aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/Makefile.m322
-rw-r--r--lib/config-win32.h6
-rw-r--r--src/Makefile.m322
3 files changed, 7 insertions, 3 deletions
diff --git a/lib/Makefile.m32 b/lib/Makefile.m32
index 1de5af893..bb01bbad3 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 cfbca9ca3..c1e69541e 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 891a000a5..b8a60af2a 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