diff options
author | Carsten Haitzler <raster@rasterman.com> | 2012-04-26 04:51:32 +0000 |
---|---|---|
committer | Carsten Haitzler <raster@rasterman.com> | 2012-04-26 04:51:32 +0000 |
commit | 8616b933359bcc3e0be58c6e108e111088a1b703 (patch) | |
tree | 05fb974eb8b1735de429fb7909d9f4f8a9cfd907 /legacy/embryo | |
parent | ce4331df424a3f7897d8c20df4a0411340b04743 (diff) |
restore .99 micro versions for trunk and add back svnrev vers too.
SVN revision: 70492
Diffstat (limited to 'legacy/embryo')
-rw-r--r-- | legacy/embryo/configure.ac | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/legacy/embryo/configure.ac b/legacy/embryo/configure.ac index 37f39af8eb..f4b4b79d7d 100644 --- a/legacy/embryo/configure.ac +++ b/legacy/embryo/configure.ac | |||
@@ -2,11 +2,11 @@ | |||
2 | ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## | 2 | ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## |
3 | m4_define([v_maj], [1]) | 3 | m4_define([v_maj], [1]) |
4 | m4_define([v_min], [2]) | 4 | m4_define([v_min], [2]) |
5 | m4_define([v_mic], [0]) | 5 | m4_define([v_mic], [99]) |
6 | 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'])) | 6 | 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'])) |
7 | 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']))]) | 7 | 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']))]) |
8 | ##-- When released, remove the dnl on the below line | 8 | ##-- When released, remove the dnl on the below line |
9 | m4_undefine([v_rev]) | 9 | dnl m4_undefine([v_rev]) |
10 | ##-- When doing snapshots - change soname. remove dnl on below line | 10 | ##-- When doing snapshots - change soname. remove dnl on below line |
11 | dnl m4_define([relname], [ver-pre-svn-07]) | 11 | dnl m4_define([relname], [ver-pre-svn-07]) |
12 | dnl m4_define([v_rel], [-release ver-pre-svn-07]) | 12 | dnl m4_define([v_rel], [-release ver-pre-svn-07]) |