diff -urp coreutils-5.2.1.o/m4/fsusage.m4 coreutils-5.2.1/m4/fsusage.m4 --- coreutils-5.2.1.o/m4/fsusage.m4 2003-08-17 09:51:49.000000000 +0200 +++ coreutils-5.2.1/m4/fsusage.m4 2006-11-04 00:24:55.089407750 +0100 @@ -239,7 +239,7 @@ choke -- this is a workaround for a Sun- # Prerequisites of lib/fsusage.c not done by jm_FILE_SYSTEM_USAGE. AC_DEFUN([gl_PREREQ_FSUSAGE_EXTRA], [ - AC_REQUIRE([jm_AC_TYPE_UINTMAX_T]) + AC_REQUIRE([gl_AC_TYPE_UINTMAX_T]) AC_CHECK_HEADERS_ONCE(fcntl.h) AC_CHECK_HEADERS(dustat.h sys/fs/s5param.h sys/filsys.h sys/statfs.h sys/statvfs.h) jm_STATFS_TRUNCATES diff -urp coreutils-5.2.1.o/m4/gettext.m4 coreutils-5.2.1/m4/gettext.m4 --- coreutils-5.2.1.o/m4/gettext.m4 2004-01-12 21:47:45.000000000 +0100 +++ coreutils-5.2.1/m4/gettext.m4 2006-11-04 00:22:54.729885750 +0100 @@ -358,19 +358,19 @@ AC_DEFUN([AM_INTL_SUBDIR], AC_REQUIRE([AC_C_INLINE])dnl AC_REQUIRE([AC_TYPE_OFF_T])dnl AC_REQUIRE([AC_TYPE_SIZE_T])dnl - AC_REQUIRE([jm_AC_TYPE_LONG_LONG])dnl + AC_REQUIRE([gl_AC_TYPE_LONG_LONG])dnl AC_REQUIRE([gt_TYPE_LONGDOUBLE])dnl AC_REQUIRE([gt_TYPE_WCHAR_T])dnl AC_REQUIRE([gt_TYPE_WINT_T])dnl - AC_REQUIRE([jm_AC_HEADER_INTTYPES_H]) - AC_REQUIRE([jm_AC_HEADER_STDINT_H]) + AC_REQUIRE([gl_AC_HEADER_INTTYPES_H]) + AC_REQUIRE([gl_AC_HEADER_STDINT_H]) AC_REQUIRE([gt_TYPE_INTMAX_T]) AC_REQUIRE([gt_PRINTF_POSIX]) AC_REQUIRE([AC_FUNC_ALLOCA])dnl AC_REQUIRE([AC_FUNC_MMAP])dnl - AC_REQUIRE([jm_GLIBC21])dnl + AC_REQUIRE([gl_GLIBC21])dnl AC_REQUIRE([gt_INTDIV0])dnl - AC_REQUIRE([jm_AC_TYPE_UINTMAX_T])dnl + AC_REQUIRE([gl_AC_TYPE_UINTMAX_T])dnl AC_REQUIRE([gt_HEADER_INTTYPES_H])dnl AC_REQUIRE([gt_INTTYPES_PRI])dnl AC_REQUIRE([gl_XSIZE])dnl diff -urp coreutils-5.2.1.o/m4/glibc21.m4 coreutils-5.2.1/m4/glibc21.m4 --- coreutils-5.2.1.o/m4/glibc21.m4 2002-02-16 15:58:48.000000000 +0100 +++ coreutils-5.2.1/m4/glibc21.m4 2006-11-04 00:28:24.190475750 +0100 @@ -9,7 +9,7 @@ dnl the same distribution terms as the r # Test for the GNU C Library, version 2.1 or newer. # From Bruno Haible. -AC_DEFUN([jm_GLIBC21], +AC_DEFUN([gl_GLIBC21], [ AC_CACHE_CHECK(whether we are using the GNU C Library 2.1 or newer, ac_cv_gnu_library_2_1, diff -urp coreutils-5.2.1.o/m4/human.m4 coreutils-5.2.1/m4/human.m4 --- coreutils-5.2.1.o/m4/human.m4 2003-09-10 08:24:31.000000000 +0200 +++ coreutils-5.2.1/m4/human.m4 2006-11-04 00:25:02.521872250 +0100 @@ -10,7 +10,7 @@ AC_DEFUN([gl_HUMAN], [ dnl Prerequisites of lib/human.h. AC_REQUIRE([AM_STDBOOL_H]) - AC_REQUIRE([jm_AC_TYPE_UINTMAX_T]) + AC_REQUIRE([gl_AC_TYPE_UINTMAX_T]) dnl Prerequisites of lib/human.c. AC_CHECK_HEADERS_ONCE(locale.h) diff -urp coreutils-5.2.1.o/m4/intmax.m4 coreutils-5.2.1/m4/intmax.m4 --- coreutils-5.2.1.o/m4/intmax.m4 2004-01-12 21:47:45.000000000 +0100 +++ coreutils-5.2.1/m4/intmax.m4 2006-11-04 00:27:59.712946000 +0100 @@ -12,8 +12,8 @@ dnl find a replacement if it is lacking. AC_DEFUN([gt_TYPE_INTMAX_T], [ - AC_REQUIRE([jm_AC_HEADER_INTTYPES_H]) - AC_REQUIRE([jm_AC_HEADER_STDINT_H]) + AC_REQUIRE([gl_AC_HEADER_INTTYPES_H]) + AC_REQUIRE([gl_AC_HEADER_STDINT_H]) AC_CACHE_CHECK(for intmax_t, gt_cv_c_intmax_t, [AC_TRY_COMPILE([ #include diff -urp coreutils-5.2.1.o/m4/intmax_t.m4 coreutils-5.2.1/m4/intmax_t.m4 --- coreutils-5.2.1.o/m4/intmax_t.m4 2003-08-17 09:51:49.000000000 +0200 +++ coreutils-5.2.1/m4/intmax_t.m4 2006-11-04 00:27:37.639566500 +0100 @@ -17,10 +17,10 @@ AC_DEFUN([jm_AC_TYPE_INTMAX_T], [ dnl For simplicity, we assume that a header file defines 'intmax_t' if and dnl only if it defines 'uintmax_t'. - AC_REQUIRE([jm_AC_HEADER_INTTYPES_H]) - AC_REQUIRE([jm_AC_HEADER_STDINT_H]) + AC_REQUIRE([gl_AC_HEADER_INTTYPES_H]) + AC_REQUIRE([gl_AC_HEADER_STDINT_H]) if test $jm_ac_cv_header_inttypes_h = no && test $jm_ac_cv_header_stdint_h = no; then - AC_REQUIRE([jm_AC_TYPE_LONG_LONG]) + AC_REQUIRE([gl_AC_TYPE_LONG_LONG]) test $ac_cv_type_long_long = yes \ && ac_type='long long' \ || ac_type='long' @@ -36,8 +36,8 @@ dnl An alternative would be to explicitl AC_DEFUN([gt_AC_TYPE_INTMAX_T], [ - AC_REQUIRE([jm_AC_HEADER_INTTYPES_H]) - AC_REQUIRE([jm_AC_HEADER_STDINT_H]) + AC_REQUIRE([gl_AC_HEADER_INTTYPES_H]) + AC_REQUIRE([gl_AC_HEADER_STDINT_H]) AC_CACHE_CHECK(for intmax_t, gt_cv_c_intmax_t, [AC_TRY_COMPILE([ #include @@ -53,7 +53,7 @@ AC_DEFUN([gt_AC_TYPE_INTMAX_T], AC_DEFINE(HAVE_INTMAX_T, 1, [Define if you have the 'intmax_t' type in or .]) else - AC_REQUIRE([jm_AC_TYPE_LONG_LONG]) + AC_REQUIRE([gl_AC_TYPE_LONG_LONG]) test $ac_cv_type_long_long = yes \ && ac_type='long long' \ || ac_type='long' diff -urp coreutils-5.2.1.o/m4/inttypes_h.m4 coreutils-5.2.1/m4/inttypes_h.m4 --- coreutils-5.2.1.o/m4/inttypes_h.m4 2003-07-10 10:35:02.000000000 +0200 +++ coreutils-5.2.1/m4/inttypes_h.m4 2006-11-04 00:27:04.989526000 +0100 @@ -11,7 +11,7 @@ dnl From Paul Eggert. # Define HAVE_INTTYPES_H_WITH_UINTMAX if exists, # doesn't clash with , and declares uintmax_t. -AC_DEFUN([jm_AC_HEADER_INTTYPES_H], +AC_DEFUN([gl_AC_HEADER_INTTYPES_H], [ AC_CACHE_CHECK([for inttypes.h], jm_ac_cv_header_inttypes_h, [AC_TRY_COMPILE( diff -urp coreutils-5.2.1.o/m4/jm-macros.m4 coreutils-5.2.1/m4/jm-macros.m4 --- coreutils-5.2.1.o/m4/jm-macros.m4 2003-12-20 18:57:18.000000000 +0100 +++ coreutils-5.2.1/m4/jm-macros.m4 2006-11-04 00:28:29.610814500 +0100 @@ -130,7 +130,7 @@ AC_DEFUN([jm_MACROS], ]) AM_LANGINFO_CODESET - jm_GLIBC21 + gl_GLIBC21 AM_ICONV jm_FUNC_UNLINK_BUSY_TEXT @@ -249,8 +249,8 @@ AC_DEFUN([jm_CHECK_ALL_TYPES], AC_CHECK_TYPE(major_t, unsigned int) AC_CHECK_TYPE(minor_t, unsigned int) - AC_REQUIRE([jm_AC_TYPE_UINTMAX_T]) - AC_REQUIRE([jm_AC_TYPE_UNSIGNED_LONG_LONG]) + AC_REQUIRE([gl_AC_TYPE_UINTMAX_T]) + AC_REQUIRE([gl_AC_TYPE_UNSIGNED_LONG_LONG]) AC_REQUIRE([AC_HEADER_MAJOR]) AC_REQUIRE([AC_HEADER_DIRENT]) diff -urp coreutils-5.2.1.o/m4/longlong.m4 coreutils-5.2.1/m4/longlong.m4 --- coreutils-5.2.1.o/m4/longlong.m4 2003-08-17 09:51:49.000000000 +0200 +++ coreutils-5.2.1/m4/longlong.m4 2006-11-04 00:23:40.168725500 +0100 @@ -10,7 +10,7 @@ dnl From Paul Eggert. # Define HAVE_LONG_LONG if 'long long' works. -AC_DEFUN([jm_AC_TYPE_LONG_LONG], +AC_DEFUN([gl_AC_TYPE_LONG_LONG], [ AC_CACHE_CHECK([for long long], ac_cv_type_long_long, [AC_TRY_LINK([long long ll = 1LL; int i = 63;], diff -urp coreutils-5.2.1.o/m4/mkstemp.m4 coreutils-5.2.1/m4/mkstemp.m4 --- coreutils-5.2.1.o/m4/mkstemp.m4 2003-09-13 12:45:30.000000000 +0200 +++ coreutils-5.2.1/m4/mkstemp.m4 2006-11-04 00:25:23.147161250 +0100 @@ -62,5 +62,5 @@ AC_DEFUN([jm_PREREQ_TEMPNAME], AC_CHECK_HEADERS(stdint.h) AC_CHECK_FUNCS(__secure_getenv gettimeofday) AC_CHECK_DECLS_ONCE(getenv) - AC_REQUIRE([jm_AC_TYPE_UINTMAX_T]) + AC_REQUIRE([gl_AC_TYPE_UINTMAX_T]) ]) diff -urp coreutils-5.2.1.o/m4/prereq.m4 coreutils-5.2.1/m4/prereq.m4 --- coreutils-5.2.1.o/m4/prereq.m4 2003-12-18 11:33:33.000000000 +0100 +++ coreutils-5.2.1/m4/prereq.m4 2006-11-04 00:23:46.349111750 +0100 @@ -136,7 +136,7 @@ AC_DEFUN([jm_PREREQ_STAT], AC_CHECK_HEADERS([netinet/in.h nfs/nfs_clnt.h nfs/vfs.h],,, [AC_INCLUDES_DEFAULT]) - AC_REQUIRE([jm_AC_TYPE_LONG_LONG]) + AC_REQUIRE([gl_AC_TYPE_LONG_LONG]) statxfs_includes="\ $ac_includes_default diff -urp coreutils-5.2.1.o/m4/stdint_h.m4 coreutils-5.2.1/m4/stdint_h.m4 --- coreutils-5.2.1.o/m4/stdint_h.m4 2003-07-10 10:34:01.000000000 +0200 +++ coreutils-5.2.1/m4/stdint_h.m4 2006-11-04 00:27:44.596001250 +0100 @@ -11,7 +11,7 @@ dnl From Paul Eggert. # Define HAVE_STDINT_H_WITH_UINTMAX if exists, # doesn't clash with , and declares uintmax_t. -AC_DEFUN([jm_AC_HEADER_STDINT_H], +AC_DEFUN([gl_AC_HEADER_STDINT_H], [ AC_CACHE_CHECK([for stdint.h], jm_ac_cv_header_stdint_h, [AC_TRY_COMPILE( diff -urp coreutils-5.2.1.o/m4/strtoimax.m4 coreutils-5.2.1/m4/strtoimax.m4 --- coreutils-5.2.1.o/m4/strtoimax.m4 2003-09-13 12:45:30.000000000 +0200 +++ coreutils-5.2.1/m4/strtoimax.m4 2006-11-04 00:24:03.034154500 +0100 @@ -33,5 +33,5 @@ AC_DEFUN([gl_FUNC_STRTOIMAX], AC_DEFUN([gl_PREREQ_STRTOIMAX], [ jm_AC_TYPE_INTMAX_T AC_CHECK_DECLS(strtoll) - AC_REQUIRE([jm_AC_TYPE_LONG_LONG]) + AC_REQUIRE([gl_AC_TYPE_LONG_LONG]) ]) diff -urp coreutils-5.2.1.o/m4/strtoll.m4 coreutils-5.2.1/m4/strtoll.m4 --- coreutils-5.2.1.o/m4/strtoll.m4 2003-08-17 09:51:49.000000000 +0200 +++ coreutils-5.2.1/m4/strtoll.m4 2006-11-04 00:24:13.290795500 +0100 @@ -10,7 +10,7 @@ AC_DEFUN([gl_FUNC_STRTOLL], [ dnl We don't need (and can't compile) the replacement strtoll dnl unless the type 'long long' exists. - AC_REQUIRE([jm_AC_TYPE_LONG_LONG]) + AC_REQUIRE([gl_AC_TYPE_LONG_LONG]) if test "$ac_cv_type_long_long" = yes; then AC_REPLACE_FUNCS(strtoll) if test $ac_cv_func_strtoll = no; then diff -urp coreutils-5.2.1.o/m4/strtoull.m4 coreutils-5.2.1/m4/strtoull.m4 --- coreutils-5.2.1.o/m4/strtoull.m4 2003-08-17 09:51:49.000000000 +0200 +++ coreutils-5.2.1/m4/strtoull.m4 2006-11-04 00:26:12.898270500 +0100 @@ -10,7 +10,7 @@ AC_DEFUN([gl_FUNC_STRTOULL], [ dnl We don't need (and can't compile) the replacement strtoull dnl unless the type 'unsigned long long' exists. - AC_REQUIRE([jm_AC_TYPE_UNSIGNED_LONG_LONG]) + AC_REQUIRE([gl_AC_TYPE_UNSIGNED_LONG_LONG]) if test "$ac_cv_type_unsigned_long_long" = yes; then AC_REPLACE_FUNCS(strtoull) if test $ac_cv_func_strtoull = no; then diff -urp coreutils-5.2.1.o/m4/strtoumax.m4 coreutils-5.2.1/m4/strtoumax.m4 --- coreutils-5.2.1.o/m4/strtoumax.m4 2003-09-13 12:15:46.000000000 +0200 +++ coreutils-5.2.1/m4/strtoumax.m4 2006-11-04 00:26:19.214665250 +0100 @@ -31,7 +31,7 @@ AC_DEFUN([gl_FUNC_STRTOUMAX], # Prerequisites of lib/strtoumax.c. AC_DEFUN([gl_PREREQ_STRTOUMAX], [ - jm_AC_TYPE_UINTMAX_T + gl_AC_TYPE_UINTMAX_T AC_CHECK_DECLS(strtoull) - AC_REQUIRE([jm_AC_TYPE_UNSIGNED_LONG_LONG]) + AC_REQUIRE([gl_AC_TYPE_UNSIGNED_LONG_LONG]) ]) diff -urp coreutils-5.2.1.o/m4/uintmax_t.m4 coreutils-5.2.1/m4/uintmax_t.m4 --- coreutils-5.2.1.o/m4/uintmax_t.m4 2003-08-10 10:47:53.000000000 +0200 +++ coreutils-5.2.1/m4/uintmax_t.m4 2006-11-04 00:27:52.260480250 +0100 @@ -13,12 +13,12 @@ AC_PREREQ(2.13) # Define uintmax_t to 'unsigned long' or 'unsigned long long' # if it is not already defined in or . -AC_DEFUN([jm_AC_TYPE_UINTMAX_T], +AC_DEFUN([gl_AC_TYPE_UINTMAX_T], [ - AC_REQUIRE([jm_AC_HEADER_INTTYPES_H]) - AC_REQUIRE([jm_AC_HEADER_STDINT_H]) + AC_REQUIRE([gl_AC_HEADER_INTTYPES_H]) + AC_REQUIRE([gl_AC_HEADER_STDINT_H]) if test $jm_ac_cv_header_inttypes_h = no && test $jm_ac_cv_header_stdint_h = no; then - AC_REQUIRE([jm_AC_TYPE_UNSIGNED_LONG_LONG]) + AC_REQUIRE([gl_AC_TYPE_UNSIGNED_LONG_LONG]) test $ac_cv_type_unsigned_long_long = yes \ && ac_type='unsigned long long' \ || ac_type='unsigned long' diff -urp coreutils-5.2.1.o/m4/ulonglong.m4 coreutils-5.2.1/m4/ulonglong.m4 --- coreutils-5.2.1.o/m4/ulonglong.m4 2003-08-17 09:51:49.000000000 +0200 +++ coreutils-5.2.1/m4/ulonglong.m4 2006-11-04 00:26:33.507558500 +0100 @@ -10,7 +10,7 @@ dnl From Paul Eggert. # Define HAVE_UNSIGNED_LONG_LONG if 'unsigned long long' works. -AC_DEFUN([jm_AC_TYPE_UNSIGNED_LONG_LONG], +AC_DEFUN([gl_AC_TYPE_UNSIGNED_LONG_LONG], [ AC_CACHE_CHECK([for unsigned long long], ac_cv_type_unsigned_long_long, [AC_TRY_LINK([unsigned long long ull = 1ULL; int i = 63;], diff -urp coreutils-5.2.1.o/m4/vasnprintf.m4 coreutils-5.2.1/m4/vasnprintf.m4 --- coreutils-5.2.1.o/m4/vasnprintf.m4 2004-01-16 09:26:02.000000000 +0100 +++ coreutils-5.2.1/m4/vasnprintf.m4 2006-11-04 00:24:33.024028750 +0100 @@ -24,7 +24,7 @@ AC_DEFUN([gl_FUNC_VASNPRINTF], AC_DEFUN([gl_PREREQ_PRINTF_ARGS], [ AC_REQUIRE([bh_C_SIGNED]) - AC_REQUIRE([jm_AC_TYPE_LONG_LONG]) + AC_REQUIRE([gl_AC_TYPE_LONG_LONG]) AC_REQUIRE([gt_TYPE_LONGDOUBLE]) AC_REQUIRE([gt_TYPE_WCHAR_T]) AC_REQUIRE([gt_TYPE_WINT_T]) @@ -33,7 +33,7 @@ AC_DEFUN([gl_PREREQ_PRINTF_ARGS], # Prequisites of lib/printf-parse.h, lib/printf-parse.c. AC_DEFUN([gl_PREREQ_PRINTF_PARSE], [ - AC_REQUIRE([jm_AC_TYPE_LONG_LONG]) + AC_REQUIRE([gl_AC_TYPE_LONG_LONG]) AC_REQUIRE([gt_TYPE_LONGDOUBLE]) AC_REQUIRE([gt_TYPE_WCHAR_T]) AC_REQUIRE([gt_TYPE_WINT_T]) @@ -46,7 +46,7 @@ AC_DEFUN([gl_PREREQ_PRINTF_PARSE], AC_DEFUN([gl_PREREQ_VASNPRINTF], [ AC_REQUIRE([AC_FUNC_ALLOCA]) - AC_REQUIRE([jm_AC_TYPE_LONG_LONG]) + AC_REQUIRE([gl_AC_TYPE_LONG_LONG]) AC_REQUIRE([gt_TYPE_LONGDOUBLE]) AC_REQUIRE([gt_TYPE_WCHAR_T]) AC_REQUIRE([gt_TYPE_WINT_T]) diff -urp coreutils-5.2.1.o/m4/xstrtol.m4 coreutils-5.2.1/m4/xstrtol.m4 --- coreutils-5.2.1.o/m4/xstrtol.m4 2003-09-13 12:45:30.000000000 +0200 +++ coreutils-5.2.1/m4/xstrtol.m4 2006-11-04 00:25:44.648505000 +0100 @@ -16,7 +16,7 @@ AC_DEFUN([gl_XSTRTOL], AC_DEFUN([gl_PREREQ_XSTRTOL_H], [ AC_REQUIRE([jm_AC_TYPE_INTMAX_T]) - AC_REQUIRE([jm_AC_TYPE_UINTMAX_T]) + AC_REQUIRE([gl_AC_TYPE_UINTMAX_T]) ]) # Prerequisites of lib/xstrtol.c. diff -urp coreutils-5.2.1.o/m4/xstrtoumax.m4 coreutils-5.2.1/m4/xstrtoumax.m4 --- coreutils-5.2.1.o/m4/xstrtoumax.m4 2003-08-17 09:51:49.000000000 +0200 +++ coreutils-5.2.1/m4/xstrtoumax.m4 2006-11-04 00:25:52.444992250 +0100 @@ -4,6 +4,6 @@ dnl Cloned from xstrtoimax.m4. Keep the AC_DEFUN([jm_XSTRTOUMAX], [ dnl Prerequisites of lib/xstrtoumax.c. - AC_REQUIRE([jm_AC_TYPE_UINTMAX_T]) + AC_REQUIRE([gl_AC_TYPE_UINTMAX_T]) AC_REQUIRE([gl_PREREQ_XSTRTOL]) ])