From 76ceeb3582bba138227bf76167b451ee017d38fc Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Fri, 16 Nov 2012 13:27:48 +0100 Subject: Improve parsing of the GIT revision number. * configure.ac (mmm4_revision): Use git rev-parse. Print version information at the end of a configure run. --- configure.ac | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index c908ef2..b420f48 100644 --- a/configure.ac +++ b/configure.ac @@ -30,8 +30,9 @@ 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;}')])) -m4_define([git_revision], m4_esyscmd([git branch -v 2>/dev/null \ - | awk '/^\* / {printf "%s",$3}'])) +m4_define([git_revision], + m4_esyscmd([git rev-parse --short HEAD | tr -d '\n\r'])) + m4_define([my_full_version], [my_version[]m4_if(my_issvn,[yes], [m4_if(git_revision,[],[-svn[]svn_revision],[-git[]git_revision])])]) @@ -382,3 +383,10 @@ AC_CONFIG_FILES([src/libassuan-config], [chmod +x src/libassuan-config]) AC_CONFIG_FILES([src/versioninfo.rc]) AC_OUTPUT + +echo " + Libassuan v${VERSION} has been configured as follows: + + Revision: git_revision + Platform: $host +" -- cgit v1.2.3