From: Bruno Haible Date: Wed, 4 May 2005 10:56:47 +0000 (+0000) Subject: Assume autoconf-2.50 or newer. X-Git-Tag: v0.15~531 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=852917fb0ec2fdece3b50d470d43f26a574d3189;p=thirdparty%2Fgettext.git Assume autoconf-2.50 or newer. --- diff --git a/gettext-runtime/intl/Makefile.in b/gettext-runtime/intl/Makefile.in index 25499c0f1..1820f5374 100644 --- a/gettext-runtime/intl/Makefile.in +++ b/gettext-runtime/intl/Makefile.in @@ -493,7 +493,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status # This would be more efficient, but doesn't work any more with autoconf-2.57, # when AC_CONFIG_FILES([intl/Makefile:somedir/Makefile.in]) is used. -# cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status +# cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ # Tell versions [3.59,3.63) of GNU make not to export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/gettext-runtime/m4/ChangeLog b/gettext-runtime/m4/ChangeLog index 00db8f0ab..bf6dafa59 100644 --- a/gettext-runtime/m4/ChangeLog +++ b/gettext-runtime/m4/ChangeLog @@ -1,3 +1,9 @@ +2005-03-13 Bruno Haible + + * po.m4 (AM_PO_SUBDIRS): Use AC_CONFIG_COMMANDS instead of + AC_OUTPUT_COMMANDS. + Suggested by Alexandre Duret-Lutz . + 2005-04-30 Bruno Haible * gettext.m4 (AM_INTL_SUBDIR): Remove CPPFLAGS addition for diff --git a/gettext-runtime/m4/po.m4 b/gettext-runtime/m4/po.m4 index f2795eea0..f1c48ed24 100644 --- a/gettext-runtime/m4/po.m4 +++ b/gettext-runtime/m4/po.m4 @@ -1,4 +1,4 @@ -# po.m4 serial 7 (gettext-0.14.3) +# po.m4 serial 8 (gettext-0.15) dnl Copyright (C) 1995-2005 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -86,7 +86,7 @@ AC_DEFUN([AM_PO_SUBDIRS], rm -f messages.po fi - AC_OUTPUT_COMMANDS([ + AC_CONFIG_COMMANDS([po-directories], [[ for ac_file in $CONFIG_FILES; do # Support "outfile[:infile[:infile...]]" case "$ac_file" in @@ -197,7 +197,7 @@ AC_DEFUN([AM_PO_SUBDIRS], fi ;; esac - done], + done]], [# Capture the value of obsolete ALL_LINGUAS because we need it to compute # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS. But hide it # from automake. diff --git a/gettext-runtime/po/ChangeLog b/gettext-runtime/po/ChangeLog index d77d00383..9d3bc37d5 100644 --- a/gettext-runtime/po/ChangeLog +++ b/gettext-runtime/po/ChangeLog @@ -1,3 +1,9 @@ +2005-03-13 Bruno Haible + + * Makefile.in.in (Makefile): Call config.status with calling convention + supported since autoconf-2.50. + Suggested by Alexandre Duret-Lutz . + 2005-04-11 Bruno Haible * gettext-0.14.4 released. diff --git a/gettext-runtime/po/Makefile.in.in b/gettext-runtime/po/Makefile.in.in index 1f5cc285d..cbee426d1 100644 --- a/gettext-runtime/po/Makefile.in.in +++ b/gettext-runtime/po/Makefile.in.in @@ -8,7 +8,7 @@ # Please note that the actual code of GNU gettext is covered by the GNU # General Public License and is *not* in the public domain. # -# Origin: gettext-0.14.4 +# Origin: gettext-0.15 PACKAGE = @PACKAGE@ VERSION = @VERSION@ @@ -374,8 +374,7 @@ update-gmo: Makefile $(GMOFILES) Makefile: Makefile.in.in Makevars $(top_builddir)/config.status @POMAKEFILEDEPS@ cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@.in CONFIG_HEADERS= \ - $(SHELL) ./config.status + && $(SHELL) ./config.status $(subdir)/$@.in po-directories force: diff --git a/gettext-tools/po/ChangeLog b/gettext-tools/po/ChangeLog index 7be8ec400..504dfbcbe 100644 --- a/gettext-tools/po/ChangeLog +++ b/gettext-tools/po/ChangeLog @@ -1,3 +1,9 @@ +2005-03-13 Bruno Haible + + * Makefile.in.in (Makefile): Call config.status with calling convention + supported since autoconf-2.50. + Suggested by Alexandre Duret-Lutz . + 2005-04-11 Bruno Haible * gettext-0.14.4 released. diff --git a/gettext-tools/po/Makefile.in.in b/gettext-tools/po/Makefile.in.in index 1f5cc285d..cbee426d1 100644 --- a/gettext-tools/po/Makefile.in.in +++ b/gettext-tools/po/Makefile.in.in @@ -8,7 +8,7 @@ # Please note that the actual code of GNU gettext is covered by the GNU # General Public License and is *not* in the public domain. # -# Origin: gettext-0.14.4 +# Origin: gettext-0.15 PACKAGE = @PACKAGE@ VERSION = @VERSION@ @@ -374,8 +374,7 @@ update-gmo: Makefile $(GMOFILES) Makefile: Makefile.in.in Makevars $(top_builddir)/config.status @POMAKEFILEDEPS@ cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@.in CONFIG_HEADERS= \ - $(SHELL) ./config.status + && $(SHELL) ./config.status $(subdir)/$@.in po-directories force: