use git versions, not git-svn versions

This commit is contained in:
Christian Grothoff 2015-04-15 16:01:25 +02:00
parent 515d1cf890
commit ad4759b46a

View File

@ -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)