← Commit list

e411c98f70

Viktor Szakats

2024-04-13

SUCCESS Duration: 406s

Subject

build: prefer `USE_IPV6` macro internally (was: `ENABLE_IPV6`)

Binary

Download Binary (813 KB)

Architecture & Compiler Flags

Architecture: x86_64-linux-gnu Compiler: gcc (Ubuntu 11.4.0-1ubuntu1~22.04.3) 11.4.0

—

Build Log

$ git checkout -f e411c98f702f0fb38dceec95e7507ef15a00d12c
Previous HEAD position was 49f83c30e4 lib: merge `ENABLE_QUIC` C macro into `USE_HTTP3`
HEAD is now at e411c98f70 build: prefer `USE_IPV6` macro internally (was: `ENABLE_IPV6`)

$ git clean -fdx
Removing Makefile
Removing Makefile.in
Removing aclocal.m4
Removing autom4te.cache/
Removing compile
Removing config.guess
Removing config.log
Removing config.status
Removing config.sub
Removing configure
Removing curl-config
Removing depcomp
Removing docs/Makefile
Removing docs/Makefile.in
Removing docs/cmdline-opts/Makefile
Removing docs/cmdline-opts/Makefile.in
Removing docs/examples/.deps/
Removing docs/examples/Makefile
Removing docs/examples/Makefile.in
Removing docs/libcurl/Makefile
Removing docs/libcurl/Makefile.in
Removing docs/libcurl/opts/Makefile
Removing docs/libcurl/opts/Makefile.in
Removing include/Makefile
Removing include/Makefile.in
Removing include/curl/Makefile
Removing include/curl/Makefile.in
Removing install-sh
Removing lib/.deps/
Removing lib/.dirstamp
Removing lib/.libs/
Removing lib/Makefile
Removing lib/Makefile.in
Removing lib/base64.o
Removing lib/curl_config.h
Removing lib/curl_config.h.in
Removing lib/curl_multibyte.o
Removing lib/dynbuf.o
Removing lib/libcurl.la
Removing lib/libcurl.vers
Removing lib/libcurl_la-altsvc.lo
Removing lib/libcurl_la-altsvc.o
Removing lib/libcurl_la-amigaos.lo
Removing lib/libcurl_la-amigaos.o
Removing lib/libcurl_la-asyn-ares.lo
Removing lib/libcurl_la-asyn-ares.o
Removing lib/libcurl_la-asyn-thread.lo
Removing lib/libcurl_la-asyn-thread.o
Removing lib/libcurl_la-base64.lo
Removing lib/libcurl_la-base64.o
Removing lib/libcurl_la-bufq.lo
Removing lib/libcurl_la-bufq.o
Removing lib/libcurl_la-bufref.lo
Removing lib/libcurl_la-bufref.o
Removing lib/libcurl_la-c-hyper.lo
Removing lib/libcurl_la-c-hyper.o
Removing lib/libcurl_la-cf-h1-proxy.lo
Removing lib/libcurl_la-cf-h1-proxy.o
Removing lib/libcurl_la-cf-h2-proxy.lo
Removing lib/libcurl_la-cf-h2-proxy.o
Removing lib/libcurl_la-cf-haproxy.lo
Removing lib/libcurl_la-cf-haproxy.o
Removing lib/libcurl_la-cf-https-connect.lo
Removing lib/libcurl_la-cf-https-connect.o
Removing lib/libcurl_la-cf-socket.lo
Removing lib/libcurl_la-cf-socket.o
Removing lib/libcurl_la-cfilters.lo
Removing lib/libcurl_la-cfilters.o
Removing lib/libcurl_la-conncache.lo
Removing lib/libcurl_la-conncache.o
Removing lib/libcurl_la-connect.lo
Removing lib/libcurl_la-connect.o
Removing lib/libcurl_la-content_encoding.lo
Removing lib/libcurl_la-content_encoding.o
Removing lib/libcurl_la-cookie.lo
Removing lib/libcurl_la-cookie.o
Removing lib/libcurl_la-curl_addrinfo.lo
Removing lib/libcurl_la-curl_addrinfo.o
Removing lib/libcurl_la-curl_des.lo
Removing lib/libcurl_la-curl_des.o
Removing lib/libcurl_la-curl_endian.lo
Removing lib/libcurl_la-curl_endian.o
Removing lib/libcurl_la-curl_fnmatch.lo
Removing lib/libcurl_la-curl_fnmatch.o
Removing lib/libcurl_la-curl_get_line.lo
Removing lib/libcurl_la-curl_get_line.o
Removing lib/libcurl_la-curl_gethostname.lo
Removing lib/libcurl_la-curl_gethostname.o
Removing lib/libcurl_la-curl_gssapi.lo
Removing lib/libcurl_la-curl_gssapi.o
Removing lib/libcurl_la-curl_memrchr.lo
Removing lib/libcurl_la-curl_memrchr.o
Removing lib/libcurl_la-curl_multibyte.lo
Removing lib/libcurl_la-curl_multibyte.o
Removing lib/libcurl_la-curl_ntlm_core.lo
Removing lib/libcurl_la-curl_ntlm_core.o
Removing lib/libcurl_la-curl_path.lo
Removing lib/libcurl_la-curl_path.o
Removing lib/libcurl_la-curl_range.lo
Removing lib/libcurl_la-curl_range.o
Removing lib/libcurl_la-curl_rtmp.lo
Removing lib/libcurl_la-curl_rtmp.o
Removing lib/libcurl_la-curl_sasl.lo
Removing lib/libcurl_la-curl_sasl.o
Removing lib/libcurl_la-curl_sha512_256.lo
Removing lib/libcurl_la-curl_sha512_256.o
Removing lib/libcurl_la-curl_sspi.lo
Removing lib/libcurl_la-curl_sspi.o
Removing lib/libcurl_la-curl_threads.lo
Removing lib/libcurl_la-curl_threads.o
Removing lib/libcurl_la-curl_trc.lo
Removing lib/libcurl_la-curl_trc.o
Removing lib/libcurl_la-cw-out.lo
Removing lib/libcurl_la-cw-out.o
Removing lib/libcurl_la-dict.lo
Removing lib/libcurl_la-dict.o
Removing lib/libcurl_la-doh.lo
Removing lib/libcurl_la-doh.o
Removing lib/libcurl_la-dynbuf.lo
Removing lib/libcurl_la-dynbuf.o
Removing lib/libcurl_la-dynhds.lo
Removing lib/libcurl_la-dynhds.o
Removing lib/libcurl_la-easy.lo
Removing lib/libcurl_la-easy.o
Removing lib/libcurl_la-easygetopt.lo
Removing lib/libcurl_la-easygetopt.o
Removing lib/libcurl_la-easyoptions.lo
Removing lib/libcurl_la-easyoptions.o
Removing lib/libcurl_la-escape.lo
Removing lib/libcurl_la-escape.o
Removing lib/libcurl_la-file.lo
Removing lib/libcurl_la-file.o
Removing lib/libcurl_la-fileinfo.lo
Removing lib/libcurl_la-fileinfo.o
Removing lib/libcurl_la-fopen.lo
Removing lib/libcurl_la-fopen.o
Removing lib/libcurl_la-formdata.lo
Removing lib/libcurl_la-formdata.o
Removing lib/libcurl_la-ftp.lo
Removing lib/libcurl_la-ftp.o
Removing lib/libcurl_la-ftplistparser.lo
Removing lib/libcurl_la-ftplistparser.o
Removing lib/libcurl_la-getenv.lo
Removing lib/libcurl_la-getenv.o
Removing lib/libcurl_la-getinfo.lo
Removing lib/libcurl_la-getinfo.o
Removing lib/libcurl_la-gopher.lo
Removing lib/libcurl_la-gopher.o
Removing lib/libcurl_la-hash.lo
Removing lib/libcurl_la-hash.o
Removing lib/libcurl_la-headers.lo
Removing lib/libcurl_la-headers.o
Removing lib/libcurl_la-hmac.lo
Removing lib/libcurl_la-hmac.o
Removing lib/libcurl_la-hostasyn.lo
Removing lib/libcurl_la-hostasyn.o
Removing lib/libcurl_la-hostip.lo
Removing lib/libcurl_la-hostip.o
Removing lib/libcurl_la-hostip4.lo
Removing lib/libcurl_la-hostip4.o
Removing lib/libcurl_la-hostip6.lo
Removing lib/libcurl_la-hostip6.o
Removing lib/libcurl_la-hostsyn.lo
Removing lib/libcurl_la-hostsyn.o
Removing lib/libcurl_la-hsts.lo
Removing lib/libcurl_la-hsts.o
Removing lib/libcurl_la-http.lo
Removing lib/libcurl_la-http.o
Removing lib/libcurl_la-http1.lo
Removing lib/libcurl_la-http1.o
Removing lib/libcurl_la-http2.lo
Removing lib/libcurl_la-http2.o
Removing lib/libcurl_la-http_aws_sigv4.lo
Removing lib/libcurl_la-http_aws_sigv4.o
Removing lib/libcurl_la-http_chunks.lo
Removing lib/libcurl_la-http_chunks.o
Removing lib/libcurl_la-http_digest.lo
Removing lib/libcurl_la-http_digest.o
Removing lib/libcurl_la-http_negotiate.lo
Removing lib/libcurl_la-http_negotiate.o
Removing lib/libcurl_la-http_ntlm.lo
Removing lib/libcurl_la-http_ntlm.o
Removing lib/libcurl_la-http_proxy.lo
Removing lib/libcurl_la-http_proxy.o
Removing lib/libcurl_la-idn.lo
Removing lib/libcurl_la-idn.o
Removing lib/libcurl_la-if2ip.lo
Removing lib/libcurl_la-if2ip.o
Removing lib/libcurl_la-imap.lo
Removing lib/libcurl_la-imap.o
Removing lib/libcurl_la-inet_ntop.lo
Removing lib/libcurl_la-inet_ntop.o
Removing lib/libcurl_la-inet_pton.lo
Removing lib/libcurl_la-inet_pton.o
Removing lib/libcurl_la-krb5.lo
Removing lib/libcurl_la-krb5.o
Removing lib/libcurl_la-ldap.lo
Removing lib/libcurl_la-ldap.o
Removing lib/libcurl_la-llist.lo
Removing lib/libcurl_la-llist.o
Removing lib/libcurl_la-macos.lo
Removing lib/libcurl_la-macos.o
Removing lib/libcurl_la-md4.lo
Removing lib/libcurl_la-md4.o
Removing lib/libcurl_la-md5.lo
Removing lib/libcurl_la-md5.o
Removing lib/libcurl_la-memdebug.lo
Removing lib/libcurl_la-memdebug.o
Removing lib/libcurl_la-mime.lo
Removing lib/libcurl_la-mime.o
Removing lib/libcurl_la-mprintf.lo
Removing lib/libcurl_la-mprintf.o
Removing lib/libcurl_la-mqtt.lo
Removing lib/libcurl_la-mqtt.o
Removing lib/libcurl_la-multi.lo
Removing lib/libcurl_la-multi.o
Removing lib/libcurl_la-netrc.lo
Removing lib/libcurl_la-netrc.o
Removing lib/libcurl_la-nonblock.lo
Removing lib/libcurl_la-nonblock.o
Removing lib/libcurl_la-noproxy.lo
Removing lib/libcurl_la-noproxy.o
Removing lib/libcurl_la-openldap.lo
Removing lib/libcurl_la-openldap.o
Removing lib/libcurl_la-parsedate.lo
Removing lib/libcurl_la-parsedate.o
Removing lib/libcurl_la-pingpong.lo
Removing lib/libcurl_la-pingpong.o
Removing lib/libcurl_la-pop3.lo
Removing lib/libcurl_la-pop3.o
Removing lib/libcurl_la-progress.lo
Removing lib/libcurl_la-progress.o
Removing lib/libcurl_la-psl.lo
Removing lib/libcurl_la-psl.o
Removing lib/libcurl_la-rand.lo
Removing lib/libcurl_la-rand.o
Removing lib/libcurl_la-rename.lo
Removing lib/libcurl_la-rename.o
Removing lib/libcurl_la-request.lo
Removing lib/libcurl_la-request.o
Removing lib/libcurl_la-rtsp.lo
Removing lib/libcurl_la-rtsp.o
Removing lib/libcurl_la-select.lo
Removing lib/libcurl_la-select.o
Removing lib/libcurl_la-sendf.lo
Removing lib/libcurl_la-sendf.o
Removing lib/libcurl_la-setopt.lo
Removing lib/libcurl_la-setopt.o
Removing lib/libcurl_la-sha256.lo
Removing lib/libcurl_la-sha256.o
Removing lib/libcurl_la-share.lo
Removing lib/libcurl_la-share.o
Removing lib/libcurl_la-slist.lo
Removing lib/libcurl_la-slist.o
Removing lib/libcurl_la-smb.lo
Removing lib/libcurl_la-smb.o
Removing lib/libcurl_la-smtp.lo
Removing lib/libcurl_la-smtp.o
Removing lib/libcurl_la-socketpair.lo
Removing lib/libcurl_la-socketpair.o
Removing lib/libcurl_la-socks.lo
Removing lib/libcurl_la-socks.o
Removing lib/libcurl_la-socks_gssapi.lo
Removing lib/libcurl_la-socks_gssapi.o
Removing lib/libcurl_la-socks_sspi.lo
Removing lib/libcurl_la-socks_sspi.o
Removing lib/libcurl_la-speedcheck.lo
Removing lib/libcurl_la-speedcheck.o
Removing lib/libcurl_la-splay.lo
Removing lib/libcurl_la-splay.o
Removing lib/libcurl_la-strcase.lo
Removing lib/libcurl_la-strcase.o
Removing lib/libcurl_la-strdup.lo
Removing lib/libcurl_la-strdup.o
Removing lib/libcurl_la-strerror.lo
Removing lib/libcurl_la-strerror.o
Removing lib/libcurl_la-strtok.lo
Removing lib/libcurl_la-strtok.o
Removing lib/libcurl_la-strtoofft.lo
Removing lib/libcurl_la-strtoofft.o
Removing lib/libcurl_la-system_win32.lo
Removing lib/libcurl_la-system_win32.o
Removing lib/libcurl_la-telnet.lo
Removing lib/libcurl_la-telnet.o
Removing lib/libcurl_la-tftp.lo
Removing lib/libcurl_la-tftp.o
Removing lib/libcurl_la-timediff.lo
Removing lib/libcurl_la-timediff.o
Removing lib/libcurl_la-timeval.lo
Removing lib/libcurl_la-timeval.o
Removing lib/libcurl_la-transfer.lo
Removing lib/libcurl_la-transfer.o
Removing lib/libcurl_la-url.lo
Removing lib/libcurl_la-url.o
Removing lib/libcurl_la-urlapi.lo
Removing lib/libcurl_la-urlapi.o
Removing lib/libcurl_la-version.lo
Removing lib/libcurl_la-version.o
Removing lib/libcurl_la-version_win32.lo
Removing lib/libcurl_la-version_win32.o
Removing lib/libcurl_la-warnless.lo
Removing lib/libcurl_la-warnless.o
Removing lib/libcurl_la-ws.lo
Removing lib/libcurl_la-ws.o
Removing lib/nonblock.o
Removing lib/stamp-h1
Removing lib/strtoofft.o
Removing lib/timediff.o
Removing lib/vauth/.deps/
Removing lib/vauth/.dirstamp
Removing lib/vauth/libcurl_la-cleartext.lo
Removing lib/vauth/libcurl_la-cleartext.o
Removing lib/vauth/libcurl_la-cram.lo
Removing lib/vauth/libcurl_la-cram.o
Removing lib/vauth/libcurl_la-digest.lo
Removing lib/vauth/libcurl_la-digest.o
Removing lib/vauth/libcurl_la-digest_sspi.lo
Removing lib/vauth/libcurl_la-digest_sspi.o
Removing lib/vauth/libcurl_la-gsasl.lo
Removing lib/vauth/libcurl_la-gsasl.o
Removing lib/vauth/libcurl_la-krb5_gssapi.lo
Removing lib/vauth/libcurl_la-krb5_gssapi.o
Removing lib/vauth/libcurl_la-krb5_sspi.lo
Removing lib/vauth/libcurl_la-krb5_sspi.o
Removing lib/vauth/libcurl_la-ntlm.lo
Removing lib/vauth/libcurl_la-ntlm.o
Removing lib/vauth/libcurl_la-ntlm_sspi.lo
Removing lib/vauth/libcurl_la-ntlm_sspi.o
Removing lib/vauth/libcurl_la-oauth2.lo
Removing lib/vauth/libcurl_la-oauth2.o
Removing lib/vauth/libcurl_la-spnego_gssapi.lo
Removing lib/vauth/libcurl_la-spnego_gssapi.o
Removing lib/vauth/libcurl_la-spnego_sspi.lo
Removing lib/vauth/libcurl_la-spnego_sspi.o
Removing lib/vauth/libcurl_la-vauth.lo
Removing lib/vauth/libcurl_la-vauth.o
Removing lib/version_win32.o
Removing lib/vquic/.deps/
Removing lib/vquic/.dirstamp
Removing lib/vquic/libcurl_la-curl_msh3.lo
Removing lib/vquic/libcurl_la-curl_msh3.o
Removing lib/vquic/libcurl_la-curl_ngtcp2.lo
Removing lib/vquic/libcurl_la-curl_ngtcp2.o
Removing lib/vquic/libcurl_la-curl_osslq.lo
Removing lib/vquic/libcurl_la-curl_osslq.o
Removing lib/vquic/libcurl_la-curl_quiche.lo
Removing lib/vquic/libcurl_la-curl_quiche.o
Removing lib/vquic/libcurl_la-vquic-tls.lo
Removing lib/vquic/libcurl_la-vquic-tls.o
Removing lib/vquic/libcurl_la-vquic.lo
Removing lib/vquic/libcurl_la-vquic.o
Removing lib/vssh/.deps/
Removing lib/vssh/.dirstamp
Removing lib/vssh/libcurl_la-libssh.lo
Removing lib/vssh/libcurl_la-libssh.o
Removing lib/vssh/libcurl_la-libssh2.lo
Removing lib/vssh/libcurl_la-libssh2.o
Removing lib/vssh/libcurl_la-wolfssh.lo
Removing lib/vssh/libcurl_la-wolfssh.o
Removing lib/vtls/.deps/
Removing lib/vtls/.dirstamp
Removing lib/vtls/libcurl_la-bearssl.lo
Removing lib/vtls/libcurl_la-bearssl.o
Removing lib/vtls/libcurl_la-gtls.lo
Removing lib/vtls/libcurl_la-gtls.o
Removing lib/vtls/libcurl_la-hostcheck.lo
Removing lib/vtls/libcurl_la-hostcheck.o
Removing lib/vtls/libcurl_la-keylog.lo
Removing lib/vtls/libcurl_la-keylog.o
Removing lib/vtls/libcurl_la-mbedtls.lo
Removing lib/vtls/libcurl_la-mbedtls.o
Removing lib/vtls/libcurl_la-mbedtls_threadlock.lo
Removing lib/vtls/libcurl_la-mbedtls_threadlock.o
Removing lib/vtls/libcurl_la-openssl.lo
Removing lib/vtls/libcurl_la-openssl.o
Removing lib/vtls/libcurl_la-rustls.lo
Removing lib/vtls/libcurl_la-rustls.o
Removing lib/vtls/libcurl_la-schannel.lo
Removing lib/vtls/libcurl_la-schannel.o
Removing lib/vtls/libcurl_la-schannel_verify.lo
Removing lib/vtls/libcurl_la-schannel_verify.o
Removing lib/vtls/libcurl_la-sectransp.lo
Removing lib/vtls/libcurl_la-sectransp.o
Removing lib/vtls/libcurl_la-vtls.lo
Removing lib/vtls/libcurl_la-vtls.o
Removing lib/vtls/libcurl_la-wolfssl.lo
Removing lib/vtls/libcurl_la-wolfssl.o
Removing lib/vtls/libcurl_la-x509asn1.lo
Removing lib/vtls/libcurl_la-x509asn1.o
Removing lib/warnless.o
Removing libcurl.pc
Removing libtool
Removing ltmain.sh
Removing m4/libtool.m4
Removing m4/ltoptions.m4
Removing m4/ltsugar.m4
Removing m4/ltversion.m4
Removing m4/lt~obsolete.m4
Removing missing
Removing packages/Makefile
Removing packages/Makefile.in
Removing packages/vms/Makefile
Removing packages/vms/Makefile.in
Removing scripts/Makefile
Removing scripts/Makefile.in
Removing src/.deps/
Removing src/.libs/
Removing src/Makefile
Removing src/Makefile.in
Removing src/curl
Removing src/slist_wc.o
Removing src/tool_binmode.o
Removing src/tool_bname.o
Removing src/tool_cb_dbg.o
Removing src/tool_cb_hdr.o
Removing src/tool_cb_prg.o
Removing src/tool_cb_rea.o
Removing src/tool_cb_see.o
Removing src/tool_cb_wrt.o
Removing src/tool_cfgable.o
Removing src/tool_dirhie.o
Removing src/tool_doswin.o
Removing src/tool_easysrc.o
Removing src/tool_filetime.o
Removing src/tool_findfile.o
Removing src/tool_formparse.o
Removing src/tool_getparam.o
Removing src/tool_getpass.o
Removing src/tool_help.o
Removing src/tool_helpers.o
Removing src/tool_hugehelp.c
Removing src/tool_hugehelp.o
Removing src/tool_ipfs.o
Removing src/tool_libinfo.o
Removing src/tool_listhelp.o
Removing src/tool_main.o
Removing src/tool_msgs.o
Removing src/tool_operate.o
Removing src/tool_operhlp.o
Removing src/tool_paramhlp.o
Removing src/tool_parsecfg.o
Removing src/tool_progress.o
Removing src/tool_setopt.o
Removing src/tool_sleep.o
Removing src/tool_stderr.o
Removing src/tool_strdup.o
Removing src/tool_urlglob.o
Removing src/tool_util.o
Removing src/tool_vms.o
Removing src/tool_writeout.o
Removing src/tool_writeout_json.o
Removing src/tool_xattr.o
Removing src/var.o
Removing tests/Makefile
Removing tests/Makefile.in
Removing tests/certs/Makefile
Removing tests/certs/Makefile.in
Removing tests/certs/scripts/Makefile
Removing tests/certs/scripts/Makefile.in
Removing tests/config
Removing tests/configurehelp.pm
Removing tests/data/Makefile
Removing tests/data/Makefile.in
Removing tests/http/Makefile
Removing tests/http/Makefile.in
Removing tests/http/clients/.deps/
Removing tests/http/clients/Makefile
Removing tests/http/clients/Makefile.in
Removing tests/http/config.ini
Removing tests/libtest/.deps/
Removing tests/libtest/Makefile
Removing tests/libtest/Makefile.in
Removing tests/server/.deps/
Removing tests/server/Makefile
Removing tests/server/Makefile.in
Removing tests/unit/.deps/
Removing tests/unit/Makefile
Removing tests/unit/Makefile.in

