Mercurial > gnulib
changeset 39369:b224f0eb9bbd
c-strtod: Fix configure test for Android.
* m4/c-strtod.m4 (gl_C_STRTOD): Use AC_LINK_IFELSE instead of
AC_CHECK_FUNC.
author | Bruno Haible <bruno@clisp.org> |
---|---|
date | Sun, 13 May 2018 16:03:03 +0200 |
parents | 138b53d2c233 |
children | eaf5ea6225e1 |
files | ChangeLog m4/c-strtod.m4 |
diffstat | 2 files changed, 35 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sun May 13 15:49:40 2018 +0200 +++ b/ChangeLog Sun May 13 16:03:03 2018 +0200 @@ -1,3 +1,9 @@ +2018-05-13 Bruno Haible <bruno@clisp.org> + + c-strtod: Fix configure test for Android. + * m4/c-strtod.m4 (gl_C_STRTOD): Use AC_LINK_IFELSE instead of + AC_CHECK_FUNC. + 2018-05-13 Bruno Haible <bruno@clisp.org> random: Fix compilation error on Android.
--- a/m4/c-strtod.m4 Sun May 13 15:49:40 2018 +0200 +++ b/m4/c-strtod.m4 Sun May 13 16:03:03 2018 +0200 @@ -1,4 +1,4 @@ -# c-strtod.m4 serial 15 +# c-strtod.m4 serial 16 # Copyright (C) 2004-2006, 2009-2018 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation @@ -37,7 +37,34 @@ AC_DEFUN([gl_C_STRTOD], [ AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) - AC_CHECK_FUNCS([strtod_l]) + + AC_CHECK_HEADERS_ONCE([xlocale.h]) + dnl We can't use AC_CHECK_FUNC here, because strtod_l() is defined as a + dnl static inline function when compiling for Android 7.1 or older. + AC_CACHE_CHECK([for strtod_l], [gl_cv_func_strtod_l], + [AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [[#include <stdlib.h> + #include <locale.h> + #if HAVE_XLOCALE_H + # include <xlocale.h> + #endif + locale_t loc; + ]], + [[char *end; + return strtod_l("0",&end,loc) < 0.0; + ]]) + ], + [gl_cv_func_strtod_l=yes], + [gl_cv_func_strtod_l=no]) + ]) + if test $gl_cv_func_strtod_l = yes; then + HAVE_STRTOD_L=1 + else + HAVE_STRTOD_L=0 + fi + AC_DEFINE_UNQUOTED([HAVE_STRTOD_L], [$HAVE_STRTOD_L], + [Define to 1 if the system has the 'strtod_l' function.]) ]) dnl Prerequisites of lib/c-strtold.c.