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 d1afd89d4204333b1df41fbecbc36d982917ef24..16ef55aa08b978579b183b99237ed57b4fcc1e11 100644 (file)
--- 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 de2395ede1ebdbb560de4800c588e91d08d36c9c..c78c95823bee397cf2148e9db14d21f1ab28a1a3 100644 (file)
--- 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 93cb28226d64032e1096a114434284f6adfcd9d9..dbaf54aef6054f25c464fe9cd139920c1857f3f8 100644 (file)
--- 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 805eab41b5c7000de1cb7c49b5eca7d70809b831..629bfa01430fbf6a106bd1f9c0986370b021320f 100644 (file)
--- 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 a02591c2d90ca745b2585b7fb3c388e4fccc9926..53a5ba420f21d5c5cc10481011e4232397bb5401 100644 (file)
--- 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 7d620e71e4391c10209163fbd99b3be477f4f277..880a99345d5b9d3affca38de2f1d9423068b3118 100644 (file)
--- 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"