From 365e8eb78e1933c89e786998df6ab8ac8e9f86e1 Mon Sep 17 00:00:00 2001
From: Gisle Vanem <gvanem@broadpark.no>
Date: Mon, 16 Apr 2007 16:52:56 +0000
Subject: [PATCH] No need for USE_MANUAL. Use select_s() instead of select().
 Added ares_getopt.o to program sample objects.

---
 ares/Makefile.dj | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/ares/Makefile.dj b/ares/Makefile.dj
index aa1220c..32779a5 100644
--- a/ares/Makefile.dj
+++ b/ares/Makefile.dj
@@ -21,7 +21,7 @@ CFLAGS += -DWATT32 -DHAVE_AF_INET6 -DHAVE_PF_INET6 -DHAVE_FIONBIO \
           -DRECV_TYPE_ARG1='int'   -DRECV_TYPE_ARG2='void*' \
           -DRECV_TYPE_ARG3='int'   -DRECV_TYPE_ARG4='int' \
           -DRECV_TYPE_RETV='int'   -DHAVE_STRUCT_TIMEVAL \
-          -UHAVE_CONFIG_H
+          -Dselect=select_s        -UHAVE_CONFIG_H
 
 LDFLAGS = -s
 
@@ -38,7 +38,6 @@ endif
 
 ifeq ($(USE_ZLIB),1)
   EX_LIBS += $(ZLIB_ROOT)/libz.a
-  CFLAGS  += -DUSE_MANUAL
 endif
 
 ifeq ($(USE_IDNA),1)
@@ -55,10 +54,10 @@ all: $(OBJ_DIR) libcares.a ahost.exe adig.exe
 libcares.a: $(OBJECTS)
 	ar rs $@ $?
 
-ahost.exe: ahost.c $(OBJ_HACK)
+ahost.exe: ahost.c $(OBJ_DIR)/ares_getopt.o $(OBJ_HACK)
 	$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $^ $(EX_LIBS)
 
-adig.exe: adig.c $(OBJ_HACK)
+adig.exe: adig.c $(OBJ_DIR)/ares_getopt.o $(OBJ_HACK)
 	$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $^ $(EX_LIBS)
 
 clean:
-- 
2.7.4