X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fnanosleep.m4;h=7e3351776e4aee4fee93a631645cd9c48bdfdea5;hb=a24af4f63b6e167ba39456aadf46dfe0a1db6fba;hp=c73a3ffadf328cb51317580cb0f2bcd9c9642055;hpb=d60538f94ef1a5f819de81675481e76354d3bb11;p=gnulib.git

diff --git a/m4/nanosleep.m4 b/m4/nanosleep.m4
index c73a3ffad..7e3351776 100644
--- a/m4/nanosleep.m4
+++ b/m4/nanosleep.m4
@@ -1,7 +1,8 @@
-#serial 2
+#serial 5
 
 dnl From Jim Meyering.
-dnl Check for the nanosleep function
+dnl Check for the nanosleep function.
+dnl If not found, use the supplied replacement.
 dnl
 
 AC_DEFUN(jm_FUNC_NANOSLEEP,
@@ -12,8 +13,19 @@ AC_DEFUN(jm_FUNC_NANOSLEEP,
 
  AC_CACHE_CHECK([whether nanosleep works],
   jm_cv_func_nanosleep_works,
-  [AC_TRY_RUN([
-#   include <time.h>
+  [
+   AC_REQUIRE([AC_HEADER_TIME])
+   AC_TRY_RUN([
+#   if TIME_WITH_SYS_TIME
+#    include <sys/time.h>
+#    include <time.h>
+#   else
+#    if HAVE_SYS_TIME_H
+#     include <sys/time.h>
+#    else
+#     include <time.h>
+#    endif
+#   endif
 
     int
     main ()
@@ -27,12 +39,12 @@ 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
 ])