# HG changeset patch # User Bruno Haible # Date 1232566059 -3600 # Node ID 8488a80e49bc7513a68a3a4ddc8e88e7e5fcd95e # Parent 46ff2eeb7a64eae61d63f761d577ecba9855c8f0 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 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,11 @@ 2009-01-21 Bruno Haible and Jim Meyering + 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 --- 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 @@ [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 --- a/modules/nanosleep +++ b/modules/nanosleep @@ -9,6 +9,7 @@ clock-time extensions gettime +multiarch sigaction stdbool sys_select