backport this fix to 2.0.46-dev:

  By default, use the same CC and CPP with which APR was built.
  The user can override with CC and CPP environment variables.

Reviewed by:	nd, stoddard

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

diff --git a/CHANGES b/CHANGES
index b9eb9cef455849c6fabc12a0a99528141d6665d5..b47bb3b8eb853fe9d3f7c8257799a0c633f81272 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,9 @@
 Changes with Apache 2.0.46
 
+  *) 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/STATUS b/STATUS
index cefd000da6658204c5e16b5dcc39f65c9d122f04..3d6873e25d48e7d719f63383045a857573f9438d 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -1,5 +1,5 @@
 APACHE 2.0 STATUS:                                              -*-text-*-
-Last modified at [$Date: 2003/05/13 16:12:19 $]
+Last modified at [$Date: 2003/05/13 16:30:00 $]
 
 Release:
 
@@ -203,11 +203,6 @@ PATCHES TO PORT FROM 2.1
       (the docs should explain the thing better. Currently it's not
        really understandable for users. If nobody else does, nd tries to.)
 
-    * By default, use the same CC and CPP with which APR was built.
-      The user can override with CC and CPP environment variables.
-      configure.in              r1.249
-      +1: trawick, nd, stoddard
-
     * Fix a problem that caused httpd to be linked with incorrect flags
       on some platforms when mod_so was enabled by default, breaking 
       DSOs on AIX.  PR 19012

diff --git a/configure.in b/configure.in
index 90ff8baf80f87913f8848c4ceb26faf59b7e37ce..08e075352f580449ff0ff3dcb8fe61420ab9641d 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)