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.
This commit is contained in:
Yang Tse 2009-06-06 13:20:39 +00:00
parent 262907d0a3
commit 8d581f7fe4
4 changed files with 9 additions and 31 deletions

View file

@ -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