1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
|
--- php5-5.1.1/sapi/apache/config.m4 2005-05-30 09:16:45.000000000 +1000
+++ php5-5.1.1/sapi/apache/config.m4 2005-12-20 20:02:26.000000000 +1100
@@ -52,11 +52,11 @@
APXS_HTTPD=`$APXS -q SBINDIR`/`$APXS -q TARGET`
APACHE_INCLUDE=-I$APXS_INCLUDEDIR
- # Test that we're trying to configure with apache 1.x
- PHP_AP_EXTRACT_VERSION($APXS_HTTPD)
- if test "$APACHE_VERSION" -ge 2000000; then
- AC_MSG_ERROR([You have enabled Apache 1.3 support while your server is Apache 2. Please use the appropiate switch --with-apxs2])
- fi
+dnl # Test that we're trying to configure with apache 1.x
+dnl PHP_AP_EXTRACT_VERSION($APXS_HTTPD)
+dnl if test "$APACHE_VERSION" -ge 2000000; then
+dnl AC_MSG_ERROR([You have enabled Apache 1.3 support while your server is Apache 2. Please use the appropiate switch --with-apxs2])
+dnl fi
for flag in $APXS_CFLAGS; do
case $flag in
--- php5-5.1.1/sapi/apache2handler/config.m4 2005-09-02 00:33:47.000000000 +1000
+++ php5-5.1.1/sapi/apache2handler/config.m4 2005-12-20 19:57:17.000000000 +1100
@@ -56,13 +56,13 @@
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)
- if test "$APACHE_VERSION" -le 2000000; then
- AC_MSG_ERROR([You have enabled Apache 2 support while your server is Apache 1.3. Please use the appropiate switch --with-apxs (without the 2)])
- elif test "$APACHE_VERSION" -lt 2000044; then
- AC_MSG_ERROR([Please note that Apache version >= 2.0.44 is required])
- fi
+dnl # Test that we're trying to configure with apache 2.x
+dnl PHP_AP_EXTRACT_VERSION($APXS_HTTPD)
+dnl if test "$APACHE_VERSION" -le 2000000; then
+dnl AC_MSG_ERROR([You have enabled Apache 2 support while your server is Apache 1.3. Please use the appropiate switch --with-apxs (without the 2)])
+dnl elif test "$APACHE_VERSION" -lt 2000044; then
+dnl AC_MSG_ERROR([Please note that Apache version >= 2.0.44 is required])
+dnl fi
APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`
if test -z `$APXS -q SYSCONFDIR`; then
|
