From 9063c7931ab1d25649a9c70cd8f45be92c58de93 Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering@redhat.com>
Date: Fri, 14 Jan 2011 09:43:00 +0100
Subject: [PATCH] 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>.
---
 ChangeLog           | 9 +++++++++
 build-aux/bootstrap | 4 ++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 167680366..85e510e97 100644
--- 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 ecf251784..25bc53b9d 100755
--- 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.
 
-- 
2.11.0