X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fjm-macros.m4;h=53a0a8b9db392f8053c9dcb126634e8d9dfb471e;hb=a5445d0c68629bd0e57fa8467994915f0d5c49ea;hp=d3e59539cf42412ab3dca0c1eb238f887d27eaa7;hpb=54507643b56077d703b5c54969d5095a4c8e6895;p=gnulib.git diff --git a/m4/jm-macros.m4 b/m4/jm-macros.m4 index d3e59539c..53a0a8b9d 100644 --- a/m4/jm-macros.m4 +++ b/m4/jm-macros.m4 @@ -1,16 +1,17 @@ -#serial 24 +#serial 39 -*- autoconf -*- dnl Misc type-related macros for fileutils, sh-utils, textutils. -AC_DEFUN(jm_MACROS, +AC_DEFUN([jm_MACROS], [ - AC_PREREQ(2.14a) + AC_PREREQ(2.52) GNU_PACKAGE="GNU $PACKAGE" AC_DEFINE_UNQUOTED(GNU_PACKAGE, "$GNU_PACKAGE", [The concatenation of the strings `GNU ', and PACKAGE.]) AC_SUBST(GNU_PACKAGE) + AM_MISSING_PROG(HELP2MAN, help2man) AC_SUBST(OPTIONAL_BIN_PROGS) AC_SUBST(OPTIONAL_BIN_ZCRIPTS) AC_SUBST(MAN) @@ -19,49 +20,12 @@ AC_DEFUN(jm_MACROS, dnl This macro actually runs replacement code. See isc-posix.m4. AC_REQUIRE([AC_ISC_POSIX])dnl - AC_CHECK_HEADERS( \ - errno.h \ - fcntl.h \ - fenv.h \ - float.h \ - limits.h \ - memory.h \ - mntent.h \ - mnttab.h \ - netdb.h \ - paths.h \ - stdlib.h \ - stddef.h \ - string.h \ - sys/acl.h \ - sys/filsys.h \ - sys/fs/s5param.h \ - sys/fs_types.h \ - sys/fstyp.h \ - sys/ioctl.h \ - sys/mntent.h \ - sys/mount.h \ - sys/param.h \ - sys/socket.h \ - sys/statfs.h \ - sys/statvfs.h \ - sys/systeminfo.h \ - sys/time.h \ - sys/timeb.h \ - sys/vfs.h \ - sys/wait.h \ - syslog.h \ - termios.h \ - unistd.h \ - utime.h \ - values.h \ - ) - + jm_CHECK_ALL_TYPES jm_INCLUDED_REGEX([lib/regex.c]) + AC_REQUIRE([UTILS_HOST_OS]) AC_REQUIRE([jm_BISON]) AC_REQUIRE([jm_ASSERT]) - AC_REQUIRE([jm_AC_HEADER_INTTYPES_H]) 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]) @@ -88,10 +52,12 @@ AC_DEFUN(jm_MACROS, AC_REQUIRE([jm_FUNC_PUTENV]) AC_REQUIRE([jm_AFS]) AC_REQUIRE([jm_AC_PREREQ_XSTRTOUMAX]) + AC_REQUIRE([jm_AC_PREREQ_XSTRTOIMAX]) AC_REQUIRE([jm_AC_FUNC_LINK_FOLLOWS_SYMLINK]) AC_REQUIRE([AM_FUNC_ERROR_AT_LINE]) AC_REQUIRE([jm_FUNC_GNU_STRFTIME]) AC_REQUIRE([jm_FUNC_MKTIME]) + AC_REQUIRE([jm_FUNC_FPENDING]) AC_REQUIRE([jm_FUNC_GETGROUPS]) test -n "$GETGROUPS_LIB" && LIBS="$GETGROUPS_LIB $LIBS" @@ -101,6 +67,7 @@ AC_DEFUN(jm_MACROS, AC_FUNC_GETLOADAVG([lib]) AC_REQUIRE([jm_SYS_PROC_UPTIME]) AC_REQUIRE([jm_FUNC_FTRUNCATE]) + AC_REQUIRE([vb_FUNC_RENAME]) AC_REPLACE_FUNCS(strcasecmp strncasecmp) AC_REPLACE_FUNCS(dup2) @@ -115,9 +82,14 @@ AC_DEFUN(jm_MACROS, dnl used by e.g. intl/*domain.c and lib/canon-host.c AC_REPLACE_FUNCS(strdup) - AC_REPLACE_FUNCS(memchr memmove memcpy memset) + AC_REPLACE_FUNCS(memchr memcpy memmove memrchr memset) AC_CHECK_FUNCS(getpagesize) + AC_REPLACE_FUNCS(mkstemp) + if test $ac_cv_func_mkstemp != yes; then + AC_LIBOBJ(tempname) + fi + # By default, argmatch should fail calling usage (1). AC_DEFINE(ARGMATCH_DIE, [usage (1)], [Define to the function xargmatch calls on failures.]) @@ -143,6 +115,7 @@ AC_DEFUN(jm_MACROS, AC_CHECK_FUNCS(clock_gettime) LIBS=$fetish_saved_libs AC_CHECK_FUNCS(gettimeofday) + AC_FUNC_GETTIMEOFDAY_CLOBBER AC_REQUIRE([AC_FUNC_CLOSEDIR_VOID]) AC_REQUIRE([jm_FUNC_UTIME]) @@ -150,11 +123,11 @@ AC_DEFUN(jm_MACROS, AC_CHECK_FUNCS( \ acl \ bcopy \ + canonicalize_file_name \ endgrent \ endpwent \ fchdir \ fdatasync \ - fseeko \ ftime \ ftruncate \ getcwd \ @@ -175,6 +148,7 @@ AC_DEFUN(jm_MACROS, strerror \ strrchr \ sysinfo \ + wcrtomb \ tzset \ ) @@ -206,9 +180,10 @@ AC_DEFUN(jm_MACROS, LIBS="$ac_seq_save_LIBS" ]) - jm_LANGINFO_CODESET + AM_LANGINFO_CODESET jm_GLIBC21 - jm_ICONV + AM_ICONV + jm_FUNC_UNLINK_BUSY_TEXT # These tests are for df. jm_LIST_MOUNTED_FILESYSTEMS([list_mounted_fs=yes], [list_mounted_fs=no]) @@ -219,11 +194,58 @@ AC_DEFUN(jm_MACROS, AC_LIBOBJ(fsusage) AC_LIBOBJ(mountlist) fi + AC_REQUIRE([jm_AC_DOS]) ]) +# 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_CHECK_HEADERS( \ + errno.h \ + fcntl.h \ + fenv.h \ + float.h \ + limits.h \ + memory.h \ + mntent.h \ + mnttab.h \ + netdb.h \ + paths.h \ + stdlib.h \ + stddef.h \ + stdint.h \ + string.h \ + sys/acl.h \ + sys/filsys.h \ + sys/fs/s5param.h \ + sys/fs_types.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/systeminfo.h \ + sys/time.h \ + sys/timeb.h \ + sys/vfs.h \ + sys/wait.h \ + syslog.h \ + termios.h \ + unistd.h \ + utime.h \ + values.h \ + ) +]) + # This macro must be invoked before any tests that run the compiler. -AC_DEFUN(jm_CHECK_ALL_TYPES, +AC_DEFUN([jm_CHECK_ALL_TYPES], [ # FIXME: I shouldn't have to require this macro here. Rather, it should # be required by any autoconf macro that performs a compile-time test or @@ -248,6 +270,7 @@ AC_DEFUN(jm_CHECK_ALL_TYPES, AC_REQUIRE([AC_C_INLINE]) AC_REQUIRE([AC_C_LONG_DOUBLE]) + AC_REQUIRE([jm_CHECK_ALL_HEADERS]) AC_REQUIRE([AC_HEADER_DIRENT]) AC_REQUIRE([AC_HEADER_STDC]) AC_CHECK_MEMBERS([struct stat.st_blksize],,,[$ac_includes_default @@ -274,6 +297,8 @@ AC_DEFUN(jm_CHECK_ALL_TYPES, dnl This relies on the fact that autoconf 2.14a's implementation of dnl AC_CHECK_TYPE checks includes unistd.h. AC_CHECK_TYPE(ssize_t, int) + 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])