- added ac2.53b/am1.6b compatibility patch

Changed files:
    php-acam.patch -> 1.1
    php.spec -> 1.198

diff --git a/php-acam.patch b/php-acam.patch
new file mode 100644 (file)
index 0000000..5369ac7
--- /dev/null
+++ b/php-acam.patch
@@ -0,0 +1,10 @@
+--- php-4.2.2/ext/mysql/config.m4.orig Fri Aug  9 23:49:00 2002
++++ php-4.2.2/ext/mysql/config.m4      Sat Aug 10 00:05:40 2002
+@@ -49,6 +49,7 @@
+ [  --with-mysql[=DIR]      Include MySQL support. DIR is the MySQL base directory.
+                           If unspecified, the bundled MySQL library will be used.], yes)
+ 
++PHP_REQUIRE_CXX
+ if test "$PHP_MYSQL" != "no"; then
+   AC_DEFINE(HAVE_MYSQL, 1, [Whether you have MySQL])
+   if test "$PHP_SAFE_MODE" = "yes"; then

diff --git a/php.spec b/php.spec
index fbf54f95c17e81166df34e52a9be735610c5a6be..cc5e4ca1f794fd8cb46ae5e64a53ca2c50c74c43 100644 (file)
--- a/php.spec
+++ b/php.spec
@@ -76,6 +76,7 @@ Patch20:      %{name}-php_iconv_string_declaration.patch
 Patch21:       %{name}-pear-cosmetic.patch
 Patch22:       %{name}-mnogosearch.patch
 Patch23:       %{name}-ini.patch
+Patch24:       %{name}-acam.patch
 Icon:          php4.gif
 URL:           http://www.php.net/
 BuildRequires: apache-devel
@@ -1257,6 +1258,9 @@ Repozytorium Aplikacji. Ten pakiet zawiera aplikacje potrzebne do
 %patch22 -p1
 cp php.ini-dist php.ini
 %patch23 -p1
+# for ac2.53b/am1.6b - AC_LANG_CXX has AM_CONDITIONAL, so cannot be invoked
+# conditionally...
+%patch24 -p1
 
 install -d manual
 bzip2 -dc %{SOURCE3} | tar -xf - -C manual