Index: configure.in
===================================================================
RCS file: /cvs/gnome/gtkmm/configure.in,v
retrieving revision 1.48
diff -u -r1.48 configure.in
--- configure.in	13 Nov 2004 10:32:52 -0000	1.48
+++ configure.in	2 Dec 2004 19:04:33 -0000
@@ -11,16 +11,28 @@
 #  Copyright 1999 gtkmm Development Team
 #  Copyright 1998 Stephan Kulow 
 #
-AC_INIT(gtk/gtkmmconfig.h.in)
+pushdef([GTKMM_MAJOR_VERSION],     [2])
+pushdef([GTKMM_MINOR_VERSION],     [5])
+pushdef([GTKMM_MICRO_VERSION],     [1])
+pushdef([GTKMM_EXTRA_VERSION],     [])
+pushdef([GTKMM_VERSION], GTKMM_MAJOR_VERSION.GTKMM_MINOR_VERSION.GTKMM_MICRO_VERSION[]GTKMM_EXTRA_VERSION)
+AC_INIT([gtkmm], GTKMM_VERSION, [gtkmm-list@gnome.org])
+AC_CONFIG_SRCDIR([gtk/gtkmmconfig.h.in])
 AC_PREREQ(2.50)
 
 #########################################################################
 #  Version and initialization
 #########################################################################
-GTKMM_MAJOR_VERSION=2
-GTKMM_MINOR_VERSION=5
-GTKMM_MICRO_VERSION=1
-GTKMM_VERSION=$GTKMM_MAJOR_VERSION.$GTKMM_MINOR_VERSION.$GTKMM_MICRO_VERSION
+[GTKMM_MAJOR_VERSION]=GTKMM_MAJOR_VERSION
+[GTKMM_MINOR_VERSION]=GTKMM_MINOR_VERSION
+[GTKMM_MICRO_VERSION]=GTKMM_MICRO_VERSION
+[GTKMM_EXTRA_VERSION]=GTKMM_EXTRA_VERSION
+[GTKMM_VERSION]=GTKMM_VERSION
+popdef([GTKMM_MAJOR_VERSION])
+popdef([GTKMM_MINOR_VERSION])
+popdef([GTKMM_MICRO_VERSION])
+popdef([GTKMM_EXTRA_VERSION])
+popdef([GTKMM_VERSION])
 GTKMM_RELEASE=$GTKMM_MAJOR_VERSION.$GTKMM_MINOR_VERSION
 AC_DEFINE_UNQUOTED(GTKMM_MAJOR_VERSION, $GTKMM_MAJOR_VERSION, [Major version of gtkmm])
 AC_DEFINE_UNQUOTED(GTKMM_MINOR_VERSION, $GTKMM_MINOR_VERSION, [Minor version of gtkmm])
@@ -40,12 +52,8 @@
 
 AC_CONFIG_AUX_DIR(scripts)
 
-dnl For automake.
-VERSION=$GTKMM_VERSION
-PACKAGE=gtkmm
-
 dnl Initialize automake stuff
-AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
+AM_INIT_AUTOMAKE([1.9 tar-ustar])
 
 dnl Specify a configuration file (no autoheader)
 AM_CONFIG_HEADER(config.h gdk/gdkmmconfig.h gtk/gtkmmconfig.h)
