Define version number in one place

Adding the version.m4 macro defines VERSION_NUMBER for us in
one place so that we can simplify package releases (and fix
'osrf_config --version' output so that it does not always
tell us 'trunk').

Signed-off-by: Dan Scott <dscott@laurentian.ca>

diff --git a/configure.ac b/configure.ac
index 2b60acb..9dc04ab 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -20,9 +20,10 @@
 #-------------------------------
 
 export PATH=${PATH}:/usr/sbin
+m4_include([version.m4])
 AC_PREREQ(2.59)
-AC_INIT([OpenSRF],[trunk],[open-ils-dev@list.georgialibraries.org])
-AM_INIT_AUTOMAKE([OpenSRF], [trunk])
+AC_INIT([OpenSRF],m4_defn([VERSION_NUMBER]),[open-ils-dev@list.georgialibraries.org])
+AM_INIT_AUTOMAKE([OpenSRF], m4_defn([VERSION_NUMBER]))
 AC_REVISION($Revision: 0.1 $)
 AC_CONFIG_SRCDIR([configure.ac])
 AC_PREFIX_DEFAULT([/opensrf])

diff --git a/version.m4 b/version.m4
new file mode 100644 (file)
index 0000000..5c284f9
--- /dev/null
+++ b/version.m4
@@ -0,0 +1 @@
+m4_define([VERSION_NUMBER],[master])