mirror of
https://github.com/irssi/irssi.git
synced 2024-10-27 05:20:20 -04:00
Merge pull request #677 from rrebello/openssl-misc
OpenSSL support detection and documentation fixes
This commit is contained in:
commit
590056d3c3
4
INSTALL
4
INSTALL
@ -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
21
configure.ac
@ -243,11 +243,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 **
|
||||||
@ -289,7 +284,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
|
||||||
|
Loading…
Reference in New Issue
Block a user