changeset 8445:cf3799cf6eea

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.
author Jim Meyering <jim@meyering.net>
date Sat, 17 Mar 2007 11:52:47 +0000
parents c6ca8a6c6e0e
children 00a5a0685e6a
files ChangeLog build-aux/bootstrap
diffstat 2 files changed, 12 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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>
--- a/build-aux/bootstrap
+++ b/build-aux/bootstrap
@@ -169,10 +169,15 @@
 }
 
 # 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