[cairo-commit] configure.in Makefile.am Version.mk

[Behdad Esfahbod]

 Makefile.am  |    1 +
 Version.mk   |   10 ++++++++++
 configure.in |   13 +++++--------
 3 files changed, 16 insertions(+), 8 deletions(-)

New commits:
commit 98942f99f3e10a1898a11d29e5f40f894d74c0a7
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Wed Aug 27 17:53:02 2008 -0400

    [configure.in] Move library version information to Version.mk

diff --git a/Makefile.am b/Makefile.am
index 721d7c8..401af2c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -57,6 +57,7 @@ endif
 
 EXTRA_DIST = \
 	autogen.sh \
+	Version.mk \
 	AUTHORS \
 	BIBLIOGRAPHY \
 	BUGS \
diff --git a/Version.mk b/Version.mk
new file mode 100644
index 0000000..f042602
--- /dev/null
+++ b/Version.mk
@@ -0,0 +1,10 @@
+#
+# cairo package version number, (as distinct from shared library version)
+#
+# For the minor number: odd  => unstable series
+#			even => stable series
+# For the micro number: odd  => in-progress development (from git)
+#			even => tar-file snapshot or release
+cairo_version_major=1
+cairo_version_minor=7
+cairo_version_micro=5
diff --git a/configure.in b/configure.in
index 9985787..5b0bde9 100644
--- a/configure.in
+++ b/configure.in
@@ -1,13 +1,10 @@
 AC_PREREQ(2.58)
 
-dnl cairo package version number, (as distinct from shared library version)
-dnl For the minor number: odd => unstable series
-dnl			  even => stable series
-dnl For the micro number: odd => in-progress development (from git)
-dnl			  even => tar-file snapshot or release
-m4_define(cairo_version_major, 1)
-m4_define(cairo_version_minor, 7)
-m4_define(cairo_version_micro, 5)
+m4_define([cairo_version_macro],
+		m4_bpatsubst(m4_include(Version.mk),
+			     [^\([a-zA-Z0-9_]*\) *= *\(.*\)],
+			     [[m4_define(\1, \[\2\])]]))
+cairo_version_macro
 
 m4_define([cairo_release_status],
 	  [m4_if(m4_eval(cairo_version_micro % 2), [1], [git],