-#serial 37
+#serial 45
-dnl We use jm_ for non Autoconf macros.
-m4_pattern_forbid([^jm_[ABCDEFGHIJKLMNOPQRSTUVXYZ]])dnl
+dnl We use gl_ for non Autoconf macros.
m4_pattern_forbid([^gl_[ABCDEFGHIJKLMNOPQRSTUVXYZ]])dnl
# These are the prerequisite macros for files in the lib/
# directory of the coreutils package.
-AC_DEFUN([jm_PREREQ],
+AC_DEFUN([gl_PREREQ],
[
# We don't yet use c-stack.c.
# AC_REQUIRE([gl_C_STACK])
AC_REQUIRE([AM_FUNC_GETLINE])
AC_REQUIRE([AM_STDBOOL_H])
- AC_REQUIRE([UTILS_FUNC_MKDIR_TRAILING_SLASH])
- AC_REQUIRE([UTILS_FUNC_MKSTEMP])
+ AC_REQUIRE([gl_FUNC_MKDIR_TRAILING_SLASH])
+ AC_REQUIRE([gl_FUNC_MKSTEMP])
+ AC_REQUIRE([gl_ALLOCSA])
AC_REQUIRE([gl_BACKUPFILE])
+ AC_REQUIRE([gl_C_STRTOLD])
AC_REQUIRE([gl_CANON_HOST])
+ AC_REQUIRE([gl_CLOEXEC])
AC_REQUIRE([gl_CLOSEOUT])
AC_REQUIRE([gl_DIRNAME])
AC_REQUIRE([gl_ERROR])
AC_REQUIRE([gl_EXCLUDE])
AC_REQUIRE([gl_EXITFAIL])
+ AC_REQUIRE([gl_FCNTL_SAFER])
AC_REQUIRE([gl_FILEBLOCKS])
AC_REQUIRE([gl_FILEMODE])
AC_REQUIRE([gl_FILE_TYPE])
AC_REQUIRE([gl_FUNC_ALLOCA])
AC_REQUIRE([gl_FUNC_ATEXIT])
AC_REQUIRE([gl_FUNC_DUP2])
- AC_REQUIRE([gl_FUNC_EUIDACCESS])
AC_REQUIRE([gl_FUNC_FNMATCH_GNU])
AC_REQUIRE([gl_FUNC_GETHOSTNAME])
AC_REQUIRE([AC_FUNC_GETLOADAVG])
AC_REQUIRE([gl_FUNC_MEMRCHR])
AC_REQUIRE([gl_FUNC_MEMSET])
AC_REQUIRE([gl_FUNC_MKTIME])
+ AC_REQUIRE([gl_FUNC_NONREENTRANT_EUIDACCESS])
AC_REQUIRE([gl_FUNC_READLINK])
AC_REQUIRE([gl_FUNC_RMDIR])
AC_REQUIRE([gl_FUNC_RPMATCH])
AC_REQUIRE([gl_GETNDELIM2])
AC_REQUIRE([gl_GETOPT])
AC_REQUIRE([gl_GETPAGESIZE])
+ AC_REQUIRE([gl_GETTIME])
AC_REQUIRE([gl_GETUGROUPS])
AC_REQUIRE([gl_HARD_LOCALE])
AC_REQUIRE([gl_HASH])
AC_REQUIRE([gl_HUMAN])
AC_REQUIRE([gl_IDCACHE])
+ AC_REQUIRE([gl_INTTOSTR])
AC_REQUIRE([gl_LONG_OPTIONS])
AC_REQUIRE([gl_MAKEPATH])
AC_REQUIRE([gl_MBSWIDTH])
AC_REQUIRE([gl_SAVEDIR])
AC_REQUIRE([gl_SAVE_CWD])
AC_REQUIRE([gl_SETTIME])
- AC_REQUIRE([gl_SHA])
+ AC_REQUIRE([gl_SHA1])
AC_REQUIRE([gl_STDIO_SAFER])
AC_REQUIRE([gl_STRCASE])
AC_REQUIRE([gl_TIMESPEC])
AC_REQUIRE([gl_UNICODEIO])
AC_REQUIRE([gl_UNISTD_SAFER])
AC_REQUIRE([gl_USERSPEC])
+ AC_REQUIRE([gl_UTIMECMP])
AC_REQUIRE([gl_UTIMENS])
AC_REQUIRE([gl_XALLOC])
AC_REQUIRE([gl_XGETCWD])
AC_REQUIRE([gl_XSTRTOD])
AC_REQUIRE([gl_XSTRTOL])
AC_REQUIRE([gl_YESNO])
- AC_REQUIRE([jm_FUNC_GLIBC_UNLOCKED_IO])
- AC_REQUIRE([jm_FUNC_GNU_STRFTIME])
- AC_REQUIRE([jm_FUNC_LSTAT])
+ AC_REQUIRE([AC_FUNC_CALLOC])
+ AC_REQUIRE([gl_FUNC_GLIBC_UNLOCKED_IO])
+ AC_REQUIRE([gl_FUNC_GNU_STRFTIME])
+ AC_REQUIRE([gl_FUNC_LSTAT])
AC_REQUIRE([AC_FUNC_MALLOC])
- AC_REQUIRE([jm_FUNC_MEMCMP])
- AC_REQUIRE([jm_FUNC_NANOSLEEP])
- AC_REQUIRE([jm_FUNC_PUTENV])
+ AC_REQUIRE([gl_FUNC_MEMCMP])
+ AC_REQUIRE([gl_FUNC_NANOSLEEP])
+ AC_REQUIRE([gl_FUNC_PUTENV])
AC_REQUIRE([AC_FUNC_REALLOC])
- AC_REQUIRE([jm_FUNC_STAT])
- AC_REQUIRE([jm_FUNC_UTIME])
- AC_REQUIRE([jm_PREREQ_STAT])
- AC_REQUIRE([jm_XSTRTOIMAX])
- AC_REQUIRE([jm_XSTRTOUMAX])
+ AC_REQUIRE([gl_FUNC_STAT])
+ AC_REQUIRE([gl_FUNC_UTIME])
+ AC_REQUIRE([gl_XSTRTOIMAX])
+ AC_REQUIRE([gl_XSTRTOUMAX])
AC_REQUIRE([vb_FUNC_RENAME])
])
-
-AC_DEFUN([jm_PREREQ_STAT],
-[
- AC_CHECK_HEADERS(sys/sysmacros.h sys/statvfs.h sys/vfs.h inttypes.h)
- AC_CHECK_HEADERS(sys/param.h sys/mount.h)
- AC_CHECK_FUNCS(statvfs)
-
- # For `struct statfs' on Ultrix 4.4.
- AC_CHECK_HEADERS([netinet/in.h nfs/nfs_clnt.h nfs/vfs.h],,,
- [AC_INCLUDES_DEFAULT])
-
- AC_REQUIRE([jm_AC_TYPE_LONG_LONG])
-
- statxfs_includes="\
-$ac_includes_default
-#if HAVE_SYS_STATVFS_H
-# include <sys/statvfs.h>
-#endif
-#if HAVE_SYS_VFS_H
-# include <sys/vfs.h>
-#endif
-#if !HAVE_SYS_STATVFS_H && !HAVE_SYS_VFS_H
-# if HAVE_SYS_MOUNT_H && HAVE_SYS_PARAM_H
-/* NetBSD 1.5.2 needs these, for the declaration of struct statfs. */
-# include <sys/param.h>
-# include <sys/mount.h>
-# elif HAVE_NETINET_IN_H && HAVE_NFS_NFS_CLNT_H && HAVE_NFS_VFS_H
-/* Ultrix 4.4 needs these for the declaration of struct statfs. */
-# include <netinet/in.h>
-# include <nfs/nfs_clnt.h>
-# include <nfs/vfs.h>
-# endif
-#endif
-"
- AC_CHECK_MEMBERS([struct statfs.f_basetype],,,[$statxfs_includes])
- AC_CHECK_MEMBERS([struct statvfs.f_basetype],,,[$statxfs_includes])
- AC_CHECK_MEMBERS([struct statfs.f_fstypename],,,[$statxfs_includes])
- AC_CHECK_MEMBERS([struct statfs.f_type],,,[$statxfs_includes])
- AC_CHECK_MEMBERS([struct statvfs.f_type],,,[$statxfs_includes])
- AC_CHECK_MEMBERS([struct statfs.f_fsid.__val],,,[$statxfs_includes])
- AC_CHECK_MEMBERS([struct statvfs.f_fsid.__val],,,[$statxfs_includes])
- AC_CHECK_MEMBERS([struct statfs.f_namemax],,,[$statxfs_includes])
- AC_CHECK_MEMBERS([struct statvfs.f_namemax],,,[$statxfs_includes])
- AC_CHECK_MEMBERS([struct statfs.f_namelen],,,[$statxfs_includes])
- AC_CHECK_MEMBERS([struct statvfs.f_namelen],,,[$statxfs_includes])
-])