automake: warn about install.sh being found, rather than error.

Report from https://bugs.gnu.org/19964.

* bin/automake.in (scan_autoconf_files): give a msg 'obsolete'
rather than err_am. Mention where install.sh was found.
(En passant, fix some doubled words.)
* NEWS: mention this.

diff --git a/NEWS b/NEWS
index d06de78fd16eaff58e190351115d91eca20c6797..9c1b56851ec8e6ca839191e55ce889cfbaf559e7 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -41,10 +41,13 @@ New in 1.x:
   - The compile script is more robust to Windows configurations;
     specifically, avoiding double-path translation on MSYS. (bug#75939)
 
+  - Only warn about install.sh being found, instead of it being a fatal
+    error. (bug#19964)
+
   - AM_SILENT_RULES once again always ends with a newline. (bug#72267)
 
-  - AM_SANITY_CHECK outputs a "no" for failure before fatal errors.
-    (bug#76448)
+  - AM_SANITY_CHECK outputs "no" on failure, so that a complete line is
+  printed to stdout before the error message is written to stderr. (bug#76448)
 
 * Miscellaneous changes
 

diff --git a/bin/automake.in b/bin/automake.in
index 70c512af2ea74dbb26d92a0a11fdc8cd3dad059c..bb60a6355ca6e3d05239a2f7c77e3201d50edb11 100644 (file)
--- a/bin/automake.in
+++ b/bin/automake.in
@@ -1061,7 +1061,7 @@ sub err_ac
 
 # msg_am ($CHANNEL, $MESSAGE, [%OPTIONS])
 # ---------------------------------------
-# Messages about about the current Makefile.am.
+# Messages about the current Makefile.am.
 sub msg_am
 {
   my ($channel, $msg, %opts) = @_;
@@ -1070,7 +1070,7 @@ sub msg_am
 
 # msg_ac ($CHANNEL, $MESSAGE, [%OPTIONS])
 # ---------------------------------------
-# Messages about about configure.ac.
+# Messages about configure.ac.
 sub msg_ac
 {
   my ($channel, $msg, %opts) = @_;
@@ -5668,8 +5668,15 @@ sub scan_autoconf_files ()
     {
       require_conf_file ($required_aux_file{$file}->get, FOREIGN, $file)
     }
-  err_am "'install.sh' is an anachronism; use 'install-sh' instead"
-    if -f $config_aux_dir . '/install.sh';
+  
+  my $auxdir_install_dot_sh = "$config_aux_dir/install.sh";
+  # Maybe there is a way to report the line number of the
+  # AC_CONFIG_AUX_DIR call in configure.ac? Don't know.
+  msg 'obsolete', "$configure_ac", "'install.sh' is an anachronism\n"
+                                 . "  (found in $auxdir_install_dot_sh,\n"
+                                 . "   defined by AC_CONFIG_AUX_DIR);\n"
+                                 . "  use 'install-sh' instead"
+    if -f $auxdir_install_dot_sh;
 
   # Preserve dist_common for later.
   @configure_dist_common = @dist_common;
@@ -5954,7 +5961,7 @@ sub lang_yacc_target_hook
     my ($self, $aggregate, $output, $input, %transform) = @_;
 
     # If some relevant *YFLAGS variable contains the '-d' flag, we'll
-    # have to to generate special code.
+    # have to generate special code.
     my $yflags_contains_minus_d = 0;
 
     foreach my $pfx ("", "${aggregate}_")
@@ -7549,8 +7556,7 @@ sub is_make_dir
 ################################################################
 
 # Find the aux dir.  This should match the algorithm used by
-# ./configure. (See the Autoconf documentation for for
-# AC_CONFIG_AUX_DIR.)
+# ./configure. See the Autoconf documentation for AC_CONFIG_AUX_DIR.
 sub locate_aux_dir ()
 {
   if (! $config_aux_dir_set_in_configure_ac)