Permit Makefile.in to be built with an automake version which contains

different *.m4 files than ours. This avoids a bootstrapping problem between
gettext and automake.

diff --git a/ChangeLog b/ChangeLog
index cd344d861fe6cc74ebb6649bfb0a723d463eb708..a54892be84c25ac34b06a896b06ab1f7b33d364f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2000-06-16  Bruno Haible  <haible@clisp.cons.org>
+
+       * Makefile.am: Put back the ACLOCAL_AMFLAGS definition, but define
+       ACLOCAL as a wrapper around aclocal.
+       * aclocal.sh: New file.
+
+       * config.guess, config.sub: Update to GNU version 2000-06-13.
+       * misc/locale.alias: Update to glibc CVS version 2000-06-13.
+
 2000-05-06  Ulrich Drepper  <drepper@redhat.com>
 
        * Makefile.am: Comment out ACLOCAL_AMFLAGS definition.  The files

diff --git a/Makefile.am b/Makefile.am
index b3be0aa0174422a0df12a1b8e94b1f9d9b5bfa60..213d4ae21d2daf084db2a46f61037ae3ec8bf2fb 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,7 +19,8 @@
 
 AUTOMAKE_OPTIONS = 1.3 gnits
 MAINT_CHARSET = latin1
-## ACLOCAL_AMFLAGS = -I m4
+ACLOCAL = ./aclocal.sh @ACLOCAL@
+ACLOCAL_AMFLAGS = -I m4
 
 gettextsrcdir = $(datadir)/gettext
 gettextsrc_DATA = ABOUT-NLS

diff --git a/aclocal.sh b/aclocal.sh
new file mode 100755 (executable)
index 0000000..f1cbc62
--- /dev/null
+++ b/aclocal.sh
@@ -0,0 +1,71 @@
+#! /bin/sh
+
+# This script is a work-alike of `aclocal' contained in the GNU automake
+# package. It is needed because our aclocal.m4 must be generated from the
+# non-gettext .m4 files in /usr/share/aclocal and from the gettext specific
+# .m4 files in the local m4 directory.
+# With   "aclocal --acdir=m4"
+# we get an error: macro `AM_INIT_AUTOMAKE' not found in library
+# With   "aclocal -I m4"
+# we get an error: duplicated macro `AM_GNU_GETTEXT'
+# The solution is to put all the .m4 files into a temporary directory.
+
+# 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
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+set -e
+
+if test $# = 0; then
+  echo "Usage: $0 aclocal-program [aclocal-options]" 1>&2
+  exit 1
+fi
+
+ACLOCAL="$1"
+shift
+
+# Prepare temporary directory.
+mkdir aclocal.tmp
+trap "rm -rf aclocal.tmp; exit 1" 1 2 15
+
+# First, copy the standard m4 files.
+for f in `"$ACLOCAL" --print-ac-dir`/*.m4; do
+  cp $f aclocal.tmp
+done
+
+# Then, copy the contents of any -I directories, overriding previously
+# copied files of the same name.
+options=""
+last_was_I=no
+for arg
+do
+  if test $last_was_I = yes; then
+    for f in "$arg"/*.m4; do
+      cp $f aclocal.tmp
+    done
+    last_was_I=no
+  else
+    case "$arg" in
+      -I) last_was_I=yes;;
+      *)  last_was_I=no options="$options $arg";;
+    esac
+  fi
+done
+
+# Now call `aclocal' for real.
+"$ACLOCAL" --acdir=aclocal.tmp $options
+
+# Clean up temporary directory.
+rm -rf aclocal.tmp
+