diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | autoconf-lib-link/ChangeLog | 6 | ||||
| -rw-r--r-- | autoconf-lib-link/Makefile.am | 19 | ||||
| -rwxr-xr-x | autogen.sh | 12 | ||||
| -rwxr-xr-x | build-aux/fixaclocal | 33 | ||||
| -rw-r--r-- | gettext-runtime/ChangeLog | 5 | ||||
| -rw-r--r-- | gettext-runtime/Makefile.am | 1 | ||||
| -rw-r--r-- | gettext-runtime/libasprintf/ChangeLog | 5 | ||||
| -rw-r--r-- | gettext-runtime/libasprintf/Makefile.am | 1 | ||||
| -rw-r--r-- | gettext-tools/ChangeLog | 5 | ||||
| -rw-r--r-- | gettext-tools/Makefile.am | 1 | ||||
| -rw-r--r-- | gettext-tools/examples/ChangeLog | 5 | ||||
| -rw-r--r-- | gettext-tools/examples/Makefile.am | 1 |
14 files changed, 87 insertions, 15 deletions
@@ -1,3 +1,10 @@ +2006-10-27 Bruno Haible <bruno@clisp.org> + + Work around automake-1.10 annoyance. + * build-aux/fixaclocal: New file. + * autogen.sh: Use it for every aclocal invocation. + * Makefile.am (ACLOCAL): New macro. + 2006-10-26 Bruno Haible <bruno@clisp.org> * gettext-0.16 released. diff --git a/Makefile.am b/Makefile.am index 2efaaa6..40d6792 100644 --- a/Makefile.am +++ b/Makefile.am @@ -18,6 +18,7 @@ ## Process this file with automake to produce Makefile.in. AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies +ACLOCAL = build-aux/fixaclocal @ACLOCAL@ SUBDIRS = gnulib-local gettext-runtime gettext-tools autoconf-lib-link diff --git a/autoconf-lib-link/ChangeLog b/autoconf-lib-link/ChangeLog index b50485c..3556af3 100644 --- a/autoconf-lib-link/ChangeLog +++ b/autoconf-lib-link/ChangeLog @@ -1,3 +1,9 @@ +2006-10-27 Bruno Haible <bruno@clisp.org> + + Work around automake-1.10 annoyance. + * Makefile.am (ACLOCAL): New macro. + (tests/*/aclocal.m4): Use fixaclocal. + 2006-10-26 Bruno Haible <bruno@clisp.org> * gettext-0.16 released. diff --git a/autoconf-lib-link/Makefile.am b/autoconf-lib-link/Makefile.am index b26f1c3..2abbfb7 100644 --- a/autoconf-lib-link/Makefile.am +++ b/autoconf-lib-link/Makefile.am @@ -1,5 +1,5 @@ ## Makefile for the autoconf-lib-link directory of GNU gettext -## Copyright (C) 1995-1999, 2000-2003, 2005 Free Software Foundation, Inc. +## Copyright (C) 1995-1999, 2000-2003, 2005-2006 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 @@ -18,6 +18,7 @@ ## Process this file with automake to produce Makefile.in. AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies +ACLOCAL = ../build-aux/fixaclocal @ACLOCAL@ ACLOCAL_AMFLAGS = -I m4 -I ../m4 EXTRA_DIST = DISTCLEANFILES = @@ -81,7 +82,7 @@ CONFIGURES_RPATHX = $(srcdir)/tests/rpathx/Makefile.in $(srcdir)/tests/rpathx/ac $(srcdir)/tests/rpathx/Makefile.in: $(srcdir)/tests/rpathx/Makefile.am $(srcdir)/tests/rpathx/configure.ac $(srcdir)/tests/rpathx/aclocal.m4 cd $(srcdir)/tests/rpathx && automake Makefile $(srcdir)/tests/rpathx/aclocal.m4: $(srcdir)/tests/rpathx/configure.ac $(srcdir)/../m4/libtool.m4 - cd $(srcdir)/tests/rpathx && aclocal -I `cd ../../m4 && pwd` -I `cd ../../../m4 && pwd` + cd $(srcdir)/tests/rpathx && ../../../build-aux/fixaclocal aclocal -I `cd ../../m4 && pwd` -I `cd ../../../m4 && pwd` $(srcdir)/tests/rpathx/configure: $(srcdir)/tests/rpathx/configure.ac $(srcdir)/tests/rpathx/aclocal.m4 cd $(srcdir)/tests/rpathx && autoconf @@ -89,7 +90,7 @@ CONFIGURES_RPATHY = $(srcdir)/tests/rpathy/Makefile.in $(srcdir)/tests/rpathy/ac $(srcdir)/tests/rpathy/Makefile.in: $(srcdir)/tests/rpathy/Makefile.am $(srcdir)/tests/rpathy/configure.ac $(srcdir)/tests/rpathy/aclocal.m4 cd $(srcdir)/tests/rpathy && automake Makefile $(srcdir)/tests/rpathy/aclocal.m4: $(srcdir)/tests/rpathy/configure.ac $(srcdir)/../m4/libtool.m4 $(srcdir)/m4/lib-link.m4 $(srcdir)/m4/lib-prefix.m4 $(srcdir)/m4/lib-ld.m4 - cd $(srcdir)/tests/rpathy && aclocal -I `cd ../../m4 && pwd` -I `cd ../../../m4 && pwd` + cd $(srcdir)/tests/rpathy && ../../../build-aux/fixaclocal aclocal -I `cd ../../m4 && pwd` -I `cd ../../../m4 && pwd` $(srcdir)/tests/rpathy/configure: $(srcdir)/tests/rpathy/configure.ac $(srcdir)/tests/rpathy/aclocal.m4 cd $(srcdir)/tests/rpathy && autoconf @@ -97,7 +98,7 @@ CONFIGURES_RPATHZ = $(srcdir)/tests/rpathz/Makefile.in $(srcdir)/tests/rpathz/ac $(srcdir)/tests/rpathz/Makefile.in: $(srcdir)/tests/rpathz/Makefile.am $(srcdir)/tests/rpathz/configure.ac $(srcdir)/tests/rpathz/aclocal.m4 cd $(srcdir)/tests/rpathz && automake Makefile $(srcdir)/tests/rpathz/aclocal.m4: $(srcdir)/tests/rpathz/configure.ac $(srcdir)/../m4/libtool.m4 $(srcdir)/m4/lib-link.m4 $(srcdir)/m4/lib-prefix.m4 $(srcdir)/m4/lib-ld.m4 - cd $(srcdir)/tests/rpathz && aclocal -I `cd ../../m4 && pwd` -I `cd ../../../m4 && pwd` + cd $(srcdir)/tests/rpathz && ../../../build-aux/fixaclocal aclocal -I `cd ../../m4 && pwd` -I `cd ../../../m4 && pwd` $(srcdir)/tests/rpathz/configure: $(srcdir)/tests/rpathz/configure.ac $(srcdir)/tests/rpathz/aclocal.m4 cd $(srcdir)/tests/rpathz && autoconf @@ -105,7 +106,7 @@ CONFIGURES_RPATHLX = $(srcdir)/tests/rpathlx/Makefile.in $(srcdir)/tests/rpathlx $(srcdir)/tests/rpathlx/Makefile.in: $(srcdir)/tests/rpathlx/Makefile.am $(srcdir)/tests/rpathlx/configure.ac $(srcdir)/tests/rpathlx/aclocal.m4 cd $(srcdir)/tests/rpathlx && automake Makefile $(srcdir)/tests/rpathlx/aclocal.m4: $(srcdir)/tests/rpathlx/configure.ac $(srcdir)/m4/lib-link.m4 $(srcdir)/m4/lib-prefix.m4 $(srcdir)/m4/lib-ld.m4 - cd $(srcdir)/tests/rpathlx && aclocal -I `cd ../../m4 && pwd` + cd $(srcdir)/tests/rpathlx && ../../../build-aux/fixaclocal aclocal -I `cd ../../m4 && pwd` $(srcdir)/tests/rpathlx/configure: $(srcdir)/tests/rpathlx/configure.ac $(srcdir)/tests/rpathlx/aclocal.m4 cd $(srcdir)/tests/rpathlx && autoconf @@ -113,7 +114,7 @@ CONFIGURES_RPATHLY = $(srcdir)/tests/rpathly/Makefile.in $(srcdir)/tests/rpathly $(srcdir)/tests/rpathly/Makefile.in: $(srcdir)/tests/rpathly/Makefile.am $(srcdir)/tests/rpathly/configure.ac $(srcdir)/tests/rpathly/aclocal.m4 cd $(srcdir)/tests/rpathly && automake Makefile $(srcdir)/tests/rpathly/aclocal.m4: $(srcdir)/tests/rpathly/configure.ac $(srcdir)/m4/lib-link.m4 $(srcdir)/m4/lib-prefix.m4 $(srcdir)/m4/lib-ld.m4 - cd $(srcdir)/tests/rpathly && aclocal -I `cd ../../m4 && pwd` + cd $(srcdir)/tests/rpathly && ../../../build-aux/fixaclocal aclocal -I `cd ../../m4 && pwd` $(srcdir)/tests/rpathly/configure: $(srcdir)/tests/rpathly/configure.ac $(srcdir)/tests/rpathly/aclocal.m4 cd $(srcdir)/tests/rpathly && autoconf @@ -121,7 +122,7 @@ CONFIGURES_RPATHLYX = $(srcdir)/tests/rpathlyx/Makefile.in $(srcdir)/tests/rpath $(srcdir)/tests/rpathlyx/Makefile.in: $(srcdir)/tests/rpathlyx/Makefile.am $(srcdir)/tests/rpathlyx/configure.ac $(srcdir)/tests/rpathlyx/aclocal.m4 cd $(srcdir)/tests/rpathlyx && automake Makefile $(srcdir)/tests/rpathlyx/aclocal.m4: $(srcdir)/tests/rpathlyx/configure.ac $(srcdir)/m4/lib-link.m4 $(srcdir)/m4/lib-prefix.m4 $(srcdir)/m4/lib-ld.m4 - cd $(srcdir)/tests/rpathlyx && aclocal -I `cd ../../m4 && pwd` + cd $(srcdir)/tests/rpathlyx && ../../../build-aux/fixaclocal aclocal -I `cd ../../m4 && pwd` $(srcdir)/tests/rpathlyx/configure: $(srcdir)/tests/rpathlyx/configure.ac $(srcdir)/tests/rpathlyx/aclocal.m4 cd $(srcdir)/tests/rpathlyx && autoconf @@ -129,7 +130,7 @@ CONFIGURES_RPATHLZ = $(srcdir)/tests/rpathlz/Makefile.in $(srcdir)/tests/rpathlz $(srcdir)/tests/rpathlz/Makefile.in: $(srcdir)/tests/rpathlz/Makefile.am $(srcdir)/tests/rpathlz/configure.ac $(srcdir)/tests/rpathlz/aclocal.m4 cd $(srcdir)/tests/rpathlz && automake Makefile $(srcdir)/tests/rpathlz/aclocal.m4: $(srcdir)/tests/rpathlz/configure.ac $(srcdir)/m4/lib-link.m4 $(srcdir)/m4/lib-prefix.m4 $(srcdir)/m4/lib-ld.m4 - cd $(srcdir)/tests/rpathlz && aclocal -I `cd ../../m4 && pwd` + cd $(srcdir)/tests/rpathlz && ../../../build-aux/fixaclocal aclocal -I `cd ../../m4 && pwd` $(srcdir)/tests/rpathlz/configure: $(srcdir)/tests/rpathlz/configure.ac $(srcdir)/tests/rpathlz/aclocal.m4 cd $(srcdir)/tests/rpathlz && autoconf @@ -137,7 +138,7 @@ CONFIGURES_RPATHLZYX = $(srcdir)/tests/rpathlzyx/Makefile.in $(srcdir)/tests/rpa $(srcdir)/tests/rpathlzyx/Makefile.in: $(srcdir)/tests/rpathlzyx/Makefile.am $(srcdir)/tests/rpathlzyx/configure.ac $(srcdir)/tests/rpathlzyx/aclocal.m4 cd $(srcdir)/tests/rpathlzyx && automake Makefile $(srcdir)/tests/rpathlzyx/aclocal.m4: $(srcdir)/tests/rpathlzyx/configure.ac $(srcdir)/m4/lib-link.m4 $(srcdir)/m4/lib-prefix.m4 $(srcdir)/m4/lib-ld.m4 - cd $(srcdir)/tests/rpathlzyx && aclocal -I `cd ../../m4 && pwd` + cd $(srcdir)/tests/rpathlzyx && ../../../build-aux/fixaclocal aclocal -I `cd ../../m4 && pwd` $(srcdir)/tests/rpathlzyx/configure: $(srcdir)/tests/rpathlzyx/configure.ac $(srcdir)/tests/rpathlzyx/aclocal.m4 cd $(srcdir)/tests/rpathlzyx && autoconf @@ -207,20 +207,20 @@ if test -n "$GNULIB_TOOL"; then fi (cd autoconf-lib-link - aclocal -I m4 -I ../m4 + ../build-aux/fixaclocal aclocal -I m4 -I ../m4 autoconf automake ) (cd gettext-runtime - aclocal -I m4 -I ../autoconf-lib-link/m4 -I ../m4 -I gnulib-m4 + ../build-aux/fixaclocal aclocal -I m4 -I ../autoconf-lib-link/m4 -I ../m4 -I gnulib-m4 autoconf autoheader && touch config.h.in automake ) (cd gettext-runtime/libasprintf - aclocal -I ../../m4 -I ../m4 + ../../build-aux/fixaclocal aclocal -I ../../m4 -I ../m4 autoconf autoheader && touch config.h.in automake @@ -229,14 +229,14 @@ fi cp -p gettext-runtime/ABOUT-NLS gettext-tools/ABOUT-NLS (cd gettext-tools - aclocal -I m4 -I ../gettext-runtime/m4 -I ../autoconf-lib-link/m4 -I ../m4 -I gnulib-m4 -I libgettextpo/gnulib-m4 + ../build-aux/fixaclocal aclocal -I m4 -I ../gettext-runtime/m4 -I ../autoconf-lib-link/m4 -I ../m4 -I gnulib-m4 -I libgettextpo/gnulib-m4 autoconf autoheader && touch config.h.in automake ) (cd gettext-tools/examples - aclocal -I ../../gettext-runtime/m4 -I ../../m4 + ../../build-aux/fixaclocal aclocal -I ../../gettext-runtime/m4 -I ../../m4 autoconf automake # Rebuilding the examples PO files is only rarely needed. @@ -245,7 +245,7 @@ cp -p gettext-runtime/ABOUT-NLS gettext-tools/ABOUT-NLS fi ) -aclocal +build-aux/fixaclocal aclocal autoconf automake diff --git a/build-aux/fixaclocal b/build-aux/fixaclocal new file mode 100755 index 0000000..953dc3a --- /dev/null +++ b/build-aux/fixaclocal @@ -0,0 +1,33 @@ +#!/bin/sh +# Script for fixing aclocal.m4 files produced by 'aclocal' from automake 1.10. +# Copyright (C) 2006 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 +# 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +# Usage: fixaclocal aclocal [OPTIONS] + +"$@" +result=$? +if test $result = 0 && test -f aclocal.m4; then + # Remove the block of 4 lines starting with 'm4_if(m4_PACKAGE_VERSION'. + sed -e '/m4_if(m4_PACKAGE_VERSION/{N;N;N;d}' < aclocal.m4 > aclocal.m4.tmp + if cmp aclocal.m4 aclocal.m4.tmp > /dev/null; then + rm -f aclocal.m4.tmp + else + mv aclocal.m4.tmp aclocal.m4 + fi +else + exit $result +fi diff --git a/gettext-runtime/ChangeLog b/gettext-runtime/ChangeLog index 7db8a0d..8f7c4db 100644 --- a/gettext-runtime/ChangeLog +++ b/gettext-runtime/ChangeLog @@ -1,3 +1,8 @@ +2006-10-27 Bruno Haible <bruno@clisp.org> + + Work around automake-1.10 annoyance. + * Makefile.am (ACLOCAL): New macro. + 2006-10-26 Bruno Haible <bruno@clisp.org> * gettext-0.16 released. diff --git a/gettext-runtime/Makefile.am b/gettext-runtime/Makefile.am index fe730f7..4579ac7 100644 --- a/gettext-runtime/Makefile.am +++ b/gettext-runtime/Makefile.am @@ -18,6 +18,7 @@ ## Process this file with automake to produce Makefile.in. AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies +ACLOCAL = ../build-aux/fixaclocal @ACLOCAL@ ACLOCAL_AMFLAGS = -I m4 -I ../autoconf-lib-link/m4 -I ../m4 -I gnulib-m4 MAKEINFO = env LANG= LC_MESSAGES= LC_ALL= LANGUAGE= @MAKEINFO@ diff --git a/gettext-runtime/libasprintf/ChangeLog b/gettext-runtime/libasprintf/ChangeLog index d788008..d1b2b33 100644 --- a/gettext-runtime/libasprintf/ChangeLog +++ b/gettext-runtime/libasprintf/ChangeLog @@ -1,3 +1,8 @@ +2006-10-27 Bruno Haible <bruno@clisp.org> + + Work around automake-1.10 annoyance. + * Makefile.am (ACLOCAL): New macro. + 2006-10-26 Bruno Haible <bruno@clisp.org> * gettext-0.16 released. diff --git a/gettext-runtime/libasprintf/Makefile.am b/gettext-runtime/libasprintf/Makefile.am index 44b6431..f27f3f5 100644 --- a/gettext-runtime/libasprintf/Makefile.am +++ b/gettext-runtime/libasprintf/Makefile.am @@ -19,6 +19,7 @@ ## Process this file with automake to produce Makefile.in. AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies +ACLOCAL = ../../build-aux/fixaclocal @ACLOCAL@ ACLOCAL_AMFLAGS = -I ../../m4 -I ../m4 EXTRA_DIST = MOSTLYCLEANFILES = diff --git a/gettext-tools/ChangeLog b/gettext-tools/ChangeLog index 6a09c71..a3b49b7 100644 --- a/gettext-tools/ChangeLog +++ b/gettext-tools/ChangeLog @@ -1,3 +1,8 @@ +2006-10-27 Bruno Haible <bruno@clisp.org> + + Work around automake-1.10 annoyance. + * Makefile.am (ACLOCAL): New macro. + 2006-10-26 Bruno Haible <bruno@clisp.org> * gettext-0.16 released. diff --git a/gettext-tools/Makefile.am b/gettext-tools/Makefile.am index 9d92c32..c110457 100644 --- a/gettext-tools/Makefile.am +++ b/gettext-tools/Makefile.am @@ -18,6 +18,7 @@ ## Process this file with automake to produce Makefile.in. AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies +ACLOCAL = ../build-aux/fixaclocal @ACLOCAL@ ACLOCAL_AMFLAGS = -I m4 -I ../gettext-runtime/m4 -I ../autoconf-lib-link/m4 -I ../m4 -I gnulib-m4 -I libgettextpo/gnulib-m4 SUBDIRS = doc intl gnulib-lib libgrep libuniname src libgettextpo po projects misc man m4 tests examples diff --git a/gettext-tools/examples/ChangeLog b/gettext-tools/examples/ChangeLog index bf3cca4..efb6065 100644 --- a/gettext-tools/examples/ChangeLog +++ b/gettext-tools/examples/ChangeLog @@ -1,3 +1,8 @@ +2006-10-27 Bruno Haible <bruno@clisp.org> + + Work around automake-1.10 annoyance. + * Makefile.am (ACLOCAL): New macro. + 2006-10-26 Bruno Haible <bruno@clisp.org> * gettext-0.16 released. diff --git a/gettext-tools/examples/Makefile.am b/gettext-tools/examples/Makefile.am index 1b35647..d7a0533 100644 --- a/gettext-tools/examples/Makefile.am +++ b/gettext-tools/examples/Makefile.am @@ -18,6 +18,7 @@ ## Process this file with automake to produce Makefile.in. AUTOMAKE_OPTIONS = 1.2 foreign +ACLOCAL = ../../build-aux/fixaclocal @ACLOCAL@ ACLOCAL_AMFLAGS = -I ../../gettext-runtime/m4 -I ../../m4 SUBDIRS = po EXTRA_DIST = |