X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fjm-macros.m4;h=2ed57dcae2f4cc0539ccfa07ae34656e2a2aa21f;hb=d9bb1ae90d7f678142b0654701cc061aa70eb9ca;hp=bf687039d82f58b2b7814ee63c0cb219719439fc;hpb=381b2b4eafe655cb3fcbe16f1f1944aa555a5c83;p=gnulib.git

diff --git a/m4/jm-macros.m4 b/m4/jm-macros.m4
index bf687039d..2ed57dcae 100644
--- 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.
 
@@ -31,6 +31,7 @@ AC_DEFUN(jm_MACROS,
     netdb.h \
     paths.h \
     stdlib.h \
+    stddef.h \
     string.h \
     sys/acl.h \
     sys/filsys.h \
@@ -175,37 +176,53 @@ AC_DEFUN(jm_MACROS,
   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_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 <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
@@ -214,4 +231,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])
+
 ])