Commit a162de0a authored by Jeff Trawick's avatar Jeff Trawick
Browse files

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
parent 8bd9f0cf

acinclude.m4

+1 −0
Changes for acinclude.m4: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -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)

build/rules.mk.in

+1 −1
Changes for build/rules.mk.in: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -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)

configure.in

+4 −2
Changes for configure.in: 4 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -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),