Index: acinclude.m4
===================================================================
RCS file: /cvs/gnome/gossip/acinclude.m4,v
retrieving revision 1.2
diff -u -r1.2 acinclude.m4
--- acinclude.m4	15 Oct 2003 22:09:54 -0000	1.2
+++ acinclude.m4	9 Sep 2004 11:40:19 -0000
@@ -7,7 +7,11 @@
 	default_compile_warnings="no"
     fi
 
-    AC_ARG_WITH(compile-warnings, [  --with-compile-warnings=[no/yes/error] Compiler warnings ], [enable_compile_warnings="$withval"], [enable_compile_warnings="$default_compile_warnings"])
+    AC_ARG_WITH(compile-warnings,
+                AS_HELP_STRING([--with-compile-warnings=@<:@no/yes/error@:>@],
+                               [Compiler warnings]),
+                [enable_compile_warnings="$withval"],
+                [enable_compile_warnings="$default_compile_warnings"])
 
     warnCFLAGS=
     if test "x$GCC" != xyes; then
Index: autogen.sh
===================================================================
RCS file: /cvs/gnome/gossip/autogen.sh,v
retrieving revision 1.6
diff -u -r1.6 autogen.sh
--- autogen.sh	18 May 2004 21:51:07 -0000	1.6
+++ autogen.sh	9 Sep 2004 11:40:20 -0000
@@ -3,8 +3,8 @@
 
 : ${AUTOCONF=autoconf}
 : ${AUTOHEADER=autoheader}
-: ${AUTOMAKE=automake-1.7}
-: ${ACLOCAL=aclocal-1.7}
+: ${AUTOMAKE=automake-1.9}
+: ${ACLOCAL=aclocal-1.9}
 : ${LIBTOOLIZE=libtoolize}
 : ${INTLTOOLIZE=intltoolize}
 : ${LIBTOOL=libtool}
@@ -47,7 +47,7 @@
 ($AUTOMAKE --version) < /dev/null > /dev/null 2>&1 || {
 	echo
 	echo "You must have automake installed to compile $PROJECT."
-	echo "Get ftp://sourceware.cygnus.com/pub/automake/automake-1.4.tar.gz"
+	echo "Get ftp://ftp.gnu.org/pub/gnu/automake/automake-1.9.tar.gz"
 	echo "(or a newer version if it is available)"
 	DIE=1
 }
Index: configure.in
===================================================================
RCS file: /cvs/gnome/gossip/configure.in,v
retrieving revision 1.68
diff -u -r1.68 configure.in
--- configure.in	2 Sep 2004 19:53:59 -0000	1.68
+++ configure.in	9 Sep 2004 11:40:20 -0000
@@ -1,8 +1,9 @@
-AC_INIT(src)
-AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(gossip, 0.7.8)
-
-AM_MAINTAINER_MODE
+AC_INIT(Imendio Gossip, 0.7.8, , gossip)
+AC_PREREQ(2.59)
+AC_COPYRIGHT([Copyright (C) 2003-2004 Imendio HB])
+AC_CONFIG_SRCDIR(src/gossip-app.h)
+AC_CONFIG_HEADERS(config.h)
+AM_INIT_AUTOMAKE(1.9 -Wall check-news dist-bzip2 no-define)
 
 AC_ISC_POSIX
 AC_PROG_CC
@@ -20,7 +21,10 @@
 
 dnl D-BUS
 dnl ==========================
-AC_ARG_ENABLE(dbus, [  --enable-dbus=[no/yes/auto]    compile with d-bus support.],,enable_dbus=no)
+AC_ARG_ENABLE(dbus,
+              AS_HELP_STRING([--enable-dbus=@<:@no/yes/auto@:>@],
+                             [compile with d-bus support]), ,
+              enable_dbus=no)
 
 if test "x$enable_dbus" != "xno"; then
    dbus_pkgconfig_tmp="dbus-1 >= 0.22 dbus-glib-1"
@@ -48,30 +52,19 @@
 dnl
 dnl ==========================================================================
 
-dnl If you add a version number here, you *must* add an AC_SUBST line for
-dnl it too, or it will never make it into the spec file!
+dnl AC_SUBST is required to ensure that the versions number end up into the
+dnl spec file.
 
