diff options
author | Yang Tse <yangsita@gmail.com> | 2012-06-07 23:49:27 +0200 |
---|---|---|
committer | Yang Tse <yangsita@gmail.com> | 2012-06-07 23:50:12 +0200 |
commit | 04ca9aecd1a6b32c5e81885f7f1e99d30d6d8ec3 (patch) | |
tree | cc7a188d7a6c4676fdb895df4b7c484b3ba99f78 /configure.ac | |
parent | 2e48139fbf44283a07f02978095d50bdcb112b9f (diff) | |
download | curl-04ca9aecd1a6b32c5e81885f7f1e99d30d6d8ec3.tar.gz |
metalink: build fixes and adjustments I
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index ef3ef77ea..8e7fe6d6d 100644 --- a/configure.ac +++ b/configure.ac @@ -163,8 +163,9 @@ curl_verbose_msg="enabled (--disable-verbose)" curl_ldaps_msg="no (--enable-ldaps)" curl_rtsp_msg="no (--enable-rtsp)" curl_rtmp_msg="no (--with-librtmp)" + curl_mtlnk_msg="no (--with-libmetalink)" + init_ssl_msg=${curl_ssl_msg} -curl_metalink_msg="no (--with-libmetalink)" dnl dnl Save anything in $LIBS for later @@ -2265,18 +2266,17 @@ if test X"$OPT_LIBMETALINK" != Xno; then if test -n "$addlib"; then AC_MSG_NOTICE([detected libmetalink version $version]) - curl_metalink_msg="enabled" + curl_mtlnk_msg="enabled" LIBMETALINK_LIBS=$addlib LIBMETALINK_LDFLAGS=$addld LIBMETALINK_CFLAGS=$addcflags AC_SUBST([LIBMETALINK_LIBS]) AC_SUBST([LIBMETALINK_LDFLAGS]) AC_SUBST([LIBMETALINK_CFLAGS]) - AC_DEFINE(HAVE_LIBMETALINK, 1, [if libmetalink is available]) + AC_DEFINE(USE_METALINK, 1, [Define to enable metalink support]) fi fi -AM_CONDITIONAL([HAVE_LIBMETALINK], [test -n "$LIBMETALINK_LIBS"]) dnl ********************************************************************** dnl Check for the presence of LIBSSH2 libraries and headers @@ -3381,7 +3381,7 @@ AC_MSG_NOTICE([Configured to build curl/libcurl: LDAPS support: ${curl_ldaps_msg} RTSP support: ${curl_rtsp_msg} RTMP support: ${curl_rtmp_msg} - metalink support: ${curl_metalink_msg} + metalink support: ${curl_mtlnk_msg} Protocols: ${SUPPORT_PROTOCOLS} ]) |