Changeset 5414

Timestamp:

Aug 8, 2016 11:19:35 AM (8 years ago)

Author:

ming

Message:

Re #1943: Fixed incorrect configure script.

Location:

pjproject/trunk

Files:

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

pjproject/trunk/aconfigure

@@ -7954 +7954 @@
 
                         # Check if SRTP should be compiled with OpenSSL
-                        # support, to enable cryptos such as AES GCM    AC_CHECK_LIB(crypto,EVP_aes_128_gcm,[ac_ssl_has_aes_gcm=1])
+                        # 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_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lssl  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char EVP_aes_128_gcm ();
+int
+main ()
+{
+return EVP_aes_128_gcm ();
+  ;
+  return 0;
+}
+_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
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+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 :
+  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

pjproject/trunk/aconfigure.ac

@@ -1604 +1604 @@
                         
                         # Check if SRTP should be compiled with OpenSSL
-                        # support, to enable cryptos such as AES GCM    AC_CHECK_LIB(crypto,EVP_aes_128_gcm,[ac_ssl_has_aes_gcm=1])
+                        # support, to enable cryptos such as AES GCM
+                        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])