* m4/depout.m4 (AM_OUTPUT_DEPENDENCY_COMMANDS): Use AMDEP_TRUE,

	not AMDEP.
	* m4/depend.m4 (AM_DEPENDENCIES): Require AM_DEP_TRACK.
	Correctly look at AMDEP_TRUE, not AMDEP.

diff --git a/ChangeLog b/ChangeLog
index 83c49d1095b3669bc48256d836c4c59f0756ef75..2561d470c4e19a29d28dd656e8b6eeba51e5ccd7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2001-05-13  Tom Tromey  <tromey@redhat.com>
 
+       * m4/depout.m4 (AM_OUTPUT_DEPENDENCY_COMMANDS): Use AMDEP_TRUE,
+       not AMDEP.
+       * m4/depend.m4 (AM_DEPENDENCIES): Require AM_DEP_TRACK.
+       Correctly look at AMDEP_TRUE, not AMDEP.
+
        Report from Robert Boehne:
        * tests/Makefile.am (TESTS): Added depend2.test.
        * tests/depend2.test: New file.

diff --git a/m4/depend.m4 b/m4/depend.m4
index 455045984b5eea9e4d1b8761b1f28bb2f287afcb..e37b3ead73db9fc16d99b55b5dd683cc1bb94262 100644 (file)
--- a/m4/depend.m4
+++ b/m4/depend.m4
@@ -35,10 +35,11 @@ depcc="$$1"
 depcpp=""])
 
 AC_REQUIRE([AM_MAKE_INCLUDE])
+AC_REQUIRE([AM_DEP_TRACK])
 
 AC_CACHE_CHECK([dependency style of $depcc],
                [am_cv_$1_dependencies_compiler_type],
-[if test -z "$AMDEP"; then
+[if test -z "$AMDEP_TRUE"; 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/m4/depout.m4 b/m4/depout.m4
index 1f49b764f383106d447748418c585ee880aeb95c..c38780564b9098d7b40c038866a61d972b06e2b6 100644 (file)
--- a/m4/depout.m4
+++ b/m4/depout.m4
@@ -9,7 +9,7 @@
 # need in order to bootstrap the dependency handling code.
 AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],[
 AC_OUTPUT_COMMANDS([
-test x"$AMDEP" != x"" ||
+test x"$AMDEP_TRUE" != x"" ||
 for mf in $CONFIG_FILES; do
   case "$mf" in
   Makefile) dirpart=.;;
@@ -46,5 +46,5 @@ for mf in $CONFIG_FILES; do
     echo '# dummy' > "$dirpart/$file"
   done
 done
-], [AMDEP="$AMDEP"
+], [AMDEP_TRUE="$AMDEP_TRUE"
 ac_aux_dir="$ac_aux_dir"])])