From 1105652c1d4566ce4ade5f8e7472e6de6a57a731 Mon Sep 17 00:00:00 2001 From: psychon Date: Fri, 17 Jul 2009 21:04:41 +0000 Subject: [PATCH] m4 sucks and autoconf is ugly For some reason this interpreted some comma as an argument separator and choked up badly from there on. git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@1566 726aef4b-f618-498e-8847-2d620e286838 --- configure | 14 ++++++++++---- configure.in | 7 +++---- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/configure b/configure index 14b66993..cdf2ce6d 100755 --- a/configure +++ b/configure @@ -2958,9 +2958,9 @@ fi if test -z "$PKG_CONFIG" then { { $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 +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;} +Disabling c-ares may result in a slight performance decrease but will not have any other side-effects" >&2;} { (exit 1); exit 1; }; } fi @@ -3025,10 +3025,16 @@ 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. -Disabling c-ares may result in a slight performance decrease +Disabling c-ares may result in a slight performance decrease but will not have any other side-effects" >&5 +$as_echo "$as_me: 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" >&2;} + { (exit 1); exit 1; }; } elif test $pkg_failed = untried; then { { $as_echo "$as_me:$LINENO: error: c-ares not found. Try --disable-c-ares. -Disabling c-ares may result in a slight performance decrease +Disabling c-ares may result in a slight performance decrease but will not have any other side-effects" >&5 +$as_echo "$as_me: 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" >&2;} + { (exit 1); exit 1; }; } 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 24f48723..ab74641f 100644 --- a/configure.in +++ b/configure.in @@ -121,11 +121,10 @@ if test "x$ARES" = "xyes"; then if test -z "$PKG_CONFIG" then 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]) +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. -Disabling c-ares may result in a slight performance decrease, but will not have any other side-effects])) + 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