diff options
| author | ailin-nemui <ailin-nemui@users.noreply.github.com> | 2017-04-04 12:27:50 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-04 12:27:50 +0200 |
| commit | 590056d3c33a0efc126f35c7c0a7389282158855 (patch) | |
| tree | f43976ebe3c7ef163d4b35d7b8f36f44a0d944b5 | |
| parent | d5e23f97a7f98177bedc1842430a1199785bee20 (diff) | |
| parent | 449b8a4589f1fcadae44387999260ed5f8c6c2bf (diff) | |
| download | irssi-590056d3c33a0efc126f35c7c0a7389282158855.zip | |
Merge pull request #677 from rrebello/openssl-misc
OpenSSL support detection and documentation fixes
| -rw-r--r-- | INSTALL | 4 | ||||
| -rw-r--r-- | configure.ac | 21 |
2 files changed, 15 insertions, 10 deletions
@@ -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 8d1ba706..dd5064c9 100644 --- a/configure.ac +++ b/configure.ac @@ -244,11 +244,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 ** @@ -289,7 +284,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 |