[svn] commit: r4169 - in /branches/trac438: ./ src/lib/log/ src/lib/log/compiler/ src/lib/log/tests/

[BIND 10 source code commits]

Author: stephen
Date: Wed Jan  5 15:55:55 2011
New Revision: 4169

Log:
Check-in of some code prior to conversion of repository to git; the code is not finished!

Added:
    branches/trac438/src/lib/log/Message.h
    branches/trac438/src/lib/log/README.txt
    branches/trac438/src/lib/log/appender.h
    branches/trac438/src/lib/log/compiler/
    branches/trac438/src/lib/log/compiler/message.cc
    branches/trac438/src/lib/log/dbglevels.h
    branches/trac438/src/lib/log/filename.cc
    branches/trac438/src/lib/log/filename.h
    branches/trac438/src/lib/log/log.h
    branches/trac438/src/lib/log/logger.cc
    branches/trac438/src/lib/log/logger.h
    branches/trac438/src/lib/log/message_reader.cc
    branches/trac438/src/lib/log/message_reader.h
    branches/trac438/src/lib/log/root_logger_name.cc
    branches/trac438/src/lib/log/root_logger_name.h
    branches/trac438/src/lib/log/stringutil.cc
    branches/trac438/src/lib/log/stringutil.h
    branches/trac438/src/lib/log/tests/
    branches/trac438/src/lib/log/tests/Makefile.am
    branches/trac438/src/lib/log/tests/filename_unittest.cc
    branches/trac438/src/lib/log/tests/logger_unittest.cc
    branches/trac438/src/lib/log/tests/message_reader_unittest.cc
    branches/trac438/src/lib/log/tests/root_logger_name_unittest.cc
    branches/trac438/src/lib/log/tests/run_unittests.cc
    branches/trac438/src/lib/log/tests/stringutil_unittest.cc
    branches/trac438/src/lib/log/tests/xdebuglevel_unittest.cc
    branches/trac438/src/lib/log/xdebuglevel.cc
    branches/trac438/src/lib/log/xdebuglevel.h
Modified:
    branches/trac438/configure.ac
    branches/trac438/src/lib/log/Makefile.am

Modified: branches/trac438/configure.ac
==============================================================================
--- branches/trac438/configure.ac (original)
+++ branches/trac438/configure.ac Wed Jan  5 15:55:55 2011
@@ -326,6 +326,39 @@
 	AC_SUBST(GENHTML)
 fi
 AC_SUBST(USE_LCOV)
+
+# Configure log4cxx header and library path
+#
+# If explicitly specified, use it.
+
+AC_ARG_WITH([log4cxx],
+  AC_HELP_STRING([--with-log4cxx=PATH],
+    [specify directory where log4cxx is installed]),
+  [log4cxx_include_path="${withval}/include"])
+
+# If not specified, try some common paths.  These default to
+# /usr/include if not found
+
+if test -z "$with_log4cxx"; then
+	log4cxxdirs="/usr/local /usr/pkg /opt /opt/local"
+	for d in $log4cxxdirs
+	do
+		if test -d $d/include/log4cxx; then
+			log4cxx_include_path=$d/include
+			break
+		fi
+	done
+fi
+
+CPPFLAGS_SAVES="$CPPFLAGS"
+if test "${log4cxx_include_path}" ; then
+	LOG4CXX_INCLUDES="-I${log4cxx_include_path}"
+	CPPFLAGS="$CPPFLAGS $LOG4CXX_INCLUDES"
+fi
+AC_CHECK_HEADER([log4cxx/logger.h],, AC_MSG_ERROR([Missing log4cxx header files.]))
+CPPFLAGS="$CPPFLAGS_SAVES"
+AC_SUBST(LOG4CXX_INCLUDES)
+
 
 #
 # Configure Boost header path
@@ -612,6 +645,7 @@
                  src/lib/datasrc/tests/Makefile
                  src/lib/xfr/Makefile
                  src/lib/log/Makefile
+                 src/lib/log/tests/Makefile
                  src/lib/testutils/Makefile
                  src/lib/testutils/testdata/Makefile
                  src/lib/nsas/Makefile
@@ -721,6 +755,7 @@
                  ${PYTHON_LDFLAGS}
                  ${PYTHON_LIB}
   Boost:         ${BOOST_INCLUDES}
+  log4cxx:       ${LOG4CXX_INCLUDES}
   SQLite:        $SQLITE_CFLAGS
                  $SQLITE_LIBS
 

Modified: branches/trac438/src/lib/log/Makefile.am
==============================================================================
--- branches/trac438/src/lib/log/Makefile.am (original)
+++ branches/trac438/src/lib/log/Makefile.am Wed Jan  5 15:55:55 2011
@@ -1,4 +1,27 @@
-AM_CXXFLAGS = $(B10_CXXFLAGS)
+SUBDIRS = . tests
+
+AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib
+AM_CPPFLAGS += $(BOOST_INCLUDES)
+AM_CPPFLAGS += -I$(top_srcdir)/src/lib/log -I$(top_builddir)/src/lib/log
+
+CLEANFILES = *.gcno *.gcda
 
 lib_LTLIBRARIES = liblog.la
-liblog_la_SOURCES = dummylog.cc dummylog.h
+liblog_la_SOURCES  = root_logger_name.cc root_logger_name.h
+liblog_la_SOURCES += xdebuglevel.cc xdebuglevel.h
+liblog_la_SOURCES += logger.cc logger.h
+liblog_la_SOURCES += message_reader.cc message_reader.h
+liblog_la_SOURCES += filename.h filename.cc
+liblog_la_SOURCES += stringutil.h stringutil.cc
+
+# Note: the ordering matters: -Wno-... must follow -Wextra (defined in
+# B10_CXXFLAGS)
+liblog_la_CXXFLAGS = $(AM_CXXFLAGS)
+if USE_GXX
+liblog_la_CXXFLAGS += -Wno-unused-parameter
+endif
+if USE_CLANGPP
+# Same for clang++, but we need to turn off -Werror completely.
+liblog_la_CXXFLAGS += -Wno-error
+endif
+liblog_la_CPPFLAGS = $(AM_CPPFLAGS)