diff options
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | gettext-runtime/NEWS | 1 | ||||
| -rw-r--r-- | gettext-runtime/m4/ChangeLog | 8 | ||||
| -rw-r--r-- | gettext-runtime/m4/po.m4 | 10 | ||||
| -rw-r--r-- | gettext-runtime/m4/progtest.m4 | 7 |
5 files changed, 21 insertions, 6 deletions
@@ -1,6 +1,7 @@ Version 0.14.2 - January 2005 * Improved detection of the locale on MacOS X. +* The gettext autoconf macros now require autoconf 2.50 or newer. Version 0.14 - January 2004 diff --git a/gettext-runtime/NEWS b/gettext-runtime/NEWS index 9f1d109..a703548 100644 --- a/gettext-runtime/NEWS +++ b/gettext-runtime/NEWS @@ -1,6 +1,7 @@ Version 0.14.2 - January 2005 * Improved detection of the locale on MacOS X. +* The gettext autoconf macros now require autoconf 2.50 or newer. Version 0.14 - January 2004 diff --git a/gettext-runtime/m4/ChangeLog b/gettext-runtime/m4/ChangeLog index d168dfe..370b9d8 100644 --- a/gettext-runtime/m4/ChangeLog +++ b/gettext-runtime/m4/ChangeLog @@ -1,3 +1,11 @@ +2005-01-08 Bruno Haible <bruno@clisp.org> + + * progtest.m4: Require autoconf >= 2.50. + (AM_PATH_PROG_WITH_TEST): Emit some traces to the log file. + * po.m4: Require autoconf >= 2.50. + (AM_PO_SUBDIRS): Emit the tested program's output to the log file. + Suggested by Yann Dirson <ydirson@altern.org>. + 2004-06-01 Paul Eggert <eggert@cs.ucla.edu> * longlong.m4, ulonglong.m4: Fix copyright date and/or serial number. diff --git a/gettext-runtime/m4/po.m4 b/gettext-runtime/m4/po.m4 index c446386..68ff456 100644 --- a/gettext-runtime/m4/po.m4 +++ b/gettext-runtime/m4/po.m4 @@ -1,4 +1,4 @@ -# po.m4 serial 4 (gettext-0.14.2) +# po.m4 serial 5 (gettext-0.14.2) dnl Copyright (C) 1995-2005 Free Software Foundation, Inc. dnl This file is free software, distributed under the terms of the GNU dnl General Public License. As a special exception to the GNU General @@ -19,6 +19,8 @@ dnl Authors: dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000. dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003. +AC_PREREQ(2.50) + dnl Checks for all prerequisites of the po subdirectory. AC_DEFUN([AM_PO_SUBDIRS], [ @@ -34,7 +36,7 @@ AC_DEFUN([AM_PO_SUBDIRS], dnl The first test excludes Solaris msgfmt and early GNU msgfmt versions. dnl The second test excludes FreeBSD msgfmt. AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, - [$ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1 && + [$ac_dir/$ac_word --statistics /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 && (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)], :) AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) @@ -43,7 +45,7 @@ AC_DEFUN([AM_PO_SUBDIRS], dnl The first test excludes Solaris xgettext and early GNU xgettext versions. dnl The second test excludes FreeBSD xgettext. AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, - [$ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >/dev/null 2>&1 && + [$ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 && (if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)], :) dnl Remove leftover from FreeBSD xgettext call. @@ -51,7 +53,7 @@ AC_DEFUN([AM_PO_SUBDIRS], dnl Search for GNU msgmerge 0.11 or newer in the PATH. AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge, - [$ac_dir/$ac_word --update -q /dev/null /dev/null >/dev/null 2>&1], :) + [$ac_dir/$ac_word --update -q /dev/null /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1], :) dnl This could go away some day; the PATH_PROG_WITH_TEST already does it. dnl Test whether we really found GNU msgfmt. diff --git a/gettext-runtime/m4/progtest.m4 b/gettext-runtime/m4/progtest.m4 index 8fe527c..346482d 100644 --- a/gettext-runtime/m4/progtest.m4 +++ b/gettext-runtime/m4/progtest.m4 @@ -1,5 +1,5 @@ -# progtest.m4 serial 3 (gettext-0.12) -dnl Copyright (C) 1996-2003 Free Software Foundation, Inc. +# progtest.m4 serial 4 (gettext-0.14.2) +dnl Copyright (C) 1996-2003, 2005 Free Software Foundation, Inc. dnl This file is free software, distributed under the terms of the GNU dnl General Public License. As a special exception to the GNU General dnl Public License, this file may be distributed as part of a program @@ -18,6 +18,8 @@ dnl They are *not* in the public domain. dnl Authors: dnl Ulrich Drepper <drepper@cygnus.com>, 1996. +AC_PREREQ(2.50) + # Search path for a program which passes the given test. dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, @@ -67,6 +69,7 @@ AC_CACHE_VAL(ac_cv_path_$1, test -z "$ac_dir" && ac_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then + echo "$as_me: trying $ac_dir/$ac_word..." >&AS_MESSAGE_LOG_FD if [$3]; then ac_cv_path_$1="$ac_dir/$ac_word$ac_exec_ext" break 2 |