moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-21 23:58:49 -05:00
Code Issues Releases Wiki Activity

configure: use the threaded resolver backend by default if possible

Browse Source 
Closes #1647
This commit is contained in:
Daniel Stenberg 2017-08-10 15:07:40 +02:00
parent ac8af84527
commit d86e9182e4
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
configure.ac
View File

@ -3402,11 +3402,8 @@ else
fi fi
AM_CONDITIONAL(BUILD_LIBHOSTNAME, test x$build_libhostname = xyes) AM_CONDITIONAL(BUILD_LIBHOSTNAME, test x$build_libhostname = xyes)
CURL_CHECK_OPTION_THREADED_RESOLVER if test "x$want_ares" != xyes; then
CURL_CHECK_OPTION_THREADED_RESOLVER
if test "x$want_thres" = xyes && test "x$want_ares" = xyes; then
AC_MSG_ERROR(
[Options --enable-threaded-resolver and --enable-ares are mutually exclusive])
fi fi
dnl ************************************************************ dnl ************************************************************

10
m4/curl-confopts.m4
View File

@ -5,7 +5,7 @@
# | (__| |_| | _ <| |___ # | (__| |_| | _ <| |___
# \___|\___/|_| \_\_____| # \___|\___/|_| \_\_____|
# #
# Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al. # Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al.
# #
# This software is licensed as described in the file COPYING, which # This software is licensed as described in the file COPYING, which
# you should have received as part of this distribution. The terms # you should have received as part of this distribution. The terms
@ -37,12 +37,12 @@ AC_HELP_STRING([--enable-threaded-resolver],[Enable threaded resolver])
AC_HELP_STRING([--disable-threaded-resolver],[Disable threaded resolver]), AC_HELP_STRING([--disable-threaded-resolver],[Disable threaded resolver]),
OPT_THRES=$enableval) OPT_THRES=$enableval)
case "$OPT_THRES" in case "$OPT_THRES" in
yes)
dnl --enable-threaded-resolver option used
want_thres="yes"
;;
*) *)
dnl configure option not specified dnl configure option not specified
want_thres="yes"
;;
no)
dnl --disable-threaded-resolver option used
want_thres="no" want_thres="no"
;; ;;
esac esac