summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2012-11-16 11:03:10 +0100
committerWerner Koch <wk@gnupg.org>2012-11-16 11:03:10 +0100
commit322a9b53e6f7e71aca46a45b12b036ecf46be8ee (patch)
tree412d30186b1e7ff4ea71e3e35dd66962ae551b60
parent65c2a52a1cce0aa609b3b6c68c0e89890171209b (diff)
downloadlibgcrypt-322a9b53e6f7e71aca46a45b12b036ecf46be8ee.tar.gz
Improve parsing of the GIT revision number.
* configure.ac (git_revision): Use git rev-parse.
-rw-r--r--configure.ac5
1 files changed, 3 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index 546dab70..a2f6b010 100644
--- a/configure.ac
+++ b/configure.ac
@@ -31,8 +31,9 @@ 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}']))
+m4_define([git_revision],
+ m4_esyscmd([git rev-parse --short HEAD | tr -d '\n\r']))
+
AC_INIT([libgcrypt],
[my_version[]m4_if(my_issvn,[yes],
[m4_if(git_revision,[],[-svn[]svn_revision],[-git[]git_revision])])],