From 492e70943188ede4e37701b0630924cf51d792b7 Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Mon, 4 Dec 2006 16:55:45 +0000 Subject: 2006-12-04 Jim Meyering * configure.ac: Check for cppunit (>= 1.11.4). Set/substitute CPPUNIT_CXXFLAGS. * tests/Makefile.am (extra_libs): Use $(CPPUNIT_LIBS), rather than hard-coding -lcppunit. (AM_CXXFLAGS): Add $(CPPUNIT_CXXFLAGS). git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@482252 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/tests/Makefile.am | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'cpp/tests') diff --git a/cpp/tests/Makefile.am b/cpp/tests/Makefile.am index 55c190600f..d5cd60a831 100644 --- a/cpp/tests/Makefile.am +++ b/cpp/tests/Makefile.am @@ -1,4 +1,4 @@ -AM_CXXFLAGS = $(WARNING_CFLAGS) +AM_CXXFLAGS = $(WARNING_CFLAGS) $(CPPUNIT_CXXFLAGS) INCLUDES = \ -I$(top_srcdir)/gen \ -I$(top_srcdir)/lib \ @@ -9,8 +9,6 @@ INCLUDES = \ -I$(top_srcdir)/lib/common/framing \ $(APR_CXXFLAGS) -# FIXME: -lcppunit must come from autoconf - # FIXME: have e.g., topicall, run as part of "make check"? EXTRA_DIST = \ env \ @@ -80,7 +78,7 @@ run-python-tests: $(check_LTLIBRARIES) include gen.mk abs_builddir = @abs_builddir@ -extra_libs = -lcppunit +extra_libs = $(CPPUNIT_LIBS) lib_client = $(abs_builddir)/../lib/client/libclient.la lib_common = $(abs_builddir)/../lib/common/libcommon.la lib_broker = $(abs_builddir)/../lib/broker/libbroker.la -- cgit v1.2.1