From: Bruno Haible Date: Tue, 27 Jun 2006 12:16:16 +0000 (+0000) Subject: Assume autoconf 2.60 or newer. X-Git-Tag: v0.15~75 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6dbc3c9e341e71b69469262f049cd86017c8fc46;p=thirdparty%2Fgettext.git Assume autoconf 2.60 or newer. --- diff --git a/ChangeLog b/ChangeLog index 061a1297f..38a9504cc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2006-04-14 Bruno Haible + + * autogen.sh: Require autoconf-2.60. + 2006-03-28 Ralf Wildenhues * m4/libtool.m4 (_LT_SYS_DYNAMIC_LINKER) [ linux ]: Avoid warning when diff --git a/autogen.sh b/autogen.sh index 8a47198fd..4c17b6ece 100755 --- a/autogen.sh +++ b/autogen.sh @@ -2,7 +2,7 @@ # Convenience script for regenerating all aclocal.m4, config.h.in, Makefile.in, # configure files with new versions of autoconf or automake. # -# This script requires autoconf-2.58..2.59 and automake-1.8.2..1.9 in the PATH. +# This script requires autoconf-2.60 and automake-1.8.2..1.9 in the PATH. # Copyright (C) 2003-2006 Free Software Foundation, Inc. # diff --git a/gettext-runtime/ChangeLog b/gettext-runtime/ChangeLog index 3a9f5407a..0a1b71fcd 100644 --- a/gettext-runtime/ChangeLog +++ b/gettext-runtime/ChangeLog @@ -1,3 +1,9 @@ +2006-04-14 Bruno Haible + + Assume autoconf >= 2.60. + * configure.ac (docdir): If --docdir value was given, use that. + (mandir): Remove customization. + 2006-05-15 Bruno Haible * configure.ac (DLL_VARIABLE): Define as empty on mingw, like on diff --git a/gettext-runtime/configure.ac b/gettext-runtime/configure.ac index 630c382bf..796bd2e63 100644 --- a/gettext-runtime/configure.ac +++ b/gettext-runtime/configure.ac @@ -26,9 +26,7 @@ AM_INIT_AUTOMAKE(gettext-runtime, $VERSION_NUMBER) AM_CONFIG_HEADER(config.h) dnl Installation directories. -AC_SUBST([docdir], ['${datadir}/doc/gettext']) -dnl Prefer modern Filesystem Hierarchy Standard over antiquated GNU standards. -test "$mandir" != '${prefix}/man' || mandir='${datadir}/man' +test "$docdir" != '${datarootdir}/doc/${PACKAGE}' || docdir='${datarootdir}/doc/gettext' dnl Checks for programs. AC_PROG_CC diff --git a/gettext-runtime/intl-csharp/ChangeLog b/gettext-runtime/intl-csharp/ChangeLog index 32ac31030..c9b95ef8d 100644 --- a/gettext-runtime/intl-csharp/ChangeLog +++ b/gettext-runtime/intl-csharp/ChangeLog @@ -1,3 +1,8 @@ +2006-04-14 Bruno Haible + + Assume autoconf >= 2.60. + * Makefile.am (docdir, htmldir): Remove variables. + 2006-04-17 Bruno Haible * Makefile.am: Use $(mkdir_p) instead of $(mkinstalldirs). diff --git a/gettext-runtime/intl-csharp/Makefile.am b/gettext-runtime/intl-csharp/Makefile.am index 5c40f9384..303c76fff 100644 --- a/gettext-runtime/intl-csharp/Makefile.am +++ b/gettext-runtime/intl-csharp/Makefile.am @@ -1,5 +1,5 @@ ## Makefile for the gettext-runtime/intl-csharp subdirectory of GNU gettext -## Copyright (C) 2003, 2006 Free Software Foundation, Inc. +## Copyright (C) 2003 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 @@ -26,6 +26,9 @@ RM = rm -f docdir = @docdir@ htmldir = $(docdir) +docdir = @docdir@ +htmldir = $(docdir) + CSHARPCOMP = $(SHELL) ../lib/csharpcomp.sh CSHARPCOMPFLAGS = @CSHARPCOMPFLAGS@ diff --git a/gettext-runtime/intl-java/ChangeLog b/gettext-runtime/intl-java/ChangeLog index 7beeecfba..727b07e7c 100644 --- a/gettext-runtime/intl-java/ChangeLog +++ b/gettext-runtime/intl-java/ChangeLog @@ -1,3 +1,8 @@ +2006-04-14 Bruno Haible + + Assume autoconf >= 2.60. + * Makefile.am (docdir, htmldir): Remove variables. + 2006-04-17 Bruno Haible * Makefile.am: Use $(mkdir_p) instead of $(mkinstalldirs). diff --git a/gettext-runtime/intl-java/Makefile.am b/gettext-runtime/intl-java/Makefile.am index 94d2c55c9..86a2bf759 100644 --- a/gettext-runtime/intl-java/Makefile.am +++ b/gettext-runtime/intl-java/Makefile.am @@ -1,5 +1,5 @@ ## Makefile for the gettext-runtime/intl-java subdirectory of GNU gettext -## Copyright (C) 2001-2003 Free Software Foundation, Inc. +## Copyright (C) 2001-2003, 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 @@ -24,8 +24,6 @@ CLEANFILES = RM = rm -f jardir = $(datadir)/gettext -docdir = @docdir@ -htmldir = $(docdir) JAR = @JAR@ JAVACOMP = $(SHELL) ../lib/javacomp.sh diff --git a/gettext-runtime/libasprintf/ChangeLog b/gettext-runtime/libasprintf/ChangeLog index ae0235f74..45f5aa60e 100644 --- a/gettext-runtime/libasprintf/ChangeLog +++ b/gettext-runtime/libasprintf/ChangeLog @@ -1,3 +1,9 @@ +2006-04-14 Bruno Haible + + Assume autoconf >= 2.60. + * Makefile.am (docdir, dvidir, psdir, pdfdir, htmldir): Remove + variables. + 2006-05-24 Bruno Haible * printf-args.c (printf_fetchargs): Turn NULL pointers for diff --git a/gettext-runtime/libasprintf/Makefile.am b/gettext-runtime/libasprintf/Makefile.am index 409c04e0a..68db9535c 100644 --- a/gettext-runtime/libasprintf/Makefile.am +++ b/gettext-runtime/libasprintf/Makefile.am @@ -1,5 +1,5 @@ ## Makefile for the gettext-runtime/libasprintf subdirectory of GNU gettext -## Copyright (C) 2002-2005 Free Software Foundation, Inc. +## Copyright (C) 2002-2006 Free Software Foundation, Inc. ## ## This program is free software; you can redistribute it and/or modify it ## under the terms of the GNU Library General Public License as published @@ -87,12 +87,6 @@ clean-local: # Documentation. -docdir = $(datadir)/doc/@PACKAGE@ -dvidir = $(docdir) -psdir = $(docdir) -pdfdir = $(docdir) -htmldir = $(docdir) - MAKEINFO = env LANG= LC_MESSAGES= LC_ALL= LANGUAGE= @MAKEINFO@ MAKEINFOFLAGS = --no-split diff --git a/gettext-runtime/man/ChangeLog b/gettext-runtime/man/ChangeLog index f9f1482ef..2b23bb9dc 100644 --- a/gettext-runtime/man/ChangeLog +++ b/gettext-runtime/man/ChangeLog @@ -1,3 +1,8 @@ +2006-04-14 Bruno Haible + + Assume autoconf >= 2.60. + * Makefile.am (mandir, docdir, htmldir, localedir): Remove variables. + 2006-04-17 Bruno Haible * Makefile.am: Use $(mkdir_p) instead of $(mkinstalldirs). diff --git a/gettext-runtime/man/Makefile.am b/gettext-runtime/man/Makefile.am index 6f2261415..8b2d8c4c0 100644 --- a/gettext-runtime/man/Makefile.am +++ b/gettext-runtime/man/Makefile.am @@ -1,5 +1,5 @@ ## Makefile for the gettext-runtime/man subdirectory of GNU gettext -## Copyright (C) 2001-2003 Free Software Foundation, Inc. +## Copyright (C) 2001-2003, 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,11 +18,6 @@ ## Process this file with automake to produce Makefile.in. VERSION = @VERSION@ -mandir = @mandir@ -docdir = @docdir@ -htmldir = $(docdir) - -localedir = $(datadir)/locale AUTOMAKE_OPTIONS = 1.2 gnits EXTRA_DIST = diff --git a/gettext-runtime/src/ChangeLog b/gettext-runtime/src/ChangeLog index 019d7b121..7ddf4a75c 100644 --- a/gettext-runtime/src/ChangeLog +++ b/gettext-runtime/src/ChangeLog @@ -1,3 +1,8 @@ +2006-04-14 Bruno Haible + + Assume autoconf >= 2.60. + * Makefile.am (localedir): Remove variable. + 2006-04-02 Bruno Haible * envsubst.c: Include propername.h. diff --git a/gettext-runtime/src/Makefile.am b/gettext-runtime/src/Makefile.am index 54a98c9b2..eb95593a4 100644 --- a/gettext-runtime/src/Makefile.am +++ b/gettext-runtime/src/Makefile.am @@ -25,8 +25,6 @@ RM = rm -f bin_PROGRAMS = gettext ngettext envsubst -localedir = $(datadir)/locale - AM_CPPFLAGS = \ -I. -I$(srcdir) \ -I.. \ diff --git a/gettext-tools/ChangeLog b/gettext-tools/ChangeLog index f80f71396..90991b771 100644 --- a/gettext-tools/ChangeLog +++ b/gettext-tools/ChangeLog @@ -1,3 +1,10 @@ +2006-04-14 Bruno Haible + + Assume autoconf >= 2.60. + * configure.ac (localedir): Remove variable. + (docdir): If --docdir value was given, use that. + (mandir): Remove customization. + 2006-05-15 Bruno Haible * woe32dll/export.h: Renamed from cygwin/export.h. diff --git a/gettext-tools/configure.ac b/gettext-tools/configure.ac index 5900f38bf..b524b0b86 100644 --- a/gettext-tools/configure.ac +++ b/gettext-tools/configure.ac @@ -26,10 +26,7 @@ AM_INIT_AUTOMAKE(gettext-tools, $VERSION_NUMBER) AM_CONFIG_HEADER(config.h) dnl Installation directories. -AC_SUBST([localedir], ['${datadir}/locale']) -AC_SUBST([docdir], ['${datadir}/doc/gettext']) -dnl Prefer modern Filesystem Hierarchy Standard over antiquated GNU standards. -test "$mandir" != '${prefix}/man' || mandir='${datadir}/man' +test "$docdir" != '${datarootdir}/doc/${PACKAGE}' || docdir='${datarootdir}/doc/gettext' dnl Checks for programs. AC_PROG_CC diff --git a/gettext-tools/doc/ChangeLog b/gettext-tools/doc/ChangeLog index 791be989d..8fa010ccb 100644 --- a/gettext-tools/doc/ChangeLog +++ b/gettext-tools/doc/ChangeLog @@ -1,3 +1,9 @@ +2006-04-14 Bruno Haible + + Assume autoconf >= 2.60. + * Makefile.am (docdir, dvidir, psdir, pdfdir, htmldir): Remove + variables. + 2006-06-18 Bruno Haible * gettext.texi (configure.in): Document where to put AC_GNU_SOURCE. diff --git a/gettext-tools/doc/Makefile.am b/gettext-tools/doc/Makefile.am index 6f81e2c77..33c5831ab 100644 --- a/gettext-tools/doc/Makefile.am +++ b/gettext-tools/doc/Makefile.am @@ -17,12 +17,6 @@ ## Process this file with automake to produce Makefile.in. -docdir = @docdir@ -dvidir = $(docdir) -psdir = $(docdir) -pdfdir = $(docdir) -htmldir = $(docdir) - AUTOMAKE_OPTIONS = 1.2 gnits EXTRA_DIST = MOSTLYCLEANFILES = diff --git a/gettext-tools/examples/ChangeLog b/gettext-tools/examples/ChangeLog index 588454f6c..81a9ea0cd 100644 --- a/gettext-tools/examples/ChangeLog +++ b/gettext-tools/examples/ChangeLog @@ -1,3 +1,9 @@ +2006-04-14 Bruno Haible + + Assume autoconf >= 2.60. + * Makefile.am (docdir): Remove variable. + * po/Makefile.am (localedir): Remove variable. + 2006-06-04 Bruno Haible * hello-c/{autoclean.sh,m4/Makefile.am}: Replace inttypes.m4 with diff --git a/gettext-tools/examples/Makefile.am b/gettext-tools/examples/Makefile.am index 885740815..d5bc31037 100644 --- a/gettext-tools/examples/Makefile.am +++ b/gettext-tools/examples/Makefile.am @@ -21,7 +21,6 @@ AUTOMAKE_OPTIONS = 1.2 gnits SUBDIRS = po EXTRA_DIST = -docdir = @docdir@ examplesdir = $(docdir)/examples examples_DATA = installpaths diff --git a/gettext-tools/examples/po/Makefile.am b/gettext-tools/examples/po/Makefile.am index b305ad1f0..d43b217ac 100644 --- a/gettext-tools/examples/po/Makefile.am +++ b/gettext-tools/examples/po/Makefile.am @@ -121,8 +121,6 @@ MSGID_BUGS_ADDRESS = bug-gnu-gettext@gnu.org # message catalogs shall be used. It is usually empty. EXTRA_LOCALE_CATEGORIES = -localedir = $(datadir)/locale - MSGMERGE = msgmerge MSGMERGE_UPDATE = @MSGMERGE@ --update MSGINIT = msginit diff --git a/gettext-tools/lib/ChangeLog b/gettext-tools/lib/ChangeLog index 08fee7aa0..1862963a1 100644 --- a/gettext-tools/lib/ChangeLog +++ b/gettext-tools/lib/ChangeLog @@ -1,3 +1,8 @@ +2006-04-14 Bruno Haible + + Assume autoconf >= 2.60. + * Makefile.am (docdir): Remove variable. + 2006-06-21 Bruno Haible Avoid warnings from recent versions of mcs. diff --git a/gettext-tools/lib/Makefile.am b/gettext-tools/lib/Makefile.am index 5b725f479..75370e6fc 100644 --- a/gettext-tools/lib/Makefile.am +++ b/gettext-tools/lib/Makefile.am @@ -153,7 +153,6 @@ EXTRA_DIST += javaversion.java # Files installed for the examples. -docdir = @docdir@ examplesbuildauxdir = $(docdir)/examples/build-aux examplesbuildaux_DATA = \ javacomp.sh.in javaexec.sh.in \ diff --git a/gettext-tools/m4/ChangeLog b/gettext-tools/m4/ChangeLog index bfa0349ab..993188ca5 100644 --- a/gettext-tools/m4/ChangeLog +++ b/gettext-tools/m4/ChangeLog @@ -1,3 +1,8 @@ +2006-04-14 Bruno Haible + + Assume autoconf >= 2.60. + * Makefile.am (docdir): Remove variable. + 2006-06-17 Bruno Haible * setenv.m4 (gl_PREREQ_SETENV, gl_PREREQ_UNSETENV): Remove test diff --git a/gettext-tools/m4/Makefile.am b/gettext-tools/m4/Makefile.am index 7e3ec75f0..13b675e4f 100644 --- a/gettext-tools/m4/Makefile.am +++ b/gettext-tools/m4/Makefile.am @@ -38,7 +38,6 @@ aclocal_DATA = \ # Files installed for the examples. -docdir = @docdir@ examplesbuildauxdir = $(docdir)/examples/build-aux examplesbuildaux_DATA = \ gcj.m4 javacomp.m4 javaexec.m4 \ diff --git a/gettext-tools/man/ChangeLog b/gettext-tools/man/ChangeLog index 25707298a..25196a76c 100644 --- a/gettext-tools/man/ChangeLog +++ b/gettext-tools/man/ChangeLog @@ -1,3 +1,8 @@ +2006-04-14 Bruno Haible + + Assume autoconf >= 2.60. + * Makefile.am (mandir, docdir, htmldir, localedir): Remove variables. + 2006-04-17 Bruno Haible * Makefile.am: Use $(mkdir_p) instead of $(mkinstalldirs). diff --git a/gettext-tools/man/Makefile.am b/gettext-tools/man/Makefile.am index 412f90308..93d45252d 100644 --- a/gettext-tools/man/Makefile.am +++ b/gettext-tools/man/Makefile.am @@ -1,5 +1,5 @@ ## Makefile for the gettext-tools/man subdirectory of GNU gettext -## Copyright (C) 2001-2003 Free Software Foundation, Inc. +## Copyright (C) 2001-2003, 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,11 +18,6 @@ ## Process this file with automake to produce Makefile.in. VERSION = @VERSION@ -mandir = @mandir@ -docdir = @docdir@ -htmldir = $(docdir) - -localedir = $(datadir)/locale AUTOMAKE_OPTIONS = 1.2 gnits EXTRA_DIST = diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog index 2df2f2682..fa84b3dba 100644 --- a/gettext-tools/src/ChangeLog +++ b/gettext-tools/src/ChangeLog @@ -1,3 +1,8 @@ +2006-04-14 Bruno Haible + + Assume autoconf >= 2.60. + * Makefile.am (localedir): Remove variable. + 2006-06-21 Bruno Haible * x-sh.c (read_word): Recognize the Bash process substitution syntax. diff --git a/gettext-tools/src/Makefile.am b/gettext-tools/src/Makefile.am index bf631ffd4..f1f90420c 100644 --- a/gettext-tools/src/Makefile.am +++ b/gettext-tools/src/Makefile.am @@ -57,7 +57,6 @@ x-tcl.h x-perl.h x-php.h x-stringtable.h x-rst.h x-glade.h EXTRA_DIST += FILES project-id ChangeLog.0 -localedir = $(datadir)/locale aliaspath = $(localedir) jardir = $(datadir)/gettext pkgdatadir = $(datadir)/gettext diff --git a/gettext-tools/tests/ChangeLog b/gettext-tools/tests/ChangeLog index 2b79cad12..883ff1602 100644 --- a/gettext-tools/tests/ChangeLog +++ b/gettext-tools/tests/ChangeLog @@ -1,3 +1,8 @@ +2006-04-14 Bruno Haible + + Assume autoconf >= 2.60. + * Makefile.am (localedir): Remove variable. + 2006-06-21 Bruno Haible * xgettext-sh-5: New file. diff --git a/gettext-tools/tests/Makefile.am b/gettext-tools/tests/Makefile.am index 31aeb1fb8..5344b174a 100644 --- a/gettext-tools/tests/Makefile.am +++ b/gettext-tools/tests/Makefile.am @@ -178,7 +178,6 @@ xg-c-1.ok.po: $(top_srcdir)/src/xgettext.c $(top_srcdir)/src/msgfmt.c $(top_srcdir)/src/xgettext.c $(top_srcdir)/src/msgfmt.c # Three auxiliary programs used by the tests. -localedir = $(datadir)/locale AM_CPPFLAGS = \ -I.. \ -I../lib -I$(top_srcdir)/lib \