bootstrap: avoid failure when there is no .gitmodules file

": ${gnulib_path=gnulib}" fails to set $gnulib_path when that variable
has been assigned to, even when its value is the empty string.
* build-aux/bootstrap (gnulib_path): Test explicitly for an empty
"$gnulib_path", rather than using ${gnulib_path=gnulib}.
Reported by John W. Eaton <jwe@gnu.org>.

diff --git a/ChangeLog b/ChangeLog
index 167680366c91693bc010d02ce8f655e94d52f0ac..85e510e97f9064d67a9287bae0baec6097330246 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2011-01-14  Jim Meyering  <meyering@redhat.com>
+
+       bootstrap: avoid failure when there is no .gitmodules file
+       ": ${gnulib_path=gnulib}" fails to set $gnulib_path when that variable
+       has been assigned to, even when its value is the empty string.
+       * build-aux/bootstrap (gnulib_path): Test explicitly for an empty
+       "$gnulib_path", rather than using ${gnulib_path=gnulib}.
+       Reported by John W. Eaton <jwe@gnu.org>.
+
 2011-01-19  Paul Eggert  <eggert@cs.ucla.edu>
 
        assume <ctype.h>, ..., <time.h> exist

diff --git a/build-aux/bootstrap b/build-aux/bootstrap
index ecf2517840c122526c967f0c576cd7ececf23ae4..25bc53b9d9a4caa9ed2fe4926d4ac5bb8266adf8 100755 (executable)
--- a/build-aux/bootstrap
+++ b/build-aux/bootstrap
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Print a version string.
-scriptversion=2010-11-20.03; # UTC
+scriptversion=2011-01-14.08; # UTC
 
 # Bootstrap this package from checked-out sources.
 
@@ -462,7 +462,7 @@ git_modules_config () {
 }
 
 gnulib_path=`git_modules_config submodule.gnulib.path`
-: ${gnulib_path=gnulib}
+test -z "$gnulib_path" && gnulib_path=gnulib
 
 # Get gnulib files.