Merge branch 'master' into jreed-doxygen

configure.ac

@@ -375,6 +375,10 @@ AC_ARG_WITH([log4cxx],
    log4cxx_library_path="${withval}/lib"
   ])
 
+# This is an urgent fix to avoid regression due to log4cxx on some
+# platforms.  It should be cleaned up with a better fix.
+if test "X$with_log4cxx" != "Xno"; then
+
 # If not specified, try some common paths.  These default to
 # /usr/include and /usr/lib if not found
 
@@ -405,7 +409,10 @@ if test "${log4cxx_library_path}"; then
 fi
 AC_SUBST(LOG4CXX_LDFLAGS)
 
-
+# The following two lines are part of the urgent fix, and should be cleaned
+# up with a better fix.
+fi
+AM_CONDITIONAL(USE_LOG4CXX, test "X${with_log4cxx}" != "Xno")
 
 #
 # Configure Boost header path

src/bin/auth/Makefile.am

@@ -51,7 +51,6 @@ b10_auth_LDADD += $(top_builddir)/src/lib/cc/libcc.la
 b10_auth_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la
 b10_auth_LDADD += $(top_builddir)/src/lib/asiolink/libasiolink.la
 b10_auth_LDADD += $(top_builddir)/src/lib/xfr/libxfr.la
-b10_auth_LDADD += $(top_builddir)/src/lib/log/liblog.la
 b10_auth_LDADD += $(SQLITE_LIBS)
 
 # TODO: config.h.in is wrong because doesn't honor pkgdatadir

src/lib/log/Makefile.am

@@ -1,4 +1,6 @@
+if USE_LOG4CXX
 SUBDIRS = . compiler tests
+endif
 
 AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib
 AM_CPPFLAGS += $(BOOST_INCLUDES)
@@ -10,7 +12,8 @@ CLEANFILES = *.gcno *.gcda
 lib_LTLIBRARIES = liblog.la
 liblog_la_SOURCES  =
 liblog_la_SOURCES += dbglevels.h
-liblog_la_SOURCES += dummylog.h dummylog.cc Message.h
+liblog_la_SOURCES += dummylog.h dummylog.cc
+if USE_LOG4CXX
 liblog_la_SOURCES += filename.h filename.cc
 liblog_la_SOURCES += logger.cc logger.h
 liblog_la_SOURCES += logger_support.cc logger_support.h
@@ -25,6 +28,7 @@ liblog_la_SOURCES += strutil.h strutil.cc
 liblog_la_SOURCES += xdebuglevel.cc xdebuglevel.h
 
 liblog_la_LDFLAGS = $(LOG4CXX_LDFLAGS)
+endif
 
 # Note: the ordering matters: -Wno-... must follow -Wextra (defined in
 # B10_CXXFLAGS)