[Gnucash-changes] r13225 - gnucash/trunk - rework the initialization to require autoconf-2.59 and automake-1.9

[Derek Atkins]

Author: warlord
Date: 2006-02-11 18:24:01 -0500 (Sat, 11 Feb 2006)
New Revision: 13225
Trac: http://svn.gnucash.org/trac/changeset/13225

Modified:
   gnucash/trunk/ChangeLog
   gnucash/trunk/configure.in
Log:
rework the initialization to require autoconf-2.59 and automake-1.9
parse the version out of the AC_PACKAGE_VERSION macro, so
we still only need to set it in one place.  This should
solve a number of old-automake related problems people have seen.



Modified: gnucash/trunk/ChangeLog
===================================================================
--- gnucash/trunk/ChangeLog	2006-02-11 22:50:28 UTC (rev 13224)
+++ gnucash/trunk/ChangeLog	2006-02-11 23:24:01 UTC (rev 13225)
@@ -6,6 +6,12 @@
 	* src/business/business-reports/owner-report.scm:
 	  set the document title properly AFTER type-str is set.
 
+	* configure.in:
+	  rework the initialization to require autoconf-2.59 and automake-1.9
+	  parse the version out of the AC_PACKAGE_VERSION macro, so
+	  we still only need to set it in one place.  This should
+	  solve a number of old-automake related problems people have seen.
+
 2006-02-11  David Hampton  <hampton at employees.org>
 
 	* src/gnome/glade/acctperiod.glade:

Modified: gnucash/trunk/configure.in
===================================================================
--- gnucash/trunk/configure.in	2006-02-11 22:50:28 UTC (rev 13224)
+++ gnucash/trunk/configure.in	2006-02-11 23:24:01 UTC (rev 13225)
@@ -19,20 +19,20 @@
 #   Footer    - Autoconf footer stuff
 
 # Autoconf initialization
-AC_INIT
+AC_PREREQ(2.59)
+AC_INIT([gnucash], [1.9.0], [gnucash-devel at gnucash.org])
 AC_CONFIG_HEADERS(config.h)
 AC_CONFIG_SRCDIR(src/engine/Transaction.h)
-AC_PREREQ(2.53)
 
-# Define the version number
-GNUCASH_MAJOR_VERSION=1
-GNUCASH_MINOR_VERSION=9
-GNUCASH_MICRO_VERSION=0
-GNUCASH_VERSION_STRING="$GNUCASH_MAJOR_VERSION.$GNUCASH_MINOR_VERSION.$GNUCASH_MICRO_VERSION"
+# Initialize automake -- make sure we have at least version 1.9
+AM_INIT_AUTOMAKE(1.9)
 
-AM_INIT_AUTOMAKE(gnucash, $GNUCASH_VERSION_STRING)
+# Parse out the version number
+GNUCASH_VERSION_STRING=AC_PACKAGE_VERSION
+GNUCASH_MAJOR_VERSION=`echo $GNUCASH_VERSION_STRING | sed -e 's/^\([^\.]*\)\.\([^.]*\)\.\(.*\)$/\1/'`
+GNUCASH_MINOR_VERSION=`echo $GNUCASH_VERSION_STRING | sed -e 's/^\([^\.]*\)\.\([^.]*\)\.\(.*\)$/\2/'`
+GNUCASH_MICRO_VERSION=`echo $GNUCASH_VERSION_STRING | sed -e 's/^\([^\.]*\)\.\([^.]*\)\.\(.*\)$/\3/'`
 
-
 ##  Do this first, because the other tests depend on it:
 
 # Check for gcc and intltool (somehow breaks the suggested content