Commit 658ec970 authored by Guenter Knauf's avatar Guenter Knauf
Browse files

Fixed ares-enabled builds with static makefiles.

parent 88535d59

lib/Makefile.m32

+1 −1
Original line number Diff line number Diff line
@@ -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

lib/config-win32.h

+5 −1
Original line number Diff line number Diff line
@@ -612,7 +612,11 @@ 
/* #define USE_ARES 1 */



/* Define to enable threaded asynchronous DNS lookups. */

#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"

src/Makefile.m32

+1 −1
Original line number Diff line number Diff line
@@ -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