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.
* modules/mktime (Depends-on): Add multiarch.

diff --git a/ChangeLog b/ChangeLog
index 168fbc296754a4fc5a74fee30c2ccb6af67eaa4e..07eb24acd76f1bde4f862c1ec294a8bb1d1fa855 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-01-21  Bruno Haible  <bruno@clisp.org>
+       and Jim Meyering  <meyering@redhat.com>
+
+       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.
+       * modules/mktime (Depends-on): Add multiarch.
+
 2009-01-21  Eric Blake  <ebb9@byu.net>
 
        multiarch: avoid expand-before-require warning

diff --git a/m4/mktime.m4 b/m4/mktime.m4
index 223b9f1f4050e042951204546e3bcabee4de3d5c..1e926e86b095eda7475aaac4dcbf58ec3314f25e 100644 (file)
--- a/m4/mktime.m4
+++ b/m4/mktime.m4
@@ -1,4 +1,4 @@
-# serial 14
+# serial 15
 dnl Copyright (C) 2002-2003, 2005-2007, 2009 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -15,6 +15,13 @@ dnl From Jim Meyering.
 AC_DEFUN([AC_FUNC_MKTIME],
 [AC_CHECK_HEADERS_ONCE([unistd.h])
 AC_CHECK_FUNCS_ONCE([alarm])
+AC_REQUIRE([gl_MULTIARCH])
+if test $APPLE_UNIVERSAL_BUILD = 1; then
+  # A universal build on Apple MacOS X platforms.
+  # The test result would be 'yes' in 32-bit mode and 'no' in 64-bit mode.
+  # But we need a configuration result that is valid in both modes.
+  ac_cv_func_working_mktime=no
+fi
 AC_CACHE_CHECK([for working mktime], [ac_cv_func_working_mktime],
 [AC_RUN_IFELSE([AC_LANG_SOURCE(
 [[/* Test program from Paul Eggert and Tony Leneis.  */

diff --git a/modules/mktime b/modules/mktime
index 48467745a86da9e541bb7062bf25e03f4cbcd1d3..7a5165bbd89a31f28c8f03bd4cff0fba19ad0c24 100644 (file)
--- a/modules/mktime
+++ b/modules/mktime
@@ -6,6 +6,7 @@ lib/mktime.c
 m4/mktime.m4
 
 Depends-on:
+multiarch
 time_r
 
 configure.ac:
@@ -21,4 +22,3 @@ LGPLv2+
 
 Maintainer:
 Paul Eggert, Jim Meyering, glibc
-