X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fjm-macros.m4;h=65c9ebf0a989580e71b65043a91f47bc4e2ec0fa;hb=02d97fa1f7a73756747951b74de8655d9f11b509;hp=6f8155b2bf3db58f3c199e7fd770cc5fb79d883f;hpb=3fe59d6cc48e3aca9e98a8a4f7499d589ece1db7;p=gnulib.git diff --git a/m4/jm-macros.m4 b/m4/jm-macros.m4 index 6f8155b2b..65c9ebf0a 100644 --- a/m4/jm-macros.m4 +++ b/m4/jm-macros.m4 @@ -1,70 +1,46 @@ -#serial 14 +#serial 68 -*- autoconf -*- + +m4_undefine([AC_LANG_SOURCE(C)]) +dnl The following is identical to the definition in c.m4 +dnl from the autoconf cvs repository on 2003-03-07. +dnl FIXME: remove this code once we upgrade to autoconf-2.58. + +# We can't use '#line $LINENO "configure"' here, since +# Sun c89 (Sun WorkShop 6 update 2 C 5.3 Patch 111679-08 2002/05/09) +# rejects $LINENO greater than 32767, and some configure scripts +# are longer than 32767 lines. +m4_define([AC_LANG_SOURCE(C)], +[/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$1]) + 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.57) 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) 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 \ - ) - - AC_CHECK_HEADERS(langinfo.h) - AC_CHECK_FUNCS(nl_langinfo) - - jm_INCLUDED_REGEX([lib/regex.c]) + jm_CHECK_ALL_TYPES - AC_REQUIRE([jm_BISON]) + AC_REQUIRE([UTILS_HOST_OS]) 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]) @@ -72,50 +48,36 @@ AC_DEFUN(jm_MACROS, AC_REQUIRE([jm_PREREQ]) + AC_REQUIRE([UTILS_FUNC_DIRFD]) + AC_REQUIRE([AC_FUNC_ACL]) + AC_REQUIRE([AC_FUNC_FTW]) 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([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([AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK]) + AC_REQUIRE([AC_FUNC_STRERROR_R]) 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_FPENDING]) + + # This is for od and stat, and any other program that + # uses the PRI.MAX macros from inttypes.h. + AC_REQUIRE([gt_INTTYPES_PRI]) AC_REQUIRE([jm_FUNC_GETGROUPS]) - test -n "$GETGROUPS_LIB" && LIBS="$GETGROUPS_LIB $LIBS" - AC_REQUIRE([AC_FUNC_VPRINTF]) + AC_REQUIRE([AC_FUNC_FSEEKO]) 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) + AC_CONFIG_LIBOBJ_DIR([lib]) + AC_FUNC_GETLOADAVG([lib]) - dnl used by e.g. intl/*domain.c and lib/canon-host.c - AC_REPLACE_FUNCS(strdup) + AC_REQUIRE([jm_SYS_PROC_UPTIME]) + AC_REQUIRE([jm_FUNC_FTRUNCATE]) - AC_REPLACE_FUNCS(memchr memmove memcpy memset) - AC_CHECK_FUNCS(getpagesize) + # raise is used by at least sort and ls. + AC_REPLACE_FUNCS(raise) # By default, argmatch should fail calling usage (1). AC_DEFINE(ARGMATCH_DIE, [usage (1)], @@ -129,30 +91,21 @@ AC_DEFUN(jm_MACROS, 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_REQUIRE([gl_CLOCK_TIME]) AC_CHECK_FUNCS(gettimeofday) + AC_FUNC_GETTIMEOFDAY_CLOBBER 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 \ + iswspace \ lchown \ listmntent \ localeconv \ @@ -160,64 +113,142 @@ AC_DEFUN(jm_MACROS, mempcpy \ mkfifo \ realpath \ - resolvepath \ sethostname \ strchr \ strerror \ strrchr \ + sysctl \ sysinfo \ + wcrtomb \ 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 + # for test.c + AC_CHECK_FUNCS(setreuid setregid) + + AC_FUNC_STRTOD + AC_REQUIRE([UTILS_SYS_OPEN_MAX]) + AC_REQUIRE([GL_FUNC_GETCWD_PATH_MAX]) + AC_REQUIRE([GL_FUNC_READDIR]) + + # 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" + ]) + + AM_LANGINFO_CODESET + jm_GLIBC21 + AM_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" - LIBOBJS="$LIBOBJS fsusage.$ac_objext" - LIBOBJS="$LIBOBJS mountlist.$ac_objext" + AC_REQUIRE([gl_FSUSAGE]) + AC_REQUIRE([gl_MOUNTLIST]) + if test $gl_cv_list_mounted_fs = yes && test $gl_cv_fs_space = yes; then + DF_PROG='df$(EXEEXT)' fi + AC_REQUIRE([jm_AC_DOS]) + AC_REQUIRE([AC_FUNC_CANONICALIZE_FILE_NAME]) + # If any of these functions don't exist (e.g. DJGPP 2.03), + # use the corresponding stub. + AC_CHECK_FUNC([fchdir], , [AC_LIBOBJ(fchdir-stub)]) + AC_CHECK_FUNC([fchown], , [AC_LIBOBJ(fchown-stub)]) +]) + +# 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 \ + float.h \ + hurd.h \ + limits.h \ + memory.h \ + mntent.h \ + mnttab.h \ + netdb.h \ + paths.h \ + stdlib.h \ + stddef.h \ + stdint.h \ + string.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/sysctl.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 \ + ) ]) -AC_DEFUN(jm_CHECK_ALL_TYPES, +# This macro must be invoked before any tests that run the compiler. +AC_DEFUN([jm_CHECK_ALL_TYPES], [ + 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_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([jm_CHECK_ALL_HEADERS]) AC_REQUIRE([AC_HEADER_DIRENT]) AC_REQUIRE([AC_HEADER_STDC]) - AC_CHECK_MEMBERS((struct stat.st_blksize),,,[$ac_includes_default + AC_CHECK_MEMBERS( + [struct stat.st_author, + 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]) @@ -228,9 +259,12 @@ AC_DEFUN(jm_CHECK_ALL_TYPES, AC_REQUIRE([AC_TYPE_UID_T]) AC_CHECK_TYPE(ino_t, unsigned long) + gt_TYPE_SSIZE_T + 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])