diff options
author | Owen Taylor <otaylor@redhat.com> | 2002-07-26 22:10:44 +0000 |
---|---|---|
committer | Owen Taylor <otaylor@src.gnome.org> | 2002-07-26 22:10:44 +0000 |
commit | a284e446950f1a8454e52fd955bf6f7ade93b897 (patch) | |
tree | 391fd2fc63e1940681d6d81e3127a1899bb5e030 | |
parent | b97d11548bf7eb4ddba69e54a5a2784306d4324f (diff) | |
download | pango-a284e446950f1a8454e52fd955bf6f7ade93b897.tar.gz |
Replace uses of grep \(A\|B\) ... with egrep (A|B). (#84872, Arnaud
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)
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ChangeLog.pre-1-10 | 5 | ||||
-rw-r--r-- | ChangeLog.pre-1-2 | 5 | ||||
-rw-r--r-- | ChangeLog.pre-1-4 | 5 | ||||
-rw-r--r-- | ChangeLog.pre-1-6 | 5 | ||||
-rw-r--r-- | ChangeLog.pre-1-8 | 5 | ||||
-rw-r--r-- | configure.in | 56 |
7 files changed, 58 insertions, 28 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) + Thu Jul 25 11:42:17 2002 Owen Taylor <otaylor@redhat.com> * pango/pangoft2-fontmap.c (pango_ft2_shutdown_display) diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index c5211ebf..a78e900b 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-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) + Thu Jul 25 11:42:17 2002 Owen Taylor <otaylor@redhat.com> * pango/pangoft2-fontmap.c (pango_ft2_shutdown_display) diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2 index c5211ebf..a78e900b 100644 --- a/ChangeLog.pre-1-2 +++ b/ChangeLog.pre-1-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) + Thu Jul 25 11:42:17 2002 Owen Taylor <otaylor@redhat.com> * pango/pangoft2-fontmap.c (pango_ft2_shutdown_display) diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index c5211ebf..a78e900b 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-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) + Thu Jul 25 11:42:17 2002 Owen Taylor <otaylor@redhat.com> * pango/pangoft2-fontmap.c (pango_ft2_shutdown_display) diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index c5211ebf..a78e900b 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-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) + Thu Jul 25 11:42:17 2002 Owen Taylor <otaylor@redhat.com> * pango/pangoft2-fontmap.c (pango_ft2_shutdown_display) diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index c5211ebf..a78e900b 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-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) + Thu Jul 25 11:42:17 2002 Owen Taylor <otaylor@redhat.com> * pango/pangoft2-fontmap.c (pango_ft2_shutdown_display) diff --git a/configure.in b/configure.in index abb5a991..7218ed36 100644 --- a/configure.in +++ b/configure.in @@ -370,19 +370,19 @@ INCLUDED_FT2_MODULES= INCLUDED_WIN32_MODULES= IFS="${IFS= }"; pango_save_ifs="$IFS"; IFS="," for module in $included_modules; do - if echo $indic_modules | grep "\(^\| \)$module\(\$\| \)" > /dev/null; then + if echo $indic_modules | egrep "(^| )$module(\$| )" > /dev/null; then dir=indic else dir=`echo $module | sed "s/-.*//"` fi - if echo $module | grep -- "-xft\($\|,\)" > /dev/null; then + if echo $module | egrep -- "-xft($|,)" > /dev/null; then INCLUDED_XFT_MODULES="$INCLUDED_XFT_MODULES \$(top_builddir)/modules/$dir/libpango-$module.la" - elif echo $module | grep -- "-ft2\($\|,\)" > /dev/null; then + elif echo $module | egrep -- "-ft2($|,)" > /dev/null; then INCLUDED_FT2_MODULES="$INCLUDED_FT2_MODULES \$(top_builddir)/modules/$dir/libpango-$module.la" - elif echo $module | grep -- "-x\($\|,\)" > /dev/null; then + elif echo $module | egrep -- "-x($|,)" > /dev/null; then INCLUDED_X_MODULES="$INCLUDED_X_MODULES \$(top_builddir)/modules/$dir/libpango-$module.la" - elif echo $module | grep -- "-win32\($\|,\)" > /dev/null; then + elif echo $module | egrep -- "-win32($|,)" > /dev/null; then INCLUDED_WIN32_MODULES="$INCLUDED_WIN32_MODULES \$(top_builddir)/modules/$dir/libpango-$module.la" else AC_MSG_ERROR([the specified module $module does not exist]) @@ -395,31 +395,31 @@ AC_SUBST(INCLUDED_XFT_MODULES) AC_SUBST(INCLUDED_FT2_MODULES) AC_SUBST(INCLUDED_WIN32_MODULES) -AM_CONDITIONAL(INCLUDE_ARABIC_FT2,echo $included_modules | grep '\(^\|,\)arabic-ft2\($\|,\)' > /dev/null) -AM_CONDITIONAL(INCLUDE_ARABIC_X,echo $included_modules | grep '\(^\|,\)arabic-x\($\|,\)' > /dev/null) -AM_CONDITIONAL(INCLUDE_ARABIC_XFT,echo $included_modules | grep '\(^\|,\)arabic-xft\($\|,\)' > /dev/null) +AM_CONDITIONAL(INCLUDE_ARABIC_FT2,echo $included_modules | egrep '(^|,)arabic-ft2($|,)' > /dev/null) +AM_CONDITIONAL(INCLUDE_ARABIC_X,echo $included_modules | egrep '(^|,)arabic-x($|,)' > /dev/null) +AM_CONDITIONAL(INCLUDE_ARABIC_XFT,echo $included_modules | egrep '(^|,)arabic-xft($|,)' > /dev/null) -AM_CONDITIONAL(INCLUDE_BASIC_FT2,echo $included_modules | grep '\(^\|,\)basic-ft2\($\|,\)' > /dev/null) -AM_CONDITIONAL(INCLUDE_BASIC_WIN32,echo $included_modules | grep '\(^\|,\)basic-win32\($\|,\)' > /dev/null) -AM_CONDITIONAL(INCLUDE_BASIC_XFT,echo $included_modules | grep '\(^\|,\)basic-xft\($\|,\)' > /dev/null) -AM_CONDITIONAL(INCLUDE_BASIC_X,echo $included_modules | grep '\(^\|,\)basic-x\($\|,\)' > /dev/null) +AM_CONDITIONAL(INCLUDE_BASIC_FT2,echo $included_modules | egrep '(^|,)basic-ft2($|,)' > /dev/null) +AM_CONDITIONAL(INCLUDE_BASIC_WIN32,echo $included_modules | egrep '(^|,)basic-win32($|,)' > /dev/null) +AM_CONDITIONAL(INCLUDE_BASIC_XFT,echo $included_modules | egrep '(^|,)basic-xft($|,)' > /dev/null) +AM_CONDITIONAL(INCLUDE_BASIC_X,echo $included_modules | egrep '(^|,)basic-x($|,)' > /dev/null) -AM_CONDITIONAL(INCLUDE_HANGUL_X,echo $included_modules | grep '\(^\|,\)hangul-x\($\|,\)' > /dev/null) +AM_CONDITIONAL(INCLUDE_HANGUL_X,echo $included_modules | egrep '(^|,)hangul-x($|,)' > /dev/null) -AM_CONDITIONAL(INCLUDE_HEBREW_FT2,echo $included_modules | grep '\(^\|,\)hebrew-ft2\($\|,\)' > /dev/null) -AM_CONDITIONAL(INCLUDE_HEBREW_X,echo $included_modules | grep '\(^\|,\)hebrew-x\($\|,\)' > /dev/null) -AM_CONDITIONAL(INCLUDE_HEBREW_XFT,echo $included_modules | grep '\(^\|,\)hebrew-xft\($\|,\)' > /dev/null) +AM_CONDITIONAL(INCLUDE_HEBREW_FT2,echo $included_modules | egrep '(^|,)hebrew-ft2($|,)' > /dev/null) +AM_CONDITIONAL(INCLUDE_HEBREW_X,echo $included_modules | egrep '(^|,)hebrew-x($|,)' > /dev/null) +AM_CONDITIONAL(INCLUDE_HEBREW_XFT,echo $included_modules | egrep '(^|,)hebrew-xft($|,)' > /dev/null) -AM_CONDITIONAL(INCLUDE_BENGALI_X,echo $included_modules | grep '\(^\|,\)bengali-x\($\|,\)' > /dev/null) -AM_CONDITIONAL(INCLUDE_DEVANAGARI_X,echo $included_modules | grep '\(^\|,\)devanagari-x\($\|,\)' > /dev/null) -AM_CONDITIONAL(INCLUDE_GUJARATI_X,echo $included_modules | grep '\(^\|,\)gujarati-x\($\|,\)' > /dev/null) -AM_CONDITIONAL(INCLUDE_GURMUKHI_X,echo $included_modules | grep '\(^\|,\)gurmukhi-x\($\|,\)' > /dev/null) -AM_CONDITIONAL(INCLUDE_MYANMAR_X,echo $included_modules | grep '\(^\|,\)myanmar-x\($\|,\)' > /dev/null) +AM_CONDITIONAL(INCLUDE_BENGALI_X,echo $included_modules | egrep '(^|,)bengali-x($|,)' > /dev/null) +AM_CONDITIONAL(INCLUDE_DEVANAGARI_X,echo $included_modules | egrep '(^|,)devanagari-x($|,)' > /dev/null) +AM_CONDITIONAL(INCLUDE_GUJARATI_X,echo $included_modules | egrep '(^|,)gujarati-x($|,)' > /dev/null) +AM_CONDITIONAL(INCLUDE_GURMUKHI_X,echo $included_modules | egrep '(^|,)gurmukhi-x($|,)' > /dev/null) +AM_CONDITIONAL(INCLUDE_MYANMAR_X,echo $included_modules | egrep '(^|,)myanmar-x($|,)' > /dev/null) -AM_CONDITIONAL(INCLUDE_TAMIL_X,echo $included_modules | grep '\(^\|,\)tamil-x\($\|,\)' > /dev/null) -AM_CONDITIONAL(INCLUDE_TAMIL_XFT,echo $included_modules | grep '\(^\|,\)tamil-xft\($\|,\)' > /dev/null) +AM_CONDITIONAL(INCLUDE_TAMIL_X,echo $included_modules | egrep '(^|,)tamil-x($|,)' > /dev/null) +AM_CONDITIONAL(INCLUDE_TAMIL_XFT,echo $included_modules | egrep '(^|,)tamil-xft($|,)' > /dev/null) -AM_CONDITIONAL(INCLUDE_THAI_X,echo $included_modules | grep '\(^\|,\)thai-x\($\|,\)' > /dev/null) +AM_CONDITIONAL(INCLUDE_THAI_X,echo $included_modules | egrep '(^|,)thai-x($|,)' > /dev/null) # @@ -635,7 +635,7 @@ EOTEXT IFS="${IFS= }"; pango_save_ifs="$IFS"; IFS="," for module in $included_modules; do - if echo $module | grep -- "-x\($\|,\)" > /dev/null; then + if echo $module | egrep -- "-x($|,)" > /dev/null; then module_c=`echo $module | sed s/-/_/` cat >> pango/module-defs-x.c <<EOTEXT { _pango_${module_c}_script_engine_list, _pango_${module_c}_script_engine_load,_pango_${module_c}_script_engine_unload }, @@ -662,7 +662,7 @@ EOTEXT IFS="${IFS= }"; pango_save_ifs="$IFS"; IFS="," for module in $included_modules; do - if echo $module | grep -- "-xft\($\|,\)" > /dev/null; then + if echo $module | egrep -- "-xft($|,)" > /dev/null; then module_c=`echo $module | sed s/-/_/` cat >> pango/module-defs-xft.c <<EOTEXT { _pango_${module_c}_script_engine_list, _pango_${module_c}_script_engine_load,_pango_${module_c}_script_engine_unload }, @@ -689,7 +689,7 @@ EOTEXT IFS="${IFS= }"; pango_save_ifs="$IFS"; IFS="," for module in $included_modules; do - if echo $module | grep -- "-ft2\($\|,\)" > /dev/null; then + if echo $module | egrep -- "-ft2($|,)" > /dev/null; then module_c=`echo $module | sed s/-/_/` cat >> pango/module-defs-ft2.c <<EOTEXT { _pango_${module_c}_script_engine_list, _pango_${module_c}_script_engine_load,_pango_${module_c}_script_engine_unload }, @@ -715,7 +715,7 @@ EOTEXT IFS="${IFS= }"; pango_save_ifs="$IFS"; IFS="," for module in $included_modules; do - if echo $module | grep -- "-win32\($\|,\)" > /dev/null; then + if echo $module | egrep -- "-win32($|,)" > /dev/null; then module_c=`echo $module | sed s/-/_/` cat >> pango/module-defs-win32.c <<EOTEXT { _pango_${module_c}_script_engine_list, _pango_${module_c}_script_engine_load,_pango_${module_c}_script_engine_unload }, |