![(please configure the [header_logo] section in trac.ini)](/repos/chrome/site/pj.jpg)
Changeset 5725 for pjproject/trunk/aconfigure
- Timestamp:
- Jan 15, 2018 8:52:29 AM (7 years ago)
- File:
-
- 1 edited
-
pjproject/trunk/aconfigure (modified) (16 diffs)
Legend:
- Unmodified
- Added
- Removed
-
pjproject/trunk/aconfigure
r5679 r5725 643 643 ac_no_opencore_amrwb 644 644 ac_no_opencore_amrnb 645 libgnutls_present 646 gnutls_h_present 645 647 libcrypto_present 646 648 libssl_present 647 649 openssl_h_present 650 ac_ssl_backend 648 651 ac_ssl_has_aes_gcm 649 652 ac_no_ssl … … 759 762 oldincludedir 760 763 includedir 761 runstatedir762 764 localstatedir 763 765 sharedstatedir … … 820 822 with_ipp_arch 821 823 with_ssl 824 with_gnutls 822 825 enable_ssl 823 826 with_opencore_amrnb … … 884 887 sharedstatedir='${prefix}/com' 885 888 localstatedir='${prefix}/var' 886 runstatedir='${localstatedir}/run'887 889 includedir='${prefix}/include' 888 890 oldincludedir='/usr/include' … … 1137 1139 silent=yes ;; 1138 1140 1139 -runstatedir | --runstatedir | --runstatedi | --runstated \1140 | --runstate | --runstat | --runsta | --runst | --runs \1141 | --run | --ru | --r)1142 ac_prev=runstatedir ;;1143 -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \1144 | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \1145 | --run=* | --ru=* | --r=*)1146 runstatedir=$ac_optarg ;;1147 1148 1141 -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) 1149 1142 ac_prev=sbindir ;; … … 1283 1276 datadir sysconfdir sharedstatedir localstatedir includedir \ 1284 1277 oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ 1285 libdir localedir mandir runstatedir1278 libdir localedir mandir 1286 1279 do 1287 1280 eval ac_val=\$$ac_var … … 1436 1429 --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] 1437 1430 --localstatedir=DIR modifiable single-machine data [PREFIX/var] 1438 --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]1439 1431 --libdir=DIR object code libraries [EPREFIX/lib] 1440 1432 --includedir=DIR C header files [PREFIX/include] … … 1555 1547 --with-ipp-arch=ARCH Specify the Intel IPP ARCH suffix, e.g. "64" or 1556 1548 "em64t. Default is blank for IA32" 1557 --with-ssl=DIR Specify alternate libssl prefix 1549 --with-ssl=DIR Specify alternate SSL library prefix. This option 1550 will try to find OpenSSL first, then if not found, 1551 GnuTLS. To skip OpenSSL finding, use --with-gnutls 1552 option instead. 1553 --with-gnutls=DIR Specify alternate GnuTLS prefix 1558 1554 --with-opencore-amrnb=DIR 1559 1555 This option is obsolete and replaced by … … 7860 7856 7861 7857 7862 if test "x$ac_cross_compile" != "x" -a "x$with_ssl" = "xno"; then 7858 7859 # Check whether --with-gnutls was given. 7860 if test "${with_gnutls+set}" = set; then : 7861 withval=$with_gnutls; 7862 else 7863 with_gnutls=no 7864 7865 fi 7866 7867 7868 if test "x$ac_cross_compile" != "x" -a "x$with_ssl" = "xno" -a "x$with_gnutls" = "xno"; then 7863 7869 enable_ssl=no 7864 7870 fi … … 7866 7872 7867 7873 ac_ssl_has_aes_gcm=0 7874 7868 7875 7869 7876 # Check whether --enable-ssl was given. … … 7878 7885 else 7879 7886 7880 { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking for OpenSSL installations.." >&57881 $as_echo "checking for OpenSSL installations.." >&6; }7882 7887 if test "x$with_ssl" != "xno" -a "x$with_ssl" != "x"; then 7883 7888 CFLAGS="$CFLAGS -I$with_ssl/include" … … 7887 7892 fi 7888 7893 7889 7890 7891 ac_fn_c_check_header_mongrel "$LINENO" "openssl/ssl.h" "ac_cv_header_openssl_ssl_h" "$ac_includes_default" 7894 if test "x$with_gnutls" = "xno"; then 7895 7896 { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking for OpenSSL installations.." >&5 7897 $as_echo "checking for OpenSSL installations.." >&6; } 7898 7899 7900 7901 ac_fn_c_check_header_mongrel "$LINENO" "openssl/ssl.h" "ac_cv_header_openssl_ssl_h" "$ac_includes_default" 7892 7902 if test "x$ac_cv_header_openssl_ssl_h" = xyes; then : 7893 7903 openssl_h_present=1 … … 7895 7905 7896 7906 7897 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ERR_load_BIO_strings in -lcrypto" >&57907 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ERR_load_BIO_strings in -lcrypto" >&5 7898 7908 $as_echo_n "checking for ERR_load_BIO_strings in -lcrypto... " >&6; } 7899 7909 if ${ac_cv_lib_crypto_ERR_load_BIO_strings+:} false; then : … … 7935 7945 fi 7936 7946 7937 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_CTX_new in -lssl" >&57947 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_CTX_new in -lssl" >&5 7938 7948 $as_echo_n "checking for SSL_CTX_new in -lssl... " >&6; } 7939 7949 if ${ac_cv_lib_ssl_SSL_CTX_new+:} false; then : … … 7975 7985 fi 7976 7986 7977 if test "x$openssl_h_present" = "x1" -a "x$libssl_present" = "x1" -a "x$libcrypto_present" = "x1"; then7987 if test "x$openssl_h_present" = "x1" -a "x$libssl_present" = "x1" -a "x$libcrypto_present" = "x1"; then 7978 7988 { $as_echo "$as_me:${as_lineno-$LINENO}: result: OpenSSL library found, SSL support enabled" >&5 7979 7989 $as_echo "OpenSSL library found, SSL support enabled" >&6; } … … 8051 8061 $as_echo "#define PJ_HAS_SSL_SOCK 1" >>confdefs.h 8052 8062 8053 else 8054 { $as_echo "$as_me:${as_lineno-$LINENO}: result: ** OpenSSL libraries not found, disabling SSL support **" >&5 8055 $as_echo "** OpenSSL libraries not found, disabling SSL support **" >&6; } 8063 $as_echo "#define PJ_SSL_SOCK_IMP PJ_SSL_SOCK_IMP_OPENSSL" >>confdefs.h 8064 8065 ac_ssl_backend="openssl" 8066 else 8067 { $as_echo "$as_me:${as_lineno-$LINENO}: result: ** OpenSSL libraries not found **" >&5 8068 $as_echo "** OpenSSL libraries not found **" >&6; } 8069 fi 8070 8056 8071 fi 8072 8073 if test "x$ac_ssl_backend" = "x"; then 8074 8075 if test "x$with_gnutls" != "xno" -a "x$with_gnutls" != "x"; then 8076 CFLAGS="$CFLAGS -I$with_gnutls/include" 8077 LDFLAGS="$LDFLAGS -L$with_gnutls/lib" 8078 { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using GnuTLS prefix... $with_gnutls" >&5 8079 $as_echo "Using GnuTLS prefix... $with_gnutls" >&6; } 8080 fi 8081 8082 for ac_prog in $host-pkg-config pkg-config "python pkgconfig.py" 8083 do 8084 # Extract the first word of "$ac_prog", so it can be a program name with args. 8085 set dummy $ac_prog; ac_word=$2 8086 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8087 $as_echo_n "checking for $ac_word... " >&6; } 8088 if ${ac_cv_prog_PKG_CONFIG+:} false; then : 8089 $as_echo_n "(cached) " >&6 8090 else 8091 if test -n "$PKG_CONFIG"; then 8092 ac_cv_prog_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test. 8093 else 8094 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 8095 for as_dir in $PATH 8096 do 8097 IFS=$as_save_IFS 8098 test -z "$as_dir" && as_dir=. 8099 for ac_exec_ext in '' $ac_executable_extensions; do 8100 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 8101 ac_cv_prog_PKG_CONFIG="$ac_prog" 8102 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 8103 break 2 8104 fi 8105 done 8106 done 8107 IFS=$as_save_IFS 8108 8109 fi 8110 fi 8111 PKG_CONFIG=$ac_cv_prog_PKG_CONFIG 8112 if test -n "$PKG_CONFIG"; then 8113 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 8114 $as_echo "$PKG_CONFIG" >&6; } 8115 else 8116 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 8117 $as_echo "no" >&6; } 8118 fi 8119 8120 8121 test -n "$PKG_CONFIG" && break 8122 done 8123 test -n "$PKG_CONFIG" || PKG_CONFIG="none" 8124 8125 { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking for GnuTLS installations.." >&5 8126 $as_echo "checking for GnuTLS installations.." >&6; } 8127 8128 8129 ac_fn_c_check_header_mongrel "$LINENO" "gnutls/gnutls.h" "ac_cv_header_gnutls_gnutls_h" "$ac_includes_default" 8130 if test "x$ac_cv_header_gnutls_gnutls_h" = xyes; then : 8131 gnutls_h_present=1 8132 fi 8133 8134 8135 8136 if test "$PKG_CONFIG" != "none"; then 8137 if $PKG_CONFIG --exists gnutls; then 8138 LIBS="$LIBS `$PKG_CONFIG --libs gnutls`" 8139 libgnutls_present=1 8140 else 8141 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gnutls_certificate_set_x509_system_trust in -lgnutls" >&5 8142 $as_echo_n "checking for gnutls_certificate_set_x509_system_trust in -lgnutls... " >&6; } 8143 if ${ac_cv_lib_gnutls_gnutls_certificate_set_x509_system_trust+:} false; then : 8144 $as_echo_n "(cached) " >&6 8145 else 8146 ac_check_lib_save_LIBS=$LIBS 8147 LIBS="-lgnutls $LIBS" 8148 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 8149 /* end confdefs.h. */ 8150 8151 /* Override any GCC internal prototype to avoid an error. 8152 Use char because int might match the return type of a GCC 8153 builtin and then its argument prototype would still apply. */ 8154 #ifdef __cplusplus 8155 extern "C" 8156 #endif 8157 char gnutls_certificate_set_x509_system_trust (); 8158 int 8159 main () 8160 { 8161 return gnutls_certificate_set_x509_system_trust (); 8162 ; 8163 return 0; 8164 } 8165 _ACEOF 8166 if ac_fn_c_try_link "$LINENO"; then : 8167 ac_cv_lib_gnutls_gnutls_certificate_set_x509_system_trust=yes 8168 else 8169 ac_cv_lib_gnutls_gnutls_certificate_set_x509_system_trust=no 8170 fi 8171 rm -f core conftest.err conftest.$ac_objext \ 8172 conftest$ac_exeext conftest.$ac_ext 8173 LIBS=$ac_check_lib_save_LIBS 8174 fi 8175 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gnutls_gnutls_certificate_set_x509_system_trust" >&5 8176 $as_echo "$ac_cv_lib_gnutls_gnutls_certificate_set_x509_system_trust" >&6; } 8177 if test "x$ac_cv_lib_gnutls_gnutls_certificate_set_x509_system_trust" = xyes; then : 8178 libgnutls_present=1 && 8179 LIBS="$LIBS -lgnutls" 8180 fi 8181 8182 fi 8183 else 8184 { $as_echo "$as_me:${as_lineno-$LINENO}: result: *** Warning: neither pkg-config nor python is available, disabling gnutls. ***" >&5 8185 $as_echo "*** Warning: neither pkg-config nor python is available, disabling gnutls. ***" >&6; } 8186 fi 8187 8188 if test "x$gnutls_h_present" = "x1" -a "x$libgnutls_present" = "x1"; then 8189 { $as_echo "$as_me:${as_lineno-$LINENO}: result: GnuTLS library found, SSL support enabled" >&5 8190 $as_echo "GnuTLS library found, SSL support enabled" >&6; } 8191 $as_echo "#define PJ_HAS_SSL_SOCK 1" >>confdefs.h 8192 8193 $as_echo "#define PJ_SSL_SOCK_IMP PJ_SSL_SOCK_IMP_GNUTLS" >>confdefs.h 8194 8195 ac_ssl_backend="gnutls" 8196 else 8197 { $as_echo "$as_me:${as_lineno-$LINENO}: result: ** No GnuTLS libraries found, disabling SSL support **" >&5 8198 $as_echo "** No GnuTLS libraries found, disabling SSL support **" >&6; } 8199 fi 8200 8201 fi 8057 8202 8058 8203 fi
Note: See TracChangeset
for help on using the changeset viewer.
