From: Peter Rosin <peda@lysator.liu.se>
Date: Tue, 1 Jan 2013 18:40:57 +0000 (+0100)
Subject: maint: check if git works before relying on it
X-Git-Tag: v2.4.2.418~71
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a9fac8df4df005dd03740675fa944107b9792adf;p=thirdparty%2Flibtool.git

maint: check if git works before relying on it

Makefile.am (m4/ltversion.m4): Take the opportunity to regenerate
$(srcdir)/.serial whenever git is actually working.
(git_version_gen): Provide a fallback version for the git-version-gen
script to use when .tarball-version does not exist and git is not
working.

Signed-off-by: Peter Rosin <peda@lysator.liu.se>
---

diff --git a/Makefile.am b/Makefile.am
index 87ed3d99a..5f5434658 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -46,7 +46,7 @@ EXTRA_LTLIBRARIES	=
 # Using 'cd' in backquotes may print the directory name, use this instead:
 lt__cd		= CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 
-git_version_gen = '$(SHELL)' '$(aux_dir)/git-version-gen' '.tarball-version'
+git_version_gen = '$(SHELL)' '$(aux_dir)/git-version-gen' '--fallback' '$(VERSION)' '.tarball-version'
 rebuild = rebuild=:; revision=`$(lt__cd) $(srcdir) && $(git_version_gen) | sed 's|-.*$$||g'`
 
 
@@ -126,11 +126,10 @@ $(ltversion_m4): $(ltversion_in) $(dotversion)
 	done; \
 	if $$rebuild; then \
 	  rm -f '$@'; \
-	  if test -f '$(srcdir)/.serial'; then \
-	    serial=`cat '$(srcdir)/.serial'`; \
-	  else \
-	    serial=`$(git_commit_count)`; \
+	  if test -d '$(srcdir)/.git' && git --version >/dev/null 2>&1; then \
+	    $(git_commit_count) > '$(srcdir)/.serial'; \
 	  fi; \
+	  serial=`cat '$(srcdir)/.serial'`; \
 	  if test 0 = '$(AM_DEFAULT_VERBOSITY)' && test 1 != '$(V)'; \
 	    then echo "  GEN     " $@; \
 	  else echo $(bootstrap_edit) "'$(ltversion_in)' > '$@'"; fi; \