From 951382255beec25d7ad320a12c8b3a5555607006 Mon Sep 17 00:00:00 2001 From: psychon Date: Fri, 17 Jul 2009 20:44:53 +0000 Subject: [PATCH] Improve the error message if c-ares or pkg-config is not found This now states more explicitly that c-ares is not strictly required. Thanks to flakes for noticing that the error messages needs improvement and to w00t for improving the improved error message flakes and me came up with. git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@1565 726aef4b-f618-498e-8847-2d620e286838 --- configure | 16 ++++++++-------- configure.in | 7 +++++-- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/configure b/configure index 5fc2b290..14b66993 100755 --- a/configure +++ b/configure @@ -2957,8 +2957,10 @@ $as_echo "no" >&6; } fi if test -z "$PKG_CONFIG" then - { { $as_echo "$as_me:$LINENO: error: pkg-config not found. Try --disable-c-ares." >&5 -$as_echo "$as_me: error: pkg-config not found. Try --disable-c-ares." >&2;} + { { $as_echo "$as_me:$LINENO: 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" >&5 +$as_echo "$as_me: 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" >&2;} { (exit 1); exit 1; }; } fi @@ -3022,13 +3024,11 @@ fi { $as_echo "$as_me:$LINENO: result: no" >&5 $as_echo "no" >&6; } - { { $as_echo "$as_me:$LINENO: error: c-ares not found. Try --disable-c-ares." >&5 -$as_echo "$as_me: error: c-ares not found. Try --disable-c-ares." >&2;} - { (exit 1); exit 1; }; } + { { $as_echo "$as_me:$LINENO: error: c-ares not found. Try --disable-c-ares. +Disabling c-ares may result in a slight performance decrease elif test $pkg_failed = untried; then - { { $as_echo "$as_me:$LINENO: error: c-ares not found. Try --disable-c-ares." >&5 -$as_echo "$as_me: error: c-ares not found. Try --disable-c-ares." >&2;} - { (exit 1); exit 1; }; } + { { $as_echo "$as_me:$LINENO: error: c-ares not found. Try --disable-c-ares. +Disabling c-ares may result in a slight performance decrease else c_ares_CFLAGS=$pkg_cv_c_ares_CFLAGS c_ares_LIBS=$pkg_cv_c_ares_LIBS diff --git a/configure.in b/configure.in index c05ff76d..24f48723 100644 --- a/configure.in +++ b/configure.in @@ -120,9 +120,12 @@ if test "x$ARES" = "xyes"; then PKG_PROG_PKG_CONFIG() if test -z "$PKG_CONFIG" then - AC_MSG_ERROR([pkg-config not found. Try --disable-c-ares.]) + AC_MSG_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]) fi - PKG_CHECK_MODULES([c_ares], [libcares],, AC_MSG_ERROR([c-ares not found. Try --disable-c-ares.])) + PKG_CHECK_MODULES([c_ares], [libcares],, + AC_MSG_ERROR([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])) appendCXX $c_ares_CFLAGS -DHAVE_ARES appendLib $c_ares_LIBS fi