Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
Date: 24 Apr 2003 13:19:03 -0000
Message-ID: <20030424131903.35347.qmail@icarus.apache.org>
From: trawick@apache.org
To: httpd-2.0-cvs@apache.org
Subject: cvs commit: httpd-2.0 CHANGES configure.in

trawick     2003/04/24 06:19:03

  Modified:    .        CHANGES configure.in
  Log:
  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.
  
  Revision  Changes    Path
  1.1153    +4 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.1152
  retrieving revision 1.1153
  diff -u -r1.1152 -r1.1153
  --- CHANGES	22 Apr 2003 20:07:19 -0000	1.1152
  +++ CHANGES	24 Apr 2003 13:18:59 -0000	1.1153
  @@ -2,6 +2,10 @@
   
     [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]
  
  
  
  1.249     +8 -2      httpd-2.0/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/configure.in,v
  retrieving revision 1.248
  retrieving revision 1.249
  diff -u -r1.248 -r1.249
  --- configure.in	5 Apr 2003 21:46:40 -0000	1.248
  +++ configure.in	24 Apr 2003 13:19:00 -0000	1.249
  @@ -76,6 +76,8 @@
     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 @@
   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 @@
   
   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)