log4cxx is including a copy of the autoconf-generated config_auto.h even
when compiling another program which also uses autoconf, causing
conflicts. However, only LOG4CXX_EXPORT is really needed. I made this
quick patch to fix it.

This patch reuses the LOG4CXX define used for almost the same purpose on
config_msvc.h (to determine if we're compiling log4cxx itself or a
program which uses log4cxx).

 configure.in             |    1 +
 include/log4cxx/config.h |    5 +++++
 2 files changed, 6 insertions(+)

--- log4cxx-0.9.7.orig/include/log4cxx/config.h 2004-05-11 14:14:19.000000000 
-0300
+++ log4cxx-0.9.7/include/log4cxx/config.h      2004-07-08 15:52:16.000000000 
-0300
@@ -4,7 +4,12 @@
 #ifdef _MSC_VER
 #include <log4cxx/config_msvc.h>
 #else
+#ifdef LOG4CXX
 #include <log4cxx/config_auto.h>
+#else
+/* no explicit exports */
+#define LOG4CXX_EXPORT
+#endif
 #endif
 
 #endif //_LOG4CXX_CONFIG_H
--- log4cxx-0.9.7.orig/configure.in     2004-05-10 17:59:02.000000000 -0300
+++ log4cxx-0.9.7/configure.in  2004-07-08 15:53:13.000000000 -0300
@@ -334,6 +334,7 @@
        ;;
 esac
 
+CPPFLAGS="-DLOG4CXX $CPPFLAGS"
 
 # Create files
 # ----------------------------------------------------------------------------

-- 
Cesar Eduardo Barros
[EMAIL PROTECTED]
[EMAIL PROTECTED]

Reply via email to