By default, use the same CC and CPP with which APR was built.

The user can override with CC and CPP environment variables.

This applies to out-of-tree APR builds.  Prior to this change,
if you had multiple compilers on the system and you told
APR to use a non-default one, you'd have to remember to tell
Apache too.  Otherwise, Apache would use the default compiler
but use CFLAGS that went with the compiler that APR was built
with.

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

diff --git a/CHANGES b/CHANGES
index ccdedf911d55eb1196bec07a40b41d2b0f3b8911..99f279c60ac59891499a5ae28381609d9b307af9 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,10 @@ Changes with Apache 2.1.0-dev
 
   [Remove entries to the current 2.0 section below, when backported]
 
+  *) By default, use the same CC and CPP with which APR was built.
+     The user can override with CC and CPP environment variables.
+     [Jeff Trawick]
+
   *) Fix ap_construct_url() so that it surrounds IPv6 literal address
      strings with [].  This fixes certain types of redirection.
      PR 19207.  [Jeff Trawick]

diff --git a/configure.in b/configure.in
index d660185e7a962f99ca30de23b4357936fc4173fd..f6707b0c3d1e0413e4e94de9a291f25b5be31f52 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -76,6 +76,8 @@ if test "$apr_found" = "reconfig"; then
   AP_CLEAN_SRCLIB_DIRS="$AP_CLEAN_SRCLIB_DIRS apr"
 fi
 
+APR_SETIFNULL(CC, `$apr_config --cc`)
+APR_SETIFNULL(CPP, `$apr_config --cpp`)
 APR_ADDTO(CFLAGS, `$apr_config --cflags`)
 APR_ADDTO(CPPFLAGS, `$apr_config --cppflags`)
 APR_ADDTO(LDFLAGS, `$apr_config --ldflags`)
@@ -106,6 +108,12 @@ APR_ADDTO(INCLUDES, `$apu_config --includes`)
 APU_BINDIR=`$apu_config --bindir`
 APU_INCLUDEDIR=`$apu_config --includedir`
 
+dnl In case we picked up CC and CPP from APR, get that info into the
+dnl config cache so that PCRE uses it.  Otherwise, CC and CPP used for
+dnl PCRE and for our config tests will be whatever PCRE determines.
+AC_PROG_CC
+AC_PROG_CPP
+
 echo $ac_n "${nl}Configuring PCRE regular expression library ...${nl}"
 
 APR_SUBDIR_CONFIG(srclib/pcre,
@@ -236,8 +244,6 @@ dnl ## Check for programs
 
 AC_PATH_PROG(RM, rm)
 AC_PROG_AWK
-AC_PROG_CC
-AC_PROG_CPP
 AC_PROG_INSTALL
 AC_PROG_LN_S
 AC_CHECK_TOOL(RANLIB, ranlib, true)