nanosleep: skip configure test (fail it) for apple universal builds

* m4/nanosleep.m4 (gl_FUNC_NANOSLEEP): Require gl_MULTIARCH. In Apple
universal builds, assume that nanosleep does not work.
* modules/nanosleep (Depends-on): Add multiarch.

diff --git a/ChangeLog b/ChangeLog
index 07eb24acd76f1bde4f862c1ec294a8bb1d1fa855..4dd6650ec7bfe40a812e7f12ed0899b321e73150 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
 2009-01-21  Bruno Haible  <bruno@clisp.org>
        and Jim Meyering  <meyering@redhat.com>
 
+       nanosleep: skip configure test (fail it) for apple universal builds
+       * m4/nanosleep.m4 (gl_FUNC_NANOSLEEP): Require gl_MULTIARCH. In Apple
+       universal builds, assume that nanosleep does not work.
+       * modules/nanosleep (Depends-on): Add multiarch.
+
        mktime: skip configure test (fail it) for apple universal builds
        * m4/mktime.m4 (AC_FUNC_MKTIME): Require gl_MULTIARCH. In Apple
        universal builds, assume that mktime does not work.

diff --git a/m4/nanosleep.m4 b/m4/nanosleep.m4
index ba54130bc0da8ddf495bf118d48970b6debeaf3f..7f08744ac0a6aac9bc019cd28f8404a50a23c111 100644 (file)
--- a/m4/nanosleep.m4
+++ b/m4/nanosleep.m4
@@ -1,4 +1,4 @@
-# serial 26
+# serial 27
 
 dnl From Jim Meyering.
 dnl Check for the nanosleep function.
@@ -28,6 +28,15 @@ AC_DEFUN([gl_FUNC_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],
   [

diff --git a/modules/nanosleep b/modules/nanosleep
index 61b4527b33b81460509e0c588f28f41b6b4d3e03..ef10653d9d889923a8d55aa86ab74e188f487cf4 100644 (file)
--- a/modules/nanosleep
+++ b/modules/nanosleep
@@ -9,6 +9,7 @@ Depends-on:
 clock-time
 extensions
 gettime
+multiarch
 sigaction
 stdbool
 sys_select