mcatan 2004/04/10 14:44:17
Modified: . configure.in
Log:
added StrictMath class and removed _min and _max macros
improved cppunit detection algo
Revision Changes Path
1.30 +11 -5 logging-log4cxx/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/logging-log4cxx/configure.in,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- configure.in 5 Apr 2004 20:51:30 -0000 1.29
+++ configure.in 10 Apr 2004 21:44:17 -0000 1.30
@@ -19,11 +19,6 @@
AC_SUBST(LT_VERSION)
AM_CONFIG_HEADER(include/log4cxx/config.h)
-AH_VERBATIM([HAVE_STD_MINMAX],
-[/* std::min & std::max */
-#include <algorithm>
-#define _min std::min
-#define _max std::max])
AH_VERBATIM([HAVE_NO_EXPLICIT_EXPORTS],
[/* no explicit exports */
@@ -114,6 +109,17 @@
if test "x$enable_cppunit" = xno; then
enable_tests=no
else
+ AC_CHECK_PROG(CPPUNIT_CONFIG, cppunit-config, yes, no)
+ if test "x$CPPUNIT_CONFIG" = "xyes"
+ then
+ LIBS_CPPUNIT="`cppunit-config --libs`"
+ CPPFLAGS_CPPUNIT="`cppunit-config --cflags`"
+ AC_SUBST(LIBS_CPPUNIT)
+ AC_SUBST(CPPFLAGS_CPPUNIT)
+ else
+ AC_MSG_WARN(cppunit not found !)
+ fi
+
AC_CHECK_HEADER([cppunit/TestFixture.h],,
enable_tests=no)
fi
