summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorYang Tse <yangsita@gmail.com>2009-06-06 13:20:39 +0000
committerYang Tse <yangsita@gmail.com>2009-06-06 13:20:39 +0000
commit8d581f7fe404eaad2defdeeeae456eb8463bbc56 (patch)
tree3867cd175bbec287143f10aa2db0e44f44b09b0b /lib
parent262907d0a3e2ca77343eca3e9b10e7c5d5ffca12 (diff)
downloadcurl-8d581f7fe404eaad2defdeeeae456eb8463bbc56.tar.gz
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.
Diffstat (limited to 'lib')
-rw-r--r--lib/Makefile.am8
1 files changed, 0 insertions, 8 deletions
diff --git a/lib/Makefile.am b/lib/Makefile.am
index bc775d7b4..34c2b72c3 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -110,12 +110,6 @@ 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
@@ -123,8 +117,6 @@ include Makefile.inc
libcurl_la_SOURCES = $(CSOURCES) $(HHEADERS)
-libcurl_la_LIBADD = $(EMBEDDEDARES)
-
WIN32SOURCES = $(CSOURCES)
WIN32HEADERS = $(HHEADERS) config-win32.h