diff options
-rw-r--r-- | gettext-runtime/m4/ChangeLog | 6 | ||||
-rw-r--r-- | gettext-runtime/m4/gettext.m4 | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/gettext-runtime/m4/ChangeLog b/gettext-runtime/m4/ChangeLog index 4743833..eb6a585 100644 --- a/gettext-runtime/m4/ChangeLog +++ b/gettext-runtime/m4/ChangeLog @@ -2,6 +2,12 @@ * gettext-0.14.3 released. +2005-03-12 Bruno Haible <bruno@clisp.org> + + * gettext.m4 (AM_GNU_GETTEXT): Fix quoting bug. Fixes an endless loop + of 'aclocal' when a configure.ac contains two invocations of + AM_GNU_GETTEXT. + 2005-03-11 Bruno Haible <bruno@clisp.org> * gettext.m4 (AM_GNU_GETTEXT): CATOBJEXT and INTLOBJS default to empty. diff --git a/gettext-runtime/m4/gettext.m4 b/gettext-runtime/m4/gettext.m4 index 1626ac0..6261026 100644 --- a/gettext-runtime/m4/gettext.m4 +++ b/gettext-runtime/m4/gettext.m4 @@ -1,4 +1,4 @@ -# gettext.m4 serial 35 (gettext-0.14.3) +# gettext.m4 serial 36 (gettext-0.14.3) 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, @@ -63,8 +63,8 @@ AC_DEFUN([AM_GNU_GETTEXT], ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], , [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT ])])])]) - define(gt_included_intl, ifelse([$1], [external], [no], [yes])) - define(gt_libtool_suffix_prefix, ifelse([$1], [use-libtool], [l], [])) + define([gt_included_intl], ifelse([$1], [external], [no], [yes])) + define([gt_libtool_suffix_prefix], ifelse([$1], [use-libtool], [l], [])) AC_REQUIRE([AM_PO_SUBDIRS])dnl ifelse(gt_included_intl, yes, [ |