Hi,
I had some trouble building the cppunit tests with
the automake mechanism. The attached patch solves these:
- remove unused boost_regexp library; I assume this was
an artefakt from an earlier version (build.xml does not
refer to it anymore)
- Add $top_builddir/include to INCLUDE in Makefile.am's
below tests/, like in src/Makefile.am to support building
in separate build tree
- Some fixes in README (no need to install boost_regexp
for the unit tests).
Anyone still testing on Linux Mandrake 10.0? If not,
we should remove it from README.
Best Regards,
Andreas
--
Andreas Fester
mailto:[EMAIL PROTECTED]
WWW: http://littletux.homelinux.org
ICQ: 326674288
Index: README
===================================================================
RCS file: /home/cvspublic/logging-log4cxx/README,v
retrieving revision 1.14
diff -u -u -r1.14 README
--- README 14 May 2004 06:06:47 -0000 1.14
+++ README 16 Jul 2005 09:49:29 -0000
@@ -1,7 +1,7 @@
Introduction
============
Log4cxx is a port to C++ of the log4j project.
-The goal is have the same functionnalities and interfaces of log4j.
+The goal is have the same functionalities and interfaces of log4j.
Features
========
@@ -34,14 +34,13 @@
Supported OS
============
-* Linux (tested on Linux Mandrake 10.0)
+* Linux (tested on Linux Mandrake 10.0, Debian GNU/Linux 3.1)
* FreeBSD
* Windows (MSVC 6.0, MSVC 7.1 or Cygwin)
* Other POSIX OS should be supported but were not tested
Installation
============
-./autogen.sh
./configure
make
make check
@@ -64,7 +63,6 @@
=============
You will need to install
* cppunit (http://cppunit.sourceforge.net/)
-* boost regex (http://www.boost.org/)
POSIC :
* run "make check"
@@ -98,4 +96,3 @@
This library is licensed under the Apache Public License. Please read the
included license.apl for details.
-
Index: configure.in
===================================================================
RCS file: /home/cvspublic/logging-log4cxx/configure.in,v
retrieving revision 1.54
diff -u -u -r1.54 configure.in
--- configure.in 3 Jun 2005 05:20:30 -0000 1.54
+++ configure.in 16 Jul 2005 09:49:32 -0000
@@ -122,12 +122,6 @@
enable_tests=no)
fi
-AC_HAVE_LIBRARY([boost_regex],,
- enable_tests=no)
-
-AC_CHECK_HEADERS([boost/regex.hpp],,
- enable_tests=no)
-
AM_CONDITIONAL(TESTS, test x$enable_tests = xyes)
Index: tests/src/Makefile.am
===================================================================
RCS file: /home/cvspublic/logging-log4cxx/tests/src/Makefile.am,v
retrieving revision 1.12
diff -u -u -r1.12 Makefile.am
--- tests/src/Makefile.am 7 Jan 2005 01:25:20 -0000 1.12
+++ tests/src/Makefile.am 16 Jul 2005 09:49:34 -0000
@@ -5,7 +5,8 @@
if TESTS
-INCLUDES = -I$(top_srcdir)/include
+INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include
+
noinst_PROGRAMS = testsuite shortsocketserver
testsuite_SOURCES = \
@@ -40,7 +41,7 @@
-Wl,--whole-archive,xml/libxml.a,--no-whole-archive\
-Wl,--whole-archive,db/libdb.a,--no-whole-archive\
-Wl,--whole-archive,nt/libnt.a,--no-whole-archive\
- @LIBS_CPPUNIT@ -lboost_regex
+ @LIBS_CPPUNIT@
AM_CPPFLAGS = @CPPFLAGS_CPPUNIT@
@@ -66,7 +67,7 @@
shortsocketserver_LDFLAGS = \
-Wl,--whole-archive,util/libutil.a,--no-whole-archive\
-Wl,--whole-archive,xml/libxml.a,--no-whole-archive\
- @LIBS_CPPUNIT@ -lboost_regex
+ @LIBS_CPPUNIT@
shortsocketserver_DEPENDENCIES = \
util/libutil.a\
Index: tests/src/customlogger/Makefile.am
===================================================================
RCS file: /home/cvspublic/logging-log4cxx/tests/src/customlogger/Makefile.am,v
retrieving revision 1.2
diff -u -u -r1.2 Makefile.am
--- tests/src/customlogger/Makefile.am 2 Apr 2004 09:02:22 -0000 1.2
+++ tests/src/customlogger/Makefile.am 16 Jul 2005 09:49:34 -0000
@@ -5,7 +5,7 @@
noinst_LIBRARIES = libcustomlogger.a
-INCLUDES = -I$(top_srcdir)/include
+INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include
libcustomlogger_a_SOURCES = \
xlogger.cpp\
Index: tests/src/db/Makefile.am
===================================================================
RCS file: /home/cvspublic/logging-log4cxx/tests/src/db/Makefile.am,v
retrieving revision 1.2
diff -u -u -r1.2 Makefile.am
--- tests/src/db/Makefile.am 16 Dec 2004 00:21:47 -0000 1.2
+++ tests/src/db/Makefile.am 16 Jul 2005 09:49:34 -0000
@@ -3,7 +3,8 @@
if TESTS
noinst_LIBRARIES = libdb.a
-INCLUDES = -I$(top_srcdir)/include
+INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include
+
libdb_a_SOURCES = \
odbcappendertestcase.cpp
Index: tests/src/defaultinit/Makefile.am
===================================================================
RCS file: /home/cvspublic/logging-log4cxx/tests/src/defaultinit/Makefile.am,v
retrieving revision 1.1
diff -u -u -r1.1 Makefile.am
--- tests/src/defaultinit/Makefile.am 18 Jan 2004 16:24:29 -0000 1.1
+++ tests/src/defaultinit/Makefile.am 16 Jul 2005 09:49:34 -0000
@@ -4,7 +4,7 @@
noinst_LIBRARIES = libdefaultinit.a
-INCLUDES = -I$(top_srcdir)/include
+INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include
libdefaultinit_a_SOURCES = \
testcase1.cpp\
Index: tests/src/helpers/Makefile.am
===================================================================
RCS file: /home/cvspublic/logging-log4cxx/tests/src/helpers/Makefile.am,v
retrieving revision 1.10
diff -u -u -r1.10 Makefile.am
--- tests/src/helpers/Makefile.am 28 Apr 2005 20:53:45 -0000 1.10
+++ tests/src/helpers/Makefile.am 16 Jul 2005 09:49:34 -0000
@@ -4,7 +4,7 @@
noinst_LIBRARIES = libhelpers.a
-INCLUDES = -I$(top_srcdir)/include
+INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include
libhelpers_a_SOURCES = \
absolutetimedateformattestcase.cpp \
Index: tests/src/net/Makefile.am
===================================================================
RCS file: /home/cvspublic/logging-log4cxx/tests/src/net/Makefile.am,v
retrieving revision 1.2
diff -u -u -r1.2 Makefile.am
--- tests/src/net/Makefile.am 2 Apr 2004 09:02:22 -0000 1.2
+++ tests/src/net/Makefile.am 16 Jul 2005 09:49:34 -0000
@@ -4,7 +4,7 @@
if TESTS
noinst_LIBRARIES = libnet.a
-INCLUDES = -I$(top_srcdir)/include
+INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include
libnet_a_SOURCES = \
socketservertestcase.cpp
Index: tests/src/nt/Makefile.am
===================================================================
RCS file: /home/cvspublic/logging-log4cxx/tests/src/nt/Makefile.am,v
retrieving revision 1.2
diff -u -u -r1.2 Makefile.am
--- tests/src/nt/Makefile.am 16 Dec 2004 00:21:47 -0000 1.2
+++ tests/src/nt/Makefile.am 16 Jul 2005 09:49:34 -0000
@@ -3,7 +3,7 @@
if TESTS
noinst_LIBRARIES = libnt.a
-INCLUDES = -I$(top_srcdir)/include
+INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include
libnt_a_SOURCES = \
nteventlogappendertestcase.cpp
Index: tests/src/pattern/Makefile.am
===================================================================
RCS file: /home/cvspublic/logging-log4cxx/tests/src/pattern/Makefile.am,v
retrieving revision 1.2
diff -u -u -r1.2 Makefile.am
--- tests/src/pattern/Makefile.am 2 Apr 2004 09:02:22 -0000 1.2
+++ tests/src/pattern/Makefile.am 16 Jul 2005 09:49:34 -0000
@@ -5,7 +5,7 @@
noinst_LIBRARIES = libpattern.a
-INCLUDES = -I$(top_srcdir)/include
+INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include
libpattern_a_SOURCES = \
num343patternconverter.cpp \
Index: tests/src/rolling/Makefile.am
===================================================================
RCS file: /home/cvspublic/logging-log4cxx/tests/src/rolling/Makefile.am,v
retrieving revision 1.3
diff -u -u -r1.3 Makefile.am
--- tests/src/rolling/Makefile.am 1 Jun 2005 18:40:27 -0000 1.3
+++ tests/src/rolling/Makefile.am 16 Jul 2005 09:49:34 -0000
@@ -4,7 +4,7 @@
noinst_LIBRARIES = librolling.a
-INCLUDES = -I$(top_srcdir)/include
+INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include
librolling_a_SOURCES = \
filenamepatterntestcase.cpp \
Index: tests/src/util/Makefile.am
===================================================================
RCS file: /home/cvspublic/logging-log4cxx/tests/src/util/Makefile.am,v
retrieving revision 1.5
diff -u -u -r1.5 Makefile.am
--- tests/src/util/Makefile.am 16 Dec 2004 00:21:47 -0000 1.5
+++ tests/src/util/Makefile.am 16 Jul 2005 09:49:34 -0000
@@ -5,7 +5,7 @@
noinst_LIBRARIES = libutil.a
-INCLUDES = -I$(top_srcdir)/include
+INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include
libutil_a_SOURCES = \
absolutetimefilter.cpp\
Index: tests/src/varia/Makefile.am
===================================================================
RCS file: /home/cvspublic/logging-log4cxx/tests/src/varia/Makefile.am,v
retrieving revision 1.1
diff -u -u -r1.1 Makefile.am
--- tests/src/varia/Makefile.am 4 Feb 2004 01:01:19 -0000 1.1
+++ tests/src/varia/Makefile.am 16 Jul 2005 09:49:34 -0000
@@ -4,7 +4,8 @@
noinst_LIBRARIES = libvaria.a
-INCLUDES = -I$(top_srcdir)/include
+INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include
+
libvaria_a_SOURCES = \
errorhandlertestcase.cpp \
Index: tests/src/xml/Makefile.am
===================================================================
RCS file: /home/cvspublic/logging-log4cxx/tests/src/xml/Makefile.am,v
retrieving revision 1.3
diff -u -u -r1.3 Makefile.am
--- tests/src/xml/Makefile.am 2 Apr 2004 09:02:22 -0000 1.3
+++ tests/src/xml/Makefile.am 16 Jul 2005 09:49:34 -0000
@@ -5,7 +5,8 @@
noinst_LIBRARIES = libxml.a
-INCLUDES = -I$(top_srcdir)/include
+INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include
+
libxml_a_SOURCES = \
customleveltestcase.cpp \