-LIBXML_REQUIRED=2.4.7
-LIBXSLT_REQUIRED=1.0.0
-GLIB_REQUIRED=2.4.0
-GTK_REQUIRED=2.4.0
-LIBGLADE_REQUIRED=2.0.0
-LOUDMOUTH_REQUIRED=0.17
-GCONF_REQUIRED=1.2.0
-LIBGNOMEUI_REQUIRED=2.0.0
-LIBGNOMEVFS_REQUIRED=2.0.0
-DESKTOP_FILE_UTILS_REQUIRED=0.2.90
-
-AC_SUBST(LIBXML_REQUIRED)
-AC_SUBST(LIBXSLT_REQUIRED)
-AC_SUBST(GLIB_REQUIRED)
-AC_SUBST(GTK_REQUIRED)
-AC_SUBST(LIBGLADE_REQUIRED)
-AC_SUBST(LOUDMOUTH_REQUIRED)
-AC_SUBST(GCONF_REQUIRED)
-AC_SUBST(LIBGNOMEUI_REQUIRED)
-AC_SUBST(LIBGNOMEVFS_REQUIRED)
-AC_SUBST(DESKTOP_FILE_UTILS_REQUIRED)
+AC_SUBST(LIBXML_REQUIRED, 2.4.7)
+AC_SUBST(LIBXSLT_REQUIRED, 1.0.0)
+AC_SUBST(GLIB_REQUIRED, 2.4.0)
+AC_SUBST(GTK_REQUIRED, 2.4.0)
+AC_SUBST(LIBGLADE_REQUIRED, 2.0.0)
+AC_SUBST(LOUDMOUTH_REQUIRED, 0.17)
+AC_SUBST(GCONF_REQUIRED, 1.2.0)
+AC_SUBST(LIBGNOMEUI_REQUIRED, 2.0.0)
+AC_SUBST(LIBGNOMEVFS_REQUIRED, 2.0.0)
+AC_SUBST(DESKTOP_FILE_UTILS_REQUIRED.0.2.90)
 
 dnl To make the egg stuff build properly, should have a real test...
 AC_DEFINE(HAVE_GTK_MULTIHEAD,0,[gtk+ with multihead support found])
@@ -146,18 +139,9 @@
 ALL_LINGUAS="ar az ca cs cy da de en_CA en_GB eo es eu fr ga hr it lt ml ms nl no pl pt pt_BR ru sq sr sr@Latn sv uk zh_CN zh_TW"
 
 AM_GLIB_GNU_GETTEXT
-
-if test "x$prefix" = "xNONE"; then
-  GOSSIP_LOCALEDIR=$ac_default_prefix/share/locale
-else
-  GOSSIP_LOCALEDIR=$prefix/share/locale
-fi
-AC_DEFINE_UNQUOTED(GOSSIP_LOCALEDIR, "$GOSSIP_LOCALEDIR",[locale directory])
 dnl -----------------------------------------------------------
 
 CFLAGS="$CFLAGS $WARN_CFLAGS"
-
-AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
 
 AC_OUTPUT([
 Makefile
Index: src/Makefile.am
===================================================================
RCS file: /cvs/gnome/gossip/src/Makefile.am,v
retrieving revision 1.29
diff -u -r1.29 Makefile.am
--- src/Makefile.am	5 Sep 2004 22:36:09 -0000	1.29
+++ src/Makefile.am	9 Sep 2004 11:40:45 -0000
@@ -1,6 +1,6 @@
 SUBDIRS = sounds
 
-INCLUDES =	\
+AM_CPPFLAGS =	\
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
 	-DPREFIX="\"$(prefix)"\"		\
 	-DSYSCONFDIR=\""$(sysconfdir)"\"        \
Index: src/gossip-about.c
===================================================================
RCS file: /cvs/gnome/gossip/src/gossip-about.c,v
retrieving revision 1.3
diff -u -r1.3 gossip-about.c
--- src/gossip-about.c	7 Jul 2004 16:37:44 -0000	1.3
+++ src/gossip-about.c	9 Sep 2004 11:40:46 -0000
@@ -325,7 +325,7 @@
 
 	data = g_new0 (AboutData, 1);
 
-	data->title = "Imendio Gossip " VERSION;
+	data->title = PACKAGE_STRING;
 
 	data->written_by =
 		"Mikael Hallendal\n"
Index: src/gossip-app.c
===================================================================
RCS file: /cvs/gnome/gossip/src/gossip-app.c,v
retrieving revision 1.136
diff -u -r1.136 gossip-app.c
--- src/gossip-app.c	5 Sep 2004 22:36:09 -0000	1.136
+++ src/gossip-app.c	9 Sep 2004 11:40:47 -0000
@@ -1157,8 +1157,8 @@
 			lm_message_node_set_attributes (node,
 							"xmlns", namespace,
 							NULL);
-			lm_message_node_add_child (node, "name", "Imendio Gossip");
-			lm_message_node_add_child (node, "version", VERSION);
+			lm_message_node_add_child (node, "name", PACKAGE_NAME);
+			lm_message_node_add_child (node, "version", PACKAGE_VERSION);
 			
 			uname (&osinfo);
 			lm_message_node_add_child (node, "os", osinfo.sysname);
Index: src/gossip-main.c
===================================================================
RCS file: /cvs/gnome/gossip/src/gossip-main.c,v
retrieving revision 1.13
diff -u -r1.13 gossip-main.c
--- src/gossip-main.c	21 Apr 2004 00:04:26 -0000	1.13
+++ src/gossip-main.c	9 Sep 2004 11:40:48 -0000
@@ -89,11 +89,11 @@
 		{ NULL, '\0', 0, NULL, 0, NULL, NULL }
 	};
 	
-	bindtextdomain (PACKAGE, GNOMELOCALEDIR);
+	bindtextdomain (PACKAGE_TARNAME, GNOMELOCALEDIR);
         bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
-	textdomain (PACKAGE);
+	textdomain (PACKAGE_TARNAME);
 
-	program = gnome_program_init (PACKAGE, VERSION,
+	program = gnome_program_init (PACKAGE_TARNAME, PACKAGE_VERSION,
 				      LIBGNOMEUI_MODULE,
                                       argc, argv,
                                       GNOME_PROGRAM_STANDARD_PROPERTIES,
