Bug fix for people who don't have LINGUAS set.

diff --git a/m4/ChangeLog b/m4/ChangeLog
index f453cfcb9e61aedcfeb7a961c2ff9744e5471946..9d64d78a6627d86bd27941ff4aec2edabdd7c4c0 100644 (file)
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,9 @@
+2001-09-24  Bruno Haible  <haible@clisp.cons.org>
+
+       * gettext.m4 (AM_WITH_NLS): Capture not only the value of $LINGUAS,
+       but also whether it was set or unset.
+       Reported by Andreas Schwab <schwab@suse.de>.
+
 2001-08-12  Jim Meyering  <meyering@lucent.com>
 
        * mbrtowc.m4: Quote first arg of AC_DEFUN.

diff --git a/m4/gettext.m4 b/m4/gettext.m4
index 3a882a5bb6811fc8dbd3470271fb008f1c1f653b..fc7205c2e8ac0703a381c76cceb71912089c9ffa 100644 (file)
--- 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].*)