From: Bruno Haible Date: Fri, 11 Mar 2005 13:15:40 +0000 (+0000) Subject: Initialize two variables to empty. X-Git-Tag: v0.14.3~11 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8c906ea9eddc150b22f819b488cfc7676fd4757f;p=thirdparty%2Fgettext.git Initialize two variables to empty. --- diff --git a/gettext-runtime/m4/ChangeLog b/gettext-runtime/m4/ChangeLog index 5cf5fb3cd..47438333a 100644 --- a/gettext-runtime/m4/ChangeLog +++ b/gettext-runtime/m4/ChangeLog @@ -2,6 +2,11 @@ * gettext-0.14.3 released. +2005-03-11 Bruno Haible + + * gettext.m4 (AM_GNU_GETTEXT): CATOBJEXT and INTLOBJS default to empty. + Reported by Stepan Kasal . + 2005-03-07 Bruno Haible * po.m4: Add comments. diff --git a/gettext-runtime/m4/gettext.m4 b/gettext-runtime/m4/gettext.m4 index 368907a29..1626ac03c 100644 --- a/gettext-runtime/m4/gettext.m4 +++ b/gettext-runtime/m4/gettext.m4 @@ -1,4 +1,4 @@ -# gettext.m4 serial 34 (gettext-0.14.2) +# gettext.m4 serial 35 (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, @@ -239,6 +239,7 @@ return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'` fi + CATOBJEXT= if test "$gt_use_preinstalled_gnugettext" = "yes" \ || test "$nls_cv_use_gnu_gettext" = "yes"; then dnl Mark actions to use GNU gettext tools. @@ -330,6 +331,7 @@ return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", AC_SUBST(GENCAT) dnl For backward compatibility. Some Makefiles may be using this. + INTLOBJS= if test "$USE_INCLUDED_LIBINTL" = yes; then INTLOBJS="\$(GETTOBJS)" fi