From 85c3d68aff3f2dc3a061e6f8912fbfdf31b754de Mon Sep 17 00:00:00 2001
From: mom040267 <mom040267@users.noreply.github.com>
Date: Mon, 20 Oct 2014 07:09:35 +0000
Subject: [PATCH] list of libraries cleaned

---
 ChangeLog |  3 ++-
 configure | 16 ++++++++++++----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 021e4b97..05c32ecf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,7 +3,8 @@ Version 4.2.1.4 'Monza':
 	- Code cleaning.
 	- TCP/TLS tests extended.
 	- relay RTCP sockets ports allocation fixed.
-	
+	- list of libraries cleaned.
+
 10/05/2014 Oleg Moskalenko <mom040267@gmail.com>
 Version 4.2.1.2 'Monza':
 	- oAuth security experimental implementation;
diff --git a/configure b/configure
index d7e2ee77..58047ced 100755
--- a/configure
+++ b/configure
@@ -823,8 +823,6 @@ fi
 ###########################
 
 testlib socket
-testlib nsl
-testlib dl
 testlib rt
 testlib wldap32
 ER=$?
@@ -952,13 +950,23 @@ fi
 testlib event_core
 ER=$?
 if ! [ ${ER} -eq 0 ] ; then
-    testlib event_extra
     ${ECHO_CMD} "Libevent2 runtime found."
+    testlib event_extra
+    ER=$?
+    if ! [ ${ER} -eq 0 ] ; then
+	${ECHO_CMD} "Libevent2 runtime 'extra' found."
+    else
+	${ECHO_CMD} "ERROR: Libevent2 'extra' runtime library is not installed properly in required location."
+	${ECHO_CMD} "See the INSTALL file."
+	${ECHO_CMD} "Abort."
+	cleanup
+	exit
+    fi
 else
     testlib event
     ER=$?
     if ! [ ${ER} -eq 0 ] ; then
-		${ECHO_CMD} "Libevent2 runtime found."
+		${ECHO_CMD} "Libevent2 runtime found (old style)."
     else
 		${ECHO_CMD} "ERROR: Libevent2 runtime libraries are not installed properly in required location."
 		${ECHO_CMD} "See the INSTALL file."