From: Tom Tromey <tromey@redhat.com>
Date: Thu, 19 Mar 1998 21:15:02 +0000 (+0000)
Subject: sinclude fix
X-Git-Tag: Release-1-2h~22
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=75da617a4dd519572cb73aac3bd20b4fb76f4768;p=thirdparty%2Fautomake.git

sinclude fix
---

diff --git a/ChangeLog b/ChangeLog
index 9a11556d0..2558d3f62 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 Thu Mar 19 01:33:35 1998  Tom Tromey  <tromey@cygnus.com>
 
+	* automake.in (scan_one_configure_file): Check for `sinclude' and
+	turn into recursive call.
+
 	* automake.in (initialize_per_input): Set $output_all.
 	(generate_makefile): Don't set $output_header or generate
 	`default' target.  Print $output_all before $output_header.
diff --git a/automake.in b/automake.in
index a7db36f4c..150934a50 100755
--- a/automake.in
+++ b/automake.in
@@ -3961,6 +3961,13 @@ sub scan_one_configure_file
 	# used.
 	next if /AC_DEFUN/;
 
+	# Follow includes.  This is a weirdness commonly in use at
+	# Cygnus and hopefully nowhere else.
+	if (/sinclude\((.*)\)/ && -f $1)
+	{
+	    &scan_one_configure_file ($1);
+	}
+
 	# Populate libobjs array.
 	if (/AC_FUNC_ALLOCA/)
 	{
diff --git a/tests/ChangeLog b/tests/ChangeLog
index 17ec2b3bc..76b3641c0 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,7 @@
+Thu Mar 19 14:11:45 1998  Tom Tromey  <tromey@cygnus.com>
+
+	* sinclude.test: New file.
+
 Wed Mar 18 17:15:22 1998  Tom Tromey  <tromey@cygnus.com>
 
 	* java.test: New file.
diff --git a/tests/sinclude.test b/tests/sinclude.test
new file mode 100755
index 000000000..4ef16887f
--- /dev/null
+++ b/tests/sinclude.test
@@ -0,0 +1,20 @@
+#! /bin/sh
+
+# Test to see if `sinclude' works.
+
+. $srcdir/defs || exit 1
+
+cat > aclocal.m4 << 'END'
+sinclude(sub/p.m4)
+END
+
+mkdir sub
+cat > sub/p.m4 << 'END'
+AC_SUBST(MAGICALPIG)
+END
+
+: > Makefile.am
+
+$AUTOMAKE || exit 1
+
+grep MAGICALPIG Makefile.in