Embed gnulib as a git submodule.

diff --git a/.gitmodules b/.gitmodules
new file mode 100644 (file)
index 0000000..acb2669
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "gnulib"]
+       path = gnulib
+       url = git://git.sv.gnu.org/gnulib.git

diff --git a/ChangeLog b/ChangeLog
index 94a628906effce75c804fd424650033d7d11b793..4524a888eb6b83b1f388a70f7bbda7f92a1ce4b6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2013-06-17  Daiki Ueno  <ueno@gnu.org>
+
+       Embed Gnulib using git submodule.
+       * autogen.sh: Port git submodule update code from the 'bootstrap'
+       script in Gnulib and respect the GNULIB_SRCDIR envvar as well as
+       GNULIB_TOOL.
+       (cleanup_gnulib): New function borrowed from Gnulib.
+       (git_modules_config): Likewise.
+       (gnulib_path): New variable.
+
 2013-06-13  Daiki Ueno  <ueno@gnu.org>
 
        * NEWS: Document more new features.  Mention Glade msgctxt support

diff --git a/autogen.sh b/autogen.sh
index f55ce5ba921f58ed944bfb7af5e2e60be3798660..4716d6ff321063aef3030b2033d9e4398c77f2e3 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -53,20 +53,76 @@ while :; do
   esac
 done
 
+cleanup_gnulib() {
+  status=$?
+  rm -fr "$gnulib_path"
+  exit $status
+}
+
+git_modules_config () {
+  test -f .gitmodules && git config --file .gitmodules "$@"
+}
+
+gnulib_path=$(git_modules_config submodule.gnulib.path)
+test -z "$gnulib_path" && gnulib_path=gnulib
+
 # The tests in gettext-tools/tests are not meant to be executable, because
 # they have a TESTS_ENVIRONMENT that specifies the shell explicitly.
 
 if ! $skip_gnulib; then
   if test -z "$GNULIB_TOOL"; then
-    # Check out gnulib in a subdirectory 'gnulib'.
-    if test -d gnulib; then
-      (cd gnulib && git pull)
-    else
-      git clone git://git.savannah.gnu.org/gnulib.git
-    fi
+    # Get gnulib files.
+    case ${GNULIB_SRCDIR--} in
+    -)
+      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_path" ]; then
+        echo "$0: getting gnulib files..."
+
+        trap cleanup_gnulib 1 2 13 15
+
+        shallow=
+        git clone -h 2>&1 | grep -- --depth > /dev/null && shallow='--depth 2'
+        git clone $shallow git://git.sv.gnu.org/gnulib "$gnulib_path" ||
+          cleanup_gnulib
+
+        trap - 1 2 13 15
+      fi
+      GNULIB_SRCDIR=$gnulib_path
+      ;;
+    *)
+      # Use GNULIB_SRCDIR as a reference.
+      if test -d "$GNULIB_SRCDIR"/.git && \
+            git_modules_config submodule.gnulib.url >/dev/null; then
+        echo "$0: getting gnulib files..."
+        if git submodule -h|grep -- --reference > /dev/null; then
+          # Prefer the one-liner available in git 1.6.4 or newer.
+          git submodule update --init --reference "$GNULIB_SRCDIR" \
+            "$gnulib_path" || exit $?
+        else
+          # This fallback allows at least git 1.5.5.
+          if test -f "$gnulib_path"/gnulib-tool; then
+            # Since file already exists, assume submodule init already complete.
+            git submodule update || exit $?
+          else
+            # Older git can't clone into an empty directory.
+            rmdir "$gnulib_path" 2>/dev/null
+            git clone --reference "$GNULIB_SRCDIR" \
+              "$(git_modules_config submodule.gnulib.url)" "$gnulib_path" \
+              && git submodule init && git submodule update \
+              || exit $?
+          fi
+        fi
+        GNULIB_SRCDIR=$gnulib_path
+      fi
+      ;;
+    esac
     # Now it should contain a gnulib-tool.
-    if test -f gnulib/gnulib-tool; then
-      GNULIB_TOOL=`pwd`/gnulib/gnulib-tool
+    if test -f "$GNULIB_SRCDIR"/gnulib-tool; then
+      GNULIB_TOOL="$GNULIB_SRCDIR"/gnulib-tool
     else
       echo "** warning: gnulib-tool not found" 1>&2
     fi

diff --git a/gnulib b/gnulib
new file mode 160000 (submodule)
index 0000000..8672534
--- /dev/null
+++ b/gnulib
@@ -0,0 +1 @@
+Subproject commit 86725346a1b116f3c2da26c124288f5f4495bf69