Enabled MinGW sync resolver builds.

diff --git a/lib/Makefile.m32 b/lib/Makefile.m32
index bb01bbad3dbd3d95fc60060c234d8e47d5075a3c..3df923a724b7116c0f2ea992ef36162db18688b6 100644 (file)
--- a/lib/Makefile.m32
+++ b/lib/Makefile.m32
@@ -106,6 +106,9 @@ endif
 ifeq ($(findstring -ares,$(CFG)),-ares)
 ARES = 1
 endif
+ifeq ($(findstring -sync,$(CFG)),-sync)
+SYNC = 1
+endif
 ifeq ($(findstring -rtmp,$(CFG)),-rtmp)
 RTMP = 1
 SSL = 1
@@ -151,11 +154,15 @@ endif
 INCLUDES = -I. -I../include
 CFLAGS += -DBUILDING_LIBCURL
 
-ifdef ARES
-  INCLUDES += -I"$(LIBCARES_PATH)"
-  CFLAGS += -DUSE_ARES -DCARES_STATICLIB
-  DLL_LIBS += -L"$(LIBCARES_PATH)" -lcares
-  libcurl_dll_DEPENDENCIES = $(LIBCARES_PATH)/libcares.a
+ifdef SYNC
+  CFLAGS += -DUSE_SYNC_DNS
+else
+  ifdef ARES
+    INCLUDES += -I"$(LIBCARES_PATH)"
+    CFLAGS += -DUSE_ARES -DCARES_STATICLIB
+    DLL_LIBS += -L"$(LIBCARES_PATH)" -lcares
+    libcurl_dll_DEPENDENCIES = $(LIBCARES_PATH)/libcares.a
+  endif
 endif
 ifdef RTMP
   INCLUDES += -I"$(LIBRTMP_PATH)"

diff --git a/lib/config-win32.h b/lib/config-win32.h
index c1e69541ed4d1f881a950c52c2b7fcee46043565..9ce6ad2985bc86be964dc07d73a5320e4072be89 100644 (file)
--- a/lib/config-win32.h
+++ b/lib/config-win32.h
@@ -611,11 +611,10 @@
 /* Define to enable c-ares asynchronous DNS lookups. */
 /* #define USE_ARES 1 */
 
-/* Define to enable threaded asynchronous DNS lookups. */
-#if !defined(USE_ARES) && !defined(USE_THREADS_WIN32)
+/* Default define to enable threaded asynchronous DNS lookups. */
+#if !defined(USE_SYNC_DNS) && !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)

diff --git a/src/Makefile.m32 b/src/Makefile.m32
index b8a60af2af3385727a9452e51f35c700a64d872b..3dd7bd6b84cade94e223a02b02c90ec70beef9e2 100644 (file)
--- a/src/Makefile.m32
+++ b/src/Makefile.m32
@@ -120,6 +120,9 @@ endif
 ifeq ($(findstring -ares,$(CFG)),-ares)
 ARES = 1
 endif
+ifeq ($(findstring -sync,$(CFG)),-sync)
+SYNC = 1
+endif
 ifeq ($(findstring -rtmp,$(CFG)),-rtmp)
 RTMP = 1
 SSL = 1
@@ -173,12 +176,16 @@ else
   CFLAGS += -DCURL_STATICLIB
   LDFLAGS += -static
 endif
-ifdef ARES
-  ifndef DYN
-    curl_DEPENDENCIES += $(LIBCARES_PATH)/libcares.a
+ifdef SYNC
+  CFLAGS += -DUSE_SYNC_DNS
+else
+  ifdef ARES
+    ifndef DYN
+      curl_DEPENDENCIES += $(LIBCARES_PATH)/libcares.a
+    endif
+    CFLAGS += -DUSE_ARES -DCARES_STATICLIB
+    curl_LDADD += -L"$(LIBCARES_PATH)" -lcares
   endif
-  CFLAGS += -DUSE_ARES -DCARES_STATICLIB
-  curl_LDADD += -L"$(LIBCARES_PATH)" -lcares
 endif
 ifdef RTMP
   CFLAGS += -DUSE_LIBRTMP