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

--- php-5.4.0alpha2/build/php.m4	2011-08-07 21:13:21.581133944 +0300
+++ php-5.4.0alpha2/build/php.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="- /.
 "
Commit	Line	Data
f7323448 ER	1	--- php-5.4.0alpha2/build/php.m4 2011-08-07 21:13:21.581133944 +0300
f7323448 ER	2	+++ php-5.4.0alpha2/build/php.m4 2011-08-07 21:10:21.766717150 +0300
02d2dcbb	3	@@ -2607,7 +2609,14 @@
c0240cb1	4	dnl version for apache1/2.
	5	dnl
	6	AC_DEFUN([PHP_AP_EXTRACT_VERSION],[
02d2dcbb ER	7	- ac_output=`$1 -v 2>&1 \| grep version \| $SED -e 's/Oracle-HTTP-//'`
	8	+ PHP_ARG_WITH(apache-version, Set Apache version,
	9	+ [ --with-apache-version=VERSION Set Apache version instead of detecting from httpd binary])
	10	+
c0240cb1	11	+ if test "$with_apache_version" != "no"; then
	12	+ ac_output="foo bar baz $with_apache_version"
	13	+ else
02d2dcbb	14	+ ac_output=`$1 -v 2>&1 \| grep version \| $SED -e 's/Oracle-HTTP-//'`
c0240cb1	15	+ fi
	16	ac_IFS=$IFS
	17	IFS="- /.
	18	"