diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | configure.ac | 8 |
2 files changed, 10 insertions, 2 deletions
@@ -1,3 +1,7 @@ +2010-12-23 Werner Koch <wk@g10code.com> + + * configure.ac: Add a git commit identifier to the version. + 2010-11-01 Marcus Brinkmann <marcus@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@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 |