sniper Mon Dec 19 22:29:12 2005 EDT
Modified files: (Branch: PHP_4_4)
/php-src NEWS acinclude.m4
/php-src/build libtool.m4
Log:
- Fixed bug #35735 ($EGREP and $SED are not defined in configure)
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.1247.2.920.2.101&r2=1.1247.2.920.2.102&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.920.2.101 php-src/NEWS:1.1247.2.920.2.102
--- php-src/NEWS:1.1247.2.920.2.101 Wed Dec 14 03:38:55 2005
+++ php-src/NEWS Mon Dec 19 22:29:11 2005
@@ -3,6 +3,7 @@
?? ??? 2005, Version 4.4.2
- Prevent header injection by limiting each header to a single line. (Ilia)
- Fixed possible XSS inside error reporting functionality. (Ilia)
+- Fixed bug #35735 ($EGREP not defined in configure). (Jani)
- Fixed bug #35655 (whitespace following end of heredoc is lost). (Ilia)
- Fixed bug #35646 (%{mod_php_memory_usage}n is not reset after exit).
(vovik at getart dot ru, Tony)
http://cvs.php.net/viewcvs.cgi/php-src/acinclude.m4?r1=1.218.2.50.2.5&r2=1.218.2.50.2.6&diff_format=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.218.2.50.2.5 php-src/acinclude.m4:1.218.2.50.2.6
--- php-src/acinclude.m4:1.218.2.50.2.5 Fri Sep 23 09:20:22 2005
+++ php-src/acinclude.m4 Mon Dec 19 22:29:11 2005
@@ -1,4 +1,4 @@
-dnl $Id: acinclude.m4,v 1.218.2.50.2.5 2005/09/23 09:20:22 hyanantha Exp $ -*-
autoconf -*-
+dnl $Id: acinclude.m4,v 1.218.2.50.2.6 2005/12/19 22:29:11 sniper Exp $ -*-
autoconf -*-
dnl
dnl This file contains local autoconf functions.
@@ -548,6 +548,10 @@
])
AC_DEFUN([PHP_CONFIG_NICE],[
+ AC_REQUIRE([AC_PROG_EGREP])
+ AC_REQUIRE([LT_AC_PROG_SED])
+ PHP_SUBST(EGREP)
+ PHP_SUBST(SED)
test -f $1 && mv $1 $1.old
rm -f $1.old
cat >$1<<EOF
http://cvs.php.net/viewcvs.cgi/php-src/build/libtool.m4?r1=1.1.4.2&r2=1.1.4.2.2.1&diff_format=u
Index: php-src/build/libtool.m4
diff -u php-src/build/libtool.m4:1.1.4.2 php-src/build/libtool.m4:1.1.4.2.2.1
--- php-src/build/libtool.m4:1.1.4.2 Tue Feb 15 08:52:33 2005
+++ php-src/build/libtool.m4 Mon Dec 19 22:29:12 2005
@@ -3138,6 +3138,21 @@
pic_mode=ifelse($#,1,$1,default)])
+# AC_PROG_EGREP
+# -------------
+# This is predefined starting with Autoconf 2.54, so this conditional
+# definition can be removed once we require Autoconf 2.54 or later.
+ifdef([AC_PROG_EGREP], [], [AC_DEFUN([AC_PROG_EGREP],
+[AC_CACHE_CHECK([for egrep], [ac_cv_prog_egrep],
+ [if echo a | (grep -E '(a|b)') >/dev/null 2>&1
+ then ac_cv_prog_egrep='grep -E'
+ else ac_cv_prog_egrep='egrep'
+ fi])
+ EGREP=$ac_cv_prog_egrep
+ AC_SUBST([EGREP])
+])])
+
+
# AC_PATH_TOOL_PREFIX - find a file program which can recognise shared library
AC_DEFUN([AC_PATH_TOOL_PREFIX],
[AC_MSG_CHECKING([for $1])
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
