From: Bruno Haible Date: Tue, 25 Sep 2001 13:42:35 +0000 (+0000) Subject: Bug fix for people who don't have LINGUAS set. X-Git-Tag: v0.11~472 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=62241c097c065cd7157c66c3158f62be7569bdc1;p=thirdparty%2Fgettext.git Bug fix for people who don't have LINGUAS set. --- diff --git a/m4/ChangeLog b/m4/ChangeLog index f453cfcb9..9d64d78a6 100644 --- a/m4/ChangeLog +++ b/m4/ChangeLog @@ -1,3 +1,9 @@ +2001-09-24 Bruno Haible + + * gettext.m4 (AM_WITH_NLS): Capture not only the value of $LINGUAS, + but also whether it was set or unset. + Reported by Andreas Schwab . + 2001-08-12 Jim Meyering * mbrtowc.m4: Quote first arg of AC_DEFUN. diff --git a/m4/gettext.m4 b/m4/gettext.m4 index 3a882a5bb..fc7205c2e 100644 --- a/m4/gettext.m4 +++ b/m4/gettext.m4 @@ -312,7 +312,8 @@ return (int) gettext ("")]ifelse([$2], need-ngettext, [ + (int) ngettext ("", "" # compute GMOFILES, POFILES, CATALOGS. But hide it from automake. eval 'ALL_LINGUAS''="$ALL_LINGUAS"' # Capture the value of $LINGUAS because we need it to compute CATALOGS. - LINGUAS="$LINGUAS" + LINGUAS="${LINGUAS-%UNSET%}" + test "%UNSET%" != "\$LINGUAS" || unset LINGUAS ]) @@ -339,7 +340,7 @@ return (int) gettext ("")]ifelse([$2], need-ngettext, [ + (int) ngettext ("", "" dnl Found it, now check the version. AC_MSG_CHECKING([version of bison]) changequote(<<,>>)dnl - ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison .* \([0-9]*\.[0-9.]*\).*$/\1/p'` + ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'` case $ac_prog_version in '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; 1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*)