From: Daniel Stenberg <daniel@haxx.se>
Date: Thu, 10 Aug 2017 13:07:40 +0000 (+0200)
Subject: configure: use the threaded resolver backend by default if possible
X-Git-Tag: curl-7_55_1~28
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d86e9182e41050be508a5dfbaa3f7070b817a685;p=thirdparty%2Fcurl.git

configure: use the threaded resolver backend by default if possible

Closes #1647
---

diff --git a/configure.ac b/configure.ac
index edcb3931f5..edebfc77b2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3402,11 +3402,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 ************************************************************
diff --git a/m4/curl-confopts.m4 b/m4/curl-confopts.m4
index 42f2a965a9..d77a884d58 100644
--- a/m4/curl-confopts.m4
+++ b/m4/curl-confopts.m4
@@ -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
@@ -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