Changeset 5622

Timestamp:

Jul 6, 2017 5:00:30 AM (7 years ago)

Author:

nanang

Message:

Re #1993: Updated configure script to enable AES-GCM with OpenSSL 1.1.0 after updating bundled libsrtp version.

Location:

pjproject/trunk

Files:

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

pjproject/trunk/aconfigure

@@ -757 +757 @@
 oldincludedir
 includedir
+runstatedir
 localstatedir
 sharedstatedir
@@ -879 +880 @@
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
+runstatedir='${localstatedir}/run'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
@@ -1131 +1133 @@
     silent=yes ;;
 
+  -runstatedir | --runstatedir | --runstatedi | --runstated \
+  | --runstate | --runstat | --runsta | --runst | --runs \
+  | --run | --ru | --r)
+    ac_prev=runstatedir ;;
+  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
+  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
+  | --run=* | --ru=* | --r=*)
+    runstatedir=$ac_optarg ;;
+
   -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
     ac_prev=sbindir ;;
@@ -1268 +1279 @@
                 datadir sysconfdir sharedstatedir localstatedir includedir \
                 oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-                libdir localedir mandir
+                libdir localedir mandir runstatedir
 do
   eval ac_val=\$$ac_var
@@ -1421 +1432 @@
   --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
   --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
   --libdir=DIR            object code libraries [EPREFIX/lib]
   --includedir=DIR        C header files [PREFIX/include]
@@ -7944 +7956 @@
 
                         # EVP_CIPHER_CTX is now opaque in OpenSSL 1.1.0, libsrtp 1.5.4 uses it as a transparent type.
+                        # Update 2.7: our bundled libsrtp has been upgraded to 2.1.0,
+                        # so we can omit EVP_CIPHER_CTX definition check now.
                         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -7950 +7964 @@
 main ()
 {
-EVP_CIPHER_CTX ctx;EVP_aes_128_gcm();
+EVP_CIPHER_CTX *ctx;EVP_aes_128_gcm();
   ;
   return 0;

pjproject/trunk/aconfigure.ac

@@ -1582 +1582 @@
                         
                         # EVP_CIPHER_CTX is now opaque in OpenSSL 1.1.0, libsrtp 1.5.4 uses it as a transparent type.
+                        # Update 2.7: our bundled libsrtp has been upgraded to 2.1.0,
+                        # so we can omit EVP_CIPHER_CTX definition check now.
                         AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <openssl/evp.h>]],
-                                                          [EVP_CIPHER_CTX ctx;EVP_aes_128_gcm();])],
+                                                          [EVP_CIPHER_CTX *ctx;EVP_aes_128_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