summaryrefslogtreecommitdiff
path: root/syntax.pl
diff options
context:
space:
mode:
authorRodrigo Rebello <rprebello@gmail.com>2017-03-20 13:17:42 -0300
committerRodrigo Rebello <rprebello@gmail.com>2017-03-20 16:09:43 -0300
commita720c3b5efdcd9b580110441bb22be91a4a16732 (patch)
tree11ede03454789603f594d98947ecb5f5ff17ed7a /syntax.pl
parent966efced3c178031f5f75a1009acc0ec8f897b4a (diff)
downloadirssi-a720c3b5efdcd9b580110441bb22be91a4a16732.zip
Get back to using pkg-config to check for OpenSSL
Commit 6300dfec7 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).
Diffstat (limited to 'syntax.pl')
0 files changed, 0 insertions, 0 deletions