build: Link with the libtool archive.

diff --git a/Makefile.in b/Makefile.in
index 69ce8e9b2c8df50a1e0f5c0e76cfdcae7d0bc5e7..8d5c7ee8391398c52f607186c847c699c4ae37a8 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -358,10 +358,10 @@ unbound-control$(EXEEXT): $(CONTROL_OBJ_LINK) libunbound.la
        $(LINK) -o $@ $(CONTROL_OBJ_LINK) $(EXTRALINK) $(SSLLIB) $(LIBS)
 
 unbound-host$(EXEEXT): $(HOST_OBJ_LINK) libunbound.la
-       $(LINK) -o $@ $(HOST_OBJ_LINK) -L. -L.libs -lunbound $(SSLLIB) $(LIBS)
+       $(LINK) -o $@ $(HOST_OBJ_LINK) libunbound.la $(SSLLIB) $(LIBS)
 
 unbound-anchor$(EXEEXT):       $(UBANCHOR_OBJ_LINK) libunbound.la
-       $(LINK) -o $@ $(UBANCHOR_OBJ_LINK) -L. -L.libs -lunbound -lexpat $(SSLLIB) $(LIBS)
+       $(LINK) -o $@ $(UBANCHOR_OBJ_LINK) libunbound.la -lexpat $(SSLLIB) $(LIBS)
 
 unbound-service-install$(EXEEXT):      $(SVCINST_OBJ_LINK)
        $(LINK) -o $@ $(SVCINST_OBJ_LINK) $(LIBS)
@@ -370,7 +370,7 @@ unbound-service-remove$(EXEEXT):    $(SVCUNINST_OBJ_LINK)
        $(LINK) -o $@ $(SVCUNINST_OBJ_LINK) $(LIBS)
 
 anchor-update$(EXEEXT):  $(ANCHORUPD_OBJ_LINK) libunbound.la
-       $(LINK) -o $@ $(ANCHORUPD_OBJ_LINK) -L. -L.libs -lunbound $(LIBS)
+       $(LINK) -o $@ $(ANCHORUPD_OBJ_LINK) libunbound.la $(LIBS)
 
 unittest$(EXEEXT):     $(UNITTEST_OBJ_LINK)
        $(LINK) -o $@ $(UNITTEST_OBJ_LINK) $(SSLLIB) $(LIBS)
@@ -391,7 +391,7 @@ memstats$(EXEEXT):  $(MEMSTATS_OBJ_LINK)
        $(LINK) -o $@ $(MEMSTATS_OBJ_LINK) $(SSLLIB) $(LIBS)
 
 asynclook$(EXEEXT):    $(ASYNCLOOK_OBJ_LINK) libunbound.la
-       $(LINK) -o $@ $(ASYNCLOOK_OBJ_LINK) -L. -L.libs -lunbound $(SSLLIB) $(LIBS)
+       $(LINK) -o $@ $(ASYNCLOOK_OBJ_LINK) libunbound.la $(SSLLIB) $(LIBS)
 
 streamtcp$(EXEEXT):    $(STREAMTCP_OBJ_LINK)
        $(LINK) -o $@ $(STREAMTCP_OBJ_LINK) $(SSLLIB) $(LIBS)
@@ -468,7 +468,7 @@ libunbound/python/libunbound_wrap.c:        $(srcdir)/libunbound/python/libunbound.i un
 
 # Pyunbound python unbound wrapper
 _unbound.la:   libunbound_wrap.lo libunbound.la
-       $(LIBTOOL) --tag=CC --mode=link $(CC) $(RUNTIME_PATH) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -module -avoid-version -no-undefined -shared -o $@ libunbound_wrap.lo -rpath $(PYTHON_SITE_PKG) -L. -L.libs -lunbound $(LIBS)
+       $(LIBTOOL) --tag=CC --mode=link $(CC) $(RUNTIME_PATH) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -module -avoid-version -no-undefined -shared -o $@ libunbound_wrap.lo -rpath $(PYTHON_SITE_PKG) libunbound.la $(LIBS)
 
 util/config_file.c:    util/configparser.h
 util/configlexer.c:  $(srcdir)/util/configlexer.lex util/configparser.h

diff --git a/configure.ac b/configure.ac
index efbdfe6aab65f6dd8e75899d316d6265a28f10f1..43286e2b92ba2b5cba498c8164cf8cb4dd44e250 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1713,7 +1713,7 @@ case "$enable_allsymbols" in
        yes)
        COMMON_OBJ_ALL_SYMBOLS=""
        UBSYMS=""
-       EXTRALINK="-L. -L.libs -lunbound"
+       EXTRALINK="libunbound.la"
        AC_DEFINE(EXPORT_ALL_SYMBOLS, 1, [Define this if you enabled-allsymbols from libunbound to link binaries to it for smaller install size, but the libunbound export table is polluted by internal symbols])
        ;;
        no|*)