From 8d63c8ed4765385061c7d2e8ed512dcb6dd0492b Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Tue, 22 Jan 2002 18:52:26 +0000 Subject: [PATCH] * m4/gcj.m4 (AM_PROG_GCJ): Don't invoke dependency code if no-dependencies option is set. * m4/init.m4 (AM_INIT_AUTOMAKE): Don't invoke dependency code if no-dependencies option is set. Don't call AM_DEP_TRACK or AM_SET_DEPDIR. --- ChangeLog | 8 ++++++++ m4/gcj.m4 | 2 +- m4/init.m4 | 7 ++++--- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index a76ea23f9..01570a5ef 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2002-01-22 Tom Tromey + + * m4/gcj.m4 (AM_PROG_GCJ): Don't invoke dependency code if + no-dependencies option is set. + * m4/init.m4 (AM_INIT_AUTOMAKE): Don't invoke dependency code if + no-dependencies option is set. Don't call AM_DEP_TRACK or + AM_SET_DEPDIR. + 2002-01-22 Pavel Roskin * tests/asm.test: Use CCAS and CCASFLAGS instead of AS and diff --git a/m4/gcj.m4 b/m4/gcj.m4 index ea4f9402a..d0cdf9ab4 100644 --- a/m4/gcj.m4 +++ b/m4/gcj.m4 @@ -25,5 +25,5 @@ if test "x${GCJFLAGS-unset}" = xunset; then GCJFLAGS="-g -O2" fi AC_SUBST(GCJFLAGS) -_AM_DEPENDENCIES(GCJ) +_AM_IF_OPTION([no-dependencies],, [_AM_DEPENDENCIES(GCJ)]) ]) diff --git a/m4/init.m4 b/m4/init.m4 index a7e018e50..e07b296e1 100644 --- a/m4/init.m4 +++ b/m4/init.m4 @@ -85,9 +85,9 @@ AM_PROG_INSTALL_STRIP # some platforms. AC_REQUIRE([AC_PROG_AWK])dnl AC_REQUIRE([AC_PROG_MAKE_SET])dnl -AC_REQUIRE([AM_DEP_TRACK])dnl -AC_REQUIRE([AM_SET_DEPDIR])dnl -AC_PROVIDE_IFELSE([AC_PROG_][CC], + +_AM_IF_OPTION([no-dependencies],, +[AC_PROVIDE_IFELSE([AC_PROG_][CC], [_AM_DEPENDENCIES(CC)], [define([AC_PROG_][CC], defn([AC_PROG_][CC])[_AM_DEPENDENCIES(CC)])])dnl @@ -96,3 +96,4 @@ AC_PROVIDE_IFELSE([AC_PROG_][CXX], [define([AC_PROG_][CXX], defn([AC_PROG_][CXX])[_AM_DEPENDENCIES(CXX)])])dnl ]) +]) -- 2.47.2