From 071ba60b6e92736e1f41512b379b70b6f28f1007 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Fri, 26 Jul 2002 22:19:17 +0000 Subject: [PATCH] Replace uses of grep \(A\|B\) ... with egrep (A|B). (#84872, Arnaud Fri Jul 26 17:59:06 2002 Owen Taylor * configure.in: Replace uses of grep \(A\|B\) ... with egrep (A|B). (#84872, Arnaud Charlet) --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-2 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ configure.in | 8 ++++---- 7 files changed, 34 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index de4d835897..f8e32d21e3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Jul 26 17:59:06 2002 Owen Taylor + + * configure.in: Replace uses of grep \(A\|B\) ... with + egrep (A|B). (#84872, Arnaud Charlet) + Fri Jul 26 21:39:21 2002 Kristian Rietveld * gtk/gtktreestore.c (node_free): return FALSE, diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index de4d835897..f8e32d21e3 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Fri Jul 26 17:59:06 2002 Owen Taylor + + * configure.in: Replace uses of grep \(A\|B\) ... with + egrep (A|B). (#84872, Arnaud Charlet) + Fri Jul 26 21:39:21 2002 Kristian Rietveld * gtk/gtktreestore.c (node_free): return FALSE, diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index de4d835897..f8e32d21e3 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +Fri Jul 26 17:59:06 2002 Owen Taylor + + * configure.in: Replace uses of grep \(A\|B\) ... with + egrep (A|B). (#84872, Arnaud Charlet) + Fri Jul 26 21:39:21 2002 Kristian Rietveld * gtk/gtktreestore.c (node_free): return FALSE, diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index de4d835897..f8e32d21e3 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Fri Jul 26 17:59:06 2002 Owen Taylor + + * configure.in: Replace uses of grep \(A\|B\) ... with + egrep (A|B). (#84872, Arnaud Charlet) + Fri Jul 26 21:39:21 2002 Kristian Rietveld * gtk/gtktreestore.c (node_free): return FALSE, diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index de4d835897..f8e32d21e3 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Fri Jul 26 17:59:06 2002 Owen Taylor + + * configure.in: Replace uses of grep \(A\|B\) ... with + egrep (A|B). (#84872, Arnaud Charlet) + Fri Jul 26 21:39:21 2002 Kristian Rietveld * gtk/gtktreestore.c (node_free): return FALSE, diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index de4d835897..f8e32d21e3 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Fri Jul 26 17:59:06 2002 Owen Taylor + + * configure.in: Replace uses of grep \(A\|B\) ... with + egrep (A|B). (#84872, Arnaud Charlet) + Fri Jul 26 21:39:21 2002 Kristian Rietveld * gtk/gtktreestore.c (node_free): return FALSE, diff --git a/configure.in b/configure.in index a6eb7dbd60..9701cb1192 100644 --- a/configure.in +++ b/configure.in @@ -783,7 +783,7 @@ INCLUDED_LOADER_DEFINE= IFS="${IFS= }"; gtk_save_ifs="$IFS"; IFS="," for loader in $included_loaders; do - if echo "$all_loaders" | grep "\(^\|\,\)$loader\(\$\|\,\)" > /dev/null; then + if echo "$all_loaders" | egrep "(^|,)$loader(\$|,)" > /dev/null; then : else AC_MSG_ERROR([the specified loader $loader does not exist]) @@ -806,13 +806,13 @@ AM_CONDITIONAL(HAVE_JPEG, test "x$LIBJPEG" != x) if $dynworks ; then STATIC_LIB_DEPS= - if echo "$included_loaders" | grep "\(^\|\,\)tiff\(\$\|\,\)" > /dev/null; then + if echo "$included_loaders" | egrep '(^|,)tiff($|,)' > /dev/null; then STATIC_LIB_DEPS="$STATIC_LIB_DEPS $LIBTIFF" fi - if echo "$included_loaders" | grep "\(^\|\,\)jpeg\(\$\|\,\)" > /dev/null; then + if echo "$included_loaders" | egrep '(^|,)jpeg($|,)' > /dev/null; then STATIC_LIB_DEPS="$STATIC_LIB_DEPS $LIBJPEG" fi - if echo "$included_loaders" | grep "\(^\|\,\)png\(\$\|\,\)" > /dev/null; then + if echo "$included_loaders" | egrep '(^|,)png($|,)' > /dev/null; then STATIC_LIB_DEPS="$STATIC_LIB_DEPS $LIBPNG" fi else