From ca6b64ac2abf7c8ca1db39afa70ab5d96e00ad6f Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Mon, 14 May 2001 00:01:08 +0000 Subject: [PATCH] * 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. --- ChangeLog | 5 +++++ m4/depend.m4 | 3 ++- m4/depout.m4 | 4 ++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 83c49d10..2561d470 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2001-05-13 Tom Tromey + * 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 45504598..e37b3ead 100644 --- 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 1f49b764..c3878056 100644 --- 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"])]) -- 2.43.5