From: Bruno Haible <bruno@clisp.org>
Date: Fri, 4 Jun 2010 09:58:38 +0000 (+0200)
Subject: Don't use the git program if it does not exist.
X-Git-Tag: v0.18.1~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f324b78fa1449cd6c38fbd193340a7a1bb6995c8;p=thirdparty%2Fgettext.git

Don't use the git program if it does not exist.
---

diff --git a/gettext-tools/ChangeLog b/gettext-tools/ChangeLog
index 35b049ba5..f28925a24 100644
--- a/gettext-tools/ChangeLog
+++ b/gettext-tools/ChangeLog
@@ -2,6 +2,11 @@
 
 	* gettext-0.18.1 released.
 
+2010-06-04  Bruno Haible  <bruno@clisp.org>
+
+	* configure.ac (ARCHIVE_FORMAT): If neither --with-git nor --with-cvs
+	is specified, use the git format only if the 'git' program exists.
+
 2010-06-03  Bruno Haible  <bruno@clisp.org>
 
 	Deprecate the --with-cvs option.
diff --git a/gettext-tools/configure.ac b/gettext-tools/configure.ac
index 6136df77f..be6af1059 100644
--- a/gettext-tools/configure.ac
+++ b/gettext-tools/configure.ac
@@ -338,11 +338,12 @@ else
     ARCHIVE_FORMAT=cvs
   else
     # Neither --with-git nor --with-cvs is specified.
-    if test "$gt_use_git" != no; then
-      # --without-git is not specified. Use git format.
+    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.
       ARCHIVE_FORMAT=git
     else
-      # --without-git is specified.
+      # --without-git is specified, or the git program is missing.
       ARCHIVE_FORMAT=dir
     fi
   fi