have bootstrap initialize a `gnulib' submodule in a git checkout

2008-10-02  Paolo Bonzini  <bonzini@gnu.org>

	* build-aux/bootstrap: Recognize `gnulib' being a submodule in a
	git repository, and initialize/update it accordingly.

diff --git a/ChangeLog b/ChangeLog
index 057938c6f59af5ea15ba6cc7c28dfb3ab22ebd03..06eba5e9bf3cea5fc6fc7921f02f86a66e087f23 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-10-02  Paolo Bonzini  <bonzini@gnu.org>
+
+       * build-aux/bootstrap: Recognize `gnulib' being a submodule in a
+       git repository, and initialize/update it accordingly.
+
 2008-10-02  Jim Meyering  <meyering@redhat.com>
 
        fts.c: sync with similar code from coreutils' remove.c

diff --git a/build-aux/bootstrap b/build-aux/bootstrap
index 74fa3eb12a20f0c5a0c3d008799f9c0633672493..53f3817d362bcf9b38fadca742635c05ddb3f27b 100755 (executable)
--- a/build-aux/bootstrap
+++ b/build-aux/bootstrap
@@ -224,11 +224,20 @@ cleanup_gnulib() {
   exit $status
 }
 
+git_modules_config () {
+  GIT_CONFIG_LOCAL=.gitmodules git config "$@"
+}
+
 # Get gnulib files.
 
 case ${GNULIB_SRCDIR--} in
 -)
-  if [ ! -d gnulib ]; then
+  if git_modules_config submodule.gnulib.url >/dev/null; then
+    echo "$0: getting gnulib files..."
+    git submodule init || exit $?
+    git submodule update || exit $?
+
+  elif [ ! -d gnulib ]; then
     echo "$0: getting gnulib files..."
 
     trap cleanup_gnulib 1 2 13 15
@@ -239,6 +248,20 @@ case ${GNULIB_SRCDIR--} in
     trap - 1 2 13 15
   fi
   GNULIB_SRCDIR=gnulib
+  ;;
+*)
+  # Redirect the gnulib submodule to the directory on the command line
+  # if possible.
+  if test -d "$GNULIB_SRCDIR"/.git && \
+       git_modules_config submodule.gnulib.url >/dev/null; then
+    git submodule init
+    GNULIB_SRCDIR=`cd $GNULIB_SRCDIR && pwd`
+    git config --replace-all submodule.gnulib.url $GNULIB_SRCDIR
+    echo "$0: getting gnulib files..."
+    git submodule update || exit $?
+    GNULIB_SRCDIR=gnulib
+  fi
+  ;;
 esac
 
 gnulib_tool=$GNULIB_SRCDIR/gnulib-tool