* tests/Makefile.am (TESTS): Added auxdir2.test.

	(XFAIL_TESTS): Likewise.
	* tests/auxdir2.test: New file.

diff --git a/ChangeLog b/ChangeLog
index 325c20fd0a485a5edffeeaa2227ad8c41cc516b1..32d77028deeeb9780db813e75acb7220ca6316b8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2001-07-22  Tom Tromey  <tromey@redhat.com>
 
+       * tests/Makefile.am (TESTS): Added auxdir2.test.
+       (XFAIL_TESTS): Likewise.
+       * tests/auxdir2.test: New file.
+
        * tests/Makefile.am (XFAIL_TESTS): Removed substtarg.test.
        * automake.in (TARGET_PATTERN): Add `@' as allowable character.
 

diff --git a/tests/Makefile.am b/tests/Makefile.am
index ddf5d63c74ea65ccd326add0ea27a24e1c52330f..6a3fda50367b01efa286886a970d22bf9935fa0b 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to create Makefile.in
 
-XFAIL_TESTS = subdir5.test
+XFAIL_TESTS = subdir5.test auxdir2.test
 
 TESTS =        \
 acinclude.test \
@@ -25,6 +25,7 @@ ansi4.test \
 ansi5.test \
 asm.test \
 auxdir.test \
+auxdir2.test \
 backsl.test \
 backsl2.test \
 badline.test \

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 7c5a59ec961787b832ef325d87e6b6c84f8175aa..a2e7cd523bc5516037fa6dd436698c4cdc7c2bf0 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -66,7 +66,7 @@ _am_include = @_am_include@
 _am_quote = @_am_quote@
 install_sh = @install_sh@
 
-XFAIL_TESTS = subdir5.test
+XFAIL_TESTS = subdir5.test auxdir2.test
 
 TESTS = \
 acinclude.test \
@@ -91,6 +91,7 @@ ansi4.test \
 ansi5.test \
 asm.test \
 auxdir.test \
+auxdir2.test \
 backsl.test \
 backsl2.test \
 badline.test \

diff --git a/tests/auxdir2.test b/tests/auxdir2.test
new file mode 100755 (executable)
index 0000000..1251fbe
--- /dev/null
+++ b/tests/auxdir2.test
@@ -0,0 +1,15 @@
+#! /bin/sh
+
+# It should be possible to use a computed auxdir.  This might seem
+# bizarre, but it is actually used in multilib builds.
+
+. $srcdir/defs || exit 1
+
+# The "./." is here so we don't have to mess with subdirs.
+cat >> configure.in << 'END'
+AC_CONFIG_AUX_DIR($foo)
+END
+
+: > Makefile.am
+
+$AUTOMAKE