Changeset 5073


Ignore:
Timestamp:
Apr 22, 2015 3:40:41 AM (6 years ago)
Author:
ming
Message:

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

Location:
pjproject/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk/aconfigure

    r5034 r5073  
    77587758                        $as_echo "#define PJ_HAS_SSL_SOCK 1" >>confdefs.h 
    77597759 
    7760                         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSLv2_method in -lssl" >&5 
    7761 $as_echo_n "checking for SSLv2_method in -lssl... " >&6; } 
    7762 if ${ac_cv_lib_ssl_SSLv2_method+:} false; then : 
    7763   $as_echo_n "(cached) " >&6 
    7764 else 
    7765   ac_check_lib_save_LIBS=$LIBS 
    7766 LIBS="-lssl  $LIBS" 
    7767 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 
    7768 /* end confdefs.h.  */ 
    7769  
    7770 /* Override any GCC internal prototype to avoid an error. 
    7771    Use char because int might match the return type of a GCC 
    7772    builtin and then its argument prototype would still apply.  */ 
    7773 #ifdef __cplusplus 
    7774 extern "C" 
    7775 #endif 
    7776 char SSLv2_method (); 
    7777 int 
    7778 main () 
    7779 { 
    7780 return SSLv2_method (); 
    7781   ; 
    7782   return 0; 
    7783 } 
    7784 _ACEOF 
    7785 if ac_fn_c_try_link "$LINENO"; then : 
    7786   ac_cv_lib_ssl_SSLv2_method=yes 
    7787 else 
    7788   ac_cv_lib_ssl_SSLv2_method=no 
    7789 fi 
    7790 rm -f core conftest.err conftest.$ac_objext \ 
    7791     conftest$ac_exeext conftest.$ac_ext 
    7792 LIBS=$ac_check_lib_save_LIBS 
    7793 fi 
    7794 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSLv2_method" >&5 
    7795 $as_echo "$ac_cv_lib_ssl_SSLv2_method" >&6; } 
    7796 if test "x$ac_cv_lib_ssl_SSLv2_method" = xyes; then : 
    7797   libssl_no_ssl2=1 
    7798 fi 
    7799  
    7800                         if test "x$libssl_no_ssl2" != "x1"; then 
    7801                                 CFLAGS="$CFLAGS -DOPENSSL_NO_SSL2=1" 
    7802                         fi 
    78037760                else 
    78047761                        { $as_echo "$as_me:${as_lineno-$LINENO}: result: ** OpenSSL libraries not found, disabling SSL support **" >&5 
  • pjproject/trunk/aconfigure.ac

    r5034 r5073  
    15411541                        #AC_DEFINE(PJSIP_HAS_TLS_TRANSPORT, 1) 
    15421542                        AC_DEFINE(PJ_HAS_SSL_SOCK, 1) 
    1543                         AC_CHECK_LIB(ssl,SSLv2_method,[libssl_no_ssl2=1]) 
    1544                         if test "x$libssl_no_ssl2" != "x1"; then 
    1545                                 CFLAGS="$CFLAGS -DOPENSSL_NO_SSL2=1" 
    1546                         fi 
    15471543                else 
    15481544                        AC_MSG_RESULT([** OpenSSL libraries not found, disabling SSL support **]) 
Note: See TracChangeset for help on using the changeset viewer.