From cd5e6743f744503f357b0877d6b5bad96ae53d1f Mon Sep 17 00:00:00 2001
From: Yang Tse <yangsita@gmail.com>
Date: Sat, 30 May 2009 15:56:42 +0000
Subject: Delegate c-ares linking magic on libtool and auto-makefiles when
 using the uninstalled c-ares libtool archive built from the CVS embedded
 tree.

---
 lib/Makefile.am | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'lib')

diff --git a/lib/Makefile.am b/lib/Makefile.am
index f7bfadde8..ec1905745 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -103,6 +103,12 @@ if MIMPURE
 MIMPURE = -mimpure-text
 endif
 
+if USE_EMBEDDED_ARES
+EMBEDDEDARES = ../ares/libcares.la
+else
+EMBEDDEDARES =
+endif
+
 libcurl_la_LDFLAGS = $(UNDEF) $(VERSIONINFO) $(MIMPURE) $(LIBCURL_LIBS)
 
 # Makefile.inc provides the CSOURCES and HHEADERS defines
@@ -110,6 +116,8 @@ include Makefile.inc
 
 libcurl_la_SOURCES = $(CSOURCES) $(HHEADERS)
 
+libcurl_la_LIBADD = $(EMBEDDEDARES)
+
 WIN32SOURCES = $(CSOURCES)
 WIN32HEADERS = $(HHEADERS) config-win32.h
 
-- 
cgit v1.2.3