diff options
| author | Alan Conway <aconway@apache.org> | 2006-12-04 16:55:45 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2006-12-04 16:55:45 +0000 |
| commit | 85bbb0a8a0128a7142ab4f7267cf22fe45574647 (patch) | |
| tree | 9dcfc7738dcdd61a3ab32842b9cabc7e4c9ab41b /qpid/cpp/tests | |
| parent | 3312f2e91dfea4ab102c383fecdd0a2501293a24 (diff) | |
| download | qpid-python-85bbb0a8a0128a7142ab4f7267cf22fe45574647.tar.gz | |
2006-12-04 Jim Meyering <jim@meyering.net>
* 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@482252 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/tests')
| -rw-r--r-- | qpid/cpp/tests/Makefile.am | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/qpid/cpp/tests/Makefile.am b/qpid/cpp/tests/Makefile.am index 55c190600f..d5cd60a831 100644 --- a/qpid/cpp/tests/Makefile.am +++ b/qpid/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 |