From: Eric Blake <ebb9@byu.net>
Date: Wed, 4 Jun 2008 22:03:13 +0000 (-0600)
Subject: Be tolerant of UNKNOWN version in gnulib-tool test dir.
X-Git-Tag: v0.1~7309
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=2b2986f1776a2850832d60e699b5231d54aa2d01;p=gnulib.git

Be tolerant of UNKNOWN version in gnulib-tool test dir.

* top/GNUmakefile (_dummy): Warn rather than reconfigure if
git-version-gen fails to come up with a version.
Reported by Simon Josefsson.

Signed-off-by: Eric Blake <ebb9@byu.net>
---

diff --git a/ChangeLog b/ChangeLog
index c3f7d4131..f30e73370 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-06-05  Eric Blake  <ebb9@byu.net>
+
+	Be tolerant of UNKNOWN version in gnulib-tool test dir.
+	* top/GNUmakefile (_dummy): Warn rather than reconfigure if
+	git-version-gen fails to come up with a version.
+	Reported by Simon Josefsson.
+
 2008-06-05  Jim Meyering  <meyering@redhat.com>
 	    Paul Eggert  <eggert@cs.ucla.edu>
 
diff --git a/top/GNUmakefile b/top/GNUmakefile
index 0c1bc38af..062900b54 100644
--- a/top/GNUmakefile
+++ b/top/GNUmakefile
@@ -59,9 +59,13 @@ ifeq ($(_have-git-version-gen)0,yes$(MAKELEVEL))
     _curr-ver := $(shell cd $(srcdir) && ./$(_build-aux)/git-version-gen \
                    $(srcdir)/.tarball-version)
     ifneq ($(_curr-ver),$(VERSION))
-      $(info INFO: running autoreconf for new version string: $(_curr-ver))
-      _dummy := $(shell cd $(srcdir) && rm -rf autom4te.cache .version \
-        && $(_autoreconf))
+      ifeq ($(_curr-ver),UNKNOWN)
+        $(info WARNING: unable to verify if $(VERSION) is correct version)
+      else
+        $(info INFO: running autoreconf for new version string: $(_curr-ver))
+        _dummy := $(shell cd $(srcdir) && rm -rf autom4te.cache .version \
+          && $(_autoreconf))
+      endif
     endif
   endif
 endif