From: foobar Date: Tue, 1 Jul 2003 00:16:23 +0000 (+0000) Subject: - Changed 'grep -E' back to 'egrep'. X-Git-Tag: BEFORE_ARG_INFO~505 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d215b040b7001469422767762e0155f7c7f14e75;p=php - 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.. # --- diff --git a/acinclude.m4 b/acinclude.m4 index 0949e4b437..d73db55337 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -33,7 +33,7 @@ test -d include || mkdir include > 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 @@ AC_DEFUN([PHP_CHECK_CC_OPTION],[ 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 diff --git a/configure.in b/configure.in index ae2c4d4bb0..c6ff569b35 100644 --- a/configure.in +++ b/configure.in @@ -921,7 +921,7 @@ datadir=`eval echo $datadir` 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