Merge revisions 1001-1174 from 1.1 branch.

Author: wilx

CMakeLists.txt

@@ -77,6 +77,7 @@ set (log4cplus_sources
   src/logger.cxx
   src/loggerimpl.cxx
   src/loggingevent.cxx
+  src/loggingmacros.cxx
   src/loglevel.cxx
   src/loglog.cxx
   src/logloguser.cxx

Makefile.in

@@ -51,7 +51,10 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/acx_pthread.m4 \
 	$(top_srcdir)/m4/ax_declspec.m4 \
 	$(top_srcdir)/m4/ax_tls_support.m4 \
-	$(top_srcdir)/m4/ax__sync.m4 $(top_srcdir)/configure.in
+	$(top_srcdir)/m4/ax__sync.m4 \
+	$(top_srcdir)/m4/ax_macro_va_args.m4 \
+	$(top_srcdir)/m4/ax_macro_function.m4 \
+	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
@@ -126,6 +129,8 @@ LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LOG4CPLUS_NDEBUG = @LOG4CPLUS_NDEBUG@
+LOG4CPLUS_PROFILING_CXXFLAGS = @LOG4CPLUS_PROFILING_CXXFLAGS@
+LOG4CPLUS_PROFILING_LDFLAGS = @LOG4CPLUS_PROFILING_LDFLAGS@
 LTLIBOBJS = @LTLIBOBJS@
 LT_VERSION = @LT_VERSION@
 MAKEINFO = @MAKEINFO@

acinclude.m4

@@ -7,3 +7,5 @@ m4_include([m4/acx_pthread.m4])
 m4_include([m4/ax_declspec.m4])
 m4_include([m4/ax_tls_support.m4])
 m4_include([m4/ax__sync.m4])
+m4_include([m4/ax_macro_va_args.m4])
+m4_include([m4/ax_macro_function.m4])