X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fjm-macros.m4;h=7191991a43658fb808e62ca24c9daa5e1eaa1898;hb=cc27b89aa73cc3fd94a629dab247cb3368ed1703;hp=6228aa451137b06cd48cee4db91f9052c99dd2a7;hpb=857ca943b2e977c2389352bdf94d7d5b145ad788;p=gnulib.git diff --git a/m4/jm-macros.m4 b/m4/jm-macros.m4 index 6228aa451..7191991a4 100644 --- a/m4/jm-macros.m4 +++ b/m4/jm-macros.m4 @@ -1,4 +1,4 @@ -#serial 12 +#serial 28 -*- autoconf -*- dnl Misc type-related macros for fileutils, sh-utils, textutils. @@ -31,6 +31,8 @@ AC_DEFUN(jm_MACROS, netdb.h \ paths.h \ stdlib.h \ + stddef.h \ + stdint.h \ string.h \ sys/acl.h \ sys/filsys.h \ @@ -68,15 +70,17 @@ AC_DEFUN(jm_MACROS, AC_REQUIRE([jm_PREREQ]) + AC_REQUIRE([jm_SYS_OFF_T_PRINTF_FORMAT]) AC_REQUIRE([jm_FUNC_LCHOWN]) + AC_REQUIRE([fetish_FUNC_RMDIR_NOTEMPTY]) AC_REQUIRE([jm_FUNC_CHOWN]) AC_REQUIRE([jm_FUNC_MKTIME]) AC_REQUIRE([jm_FUNC_LSTAT]) - AC_REQUIRE([jm_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK]) + AC_REQUIRE([AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK]) AC_REQUIRE([jm_FUNC_STAT]) AC_REQUIRE([jm_FUNC_REALLOC]) AC_REQUIRE([jm_FUNC_MALLOC]) - AC_REQUIRE([jm_FUNC_STRERROR_R]) + AC_REQUIRE([AC_FUNC_STRERROR_R]) AC_REQUIRE([jm_FUNC_NANOSLEEP]) AC_REQUIRE([jm_FUNC_READDIR]) AC_REQUIRE([jm_FUNC_MEMCMP]) @@ -90,13 +94,14 @@ AC_DEFUN(jm_MACROS, 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" AC_REQUIRE([AC_FUNC_VPRINTF]) AC_REQUIRE([AC_FUNC_ALLOCA]) - AC_REQUIRE([AM_FUNC_GETLOADAVG]) + AC_FUNC_GETLOADAVG([lib]) AC_REQUIRE([jm_SYS_PROC_UPTIME]) AC_REQUIRE([jm_FUNC_FTRUNCATE]) @@ -105,12 +110,15 @@ AC_DEFUN(jm_MACROS, AC_REPLACE_FUNCS(gethostname getusershell) AC_REPLACE_FUNCS(stime strcspn stpcpy strstr strtol strtoul) AC_REPLACE_FUNCS(strpbrk) - AC_REPLACE_FUNCS(euidaccess memcmp mkdir rmdir rpmatch strndup strverscmp) + 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 AC_REPLACE_FUNCS(strdup) - AC_REPLACE_FUNCS(memchr memmove memcpy memset) + AC_REPLACE_FUNCS(memchr memcpy memmove memrchr memset) AC_CHECK_FUNCS(getpagesize) # By default, argmatch should fail calling usage (1). @@ -127,8 +135,16 @@ AC_DEFUN(jm_MACROS, # used by sleep and shred # Solaris 2.5.1 needs -lposix4 to get the clock_gettime function. # Solaris 7 prefers the library name -lrt to the obsolescent name -lposix4. - AC_SEARCH_LIBS(clock_gettime, [rt posix4]) - AC_CHECK_FUNCS(clock_gettime) + + # Save and restore LIBS so e.g., -lrt, isn't added to it. Otherwise, *all* + # programs in the package would end up linked with that potentially-shared + # library, inducing unnecessary run-time overhead. + fetish_saved_libs=$LIBS + 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) + LIBS=$fetish_saved_libs AC_CHECK_FUNCS(gettimeofday) AC_REQUIRE([AC_FUNC_CLOSEDIR_VOID]) @@ -162,6 +178,7 @@ AC_DEFUN(jm_MACROS, strerror \ strrchr \ sysinfo \ + wcrtomb \ tzset \ ) @@ -175,37 +192,88 @@ AC_DEFUN(jm_MACROS, AC_SUBST(POW_LIBM) test $am_cv_func_strtod_needs_libm = yes && POW_LIBM=-lm + # 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 + # and doesn't have a separate math library. + + AC_SUBST(SEQ_LIBM) + ac_seq_body=' + static double x, y; + x = floor (x); + x = rint (x); + x = modf (x, &y);' + AC_TRY_LINK([#include ], $ac_seq_body, , + [ac_seq_save_LIBS="$LIBS" + LIBS="$LIBS -lm" + AC_TRY_LINK([#include ], $ac_seq_body, SEQ_LIBM=-lm) + LIBS="$ac_seq_save_LIBS" + ]) + + jm_LANGINFO_CODESET + jm_GLIBC21 + jm_ICONV + jm_FUNC_UNLINK_BUSY_TEXT + + # These tests are for df. + jm_LIST_MOUNTED_FILESYSTEMS([list_mounted_fs=yes], [list_mounted_fs=no]) + jm_FSTYPENAME + jm_FILE_SYSTEM_USAGE([space=yes], [space=no]) + if test $list_mounted_fs = yes && test $space = yes; then + DF_PROG="df" + AC_LIBOBJ(fsusage) + AC_LIBOBJ(mountlist) + fi + ]) +# This macro must be invoked before any tests that run the compiler. 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 + # otherwise uses confdefs.h. + AC_REQUIRE([AC__GNU_SOURCE]) + + 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 + dnl whether functions and headers are available, whether they work, etc. + AC_REQUIRE([AC_SYS_LARGEFILE]) + + dnl This test must precede tests of compiler characteristics like + dnl that for the inline keyword, since it may change the degree to + dnl which the compiler supports such features. + AC_REQUIRE([AM_C_PROTOTYPES]) + dnl Checks for typedefs, structures, and compiler characteristics. - AC_C_BIGENDIAN - AC_PROG_CC_STDC - AC_C_CONST - AC_C_INLINE - AC_C_LONG_DOUBLE - - AC_HEADER_DIRENT - AC_HEADER_STDC - AC_CHECK_MEMBERS((struct stat.st_blksize)) - AC_STRUCT_ST_BLOCKS - - AC_STRUCT_TM - AC_HEADER_TIME - AC_STRUCT_TIMEZONE - AC_HEADER_STAT - AC_STRUCT_ST_MTIM_NSEC - AC_STRUCT_ST_DM_MODE + 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]) + AC_REQUIRE([AC_C_LONG_DOUBLE]) + + AC_REQUIRE([AC_HEADER_DIRENT]) + AC_REQUIRE([AC_HEADER_STDC]) + AC_CHECK_MEMBERS([struct stat.st_blksize],,,[$ac_includes_default +#include + ]) + AC_REQUIRE([AC_STRUCT_ST_BLOCKS]) + + AC_REQUIRE([AC_STRUCT_TM]) + AC_REQUIRE([AC_STRUCT_TIMEZONE]) + AC_REQUIRE([AC_HEADER_STAT]) + AC_REQUIRE([AC_STRUCT_ST_MTIM_NSEC]) + AC_REQUIRE([AC_STRUCT_ST_DM_MODE]) AC_REQUIRE([jm_CHECK_TYPE_STRUCT_TIMESPEC]) - AC_TYPE_GETGROUPS - AC_TYPE_MODE_T - AC_TYPE_OFF_T - AC_TYPE_PID_T - AC_TYPE_SIGNAL - AC_TYPE_SIZE_T - AC_TYPE_UID_T + AC_REQUIRE([AC_TYPE_GETGROUPS]) + 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) dnl This relies on the fact that autoconf 2.14a's implementation of