Mercurial > hg > octave-lojdl > gnulib-hg
changeset 11068:46ff2eeb7a64
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.
| author | Bruno Haible <bruno@clisp.org> |
|---|---|
| date | Wed, 21 Jan 2009 20:26:05 +0100 |
| parents | f5a88114d90a |
| children | 8488a80e49bc |
| files | ChangeLog m4/mktime.m4 modules/mktime |
| diffstat | 3 files changed, 17 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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 @@ 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. */