From: Tom Tromey Date: Fri, 27 Jul 2001 02:29:42 +0000 (+0000) Subject: * automake.texi (Optional): Don't mention ALL_LINGUAS. X-Git-Tag: Release-1-4j~10 X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=df0043bb13324d945dd9c6e9edd402389fd630e6;p=automake.git * automake.texi (Optional): Don't mention ALL_LINGUAS. (gettext): Likewise. * 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. --- diff --git a/ChangeLog b/ChangeLog index 3397ba50..7ea38218 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2001-07-26 Tom Tromey + * automake.texi (Optional): Don't mention ALL_LINGUAS. + (gettext): Likewise. + * 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. + * automake.in (am_print_error): New function. (am_error): Use it. (am_file_error): Likewise. diff --git a/automake.in b/automake.in index f34cdb8a..672879c8 100755 --- a/automake.in +++ b/automake.in @@ -392,13 +392,6 @@ my $seen_gettext = 0; # 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 @@ sub handle_gettext 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 () - { - 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. @@ -4598,14 +4563,6 @@ sub scan_one_autoconf_file $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]' # means we are actually scanning AM_CONFIG_HEADER from # aclocal.m4. diff --git a/automake.texi b/automake.texi index 6a8153e5..6f44fdf2 100644 --- a/automake.texi +++ b/automake.texi @@ -1191,13 +1191,6 @@ If a Lex source file is seen, then this macro must be used. Autoconf Manual}. @cvindex AC_PROG_LEX -@item 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 -@samp{.po} files exist, and that all the @samp{.po} files that exist are -named. -@cvindex ALL_LINGUAS - @item AM_C_PROTOTYPES This is required when using automatic de-ANSI-fication; see @ref{ANSI}. @cvindex AM_C_PROTOTYPES @@ -2980,10 +2973,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 @section Libtool