Detect use of AC_CONFIG_AUX_DIR also when its argument is quoted.

* build-aux/bootstrap: Put ""s around use of $build_aux, in case
someone uses a name containing shell meta-characters.
Reported by Alfred M. Szmidt.

diff --git a/ChangeLog b/ChangeLog
index 86bc25ae8fa8f8f743e5399dce7378baf4693540..8880c9852117c0fb7655f428a7701d2599bfaaf1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2007-03-17  Jim Meyering  <jim@meyering.net>
 
+       Detect use of AC_CONFIG_AUX_DIR also when its argument is quoted.
+       * build-aux/bootstrap: Put ""s around use of $build_aux, in case
+       someone uses a name containing shell meta-characters.
+       Reported by Alfred M. Szmidt.
+
        * build-aux/bootstrap: Don't use \> in grep regexp.  For HP-UX.
 
 2007-03-16  Alfred M. Szmidt  <ams@gnu.org>

diff --git a/build-aux/bootstrap b/build-aux/bootstrap
index eadf9f5cd59b54481f99b11c43e34a3c2fd1793d..5c4b8556a895157f47db9a1a5d9ced59672f1ca0 100755 (executable)
--- a/build-aux/bootstrap
+++ b/build-aux/bootstrap
@@ -169,10 +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 ||
+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.
+    echo "  AC_CONFIG_AUX_DIR([$build_aux])" >&2.
   }
 
 # If $build_aux doesn't exist, create it now, otherwise some bits