diff options
| author | Carl C. Trieloff <cctrieloff@apache.org> | 2006-12-06 16:55:44 +0000 |
|---|---|---|
| committer | Carl C. Trieloff <cctrieloff@apache.org> | 2006-12-06 16:55:44 +0000 |
| commit | b0efea556ebe27eb9617bf57643c81bf7cb7a92b (patch) | |
| tree | 494607ea86bc26f4bca4659488064c798242cdc9 /cpp/configure.ac | |
| parent | 355a889c72f14342c3cb6b50e28e9fad6149d888 (diff) | |
| download | qpid-python-b0efea556ebe27eb9617bf57643c81bf7cb7a92b.tar.gz | |
2006-12-06 Jim Meyering <meyering@redhat.com>
Still test for libcppunit, but don't make configure fail if it's
not available or too old.
* configure.ac: Don't use PKG_CHECK_MODULES to test for cppunit,
since this isn't a hard test (needed only for the tests run by
"make check"), and doesn't really depend on the version.
Instead, use the AM_PATH_CPPUNIT macro.
* m4/cppunit.m4: New file, from cppunit-1.12.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@483149 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/configure.ac')
| -rw-r--r-- | cpp/configure.ac | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/cpp/configure.ac b/cpp/configure.ac index 8ba48d54e2..bc069359be 100644 --- a/cpp/configure.ac +++ b/cpp/configure.ac @@ -93,9 +93,11 @@ AC_SUBST(LIBTOOL_VERSION_INFO_ARG) gl_CLOCK_TIME +# Check for cppunit support. CPPUNIT_MINIMUM_VERSION=1.10.2 -PKG_CHECK_MODULES([CPPUNIT], [cppunit >= $CPPUNIT_MINIMUM_VERSION]) +AM_PATH_CPPUNIT([$CPPUNIT_MINIMUM_VERSION], , [CPPUNIT_LIBS=-lcppunit]) CPPUNIT_CXXFLAGS=$CPPUNIT_CFLAGS +AC_SUBST(CPPUNIT_LIBS) AC_SUBST(CPPUNIT_CXXFLAGS) AC_ARG_ENABLE(apr, |