* 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.

diff --git a/ChangeLog b/ChangeLog
index a76ea23f97134b9181f82e8a12c957d2dbcc6755..01570a5efc2ca24108cedd52182a00c4d3a3b747 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2002-01-22  Tom Tromey  <tromey@redhat.com>
+
+       * 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  <proski@gnu.org>
 
        * tests/asm.test: Use CCAS and CCASFLAGS instead of AS and 

diff --git a/m4/gcj.m4 b/m4/gcj.m4
index ea4f9402aa82267c1b9c3d43506775ec4b752df2..d0cdf9ab4aee7c5a0809d5685607105f94326dc5 100644 (file)
--- 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 a7e018e50ee8c71b208c0fa0d2f244f828e4bba0..e07b296e135090d369a0c6069512fe9461bac00b 100644 (file)
--- 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
 ])
+])