Author: aconway
Date: Mon Dec 4 08:55:45 2006
New Revision: 482252
URL: http://svn.apache.org/viewvc?view=rev&rev=482252
Log:
2006-12-04 Jim Meyering <[EMAIL PROTECTED]>
* 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).
Modified:
incubator/qpid/trunk/qpid/cpp/configure.ac
incubator/qpid/trunk/qpid/cpp/tests/Makefile.am
Modified: incubator/qpid/trunk/qpid/cpp/configure.ac
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/configure.ac?view=diff&rev=482252&r1=482251&r2=482252
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/configure.ac (original)
+++ incubator/qpid/trunk/qpid/cpp/configure.ac Mon Dec 4 08:55:45 2006
@@ -85,8 +85,11 @@
APR_CXXFLAGS="$APR_CFLAGS -DUSE_APR=1"
AC_SUBST(APR_CXXFLAGS)
-AC_SUBST(APR_LIBS)
+CPPUNIT_MINIMUM_VERSION=1.11.4
+PKG_CHECK_MODULES([CPPUNIT], [cppunit >= $CPPUNIT_MINIMUM_VERSION])
+CPPUNIT_CXXFLAGS=$CPPUNIT_CFLAGS
+AC_SUBST(CPPUNIT_CXXFLAGS)
AC_CONFIG_FILES([
Makefile
Modified: incubator/qpid/trunk/qpid/cpp/tests/Makefile.am
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/tests/Makefile.am?view=diff&rev=482252&r1=482251&r2=482252
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/tests/Makefile.am (original)
+++ incubator/qpid/trunk/qpid/cpp/tests/Makefile.am Mon Dec 4 08:55:45 2006
@@ -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 @@
-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 @@
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
