automake-patches
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Patch: FYI: don't check ALL_LINGUAS


From: Tom Tromey
Subject: Patch: FYI: don't check ALL_LINGUAS
Date: 26 Jul 2001 20:55:41 -0600

I'm checking this in.
The new gettext doesn't work with this code, and I think that
continuing to do the checking in automake, and not gettext, is
not the best idea.

Tom

Index: ChangeLog
from  Tom Tromey  <address@hidden>
        * automake.in (seen_linguas, all_linguas, all_linguas_line):
        Removed.
        (handle_gettext): Don't do any checking of the languages.
        (scan_one_autoconf_file): Don't look for ALL_LINGUAS.

Index: automake.in
===================================================================
RCS file: /cvs/automake/automake/automake.in,v
retrieving revision 1.1161
diff -u -r1.1161 automake.in
--- automake.in 2001/07/27 00:02:43 1.1161
+++ automake.in 2001/07/27 02:28:26
@@ -392,13 +392,6 @@
 # Line number at which AM_GNU_GETTEXT seen.
 my $ac_gettext_line = 0;
 
-# Whether ALL_LINGUAS has been seen.
-my $seen_linguas = '';
-# The actual text.
-my $all_linguas = '';
-# Line number at which it appears.
-my $all_linguas_line = 0;
-
 # TRUE if AC_DECL_YYTEXT was seen.
 my $seen_decl_yytext = 0;
 
@@ -3868,34 +3861,6 @@
        if ! grep ('intl', @subdirs);
 
     &require_file_with_conf_line ($ac_gettext_line, $GNU, 'ABOUT-NLS');
-
-    # Ensure that each language in ALL_LINGUAS has a .po file, and
-    # each po file is mentioned in ALL_LINGUAS.
-    if ($seen_linguas)
-    {
-       my %linguas = map { $_ => 1 } split (' ', $all_linguas);
-
-       foreach (<po/*.po>)
-       {
-           s/^po\///;
-           s/\.po$//;
-
-           &am_line_error ($all_linguas_line,
-                           ("po/$_.po exists but `$_' not in `ALL_LINGUAS'"))
-               if ! $linguas{$_};
-       }
-
-       foreach (keys %linguas)
-       {
-           &am_line_error ($all_linguas_line,
-                           "$_ in `ALL_LINGUAS' but po/$_.po does not exist")
-               if ! -f "po/$_.po";
-       }
-    }
-    else
-    {
-       &am_error ("AM_GNU_GETTEXT in `$configure_ac' but `ALL_LINGUAS' not 
defined");
-    }
 }
 
 # Handle footer elements.
@@ -4596,14 +4561,6 @@
        {
            $seen_gettext = 1;
            $ac_gettext_line = $.;
-       }
-
-        # Look for ALL_LINGUAS.
-        if (/ALL_LINGUAS="(.*)"$/ || /ALL_LINGUAS=(.*)$/)
-       {
-           $seen_linguas = 1;
-           $all_linguas = $1;
-           $all_linguas_line = $.;
        }
 
        # Handle configuration headers.  A config header of `[$1]'
Index: automake.texi
===================================================================
RCS file: /cvs/automake/automake/automake.texi,v
retrieving revision 1.228
diff -u -r1.228 automake.texi
--- automake.texi 2001/07/27 00:02:43 1.228
+++ automake.texi 2001/07/27 02:28:31
@@ -1191,13 +1191,6 @@
 Autoconf Manual}.
 @cvindex AC_PROG_LEX
 
address@hidden ALL_LINGUAS
-If Automake sees that this variable is set in @file{configure.in}, it
-will check the @file{po} directory to ensure that all the named
address@hidden files exist, and that all the @samp{.po} files that exist are
-named.
address@hidden ALL_LINGUAS
-
 @item AM_C_PROTOTYPES
 This is required when using automatic de-ANSI-fication; see @ref{ANSI}.
 @cvindex AM_C_PROTOTYPES
@@ -2979,10 +2972,6 @@
 subdirectories to the package, @file{intl} and @file{po}.  Automake
 insures that these directories exist and are mentioned in
 @code{SUBDIRS}.
-
-Furthermore, Automake checks that the definition of @code{ALL_LINGUAS}
-in @file{configure.in} corresponds to all the valid @file{.po} files,
-and nothing more.
 
 
 @node Libtool, Java, gettext, Other GNU Tools



reply via email to

[Prev in Thread] Current Thread [Next in Thread]