Commit d27a46f0 authored Nov 29, 2012 by Yang Tse

build: prevent global LIBS from influencing test server build targets

parent 4abf4fba

configure.ac

+7 −0

Original line number	Diff line number	Diff line
		@@ -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

tests/server/Makefile.am

+4 −0

Original line number	Diff line number	Diff line
		@@ -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