ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/svn/ircd-hybrid/branches/8.2.x/m4/ax_arg_openssl.m4
(Generate patch)

Comparing:
ircd-hybrid/trunk/m4/ax_check_openssl.m4 (file contents), Revision 2481 by michael, Wed Oct 23 16:38:58 2013 UTC vs.
ircd-hybrid/branches/8.2.x/m4/ax_arg_openssl.m4 (file contents), Revision 9124 by michael, Sun Jan 5 19:09:19 2020 UTC

# Line 1 | Line 1
1 < AC_DEFUN([AX_CHECK_OPENSSL], [
1 > AC_DEFUN([AX_ARG_OPENSSL], [
2   AC_ARG_ENABLE(openssl,
3 < [  --enable-openssl[=DIR]       Enable OpenSSL support (DIR optional).
4 <  --disable-openssl            Disable OpenSSL support. ],
3 > [  --enable-openssl[=DIR]       Enable LibreSSL/OpenSSL support (DIR optional).
4 >  --disable-openssl            Disable LibreSSL/OpenSSL support. ],
5   [ cf_enable_openssl=$enableval ],
6   [ cf_enable_openssl="auto" ])
7 < AC_MSG_CHECKING([for OpenSSL])
7 > AC_MSG_CHECKING([for LibreSSL/OpenSSL])
8   if test "$cf_enable_openssl" != "no"; then
9    cf_openssl_basedir=""
10    if test "$cf_enable_openssl" != "auto" &&
# Line 61 | Line 61 | else
61   fi
62  
63   AS_IF([test "$cf_enable_openssl" != "no"],
64 < [AC_MSG_CHECKING(for OpenSSL 0.9.8 or above)
64 > [AC_MSG_CHECKING(for LibreSSL or OpenSSL 1.0.2r and above)
65    AC_RUN_IFELSE([
66      AC_LANG_PROGRAM([
67      #include <openssl/opensslv.h>
68      #include <stdlib.h>],
69 <    [[ exit(!(OPENSSL_VERSION_NUMBER >= 0x00908000)); ]])],
69 >    [[ exit(!(OPENSSL_VERSION_NUMBER >= 0x1000212fL)); ]])],
70    [cf_openssl_version_ok=yes],
71    [cf_openssl_version_ok=no],
72    [cf_openssl_version_ok=no])
# Line 77 | Line 77 | AS_IF([test "$cf_enable_openssl" != "no"
77      AC_CHECK_LIB(crypto, RSA_free)
78      AS_IF([test "$ac_cv_lib_crypto_RSA_free" = "yes"],
79        [AC_CHECK_LIB(ssl, SSL_connect)])
80 <    ],[AC_MSG_RESULT(no - OpenSSL support disabled)
80 >    ],[AC_MSG_RESULT(no - LibreSSL/OpenSSL support disabled)
81      cf_enable_openssl="no"])])
82
83 AM_CONDITIONAL(ENABLE_SSL, [test "$ac_cv_lib_ssl_SSL_connect" = yes])
82   ])

Comparing:
ircd-hybrid/trunk/m4/ax_check_openssl.m4 (property svn:eol-style), Revision 2481 by michael, Wed Oct 23 16:38:58 2013 UTC vs.
ircd-hybrid/branches/8.2.x/m4/ax_arg_openssl.m4 (property svn:eol-style), Revision 9124 by michael, Sun Jan 5 19:09:19 2020 UTC

# Line 0 | Line 1
1 + native

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines