Attached are a few additional patches which are required
for automake:
- Remove autoheader form autogen.sh since no AC_CONFIG_HEADER
is (currently) in configure.in
- Fix some DOS linefeeds in configure.in
- add two missing SUBDIRectorieS to some Makefile.am's
Best Regards,
Andreas
--
Andreas Fester
mailto:[EMAIL PROTECTED]
WWW: http://littletux.homelinux.org
ICQ: 326674288
Index: autogen.sh
===================================================================
RCS file: /home/cvspublic/logging-log4cxx/autogen.sh,v
retrieving revision 1.4
diff -u -r1.4 autogen.sh
--- autogen.sh 30 May 2005 00:18:12 -0000 1.4
+++ autogen.sh 2 Jun 2005 18:50:51 -0000
@@ -10,6 +10,5 @@
rm -f config.cache
rm -f config.log
aclocal -I .
-autoheader
autoconf
automake -a --copy
Index: configure.in
===================================================================
RCS file: /home/cvspublic/logging-log4cxx/configure.in,v
retrieving revision 1.53
diff -u -r1.53 configure.in
--- configure.in 1 Jun 2005 20:40:25 -0000 1.53
+++ configure.in 2 Jun 2005 18:50:52 -0000
@@ -392,14 +405,14 @@
include/log4cxx/config/Makefile
include/log4cxx/db/Makefile
include/log4cxx/rolling/Makefile
-include/log4cxx/pattern/Makefile
-include/log4cxx/filter/Makefile
+include/log4cxx/pattern/Makefile
+include/log4cxx/filter/Makefile
simplesocketserver/Makefile
tests/Makefile
tests/input/Makefile
tests/input/performance/Makefile
tests/input/ndc/Makefile
-tests/input/rolling/Makefile
+tests/input/rolling/Makefile
tests/input/xml/Makefile
tests/src/Makefile
tests/src/customlogger/Makefile
@@ -414,9 +427,9 @@
tests/src/xml/Makefile
tests/src/varia/Makefile
tests/witness/Makefile
-tests/witness/encoding/Makefile
-tests/witness/ndc/Makefile
-tests/witness/rolling/Makefile
+tests/witness/encoding/Makefile
+tests/witness/ndc/Makefile
+tests/witness/rolling/Makefile
performance/Makefile
performance/xml/Makefile
examples/Makefile
Index: include/log4cxx/Makefile.am
===================================================================
RCS file: /home/cvspublic/logging-log4cxx/include/log4cxx/Makefile.am,v
retrieving revision 1.9
diff -u -r1.9 Makefile.am
--- include/log4cxx/Makefile.am 1 Jun 2005 18:40:23 -0000 1.9
+++ include/log4cxx/Makefile.am 2 Jun 2005 18:50:52 -0000
@@ -1,4 +1,4 @@
-SUBDIRS = helpers net nt rolling spi varia xml config db private pattern
+SUBDIRS = helpers net nt rolling spi varia xml config db private pattern filter
log4cxxincdir = $(includedir)/log4cxx
log4cxxinc_HEADERS= $(top_srcdir)/include/log4cxx/*.h log4cxx.h
DISTCLEANFILES = log4cxx.h
Index: tests/input/Makefile.am
===================================================================
RCS file: /home/cvspublic/logging-log4cxx/tests/input/Makefile.am,v
retrieving revision 1.3
diff -u -r1.3 Makefile.am
--- tests/input/Makefile.am 18 Feb 2005 17:18:54 -0000 1.3
+++ tests/input/Makefile.am 2 Jun 2005 18:50:53 -0000
@@ -1,2 +1,2 @@
-SUBDIRS = ndc performance xml
+SUBDIRS = ndc performance xml rolling
EXTRA_DIST = *.properties