Per suggestion, tuck NOTEST_* in config_vars.mk. Yep, I changed

the name. NONAC_* causes autoconf to complain loud and long.

PR:
Obtained from:
Submitted by:
Reviewed by:

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87660 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/acinclude.m4 b/acinclude.m4
index 5ff8066a589054c5de345e0f3bd7ecc62ab6ba19..3a12a9d66166ebb7b54b0ef7d13ccedbf1941e13 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -79,6 +79,8 @@ AC_DEFUN(APACHE_GEN_CONFIG_VARS,[
   APACHE_SUBST(SHELL)
   APACHE_SUBST(MODULE_DIRS)
   APACHE_SUBST(PORT)
+  APACHE_SUBST(NOTEST_CFLAGS)
+  APACHE_SUBST(NOTEST_LDFLAGS)
 
   abs_srcdir="`(cd $srcdir && pwd)`"
 

diff --git a/build/fastgen.sh b/build/fastgen.sh
index 2fa2932d38ce9315e6b9530c0139413bef829c9a..347fb14250b17fa83f2486cfc9b74576a868a297 100755 (executable)
--- a/build/fastgen.sh
+++ b/build/fastgen.sh
@@ -87,8 +87,6 @@ top_builddir = $top_builddir
 srcdir       = $top_srcdir/$dir
 builddir     = $top_builddir/$dir
 VPATH        = $top_srcdir/$dir
-NONAC_CFLAGS  = $NONAC_CFLAGS
-NONAC_LDFLAGS = $NONAC_LDFLAGS
 EOF
     
     test -z "$dir" && dir="."
@@ -106,8 +104,6 @@ top_builddir = $top_builddir
 srcdir       = $top_srcdir/$dir
 builddir     = $top_builddir/$dir
 VPATH        = $top_srcdir/$dir
-NONAC_CFLAGS  = $NONAC_CFLAGS
-NONAC_LDFLAGS = $NONAC_LDFLAGS
 EOF
   
     test -z "$dir" && dir="."

diff --git a/build/rules.mk b/build/rules.mk
index 81df4cf00e594ee373c28d638697c41f5e551d91..9c3b4e1d33794752ca8b27b12731b3435654f0b4 100644 (file)
--- a/build/rules.mk
+++ b/build/rules.mk
@@ -59,7 +59,7 @@ include $(top_builddir)/config_vars.mk
 # Compile commands
 
 COMMON_FLAGS = $(DEFS) $(INCLUDES) $(EXTRA_INCLUDES) $(CPPFLAGS)
-COMPILE      = $(CC)  $(COMMON_FLAGS) $(CFLAGS) $(EXTRA_CFLAGS) $(NONAC_CFLAGS)
+COMPILE      = $(CC)  $(COMMON_FLAGS) $(CFLAGS) $(EXTRA_CFLAGS) $(NOTEST_CFLAGS)
 CXX_COMPILE  = $(CXX) $(COMMON_FLAGS) $(CXXFLAGS) $(EXTRA_CXXFLAGS)
 
 SH_COMPILE     = $(SH_LIBTOOL) --mode=compile $(COMPILE) -c $< && touch $@
@@ -70,9 +70,9 @@ LT_CXX_COMPILE = $(LIBTOOL) --mode=compile $(CXX_COMPILE) -c $< && touch $@
 
 # Link-related commands
 
-LINK     = $(LIBTOOL) --mode=link $(COMPILE) $(LTFLAGS) $(LDFLAGS) $(NONAC_LDFLAGS) -o $@
-SH_LINK  = $(SH_LIBTOOL) --mode=link $(COMPILE) $(LTFLAGS) $(LDFLAGS) $(NONAC_LDFLAGS) -o $@
-MOD_LINK = $(LIBTOOL) --mode=link $(COMPILE) -module $(LTFLAGS) $(LDFLAGS) $(NONAC_LDFLAGS) -o $@
+LINK     = $(LIBTOOL) --mode=link $(COMPILE) $(LTFLAGS) $(LDFLAGS) $(NOTEST_LDFLAGS) -o $@
+SH_LINK  = $(SH_LIBTOOL) --mode=link $(COMPILE) $(LTFLAGS) $(LDFLAGS) $(NOTEST_LDFLAGS) -o $@
+MOD_LINK = $(LIBTOOL) --mode=link $(COMPILE) -module $(LTFLAGS) $(LDFLAGS) $(NOTEST_LDFLAGS) -o $@
 
 # Cross compile commands