$ autoreconf -fi
libtoolize: putting auxiliary files in '.'.
libtoolize: copying file './ltmain.sh'
libtoolize: putting macros in AC_CONFIG_MACRO_DIRS, 'm4'.
libtoolize: copying file 'm4/libtool.m4'
libtoolize: copying file 'm4/ltoptions.m4'
libtoolize: copying file 'm4/ltsugar.m4'
libtoolize: copying file 'm4/ltversion.m4'
libtoolize: copying file 'm4/lt~obsolete.m4'
libtoolize: Remember to add 'LT_INIT' to configure.ac.
configure.ac:123: installing './compile'
configure.ac:425: installing './config.guess'
configure.ac:425: installing './config.sub'
configure.ac:123: installing './install-sh'
configure.ac:129: installing './missing'
docs/examples/Makefile.am: installing './depcomp'

$ bash -c find . -name config.guess -exec cp /usr/share/misc/config.guess {} \;

$ bash -c find . -name config.sub -exec cp /usr/share/misc/config.sub {} \;

$ chmod +x configure

$ ./configure --disable-shared --without-ssl --disable-docs
checking whether to enable maintainer-specific portions of Makefiles... no
checking whether make supports nested variables... yes
checking whether to enable debug build options... no
checking whether to enable compiler optimizer... (assumed) yes
checking whether to enable strict compiler warnings... no
checking whether to enable compiler warnings as errors... no
checking whether to enable curl debug memory tracking... no
checking whether to enable hiding of library internal symbols... yes
checking whether to enable c-ares for DNS lookups... no
checking whether to disable dependency on -lrt... (assumed no)
checking whether to enable ECH support... no
checking for path separator... :
checking for sed... /usr/bin/sed
checking for grep... /usr/bin/grep
checking that grep -E works... yes
checking for ar... /usr/bin/ar
checking for a BSD-compatible install... /usr/bin/install -c
checking for gcc... ccache gcc
checking whether the C compiler works... yes
checking for C compiler default output file name... a.out
checking for suffix of executables...
checking whether we are cross compiling... no
checking for suffix of object files... o
checking whether the compiler supports GNU C... yes
checking whether ccache gcc accepts -g... yes
checking for ccache gcc option to enable C11 features... none needed
checking whether ccache gcc understands -c and -o together... yes
checking how to run the C preprocessor... ccache gcc -E
checking for stdio.h... yes
checking for stdlib.h... yes
checking for string.h... yes
checking for inttypes.h... yes
checking for stdint.h... yes
checking for strings.h... yes
checking for sys/stat.h... yes
checking for sys/types.h... yes
checking for unistd.h... yes
checking for stdatomic.h... yes
checking if _Atomic is available... yes
checking for a sed that does not truncate output... (cached) /usr/bin/sed
checking for code coverage support... no
checking whether build environment is sane... yes
checking for a race-free mkdir -p... /usr/bin/mkdir -p
checking for gawk... gawk
checking whether make sets $(MAKE)... yes
checking whether make supports the include directive... yes (GNU style)
checking dependency style of ccache gcc... gcc3
checking curl version... 8.8.0-DEV
checking for httpd... no
checking for apache2... no
checking for apachectl... no
checking for apxs... no
configure: httpd/apache2 not in PATH, http tests disabled
configure: apxs not in PATH, http tests disabled
checking for nghttpx... no
checking for caddy... no
checking build system type... x86_64-pc-linux-gnu
checking host system type... x86_64-pc-linux-gnu
checking for grep that handles long lines and -e... (cached) /usr/bin/grep
checking for egrep... /usr/bin/grep -E
checking if OS is AIX (to define _ALL_SOURCE)... no
checking if _THREAD_SAFE is already defined... no
checking if _THREAD_SAFE is actually needed... no
checking if _THREAD_SAFE is onwards defined... no
checking if _REENTRANT is already defined... no
checking if _REENTRANT is actually needed... no
checking if _REENTRANT is onwards defined... no
checking for special C compiler options needed for large files... no
checking for _FILE_OFFSET_BITS value needed for large files... no
checking how to print strings... printf
checking for a sed that does not truncate output... (cached) /usr/bin/sed
checking for fgrep... /usr/bin/grep -F
checking for ld used by ccache gcc... /usr/bin/ld
checking if the linker (/usr/bin/ld) is GNU ld... yes
checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B
checking the name lister (/usr/bin/nm -B) interface... BSD nm
checking whether ln -s works... yes
checking the maximum length of command line arguments... 1572864
checking how to convert x86_64-pc-linux-gnu file names to x86_64-pc-linux-gnu format... func_convert_file_noop
checking how to convert x86_64-pc-linux-gnu file names to toolchain format... func_convert_file_noop
checking for /usr/bin/ld option to reload object files... -r
checking for objdump... objdump
checking how to recognize dependent libraries... pass_all
checking for dlltool... no
checking how to associate runtime and link libraries... printf %s\n
checking for archiver @FILE support... @
checking for strip... strip
checking for ranlib... ranlib
checking command to parse /usr/bin/nm -B output from ccache gcc object... ok
checking for sysroot... no
checking for a working dd... /usr/bin/dd
checking how to truncate binary pipes... /usr/bin/dd bs=4096 count=1
checking for mt... mt
checking if mt is a manifest tool... no
checking for dlfcn.h... yes
checking for objdir... .libs
checking if ccache gcc supports -fno-rtti -fno-exceptions... no
checking for ccache gcc option to produce PIC... -fPIC -DPIC
checking if ccache gcc PIC flag -fPIC -DPIC works... yes
checking if ccache gcc static flag -static works... yes
checking if ccache gcc supports -c -o file.o... yes
checking if ccache gcc supports -c -o file.o... (cached) yes
checking whether the ccache gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes
checking dynamic linker characteristics... GNU/Linux ld.so
checking how to hardcode library paths into programs... immediate
checking whether stripping libraries is possible... yes
checking if libtool supports shared libraries... yes
checking whether to build shared libraries... no
checking whether to build static libraries... yes
checking whether to build shared libraries with -version-info... yes
checking whether to build shared libraries with -no-undefined... no
checking whether to build shared libraries with -mimpure-text... no
checking whether to build shared libraries with PIC... yes
checking whether to build static libraries with PIC... yes
checking whether to build shared libraries only... no
checking whether to build static libraries only... yes
checking for windres... no
checking for inline... inline
checking if cpp -P is needed... yes
checking if cpp -P works... yes
checking if compiler is DEC/Compaq/HP C... no
checking if compiler is HP-UX C... no
checking if compiler is IBM C... no
checking if compiler is Intel C... no
checking if compiler is clang... no
checking if compiler is GNU C... yes
checking compiler version... gcc '1100' (raw: '11')
checking if compiler is SGI MIPSpro C... no
checking if compiler is SGI MIPS C... no
checking if compiler is SunPro C... no
checking if compiler is Tiny C... no
checking whether build target is a native Windows one... no
checking if compiler accepts some basic options... yes
configure: compiler options added: -Werror-implicit-function-declaration
checking if compiler optimizer assumed setting might be used... yes
checking if compiler accepts optimizer enabling options... yes
configure: compiler options added: -O2
checking if compiler accepts strict warning options... yes
configure: compiler options added: -Wno-system-headers
checking if compiler halts on compilation errors... yes
checking if compiler halts on negative sized arrays... yes
checking if compiler halts on function prototype mismatch... yes
checking if compiler supports hiding library internal symbols... yes
checking whether build target supports WIN32 file API... no
checking whether build target supports WIN32 crypto API... no
checking for good-to-use Darwin CFLAGS... no
checking whether to link macOS CoreFoundation, CoreServices, and SystemConfiguration frameworks... no
checking to see if the compiler supports __builtin_available()... no
checking whether to support http... yes
checking whether to support ftp... yes
checking whether to support file... yes
checking whether to support ldap... yes
checking whether to support ldaps... yes
checking whether to support rtsp... yes
checking whether to support proxies... yes
checking whether to support dict... yes
checking whether to support telnet... yes
checking whether to support tftp... yes
checking whether to support pop3... yes
checking whether to support imap... yes
checking whether to support smb... yes
checking whether to support smtp... yes
checking whether to support gopher... yes
checking whether to support mqtt... no
checking whether to provide built-in manual... yes
checking whether to build documentation... no
checking whether to enable generation of C code... yes
checking whether to use libgcc... no
checking if X/Open network library is required... no
checking for gethostbyname... yes
checking whether build target is a native Windows one... (cached) no
checking for proto/bsdsocket.h... no
checking for connect in libraries... yes
checking for sys/types.h... (cached) yes
checking for sys/time.h... yes
checking for monotonic clock_gettime... yes
checking for clock_gettime in libraries... no additional lib required
checking if monotonic clock_gettime works... yes
checking for sys/types.h... (cached) yes
checking for sys/time.h... (cached) yes
checking for raw monotonic clock_gettime... yes
checking for pkg-config... /usr/bin/pkg-config
checking for zlib options with pkg-config... found
checking for zlib.h... yes
configure: found both libz and libz.h header
checking for BrotliDecoderDecompress in -lbrotlidec... no
checking for brotli/decode.h... no
checking for ZSTD_createDStream in -lzstd... no
checking for zstd.h... no
checking for lber.h... no
checking for ldap.h... no
checking for ldap_ssl.h... no
checking for LDAP libraries... cannot find LDAP libraries
checking whether to enable IPv6... yes
checking if struct sockaddr_in6 has sin6_scope_id member... yes
checking if argv can be written to... yes
checking if GSS-API support is requested... no
checking whether to enable Windows native SSL/TLS... no
checking whether to enable Secure Transport... no
checking whether to enable Amiga native SSL/TLS (AmiSSL v5)... no
checking for psl_builtin in -lpsl... yes
checking for libpsl.h... yes
checking for library containing gsasl_init... no
checking for RTMP_Init in -lrtmp... no
checking whether versioned symbols are wanted... no
checking whether to enable Windows native IDN (Windows native builds only)... no
checking whether to build with libidn2... (assumed) yes
checking for pkg-config... (cached) /usr/bin/pkg-config
checking for libidn2 options with pkg-config... no
configure: IDN_LIBS: "-lidn2"
configure: IDN_LDFLAGS: ""
configure: IDN_CPPFLAGS: ""
configure: IDN_DIR: ""
checking if idn2_lookup_ul can be linked... no
checking for idn2.h... no
checking for pkg-config... (cached) /usr/bin/pkg-config
checking for libnghttp2 options with pkg-config... no
checking for nghttp2_session_get_stream_local_window_size in -lnghttp2... no
checking for sys/types.h... (cached) yes
checking for sys/time.h... (cached) yes
checking for sys/select.h... yes
checking for sys/socket.h... yes
checking for sys/ioctl.h... yes
checking for unistd.h... (cached) yes
checking for stdlib.h... (cached) yes
checking for arpa/inet.h... yes
checking for net/if.h... yes
checking for netinet/in.h... yes
checking for netinet/in6.h... no
checking for sys/un.h... yes
checking for linux/tcp.h... yes
checking for netinet/tcp.h... yes
checking for netinet/udp.h... yes
checking for netdb.h... yes
checking for sys/sockio.h... no
checking for sys/stat.h... (cached) yes
checking for sys/param.h... yes
checking for termios.h... yes
checking for termio.h... yes
checking for fcntl.h... yes
checking for io.h... no
checking for pwd.h... yes
checking for utime.h... yes
checking for sys/utime.h... no
checking for sys/poll.h... yes
checking for poll.h... yes
checking for socket.h... no
checking for sys/resource.h... yes
checking for libgen.h... yes
checking for locale.h... yes
checking for stdbool.h... yes
checking for sys/filio.h... no
checking for sys/wait.h... yes
checking for setjmp.h... yes
checking for an ANSI C-conforming const... yes
checking for size_t... yes
checking for sys/types.h... (cached) yes
checking for sys/time.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for struct timeval... yes
checking run-time libs availability... fine
checking size of size_t... 8
checking size of long... 8
checking size of int... 4
checking size of time_t... 8
checking size of off_t... 8
checking size of curl_off_t... 8
checking size of curl_socket_t... 4
checking for long long... yes
checking for ssize_t... yes
checking for bool... yes
checking for sa_family_t... yes
checking for suseconds_t... yes
checking if time_t is unsigned... no
checking for in_addr_t... yes
checking for struct sockaddr_storage... yes
checking for sys/select.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for select... yes
checking for sys/types.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for recv... yes
checking for sys/types.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for send... yes
checking for sys/types.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for MSG_NOSIGNAL... yes
checking for sys/types.h... (cached) yes
checking for unistd.h... (cached) yes
checking if alarm can be linked... yes
checking if alarm is prototyped... yes
checking if alarm is compilable... yes
checking if alarm usage allowed... yes
checking if alarm might be used... yes
checking for sys/types.h... (cached) yes
checking for strings.h... (cached) yes
checking for sys/types.h... (cached) yes
checking for libgen.h... (cached) yes
checking if basename can be linked... yes
checking if basename is prototyped... yes
checking if basename is compilable... yes
checking if basename usage allowed... yes
checking if basename might be used... yes
checking for sys/types.h... (cached) yes
checking for socket.h... (cached) no
checking if closesocket can be linked... no
checking if closesocket might be used... no
checking for sys/types.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking if CloseSocket can be linked... no
checking if CloseSocket might be used... no
checking for sys/types.h... (cached) yes
checking for unistd.h... (cached) yes
checking for fcntl.h... (cached) yes
checking if fcntl can be linked... yes
checking if fcntl is prototyped... yes
checking if fcntl is compilable... yes
checking if fcntl usage allowed... yes
checking if fcntl might be used... yes
checking if fcntl O_NONBLOCK is compilable... yes
checking if fcntl O_NONBLOCK usage allowed... yes
checking if fcntl O_NONBLOCK might be used... yes
checking whether build target is a native Windows one... (cached) no
checking for sys/types.h... (cached) yes
checking for netdb.h... (cached) yes
checking if freeaddrinfo can be linked... yes
checking if freeaddrinfo is prototyped... yes
checking if freeaddrinfo is compilable... yes
checking if freeaddrinfo usage allowed... yes
checking if freeaddrinfo might be used... yes
checking for sys/types.h... (cached) yes
checking for sys/xattr.h... yes
checking if fsetxattr can be linked... yes
checking if fsetxattr is prototyped... yes
checking if fsetxattr takes 5 args.... yes
checking if fsetxattr is compilable... yes
checking if fsetxattr usage allowed... yes
checking if fsetxattr might be used... yes
checking if ftruncate can be linked... yes
checking if ftruncate is prototyped... yes
checking if ftruncate is compilable... yes
checking if ftruncate usage allowed... yes
checking if ftruncate might be used... yes
checking for sys/types.h... (cached) yes
checking if getaddrinfo can be linked... yes
checking if getaddrinfo is prototyped... yes
checking if getaddrinfo is compilable... yes
checking if getaddrinfo seems to work... yes
checking if getaddrinfo usage allowed... yes
checking if getaddrinfo might be used... yes
checking if getaddrinfo is threadsafe... yes
checking if gethostbyname can be linked... yes
checking if gethostbyname is prototyped... yes
checking if gethostbyname is compilable... yes
checking if gethostbyname usage allowed... yes
checking if gethostbyname might be used... yes
checking if gethostbyname_r can be linked... yes
checking if gethostbyname_r is prototyped... yes
checking if gethostbyname_r takes 3 args.... no
checking if gethostbyname_r takes 5 args.... no
checking if gethostbyname_r takes 6 args.... yes
checking if gethostbyname_r is compilable... yes
checking if gethostbyname_r usage allowed... yes
checking if gethostbyname_r might be used... yes
checking if gethostname can be linked... yes
checking if gethostname is prototyped... yes
checking if gethostname is compilable... yes
checking for gethostname arg 2 data type... size_t
checking if gethostname usage allowed... yes
checking if gethostname might be used... yes
checking if getpeername can be linked... yes
checking if getpeername is prototyped... yes
checking if getpeername is compilable... yes
checking if getpeername usage allowed... yes
checking if getpeername might be used... yes
checking if getsockname can be linked... yes
checking if getsockname is prototyped... yes
checking if getsockname is compilable... yes
checking if getsockname usage allowed... yes
checking if getsockname might be used... yes
checking for net/if.h... (cached) yes
checking if if_nametoindex can be linked... yes
checking if if_nametoindex is prototyped... yes
checking if if_nametoindex is compilable... yes
checking if if_nametoindex usage allowed... yes
checking if if_nametoindex might be used... yes
checking for sys/types.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for netinet/in.h... (cached) yes
checking for ifaddrs.h... yes
checking if getifaddrs can be linked... yes
checking if getifaddrs is prototyped... yes
checking if getifaddrs is compilable... yes
checking if getifaddrs seems to work... yes
checking if getifaddrs usage allowed... yes
checking if getifaddrs might be used... yes
checking for sys/types.h... (cached) yes
checking for sys/time.h... (cached) yes
checking if gmtime_r can be linked... yes
checking if gmtime_r is prototyped... yes
checking if gmtime_r is compilable... yes
checking if gmtime_r seems to work... yes
checking if gmtime_r usage allowed... yes
checking if gmtime_r might be used... yes
checking for sys/types.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for netinet/in.h... (cached) yes
checking for arpa/inet.h... (cached) yes
checking if inet_ntop can be linked... yes
checking if inet_ntop is prototyped... yes
checking if inet_ntop is compilable... yes
checking if inet_ntop seems to work... yes
checking if inet_ntop usage allowed... yes
checking if inet_ntop might be used... yes
checking if inet_pton can be linked... yes
checking if inet_pton is prototyped... yes
checking if inet_pton is compilable... yes
checking if inet_pton seems to work... yes
checking if inet_pton usage allowed... yes
checking if inet_pton might be used... yes
checking for sys/types.h... (cached) yes
checking for unistd.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for sys/ioctl.h... (cached) yes
checking for stropts.h... no
checking if ioctl can be linked... yes
checking if ioctl is prototyped... yes
checking if ioctl is compilable... yes
checking if ioctl usage allowed... yes
checking if ioctl might be used... yes
checking if ioctl FIONBIO is compilable... yes
checking if ioctl FIONBIO usage allowed... yes
checking if ioctl FIONBIO might be used... yes
checking if ioctl SIOCGIFADDR is compilable... yes
checking if ioctl SIOCGIFADDR usage allowed... yes
checking if ioctl SIOCGIFADDR might be used... yes
checking if ioctlsocket can be linked... no
checking if ioctlsocket might be used... no
checking if IoctlSocket can be linked... no
checking if IoctlSocket might be used... no
checking if memrchr can be linked... yes
checking if memrchr is prototyped... no
checking if memrchr might be used... no
checking for sys/types.h... (cached) yes
checking for poll.h... (cached) yes
checking for sys/poll.h... (cached) yes
checking if poll can be linked... yes
checking if poll is prototyped... yes
checking if poll is compilable... yes
checking if poll seems to work... yes
checking if poll usage allowed... yes
checking if poll might be used... yes
checking for sys/types.h... (cached) yes
checking if sigaction can be linked... yes
checking if sigaction is prototyped... yes
checking if sigaction is compilable... yes
checking if sigaction usage allowed... yes
checking if sigaction might be used... yes
checking if siginterrupt can be linked... yes
checking if siginterrupt is prototyped... yes
checking if siginterrupt is compilable... yes
checking if siginterrupt usage allowed... yes
checking if siginterrupt might be used... yes
checking if signal can be linked... yes
checking if signal is prototyped... yes
checking if signal is compilable... yes
checking if signal usage allowed... yes
checking if signal might be used... yes
checking for sys/types.h... (cached) yes
checking if sigsetjmp can be linked... no
checking if sigsetjmp seems a macro... yes
checking if sigsetjmp is compilable... yes
checking if sigsetjmp usage allowed... yes
checking if sigsetjmp might be used... yes
checking if socket can be linked... yes
checking if socket is prototyped... yes
checking if socket is compilable... yes
checking if socket usage allowed... yes
checking if socket might be used... yes
checking if socketpair can be linked... yes
checking if socketpair is prototyped... yes
checking if socketpair is compilable... yes
checking if socketpair usage allowed... yes
checking if socketpair might be used... yes
checking if strcasecmp can be linked... yes
checking if strcasecmp is prototyped... yes
checking if strcasecmp is compilable... yes
checking if strcasecmp usage allowed... yes
checking if strcasecmp might be used... yes
checking if strcmpi can be linked... no
checking if strcmpi might be used... no
checking if strdup can be linked... yes
checking if strdup is prototyped... yes
checking if strdup is compilable... yes
checking if strdup usage allowed... yes
checking if strdup might be used... yes
checking if strerror_r can be linked... yes
checking if strerror_r is prototyped... yes
checking if strerror_r is compilable... yes
checking if strerror_r is glibc like... no
checking if strerror_r is POSIX like... yes
checking if strerror_r seems to work... yes
checking if strerror_r usage allowed... yes
checking if strerror_r might be used... yes
checking if stricmp can be linked... no
checking if stricmp might be used... no
checking if strtok_r can be linked... yes
checking if strtok_r is prototyped... yes
checking if strtok_r is compilable... yes
checking if strtok_r usage allowed... yes
checking if strtok_r might be used... yes
checking if strtoll can be linked... yes
checking if strtoll is prototyped... yes
checking if strtoll is compilable... yes
checking if strtoll usage allowed... yes
checking if strtoll might be used... yes
checking for ccache gcc options needed to detect all undeclared functions... none needed
checking whether getpwuid_r is declared... yes
checking for _fseeki64... no
checking deeper for _fseeki64... but still no
checking for arc4random... no
checking deeper for arc4random... but still no
checking for fnmatch... yes
checking for fseeko... yes
checking for geteuid... yes
checking for getpass_r... no
checking deeper for getpass_r... but still no
checking for getppid... yes
checking for getpwuid... yes
checking for getpwuid_r... yes
checking for getrlimit... yes
checking for gettimeofday... yes
checking for if_nametoindex... yes
checking for mach_absolute_time... no
checking deeper for mach_absolute_time... but still no
checking for pipe... yes
checking for sched_yield... yes
checking for sendmsg... yes
checking for setlocale... yes
checking for setmode... no
checking deeper for setmode... but still no
checking for setrlimit... yes
checking for snprintf... yes
checking for utime... yes
checking for utimes... yes
checking whether fseeko is declared... yes
checking how to set a socket into non-blocking mode... fcntl O_NONBLOCK
checking for perl... /usr/bin/perl
checking whether to enable the threaded resolver... yes
checking whether to use POSIX threads for threaded resolver... auto
checking for pthread.h... yes
checking for pthread_create... yes
checking for dirent.h... yes
checking for opendir... yes
checking convert -I options to -isystem... yes
checking whether to enable verbose strings... yes
checking whether to enable SSPI support (Windows native builds only)... no
checking whether to enable basic authentication method... yes
checking whether to enable bearer authentication method... yes
checking whether to enable digest authentication method... yes
checking whether to enable kerberos authentication method... yes
checking whether to enable negotiate authentication method... yes
checking whether to enable aws sig methods... yes
checking whether to support NTLM... yes
checking whether to enable TLS-SRP authentication... yes
checking whether to enable Unix domain sockets... auto
checking for struct sockaddr_un.sun_path... yes
checking whether to support cookies... yes
checking whether to support socketpair... yes
checking whether to support HTTP authentication... yes
checking whether to support DoH... yes
checking whether to support the MIME API... yes
checking whether to support binding connections locally... yes
checking whether to support the form API... yes
checking whether to support date parsing... yes
checking whether to support netrc parsing... yes
checking whether to support progress-meter... yes
checking whether to support DNS shuffling... yes
checking whether to support curl_easy_option*... yes
checking whether to support alt-svc... yes
checking whether to support headers-api... yes
configure: disables HSTS due to lack of SSL
checking whether to support WebSockets... no
checking whether hiding of library internal symbols will actually happen... yes
checking if this build supports HTTPS-proxy... no
checking that generated files are newer than configure... done
configure: creating ./config.status
config.status: creating Makefile
config.status: creating docs/Makefile
config.status: creating docs/examples/Makefile
config.status: creating docs/libcurl/Makefile
config.status: creating docs/libcurl/opts/Makefile
config.status: creating docs/cmdline-opts/Makefile
config.status: creating include/Makefile
config.status: creating include/curl/Makefile
config.status: creating src/Makefile
config.status: creating lib/Makefile
config.status: creating scripts/Makefile
config.status: creating lib/libcurl.vers
config.status: creating tests/Makefile
config.status: creating tests/config
config.status: creating tests/certs/Makefile
config.status: creating tests/certs/scripts/Makefile
config.status: creating tests/data/Makefile
config.status: creating tests/server/Makefile
config.status: creating tests/libtest/Makefile
config.status: creating tests/unit/Makefile
config.status: creating tests/http/config.ini
config.status: creating tests/http/Makefile
config.status: creating tests/http/clients/Makefile
config.status: creating packages/Makefile
config.status: creating packages/vms/Makefile
config.status: creating curl-config
config.status: creating libcurl.pc
config.status: creating lib/curl_config.h
config.status: executing depfiles commands
config.status: executing libtool commands
configure: Configured to build curl/libcurl:

