Author: cctrieloff
Date: Wed Dec 6 08:55:44 2006
New Revision: 483149
URL: http://svn.apache.org/viewvc?view=rev&rev=483149
Log:
2006-12-06 Jim Meyering <[EMAIL PROTECTED]>
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.
Modified:
incubator/qpid/trunk/qpid/cpp/configure.ac
Modified: incubator/qpid/trunk/qpid/cpp/configure.ac
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/configure.ac?view=diff&rev=483149&r1=483148&r2=483149
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/configure.ac (original)
+++ incubator/qpid/trunk/qpid/cpp/configure.ac Wed Dec 6 08:55:44 2006
@@ -93,9 +93,11 @@
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,
