configure: remove USE_EXPLICIT_LIB_DEPS

Added a long time ago for something that libtool should handle for us.

Closes #14697

diff --git a/configure.ac b/configure.ac
index 52e6fdbb5a0bd504c205edb7da8005d70256d253..0b3dc86052032d1f567534fa769c4c4463de3b86 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -501,14 +501,6 @@ fi
 AC_SUBST([LIBCURL_PC_CFLAGS])
 
 
-# Determine whether all dependent libraries must be specified when linking
-if test "X$enable_shared" = "Xyes" -a "X$link_all_deplibs" = "Xno"; then
-  require_lib_deps=no
-else
-  require_lib_deps=yes
-fi
-AM_CONDITIONAL(USE_EXPLICIT_LIB_DEPS, test x$require_lib_deps = xyes)
-
 dnl **********************************************************************
 dnl platform/compiler/architecture specific checks/flags
 dnl **********************************************************************

diff --git a/docs/examples/Makefile.am b/docs/examples/Makefile.am
index cfe4ec0ba2f53a5118c68cfe26cd68e56ad3e579..8a731f55ff5795689fb405108242bc767dd2511b 100644 (file)
--- a/docs/examples/Makefile.am
+++ b/docs/examples/Makefile.am
@@ -55,11 +55,7 @@ endif
 LIBS = $(BLANK_AT_MAKETIME)
 
 # Dependencies
-if USE_EXPLICIT_LIB_DEPS
 LDADD = $(LIBDIR)/libcurl.la @LIBCURL_PC_LIBS_PRIVATE@
-else
-LDADD = $(LIBDIR)/libcurl.la
-endif
 
 # This might hold -Werror
 CFLAGS += @CURL_CFLAG_EXTRAS@

diff --git a/src/Makefile.am b/src/Makefile.am
index 76af4602fc38273e29c00925d74bb4f02c2b286b..8de938f9d97339db47c842a5506125272d55839d 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -72,11 +72,7 @@ CFLAGS += @CURL_CFLAG_EXTRAS@
 # Prevent LIBS from being used for all link targets
 LIBS = $(BLANK_AT_MAKETIME)
 
-if USE_EXPLICIT_LIB_DEPS
 curl_LDADD = $(top_builddir)/lib/libcurl.la @LIBCURL_PC_LIBS_PRIVATE@
-else
-curl_LDADD = $(top_builddir)/lib/libcurl.la @SSL_LIBS@ @ZLIB_LIBS@ @CURL_NETWORK_AND_TIME_LIBS@
-endif
 
 # if unit tests are enabled, build a static library to link them with
 if BUILD_UNITTESTS

diff --git a/tests/http/clients/Makefile.am b/tests/http/clients/Makefile.am
index 9650d61a849d30b3215852e02b84bc458c78f049..e9bdda9f8891af8d9a6fc965ceaf7cc19f8368a3 100644 (file)
--- a/tests/http/clients/Makefile.am
+++ b/tests/http/clients/Makefile.am
@@ -56,11 +56,7 @@ endif
 LIBS = $(BLANK_AT_MAKETIME)
 
 # Dependencies
-if USE_EXPLICIT_LIB_DEPS
 LDADD = $(LIBDIR)/libcurl.la @LIBCURL_PC_LIBS_PRIVATE@
-else
-LDADD = $(LIBDIR)/libcurl.la
-endif
 
 # This might hold -Werror
 CFLAGS += @CURL_CFLAG_EXTRAS@

diff --git a/tests/libtest/Makefile.am b/tests/libtest/Makefile.am
index d5b394463f91b39d25210388329a725fdfe30834..2e360cad443f8f3676c4e36b91998faeed186539 100644 (file)
--- a/tests/libtest/Makefile.am
+++ b/tests/libtest/Makefile.am
@@ -48,13 +48,8 @@ CLEANFILES = lib1521.c
 # Prevent LIBS from being used for all link targets
 LIBS = $(BLANK_AT_MAKETIME)
 
-if USE_EXPLICIT_LIB_DEPS
 SUPPORTFILES_LIBS = $(top_builddir)/lib/libcurl.la @LIBCURL_PC_LIBS_PRIVATE@
 TESTUTIL_LIBS = $(top_builddir)/lib/libcurl.la @LIBCURL_PC_LIBS_PRIVATE@
-else
-SUPPORTFILES_LIBS = $(top_builddir)/lib/libcurl.la @CURL_NETWORK_LIBS@
-TESTUTIL_LIBS = $(top_builddir)/lib/libcurl.la @CURL_NETWORK_AND_TIME_LIBS@
-endif
 
 # Dependencies (may need to be overridden)
 LDADD = $(SUPPORTFILES_LIBS)

diff --git a/tests/libtest/Makefile.inc b/tests/libtest/Makefile.inc
index 0c1414938a0ffe287f0e3fd6cb7f79dab4aaa681..c3e86d936774af7a0fac09d2e7c10bd504a205b0 100644 (file)
--- a/tests/libtest/Makefile.inc
+++ b/tests/libtest/Makefile.inc
@@ -84,6 +84,7 @@ libntlmconnect_SOURCES = libntlmconnect.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS
 libntlmconnect_LDADD = $(TESTUTIL_LIBS)
 
 libauthretry_SOURCES = libauthretry.c $(SUPPORTFILES)
+libauthretry_LDADD = $(TESTUTIL_LIBS)
 
 libprereq_SOURCES = libprereq.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
 libprereq_LDADD = $(TESTUTIL_LIBS)