2001-04-10 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

	* m4/make.m4 (AM_MAKE_INCLUDE): Pass `-s' to make.
	* tests/Makefile.am (TESTS): Added make.test.
	* tests/make.test: New file.

diff --git a/ChangeLog b/ChangeLog
index 12f0c0eefdeabb5b0f4d51dd20784aee39fb68cb..1be14971527f55e5ea5c340e93b0ee8db9feec88 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-04-10  Ralf Corsepius  <corsepiu@faw.uni-ulm.de>
+
+       * m4/make.m4 (AM_MAKE_INCLUDE): Pass `-s' to make.
+       * tests/Makefile.am (TESTS): Added make.test.
+       * tests/make.test: New file.
+
 2001-04-10  Tom Tromey  <tromey@redhat.com>
 
        * tests/defs: Changed how ACLOCAL and AUTOMAKE are set.

diff --git a/m4/make.m4 b/m4/make.m4
index 38104717dd3d835a234325277ae68b2cb7161d37..c5a02dd3a76057f4001f5fec916b169394f78ba6 100644 (file)
--- a/m4/make.m4
+++ b/m4/make.m4
@@ -13,7 +13,7 @@ AC_MSG_CHECKING([for style of include used by $am_make])
 _am_include='#'
 for am_inc in include .include; do
    echo "$am_inc confinc" > confmf
-   if test "`$am_make -f confmf 2> /dev/null`" = "done"; then
+   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
       _am_include=$am_inc
       break
    fi

diff --git a/tests/Makefile.am b/tests/Makefile.am
index b95e38d14d9a7caafeb3956d7e12aed91bed783f..4fd89fde93189a825a350b9d3501c9c4351abfd5 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -167,6 +167,7 @@ link_f_cxx.test     \
 link_f_only.test \
 lisp.test \
 ltlibobjs.test \
+make.test \
 makevars.test \
 man.test \
 mclean.test \

diff --git a/tests/Makefile.in b/tests/Makefile.in
index adbe30eb97fc9841ee31a4fc50d4a702285e31ab..20626e8fd27d6ba79456f4049b8ee6c085fe4f7f 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -240,6 +240,7 @@ link_f_cxx.test     \
 link_f_only.test \
 lisp.test \
 ltlibobjs.test \
+make.test \
 makevars.test \
 man.test \
 mclean.test \

diff --git a/tests/make.test b/tests/make.test
new file mode 100755 (executable)
index 0000000..0ad6fe3
--- /dev/null
+++ b/tests/make.test
@@ -0,0 +1,34 @@
+#! /bin/sh
+
+# Test to make sure `make' check works.
+# From Ralf Corsepius.
+
+. $srcdir/defs || exit 1
+
+cat > configure.in << 'END'
+AC_INIT(Makefile.am)
+AM_INIT_AUTOMAKE(foo,0,no)
+AM_MAKE_INCLUDE
+AC_OUTPUT(Makefile)
+END
+
+: > Makefile.am
+
+$needs_autoconf
+
+set -e
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+
+export ACLOCAL
+export AUTOCONF
+export AUTOMAKE
+
+./configure
+touch configure.in
+$MAKE
+
+fgrep '_am_include = #' Makefile && exit 1
+exit 0