Update the GBS

[Akim Demaille]

I'm installing this.

Index: ChangeLog
from  Akim Demaille  <address@hidden>

        * configure.ac: Automake 1.7.1, Autoconf 2.54, Gettext 0.11.5,
        used as `external', and Libtool 1.4.3.
        (LINGUAS): Remove.
        (LTLIBOBJS): Don't play with it.
        * intl/: Remove.
        * Makefile.am (SUBDIRS): Remove intl.
        (ACLOCAL_AMFLAGS): Add -I config.
        (EXTRA_DIST): Add config/config.rpath.
        * po/LINGUAS: New.
        * po/Makevars: New.
        * modules/perl.c (M4INIT_HANDLER): Don't prototype xs_init.

Index: Makefile.am
===================================================================
RCS file: /cvsroot/m4/m4/Makefile.am,v
retrieving revision 1.9
diff -u -u -r1.9 Makefile.am
--- Makefile.am 5 Sep 2001 08:15:38 -0000 1.9
+++ Makefile.am 4 Nov 2002 16:29:58 -0000
@@ -19,16 +19,14 @@
 ##
 ## Written by Gary V. Vaughan <address@hidden>
 
-AUTOMAKE_OPTIONS = 1.5 dist-bzip2
-
-EXTRA_DIST     = bootstrap
+EXTRA_DIST     = config/config.rpath  bootstrap
 
 auxdir         = $(top_srcdir)/$(ac_aux_dir)
 
 ## There is currently no means with Automake not to run aclocal.
-ACLOCAL_AMFLAGS = --version >/dev/null && touch aclocal.m4
+ACLOCAL_AMFLAGS = -I config
 
-SUBDIRS                        = intl po config m4 modules src tests examples 
doc .
+SUBDIRS                        = po config m4 modules src tests examples doc .
 MAINTAINERCLEANFILES   = ABOUT-NLS COPYING INSTALL Makefile.in aclocal.m4 \
                          config-h.in configure ltmain.sh stamp-h.in \
                          po/cat-id-tbl.c po/m4.pot po/stamp-cat-id
Index: bootstrap
===================================================================
RCS file: /cvsroot/m4/m4/bootstrap,v
retrieving revision 1.16
diff -u -u -r1.16 bootstrap
--- bootstrap 29 May 2002 03:10:31 -0000 1.16
+++ bootstrap 4 Nov 2002 16:29:58 -0000
@@ -1,82 +1,9 @@
 #! /bin/sh -x
 
 # helps bootstrapping M4, when checked out from CVS
-# requires GNU autoconf, GNU automake and GNU libtool
+# requires GNU Autoconf, GNU Automake, GNU Gettext and GNU Libtool
 
-find . -name autom4te.cache | xargs rm -rf
-
-auxdir=`grep '^AC_CONFIG_AUX_DIR' configure.ac | sed 's/^.*(\([^)]*\)).*$/\1/'`
-
-rm -f config.cache
-rm aclocal.m4
-
-trap 'rm -f aclocal.m4t' 0 1 9 15
-
-# Make a copy of each Automake/Gettext m4 file we need.
-aclocal_libdir=`aclocal --print-ac-dir`
-aclocal_version=`aclocal --version | sed 's/^.* //;q'`
-aclocal_apiversion=`echo $aclocal_version | sed 's/\([0-9]*\.[0-9]*\).*$/\1/'`
-aclocal_apilibdir=$aclocal_libdir-$aclocal_apiversion
-for i in `make -f config/Makefile.am spy SPIED=ACLOCAL_MACROS`
-do
-  cp $aclocal_apilibdir/$i config 2>/dev/null ||
-    cp $aclocal_libdir/$i config  2>/dev/null ||
-    echo "$0: cannot find $i" >&2
-done
-
-
-# aclocal is one of the worst things that ever happened to the GNU
-# build system...
-{
-  sed 's/^  //' <<EOF
-  # This file was gererated by $0.
-  # Do not edit by hand, *nor by aclocal*.
-
-  # aclocal macros.
-EOF
-  for i in `make -f config/Makefile.am spy SPIED=ACLOCAL_MACROS`
-  do
-    echo "m4_include([config/$i])"
-  done
-  echo
-  echo '# GNU M4 macros.'
-  for i in `make -f config/Makefile.am spy SPIED=SPECIFIC_MACROS`
-  do
-    echo "m4_include([config/$i])"
-  done
-  echo
-} >aclocal.m4
-
-
-# Automake understands nothing to our aclocal and misses all its
-# AC_SUBST...  We need aclocal to contain the includes though, otherwise
-# autoconf won't see them either :)
-# Output them, but in a way that makes m4 ignore then.
-#
-# Don't have aclocal grow while autoconf reads it: use aclocal.m4t.
-{
-  echo '# Help Automake understand includes.'
-  echo "ifelse("
-  echo "  ["
-  echo "    # It doesn't see its own version."
-  echo "    AM_AUTOMAKE_VERSION([$aclocal_version])"
-  echo "    # It doesn't see AC_SUBSTs."
-  autoconf -t AC_SUBST:'    AC_SUBST([$1])' | sort -u
-  echo "    # It doesn't see AM_CONDITIONALs."
-  autoconf -t AM_CONDITIONAL:'    AM_CONDITIONAL([$1])' | sort -u
-  echo "  ]"
-  echo ")"
-} >aclocal.m4t
-
-cat aclocal.m4t >>aclocal.m4
-
-# shtoolize -q -I ./$auxdir echo move install mkdir version || exit 1
-# gettextize -f -c  || exit 1
-libtoolize --force --copy || exit 1
-touch config-h.in
-automake --add-missing --copy || exit 1
-autoconf || exit 1
-autoheader || exit 1
+autoreconf -fvi
 
 (
   cd tests
Index: configure.ac
===================================================================
RCS file: /cvsroot/m4/m4/configure.ac,v
retrieving revision 1.6
diff -u -u -r1.6 configure.ac
--- configure.ac 22 Jan 2002 16:24:26 -0000 1.6
+++ configure.ac 4 Nov 2002 16:29:58 -0000
@@ -1,5 +1,5 @@
 # Configure template for GNU m4.                       -*-Autoconf-*-
-# Copyright 1991-1994, 2000, 2001  Free Software Foundation, Inc.
+# Copyright (C) 1991-1994, 2000, 2001, 2002  Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -19,7 +19,7 @@
 ## -------------------------- ##
 ## We need a modern Autotest. ##
 ## -------------------------- ##
-AC_PREREQ([2.52e])
+AC_PREREQ([2.54])
 
 
 
@@ -30,7 +30,7 @@
 
 AC_CONFIG_SRCDIR([src/m4.h])
 AC_CONFIG_AUX_DIR(config)
-AM_CONFIG_HEADER(config.h:config-h.in)
+AC_CONFIG_HEADERS(config.h:config-h.in)
 AC_CONFIG_TESTDIR(tests)
 AC_CONFIG_FILES([tests/m4], [chmod +x tests/m4])
 
@@ -60,6 +60,7 @@
 # We use some of Jim's macros.
 m4_pattern_forbid([^jm_])
 m4_pattern_allow([^jm_cv_])
+m4_pattern_allow([^jm_ac_cv_])
 
 pkglibexecdir='${libexecdir}'/$PACKAGE
 AC_SUBST([pkglibexecdir])
@@ -94,7 +95,7 @@
 ## ------------------------ ##
 ## Automake Initialisation. ##
 ## ------------------------ ##
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE([1.7.1 dist-bzip2])
 
 
 
@@ -126,7 +127,7 @@
 AM_ENABLE_SHARED
 AC_LIBTOOL_DLOPEN
 AC_LIBTOOL_WIN32_DLL
-AM_PROG_LIBTOOL
+AC_PROG_LIBTOOL
 AC_LIB_LTDL
 
 AC_SUBST([LTDLINCL], ["${LTDLINCL-INCLTDL}"])
@@ -136,13 +137,10 @@
 ## ---------------- ##
 ## Gettext support. ##
 ## ---------------- ##
-ALL_LINGUAS="cs de el fr it ja nl pl ru sv"
-AM_GNU_GETTEXT
-AC_CONFIG_FILES(po/Makefile.in intl/Makefile)
-
-if test "$USE_INCLUDED_LIBINTL" = yes; then
-  AC_SUBST([INTLINCL], ['-I$(top_srcdir)/intl'])
-fi
+AM_GNU_GETTEXT(external, need-ngettext)
+AM_GNU_GETTEXT_VERSION(0.11.5)
+AC_CONFIG_FILES(po/Makefile.in)
+
 
 
 
@@ -207,16 +205,6 @@
 
 AC_LIB_GMP
 AM_CONDITIONAL([USE_GMP], [test "x$USE_GMP" = xyes])
-
-
-
-## ---------------------------------- ##
-## Make sure LTLIBOBJS is up to date. ##
-## ---------------------------------- ##
-Xsed="sed -e s/^X//"
-LTLIBOBJS=`echo X"$LIB@&address@hidden" | \
-    $Xsed -e 's,\.[[^.]]* ,.lo ,g;s,\.[[^.]]*$,.lo,'`
-AC_SUBST([LTLIBOBJS])
 
 
 
Index: config/Makefile.am
===================================================================
RCS file: /cvsroot/m4/m4/config/Makefile.am,v
retrieving revision 1.10
diff -u -u -r1.10 Makefile.am
--- config/Makefile.am 22 Jan 2002 16:24:26 -0000 1.10
+++ config/Makefile.am 4 Nov 2002 16:29:58 -0000
@@ -1,6 +1,6 @@
 ## Makefile.am -- Process this file with automake to produce Makefile.in
 ##
-## Copyright 2001 Free Software Foundation
+## Copyright (C) 2001, 2002 Free Software Foundation
 ##
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -27,31 +27,14 @@
 $(STANDARD_TOOLS)
 
 ACLOCAL_MACROS =                               \
-amversion.m4                                   \
-auxdir.m4                                      \
-ccstdc.m4                                      \
-codeset.m4                                     \
-cond.m4                                                \
-depend.m4                                      \
-depout.m4                                      \
 dmalloc.m4                                     \
 gettext.m4                                     \
-glibc21.m4                                     \
-header.m4                                      \
 iconv.m4                                       \
-init.m4                                                \
-install-sh.m4                                  \
-isc-posix.m4                                   \
-lcmessage.m4                                   \
 libtool.m4                                     \
 ltdl.m4                                                \
-make.m4                                                \
-missing.m4                                     \
 options.m4                                     \
 progtest.m4                                    \
-protos.m4                                      \
-sanity.m4                                      \
-strip.m4
+protos.m4
 
 STANDARD_TOOLS =                               \
 compile                                                \
Index: modules/perl.c
===================================================================
RCS file: /cvsroot/m4/m4/modules/perl.c,v
retrieving revision 1.8
diff -u -u -r1.8 perl.c
--- modules/perl.c 12 Oct 2001 19:57:29 -0000 1.8
+++ modules/perl.c 4 Nov 2002 16:29:59 -0000
@@ -62,8 +62,6 @@
 
 static PerlInterpreter *my_perl;
 
-extern void xs_init (void);
-
 M4INIT_HANDLER (perl)
 {
   const lt_dlinfo *info = 0;
Index: po/ChangeLog
from  gettextize  <address@hidden>

        * Makefile.in.in: Upgrade to gettext-0.11.5.
        * boldquot.sed: New file, from gettext-0.11.5.
        * address@hidden: New file, from gettext-0.11.5.
        * address@hidden: New file, from gettext-0.11.5.
        * insert-header.sin: New file, from gettext-0.11.5.
        * quot.sed: New file, from gettext-0.11.5.
        * remove-potcdate.sin: New file, from gettext-0.11.5.
        * Rules-quot: New file, from gettext-0.11.5.

Index: po/LINGUAS
===================================================================
RCS file: po/LINGUAS
diff -N po/LINGUAS
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ po/LINGUAS 4 Nov 2002 16:29:59 -0000
@@ -0,0 +1,10 @@
+cs
+de
+el
+fr
+it
+ja
+nl
+pl
+ru
+sv
Index: po/Makevars
===================================================================
RCS file: po/Makevars
diff -N po/Makevars
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ po/Makevars 4 Nov 2002 16:29:59 -0000
@@ -0,0 +1,25 @@
+# Makefile variables for PO directory in any package using GNU gettext.
+
+# Usually the message domain is the same as the package name.
+DOMAIN = $(PACKAGE)
+
+# These two variables depend on the location of this directory.
+subdir = po
+top_builddir = ..
+
+# These options get passed to xgettext.
+XGETTEXT_OPTIONS = --keyword=_ --keyword=N_
+
+# This is the copyright holder that gets inserted into the header of the
+# $(DOMAIN).pot file.  Set this to the copyright holder of the surrounding
+# package.  (Note that the msgstr strings, extracted from the package's
+# sources, belong to the copyright holder of the package.)  Translators are
+# expected to transfer the copyright for their translations to this person
+# or entity, or to disclaim their copyright.  The empty string stands for
+# the public domain; in this case the translators are expected to disclaim
+# their copyright.
+COPYRIGHT_HOLDER = Free Software Foundation, Inc.
+
+# This is the list of locale categories, beyond LC_MESSAGES, for which the
+# message catalogs shall be used.  It is usually empty.
+EXTRA_LOCALE_CATEGORIES =