From: Tomek Mrugalski <tomasz@isc.org>
Date: Mon, 11 Aug 2014 14:09:43 +0000 (+0200)
Subject: [3508] git version is now detected.
X-Git-Tag: trac3482_base~46^2~9
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0bcb05a8d0f89d2a8ff21830a633055b9e346777;p=thirdparty%2Fkea.git

[3508] git version is now detected.
---

diff --git a/configure.ac b/configure.ac
index 81728c202a..46c1eeb7aa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,6 +29,20 @@ AC_CONFIG_MACRO_DIR([m4macros])
 # Checks for programs.
 AC_PROG_CXX
 
+# Check for exact Kea version.
+AC_MSG_CHECKING(whether this is a tarball or git source)
+echo "test -d ${srcdir}/.git"
+if test -d "${srcdir}/.git"; then
+	KEA_SRCID="git `(cd "${top_srcdir}";git rev-parse HEAD)`"
+        AC_MSG_RESULT("git")
+else
+        KEA_SRCID="tarball"
+        AC_MSG_RESULT("tarball")
+fi
+# Export EXTENDED_VERSION to config.h
+# This will be either "tarball" or "git abcd".
+AC_DEFINE_UNQUOTED([EXTENDED_VERSION], ["${KEA_SRCID}"], [Extended Kea version])
+
 # Enable low-performing debugging facilities? This option optionally
 # enables some debugging aids that perform slowly and hence aren't built
 # by default.
@@ -1481,6 +1495,11 @@ AC_OUTPUT
 dnl Print the results
 dnl
 
+EXTENDED_VERSION=${PACKAGE_VERSION}
+if test "$KEA_SRCID" != ""; then
+   EXTENDED_VERSION="${EXTENDED_VERSION} ($KEA_SRCID)"
+fi
+
 cat > config.report << END
 
        Kea source configure results:
@@ -1489,6 +1508,7 @@ cat > config.report << END
 Package:
   Name:            ${PACKAGE_NAME}
   Version:         ${PACKAGE_VERSION}
+  Extended version:${EXTENDED_VERSION}
   OS Family:       ${OS_TYPE}
   Using GNU sed:   ${GNU_SED}