summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLiong Sauw Ming <ming@teluu.com>2016-08-08 11:19:35 +0000
committerLiong Sauw Ming <ming@teluu.com>2016-08-08 11:19:35 +0000
commit383f6b6e0abeca9c60adb93edff4818bae550c1c (patch)
tree0577010da6e5f6f20afa30be8fe8bf162ed78205
parent3cd6641720bf810a675a255bfdc5dd1906873193 (diff)
Re #1943: Fixed incorrect configure script.
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@5414 74dad513-b988-da41-8d7b-12977e46ad98
-rwxr-xr-xaconfigure42
-rw-r--r--aconfigure.ac3
2 files changed, 43 insertions, 2 deletions
diff --git a/aconfigure b/aconfigure
index d82fc108..2787b577 100755
--- a/aconfigure
+++ b/aconfigure
@@ -7953,7 +7953,47 @@ fi
$as_echo "OpenSSL library found, SSL support enabled" >&6; }
# 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
$as_echo "OpenSSL has AES GCM support, SRTP will use OpenSSl version" >&6; }
diff --git a/aconfigure.ac b/aconfigure.ac
index 795c6e4e..ce50f116 100644
--- a/aconfigure.ac
+++ b/aconfigure.ac
@@ -1603,7 +1603,8 @@ AC_ARG_ENABLE(ssl,
AC_MSG_RESULT([OpenSSL library found, SSL support enabled])
# 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])
else