Begining stub of NONAC_LDFLAGS and NONAC_CFLAGS stuff.

First of all, avoid re-adding values to the various hints
each time called (not a problem now, but could be later).
Then build up CFLAGS/LDFLAGS during Makefile generation.

PR:
Obtained from:
Submitted by:
Reviewed by:

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

diff --git a/build/fastgen.sh b/build/fastgen.sh
index 347fb14250b17fa83f2486cfc9b74576a868a297..673377227ac1f954e22b60a049ab2bac346b6f0a 100755 (executable)
--- a/build/fastgen.sh
+++ b/build/fastgen.sh
@@ -87,6 +87,8 @@ 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 26d4cfc0ff8e256129ffd520ddc50cc387873203..81df4cf00e594ee373c28d638697c41f5e551d91 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)
+COMPILE      = $(CC)  $(COMMON_FLAGS) $(CFLAGS) $(EXTRA_CFLAGS) $(NONAC_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) -o $@
-SH_LINK  = $(SH_LIBTOOL) --mode=link $(COMPILE) $(LTFLAGS) $(LDFLAGS) -o $@
-MOD_LINK = $(LIBTOOL) --mode=link $(COMPILE) -module $(LTFLAGS) $(LDFLAGS) -o $@
+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 $@
 
 # Cross compile commands
 

diff --git a/hints.m4 b/hints.m4
index bf9202373dc19694be4690b35cc4bf9dd3054d98..93b5a3253964778ca086655d3343d57ad433cd70 100644 (file)
--- a/hints.m4
+++ b/hints.m4
@@ -5,9 +5,12 @@ dnl  Preload various ENV/makefile paramsm such as CC, CFLAGS, etc
 dnl  based on outside knowledge
 dnl
 AC_DEFUN(APACHE_PRELOAD, [
-echo "Applying hints file rules for $host"
+if test "$DID_APACHE_PRELOAD" != "yes" ; then
+  DID_APACHE_PRELOAD="yes"; export DID_APACHE_PRELOAD
 
-case "$host" in
+  echo "Applying Apache hints file rules for $host"
+
+  case "$host" in
     *-apple-aux3*)
        APR_SETVAR(APACHE_MPM, [prefork])
         APR_SETVAR(SINGLE_LISTEN_UNSERIALIZED_ACCEPT, [1])
@@ -49,6 +52,7 @@ dnl   ;;
         APR_SETVAR(APACHE_MPM, [beos])
         APR_SETVAR(SINGLE_LISTEN_UNSERIALIZED_ACCEPT, [1])
         ;;
-esac
-APR_DOEXTRA
+  esac
+  APR_DOEXTRA
+fi
 ])