-#serial 67 -*- autoconf -*-
+#serial 76 -*- autoconf -*-
-m4_undefine([AC_LANG_SOURCE(C)])
-dnl The following is identical to the definition in c.m4
-dnl from the autoconf cvs repository on 2003-03-07.
-dnl FIXME: remove this code once we upgrade to autoconf-2.58.
+dnl Misc type-related macros for coreutils.
-# We can't use '#line $LINENO "configure"' here, since
-# Sun c89 (Sun WorkShop 6 update 2 C 5.3 Patch 111679-08 2002/05/09)
-# rejects $LINENO greater than 32767, and some configure scripts
-# are longer than 32767 lines.
-m4_define([AC_LANG_SOURCE(C)],
-[/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$1])
+# Copyright (C) 1998, 2000, 2001, 2002, 2003, 2004 Free Software
+# Foundation, Inc.
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
-dnl Misc type-related macros for fileutils, sh-utils, textutils.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
-AC_DEFUN([jm_MACROS],
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+# Written by Jim Meyering.
+
+AC_DEFUN([gl_MACROS],
[
- AC_PREREQ(2.57)
+ AC_PREREQ(2.58)
GNU_PACKAGE="GNU $PACKAGE"
AC_DEFINE_UNQUOTED(GNU_PACKAGE, "$GNU_PACKAGE",
dnl This macro actually runs replacement code. See isc-posix.m4.
AC_REQUIRE([AC_ISC_POSIX])dnl
- jm_CHECK_ALL_TYPES
+ gl_CHECK_ALL_TYPES
- AC_REQUIRE([UTILS_HOST_OS])
- AC_REQUIRE([jm_ASSERT])
- AC_REQUIRE([jm_CHECK_TYPE_STRUCT_UTIMBUF])
- AC_REQUIRE([jm_CHECK_TYPE_STRUCT_DIRENT_D_TYPE])
- AC_REQUIRE([jm_CHECK_TYPE_STRUCT_DIRENT_D_INO])
- AC_REQUIRE([jm_CHECK_DECLS])
+ AC_REQUIRE([gl_HOST_OS])
+ AC_REQUIRE([gl_ASSERT])
+ AC_REQUIRE([gl_CHECK_TYPE_STRUCT_UTIMBUF])
+ AC_REQUIRE([gl_CHECK_TYPE_STRUCT_DIRENT_D_TYPE])
+ AC_REQUIRE([gl_CHECK_TYPE_STRUCT_DIRENT_D_INO])
+ AC_REQUIRE([gl_CHECK_DECLS])
- AC_REQUIRE([jm_PREREQ])
+ AC_REQUIRE([gl_PREREQ])
- AC_REQUIRE([UTILS_FUNC_DIRFD])
+ AC_REQUIRE([gl_FUNC_DIRFD])
AC_REQUIRE([AC_FUNC_ACL])
- AC_REQUIRE([AC_FUNC_FTW])
- AC_REQUIRE([jm_FUNC_LCHOWN])
+ AC_REQUIRE([gl_FUNC_LCHOWN])
AC_REQUIRE([fetish_FUNC_RMDIR_NOTEMPTY])
- AC_REQUIRE([jm_FUNC_CHOWN])
+ AC_REQUIRE([gl_FUNC_CHOWN])
AC_REQUIRE([AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK])
AC_REQUIRE([AC_FUNC_STRERROR_R])
- AC_REQUIRE([jm_FUNC_GROUP_MEMBER])
- AC_REQUIRE([jm_AFS])
- AC_REQUIRE([jm_AC_FUNC_LINK_FOLLOWS_SYMLINK])
- AC_REQUIRE([jm_FUNC_FPENDING])
+ AC_REQUIRE([gl_FUNC_GROUP_MEMBER])
+ AC_REQUIRE([gl_AFS])
+ AC_REQUIRE([gl_AC_FUNC_LINK_FOLLOWS_SYMLINK])
+ AC_REQUIRE([gl_FUNC_FPENDING])
# This is for od and stat, and any other program that
# uses the PRI.MAX macros from inttypes.h.
AC_REQUIRE([gt_INTTYPES_PRI])
- AC_REQUIRE([jm_FUNC_GETGROUPS])
+ AC_REQUIRE([gl_FUNC_GETGROUPS])
AC_REQUIRE([AC_FUNC_FSEEKO])
AC_REQUIRE([AC_FUNC_ALLOCA])
AC_CONFIG_LIBOBJ_DIR([lib])
AC_FUNC_GETLOADAVG([lib])
- AC_REQUIRE([jm_SYS_PROC_UPTIME])
- AC_REQUIRE([jm_FUNC_FTRUNCATE])
+ AC_REQUIRE([gl_SYS_PROC_UPTIME])
+ AC_REQUIRE([gl_FUNC_FTRUNCATE])
# raise is used by at least sort and ls.
AC_REPLACE_FUNCS(raise)
# used by sleep and shred
AC_REQUIRE([gl_CLOCK_TIME])
- AC_CHECK_FUNCS(gettimeofday)
+ AC_CHECK_FUNCS_ONCE(gettimeofday)
AC_FUNC_GETTIMEOFDAY_CLOBBER
+ # used by shred
+ AC_CHECK_FUNCS_ONCE(directio)
AC_REQUIRE([AC_FUNC_CLOSEDIR_VOID])
- AC_CHECK_FUNCS( \
+ AC_CHECK_FUNCS_ONCE( \
endgrent \
endpwent \
- fdatasync \
ftruncate \
gethrtime \
hasmntopt \
memcpy \
mempcpy \
mkfifo \
+ mbrlen \
realpath \
sethostname \
strchr \
strrchr \
sysctl \
sysinfo \
+ tcgetpgrp \
wcrtomb \
tzset \
)
- # for test.c
- AC_CHECK_FUNCS(setreuid setregid)
-
AC_FUNC_STRTOD
- AC_REQUIRE([UTILS_SYS_OPEN_MAX])
+
+ AC_REQUIRE([cu_PREREQ_STAT_PROG])
AC_REQUIRE([GL_FUNC_GETCWD_PATH_MAX])
AC_REQUIRE([GL_FUNC_READDIR])
+ # for dd.c and shred.c
+ fetish_saved_libs=$LIBS
+ AC_SEARCH_LIBS([fdatasync], [rt posix4],
+ [test "$ac_cv_search_fdatasync" = "none required" ||
+ LIB_FDATASYNC=$ac_cv_search_fdatasync])
+ AC_SUBST([LIB_FDATASYNC])
+ AC_CHECK_FUNCS(fdatasync)
+ LIBS=$fetish_saved_libs
+
# See if linking `seq' requires -lm.
# It does on nearly every system. The single exception (so far) is
# BeOS which has all the math functions in the normal runtime library
])
AM_LANGINFO_CODESET
- jm_GLIBC21
+ gl_GLIBC21
AM_ICONV
- jm_FUNC_UNLINK_BUSY_TEXT
+ gl_FUNC_UNLINK_BUSY_TEXT
# These tests are for df.
AC_REQUIRE([gl_FSUSAGE])
AC_REQUIRE([gl_MOUNTLIST])
- if test $gl_list_mounted_fs = yes && test $gl_cv_fs_space = yes; then
+ if test $gl_cv_list_mounted_fs = yes && test $gl_cv_fs_space = yes; then
DF_PROG='df$(EXEEXT)'
fi
- AC_REQUIRE([jm_AC_DOS])
+ AC_REQUIRE([gl_AC_DOS])
AC_REQUIRE([AC_FUNC_CANONICALIZE_FILE_NAME])
# If any of these functions don't exist (e.g. DJGPP 2.03),
# use the corresponding stub.
AC_CHECK_FUNC([fchdir], , [AC_LIBOBJ(fchdir-stub)])
- AC_CHECK_FUNC([fchown], , [AC_LIBOBJ(fchown-stub)])
+
+ AC_REQUIRE([gl_FUNC_FREE])
])
# These tests must be run before any use of AC_CHECK_TYPE,
# because that macro compiles code that tests e.g., HAVE_UNISTD_H.
# See the definition of ac_includes_default in `configure'.
-AC_DEFUN([jm_CHECK_ALL_HEADERS],
+AC_DEFUN([gl_CHECK_ALL_HEADERS],
[
- AC_CHECK_HEADERS( \
+ AC_CHECK_HEADERS_ONCE( \
errno.h \
fcntl.h \
float.h \
sys/fstyp.h \
sys/ioctl.h \
sys/mntent.h \
- sys/mount.h \
sys/param.h \
sys/resource.h \
sys/socket.h \
sys/statfs.h \
sys/statvfs.h \
- sys/sysctl.h \
sys/systeminfo.h \
sys/time.h \
sys/timeb.h \
termios.h \
unistd.h \
utime.h \
- values.h \
)
+ AC_CHECK_HEADERS(sys/mount.h sys/sysctl.h, [], [],
+ [AC_INCLUDES_DEFAULT
+ [#if HAVE_SYS_PARAM_H
+ #include <sys/param.h>
+ #endif]])
])
# This macro must be invoked before any tests that run the compiler.
-AC_DEFUN([jm_CHECK_ALL_TYPES],
+AC_DEFUN([gl_CHECK_ALL_TYPES],
[
dnl This test must come as early as possible after the compiler configuration
dnl tests, because the choice of the file model can (in principle) affect
AC_REQUIRE([AC_C_INLINE])
AC_REQUIRE([AC_C_LONG_DOUBLE])
- AC_REQUIRE([jm_CHECK_ALL_HEADERS])
+ AC_REQUIRE([gl_CHECK_ALL_HEADERS])
AC_REQUIRE([AC_HEADER_DIRENT])
AC_REQUIRE([AC_HEADER_STDC])
AC_CHECK_MEMBERS(
AC_REQUIRE([AC_STRUCT_ST_DM_MODE])
AC_REQUIRE([AC_TYPE_GETGROUPS])
+ AC_REQUIRE([AC_TYPE_MBSTATE_T])
AC_REQUIRE([AC_TYPE_MODE_T])
AC_REQUIRE([AC_TYPE_OFF_T])
AC_REQUIRE([AC_TYPE_PID_T])
AC_REQUIRE([AC_TYPE_SIGNAL])
AC_REQUIRE([AC_TYPE_SIZE_T])
AC_REQUIRE([AC_TYPE_UID_T])
- AC_CHECK_TYPE(ino_t, unsigned long)
+ AC_CHECK_TYPE(ino_t, unsigned long int)
gt_TYPE_SSIZE_T
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_UINT32_T])
+ AC_REQUIRE([gl_AC_TYPE_UINTMAX_T])
+ AC_REQUIRE([gl_AC_TYPE_UINTPTR_T])
+ AC_REQUIRE([gl_AC_TYPE_UNSIGNED_LONG_LONG])
AC_REQUIRE([AC_HEADER_MAJOR])
AC_REQUIRE([AC_HEADER_DIRENT])
projects / gnulib.git / blobdiff