mirror of
https://github.com/moparisthebest/curl
synced 2024-08-13 17:03:50 -04:00
Fixed ares-enabled builds with static makefiles.
This commit is contained in:
parent
88535d593e
commit
658ec97055
@ -153,7 +153,7 @@ CFLAGS += -DBUILDING_LIBCURL
|
|||||||
|
|
||||||
ifdef ARES
|
ifdef ARES
|
||||||
INCLUDES += -I"$(LIBCARES_PATH)"
|
INCLUDES += -I"$(LIBCARES_PATH)"
|
||||||
CFLAGS += -DUSE_ARES
|
CFLAGS += -DUSE_ARES -DCARES_STATICLIB
|
||||||
DLL_LIBS += -L"$(LIBCARES_PATH)" -lcares
|
DLL_LIBS += -L"$(LIBCARES_PATH)" -lcares
|
||||||
libcurl_dll_DEPENDENCIES = $(LIBCARES_PATH)/libcares.a
|
libcurl_dll_DEPENDENCIES = $(LIBCARES_PATH)/libcares.a
|
||||||
endif
|
endif
|
||||||
|
@ -612,7 +612,11 @@
|
|||||||
/* #define USE_ARES 1 */
|
/* #define USE_ARES 1 */
|
||||||
|
|
||||||
/* Define to enable threaded asynchronous DNS lookups. */
|
/* 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)
|
#if defined(USE_ARES) && defined(USE_THREADS_WIN32)
|
||||||
# error "Only one DNS lookup specialty may be defined at most"
|
# error "Only one DNS lookup specialty may be defined at most"
|
||||||
|
@ -177,7 +177,7 @@ ifdef ARES
|
|||||||
ifndef DYN
|
ifndef DYN
|
||||||
curl_DEPENDENCIES += $(LIBCARES_PATH)/libcares.a
|
curl_DEPENDENCIES += $(LIBCARES_PATH)/libcares.a
|
||||||
endif
|
endif
|
||||||
CFLAGS += -DUSE_ARES
|
CFLAGS += -DUSE_ARES -DCARES_STATICLIB
|
||||||
curl_LDADD += -L"$(LIBCARES_PATH)" -lcares
|
curl_LDADD += -L"$(LIBCARES_PATH)" -lcares
|
||||||
endif
|
endif
|
||||||
ifdef RTMP
|
ifdef RTMP
|
||||||
|
Loading…
Reference in New Issue
Block a user