From c76bd2a653283324f399248712d8b2c806336a85 Mon Sep 17 00:00:00 2001
From: Qball Cow <qball@sarine.nl>
Date: Fri, 13 Feb 2009 16:49:15 +0100
Subject: [PATCH] Generate version string in libmpd-version from configure.ac

---
 configure.ac            | 11 ++++++++++-
 src/libmpd-version.h.in |  6 +++---
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 52c7085..16bc9b6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,10 +2,19 @@ AC_INIT([libmpd], [0.17.97-git], [qball@sarine.nl])
 AM_CONFIG_HEADER(config.h)
 m4_define([package_major_version], [0])
 m4_define([package_minor_version], [17])
-m4_define([package_micro_version], [97-git])
+m4_define([package_micro_version], [97])
 m4_define([package_version], [package_major_version.package_minor_version.package_micro_version])
 AM_INIT_AUTOMAKE
+AC_CONFIG_MACRO_DIR([m4])
 
+
+# This makes sure the right substitution is done
+[LIBMPD_MAJOR_VERSION]=package_major_version
+[LIBMPD_MINOR_VERSION]=package_minor_version
+[LIBMPD_MICRO_VERSION]=package_micro_version
+AC_SUBST([LIBMPD_MAJOR_VERSION])
+AC_SUBST([LIBMPD_MINOR_VERSION])
+AC_SUBST([LIBMPD_MICRO_VERSION])
 #  C:R:A
 #  C is updated on abi break 
 #  R is on changed source code.
diff --git a/src/libmpd-version.h.in b/src/libmpd-version.h.in
index 69ee1a5..41c3b7f 100644
--- a/src/libmpd-version.h.in
+++ b/src/libmpd-version.h.in
@@ -20,7 +20,7 @@
 #ifndef LIBMPD_VERSION
 #define LIBMPD_VERSION "@VERSION@"
 
-#define LIBMPD_MAJOR_VERSION (0)
-#define LIBMPD_MINOR_VERSION (17)
-#define LIBMPD_MICRO_VERSION (1)
+#define LIBMPD_MAJOR_VERSION (@LIBMPD_MAJOR_VERSION@)
+#define LIBMPD_MINOR_VERSION (@LIBMPD_MINOR_VERSION@)
+#define LIBMPD_MICRO_VERSION (@LIBMPD_MICRO_VERSION@)
 #endif
-- 
2.11.4.GIT