--- a/ChangeLog	Thu Oct 12 07:35:16 2006 +0000
+++ b/ChangeLog	Thu Oct 12 08:01:18 2006 +0000
@@ -1,5 +1,12 @@
 2006-10-12  Paul Eggert  <eggert@cs.ucla.edu>
 
+	* m4/extensions.m4 (AC_USE_SYSTEM_EXTENSIONS): Renamed from
+	gl_USE_SYSTEM_EXTENSIONS, to fix a coreutils bootstrap failure
+	reported by Jim Meyering.  All uses of cache variables renamed
+	to match Autoconf's.
+	(gl_USE_SYSTEM_EXTENSIONS): New macro, which simply requires
+	the other one.
+
 	* m4/rename-dest-slash.m4 (gl_FUNC_RENAME_TRAILING_DEST_SLASH):
 	Fix misspelling in diagnostic.
 

--- a/m4/extensions.m4	Thu Oct 12 07:35:16 2006 +0000
+++ b/m4/extensions.m4	Thu Oct 12 08:01:18 2006 +0000
@@ -1,4 +1,4 @@
-# serial 3  -*- Autoconf -*-
+# serial 4  -*- Autoconf -*-
 # Enable extensions on systems that normally disable them.
 
 # Copyright (C) 2003, 2006 Free Software Foundation, Inc.
@@ -6,19 +6,17 @@
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# The main body of this macro is stolen from CVS Autoconf.  Perhaps we
-# can replace it with AC_USE_SYSTEM_EXTENSIONS once we can assume
-# Autoconf 2.61 or later everywhere, but since CVS Autoconf mutates
-# rapidly enough in this area it's likely that we'll need
-# gl_USE_SYSTEM_EXTENSIONS for quite some time.
+# This definition of AC_USE_SYSTEM_EXTENSIONS is stolen from CVS
+# Autoconf.  Perhaps we can remove this once we can assume Autoconf
+# 2.61 or later everywhere, but since CVS Autoconf mutates rapidly
+# enough in this area it's likely we'll need to redefine
+# AC_USE_SYSTEM_EXTENSIONS for quite some time.
 
-# _gl_TANDEM_SOURCE
-
-# gl_USE_SYSTEM_EXTENSIONS
+# AC_USE_SYSTEM_EXTENSIONS
 # ------------------------
 # Enable extensions on systems that normally disable them,
 # typically due to standards-conformance issues.
-AC_DEFUN([gl_USE_SYSTEM_EXTENSIONS],
+AC_DEFUN([AC_USE_SYSTEM_EXTENSIONS],
 [
   AC_BEFORE([$0], [AC_COMPILE_IFELSE])
   AC_BEFORE([$0], [AC_RUN_IFELSE])
@@ -39,15 +37,22 @@
 # undef _TANDEM_SOURCE
 #endif])
   AC_CACHE_CHECK([whether it is safe to define __EXTENSIONS__],
-    [gl_cv_safe_to_define___extensions__],
+    [ac_cv_safe_to_define___extensions__],
     [AC_COMPILE_IFELSE(
        [AC_LANG_PROGRAM([
 #	  define __EXTENSIONS__ 1
 	  AC_INCLUDES_DEFAULT])],
-       [gl_cv_safe_to_define___extensions__=yes],
-       [gl_cv_safe_to_define___extensions__=no])])
-  test $gl_cv_safe_to_define___extensions__ = yes &&
+       [ac_cv_safe_to_define___extensions__=yes],
+       [ac_cv_safe_to_define___extensions__=no])])
+  test $ac_cv_safe_to_define___extensions__ = yes &&
     AC_DEFINE([__EXTENSIONS__])
   AC_DEFINE([_POSIX_PTHREAD_SEMANTICS])
   AC_DEFINE([_TANDEM_SOURCE])
 ])
+
+# gl_USE_SYSTEM_EXTENSIONS
+# ------------------------
+# Enable extensions on systems that normally disable them,
+# typically due to standards-conformance issues.
+AC_DEFUN([gl_USE_SYSTEM_EXTENSIONS],
+  [AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])])