Applied patches from Daniel

configure.ac

@@ -2252,10 +2252,14 @@ if test X"$OPT_LIBMETALINK" != Xno; then
     fi
   fi
   if test "$PKGTEST" = "yes" && test "$PKGCONFIG" != "no"; then
-    addlib=`$PKGCONFIG --libs-only-l libmetalink`
-    addld=`$PKGCONFIG --libs-only-L libmetalink`
-    addcflags=`$PKGCONFIG --cflags-only-I libmetalink`
-    version=`$PKGCONFIG --modversion libmetalink`
+    addlib=`CURL_EXPORT_PCDIR([$LIBMETALINK_PCDIR]) dnl
+      $PKGCONFIG --libs-only-l libmetalink`
+    addld=`CURL_EXPORT_PCDIR([$LIBMETALINK_PCDIR]) dnl
+      $PKGCONFIG --libs-only-L libmetalink`
+    addcflags=`CURL_EXPORT_PCDIR([$LIBMETALINK_PCDIR]) dnl
+      $PKGCONFIG --cflags-only-I libmetalink`
+    version=`CURL_EXPORT_PCDIR([$LIBMETALINK_PCDIR]) dnl
+      $PKGCONFIG --modversion libmetalink`
     libmetalinklib=`echo $addld | $SED -e 's/-L//'`
   fi
   if test -n "$addlib"; then

src/tool_sdecls.h

@@ -101,10 +101,7 @@ struct getout {
 #define GETOUT_USEREMOTE  (1<<2)  /* use remote file name locally */
 #define GETOUT_UPLOAD     (1<<3)  /* if set, -T has been used */
 #define GETOUT_NOUPLOAD   (1<<4)  /* if set, -T "" has been used */
-#ifdef HAVE_LIBMETALINK
 #define GETOUT_METALINK (1<<5) /* set when Metalink download */
-#endif /* HAVE_LIBMETALINK */
-
 
 /*
  * 'trace' enumeration represents curl's output look'n feel possibilities.