PsychoticNinja/irssi
1
0
Fork 1
mirror of https://github.com/irssi/irssi.git synced 2025-04-26 04:51:11 -05:00
Code Issues Projects Releases Wiki Activity

Merge pull request #677 from rrebello/openssl-misc

Browse Source 
OpenSSL support detection and documentation fixes
(cherry picked from commit 590056d3c33a0efc126f35c7c0a7389282158855)
This commit is contained in:
ailin-nemui 2017-04-04 12:27:50 +02:00 committed by Ailin Nemui
parent 1f1868c532
commit 7b4106fe0c
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
INSTALL
View File

@ -30,10 +30,6 @@ configure options
Build the irssi proxy (see startup-HOWTO). Build the irssi proxy (see startup-HOWTO).
--disable-ssl
Disable SSL support.
--with-perl=[yes|no|module] --with-perl=[yes|no|module]
Enable Perl support Enable Perl support

21
configure.ac
View File

@ -230,11 +230,6 @@ if test "x$want_socks" = "xyes"; then
]) ])
fi fi
dnl **
dnl ** OpenSSL checks
dnl **
AC_CHECK_LIB([ssl], [SSL_library_init])
dnl ** dnl **
dnl ** fe-text checks dnl ** fe-text checks
dnl ** dnl **
@ -276,7 +271,21 @@ if test -z "$GLIB_LIBS"; then
AC_ERROR([GLIB is required to build irssi.]) AC_ERROR([GLIB is required to build irssi.])
fi 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 **
dnl ** curses checks dnl ** curses checks