* automake.in (parse_arguments, MAIN): Give more precise

diagnostics when not input file is found.
* tests/output5.test: Adjust.
Suggested by Jens Petersen.

diff --git a/ChangeLog b/ChangeLog
index 0f64dab25ec5af979eef78387df49ceec5435364..e55b80fdf5e147de01efa9c680a2e95c6003a706 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-05-15  Alexandre Duret-Lutz  <adl@gnu.org>
+
+       * automake.in (parse_arguments, MAIN): Give more precise
+       diagnostics when not input file is found.
+       * tests/output5.test: Adjust.
+       Suggested by Jens Petersen.
+
 2004-05-14  Alexandre Duret-Lutz  <adl@gnu.org>
 
        * lib/am/libs.am (AR, ARFLAGS): Move these definition ...

diff --git a/automake.in b/automake.in
index e4f2fedde680c63e1507f978a78b6757b79c55eb..97e0cb70537b357d99e515a9f8069701caaefe38 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -7363,6 +7363,7 @@ sub parse_arguments ()
       $output_directory = '.';
     }
 
+  my $errspec = 0;
   foreach my $arg (@ARGV)
     {
       if ($arg =~ /^-./)
@@ -7382,9 +7383,12 @@ sub parse_arguments ()
        }
       else
        {
-         error "no Automake input file found in `$arg'";
+         error "no Automake input file found for `$arg'";
+         $errspec = 1;
        }
     }
+  fatal "no input file found among supplied arguments"
+    if $errspec && ! @input_files;
 }
 
 ################################################################
@@ -7400,8 +7404,13 @@ $configure_ac = require_configure_ac;
 # Do configure.ac scan only once.
 scan_autoconf_files;
 
-fatal "no `Makefile.am' found or specified\n"
-  if ! @input_files;
+if (! @input_files)
+  {
+    my $msg = '';
+    $msg = "\nDid you forget AC_CONFIG_FILES([Makefile]) in $configure_ac?"
+      if -f 'Makefile.am';
+    fatal ("no `Makefile.am' found for any configure output$msg");
+  }
 
 # Now do all the work on each file.
 foreach my $file (@input_files)

diff --git a/tests/output5.test b/tests/output5.test
index aa6d349c49d95147e007a6970220c3dcfd19c160..5ba0cdf1a1940619311ad52ad0aff37091cb4e3c 100755 (executable)
--- a/tests/output5.test
+++ b/tests/output5.test
@@ -1,5 +1,6 @@
 #! /bin/sh
-# Copyright (C) 1997, 2000, 2001, 2002, 2003  Free Software Foundation, Inc.
+# Copyright (C) 1997, 2000, 2001, 2002, 2003, 2004  Free Software
+#   Foundation, Inc.
 #
 # This file is part of GNU Automake.
 #
@@ -34,4 +35,4 @@ END
 
 $ACLOCAL
 AUTOMAKE_fails
-grep 'found or specified' stderr
+grep 'AC_CONFIG_FILES(.Makefile.)' stderr