You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by tr...@apache.org on 2003/05/13 18:30:04 UTC
cvs commit: httpd-2.0 CHANGES STATUS configure.in
trawick 2003/05/13 09:30:04
Modified: . Tag: APACHE_2_0_BRANCH CHANGES STATUS configure.in
Log:
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
Revision Changes Path
No revision
No revision
1.988.2.90 +4 -0 httpd-2.0/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/httpd-2.0/CHANGES,v
retrieving revision 1.988.2.89
retrieving revision 1.988.2.90
diff -u -r1.988.2.89 -r1.988.2.90
--- CHANGES 13 May 2003 16:01:03 -0000 1.988.2.89
+++ CHANGES 13 May 2003 16:29:59 -0000 1.988.2.90
@@ -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]
1.751.2.255 +1 -6 httpd-2.0/STATUS
Index: STATUS
===================================================================
RCS file: /home/cvs/httpd-2.0/STATUS,v
retrieving revision 1.751.2.254
retrieving revision 1.751.2.255
diff -u -r1.751.2.254 -r1.751.2.255
--- STATUS 13 May 2003 16:12:19 -0000 1.751.2.254
+++ STATUS 13 May 2003 16:30:00 -0000 1.751.2.255
@@ -203,11 +203,6 @@
(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
1.232.2.7 +8 -2 httpd-2.0/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/httpd-2.0/configure.in,v
retrieving revision 1.232.2.6
retrieving revision 1.232.2.7
diff -u -r1.232.2.6 -r1.232.2.7
--- configure.in 17 Apr 2003 02:57:21 -0000 1.232.2.6
+++ configure.in 13 May 2003 16:30:01 -0000 1.232.2.7
@@ -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)