From: Mark Wooding <mdw@distorted.org.uk>
Date: Thu, 14 Jun 2018 10:01:27 +0000 (+0100)
Subject: build: Configure `pkg-config' correctly for static linking.
X-Git-Tag: 2.3.3~10
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/mLib/commitdiff_plain/5b2eac521b6d3e4ea7fddc56c4a344151735b722

build: Configure `pkg-config' correctly for static linking.
---

diff --git a/configure.ac b/configure.ac
index 9ff83ba..ab8d2a8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -50,13 +50,17 @@ AC_DEFINE_UNQUOTED([SRCDIR], ["$(cd $srcdir && pwd)"],
 dnl--------------------------------------------------------------------------
 dnl C programming environment.
 
+MLIB_LIBS=
+
 dnl Headers.
 AC_CHECK_HEADERS([float.h])
 AC_CHECK_HEADERS([stdint.h])
 
 dnl Libraries.
+mdw_ORIG_LIBS=$LIBS LIBS=$MLIB_LIBS
 AC_SEARCH_LIBS([socket], [socket])
 AC_SEARCH_LIBS([gethostbyname], [nsl resolv])
+MLIB_LIBS=$LIBS LIBS=$mdw_ORIG_LIBS
 
 dnl Functions.
 AC_CHECK_FUNCS([snprintf])
@@ -78,6 +82,9 @@ AC_CHECK_MEMBERS([struct msgdr.msg_control],,, [
 dnl Find out whether we're cross-compiling.
 AM_CONDITIONAL([CROSS_COMPILING], [test "$cross_compiling" = yes])
 
+dnl Set the master library list.
+AC_SUBST([MLIB_LIBS])
+
 dnl--------------------------------------------------------------------------
 dnl Name resolution.
 
@@ -87,10 +94,12 @@ AC_ARG_WITH([adns],
   [want_adns=$withval],
   [want_adns=auto])
 
+mdw_ORIG_LIBS=$LIBS LIBS=$MLIB_LIBS
 case $want_adns in
   no) ;;
   *) AC_SEARCH_LIBS([adns_init], [adns], [have_adns=yes], [have_adns=no]) ;;
 esac
+MLIB_LIBS=$LIBS LIBS=$mdw_ORIG_LIBS
 case $want_adns,$have_adns in
   yes,no)
     AC_MSG_ERROR([ADNS library not found but explicitly requested])
diff --git a/mLib.pc.in b/mLib.pc.in
index 624d60a..3bfdacc 100644
--- a/mLib.pc.in
+++ b/mLib.pc.in
@@ -7,4 +7,5 @@ Name: mLib
 Description: A library of miscellaneous stuff
 Version: @VERSION@
 Libs: -L${libdir} -lmLib
+Libs.private: @MLIB_LIBS@
 Cflags: -I${includedir}
diff --git a/vars.am b/vars.am
index fceef07..9870cef 100644
--- a/vars.am
+++ b/vars.am
@@ -87,7 +87,8 @@ SUBSTITUTIONS = \
 	prefix=$(prefix) exec_prefix=$(exec_prefix) \
 	libdir=$(libdir) includedir=$(includedir) \
 	bindir=$(bindir) sbindir=$(sbindir) \
-	PACKAGE=$(PACKAGE) VERSION=$(VERSION)
+	PACKAGE=$(PACKAGE) VERSION=$(VERSION) \
+	MLIB_LIBS="$(MLIB_LIBS)"
 
 V_SUBST			 = $(V_SUBST_@AM_V@)
 V_SUBST_		 = $(V_SUBST_@AM_DEFAULT_V@)