From cd5e6743f744503f357b0877d6b5bad96ae53d1f Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Sat, 30 May 2009 15:56:42 +0000 Subject: Delegate c-ares linking magic on libtool and auto-makefiles when using the uninstalled c-ares libtool archive built from the CVS embedded tree. --- tests/libtest/Makefile.am | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'tests') diff --git a/tests/libtest/Makefile.am b/tests/libtest/Makefile.am index 770abf6ca..228ae6b49 100644 --- a/tests/libtest/Makefile.am +++ b/tests/libtest/Makefile.am @@ -42,9 +42,15 @@ LIBDIR = $(top_builddir)/lib EXTRA_DIST = test75.pl test307.pl test610.pl test613.pl test1013.pl \ test1022.pl Makefile.inc +if USE_EMBEDDED_ARES +EMBEDDEDARES = $(top_builddir)/ares/libcares.la +else +EMBEDDEDARES = +endif + # Dependencies (may need to be overriden) -LDADD = $(LIBDIR)/libcurl.la -DEPENDENCIES = $(LIBDIR)/libcurl.la +LDADD = $(LIBDIR)/libcurl.la $(EMBEDDEDARES) +DEPENDENCIES = $(LIBDIR)/libcurl.la $(EMBEDDEDARES) # Makefile.inc provides the source defines (TESTUTIL, SUPPORTFILES, noinst_PROGRAMS, lib*_SOURCES, and lib*_CFLAGS) include Makefile.inc -- cgit v1.2.3