Changeset 5091


Ignore:
Timestamp:
May 11, 2015 9:18:24 AM (6 years ago)
Author:
ming
Message:

Re #1843 (misc): related to r4966, remove ldl and lz from OpenSSL dependencies since both libraries are actually optional for OpenSSL, and may be unavailable in some platforms, such as BB10

Location:
pjproject/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk/aconfigure

    r5084 r5091  
    76777677else 
    76787678  ac_check_lib_save_LIBS=$LIBS 
    7679 LIBS="-lcrypto -ldl -lz $LIBS" 
     7679LIBS="-lcrypto $LIBS" 
    76807680cat confdefs.h - <<_ACEOF >conftest.$ac_ext 
    76817681/* end confdefs.h.  */ 
     
    77087708$as_echo "$ac_cv_lib_crypto_ERR_load_BIO_strings" >&6; } 
    77097709if test "x$ac_cv_lib_crypto_ERR_load_BIO_strings" = xyes; then : 
    7710   libcrypto_present=1 && LIBS="-lcrypto -ldl -lz $LIBS" 
     7710  libcrypto_present=1 && LIBS="-lcrypto $LIBS" 
    77117711fi 
    77127712 
  • pjproject/trunk/aconfigure.ac

    r5084 r5091  
    15341534                AC_SUBST(libcrypto_present) 
    15351535                AC_CHECK_HEADER(openssl/ssl.h,[openssl_h_present=1]) 
    1536                 AC_CHECK_LIB(crypto,ERR_load_BIO_strings,[libcrypto_present=1 && LIBS="-lcrypto -ldl -lz $LIBS"],,-ldl -lz) 
     1536                AC_CHECK_LIB(crypto,ERR_load_BIO_strings,[libcrypto_present=1 && LIBS="-lcrypto $LIBS"]) 
    15371537                AC_CHECK_LIB(ssl,SSL_library_init,[libssl_present=1 && LIBS="-lssl $LIBS"]) 
    15381538                if test "x$openssl_h_present" = "x1" -a "x$libssl_present" = "x1" -a "x$libcrypto_present" = "x1"; then 
Note: See TracChangeset for help on using the changeset viewer.