summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorng0 <ng0@n0.is>2019-01-12 21:19:50 +0000
committerng0 <ng0@n0.is>2019-01-12 21:19:50 +0000
commit947fa3b58d652d0a84bd20bcc45ed21267b3ee52 (patch)
tree173cf355b53bba20ac6622104ab4042cb2858183 /configure.ac
parent5b22ac2fcff3090a1acc41647936b8fbc3d57b13 (diff)
parent4258dc02d86e7e4de9f795a1af3a0bc6732d4ab5 (diff)
downloadgnurl-947fa3b58d652d0a84bd20bcc45ed21267b3ee52.tar.gz
gnurl-947fa3b58d652d0a84bd20bcc45ed21267b3ee52.tar.bz2
gnurl-947fa3b58d652d0a84bd20bcc45ed21267b3ee52.zip
Merge tag 'curl-7_63_0'
7.63.0
Diffstat (limited to 'configure.ac')
-rwxr-xr-xconfigure.ac21
1 files changed, 7 insertions, 14 deletions
diff --git a/configure.ac b/configure.ac
index 0c0e46a9e..28cb8c16f 100755
--- a/configure.ac
+++ b/configure.ac
@@ -158,7 +158,7 @@ AC_SUBST(PKGADD_VENDOR)
dnl
dnl initialize all the info variables
- curl_ssl_msg="no (--with-{ssl,gnutls,nss,polarssl,mbedtls,cyassl,axtls,winssl,darwinssl,mesalink} )"
+ curl_ssl_msg="no (--with-{ssl,gnutls,nss,polarssl,mbedtls,cyassl,winssl,darwinssl,mesalink} )"
curl_ssh_msg="no (--with-libssh2)"
curl_zlib_msg="no (--with-zlib)"
curl_brotli_msg="no (--with-brotli)"
@@ -1928,8 +1928,6 @@ AC_HELP_STRING([--disable-versioned-symbols], [Disable versioned symbols in shar
versioned_symbols_flavour="POLARSSL_"
elif test "x$CYASSL_ENABLED" = "x1"; then
versioned_symbols_flavour="CYASSL_"
- elif test "x$AXTLS_ENABLED" = "x1"; then
- versioned_symbols_flavour="AXTLS_"
elif test "x$WINSSL_ENABLED" = "x1"; then
versioned_symbols_flavour="WINSSL_"
elif test "x$DARWINSSL_ENABLED" = "x1"; then
@@ -3090,17 +3088,7 @@ AC_CONFIG_FILES([Makefile \
tests/libtest/Makefile \
tests/unit/Makefile \
packages/Makefile \
- packages/Win32/Makefile \
- packages/Win32/cygwin/Makefile \
- packages/Linux/Makefile \
- packages/Linux/RPM/Makefile \
- packages/Linux/RPM/curl.spec \
- packages/Linux/RPM/curl-ssl.spec \
- packages/Solaris/Makefile \
packages/vms/Makefile \
- packages/AIX/Makefile \
- packages/AIX/RPM/Makefile \
- packages/AIX/RPM/curl.spec \
gnurl-config \
libgnurl.pc
])
@@ -3112,10 +3100,15 @@ XC_AMEND_DISTCLEAN([lib src tests/unit tests/server tests/libtest docs/examples]
AC_MSG_NOTICE([Configured to build gnurl/libgnurl:
- curl version: ${CURLVERSION}
Host setup: ${host}
Install prefix: ${prefix}
Compiler: ${CC}
+ CFLAGS: ${CFLAGS}
+ CPPFLAGS: ${CPPFLAGS}
+ LDFLAGS: ${LDFLAGS}
+ LIBS: ${LIBS}
+
+ curl version: ${CURLVERSION}
SSL support: ${curl_ssl_msg}
SSH support: ${curl_ssh_msg}
zlib support: ${curl_zlib_msg}