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.

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

OpenSSL support detection and documentation fixes #677

Merged
merged 2 commits into from Apr 4, 2017

Conversation

Projects
None yet
3 participants
@rrebello
Contributor

rrebello commented Mar 20, 2017

This commit series improves the detection of OpenSSL through the use of pkg-config in the configure script and removes an outdated information from INSTALL.

rrebello added some commits Mar 20, 2017

Get back to using pkg-config to check for OpenSSL
Commit 6300dfe removed the option to disable SSL support from the
configure script since it became a requirement, but it also removed the
use of pkg-config for finding the OpenSSL library and its dependencies.

This had the unfortunate consequence of breaking the correct detection
of library flags in many static linking scenarios. In some cases, for
example, OpenSSL might have been built with zlib, which requires `-lz`
to be passed to the linker when doing a static link of the irssi
executable. Thus, pkg-config becomes an invaluable tool in such
situations, since no guessing work is needed as the OpenSSL .pc file
provides all the necessary flags.

So, this commit re-inserts the PKG_CHECK_MODULES macro in the configure
script when looking for OpenSSL. The test using AC_CHECK_LIB remains,
but only as a last resort in case the one using pkg-config fails.

Also, because the macro AM_PATH_GLIB_2_0 contains an unconditional call
to PKG_PROG_PKG_CONFIG, the OpenSSL checks are moved so that they come
after the Glib ones in order to avoid doubly checking for the pkg-config
binary (PKG_CHECK_MODULES skips that check if it has been performed
before, but PKG_PROG_PKG_CONFIG does not).
Remove outdated information from INSTALL
Disabling SSL support is no longer an option.

@rrebello rrebello changed the title from OpenSSL detection and documentation fixes to OpenSSL support detection and documentation fixes Mar 20, 2017

@dequis

This comment has been minimized.

Member

dequis commented Mar 20, 2017

Relevant 6300dfe @ahf

@ailin-nemui ailin-nemui merged commit 590056d into irssi:master Apr 4, 2017

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

@rrebello rrebello deleted the rrebello:openssl-misc branch Apr 7, 2017

ailin-nemui added a commit to ailin-nemui/irssi that referenced this pull request Dec 7, 2017

Merge pull request irssi#677 from rrebello/openssl-misc
OpenSSL support detection and documentation fixes
(cherry picked from commit 590056d)

@ailin-nemui ailin-nemui added this to the 1.0.3 milestone Jan 10, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment