From 85057c00f479269e015c8b4ae5cb0135c65cecd3 Mon Sep 17 00:00:00 2001
From: Tom Tromey <tromey@redhat.com>
Date: Sat, 9 Dec 1995 04:18:33 +0000
Subject: [PATCH] Check for AC_PROG_MAKE_SET when required

---
 ChangeLog          |  4 +++-
 Makefile.am        |  3 +++
 Makefile.in        | 21 ++++++++++++---------
 automake.in        | 13 ++++++++++++-
 lib/am/Makefile.am |  3 +++
 5 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9381ab02..aa7cb35f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,11 @@
 Fri Dec  8 16:30:48 1995  Tom Tromey  <tromey@cambric.colorado.edu>
 
+	* automake.in (handle_texinfo): Use "$? >> 8", not "$?".
+	(handle_configure): Check for AC_PROG_MAKE_SET.
+
 	* depend.am (DEP_FILES): Handle deANSIfication case.  From Jim
 	Meyering.
 
-
 	* automake.in (am_install_var): Changed how 'clean' handled for
 	uniform name targets.
 	* Makefile.am (pkgdata_DATA): Added new files.
diff --git a/Makefile.am b/Makefile.am
index a76be772..bb92699c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,6 +16,9 @@ libraries-clean.am scripts-clean.am programs-clean.am data-clean.am
 
 DIST_OTHER = automake.in
 
+# Gross.
+DIST_SUBDIRS = samples/cpio/*Makefile.am
+
 # The following requires a fixed version of the Emacs 19.30 etags.
 ETAGS_ARGS = automake.in --lang=none \
  --regex='/^@node[ \t]+\([^,]+\)/\1/' automake.texi
diff --git a/Makefile.in b/Makefile.in
index 563624d5..d1ef43da 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -63,6 +63,8 @@ libraries-clean.am scripts-clean.am programs-clean.am data-clean.am
 
 DIST_OTHER = automake.in
 
+DIST_SUBDIRS = samples/cpio/*Makefile.am
+
 ETAGS_ARGS = automake.in --lang=none \
  --regex='/^@node[ \t]+\([^,]+\)/\1/' automake.texi
 
@@ -92,6 +94,15 @@ DISTFILES = $(SOURCES) $(HEADERS) $(TEXINFOS) $(INFOS) $(MANS) \
 
 default: all
 
+mostlyclean-binSCRIPTS:
+
+clean-binSCRIPTS:
+	rm -f $(bin_SCRIPTS)
+
+distclean-binSCRIPTS:
+
+maintainer-clean-binSCRIPTS:
+
 install-binSCRIPTS: $(bin_SCRIPTS)
 	$(top_srcdir)/mkinstalldirs $(bindir)
 	for p in $(bin_SCRIPTS); do		\
@@ -103,15 +114,6 @@ uninstall-binSCRIPTS:
 	  rm -f $(bindir)/`echo $$p|sed '$(transform)'`; \
 	done
 
-mostlyclean-binSCRIPTS:
-
-clean-binSCRIPTS:
-	rm -f $(bin_SCRIPTS)
-
-distclean-binSCRIPTS:
-
-maintainer-clean-binSCRIPTS:
-
 version.texi: stamp-vti
 
 stamp-vti: automake.texi $(top_srcdir)/configure.in
@@ -287,6 +289,7 @@ maintainer-clean: distclean maintainer-clean-binSCRIPTS maintainer-clean-vti mai
 
 # SUBDIRS = intl po
 # CONFIG_HEADER = config.h
+# Gross.
 # The following requires a fixed version of the Emacs 19.30 etags.
 # The simplest form of checking.
 check-local: automake
diff --git a/automake.in b/automake.in
index acba27e6..90d8eb77 100755
--- a/automake.in
+++ b/automake.in
@@ -479,7 +479,7 @@ sub handle_texinfo
     # automatic versioning capability.
     system ("grep version.texi " . $relative_dir . "/" . $texis[0]
 	    . " > /dev/null 2>&1");
-    if (!$?)
+    if (! ($? >> 8))
     {
 	# Got a hit.
 	push (@texis, 'version.texi');
@@ -731,6 +731,17 @@ sub handle_configure
 	# FIXME require 'configure'?  What if autoconf hasn't been run
 	# yet?
 
+	if (defined $contents{'SUBDIRS'})
+	{
+	    # We required AC_PROG_MAKE_SET.
+	    system ("grep AC_PROG_MAKE_SET configure.in > /dev/null 2>&1");
+	    if ($? >> 8)
+	    {
+		# Nope.
+		&am_error ("AC_PROG_MAKE_SET must be used in configure.in");
+	    }
+	}
+
 	if (-f 'aclocal.m4')
 	{
 	    $output_vars .= "ACLOCAL = aclocal.m4\n";
diff --git a/lib/am/Makefile.am b/lib/am/Makefile.am
index a76be772..bb92699c 100644
--- a/lib/am/Makefile.am
+++ b/lib/am/Makefile.am
@@ -16,6 +16,9 @@ libraries-clean.am scripts-clean.am programs-clean.am data-clean.am
 
 DIST_OTHER = automake.in
 
+# Gross.
+DIST_SUBDIRS = samples/cpio/*Makefile.am
+
 # The following requires a fixed version of the Emacs 19.30 etags.
 ETAGS_ARGS = automake.in --lang=none \
  --regex='/^@node[ \t]+\([^,]+\)/\1/' automake.texi
-- 
2.43.5