- merged apache packages split from DEVEL (1.421.2.3.2.35)

Changed files:
    php-stupidapache_version.patch -> 1.3

diff --git a/php-stupidapache_version.patch b/php-stupidapache_version.patch
index 0f75407ea7148cf7e8f61550855a2fb7fe065236..e76de125b31b84e1d2cc40eb08b39cdc7b7c99e2 100644 (file)
--- a/php-stupidapache_version.patch
+++ b/php-stupidapache_version.patch
@@ -1,12 +1,12 @@
---- acinclude.m4~      2005-03-17 10:10:04.000000000 +0200
-+++ acinclude.m4       2005-03-17 09:57:25.000000000 +0200
-@@ -1851,8 +1851,14 @@
+--- ./acinclude.m4~    2005-06-16 21:20:24.000000000 +0300
++++ ./acinclude.m4     2005-06-16 21:20:34.000000000 +0300
+@@ -1949,8 +1949,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
++if test "$with_apache_version" != "no"; then
 +  ac_output="foo bar baz $with_apache_version"
 +else
    ac_output=`$1 -v 2>&1`
@@ -15,15 +15,3 @@
    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.