summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--acinclude.m48
-rw-r--r--configure.in2
-rw-r--r--pear/scripts/phpize.in6
3 files changed, 8 insertions, 8 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index 93a5d94341..811030b558 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -31,9 +31,9 @@ AC_DEFUN([PHP_INIT_BUILD_SYSTEM],[
mkdir include >/dev/null 2>&1
> Makefile.objects
> Makefile.fragments
-dnl We need to play tricks here to avoid matching the egrep line itself
+dnl We need to play tricks here to avoid matching the grep line itself
pattern=define
-egrep $pattern'.*include/php' $srcdir/configure|sed 's/.*>//'|xargs touch 2>/dev/null
+grep -E $pattern'.*include/php' $srcdir/configure|sed 's/.*>//'|xargs touch 2>/dev/null
])
dnl PHP_GEN_GLOBAL_MAKEFILE
@@ -1114,7 +1114,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 | egrep "$opt" > /dev/null 2>&1 ; then
+ if eval $ac_php_compile 2>&1 | grep -E "$opt" > /dev/null 2>&1 ; then
eval php_cc_$var=no
AC_MSG_RESULT([no])
else
@@ -1771,7 +1771,7 @@ $debug ||
_sed=sed
# Check for GNU sed and select it if it is found.
- if "${_sed}" --version 2>&1 < /dev/null | egrep '(GNU)' > /dev/null; then
+ if "${_sed}" --version 2>&1 < /dev/null | grep -E '(GNU)' > /dev/null; then
ac_cv_path_sed=${_sed}
else
cat /dev/null > "$tmp/sed.in"
diff --git a/configure.in b/configure.in
index cc71a074db..fa471f68b3 100644
--- a/configure.in
+++ b/configure.in
@@ -881,7 +881,7 @@ datadir=`eval echo $datadir`
dnl Build extension directory path
-ZEND_MODULE_API_NO=`egrep '#define ZEND_MODULE_API_NO ' $srcdir/Zend/zend_modules.h|sed 's/#define ZEND_MODULE_API_NO //'`
+ZEND_MODULE_API_NO=`grep -E '#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
diff --git a/pear/scripts/phpize.in b/pear/scripts/phpize.in
index d9dcb1cd75..c77694f8c3 100644
--- a/pear/scripts/phpize.in
+++ b/pear/scripts/phpize.in
@@ -30,9 +30,9 @@ autoheader
libtoolize -f -c
# dumping API NOs:
-PHP_API_VERSION=`egrep '#define PHP_API_VERSION' $includedir/main/php.h|sed 's/#define PHP_API_VERSION//'`
-ZEND_MODULE_API_NO=`egrep '#define ZEND_MODULE_API_NO' $includedir/Zend/zend_modules.h|sed 's/#define ZEND_MODULE_API_NO//'`
-ZEND_EXTENSION_API_NO=`egrep '#define ZEND_EXTENSION_API_NO' $includedir/Zend/zend_extensions.h|sed 's/#define ZEND_EXTENSION_API_NO//'`
+PHP_API_VERSION=`grep -E '#define PHP_API_VERSION' $includedir/main/php.h|sed 's/#define PHP_API_VERSION//'`
+ZEND_MODULE_API_NO=`grep -E '#define ZEND_MODULE_API_NO' $includedir/Zend/zend_modules.h|sed 's/#define ZEND_MODULE_API_NO//'`
+ZEND_EXTENSION_API_NO=`grep -E '#define ZEND_EXTENSION_API_NO' $includedir/Zend/zend_extensions.h|sed 's/#define ZEND_EXTENSION_API_NO//'`
echo "Configuring for:"
echo " PHP Api Version: "$PHP_API_VERSION