sinclude fix

diff --git a/ChangeLog b/ChangeLog
index 9a11556d0e7214a705857b95c17af88846251950..2558d3f627d7b3929b7d5ed875227ffd6f3654c4 100644 (file)
--- 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 a7db36f4c7872d9e9743b44afc7de5abcd30c39a..150934a50a384e216be72c181d049ba3949376dc 100755 (executable)
--- 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 17ec2b3bcffb7e80266225c5dc680d9e33192e0c..76b3641c0f5b9dec21e2f3de5c6383c885099513 100644 (file)
--- 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 (executable)
index 0000000..4ef1688
--- /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