Host setup: x86_64-pc-linux-gnu
Install prefix: /usr/local
Compiler: ccache gcc
CFLAGS: -Werror-implicit-function-declaration -O2 -Wno-system-headers
CPPFLAGS:
LDFLAGS:
LIBS: -lpsl -lz

curl version: 8.8.0-DEV
SSL: no (--with-{openssl,gnutls,mbedtls,wolfssl,schannel,secure-transport,amissl,bearssl,rustls} )
SSH: no (--with-{libssh,libssh2})
zlib: enabled
brotli: no (--with-brotli)
zstd: no (--with-zstd)
GSS-API: no (--with-gssapi)
GSASL: no (libgsasl not found)
TLS-SRP: no (--enable-tls-srp)
resolver: POSIX threaded
IPv6: enabled
Unix sockets: enabled
IDN: no (--with-{libidn2,winidn})
Build docs: no
Build libcurl: Shared=no, Static=yes
Built-in manual: no (--enable-manual)
--libcurl option: enabled (--disable-libcurl-option)
Verbose errors: enabled (--disable-verbose)
Code coverage: disabled
SSPI: no (--enable-sspi)
ca cert bundle: no
ca cert path:
ca fallback:
LDAP: no (--enable-ldap / --with-ldap-lib / --with-lber-lib)
LDAPS: no (--enable-ldaps)
RTSP: enabled
RTMP: no (--with-librtmp)
PSL: enabled
Alt-svc: enabled (--disable-alt-svc)
Headers API: enabled (--disable-headers-api)
HSTS: no (--enable-hsts)
HTTP1: enabled (internal)
HTTP2: no (--with-nghttp2)
HTTP3: no (--with-ngtcp2 --with-nghttp3, --with-quiche, --with-openssl-quic, --with-msh3)
ECH: no (--enable-ech)
WebSockets: no (--enable-websockets)
Protocols: DICT FILE FTP GOPHER HTTP IMAP IPFS IPNS MQTT POP3 RTSP SMTP TELNET TFTP
Features: AsynchDNS IPv6 Largefile PSL UnixSockets alt-svc libz threadsafe

