[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnurl] 12/41: configure: use the threaded resolver backend
From: |
gnunet |
Subject: |
[GNUnet-SVN] [gnurl] 12/41: configure: use the threaded resolver backend by default if possible |
Date: |
Sun, 20 Aug 2017 20:46:34 +0200 |
This is an automated email from the git hooks/post-receive script.
ng0 pushed a commit to annotated tag gnurl-7.55.1
in repository gnurl.
commit d86e9182e41050be508a5dfbaa3f7070b817a685
Author: Daniel Stenberg <address@hidden>
AuthorDate: Thu Aug 10 15:07:40 2017 +0200
configure: use the threaded resolver backend by default if possible
Closes #1647
---
configure.ac | 7 ++-----
m4/curl-confopts.m4 | 10 +++++-----
2 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/configure.ac b/configure.ac
index edcb3931f..edebfc77b 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 42f2a965a..d77a884d5 100644
--- a/m4/curl-confopts.m4
+++ b/m4/curl-confopts.m4
@@ -5,7 +5,7 @@
# | (__| |_| | _ <| |___
# \___|\___/|_| \_\_____|
#
-# Copyright (C) 1998 - 2013, Daniel Stenberg, <address@hidden>, et al.
+# Copyright (C) 1998 - 2017, Daniel Stenberg, <address@hidden>, 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
--
To stop receiving notification emails like this one, please contact
address@hidden
- [GNUnet-SVN] [gnurl] 39/41: gitignore: ignore .xz now instead of .lzma, (continued)
- [GNUnet-SVN] [gnurl] 39/41: gitignore: ignore .xz now instead of .lzma, gnunet, 2017/08/20
- [GNUnet-SVN] [gnurl] 27/41: curl/system.h: add Oracle Solaris Studio, gnunet, 2017/08/20
- [GNUnet-SVN] [gnurl] 30/41: connect-to.d: better language, gnunet, 2017/08/20
- [GNUnet-SVN] [gnurl] 24/41: docs: fix typo stuct -> struct, gnunet, 2017/08/20
- [GNUnet-SVN] [gnurl] 23/41: test1447: require a curl with http support, gnunet, 2017/08/20
- [GNUnet-SVN] [gnurl] 13/41: mkhelp.pl: allow executing this script directly, gnunet, 2017/08/20
- [GNUnet-SVN] [gnurl] 31/41: cmake: allow user to override CMAKE_DEBUG_POSTFIX, gnunet, 2017/08/20
- [GNUnet-SVN] [gnurl] 25/41: docs: fix grammar in CURL_SSLVERSION_MAX_DEFAULT description, gnunet, 2017/08/20
- [GNUnet-SVN] [gnurl] 22/41: curl/system.h: support more architectures, gnunet, 2017/08/20
- [GNUnet-SVN] [gnurl] 29/41: connect-to.d: clarified, gnunet, 2017/08/20
- [GNUnet-SVN] [gnurl] 12/41: configure: use the threaded resolver backend by default if possible,
gnunet <=
- [GNUnet-SVN] [gnurl] 37/41: ipv6_scope: support unique local addresses, gnunet, 2017/08/20
- [GNUnet-SVN] [gnurl] 35/41: test1448: verify redirect to IDN using URL, gnunet, 2017/08/20
- [GNUnet-SVN] [gnurl] 41/41: Patchset for gnURL microfork: * Patches to rename libcurl to libgnurl by Christian * Updated for latest curl using git cherry-pick by Jeff, Florian, ng0 * Patches to fix the testsuite (deleted tests/data/test1139, renamed reference from libcurl.* to libgnurl.*) by ng0 * Added guix-gnurl.scm which can be used to build this with guix prior to installing it. (author: ng0) * Further adjustments by ng0 * 7.55.0: Manual addition of a7bbbb7c368c6096802007f61f19a02e9d75285b and f864bd8c880d5a91637 [...], gnunet, 2017/08/20