From: Guenter Knauf <lists@gknw.net>
Date: Tue, 9 Apr 2013 15:44:51 +0000 (+0200)
Subject: Fixed ares-enabled builds with static makefiles.
X-Git-Tag: curl-7_30_0~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=658ec97055456f739222aa2a5719a4d403ced99a;p=thirdparty%2Fcurl.git

Fixed ares-enabled builds with static makefiles.
---

diff --git a/lib/Makefile.m32 b/lib/Makefile.m32
index 1de5af893a..bb01bbad3d 100644
--- a/lib/Makefile.m32
+++ b/lib/Makefile.m32
@@ -153,7 +153,7 @@ CFLAGS += -DBUILDING_LIBCURL
 
 ifdef ARES
   INCLUDES += -I"$(LIBCARES_PATH)"
-  CFLAGS += -DUSE_ARES
+  CFLAGS += -DUSE_ARES -DCARES_STATICLIB
   DLL_LIBS += -L"$(LIBCARES_PATH)" -lcares
   libcurl_dll_DEPENDENCIES = $(LIBCARES_PATH)/libcares.a
 endif
diff --git a/lib/config-win32.h b/lib/config-win32.h
index cfbca9ca38..c1e69541ed 100644
--- a/lib/config-win32.h
+++ b/lib/config-win32.h
@@ -612,7 +612,11 @@
 /* #define USE_ARES 1 */
 
 /* Define to enable threaded asynchronous DNS lookups. */
-#define USE_THREADS_WIN32 1
+#if !defined(USE_ARES) && !defined(USE_THREADS_WIN32)
+#  define USE_THREADS_WIN32 1
+#elif defined(USE_THREADS_WIN32) && USE_THREADS_WIN32 == 0
+#  undef USE_THREADS_WIN32
+#endif
 
 #if defined(USE_ARES) && defined(USE_THREADS_WIN32)
 #  error "Only one DNS lookup specialty may be defined at most"
diff --git a/src/Makefile.m32 b/src/Makefile.m32
index 891a000a59..b8a60af2af 100644
--- a/src/Makefile.m32
+++ b/src/Makefile.m32
@@ -177,7 +177,7 @@ ifdef ARES
   ifndef DYN
     curl_DEPENDENCIES += $(LIBCARES_PATH)/libcares.a
   endif
-  CFLAGS += -DUSE_ARES
+  CFLAGS += -DUSE_ARES -DCARES_STATICLIB
   curl_LDADD += -L"$(LIBCARES_PATH)" -lcares
 endif
 ifdef RTMP