configure: WARNING: Cannot find libraries for LDAP support: LDAP disabled
configure: WARNING: libgsasl was not found
configure: WARNING: Cannot find libraries for IDN support: IDN disabled

$ make -j3
Making all in lib
make[1]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/lib'
make all-am
make[2]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/lib'
CC libcurl_la-altsvc.lo
CC libcurl_la-amigaos.lo
CC libcurl_la-asyn-ares.lo
CC libcurl_la-asyn-thread.lo
CC libcurl_la-base64.lo
CC libcurl_la-bufq.lo
CC libcurl_la-bufref.lo
CC libcurl_la-c-hyper.lo
CC libcurl_la-cf-h1-proxy.lo
CC libcurl_la-cf-h2-proxy.lo
CC libcurl_la-cf-haproxy.lo
CC libcurl_la-cf-https-connect.lo
CC libcurl_la-cf-socket.lo
CC libcurl_la-cfilters.lo
CC libcurl_la-conncache.lo
CC libcurl_la-connect.lo
CC libcurl_la-content_encoding.lo
CC libcurl_la-cookie.lo
CC libcurl_la-curl_addrinfo.lo
CC libcurl_la-curl_des.lo
CC libcurl_la-curl_endian.lo
CC libcurl_la-curl_fnmatch.lo
CC libcurl_la-curl_get_line.lo
CC libcurl_la-curl_gethostname.lo
CC libcurl_la-curl_gssapi.lo
CC libcurl_la-curl_memrchr.lo
CC libcurl_la-curl_multibyte.lo
CC libcurl_la-curl_ntlm_core.lo
CC libcurl_la-curl_path.lo
CC libcurl_la-curl_range.lo
CC libcurl_la-curl_rtmp.lo
CC libcurl_la-curl_sasl.lo
CC libcurl_la-curl_sha512_256.lo
CC libcurl_la-curl_sspi.lo
CC libcurl_la-curl_threads.lo
CC libcurl_la-curl_trc.lo
CC libcurl_la-cw-out.lo
CC libcurl_la-dict.lo
CC libcurl_la-doh.lo
CC libcurl_la-dynbuf.lo
CC libcurl_la-dynhds.lo
CC libcurl_la-easy.lo
CC libcurl_la-easygetopt.lo
CC libcurl_la-easyoptions.lo
CC libcurl_la-escape.lo
CC libcurl_la-file.lo
CC libcurl_la-fileinfo.lo
CC libcurl_la-fopen.lo
CC libcurl_la-formdata.lo
CC libcurl_la-ftp.lo
CC libcurl_la-ftplistparser.lo
CC libcurl_la-getenv.lo
CC libcurl_la-getinfo.lo
CC libcurl_la-gopher.lo
CC libcurl_la-hash.lo
CC libcurl_la-headers.lo
CC libcurl_la-hmac.lo
CC libcurl_la-hostasyn.lo
CC libcurl_la-hostip.lo
CC libcurl_la-hostip4.lo
CC libcurl_la-hostip6.lo
CC libcurl_la-hostsyn.lo
CC libcurl_la-hsts.lo
CC libcurl_la-http.lo
CC libcurl_la-http1.lo
CC libcurl_la-http2.lo
CC libcurl_la-http_aws_sigv4.lo
CC libcurl_la-http_chunks.lo
CC libcurl_la-http_digest.lo
CC libcurl_la-http_negotiate.lo
CC libcurl_la-http_ntlm.lo
CC libcurl_la-http_proxy.lo
CC libcurl_la-idn.lo
CC libcurl_la-if2ip.lo
CC libcurl_la-imap.lo
CC libcurl_la-inet_ntop.lo
CC libcurl_la-inet_pton.lo
CC libcurl_la-krb5.lo
CC libcurl_la-ldap.lo
CC libcurl_la-llist.lo
CC libcurl_la-macos.lo
CC libcurl_la-md4.lo
CC libcurl_la-md5.lo
CC libcurl_la-memdebug.lo
CC libcurl_la-mime.lo
CC libcurl_la-mprintf.lo
CC libcurl_la-mqtt.lo
CC libcurl_la-multi.lo
CC libcurl_la-netrc.lo
CC libcurl_la-nonblock.lo
CC libcurl_la-noproxy.lo
CC libcurl_la-openldap.lo
CC libcurl_la-parsedate.lo
CC libcurl_la-pingpong.lo
CC libcurl_la-pop3.lo
CC libcurl_la-progress.lo
CC libcurl_la-psl.lo
CC libcurl_la-rand.lo
CC libcurl_la-rename.lo
CC libcurl_la-request.lo
CC libcurl_la-rtsp.lo
CC libcurl_la-select.lo
CC libcurl_la-sendf.lo
CC libcurl_la-setopt.lo
CC libcurl_la-sha256.lo
CC libcurl_la-share.lo
CC libcurl_la-slist.lo
CC libcurl_la-smb.lo
CC libcurl_la-smtp.lo
CC libcurl_la-socketpair.lo
CC libcurl_la-socks.lo
CC libcurl_la-socks_gssapi.lo
CC libcurl_la-socks_sspi.lo
CC libcurl_la-speedcheck.lo
CC libcurl_la-splay.lo
CC libcurl_la-strcase.lo
CC libcurl_la-strdup.lo
CC libcurl_la-strerror.lo
CC libcurl_la-strtok.lo
CC libcurl_la-strtoofft.lo
CC libcurl_la-system_win32.lo
CC libcurl_la-telnet.lo
CC libcurl_la-tftp.lo
CC libcurl_la-timediff.lo
CC libcurl_la-timeval.lo
CC libcurl_la-transfer.lo
CC libcurl_la-url.lo
CC libcurl_la-urlapi.lo
CC libcurl_la-version.lo
CC libcurl_la-version_win32.lo
CC libcurl_la-warnless.lo
CC libcurl_la-ws.lo
CC vauth/libcurl_la-cleartext.lo
CC vauth/libcurl_la-cram.lo
CC vauth/libcurl_la-digest.lo
CC vauth/libcurl_la-digest_sspi.lo
CC vauth/libcurl_la-gsasl.lo
CC vauth/libcurl_la-krb5_gssapi.lo
CC vauth/libcurl_la-krb5_sspi.lo
CC vauth/libcurl_la-ntlm.lo
CC vauth/libcurl_la-ntlm_sspi.lo
CC vauth/libcurl_la-oauth2.lo
CC vauth/libcurl_la-spnego_gssapi.lo
CC vauth/libcurl_la-spnego_sspi.lo
CC vauth/libcurl_la-vauth.lo
CC vtls/libcurl_la-bearssl.lo
CC vtls/libcurl_la-gtls.lo
CC vtls/libcurl_la-hostcheck.lo
CC vtls/libcurl_la-keylog.lo
CC vtls/libcurl_la-mbedtls.lo
CC vtls/libcurl_la-mbedtls_threadlock.lo
CC vtls/libcurl_la-openssl.lo
CC vtls/libcurl_la-rustls.lo
CC vtls/libcurl_la-schannel.lo
CC vtls/libcurl_la-schannel_verify.lo
CC vtls/libcurl_la-sectransp.lo
CC vtls/libcurl_la-vtls.lo
CC vtls/libcurl_la-wolfssl.lo
CC vtls/libcurl_la-x509asn1.lo
CC vquic/libcurl_la-curl_msh3.lo
CC vquic/libcurl_la-curl_ngtcp2.lo
CC vquic/libcurl_la-curl_osslq.lo
CC vquic/libcurl_la-curl_quiche.lo
CC vquic/libcurl_la-vquic.lo
CC vquic/libcurl_la-vquic-tls.lo
CC vssh/libcurl_la-libssh.lo
CC vssh/libcurl_la-libssh2.lo
CC vssh/libcurl_la-wolfssh.lo
CCLD libcurl.la
make[2]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/lib'
make[1]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/lib'
Making all in docs
make[1]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs'
Making all in .
make[2]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs'
make[2]: Nothing to be done for 'all-am'.
make[2]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs'
Making all in cmdline-opts
make[2]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs/cmdline-opts'
make[2]: Nothing to be done for 'all'.
make[2]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs/cmdline-opts'
Making all in libcurl
make[2]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs/libcurl'
Making all in opts
make[3]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs/libcurl/opts'
make[3]: Nothing to be done for 'all'.
make[3]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs/libcurl/opts'
make[3]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs/libcurl'
make[3]: Nothing to be done for 'all-am'.
make[3]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs/libcurl'
make[2]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs/libcurl'
make[1]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs'
Making all in src
make[1]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/src'
make[2]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/src'
CC slist_wc.o
CC tool_binmode.o
CC tool_bname.o
CC tool_cb_dbg.o
CC tool_cb_hdr.o
CC tool_cb_prg.o
CC tool_cb_rea.o
CC tool_cb_see.o
CC tool_cb_wrt.o
CC tool_cfgable.o
CC tool_dirhie.o
CC tool_doswin.o
CC tool_easysrc.o
CC tool_filetime.o
CC tool_findfile.o
CC tool_formparse.o
CC tool_getparam.o
CC tool_getpass.o
CC tool_help.o
CC tool_helpers.o
echo '#include "tool_hugehelp.h"' >> tool_hugehelp.c
CC tool_ipfs.o
CC tool_libinfo.o
CC tool_listhelp.o
CC tool_main.o
CC tool_msgs.o
CC tool_operate.o
CC tool_operhlp.o
CC tool_paramhlp.o
CC tool_parsecfg.o
CC tool_progress.o
CC tool_setopt.o
CC tool_sleep.o
CC tool_stderr.o
CC tool_strdup.o
CC tool_urlglob.o
CC tool_util.o
CC tool_vms.o
CC tool_writeout.o
CC tool_writeout_json.o
CC tool_xattr.o
CC var.o
CC tool_hugehelp.o
CC ../lib/base64.o
CC ../lib/curl_multibyte.o
CC ../lib/dynbuf.o
CC ../lib/nonblock.o
CC ../lib/strtoofft.o
CC ../lib/timediff.o
CC ../lib/warnless.o
CC ../lib/version_win32.o
CCLD curl
make[2]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/src'
make[1]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/src'
Making all in scripts
make[1]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/scripts'
make[1]: Nothing to be done for 'all'.
make[1]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/scripts'
make[1]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0'
make[1]: Nothing to be done for 'all-am'.
make[1]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0'

Commit Diff GitHub →

CMakeLists.txt +3 -0 configure.ac +1 -1 lib/Makefile.mk +1 -1 lib/altsvc.c +1 -1 lib/asyn-ares.c +3 -3 lib/asyn-thread.c +2 -2 lib/cf-socket.c +13 -13 lib/config-os400.h +1 -1 lib/config-plan9.h +1 -1 lib/config-riscos.h +1 -4 lib/config-win32.h +0 -4 lib/conncache.c +1 -1 lib/connect.c +5 -5 lib/curl_addrinfo.c +9 -9 lib/curl_config.h.cmake +1 -1 lib/curl_setup.h +8 -3 lib/doh.c +4 -4 lib/ftp.c +9 -9 lib/hostip.c +11 -11 lib/hostip.h +1 -1 lib/if2ip.c +8 -8 lib/if2ip.h +2 -2 lib/inet_ntop.c +2 -2 lib/inet_pton.c +2 -2 lib/noproxy.c +1 -1 lib/setopt.c +1 -1 lib/setup-vms.h +2 -2 lib/sockaddr.h +1 -1 lib/socks.c +3 -3 lib/url.c +3 -3 lib/urlapi.c +2 -2 lib/urldata.h +2 -2 lib/version.c +1 -1 lib/vquic/curl_osslq.c +2 -2 lib/vtls/gtls.c +2 -2 lib/vtls/openssl.c +2 -2 lib/vtls/rustls.c +2 -2 lib/vtls/vtls.c +2 -2 tests/server/mqttd.c +12 -12 tests/server/rtspd.c +12 -12 tests/server/server_sockaddr.h +1 -1 tests/server/sockfilt.c +15 -15 tests/server/socksd.c +8 -8 tests/server/sws.c +12 -12 tests/server/tftpd.c +18 -18 tests/unit/unit1607.c +1 -1 tests/unit/unit2600.c +2 -2

