From 8dc49973c5c93b423097eb9c1dee634336134f22 Mon Sep 17 00:00:00 2001 From: Tom Hacohen Date: Tue, 13 Dec 2011 08:48:38 +0000 Subject: [PATCH] E: Fixed svn detection for svn1.7 SVN revision: 66143 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 53096db08..43f5f5fc5 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ m4_define([v_maj], [0]) m4_define([v_min], [16]) m4_define([v_mic], [999]) -m4_define([v_rev], m4_esyscmd([(svnversion "${SVN_REPO_PATH:-.}" | grep -v export || echo 0) | awk -F : '{printf("%s\n", $1);}' | tr -d ' :MSP\n'])) +m4_define([v_rev], m4_esyscmd([(svnversion "${SVN_REPO_PATH:-.}" | grep -v '\(export\|Unversioned directory\)' || echo 0) | awk -F : '{printf("%s\n", $1);}' | tr -d ' :MSP\n'])) m4_if(v_rev, [0], [m4_define([v_rev], m4_esyscmd([git log 2> /dev/null | (grep -m1 git-svn-id || echo 0) | sed -e 's/.*@\([0-9]*\).*/\1/' | tr -d '\n']))]) ##-- When released, remove the dnl on the below line dnl m4_undefine([v_rev])