- PHP_5_4 branch from PLD

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

diff --git a/php-stupidapache_version.patch b/php-stupidapache_version.patch
new file mode 100644 (file)
index 0000000..100ec4f
--- /dev/null
+++ b/php-stupidapache_version.patch
@@ -0,0 +1,18 @@
+--- php-5.4.0alpha2/acinclude.m4       2011-08-07 21:13:21.581133944 +0300
++++ php-5.4.0alpha2/acinclude.m4       2011-08-07 21:10:21.766717150 +0300
+@@ -2607,7 +2609,14 @@
+ 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-//'`
++  PHP_ARG_WITH(apache-version, Set Apache version,
++  [  --with-apache-version=VERSION      Set Apache version instead of detecting from httpd binary])
++
++  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="- /.
+ "