summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Haitzler <raster@rasterman.com>2012-04-26 04:51:32 +0000
committerCarsten Haitzler <raster@rasterman.com>2012-04-26 04:51:32 +0000
commit8a26d2660fc4eb35d3b73b8ef455bb3305bcb8b8 (patch)
tree6b743f4cb45ab327e2db4bcf3334a72b34dc5555
parentf921ad48acc48f54ac9c14e59a0c825a4fcd4acd (diff)
downloadeet-8a26d2660fc4eb35d3b73b8ef455bb3305bcb8b8.tar.gz
restore .99 micro versions for trunk and add back svnrev vers too.
SVN revision: 70492
-rw-r--r--configure.ac4
1 files changed, 2 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index eb9a021..882fda8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,11 +2,11 @@
##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
m4_define([v_maj], [1])
m4_define([v_min], [6])
-m4_define([v_mic], [0])
+m4_define([v_mic], [99])
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
-m4_undefine([v_rev])
+dnl m4_undefine([v_rev])
##-- When doing snapshots - change soname. remove dnl on below line
dnl m4_define([relname], [ver-pre-svn-05])
dnl m4_define([v_rel], [-release relname])