diff options
author | Christian Grothoff <christian@grothoff.org> | 2015-04-15 16:01:25 +0200 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2015-04-15 16:01:25 +0200 |
commit | ad4759b46ab6492180c5abd7c164d94ad9125898 (patch) | |
tree | 0bafd23bd0109e227363707b024ac2b5680879a5 /configure.ac | |
parent | 515d1cf890533de52466b799971ad5a238bea8b6 (diff) |
use git versions, not git-svn versions
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 18965a0f7..20450390d 100644 --- a/configure.ac +++ b/configure.ac @@ -200,19 +200,19 @@ AM_CONDITIONAL([USE_COVERAGE], [test "x$use_gcov" = "xyes"]) # version info AC_PATH_PROG(gitcommand, git) AC_MSG_CHECKING(for source being under a VCS) -gitsvn_version= +git_version= AS_IF([test ! "X$gitcommand" = "X"], [ - gitsvn_version=$(cd $srcdir ; git log -1 2>/dev/null | grep "git-svn-id" | sed -e 's/.*@\([[0-9]]\+\) .*/\1/') + git_version=$(cd $srcdir ; git rev-list --full-history --all --abbrev-commit | head -n 1 2>/dev/null) ]) -AS_IF([test "X$gitsvn_version" = "X"], +AS_IF([test "X$git_version" = "X"], [ vcs_name="no" vcs_version="\"release\"" ], [ vcs_name="yes, git-svn" - vcs_version="\"svn-r$gitsvn_version\"" + vcs_version="\"git-$git_version\"" ]) AC_MSG_RESULT($vcs_name) |