Changeset 4892


Ignore:
Timestamp:
Aug 19, 2014 2:18:07 AM (6 years ago)
Author:
ming
Message:

Re #1751 (misc): Fixed compilation error due to the lack of the SSLv2 methods.
The fix will autodetect this and define OPENSSL_NO_SSL2 if necessary. Related to #1321.

Location:
pjproject/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk/aconfigure

    r4881 r4892  
    77187718                        $as_echo "#define PJ_HAS_SSL_SOCK 1" >>confdefs.h 
    77197719 
     7720                        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSLv2_method in -lssl" >&5 
     7721$as_echo_n "checking for SSLv2_method in -lssl... " >&6; } 
     7722if ${ac_cv_lib_ssl_SSLv2_method+:} false; then : 
     7723  $as_echo_n "(cached) " >&6 
     7724else 
     7725  ac_check_lib_save_LIBS=$LIBS 
     7726LIBS="-lssl  $LIBS" 
     7727cat confdefs.h - <<_ACEOF >conftest.$ac_ext 
     7728/* end confdefs.h.  */ 
     7729 
     7730/* Override any GCC internal prototype to avoid an error. 
     7731   Use char because int might match the return type of a GCC 
     7732   builtin and then its argument prototype would still apply.  */ 
     7733#ifdef __cplusplus 
     7734extern "C" 
     7735#endif 
     7736char SSLv2_method (); 
     7737int 
     7738main () 
     7739{ 
     7740return SSLv2_method (); 
     7741  ; 
     7742  return 0; 
     7743} 
     7744_ACEOF 
     7745if ac_fn_c_try_link "$LINENO"; then : 
     7746  ac_cv_lib_ssl_SSLv2_method=yes 
     7747else 
     7748  ac_cv_lib_ssl_SSLv2_method=no 
     7749fi 
     7750rm -f core conftest.err conftest.$ac_objext \ 
     7751    conftest$ac_exeext conftest.$ac_ext 
     7752LIBS=$ac_check_lib_save_LIBS 
     7753fi 
     7754{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSLv2_method" >&5 
     7755$as_echo "$ac_cv_lib_ssl_SSLv2_method" >&6; } 
     7756if test "x$ac_cv_lib_ssl_SSLv2_method" = xyes; then : 
     7757  libssl_no_ssl2=1 
     7758fi 
     7759 
     7760                        if test "x$libssl_no_ssl2" != "x1"; then 
     7761                                CFLAGS="$CFLAGS -DOPENSSL_NO_SSL2=1" 
     7762                        fi 
    77207763                else 
    77217764                        { $as_echo "$as_me:${as_lineno-$LINENO}: result: ** OpenSSL libraries not found, disabling SSL support **" >&5 
  • pjproject/trunk/aconfigure.ac

    r4881 r4892  
    15221522                        #AC_DEFINE(PJSIP_HAS_TLS_TRANSPORT, 1) 
    15231523                        AC_DEFINE(PJ_HAS_SSL_SOCK, 1) 
     1524                        AC_CHECK_LIB(ssl,SSLv2_method,[libssl_no_ssl2=1]) 
     1525                        if test "x$libssl_no_ssl2" != "x1"; then 
     1526                                CFLAGS="$CFLAGS -DOPENSSL_NO_SSL2=1" 
     1527                        fi 
    15241528                else 
    15251529                        AC_MSG_RESULT([** OpenSSL libraries not found, disabling SSL support **]) 
Note: See TracChangeset for help on using the changeset viewer.