X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fprereq.m4;fp=m4%2Fprereq.m4;h=83055eeb855e0bf37ec7f3397ae2a8e32a18ad34;hb=2dff9f9795548abdcc357f30ef395b902d02daa0;hp=3c5d16ae46e99d868f3100fc883ee80b6d5b09c1;hpb=971bdba0b44620278be42230c084566058e9cc73;p=gnulib.git diff --git a/m4/prereq.m4 b/m4/prereq.m4 index 3c5d16ae4..83055eeb8 100644 --- a/m4/prereq.m4 +++ b/m4/prereq.m4 @@ -1,31 +1,132 @@ -#serial 27 +#serial 35 -dnl These are the prerequisite macros for files in the lib/ -dnl directories of the fileutils, sh-utils, and textutils packages. +dnl We use jm_ for non Autoconf macros. +m4_pattern_forbid([^jm_[ABCDEFGHIJKLMNOPQRSTUVXYZ]])dnl +m4_pattern_forbid([^gl_[ABCDEFGHIJKLMNOPQRSTUVXYZ]])dnl + +# These are the prerequisite macros for files in the lib/ +# directory of the coreutils package. AC_DEFUN([jm_PREREQ], [ - gl_BACKUPFILE - jm_PREREQ_C_STACK - gl_CANON_HOST - gl_DIRNAME - jm_PREREQ_ERROR - gl_EXCLUDE - gl_GETPAGESIZE - gl_HARD_LOCALE - gl_HASH - gl_HUMAN - gl_MBSWIDTH - gl_FUNC_MEMCHR - gl_PHYSMEM - gl_POSIXVER - gl_QUOTEARG - gl_READUTMP - gl_REGEX - jm_PREREQ_STAT - gl_FUNC_STRNLEN - gl_XGETCWD - gl_XREADLINK + # We don't yet use c-stack.c. + # AC_REQUIRE([gl_C_STACK]) + + AC_REQUIRE([AM_FUNC_GETLINE]) + AC_REQUIRE([AM_STDBOOL_H]) + AC_REQUIRE([UTILS_FUNC_MKDIR_TRAILING_SLASH]) + AC_REQUIRE([UTILS_FUNC_MKSTEMP]) + AC_REQUIRE([gl_BACKUPFILE]) + AC_REQUIRE([gl_CANON_HOST]) + AC_REQUIRE([gl_CLOSEOUT]) + AC_REQUIRE([gl_DIRNAME]) + AC_REQUIRE([gl_ERROR]) + AC_REQUIRE([gl_EXCLUDE]) + AC_REQUIRE([gl_EXITFAIL]) + AC_REQUIRE([gl_FILEBLOCKS]) + AC_REQUIRE([gl_FILEMODE]) + AC_REQUIRE([gl_FILE_TYPE]) + AC_REQUIRE([gl_FSUSAGE]) + AC_REQUIRE([gl_FUNC_ALLOCA]) + AC_REQUIRE([gl_FUNC_ATEXIT]) + AC_REQUIRE([gl_FUNC_DUP2]) + AC_REQUIRE([gl_FUNC_EUIDACCESS]) + AC_REQUIRE([gl_FUNC_FNMATCH_GNU]) + AC_REQUIRE([gl_FUNC_GETHOSTNAME]) + AC_REQUIRE([gl_FUNC_GETLOADAVG]) + AC_REQUIRE([gl_FUNC_GETPASS]) + AC_REQUIRE([gl_FUNC_GETUSERSHELL]) + AC_REQUIRE([gl_FUNC_MEMCHR]) + AC_REQUIRE([gl_FUNC_MEMCPY]) + AC_REQUIRE([gl_FUNC_MEMMOVE]) + AC_REQUIRE([gl_FUNC_MEMRCHR]) + AC_REQUIRE([gl_FUNC_MEMSET]) + AC_REQUIRE([gl_FUNC_MKTIME]) + AC_REQUIRE([gl_FUNC_READLINK]) + AC_REQUIRE([gl_FUNC_RMDIR]) + AC_REQUIRE([gl_FUNC_RPMATCH]) + AC_REQUIRE([gl_FUNC_SIG2STR]) + AC_REQUIRE([gl_FUNC_STPCPY]) + AC_REQUIRE([gl_FUNC_STRCSPN]) + AC_REQUIRE([gl_FUNC_STRDUP]) + AC_REQUIRE([gl_FUNC_STRNDUP]) + AC_REQUIRE([gl_FUNC_STRNLEN]) + AC_REQUIRE([gl_FUNC_STRPBRK]) + AC_REQUIRE([gl_FUNC_STRSTR]) + AC_REQUIRE([gl_FUNC_STRTOD]) + AC_REQUIRE([gl_FUNC_STRTOIMAX]) + AC_REQUIRE([gl_FUNC_STRTOLL]) + AC_REQUIRE([gl_FUNC_STRTOL]) + AC_REQUIRE([gl_FUNC_STRTOULL]) + AC_REQUIRE([gl_FUNC_STRTOUL]) + AC_REQUIRE([gl_FUNC_STRTOUMAX]) + AC_REQUIRE([gl_FUNC_STRVERSCMP]) + AC_REQUIRE([gl_FUNC_VASNPRINTF]) + AC_REQUIRE([gl_FUNC_VASPRINTF]) + AC_REQUIRE([gl_GETDATE]) + AC_REQUIRE([gl_GETNDELIM2]) + AC_REQUIRE([gl_GETOPT]) + AC_REQUIRE([gl_GETPAGESIZE]) + AC_REQUIRE([gl_HARD_LOCALE]) + AC_REQUIRE([gl_HASH]) + AC_REQUIRE([gl_HUMAN]) + AC_REQUIRE([gl_MBSWIDTH]) + AC_REQUIRE([gl_MEMCOLL]) + AC_REQUIRE([gl_MODECHANGE]) + AC_REQUIRE([gl_MOUNTLIST]) + AC_REQUIRE([gl_OBSTACK]) + AC_REQUIRE([gl_PATHMAX]) + AC_REQUIRE([gl_PATH_CONCAT]) + AC_REQUIRE([gl_PHYSMEM]) + AC_REQUIRE([gl_POSIXTM]) + AC_REQUIRE([gl_POSIXVER]) + AC_REQUIRE([gl_QUOTEARG]) + AC_REQUIRE([gl_QUOTE]) + AC_REQUIRE([gl_READUTMP]) + AC_REQUIRE([gl_REGEX]) + AC_REQUIRE([gl_SAFE_READ]) + AC_REQUIRE([gl_SAFE_WRITE]) + AC_REQUIRE([gl_SAME]) + AC_REQUIRE([gl_SAVEDIR]) + AC_REQUIRE([gl_SAVE_CWD]) + AC_REQUIRE([gl_SETTIME]) + AC_REQUIRE([gl_SHA]) + AC_REQUIRE([gl_STDIO_SAFER]) + AC_REQUIRE([gl_STRCASE]) + AC_REQUIRE([gl_TIMESPEC]) + AC_REQUIRE([gl_UNICODEIO]) + AC_REQUIRE([gl_UNISTD_SAFER]) + AC_REQUIRE([gl_USERSPEC]) + AC_REQUIRE([gl_UTIMENS]) + AC_REQUIRE([gl_XALLOC]) + AC_REQUIRE([gl_XGETCWD]) + AC_REQUIRE([gl_XREADLINK]) + AC_REQUIRE([gl_XSTRTOD]) + AC_REQUIRE([gl_XSTRTOL]) + AC_REQUIRE([gl_YESNO]) + AC_REQUIRE([jm_FUNC_GLIBC_UNLOCKED_IO]) + AC_REQUIRE([jm_FUNC_GNU_STRFTIME]) + AC_REQUIRE([jm_FUNC_LSTAT]) + AC_REQUIRE([jm_FUNC_MALLOC]) + AC_REQUIRE([jm_FUNC_MEMCMP]) + AC_REQUIRE([jm_FUNC_NANOSLEEP]) + AC_REQUIRE([jm_FUNC_PUTENV]) + AC_REQUIRE([jm_FUNC_REALLOC]) + AC_REQUIRE([jm_FUNC_STAT]) + AC_REQUIRE([jm_FUNC_UTIME]) + AC_REQUIRE([jm_PREREQ_ADDEXT]) + AC_REQUIRE([jm_PREREQ_STAT]) + AC_REQUIRE([jm_XSTRTOIMAX]) + AC_REQUIRE([jm_XSTRTOUMAX]) + AC_REQUIRE([vb_FUNC_RENAME]) +]) + +AC_DEFUN([jm_PREREQ_ADDEXT], +[ + dnl For addext.c. + AC_REQUIRE([AC_SYS_LONG_FILE_NAMES]) + AC_CHECK_FUNCS(pathconf) + AC_CHECK_HEADERS(limits.h string.h unistd.h) ]) AC_DEFUN([jm_PREREQ_STAT], @@ -33,7 +134,12 @@ AC_DEFUN([jm_PREREQ_STAT], AC_CHECK_HEADERS(sys/sysmacros.h sys/statvfs.h sys/vfs.h inttypes.h) AC_CHECK_HEADERS(sys/param.h sys/mount.h) AC_CHECK_FUNCS(statvfs) - jm_AC_TYPE_LONG_LONG + + # For `struct statfs' on Ultrix 4.4. + AC_CHECK_HEADERS([netinet/in.h nfs/nfs_clnt.h nfs/vfs.h],,, + [AC_INCLUDES_DEFAULT]) + + AC_REQUIRE([jm_AC_TYPE_LONG_LONG]) statxfs_includes="\ $ac_includes_default @@ -43,10 +149,17 @@ $ac_includes_default #if HAVE_SYS_VFS_H # include #endif -#if ( ! HAVE_SYS_STATVFS_H && ! HAVE_SYS_VFS_H && HAVE_SYS_MOUNT_H && HAVE_SYS_PARAM_H ) +#if !HAVE_SYS_STATVFS_H && !HAVE_SYS_VFS_H +# if HAVE_SYS_MOUNT_H && HAVE_SYS_PARAM_H /* NetBSD 1.5.2 needs these, for the declaration of struct statfs. */ -# include -# include +# include +# include +# elif HAVE_NETINET_IN_H && HAVE_NFS_NFS_CLNT_H && HAVE_NFS_VFS_H +/* Ultrix 4.4 needs these for the declaration of struct statfs. */ +# include +# include +# include +# endif #endif " AC_CHECK_MEMBERS([struct statfs.f_basetype],,,[$statxfs_includes])