don't use syntax that non-GNU greps don't understand. Fixes bug #313531.

2005-08-17  James Henstridge  <james@jamesh.id.au>

	* macros2/gnome-autogen.sh: don't use syntax that non-GNU greps
	don't understand.  Fixes bug #313531.

svn path=/trunk/; revision=3602

diff --git a/ChangeLog b/ChangeLog
index b1acc29..1247848 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-08-17  James Henstridge  <james@jamesh.id.au>
+
+       * macros2/gnome-autogen.sh: don't use syntax that non-GNU greps
+       don't understand.  Fixes bug #313531.
+
 2005-08-16  James Henstridge  <james@jamesh.id.au>
 
        * macros2/gnome-autogen.sh: add checks for gnome-common macro

diff --git a/macros2/gnome-autogen.sh b/macros2/gnome-autogen.sh
index 12b9c6e..f5be87c 100644 (file)
--- a/macros2/gnome-autogen.sh
+++ b/macros2/gnome-autogen.sh
@@ -215,7 +215,7 @@ want_gnome_doc_utils=false
 
 configure_files="`find $srcdir -name '{arch}' -prune -o -name configure.ac -print -o -name configure.in -print`"
 for configure_ac in $configure_files; do
-    if grep "^A[CM]_PROG_LIBTOOL" $configure_ac >/dev/null || \
+    if grep "^A[CM]_PROG_LIBTOOL" $configure_ac >/dev/null ||
        grep "^LT_INIT" $configure_ac >/dev/null; then
        want_libtool=true
     fi
@@ -225,7 +225,8 @@ for configure_ac in $configure_files; do
     if grep "^AM_GLIB_GNU_GETTEXT" $configure_ac >/dev/null; then
        want_glib_gettext=true
     fi
-    if grep "^\(AC\|IT\)_PROG_INTLTOOL" $configure_ac >/dev/null; then
+    if grep "^AC_PROG_INTLTOOL" $configure_ac >/dev/null ||
+       grep "^IT_PROG_INTLTOOL" $configure_ac >/dev/null; then
        want_intltool=true
     fi
     if grep "^PKG_CHECK_MODULES" $configure_ac >/dev/null; then
@@ -347,7 +348,7 @@ for configure_ac in $configure_files; do
         # details.
 
         # programs that might install new macros get run before aclocal
-       if grep "^A[CM]_PROG_LIBTOOL" $basename >/dev/null || \
+       if grep "^A[CM]_PROG_LIBTOOL" $basename >/dev/null ||
           grep "^LT_INIT" $basename >/dev/null; then
            printbold "Running $LIBTOOLIZE..."
            $LIBTOOLIZE --force --copy || exit 1
@@ -366,7 +367,8 @@ for configure_ac in $configure_files; do
           fi
        fi
 
-       if grep "^\(AC\|IT\)_PROG_INTLTOOL" $basename >/dev/null; then
+       if grep "^AC_PROG_INTLTOOL" $basename >/dev/null ||
+           grep "^IT_PROG_INTLTOOL" $basename >/dev/null; then
            printbold "Running $INTLTOOLIZE..."
            $INTLTOOLIZE --force --copy --automake || exit 1
        fi