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 | 492e70943188ede4e37701b0630924cf51d792b7 (patch) | |
| tree | 0f7b7d293a90fc7d6cc7658cf7647be2fc4c0a17 /cpp/configure.ac | |
| parent | f060abcfc156a687115bb218fe37147365b61763 (diff) | |
| download | qpid-python-492e70943188ede4e37701b0630924cf51d792b7.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/qpid@482252 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/configure.ac')
| -rw-r--r-- | cpp/configure.ac | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/cpp/configure.ac b/cpp/configure.ac index 95aeadf7e0..955c114a7e 100644 --- a/cpp/configure.ac +++ b/cpp/configure.ac @@ -85,8 +85,11 @@ PKG_CHECK_MODULES([APR], [apr-1 >= $APR_MINIMUM_VERSION]) 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 |