Changeset 5416 for pjproject

Timestamp:

Aug 11, 2016 3:10:37 AM (8 years ago)

Author:

riza

Message:

Re #1943: Improve the clarity of configure log message.

Location:

pjproject/trunk

Files:

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

pjproject/trunk/aconfigure

@@ -7955 +7955 @@
                         # Check if SRTP should be compiled with OpenSSL
                         # support, to enable cryptos such as AES GCM
-                        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for EVP_aes_128_gcm in -lssl" >&5
-$as_echo_n "checking for EVP_aes_128_gcm in -lssl... " >&6; }
-if ${ac_cv_lib_ssl_EVP_aes_128_gcm+:} false; then :
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for EVP_aes_128_gcm in -lcrypto" >&5
+$as_echo_n "checking for EVP_aes_128_gcm in -lcrypto... " >&6; }
+if ${ac_cv_lib_crypto_EVP_aes_128_gcm+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lssl  $LIBS"
+LIBS="-lcrypto  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -7981 +7981 @@
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_ssl_EVP_aes_128_gcm=yes
-else
-  ac_cv_lib_ssl_EVP_aes_128_gcm=no
+  ac_cv_lib_crypto_EVP_aes_128_gcm=yes
+else
+  ac_cv_lib_crypto_EVP_aes_128_gcm=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
@@ -7989 +7989 @@
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_EVP_aes_128_gcm" >&5
-$as_echo "$ac_cv_lib_ssl_EVP_aes_128_gcm" >&6; }
-if test "x$ac_cv_lib_ssl_EVP_aes_128_gcm" = xyes; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_EVP_aes_128_gcm" >&5
+$as_echo "$ac_cv_lib_crypto_EVP_aes_128_gcm" >&6; }
+if test "x$ac_cv_lib_crypto_EVP_aes_128_gcm" = xyes; then :
   ac_ssl_has_aes_gcm=1
 fi
 
                         if test "x$ac_ssl_has_aes_gcm" = "x1"; then
-                                { $as_echo "$as_me:${as_lineno-$LINENO}: result: OpenSSL has AES GCM support, SRTP will use OpenSSl version" >&5
-$as_echo "OpenSSL has AES GCM support, SRTP will use OpenSSl version" >&6; }
+                                { $as_echo "$as_me:${as_lineno-$LINENO}: result: OpenSSL has AES GCM support, SRTP will use OpenSSL" >&5
+$as_echo "OpenSSL has AES GCM support, SRTP will use OpenSSL" >&6; }
                         else
                                 { $as_echo "$as_me:${as_lineno-$LINENO}: result: OpenSSL AES GCM support not found, SRTP will only support AES CM cryptos" >&5

pjproject/trunk/aconfigure.ac

@@ -1607 +1607 @@
                         AC_CHECK_LIB(crypto,EVP_aes_128_gcm,[ac_ssl_has_aes_gcm=1])
                         if test "x$ac_ssl_has_aes_gcm" = "x1"; then
-                                AC_MSG_RESULT([OpenSSL has AES GCM support, SRTP will use OpenSSl version])
+                                AC_MSG_RESULT([OpenSSL has AES GCM support, SRTP will use OpenSSL])
                         else
                                 AC_MSG_RESULT([OpenSSL AES GCM support not found, SRTP will only support AES CM cryptos])