aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configure.ac7
-rw-r--r--tests/server/Makefile.am4
2 files changed, 11 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac
index 59df0c77d..b6a8a632c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3339,6 +3339,13 @@ AC_SUBST(CURL_NETWORK_LIBS)
AC_SUBST(CURL_NETWORK_AND_TIME_LIBS)
LIBS=$ALL_LIBS dnl LIBS is a magic variable that's used for every link
+dnl BLANK_AT_MAKETIME might be used in some of our Makefile.am files to
+dnl blank LIBS variable used in generated makefile at makefile processing
+dnl time. Our test server's Makefile.am uses this to prevent global LIBS
+dnl from being used for any test server build target.
+BLANK_AT_MAKETIME=
+AC_SUBST(BLANK_AT_MAKETIME)
+
AM_CONDITIONAL(CROSSCOMPILING, test x$cross_compiling = xyes)
dnl yes or no
diff --git a/tests/server/Makefile.am b/tests/server/Makefile.am
index 99cc0d67d..85e0c097c 100644
--- a/tests/server/Makefile.am
+++ b/tests/server/Makefile.am
@@ -50,6 +50,10 @@ AM_CPPFLAGS = -I$(top_builddir)/include/curl \
-I$(top_srcdir)/lib
endif
+# Prevent global LIBS from influencing test server build targets
+BLANK_AT_MAKETIME = @BLANK_AT_MAKETIME@
+LIBS = $(BLANK_AT_MAKETIME)
+
if DOING_NATIVE_WINDOWS
AM_CPPFLAGS += -DCURL_STATICLIB
endif