This fixes the apache2handler build against HEAD of httpd-2.0:
- pick up correct names for ap[ru]-config from apxs
- pick up --cppflags etc from apr-config to ensure that
-D_LARGEFILE64_SOURCE is used where necessary (that's bug #27761)
since APR now has large file support
(tested to not break the build against the 2.0.x branch)
Index: sapi/apache2handler/config.m4
RCS file: /repository/php-src/sapi/apache2handler/config.m4,v
retrieving revision 1.9
diff -u -r1.9 config.m4
--- sapi/apache2handler/config.m4 21 Oct 2003 11:48:31 -0000 1.9
+++ sapi/apache2handler/config.m4 13 Aug 2004 10:44:57 -0000
@@ -39,8 +39,14 @@
APU_BINDIR=$APXS -q APU_BINDIR
APR_BINDIR=$APXS -q APR_BINDIR
- APU_INCLUDEDIR="
$APU_BINDIR/apu-config --includes
" - APR_INCLUDEDIR="
$APR_BINDIR/apr-config --includes
"
-
Pick up ap[ru]-N-config if using httpd >=2.1
-
APR_CONFIG=
$APXS -q APR_CONFIG 2>/dev/null
|| -
APR_CONFIG="$APR_BINDIR/apr-config"
-
APU_CONFIG=
$APXS -q APU_CONFIG 2>/dev/null
|| -
APU_CONFIG="$APU_BINDIR/apu-config"
-
APR_CFLAGS="
$APR_CONFIG --cppflags --cflags --includes
" -
APU_CFLAGS="
$APU_CONFIG --includes
"for flag in $APXS_CFLAGS; do
case $flag in
@@ -48,7 +54,7 @@
esac
done
- APACHE_CFLAGS="$APACHE_CPPFLAGS -I$APXS_INCLUDEDIR $APU_INCLUDEDIR $APR_INCLUDEDIR"
-
APACHE_CFLAGS="$APACHE_CPPFLAGS -I$APXS_INCLUDEDIR $APR_CFLAGS $APU_CFLAGS"
Test that we're trying to configure with apache 2.x
PHP_AP_EXTRACT_VERSION($APXS_HTTPD)
This fixes the apache2handler build against HEAD of httpd-2.0:
Actually, this alternative patch is a fractionally safer change,
avoiding picking up --cflags from apr-config:
Index: sapi/apache2handler/config.m4
RCS file: /repository/php-src/sapi/apache2handler/config.m4,v
retrieving revision 1.9
diff -u -r1.9 config.m4
--- sapi/apache2handler/config.m4 21 Oct 2003 11:48:31 -0000 1.9
+++ sapi/apache2handler/config.m4 13 Aug 2004 10:50:30 -0000
@@ -39,8 +39,14 @@
APU_BINDIR=$APXS -q APU_BINDIR
APR_BINDIR=$APXS -q APR_BINDIR
- APU_INCLUDEDIR="
$APU_BINDIR/apu-config --includes
" - APR_INCLUDEDIR="
$APR_BINDIR/apr-config --includes
"
-
Pick up ap[ru]-N-config if using httpd >=2.1
-
APR_CONFIG=
$APXS -q APR_CONFIG 2>/dev/null
|| -
APR_CONFIG="$APR_BINDIR/apr-config"
-
APU_CONFIG=
$APXS -q APU_CONFIG 2>/dev/null
|| -
APU_CONFIG="$APU_BINDIR/apu-config"
-
APR_CFLAGS="
$APR_CONFIG --cppflags --includes
" -
APU_CFLAGS="
$APU_CONFIG --includes
"for flag in $APXS_CFLAGS; do
case $flag in
@@ -48,7 +54,7 @@
esac
done
- APACHE_CFLAGS="$APACHE_CPPFLAGS -I$APXS_INCLUDEDIR $APU_INCLUDEDIR $APR_INCLUDEDIR"
-
APACHE_CFLAGS="$APACHE_CPPFLAGS -I$APXS_INCLUDEDIR $APR_CFLAGS $APU_CFLAGS"
Test that we're trying to configure with apache 2.x
PHP_AP_EXTRACT_VERSION($APXS_HTTPD)