rel 3

[packages/php.git] / php-stupidapache_version.patch

diff --git a/php-stupidapache_version.patch b/php-stupidapache_version.patch
index 81475155886acf4271ccefec7bb54a9e44e132ac..f2478a4400a1fe5250a7ae43da5f51f3b3439f23 100644 (file)
--- a/php-stupidapache_version.patch
+++ b/php-stupidapache_version.patch
@@ -1,11 +1,15 @@
---- acinclude.m4~      2004-10-09 01:57:35.942764320 +0000
-+++ acinclude.m4       2004-10-09 02:16:31.363154184 +0000
-@@ -1850,6 +1850,7 @@
-   set $ac_output
-   IFS=$ac_IFS
- 
--  APACHE_VERSION=`expr [$]4 \* 1000000 + [$]5 \* 1000 + [$]6`
-+  # APACHE_VERSION=`expr [$]4 \* 1000000 + [$]5 \* 1000 + [$]6`
-+  APACHE_VERSION=2000052
- ])
- 
+--- php-5.3.1/acinclude.m4~    2009-11-26 00:49:53.000000000 +0200
++++ php-5.3.1/acinclude.m4     2009-11-26 00:51:11.466867803 +0200
+@@ -2582,7 +2582,11 @@
+ dnl version for apache1/2.
+ dnl
+ AC_DEFUN([PHP_AP_EXTRACT_VERSION],[
+-  ac_output=`$1 -v 2>&1 | grep version | $SED -e 's/Oracle-HTTP-//'`
++  if test "$with_apache_version" != "no"; then
++    ac_output="foo bar baz $with_apache_version"
++  else
++    ac_output=`$1 -v 2>&1 | grep version | $SED -e 's/Oracle-HTTP-//'`
++  fi
+   ac_IFS=$IFS
+ IFS="- /.
+ "