added --disable-tls option and use it by default under NetBSD which is reported to not have TLS support
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60978 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
60
configure
vendored
60
configure
vendored
@@ -1,5 +1,5 @@
|
||||
#! /bin/sh
|
||||
# From configure.in Id: configure.in 60470 2009-05-02 12:52:54Z VZ .
|
||||
# From configure.in Id: configure.in 60555 2009-05-08 23:12:57Z VZ .
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.61 for wxWidgets 2.9.0.
|
||||
#
|
||||
@@ -1693,6 +1693,7 @@ Optional Features:
|
||||
--disable-rpath disable use of rpath for uninstalled builds
|
||||
--enable-objc_uniquifying enable Objective-C class name uniquifying
|
||||
--disable-visibility disable use of ELF symbols visibility even if supported
|
||||
--disable-tls disable use of compiler TLS support
|
||||
--enable-intl use internationalization system
|
||||
--enable-xlocale use x-locale support (requires wxLocale)
|
||||
--enable-config use wxConfig (and derived) classes
|
||||
@@ -2930,6 +2931,7 @@ DEFAULT_wxUSE_GSTREAMER8=no
|
||||
DEFAULT_wxUSE_UNICODE_UTF8=auto
|
||||
DEFAULT_wxUSE_OPENGL=auto
|
||||
DEFAULT_wxUSE_MEDIACTRL=auto
|
||||
DEFAULT_wxUSE_COMPILER_TLS=auto
|
||||
|
||||
DEFAULT_wxUSE_UNICODE_UTF8_LOCALE=no
|
||||
|
||||
@@ -5583,6 +5585,50 @@ fi
|
||||
echo "${ECHO_T}$result" >&6; }
|
||||
|
||||
|
||||
enablestring=disable
|
||||
defaultval=
|
||||
if test -z "$defaultval"; then
|
||||
if test x"$enablestring" = xdisable; then
|
||||
defaultval=yes
|
||||
else
|
||||
defaultval=no
|
||||
fi
|
||||
fi
|
||||
|
||||
{ echo "$as_me:$LINENO: checking for --${enablestring:-enable}-tls" >&5
|
||||
echo $ECHO_N "checking for --${enablestring:-enable}-tls... $ECHO_C" >&6; }
|
||||
# Check whether --enable-tls was given.
|
||||
if test "${enable_tls+set}" = set; then
|
||||
enableval=$enable_tls;
|
||||
if test "$enableval" = yes; then
|
||||
wx_cv_use_tls='wxUSE_COMPILER_TLS=yes'
|
||||
else
|
||||
wx_cv_use_tls='wxUSE_COMPILER_TLS=no'
|
||||
fi
|
||||
|
||||
else
|
||||
|
||||
wx_cv_use_tls='wxUSE_COMPILER_TLS=${'DEFAULT_wxUSE_COMPILER_TLS":-$defaultval}"
|
||||
|
||||
fi
|
||||
|
||||
|
||||
eval "$wx_cv_use_tls"
|
||||
|
||||
if test x"$enablestring" = xdisable; then
|
||||
if test $wxUSE_COMPILER_TLS = yes; then
|
||||
result=no
|
||||
else
|
||||
result=yes
|
||||
fi
|
||||
else
|
||||
result=$wxUSE_COMPILER_TLS
|
||||
fi
|
||||
|
||||
{ echo "$as_me:$LINENO: result: $result" >&5
|
||||
echo "${ECHO_T}$result" >&6; }
|
||||
|
||||
|
||||
|
||||
|
||||
enablestring=
|
||||
@@ -40239,6 +40285,17 @@ echo "$as_me: WARNING: wxMutex won't be recursive on this platform" >&2;}
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "$wxUSE_COMPILER_TLS" = "auto"; then
|
||||
if test "$USE_NETBSD" = 1; then
|
||||
{ echo "$as_me:$LINENO: WARNING: Disabling TLS under NetBSD, please contact wx-dev if it works now" >&5
|
||||
echo "$as_me: WARNING: Disabling TLS under NetBSD, please contact wx-dev if it works now" >&2;}
|
||||
wxUSE_COMPILER_TLS=no
|
||||
else
|
||||
wxUSE_COMPILER_TLS=yes
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "$wxUSE_COMPILER_TLS" = "yes"; then
|
||||
{ echo "$as_me:$LINENO: checking for __thread keyword" >&5
|
||||
echo $ECHO_N "checking for __thread keyword... $ECHO_C" >&6; }
|
||||
if test "${wx_cv_cc___thread+set}" = set; then
|
||||
@@ -40420,6 +40477,7 @@ _ACEOF
|
||||
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
else
|
||||
if test "$wxUSE_THREADS" = "yes" ; then
|
||||
|
13
configure.in
13
configure.in
@@ -388,6 +388,7 @@ dnl automatic features
|
||||
DEFAULT_wxUSE_UNICODE_UTF8=auto
|
||||
DEFAULT_wxUSE_OPENGL=auto
|
||||
DEFAULT_wxUSE_MEDIACTRL=auto
|
||||
DEFAULT_wxUSE_COMPILER_TLS=auto
|
||||
|
||||
DEFAULT_wxUSE_UNICODE_UTF8_LOCALE=no
|
||||
|
||||
@@ -687,6 +688,7 @@ WX_ARG_DISABLE(rpath, [ --disable-rpath disable use of rpath for
|
||||
WX_ARG_ENABLE(objc_uniquifying,[ --enable-objc_uniquifying enable Objective-C class name uniquifying], wxUSE_OBJC_UNIQUIFYING)
|
||||
|
||||
WX_ARG_DISABLE(visibility, [ --disable-visibility disable use of ELF symbols visibility even if supported], wxUSE_VISIBILITY)
|
||||
WX_ARG_DISABLE(tls, [ --disable-tls disable use of compiler TLS support], wxUSE_COMPILER_TLS)
|
||||
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl optional non GUI features
|
||||
@@ -4985,6 +4987,16 @@ if test "$TOOLKIT" != "MSW" -a "$USE_OS2" != 1; then
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "$wxUSE_COMPILER_TLS" = "auto"; then
|
||||
if test "$USE_NETBSD" = 1; then
|
||||
AC_MSG_WARN([Disabling TLS under NetBSD, please contact wx-dev if it works now])
|
||||
wxUSE_COMPILER_TLS=no
|
||||
else
|
||||
wxUSE_COMPILER_TLS=yes
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "$wxUSE_COMPILER_TLS" = "yes"; then
|
||||
dnl test for compiler thread-specific variables support
|
||||
AC_CACHE_CHECK([for __thread keyword],
|
||||
wx_cv_cc___thread,
|
||||
@@ -5028,6 +5040,7 @@ if test "$TOOLKIT" != "MSW" -a "$USE_OS2" != 1; then
|
||||
AC_DEFINE(HAVE___THREAD_KEYWORD)
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
dnl from if !MSW
|
||||
else
|
||||
|
Reference in New Issue
Block a user