From: Bruno Haible Date: Tue, 21 Feb 2006 11:44:46 +0000 (+0000) Subject: No need to call AM_NLS twice. X-Git-Tag: v0.15~311 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=650a47ab6a0f4cf34a15b23140ffa7e21d85b6c0;p=thirdparty%2Fgettext.git No need to call AM_NLS twice. --- diff --git a/gettext-runtime/m4/ChangeLog b/gettext-runtime/m4/ChangeLog index 12d0002c3..91d03d91d 100644 --- a/gettext-runtime/m4/ChangeLog +++ b/gettext-runtime/m4/ChangeLog @@ -1,3 +1,9 @@ +2006-02-21 Bruno Haible + + * gettext.m4 (AM_GNU_GETTEXT): Invoke AM_NLS through AC_REQUIRE, not + directly. + Reported by Ron . + 2005-11-21 Bruno Haible * gettext.m4 (AM_INTL_SUBDIR): Invoke gt_LC_MESSAGES always, since we diff --git a/gettext-runtime/m4/gettext.m4 b/gettext-runtime/m4/gettext.m4 index dd5875fa3..629e104f1 100644 --- a/gettext-runtime/m4/gettext.m4 +++ b/gettext-runtime/m4/gettext.m4 @@ -1,5 +1,5 @@ -# gettext.m4 serial 44 (gettext-0.15) -dnl Copyright (C) 1995-2005 Free Software Foundation, Inc. +# gettext.m4 serial 45 (gettext-0.15) +dnl Copyright (C) 1995-2006 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -94,7 +94,7 @@ AC_DEFUN([AM_GNU_GETTEXT], gt_INTL_MACOSX dnl Set USE_NLS. - AM_NLS + AC_REQUIRE([AM_NLS]) ifelse(gt_included_intl, yes, [ BUILD_INCLUDED_LIBINTL=no