Use pkg-config of libmetalink in configure.ac

configure.ac

@@ -356,7 +356,8 @@ AS_IF([test x"$ENABLE_METALINK" == xyes],[
     dnl If metalink module is found
     AC_MSG_NOTICE([compiling in support for metalink])
     LIBS="$LIBMETALINK_LIBS $LIBS"
-    LIBS="$LIBMETALINK_CFLAGS $CFLAGS"
+    CFLAGS="$LIBMETALINK_CFLAGS $CFLAGS"
+    metalink=yes
   ], [
     dnl If metalink module is not found
     AC_MSG_ERROR([libmetalink not found])
@@ -364,6 +365,7 @@ AS_IF([test x"$ENABLE_METALINK" == xyes],[
 ],[
   dnl If metalink support is not requested
   AC_MSG_NOTICE([compiling without support for metalink])
+  metalink=no
 ])
 
 
@@ -543,7 +545,7 @@ fi
 
 dnl Needed by src/Makefile.am
 AM_CONDITIONAL([IRI_IS_ENABLED], [test "X$iri" != "Xno"])
-
+AM_CONDITIONAL([METALINK_IS_ENABLED], [test "X$metalink" != "Xno"])
 
 dnl
 dnl Create output

src/Makefile.am

@@ -34,6 +34,9 @@
 if IRI_IS_ENABLED
 IRI_OBJ = iri.c
 endif
+if METALINK_IS_ENABLED
+METALINK_OBJ = metalink.c
+endif
 
 # The following line is losing on some versions of make!
 DEFS     = @DEFS@ -DSYSTEM_WGETRC=\"$(sysconfdir)/wgetrc\" -DLOCALEDIR=\"$(localedir)\"
@@ -47,7 +50,7 @@ wget_SOURCES = cmpt.c connect.c convert.c cookies.c ftp.c    		  \
 	       ftp-basic.c ftp-ls.c hash.c host.c html-parse.c html-url.c \
 	       http.c init.c log.c main.c netrc.c progress.c ptimer.c     \
 	       recur.c res.c retr.c spider.c url.c	          	  \
-	       utils.c exits.c build_info.c $(IRI_OBJ)	  \
+	       utils.c exits.c build_info.c $(IRI_OBJ) $(METALINK_OBJ)	  \
 	       css-url.h css-tokens.h connect.h convert.h cookies.h       \
 	       ftp.h hash.h host.h html-parse.h html-url.h      \
 	       http.h http-ntlm.h init.h log.h mswindows.h netrc.h        \

src/retr.c

@@ -38,6 +38,7 @@ as that of the covered work.  */
 #include <string.h>
 #include <assert.h>
 #include <metalink/metalink_parser.h>
+#include <metalink/metalink_types.h>
 #include <pthread.h>
 #include <semaphore.h>