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

diff --git a/m4/nanosleep.m4 b/m4/nanosleep.m4
index 1d15a7387..2e0b97199 100644
--- a/m4/nanosleep.m4
+++ b/m4/nanosleep.m4
@@ -1,15 +1,18 @@
-#serial 3
+#serial 8
 
 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,
@@ -39,12 +42,13 @@ 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_UNQUOTED(nanosleep, rpl_nanosleep,
+      [Define to rpl_nanosleep if the replacement function should be used.])
   fi
+
+ LIBS=$nanosleep_save_libs
 ])