* configure.ac: Bump version, append hg revision.

[cacao.git] / m4 / version.m4

diff --git a/m4/version.m4 b/m4/version.m4
index ba7c0e4622b2dde66a0dc0b47c058b7086122d04..8b039463767cf6bb4e78d4132e845d10d4cdf3f3 100644 (file)
--- a/m4/version.m4
+++ b/m4/version.m4
@@ -29,7 +29,7 @@ if test x`echo "$version" | $SED -e 's/[[0-9a-z+]]*//g'` = "x..";
 then
     major=`echo "$version" | $SED -e 's/\.[[0-9a-z.+]]*$//'`
     minor=`echo "$version" | $SED -e 's/^[[0-9]]*\.//' -e 's/\.[[0-9a-z.+]]*$//'`
-    micro=`echo "$version" | $SED -e 's/^[[0-9]]*\.[[0-9]]*\.//' -e 's/[[a-z.+]]*$//'`
+    micro=`echo "$version" | $SED -r -e 's/^[[0-9]]*\.[[0-9]]*\.([[0-9]]*).*/\1/'`
     extra=`echo "$version" | $SED -e 's/^[[0-9]]*\.[[0-9]]*\.[[0-9]]*//'`
 else
     major=`echo "$version" | $SED -e 's/\.[[0-9a-z.+]]*$//'`
@@ -37,11 +37,16 @@ else
     micro=0
     extra=`echo "$version" | $SED -e 's/^[[0-9]]*\.[[0-9]]*//'`
 fi
+if test ! "x$CACAO_HGREV" = "x";
+then
+    extra="$extra.hg$CACAO_HGREV"
+fi
 
 AC_DEFINE_UNQUOTED(VERSION_MAJOR, $major, [major version number])
 AC_DEFINE_UNQUOTED(VERSION_MINOR, $minor, [minor version number])
 AC_DEFINE_UNQUOTED(VERSION_MICRO, $micro, [micro version number])
 AC_DEFINE_UNQUOTED(VERSION_EXTRA, "$extra", [extra version info])
+AC_DEFINE_UNQUOTED(VERSION_FULL, "$major.$minor.$micro$extra", [full version info])
 ])