* m4/depend.m4 (AM_DEPENDENCIES): Renamed to _AM_DEPENDENCIES.

	* m4/init.m4: Updated callers.

diff --git a/ChangeLog b/ChangeLog
index cd95e8b9f439b255ebe7b5be51d411ac6d663dbf..8faec760bc9936b2c43d37eb316be0f376cadc86 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-07-17  Tom Tromey  <tromey@redhat.com>
+
+       * m4/depend.m4 (AM_DEPENDENCIES): Renamed to _AM_DEPENDENCIES.
+       * m4/init.m4: Updated callers.
+
 2001-06-10  Tim Mooney  <mooney@dogbert.cc.ndsu.NoDak.edu>
 
        * aclocal.in (parse_arguments, write_aclocal): Update Copyrights.

diff --git a/m4/depend.m4 b/m4/depend.m4
index 0c12f5d5e5c7b3e6709887456994bf9a78bb04c8..c57c2e96bbf46d50976ff9e5b818e7e5a5d45499 100644 (file)
--- a/m4/depend.m4
+++ b/m4/depend.m4
@@ -10,17 +10,17 @@
 
 
 
-# AM_DEPENDENCIES(NAME)
+# _AM_DEPENDENCIES(NAME)
 # ---------------------
 # See how the compiler implements dependency checking.
 # NAME is "CC", "CXX" or "OBJC".
 # We try a few techniques and use that to set a single cache variable.
 #
 # We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
-# modified to invoke AM_DEPENDENCIES(CC); we would have a circular
+# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
 # dependency, and given that the user is not expected to run this macro,
 # just rely on AC_PROG_CC.
-AC_DEFUN([AM_DEPENDENCIES],
+AC_DEFUN([_AM_DEPENDENCIES],
 [AC_REQUIRE([AM_SET_DEPDIR])dnl
 AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
 AC_REQUIRE([AM_MAKE_INCLUDE])dnl
@@ -96,7 +96,7 @@ AC_SUBST([$1DEPMODE])
 # AM_SET_DEPDIR
 # -------------
 # Choose a directory name for dependency files.
-# This macro is AC_REQUIREd in AM_DEPENDENCIES
+# This macro is AC_REQUIREd in _AM_DEPENDENCIES
 AC_DEFUN([AM_SET_DEPDIR],
 [if test -d .deps || mkdir .deps 2> /dev/null || test -d .deps; then
   DEPDIR=.deps

diff --git a/m4/init.m4 b/m4/init.m4
index 5881a3489ed68b9aa2a1ce80d5575e0b63888eda..863403672fc7ea264a203b368234a8fcb06f6dfb 100644 (file)
--- a/m4/init.m4
+++ b/m4/init.m4
@@ -70,11 +70,11 @@ 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_DEPENDENCIES(CC)],
+                  [_AM_DEPENDENCIES(CC)],
                   [define([AC_PROG_][CC],
-                          defn([AC_PROG_][CC])[AM_DEPENDENCIES(CC)])])dnl
+                          defn([AC_PROG_][CC])[_AM_DEPENDENCIES(CC)])])dnl
 AC_PROVIDE_IFELSE([AC_PROG_][CXX],
-                  [AM_DEPENDENCIES(CXX)],
+                  [_AM_DEPENDENCIES(CXX)],
                   [define([AC_PROG_][CXX],
-                          defn([AC_PROG_][CXX])[AM_DEPENDENCIES(CXX)])])dnl
+                          defn([AC_PROG_][CXX])[_AM_DEPENDENCIES(CXX)])])dnl
 ])