From d4cd83fdf38dc81fa64484c4b98d4c033caf3a47 Mon Sep 17 00:00:00 2001
From: psychon <psychon@726aef4b-f618-498e-8847-2d620e286838>
Date: Thu, 18 Sep 2008 18:16:49 +0000
Subject: [PATCH] autoconf and m4 both suck (autoconf choked on some comma and
 messed up badly after that)

git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@1208 726aef4b-f618-498e-8847-2d620e286838
---
 configure    | 18 ++++++++++--------
 configure.in |  4 ++--
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/configure b/configure
index 051fc7a1..ff5a800e 100755
--- a/configure
+++ b/configure
@@ -3402,9 +3402,7 @@ if test "${ac_cv_lib_crypto_BIO_new+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lcrypto eg. libssl-dev." >&5
-echo "$as_me: error: Could not find libcrypto. Try --disable-openssl or install the
-			       appropriate dependencies $LIBS"
+LIBS="-lcrypto  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -3468,7 +3466,10 @@ _ACEOF
 
 else
   { { echo "$as_me:$LINENO: error: Could not find libcrypto. Try --disable-openssl or install the
-			       appropriate dependencies
+			       appropriate dependencies eg. libssl-dev." >&5
+echo "$as_me: error: Could not find libcrypto. Try --disable-openssl or install the
+			       appropriate dependencies eg. libssl-dev." >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
 
@@ -3478,9 +3479,7 @@ if test "${ac_cv_lib_ssl_SSL_shutdown+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lssl eg. libssl-dev." >&5
-echo "$as_me: error: Could not find libssl. Try --disable-openssl or install the
-			       appropriate dependencies $LIBS"
+LIBS="-lssl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -3544,7 +3543,10 @@ _ACEOF
 
 else
   { { echo "$as_me:$LINENO: error: Could not find libssl. Try --disable-openssl or install the
-			       appropriate dependencies
+			       appropriate dependencies eg. libssl-dev." >&5
+echo "$as_me: error: Could not find libssl. Try --disable-openssl or install the
+			       appropriate dependencies eg. libssl-dev." >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
 
diff --git a/configure.in b/configure.in
index 7d8b77f8..08cd8774 100644
--- a/configure.in
+++ b/configure.in
@@ -124,10 +124,10 @@ if test -z "$NOSSL"; then
 	# On some arches libssl depends on libcrypto without linking to it :(
 	AC_CHECK_LIB( crypto, BIO_new,,
 		     AC_ERROR([Could not find libcrypto. Try --disable-openssl or install the
-			       appropriate dependencies, eg. libssl-dev.]), )
+			       appropriate dependencies eg. libssl-dev.]), )
 	AC_CHECK_LIB( ssl, SSL_shutdown,,
 		     AC_ERROR([Could not find libssl. Try --disable-openssl or install the
-			       appropriate dependencies, eg. libssl-dev.]), )
+			       appropriate dependencies eg. libssl-dev.]), )
 
 	if test -z "$NOSSL"; then
 		appendCXX -DHAVE_LIBSSL