* automake.in (handle_configure): Don't check for

	AC_PROG_MAKE_SET.
	(scan_configure): Check for AC_PROG_MAKE_SET.

diff --git a/ChangeLog b/ChangeLog
index 8b7d04b6b56dfee247aa7fe457e6682e5cab208a..a32704ab9febc4fadc4010176c5424fa9918b0f3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2000-01-06  Tom Tromey  <tromey@cygnus.com>
 
+       * automake.in (handle_configure): Don't check for
+       AC_PROG_MAKE_SET.
+       (scan_configure): Check for AC_PROG_MAKE_SET.
+
        * header-vars.am (@SET_MAKE@): Added.
        * subdirs.am (@SET_MAKE@): Removed.  Report from Motoyuki
        Kasahara.

diff --git a/automake.in b/automake.in
index e9c34b5a2d2c755c450041208e33fe6663cf2607..9f4121f2bba90b950d1c65aaf8dabe6356a86bb2 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -6,7 +6,7 @@ eval 'exec @PERL@ -S $0 ${1+"$@"}'
     if 0;
 
 # automake - create Makefile.in from Makefile.am
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+# Copyright (C) 1994-99, 2000 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -3204,10 +3204,6 @@ sub handle_configure
 {
     local ($local, $input, @secondary_inputs) = @_;
 
-    # If SUBDIRS defined, require AC_PROG_MAKE_SET.
-    &am_line_error ('SUBDIRS', "AC_PROG_MAKE_SET must be used in configure.in")
-       if &variable_defined ('SUBDIRS') && ! $seen_make_set;
-
     local ($top_reldir);
 
     local ($input_base) = &basename ($input);
@@ -4687,6 +4683,11 @@ sub scan_configure
     &am_conf_error ("\`VERSION' not defined in configure.in")
         if ! $seen_version;
 
+    # Always require AC_PROG_MAKE_SET.  We might randomly use $(MAKE)
+    # for our own reasons.
+    &am_conf_error ("\`AC_PROG_MAKE_SET' must be used in configure.in")
+       if ! $seen_make_set;
+
     # 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