[Gnucash-changes] Version string now composed from the separate numbers.

[Christian Stimming]

Log Message:
-----------
Version string now composed from the separate numbers.

2005-10-26  Christian Stimming  <stimming at tuhh.de>

	* configure.in: Compose the version string again from several
	shell variables. Makes life much easier for anyone, including
	potential automated tarball builds. Slight updates in the build
	system.

Tags:
----
gnucash-gnome2-dev

Modified Files:
--------------
    gnucash:
        ChangeLog
        Makefile.am
        configure.in

Revision Data
-------------
Index: configure.in
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/configure.in,v
retrieving revision 1.359.2.72
retrieving revision 1.359.2.73
diff -Lconfigure.in -Lconfigure.in -u -r1.359.2.72 -r1.359.2.73
--- configure.in
+++ configure.in
@@ -18,21 +18,25 @@
 #   Libraries - Check for libraries
 #   Footer    - Autoconf footer stuff
 
+# Autoconf initialization
+AC_INIT(gnucash)
+AC_CONFIG_HEADERS(config.h)
+AC_CONFIG_SRCDIR(src/engine/Transaction.h)
+AC_PREREQ(2.53)
 
-##  Do this first, because the other tests depend on it:
+# 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"
 
-### --------------------------------------------------------------------------
-### Headers
-### check for various programs, and stuff (do this first because later
-### commands depend on them):
+AM_INIT_AUTOMAKE($PACKAGE_NAME, $GNUCASH_VERSION_STRING)
 
-AC_INIT(gnucash, 1.99.0, http://bugzilla.gnome.org/enter_bug.cgi?product=GnuCash)
-AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
 
-AM_CONFIG_HEADER(config.h)
-AC_CONFIG_SRCDIR(src/engine/Transaction.h)
-AC_PREREQ(2.53)
+##  Do this first, because the other tests depend on it:
 
+# Check for gcc and intltool (somehow breaks the suggested content
+# order, doesn't it? Whatever.)
 AC_PROG_CC
 AC_PROG_INTLTOOL
 
@@ -51,10 +55,6 @@
 # that is explicitly tagged in cvs as a version.
 AC_DEFINE(GNUCASH_CVS,1,[Define if built from untagged cvs])
 
-GNUCASH_MAJOR_VERSION=1
-GNUCASH_MINOR_VERSION=9
-GNUCASH_MICRO_VERSION=0
-
 AC_SUBST(GNUCASH_MAJOR_VERSION)
 AC_SUBST(GNUCASH_MINOR_VERSION)
 AC_SUBST(GNUCASH_MICRO_VERSION)
@@ -78,7 +78,7 @@
 
 
 AM_MAINTAINER_MODE
-#AM_ACLOCAL_INCLUDE(macros) -- old, deprecated macro
+AC_CONFIG_MACRO_DIR(macros)
 
 
 AC_PROG_INSTALL
@@ -1264,7 +1264,7 @@
 LIBOBJS_SEDSCRIPT="s,\.[[^.]]* ,$U&,g;s,\.[[^.]]*\$\$,$U&,"
 AC_SUBST(LIBOBJS_SEDSCRIPT)
 
-AC_OUTPUT( po/Makefile.in
+AC_CONFIG_FILES(po/Makefile.in
           dnl # Makefiles
           Makefile
           accounts/Makefile
@@ -1422,7 +1422,8 @@
           gnucash-config
           ,
           dnl # commands go here, but we don't have any right now
-          )
+)
+AC_OUTPUT
 
 if test x$RPC_DIR = xrpc ; then
        AC_MSG_WARN([
Index: ChangeLog
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/ChangeLog,v
retrieving revision 1.1487.2.356
retrieving revision 1.1487.2.357
diff -LChangeLog -LChangeLog -u -r1.1487.2.356 -r1.1487.2.357
--- ChangeLog
+++ ChangeLog
@@ -1,3 +1,10 @@
+2005-10-26  Christian Stimming  <stimming at tuhh.de>
+
+	* configure.in: Compose the version string again from several
+	shell variables. Makes life much easier for anyone, including
+	potential automated tarball builds. Slight updates in the build
+	system.
+
 2005-10-26  David Hampton  <hampton at employees.org>
 
 	* src/scm/main.scm: Update previous version to 1.8.12.
Index: Makefile.am
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/Makefile.am,v
retrieving revision 1.55.4.10
retrieving revision 1.55.4.11
diff -LMakefile.am -LMakefile.am -u -r1.55.4.10 -r1.55.4.11
--- Makefile.am
+++ Makefile.am
@@ -123,7 +123,7 @@
 
 .PHONY: etags ctags
 
-ACLOCAL_AMFLAGS = -I m4
+ACLOCAL_AMFLAGS = -I macros -I m4
 
 .PHONY: doc
 doc: