build: drop unused feature macros, update exception list
- cmp-config.pl: add remaining exceptions. Sort list. - drop unused `HAVE_SYS_WAIT_H`. Follow-up to50def7c881#13249 - drop unused `HAVE_FCHMOD`. Follow-up to03cb1ff4d6#12395 - autotools: stop promoting variables to macros: `USE_NGTCP2_CRYPTO_*`, `USE_NGTCP2_H3`, `USE_OPENSSL_H3`, `HAVE_LIBRESSL`. They are not used in the source. - cmake: drop unused `HAVE_O_NONBLOCK`, `HAVE_DISABLED_NONBLOCKING`. - lib: drop `NEED_MALLOC_H`. It was used in manual-build cases for Amiga/MS-DOS/Windows/WinCE, but never by autotools/cmake, thus apparently unnecessary. - lib: drop unused `NEED_MEMORY_H`. - lib: simplify classic mac feature guards, drop `HAVE_EXTRA_STRICMP_H` and `HAVE_EXTRA_STRDUP_H`. - autotools: drop unused `HAVE_GETHOSTBYNAME` detection. - autotools: drop unused OpenSSL feature tests: `HAVE_ERR_H`, `HAVE_PEM_H`, `HAVE_RSA_H` - autotools: drop unused OpenSSL feature tests: `HAVE_X509_H`, `HAVE_CRYPTO_H`, `HAVE_SSL_H`. They performed a fallback check when the primary check missed `openssl/x509.h`. Though if any other prefixed headers were found, OpenSSL is already assumed detected. The fallback check was looking for 3 unprefixed OpenSSL headers, and if all found, marked OpenSSL found internally, but did not promote it to `curl_config.h` via `USE_OPENSSL`. Meaning it either didn't do anything or may have continued with an inconsistent state. Added ind99c20f628(2008) At the time, there was an extra `AC_DEFINE(USE_SSLEAY, 1 ...` logic after this code, which kicked in in the fallback case, but that code was deleted in709cf76f6b(2015) Follow-up to709cf76f6b- autotools: drop `AC_SUBST()` where the value is explicitly set anyway and the macro is unused. - autotools: replace `AC_SUBST(VAR, 1)` with local variable assigments, where the `@VAR@` macro is unused. Also dedupe the local variable if there was a parallel one used for the same purpose. - autotools: drop local feature variables that were never used. - autotools: drop unused `CURL_CHECK_OPTION_NTLM_WB`, `CURL_CHECK_NTLM_WB`. Also stop setting unused `NTLM_WB_ENABLED` macro for VMS. Follow-up to50def7c881#13249 - autotools: drop unused `PKGADD_*`. Follow-up tobae0d473f5#3331 - autotools: drop unused `CURL_NETWORK_LIBS`. Follow-up to3af75e18d6#14697 Closes #15577
This commit is contained in:
Viktor Szakats
parent
ba9fe58d43
commit
dc874d4369
30
.github/scripts/cmp-config.pl
vendored
30
.github/scripts/cmp-config.pl
vendored
@ -34,50 +34,63 @@ if(!$cmake) {
|
||||
# this lists complete lines that will be removed from the output if
|
||||
# matching
|
||||
my %remove = (
|
||||
'#define _FILE_OFFSET_BITS 64' => 1,
|
||||
'#define CURL_EXTERN_SYMBOL' => 1,
|
||||
'#define CURL_SA_FAMILY_T sa_family_t' => 1,
|
||||
'#define CURL_OS "Linux"' => 1,
|
||||
'#define CURL_OS "x86_64-pc-linux-gnu"' => 1,
|
||||
'#define CURL_SA_FAMILY_T ADDRESS_FAMILY' => 1,
|
||||
'#define HAVE_ADDRESS_FAMILY 1' => 1,
|
||||
'#define GETHOSTNAME_TYPE_ARG2 size_t' => 1,
|
||||
'#define CURL_SA_FAMILY_T sa_family_t' => 1,
|
||||
'#define GETHOSTNAME_TYPE_ARG2 int' => 1,
|
||||
'#define GETHOSTNAME_TYPE_ARG2 size_t' => 1,
|
||||
'#define HAVE_ADDRESS_FAMILY 1' => 1,
|
||||
'#define HAVE_BROTLI 1' => 1,
|
||||
'#define HAVE_BROTLI_DECODE_H 1' => 1,
|
||||
'#define HAVE_DECL_GETPWUID_R 1' => 1,
|
||||
'#define HAVE_DECL_GETPWUID_R 0' => 1,
|
||||
'#define HAVE_DECL_GETPWUID_R 1' => 1,
|
||||
'#define HAVE_DECL_GETPWUID_R_MISSING 1' => 1,
|
||||
'#define HAVE_DLFCN_H 1' => 1,
|
||||
'#define HAVE_GETHOSTBYNAME 1' => 1,
|
||||
'#define HAVE_GSSAPI_GSSAPI_KRB5_H 1' => 1,
|
||||
'#define HAVE_INTTYPES_H 1' => 1,
|
||||
'#define HAVE_IOCTL 1' => 1,
|
||||
'#define HAVE_LDAP_H 1' => 1,
|
||||
'#define HAVE_LDAP_SSL 1' => 1,
|
||||
'#define HAVE_LIBBROTLIDEC 1' => 1,
|
||||
'#define HAVE_LIBPSL_H 1' => 1,
|
||||
'#define HAVE_LIBRTMP_RTMP_H 1' => 1,
|
||||
'#define HAVE_LIBSOCKET 1' => 1,
|
||||
'#define HAVE_LIBSSH' => 1,
|
||||
'#define HAVE_LIBSSH2 1' => 1,
|
||||
'#define HAVE_LIBSSL 1' => 1,
|
||||
'#define HAVE_LIBWOLFSSH' => 1,
|
||||
'#define HAVE_LIBZSTD 1' => 1,
|
||||
'#define HAVE_MSH3_H 1' => 1,
|
||||
'#define HAVE_NGHTTP2_NGHTTP2_H 1' => 1,
|
||||
'#define HAVE_NGHTTP3_NGHTTP3_H 1' => 1,
|
||||
'#define HAVE_NGTCP2_NGTCP2_CRYPTO_H 1' => 1,
|
||||
'#define HAVE_NGTCP2_NGTCP2_H 1' => 1,
|
||||
'#define HAVE_OPENSSL_CRYPTO_H 1' => 1,
|
||||
'#define HAVE_OPENSSL_ERR_H 1' => 1,
|
||||
'#define HAVE_OPENSSL_PEM_H 1' => 1,
|
||||
'#define HAVE_OPENSSL_RSA_H 1' => 1,
|
||||
'#define HAVE_OPENSSL_SSL_H 1' => 1,
|
||||
'#define HAVE_OPENSSL_X509_H 1' => 1,
|
||||
'#define HAVE_QUICHE_H 1' => 1,
|
||||
'#define HAVE_SA_FAMILY_T 1' => 1,
|
||||
'#define HAVE_SETJMP_H 1' => 1,
|
||||
'#define HAVE_SSL_ECH_SET1_ECHCONFIG 1' => 1,
|
||||
'#define HAVE_SSL_SET1_ECH_CONFIG_LIST 1' => 1,
|
||||
'#define HAVE_SSL_SET_QUIC_USE_LEGACY_CODEPOINT 1' => 1,
|
||||
'#define HAVE_STDINT_H 1' => 1,
|
||||
'#define HAVE_STDIO_H 1' => 1,
|
||||
'#define HAVE_STDLIB_H 1' => 1,
|
||||
'#define HAVE_STRING_H 1' => 1,
|
||||
'#define HAVE_SYS_XATTR_H 1' => 1,
|
||||
'#define HAVE_UNICODE_UIDNA_H 1' => 1,
|
||||
'#define HAVE_WOLFSSH_SSH_H 1' => 1,
|
||||
'#define HAVE_WOLFSSL_CTX_GENERATEECHCONFIG 1' => 1,
|
||||
'#define HAVE_ZSTD 1' => 1,
|
||||
'#define HAVE_ZSTD_H 1' => 1,
|
||||
'#define LT_OBJDIR ".libs/"' => 1,
|
||||
'#define NEED_LBER_H 1' => 1,
|
||||
'#define CURL_OS "Linux"' => 1,
|
||||
'#define CURL_OS "x86_64-pc-linux-gnu"' => 1,
|
||||
'#define PACKAGE "curl"' => 1,
|
||||
'#define PACKAGE_BUGREPORT "a suitable curl mailing list: https://curl.se/mail/"' => 1,
|
||||
'#define PACKAGE_NAME "curl"' => 1,
|
||||
@ -87,6 +100,7 @@ my %remove = (
|
||||
'#define PACKAGE_VERSION "-"' => 1,
|
||||
'#define SIZEOF_LONG_LONG 8' => 1,
|
||||
'#define VERSION "-"' => 1,
|
||||
'#define _FILE_OFFSET_BITS 64' => 1,
|
||||
);
|
||||
|
||||
sub filter {
|
||||
|
||||
@ -85,7 +85,6 @@ endif()
|
||||
set(HAVE_GETADDRINFO 1)
|
||||
set(HAVE_FREEADDRINFO 1)
|
||||
|
||||
set(HAVE_FCHMOD 0)
|
||||
set(HAVE_SOCKETPAIR 0)
|
||||
set(HAVE_SENDMSG 0)
|
||||
set(HAVE_SENDMMSG 0)
|
||||
@ -132,7 +131,6 @@ set(HAVE_POLL 0)
|
||||
set(HAVE_PWD_H 0)
|
||||
set(HAVE_SYS_EVENTFD_H 0)
|
||||
set(HAVE_SYS_FILIO_H 0)
|
||||
set(HAVE_SYS_WAIT_H 0)
|
||||
set(HAVE_SYS_IOCTL_H 0)
|
||||
set(HAVE_SYS_POLL_H 0)
|
||||
set(HAVE_SYS_RESOURCE_H 0)
|
||||
@ -186,7 +184,6 @@ set(HAVE_GETHOSTBYNAME_R_5_REENTRANT 0)
|
||||
set(HAVE_GETHOSTBYNAME_R_6 0)
|
||||
set(HAVE_GETHOSTBYNAME_R_6_REENTRANT 0)
|
||||
|
||||
set(HAVE_O_NONBLOCK 0)
|
||||
set(HAVE_IN_ADDR_T 0)
|
||||
set(STDC_HEADERS 1)
|
||||
|
||||
|
||||
@ -1465,7 +1465,6 @@ endif()
|
||||
# Order for these is significant.
|
||||
check_include_file("sys/eventfd.h" HAVE_SYS_EVENTFD_H)
|
||||
check_include_file("sys/filio.h" HAVE_SYS_FILIO_H)
|
||||
check_include_file("sys/wait.h" HAVE_SYS_WAIT_H)
|
||||
check_include_file("sys/ioctl.h" HAVE_SYS_IOCTL_H)
|
||||
check_include_file("sys/param.h" HAVE_SYS_PARAM_H)
|
||||
check_include_file("sys/poll.h" HAVE_SYS_POLL_H)
|
||||
@ -1664,7 +1663,6 @@ foreach(_curl_test IN ITEMS
|
||||
HAVE_IOCTL_FIONBIO
|
||||
HAVE_IOCTL_SIOCGIFADDR
|
||||
HAVE_SETSOCKOPT_SO_NONBLOCK
|
||||
HAVE_O_NONBLOCK
|
||||
HAVE_GETHOSTBYNAME_R_3
|
||||
HAVE_GETHOSTBYNAME_R_5
|
||||
HAVE_GETHOSTBYNAME_R_6
|
||||
@ -1759,15 +1757,6 @@ if(NOT HAVE_IN_ADDR_T)
|
||||
set(in_addr_t "unsigned long")
|
||||
endif()
|
||||
|
||||
# Check for nonblocking
|
||||
set(HAVE_DISABLED_NONBLOCKING 1)
|
||||
if(HAVE_FIONBIO OR
|
||||
HAVE_IOCTLSOCKET OR
|
||||
HAVE_IOCTLSOCKET_CASE OR
|
||||
HAVE_O_NONBLOCK)
|
||||
unset(HAVE_DISABLED_NONBLOCKING)
|
||||
endif()
|
||||
|
||||
if(CMAKE_COMPILER_IS_GNUCC AND APPLE)
|
||||
include(CheckCCompilerFlag)
|
||||
check_c_compiler_flag("-Wno-long-double" HAVE_C_FLAG_Wno_long_double)
|
||||
|
||||
@ -1415,13 +1415,11 @@ AC_DEFUN([CURL_CHECK_WIN32_LARGEFILE], [
|
||||
AC_MSG_RESULT([yes (large file enabled)])
|
||||
AC_DEFINE_UNQUOTED(USE_WIN32_LARGE_FILES, 1,
|
||||
[Define to 1 if you are building a Windows target with large file support.])
|
||||
AC_SUBST(USE_WIN32_LARGE_FILES, [1])
|
||||
;;
|
||||
win32_small_files)
|
||||
AC_MSG_RESULT([yes (large file disabled)])
|
||||
AC_DEFINE_UNQUOTED(USE_WIN32_SMALL_FILES, 1,
|
||||
[Define to 1 if you are building a Windows target without large file support.])
|
||||
AC_SUBST(USE_WIN32_SMALL_FILES, [1])
|
||||
;;
|
||||
*)
|
||||
AC_MSG_RESULT([no])
|
||||
@ -1462,7 +1460,7 @@ AC_DEFUN([CURL_CHECK_WIN32_CRYPTO], [
|
||||
AC_MSG_RESULT([yes])
|
||||
AC_DEFINE_UNQUOTED(USE_WIN32_CRYPTO, 1,
|
||||
[Define to 1 if you are building a Windows target with crypto API support.])
|
||||
AC_SUBST(USE_WIN32_CRYPTO, [1])
|
||||
USE_WIN32_CRYPTO=1
|
||||
;;
|
||||
*)
|
||||
AC_MSG_RESULT([no])
|
||||
|
||||
196
configure.ac
196
configure.ac
@ -139,14 +139,6 @@ dnl we extract the numerical version for curl-config only
|
||||
VERSIONNUM=`$SED -ne 's/^#define LIBCURL_VERSION_NUM 0x\([0-9A-Fa-f]*\).*/\1/p' ${srcdir}/include/curl/curlver.h`
|
||||
AC_SUBST(VERSIONNUM)
|
||||
|
||||
dnl Solaris pkgadd support definitions
|
||||
PKGADD_PKG="HAXXcurl"
|
||||
PKGADD_NAME="curl - a client that groks URLs"
|
||||
PKGADD_VENDOR="curl.se"
|
||||
AC_SUBST(PKGADD_PKG)
|
||||
AC_SUBST(PKGADD_NAME)
|
||||
AC_SUBST(PKGADD_VENDOR)
|
||||
|
||||
dnl
|
||||
dnl initialize all the info variables
|
||||
curl_ssl_msg="no (--with-{openssl,gnutls,mbedtls,wolfssl,schannel,secure-transport,amissl,bearssl,rustls} )"
|
||||
@ -677,11 +669,11 @@ AS_HELP_STRING([--disable-http],[Disable HTTP support]),
|
||||
AC_DEFINE(CURL_DISABLE_HTTP, 1, [to disable HTTP])
|
||||
disable_http="yes"
|
||||
AC_MSG_WARN([disable HTTP disables FTP over proxy, IPFS and RTSP])
|
||||
AC_SUBST(CURL_DISABLE_HTTP, [1])
|
||||
CURL_DISABLE_HTTP=1
|
||||
AC_DEFINE(CURL_DISABLE_IPFS, 1, [to disable IPFS])
|
||||
AC_SUBST(CURL_DISABLE_IPFS, [1])
|
||||
CURL_DISABLE_IPFS=1
|
||||
AC_DEFINE(CURL_DISABLE_RTSP, 1, [to disable RTSP])
|
||||
AC_SUBST(CURL_DISABLE_RTSP, [1])
|
||||
CURL_DISABLE_RTSP=1
|
||||
dnl toggle off alt-svc too when HTTP is disabled
|
||||
AC_DEFINE(CURL_DISABLE_ALTSVC, 1, [disable alt-svc])
|
||||
AC_DEFINE(CURL_DISABLE_HSTS, 1, [disable HSTS])
|
||||
@ -705,7 +697,7 @@ AS_HELP_STRING([--disable-ftp],[Disable FTP support]),
|
||||
no)
|
||||
AC_MSG_RESULT(no)
|
||||
AC_DEFINE(CURL_DISABLE_FTP, 1, [to disable FTP])
|
||||
AC_SUBST(CURL_DISABLE_FTP, [1])
|
||||
CURL_DISABLE_FTP=1
|
||||
;;
|
||||
*)
|
||||
AC_MSG_RESULT(yes)
|
||||
@ -721,7 +713,7 @@ AS_HELP_STRING([--disable-file],[Disable FILE support]),
|
||||
no)
|
||||
AC_MSG_RESULT(no)
|
||||
AC_DEFINE(CURL_DISABLE_FILE, 1, [to disable FILE])
|
||||
AC_SUBST(CURL_DISABLE_FILE, [1])
|
||||
CURL_DISABLE_FILE=1
|
||||
;;
|
||||
*)
|
||||
AC_MSG_RESULT(yes)
|
||||
@ -737,7 +729,7 @@ AS_HELP_STRING([--disable-ipfs],[Disable IPFS support]),
|
||||
no)
|
||||
AC_MSG_RESULT(no)
|
||||
AC_DEFINE(CURL_DISABLE_IPFS, 1, [to disable IPFS])
|
||||
AC_SUBST(CURL_DISABLE_IPFS, [1])
|
||||
CURL_DISABLE_IPFS=1
|
||||
;;
|
||||
*)
|
||||
if test x$CURL_DISABLE_HTTP = x1; then
|
||||
@ -763,7 +755,7 @@ AS_HELP_STRING([--disable-ldap],[Disable LDAP support]),
|
||||
no)
|
||||
AC_MSG_RESULT(no)
|
||||
AC_DEFINE(CURL_DISABLE_LDAP, 1, [to disable LDAP])
|
||||
AC_SUBST(CURL_DISABLE_LDAP, [1])
|
||||
CURL_DISABLE_LDAP=1
|
||||
;;
|
||||
yes)
|
||||
ldap_askedfor="yes"
|
||||
@ -783,28 +775,28 @@ AS_HELP_STRING([--disable-ldaps],[Disable LDAPS support]),
|
||||
no)
|
||||
AC_MSG_RESULT(no)
|
||||
AC_DEFINE(CURL_DISABLE_LDAPS, 1, [to disable LDAPS])
|
||||
AC_SUBST(CURL_DISABLE_LDAPS, [1])
|
||||
CURL_DISABLE_LDAPS=1
|
||||
;;
|
||||
*)
|
||||
if test "x$CURL_DISABLE_LDAP" = "x1"; then
|
||||
AC_MSG_RESULT(LDAP needs to be enabled to support LDAPS)
|
||||
AC_DEFINE(CURL_DISABLE_LDAPS, 1, [to disable LDAPS])
|
||||
AC_SUBST(CURL_DISABLE_LDAPS, [1])
|
||||
CURL_DISABLE_LDAPS=1
|
||||
else
|
||||
AC_MSG_RESULT(yes)
|
||||
AC_DEFINE(HAVE_LDAP_SSL, 1, [Use LDAPS implementation])
|
||||
AC_SUBST(HAVE_LDAP_SSL, [1])
|
||||
HAVE_LDAP_SSL=1
|
||||
fi
|
||||
;;
|
||||
esac ],[
|
||||
if test "x$CURL_DISABLE_LDAP" = "x1"; then
|
||||
AC_MSG_RESULT(no)
|
||||
AC_DEFINE(CURL_DISABLE_LDAPS, 1, [to disable LDAPS])
|
||||
AC_SUBST(CURL_DISABLE_LDAPS, [1])
|
||||
CURL_DISABLE_LDAPS=1
|
||||
else
|
||||
AC_MSG_RESULT(yes)
|
||||
AC_DEFINE(HAVE_LDAP_SSL, 1, [Use LDAPS implementation])
|
||||
AC_SUBST(HAVE_LDAP_SSL, [1])
|
||||
HAVE_LDAP_SSL=1
|
||||
fi ]
|
||||
)
|
||||
|
||||
@ -904,7 +896,7 @@ fi
|
||||
if test X"$want_hyper" != Xno; then
|
||||
AC_MSG_NOTICE([Disable RTSP support with hyper])
|
||||
AC_DEFINE(CURL_DISABLE_RTSP, 1, [to disable RTSP])
|
||||
AC_SUBST(CURL_DISABLE_RTSP, [1])
|
||||
CURL_DISABLE_RTSP=1
|
||||
else
|
||||
AC_MSG_CHECKING([whether to support rtsp])
|
||||
AC_ARG_ENABLE(rtsp,
|
||||
@ -914,7 +906,7 @@ AS_HELP_STRING([--disable-rtsp],[Disable RTSP support]),
|
||||
no)
|
||||
AC_MSG_RESULT(no)
|
||||
AC_DEFINE(CURL_DISABLE_RTSP, 1, [to disable RTSP])
|
||||
AC_SUBST(CURL_DISABLE_RTSP, [1])
|
||||
CURL_DISABLE_RTSP=1
|
||||
;;
|
||||
*)
|
||||
if test x$CURL_DISABLE_HTTP = x1; then
|
||||
@ -942,7 +934,7 @@ AS_HELP_STRING([--disable-proxy],[Disable proxy support]),
|
||||
no)
|
||||
AC_MSG_RESULT(no)
|
||||
AC_DEFINE(CURL_DISABLE_PROXY, 1, [to disable proxies])
|
||||
AC_SUBST(CURL_DISABLE_PROXY, [1])
|
||||
CURL_DISABLE_PROXY=1
|
||||
https_proxy="no"
|
||||
;;
|
||||
*)
|
||||
@ -960,7 +952,7 @@ AS_HELP_STRING([--disable-dict],[Disable DICT support]),
|
||||
no)
|
||||
AC_MSG_RESULT(no)
|
||||
AC_DEFINE(CURL_DISABLE_DICT, 1, [to disable DICT])
|
||||
AC_SUBST(CURL_DISABLE_DICT, [1])
|
||||
CURL_DISABLE_DICT=1
|
||||
;;
|
||||
*)
|
||||
AC_MSG_RESULT(yes)
|
||||
@ -977,7 +969,7 @@ AS_HELP_STRING([--disable-telnet],[Disable TELNET support]),
|
||||
no)
|
||||
AC_MSG_RESULT(no)
|
||||
AC_DEFINE(CURL_DISABLE_TELNET, 1, [to disable TELNET])
|
||||
AC_SUBST(CURL_DISABLE_TELNET, [1])
|
||||
CURL_DISABLE_TELNET=1
|
||||
;;
|
||||
*)
|
||||
AC_MSG_RESULT(yes)
|
||||
@ -994,7 +986,7 @@ AS_HELP_STRING([--disable-tftp],[Disable TFTP support]),
|
||||
no)
|
||||
AC_MSG_RESULT(no)
|
||||
AC_DEFINE(CURL_DISABLE_TFTP, 1, [to disable TFTP])
|
||||
AC_SUBST(CURL_DISABLE_TFTP, [1])
|
||||
CURL_DISABLE_TFTP=1
|
||||
;;
|
||||
*)
|
||||
AC_MSG_RESULT(yes)
|
||||
@ -1011,7 +1003,7 @@ AS_HELP_STRING([--disable-pop3],[Disable POP3 support]),
|
||||
no)
|
||||
AC_MSG_RESULT(no)
|
||||
AC_DEFINE(CURL_DISABLE_POP3, 1, [to disable POP3])
|
||||
AC_SUBST(CURL_DISABLE_POP3, [1])
|
||||
CURL_DISABLE_POP3=1
|
||||
;;
|
||||
*)
|
||||
AC_MSG_RESULT(yes)
|
||||
@ -1028,7 +1020,7 @@ AS_HELP_STRING([--disable-imap],[Disable IMAP support]),
|
||||
no)
|
||||
AC_MSG_RESULT(no)
|
||||
AC_DEFINE(CURL_DISABLE_IMAP, 1, [to disable IMAP])
|
||||
AC_SUBST(CURL_DISABLE_IMAP, [1])
|
||||
CURL_DISABLE_IMAP=1
|
||||
;;
|
||||
*)
|
||||
AC_MSG_RESULT(yes)
|
||||
@ -1045,7 +1037,7 @@ AS_HELP_STRING([--disable-smb],[Disable SMB/CIFS support]),
|
||||
no)
|
||||
AC_MSG_RESULT(no)
|
||||
AC_DEFINE(CURL_DISABLE_SMB, 1, [to disable SMB/CIFS])
|
||||
AC_SUBST(CURL_DISABLE_SMB, [1])
|
||||
CURL_DISABLE_SMB=1
|
||||
;;
|
||||
*)
|
||||
AC_MSG_RESULT(yes)
|
||||
@ -1062,7 +1054,7 @@ AS_HELP_STRING([--disable-smtp],[Disable SMTP support]),
|
||||
no)
|
||||
AC_MSG_RESULT(no)
|
||||
AC_DEFINE(CURL_DISABLE_SMTP, 1, [to disable SMTP])
|
||||
AC_SUBST(CURL_DISABLE_SMTP, [1])
|
||||
CURL_DISABLE_SMTP=1
|
||||
;;
|
||||
*)
|
||||
AC_MSG_RESULT(yes)
|
||||
@ -1079,7 +1071,7 @@ AS_HELP_STRING([--disable-gopher],[Disable Gopher support]),
|
||||
no)
|
||||
AC_MSG_RESULT(no)
|
||||
AC_DEFINE(CURL_DISABLE_GOPHER, 1, [to disable Gopher])
|
||||
AC_SUBST(CURL_DISABLE_GOPHER, [1])
|
||||
CURL_DISABLE_GOPHER=1
|
||||
;;
|
||||
*)
|
||||
AC_MSG_RESULT(yes)
|
||||
@ -1096,7 +1088,7 @@ AS_HELP_STRING([--disable-mqtt],[Disable MQTT support]),
|
||||
no)
|
||||
AC_MSG_RESULT(no)
|
||||
AC_DEFINE(CURL_DISABLE_MQTT, 1, [to disable MQTT])
|
||||
AC_SUBST(CURL_DISABLE_MQTT, [1])
|
||||
CURL_DISABLE_MQTT=1
|
||||
;;
|
||||
*)
|
||||
AC_MSG_RESULT(yes)
|
||||
@ -1339,7 +1331,6 @@ if test "$HAVE_GETHOSTBYNAME" != "1" -o "${with_amissl+set}" = set; then
|
||||
HAVE_GETHOSTBYNAME="1"
|
||||
HAVE_PROTO_BSDSOCKET_H="1"
|
||||
AC_DEFINE(HAVE_PROTO_BSDSOCKET_H, 1, [if Amiga bsdsocket.library is in use])
|
||||
AC_SUBST(HAVE_PROTO_BSDSOCKET_H, [1])
|
||||
],[
|
||||
AC_MSG_RESULT([no])
|
||||
])
|
||||
@ -1357,8 +1348,6 @@ fi
|
||||
|
||||
CURL_CHECK_LIBS_CONNECT
|
||||
|
||||
CURL_NETWORK_LIBS=$LIBS
|
||||
|
||||
dnl **********************************************************************
|
||||
dnl In case that function clock_gettime with monotonic timer is available,
|
||||
dnl check for additional required libraries.
|
||||
@ -1559,7 +1548,6 @@ if test X"$OPT_BROTLI" != Xno; then
|
||||
curl_brotli_msg="enabled (libbrotlidec)"
|
||||
HAVE_BROTLI=1
|
||||
AC_DEFINE(HAVE_BROTLI, 1, [if BROTLI is in use])
|
||||
AC_SUBST(HAVE_BROTLI, [1])
|
||||
)
|
||||
|
||||
if test X"$OPT_BROTLI" != Xoff &&
|
||||
@ -1649,7 +1637,6 @@ if test X"$OPT_ZSTD" != Xno; then
|
||||
curl_zstd_msg="enabled (libzstd)"
|
||||
HAVE_ZSTD=1
|
||||
AC_DEFINE(HAVE_ZSTD, 1, [if libzstd is in use])
|
||||
AC_SUBST(HAVE_ZSTD, [1])
|
||||
)
|
||||
|
||||
if test X"$OPT_ZSTD" != Xoff &&
|
||||
@ -1715,9 +1702,11 @@ if test x$CURL_DISABLE_LDAP != x1; then
|
||||
fi
|
||||
AC_MSG_WARN(["$LDAPLIBNAME" is not an LDAP library: LDAP disabled])
|
||||
AC_DEFINE(CURL_DISABLE_LDAP, 1, [to disable LDAP])
|
||||
AC_SUBST(CURL_DISABLE_LDAP, [1])
|
||||
CURL_DISABLE_LDAP=1
|
||||
AC_DEFINE(CURL_DISABLE_LDAPS, 1, [to disable LDAPS])
|
||||
AC_SUBST(CURL_DISABLE_LDAPS, [1])])
|
||||
CURL_DISABLE_LDAPS=1
|
||||
]
|
||||
)
|
||||
else
|
||||
dnl Try to find the right ldap libraries for this system
|
||||
CURL_CHECK_LIBS_LDAP
|
||||
@ -1728,9 +1717,9 @@ if test x$CURL_DISABLE_LDAP != x1; then
|
||||
fi
|
||||
AC_MSG_WARN([Cannot find libraries for LDAP support: LDAP disabled])
|
||||
AC_DEFINE(CURL_DISABLE_LDAP, 1, [to disable LDAP])
|
||||
AC_SUBST(CURL_DISABLE_LDAP, [1])
|
||||
CURL_DISABLE_LDAP=1
|
||||
AC_DEFINE(CURL_DISABLE_LDAPS, 1, [to disable LDAPS])
|
||||
AC_SUBST(CURL_DISABLE_LDAPS, [1])
|
||||
CURL_DISABLE_LDAPS=1
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
@ -1745,9 +1734,11 @@ if test x$CURL_DISABLE_LDAP != x1; then
|
||||
AC_CHECK_LIB("$LBERLIBNAME", ber_free,, [
|
||||
AC_MSG_WARN(["$LBERLIBNAME" is not an LBER library: LDAP disabled])
|
||||
AC_DEFINE(CURL_DISABLE_LDAP, 1, [to disable LDAP])
|
||||
AC_SUBST(CURL_DISABLE_LDAP, [1])
|
||||
CURL_DISABLE_LDAP=1
|
||||
AC_DEFINE(CURL_DISABLE_LDAPS, 1, [to disable LDAPS])
|
||||
AC_SUBST(CURL_DISABLE_LDAPS, [1])])
|
||||
CURL_DISABLE_LDAPS=1
|
||||
]
|
||||
)
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
@ -1763,7 +1754,7 @@ if test x$CURL_DISABLE_LDAP != x1; then
|
||||
if test "x$ac_cv_func_ldap_init_fd" = "xyes"; then
|
||||
curl_ldap_msg="enabled (OpenLDAP)"
|
||||
AC_DEFINE(USE_OPENLDAP, 1, [Use OpenLDAP-specific code])
|
||||
AC_SUBST(USE_OPENLDAP, [1])
|
||||
USE_OPENLDAP=1
|
||||
else
|
||||
curl_ldap_msg="enabled (ancient OpenLDAP)"
|
||||
fi
|
||||
@ -1827,7 +1818,6 @@ if test "$ipv6" = yes; then
|
||||
curl_ipv6_msg="enabled"
|
||||
AC_DEFINE(USE_IPV6, 1, [Define if you want to enable IPv6 support])
|
||||
IPV6_ENABLED=1
|
||||
AC_SUBST(IPV6_ENABLED)
|
||||
|
||||
AC_MSG_CHECKING([if struct sockaddr_in6 has sin6_scope_id member])
|
||||
AC_COMPILE_IFELSE([ AC_LANG_PROGRAM([[
|
||||
@ -2133,7 +2123,6 @@ case "$DEFAULT_SSL_BACKEND" in
|
||||
;;
|
||||
*)
|
||||
dnl --with-default-ssl-backend option used with name
|
||||
AC_SUBST(DEFAULT_SSL_BACKEND)
|
||||
dnl needs to be validated below
|
||||
VALID_DEFAULT_SSL_BACKEND=no
|
||||
;;
|
||||
@ -2149,8 +2138,8 @@ CURL_WITH_WOLFSSL
|
||||
CURL_WITH_BEARSSL
|
||||
CURL_WITH_RUSTLS
|
||||
|
||||
dnl link required libraries for USE_WIN32_CRYPTO or USE_SCHANNEL
|
||||
if test "x$USE_WIN32_CRYPTO" = "x1" -o "x$USE_SCHANNEL" = "x1"; then
|
||||
dnl link required libraries for USE_WIN32_CRYPTO or SCHANNEL_ENABLED
|
||||
if test "x$USE_WIN32_CRYPTO" = "x1" -o "x$SCHANNEL_ENABLED" = "x1"; then
|
||||
LIBS="-ladvapi32 -lcrypt32 $LIBS"
|
||||
fi
|
||||
|
||||
@ -2166,7 +2155,6 @@ Use --with-openssl, --with-gnutls, --with-wolfssl, --with-mbedtls, --with-schann
|
||||
;;
|
||||
x1)
|
||||
# one SSL backend is enabled
|
||||
AC_SUBST(SSL_ENABLED)
|
||||
SSL_ENABLED="1"
|
||||
AC_MSG_NOTICE([built with one SSL backend])
|
||||
;;
|
||||
@ -2180,9 +2168,7 @@ Since these are conflicting parameters, verify which is the desired one and drop
|
||||
;;
|
||||
*)
|
||||
# more than one SSL backend is enabled
|
||||
AC_SUBST(SSL_ENABLED)
|
||||
SSL_ENABLED="1"
|
||||
AC_SUBST(CURL_WITH_MULTI_SSL)
|
||||
CURL_WITH_MULTI_SSL="1"
|
||||
AC_DEFINE(CURL_WITH_MULTI_SSL, 1, [built with multiple SSL backends])
|
||||
AC_MSG_NOTICE([built with multiple SSL backends])
|
||||
@ -2313,9 +2299,8 @@ if test X"$OPT_LIBPSL" != Xno; then
|
||||
[
|
||||
AC_CHECK_HEADERS(libpsl.h,
|
||||
curl_psl_msg="enabled"
|
||||
LIBPSL_ENABLED=1
|
||||
AC_DEFINE(USE_LIBPSL, 1, [if libpsl is in use])
|
||||
AC_SUBST(USE_LIBPSL, [1])
|
||||
USE_LIBPSL=1
|
||||
LIBCURL_PC_REQUIRES_PRIVATE="$LIBCURL_PC_REQUIRES_PRIVATE libpsl"
|
||||
)
|
||||
],
|
||||
@ -2326,7 +2311,7 @@ if test X"$OPT_LIBPSL" != Xno; then
|
||||
LIBS=$CLEANLIBS
|
||||
)
|
||||
|
||||
if test "$LIBPSL_ENABLED" != "1"; then
|
||||
if test "$USE_LIBPSL" != "1"; then
|
||||
AC_MSG_ERROR([libpsl libs and/or directories were not found where specified!])
|
||||
fi
|
||||
fi
|
||||
@ -2430,17 +2415,16 @@ if test X"$OPT_LIBSSH2" != Xno; then
|
||||
|
||||
AC_CHECK_HEADER(libssh2.h,
|
||||
curl_ssh_msg="enabled (libssh2)"
|
||||
LIBSSH2_ENABLED=1
|
||||
AC_DEFINE(USE_LIBSSH2, 1, [if libssh2 is in use])
|
||||
AC_SUBST(USE_LIBSSH2, [1])
|
||||
USE_LIBSSH2=1
|
||||
)
|
||||
|
||||
if test X"$OPT_LIBSSH2" != Xoff &&
|
||||
test "$LIBSSH2_ENABLED" != "1"; then
|
||||
test "$USE_LIBSSH2" != "1"; then
|
||||
AC_MSG_ERROR([libssh2 libs and/or directories were not found where specified!])
|
||||
fi
|
||||
|
||||
if test "$LIBSSH2_ENABLED" = "1"; then
|
||||
if test "$USE_LIBSSH2" = "1"; then
|
||||
if test -n "$DIR_SSH2"; then
|
||||
dnl when the libssh2 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
|
||||
@ -2507,17 +2491,16 @@ elif test X"$OPT_LIBSSH" != Xno; then
|
||||
|
||||
AC_CHECK_HEADER(libssh/libssh.h,
|
||||
curl_ssh_msg="enabled (libssh)"
|
||||
LIBSSH_ENABLED=1
|
||||
AC_DEFINE(USE_LIBSSH, 1, [if libssh is in use])
|
||||
AC_SUBST(USE_LIBSSH, [1])
|
||||
USE_LIBSSH=1
|
||||
)
|
||||
|
||||
if test X"$OPT_LIBSSH" != Xoff &&
|
||||
test "$LIBSSH_ENABLED" != "1"; then
|
||||
test "$USE_LIBSSH" != "1"; then
|
||||
AC_MSG_ERROR([libssh libs and/or directories were not found where specified!])
|
||||
fi
|
||||
|
||||
if test "$LIBSSH_ENABLED" = "1"; then
|
||||
if test "$USE_LIBSSH" = "1"; then
|
||||
if test "$curl_cv_native_windows" = "yes"; then
|
||||
dnl for if_nametoindex
|
||||
LIBS="-liphlpapi $LIBS"
|
||||
@ -2560,9 +2543,8 @@ elif test X"$OPT_WOLFSSH" != Xno; then
|
||||
|
||||
AC_CHECK_HEADERS(wolfssh/ssh.h,
|
||||
curl_ssh_msg="enabled (wolfSSH)"
|
||||
WOLFSSH_ENABLED=1
|
||||
AC_DEFINE(USE_WOLFSSH, 1, [if wolfSSH is in use])
|
||||
AC_SUBST(USE_WOLFSSH, [1])
|
||||
USE_WOLFSSH=1
|
||||
)
|
||||
fi
|
||||
|
||||
@ -2629,9 +2611,8 @@ if test X"$OPT_LIBRTMP" != Xno; then
|
||||
[
|
||||
AC_CHECK_HEADERS(librtmp/rtmp.h,
|
||||
curl_rtmp_msg="enabled (librtmp)"
|
||||
LIBRTMP_ENABLED=1
|
||||
AC_DEFINE(USE_LIBRTMP, 1, [if librtmp is in use])
|
||||
AC_SUBST(USE_LIBRTMP, [1])
|
||||
USE_LIBRTMP=1
|
||||
LIBCURL_PC_REQUIRES_PRIVATE="$LIBCURL_PC_REQUIRES_PRIVATE librtmp"
|
||||
)
|
||||
],
|
||||
@ -2643,7 +2624,7 @@ if test X"$OPT_LIBRTMP" != Xno; then
|
||||
)
|
||||
|
||||
if test X"$OPT_LIBRTMP" != Xoff &&
|
||||
test "$LIBRTMP_ENABLED" != "1"; then
|
||||
test "$USE_LIBRTMP" != "1"; then
|
||||
AC_MSG_ERROR([librtmp libs and/or directories were not found where specified!])
|
||||
fi
|
||||
fi
|
||||
@ -2808,7 +2789,7 @@ AS_HELP_STRING([--without-winidn], [disable Windows native IDN]),
|
||||
#
|
||||
if test "$tst_links_winidn" = "yes"; then
|
||||
AC_DEFINE(USE_WIN32_IDN, 1, [Define to 1 if you have the `normaliz' (WinIDN) library (-lnormaliz).])
|
||||
AC_SUBST([IDN_ENABLED], [1])
|
||||
IDN_ENABLED=1
|
||||
curl_idn_msg="enabled (Windows-native)"
|
||||
else
|
||||
AC_MSG_WARN([Cannot find libraries for IDN support: IDN disabled])
|
||||
@ -2842,8 +2823,8 @@ AS_HELP_STRING([--without-apple-idn],[Disable AppleIDN]),
|
||||
AC_CHECK_HEADERS(unicode/uidna.h,
|
||||
curl_idn_msg="enabled (AppleIDN)"
|
||||
AC_DEFINE(USE_APPLE_IDN, 1, [if AppleIDN])
|
||||
AC_SUBST(USE_APPLE_IDN, [1])
|
||||
AC_SUBST([IDN_ENABLED], [1])
|
||||
USE_APPLE_IDN=1
|
||||
IDN_ENABLED=1
|
||||
LIBS="-licucore -liconv $LIBS"
|
||||
tst_links_appleidn='yes'
|
||||
)
|
||||
@ -2975,7 +2956,7 @@ if test "$want_idn" = "yes"; then
|
||||
AC_DEFINE(HAVE_LIBIDN2, 1, [Define to 1 if you have the `idn2' library (-lidn2).])
|
||||
dnl different versions of libidn have different setups of these:
|
||||
|
||||
AC_SUBST([IDN_ENABLED], [1])
|
||||
IDN_ENABLED=1
|
||||
curl_idn_msg="enabled (libidn2)"
|
||||
if test -n "$IDN_DIR" -a "x$cross_compiling" != "xyes"; then
|
||||
CURL_LIBRARY_PATH="$CURL_LIBRARY_PATH:$IDN_DIR"
|
||||
@ -3074,9 +3055,8 @@ if test X"$want_nghttp2" != Xno; then
|
||||
[
|
||||
AC_CHECK_HEADERS(nghttp2/nghttp2.h,
|
||||
curl_h2_msg="enabled (nghttp2)"
|
||||
NGHTTP2_ENABLED=1
|
||||
AC_DEFINE(USE_NGHTTP2, 1, [if nghttp2 is in use])
|
||||
AC_SUBST(USE_NGHTTP2, [1])
|
||||
USE_NGHTTP2=1
|
||||
LIBCURL_PC_REQUIRES_PRIVATE="$LIBCURL_PC_REQUIRES_PRIVATE libnghttp2"
|
||||
)
|
||||
|
||||
@ -3163,9 +3143,8 @@ if test X"$want_tcp2" != Xno; then
|
||||
AC_CHECK_LIB(ngtcp2, ngtcp2_conn_client_new_versioned,
|
||||
[
|
||||
AC_CHECK_HEADERS(ngtcp2/ngtcp2.h,
|
||||
NGTCP2_ENABLED=1
|
||||
AC_DEFINE(USE_NGTCP2, 1, [if ngtcp2 is in use])
|
||||
AC_SUBST(USE_NGTCP2, [1])
|
||||
USE_NGTCP2=1
|
||||
CURL_LIBRARY_PATH="$CURL_LIBRARY_PATH:$DIR_TCP2"
|
||||
export CURL_LIBRARY_PATH
|
||||
AC_MSG_NOTICE([Added $DIR_TCP2 to CURL_LIBRARY_PATH])
|
||||
@ -3189,7 +3168,7 @@ if test X"$want_tcp2" != Xno; then
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "x$NGTCP2_ENABLED" = "x1" -a "x$OPENSSL_ENABLED" = "x1" -a "x$OPENSSL_IS_BORINGSSL" != "x1"; then
|
||||
if test "x$USE_NGTCP2" = "x1" -a "x$OPENSSL_ENABLED" = "x1" -a "x$OPENSSL_IS_BORINGSSL" != "x1"; then
|
||||
dnl backup the pre-ngtcp2_crypto_quictls variables
|
||||
CLEANLDFLAGS="$LDFLAGS"
|
||||
CLEANLDFLAGSPC="$LDFLAGSPC"
|
||||
@ -3222,9 +3201,7 @@ if test "x$NGTCP2_ENABLED" = "x1" -a "x$OPENSSL_ENABLED" = "x1" -a "x$OPENSSL_IS
|
||||
AC_CHECK_LIB(ngtcp2_crypto_quictls, ngtcp2_crypto_recv_client_initial_cb,
|
||||
[
|
||||
AC_CHECK_HEADERS(ngtcp2/ngtcp2_crypto.h,
|
||||
NGTCP2_ENABLED=1
|
||||
AC_DEFINE(USE_NGTCP2_CRYPTO_QUICTLS, 1, [if ngtcp2_crypto_quictls is in use])
|
||||
AC_SUBST(USE_NGTCP2_CRYPTO_QUICTLS, [1])
|
||||
USE_NGTCP2=1
|
||||
CURL_LIBRARY_PATH="$CURL_LIBRARY_PATH:$DIR_NGTCP2_CRYPTO_QUICTLS"
|
||||
export CURL_LIBRARY_PATH
|
||||
AC_MSG_NOTICE([Added $DIR_NGTCP2_CRYPTO_QUICTLS to CURL_LIBRARY_PATH])
|
||||
@ -3248,7 +3225,7 @@ if test "x$NGTCP2_ENABLED" = "x1" -a "x$OPENSSL_ENABLED" = "x1" -a "x$OPENSSL_IS
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "x$NGTCP2_ENABLED" = "x1" -a "x$OPENSSL_ENABLED" = "x1" -a "x$OPENSSL_IS_BORINGSSL" = "x1"; then
|
||||
if test "x$USE_NGTCP2" = "x1" -a "x$OPENSSL_ENABLED" = "x1" -a "x$OPENSSL_IS_BORINGSSL" = "x1"; then
|
||||
dnl backup the pre-ngtcp2_crypto_boringssl variables
|
||||
CLEANLDFLAGS="$LDFLAGS"
|
||||
CLEANLDFLAGSPC="$LDFLAGSPC"
|
||||
@ -3281,9 +3258,7 @@ if test "x$NGTCP2_ENABLED" = "x1" -a "x$OPENSSL_ENABLED" = "x1" -a "x$OPENSSL_IS
|
||||
AC_CHECK_LIB(ngtcp2_crypto_boringssl, ngtcp2_crypto_recv_client_initial_cb,
|
||||
[
|
||||
AC_CHECK_HEADERS(ngtcp2/ngtcp2_crypto.h,
|
||||
NGTCP2_ENABLED=1
|
||||
AC_DEFINE(USE_NGTCP2_CRYPTO_BORINGSSL, 1, [if ngtcp2_crypto_boringssl is in use])
|
||||
AC_SUBST(USE_NGTCP2_CRYPTO_BORINGSSL, [1])
|
||||
USE_NGTCP2=1
|
||||
CURL_LIBRARY_PATH="$CURL_LIBRARY_PATH:$DIR_NGTCP2_CRYPTO_BORINGSSL"
|
||||
export CURL_LIBRARY_PATH
|
||||
AC_MSG_NOTICE([Added $DIR_NGTCP2_CRYPTO_BORINGSSL to CURL_LIBRARY_PATH])
|
||||
@ -3307,7 +3282,7 @@ if test "x$NGTCP2_ENABLED" = "x1" -a "x$OPENSSL_ENABLED" = "x1" -a "x$OPENSSL_IS
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "x$NGTCP2_ENABLED" = "x1" -a "x$GNUTLS_ENABLED" = "x1"; then
|
||||
if test "x$USE_NGTCP2" = "x1" -a "x$GNUTLS_ENABLED" = "x1"; then
|
||||
dnl backup the pre-ngtcp2_crypto_gnutls variables
|
||||
CLEANLDFLAGS="$LDFLAGS"
|
||||
CLEANLDFLAGSPC="$LDFLAGSPC"
|
||||
@ -3340,9 +3315,7 @@ if test "x$NGTCP2_ENABLED" = "x1" -a "x$GNUTLS_ENABLED" = "x1"; then
|
||||
AC_CHECK_LIB(ngtcp2_crypto_gnutls, ngtcp2_crypto_recv_client_initial_cb,
|
||||
[
|
||||
AC_CHECK_HEADERS(ngtcp2/ngtcp2_crypto.h,
|
||||
NGTCP2_ENABLED=1
|
||||
AC_DEFINE(USE_NGTCP2_CRYPTO_GNUTLS, 1, [if ngtcp2_crypto_gnutls is in use])
|
||||
AC_SUBST(USE_NGTCP2_CRYPTO_GNUTLS, [1])
|
||||
USE_NGTCP2=1
|
||||
CURL_LIBRARY_PATH="$CURL_LIBRARY_PATH:$DIR_NGTCP2_CRYPTO_GNUTLS"
|
||||
export CURL_LIBRARY_PATH
|
||||
AC_MSG_NOTICE([Added $DIR_NGTCP2_CRYPTO_GNUTLS to CURL_LIBRARY_PATH])
|
||||
@ -3366,7 +3339,7 @@ if test "x$NGTCP2_ENABLED" = "x1" -a "x$GNUTLS_ENABLED" = "x1"; then
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "x$NGTCP2_ENABLED" = "x1" -a "x$WOLFSSL_ENABLED" = "x1"; then
|
||||
if test "x$USE_NGTCP2" = "x1" -a "x$WOLFSSL_ENABLED" = "x1"; then
|
||||
dnl backup the pre-ngtcp2_crypto_wolfssl variables
|
||||
CLEANLDFLAGS="$LDFLAGS"
|
||||
CLEANLDFLAGSPC="$LDFLAGSPC"
|
||||
@ -3399,9 +3372,7 @@ if test "x$NGTCP2_ENABLED" = "x1" -a "x$WOLFSSL_ENABLED" = "x1"; then
|
||||
AC_CHECK_LIB(ngtcp2_crypto_wolfssl, ngtcp2_crypto_recv_client_initial_cb,
|
||||
[
|
||||
AC_CHECK_HEADERS(ngtcp2/ngtcp2_crypto.h,
|
||||
NGTCP2_ENABLED=1
|
||||
AC_DEFINE(USE_NGTCP2_CRYPTO_WOLFSSL, 1, [if ngtcp2_crypto_wolfssl is in use])
|
||||
AC_SUBST(USE_NGTCP2_CRYPTO_WOLFSSL, [1])
|
||||
USE_NGTCP2=1
|
||||
CURL_LIBRARY_PATH="$CURL_LIBRARY_PATH:$DIR_NGTCP2_CRYPTO_WOLFSSL"
|
||||
export CURL_LIBRARY_PATH
|
||||
AC_MSG_NOTICE([Added $DIR_NGTCP2_CRYPTO_WOLFSSL to CURL_LIBRARY_PATH])
|
||||
@ -3454,14 +3425,14 @@ esac
|
||||
curl_openssl_quic_msg="no (--with-openssl-quic)"
|
||||
if test "x$want_openssl_quic" = "xyes"; then
|
||||
|
||||
if test "$NGTCP2_ENABLED" = 1; then
|
||||
if test "$USE_NGTCP2" = 1; then
|
||||
AC_MSG_ERROR([--with-openssl-quic and --with-ngtcp2 are mutually exclusive])
|
||||
fi
|
||||
if test "$have_openssl_quic" != 1; then
|
||||
AC_MSG_ERROR([--with-openssl-quic requires quic support and OpenSSL >= 3.3.0])
|
||||
fi
|
||||
AC_DEFINE(USE_OPENSSL_QUIC, 1, [if openssl QUIC is in use])
|
||||
AC_SUBST(USE_OPENSSL_QUIC, [1])
|
||||
USE_OPENSSL_QUIC=1
|
||||
fi
|
||||
|
||||
dnl **********************************************************************
|
||||
@ -3538,7 +3509,7 @@ if test X"$want_nghttp3" != Xno; then
|
||||
[
|
||||
AC_CHECK_HEADERS(nghttp3/nghttp3.h,
|
||||
AC_DEFINE(USE_NGHTTP3, 1, [if nghttp3 is in use])
|
||||
AC_SUBST(USE_NGHTTP3, [1])
|
||||
USE_NGHTTP3=1
|
||||
CURL_LIBRARY_PATH="$CURL_LIBRARY_PATH:$DIR_NGHTTP3"
|
||||
export CURL_LIBRARY_PATH
|
||||
AC_MSG_NOTICE([Added $DIR_NGHTTP3 to CURL_LIBRARY_PATH])
|
||||
@ -3566,9 +3537,8 @@ dnl **********************************************************************
|
||||
dnl Check for ngtcp2 and nghttp3 (HTTP/3 with ngtcp2 + nghttp3)
|
||||
dnl **********************************************************************
|
||||
|
||||
if test "x$NGTCP2_ENABLED" = "x1" -a "x$USE_NGHTTP3" = "x1"; then
|
||||
AC_DEFINE(USE_NGTCP2_H3, 1, [if ngtcp2 + nghttp3 is in use])
|
||||
AC_SUBST(USE_NGTCP2_H3, [1])
|
||||
if test "x$USE_NGTCP2" = "x1" -a "x$USE_NGHTTP3" = "x1"; then
|
||||
USE_NGTCP2_H3=1
|
||||
AC_MSG_NOTICE([HTTP3 support is experimental])
|
||||
curl_h3_msg="enabled (ngtcp2 + nghttp3)"
|
||||
fi
|
||||
@ -3579,8 +3549,7 @@ dnl **********************************************************************
|
||||
|
||||
if test "x$USE_OPENSSL_QUIC" = "x1" -a "x$USE_NGHTTP3" = "x1"; then
|
||||
experimental="$experimental HTTP3"
|
||||
AC_DEFINE(USE_OPENSSL_H3, 1, [if openssl quic + nghttp3 is in use])
|
||||
AC_SUBST(USE_OPENSSL_H3, [1])
|
||||
USE_OPENSSL_H3=1
|
||||
AC_MSG_NOTICE([HTTP3 support is experimental])
|
||||
curl_h3_msg="enabled (openssl + nghttp3)"
|
||||
fi
|
||||
@ -3662,9 +3631,8 @@ if test X"$want_quiche" != Xno; then
|
||||
experimental="$experimental HTTP3"
|
||||
AC_MSG_NOTICE([HTTP3 support is experimental])
|
||||
curl_h3_msg="enabled (quiche)"
|
||||
QUICHE_ENABLED=1
|
||||
AC_DEFINE(USE_QUICHE, 1, [if quiche is in use])
|
||||
AC_SUBST(USE_QUICHE, [1])
|
||||
USE_QUICHE=1
|
||||
AC_CHECK_FUNCS([quiche_conn_set_qlog_fd])
|
||||
CURL_LIBRARY_PATH="$CURL_LIBRARY_PATH:$DIR_QUICHE"
|
||||
export CURL_LIBRARY_PATH
|
||||
@ -3737,7 +3705,7 @@ if test X"$want_msh3" != Xno; then
|
||||
if test "$NGHTTP3_ENABLED" = 1; then
|
||||
AC_MSG_ERROR([--with-msh3 and --with-ngtcp2 are mutually exclusive])
|
||||
fi
|
||||
if test "$QUICHE_ENABLED" = 1; then
|
||||
if test "$USE_QUICHE" = 1; then
|
||||
AC_MSG_ERROR([--with-msh3 and --with-quiche are mutually exclusive])
|
||||
fi
|
||||
|
||||
@ -3761,9 +3729,8 @@ if test X"$want_msh3" != Xno; then
|
||||
[
|
||||
AC_CHECK_HEADERS(msh3.h,
|
||||
curl_h3_msg="enabled (msh3)"
|
||||
MSH3_ENABLED=1
|
||||
AC_DEFINE(USE_MSH3, 1, [if msh3 is in use])
|
||||
AC_SUBST(USE_MSH3, [1])
|
||||
USE_MSH3=1
|
||||
CURL_LIBRARY_PATH="$CURL_LIBRARY_PATH:$DIR_MSH3"
|
||||
export CURL_LIBRARY_PATH
|
||||
AC_MSG_NOTICE([Added $DIR_MSH3 to CURL_LIBRARY_PATH])
|
||||
@ -3845,9 +3812,8 @@ if test X"$want_libuv" != Xno; then
|
||||
AC_CHECK_LIB(uv, uv_default_loop,
|
||||
[
|
||||
AC_CHECK_HEADERS(uv.h,
|
||||
LIBUV_ENABLED=1
|
||||
AC_DEFINE(USE_LIBUV, 1, [if libuv is in use])
|
||||
AC_SUBST(USE_LIBUV, [1])
|
||||
USE_LIBUV=1
|
||||
CURL_LIBRARY_PATH="$CURL_LIBRARY_PATH:$DIR_LIBUV"
|
||||
export CURL_LIBRARY_PATH
|
||||
AC_MSG_NOTICE([Added $DIR_LIBUV to CURL_LIBRARY_PATH])
|
||||
@ -3965,7 +3931,6 @@ AC_CHECK_HEADERS(
|
||||
locale.h \
|
||||
stdbool.h \
|
||||
sys/filio.h \
|
||||
sys/wait.h \
|
||||
sys/eventfd.h \
|
||||
setjmp.h,
|
||||
dnl to do if not found
|
||||
@ -4128,7 +4093,6 @@ CURL_CHECK_FUNC_FREEADDRINFO
|
||||
CURL_CHECK_FUNC_FSETXATTR
|
||||
CURL_CHECK_FUNC_FTRUNCATE
|
||||
CURL_CHECK_FUNC_GETADDRINFO
|
||||
CURL_CHECK_FUNC_GETHOSTBYNAME
|
||||
CURL_CHECK_FUNC_GETHOSTBYNAME_R
|
||||
CURL_CHECK_FUNC_GETHOSTNAME
|
||||
CURL_CHECK_FUNC_GETPEERNAME
|
||||
@ -4423,7 +4387,7 @@ AS_HELP_STRING([--disable-sspi],[Disable SSPI]),
|
||||
if test "$curl_cv_native_windows" = "yes"; then
|
||||
AC_MSG_RESULT(yes)
|
||||
AC_DEFINE(USE_WINDOWS_SSPI, 1, [to enable SSPI support])
|
||||
AC_SUBST(USE_WINDOWS_SSPI, [1])
|
||||
USE_WINDOWS_SSPI=1
|
||||
curl_sspi_msg="enabled"
|
||||
else
|
||||
AC_MSG_RESULT(no)
|
||||
@ -4458,7 +4422,6 @@ AS_HELP_STRING([--disable-basic-auth],[Disable basic authentication]),
|
||||
no)
|
||||
AC_MSG_RESULT(no)
|
||||
AC_DEFINE(CURL_DISABLE_BASIC_AUTH, 1, [to disable basic authentication])
|
||||
CURL_DISABLE_BASIC_AUTH=1
|
||||
;;
|
||||
*)
|
||||
AC_MSG_RESULT(yes)
|
||||
@ -4478,7 +4441,6 @@ AS_HELP_STRING([--disable-bearer-auth],[Disable bearer authentication]),
|
||||
no)
|
||||
AC_MSG_RESULT(no)
|
||||
AC_DEFINE(CURL_DISABLE_BEARER_AUTH, 1, [to disable bearer authentication])
|
||||
CURL_DISABLE_BEARER_AUTH=1
|
||||
;;
|
||||
*)
|
||||
AC_MSG_RESULT(yes)
|
||||
@ -4498,7 +4460,6 @@ AS_HELP_STRING([--disable-digest-auth],[Disable digest authentication]),
|
||||
no)
|
||||
AC_MSG_RESULT(no)
|
||||
AC_DEFINE(CURL_DISABLE_DIGEST_AUTH, 1, [to disable digest authentication])
|
||||
CURL_DISABLE_DIGEST_AUTH=1
|
||||
;;
|
||||
*)
|
||||
AC_MSG_RESULT(yes)
|
||||
@ -4558,7 +4519,6 @@ AS_HELP_STRING([--disable-aws],[Disable AWS sig support]),
|
||||
no)
|
||||
AC_MSG_RESULT(no)
|
||||
AC_DEFINE(CURL_DISABLE_AWS, 1, [to disable AWS sig support])
|
||||
CURL_DISABLE_AWS=1
|
||||
;;
|
||||
*)
|
||||
AC_MSG_RESULT(yes)
|
||||
@ -4643,7 +4603,7 @@ if test "x$want_unix_sockets" != "xno"; then
|
||||
else
|
||||
AC_CHECK_MEMBER([struct sockaddr_un.sun_path], [
|
||||
AC_DEFINE(USE_UNIX_SOCKETS, 1, [Use Unix domain sockets])
|
||||
AC_SUBST(USE_UNIX_SOCKETS, [1])
|
||||
USE_UNIX_SOCKETS=1
|
||||
curl_unix_sockets_msg="enabled"
|
||||
], [
|
||||
if test "x$want_unix_sockets" = "xyes"; then
|
||||
@ -5049,7 +5009,7 @@ if test "x$CURL_DISABLE_HTTP" != "x1"; then
|
||||
no)
|
||||
AC_MSG_RESULT(no)
|
||||
AC_DEFINE(CURL_DISABLE_WEBSOCKETS, [1], [disable WebSockets])
|
||||
AC_SUBST(CURL_DISABLE_WEBSOCKETS, [1])
|
||||
CURL_DISABLE_WEBSOCKETS=1
|
||||
;;
|
||||
*)
|
||||
if test ${ac_cv_sizeof_curl_off_t} -gt 4; then
|
||||
@ -5059,7 +5019,7 @@ if test "x$CURL_DISABLE_HTTP" != "x1"; then
|
||||
AC_MSG_RESULT(no)
|
||||
AC_MSG_WARN([WebSockets disabled due to lack of >32 bit curl_off_t])
|
||||
AC_DEFINE(CURL_DISABLE_WEBSOCKETS, [1], [disable WebSockets])
|
||||
AC_SUBST(CURL_DISABLE_WEBSOCKETS, [1])
|
||||
CURL_DISABLE_WEBSOCKETS=1
|
||||
fi
|
||||
;;
|
||||
esac ],
|
||||
@ -5068,7 +5028,7 @@ if test "x$CURL_DISABLE_HTTP" != "x1"; then
|
||||
else
|
||||
AC_MSG_WARN([WebSockets disabled because HTTP is disabled])
|
||||
AC_DEFINE(CURL_DISABLE_WEBSOCKETS, [1], [disable WebSockets])
|
||||
AC_SUBST(CURL_DISABLE_WEBSOCKETS, [1])
|
||||
CURL_DISABLE_WEBSOCKETS=1
|
||||
fi
|
||||
|
||||
dnl ************************************************************
|
||||
@ -5101,7 +5061,6 @@ LIBCURL_PC_LIBS_PRIVATE="$LIBS$PTHREAD"
|
||||
|
||||
AC_SUBST(LIBCURL_PC_LDFLAGS_PRIVATE)
|
||||
AC_SUBST(LIBCURL_PC_LIBS_PRIVATE)
|
||||
AC_SUBST(CURL_NETWORK_LIBS)
|
||||
AC_SUBST(CURL_NETWORK_AND_TIME_LIBS)
|
||||
|
||||
dnl BLANK_AT_MAKETIME may be used in our Makefile.am files to blank
|
||||
@ -5439,7 +5398,6 @@ squeeze LIBS
|
||||
|
||||
squeeze LIBCURL_PC_LDFLAGS_PRIVATE
|
||||
squeeze LIBCURL_PC_LIBS_PRIVATE
|
||||
squeeze CURL_NETWORK_LIBS
|
||||
squeeze CURL_NETWORK_AND_TIME_LIBS
|
||||
|
||||
squeeze SUPPORT_FEATURES
|
||||
|
||||
@ -59,8 +59,6 @@
|
||||
#define HAVE_WRITABLE_ARGV 1
|
||||
#define HAVE_SYS_IOCTL_H 1
|
||||
|
||||
#define NEED_MALLOC_H 1
|
||||
|
||||
#define SIZEOF_INT 4
|
||||
#define SIZEOF_SIZE_T 4
|
||||
|
||||
|
||||
@ -75,8 +75,6 @@
|
||||
#define HAVE_SYS_TYPES_H 1
|
||||
#define HAVE_UNISTD_H 1
|
||||
|
||||
#define NEED_MALLOC_H 1
|
||||
|
||||
#define SIZEOF_INT 4
|
||||
#define SIZEOF_LONG 4
|
||||
#define SIZEOF_SIZE_T 4
|
||||
|
||||
@ -97,7 +97,4 @@
|
||||
#define SEND_TYPE_ARG4 int
|
||||
#define SEND_TYPE_RETV ssize_t
|
||||
|
||||
#define HAVE_EXTRA_STRICMP_H 1
|
||||
#define HAVE_EXTRA_STRDUP_H 1
|
||||
|
||||
#endif /* HEADER_CURL_CONFIG_MAC_H */
|
||||
|
||||
@ -110,9 +110,6 @@
|
||||
/* Define if you have the GNU gssapi libraries */
|
||||
#undef HAVE_GSSGNU
|
||||
|
||||
/* Define if you need the malloc.h header file even with stdlib.h */
|
||||
/* #define NEED_MALLOC_H 1 */
|
||||
|
||||
/* Define if you have the <netdb.h> header file. */
|
||||
#define HAVE_NETDB_H
|
||||
|
||||
|
||||
@ -105,9 +105,6 @@
|
||||
/* Define if you have the <io.h> header file. */
|
||||
#undef HAVE_IO_H
|
||||
|
||||
/* Define if you need the malloc.h header file even with stdlib.h */
|
||||
/* #define NEED_MALLOC_H 1 */
|
||||
|
||||
/* Define if you have the <netdb.h> header file. */
|
||||
#define HAVE_NETDB_H
|
||||
|
||||
|
||||
@ -44,9 +44,6 @@
|
||||
/* Define if you have the <locale.h> header file. */
|
||||
#define HAVE_LOCALE_H 1
|
||||
|
||||
/* Define if you need <malloc.h> header even with <stdlib.h> header file. */
|
||||
#define NEED_MALLOC_H 1
|
||||
|
||||
/* Define if you have the <netdb.h> header file. */
|
||||
/* #define HAVE_NETDB_H 1 */
|
||||
|
||||
|
||||
@ -41,9 +41,6 @@
|
||||
/* Define if you have the <io.h> header file. */
|
||||
#define HAVE_IO_H 1
|
||||
|
||||
/* Define if you need the malloc.h header file even with stdlib.h */
|
||||
#define NEED_MALLOC_H 1
|
||||
|
||||
/* Define if you have the <netdb.h> header file. */
|
||||
/* #define HAVE_NETDB_H 1 */
|
||||
|
||||
|
||||
@ -565,9 +565,6 @@
|
||||
/* Define to 1 if you have the <sys/filio.h> header file. */
|
||||
#cmakedefine HAVE_SYS_FILIO_H 1
|
||||
|
||||
/* Define to 1 if you have the <sys/wait.h> header file. */
|
||||
#cmakedefine HAVE_SYS_WAIT_H 1
|
||||
|
||||
/* Define to 1 if you have the <sys/ioctl.h> header file. */
|
||||
#cmakedefine HAVE_SYS_IOCTL_H 1
|
||||
|
||||
@ -625,9 +622,6 @@
|
||||
/* Define this symbol if your OS supports changing the contents of argv */
|
||||
#cmakedefine HAVE_WRITABLE_ARGV 1
|
||||
|
||||
/* Define to 1 if you need the malloc.h header file even with stdlib.h */
|
||||
#cmakedefine NEED_MALLOC_H 1
|
||||
|
||||
/* Define to 1 if _REENTRANT preprocessor symbol must be defined. */
|
||||
#cmakedefine NEED_REENTRANT 1
|
||||
|
||||
|
||||
@ -399,11 +399,8 @@
|
||||
# include <lwip/netdb.h>
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_EXTRA_STRICMP_H
|
||||
#ifdef macintosh
|
||||
# include <extra/stricmp.h>
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_EXTRA_STRDUP_H
|
||||
# include <extra/strdup.h>
|
||||
#endif
|
||||
|
||||
|
||||
@ -40,14 +40,6 @@
|
||||
#include <sys/types.h>
|
||||
#endif
|
||||
|
||||
#ifdef NEED_MALLOC_H
|
||||
#include <malloc.h>
|
||||
#endif
|
||||
|
||||
#ifdef NEED_MEMORY_H
|
||||
#include <memory.h>
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_SYS_STAT_H
|
||||
#include <sys/stat.h>
|
||||
#endif
|
||||
|
||||
@ -46,7 +46,6 @@ if test "x$OPT_BEARSSL" != xno; then
|
||||
dnl libbearssl found, set the variable
|
||||
[
|
||||
AC_DEFINE(USE_BEARSSL, 1, [if BearSSL is enabled])
|
||||
AC_SUBST(USE_BEARSSL, [1])
|
||||
BEARSSL_ENABLED=1
|
||||
USE_BEARSSL="yes"
|
||||
ssl_msg="BearSSL"
|
||||
@ -74,7 +73,6 @@ if test "x$OPT_BEARSSL" != xno; then
|
||||
AC_CHECK_LIB(bearssl, br_ssl_client_init_full,
|
||||
[
|
||||
AC_DEFINE(USE_BEARSSL, 1, [if BearSSL is enabled])
|
||||
AC_SUBST(USE_BEARSSL, [1])
|
||||
BEARSSL_ENABLED=1
|
||||
USE_BEARSSL="yes"
|
||||
ssl_msg="BearSSL"
|
||||
|
||||
@ -565,76 +565,13 @@ AC_DEFUN([CURL_CHECK_LIB_ARES], [
|
||||
dnl finally c-ares will be used
|
||||
AC_DEFINE(USE_ARES, 1, [Define to enable c-ares support])
|
||||
AC_DEFINE(CARES_NO_DEPRECATED, 1, [Ignore c-ares deprecation warnings])
|
||||
AC_SUBST([USE_ARES], [1])
|
||||
USE_ARES=1
|
||||
LIBCURL_PC_REQUIRES_PRIVATE="$LIBCURL_PC_REQUIRES_PRIVATE libcares"
|
||||
curl_res_msg="c-ares"
|
||||
fi
|
||||
fi
|
||||
])
|
||||
|
||||
dnl CURL_CHECK_OPTION_NTLM_WB
|
||||
dnl -------------------------------------------------
|
||||
dnl Verify if configure has been invoked with option
|
||||
dnl --enable-ntlm-wb or --disable-ntlm-wb, and set
|
||||
dnl shell variable want_ntlm_wb and want_ntlm_wb_file
|
||||
dnl as appropriate.
|
||||
|
||||
AC_DEFUN([CURL_CHECK_OPTION_NTLM_WB], [
|
||||
AC_BEFORE([$0],[CURL_CHECK_NTLM_WB])dnl
|
||||
OPT_NTLM_WB="default"
|
||||
AC_ARG_ENABLE(ntlm-wb,
|
||||
AS_HELP_STRING([--enable-ntlm-wb@<:@=FILE@:>@],[Enable NTLM delegation to winbind's ntlm_auth helper, where FILE is ntlm_auth's absolute filename (default: /usr/bin/ntlm_auth)])
|
||||
AS_HELP_STRING([--disable-ntlm-wb],[Disable NTLM delegation to winbind's ntlm_auth helper]),
|
||||
OPT_NTLM_WB=$enableval)
|
||||
want_ntlm_wb_file="/usr/bin/ntlm_auth"
|
||||
case "$OPT_NTLM_WB" in
|
||||
no)
|
||||
dnl --disable-ntlm-wb option used
|
||||
want_ntlm_wb="no"
|
||||
;;
|
||||
default)
|
||||
dnl configure option not specified
|
||||
want_ntlm_wb="yes"
|
||||
;;
|
||||
*)
|
||||
dnl --enable-ntlm-wb option used
|
||||
want_ntlm_wb="yes"
|
||||
if test -n "$enableval" && test "$enableval" != "yes"; then
|
||||
want_ntlm_wb_file="$enableval"
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
])
|
||||
|
||||
|
||||
dnl CURL_CHECK_NTLM_WB
|
||||
dnl -------------------------------------------------
|
||||
dnl Check if support for NTLM delegation to winbind's
|
||||
dnl ntlm_auth helper will finally be enabled depending
|
||||
dnl on given configure options and target platform.
|
||||
|
||||
AC_DEFUN([CURL_CHECK_NTLM_WB], [
|
||||
AC_REQUIRE([CURL_CHECK_OPTION_NTLM_WB])dnl
|
||||
AC_REQUIRE([CURL_CHECK_NATIVE_WINDOWS])dnl
|
||||
AC_MSG_CHECKING([whether to enable NTLM delegation to winbind's helper])
|
||||
if test "$curl_cv_native_windows" = "yes" ||
|
||||
test "x$SSL_ENABLED" = "x"; then
|
||||
want_ntlm_wb_file=""
|
||||
want_ntlm_wb="no"
|
||||
elif test "x$ac_cv_func_fork" != "xyes"; then
|
||||
dnl ntlm_wb requires fork
|
||||
want_ntlm_wb="no"
|
||||
fi
|
||||
AC_MSG_RESULT([$want_ntlm_wb])
|
||||
if test "$want_ntlm_wb" = "yes"; then
|
||||
AC_DEFINE(NTLM_WB_ENABLED, 1,
|
||||
[Define to enable NTLM delegation to winbind's ntlm_auth helper.])
|
||||
AC_DEFINE_UNQUOTED(NTLM_WB_FILE, "$want_ntlm_wb_file",
|
||||
[Define absolute filename for winbind's ntlm_auth helper.])
|
||||
NTLM_WB_ENABLED=1
|
||||
fi
|
||||
])
|
||||
|
||||
dnl CURL_CHECK_OPTION_HTTPSRR
|
||||
dnl -----------------------------------------------------
|
||||
dnl Verify whether configure has been invoked with option
|
||||
|
||||
@ -1498,103 +1498,6 @@ AC_DEFUN([CURL_CHECK_FUNC_GETADDRINFO], [
|
||||
])
|
||||
|
||||
|
||||
dnl CURL_CHECK_FUNC_GETHOSTBYNAME
|
||||
dnl -------------------------------------------------
|
||||
dnl Verify if gethostbyname is available, prototyped,
|
||||
dnl and can be compiled. If all of these are true,
|
||||
dnl and usage has not been previously disallowed with
|
||||
dnl shell variable curl_disallow_gethostbyname, then
|
||||
dnl HAVE_GETHOSTBYNAME will be defined.
|
||||
|
||||
AC_DEFUN([CURL_CHECK_FUNC_GETHOSTBYNAME], [
|
||||
AC_REQUIRE([CURL_INCLUDES_WINSOCK2])dnl
|
||||
AC_REQUIRE([CURL_INCLUDES_NETDB])dnl
|
||||
#
|
||||
tst_links_gethostbyname="unknown"
|
||||
tst_proto_gethostbyname="unknown"
|
||||
tst_compi_gethostbyname="unknown"
|
||||
tst_allow_gethostbyname="unknown"
|
||||
#
|
||||
AC_MSG_CHECKING([if gethostbyname can be linked])
|
||||
AC_LINK_IFELSE([
|
||||
AC_LANG_PROGRAM([[
|
||||
$curl_includes_winsock2
|
||||
$curl_includes_bsdsocket
|
||||
$curl_includes_netdb
|
||||
]],[[
|
||||
if(0 != gethostbyname(0))
|
||||
return 1;
|
||||
]])
|
||||
],[
|
||||
AC_MSG_RESULT([yes])
|
||||
tst_links_gethostbyname="yes"
|
||||
],[
|
||||
AC_MSG_RESULT([no])
|
||||
tst_links_gethostbyname="no"
|
||||
])
|
||||
#
|
||||
if test "$tst_links_gethostbyname" = "yes"; then
|
||||
AC_MSG_CHECKING([if gethostbyname is prototyped])
|
||||
AC_EGREP_CPP([gethostbyname],[
|
||||
$curl_includes_winsock2
|
||||
$curl_includes_bsdsocket
|
||||
$curl_includes_netdb
|
||||
],[
|
||||
AC_MSG_RESULT([yes])
|
||||
tst_proto_gethostbyname="yes"
|
||||
],[
|
||||
AC_MSG_RESULT([no])
|
||||
tst_proto_gethostbyname="no"
|
||||
])
|
||||
fi
|
||||
#
|
||||
if test "$tst_proto_gethostbyname" = "yes"; then
|
||||
AC_MSG_CHECKING([if gethostbyname is compilable])
|
||||
AC_COMPILE_IFELSE([
|
||||
AC_LANG_PROGRAM([[
|
||||
$curl_includes_winsock2
|
||||
$curl_includes_bsdsocket
|
||||
$curl_includes_netdb
|
||||
]],[[
|
||||
if(0 != gethostbyname(0))
|
||||
return 1;
|
||||
]])
|
||||
],[
|
||||
AC_MSG_RESULT([yes])
|
||||
tst_compi_gethostbyname="yes"
|
||||
],[
|
||||
AC_MSG_RESULT([no])
|
||||
tst_compi_gethostbyname="no"
|
||||
])
|
||||
fi
|
||||
#
|
||||
if test "$tst_compi_gethostbyname" = "yes"; then
|
||||
AC_MSG_CHECKING([if gethostbyname usage allowed])
|
||||
if test "x$curl_disallow_gethostbyname" != "xyes"; then
|
||||
AC_MSG_RESULT([yes])
|
||||
tst_allow_gethostbyname="yes"
|
||||
else
|
||||
AC_MSG_RESULT([no])
|
||||
tst_allow_gethostbyname="no"
|
||||
fi
|
||||
fi
|
||||
#
|
||||
AC_MSG_CHECKING([if gethostbyname might be used])
|
||||
if test "$tst_links_gethostbyname" = "yes" &&
|
||||
test "$tst_proto_gethostbyname" = "yes" &&
|
||||
test "$tst_compi_gethostbyname" = "yes" &&
|
||||
test "$tst_allow_gethostbyname" = "yes"; then
|
||||
AC_MSG_RESULT([yes])
|
||||
AC_DEFINE_UNQUOTED(HAVE_GETHOSTBYNAME, 1,
|
||||
[Define to 1 if you have the gethostbyname function.])
|
||||
curl_cv_func_gethostbyname="yes"
|
||||
else
|
||||
AC_MSG_RESULT([no])
|
||||
curl_cv_func_gethostbyname="no"
|
||||
fi
|
||||
])
|
||||
|
||||
|
||||
dnl CURL_CHECK_FUNC_GETHOSTBYNAME_R
|
||||
dnl -------------------------------------------------
|
||||
dnl Verify if gethostbyname_r is available, prototyped,
|
||||
|
||||
@ -102,7 +102,6 @@ if test "x$OPT_GNUTLS" != xno; then
|
||||
AC_CHECK_LIB(gnutls, gnutls_x509_crt_get_dn2,
|
||||
[
|
||||
AC_DEFINE(USE_GNUTLS, 1, [if GnuTLS is enabled])
|
||||
AC_SUBST(USE_GNUTLS, [1])
|
||||
GNUTLS_ENABLED=1
|
||||
USE_GNUTLS="yes"
|
||||
ssl_msg="GnuTLS"
|
||||
@ -164,7 +163,7 @@ if test "$GNUTLS_ENABLED" = "1"; then
|
||||
AC_CHECK_LIB(gnutls, gnutls_srp_verifier,
|
||||
[
|
||||
AC_DEFINE(HAVE_GNUTLS_SRP, 1, [if you have the function gnutls_srp_verifier])
|
||||
AC_SUBST(HAVE_GNUTLS_SRP, [1])
|
||||
HAVE_GNUTLS_SRP=1
|
||||
])
|
||||
fi
|
||||
|
||||
|
||||
@ -46,7 +46,6 @@ if test "x$OPT_MBEDTLS" != xno; then
|
||||
dnl libmbedtls found, set the variable
|
||||
[
|
||||
AC_DEFINE(USE_MBEDTLS, 1, [if mbedTLS is enabled])
|
||||
AC_SUBST(USE_MBEDTLS, [1])
|
||||
MBEDTLS_ENABLED=1
|
||||
USE_MBEDTLS="yes"
|
||||
ssl_msg="mbedTLS"
|
||||
@ -74,7 +73,6 @@ if test "x$OPT_MBEDTLS" != xno; then
|
||||
AC_CHECK_LIB(mbedtls, mbedtls_ssl_init,
|
||||
[
|
||||
AC_DEFINE(USE_MBEDTLS, 1, [if mbedTLS is enabled])
|
||||
AC_SUBST(USE_MBEDTLS, [1])
|
||||
MBEDTLS_ENABLED=1
|
||||
USE_MBEDTLS="yes"
|
||||
ssl_msg="mbedTLS"
|
||||
|
||||
@ -120,7 +120,6 @@ if test "x$OPT_OPENSSL" != xno; then
|
||||
SSL_CPPFLAGS=`CURL_EXPORT_PCDIR([$OPENSSL_PCDIR]) dnl
|
||||
$PKGCONFIG --cflags-only-I openssl 2>/dev/null`
|
||||
|
||||
AC_SUBST(SSL_LIBS)
|
||||
AC_MSG_NOTICE([pkg-config: SSL_LIBS: "$SSL_LIBS"])
|
||||
AC_MSG_NOTICE([pkg-config: SSL_LDFLAGS: "$SSL_LDFLAGS"])
|
||||
AC_MSG_NOTICE([pkg-config: SSL_CPPFLAGS: "$SSL_CPPFLAGS"])
|
||||
@ -230,21 +229,6 @@ if test "x$OPT_OPENSSL" != xno; then
|
||||
test openssl != "$DEFAULT_SSL_BACKEND" || VALID_DEFAULT_SSL_BACKEND=yes
|
||||
OPENSSL_ENABLED=1
|
||||
AC_DEFINE(USE_OPENSSL, 1, [if OpenSSL is in use]))
|
||||
|
||||
if test $ac_cv_header_openssl_x509_h = no; then
|
||||
dnl we don't use the "action" part of the AC_CHECK_HEADERS macro
|
||||
dnl since 'err.h' might in fact find a krb4 header with the same
|
||||
dnl name
|
||||
AC_CHECK_HEADERS(x509.h rsa.h crypto.h pem.h ssl.h err.h)
|
||||
|
||||
if test $ac_cv_header_x509_h = yes &&
|
||||
test $ac_cv_header_crypto_h = yes &&
|
||||
test $ac_cv_header_ssl_h = yes; then
|
||||
dnl three matches
|
||||
ssl_msg="OpenSSL"
|
||||
OPENSSL_ENABLED=1
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
if test X"$OPENSSL_ENABLED" != X"1"; then
|
||||
@ -303,8 +287,6 @@ if test "x$OPT_OPENSSL" != xno; then
|
||||
]])
|
||||
],[
|
||||
AC_MSG_RESULT([yes])
|
||||
AC_DEFINE_UNQUOTED(HAVE_LIBRESSL, 1,
|
||||
[Define to 1 if using LibreSSL.])
|
||||
ssl_msg="LibreSSL"
|
||||
],[
|
||||
AC_MSG_RESULT([no])
|
||||
@ -378,7 +360,7 @@ if test "$OPENSSL_ENABLED" = "1"; then
|
||||
],[
|
||||
AC_MSG_RESULT([yes])
|
||||
AC_DEFINE(HAVE_OPENSSL_SRP, 1, [if you have the functions SSL_CTX_set_srp_username and SSL_CTX_set_srp_password])
|
||||
AC_SUBST(HAVE_OPENSSL_SRP, [1])
|
||||
HAVE_OPENSSL_SRP=1
|
||||
],[
|
||||
AC_MSG_RESULT([no])
|
||||
])
|
||||
|
||||
@ -94,7 +94,6 @@ if test "x$OPT_RUSTLS" != xno; then
|
||||
AC_CHECK_LIB(rustls, rustls_connection_read,
|
||||
[
|
||||
AC_DEFINE(USE_RUSTLS, 1, [if Rustls is enabled])
|
||||
AC_SUBST(USE_RUSTLS, [1])
|
||||
RUSTLS_ENABLED=1
|
||||
USE_RUSTLS="yes"
|
||||
ssl_msg="rustls"
|
||||
@ -128,7 +127,6 @@ if test "x$OPT_RUSTLS" != xno; then
|
||||
SSL_CPPFLAGS=`CURL_EXPORT_PCDIR([$RUSTLS_PCDIR]) dnl
|
||||
$PKGCONFIG --cflags-only-I rustls 2>/dev/null`
|
||||
|
||||
AC_SUBST(SSL_LIBS)
|
||||
AC_MSG_NOTICE([pkg-config: SSL_LIBS: "$SSL_LIBS"])
|
||||
AC_MSG_NOTICE([pkg-config: SSL_LDFLAGS: "$SSL_LDFLAGS"])
|
||||
AC_MSG_NOTICE([pkg-config: SSL_CPPFLAGS: "$SSL_CPPFLAGS"])
|
||||
@ -145,7 +143,6 @@ if test "x$OPT_RUSTLS" != xno; then
|
||||
link_pkgconfig=1
|
||||
ssl_msg="rustls"
|
||||
AC_DEFINE(USE_RUSTLS, 1, [if Rustls is enabled])
|
||||
AC_SUBST(USE_RUSTLS, [1])
|
||||
USE_RUSTLS="yes"
|
||||
RUSTLS_ENABLED=1
|
||||
test rustls != "$DEFAULT_SSL_BACKEND" || VALID_DEFAULT_SSL_BACKEND=yes
|
||||
|
||||
@ -30,13 +30,12 @@ if test "x$OPT_SCHANNEL" != xno; then
|
||||
test "x$curl_cv_native_windows" = "xyes"; then
|
||||
AC_MSG_RESULT(yes)
|
||||
AC_DEFINE(USE_SCHANNEL, 1, [to enable Windows native SSL/TLS support])
|
||||
AC_SUBST(USE_SCHANNEL, [1])
|
||||
ssl_msg="Schannel"
|
||||
test schannel != "$DEFAULT_SSL_BACKEND" || VALID_DEFAULT_SSL_BACKEND=yes
|
||||
SCHANNEL_ENABLED=1
|
||||
# --with-schannel implies --enable-sspi
|
||||
AC_DEFINE(USE_WINDOWS_SSPI, 1, [to enable SSPI support])
|
||||
AC_SUBST(USE_WINDOWS_SSPI, [1])
|
||||
USE_WINDOWS_SSPI=1
|
||||
curl_sspi_msg="enabled"
|
||||
else
|
||||
AC_MSG_RESULT(no)
|
||||
|
||||
@ -29,7 +29,6 @@ if test "x$OPT_SECURETRANSPORT" != xno; then
|
||||
(test "x$cross_compiling" != "xno" || test -d "/System/Library/Frameworks/Security.framework"); then
|
||||
AC_MSG_RESULT(yes)
|
||||
AC_DEFINE(USE_SECTRANSP, 1, [enable Secure Transport])
|
||||
AC_SUBST(USE_SECTRANSP, [1])
|
||||
ssl_msg="Secure Transport"
|
||||
test secure-transport != "$DEFAULT_SSL_BACKEND" || VALID_DEFAULT_SSL_BACKEND=yes
|
||||
SECURETRANSPORT_ENABLED=1
|
||||
|
||||
@ -105,7 +105,6 @@ if test "x$OPT_WOLFSSL" != xno; then
|
||||
],[
|
||||
AC_MSG_RESULT(yes)
|
||||
AC_DEFINE(USE_WOLFSSL, 1, [if wolfSSL is enabled])
|
||||
AC_SUBST(USE_WOLFSSL, [1])
|
||||
WOLFSSL_ENABLED=1
|
||||
USE_WOLFSSL="yes"
|
||||
ssl_msg="wolfSSL"
|
||||
|
||||
@ -218,15 +218,6 @@ $! for compatibility.
|
||||
$write cvh "/* Location of default ca path */"
|
||||
$write cvh "#define curl_ca_path ""gnv$curl_ca_path"""
|
||||
$!
|
||||
$! NTLM_WB_ENABLED requires fork() but configure does not know this
|
||||
$! We have to disable this in the configure command line.
|
||||
$! config_h.com finds that configure defaults to it being enabled so
|
||||
$! reports it. So we need to turn it off here.
|
||||
$!
|
||||
$write cvh "#ifdef NTLM_WB_ENABLED"
|
||||
$write cvh "#undef NTLM_WB_ENABLED"
|
||||
$write cvh "#endif"
|
||||
$!
|
||||
$! The config_h.com finds a bunch of default disable commands in
|
||||
$! configure and will incorrectly disable these options. The config_h.com
|
||||
$! is a generic procedure and it would break more things to try to fix it
|
||||
|
||||
Loading…
Reference in New Issue
Block a user