From: Guenter Knauf <lists@gknw.net>
Date: Thu, 8 Nov 2012 17:41:59 +0000 (+0100)
Subject: Added deps for static metalink-aware MinGW builds.
X-Git-Tag: upstream/7.37.1~2525
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5a4f6413d19f47a95c9d736ec90bd96c72d00c5f;p=platform%2Fupstream%2Fcurl.git

Added deps for static metalink-aware MinGW builds.
---

diff --git a/src/Makefile.m32 b/src/Makefile.m32
index 8ff4aea..766fc73 100644
--- a/src/Makefile.m32
+++ b/src/Makefile.m32
@@ -32,6 +32,14 @@ endif
 ifndef LIBMETALINK_PATH
 LIBMETALINK_PATH = ../../libmetalink-0.1.2
 endif
+# Edit the path below to point to the base of your libexpat package.
+ifndef LIBEXPAT_PATH
+LIBEXPAT_PATH = ../../expat-2.1.0
+endif
+# Edit the path below to point to the base of your libxml2 package.
+ifndef LIBXML2_PATH
+LIBXML2_PATH = ../../libxml2-2.9.0
+endif
 # Edit the path below to point to the base of your libidn package.
 ifndef LIBIDN_PATH
 LIBIDN_PATH = ../../libidn-1.18
@@ -67,6 +75,7 @@ CFLAGS	+= -D_AMD64_
 endif
 # comment LDFLAGS below to keep debug info
 LDFLAGS	= -s
+AR	= $(CROSSPREFIX)ar
 RC	= $(CROSSPREFIX)windres
 RCFLAGS	= --include-dir=$(PROOT)/include -O COFF -i
 
@@ -228,6 +237,13 @@ ifdef METALINK
   INCLUDES += -I"$(LIBMETALINK_PATH)/include"
   CFLAGS += -DUSE_METALINK
   curl_LDADD += -L"$(LIBMETALINK_PATH)/lib" -lmetalink
+  ifndef DYN
+    ifeq ($(findstring libexpat_metalink_parser.o,$(shell $(AR) t "$(LIBMETALINK_PATH)/lib/libmetalink.a")),libexpat_metalink_parser.o)
+      curl_LDADD += -L"$(LIBEXPAT_PATH)/lib" -lexpat
+    else
+      curl_LDADD += -L"$(LIBXML2_PATH)/lib" -lxml2
+    endif
+  endif
 endif
 ifdef SSPI
   CFLAGS += -DUSE_WINDOWS_SSPI