X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fjm-macros.m4;h=317ea28c85f6a92c1a6e1cf5dc789e77ecb0d3a1;hb=fbc3039a182a45152b4fa8c8e6b1ba6e9e12610d;hp=092636560a50beeee8f183397a577d22b59754c0;hpb=60319aa0e99a75fbda1a537c7cab42ba4e089d48;p=gnulib.git

diff --git a/m4/jm-macros.m4 b/m4/jm-macros.m4
index 092636560..317ea28c8 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,6 +176,10 @@ 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
@@ -187,18 +192,38 @@ AC_DEFUN(jm_MACROS,
 
 ])
 
+# 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_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_CHECK_MEMBERS((struct stat.st_blksize),,,[$ac_includes_default
+#include <sys/stat.h>
+  ])
   AC_REQUIRE([AC_STRUCT_ST_BLOCKS])
 
   AC_REQUIRE([AC_STRUCT_TM])