mirror of
https://github.com/znc/znc.git
synced 2026-05-09 06:44:40 +02:00
Better error message if pkg-config is not found
git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@1983 726aef4b-f618-498e-8847-2d620e286838
This commit is contained in:
@@ -3079,6 +3079,17 @@ fi
|
||||
if test -z "$PKG_CONFIG"
|
||||
then
|
||||
ARES=no
|
||||
|
||||
# This looks better in the summary at the end
|
||||
ARES="not found"
|
||||
if test "x$old_ARES" != "xauto" ; then
|
||||
as_fn_error "pkg-config not found. Try --disable-c-ares.
|
||||
Disabling c-ares may result in a slight performance decrease but will not have any other side-effects" "$LINENO" 5
|
||||
else
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: pkg-config was not found and thus c-ares was disabled" >&5
|
||||
$as_echo "$as_me: WARNING: pkg-config was not found and thus c-ares was disabled" >&2;}
|
||||
fi
|
||||
|
||||
else
|
||||
|
||||
pkg_failed=no
|
||||
@@ -3151,9 +3162,8 @@ else
|
||||
$as_echo "yes" >&6; }
|
||||
:
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "x$ARES" = "xno" ; then
|
||||
if test "x$ARES" = "xno" ; then
|
||||
|
||||
# This looks better in the summary at the end
|
||||
ARES="not found"
|
||||
@@ -3165,10 +3175,11 @@ Disabling c-ares may result in a slight performance decrease but will not have a
|
||||
$as_echo "$as_me: WARNING: c-ares was not found and thus disabled" >&2;}
|
||||
fi
|
||||
|
||||
else
|
||||
appendCXX $c_ares_CFLAGS -DHAVE_C_ARES
|
||||
appendLib $c_ares_LIBS
|
||||
ARES=yes
|
||||
else
|
||||
appendCXX $c_ares_CFLAGS -DHAVE_C_ARES
|
||||
appendLib $c_ares_LIBS
|
||||
ARES=yes
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
+13
-9
@@ -161,19 +161,23 @@ if test "x$ARES" != "xno"; then
|
||||
if test -z "$PKG_CONFIG"
|
||||
then
|
||||
ARES=no
|
||||
ZNC_AUTO_FAIL([ARES],
|
||||
[pkg-config not found. Try --disable-c-ares.
|
||||
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)
|
||||
fi
|
||||
|
||||
if test "x$ARES" = "xno" ; then
|
||||
ZNC_AUTO_FAIL([ARES],
|
||||
[c-ares not found. Try --disable-c-ares.
|
||||
if test "x$ARES" = "xno" ; then
|
||||
ZNC_AUTO_FAIL([ARES],
|
||||
[c-ares not found. Try --disable-c-ares.
|
||||
Disabling c-ares may result in a slight performance decrease but will not have any other side-effects],
|
||||
[c-ares was not found and thus disabled])
|
||||
else
|
||||
appendCXX $c_ares_CFLAGS -DHAVE_C_ARES
|
||||
appendLib $c_ares_LIBS
|
||||
ARES=yes
|
||||
[c-ares was not found and thus disabled])
|
||||
else
|
||||
appendCXX $c_ares_CFLAGS -DHAVE_C_ARES
|
||||
appendLib $c_ares_LIBS
|
||||
ARES=yes
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
Reference in New Issue
Block a user