X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fjm-macros.m4;h=b372ef9c7bb705f8f62729e77363e480b9a5236d;hb=ceb39112725850e44f7e0626e253d72cb9dcc94a;hp=208a8723da5e0ab3aadee655c518aa73cc2e2705;hpb=511cbe666ac29da1094d79b81da28c37726b2055;p=gnulib.git diff --git a/m4/jm-macros.m4 b/m4/jm-macros.m4 index 208a8723d..b372ef9c7 100644 --- a/m4/jm-macros.m4 +++ b/m4/jm-macros.m4 @@ -1,16 +1,17 @@ -#serial 33 -*- autoconf -*- +#serial 47 -*- autoconf -*- dnl Misc type-related macros for fileutils, sh-utils, textutils. -AC_DEFUN(jm_MACROS, +AC_DEFUN([jm_MACROS], [ - AC_PREREQ(2.14d) + AC_PREREQ(2.52g) 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) @@ -22,9 +23,10 @@ AC_DEFUN(jm_MACROS, jm_CHECK_ALL_TYPES jm_INCLUDED_REGEX([lib/regex.c]) + AC_REQUIRE([UTILS_HOST_OS]) + AC_REQUIRE([UTILS_FUNC_MKDIR_TRAILING_SLASH]) 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]) @@ -32,6 +34,8 @@ AC_DEFUN(jm_MACROS, AC_REQUIRE([jm_PREREQ]) + AC_REQUIRE([UTILS_FUNC_DIRFD]) + AC_REQUIRE([AC_FUNC_ACL]) AC_REQUIRE([jm_FUNC_LCHOWN]) AC_REQUIRE([fetish_FUNC_RMDIR_NOTEMPTY]) AC_REQUIRE([jm_FUNC_CHOWN]) @@ -51,8 +55,9 @@ 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([AC_FUNC_ERROR_AT_LINE]) AC_REQUIRE([jm_FUNC_GNU_STRFTIME]) AC_REQUIRE([jm_FUNC_MKTIME]) AC_REQUIRE([jm_FUNC_FPENDING]) @@ -60,6 +65,7 @@ AC_DEFUN(jm_MACROS, AC_REQUIRE([jm_FUNC_GETGROUPS]) test -n "$GETGROUPS_LIB" && LIBS="$GETGROUPS_LIB $LIBS" + AC_REQUIRE([AC_FUNC_FSEEKO]) AC_REQUIRE([AC_FUNC_VPRINTF]) AC_REQUIRE([AC_FUNC_ALLOCA]) AC_FUNC_GETLOADAVG([lib]) @@ -70,11 +76,11 @@ AC_DEFUN(jm_MACROS, AC_REPLACE_FUNCS(strcasecmp strncasecmp) AC_REPLACE_FUNCS(dup2) AC_REPLACE_FUNCS(gethostname getusershell) - AC_REPLACE_FUNCS(stime strcspn stpcpy strstr strtol strtoul) + AC_REPLACE_FUNCS(sig2str) + AC_REPLACE_FUNCS(strcspn stpcpy strstr strtol strtoul) AC_REPLACE_FUNCS(strpbrk) AC_REPLACE_FUNCS(euidaccess memcmp rmdir rpmatch strndup strverscmp) AC_REPLACE_FUNCS(atexit) - AC_REPLACE_FUNCS(strnlen) AC_REPLACE_FUNCS(getpass) dnl used by e.g. intl/*domain.c and lib/canon-host.c @@ -83,6 +89,8 @@ AC_DEFUN(jm_MACROS, AC_REPLACE_FUNCS(memchr memcpy memmove memrchr memset) AC_CHECK_FUNCS(getpagesize) + AC_REQUIRE([UTILS_FUNC_MKSTEMP]) + # By default, argmatch should fail calling usage (1). AC_DEFINE(ARGMATCH_DIE, [usage (1)], [Define to the function xargmatch calls on failures.]) @@ -105,21 +113,21 @@ AC_DEFUN(jm_MACROS, AC_SEARCH_LIBS(clock_gettime, [rt posix4], [LIB_CLOCK_GETTIME=$ac_cv_search_clock_gettime]) AC_SUBST(LIB_CLOCK_GETTIME) - AC_CHECK_FUNCS(clock_gettime) + AC_CHECK_FUNCS(clock_gettime clock_settime) LIBS=$fetish_saved_libs AC_CHECK_FUNCS(gettimeofday) + AC_FUNC_GETTIMEOFDAY_CLOBBER AC_REQUIRE([AC_FUNC_CLOSEDIR_VOID]) AC_REQUIRE([jm_FUNC_UTIME]) AC_CHECK_FUNCS( \ - acl \ bcopy \ + canonicalize_file_name \ endgrent \ endpwent \ fchdir \ fdatasync \ - fseeko \ ftime \ ftruncate \ getcwd \ @@ -127,6 +135,7 @@ AC_DEFUN(jm_MACROS, getmntinfo \ hasmntopt \ isascii \ + iswspace \ lchown \ listmntent \ localeconv \ @@ -148,11 +157,9 @@ AC_DEFUN(jm_MACROS, if test $am_cv_func_working_getline != yes; then AC_CHECK_FUNCS(getdelim) fi - AM_FUNC_OBSTACK + AC_FUNC_OBSTACK - AM_FUNC_STRTOD - AC_SUBST(POW_LIBM) - test $am_cv_func_strtod_needs_libm = yes && POW_LIBM=-lm + AC_FUNC_STRTOD # See if linking `seq' requires -lm. # It does on nearly every system. The single exception (so far) is @@ -172,9 +179,9 @@ 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. @@ -182,7 +189,7 @@ AC_DEFUN(jm_MACROS, jm_FSTYPENAME jm_FILE_SYSTEM_USAGE([space=yes], [space=no]) if test $list_mounted_fs = yes && test $space = yes; then - DF_PROG="df" + DF_PROG=df AC_LIBOBJ(fsusage) AC_LIBOBJ(mountlist) fi @@ -193,7 +200,7 @@ AC_DEFUN(jm_MACROS, # 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([jm_CHECK_ALL_HEADERS], [ AC_CHECK_HEADERS( \ errno.h \ @@ -210,7 +217,6 @@ AC_DEFUN(jm_CHECK_ALL_HEADERS, stddef.h \ stdint.h \ string.h \ - sys/acl.h \ sys/filsys.h \ sys/fs/s5param.h \ sys/fs_types.h \ @@ -237,7 +243,7 @@ AC_DEFUN(jm_CHECK_ALL_HEADERS, ]) # 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 @@ -256,7 +262,6 @@ AC_DEFUN(jm_CHECK_ALL_TYPES, dnl Checks for typedefs, structures, and compiler characteristics. AC_REQUIRE([AC_C_BIGENDIAN]) - AC_REQUIRE([AC_PROG_CC_STDC]) AC_REQUIRE([AC_C_CONST]) AC_REQUIRE([AC_C_VOLATILE]) AC_REQUIRE([AC_C_INLINE]) @@ -289,6 +294,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])