From 3af75e18d691af24c4a11ee6cb1441de44b3a836 Mon Sep 17 00:00:00 2001
From: Daniel Stenberg <daniel@haxx.se>
Date: Mon, 26 Aug 2024 23:17:51 +0200
Subject: [PATCH] configure: remove USE_EXPLICIT_LIB_DEPS

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

Closes #14697
---
 configure.ac                   | 8 --------
 docs/examples/Makefile.am      | 4 ----
 src/Makefile.am                | 4 ----
 tests/http/clients/Makefile.am | 4 ----
 tests/libtest/Makefile.am      | 5 -----
 tests/libtest/Makefile.inc     | 1 +
 6 files changed, 1 insertion(+), 25 deletions(-)

diff --git a/configure.ac b/configure.ac
index 52e6fdbb5a..0b3dc86052 100644
--- 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 cfe4ec0ba2..8a731f55ff 100644
--- 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 76af4602fc..8de938f9d9 100644
--- 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 9650d61a84..e9bdda9f88 100644
--- 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 d5b394463f..2e360cad44 100644
--- 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 0c1414938a..c3e86d9367 100644
--- 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)