Ignore:
Timestamp:
Jan 23, 2017 3:34:17 AM (8 years ago)
Author:
nanang
Message:

Close #1932: Support OpenSSL 1.1.0.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk/aconfigure

    r5517 r5537  
    756756oldincludedir 
    757757includedir 
    758 runstatedir 
    759758localstatedir 
    760759sharedstatedir 
     
    879878sharedstatedir='${prefix}/com' 
    880879localstatedir='${prefix}/var' 
    881 runstatedir='${localstatedir}/run' 
    882880includedir='${prefix}/include' 
    883881oldincludedir='/usr/include' 
     
    11321130    silent=yes ;; 
    11331131 
    1134   -runstatedir | --runstatedir | --runstatedi | --runstated \ 
    1135   | --runstate | --runstat | --runsta | --runst | --runs \ 
    1136   | --run | --ru | --r) 
    1137     ac_prev=runstatedir ;; 
    1138   -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ 
    1139   | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ 
    1140   | --run=* | --ru=* | --r=*) 
    1141     runstatedir=$ac_optarg ;; 
    1142  
    11431132  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) 
    11441133    ac_prev=sbindir ;; 
     
    12781267                datadir sysconfdir sharedstatedir localstatedir includedir \ 
    12791268                oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ 
    1280                 libdir localedir mandir runstatedir 
     1269                libdir localedir mandir 
    12811270do 
    12821271  eval ac_val=\$$ac_var 
     
    14311420  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com] 
    14321421  --localstatedir=DIR     modifiable single-machine data [PREFIX/var] 
    1433   --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run] 
    14341422  --libdir=DIR            object code libraries [EPREFIX/lib] 
    14351423  --includedir=DIR        C header files [PREFIX/include] 
     
    78667854fi 
    78677855 
    7868                 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_library_init in -lssl" >&5 
    7869 $as_echo_n "checking for SSL_library_init in -lssl... " >&6; } 
    7870 if ${ac_cv_lib_ssl_SSL_library_init+:} false; then : 
     7856                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_CTX_new in -lssl" >&5 
     7857$as_echo_n "checking for SSL_CTX_new in -lssl... " >&6; } 
     7858if ${ac_cv_lib_ssl_SSL_CTX_new+:} false; then : 
    78717859  $as_echo_n "(cached) " >&6 
    78727860else 
     
    78827870extern "C" 
    78837871#endif 
    7884 char SSL_library_init (); 
     7872char SSL_CTX_new (); 
    78857873int 
    78867874main () 
    78877875{ 
    7888 return SSL_library_init (); 
     7876return SSL_CTX_new (); 
    78897877  ; 
    78907878  return 0; 
     
    78927880_ACEOF 
    78937881if ac_fn_c_try_link "$LINENO"; then : 
    7894   ac_cv_lib_ssl_SSL_library_init=yes 
    7895 else 
    7896   ac_cv_lib_ssl_SSL_library_init=no 
     7882  ac_cv_lib_ssl_SSL_CTX_new=yes 
     7883else 
     7884  ac_cv_lib_ssl_SSL_CTX_new=no 
    78977885fi 
    78987886rm -f core conftest.err conftest.$ac_objext \ 
     
    79007888LIBS=$ac_check_lib_save_LIBS 
    79017889fi 
    7902 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_library_init" >&5 
    7903 $as_echo "$ac_cv_lib_ssl_SSL_library_init" >&6; } 
    7904 if test "x$ac_cv_lib_ssl_SSL_library_init" = xyes; then : 
     7890{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_CTX_new" >&5 
     7891$as_echo "$ac_cv_lib_ssl_SSL_CTX_new" >&6; } 
     7892if test "x$ac_cv_lib_ssl_SSL_CTX_new" = xyes; then : 
    79057893  libssl_present=1 && LIBS="-lssl $LIBS" 
    79067894fi 
     
    79117899 
    79127900                        # Check if SRTP should be compiled with OpenSSL 
    7913                         # support, to enable cryptos such as AES GCM 
    7914                         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for EVP_aes_128_gcm in -lcrypto" >&5 
    7915 $as_echo_n "checking for EVP_aes_128_gcm in -lcrypto... " >&6; } 
    7916 if ${ac_cv_lib_crypto_EVP_aes_128_gcm+:} false; then : 
    7917   $as_echo_n "(cached) " >&6 
    7918 else 
    7919   ac_check_lib_save_LIBS=$LIBS 
    7920 LIBS="-lcrypto  $LIBS" 
    7921 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 
     7901                        # support, to enable cryptos such as AES GCM. 
     7902 
     7903                        # EVP_CIPHER_CTX is now opaque in OpenSSL 1.1.0, libsrtp 1.5.4 uses it as a transparent type. 
     7904                        # AC_CHECK_LIB(crypto,EVP_aes_128_gcm,[ac_ssl_has_aes_gcm=1]) 
     7905                        cat confdefs.h - <<_ACEOF >conftest.$ac_ext 
    79227906/* end confdefs.h.  */ 
    7923  
    7924 /* Override any GCC internal prototype to avoid an error. 
    7925    Use char because int might match the return type of a GCC 
    7926    builtin and then its argument prototype would still apply.  */ 
    7927 #ifdef __cplusplus 
    7928 extern "C" 
    7929 #endif 
    7930 char EVP_aes_128_gcm (); 
     7907#include <openssl/evp.h> 
    79317908int 
    79327909main () 
    79337910{ 
    7934 return EVP_aes_128_gcm (); 
     7911EVP_CIPHER_CTX ctx;EVP_aes_128_gcm(); 
    79357912  ; 
    79367913  return 0; 
    79377914} 
    79387915_ACEOF 
    7939 if ac_fn_c_try_link "$LINENO"; then : 
    7940   ac_cv_lib_crypto_EVP_aes_128_gcm=yes 
    7941 else 
    7942   ac_cv_lib_crypto_EVP_aes_128_gcm=no 
    7943 fi 
    7944 rm -f core conftest.err conftest.$ac_objext \ 
    7945     conftest$ac_exeext conftest.$ac_ext 
    7946 LIBS=$ac_check_lib_save_LIBS 
    7947 fi 
    7948 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_EVP_aes_128_gcm" >&5 
    7949 $as_echo "$ac_cv_lib_crypto_EVP_aes_128_gcm" >&6; } 
    7950 if test "x$ac_cv_lib_crypto_EVP_aes_128_gcm" = xyes; then : 
     7916if ac_fn_c_try_compile "$LINENO"; then : 
    79517917  ac_ssl_has_aes_gcm=1 
    79527918fi 
    7953  
     7919rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext 
    79547920                        if test "x$ac_ssl_has_aes_gcm" = "x1"; then 
    79557921                                { $as_echo "$as_me:${as_lineno-$LINENO}: result: OpenSSL has AES GCM support, SRTP will use OpenSSL" >&5 
Note: See TracChangeset for help on using the changeset viewer.