UPDATED -- Re: Okay to commit? PATCH to bonobo-activation -- adds glib-gettextizesupport and migrates configure.in to meet Gnome 2.0 Porting Guiderecommendations.

[Miles Lane <miles megapathdsl net>]

Hi,

After working with kevinv for quite a while, it became clear
that something about using the new AM_INIT_AUTOMAKE syntax
was causing the VERSION variable values to get lost.  So, after
much trial and error, we decided to go with the old AM_INIT_AUTOMAKE
stuff, because it allows us to use the VERSION tracking approach
from libgtop and bonobo-activation more or less unchanged.

kevinv has conditioned acceptance of the patch to libgtop upon
your acceptance of this patch for bonobo-activation (he's going
to be away from the internet for a couple of weeks).

All feedback welcomed.

	Miles


--- configure.in.old	Fri Dec 14 16:33:06 2001
+++ configure.in	Fri Dec 14 16:32:34 2001
@@ -1,13 +1,20 @@
 dnl Process this file with autoconf to produce a configure script.
+
 AC_INIT(idl/Bonobo_ActivationContext.idl)
 
+dnl Specify a header configuration file
+AM_CONFIG_HEADER(config.h)
+
 BONOBO_ACTIVATION_MAJOR_VERSION=0
 BONOBO_ACTIVATION_MINOR_VERSION=9
 BONOBO_ACTIVATION_MICRO_VERSION=3
+BONOBO_ACTIVATION_VERSION=$BONOBO_ACTIVATION_MAJOR_VERSION.$BONOBO_ACTIVATION_MINOR_VERSION.$BONOBO_ACTIVATION_MICRO_VERSION
+
+AM_INIT_AUTOMAKE(bonobo-activation, $BONOBO_ACTIVATION_VERSION)
+
 BONOBO_ACTIVATION_INTERFACE_AGE=0
 BONOBO_ACTIVATION_BINARY_AGE=0
-BONOBO_ACTIVATION_VERSION="$BONOBO_ACTIVATION_MAJOR_VERSION.$BONOBO_ACTIVATION_MINOR_VERSION.$BONOBO_ACTIVATION_MICRO_VERSION"
-AM_INIT_AUTOMAKE(bonobo-activation, $BONOBO_ACTIVATION_VERSION)
+
 AC_SUBST(BONOBO_ACTIVATION_MAJOR_VERSION)
 AC_SUBST(BONOBO_ACTIVATION_MINOR_VERSION)
 AC_SUBST(BONOBO_ACTIVATION_MICRO_VERSION)
@@ -28,10 +35,6 @@
 AC_SUBST(LT_REVISION)
 AC_SUBST(LT_AGE)
 
-
-dnl Specify a header configuration file
-AM_CONFIG_HEADER(config.h)
-
 dnl Initialize maintainer mode
 AM_MAINTAINER_MODE
 
@@ -44,7 +47,7 @@
 
 dnl Checks for programs.
 AC_PROG_CC
-AM_PROG_LEX
+dnl AM_PROG_LEX
 AC_PROG_YACC
 AC_PROG_INSTALL
 AC_PROG_LN_S
@@ -53,9 +56,13 @@
 
 dnl internationalization support
 ALL_LINGUAS="az da de el es fi fr ga gl hu it ja ko nl nn no pl pt_BR ro ru sk sl sv ta tr uk pl zh_CN zh_TW"
-AM_GNOME2_GETTEXT
 
-GNOME_COMMON_INIT
+GETTEXT_PACKAGE=bonobo-activation
+AC_SUBST(GETTEXT_PACKAGE)
+AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE")
+
+AM_GLIB_GNU_GETTEXT
+
 GNOME_PLATFORM_GNOME_2(yes, force)
 
 dnl Checks for libraries.