moparisthebest
/
curl
mirror of https://github.com/moparisthebest/curl
1
0
Fork 0
Code Issues Releases Wiki Activity

Restore normal operation: 

c-ares is only enabled when specifically requested.

  Consequently, c-ares default setting is disabled.
This commit is contained in:
Yang Tse 2010-01-27 06:59:02 +00:00
parent 124b35aafe
commit 6418c0588d
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
m4/curl-confopts.m4
View File

@ -44,20 +44,20 @@ AC_HELP_STRING([--disable-ares],[Disable c-ares for DNS lookups]),
no) no)
dnl --disable-ares option used dnl --disable-ares option used
want_ares="no" want_ares="no"
AC_MSG_RESULT([no])
;; ;;
default) default)
dnl configure option not specified dnl configure option not specified
want_ares="assume_yes" want_ares="no"
AC_MSG_RESULT([(assumed) yes])
;; ;;
*) *)
dnl --enable-ares option used dnl --enable-ares option used
want_ares="yes" want_ares="yes"
want_ares_path="$enableval" if test -n "$enableval" && test "$enableval" != "yes"; then
AC_MSG_RESULT([yes]) want_ares_path="$enableval"
fi
;; ;;
esac esac
AC_MSG_RESULT([$want_ares])
]) ])
@ -363,7 +363,7 @@ dnl to enable support of this library.
AC_DEFUN([CURL_CHECK_LIB_ARES], [ AC_DEFUN([CURL_CHECK_LIB_ARES], [
# #
if test "$want_ares" = "yes" || test "$want_ares" = "assume_yes"; then if test "$want_ares" = "yes"; then
dnl c-ares library support has been requested dnl c-ares library support has been requested
clean_CPPFLAGS="$CPPFLAGS" clean_CPPFLAGS="$CPPFLAGS"
clean_LDFLAGS="$LDFLAGS" clean_LDFLAGS="$LDFLAGS"
@ -371,7 +371,7 @@ AC_DEFUN([CURL_CHECK_LIB_ARES], [
embedded_ares="unknown" embedded_ares="unknown"
configure_runpath=`pwd` configure_runpath=`pwd`
embedded_ares_builddir="$configure_runpath/ares" embedded_ares_builddir="$configure_runpath/ares"
if test -n "$want_ares_path" && test "$want_ares_path" != "yes"; then if test -n "$want_ares_path"; then
dnl c-ares library path has been specified dnl c-ares library path has been specified
ares_CPPFLAGS="-I$want_ares_path/include" ares_CPPFLAGS="-I$want_ares_path/include"
ares_LDFLAGS="-L$want_ares_path/lib" ares_LDFLAGS="-L$want_ares_path/lib"
@ -430,7 +430,7 @@ AC_DEFUN([CURL_CHECK_LIB_ARES], [
want_ares="no" want_ares="no"
]) ])
fi fi
if test "$want_ares" != "no"; then if test "$want_ares" = "yes"; then
dnl finally c-ares will be used dnl finally c-ares will be used
AC_DEFINE(USE_ARES, 1, [Define to enable c-ares support]) AC_DEFINE(USE_ARES, 1, [Define to enable c-ares support])
AC_SUBST([USE_ARES], [1]) AC_SUBST([USE_ARES], [1])