luo980/curl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

configure: remove USE_EXPLICIT_LIB_DEPS

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

Closes #14697
This commit is contained in:
Daniel Stenberg 2024-08-26 23:17:51 +02:00
parent d620ec6791
commit 3af75e18d6
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
6 changed files with 1 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
configure.ac
View File

@ -501,14 +501,6 @@ fi
AC_SUBST([LIBCURL_PC_CFLAGS]) 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 **********************************************************************
dnl platform/compiler/architecture specific checks/flags dnl platform/compiler/architecture specific checks/flags
dnl ********************************************************************** dnl **********************************************************************

4
docs/examples/Makefile.am
View File

@ -55,11 +55,7 @@ endif
LIBS = $(BLANK_AT_MAKETIME) LIBS = $(BLANK_AT_MAKETIME)
# Dependencies # Dependencies
if USE_EXPLICIT_LIB_DEPS
LDADD = $(LIBDIR)/libcurl.la @LIBCURL_PC_LIBS_PRIVATE@ LDADD = $(LIBDIR)/libcurl.la @LIBCURL_PC_LIBS_PRIVATE@
else
LDADD = $(LIBDIR)/libcurl.la
endif
# This might hold -Werror # This might hold -Werror
CFLAGS += @CURL_CFLAG_EXTRAS@ CFLAGS += @CURL_CFLAG_EXTRAS@

4
src/Makefile.am
View File

@ -72,11 +72,7 @@ CFLAGS += @CURL_CFLAG_EXTRAS@
# Prevent LIBS from being used for all link targets # Prevent LIBS from being used for all link targets
LIBS = $(BLANK_AT_MAKETIME) LIBS = $(BLANK_AT_MAKETIME)
if USE_EXPLICIT_LIB_DEPS
curl_LDADD = $(top_builddir)/lib/libcurl.la @LIBCURL_PC_LIBS_PRIVATE@ 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 unit tests are enabled, build a static library to link them with
if BUILD_UNITTESTS if BUILD_UNITTESTS

4
tests/http/clients/Makefile.am
View File

@ -56,11 +56,7 @@ endif
LIBS = $(BLANK_AT_MAKETIME) LIBS = $(BLANK_AT_MAKETIME)
# Dependencies # Dependencies
if USE_EXPLICIT_LIB_DEPS
LDADD = $(LIBDIR)/libcurl.la @LIBCURL_PC_LIBS_PRIVATE@ LDADD = $(LIBDIR)/libcurl.la @LIBCURL_PC_LIBS_PRIVATE@
else
LDADD = $(LIBDIR)/libcurl.la
endif
# This might hold -Werror # This might hold -Werror
CFLAGS += @CURL_CFLAG_EXTRAS@ CFLAGS += @CURL_CFLAG_EXTRAS@

5
tests/libtest/Makefile.am
View File

@ -48,13 +48,8 @@ CLEANFILES = lib1521.c
# Prevent LIBS from being used for all link targets # Prevent LIBS from being used for all link targets
LIBS = $(BLANK_AT_MAKETIME) LIBS = $(BLANK_AT_MAKETIME)
if USE_EXPLICIT_LIB_DEPS
SUPPORTFILES_LIBS = $(top_builddir)/lib/libcurl.la @LIBCURL_PC_LIBS_PRIVATE@ SUPPORTFILES_LIBS = $(top_builddir)/lib/libcurl.la @LIBCURL_PC_LIBS_PRIVATE@
TESTUTIL_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) # Dependencies (may need to be overridden)
LDADD = $(SUPPORTFILES_LIBS) LDADD = $(SUPPORTFILES_LIBS)

1
tests/libtest/Makefile.inc
View File

@ -84,6 +84,7 @@ libntlmconnect_SOURCES = libntlmconnect.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS
libntlmconnect_LDADD = $(TESTUTIL_LIBS) libntlmconnect_LDADD = $(TESTUTIL_LIBS)
libauthretry_SOURCES = libauthretry.c $(SUPPORTFILES) libauthretry_SOURCES = libauthretry.c $(SUPPORTFILES)
libauthretry_LDADD = $(TESTUTIL_LIBS)
libprereq_SOURCES = libprereq.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) libprereq_SOURCES = libprereq.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
libprereq_LDADD = $(TESTUTIL_LIBS) libprereq_LDADD = $(TESTUTIL_LIBS)