From: Alexandre Duret-Lutz <adl@gnu.org>
Date: Mon, 10 Jun 2002 17:37:46 +0000 (+0000)
Subject: * tests/sinclude.test: Check for m4_include too.
X-Git-Tag: Release-1-6-1b~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d8d7370a5ff5955967207e53f378066b504b0895;p=thirdparty%2Fautomake.git

* tests/sinclude.test: Check for m4_include too.
---

diff --git a/ChangeLog b/ChangeLog
index 969d509f0..78a943f09 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2002-06-10  Alexandre Duret-Lutz  <duret_g@epita.fr>
+
+	* tests/sinclude.test: Check for m4_include too.
+
 2002-06-10  Alexandre Duret-Lutz  <duret_g@epita.fr>
 
 	* tests/sinclude.test: Rename the package as amsinclude;
diff --git a/tests/sinclude.test b/tests/sinclude.test
index c3b97142f..1b6c619ae 100755
--- a/tests/sinclude.test
+++ b/tests/sinclude.test
@@ -1,9 +1,11 @@
 #! /bin/sh
 
-# Test to see if `m4_sinclude' works.
+# Test to see if `m4_sinclude' and `m4_include' works.
 
 . $srcdir/defs || exit 1
 
+set -e
+
 # Overwrite configure.in, because the default uses `sinclude' as package
 # name and this play havoc with Autoconf on some platforms (`sinclude'
 # is an m4 macro).
@@ -18,11 +20,18 @@ cat > sub/p.m4 << 'END'
 AC_SUBST(MAGICALPIG)
 END
 
+cat > sub/h.m4 << 'END'
+AC_SUBST(MAGICALHOG)
+END
+
 : > Makefile.am
 
-$ACLOCAL || exit 1
+$ACLOCAL
+
 echo 'm4_sinclude(sub/p.m4)' >> aclocal.m4
+echo 'm4_include(sub/h.m4)' >> aclocal.m4
 
-$AUTOMAKE --Wno-error || exit 1
+$AUTOMAKE
 
 grep MAGICALPIG Makefile.in
+grep MAGICALHOG Makefile.in