[ChangeLog]

* configure.ac: Reflect s/gl_MACROS/coreutils_MACROS/ renaming.
Call gl_INIT directly, rather than through the above.
[m4/ChangeLog]
* jm-macros.m4 (coreutils_MACROS): Rename from gl_MACROS, now that
most of the gnulib macros have migrated into gnulib.
Don't call gl_INIT here (now it's called from configure.ac, directly).

diff --git a/ChangeLog b/ChangeLog
index 0da30e158077de1bf9430ad6782c615fd93287f9..d27c9e1385c49f9fa129421798146ed2783a811e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-10-12  Jim Meyering  <jim@meyering.net>
+
+       * configure.ac: Reflect s/gl_MACROS/coreutils_MACROS/ renaming.
+       Call gl_INIT directly, rather than through the above.
+
 2006-10-11  Paul Eggert  <eggert@cs.ucla.edu>
 
        * bootstrap (symlink_to_gnulib): Fix bug: the dot_dots shell

diff --git a/configure.ac b/configure.ac
index 87eea8e5c55e32ba8e86218e75ed369bd1da5abe..19020f8ef82578b256a269662e7638e74cbe2e23 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -36,7 +36,8 @@ AC_PROG_GCC_TRADITIONAL
 AC_PROG_RANLIB
 AC_PROG_LN_S
 gl_EARLY
-gl_MACROS
+gl_INIT
+coreutils_MACROS
 
 AC_CHECK_FUNCS(uname,
        OPTIONAL_BIN_PROGS="$OPTIONAL_BIN_PROGS uname\$(EXEEXT)"

diff --git a/m4/ChangeLog b/m4/ChangeLog
index 6def26c5393b0ceb6f0e1aa9c07245d6635d2fc4..c1df1b7c91304e559b5ee47f8f8d6835bad1e40c 100644 (file)
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,9 @@
+2006-10-12  Jim Meyering  <jim@meyering.net>
+
+       * jm-macros.m4 (coreutils_MACROS): Rename from gl_MACROS, now that
+       most of the gnulib macros have migrated into gnulib.
+       Don't call gl_INIT here (now it's called from configure.ac, directly).
+
 2006-10-07  Jim Meyering  <jim@meyering.net>
 
        * jm-macros.m4 (gl_MACROS): Remove use of AC_CONFIG_LIBOBJ_DIR(lib).

diff --git a/m4/jm-macros.m4 b/m4/jm-macros.m4
index 48eea6f9f37b79fe07a3aad94908499bdc195de4..d65f1086feba39c71446c65be9dcddfc0da0d377 100644 (file)
--- a/m4/jm-macros.m4
+++ b/m4/jm-macros.m4
@@ -1,4 +1,4 @@
-#serial 103   -*- autoconf -*-
+#serial 104   -*- autoconf -*-
 
 dnl Misc type-related macros for coreutils.
 
@@ -21,10 +21,8 @@ dnl Misc type-related macros for coreutils.
 
 # Written by Jim Meyering.
 
-AC_DEFUN([gl_MACROS],
+AC_DEFUN([coreutils_MACROS],
 [
-  gl_INIT
-
   GNU_PACKAGE="GNU $PACKAGE"
   AC_DEFINE_UNQUOTED(GNU_PACKAGE, "$GNU_PACKAGE",
     [The concatenation of the strings `GNU ', and PACKAGE.])