From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Sat, 13 Feb 2016 17:39:11 +0000 (+0100)
Subject: Link our internal libs directly
X-Git-Tag: auth-4.0.0-alpha2~44^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F3368%2Fhead;p=thirdparty%2Fpdns.git

Link our internal libs directly

If we don't do this and we have an external version of the same
lib installed, we risk picking that one up instead.

See #3127 for background
---

diff --git a/configure.ac b/configure.ac
index d1afd89d42..16ef55aa08 100644
--- a/configure.ac
+++ b/configure.ac
@@ -305,7 +305,7 @@ AC_SUBST([AM_CPPFLAGS],
 )
 
 AC_SUBST([YAHTTP_CFLAGS], ['-I$(top_srcdir)/ext/yahttp'])
-AC_SUBST([YAHTTP_LIBS], ['-L$(top_builddir)/ext/yahttp/yahttp -lyahttp'])
+AC_SUBST([YAHTTP_LIBS], ['$(top_builddir)/ext/yahttp/yahttp/libyahttp.la'])
 
 CXXFLAGS="$SANITIZER_FLAGS $CXXFLAGS"
 
diff --git a/modules/remotebackend/Makefile.am b/modules/remotebackend/Makefile.am
index de2395ede1..c78c95823b 100644
--- a/modules/remotebackend/Makefile.am
+++ b/modules/remotebackend/Makefile.am
@@ -6,7 +6,7 @@ AM_CPPFLAGS += \
 
 AM_LDFLAGS = $(THREADFLAGS)
 
-JSON11_LIBS = -L$(top_srcdir)/ext/json11 -ljson11
+JSON11_LIBS = $(top_srcdir)/ext/json11/libjson11.la
 
 EXTRA_DIST = \
 	OBJECTFILES \
diff --git a/pdns/Makefile.am b/pdns/Makefile.am
index 93cb28226d..dbaf54aef6 100644
--- a/pdns/Makefile.am
+++ b/pdns/Makefile.am
@@ -1,4 +1,4 @@
-JSON11_LIBS = -L$(top_builddir)/ext/json11 -ljson11
+JSON11_LIBS = $(top_builddir)/ext/json11/libjson11.la
 
 AM_CPPFLAGS += \
 	-I$(top_srcdir)/ext/json11 \
@@ -294,10 +294,10 @@ pdnsutil_LDFLAGS = \
 pdnsutil_LDADD = \
 	@moduleobjects@ \
 	@modulelibs@ \
-	$(LIBDL) \
-	$(BOOST_PROGRAM_OPTIONS_LIBS) \
 	$(YAHTTP_LIBS) \
 	$(JSON11_LIBS) \
+	$(LIBDL) \
+	$(BOOST_PROGRAM_OPTIONS_LIBS) \
 	$(OPENSSL_LIBS)
 
 if BOTAN110
diff --git a/pdns/dnsdistdist/configure.ac b/pdns/dnsdistdist/configure.ac
index 805eab41b5..629bfa0143 100644
--- a/pdns/dnsdistdist/configure.ac
+++ b/pdns/dnsdistdist/configure.ac
@@ -16,7 +16,7 @@ PDNS_ENABLE_UNIT_TESTS
 DNSDIST_ENABLE_DNSCRYPT
 
 AC_SUBST([YAHTTP_CFLAGS], ['-I$(top_srcdir)/ext/yahttp'])
-AC_SUBST([YAHTTP_LIBS], ['-L$(top_builddir)/ext/yahttp/yahttp -lyahttp'])
+AC_SUBST([YAHTTP_LIBS], ['$(top_builddir)/ext/yahttp/yahttp/libyahttp.la'])
 
 PDNS_WITH_LUAJIT
 AS_IF([test "x$with_luajit" = "xno"], [
@@ -60,5 +60,5 @@ AC_SUBST([PROGRAM_LDFLAGS])
 AC_CONFIG_FILES([Makefile
 	ext/yahttp/Makefile
 	ext/yahttp/yahttp/Makefile])
-	
+
 AC_OUTPUT
diff --git a/pdns/recursordist/Makefile.am b/pdns/recursordist/Makefile.am
index a02591c2d9..53a5ba420f 100644
--- a/pdns/recursordist/Makefile.am
+++ b/pdns/recursordist/Makefile.am
@@ -1,4 +1,4 @@
-JSON11_LIBS = -L$(top_srcdir)/ext/json11 -ljson11
+JSON11_LIBS = $(top_srcdir)/ext/json11/libjson11.la
 
 AM_CPPFLAGS = $(LUA_CFLAGS) $(YAHTTP_CFLAGS) $(BOOST_CPPFLAGS) $(SANITIZER_FLAGS) -O3 -Wall -pthread -DSYSCONFDIR=\"${sysconfdir}\"
 
diff --git a/pdns/recursordist/configure.ac b/pdns/recursordist/configure.ac
index 7d620e71e4..880a99345d 100644
--- a/pdns/recursordist/configure.ac
+++ b/pdns/recursordist/configure.ac
@@ -90,7 +90,7 @@ AC_SUBST([AM_CPPFLAGS],
 )
 
 AC_SUBST([YAHTTP_CFLAGS], ['-I$(top_srcdir)/ext/yahttp'])
-AC_SUBST([YAHTTP_LIBS], ['-L$(top_builddir)/ext/yahttp/yahttp -lyahttp'])
+AC_SUBST([YAHTTP_LIBS], ['$(top_builddir)/ext/yahttp/yahttp/libyahttp.la'])
 
 CXXFLAGS="$SANITIZER_FLAGS $CXXFLAGS"