Changeset 5091

Timestamp:

May 11, 2015 9:18:24 AM (10 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:

• aconfigure (modified) (2 diffs)
• aconfigure.ac (modified) (1 diff)

pjproject/trunk/aconfigure

@@ -7677 +7677 @@
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lcrypto -ldl -lz $LIBS"
+LIBS="-lcrypto  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -7708 +7708 @@
 $as_echo "$ac_cv_lib_crypto_ERR_load_BIO_strings" >&6; }
 if test "x$ac_cv_lib_crypto_ERR_load_BIO_strings" = xyes; then :
-  libcrypto_present=1 && LIBS="-lcrypto -ldl -lz $LIBS"
+  libcrypto_present=1 && LIBS="-lcrypto $LIBS"
 fi
 

pjproject/trunk/aconfigure.ac

@@ -1534 +1534 @@
                 AC_SUBST(libcrypto_present)
                 AC_CHECK_HEADER(openssl/ssl.h,[openssl_h_present=1])
-                AC_CHECK_LIB(crypto,ERR_load_BIO_strings,[libcrypto_present=1 && LIBS="-lcrypto -ldl -lz $LIBS"],,-ldl -lz)
+                AC_CHECK_LIB(crypto,ERR_load_BIO_strings,[libcrypto_present=1 && LIBS="-lcrypto $LIBS"])
                 AC_CHECK_LIB(ssl,SSL_library_init,[libssl_present=1 && LIBS="-lssl $LIBS"])
                 if test "x$openssl_h_present" = "x1" -a "x$libssl_present" = "x1" -a "x$libcrypto_present" = "x1"; then