- add --apache-version=MAJOR.MINOR.REVISION option instead of hardcoding

Changed files:
    php4-stupidapache_version.patch -> 1.2

diff --git a/php4-stupidapache_version.patch b/php4-stupidapache_version.patch
index 81475155886acf4271ccefec7bb54a9e44e132ac..0f75407ea7148cf7e8f61550855a2fb7fe065236 100644 (file)
--- a/php4-stupidapache_version.patch
+++ b/php4-stupidapache_version.patch
@@ -1,11 +1,29 @@
---- 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
+--- acinclude.m4~      2005-03-17 10:10:04.000000000 +0200
++++ acinclude.m4       2005-03-17 09:57:25.000000000 +0200
+@@ -1851,8 +1851,14 @@
+ dnl This macro is used to get a comparable
+ dnl version for apache1/2.
+ dnl
++
+ AC_DEFUN([PHP_AP_EXTRACT_VERSION],[
++if test -n "$with_apache_version"; then
++  ac_output="foo bar baz $with_apache_version"
++else
+   ac_output=`$1 -v 2>&1`
++fi
++
+   ac_IFS=$IFS
+ IFS="- /.
+ "
+--- configure.in~      2005-03-16 22:02:44.000000000 +0200
++++ configure.in       2005-03-17 01:03:14.000000000 +0200
+@@ -766,6 +766,9 @@
  ])
+ AC_MSG_RESULT([$PHP_VERSIONING])
+ 
++PHP_ARG_WITH(apache-version,[apache version],
++[  --apache-version=MAJOR.MINOR.REVISION      Sets apache version to avoid calling apache/httpd binary], no, no)
++
+ divert(5)
  
+ dnl ## In diversion 5 we check which extensions should be compiled.