X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=build-aux%2Fbootstrap;h=3294085057373b9d8a1146f48de8e39208b42286;hb=6b78d03bdd89f7c8dec8756bf296b75b156b90f3;hp=202d227dabcca481249c87cd10b5f3a7653ebdf4;hpb=39e196895472b71150ad4c4c81439a2e60d81614;p=gnulib.git

diff --git a/build-aux/bootstrap b/build-aux/bootstrap
index 202d227da..329408505 100755
--- a/build-aux/bootstrap
+++ b/build-aux/bootstrap
@@ -169,11 +169,15 @@ insert_sorted_if_absent() {
 }
 
 # Die if there is no AC_CONFIG_AUX_DIR($build_aux) line in configure.ac.
-grep '^[	 ]*AC_CONFIG_AUX_DIR('$build_aux')' configure.ac >/dev/null ||
-  {
-    echo "$0: expected line not found in configure.ac. Add the following:" >&2
-    echo "  AC_CONFIG_AUX_DIR($build_aux)" >&2.
-  }
+found_aux_dir=no
+grep '^[	 ]*AC_CONFIG_AUX_DIR(\['"$build_aux"'\])' configure.ac \
+    >/dev/null && found_aux_dir=yes
+grep '^[	 ]*AC_CONFIG_AUX_DIR('"$build_aux"')' configure.ac \
+    >/dev/null && found_aux_dir=yes
+if test $found_aux_dir = no; then
+  echo "$0: expected line not found in configure.ac. Add the following:" >&2
+  echo "  AC_CONFIG_AUX_DIR([$build_aux])" >&2.
+fi
 
 # If $build_aux doesn't exist, create it now, otherwise some bits
 # below will malfunction.  If creating it, also mark it as ignored.
@@ -468,7 +472,7 @@ done
 
 # Import from gettext.
 with_gettext=yes
-grep '^[	 ]*AM_GNU_GETTEXT_VERSION\>' configure.ac >/dev/null || \
+grep '^[	 ]*AM_GNU_GETTEXT_VERSION(' configure.ac >/dev/null || \
     with_gettext=no
 
 if test $with_gettext = yes; then