Author: afester
Date: Sun Apr 9 08:06:30 2006
New Revision: 392748
URL: http://svn.apache.org/viewcvs?rev=392748&view=rev
Log:
LOGCXX-35: Cleaned up the configurations scripts to eliminate detection of
libxml2, removed setting of the various HAVE_XML defines.
Modified:
logging/log4cxx/trunk/INSTALL
logging/log4cxx/trunk/configure.in
logging/log4cxx/trunk/docs/Doxyfile.in
logging/log4cxx/trunk/include/log4cxx/config_msvc.h.in
logging/log4cxx/trunk/include/log4cxx/private/log4cxx_private.h.in
logging/log4cxx/trunk/include/log4cxx/private/log4cxx_private.hw
logging/log4cxx/trunk/simplesocketserver/Makefile.am
logging/log4cxx/trunk/src/Makefile.am
logging/log4cxx/trunk/xdocs/src/manual/Doxyfile.in
Modified: logging/log4cxx/trunk/INSTALL
URL:
http://svn.apache.org/viewcvs/logging/log4cxx/trunk/INSTALL?rev=392748&r1=392747&r2=392748&view=diff
==============================================================================
--- logging/log4cxx/trunk/INSTALL (original)
+++ logging/log4cxx/trunk/INSTALL Sun Apr 9 08:06:30 2006
@@ -224,9 +224,6 @@
With --enable-unicode, the library will be compiled with UTF16 Unicode support
(2 bytes wide characters instead of 1 byte wide characters)
-If the libXML2 library (http://xmlsoft.org) is detected, the DOMConfigurator
-class will be compiled.
-
Threading support can be added through option -with-thread
* "pthread" (default): pthread library
* "Microsoft" : native microsoft library
@@ -242,11 +239,6 @@
* "libsmtp" : libsmtp library (http://libsmtp.berlios.de)
* "CDO" : Microsoft CDO library (no yet implemented !)
* "no" (default) : no SMTP support
-
-XML support (DOMConfigurator) can be added through option -with-XML
- * "libxm2" (default) : gnome xml library (http://xmlsoft.org)
- * "Microsoft" : MSXML library
- * "no" : no XML support
Specifying the System Type
Modified: logging/log4cxx/trunk/configure.in
URL:
http://svn.apache.org/viewcvs/logging/log4cxx/trunk/configure.in?rev=392748&r1=392747&r2=392748&view=diff
==============================================================================
--- logging/log4cxx/trunk/configure.in (original)
+++ logging/log4cxx/trunk/configure.in Sun Apr 9 08:06:30 2006
@@ -227,44 +227,6 @@
[AC_CHECK_LIB(socket,gethostbyname)])])
AC_CHECK_FUNCS(setsockopt,,[AC_CHECK_LIB(socket,setsockopt)])
-# for DOMConfigurator
-AC_MSG_CHECKING(for XML support)
-AC_ARG_WITH(XML,
- AC_HELP_STRING(--with-XML, [XML support. Accepted arguments :
- libxml2, Microsoft, no (default=libxml2)]),
- [ac_with_xml=$withval],
- [ac_with_xml=libxml2]
- )
-case "$ac_with_xml" in
- Microsoft)
- AC_DEFINE(HAVE_MS_XML, 1, ODBC support through Microsoft XML.)
- AC_DEFINE(HAVE_XML, 1, XML support)
- AC_MSG_RESULT(Microsoft)
- ;;
- libxml2)
- AC_MSG_RESULT(libxml2)
- AC_CHECK_PROG(XML2_CONFIG, xml2-config, yes, no)
- if test "x$XML2_CONFIG" = "xyes"
- then
- AC_DEFINE(HAVE_LIBXML2, 1, XML support through libxml2.)
- AC_DEFINE(HAVE_XML, 1, XML support)
- LIBS_XML="`xml2-config --libs`"
- CPPFLAGS_XML="`xml2-config --cflags`"
- else
- AC_MSG_WARN(libxml2 not found !)
- fi
- ;;
- no)
- AC_MSG_RESULT(no)
- ;;
- *)
- AC_MSG_RESULT(???)
- AC_MSG_ERROR(Unknown option : $ac_with_xml)
- ;;
-esac
-AC_SUBST(LIBS_XML)
-AC_SUBST(CPPFLAGS_XML)
-
#for ODBCAppender
AC_MSG_CHECKING(for ODBC support)
AC_ARG_WITH(ODBC,
Modified: logging/log4cxx/trunk/docs/Doxyfile.in
URL:
http://svn.apache.org/viewcvs/logging/log4cxx/trunk/docs/Doxyfile.in?rev=392748&r1=392747&r2=392748&view=diff
==============================================================================
--- logging/log4cxx/trunk/docs/Doxyfile.in (original)
+++ logging/log4cxx/trunk/docs/Doxyfile.in Sun Apr 9 08:06:30 2006
@@ -797,7 +797,7 @@
# or name=definition (no spaces). If the definition and the = are
# omitted =1 is assumed.
-PREDEFINED = HAVE_SMTP HAVE_ODBC HAVE_XML
+PREDEFINED = HAVE_SMTP HAVE_ODBC
# If the MACRO_EXPANSION and EXPAND_PREDEF_ONLY tags are set to YES then
# this tag can be used to specify a list of macro names that should be
expanded.
Modified: logging/log4cxx/trunk/include/log4cxx/config_msvc.h.in
URL:
http://svn.apache.org/viewcvs/logging/log4cxx/trunk/include/log4cxx/config_msvc.h.in?rev=392748&r1=392747&r2=392748&view=diff
==============================================================================
--- logging/log4cxx/trunk/include/log4cxx/config_msvc.h.in (original)
+++ logging/log4cxx/trunk/include/log4cxx/config_msvc.h.in Sun Apr 9 08:06:30
2006
@@ -13,18 +13,12 @@
/* thread support through Microsoft threads. */
#define LOG4CXX_HAVE_MS_THREAD 1
-/* XML support through Microsoft XML. */
-#define LOG4CXX_HAVE_MS_XML 1
-
/* ODBC support */
#define LOG4CXX_HAVE_ODBC 1
/* thread support */
#define LOG4CXX_HAVE_THREAD 1
-/* XML support */
-#define LOG4CXX_HAVE_XML 1
-
typedef __int64 int64_t;
#if defined(WIN32) || defined(_WIN32)
@@ -57,4 +51,4 @@
#define _WIN32_WINNT 0x0400
-#include <tchar.h>
\ No newline at end of file
+#include <tchar.h>
Modified: logging/log4cxx/trunk/include/log4cxx/private/log4cxx_private.h.in
URL:
http://svn.apache.org/viewcvs/logging/log4cxx/trunk/include/log4cxx/private/log4cxx_private.h.in?rev=392748&r1=392747&r2=392748&view=diff
==============================================================================
--- logging/log4cxx/trunk/include/log4cxx/private/log4cxx_private.h.in
(original)
+++ logging/log4cxx/trunk/include/log4cxx/private/log4cxx_private.h.in Sun Apr
9 08:06:30 2006
@@ -53,7 +53,6 @@
// Capabilities should be checked in client code by
// attempting creation of the corresponding appender.
//
-#define LOG4CXX_HAVE_XML 1
#define LOG4CXX_HAVE_SMTP 0
#define LOG4CXX_HAVE_SYSLOG 1
Modified: logging/log4cxx/trunk/include/log4cxx/private/log4cxx_private.hw
URL:
http://svn.apache.org/viewcvs/logging/log4cxx/trunk/include/log4cxx/private/log4cxx_private.hw?rev=392748&r1=392747&r2=392748&view=diff
==============================================================================
--- logging/log4cxx/trunk/include/log4cxx/private/log4cxx_private.hw (original)
+++ logging/log4cxx/trunk/include/log4cxx/private/log4cxx_private.hw Sun Apr 9
08:06:30 2006
@@ -35,11 +35,6 @@
#define LOG4CXX_HAVE_SYSLOG 0
-
-#if defined(_MSC_VER)
-#define LOG4CXX_HAVE_XML 1
-#endif
-
#if !defined(__BORLANDC__)
#define LOG4CXX_RETURN_AFTER_THROW 1
#else
Modified: logging/log4cxx/trunk/simplesocketserver/Makefile.am
URL:
http://svn.apache.org/viewcvs/logging/log4cxx/trunk/simplesocketserver/Makefile.am?rev=392748&r1=392747&r2=392748&view=diff
==============================================================================
--- logging/log4cxx/trunk/simplesocketserver/Makefile.am (original)
+++ logging/log4cxx/trunk/simplesocketserver/Makefile.am Sun Apr 9 08:06:30
2006
@@ -1,6 +1,6 @@
INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include
-AM_CPPFLAGS = @CPPFLAGS_XML@ @CPPFLAGS_ODBC@
+AM_CPPFLAGS = @CPPFLAGS_ODBC@
bin_PROGRAMS = simplesocketserver
simplesocketserver_SOURCES = simplesocketserver.cpp
Modified: logging/log4cxx/trunk/src/Makefile.am
URL:
http://svn.apache.org/viewcvs/logging/log4cxx/trunk/src/Makefile.am?rev=392748&r1=392747&r2=392748&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/Makefile.am (original)
+++ logging/log4cxx/trunk/src/Makefile.am Sun Apr 9 08:06:30 2006
@@ -149,6 +149,6 @@
xmllayout.cpp\
xmlsocketappender.cpp
-AM_CPPFLAGS = @CPPFLAGS_XML@ @CPPFLAGS_ODBC@
-liblog4cxx_la_LDFLAGS = -version-info @LT_VERSION@ @LIBS_XML@ @LIBS_ODBC@
[EMAIL PROTECTED]@
+AM_CPPFLAGS = @CPPFLAGS_ODBC@
+liblog4cxx_la_LDFLAGS = -version-info @LT_VERSION@ @LIBS_ODBC@ [EMAIL
PROTECTED]@
Modified: logging/log4cxx/trunk/xdocs/src/manual/Doxyfile.in
URL:
http://svn.apache.org/viewcvs/logging/log4cxx/trunk/xdocs/src/manual/Doxyfile.in?rev=392748&r1=392747&r2=392748&view=diff
==============================================================================
--- logging/log4cxx/trunk/xdocs/src/manual/Doxyfile.in (original)
+++ logging/log4cxx/trunk/xdocs/src/manual/Doxyfile.in Sun Apr 9 08:06:30 2006
@@ -797,7 +797,7 @@
# or name=definition (no spaces). If the definition and the = are
# omitted =1 is assumed.
-PREDEFINED = HAVE_SMTP HAVE_ODBC HAVE_XML
+PREDEFINED = HAVE_SMTP HAVE_ODBC
# If the MACRO_EXPANSION and EXPAND_PREDEF_ONLY tags are set to YES then
# this tag can be used to specify a list of macro names that should be
expanded.
