From 4cce314a392dd9aed5d82fa72a43eae864d67fff Mon Sep 17 00:00:00 2001
From: Viktor Szakats <commit@vsz.me>
Date: Tue, 29 Jul 2025 00:57:55 +0200
Subject: [PATCH] build: allow libtests/clients to use libcurl dependencies
 directly

For libcurl API tests that need interacting directly with TLS-backends.

Partial revert of 58b9c6134bf8632442aa7d703aa8c7061604785e #17696 for
cmake, and implementing the same for autotools.

Ref: #18066
Closes #18069
---
 tests/client/CMakeLists.txt  | 2 +-
 tests/client/Makefile.am     | 2 +-
 tests/libtest/CMakeLists.txt | 2 +-
 tests/libtest/Makefile.am    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/client/CMakeLists.txt b/tests/client/CMakeLists.txt
index 4e550bcdd1..c1821f6398 100644
--- a/tests/client/CMakeLists.txt
+++ b/tests/client/CMakeLists.txt
@@ -40,7 +40,7 @@ add_custom_command(OUTPUT "${BUNDLE}.c"
 
 add_executable(${BUNDLE} EXCLUDE_FROM_ALL "${BUNDLE}.c")
 add_dependencies(testdeps ${BUNDLE})
-target_link_libraries(${BUNDLE} ${LIB_SELECTED} ${CURL_NETWORK_AND_TIME_LIBS})
+target_link_libraries(${BUNDLE} ${LIB_SELECTED} ${CURL_LIBS})
 target_include_directories(${BUNDLE} PRIVATE
   "${PROJECT_BINARY_DIR}/lib"            # for "curl_config.h"
   "${PROJECT_SOURCE_DIR}/lib"            # for "curl_setup.h", curlx
diff --git a/tests/client/Makefile.am b/tests/client/Makefile.am
index 650415fcdd..f20e63aa08 100644
--- a/tests/client/Makefile.am
+++ b/tests/client/Makefile.am
@@ -62,7 +62,7 @@ $(BUNDLE).c: $(top_srcdir)/scripts/mk-unity.pl Makefile.inc $(FIRST_C) $(curlx_c
 	@PERL@ $(top_srcdir)/scripts/mk-unity.pl --include $(curlx_c_lib) --test $(TESTS_C) > $(BUNDLE).c
 
 noinst_PROGRAMS = $(BUNDLE)
-LDADD = $(top_builddir)/lib/libcurl.la
+LDADD = $(top_builddir)/lib/libcurl.la @LIBCURL_PC_LIBS_PRIVATE@
 CLEANFILES = $(BUNDLE).c
 
 CHECKSRC = $(CS_$(V))
diff --git a/tests/libtest/CMakeLists.txt b/tests/libtest/CMakeLists.txt
index 849bd66202..277d86c188 100644
--- a/tests/libtest/CMakeLists.txt
+++ b/tests/libtest/CMakeLists.txt
@@ -49,7 +49,7 @@ add_custom_command(OUTPUT "${BUNDLE}.c"
 
 add_executable(${BUNDLE} EXCLUDE_FROM_ALL "${BUNDLE}.c")
 add_dependencies(testdeps ${BUNDLE})
-target_link_libraries(${BUNDLE} ${LIB_SELECTED} ${CURL_NETWORK_AND_TIME_LIBS})
+target_link_libraries(${BUNDLE} ${LIB_SELECTED} ${CURL_LIBS})
 target_include_directories(${BUNDLE} PRIVATE
   "${PROJECT_BINARY_DIR}/lib"            # for "curl_config.h"
   "${PROJECT_SOURCE_DIR}/lib"            # for "curl_setup.h", curlx
diff --git a/tests/libtest/Makefile.am b/tests/libtest/Makefile.am
index 2e746a9631..b62a359eab 100644
--- a/tests/libtest/Makefile.am
+++ b/tests/libtest/Makefile.am
@@ -69,7 +69,7 @@ $(BUNDLE).c: $(top_srcdir)/scripts/mk-unity.pl Makefile.inc $(FIRST_C) $(UTILS_C
 	@PERL@ $(top_srcdir)/scripts/mk-unity.pl --include $(UTILS_C) $(curlx_c_lib) --test $(TESTS_C) lib1521.c > $(BUNDLE).c
 
 noinst_PROGRAMS = $(BUNDLE)
-LDADD = $(top_builddir)/lib/libcurl.la
+LDADD = $(top_builddir)/lib/libcurl.la @LIBCURL_PC_LIBS_PRIVATE@
 CLEANFILES = $(BUNDLE).c lib1521.c
 
 lib1521.c: $(top_srcdir)/tests/libtest/mk-lib1521.pl $(top_srcdir)/include/curl/curl.h
-- 
2.47.2