keep -DAP_HOOK_PROBES_ENABLED (--enable-hook-probes) and

-DAP_DECLARE_EXPORT (MinGW builds) out of the *CPPFLAGS
used for third-party module builds

introduce INTERNAL_CPPFLAGS for that; apxs bypasses this

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

diff --git a/acinclude.m4 b/acinclude.m4
index 852f5333e789c5b0491327b70a967f1453a59963..7dfbd8329c1693fd475210db099a3ac8396a20d1 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -73,6 +73,7 @@ AC_DEFUN(APACHE_GEN_CONFIG_VARS,[
   APACHE_SUBST(EXTRA_LDFLAGS)
   APACHE_SUBST(EXTRA_LIBS)
   APACHE_SUBST(EXTRA_INCLUDES)
+  APACHE_SUBST(INTERNAL_CPPFLAGS)
   APACHE_SUBST(LIBTOOL)
   APACHE_SUBST(SHELL)
   APACHE_SUBST(RSYNC)

diff --git a/build/rules.mk.in b/build/rules.mk.in
index 044af7340147d13dfa5f20202d31de9c2f9ec097..2bf16fe6787669a6e763708ba21c7ec073f50c8d 100644 (file)
--- a/build/rules.mk.in
+++ b/build/rules.mk.in
@@ -24,7 +24,7 @@
 # left-to-right precedence and CPPFLAGS may include user-defined overrides.
 #
 ALL_CFLAGS   = $(EXTRA_CFLAGS) $(NOTEST_CFLAGS) $(CFLAGS)
-ALL_CPPFLAGS = $(DEFS) $(EXTRA_CPPFLAGS) $(NOTEST_CPPFLAGS) $(CPPFLAGS)
+ALL_CPPFLAGS = $(DEFS) $(INTERNAL_CPPFLAGS) $(EXTRA_CPPFLAGS) $(NOTEST_CPPFLAGS) $(CPPFLAGS)
 ALL_CXXFLAGS = $(EXTRA_CXXFLAGS) $(NOTEST_CXXFLAGS) $(CXXFLAGS)
 ALL_LDFLAGS  = $(EXTRA_LDFLAGS) $(NOTEST_LDFLAGS) $(LDFLAGS)
 ALL_LIBS     = $(EXTRA_LIBS) $(NOTEST_LIBS) $(LIBS)

diff --git a/configure.in b/configure.in
index bdc5f51f5d2369d0ebc0d8337cd53c8569619170..f4fd7d56f36d8e7795f2b1438141771b2b1c4b46 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -104,6 +104,8 @@ APR_SETIFNULL(CC, `$apr_config --cc`)
 APR_SETIFNULL(CPP, `$apr_config --cpp`)
 APR_ADDTO(CFLAGS, `$apr_config --cflags`)
 APR_ADDTO(CPPFLAGS, `$apr_config --cppflags`)
+dnl internal-only CPPFLAGS (shouldn't affect third-party module builds)
+INTERNAL_CPPFLAGS=""
 APR_ADDTO(LDFLAGS, `$apr_config --ldflags`)
 SHLIBPATH_VAR=`$apr_config --shlib-path-var`
 APR_BINDIR=`$apr_config --bindir`
@@ -305,7 +307,7 @@ case $host in
       APR_SETVAR(SINGLE_LISTEN_UNSERIALIZED_ACCEPT, [1])
       ;;
   *mingw32*)
-      APR_ADDTO(CPPFLAGS, [-DAP_DECLARE_EXPORT])
+      APR_ADDTO(INTERNAL_CPPFLAGS, [-DAP_DECLARE_EXPORT])
       APR_SETIFNULL(ac_cv_func_times, [no])
       APR_SETIFNULL(ac_cv_func_getpwnam, [no])
       APR_SETIFNULL(ac_cv_func_getgrnam, [no])
@@ -514,7 +516,7 @@ AC_ARG_ENABLE(hook-probes,APACHE_HELP_STRING(--enable-hook-probes,Enable APR hoo
 [
     AC_DEFINE(AP_HOOK_PROBES_ENABLED, 1,
         [Enable the APR hook probes capability, reading from ap_hook_probes.h])
-    APR_ADDTO(CPPFLAGS, -DAP_HOOK_PROBES_ENABLED)
+    APR_ADDTO(INTERNAL_CPPFLAGS, -DAP_HOOK_PROBES_ENABLED)
 ])dnl
 
 AC_ARG_ENABLE(exception-hook,APACHE_HELP_STRING(--enable-exception-hook,Enable fatal exception hook),