CMakeLists.txt+3 -0

@@ -303,6 +303,9 @@ if(ENABLE_IPV6 AND NOT WIN32)
	list(APPEND CURL_LIBS "-framework SystemConfiguration")
	endif()
	endif()
+	if(ENABLE_IPV6)
+	set(USE_IPV6 ON)
+	endif()

	find_package(Perl)

configure.ac+1 -1

@@ -1700,7 +1700,7 @@ int main(void)

	if test "$ipv6" = yes; then
	curl_ipv6_msg="enabled"
-	AC_DEFINE(ENABLE_IPV6, 1, [Define if you want to enable IPv6 support])
+	AC_DEFINE(USE_IPV6, 1, [Define if you want to enable IPv6 support])
	IPV6_ENABLED=1
	AC_SUBST(IPV6_ENABLED)

lib/Makefile.mk+1 -1

@@ -254,7 +254,7 @@ endif
	endif

	ifneq ($(findstring -ipv6,$(CFG)),)
-	CPPFLAGS += -DENABLE_IPV6
+	CPPFLAGS += -DUSE_IPV6
	endif

	ifneq ($(findstring -watt,$(CFG))$(MSDOS),)

lib/altsvc.c+1 -1

@@ -252,7 +252,7 @@ static CURLcode altsvc_out(struct altsvc as, FILE fp)
	CURLcode result = Curl_gmtime(as->expires, &stamp);
	if(result)
	return result;
