[Pkg-gnupg-commit] [libassuan] 345/437: * configure.ac: Add a git commit identifier to the version.

[Eric Dorland]

This is an automated email from the git hooks/post-receive script.

eric pushed a commit to branch master
in repository libassuan.

commit 88d8aea1614fcf1f549d85c0a6a0082dcd6a9787
Author: Werner Koch <wk at g10code.com>
Date:   Thu Dec 23 12:57:34 2010 +0100

    * configure.ac: Add a git commit identifier to the version.
---
 ChangeLog    | 4 ++++
 configure.ac | 8 ++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8bb45a4..803cb28 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-12-23  Werner Koch  <wk at g10code.com>
+
+	* configure.ac: Add a git commit identifier to the version.
+
 2010-11-01  Marcus Brinkmann  <marcus at g10code.de>
 
 	* configure.ac: Check for fcntl.h.
diff --git a/configure.ac b/configure.ac
index b1a55b8..b7de45b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,7 +29,11 @@ m4_define([my_issvn], [yes])
 
 m4_define([svn_revision], m4_esyscmd([printf "%d" $( (svn info 2>/dev/null \
             || echo 'Revision: 0')|sed -n '/^Revision:/ {s/[^0-9]//gp;q;}')]))
-AC_INIT([libassuan], my_version[]m4_if(my_issvn,[yes],[-svn[]svn_revision]),
+m4_define([git_revision], m4_esyscmd([git branch -v 2>/dev/null \
+          | awk '/^\* / {printf "%s",$3}']))
+AC_INIT([libassuan],
+        [my_version[]m4_if(my_issvn,[yes],
+        [m4_if(git_revision,[],[-svn[]svn_revision],[-git[]git_revision])])],
         [bug-libassuan at gnupg.org])
 
 # LT Version numbers, remember to change them just *before* a release.
@@ -50,7 +54,7 @@ AC_SUBST(LIBASSUAN_LT_CURRENT)
 AC_SUBST(LIBASSUAN_LT_AGE)
 AC_SUBST(LIBASSUAN_LT_REVISION)
 
-BUILD_REVISION=svn_revision
+BUILD_REVISION=m4_if(git_revision,[],[svn_revision],[git_revision])
 PACKAGE=$PACKAGE_NAME
 VERSION=$PACKAGE_VERSION
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/libassuan.git