From 7b4106fe0c9b0c2b1fc8c87a02d2f92646cb1d50 Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Tue, 4 Apr 2017 12:27:50 +0200
Subject: [PATCH] Merge pull request #677 from rrebello/openssl-misc

OpenSSL support detection and documentation fixes
(cherry picked from commit 590056d3c33a0efc126f35c7c0a7389282158855)
---
 INSTALL      |  4 ----
 configure.ac | 21 +++++++++++++++------
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/INSTALL b/INSTALL
index 629a75c6..d2a0acc2 100644
--- a/INSTALL
+++ b/INSTALL
@@ -30,10 +30,6 @@ configure options
 
   Build the irssi proxy (see startup-HOWTO).
 
-  --disable-ssl
-
-  Disable SSL support.
-
   --with-perl=[yes|no|module]
 
   Enable Perl support
diff --git a/configure.ac b/configure.ac
index 02b33497..9f191d3f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -230,11 +230,6 @@ if test "x$want_socks" = "xyes"; then
 	])
 fi
 
-dnl **
-dnl ** OpenSSL checks
-dnl **
-AC_CHECK_LIB([ssl], [SSL_library_init])
-
 dnl **
 dnl ** fe-text checks
 dnl **
@@ -276,7 +271,21 @@ if test -z "$GLIB_LIBS"; then
   AC_ERROR([GLIB is required to build irssi.])
 fi
 
-LIBS="$LIBS $GLIB_LIBS -lssl -lcrypto"
+LIBS="$LIBS $GLIB_LIBS"
+
+dnl **
+dnl ** OpenSSL checks
+dnl **
+PKG_CHECK_MODULES([OPENSSL], [openssl], [
+	CFLAGS="$CFLAGS $OPENSSL_CFLAGS"
+	LIBS="$LIBS $OPENSSL_LIBS"
+], [
+	AC_CHECK_LIB([ssl], [SSL_library_init], [
+		LIBS="$LIBS -lssl -lcrypto"
+	], [
+		AC_MSG_ERROR([The OpenSSL library was not found])
+	])
+])
 
 dnl **
 dnl ** curses checks