From 671a24f29b9c305c17727e7bfc0d025c25fb5c01 Mon Sep 17 00:00:00 2001
From: Azat Khuzhin <a3at.mail@gmail.com>
Date: Mon, 8 Aug 2016 18:10:56 +0300
Subject: [PATCH] autotools/win32: fix searching ssl library

---
 configure.ac           |  2 +-
 m4/libevent_openssl.m4 | 17 +++++++++++------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/configure.ac b/configure.ac
index 5df1b907..315d97a5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -778,7 +778,7 @@ fi
 # check if we have and should use openssl
 AM_CONDITIONAL(OPENSSL, [test "$enable_openssl" != "no" && test "$have_openssl" = "yes"])
 if test "x$enable_openssl" = "xyes"; then
-	AC_SEARCH_LIBS([ERR_remove_thread_state], [crypto],
+	AC_SEARCH_LIBS([ERR_remove_thread_state], [crypto eay32],
 		[AC_DEFINE(HAVE_ERR_REMOVE_THREAD_STATE, 1, [Define to 1 if you have ERR_remove_thread_stat().])])
 fi
 
diff --git a/m4/libevent_openssl.m4 b/m4/libevent_openssl.m4
index 3cb064a0..c2040595 100644
--- a/m4/libevent_openssl.m4
+++ b/m4/libevent_openssl.m4
@@ -26,12 +26,17 @@ case "$enable_openssl" in
 	save_LIBS="$LIBS"
 	LIBS=""
 	OPENSSL_LIBS=""
-	AC_SEARCH_LIBS([SSL_new], [ssl],
-	    [have_openssl=yes
-	    OPENSSL_LIBS="$LIBS -lcrypto $EV_LIB_GDI $EV_LIB_WS32 $OPENSSL_LIBADD"],
-	    [have_openssl=no],
-	    [-lcrypto $EV_LIB_GDI $EV_LIB_WS32 $OPENSSL_LIBADD])
-	LIBS="$save_LIBS"
+	for lib in crypto eay32; do
+		# clear cache
+		unset ac_cv_search_SSL_new
+		AC_SEARCH_LIBS([SSL_new], [ssl ssl32],
+		    [have_openssl=yes
+		    OPENSSL_LIBS="$LIBS -l$lib $EV_LIB_GDI $EV_LIB_WS32 $OPENSSL_LIBADD"],
+		    [have_openssl=no],
+		    [-l$lib $EV_LIB_GDI $EV_LIB_WS32 $OPENSSL_LIBADD])
+		LIBS="$save_LIBS"
+		test "$have_openssl" = "yes" && break
+	done
 	;;
     esac
     AC_SUBST(OPENSSL_INCS)
-- 
2.40.0