Changeset 5622


Ignore:
Timestamp:
Jul 6, 2017 5:00:30 AM (2 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:
2 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk/aconfigure

    r5606 r5622  
    757757oldincludedir 
    758758includedir 
     759runstatedir 
    759760localstatedir 
    760761sharedstatedir 
     
    879880sharedstatedir='${prefix}/com' 
    880881localstatedir='${prefix}/var' 
     882runstatedir='${localstatedir}/run' 
    881883includedir='${prefix}/include' 
    882884oldincludedir='/usr/include' 
     
    11311133    silent=yes ;; 
    11321134 
     1135  -runstatedir | --runstatedir | --runstatedi | --runstated \ 
     1136  | --runstate | --runstat | --runsta | --runst | --runs \ 
     1137  | --run | --ru | --r) 
     1138    ac_prev=runstatedir ;; 
     1139  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ 
     1140  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ 
     1141  | --run=* | --ru=* | --r=*) 
     1142    runstatedir=$ac_optarg ;; 
     1143 
    11331144  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) 
    11341145    ac_prev=sbindir ;; 
     
    12681279                datadir sysconfdir sharedstatedir localstatedir includedir \ 
    12691280                oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ 
    1270                 libdir localedir mandir 
     1281                libdir localedir mandir runstatedir 
    12711282do 
    12721283  eval ac_val=\$$ac_var 
     
    14211432  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com] 
    14221433  --localstatedir=DIR     modifiable single-machine data [PREFIX/var] 
     1434  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run] 
    14231435  --libdir=DIR            object code libraries [EPREFIX/lib] 
    14241436  --includedir=DIR        C header files [PREFIX/include] 
     
    79447956 
    79457957                        # EVP_CIPHER_CTX is now opaque in OpenSSL 1.1.0, libsrtp 1.5.4 uses it as a transparent type. 
     7958                        # Update 2.7: our bundled libsrtp has been upgraded to 2.1.0, 
     7959                        # so we can omit EVP_CIPHER_CTX definition check now. 
    79467960                        cat confdefs.h - <<_ACEOF >conftest.$ac_ext 
    79477961/* end confdefs.h.  */ 
     
    79507964main () 
    79517965{ 
    7952 EVP_CIPHER_CTX ctx;EVP_aes_128_gcm(); 
     7966EVP_CIPHER_CTX *ctx;EVP_aes_128_gcm(); 
    79537967  ; 
    79547968  return 0; 
  • pjproject/trunk/aconfigure.ac

    r5606 r5622  
    15821582                         
    15831583                        # EVP_CIPHER_CTX is now opaque in OpenSSL 1.1.0, libsrtp 1.5.4 uses it as a transparent type. 
     1584                        # Update 2.7: our bundled libsrtp has been upgraded to 2.1.0, 
     1585                        # so we can omit EVP_CIPHER_CTX definition check now. 
    15841586                        AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <openssl/evp.h>]], 
    1585                                                           [EVP_CIPHER_CTX ctx;EVP_aes_128_gcm();])], 
     1587                                                          [EVP_CIPHER_CTX *ctx;EVP_aes_128_gcm();])], 
    15861588                                          [AC_CHECK_LIB(crypto,EVP_aes_128_gcm,[ac_ssl_has_aes_gcm=1])]) 
    15871589                        if test "x$ac_ssl_has_aes_gcm" = "x1"; then 
Note: See TracChangeset for help on using the changeset viewer.