From abb3e225aac9f3a7eb23fd3422852b46023331dd Mon Sep 17 00:00:00 2001 From: Bram Matthys Date: Fri, 21 Oct 2016 19:04:03 +0200 Subject: [PATCH] Fix regression caused by 6e4cc3e23565c3e9bf186c095ff19b91c098ab8b --- Config | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Config b/Config index bd5f26673..584a83b6c 100755 --- a/Config +++ b/Config @@ -619,6 +619,7 @@ if [ "$REMOTEINC" = "1" ] ; then INSTALLCURL="0" + SUGGESTCURLDIR="" if [ -d "/usr/local/include/curl" ]; then SUGGESTCURLDIR="/usr/local" @@ -640,7 +641,7 @@ if [ "$REMOTEINC" = "1" ] ; then fi fi - if [ "$CURLDIR" = "$HOME/curl" -a "x$SUGGESTCURLDIR" != "x" ]; then + if [ "x$CURLDIR" = "x$HOME/curl" -a "x$SUGGESTCURLDIR" != "x" ]; then # I guess some people will complain about this, but if system wide cURL is available # and many people have old defaults then this is much preferred: echo "" @@ -651,13 +652,16 @@ if [ "$REMOTEINC" = "1" ] ; then fi if [ "x$CURLDIR" = "x" ]; then + CURLDIR="$SUGGESTCURLDIR" + # NOTE: CURLDIR may still be empty after this + # Local curl in ~/curl is used if it exists and system has no AsynchDNS if [ "$GOTASYNC" != "1" -a -d "$HOME/curl" ]; then CURLDIR="$HOME/curl" fi # Need to output it here, as the HOME check from above may cause this to be no longer relevant. - if [ "x$CURLDIR" = "x" -a "$GOTASYNC" != "1" ]; then + if [ "x$CURLDIR" = "x" -a "x$SUGGESTCURLDIRBAD" != "x" ]; then echo "Curl library was found in $SUGGESTCURLDIRBAD, but it does not support Asynchronous DNS (not compiled with c-ares)" echo "so it's of no use to us as it would stall the IRCd on REHASH." fi