X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fjm-macros.m4;h=317ea28c85f6a92c1a6e1cf5dc789e77ecb0d3a1;hb=fbc3039a182a45152b4fa8c8e6b1ba6e9e12610d;hp=a4a7c989d4ab649250e5b6e6cac46430a14ccb51;hpb=8dd2d3d9eb9285eaed0de30fd1503ae63846e71f;p=gnulib.git diff --git a/m4/jm-macros.m4 b/m4/jm-macros.m4 index a4a7c989d..317ea28c8 100644 --- a/m4/jm-macros.m4 +++ b/m4/jm-macros.m4 @@ -1,4 +1,4 @@ -#serial 10 +#serial 14 dnl Misc type-related macros for fileutils, sh-utils, textutils. @@ -11,17 +11,60 @@ AC_DEFUN(jm_MACROS, [The concatenation of the strings `GNU ', and PACKAGE.]) AC_SUBST(GNU_PACKAGE) + AC_SUBST(OPTIONAL_BIN_PROGS) + AC_SUBST(OPTIONAL_BIN_ZCRIPTS) + AC_SUBST(MAN) + AC_SUBST(DF_PROG) + 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_INCLUDED_REGEX([lib/regex.c]) AC_REQUIRE([jm_BISON]) AC_REQUIRE([jm_ASSERT]) AC_REQUIRE([jm_AC_HEADER_INTTYPES_H]) - AC_REQUIRE([jm_STRUCT_UTIMBUF]) - AC_REQUIRE([jm_STRUCT_DIRENT_D_TYPE]) - AC_REQUIRE([jm_STRUCT_DIRENT_D_INO]) + 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([jm_PREREQ]) @@ -30,25 +73,45 @@ AC_DEFUN(jm_MACROS, 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([jm_FUNC_STAT]) AC_REQUIRE([jm_FUNC_REALLOC]) AC_REQUIRE([jm_FUNC_MALLOC]) + AC_REQUIRE([jm_FUNC_STRERROR_R]) + AC_REQUIRE([jm_FUNC_NANOSLEEP]) AC_REQUIRE([jm_FUNC_READDIR]) AC_REQUIRE([jm_FUNC_MEMCMP]) AC_REQUIRE([jm_FUNC_GLIBC_UNLOCKED_IO]) AC_REQUIRE([jm_FUNC_FNMATCH]) + AC_REQUIRE([jm_FUNC_GROUP_MEMBER]) + AC_REQUIRE([jm_FUNC_PUTENV]) AC_REQUIRE([jm_AFS]) AC_REQUIRE([jm_AC_PREREQ_XSTRTOUMAX]) 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_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_REQUIRE([jm_SYS_PROC_UPTIME]) + AC_REQUIRE([jm_FUNC_FTRUNCATE]) 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(strpbrk) + AC_REPLACE_FUNCS(euidaccess memcmp mkdir rmdir rpmatch strndup strverscmp) dnl used by e.g. intl/*domain.c and lib/canon-host.c AC_REPLACE_FUNCS(strdup) - AC_REPLACE_FUNCS(memchr) - AC_REPLACE_FUNCS(memmove) + AC_REPLACE_FUNCS(memchr memmove memcpy memset) AC_CHECK_FUNCS(getpagesize) # By default, argmatch should fail calling usage (1). @@ -62,40 +125,121 @@ AC_DEFUN(jm_MACROS, dnl ...: warning: AC_TRY_RUN called without default to allow cross compiling AC_FUNC_SETVBUF_REVERSED + # 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) + AC_CHECK_FUNCS(gettimeofday) + + AC_REQUIRE([AC_FUNC_CLOSEDIR_VOID]) + AC_REQUIRE([jm_FUNC_UTIME]) + + AC_CHECK_FUNCS( \ + acl \ + bcopy \ + endgrent \ + endpwent \ + fchdir \ + fdatasync \ + fseeko \ + ftime \ + ftruncate \ + getcwd \ + gethrtime \ + getmntinfo \ + hasmntopt \ + isascii \ + lchown \ + listmntent \ + localeconv \ + memcpy \ + mempcpy \ + mkfifo \ + realpath \ + resolvepath \ + sethostname \ + strchr \ + strerror \ + strrchr \ + sysinfo \ + tzset \ + ) + AM_FUNC_GETLINE if test $am_cv_func_working_getline != yes; then AC_CHECK_FUNCS(getdelim) fi + AM_FUNC_OBSTACK + + AM_FUNC_STRTOD + AC_SUBST(POW_LIBM) + test $am_cv_func_strtod_needs_libm = yes && POW_LIBM=-lm + + jm_LANGINFO_CODESET + + jm_ICONV + + # 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" + LIBOBJS="$LIBOBJS fsusage.$ac_objext" + LIBOBJS="$LIBOBJS mountlist.$ac_objext" + fi ]) +# This macro must be invoked before any tests that run the compiler. AC_DEFUN(jm_CHECK_ALL_TYPES, [ + # Enable GNU extensions. + # Define this here, not in acconfig's @TOP@ section, since definitions + # in the latter don't make it into the configure-time tests. + AC_DEFINE([_GNU_SOURCE], 1, + [Enable GNU extensions on systems that have them.]) + + 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_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_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_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_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 @@ -104,4 +248,8 @@ AC_DEFUN(jm_CHECK_ALL_TYPES, AC_REQUIRE([jm_AC_TYPE_UINTMAX_T]) AC_REQUIRE([jm_AC_TYPE_UNSIGNED_LONG_LONG]) + + AC_REQUIRE([AC_HEADER_MAJOR]) + AC_REQUIRE([AC_HEADER_DIRENT]) + ])