From 87fec1f1544655181da3e02d7857ee00c83e0f19 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Wed, 21 Jan 2009 20:26:05 +0100 Subject: [PATCH] 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. --- ChangeLog | 8 ++++++++ m4/mktime.m4 | 9 ++++++++- modules/mktime | 2 +- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 168fbc296..07eb24acd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2009-01-21 Bruno Haible + and Jim Meyering + + 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 multiarch: avoid expand-before-require warning diff --git a/m4/mktime.m4 b/m4/mktime.m4 index 223b9f1f4..1e926e86b 100644 --- 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 48467745a..7a5165bbd 100644 --- 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 - -- 2.11.0