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 /src | |
| 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 'src')
| -rw-r--r-- | src/Makefile.am | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index a008dcb1c..b76aad104 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -45,8 +45,14 @@ bin_PROGRAMS = curl include Makefile.inc -curl_LDADD = ../lib/libcurl.la @CURL_LIBS@ -curl_DEPENDENCIES = ../lib/libcurl.la +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) BUILT_SOURCES = hugehelp.c CLEANFILES = hugehelp.c # Use the C locale to ensure that only ASCII characters appear in the |