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

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