diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | configure.ac | 5 |
2 files changed, 8 insertions, 1 deletions
@@ -1,3 +1,7 @@ +2010-12-28 Werner Koch <[email protected]> + + * configure.ac (git_revision): Add new m4 macro. + 2010-10-27 Werner Koch <[email protected]> * acinclude.m4 (GNUPG_TIME_T_UNSIGNED): New. diff --git a/configure.ac b/configure.ac index 8c48a24fc..4e9d53d66 100644 --- a/configure.ac +++ b/configure.ac @@ -29,8 +29,11 @@ m4_define([my_version], [1.4.12]) 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([gnupg], - [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])])], # Set development_version to yes if the minor number is odd or you # feel that the default check for a development version is not |