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
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
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}
])
tool_homedir.c \
tool_libinfo.c \
tool_main.c \
+ tool_metalink.c \
tool_mfiles.c \
tool_msgs.c \
tool_operate.c \
tool_homedir.c \
tool_libinfo.c \
tool_main.c \
+ tool_metalink.c \
tool_mfiles.c \
tool_msgs.c \
tool_operate.c \
tool_vms.c \
tool_writeenv.c \
tool_writeout.c \
- tool_xattr.c \
- tool_metalink.c
+ tool_xattr.c
CURL_HFILES = hugehelp.h \
tool_binmode.h \
tool_homedir.h \
tool_libinfo.h \
tool_main.h \
+ tool_metalink.h \
tool_mfiles.h \
tool_msgs.h \
tool_operate.h \
tool_vms.h \
tool_writeenv.h \
tool_writeout.h \
- tool_xattr.h \
- tool_metalink.h
+ tool_xattr.h
curl_SOURCES = $(CURL_CFILES) $(CURLX_ONES) $(CURL_HFILES)
tool_homedirr.obj \\r
tool_libinfor.obj \\r
tool_mainr.obj \\r
+ tool_metalinkr.obj \\r
tool_mfilesr.obj \\r
tool_msgsr.obj \\r
tool_operater.obj \\r
tool_homedird.obj \\r
tool_libinfod.obj \\r
tool_maind.obj \\r
+ tool_metalinkd.obj \\r
tool_mfilesd.obj \\r
tool_msgsd.obj \\r
tool_operated.obj \\r
$(CCR) $(CFLAGS) /Fo"$@" tool_libinfo.c\r
tool_mainr.obj: tool_main.c\r
$(CCR) $(CFLAGS) /Fo"$@" tool_main.c\r
+tool_metalinkr.obj: tool_metalink.c\r
+ $(CCR) $(CFLAGS) /Fo"$@" tool_metalink.c\r
tool_mfilesr.obj: tool_mfiles.c\r
$(CCR) $(CFLAGS) /Fo"$@" tool_mfiles.c\r
tool_msgsr.obj: tool_msgs.c\r
$(CCD) $(CFLAGS) /Fo"$@" tool_libinfo.c\r
tool_maind.obj: tool_main.c\r
$(CCD) $(CFLAGS) /Fo"$@" tool_main.c\r
+tool_metalinkd.obj: tool_metalink.c\r
+ $(CCD) $(CFLAGS) /Fo"$@" tool_metalink.c\r
tool_mfilesd.obj: tool_mfiles.c\r
$(CCD) $(CFLAGS) /Fo"$@" tool_mfiles.c\r
tool_msgsd.obj: tool_msgs.c\r
break;
case 'J': /* --metalink */
{
-#ifdef HAVE_LIBMETALINK
+#ifdef USE_METALINK
if(parse_metalink(config, nextarg) == -1) {
warnf(config, "Could not parse Metalink file: %s\n", nextarg);
/* TODO Is PARAM_BAD_USE appropriate here? */
if(curlinfo->features & feats[i].bitmask)
printf("%s ", feats[i].name);
}
-#ifdef HAVE_LIBMETALINK
+#ifdef USE_METALINK
printf("Metalink ");
-#endif /* HAVE_LIBMETALINK */
+#endif
puts(""); /* newline */
}
}
# include <fcntl.h>
#endif
-#ifdef HAVE_LIBMETALINK
+#ifdef USE_METALINK
#include <metalink/metalink_parser.h>
#endif /* METALINK_HASH_CHECK */
-#ifdef HAVE_LIBMETALINK
+#ifdef USE_METALINK
static metalink_checksum *new_metalink_checksum(const char *hash_name,
const char *hash_value)
return 0;
}
-#endif /* HAVE_LIBMETALINK */
+#endif /* USE_METALINK */
/*
* Returns nonzero if content_type includes mediatype.
config->metalinkfile_last = 0;
}
-#endif /* HAVE_LIBMETALINK */
+#endif /* USE_METALINK */
/*
* Counts the resource in the metalinkfile.
*/
-#ifdef HAVE_LIBMETALINK
+#ifdef USE_METALINK
int count_next_metalink_resource(metalinkfile *mlfile);
void clean_metalink(struct Configurable *config);
#else
}
#endif
-#ifdef HAVE_LIBMETALINK
+#ifdef USE_METALINK
if(!metalink && res == CURLE_OK && outs.filename) {
/* Check the content-type header field and if it indicates
Metalink file, parse it and add getout for them. */
}
}
# endif /* METALINK_HASH_CHECK */
-#endif /* HAVE_LIBMETALINK */
+#endif /* USE_METALINK */
/* No more business with this output struct */
if(outs.alloc_filename)
# End Source File\r
# Begin Source File\r
\r
+SOURCE=.\tool_metalink.c\r
+# End Source File\r
+# Begin Source File\r
+\r
SOURCE=.\tool_mfiles.c\r
# End Source File\r
# Begin Source File\r
# End Source File\r
# Begin Source File\r
\r
+SOURCE=.\tool_metalink.h\r
+# End Source File\r
+# Begin Source File\r
+\r
SOURCE=.\tool_mfiles.h\r
# End Source File\r
# Begin Source File\r