From: Bruno Haible <bruno@clisp.org>
Date: Wed, 8 Jan 2003 13:14:41 +0000 (+0000)
Subject: Avoid spurious warning.
X-Git-Tag: v0.12~1195
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=50b66f14aba151203166dda786c63ff9c4f5772f;p=thirdparty%2Fgettext.git

Avoid spurious warning.
---

diff --git a/m4/ChangeLog b/m4/ChangeLog
index 26f3e9e48..c9c82078f 100644
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,9 @@
+2003-01-08  Bruno Haible  <bruno@clisp.org>
+
+	* gettext.m4 (AM_PO_SUBDIRS): Avoid warning when there are at least
+	two PO directories.
+	Reported by Alexander Turbov <AVTurbov@gwise.eltech.ru>.
+
 2002-12-07  Bruno Haible  <bruno@clisp.org>
 
 	Switch to autoconf-2.57 and automake-1.7.2.
diff --git a/m4/gettext.m4 b/m4/gettext.m4
index bff53bffc..878df12cc 100644
--- a/m4/gettext.m4
+++ b/m4/gettext.m4
@@ -438,13 +438,16 @@ AC_DEFUN([AM_PO_SUBDIRS],
           # parameters.
           if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
             # The LINGUAS file contains the set of available languages.
-            if test -n "$ALL_LINGUAS"; then
+            if test -n "$OBSOLETE_ALL_LINGUAS"; then
               test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
             fi
             ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"`
             # Hide the ALL_LINGUAS assigment from automake.
             eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
             POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
+          else
+            # The set of available languages was given in configure.in.
+            eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
           fi
           case "$ac_given_srcdir" in
             .) srcdirpre= ;;
@@ -509,7 +512,7 @@ AC_DEFUN([AM_PO_SUBDIRS],
    [# Capture the value of obsolete ALL_LINGUAS because we need it to compute
     # POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES, CATALOGS. But hide it
     # from automake.
-    eval 'ALL_LINGUAS''="$ALL_LINGUAS"'
+    eval 'OBSOLETE_ALL_LINGUAS''="$ALL_LINGUAS"'
     # Capture the value of LINGUAS because we need it to compute CATALOGS.
     LINGUAS="${LINGUAS-%UNSET%}"
    ])