fix typos

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

diff --git a/m4/jm-macros.m4 b/m4/jm-macros.m4
index d60f2d5..ebc1946 100644 (file)
--- a/m4/jm-macros.m4
+++ b/m4/jm-macros.m4
@@ -1,4 +1,4 @@
-#serial 14
+#serial 16
 
 dnl Misc type-related macros for fileutils, sh-utils, textutils.
 
@@ -6,10 +6,6 @@ AC_DEFUN(jm_MACROS,
 [
   AC_PREREQ(2.14a)
 
-  # Kludge to work around bug in latest cvs automake.
-  # FIXME: remove this directive once the bug is fixed.
-  AC_CONFIG_AUX_DIR(.)
-
   GNU_PACKAGE="GNU $PACKAGE"
   AC_DEFINE_UNQUOTED(GNU_PACKAGE, "$GNU_PACKAGE",
     [The concatenation of the strings `GNU ', and PACKAGE.])
@@ -20,7 +16,7 @@ AC_DEFUN(jm_MACROS,
   AC_SUBST(MAN)
   AC_SUBST(DF_PROG)
 
-  # This macro actually runs replacement code.  See isc-posix.m4.
+  dnl This macro actually runs replacement code.  See isc-posix.m4.
   AC_REQUIRE([AC_ISC_POSIX])dnl
 
   AC_CHECK_HEADERS( \
@@ -196,8 +192,25 @@ AC_DEFUN(jm_MACROS,
 
 ])
 
+# This macro must be invoked before any tests that run the compiler.
 AC_DEFUN(jm_CHECK_ALL_TYPES,
 [
+  # Emit this code into config.h.in.
+  # The ifndef is to avoid redefinition warnings.
+  AH_VERBATIM([_GNU_SOURCE], [#ifndef _GNU_SOURCE
+# define _GNU_SOURCE
+#endif])
+
+  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])
@@ -208,7 +221,9 @@ AC_DEFUN(jm_CHECK_ALL_TYPES,
 
   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])