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

diff --git a/gettext-tools/ChangeLog b/gettext-tools/ChangeLog
index 35b049ba5894312d935262334c44ba5dc1973b6e..f28925a24e79f4ef8c94dec1bd92ecc8eb9cbaac 100644 (file)
--- 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 6136df77f9b5f146bd3513d01ca9b72e1867634c..be6af1059a9c7da0910a4f2f7a9917d7b139ec35 100644 (file)
--- 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