From 259b55a17c05fa084af8dcac4554ff0df0fd31f9 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 20 Apr 2017 15:55:33 +0200 Subject: [PATCH] Rename wx_cv_use_xlocale_local to wx_cv_func_strtod_l No real changes, just use more standard naming convention for a variable containing the cached value in configure. --- configure | 12 ++++++------ configure.in | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/configure b/configure index 349726d3ee..0a0a434353 100755 --- a/configure +++ b/configure @@ -32623,7 +32623,7 @@ fi if test "$wxUSE_XLOCALE" = "yes" ; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for complete xlocale" >&5 $as_echo_n "checking for complete xlocale... " >&6; } -if ${wx_cv_use_xlocale_local+:} false; then : +if ${wx_cv_func_strtod_l+:} false; then : $as_echo_n "(cached) " >&6 else @@ -32652,9 +32652,9 @@ main () } _ACEOF if ac_fn_cxx_try_compile "$LINENO"; then : - wx_cv_use_xlocale_local=yes + wx_cv_func_strtod_l=yes else - wx_cv_use_xlocale_local=no + wx_cv_func_strtod_l=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext @@ -32666,10 +32666,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_use_xlocale_local" >&5 -$as_echo "$wx_cv_use_xlocale_local" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_func_strtod_l" >&5 +$as_echo "$wx_cv_func_strtod_l" >&6; } - if test "$wx_cv_use_xlocale_local" = "yes" ; then + if test "$wx_cv_func_strtod_l" = "yes" ; then $as_echo "#define wxUSE_XLOCALE 1" >>confdefs.h fi diff --git a/configure.in b/configure.in index 7fa4c95084..f7cd77ea7a 100644 --- a/configure.in +++ b/configure.in @@ -5712,7 +5712,7 @@ if test "$wxUSE_XLOCALE" = "yes" ; then dnl even if xlocale.h exists, it may not contain all that dnl wx needs. check if strtod_l() really is available. AC_CACHE_CHECK([for complete xlocale], - wx_cv_use_xlocale_local, + wx_cv_func_strtod_l, [ AC_LANG_PUSH(C++) AC_TRY_COMPILE( @@ -5725,13 +5725,13 @@ if test "$wxUSE_XLOCALE" = "yes" ; then locale_t t; strtod_l(NULL, NULL, t); ], - wx_cv_use_xlocale_local=yes, - wx_cv_use_xlocale_local=no + wx_cv_func_strtod_l=yes, + wx_cv_func_strtod_l=no ) AC_LANG_POP() ]) - if test "$wx_cv_use_xlocale_local" = "yes" ; then + if test "$wx_cv_func_strtod_l" = "yes" ; then AC_DEFINE(wxUSE_XLOCALE) fi fi