Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

OpenSSL support detection and documentation fixes #677

Merged
merged 2 commits into from Apr 4, 2017
Merged

OpenSSL support detection and documentation fixes #677

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a720c3b
Get back to using pkg-config to check for OpenSSL
rrebello Mar 20, 2017
449b8a4
Remove outdated information from INSTALL
rrebello Mar 20, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 0 additions & 4 deletions INSTALL
View file
Open in desktop
Expand Up @@ -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
Expand Down
21 changes: 15 additions & 6 deletions configure.ac
View file
Open in desktop
Expand Up @@ -243,11 +243,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 **
Expand Down Expand Up @@ -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
Expand Down