From e75178451f433b49d97c945ff45beae9fe3601dd Mon Sep 17 00:00:00 2001
From: Tom Tromey <tromey@redhat.com>
Date: Fri, 18 May 2001 00:00:31 +0000
Subject: [PATCH] 	* m4/depend.m4 (AM_DEPENDENCIES): If depcomp doesn't
 exist, revert 	to no dependency tracking. 	* tests/Makefile.am (TESTS):
 Added depcomp2.test. 	* tests/depcomp2.test: New file.  From Pavel Roskin.

---
 ChangeLog           |  5 +++++
 m4/depend.m4        |  2 +-
 tests/Makefile.am   |  1 +
 tests/Makefile.in   |  1 +
 tests/depcomp2.test | 41 +++++++++++++++++++++++++++++++++++++++++
 5 files changed, 49 insertions(+), 1 deletion(-)
 create mode 100755 tests/depcomp2.test

diff --git a/ChangeLog b/ChangeLog
index 4e2bde65..fd40dbe1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2001-05-17  Tom Tromey  <tromey@redhat.com>
 
+	* m4/depend.m4 (AM_DEPENDENCIES): If depcomp doesn't exist, revert
+	to no dependency tracking.
+	* tests/Makefile.am (TESTS): Added depcomp2.test.
+	* tests/depcomp2.test: New file.  From Pavel Roskin.
+
 	* lib/depcomp (aix): Bug fix and simplification from Larry Jones.
 
 	* lib/depcomp (tru64): New dependency tracking mode.
diff --git a/m4/depend.m4 b/m4/depend.m4
index e37b3ead..11f7cdc5 100644
--- a/m4/depend.m4
+++ b/m4/depend.m4
@@ -39,7 +39,7 @@ AC_REQUIRE([AM_DEP_TRACK])
 
 AC_CACHE_CHECK([dependency style of $depcc],
                [am_cv_$1_dependencies_compiler_type],
-[if test -z "$AMDEP_TRUE"; then
+[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
   # We make a subdir and do the tests there.  Otherwise we can end up
   # making bogus files that we don't know about and never remove.  For
   # instance it was reported that on HP-UX the gcc test will end up
diff --git a/tests/Makefile.am b/tests/Makefile.am
index b85c670a..3884546f 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -94,6 +94,7 @@ dejagnu.test \
 depacl.test \
 depacl2.test \
 depcomp.test \
+depcomp2.test \
 depend.test \
 depend2.test \
 depend3.test \
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 53d1a398..9c1a1e85 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -162,6 +162,7 @@ dejagnu.test \
 depacl.test \
 depacl2.test \
 depcomp.test \
+depcomp2.test \
 depend.test \
 depend2.test \
 depend3.test \
diff --git a/tests/depcomp2.test b/tests/depcomp2.test
new file mode 100755
index 00000000..54e4bdae
--- /dev/null
+++ b/tests/depcomp2.test
@@ -0,0 +1,41 @@
+#! /bin/sh
+
+# Test to make sure that depcomp is not used when it's not installed
+# From Pavel Roskin.
+
+. $srcdir/defs || exit 1
+
+cat > configure.in << 'END'
+AC_INIT(subdir/foo.c)
+AM_INIT_AUTOMAKE(nonesuch, nonesuch)
+PACKAGE=nonesuch
+VERSION=nonesuch
+AC_PROG_CC
+AC_OUTPUT(Makefile subdir/Makefile)
+END
+
+cat > Makefile.am << 'END'
+SUBDIRS = subdir
+END
+
+rm -f depcomp
+mkdir subdir
+
+cat > subdir/Makefile.in << 'END'
+foo:
+	$(CC) -o foo foo.c
+END
+
+: > subdir/foo.c
+
+# Fail gracefully if no autoconf.
+$needs_autoconf
+
+# Likewise for gcc.
+(gcc -v) > /dev/null 2>&1 || exit 77
+
+$ACLOCAL || exit 1
+$AUTOMAKE --add-missing || exit 1
+$AUTOCONF || exit 1
+CC='gcc' ./configure 2>error.log
+test -z "`cat error.log`"
-- 
2.43.5