* automake.in: Require AC_PROG_INSTALL in...

(&scan_autoconf_files): here.

diff --git a/ChangeLog b/ChangeLog
index 0b25b2c7eebde092e847cafe6acff1178c93c604..c5b720ab2cd22e3ebdfbcdcaeb57f029f4b2b986 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-03-05  Akim Demaille  <akim@epita.fr>
+
+       * automake.in: Require AC_PROG_INSTALL in...
+       (&scan_autoconf_files): here.
+
+       
 2001-03-05  Akim Demaille  <akim@epita.fr>
 
        * configure.am: New file.

diff --git a/automake.in b/automake.in
index 79bda3057826d2123a4a5ead1a3fba191f5c0053..f35427c23472dd4104671d10f74e4e30de1b679f 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -919,9 +919,6 @@ foreach $am_file (@input_files)
     }
 }
 
-&am_conf_error ("AC_PROG_INSTALL must be used")
-    if (! $seen_prog_install);
-
 exit $exit_status;
 
 
@@ -4890,6 +4887,9 @@ sub scan_autoconf_files
     &am_conf_error ("\`AC_PROG_MAKE_SET' must be used")
        if ! $seen_make_set;
 
+    &am_conf_error ("\`AC_PROG_INSTALL' must be used")
+      if ! $seen_prog_install;
+
     # Look for some files we need.  Always check for these.  This
     # check must be done for every run, even those where we are only
     # looking at a subdir Makefile.  We must set relative_dir so that