* automake.in (usage): Print files in column-major order.

	(handle_gettext): Only require ABOUT-NLS for GNU programs.

diff --git a/ChangeLog b/ChangeLog
index 77471e6152db84d8ae85144d6de315cd0393885a..37b573516014052215d6886bbcdbf0d85d7f72cd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+1998-12-02  Tom Tromey  <tromey@cygnus.com>
+
+       * automake.in (usage): Print files in column-major order.
+       (handle_gettext): Only require ABOUT-NLS for GNU programs.
+
 1998-12-01  Tom Tromey  <tromey@cygnus.com>
 
        * automake.texi (Dist): Documented GZIP_ENV.

diff --git a/automake.in b/automake.in
index edbecd6b99c0e3412811948a7985aad8b12c88e9..ddcc828c7293c37ab9badd882cecb91ee949f1d3 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -3183,8 +3183,7 @@ sub handle_gettext
        return;
     }
 
-    &require_file_with_conf_line ($ac_gettext_line, $FOREIGN, 'ABOUT-NLS')
-       if $seen_gettext;
+    &require_file_with_conf_line ($ac_gettext_line, $GNU, 'ABOUT-NLS');
 
     if (&variable_defined ('SUBDIRS'))
     {
@@ -7064,13 +7063,26 @@ sub usage
     print "\nFiles which are automatically distributed, if found:\n";
     $~ = "USAGE_FORMAT";
     local (@lcomm) = sort ((@common_files, @common_sometimes));
-    local ($one, $two, $three, $four);
-    while (@lcomm > 0)
+    local ($one, $two, $three, $four, $i, $max);
+
+    $max = int (($#lcomm + 1) / 4);
+
+    for ($i = 0; $i < $max; ++$i)
+    {
+       $one = $lcomm[$i];
+       $two = $lcomm[$max + $i];
+       $three = $lcomm[2 * $max + $i];
+       $four = $lcomm[3 * $max + $i];
+       write;
+    }
+
+    local ($mod) = ($#lcomm + 1) % 4;
+    if ($mod != 0)
     {
-       $one = shift @lcomm;
-       $two = @lcomm ? shift @lcomm : '';
-       $three = @lcomm ? shift @lcomm : '';
-       $four = @lcomm ? shift @lcomm : '';
+       $one = $lcomm[$max];
+       $two = ($mod > 1) ? $lcomm[2 * $max] : '';
+       $three = ($mod > 2) ? $lcomm[3 * $max] : '';
+       $four = ($mod > 3) ? $lcomm[4 * $max] : '';
        write;
     }