From 581ce03345d38b124c03c30dcfadcc5b2a2dd819 Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Sun, 15 Nov 2009 02:45:23 +0000 Subject: Remove enable-thread / disable-thread configure option. These were only placebo options. The library is always built as thread safe as possible on every system. --- ares/configure.ac | 27 --------------------------- configure.ac | 45 --------------------------------------------- lib/config-os400.h | 3 --- lib/config-riscos.h | 3 --- lib/config-symbian.h | 3 --- lib/config-tpf.h | 3 --- lib/config-vxworks.h | 3 --- src/config-riscos.h | 3 --- 8 files changed, 90 deletions(-) diff --git a/ares/configure.ac b/ares/configure.ac index f1f52a5bc..4c719cf75 100644 --- a/ares/configure.ac +++ b/ares/configure.ac @@ -382,33 +382,6 @@ AC_HELP_STRING([--enable-libgcc],[use libgcc when linking]), ) -dnl Default is to try the thread-safe versions of a few functions -OPT_THREAD=on - -AC_ARG_ENABLE(thread,dnl -AC_HELP_STRING([--disable-thread],[don't look for thread-safe functions]) -AC_HELP_STRING([--enable-thread],[look for thread-safe functions]), -[ case "$enableval" in - no) - OPT_THREAD=off - AC_MSG_WARN(c-ares will not get built using thread-safe functions) - ;; - *) - ;; - esac -] -) - -if test X"$OPT_THREAD" = Xoff -then - AC_DEFINE(DISABLED_THREADSAFE, 1, - [Set to explicitly specify we don't want to use thread-safe functions]) -fi - -dnl for recent AIX versions, we skip all the thread-safe checks above since -dnl they claim a thread-safe libc using the standard API. But there are -dnl some functions still not thread-safe. Check for these! - dnl Let's hope this split URL remains working: dnl http://publibn.boulder.ibm.com/doc_link/en_US/a_doc_lib/aixprggd/ \ dnl genprogc/thread_quick_ref.htm diff --git a/configure.ac b/configure.ac index b23bc78a0..5f605443d 100644 --- a/configure.ac +++ b/configure.ac @@ -1827,51 +1827,6 @@ case "$LIBIDN" in ;; esac -dnl Default is to try the thread-safe versions of a few functions -OPT_THREAD=on - -AC_ARG_ENABLE(thread,dnl -AC_HELP_STRING([--disable-thread],[don't look for thread-safe functions]) -AC_HELP_STRING([--enable-thread],[look for thread-safe functions]), -[ case "$enableval" in - no) - OPT_THREAD=off - AC_MSG_WARN(libcurl will not get built using thread-safe functions) - ;; - *) - ;; - esac -] -) - -if test X"$OPT_THREAD" = Xoff -then - AC_DEFINE(DISABLED_THREADSAFE, 1, - [Set to explicitly specify we don't want to use thread-safe functions]) -else - dnl if test "$ipv6" != "yes"; then - dnl dig around for gethostbyname_r() - dnl the old gethostbyname_r check was done here - - dnl dig around for gethostbyaddr_r() - dnl the old gethostbyaddr_r check was here BUT COMMENTED OUT - dnl fi - - dnl poke around for inet_ntoa_r() - dnl the old inet_ntoa_r check was done here - - dnl is there a localtime_r() - dnl the old localtime_r check was done here - - dnl is there a strerror_r() - dnl the old strerror_r check was done here - - checkfor_gmtime_r="yes" -fi - -dnl for recent AIX versions, we skip all the thread-safe checks above since -dnl they claim a thread-safe libc using the standard API. But there are -dnl some functions still not thread-safe. Check for these! dnl Let's hope this split URL remains working: dnl http://publibn.boulder.ibm.com/doc_link/en_US/a_doc_lib/aixprggd/ \ diff --git a/lib/config-os400.h b/lib/config-os400.h index 371cbea28..7a303fdbb 100644 --- a/lib/config-os400.h +++ b/lib/config-os400.h @@ -54,9 +54,6 @@ /* Define this to your Entropy Gathering Daemon socket pathname */ #undef EGD_SOCKET -/* Set to explicitly specify we don't want to use thread-safe functions */ -#undef DISABLED_THREADSAFE - /* Define to 1 if you have the alarm function. */ #define HAVE_ALARM 1 diff --git a/lib/config-riscos.h b/lib/config-riscos.h index 912bb8aa7..a5b6850f5 100644 --- a/lib/config-riscos.h +++ b/lib/config-riscos.h @@ -50,9 +50,6 @@ /* Define this to your Entropy Gathering Daemon socket pathname */ #undef EGD_SOCKET -/* Set to explicitly specify we don't want to use thread-safe functions */ -#define DISABLED_THREADSAFE - /* Define if you want to enable IPv6 support */ #undef ENABLE_IPV6 diff --git a/lib/config-symbian.h b/lib/config-symbian.h index d3bf20924..207d9040e 100644 --- a/lib/config-symbian.h +++ b/lib/config-symbian.h @@ -57,9 +57,6 @@ /* when not building a shared library */ /* #undef CURL_STATICLIB */ -/* Set to explicitly specify we don't want to use thread-safe functions */ -/* #undef DISABLED_THREADSAFE */ - /* your Entropy Gathering Daemon socket pathname */ /* #undef EGD_SOCKET */ diff --git a/lib/config-tpf.h b/lib/config-tpf.h index fd995bf4c..efbd9b429 100644 --- a/lib/config-tpf.h +++ b/lib/config-tpf.h @@ -47,9 +47,6 @@ /* when not building a shared library */ /* #undef CURL_STATICLIB */ -/* Set to explicitly specify we don't want to use thread-safe functions */ -/* #undef DISABLED_THREADSAFE */ - /* lber dynamic library file */ /* #undef DL_LBER_FILE */ diff --git a/lib/config-vxworks.h b/lib/config-vxworks.h index 26b8074d5..2d386aff0 100644 --- a/lib/config-vxworks.h +++ b/lib/config-vxworks.h @@ -68,9 +68,6 @@ /* when not building a shared library */ /* #undef CURL_STATICLIB */ -/* Set to explicitly specify we don't want to use thread-safe functions */ -/* #undef DISABLED_THREADSAFE */ - /* your Entropy Gathering Daemon socket pathname */ /* #undef EGD_SOCKET */ diff --git a/src/config-riscos.h b/src/config-riscos.h index b397e0dd8..222ff6359 100644 --- a/src/config-riscos.h +++ b/src/config-riscos.h @@ -53,9 +53,6 @@ /* Define this to your Entropy Gathering Daemon socket pathname */ #undef EGD_SOCKET -/* Set to explicitly specify we don't want to use thread-safe functions */ -#define DISABLED_THREADSAFE - /* Define if you want to enable IPv6 support */ #undef ENABLE_IPV6 -- cgit v1.2.1