diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | configure.ac | 6 |
2 files changed, 9 insertions, 1 deletions
@@ -1,3 +1,7 @@ +2010-12-23 Werner Koch <wk@g10code.com> + + * configure.ac: Support git_revision. + 2010-11-01 Marcus Brinkmann <marcus@g10code.de> * src/w32-gettext.c (CreateFileA): Rename to ... diff --git a/configure.ac b/configure.ac index c022f5f..d772902 100644 --- a/configure.ac +++ b/configure.ac @@ -29,8 +29,11 @@ m4_define([my_issvn], [yes]) m4_define([svn_revision], m4_esyscmd([printf "%d" $(svn info 2>/dev/null \ | sed -n '/^Revision:/ s/[^0-9]//gp'|head -1)])) +m4_define([git_revision], m4_esyscmd([git branch -v 2>/dev/null \ + | awk '/^\* / {printf "%s",$3}'])) AC_INIT([libgpg-error], - [my_version[]m4_if(my_issvn,[yes],[-svn[]svn_revision])], + [my_version[]m4_if(my_issvn,[yes], + [m4_if(git_revision,[],[-svn[]svn_revision],[-git[]git_revision])])], [bug-gnupg@gnupg.org]) # LT Version numbers, remember to change them just *before* a release. # (Code changed: REVISION++) @@ -157,6 +160,7 @@ if test "$have_w32_system" = yes; then case "$VERSION" in *-svn*) BUILD_FILEVERSION="${BUILD_FILEVERSION}0,0" ;; *-cvs) BUILD_FILEVERSION="${BUILD_FILEVERSION}0,0" ;; + *-git*) BUILD_FILEVERSION="${BUILD_FILEVERSION}0,0" ;; *-rc*) BUILD_FILEVERSION="${BUILD_FILEVERSION}0,1" ;; *) BUILD_FILEVERSION="${BUILD_FILEVERSION}0,2" ;; esac |