diff options
author | Liong Sauw Ming <ming@teluu.com> | 2015-04-22 03:40:41 +0000 |
---|---|---|
committer | Liong Sauw Ming <ming@teluu.com> | 2015-04-22 03:40:41 +0000 |
commit | 318e459bbc068aca0b803e631c9956e188589a80 (patch) | |
tree | 2d8b26cc8b05d02d8cb5a7bea8d96c6c4b22e80b | |
parent | 6479925375529b74eeb9cb8dac11a5869102464b (diff) |
Re #1843 (thanks to Alexander Traud for the patch):
Defines like OPENSSL_NO_SSL3_METHOD and OPENSSL_NO_SSL2 are set in
"include/openssl/opensslconf.h". There is no need to query the OpenSSL
libraries. If the installed library does not match the installed headers,
the system is misconfigured.
This will undo r4892
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@5073 74dad513-b988-da41-8d7b-12977e46ad98
-rwxr-xr-x | aconfigure | 43 | ||||
-rw-r--r-- | aconfigure.ac | 4 |
2 files changed, 0 insertions, 47 deletions
@@ -7757,49 +7757,6 @@ $as_echo "OpenSSL library found, SSL support enabled" >&6; } #AC_DEFINE(PJSIP_HAS_TLS_TRANSPORT, 1) $as_echo "#define PJ_HAS_SSL_SOCK 1" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSLv2_method in -lssl" >&5 -$as_echo_n "checking for SSLv2_method in -lssl... " >&6; } -if ${ac_cv_lib_ssl_SSLv2_method+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lssl $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char SSLv2_method (); -int -main () -{ -return SSLv2_method (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_ssl_SSLv2_method=yes -else - ac_cv_lib_ssl_SSLv2_method=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSLv2_method" >&5 -$as_echo "$ac_cv_lib_ssl_SSLv2_method" >&6; } -if test "x$ac_cv_lib_ssl_SSLv2_method" = xyes; then : - libssl_no_ssl2=1 -fi - - if test "x$libssl_no_ssl2" != "x1"; then - CFLAGS="$CFLAGS -DOPENSSL_NO_SSL2=1" - fi else { $as_echo "$as_me:${as_lineno-$LINENO}: result: ** OpenSSL libraries not found, disabling SSL support **" >&5 $as_echo "** OpenSSL libraries not found, disabling SSL support **" >&6; } diff --git a/aconfigure.ac b/aconfigure.ac index 67cf24f1..e0e22d30 100644 --- a/aconfigure.ac +++ b/aconfigure.ac @@ -1540,10 +1540,6 @@ AC_ARG_ENABLE(ssl, # PJSIP_HAS_TLS_TRANSPORT setting follows PJ_HAS_SSL_SOCK #AC_DEFINE(PJSIP_HAS_TLS_TRANSPORT, 1) AC_DEFINE(PJ_HAS_SSL_SOCK, 1) - AC_CHECK_LIB(ssl,SSLv2_method,[libssl_no_ssl2=1]) - if test "x$libssl_no_ssl2" != "x1"; then - CFLAGS="$CFLAGS -DOPENSSL_NO_SSL2=1" - fi else AC_MSG_RESULT([** OpenSSL libraries not found, disabling SSL support **]) fi |