bakery r109 - trunk

[murrayc svn gnome org]

Author: murrayc
Date: Wed Mar 26 18:23:43 2008
New Revision: 109
URL: http://svn.gnome.org/viewvc/bakery?rev=109&view=rev

Log:
Increased version

Modified:
   trunk/ChangeLog
   trunk/NEWS
   trunk/configure.in

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	(original)
+++ trunk/NEWS	Wed Mar 26 18:23:43 2008
@@ -1,3 +1,14 @@
+2.5.1:
+
+This is a new bakery-2.6 API/ABI. It installs in parallel with bakery-2.4.
+
+* Ported to giomm (part of glibmm), 
+  removing the dependency on gnome-vfsmm or gnome-vfs.
+* Document_XML: Added add_indenting_white_space_to_node() for more useful indenting 
+  than libxml gives (because libxml gives up when it finds a text node, 
+  somewhat understandably).
+  Let's see how well this works. It is probably very bad for some documents.
+
 2.4.4:
 
 * Document: Added load_from_data().

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Wed Mar 26 18:23:43 2008
@@ -2,8 +2,41 @@
 dnl Initialization macros.
 dnl --------------------------------
 
-AC_INIT(bakery/bakery.h)
-# AC_CONFIG_AUX_DIR(scripts) #Breaks intltools for some reason.
+
+#We use pushdef here because we can't use shell variables before AC_INIT, but we want to use a variable with AC_INIT:
+pushdef([GENERIC_MAJOR_VERSION],     [2])
+pushdef([GENERIC_MINOR_VERSION],     [5])
+pushdef([GENERIC_MICRO_VERSION],     [1])
+pushdef([GENERIC_EXTRA_VERSION],     [])
+pushdef([GENERIC_VERSION], GENERIC_MAJOR_VERSION.GENERIC_MINOR_VERSION.GENERIC_MICRO_VERSION[]GENERIC_EXTRA_VERSION)
+AC_INIT([bakery], GENERIC_VERSION, [gtkmm-list gnome org])
+AC_CONFIG_SRCDIR([bakery/bakeryconfig.h.in])
+AC_PREREQ(2.59)
+
+
+#########################################################################
+#  Version and initialization
+#########################################################################
+[GTKMM_MAJOR_VERSION]=GENERIC_MAJOR_VERSION
+[GENERIC_MINOR_VERSION]=GENERIC_MINOR_VERSION
+[GENERIC_MICRO_VERSION]=GENERIC_MICRO_VERSION
+[GENERIC_EXTRA_VERSION]=GENERIC_EXTRA_VERSION
+[GENERIC_VERSION]=GENERIC_VERSION
+popdef([GENERIC_MAJOR_VERSION])
+popdef([GENERIC_MINOR_VERSION])
+popdef([GENERIC_MICRO_VERSION])
+popdef([GENERIC_EXTRA_VERSION])
+popdef([GENERIC_VERSION])
+GENERIC_RELEASE=$GENERIC_MAJOR_VERSION.$GENERIC_MINOR_VERSION
+AC_DEFINE_UNQUOTED(GENERIC_MAJOR_VERSION, $GENERIC_MAJOR_VERSION, [Major version of gtkmm])
+AC_DEFINE_UNQUOTED(GENERIC_MINOR_VERSION, $GENERIC_MINOR_VERSION, [Minor version of gtkmm])
+AC_DEFINE_UNQUOTED(GENERIC_MICRO_VERSION, $GENERIC_MICRO_VERSION, [Micro version of gtkmm])
+AC_SUBST(GENERIC_MAJOR_VERSION)
+AC_SUBST(GENERIC_MINOR_VERSION)
+AC_SUBST(GENERIC_MICRO_VERSION)
+AC_SUBST(GENERIC_VERSION)
+AC_SUBST(GENERIC_RELEASE)
+
 AC_CONFIG_HEADERS(config.h bakery/bakeryconfig.h)
 
 dnl -----------------------------------------------
@@ -12,10 +45,6 @@
 
 GENERIC_LIBRARY_NAME=bakery
 
-#release versioning
-GENERIC_MAJOR_VERSION=2
-GENERIC_MINOR_VERSION=4
-GENERIC_MICRO_VERSION=4
 
 #shared library versioning
 GENERIC_LIBRARY_VERSION=1:0:0
@@ -41,10 +70,6 @@
 PACKAGE=$GENERIC_LIBRARY_NAME
 AC_SUBST(GENERIC_LIBRARY_NAME)
 
-GENERIC_VERSION=$GENERIC_MAJOR_VERSION.$GENERIC_MINOR_VERSION.$GENERIC_MICRO_VERSION
-GENERIC_RELEASE=$GENERIC_MAJOR_VERSION.$GENERIC_MINOR_VERSION
-AC_SUBST(GENERIC_RELEASE)
-AC_SUBST(GENERIC_VERSION)
 
 AC_DEFINE_UNQUOTED(GENERIC_MAJOR_VERSION, $GENERIC_MAJOR_VERSION, "define GENERIC_MAJOR_VERSION")
 AC_DEFINE_UNQUOTED(GENERIC_MINOR_VERSION, $GENERIC_MINOR_VERSION, "define GENERIC_MINOR_VERSION")
@@ -52,7 +77,7 @@
 
 VERSION=$GENERIC_VERSION
 
-AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define)
+AM_INIT_AUTOMAKE([1.9 tar-ustar])
 
 dnl -----------------------------------------------
 dnl Checks for programs: