(AC_CHECK_FUNCS): Add nl_langinfo. (also from textutils/configure.in)

[gnulib.git] / m4 / jm-macros.m4

diff --git a/m4/jm-macros.m4 b/m4/jm-macros.m4
index 5e85bb1..6f8155b 100644 (file)
--- a/m4/jm-macros.m4
+++ b/m4/jm-macros.m4
@@ -1,4 +1,4 @@
-#serial 12
+#serial 14
 
 dnl Misc type-related macros for fileutils, sh-utils, textutils.
 
@@ -11,21 +11,54 @@ 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(string.h fcntl.h limits.h sys/time.h sys/timeb.h \
-    errno.h unistd.h stdlib.h \
-    sys/param.h sys/statfs.h sys/fstyp.h mnttab.h mntent.h utime.h \
-    sys/statvfs.h sys/vfs.h sys/mntent.h sys/mount.h sys/filsys.h \
-    sys/fs_types.h \
+  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/wait.h sys/ioctl.h sys/fs/s5param.h termios.h values.h)
-
-  AC_CHECK_HEADERS(fcntl.h fenv.h float.h limits.h netdb.h \
-                  stdlib.h string.h sys/param.h \
-                  sys/socket.h sys/systeminfo.h sys/time.h sys/timeb.h \
-                  syslog.h unistd.h paths.h termios.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])
 
@@ -69,6 +102,7 @@ AC_DEFUN(jm_MACROS,
   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)
@@ -101,41 +135,97 @@ AC_DEFUN(jm_MACROS,
   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
 
 ])
 
 AC_DEFUN(jm_CHECK_ALL_TYPES,
 [
   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_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 <sys/stat.h>
+  ])
+  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
@@ -144,4 +234,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])
+
 ])