X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fjm-macros.m4;h=bbdcc0c998e1454ddb65fe54eab15bf013846c30;hb=c0a697412199aa57fe24b7d2a11b58d78c410c2f;hp=a991628ee46d066a1982b731d71063a68d1bba9e;hpb=536e0a0dd39c9cfd8589674224bd746e5403ab84;p=gnulib.git

diff --git a/m4/jm-macros.m4 b/m4/jm-macros.m4
index a991628ee..bbdcc0c99 100644
--- a/m4/jm-macros.m4
+++ b/m4/jm-macros.m4
@@ -1,4 +1,4 @@
-#serial 13
+#serial 17
 
 dnl Misc type-related macros for fileutils, sh-utils, textutils.
 
@@ -128,8 +128,16 @@ AC_DEFUN(jm_MACROS,
   # 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)
+
+  # Save and restore LIBS so e.g., -lrt, isn't added to it.  Otherwise, *all*
+  # programs in the package would end up linked with that potentially-shared
+  # library, inducing unnecessary run-time overhead.
+  fetish_saved_libs=$LIBS
+    AC_SEARCH_LIBS(clock_gettime, [rt posix4],
+		   [LIB_CLOCK_GETTIME=$ac_cv_search_clock_gettime])
+    AC_SUBST(LIB_CLOCK_GETTIME)
+    AC_CHECK_FUNCS(clock_gettime)
+  LIBS=$fetish_saved_libs
   AC_CHECK_FUNCS(gettimeofday)
 
   AC_REQUIRE([AC_FUNC_CLOSEDIR_VOID])
@@ -192,8 +200,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])
@@ -204,7 +229,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])