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

diff --git a/m4/jm-macros.m4 b/m4/jm-macros.m4
index 625a92657..bbdcc0c99 100644
--- a/m4/jm-macros.m4
+++ b/m4/jm-macros.m4
@@ -1,4 +1,4 @@
-#serial 15
+#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])
@@ -198,12 +206,9 @@ 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
-# undef _GNU_SOURCE
+# define _GNU_SOURCE
 #endif])
 
-  # Enable GNU extensions.
-  AC_DEFINE([_GNU_SOURCE])
-
   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.