Re: UPDATED (glib-gettextize patch)



On Fri, 2001-12-14 at 22:50, Darin Adler wrote:
> On 12/14/01 4:40 PM, "Miles Lane" <miles megapathdsl net> wrote:
> 
> > dnl Process this file with autoconf to produce a configure script.
> > +
> > AC_INIT(idl/Bonobo_ActivationContext.idl)
> 
> Gratuitous change. Why not leave it alone?

Extra line just added to make the file slightly easier to read.
No biggie.  I'll remove it.

> > +dnl Specify a header configuration file
> > +AM_CONFIG_HEADER(config.h)
> 
> Reason for moving this?

No good reason (see below).  Change removed from patch.

> > +BONOBO_ACTIVATION_VERSION=$BONOBO_ACTIVATION_MAJOR_VERSION.$BONOBO_ACTIVATION
> > _MINOR_VERSION.$BONOBO_ACTIVATION_MICRO_VERSION
> > +
> > +AM_INIT_AUTOMAKE(bonobo-activation, $BONOBO_ACTIVATION_VERSION)
>
> Reason for moving this?

I'll remove this part of the patch.  I only moved it while testing
various approaches to handling the AM_INIT_AUTOMAKE VERSION strings.
I was attempting to determine whether having variables defined before
or after the AM_INIT_AUTOMAKE is significant.  With the new
AM_INIT_AUTOMAKE usage, the order does appear to be significant.
When VERSION variables are defined before AM_INIT_AUTOMAKE is called,
the values are lost.  When they are defined afterward, the values are
not lost.  Reverting to the old AM_INIT_AUTOMAKE usage, the variable 
values are not lost.

Neither kevinv or I were able to figure out a good way to have
all the VERSION info work with the new AM_INIT_AUTOMAKE usage.

> > -AM_PROG_LEX
> > +dnl AM_PROG_LEX
>
> Please remove rather than commenting out. Are you sure it's OK to remove it?
> I've seen the warning that inspired you to remove it, but I'm not sure.

Hmm.  I guess I'll leave it in.  This appears to be needed in for
certain platforms.  Strangely, I get the error even after commenting out
this occurance.

Here's the documentation:

AM_PROG_LEX
    Like AC_PROG_LEX with AC_DECL_YYTEXT (see section `Particular
Program Checks' in The Autoconf Manual), but uses the missing script on
systems that do not have lex. `HP-UX 10' is one such system.

    Autoconf 2.50 and higher, in order to simplify the interface,
includes the body of AC_DECL_YYTEXT in AC_PROG_LEX. To ensure backward
compatibility, AC_DECL_YYTEXT is nevertheless defined as an invocation
of AC_PROG_LEX. Since AM_PROG_LEX invokes both, it causes an annoying
but benign warning (AC_PROG_LEX invoked multiple times) which you should
just ignore. In the future, once Automake requires Autoconf 2.50, this
issue will be fixed, but the current compatibility with Autoconf 2.13
prevents this.

> > -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
> 
> This looks like the real change. This part I would approve for commit
> without reservations, although I am slightly surprised that the
> AC_DEFINE_UNQUOTED line is needed.

Right.  I am just following the example shown in the Gnome 2.0 Porting
Guide.  Your's is the second criticism I've heard of changes that are
suggested in the Porting Guide.  First, Havoc suggested that the
changes to AM_INIT_AUTOMAKE and friends should be reverted, since they
require an upgraded autoconf.  If you think the AC_DEFINE_UNQUOTED is
really unnecessary or counter-productive, please communicate with the
Gnome 2.0 Release Team about and see if a consensus can be reached.

Anyhow, I'll back out the movement and spacing changes, as well as the
commenting out of AM_PROG_LEX.  If it is decided that AC_DEFINE_UNQUOTED
should come out, I'll remove that change, too.

There is another patch which needs to accompany this one:

diff -u --new-file  ../bonobo-activation/acconfig.h
bonobo-activation-acconfig.h  
--- ../bonobo-activation/acconfig.h	Sat Dec 15 15:07:17 2001
+++ bonobo-activation-acconfig.h	Fri Dec 14 11:28:32 2001
@@ -5,5 +5,6 @@
 #undef ENABLE_NLS
 #undef HAVE_CATGETS
 #undef HAVE_GETTEXT
+#undef GETTEXT_PACKAGE
 #undef HAVE_LC_MESSAGES
 #undef HAVE_STPCPY

Here's the proposed ChangeLog update:

diff -u --new-file  ../bonobo-activation/ChangeLog
bonobo-activation-ChangeLog 
--- ../bonobo-activation/ChangeLog	Sat Dec 15 15:08:19 2001
+++ bonobo-activation-ChangeLog	Sat Dec 15 15:09:48 2001
@@ -1,3 +1,8 @@
+2001-12-15  Miles Lane <miles megapathdsl net>
+
+	* acconfig.h:  Added "#undef HAVE_GETTEXT" entry.
+	* configure.in:  added glib-gettextize support.
+
 2001-12-15  Ross Golder  <rossg golder org>
 
 	* bonobo-activation.spec.in: Added 'share' to docdir.


Thanks,
	Miles 




[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]