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.

---
 src/Makefile.am | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'src/Makefile.am')

diff --git a/src/Makefile.am b/src/Makefile.am
index a008dcb1c..b76aad104 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -45,8 +45,14 @@ bin_PROGRAMS = curl
 
 include Makefile.inc
 
-curl_LDADD = ../lib/libcurl.la @CURL_LIBS@
-curl_DEPENDENCIES = ../lib/libcurl.la
+if USE_EMBEDDED_ARES
+EMBEDDEDARES = ../ares/libcares.la
+else
+EMBEDDEDARES =
+endif
+
+curl_LDADD = ../lib/libcurl.la $(EMBEDDEDARES) @CURL_LIBS@
+curl_DEPENDENCIES = ../lib/libcurl.la $(EMBEDDEDARES)
 BUILT_SOURCES = hugehelp.c
 CLEANFILES = hugehelp.c
 # Use the C locale to ensure that only ASCII characters appear in the
-- 
cgit v1.2.3