diff options
| author | sean finney <seanius@debian.org> | 2007-05-20 21:59:56 +0200 |
|---|---|---|
| committer | Mark A. Hershberger <mah@debian.(none)> | 2009-03-25 00:37:41 -0400 |
| commit | 3c22f5871066027953473cd2b8860441a7ddcb95 (patch) | |
| tree | a7d68777543c9607bef83b99029903e6a78ffe94 /debian/patches/057-no_apache_installed.patch | |
| parent | cb6f7355b1d7b3b64376d9af7227e50a05eb0204 (diff) | |
| download | php-debian/5.2.2-2.tar.gz | |
Imported Debian patch 5.2.2-2debian/5.2.2-2
Diffstat (limited to 'debian/patches/057-no_apache_installed.patch')
| -rw-r--r-- | debian/patches/057-no_apache_installed.patch | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/debian/patches/057-no_apache_installed.patch b/debian/patches/057-no_apache_installed.patch index 4327988a8..2e35bcf7f 100644 --- a/debian/patches/057-no_apache_installed.patch +++ b/debian/patches/057-no_apache_installed.patch @@ -1,24 +1,3 @@ -Index: php5-5.2.0/sapi/apache/config.m4 -=================================================================== ---- php5-5.2.0.orig/sapi/apache/config.m4 2007-03-18 22:56:59.000000000 +0100 -+++ php5-5.2.0/sapi/apache/config.m4 2007-03-18 22:58:44.000000000 +0100 -@@ -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 Index: php5-5.2.0/sapi/apache2handler/config.m4 =================================================================== --- php5-5.2.0.orig/sapi/apache2handler/config.m4 2007-03-18 22:56:59.000000000 +0100 |