diff options
| author | Werner Koch <[email protected]> | 2012-11-16 12:27:48 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2012-11-16 12:31:03 +0000 |
| commit | 76ceeb3582bba138227bf76167b451ee017d38fc (patch) | |
| tree | 204b19ce62f9f53816520fdffd848ba46bd7fb07 | |
| parent | Fix non-portable use of chmod in autogen.sh. (diff) | |
| download | libassuan-76ceeb3582bba138227bf76167b451ee017d38fc.tar.gz libassuan-76ceeb3582bba138227bf76167b451ee017d38fc.zip | |
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.
| -rw-r--r-- | configure.ac | 12 |
1 files 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 +" |