carnold 2005/03/12 22:52:45
Modified: . build.xml
include/log4cxx portability.h
Log:
LOGCXX-75: Tweaks to restore linux build
Revision Changes Path
1.54 +17 -14 logging-log4cxx/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/logging-log4cxx/build.xml,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- build.xml 13 Mar 2005 06:20:45 -0000 1.53
+++ build.xml 13 Mar 2005 06:52:45 -0000 1.54
@@ -132,12 +132,6 @@
<condition property="os.family" value="unix">
<isset property="is-unix"/>
</condition>
- <condition property="is-gcc" value="true">
- <or>
- <equals arg1="${compiler}" arg2="gcc"/>
- <equals arg1="${compiler}" arg2="g++"/>
- </or>
- </condition>
</target>
@@ -169,12 +163,6 @@
<target name="unix-init" depends="mac-init" if="is-unix">
<property name="compiler" value="gcc"/>
- <condition property="pic-option" value="-fPIC">
- <and>
- <isset property="is-gcc"/>
- <istrue value="${use-pic}"/>
- </and>
- </condition>
<property name="lib.prefix" value="lib"/>
<property name="lib.extension" value=".a"/>
@@ -208,6 +196,21 @@
<mkdir dir="${build.dir}"/>
+ <condition property="is-gcc" value="true">
+ <or>
+ <equals arg1="${compiler}" arg2="gcc"/>
+ <equals arg1="${compiler}" arg2="g++"/>
+ </or>
+ </condition>
+
+ <condition property="pic-option" value="-fPIC">
+ <and>
+ <isset property="is-gcc"/>
+ <istrue value="${use-pic}"/>
+ </and>
+ </condition>
+
+
<condition property="is-debug" value="true">
<istrue value="${debug}"/>
</condition>
@@ -642,7 +645,7 @@
<libset libs="advapi32 odbc32 ws2_32" if="is-windows"/>
<libset libs="stdc++" if="is-gcc"/>
<libset libs="cw32mt" if="is-bcc"/>
- <!-- libset libs="xml2" if="is-unix"/ -->
+ <libset libs="xml2" if="is-unix"/>
<libset libs="iconv" if="has-iconv"/>
<libset libs="${apr.lib.name}${lib-suffix}" dir="${apr.lib.dir}"
if="apr.lib.dir"/>
<libset libs="${apr.lib.name}${lib-suffix}" unless="apr.lib.dir"/>
@@ -927,7 +930,7 @@
<includepath path="/usr/include/libxml2" if="is-unix"/>
<includepath path="${apr.include.dir}"/>
<defineset define="LOG4CXX"/>
- <!-- libset libs="xml2" if="is-unix"/ -->
+ <libset libs="xml2" if="is-unix"/>
<libset libs="cw32mt" if="is-bcc"/>
1.14 +16 -14 logging-log4cxx/include/log4cxx/portability.h
Index: portability.h
===================================================================
RCS file: /home/cvs/logging-log4cxx/include/log4cxx/portability.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- portability.h 12 Mar 2005 21:00:37 -0000 1.13
+++ portability.h 13 Mar 2005 06:52:45 -0000 1.14
@@ -56,24 +56,26 @@
typedef int log4cxx_status_t;
#if defined(_MSC_VER)
-#define HAVE_XML 1
-#define LOG4CXX_HAVE_XML 1
+#define HAVE_XML 1
+#define LOG4CXX_HAVE_XML 1
#endif
-
-#if !defined(__BORLANDC__)
+
+#if !defined(__BORLANDC__)
#define LOG4CXX_RETURN_AFTER_THROW
#endif
-#if !defined(_WIN32)
+#if !defined(_WIN32)
+#define HAVE_XML 1
+#define LOG4CXX_HAVE_XML 1
#define LOG4CXX_HAVE_SYSLOG 1
-#endif
-
-#if !defined(LOG4CXX_HAS_STD_WCOUT)
-#define LOG4CXX_HAS_STD_WCOUT 1
-#endif
-
-#if !defined(LOG4CXX_HAS_STD_WLOCALE)
-#define LOG4CXX_HAS_STD_WLOCALE 1
-#endif
+#endif
+
+#if !defined(LOG4CXX_HAS_STD_WCOUT)
+#define LOG4CXX_HAS_STD_WCOUT 1
+#endif
+
+#if !defined(LOG4CXX_HAS_STD_WLOCALE)
+#define LOG4CXX_HAS_STD_WLOCALE 1
+#endif
#endif //_LOG4CXX_PORTABILITY_H
