From: Akim Demaille <akim@epita.fr>
Date: Mon, 5 Mar 2001 14:42:20 +0000 (+0000)
Subject: * automake.in: Require AC_PROG_INSTALL in...
X-Git-Tag: handle-languages~183
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=c58ed3416055d410b57cc4947614013d9f511aa4;p=automake.git

* automake.in: Require AC_PROG_INSTALL in...
(&scan_autoconf_files): here.
---

diff --git a/ChangeLog b/ChangeLog
index 0b25b2c7..c5b720ab 100644
--- 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 79bda305..f35427c2 100755
--- 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