Author: arekm Date: Tue Aug 18 10:29:34 2009 GMT Module: packages Tag: HEAD ---- Log message: - rel 17; fix build with autoconf 2.64
---- Files affected: packages/php4: php4-m4-divert.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/php4/php4-m4-divert.patch diff -u /dev/null packages/php4/php4-m4-divert.patch:1.1 --- /dev/null Tue Aug 18 12:29:34 2009 +++ packages/php4/php4-m4-divert.patch Tue Aug 18 12:29:29 2009 @@ -0,0 +1,68 @@ +diff -ur php-4.4.9.org/configure.in php-4.4.9/configure.in +--- php-4.4.9.org/configure.in 2008-08-06 10:32:30.000000000 +0200 ++++ php-4.4.9/configure.in 2009-08-18 12:24:17.574051486 +0200 +@@ -1,7 +1,7 @@ + dnl ## $Id$ -*- sh -*- + dnl ## Process this file with autoconf to produce a configure script. + +-divert(1) ++divert(1001) + + dnl ## Diversion 1 is the autoconf + automake setup phase. We also + dnl ## set the PHP version, deal with platform-specific compile +@@ -247,7 +247,7 @@ + + + +-divert(2) ++divert(1002) + + dnl ## Diversion 2 is where we set PHP-specific options and come up + dnl ## with reasonable default values for them. We check for pthreads here +@@ -293,7 +293,7 @@ + sinclude(sapi/cgi/libfcgi/libfcgi.m4) + fi + +-divert(3) ++divert(1003) + + dnl ## In diversion 3 we check for compile-time options to the PHP + dnl ## core and how to deal with different system dependencies. This +@@ -644,7 +644,7 @@ + + + +-divert(4) ++divert(1004) + + dnl ## In diversion 4 we check user-configurable general settings. + +@@ -811,7 +811,7 @@ + ]) + AC_MSG_RESULT([$PHP_VERSIONING]) + +-divert(5) ++divert(1005) + + dnl ## In diversion 5 we check which extensions should be compiled. + dnl ## All of these are normally in the extension directories. +diff -ur php-4.4.9.org/ext/standard/config.m4 php-4.4.9/ext/standard/config.m4 +--- php-4.4.9.org/ext/standard/config.m4 2007-01-22 20:59:21.000000000 +0100 ++++ php-4.4.9/ext/standard/config.m4 2009-08-18 12:24:17.576968996 +0200 +@@ -1,6 +1,6 @@ + dnl $Id$ -*- sh -*- + +-divert(3)dnl ++divert(1003)dnl + + dnl + dnl Check if flush should be called explicitly after buffered io +@@ -213,7 +213,7 @@ + AC_CRYPT_CAP + AC_FLUSH_IO + +-divert(5)dnl ++divert(1005)dnl + + AC_ARG_WITH(regex, + [ --with-regex=TYPE regex library type: system, apache, php. Default: php ================================================================ _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