-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	else {
	char ipv6_unused[16];
	if(1 == Curl_inet_pton(AF_INET6, as->dst.host, ipv6_unused)) {

lib/asyn-ares.c+3 -3

@@ -539,7 +539,7 @@ static void compound_results(struct thread_data *res,
	if(!ai)
	return;

-	#ifdef ENABLE_IPV6 /* CURLRES_IPV6 */
+	#ifdef USE_IPV6 /* CURLRES_IPV6 */
	if(res->temp_ai && res->temp_ai->ai_family == PF_INET6) {
	/* We have results already, put the new IPv6 entries at the head of the
	list. */
@@ -684,7 +684,7 @@ static struct Curl_addrinfo ares2addr(struct ares_addrinfo_node node)
	/* settle family-specific sockaddr structure size. */
	if(ai->ai_family == AF_INET)
	ss_size = sizeof(struct sockaddr_in);
-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	else if(ai->ai_family == AF_INET6)
	ss_size = sizeof(struct sockaddr_in6);
	#endif
@@ -932,7 +932,7 @@ CURLcode Curl_set_dns_local_ip4(struct Curl_easy *data,
	CURLcode Curl_set_dns_local_ip6(struct Curl_easy *data,
	const char *local_ip6)
	{
-	#if defined(HAVE_CARES_SET_LOCAL) && defined(ENABLE_IPV6)
+	#if defined(HAVE_CARES_SET_LOCAL) && defined(USE_IPV6)
	unsigned char a6[INET6_ADDRSTRLEN];

	if((!local_ip6) \|\| (local_ip6[0] == 0)) {

lib/asyn-thread.c+2 -2

@@ -325,7 +325,7 @@ query_complete(DWORD err, DWORD bytes, LPWSAOVERLAPPED overlapped)
	/* settle family-specific sockaddr structure size. */
	if(ai->ai_family == AF_INET)
	ss_size = sizeof(struct sockaddr_in);
-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	else if(ai->ai_family == AF_INET6)
	ss_size = sizeof(struct sockaddr_in6);
	#endif
@@ -444,7 +444,7 @@ query_complete(DWORD err, DWORD bytes, LPWSAOVERLAPPED overlapped)
	/*
	* getaddrinfo_thread() resolves a name and then exits.
	*
-	* For builds without ARES, but with ENABLE_IPV6, create a resolver thread
+	* For builds without ARES, but with USE_IPV6, create a resolver thread
	* and wait on it.
	*/
	static unsigned int CURL_STDCALL getaddrinfo_thread(void *arg)

lib/cf-socket.c+13 -13

@@ -81,7 +81,7 @@
	#include "memdebug.h"


-	#if defined(ENABLE_IPV6) && defined(IPV6_V6ONLY) && defined(_WIN32)
+	#if defined(USE_IPV6) && defined(IPV6_V6ONLY) && defined(_WIN32)
	/* It makes support for IPv4-mapped IPv6 addresses.
	* Linux kernel, NetBSD, FreeBSD and Darwin: default is off;
	* Windows Vista and later: default is on;
@@ -287,7 +287,7 @@ static CURLcode socket_open(struct Curl_easy *data,
	/* no socket, no connection */
	return CURLE_COULDNT_CONNECT;

-	#if defined(ENABLE_IPV6) && defined(HAVE_SOCKADDR_IN6_SIN6_SCOPE_ID)
+	#if defined(USE_IPV6) && defined(HAVE_SOCKADDR_IN6_SIN6_SCOPE_ID)
	if(data->conn->scope_id && (addr->family == AF_INET6)) {
	struct sockaddr_in6 * const sa6 = (void *)&addr->sa_addr;
	sa6->sin6_scope_id = data->conn->scope_id;
@@ -405,7 +405,7 @@ static CURLcode bindlocal(struct Curl_easy data, struct connectdata conn,
	struct sockaddr sock = (struct sockaddr )&sa; /* bind to this address */
	curl_socklen_t sizeof_sa = 0; /* size of the data sock points to */
	struct sockaddr_in si4 = (struct sockaddr_in )&sa;
-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	struct sockaddr_in6 si6 = (struct sockaddr_in6 )&sa;
	#endif

@@ -419,7 +419,7 @@ static CURLcode bindlocal(struct Curl_easy data, struct connectdata conn,
	#ifdef IP_BIND_ADDRESS_NO_PORT
	int on = 1;
	#endif
-	#ifndef ENABLE_IPV6
+	#ifndef USE_IPV6
	(void)scope;
	#endif

@@ -475,7 +475,7 @@ static CURLcode bindlocal(struct Curl_easy data, struct connectdata conn,
	#endif

	switch(Curl_if2ip(af,
-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	scope, conn->scope_id,
	#endif
	dev, myhost, sizeof(myhost))) {
@@ -514,7 +514,7 @@ static CURLcode bindlocal(struct Curl_easy data, struct connectdata conn,

	if(af == AF_INET)
	conn->ip_version = CURL_IPRESOLVE_V4;
-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	else if(af == AF_INET6)
	conn->ip_version = CURL_IPRESOLVE_V6;
	#endif
@@ -547,7 +547,7 @@ static CURLcode bindlocal(struct Curl_easy data, struct connectdata conn,
	}

	if(done > 0) {
-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	/* IPv6 address */
	if(af == AF_INET6) {
	#ifdef HAVE_SOCKADDR_IN6_SIN6_SCOPE_ID
@@ -596,7 +596,7 @@ static CURLcode bindlocal(struct Curl_easy data, struct connectdata conn,
	}
	else {
	/* no device was given, prepare sa to match af's needs */
-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	if(af == AF_INET6) {
	si6->sin6_family = AF_INET6;
	si6->sin6_port = htons(port);
@@ -639,7 +639,7 @@ static CURLcode bindlocal(struct Curl_easy data, struct connectdata conn,
	/* We reuse/clobber the port variable here below */
	if(sock->sa_family == AF_INET)
	si4->sin_port = ntohs(port);
-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	else
	si6->sin6_port = ntohs(port);
	#endif
@@ -991,7 +991,7 @@ static CURLcode cf_socket_open(struct Curl_cfilter *cf,
	if(result)
	goto out;

-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	if(ctx->addr.family == AF_INET6) {
	set_ipv6_v6only(ctx->sock, 0);
	infof(data, " Trying [%s]:%d...", ctx->ip.remote_ip, ctx->ip.remote_port);
@@ -1000,7 +1000,7 @@ static CURLcode cf_socket_open(struct Curl_cfilter *cf,
	#endif
	infof(data, " Trying %s:%d...", ctx->ip.remote_ip, ctx->ip.remote_port);

-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	is_tcp = (ctx->addr.family == AF_INET
	\|\| ctx->addr.family == AF_INET6) &&
	ctx->addr.socktype == SOCK_STREAM;
@@ -1037,7 +1037,7 @@ static CURLcode cf_socket_open(struct Curl_cfilter *cf,
	#ifndef CURL_DISABLE_BINDLOCAL
	/* possibly bind the local end to an IP, interface or port */
	if(ctx->addr.family == AF_INET
-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	\|\| ctx->addr.family == AF_INET6
	#endif
	) {
@@ -1449,7 +1449,7 @@ static void cf_socket_active(struct Curl_cfilter cf, struct Curl_easy data)
	/* the first socket info gets some specials */
	if(cf->sockindex == FIRSTSOCKET) {
	cf->conn->remote_addr = &ctx->addr;
-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	cf->conn->bits.ipv6 = (ctx->addr.family == AF_INET6)? TRUE : FALSE;
	#endif
	Curl_persistconninfo(data, cf->conn, &ctx->ip);

lib/config-os400.h+1 -1

@@ -57,7 +57,7 @@
	#undef NEED_REENTRANT

	/* Define if you want to enable IPv6 support */
-	#define ENABLE_IPV6
+	#define USE_IPV6

	/* Define if struct sockaddr_in6 has the sin6_scope_id member */
	#define HAVE_SOCKADDR_IN6_SIN6_SCOPE_ID 1

lib/config-plan9.h+1 -1

@@ -28,7 +28,7 @@
	#define CURL_CA_BUNDLE "/sys/lib/tls/ca.pem"
	#define CURL_CA_PATH "/sys/lib/tls"
	#define CURL_STATICLIB 1
-	#define ENABLE_IPV6 1
+	#define USE_IPV6 1
	#define CURL_DISABLE_LDAP 1

	#define NEED_REENTRANT 1

lib/config-riscos.h+1 -4

@@ -55,7 +55,7 @@
	#undef NEED_REENTRANT

	/* Define if you want to enable IPv6 support */
-	#undef ENABLE_IPV6
+	#undef USE_IPV6

	/* Define if struct sockaddr_in6 has the sin6_scope_id member */
	#define HAVE_SOCKADDR_IN6_SIN6_SCOPE_ID 1
@@ -66,9 +66,6 @@
	/* Define this as a suitable file to read random data from */
	#undef RANDOM_FILE

-	/* Define if you want to enable IPv6 support */
-	#undef ENABLE_IPV6
-
	/* Define if you have the alarm function. */
	#define HAVE_ALARM

lib/config-win32.h+0 -4

@@ -509,8 +509,4 @@ Vista
	/* If you want to build curl with the built-in manual */
	#define USE_MANUAL 1

-	#if defined(USE_IPV6)
-	# define ENABLE_IPV6 1
-	#endif
-
	#endif /* HEADER_CURL_CONFIG_WIN32_H */

lib/conncache.c+1 -1

@@ -140,7 +140,7 @@ static void hashkey(struct connectdata conn, char buf, size_t len)
	hostname = conn->host.name;

	/* put the numbers first so that the hostname gets cut off if too long */
-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	msnprintf(buf, len, "%u/%ld/%s", conn->scope_id, port, hostname);
	#else
	msnprintf(buf, len, "%ld/%s", port, hostname);

lib/connect.c+5 -5

@@ -195,7 +195,7 @@ bool Curl_addr2string(struct sockaddr *sa, curl_socklen_t salen,
	char addr, int port)
	{
	struct sockaddr_in *si = NULL;
-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	struct sockaddr_in6 *si6 = NULL;
	#endif
	#if (defined(HAVE_SYS_UN_H) \|\| defined(WIN32_SOCKADDR_UN)) && defined(AF_UNIX)
@@ -214,7 +214,7 @@ bool Curl_addr2string(struct sockaddr *sa, curl_socklen_t salen,
	return TRUE;
	}
	break;
-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	case AF_INET6:
	si6 = (struct sockaddr_in6 )(void ) sa;
	if(Curl_inet_ntop(sa->sa_family, &si6->sin6_addr,
@@ -401,7 +401,7 @@ static CURLcode eyeballer_new(struct eyeballer **pballer,
	return CURLE_OUT_OF_MEMORY;

	baller->name = ((ai_family == AF_INET)? "ipv4" : (
-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	(ai_family == AF_INET6)? "ipv6" :
	#endif
	"ip"));
@@ -779,7 +779,7 @@ static CURLcode start_connect(struct Curl_cfilter *cf,
	/* any IP version is allowed */
	ai_family0 = remotehost->addr?
	remotehost->addr->ai_family : 0;
-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	ai_family1 = ai_family0 == AF_INET6 ?
	AF_INET : AF_INET6;
	#else
@@ -790,7 +790,7 @@ static CURLcode start_connect(struct Curl_cfilter *cf,
	/* only one IP version is allowed */
	ai_family0 = (conn->ip_version == CURL_IPRESOLVE_V4) ?
	AF_INET :
-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	AF_INET6;
	#else
	AF_UNSPEC;

lib/curl_addrinfo.c+9 -9

@@ -130,7 +130,7 @@ Curl_getaddrinfo_ex(const char *nodename,
	/* settle family-specific sockaddr structure size. */
	if(ai->ai_family == AF_INET)
	ss_size = sizeof(struct sockaddr_in);
-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	else if(ai->ai_family == AF_INET6)
	ss_size = sizeof(struct sockaddr_in6);
	#endif
@@ -259,7 +259,7 @@ Curl_he2ai(const struct hostent *he, int port)
	struct Curl_addrinfo *prevai = NULL;
	struct Curl_addrinfo *firstai = NULL;
	struct sockaddr_in *addr;
-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	struct sockaddr_in6 *addr6;
	#endif
	CURLcode result = CURLE_OK;
@@ -275,7 +275,7 @@ Curl_he2ai(const struct hostent *he, int port)
	for(i = 0; (curr = he->h_addr_list[i]) != NULL; i++) {
	size_t ss_size;
	size_t namelen = strlen(he->h_name) + 1; /* include null-terminator */
-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	if(he->h_addrtype == AF_INET6)
	ss_size = sizeof(struct sockaddr_in6);
	else
@@ -321,7 +321,7 @@ Curl_he2ai(const struct hostent *he, int port)
	addr->sin_port = htons((unsigned short)port);
	break;

-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	case AF_INET6:
	addr6 = (void )ai->ai_addr; / storage area for this info */

@@ -348,7 +348,7 @@ struct namebuff {
	struct hostent hostentry;
	union {
	struct in_addr ina4;
-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	struct in6_addr ina6;
	#endif
	} addrentry;
@@ -401,7 +401,7 @@ Curl_ip2addr(int af, const void inaddr, const char hostname, int port)
	addrentry = (void *)&buf->addrentry.ina4;
	memcpy(addrentry, inaddr, sizeof(struct in_addr));
	break;
-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	case AF_INET6:
	addrsize = sizeof(struct in6_addr);
	addrentry = (void *)&buf->addrentry.ina6;
@@ -447,7 +447,7 @@ struct Curl_addrinfo Curl_str2addr(char address, int port)
	if(Curl_inet_pton(AF_INET, address, &in) > 0)
	/* This is a dotted IP address 123.123.123.123-style */
	return Curl_ip2addr(AF_INET, &in, address, port);
-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	{
	struct in6_addr in6;
	if(Curl_inet_pton(AF_INET6, address, &in6) > 0)
@@ -570,7 +570,7 @@ void Curl_addrinfo_set_port(struct Curl_addrinfo *addrinfo, int port)
	{
	struct Curl_addrinfo *ca;
	struct sockaddr_in *addr;
-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	struct sockaddr_in6 *addr6;
	#endif
	for(ca = addrinfo; ca != NULL; ca = ca->ai_next) {
@@ -580,7 +580,7 @@ void Curl_addrinfo_set_port(struct Curl_addrinfo *addrinfo, int port)
	addr->sin_port = htons((unsigned short)port);
	break;

-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	case AF_INET6:
	addr6 = (void )ca->ai_addr; / storage area for this info */
	addr6->sin6_port = htons((unsigned short)port);

lib/curl_config.h.cmake+1 -1

@@ -163,7 +163,7 @@
	#cmakedefine USE_WIN32_LDAP 1

	/* Define if you want to enable IPv6 support */
-	#cmakedefine ENABLE_IPV6 1
+	#cmakedefine USE_IPV6 1

	/* Define to 1 if you have the alarm function. */
	#cmakedefine HAVE_ALARM 1

lib/curl_setup.h+8 -3

@@ -72,6 +72,11 @@
	# endif
	#endif

+	/* Compatibility */
+	#if defined(ENABLE_IPV6)
+	# define USE_IPV6 1
+	#endif
+
	/*
	* Include configuration script results or hand-crafted
	* configuration file for platforms which lack config tool.
@@ -309,7 +314,7 @@
	#include <TargetConditionals.h>
	#define USE_RESOLVE_ON_IPS 1
	# if TARGET_OS_MAC && !(defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE) && \
-	defined(ENABLE_IPV6)
+	defined(USE_IPV6)
	# define CURL_MACOS_CALL_COPYPROXIES 1
	# endif
	#endif
@@ -620,9 +625,9 @@
	* Mutually exclusive CURLRES_* definitions.
	*/

-	#if defined(ENABLE_IPV6) && defined(HAVE_GETADDRINFO)
+	#if defined(USE_IPV6) && defined(HAVE_GETADDRINFO)
	# define CURLRES_IPV6
-	#elif defined(ENABLE_IPV6) && (defined(_WIN32) \|\| defined(__CYGWIN__))
+	#elif defined(USE_IPV6) && (defined(_WIN32) \|\| defined(__CYGWIN__))
	/* assume on Windows that IPv6 without getaddrinfo is a broken build */
	# error "Unexpected build: IPv6 is enabled but getaddrinfo was not found."
	#else

lib/doh.c+4 -4

@@ -408,7 +408,7 @@ struct Curl_addrinfo Curl_doh(struct Curl_easy data,
	goto error;
	dohp->pending++;

-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	if((conn->ip_version != CURL_IPRESOLVE_V4) && Curl_ipv6works(data)) {
	/* create IPv6 DoH request */
	result = dohprobe(data, &dohp->probe[DOH_PROBE_SLOT_IPADDR_V6],
@@ -804,7 +804,7 @@ static CURLcode doh2ai(const struct dohentry de, const char hostname,
	struct Curl_addrinfo *prevai = NULL;
	struct Curl_addrinfo *firstai = NULL;
	struct sockaddr_in *addr;
-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	struct sockaddr_in6 *addr6;
	#endif
	CURLcode result = CURLE_OK;
@@ -820,7 +820,7 @@ static CURLcode doh2ai(const struct dohentry de, const char hostname,
	size_t ss_size;
	CURL_SA_FAMILY_T addrtype;
	if(de->addr[i].type == DNS_TYPE_AAAA) {
-	#ifndef ENABLE_IPV6
+	#ifndef USE_IPV6
	/* we can't handle IPv6 addresses */
	continue;
	#else
@@ -869,7 +869,7 @@ static CURLcode doh2ai(const struct dohentry de, const char hostname,
	addr->sin_port = htons((unsigned short)port);
	break;

-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	case AF_INET6:
	addr6 = (void )ai->ai_addr; / storage area for this info */
	DEBUGASSERT(sizeof(struct in6_addr) == sizeof(de->addr[i].ip.v6));

lib/ftp.c+9 -9

@@ -362,7 +362,7 @@ static CURLcode AcceptServerConnect(struct Curl_easy *data)
	struct connectdata *conn = data->conn;
	curl_socket_t sock = conn->sock[SECONDARYSOCKET];
	curl_socket_t s = CURL_SOCKET_BAD;
-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	struct Curl_sockaddr_storage add;
	#else
	struct sockaddr_in add;
@@ -1029,7 +1029,7 @@ static CURLcode ftp_state_use_port(struct Curl_easy *data,
	char hbuf[NI_MAXHOST];
	struct sockaddr sa = (struct sockaddr )&ss;
	struct sockaddr_in * const sa4 = (void *)sa;
-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	struct sockaddr_in6 * const sa6 = (void *)sa;
	#endif
	static const char mode[][5] = { "EPRT", "PORT" };
@@ -1056,7 +1056,7 @@ static CURLcode ftp_state_use_port(struct Curl_easy *data,
	(strlen(data->set.str[STRING_FTPPORT]) > 1)) {
	char *ip_end = NULL;

-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	if(*string_ftpport == '[') {
	/* [ipv6]:port(-range) */
	char *ip_start = string_ftpport + 1;
@@ -1078,7 +1078,7 @@ static CURLcode ftp_state_use_port(struct Curl_easy *data,
	if(ip_end) {
	/* either ipv6 or (ipv4\|domain\|interface):port(-range) */
	addrlen = ip_end - string_ftpport;
-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	if(Curl_inet_pton(AF_INET6, string_ftpport, &sa6->sin6_addr) == 1) {
	/* ipv6 */
	port_min = port_max = 0;
@@ -1124,7 +1124,7 @@ static CURLcode ftp_state_use_port(struct Curl_easy *data,

	/* attempt to get the address of the given interface name */
	switch(Curl_if2ip(conn->remote_addr->family,
-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	Curl_ipv6_scope(&conn->remote_addr->sa_addr),
	conn->scope_id,
	#endif
@@ -1156,7 +1156,7 @@ static CURLcode ftp_state_use_port(struct Curl_easy *data,
	goto out;
	}
	switch(sa->sa_family) {
-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	case AF_INET6:
	r = Curl_inet_ntop(sa->sa_family, &sa6->sin6_addr, hbuf, sizeof(hbuf));
	break;
@@ -1216,7 +1216,7 @@ static CURLcode ftp_state_use_port(struct Curl_easy *data,
	for(port = port_min; port <= port_max;) {
	if(sa->sa_family == AF_INET)
	sa4->sin_port = htons(port);
-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	else
	sa6->sin6_port = htons(port);
	#endif
@@ -1284,7 +1284,7 @@ static CURLcode ftp_state_use_port(struct Curl_easy *data,
	below */
	Curl_printable_address(ai, myhost, sizeof(myhost));

-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	if(!conn->bits.ftp_use_eprt && conn->bits.ipv6)
	/* EPRT is disabled but we are connected to a IPv6 host, so we ignore the
	request and enable EPRT again! */
@@ -1311,7 +1311,7 @@ static CURLcode ftp_state_use_port(struct Curl_easy *data,
	case AF_INET:
	port = ntohs(sa4->sin_port);
	break;
-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	case AF_INET6:
	port = ntohs(sa6->sin6_port);
	break;

lib/hostip.c+11 -11

@@ -144,7 +144,7 @@ void Curl_printable_address(const struct Curl_addrinfo ai, char buf,
	(void)Curl_inet_ntop(ai->ai_family, (const void *)ipaddr4, buf, bufsize);
	break;
	}
-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	case AF_INET6: {
	const struct sockaddr_in6 sa6 = (const void )ai->ai_addr;
	const struct in6_addr *ipaddr6 = &sa6->sin6_addr;
@@ -523,7 +523,7 @@ Curl_cache_addr(struct Curl_easy *data,
	return dns;
	}

-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	/* return a static IPv6 ::1 for the name */
	static struct Curl_addrinfo get_localhost6(int port, const char name)
	{
@@ -600,7 +600,7 @@ static struct Curl_addrinfo get_localhost(int port, const char name)
	return ca6;
	}

-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	/*
	* Curl_ipv6works() returns TRUE if IPv6 seems to work.
	*/
@@ -632,7 +632,7 @@ bool Curl_ipv6works(struct Curl_easy *data)
	return (ipv6_works>0)?TRUE:FALSE;
	}
	}
-	#endif /* ENABLE_IPV6 */
+	#endif /* USE_IPV6 */

	/*
	* Curl_host_is_ipnum() returns TRUE if the given string is a numerical IPv4
@@ -641,11 +641,11 @@ bool Curl_ipv6works(struct Curl_easy *data)
	bool Curl_host_is_ipnum(const char *hostname)
	{
	struct in_addr in;
-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	struct in6_addr in6;
	#endif
	if(Curl_inet_pton(AF_INET, hostname, &in) > 0
-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	\|\| Curl_inet_pton(AF_INET6, hostname, &in6) > 0
	#endif
	)
@@ -760,7 +760,7 @@ enum resolve_t Curl_resolv(struct Curl_easy *data,
	if(!addr)
	return CURLRESOLV_ERROR;
	}
-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	else {
	struct in6_addr in6;
	/* check if this is an IPv6 address string */
@@ -771,7 +771,7 @@ enum resolve_t Curl_resolv(struct Curl_easy *data,
	return CURLRESOLV_ERROR;
	}
	}
-	#endif /* ENABLE_IPV6 */
+	#endif /* USE_IPV6 */

	#else /* if USE_RESOLVE_ON_IPS */
	#ifndef CURL_DISABLE_DOH
@@ -779,7 +779,7 @@ enum resolve_t Curl_resolv(struct Curl_easy *data,
	if(Curl_inet_pton(AF_INET, hostname, &in) > 0)
	/* This is a dotted IP address 123.123.123.123-style */
	ipnum = TRUE;
-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	else {
	struct in6_addr in6;
	/* check if this is an IPv6 address string */
@@ -787,7 +787,7 @@ enum resolve_t Curl_resolv(struct Curl_easy *data,
	/* This is an IPv6 address literal */
	ipnum = TRUE;
	}
-	#endif /* ENABLE_IPV6 */
+	#endif /* USE_IPV6 */
	#endif /* CURL_DISABLE_DOH */

	#endif /* !USE_RESOLVE_ON_IPS */
@@ -1210,7 +1210,7 @@ CURLcode Curl_loadhostpairs(struct Curl_easy *data)
	memcpy(address, addr_begin, alen);
	address[alen] = '\0';

-	#ifndef ENABLE_IPV6
+	#ifndef USE_IPV6
	if(strchr(address, ':')) {
	infof(data, "Ignoring resolve address '%s', missing IPv6 support.",
	address);

lib/hostip.h+1 -1

@@ -96,7 +96,7 @@ enum resolve_t Curl_resolv_timeout(struct Curl_easy *data,
	struct Curl_dns_entry **dnsentry,
	timediff_t timeoutms);

-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	/*
	* Curl_ipv6works() returns TRUE if IPv6 seems to work.
	*/

lib/if2ip.c+8 -8

@@ -62,7 +62,7 @@

	/* ------------------------------------------------------------------ */

-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	/* Return the scope of the given address. */
	unsigned int Curl_ipv6_scope(const struct sockaddr *sa)
	{
@@ -97,7 +97,7 @@ unsigned int Curl_ipv6_scope(const struct sockaddr *sa)
	#if defined(HAVE_GETIFADDRS)

	if2ip_result_t Curl_if2ip(int af,
-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	unsigned int remote_scope,
	unsigned int local_scope_id,
	#endif
@@ -107,7 +107,7 @@ if2ip_result_t Curl_if2ip(int af,
	struct ifaddrs iface, head;
	if2ip_result_t res = IF2IP_NOT_FOUND;

-	#if defined(ENABLE_IPV6) && \
+	#if defined(USE_IPV6) && \
	!defined(HAVE_SOCKADDR_IN6_SIN6_SCOPE_ID)
	(void) local_scope_id;
	#endif
@@ -121,7 +121,7 @@ if2ip_result_t Curl_if2ip(int af,
	const char *ip;
	char scope[12] = "";
	char ipstr[64];
-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	if(af == AF_INET6) {
	#ifdef HAVE_SOCKADDR_IN6_SIN6_SCOPE_ID
	unsigned int scopeid = 0;
@@ -182,7 +182,7 @@ if2ip_result_t Curl_if2ip(int af,
	#elif defined(HAVE_IOCTL_SIOCGIFADDR)

	if2ip_result_t Curl_if2ip(int af,
-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	unsigned int remote_scope,
	unsigned int local_scope_id,
	#endif
@@ -196,7 +196,7 @@ if2ip_result_t Curl_if2ip(int af,
	size_t len;
	const char *r;

-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	(void)remote_scope;
	(void)local_scope_id;
	#endif
@@ -237,7 +237,7 @@ if2ip_result_t Curl_if2ip(int af,
	#else

	if2ip_result_t Curl_if2ip(int af,
-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	unsigned int remote_scope,
	unsigned int local_scope_id,
	#endif
@@ -245,7 +245,7 @@ if2ip_result_t Curl_if2ip(int af,
	char *buf, int buf_size)
	{
	(void) af;
-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	(void) remote_scope;
	(void) local_scope_id;
	#endif

lib/if2ip.h+2 -2

@@ -32,7 +32,7 @@
	#define IPV6_SCOPE_UNIQUELOCAL 3 /* Unique local */
	#define IPV6_SCOPE_NODELOCAL 4 /* Loopback. */

-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	unsigned int Curl_ipv6_scope(const struct sockaddr *sa);
	#else
	#define Curl_ipv6_scope(x) 0
@@ -45,7 +45,7 @@ typedef enum {
	} if2ip_result_t;

	if2ip_result_t Curl_if2ip(int af,
-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	unsigned int remote_scope,
	unsigned int local_scope_id,
	#endif

lib/inet_ntop.c+2 -2

@@ -42,11 +42,11 @@
	#define INT16SZ 2

	/*
-	* If ENABLE_IPV6 is disabled, we still want to parse IPv6 addresses, so make
+	* If USE_IPV6 is disabled, we still want to parse IPv6 addresses, so make
	* sure we have _some_ value for AF_INET6 without polluting our fake value
	* everywhere.
	*/
-	#if !defined(ENABLE_IPV6) && !defined(AF_INET6)
+	#if !defined(USE_IPV6) && !defined(AF_INET6)
	#define AF_INET6 (AF_INET + 1)
	#endif

lib/inet_pton.c+2 -2

@@ -39,11 +39,11 @@
	#define INT16SZ 2

	/*
-	* If ENABLE_IPV6 is disabled, we still want to parse IPv6 addresses, so make
+	* If USE_IPV6 is disabled, we still want to parse IPv6 addresses, so make
	* sure we have _some_ value for AF_INET6 without polluting our fake value
	* everywhere.
	*/
-	#if !defined(ENABLE_IPV6) && !defined(AF_INET6)
+	#if !defined(USE_IPV6) && !defined(AF_INET6)
	#define AF_INET6 (AF_INET + 1)
	#endif

lib/noproxy.c+1 -1

@@ -78,7 +78,7 @@ UNITTEST bool Curl_cidr6_match(const char *ipv6,
	const char *network,
	unsigned int bits)
	{
-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	int bytes;
	int rest;
	unsigned char address[16];

lib/setopt.c+1 -1

@@ -2634,7 +2634,7 @@ CURLcode Curl_vsetopt(struct Curl_easy *data, CURLoption option, va_list param)
	break;
	#endif

-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	case CURLOPT_ADDRESS_SCOPE:
	/*
	* Use this scope id when using IPv6

lib/setup-vms.h+2 -2

@@ -374,8 +374,8 @@ static struct passwd *vms_getpwuid(uid_t uid)
	#ifdef HAVE_NETDB_H
	#include <netdb.h>
	#ifndef AI_NUMERICHOST
-	#ifdef ENABLE_IPV6
-	#undef ENABLE_IPV6
+	#ifdef USE_IPV6
+	#undef USE_IPV6
	#endif
	#endif
	#endif

lib/sockaddr.h+1 -1

@@ -30,7 +30,7 @@ struct Curl_sockaddr_storage {
	union {
	struct sockaddr sa;
	struct sockaddr_in sa_in;
-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	struct sockaddr_in6 sa_in6;
	#endif
	#ifdef HAVE_STRUCT_SOCKADDR_STORAGE

lib/socks.c+3 -3

@@ -838,7 +838,7 @@ CONNECT_RESOLVED:
	struct Curl_addrinfo *hp = NULL;
	if(dns)
	hp = dns->addr;
-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	if(data->set.ipver != CURL_IPRESOLVE_WHATEVER) {
	int wanted_family = data->set.ipver == CURL_IPRESOLVE_V4 ?
	AF_INET : AF_INET6;
@@ -872,7 +872,7 @@ CONNECT_RESOLVED:
	infof(data, "SOCKS5 connect to %s:%d (locally resolved)", dest,
	sx->remote_port);
	}
-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	else if(hp->ai_family == AF_INET6) {
	int i;
	struct sockaddr_in6 *saddr_in6;
@@ -909,7 +909,7 @@ CONNECT_RESOLVE_REMOTE:
	IPv6 == 4,
	IPv4 == 1 */
	unsigned char ip4[4];
-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	if(conn->bits.ipv6_ip) {
	char ip6[16];
	if(1 != Curl_inet_pton(AF_INET6, sx->hostname, ip6))

lib/url.c+3 -3

@@ -1715,7 +1715,7 @@ CURLcode Curl_uc_to_curlcode(CURLUcode uc)
	}
	}

-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	/*
	* If the URL was set with an IPv6 numerical address with a zone id part, set
	* the scope_id based on that!
@@ -1980,7 +1980,7 @@ static CURLcode parseurlandfillconn(struct Curl_easy *data,

	(void)curl_url_get(uh, CURLUPART_QUERY, &data->state.up.query, 0);

-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	if(data->set.scope_id)
	/* Override any scope that was set above. */
	conn->scope_id = data->set.scope_id;
@@ -2887,7 +2887,7 @@ static CURLcode parse_connect_to_host_port(struct Curl_easy *data,

	/* detect and extract RFC6874-style IPv6-addresses */
	if(*hostptr == '[') {
-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	char ptr = ++hostptr; / advance beyond the initial bracket */
	while(ptr && (ISXDIGIT(ptr) \|\| (ptr == ':') \|\| (ptr == '.')))
	ptr++;

lib/urlapi.c+2 -2

@@ -59,11 +59,11 @@
	#define MAX_SCHEME_LEN 40

	/*
-	* If ENABLE_IPV6 is disabled, we still want to parse IPv6 addresses, so make
+	* If USE_IPV6 is disabled, we still want to parse IPv6 addresses, so make
	* sure we have _some_ value for AF_INET6 without polluting our fake value
	* everywhere.
	*/
-	#if !defined(ENABLE_IPV6) && !defined(AF_INET6)
+	#if !defined(USE_IPV6) && !defined(AF_INET6)
	#define AF_INET6 (AF_INET + 1)
	#endif

lib/urldata.h+2 -2

@@ -984,7 +984,7 @@ struct connectdata {
	int remote_port; /* the remote port, not the proxy port! */
	int conn_to_port; /* the remote port to connect to. valid only if
	bits.conn_to_port is set */
-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	unsigned int scope_id; /* Scope id for IPv6 */
	#endif
	unsigned short localport;
@@ -1706,7 +1706,7 @@ struct UserDefined {
	unsigned int new_file_perms; /* when creating remote files */
	char str[STRING_LAST]; / array of strings, pointing to allocated memory */
	struct curl_blob *blobs[BLOB_LAST];
-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	unsigned int scope_id; /* Scope id for IPv6 */
	#endif
	curl_prot_t allowed_protocols;

lib/version.c+1 -1

@@ -478,7 +478,7 @@ static const struct feat features_table[] = {
	#if defined(USE_LIBIDN2) \|\| defined(USE_WIN32_IDN)
	FEATURE("IDN", idn_present, CURL_VERSION_IDN),
	#endif
-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	FEATURE("IPv6", NULL, CURL_VERSION_IPV6),
	#endif
	#ifdef USE_KERBEROS5

lib/vquic/curl_osslq.c+2 -2

@@ -182,7 +182,7 @@ static CURLcode make_bio_addr(BIO_ADDR **pbio_addr,
	result = CURLE_OK;
	break;
	}
-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	case AF_INET6: {
	struct sockaddr_in6 * const sin =
	(struct sockaddr_in6 * const)(void *)&addr->sa_addr;
@@ -192,7 +192,7 @@ static CURLcode make_bio_addr(BIO_ADDR **pbio_addr,
	result = CURLE_OK;
	break;
	}
-	#endif /* ENABLE_IPV6 */
+	#endif /* USE_IPV6 */
	default:
	/* sunsupported */
	DEBUGASSERT(0);

lib/vtls/gtls.c+2 -2

@@ -1204,7 +1204,7 @@ Curl_gtls_verifyserver(struct Curl_easy *data,
	/* Before 3.3.6, gnutls_x509_crt_check_hostname() didn't check IP
	addresses. */
	if(!rc) {
-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	#define use_addr in6_addr
	#else
	#define use_addr in_addr
@@ -1214,7 +1214,7 @@ Curl_gtls_verifyserver(struct Curl_easy *data,

	if(Curl_inet_pton(AF_INET, peer->hostname, addrbuf) > 0)
	addrlen = 4;
-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	else if(Curl_inet_pton(AF_INET6, peer->hostname, addrbuf) > 0)
	addrlen = 16;
	#endif

lib/vtls/openssl.c+2 -2

@@ -2147,7 +2147,7 @@ CURLcode Curl_ossl_verifyhost(struct Curl_easy data, struct connectdata conn,
	int target; /* target type, GEN_DNS or GEN_IPADD */
	size_t addrlen = 0;
	STACK_OF(GENERAL_NAME) *altnames;
-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	struct in6_addr addr;
	#else
	struct in_addr addr;
@@ -2166,7 +2166,7 @@ CURLcode Curl_ossl_verifyhost(struct Curl_easy data, struct connectdata conn,
	target = GEN_IPADD;
	addrlen = sizeof(struct in_addr);
	break;
-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	case CURL_SSL_PEER_IPV6:
	if(!Curl_inet_pton(AF_INET6, peer->hostname, &addr))
	return CURLE_PEER_FAILED_VERIFICATION;

lib/vtls/rustls.c+2 -2

@@ -357,12 +357,12 @@ static bool
	cr_hostname_is_ip(const char *hostname)
	{
	struct in_addr in;
-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	struct in6_addr in6;
	if(Curl_inet_pton(AF_INET6, hostname, &in6) > 0) {
	return true;
	}
-	#endif /* ENABLE_IPV6 */
+	#endif /* USE_IPV6 */
	if(Curl_inet_pton(AF_INET, hostname, &in) > 0) {
	return true;
	}

lib/vtls/vtls.c+2 -2

@@ -1534,14 +1534,14 @@ static void cf_close(struct Curl_cfilter cf, struct Curl_easy data)
	static ssl_peer_type get_peer_type(const char *hostname)
	{
	if(hostname && hostname[0]) {
-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	struct in6_addr addr;
	#else
	struct in_addr addr;
	#endif
	if(Curl_inet_pton(AF_INET, hostname, &addr))
	return CURL_SSL_PEER_IPV4;
-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	else if(Curl_inet_pton(AF_INET6, hostname, &addr)) {
	return CURL_SSL_PEER_IPV6;
	}

tests/server/mqttd.c+12 -12

@@ -119,7 +119,7 @@ static const char *configfile = DEFAULT_CONFIG;
	static const char *logdir = "log";
	static char loglockfile[256];

-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	static bool use_ipv6 = FALSE;
	#endif
	static const char *ipv_inuse = "IPv4";
@@ -838,7 +838,7 @@ static curl_socket_t sockdaemon(curl_socket_t sock,
	/* When the specified listener port is zero, it is actually a
	request to let the system choose a non-zero available port. */

-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	if(!use_ipv6) {
	#endif
	memset(&listener.sa4, 0, sizeof(listener.sa4));
@@ -846,7 +846,7 @@ static curl_socket_t sockdaemon(curl_socket_t sock,
	listener.sa4.sin_addr.s_addr = INADDR_ANY;
	listener.sa4.sin_port = htons(*listenport);
	rc = bind(sock, &listener.sa, sizeof(listener.sa4));
-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	}
	else {
	memset(&listener.sa6, 0, sizeof(listener.sa6));
@@ -855,7 +855,7 @@ static curl_socket_t sockdaemon(curl_socket_t sock,
	listener.sa6.sin6_port = htons(*listenport);
	rc = bind(sock, &listener.sa, sizeof(listener.sa6));
	}
-	#endif /* ENABLE_IPV6 */
+	#endif /* USE_IPV6 */
	if(rc) {
	error = SOCKERRNO;
	logmsg("Error binding socket on port %hu: (%d) %s",
@@ -869,11 +869,11 @@ static curl_socket_t sockdaemon(curl_socket_t sock,
	port we actually got and update the listener port value with it. */
	curl_socklen_t la_size;
	srvr_sockaddr_union_t localaddr;
-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	if(!use_ipv6)
	#endif
	la_size = sizeof(localaddr.sa4);
-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	else
	la_size = sizeof(localaddr.sa6);
	#endif
@@ -889,7 +889,7 @@ static curl_socket_t sockdaemon(curl_socket_t sock,
	case AF_INET:
	*listenport = ntohs(localaddr.sa4.sin_port);
	break;
-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	case AF_INET6:
	*listenport = ntohs(localaddr.sa6.sin6_port);
	break;
@@ -937,7 +937,7 @@ int main(int argc, char *argv[])
	while(argc>arg) {
	if(!strcmp("--version", argv[arg])) {
	printf("mqttd IPv4%s\n",
-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	"/IPv6"
	#else
	""
@@ -971,7 +971,7 @@ int main(int argc, char *argv[])
	logdir = argv[arg++];
	}
	else if(!strcmp("--ipv6", argv[arg])) {
-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	ipv_inuse = "IPv6";
	use_ipv6 = TRUE;
	#endif
@@ -979,7 +979,7 @@ int main(int argc, char *argv[])
	}
	else if(!strcmp("--ipv4", argv[arg])) {
	/* for completeness, we support this option as well */
-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	ipv_inuse = "IPv4";
	use_ipv6 = FALSE;
	#endif
@@ -1029,11 +1029,11 @@ int main(int argc, char *argv[])

	install_signal_handlers(FALSE);

-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	if(!use_ipv6)
	#endif
	sock = socket(AF_INET, SOCK_STREAM, 0);
-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	else
	sock = socket(AF_INET6, SOCK_STREAM, 0);
	#endif

tests/server/rtspd.c+12 -12

@@ -64,7 +64,7 @@
	#define ERANGE 34 /* errno.h value */
	#endif

-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	static bool use_ipv6 = FALSE;
	#endif
	static const char *ipv_inuse = "IPv4";
@@ -1074,7 +1074,7 @@ int main(int argc, char *argv[])
	printf("rtspd IPv4%s"
	"\n"
	,
-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	"/IPv6"
	#else
	""
@@ -1103,14 +1103,14 @@ int main(int argc, char *argv[])
	logdir = argv[arg++];
	}
	else if(!strcmp("--ipv4", argv[arg])) {
-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	ipv_inuse = "IPv4";
	use_ipv6 = FALSE;
	#endif
	arg++;
	}
	else if(!strcmp("--ipv6", argv[arg])) {
-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	ipv_inuse = "IPv6";
	use_ipv6 = TRUE;
	#endif
@@ -1157,11 +1157,11 @@ int main(int argc, char *argv[])

	install_signal_handlers(false);

-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	if(!use_ipv6)
	#endif
	sock = socket(AF_INET, SOCK_STREAM, 0);
-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	else
	sock = socket(AF_INET6, SOCK_STREAM, 0);
	#endif
@@ -1181,7 +1181,7 @@ int main(int argc, char *argv[])
	goto server_cleanup;
	}

-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	if(!use_ipv6) {
	#endif
	memset(&me.sa4, 0, sizeof(me.sa4));
@@ -1189,7 +1189,7 @@ int main(int argc, char *argv[])
	me.sa4.sin_addr.s_addr = INADDR_ANY;
	me.sa4.sin_port = htons(port);
	rc = bind(sock, &me.sa, sizeof(me.sa4));
-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	}
	else {
	memset(&me.sa6, 0, sizeof(me.sa6));
@@ -1198,7 +1198,7 @@ int main(int argc, char *argv[])
	me.sa6.sin6_port = htons(port);
	rc = bind(sock, &me.sa, sizeof(me.sa6));
	}
-	#endif /* ENABLE_IPV6 */
+	#endif /* USE_IPV6 */
	if(0 != rc) {
	error = SOCKERRNO;
	logmsg("Error binding socket on port %hu: (%d) %s",
@@ -1211,11 +1211,11 @@ int main(int argc, char *argv[])
	port we actually got and update the listener port value with it. */
	curl_socklen_t la_size;
	srvr_sockaddr_union_t localaddr;
-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	if(!use_ipv6)
	#endif
	la_size = sizeof(localaddr.sa4);
-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	else
	la_size = sizeof(localaddr.sa6);
	#endif
@@ -1231,7 +1231,7 @@ int main(int argc, char *argv[])
	case AF_INET:
	port = ntohs(localaddr.sa4.sin_port);
	break;
-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	case AF_INET6:
	port = ntohs(localaddr.sa6.sin6_port);
	break;

tests/server/server_sockaddr.h+1 -1

@@ -32,7 +32,7 @@
	typedef union {
	struct sockaddr sa;
	struct sockaddr_in sa4;
-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	struct sockaddr_in6 sa6;
	#endif
	#ifdef USE_UNIX_SOCKETS

tests/server/sockfilt.c+15 -15

@@ -138,7 +138,7 @@ const char *serverlogfile = DEFAULT_LOGFILE;

	static bool verbose = FALSE;
	static bool bind_only = FALSE;
-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	static bool use_ipv6 = FALSE;
	#endif
	static const char *ipv_inuse = "IPv4";
@@ -1255,7 +1255,7 @@ static curl_socket_t sockdaemon(curl_socket_t sock,
	/* When the specified listener port is zero, it is actually a
	request to let the system choose a non-zero available port. */

-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	if(!use_ipv6) {
	#endif
	memset(&listener.sa4, 0, sizeof(listener.sa4));
@@ -1263,7 +1263,7 @@ static curl_socket_t sockdaemon(curl_socket_t sock,
	listener.sa4.sin_addr.s_addr = INADDR_ANY;
	listener.sa4.sin_port = htons(*listenport);
	rc = bind(sock, &listener.sa, sizeof(listener.sa4));
-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	}
	else {
	memset(&listener.sa6, 0, sizeof(listener.sa6));
@@ -1272,7 +1272,7 @@ static curl_socket_t sockdaemon(curl_socket_t sock,
	listener.sa6.sin6_port = htons(*listenport);
	rc = bind(sock, &listener.sa, sizeof(listener.sa6));
	}
-	#endif /* ENABLE_IPV6 */
+	#endif /* USE_IPV6 */
	if(rc) {
	error = SOCKERRNO;
	logmsg("Error binding socket on port %hu: (%d) %s",
@@ -1286,11 +1286,11 @@ static curl_socket_t sockdaemon(curl_socket_t sock,
	port we actually got and update the listener port value with it. */
	curl_socklen_t la_size;
	srvr_sockaddr_union_t localaddr;
-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	if(!use_ipv6)
	#endif
	la_size = sizeof(localaddr.sa4);
-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	else
	la_size = sizeof(localaddr.sa6);
	#endif
@@ -1306,7 +1306,7 @@ static curl_socket_t sockdaemon(curl_socket_t sock,
	case AF_INET:
	*listenport = ntohs(localaddr.sa4.sin_port);
	break;
-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	case AF_INET6:
	*listenport = ntohs(localaddr.sa6.sin6_port);
	break;
@@ -1364,7 +1364,7 @@ int main(int argc, char *argv[])
	while(argc>arg) {
	if(!strcmp("--version", argv[arg])) {
	printf("sockfilt IPv4%s\n",
-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	"/IPv6"
	#else
	""
@@ -1392,7 +1392,7 @@ int main(int argc, char *argv[])
	serverlogfile = argv[arg++];
	}
	else if(!strcmp("--ipv6", argv[arg])) {
-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	ipv_inuse = "IPv6";
	use_ipv6 = TRUE;
	#endif
@@ -1400,7 +1400,7 @@ int main(int argc, char *argv[])
	}
	else if(!strcmp("--ipv4", argv[arg])) {
	/* for completeness, we support this option as well */
-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	ipv_inuse = "IPv4";
	use_ipv6 = FALSE;
	#endif
@@ -1472,11 +1472,11 @@ int main(int argc, char *argv[])

	install_signal_handlers(false);

-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	if(!use_ipv6)
	#endif
	sock = socket(AF_INET, SOCK_STREAM, 0);
-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	else
	sock = socket(AF_INET6, SOCK_STREAM, 0);
	#endif
@@ -1491,7 +1491,7 @@ int main(int argc, char *argv[])
	if(connectport) {
	/* Active mode, we should connect to the given port number */
	mode = ACTIVE;
-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	if(!use_ipv6) {
	#endif
	memset(&me.sa4, 0, sizeof(me.sa4));
@@ -1503,7 +1503,7 @@ int main(int argc, char *argv[])
	Curl_inet_pton(AF_INET, addr, &me.sa4.sin_addr);

	rc = connect(sock, &me.sa, sizeof(me.sa4));
-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	}
	else {
	memset(&me.sa6, 0, sizeof(me.sa6));
@@ -1515,7 +1515,7 @@ int main(int argc, char *argv[])

	rc = connect(sock, &me.sa, sizeof(me.sa6));
	}
-	#endif /* ENABLE_IPV6 */
+	#endif /* USE_IPV6 */
	if(rc) {
	error = SOCKERRNO;
	logmsg("Error connecting to port %hu: (%d) %s",

tests/server/socksd.c+8 -8

@@ -176,7 +176,7 @@ static unsigned short shortval(char *value)

	static enum {
	socket_domain_inet = AF_INET
-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	, socket_domain_inet6 = AF_INET6
	#endif
	#ifdef USE_UNIX_SOCKETS
@@ -865,7 +865,7 @@ static curl_socket_t sockdaemon(curl_socket_t sock,
	listener.sa4.sin_port = htons(*listenport);
	rc = bind(sock, &listener.sa, sizeof(listener.sa4));
	break;
-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	case AF_INET6:
	memset(&listener.sa6, 0, sizeof(listener.sa6));
	listener.sa6.sin6_family = AF_INET6;
@@ -873,7 +873,7 @@ static curl_socket_t sockdaemon(curl_socket_t sock,
	listener.sa6.sin6_port = htons(*listenport);
	rc = bind(sock, &listener.sa, sizeof(listener.sa6));
	break;
-	#endif /* ENABLE_IPV6 */
+	#endif /* USE_IPV6 */
	#ifdef USE_UNIX_SOCKETS
	case AF_UNIX:
	rc = bind_unix_socket(sock, unix_socket, &listener.sau);
@@ -903,7 +903,7 @@ static curl_socket_t sockdaemon(curl_socket_t sock,
	port we actually got and update the listener port value with it. */
	curl_socklen_t la_size;
	srvr_sockaddr_union_t localaddr;
-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	if(socket_domain == AF_INET6)
	la_size = sizeof(localaddr.sa6);
	else
@@ -921,7 +921,7 @@ static curl_socket_t sockdaemon(curl_socket_t sock,
	case AF_INET:
	*listenport = ntohs(localaddr.sa4.sin_port);
	break;
-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	case AF_INET6:
	*listenport = ntohs(localaddr.sa6.sin6_port);
	break;
@@ -974,7 +974,7 @@ int main(int argc, char *argv[])
	while(argc>arg) {
	if(!strcmp("--version", argv[arg])) {
	printf("socksd IPv4%s\n",
-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	"/IPv6"
	#else
	""
@@ -1018,7 +1018,7 @@ int main(int argc, char *argv[])
	reqlogfile = argv[arg++];
	}
	else if(!strcmp("--ipv6", argv[arg])) {
-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	socket_domain = AF_INET6;
	socket_type = "IPv6";
	#endif
@@ -1026,7 +1026,7 @@ int main(int argc, char *argv[])
	}
	else if(!strcmp("--ipv4", argv[arg])) {
	/* for completeness, we support this option as well */
-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	socket_type = "IPv4";
	#endif
	arg++;

tests/server/sws.c+12 -12

@@ -70,7 +70,7 @@

	static enum {
	socket_domain_inet = AF_INET
-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	, socket_domain_inet6 = AF_INET6
	#endif
	#ifdef USE_UNIX_SOCKETS
@@ -229,7 +229,7 @@ static bool socket_domain_is_ip(void)
	{
	switch(socket_domain) {
	case AF_INET:
-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	case AF_INET6:
	#endif
	return true;
@@ -1290,7 +1290,7 @@ static curl_socket_t connect_to(const char *ipaddr, unsigned short port)
	const char *op_br = "";
	const char *cl_br = "";

-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	if(socket_domain == AF_INET6) {
	op_br = "[";
	cl_br = "]";
@@ -1335,7 +1335,7 @@ static curl_socket_t connect_to(const char *ipaddr, unsigned short port)

	rc = connect(serverfd, &serveraddr.sa, sizeof(serveraddr.sa4));
	break;
-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	case AF_INET6:
	memset(&serveraddr.sa6, 0, sizeof(serveraddr.sa6));
	serveraddr.sa6.sin6_family = AF_INET6;
@@ -1348,7 +1348,7 @@ static curl_socket_t connect_to(const char *ipaddr, unsigned short port)

	rc = connect(serverfd, &serveraddr.sa, sizeof(serveraddr.sa6));
	break;
-	#endif /* ENABLE_IPV6 */
+	#endif /* USE_IPV6 */
	#ifdef USE_UNIX_SOCKETS
	case AF_UNIX:
	logmsg("Proxying through Unix socket is not (yet?) supported.");
@@ -1976,7 +1976,7 @@ int main(int argc, char *argv[])
	while(argc>arg) {
	if(!strcmp("--version", argv[arg])) {
	puts("sws IPv4"
-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	"/IPv6"
	#endif
	#ifdef USE_UNIX_SOCKETS
@@ -2023,7 +2023,7 @@ int main(int argc, char *argv[])
	arg++;
	}
	else if(!strcmp("--ipv6", argv[arg])) {
-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	socket_type = "IPv6";
	socket_domain = AF_INET6;
	location_str = port_str;
@@ -2164,7 +2164,7 @@ int main(int argc, char *argv[])
	me.sa4.sin_port = htons(port);
	rc = bind(sock, &me.sa, sizeof(me.sa4));
	break;
-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	case AF_INET6:
	memset(&me.sa6, 0, sizeof(me.sa6));
	me.sa6.sin6_family = AF_INET6;
@@ -2172,7 +2172,7 @@ int main(int argc, char *argv[])
	me.sa6.sin6_port = htons(port);
	rc = bind(sock, &me.sa, sizeof(me.sa6));
	break;
-	#endif /* ENABLE_IPV6 */
+	#endif /* USE_IPV6 */
	#ifdef USE_UNIX_SOCKETS
	case AF_UNIX:
	rc = bind_unix_socket(sock, unix_socket, &me.sau);
@@ -2196,11 +2196,11 @@ int main(int argc, char *argv[])
	port we actually got and update the listener port value with it. */
	curl_socklen_t la_size;
	srvr_sockaddr_union_t localaddr;
-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	if(socket_domain != AF_INET6)
	#endif
	la_size = sizeof(localaddr.sa4);
-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	else
	la_size = sizeof(localaddr.sa6);
	#endif
@@ -2216,7 +2216,7 @@ int main(int argc, char *argv[])
	case AF_INET:
	port = ntohs(localaddr.sa4.sin_port);
	break;
-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	case AF_INET6:
	port = ntohs(localaddr.sa6.sin6_port);
	break;

tests/server/tftpd.c+18 -18

@@ -201,7 +201,7 @@ static curl_socket_t peer = CURL_SOCKET_BAD;
	static unsigned int timeout;
	static unsigned int maxtimeout = 5 * TIMEOUT;

-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	static bool use_ipv6 = FALSE;
	#endif
	static const char *ipv_inuse = "IPv4";
@@ -530,11 +530,11 @@ static int synchnet(curl_socket_t f /* socket to flush */)
	#endif
	if(i) {
	j++;
-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	if(!use_ipv6)
	#endif
	fromaddrlen = sizeof(fromaddr.sa4);
-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	else
	fromaddrlen = sizeof(fromaddr.sa6);
	#endif
@@ -566,7 +566,7 @@ int main(int argc, char **argv)
	while(argc>arg) {
	if(!strcmp("--version", argv[arg])) {
	printf("tftpd IPv4%s\n",
-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	"/IPv6"
	#else
	""
@@ -595,14 +595,14 @@ int main(int argc, char **argv)
	logdir = argv[arg++];
	}
	else if(!strcmp("--ipv4", argv[arg])) {
-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	ipv_inuse = "IPv4";
	use_ipv6 = FALSE;
	#endif
	arg++;
	}
	else if(!strcmp("--ipv6", argv[arg])) {
-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	ipv_inuse = "IPv6";
	use_ipv6 = TRUE;
	#endif
@@ -649,11 +649,11 @@ int main(int argc, char **argv)

	install_signal_handlers(true);

-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	if(!use_ipv6)
	#endif
	sock = socket(AF_INET, SOCK_DGRAM, 0);
-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	else
	sock = socket(AF_INET6, SOCK_DGRAM, 0);
	#endif
@@ -675,7 +675,7 @@ int main(int argc, char **argv)
	goto tftpd_cleanup;
	}

-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	if(!use_ipv6) {
	#endif
	memset(&me.sa4, 0, sizeof(me.sa4));
@@ -683,7 +683,7 @@ int main(int argc, char **argv)
	me.sa4.sin_addr.s_addr = INADDR_ANY;
	me.sa4.sin_port = htons(port);
	rc = bind(sock, &me.sa, sizeof(me.sa4));
-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	}
	else {
	memset(&me.sa6, 0, sizeof(me.sa6));
@@ -692,7 +692,7 @@ int main(int argc, char **argv)
	me.sa6.sin6_port = htons(port);
	rc = bind(sock, &me.sa, sizeof(me.sa6));
	}
-	#endif /* ENABLE_IPV6 */
+	#endif /* USE_IPV6 */
	if(0 != rc) {
	error = SOCKERRNO;
	logmsg("Error binding socket on port %hu: (%d) %s", port, error,
@@ -706,11 +706,11 @@ int main(int argc, char **argv)
	port we actually got and update the listener port value with it. */
	curl_socklen_t la_size;
	srvr_sockaddr_union_t localaddr;
-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	if(!use_ipv6)
	#endif
	la_size = sizeof(localaddr.sa4);
-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	else
	la_size = sizeof(localaddr.sa6);
	#endif
@@ -726,7 +726,7 @@ int main(int argc, char **argv)
	case AF_INET:
	port = ntohs(localaddr.sa4.sin_port);
	break;
-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	case AF_INET6:
	port = ntohs(localaddr.sa6.sin6_port);
	break;
@@ -763,11 +763,11 @@ int main(int argc, char **argv)

	for(;;) {
	fromlen = sizeof(from);
-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	if(!use_ipv6)
	#endif
	fromlen = sizeof(from.sa4);
-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	else
	fromlen = sizeof(from.sa6);
	#endif
@@ -784,7 +784,7 @@ int main(int argc, char **argv)
	set_advisor_read_lock(loglockfile);
	serverlogslocked = 1;

-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	if(!use_ipv6) {
	#endif
	from.sa4.sin_family = AF_INET;
@@ -799,7 +799,7 @@ int main(int argc, char **argv)
	result = 1;
	break;
	}
-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	}
	else {
	from.sa6.sin6_family = AF_INET6;

tests/unit/unit1607.c+1 -1

@@ -62,7 +62,7 @@ struct testcase {
	/* In builds without IPv6 support CURLOPT_RESOLVE should skip over those
	addresses, so we have to do that as well. */
	static const char skip = 0;
-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	#define IPV6ONLY(x) x
	#else
	#define IPV6ONLY(x) &skip

tests/unit/unit2600.c+2 -2

@@ -193,7 +193,7 @@ static CURLcode cf_test_create(struct Curl_cfilter **pcf,
	ctx->ai_family = ai->ai_family;
	ctx->transport = transport;
	ctx->started = Curl_now();
-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	if(ctx->ai_family == AF_INET6) {
	ctx->stats = &current_tr->cf6;
	ctx->fail_delay_ms = current_tc->cf6_fail_delay_ms;
@@ -358,7 +358,7 @@ static struct test_case TEST_CASES[] = {
	{ 2, TURL, "test.com:123:192.0.2.1,192.0.2.2", CURL_IPRESOLVE_WHATEVER,
	CNCT_TMOT, 150, 200, 200, 2, 0, 400, TC_TMOT, R_FAIL, NULL },
	/* 2 ipv4, fails after ~400ms, reports COULDNT_CONNECT */
-	#ifdef ENABLE_IPV6
+	#ifdef USE_IPV6
	{ 3, TURL, "test.com:123:::1", CURL_IPRESOLVE_WHATEVER,
	CNCT_TMOT, 150, 200, 200, 0, 1, 200, TC_TMOT, R_FAIL, NULL },
	/* 1 ipv6, fails after ~200ms, reports COULDNT_CONNECT */