Skip to content

Commit

Permalink
configure: use the threaded resolver backend by default if possible
Browse files Browse the repository at this point in the history
  • Loading branch information
bagder committed Jul 6, 2017
1 parent 23b828b commit 9cf2a34
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 10 deletions.
7 changes: 2 additions & 5 deletions configure.ac
Expand Up @@ -3397,11 +3397,8 @@ else
fi
AM_CONDITIONAL(BUILD_LIBHOSTNAME, test x$build_libhostname = xyes)

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])
if test "x$want_ares" != xyes; then
CURL_CHECK_OPTION_THREADED_RESOLVER
fi

dnl ************************************************************
Expand Down
10 changes: 5 additions & 5 deletions m4/curl-confopts.m4
Expand Up @@ -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
# you should have received as part of this distribution. The terms
Expand Down Expand Up @@ -37,12 +37,12 @@ AC_HELP_STRING([--enable-threaded-resolver],[Enable threaded resolver])
AC_HELP_STRING([--disable-threaded-resolver],[Disable threaded resolver]),
OPT_THRES=$enableval)
case "$OPT_THRES" in
yes)
dnl --enable-threaded-resolver option used
want_thres="yes"
;;
*)
dnl configure option not specified
want_thres="yes"
;;
no)
dnl --disable-threaded-resolver option used
want_thres="no"
;;
esac
Expand Down

0 comments on commit 9cf2a34

Please sign in to comment.