pissnet/pissircd
1
0
Fork 0
mirror of https://github.com/pissnet/pissircd.git synced 2025-08-11 04:31:37 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix regression caused by 6e4cc3e235

Browse source
This commit is contained in:
Bram Matthys 2016-10-21 19:04:03 +02:00
parent 23c14e56ad
commit abb3e225aa
1 changed files with 6 additions and 2 deletions

8
Config
View file

@ -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