X-Git-Url: https://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fnanosleep.m4;h=bfe8d574574ba3a7063bc0d03864e4bf8b580d44;hb=e059c2358aad79ce8dfd9581dd6f12ce8503dc63;hp=1d15a738768a460781370ff45c9a6399f66481b8;hpb=3379d3dad05e717bd000d27e01adb6d43f2d955c;p=gnulib.git

diff --git a/m4/nanosleep.m4 b/m4/nanosleep.m4
index 1d15a7387..bfe8d5745 100644
--- a/m4/nanosleep.m4
+++ b/m4/nanosleep.m4
@@ -1,20 +1,24 @@
-#serial 3
+#serial 9
 
 dnl From Jim Meyering.
 dnl Check for the nanosleep function.
 dnl If not found, use the supplied replacement.
 dnl
 
-AC_DEFUN(jm_FUNC_NANOSLEEP,
+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_REQUIRE([AC_HEADER_TIME])
+   AC_CHECK_HEADERS_ONCE(sys/time.h)
    AC_TRY_RUN([
 #   if TIME_WITH_SYS_TIME
 #    include <sys/time.h>
@@ -39,12 +43,20 @@ 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_LIBOBJ(nanosleep)
+    AC_DEFINE(nanosleep, rpl_nanosleep,
+      [Define to rpl_nanosleep if the replacement function should be used.])
+    gl_PREREQ_NANOSLEEP
   fi
+
+ LIBS=$nanosleep_save_libs
+])
+
+# Prerequisites of lib/nanosleep.c.
+AC_DEFUN([gl_PREREQ_NANOSLEEP],
+[
+  AC_CHECK_HEADERS_ONCE(unistd.h)
 ])