You are viewing a plain text version of this content. The canonical link for it is here.
Posted to log4cxx-dev@logging.apache.org by ca...@apache.org on 2008/01/30 06:49:12 UTC
svn commit: r616638 - in /logging/log4cxx/trunk: build.xml src/ant/common.xml
Author: carnold
Date: Tue Jan 29 21:49:11 2008
New Revision: 616638
URL: http://svn.apache.org/viewvc?rev=616638&view=rev
Log:
LOGCXX-230: Find built in apr and apr-util on Mac OS/X
Modified:
logging/log4cxx/trunk/build.xml
logging/log4cxx/trunk/src/ant/common.xml
Modified: logging/log4cxx/trunk/build.xml
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/build.xml?rev=616638&r1=616637&r2=616638&view=diff
==============================================================================
--- logging/log4cxx/trunk/build.xml (original)
+++ logging/log4cxx/trunk/build.xml Tue Jan 29 21:49:11 2008
@@ -350,7 +350,7 @@
</target>
-<target name="build-apr-util" depends="build-apr, find-apr-util" unless="apr-util.lib.dir">
+<target name="build-apr-util" depends="build-apr, find-apr-util" unless="apr-util-available">
<fail unless="apr-util.src.dir">Could not locate apr-util library or source.</fail>
<ant antfile="src/ant/apr-util-build.xml" target="build" inheritAll="false">
Modified: logging/log4cxx/trunk/src/ant/common.xml
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/ant/common.xml?rev=616638&r1=616637&r2=616638&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/ant/common.xml (original)
+++ logging/log4cxx/trunk/src/ant/common.xml Tue Jan 29 21:49:11 2008
@@ -187,6 +187,8 @@
<or>
<available file="/usr/lib/lib${apr.lib.name}.a"/>
<available file="/usr/lib/lib${apr.lib.name}.la"/>
+ <available file="/usr/lib/lib${apr.lib.name}.la"/>
+ <available file="/usr/lib/lib${apr.lib.name}.dylib"/>
</or>
</condition>
<condition property="apr.dir" value="/usr/local/apr">
@@ -215,6 +217,7 @@
<or>
<available file="${apr.dir}/lib/lib${apr.lib.name}.a"/>
<available file="${apr.dir}/lib/lib${apr.lib.name}.la"/>
+ <available file="${apr.dir}/lib/lib${apr.lib.name}.dylib"/>
<available file="${apr.dir}/lib/${apr.lib.name}.lib"/>
<available file="${apr.dir}/lib/${apr.lib.name}d.lib"/>
</or>
@@ -226,6 +229,7 @@
<or>
<available file="${apr.dir}/.libs/lib${apr.lib.name}.a"/>
<available file="${apr.dir}/.libs/lib${apr.lib.name}.la"/>
+ <available file="${apr.dir}/.libs/lib${apr.lib.name}.dylib"/>
<available file="${apr.dir}/.libs/${apr.lib.name}.lib"/>
<available file="${apr.dir}/.libs/${apr.lib.name}d.lib"/>
</or>
@@ -235,6 +239,7 @@
<or>
<available file="${apr.dir}/target/${debug.release}/static/lib${apr.lib.name}${lib-suffix}.a"/>
<available file="${apr.dir}/target/${debug.release}/static/lib${apr.lib.name}${lib-suffix}.la"/>
+ <available file="${apr.dir}/target/${debug.release}/static/lib${apr.lib.name}${lib-suffix}.dylib"/>
<available file="${apr.dir}/target/${debug.release}/static/${apr.lib.name}${lib-suffix}.lib"/>
</or>
</condition>
@@ -242,6 +247,7 @@
<or>
<available file="${apr.dir}/target/${debug.release}/shared/lib${apr.lib.name}${lib-suffix}.a"/>
<available file="${apr.dir}/target/${debug.release}/shared/lib${apr.lib.name}${lib-suffix}.la"/>
+ <available file="${apr.dir}/target/${debug.release}/shared/lib${apr.lib.name}${lib-suffix}.dylib"/>
<available file="${apr.dir}/target/${debug.release}/shared/${apr.lib.name}${lib-suffix}.lib"/>
</or>
</condition>
@@ -274,6 +280,7 @@
<or>
<available file="/usr/lib/lib${apr-util.lib.name}.a"/>
<available file="/usr/lib/lib${apr-util.lib.name}.la"/>
+ <available file="/usr/lib/lib${apr-util.lib.name}.dylib"/>
</or>
</condition>
<condition property="apr-util.dir" value="/usr/local/apr">
@@ -302,6 +309,7 @@
<or>
<available file="${apr-util.dir}/lib/lib${apr-util.lib.name}.a"/>
<available file="${apr-util.dir}/lib/lib${apr-util.lib.name}.la"/>
+ <available file="${apr-util.dir}/lib/lib${apr-util.lib.name}.dylib"/>
<available file="${apr-util.dir}/lib/${apr-util.lib.name}.lib"/>
<available file="${apr-util.dir}/lib/${apr-util.lib.name}d.lib"/>
</or>
@@ -313,6 +321,7 @@
<or>
<available file="${apr-util.dir}/.libs/lib${apr-util.lib.name}.a"/>
<available file="${apr-util.dir}/.libs/lib${apr-util.lib.name}.la"/>
+ <available file="${apr-util.dir}/.libs/lib${apr-util.lib.name}.dylib"/>
<available file="${apr-util.dir}/.libs/${apr-util.lib.name}.lib"/>
<available file="${apr-util.dir}/.libs/${apr-util.lib.name}d.lib"/>
</or>
@@ -322,6 +331,7 @@
<or>
<available file="${apr-util.dir}/target/${debug.release}/static/lib${apr-util.lib.name}${lib-suffix}.a"/>
<available file="${apr-util.dir}/target/${debug.release}/static/lib${apr-util.lib.name}${lib-suffix}.la"/>
+ <available file="${apr-util.dir}/target/${debug.release}/static/lib${apr-util.lib.name}${lib-suffix}.dylib"/>
<available file="${apr-util.dir}/target/${debug.release}/static/${apr-util.lib.name}${lib-suffix}.lib"/>
</or>
</condition>
@@ -329,6 +339,7 @@
<or>
<available file="${apr-util.dir}/target/${debug.release}/shared/lib${apr-util.lib.name}${lib-suffix}.a"/>
<available file="${apr-util.dir}/target/${debug.release}/shared/lib${apr-util.lib.name}${lib-suffix}.la"/>
+ <available file="${apr-util.dir}/target/${debug.release}/shared/lib${apr-util.lib.name}${lib-suffix}.dylib"/>
<available file="${apr-util.dir}/target/${debug.release}/shared/${apr-util.lib.name}${lib-suffix}.lib"/>
</or>
</condition>