From 8d581f7fe404eaad2defdeeeae456eb8463bbc56 Mon Sep 17 00:00:00 2001
From: Yang Tse <yangsita@gmail.com>
Date: Sat, 6 Jun 2009 13:20:39 +0000
Subject: Revert delegating c-ares linking magic on libtool and auto-makefiles
 when using the uninstalled c-ares libtool archive built from the CVS embedded
 tree.

This embedded c-ares linking is again handled from the configure script.
---
 src/Makefile.am | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/Makefile.am b/src/Makefile.am
index b76aad104..ea648a001 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -45,14 +45,8 @@ bin_PROGRAMS = curl
 
 include Makefile.inc
 
-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)
+curl_LDADD = $(top_builddir)/lib/libcurl.la @CURL_LIBS@
+curl_DEPENDENCIES = $(top_builddir)/lib/libcurl.la
 BUILT_SOURCES = hugehelp.c
 CLEANFILES = hugehelp.c
 # Use the C locale to ensure that only ASCII characters appear in the
-- 
cgit v1.2.3