diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-2-2 | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-2-4 | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-2-6 | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 5 | ||||
| -rw-r--r-- | configure.in | 8 |
7 files changed, 34 insertions, 4 deletions
@@ -1,3 +1,8 @@ +Fri Jul 26 17:59:06 2002 Owen Taylor <otaylor@redhat.com> + + * configure.in: Replace uses of grep \(A\|B\) ... with + egrep (A|B). (#84872, Arnaud Charlet) + Fri Jul 26 22:53:37 2002 Kristian Rietveld <kris@gtk.org> API additions: _move, _reorder and _swap for stores, path diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 5451e85e0d..eaefc54287 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Fri Jul 26 17:59:06 2002 Owen Taylor <otaylor@redhat.com> + + * configure.in: Replace uses of grep \(A\|B\) ... with + egrep (A|B). (#84872, Arnaud Charlet) + Fri Jul 26 22:53:37 2002 Kristian Rietveld <kris@gtk.org> API additions: _move, _reorder and _swap for stores, path diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 5451e85e0d..eaefc54287 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +Fri Jul 26 17:59:06 2002 Owen Taylor <otaylor@redhat.com> + + * configure.in: Replace uses of grep \(A\|B\) ... with + egrep (A|B). (#84872, Arnaud Charlet) + Fri Jul 26 22:53:37 2002 Kristian Rietveld <kris@gtk.org> API additions: _move, _reorder and _swap for stores, path diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 5451e85e0d..eaefc54287 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Fri Jul 26 17:59:06 2002 Owen Taylor <otaylor@redhat.com> + + * configure.in: Replace uses of grep \(A\|B\) ... with + egrep (A|B). (#84872, Arnaud Charlet) + Fri Jul 26 22:53:37 2002 Kristian Rietveld <kris@gtk.org> API additions: _move, _reorder and _swap for stores, path diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 5451e85e0d..eaefc54287 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Fri Jul 26 17:59:06 2002 Owen Taylor <otaylor@redhat.com> + + * configure.in: Replace uses of grep \(A\|B\) ... with + egrep (A|B). (#84872, Arnaud Charlet) + Fri Jul 26 22:53:37 2002 Kristian Rietveld <kris@gtk.org> API additions: _move, _reorder and _swap for stores, path diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 5451e85e0d..eaefc54287 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Fri Jul 26 17:59:06 2002 Owen Taylor <otaylor@redhat.com> + + * configure.in: Replace uses of grep \(A\|B\) ... with + egrep (A|B). (#84872, Arnaud Charlet) + Fri Jul 26 22:53:37 2002 Kristian Rietveld <kris@gtk.org> API additions: _move, _reorder and _swap for stores, path diff --git a/configure.in b/configure.in index eb9c034021..29d9fa1d51 100644 --- a/configure.in +++ b/configure.in @@ -789,7 +789,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]) @@ -812,13 +812,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 |