diff options
author | Yang Tse <yangsita@gmail.com> | 2009-05-30 15:56:42 +0000 |
---|---|---|
committer | Yang Tse <yangsita@gmail.com> | 2009-05-30 15:56:42 +0000 |
commit | cd5e6743f744503f357b0877d6b5bad96ae53d1f (patch) | |
tree | f3563d2fa9a6a0f4510f271e402e9fc276fe2f05 /lib | |
parent | 2091fe530f7609830d96fd4eb3c45e341d1eeb8f (diff) |
Delegate c-ares linking magic on libtool and auto-makefiles when using
the uninstalled c-ares libtool archive built from the CVS embedded tree.
Diffstat (limited to 'lib')
-rw-r--r-- | lib/Makefile.am | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/lib/Makefile.am b/lib/Makefile.am index f7bfadde8..ec1905745 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -103,6 +103,12 @@ 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 @@ -110,6 +116,8 @@ include Makefile.inc libcurl_la_SOURCES = $(CSOURCES) $(HHEADERS) +libcurl_la_LIBADD = $(EMBEDDEDARES) + WIN32SOURCES = $(CSOURCES) WIN32HEADERS = $(HHEADERS) config-win32.h |