configure: fix indentation more
Follow-up to 0052b4b52d #14628
Closes #14682
This commit is contained in:
parent
aaacd02466
commit
26ab9027f0
@ -43,14 +43,14 @@ if test "x$OPT_BEARSSL" != xno; then
|
|||||||
|
|
||||||
AC_CHECK_LIB(bearssl, br_ssl_client_init_full,
|
AC_CHECK_LIB(bearssl, br_ssl_client_init_full,
|
||||||
dnl libbearssl found, set the variable
|
dnl libbearssl found, set the variable
|
||||||
[
|
[
|
||||||
AC_DEFINE(USE_BEARSSL, 1, [if BearSSL is enabled])
|
AC_DEFINE(USE_BEARSSL, 1, [if BearSSL is enabled])
|
||||||
AC_SUBST(USE_BEARSSL, [1])
|
AC_SUBST(USE_BEARSSL, [1])
|
||||||
BEARSSL_ENABLED=1
|
BEARSSL_ENABLED=1
|
||||||
USE_BEARSSL="yes"
|
USE_BEARSSL="yes"
|
||||||
ssl_msg="BearSSL"
|
ssl_msg="BearSSL"
|
||||||
test bearssl != "$DEFAULT_SSL_BACKEND" || VALID_DEFAULT_SSL_BACKEND=yes
|
test bearssl != "$DEFAULT_SSL_BACKEND" || VALID_DEFAULT_SSL_BACKEND=yes
|
||||||
], [], -lbearssl)
|
], [], -lbearssl)
|
||||||
fi
|
fi
|
||||||
|
|
||||||
addld=""
|
addld=""
|
||||||
@ -66,22 +66,22 @@ if test "x$OPT_BEARSSL" != xno; then
|
|||||||
|
|
||||||
LDFLAGS="$LDFLAGS $addld"
|
LDFLAGS="$LDFLAGS $addld"
|
||||||
if test "$addcflags" != "-I/usr/include"; then
|
if test "$addcflags" != "-I/usr/include"; then
|
||||||
CPPFLAGS="$CPPFLAGS $addcflags"
|
CPPFLAGS="$CPPFLAGS $addcflags"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
AC_CHECK_LIB(bearssl, br_ssl_client_init_full,
|
AC_CHECK_LIB(bearssl, br_ssl_client_init_full,
|
||||||
[
|
[
|
||||||
AC_DEFINE(USE_BEARSSL, 1, [if BearSSL is enabled])
|
AC_DEFINE(USE_BEARSSL, 1, [if BearSSL is enabled])
|
||||||
AC_SUBST(USE_BEARSSL, [1])
|
AC_SUBST(USE_BEARSSL, [1])
|
||||||
BEARSSL_ENABLED=1
|
BEARSSL_ENABLED=1
|
||||||
USE_BEARSSL="yes"
|
USE_BEARSSL="yes"
|
||||||
ssl_msg="BearSSL"
|
ssl_msg="BearSSL"
|
||||||
test bearssl != "$DEFAULT_SSL_BACKEND" || VALID_DEFAULT_SSL_BACKEND=yes
|
test bearssl != "$DEFAULT_SSL_BACKEND" || VALID_DEFAULT_SSL_BACKEND=yes
|
||||||
],
|
],
|
||||||
[
|
[
|
||||||
CPPFLAGS=$_cppflags
|
CPPFLAGS=$_cppflags
|
||||||
LDFLAGS=$_ldflags
|
LDFLAGS=$_ldflags
|
||||||
], -lbearssl)
|
], -lbearssl)
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test "x$USE_BEARSSL" = "xyes"; then
|
if test "x$USE_BEARSSL" = "xyes"; then
|
||||||
|
|||||||
@ -148,7 +148,7 @@ AC_DEFUN([CURL_CHECK_COMPILER_DEC_C], [
|
|||||||
CURL_CHECK_DEF([__DECC], [], [silent])
|
CURL_CHECK_DEF([__DECC], [], [silent])
|
||||||
CURL_CHECK_DEF([__DECC_VER], [], [silent])
|
CURL_CHECK_DEF([__DECC_VER], [], [silent])
|
||||||
if test "$curl_cv_have_def___DECC" = "yes" &&
|
if test "$curl_cv_have_def___DECC" = "yes" &&
|
||||||
test "$curl_cv_have_def___DECC_VER" = "yes"; then
|
test "$curl_cv_have_def___DECC_VER" = "yes"; then
|
||||||
AC_MSG_RESULT([yes])
|
AC_MSG_RESULT([yes])
|
||||||
compiler_id="DEC_C"
|
compiler_id="DEC_C"
|
||||||
flags_dbg_yes="-g2"
|
flags_dbg_yes="-g2"
|
||||||
@ -1424,10 +1424,10 @@ AC_DEFUN([CURL_CHECK_COMPILER_SYMBOL_HIDING], [
|
|||||||
$tmp_EXTERN char *dummy(char *buff);
|
$tmp_EXTERN char *dummy(char *buff);
|
||||||
char *dummy(char *buff)
|
char *dummy(char *buff)
|
||||||
{
|
{
|
||||||
if(buff)
|
if(buff)
|
||||||
return ++buff;
|
return ++buff;
|
||||||
else
|
else
|
||||||
return buff;
|
return buff;
|
||||||
}
|
}
|
||||||
]],[[
|
]],[[
|
||||||
char b[16];
|
char b[16];
|
||||||
|
|||||||
@ -4870,11 +4870,11 @@ dnl CURL_LIBRARY_PATH variable. It keeps the LD_LIBRARY_PATH
|
|||||||
dnl changes contained within this macro.
|
dnl changes contained within this macro.
|
||||||
|
|
||||||
AC_DEFUN([CURL_RUN_IFELSE], [
|
AC_DEFUN([CURL_RUN_IFELSE], [
|
||||||
case $host_os in
|
case $host_os in
|
||||||
darwin*)
|
darwin*)
|
||||||
AC_RUN_IFELSE([AC_LANG_SOURCE([$1])], $2, $3, $4)
|
AC_RUN_IFELSE([AC_LANG_SOURCE([$1])], $2, $3, $4)
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
oldcc=$CC
|
oldcc=$CC
|
||||||
old=$LD_LIBRARY_PATH
|
old=$LD_LIBRARY_PATH
|
||||||
CC="sh ./run-compiler"
|
CC="sh ./run-compiler"
|
||||||
@ -4883,8 +4883,8 @@ AC_DEFUN([CURL_RUN_IFELSE], [
|
|||||||
AC_RUN_IFELSE([AC_LANG_SOURCE([$1])], $2, $3, $4)
|
AC_RUN_IFELSE([AC_LANG_SOURCE([$1])], $2, $3, $4)
|
||||||
LD_LIBRARY_PATH=$old # restore
|
LD_LIBRARY_PATH=$old # restore
|
||||||
CC=$oldcc
|
CC=$oldcc
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
])
|
])
|
||||||
|
|
||||||
dnl CURL_COVERAGE
|
dnl CURL_COVERAGE
|
||||||
@ -4901,8 +4901,8 @@ AC_DEFUN([CURL_COVERAGE],[
|
|||||||
|
|
||||||
dnl check if enabled by argument
|
dnl check if enabled by argument
|
||||||
AC_ARG_ENABLE(code-coverage,
|
AC_ARG_ENABLE(code-coverage,
|
||||||
AS_HELP_STRING([--enable-code-coverage], [Provide code coverage]),
|
AS_HELP_STRING([--enable-code-coverage], [Provide code coverage]),
|
||||||
coverage="$enableval")
|
coverage="$enableval")
|
||||||
|
|
||||||
dnl if not gcc switch off again
|
dnl if not gcc switch off again
|
||||||
AS_IF([ test "$GCC" != "yes" ], coverage="no" )
|
AS_IF([ test "$GCC" != "yes" ], coverage="no" )
|
||||||
@ -4981,19 +4981,19 @@ AC_DEFUN([CURL_SIZEOF], [
|
|||||||
r=0
|
r=0
|
||||||
dnl Check the sizes in a reasonable order
|
dnl Check the sizes in a reasonable order
|
||||||
for typesize in 8 4 2 16 1; do
|
for typesize in 8 4 2 16 1; do
|
||||||
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
|
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
$2
|
$2
|
||||||
]],
|
]],
|
||||||
[switch(0) {
|
[switch(0) {
|
||||||
case 0:
|
case 0:
|
||||||
case (sizeof($1) == $typesize):;
|
case (sizeof($1) == $typesize):;
|
||||||
}
|
}
|
||||||
]) ],
|
]) ],
|
||||||
[
|
[
|
||||||
r=$typesize],
|
r=$typesize],
|
||||||
[
|
[
|
||||||
r=0])
|
r=0])
|
||||||
dnl get out of the loop once matched
|
dnl get out of the loop once matched
|
||||||
if test $r -gt 0; then
|
if test $r -gt 0; then
|
||||||
break;
|
break;
|
||||||
|
|||||||
@ -93,24 +93,24 @@ if test "x$OPT_GNUTLS" != xno; then
|
|||||||
LIBS="$addlib $LIBS"
|
LIBS="$addlib $LIBS"
|
||||||
LDFLAGS="$LDFLAGS $addld"
|
LDFLAGS="$LDFLAGS $addld"
|
||||||
if test "$addcflags" != "-I/usr/include"; then
|
if test "$addcflags" != "-I/usr/include"; then
|
||||||
CPPFLAGS="$CPPFLAGS $addcflags"
|
CPPFLAGS="$CPPFLAGS $addcflags"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
dnl this function is selected since it was introduced in 3.1.10
|
dnl this function is selected since it was introduced in 3.1.10
|
||||||
AC_CHECK_LIB(gnutls, gnutls_x509_crt_get_dn2,
|
AC_CHECK_LIB(gnutls, gnutls_x509_crt_get_dn2,
|
||||||
[
|
[
|
||||||
AC_DEFINE(USE_GNUTLS, 1, [if GnuTLS is enabled])
|
AC_DEFINE(USE_GNUTLS, 1, [if GnuTLS is enabled])
|
||||||
AC_SUBST(USE_GNUTLS, [1])
|
AC_SUBST(USE_GNUTLS, [1])
|
||||||
GNUTLS_ENABLED=1
|
GNUTLS_ENABLED=1
|
||||||
USE_GNUTLS="yes"
|
USE_GNUTLS="yes"
|
||||||
ssl_msg="GnuTLS"
|
ssl_msg="GnuTLS"
|
||||||
QUIC_ENABLED=yes
|
QUIC_ENABLED=yes
|
||||||
test gnutls != "$DEFAULT_SSL_BACKEND" || VALID_DEFAULT_SSL_BACKEND=yes
|
test gnutls != "$DEFAULT_SSL_BACKEND" || VALID_DEFAULT_SSL_BACKEND=yes
|
||||||
],
|
],
|
||||||
[
|
[
|
||||||
LIBS="$CLEANLIBS"
|
LIBS="$CLEANLIBS"
|
||||||
CPPFLAGS="$CLEANCPPFLAGS"
|
CPPFLAGS="$CLEANCPPFLAGS"
|
||||||
])
|
])
|
||||||
|
|
||||||
if test "x$USE_GNUTLS" = "xyes"; then
|
if test "x$USE_GNUTLS" = "xyes"; then
|
||||||
AC_MSG_NOTICE([detected GnuTLS version $version])
|
AC_MSG_NOTICE([detected GnuTLS version $version])
|
||||||
|
|||||||
@ -70,18 +70,18 @@ if test "x$OPT_MBEDTLS" != xno; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
AC_CHECK_LIB(mbedtls, mbedtls_ssl_init,
|
AC_CHECK_LIB(mbedtls, mbedtls_ssl_init,
|
||||||
[
|
[
|
||||||
AC_DEFINE(USE_MBEDTLS, 1, [if mbedTLS is enabled])
|
AC_DEFINE(USE_MBEDTLS, 1, [if mbedTLS is enabled])
|
||||||
AC_SUBST(USE_MBEDTLS, [1])
|
AC_SUBST(USE_MBEDTLS, [1])
|
||||||
MBEDTLS_ENABLED=1
|
MBEDTLS_ENABLED=1
|
||||||
USE_MBEDTLS="yes"
|
USE_MBEDTLS="yes"
|
||||||
ssl_msg="mbedTLS"
|
ssl_msg="mbedTLS"
|
||||||
test mbedtls != "$DEFAULT_SSL_BACKEND" || VALID_DEFAULT_SSL_BACKEND=yes
|
test mbedtls != "$DEFAULT_SSL_BACKEND" || VALID_DEFAULT_SSL_BACKEND=yes
|
||||||
],
|
],
|
||||||
[
|
[
|
||||||
CPPFLAGS=$_cppflags
|
CPPFLAGS=$_cppflags
|
||||||
LDFLAGS=$_ldflags
|
LDFLAGS=$_ldflags
|
||||||
], -lmbedx509 -lmbedcrypto)
|
], -lmbedx509 -lmbedcrypto)
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test "x$USE_MBEDTLS" = "xyes"; then
|
if test "x$USE_MBEDTLS" = "xyes"; then
|
||||||
|
|||||||
@ -141,63 +141,60 @@ if test "x$OPT_OPENSSL" != xno; then
|
|||||||
LDFLAGS="$LDFLAGS $SSL_LDFLAGS"
|
LDFLAGS="$LDFLAGS $SSL_LDFLAGS"
|
||||||
|
|
||||||
AC_CHECK_LIB(crypto, HMAC_Update,[
|
AC_CHECK_LIB(crypto, HMAC_Update,[
|
||||||
HAVECRYPTO="yes"
|
HAVECRYPTO="yes"
|
||||||
LIBS="-lcrypto $LIBS"
|
LIBS="-lcrypto $LIBS"
|
||||||
],[
|
],[
|
||||||
if test -n "$LIB_OPENSSL" ; then
|
if test -n "$LIB_OPENSSL" ; then
|
||||||
LDFLAGS="$CLEANLDFLAGS -L$LIB_OPENSSL"
|
LDFLAGS="$CLEANLDFLAGS -L$LIB_OPENSSL"
|
||||||
fi
|
fi
|
||||||
if test "$PKGCONFIG" = "no" -a -n "$PREFIX_OPENSSL" ; then
|
if test "$PKGCONFIG" = "no" -a -n "$PREFIX_OPENSSL" ; then
|
||||||
# only set this if pkg-config wasn't used
|
# only set this if pkg-config wasn't used
|
||||||
CPPFLAGS="$CLEANCPPFLAGS -I$PREFIX_OPENSSL/include"
|
CPPFLAGS="$CLEANCPPFLAGS -I$PREFIX_OPENSSL/include"
|
||||||
fi
|
fi
|
||||||
# Linking previously failed, try extra paths from --with-openssl or
|
# Linking previously failed, try extra paths from --with-openssl or
|
||||||
# pkg-config. Use a different function name to avoid reusing the earlier
|
# pkg-config. Use a different function name to avoid reusing the earlier
|
||||||
# cached result.
|
# cached result.
|
||||||
AC_CHECK_LIB(crypto, HMAC_Init_ex,[
|
AC_CHECK_LIB(crypto, HMAC_Init_ex,[
|
||||||
HAVECRYPTO="yes"
|
HAVECRYPTO="yes"
|
||||||
LIBS="-lcrypto $LIBS"], [
|
LIBS="-lcrypto $LIBS"], [
|
||||||
|
|
||||||
dnl still no, but what about with -ldl?
|
dnl still no, but what about with -ldl?
|
||||||
AC_MSG_CHECKING([OpenSSL linking with -ldl])
|
AC_MSG_CHECKING([OpenSSL linking with -ldl])
|
||||||
LIBS="-lcrypto $CLEANLIBS -ldl"
|
LIBS="-lcrypto $CLEANLIBS -ldl"
|
||||||
AC_LINK_IFELSE([ AC_LANG_PROGRAM([[
|
AC_LINK_IFELSE([ AC_LANG_PROGRAM([[
|
||||||
#include <openssl/err.h>
|
#include <openssl/err.h>
|
||||||
]], [[
|
]], [[
|
||||||
ERR_clear_error();
|
ERR_clear_error();
|
||||||
]]) ],
|
]]) ],
|
||||||
[
|
[
|
||||||
AC_MSG_RESULT(yes)
|
AC_MSG_RESULT(yes)
|
||||||
HAVECRYPTO="yes"
|
HAVECRYPTO="yes"
|
||||||
],
|
],
|
||||||
[
|
[
|
||||||
AC_MSG_RESULT(no)
|
AC_MSG_RESULT(no)
|
||||||
dnl ok, so what about both -ldl and -lpthread?
|
dnl ok, so what about both -ldl and -lpthread?
|
||||||
dnl This may be necessary for static libraries.
|
dnl This may be necessary for static libraries.
|
||||||
|
|
||||||
AC_MSG_CHECKING([OpenSSL linking with -ldl and -lpthread])
|
AC_MSG_CHECKING([OpenSSL linking with -ldl and -lpthread])
|
||||||
LIBS="-lcrypto $CLEANLIBS -ldl -lpthread"
|
LIBS="-lcrypto $CLEANLIBS -ldl -lpthread"
|
||||||
AC_LINK_IFELSE([
|
AC_LINK_IFELSE([
|
||||||
AC_LANG_PROGRAM([[
|
AC_LANG_PROGRAM([[
|
||||||
#include <openssl/err.h>
|
#include <openssl/err.h>
|
||||||
]], [[
|
]], [[
|
||||||
ERR_clear_error();
|
ERR_clear_error();
|
||||||
]])],
|
]])],
|
||||||
[
|
[
|
||||||
AC_MSG_RESULT(yes)
|
AC_MSG_RESULT(yes)
|
||||||
HAVECRYPTO="yes"
|
HAVECRYPTO="yes"
|
||||||
],
|
],
|
||||||
[
|
[
|
||||||
AC_MSG_RESULT(no)
|
AC_MSG_RESULT(no)
|
||||||
LDFLAGS="$CLEANLDFLAGS"
|
LDFLAGS="$CLEANLDFLAGS"
|
||||||
CPPFLAGS="$CLEANCPPFLAGS"
|
CPPFLAGS="$CLEANCPPFLAGS"
|
||||||
LIBS="$CLEANLIBS"
|
LIBS="$CLEANLIBS"
|
||||||
|
])
|
||||||
])
|
])
|
||||||
|
])
|
||||||
])
|
|
||||||
|
|
||||||
])
|
|
||||||
])
|
])
|
||||||
|
|
||||||
if test X"$HAVECRYPTO" = X"yes"; then
|
if test X"$HAVECRYPTO" = X"yes"; then
|
||||||
@ -284,7 +281,7 @@ if test "x$OPT_OPENSSL" != xno; then
|
|||||||
#ifndef OPENSSL_IS_AWSLC
|
#ifndef OPENSSL_IS_AWSLC
|
||||||
#error not AWS-LC
|
#error not AWS-LC
|
||||||
#endif
|
#endif
|
||||||
]])
|
]])
|
||||||
],[
|
],[
|
||||||
AC_MSG_RESULT([yes])
|
AC_MSG_RESULT([yes])
|
||||||
ssl_msg="AWS-LC"
|
ssl_msg="AWS-LC"
|
||||||
@ -296,7 +293,7 @@ if test "x$OPT_OPENSSL" != xno; then
|
|||||||
AC_MSG_CHECKING([for LibreSSL])
|
AC_MSG_CHECKING([for LibreSSL])
|
||||||
AC_COMPILE_IFELSE([
|
AC_COMPILE_IFELSE([
|
||||||
AC_LANG_PROGRAM([[
|
AC_LANG_PROGRAM([[
|
||||||
#include <openssl/opensslv.h>
|
#include <openssl/opensslv.h>
|
||||||
]],[[
|
]],[[
|
||||||
int dummy = LIBRESSL_VERSION_NUMBER;
|
int dummy = LIBRESSL_VERSION_NUMBER;
|
||||||
]])
|
]])
|
||||||
@ -312,7 +309,7 @@ if test "x$OPT_OPENSSL" != xno; then
|
|||||||
AC_MSG_CHECKING([for OpenSSL >= v3])
|
AC_MSG_CHECKING([for OpenSSL >= v3])
|
||||||
AC_COMPILE_IFELSE([
|
AC_COMPILE_IFELSE([
|
||||||
AC_LANG_PROGRAM([[
|
AC_LANG_PROGRAM([[
|
||||||
#include <openssl/opensslv.h>
|
#include <openssl/opensslv.h>
|
||||||
]],[[
|
]],[[
|
||||||
#if (OPENSSL_VERSION_NUMBER >= 0x30000000L)
|
#if (OPENSSL_VERSION_NUMBER >= 0x30000000L)
|
||||||
return 0;
|
return 0;
|
||||||
@ -339,14 +336,14 @@ if test "x$OPT_OPENSSL" != xno; then
|
|||||||
|
|
||||||
if test "$OPENSSL_ENABLED" = "1"; then
|
if test "$OPENSSL_ENABLED" = "1"; then
|
||||||
if test -n "$LIB_OPENSSL"; then
|
if test -n "$LIB_OPENSSL"; then
|
||||||
dnl when the ssl shared libs were found in a path that the run-time
|
dnl when the ssl shared libs were found in a path that the run-time
|
||||||
dnl linker doesn't search through, we need to add it to CURL_LIBRARY_PATH
|
dnl linker doesn't search through, we need to add it to CURL_LIBRARY_PATH
|
||||||
dnl to prevent further configure tests to fail due to this
|
dnl to prevent further configure tests to fail due to this
|
||||||
if test "x$cross_compiling" != "xyes"; then
|
if test "x$cross_compiling" != "xyes"; then
|
||||||
CURL_LIBRARY_PATH="$CURL_LIBRARY_PATH:$LIB_OPENSSL"
|
CURL_LIBRARY_PATH="$CURL_LIBRARY_PATH:$LIB_OPENSSL"
|
||||||
export CURL_LIBRARY_PATH
|
export CURL_LIBRARY_PATH
|
||||||
AC_MSG_NOTICE([Added $LIB_OPENSSL to CURL_LIBRARY_PATH])
|
AC_MSG_NOTICE([Added $LIB_OPENSSL to CURL_LIBRARY_PATH])
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
check_for_ca_bundle=1
|
check_for_ca_bundle=1
|
||||||
LIBCURL_PC_REQUIRES_PRIVATE="$LIBCURL_PC_REQUIRES_PRIVATE openssl"
|
LIBCURL_PC_REQUIRES_PRIVATE="$LIBCURL_PC_REQUIRES_PRIVATE openssl"
|
||||||
@ -356,7 +353,7 @@ if test "x$OPT_OPENSSL" != xno; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
if test X"$OPT_OPENSSL" != Xno &&
|
if test X"$OPT_OPENSSL" != Xno &&
|
||||||
test "$OPENSSL_ENABLED" != "1"; then
|
test "$OPENSSL_ENABLED" != "1"; then
|
||||||
AC_MSG_NOTICE([OPT_OPENSSL: $OPT_OPENSSL])
|
AC_MSG_NOTICE([OPT_OPENSSL: $OPT_OPENSSL])
|
||||||
AC_MSG_NOTICE([OPENSSL_ENABLED: $OPENSSL_ENABLED])
|
AC_MSG_NOTICE([OPENSSL_ENABLED: $OPENSSL_ENABLED])
|
||||||
AC_MSG_ERROR([--with-openssl was given but OpenSSL could not be detected])
|
AC_MSG_ERROR([--with-openssl was given but OpenSSL could not be detected])
|
||||||
@ -395,7 +392,7 @@ if test "$OPENSSL_ENABLED" = "1"; then
|
|||||||
AC_MSG_CHECKING([for SRP support in OpenSSL])
|
AC_MSG_CHECKING([for SRP support in OpenSSL])
|
||||||
AC_LINK_IFELSE([
|
AC_LINK_IFELSE([
|
||||||
AC_LANG_PROGRAM([[
|
AC_LANG_PROGRAM([[
|
||||||
#include <openssl/ssl.h>
|
#include <openssl/ssl.h>
|
||||||
]],[[
|
]],[[
|
||||||
SSL_CTX_set_srp_username(NULL, "");
|
SSL_CTX_set_srp_username(NULL, "");
|
||||||
SSL_CTX_set_srp_password(NULL, "");
|
SSL_CTX_set_srp_password(NULL, "");
|
||||||
@ -430,7 +427,7 @@ if test "$OPENSSL_ENABLED" = "1"; then
|
|||||||
AC_MSG_CHECKING([for QUIC support and OpenSSL >= 3.3])
|
AC_MSG_CHECKING([for QUIC support and OpenSSL >= 3.3])
|
||||||
AC_LINK_IFELSE([
|
AC_LINK_IFELSE([
|
||||||
AC_LANG_PROGRAM([[
|
AC_LANG_PROGRAM([[
|
||||||
#include <openssl/ssl.h>
|
#include <openssl/ssl.h>
|
||||||
]],[[
|
]],[[
|
||||||
#if (OPENSSL_VERSION_NUMBER < 0x30300000L)
|
#if (OPENSSL_VERSION_NUMBER < 0x30300000L)
|
||||||
#error need at least version 3.3.0
|
#error need at least version 3.3.0
|
||||||
|
|||||||
@ -186,5 +186,4 @@ if test "x$OPT_RUSTLS" != xno; then
|
|||||||
fi
|
fi
|
||||||
])
|
])
|
||||||
|
|
||||||
|
|
||||||
RUSTLS_ENABLED
|
RUSTLS_ENABLED
|
||||||
|
|||||||
@ -28,14 +28,14 @@ case $host_os in
|
|||||||
darwin*)
|
darwin*)
|
||||||
AC_COMPILE_IFELSE([
|
AC_COMPILE_IFELSE([
|
||||||
AC_LANG_PROGRAM([[
|
AC_LANG_PROGRAM([[
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#include <TargetConditionals.h>
|
#include <TargetConditionals.h>
|
||||||
]],[[
|
]],[[
|
||||||
#if TARGET_OS_MAC && !(defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE)
|
#if TARGET_OS_MAC && !(defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE)
|
||||||
return 0;
|
return 0;
|
||||||
#else
|
#else
|
||||||
#error Not macOS
|
#error Not macOS
|
||||||
#endif
|
#endif
|
||||||
]])
|
]])
|
||||||
],[
|
],[
|
||||||
build_for_macos="yes"
|
build_for_macos="yes"
|
||||||
|
|||||||
@ -80,8 +80,8 @@ if test "x$OPT_WOLFSSL" != xno; then
|
|||||||
LDFLAGS="$LDFLAGS $addld"
|
LDFLAGS="$LDFLAGS $addld"
|
||||||
AC_MSG_NOTICE([Add $addld to LDFLAGS])
|
AC_MSG_NOTICE([Add $addld to LDFLAGS])
|
||||||
if test "$addcflags" != "-I/usr/include"; then
|
if test "$addcflags" != "-I/usr/include"; then
|
||||||
CPPFLAGS="$CPPFLAGS $addcflags"
|
CPPFLAGS="$CPPFLAGS $addcflags"
|
||||||
AC_MSG_NOTICE([Add $addcflags to CPPFLAGS])
|
AC_MSG_NOTICE([Add $addcflags to CPPFLAGS])
|
||||||
fi
|
fi
|
||||||
|
|
||||||
my_ac_save_LIBS="$LIBS"
|
my_ac_save_LIBS="$LIBS"
|
||||||
@ -101,21 +101,21 @@ if test "x$OPT_WOLFSSL" != xno; then
|
|||||||
return wolfSSL_Init();
|
return wolfSSL_Init();
|
||||||
]])
|
]])
|
||||||
],[
|
],[
|
||||||
AC_MSG_RESULT(yes)
|
AC_MSG_RESULT(yes)
|
||||||
AC_DEFINE(USE_WOLFSSL, 1, [if wolfSSL is enabled])
|
AC_DEFINE(USE_WOLFSSL, 1, [if wolfSSL is enabled])
|
||||||
AC_SUBST(USE_WOLFSSL, [1])
|
AC_SUBST(USE_WOLFSSL, [1])
|
||||||
WOLFSSL_ENABLED=1
|
WOLFSSL_ENABLED=1
|
||||||
USE_WOLFSSL="yes"
|
USE_WOLFSSL="yes"
|
||||||
ssl_msg="wolfSSL"
|
ssl_msg="wolfSSL"
|
||||||
QUIC_ENABLED=yes
|
QUIC_ENABLED=yes
|
||||||
test wolfssl != "$DEFAULT_SSL_BACKEND" || VALID_DEFAULT_SSL_BACKEND=yes
|
test wolfssl != "$DEFAULT_SSL_BACKEND" || VALID_DEFAULT_SSL_BACKEND=yes
|
||||||
],
|
],
|
||||||
[
|
[
|
||||||
AC_MSG_RESULT(no)
|
AC_MSG_RESULT(no)
|
||||||
CPPFLAGS=$_cppflags
|
CPPFLAGS=$_cppflags
|
||||||
LDFLAGS=$_ldflags
|
LDFLAGS=$_ldflags
|
||||||
wolfssllibpath=""
|
wolfssllibpath=""
|
||||||
])
|
])
|
||||||
LIBS="$my_ac_save_LIBS"
|
LIBS="$my_ac_save_LIBS"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
@ -211,7 +211,7 @@ AC_DEFUN([XC_CHECK_USER_FLAGS], [
|
|||||||
test $xc_bad_var_cflags = yes ||
|
test $xc_bad_var_cflags = yes ||
|
||||||
test $xc_bad_var_ldflags = yes ||
|
test $xc_bad_var_ldflags = yes ||
|
||||||
test $xc_bad_var_cppflags = yes; then
|
test $xc_bad_var_cppflags = yes; then
|
||||||
AC_MSG_ERROR([Can not continue. Fix errors mentioned immediately above this line.])
|
AC_MSG_ERROR([Can not continue. Fix errors mentioned immediately above this line.])
|
||||||
fi
|
fi
|
||||||
])
|
])
|
||||||
|
|
||||||
@ -239,6 +239,6 @@ AC_DEFUN([XC_CHECK_BUILD_FLAGS], [
|
|||||||
test $xc_bad_var_cflags = yes ||
|
test $xc_bad_var_cflags = yes ||
|
||||||
test $xc_bad_var_ldflags = yes ||
|
test $xc_bad_var_ldflags = yes ||
|
||||||
test $xc_bad_var_cppflags = yes; then
|
test $xc_bad_var_cppflags = yes; then
|
||||||
AC_MSG_WARN([Continuing even with errors mentioned immediately above this line.])
|
AC_MSG_WARN([Continuing even with errors mentioned immediately above this line.])
|
||||||
fi
|
fi
|
||||||
])
|
])
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user