From: Alexander Barton <alex@barton.de>
Date: Mon, 24 Sep 2012 16:00:36 +0000 (+0200)
Subject: configure.ng: don't require GIT tree to detect version string
X-Git-Tag: rel-20-rc1~70^2~1
X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=commitdiff_plain;h=d7d5f4330b15667d9f364ebabd886a062b2741fb

configure.ng: don't require GIT tree to detect version string
---

diff --git a/configure.ng b/configure.ng
index 25654f9c..da723e8f 100644
--- a/configure.ng
+++ b/configure.ng
@@ -9,7 +9,12 @@
 # Please read the file COPYING, README and AUTHORS for more information.
 #
 
-define(VERSION_ID,esyscmd(git describe|sed -e 's/rel-//g'|sed -e 's/-/~/'|tr -d \\n))
+define(VERSION_ID,esyscmd([
+	V=`git describe 2>/dev/null | sed -e 's/rel-//g' | sed -e 's/-/~/'`;
+	[ -z "$V" -a -r configure ] \
+		&& V=`grep "PACKAGE_STRING=" configure | cut -d"'" -f2 | cut -d' ' -f2`
+	( [ -n "$V" ] && echo "$V" || echo "??" ) | tr -d '\n';
+]))
 
 # -- Initialisation --