cvs: php-src / acinclude.m4 configure.in

sniper Mon Jun 30 20:16:23 2003 EDT Modified files: /php-src acinclude.m4 configure.in Log: - Changed 'grep -E' back to 'egrep'. # # whatever some posix standard says, there's no use to change this in # two places and possibly break stuff, like said in bug #22604. # # Grep for 'egrep' in autoconf 2.13 generated configure to find # several hundred 'egrep's.. # Index: php-src/acinclude.m4 diff -u php-src/acinclude.m4:1.251 php-src/acinclude.m4:1.252 --- php-src/acinclude.m4:1.251 Sat Jun 28 08:29:43 2003 +++ php-src/acinclude.m4 Mon Jun 30 20:16:23 2003 @@ -1,4 +1,4 @@ -dnl $Id: acinclude.m4,v 1.251 2003/06/28 12:29:43 sas Exp $ +dnl $Id: acinclude.m4,v 1.252 2003/07/01 00:16:23 sniper Exp $ dnl dnl This file contains local autoconf functions. @@ -33,7 +33,7 @@ > Makefile.fragments dnl We need to play tricks here to avoid matching the grep line itself pattern=define -grep -E $pattern'.*include/php' $srcdir/configure|sed 's/.*>//'|xargs touch 2>/dev/null +egrep $pattern'.*include/php' $srcdir/configure|sed 's/.*>//'|xargs touch 2>/dev/null ]) dnl PHP_GEN_GLOBAL_MAKEFILE @@ -1045,7 +1045,7 @@ changequote([,]) AC_MSG_CHECKING([if compiler supports -$1 really]) ac_php_compile="${CC-cc} -$opt -o conftest $CFLAGS $CPPFLAGS conftest.$ac_ext 2>&1" - if eval $ac_php_compile 2>&1 | grep -E "$opt" > /dev/null 2>&1 ; then + if eval $ac_php_compile 2>&1 | egrep "$opt" > /dev/null 2>&1 ; then eval php_cc_$var=no AC_MSG_RESULT([no]) else Index: php-src/configure.in diff -u php-src/configure.in:1.455 php-src/configure.in:1.456 --- php-src/configure.in:1.455 Mon Jun 30 16:04:39 2003 +++ php-src/configure.in Mon Jun 30 20:16:23 2003 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.455 2003/06/30 20:04:39 gschlossnagle Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.456 2003/07/01 00:16:23 sniper Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -921,7 +921,7 @@ dnl Build extension directory path -ZEND_MODULE_API_NO=grep -E '#define ZEND_MODULE_API_NO ' $srcdir/Zend/zend_modules.h|sed 's/#define ZEND_MODULE_API_NO //' +ZEND_MODULE_API_NO=egrep '#define ZEND_MODULE_API_NO ' $srcdir/Zend/zend_modules.h|sed 's/#define ZEND_MODULE_API_NO //' if test -z "$EXTENSION_DIR"; then extbasedir=$ZEND_MODULE_API_NO