generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

build: prevent global LIBS from influencing test server build targets

Browse Source
This commit is contained in:
Yang Tse
2012-11-29 21:56:48 +01:00
parent 4abf4fbaac
commit d27a46f09b
2 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
configure.ac
View File

@@ -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

4
tests/server/Makefile.am
View File

@@ -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