diff options
| author |  Aaron Jones | 2026-03-22 03:00:11 +0000 |
|---|---|---|
| committer | Aaron Jones | 2026-03-22 03:02:35 +0000 |
| commit | 7982a528ea178ee3b0bbe7e230b422a07b5f1b28 (patch) | |
| tree | 5534a611f6a22b92a4659178c798cc8208a51e52 /configure.ac | |
| parent | Tidy up module loading code (diff) | |
| download | solanum-amdj/unify-openssl-macro.tar.gz solanum-amdj/unify-openssl-macro.tar.bz2 solanum-amdj/unify-openssl-macro.zip | |
Unify the preprocessor macro for OpenSSL support amdj/unify-openssl-macro
Commit 9a1ee1b64ed660164197 introduced support for building IRCd
with Meson. It defines the "HAVE_OPENSSL" preprocessor macro
for both IRCd and librb. While librb does use that macro, IRCd
unfortunately uses only the "HAVE_LIBCRYPTO" macro instead, set
implicitly by AC_CHECK_LIB from autotools.
Make the autotools build system define HAVE_OPENSSL (to unify
IRCd with librb) and change IRCd to use that.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 9b4359c6..d86eff8e 100644 --- a/configure.ac +++ b/configure.ac @@ -262,9 +262,11 @@ if test "$cf_enable_openssl" != no; then dnl Work around pmake/gmake conditional incompatibilities AC_SUBST(ENCSPEED, encspeed) - dnl Do all the HAVE_LIBCRYPTO magic -- and check for ciphers + dnl Check the library is linkable CPPFLAGS="$CPPFLAGS $SSL_LIBS" - AC_CHECK_LIB(crypto, RSA_free) + AC_CHECK_LIB([crypto], [RSA_free], [ + AC_DEFINE([HAVE_OPENSSL], [1], [Define if OpenSSL appears usable]) + ]) SSL_LIBS="$SSL_LIBS -lcrypto" SSL_SRCS_ENABLE='$(SSL_SRCS)' else |