aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2018-11-21 00:08:00 +0100
committerChristian Grothoff <christian@grothoff.org>2018-11-21 00:08:31 +0100
commit1816097b7a4dca73a163b89c243ebf855e371ae5 (patch)
tree3fe4f766a146dd3bb4af96e04a6871e6cfd2020b
parent14180e7ab413f6759b484a9565bc91b895d4c132 (diff)
downloadgnunet-1816097b7a4dca73a163b89c243ebf855e371ae5.tar.gz
gnunet-1816097b7a4dca73a163b89c243ebf855e371ae5.zip
fix #5431
-rw-r--r--configure.ac27
1 files changed, 10 insertions, 17 deletions
diff --git a/configure.ac b/configure.ac
index 1d266225a..d09bd7c30 100644
--- a/configure.ac
+++ b/configure.ac
@@ -918,7 +918,7 @@ AS_IF([test x$working_libidn2 = x0],
918 AC_CHECK_LIB([idn], 918 AC_CHECK_LIB([idn],
919 [idna_to_ascii_8z], 919 [idna_to_ascii_8z],
920 [working_libidn1=1 920 [working_libidn1=1
921 LIBS="-lidn $LIBS" 921 LIBS="-lidn $LIBS"
922 AC_DEFINE_UNQUOTED([HAVE_LIBIDN], 922 AC_DEFINE_UNQUOTED([HAVE_LIBIDN],
923 [1], 923 [1],
924 [Define to 1 if you have 'libidn' (-lidn).])], 924 [Define to 1 if you have 'libidn' (-lidn).])],
@@ -1736,32 +1736,25 @@ AM_CONDITIONAL([USE_COVERAGE], [test "x$use_gcov" = "xyes"])
1736AC_PATH_PROG(svnversioncommand, svnversion) 1736AC_PATH_PROG(svnversioncommand, svnversion)
1737AC_PATH_PROG(gitcommand, git) 1737AC_PATH_PROG(gitcommand, git)
1738AC_MSG_CHECKING(for source being under a VCS) 1738AC_MSG_CHECKING(for source being under a VCS)
1739svn_version= 1739
1740gitsvn_version= 1740
1741AS_IF([test ! "X$svnversioncommand" = "X"], 1741# version info
1742[ 1742AC_PATH_PROG(gitcommand, git)
1743 svn_version=$(cd $srcdir ; $svnversioncommand -n 2>/dev/null) 1743AC_MSG_CHECKING(for source being under a VCS)
1744]) 1744git_version=
1745AS_IF([test ! "X$gitcommand" = "X"], 1745AS_IF([test ! "X$gitcommand" = "X"],
1746[ 1746[
1747 gitsvn_version=$(cd $srcdir ; git log -1 2>/dev/null | grep "git-svn-id" | sed -e 's/.*@\([[0-9]]\+\) .*/\1/') 1747 git_version=$(cd $srcdir ; git rev-list --full-history --all --abbrev-commit | head -n 1 2>/dev/null)
1748]) 1748])
1749AS_IF([test "X$svn_version" = "X" -o "X$svn_version" = "Xexported" -o "X$svn_version" = "XUnversioned directory"], 1749AS_IF([test "X$git_version" = "X"],
1750[
1751 AS_IF([test "X$gitsvn_version" = "X"],
1752 [ 1750 [
1753 vcs_name="no" 1751 vcs_name="no"
1754 vcs_version="\"release\"" 1752 vcs_version="\"release\""
1755 ], 1753 ],
1756 [ 1754 [
1757 vcs_name="yes, git-svn" 1755 vcs_name="yes, git-svn"
1758 vcs_version="\"svn-r$gitsvn_version\"" 1756 vcs_version="\"git-$git_version\""
1759 ]) 1757 ])
1760],
1761[
1762 vcs_name="yes, svn"
1763 vcs_version="\"svn-r$svn_version\""
1764])
1765AC_MSG_RESULT($vcs_name) 1758AC_MSG_RESULT($vcs_name)
1766 1759
1767AC_MSG_CHECKING(VCS version) 1760AC_MSG_CHECKING(VCS version)