From 77cd1c54c41e1c25c7935129e3b072a7c1636e1c Mon Sep 17 00:00:00 2001
From: Tom Tromey <tromey@redhat.com>
Date: Thu, 27 May 1999 20:16:47 +0000
Subject: [PATCH] 	* subobj3.test: New file. 	* Makefile.am (TESTS):
 Added subobj3.test. 	(XFAIL_TESTS): Likewise.

---
 tests/ChangeLog    |  4 ++++
 tests/Makefile.am  |  3 ++-
 tests/Makefile.in  |  3 ++-
 tests/subobj3.test | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 54 insertions(+), 2 deletions(-)
 create mode 100755 tests/subobj3.test

diff --git a/tests/ChangeLog b/tests/ChangeLog
index b83a97d5..63f6284f 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,5 +1,9 @@
 1999-05-27  Tom Tromey  <tromey@cygnus.com>
 
+	* subobj3.test: New file.
+	* Makefile.am (TESTS): Added subobj3.test.
+	(XFAIL_TESTS): Likewise.
+
 	* ltlibobjs.test: New file.
 	* Makefile.am (TESTS): Added ltlibobjs.test.
 	(XFAIL_TESTS): Added ltlibobjs.test.
diff --git a/tests/Makefile.am b/tests/Makefile.am
index e2064f41..c719c64e 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -2,7 +2,7 @@
 
 AUTOMAKE_OPTIONS = gnits
 
-XFAIL_TESTS = sourcesub.test ltlibobjs.test
+XFAIL_TESTS = sourcesub.test ltlibobjs.test subobj3.test
 TESTS =	\
 acinclude.test \
 aclocal.test \
@@ -202,6 +202,7 @@ subdir2.test \
 subdir3.test \
 subobj.test \
 subobj2.test \
+subobj3.test \
 subst.test \
 suffix.test \
 symlink.test \
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 1fedc7cd..07ec69da 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -67,7 +67,7 @@ VERSION = @VERSION@
 
 AUTOMAKE_OPTIONS = gnits
 
-XFAIL_TESTS = sourcesub.test ltlibobjs.test
+XFAIL_TESTS = sourcesub.test ltlibobjs.test subobj3.test
 TESTS = \
 acinclude.test \
 aclocal.test \
@@ -267,6 +267,7 @@ subdir2.test \
 subdir3.test \
 subobj.test \
 subobj2.test \
+subobj3.test \
 subst.test \
 suffix.test \
 symlink.test \
diff --git a/tests/subobj3.test b/tests/subobj3.test
new file mode 100755
index 00000000..5fbf4fda
--- /dev/null
+++ b/tests/subobj3.test
@@ -0,0 +1,46 @@
+#! /bin/sh
+
+# Test of subdir objects with C++.
+
+. $srcdir/defs || exit 1
+
+cat > configure.in << 'END'
+AC_INIT(sub/hello.c)
+AM_INIT_AUTOMAKE(hello,0.23)
+AC_PROG_CC
+AM_PROG_CC_C_O
+AM_C_PROTOTYPES
+AC_OUTPUT(Makefile)
+END
+
+cat > Makefile.am << 'END'
+AUTOMAKE_OPTIONS = subdir-objects
+bin_PROGRAMS = hello
+hello_SOURCES = sub/hello.c
+END
+
+mkdir sub
+cat > sub/hello.c << 'END'
+#include <stdio.h>
+int
+main (int argc, char *argv[])
+{
+   printf ("yeah, yeah\n");
+   return 0;
+}
+END
+
+# Fail gracefully if no autoconf.
+(autoconf --version) > /dev/null 2>&1 || exit 0
+
+# Likewise for gcc.
+(gcc -v) > /dev/null 2>&1 || exit 0
+
+# We use gcc and not gcc -traditional as the latter fails on some
+# Linux boxes (Red Hat 5.1 in particular).
+$ACLOCAL \
+   && autoconf \
+   && $AUTOMAKE -a \
+   && CC='gcc' ./configure \
+   && $MAKE ANSI2KNR=./ansi2knr U=_ \
+   && ./hello
-- 
2.43.5