Author: carnold
Date: Thu Aug 9 15:10:58 2007
New Revision: 564403
URL: http://svn.apache.org/viewvc?view=rev&rev=564403
Log:
LOGCXX-188: Modify apr build file for apr 1.2.9
Modified:
logging/log4cxx/trunk/src/apr/ant/build.xml
Modified: logging/log4cxx/trunk/src/apr/ant/build.xml
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/apr/ant/build.xml?view=diff&rev=564403&r1=564402&r2=564403
==============================================================================
--- logging/log4cxx/trunk/src/apr/ant/build.xml (original)
+++ logging/log4cxx/trunk/src/apr/ant/build.xml Thu Aug 9 15:10:58 2007
@@ -34,7 +34,7 @@
<property name="src.dir" location="${apr.dir}"/>
<property name="test.dir" location="${apr.dir}/test"/>
<property name="apr.lib.type" value="shared"/>
-<property name="project.dir" value="${build.dir}"/>
+<property name="project.dir" location="${build.dir}"/>
<taskdef resource="cpptasks.tasks"/>
<typedef resource="cpptasks.types"/>
@@ -45,6 +45,12 @@
</target>
<target name="os-detect">
+ <condition property="is-mac" value="true">
+ <and>
+ <os family="mac"/>
+ <not><isset property="is-windows"/></not>
+ </and>
+ </condition>
<condition property="is-unix" value="true">
<and>
<not>
@@ -194,6 +200,7 @@
<define name="WIN32" value="1"/>
</defineset>
<defineset define="_HAVE_CONFIG_H _REENTRANT _GNU_SOURCE" if="is-gcc"/>
+ <defineset define="HAVE_CONFIG_H DARWIN SIGPROCMASK_SETS_THREAD_MASK"
if="is-mac"/>
<compilerarg value="${pic-option}" if="pic-option"/>
<libset libs="advapi32 ws2_32 mswsock rpcrt4" if="is-windows"/>
<libset libs="pthread dl" if="is-unix"/>
@@ -220,6 +227,7 @@
</defineset>
<defineset define="_HAVE_CONFIG_H _REENTRANT _GNU_SOURCE" if="is-gcc"/>
<defineset define="APR_DECLARE_STATIC" unless="is-apr-shared"/>
+ <defineset define="HAVE_CONFIG_H DARWIN SIGPROCMASK_SETS_THREAD_MASK"
if="is-mac"/>
<compilerarg value="${pic-option}" if="pic-option"/>
<libset dir="${apr.lib.dir}" libs="apr-1${lib-suffix}"/>
<libset libs="cw32mt" if="is-bcc"/>
@@ -355,6 +363,7 @@
</defineset>
<defineset define="_HAVE_CONFIG_H _REENTRANT _GNU_SOURCE" if="is-gcc"/>
<defineset define="APR_DECLARE_STATIC" unless="is-apr-shared"/>
+ <defineset define="HAVE_CONFIG_H DARWIN SIGPROCMASK_SETS_THREAD_MASK"
if="is-mac"/>
<compilerarg value="${pic-option}" if="pic-option"/>
<libset dir="${apr.lib.dir}" libs="apr-1${lib-suffix}"/>
<libset libs="cw32mt" if="is-bcc"/>
@@ -381,6 +390,8 @@
<exclude name="testlockperf.c"/>
<exclude name="occhild.c"/>
<exclude name="sockchild.c"/>
+ <exclude name="sockperf.c"/>
+ <exclude name="echod.c"/>
<exclude name="mockchild.c"/>
<exclude name="readchild.c"/>
<exclude name="globalmutexchild.c"/>
@@ -398,6 +409,7 @@
</defineset>
<defineset define="_HAVE_CONFIG_H _REENTRANT _GNU_SOURCE" if="is-gcc"/>
<defineset define="APR_DECLARE_STATIC" unless="is-apr-shared"/>
+ <defineset define="HAVE_CONFIG_H DARWIN SIGPROCMASK_SETS_THREAD_MASK"
if="is-mac"/>
<compilerarg value="${pic-option}" if="pic-option"/>
<libset dir="${apr.lib.dir}" libs="apr-1${lib-suffix}"/>
<libset libs="cw32mt" if="is-bcc"/>
