X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fnanosleep.m4;h=5ed4c472752034965978951f38b154bcef282228;hb=0bfc98e547199ba45b8a0bd8ce7d77ad5a10f4ad;hp=03958049e35e8def66834b8b8d6af8c4e78b3b05;hpb=b740dfa7c02559b0ae4487686c1344ae5e1e3f27;p=gnulib.git

diff --git a/m4/nanosleep.m4 b/m4/nanosleep.m4
index 03958049e..5ed4c4727 100644
--- a/m4/nanosleep.m4
+++ b/m4/nanosleep.m4
@@ -1,4 +1,4 @@
-#serial 2
+#serial 6
 
 dnl From Jim Meyering.
 dnl Check for the nanosleep function.
@@ -7,14 +7,17 @@ dnl
 
 AC_DEFUN(jm_FUNC_NANOSLEEP,
 [
+ nanosleep_save_libs=$LIBS
+
  # Solaris 2.5.1 needs -lposix4 to get the nanosleep function.
  # Solaris 7 prefers the library name -lrt to the obsolescent name -lposix4.
- AC_SEARCH_LIBS(nanosleep, [rt posix4])
+ AC_SEARCH_LIBS(nanosleep, [rt posix4], [LIB_NANOSLEEP=$ac_cv_search_nanosleep])
+ AC_SUBST(LIB_NANOSLEEP)
 
  AC_CACHE_CHECK([whether nanosleep works],
   jm_cv_func_nanosleep_works,
   [
-   AC_HEADER_TIME
+   AC_REQUIRE([AC_HEADER_TIME])
    AC_TRY_RUN([
 #   if TIME_WITH_SYS_TIME
 #    include <sys/time.h>
@@ -39,12 +42,14 @@ AC_DEFUN(jm_FUNC_NANOSLEEP,
 	 jm_cv_func_nanosleep_works=yes,
 	 jm_cv_func_nanosleep_works=no,
 	 dnl When crosscompiling, assume the worst.
-	 jm_cv_func_nanosleep_works=yes)
+	 jm_cv_func_nanosleep_works=no)
   ])
   if test $jm_cv_func_nanosleep_works = no; then
     AC_SUBST(LIBOBJS)
     LIBOBJS="$LIBOBJS nanosleep.$ac_objext"
-    AC_DEFINE_UNQUOTED(nanosleep, gnu_nanosleep,
-      [Define to gnu_nanosleep if the replacement function should be used.])
+    AC_DEFINE_UNQUOTED(nanosleep, rpl_nanosleep,
+      [Define to rpl_nanosleep if the replacement function should be used.])
   fi
+
+ LIBS=$nanosleep_save_libs
 ])