fpurge: fix previous commits

[gnulib.git] / m4 / nanosleep.m4

diff --git a/m4/nanosleep.m4 b/m4/nanosleep.m4
index 1d832a3..7f08744 100644 (file)
--- a/m4/nanosleep.m4
+++ b/m4/nanosleep.m4
@@ -1,12 +1,11 @@
-#serial 23
+# serial 27

 
 dnl From Jim Meyering.
 dnl Check for the nanosleep function.
 dnl If not found, use the supplied replacement.
 dnl
 
 
 dnl From Jim Meyering.
 dnl Check for the nanosleep function.
 dnl If not found, use the supplied replacement.
 dnl
 

-# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 Free
-# Software Foundation, Inc.
+# Copyright (C) 1999-2001, 2003-2009 Free Software Foundation, Inc.

 
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,


@@ -19,7 +18,7 @@ AC_DEFUN([gl_FUNC_NANOSLEEP],
 
  AC_REQUIRE([gl_HEADER_TIME_H_DEFAULTS])
  AC_REQUIRE([gl_CLOCK_TIME])
 
  AC_REQUIRE([gl_HEADER_TIME_H_DEFAULTS])
  AC_REQUIRE([gl_CLOCK_TIME])

- AC_CHECK_HEADERS_ONCE(sys/time.h)
+ AC_CHECK_HEADERS_ONCE([sys/time.h])

 
  nanosleep_save_libs=$LIBS
 
 
  nanosleep_save_libs=$LIBS
 


@@ -29,6 +28,15 @@ AC_DEFUN([gl_FUNC_NANOSLEEP],
                 [test "$ac_cv_search_nanosleep" = "none required" ||
                 LIB_NANOSLEEP=$ac_cv_search_nanosleep])
 
                 [test "$ac_cv_search_nanosleep" = "none required" ||
                 LIB_NANOSLEEP=$ac_cv_search_nanosleep])
 

+ AC_REQUIRE([gl_MULTIARCH])
+ if test $APPLE_UNIVERSAL_BUILD = 1; then
+   # A universal build on Apple MacOS X platforms.
+   # The test result would be 'no (mishandles large arguments)' in 64-bit mode
+   # but 'yes' in 32-bit mode. But we need a configuration result that is
+   # valid in both modes.
+   gl_cv_func_nanosleep='no (mishandles large arguments)'
+ fi
+

  AC_CACHE_CHECK([for working nanosleep],
   [gl_cv_func_nanosleep],
   [
  AC_CACHE_CHECK([for working nanosleep],
   [gl_cv_func_nanosleep],
   [


@@ -91,7 +99,7 @@ AC_DEFUN([gl_FUNC_NANOSLEEP],
   else
     REPLACE_NANOSLEEP=1
     if test "$gl_cv_func_nanosleep" = 'no (mishandles large arguments)'; then
   else
     REPLACE_NANOSLEEP=1
     if test "$gl_cv_func_nanosleep" = 'no (mishandles large arguments)'; then

-      AC_DEFINE([HAVE_BUG_BIG_NANOSLEEP], 1,
+      AC_DEFINE([HAVE_BUG_BIG_NANOSLEEP], [1],

        [Define to 1 if nanosleep mishandles large arguments.])
       for ac_lib in $LIB_CLOCK_GETTIME; do
        case " $LIB_NANOSLEEP " in
        [Define to 1 if nanosleep mishandles large arguments.])
       for ac_lib in $LIB_CLOCK_GETTIME; do
        case " $LIB_NANOSLEEP " in


@@ -100,7 +108,7 @@ AC_DEFUN([gl_FUNC_NANOSLEEP],
        esac
       done
     fi
        esac
       done
     fi

-    AC_LIBOBJ(nanosleep)
+    AC_LIBOBJ([nanosleep])

     gl_PREREQ_NANOSLEEP
   fi
 
     gl_PREREQ_NANOSLEEP
   fi
 


@@ -111,6 +119,6 @@ AC_DEFUN([gl_FUNC_NANOSLEEP],
 # Prerequisites of lib/nanosleep.c.
 AC_DEFUN([gl_PREREQ_NANOSLEEP],
 [
 # Prerequisites of lib/nanosleep.c.
 AC_DEFUN([gl_PREREQ_NANOSLEEP],
 [

-  AC_CHECK_FUNCS_ONCE(siginterrupt)
-  AC_CHECK_HEADERS_ONCE(sys/select.h)
+  AC_CHECK_HEADERS_ONCE([sys/select.h])
+  gl_PREREQ_SIG_HANDLER_H

 ])
 ])