diff options
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 49 |
1 files changed, 32 insertions, 17 deletions
diff --git a/configure.ac b/configure.ac index d5c4e6c66..d9e09ae9a 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1292,23 +1292,38 @@ AM_CONDITIONAL([USE_COVERAGE], [test "x$use_gcov" = "xyes"]) | |||
1292 | # version info | 1292 | # version info |
1293 | AC_PATH_PROG(svnversioncommand, svnversion) | 1293 | AC_PATH_PROG(svnversioncommand, svnversion) |
1294 | AC_PATH_PROG(gitcommand, git) | 1294 | AC_PATH_PROG(gitcommand, git) |
1295 | if test "X$svnversioncommand" = "X" || test `$svnversioncommand -n '.'` = "exported" | 1295 | AC_MSG_CHECKING(for source being under a VCS) |
1296 | then | 1296 | svn_version= |
1297 | if test "X$gitcommand" = "X" | 1297 | gitsvn_version= |
1298 | then | 1298 | AS_IF([test ! "X$svnversioncommand" = "X"], |
1299 | AC_DEFINE_UNQUOTED(VCS_VERSION, ["release"], [repository svn version]) | 1299 | [ |
1300 | else | 1300 | svn_version=$(cd $srcdir ; $svnversioncommand -n 2>/dev/null) |
1301 | gitver=$(git log -1 | grep "git-svn-id" | sed -e 's/.*@\([[0-9]]\+\) .*/\1/') | 1301 | ]) |
1302 | if test "X$gitver" = "X" | 1302 | AS_IF([test ! "X$gitcommand" = "X"], |
1303 | then | 1303 | [ |
1304 | AC_DEFINE_UNQUOTED(VCS_VERSION, ["release"], [repository svn version]) | 1304 | gitsvn_version=$(cd $srcdir ; git log -1 2>/dev/null | grep "git-svn-id" | sed -e 's/.*@\([[0-9]]\+\) .*/\1/') |
1305 | else | 1305 | ]) |
1306 | AC_DEFINE_UNQUOTED(VCS_VERSION, ["svn-$gitver"], [repository svn version]) | 1306 | AS_IF([test "X$svn_version" = "X" -o "X$svn_version" = "Xexported" -o "X$svn_version" = "XUnversioned directory"], |
1307 | fi | 1307 | [ |
1308 | fi | 1308 | AS_IF([test "X$gitsvn_version" = "X"], |
1309 | else | 1309 | [ |
1310 | AC_DEFINE_UNQUOTED(VCS_VERSION, ["svn-`svnversion -n`"], [repository svn version]) | 1310 | vcs_name="no" |
1311 | fi | 1311 | vcs_version="release" |
1312 | ], | ||
1313 | [ | ||
1314 | vcs_name="yes, git-svn" | ||
1315 | vcs_version="svn-$gitsvn_version" | ||
1316 | ]) | ||
1317 | ], | ||
1318 | [ | ||
1319 | vcs_name="yes, svn" | ||
1320 | vcs_version="svn-$svn_version" | ||
1321 | ]) | ||
1322 | AC_MSG_RESULT($vcs_name) | ||
1323 | |||
1324 | AC_MSG_CHECKING(VCS version) | ||
1325 | AC_MSG_RESULT($vcs_version) | ||
1326 | AC_DEFINE_UNQUOTED(VCS_VERSION, [$vcs_version], [VCS revision/hash or tarball version]) | ||
1312 | 1327 | ||
1313 | AC_CONFIG_FILES([ | 1328 | AC_CONFIG_FILES([ |
1314 | Makefile | 1329 | Makefile |