From: Bruno Haible <bruno@clisp.org>
Date: Sun, 6 Jun 2010 13:06:14 +0000 (+0200)
Subject: Don't use the git format if the 'git' program if older than version 1.6.
X-Git-Tag: v0.18.1.1~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=88db35b39b211e89ea8365b1ae047408115ed6b6;p=thirdparty%2Fgettext.git

Don't use the git format if the 'git' program if older than version 1.6.
---

diff --git a/gettext-tools/ChangeLog b/gettext-tools/ChangeLog
index f28925a24..4c6e4d2ed 100644
--- a/gettext-tools/ChangeLog
+++ b/gettext-tools/ChangeLog
@@ -1,3 +1,10 @@
+2010-06-06  Bruno Haible  <bruno@clisp.org>
+
+	* configure.ac (ARCHIVE_FORMAT): If neither --with-git nor --with-cvs
+	is specified, don't use the git format if the 'git' program if older
+	than version 1.6.
+	Suggested by Karl Berry <karl@freefriends.org>.
+
 2010-06-04  Bruno Haible  <bruno@clisp.org>
 
 	* gettext-0.18.1 released.
diff --git a/gettext-tools/configure.ac b/gettext-tools/configure.ac
index be6af1059..4404438ff 100644
--- a/gettext-tools/configure.ac
+++ b/gettext-tools/configure.ac
@@ -338,9 +338,15 @@ else
     ARCHIVE_FORMAT=cvs
   else
     # Neither --with-git nor --with-cvs is specified.
-    if test "$gt_use_git" != no && (git --version) >/dev/null 2>&1; then
-      # --without-git is not specified, and the git program exists.
-      # Use git format.
+    if test "$gt_use_git" != no \
+       && (git --version) >/dev/null 2>&1 \
+       && { case `git --version | sed -e 's/^[^0-9]*//'` in
+              0.* | 1.[0-5].*) false ;;
+              *) true ;;
+            esac
+          }; then
+      # --without-git is not specified, and the git program exists
+      # in version 1.6 or newer. Use git format.
       ARCHIVE_FORMAT=git
     else
       # --without-git is specified, or the git program is missing.