adam/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-08-07 09:22:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

Check for c-ares 1.5.0 or later in configure

Browse Source 
There was an API change to the callback type of ares_gethostbyname() in 1.5.0,
so znc won't compile with anything older than that.


git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@2055 726aef4b-f618-498e-8847-2d620e286838
This commit is contained in:
psychon
2010-07-03 07:52:46 +00:00
parent 811b04dfce
commit a4d46e8c3c
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure
Vendored
+8 -8
View File
@@ -3119,12 +3119,12 @@ if test -n "$c_ares_CFLAGS"; then
pkg_cv_c_ares_CFLAGS="$c_ares_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcares\""; } >&5
($PKG_CONFIG --exists --print-errors "libcares") 2>&5
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcares >= 1.5.0\""; } >&5
($PKG_CONFIG --exists --print-errors "libcares >= 1.5.0") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_c_ares_CFLAGS=`$PKG_CONFIG --cflags "libcares" 2>/dev/null`
pkg_cv_c_ares_CFLAGS=`$PKG_CONFIG --cflags "libcares >= 1.5.0" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -3135,12 +3135,12 @@ if test -n "$c_ares_LIBS"; then
pkg_cv_c_ares_LIBS="$c_ares_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcares\""; } >&5
($PKG_CONFIG --exists --print-errors "libcares") 2>&5
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcares >= 1.5.0\""; } >&5
($PKG_CONFIG --exists --print-errors "libcares >= 1.5.0") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_c_ares_LIBS=`$PKG_CONFIG --libs "libcares" 2>/dev/null`
pkg_cv_c_ares_LIBS=`$PKG_CONFIG --libs "libcares >= 1.5.0" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -3160,9 +3160,9 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
c_ares_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libcares" 2>&1`
c_ares_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libcares >= 1.5.0" 2>&1`
else
c_ares_PKG_ERRORS=`$PKG_CONFIG --print-errors "libcares" 2>&1`
c_ares_PKG_ERRORS=`$PKG_CONFIG --print-errors "libcares >= 1.5.0" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$c_ares_PKG_ERRORS" >&5
configure.in
+1 -1
View File
@@ -166,7 +166,7 @@ if test "x$ARES" != "xno"; then
Disabling c-ares may result in a slight performance decrease but will not have any other side-effects],
[pkg-config was not found and thus c-ares was disabled])
else
PKG_CHECK_MODULES([c_ares], [libcares],, ARES=no)
PKG_CHECK_MODULES([c_ares], [libcares >= 1.5.0],, ARES=no)
if test "x$ARES" = "xno" ; then
ZNC_AUTO_FAIL([ARES],