philippelh/bitchx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add support for OpenSSL 1.1.0 to configure script

Browse Source 
OpenSSL 1.1.0 removed the SSLeay() function and replaced it with a macro, that AC_CHECK_LIB can't see.

Search for ERR_get_error() instead.
This commit is contained in:
Kevin Easton
2017-03-17 00:38:46 +11:00
parent 2fa0bf818a
commit 184af728c7
3 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Changelog
View File

@@ -1,5 +1,7 @@
[Changes 1.2.2] [Changes 1.2.2]
* Add support for OpenSSL 1.1.0 to configure script. (caf)
* /UNBAN <nick> can use cached whowas info to unset bans. (caf) * /UNBAN <nick> can use cached whowas info to unset bans. (caf)
* Unsetting CMDCHARS sets it back to the default. (caf) * Unsetting CMDCHARS sets it back to the default. (caf)

22
configure vendored
View File

@@ -10630,9 +10630,9 @@ esac
case "$with_ssl" in case "$with_ssl" in
yes|check) yes|check)
echo "$as_me:$LINENO: checking for SSLeay in -lcrypto" >&5 echo "$as_me:$LINENO: checking for ERR_get_error in -lcrypto" >&5
echo $ECHO_N "checking for SSLeay in -lcrypto... $ECHO_C" >&6 echo $ECHO_N "checking for ERR_get_error in -lcrypto... $ECHO_C" >&6
if test "${ac_cv_lib_crypto_SSLeay+set}" = set; then if test "${ac_cv_lib_crypto_ERR_get_error+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6 echo $ECHO_N "(cached) $ECHO_C" >&6
else else
ac_check_lib_save_LIBS=$LIBS ac_check_lib_save_LIBS=$LIBS
@@ -10650,11 +10650,11 @@ extern "C"
#endif #endif
/* We use char because int might match the return type of a gcc2 /* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */ builtin and then its argument prototype would still apply. */
char SSLeay (); char ERR_get_error ();
int int
main () main ()
{ {
SSLeay (); ERR_get_error ();
; ;
return 0; return 0;
} }
@@ -10681,20 +10681,20 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
ac_status=$? ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then (exit $ac_status); }; }; then
ac_cv_lib_crypto_SSLeay=yes ac_cv_lib_crypto_ERR_get_error=yes
else else
echo "$as_me: failed program was:" >&5 echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5 sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_crypto_SSLeay=no ac_cv_lib_crypto_ERR_get_error=no
fi fi
rm -f conftest.err conftest.$ac_objext \ rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS LIBS=$ac_check_lib_save_LIBS
fi fi
echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_SSLeay" >&5 echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_ERR_get_error" >&5
echo "${ECHO_T}$ac_cv_lib_crypto_SSLeay" >&6 echo "${ECHO_T}$ac_cv_lib_crypto_ERR_get_error" >&6
if test $ac_cv_lib_crypto_SSLeay = yes; then if test $ac_cv_lib_crypto_ERR_get_error = yes; then
cat >>confdefs.h <<_ACEOF cat >>confdefs.h <<_ACEOF
#define HAVE_LIBCRYPTO 1 #define HAVE_LIBCRYPTO 1
_ACEOF _ACEOF
@@ -10703,7 +10703,7 @@ _ACEOF
fi fi
if test x"$ac_cv_lib_crypto_SSLeay" = x"yes"; then if test x"$ac_cv_lib_crypto_ERR_get_error" = x"yes"; then
echo "$as_me:$LINENO: checking for SSL_accept in -lssl" >&5 echo "$as_me:$LINENO: checking for SSL_accept in -lssl" >&5
echo $ECHO_N "checking for SSL_accept in -lssl... $ECHO_C" >&6 echo $ECHO_N "checking for SSL_accept in -lssl... $ECHO_C" >&6

4
configure.in
View File

@@ -562,8 +562,8 @@ case "$with_ssl" in
esac esac
case "$with_ssl" in case "$with_ssl" in
yes|check) yes|check)
AC_CHECK_LIB([crypto], [SSLeay], [], [], []) AC_CHECK_LIB([crypto], [ERR_get_error], [], [], [])
if test x"$ac_cv_lib_crypto_SSLeay" = x"yes"; then if test x"$ac_cv_lib_crypto_ERR_get_error" = x"yes"; then
AC_CHECK_LIB([ssl], [SSL_accept], [], [], []) AC_CHECK_LIB([ssl], [SSL_accept], [], [], [])
fi fi
if test x"$ac_cv_lib_ssl_SSL_accept" = x"yes"; then if test x"$ac_cv_lib_ssl_SSL_accept" = x"yes"; then