Author: carnold
Date: Fri Feb 15 01:37:37 2008
New Revision: 627982
URL: http://svn.apache.org/viewvc?rev=627982&view=rev
Log:
LOGCXX-230: available gotcha
Modified:
logging/log4cxx/trunk/src/ant/find-apr-util.xml
logging/log4cxx/trunk/src/ant/find-apr.xml
logging/log4cxx/trunk/src/ant/find-libesmtp.xml
Modified: logging/log4cxx/trunk/src/ant/find-apr-util.xml
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/ant/find-apr-util.xml?rev=627982&r1=627981&r2=627982&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/ant/find-apr-util.xml (original)
+++ logging/log4cxx/trunk/src/ant/find-apr-util.xml Fri Feb 15 01:37:37 2008
@@ -30,57 +30,57 @@
<target name="find-apr-util-lib" depends="find-apr-util-src"
unless="force-ant">
- <available property="apr-util.lib.file"
- value="${apr-util.dir}/lib${apr-util.lib.name}.la"
- file="${apr-util.dir}/lib${apr-util.lib.name}.la"/>
- <available property="apr-util.lib.file"
- value="${apr-util.dir}/lib${apr-util.lib.name}.dylib"
- file="${apr-util.dir}/lib${apr-util.lib.name}.dylib"/>
- <available property="apr-util.lib.file"
- value="${apr-util.dir}/lib${apr-util.lib.name}.so"
- file="${apr-util.dir}/lib${apr-util.lib.name}.so"/>
- <available property="apr-util.lib.file"
- value="${apr-util.dir}/lib${apr-util.lib.name}.a"
- file="${apr-util.dir}/lib${apr-util.lib.name}.a"/>
- <available property="apr-util.lib.file"
- value="${apr-util.dir}/${apr-util.lib.name}.lib"
- file="${apr-util.dir}/${apr-util.lib.name}.lib"/>
+ <condition property="apr-util.lib.file"
+ value="${apr-util.dir}/lib${apr-util.lib.name}.la">
+ <available
file="${apr-util.dir}/lib${apr-util.lib.name}.la"/></condition>
+ <condition property="apr-util.lib.file"
+ value="${apr-util.dir}/lib${apr-util.lib.name}.dylib">
+ <available
file="${apr-util.dir}/lib${apr-util.lib.name}.dylib"/></condition>
+ <condition property="apr-util.lib.file"
+ value="${apr-util.dir}/lib${apr-util.lib.name}.so">
+ <available
file="${apr-util.dir}/lib${apr-util.lib.name}.so"/></condition>
+ <condition property="apr-util.lib.file"
+ value="${apr-util.dir}/lib${apr-util.lib.name}.a">
+ <available
file="${apr-util.dir}/lib${apr-util.lib.name}.a"/></condition>
+ <condition property="apr-util.lib.file"
+ value="${apr-util.dir}/${apr-util.lib.name}.lib">
+ <available
file="${apr-util.dir}/${apr-util.lib.name}.lib"/></condition>
<condition property="apr-util.lib.file.dir" value="${apr-util.dir}">
<isset property="apr-util.lib.file"/>
</condition>
- <available property="apr-util.lib.file"
- value="${apr-util.dir}/.libs/lib${apr-util.lib.name}.la"
- file="${apr-util.dir}/.libs/lib${apr-util.lib.name}.la"/>
- <available property="apr-util.lib.file"
- value="${apr-util.dir}/.libs/lib${apr-util.lib.name}.dylib"
- file="${apr-util.dir}/.libs/lib${apr-util.lib.name}.dylib"/>
- <available property="apr-util.lib.file"
- value="${apr-util.dir}/.libs/lib${apr-util.lib.name}.so"
- file="${apr-util.dir}/.libs/lib${apr-util.lib.name}.so"/>
- <available property="apr-util.lib.file"
- value="${apr-util.dir}/.libs/lib${apr-util.lib.name}.a"
- file="${apr-util.dir}/.libs/lib${apr-util.lib.name}.a"/>
- <available property="apr-util.lib.file"
- value="${apr-util.dir}/.libs/${apr-util.lib.name}.lib"
- file="${apr-util.dir}/.libs/${apr-util.lib.name}.lib"/>
+ <condition property="apr-util.lib.file"
+ value="${apr-util.dir}/.libs/lib${apr-util.lib.name}.la">
+ <available
file="${apr-util.dir}/.libs/lib${apr-util.lib.name}.la"/></condition>
+ <condition property="apr-util.lib.file"
+ value="${apr-util.dir}/.libs/lib${apr-util.lib.name}.dylib">
+ <available
file="${apr-util.dir}/.libs/lib${apr-util.lib.name}.dylib"/></condition>
+ <condition property="apr-util.lib.file"
+ value="${apr-util.dir}/.libs/lib${apr-util.lib.name}.so">
+ <available
file="${apr-util.dir}/.libs/lib${apr-util.lib.name}.so"/></condition>
+ <condition property="apr-util.lib.file"
+ value="${apr-util.dir}/.libs/lib${apr-util.lib.name}.a">
+ <available
file="${apr-util.dir}/.libs/lib${apr-util.lib.name}.a"/></condition>
+ <condition property="apr-util.lib.file"
+ value="${apr-util.dir}/.libs/${apr-util.lib.name}.lib">
+ <available
file="${apr-util.dir}/.libs/${apr-util.lib.name}.lib"/></condition>
<condition property="apr-util.lib.file.dir"
value="${apr-util.dir}/.libs">
<isset property="apr-util.lib.file"/>
</condition>
<!-- start looking at candidates in /usr -->
- <available property="apr-util.lib.file"
- value="/usr/lib/lib${apr-util.lib.name}.la"
- file="/usr/lib/lib${apr-util.lib.name}.la"/>
- <available property="apr-util.lib.file"
- value="/usr/lib/lib${apr-util.lib.name}.dylib"
- file="/usr/lib/lib${apr-util.lib.name}.dylib"/>
- <available property="apr-util.lib.file"
- value="/usr/lib/lib${apr-util.lib.name}.so"
- file="/usr/lib/lib${apr-util.lib.name}.so"/>
- <available property="apr-util.lib.file"
- value="/usr/lib/lib${apr-util.lib.name}.a"
- file="/usr/lib/lib${apr-util.lib.name}.a"/>
+ <condition property="apr-util.lib.file"
+ value="/usr/lib/lib${apr-util.lib.name}.la">
+ <available file="/usr/lib/lib${apr-util.lib.name}.la"/></condition>
+ <condition property="apr-util.lib.file"
+ value="/usr/lib/lib${apr-util.lib.name}.dylib">
+ <available
file="/usr/lib/lib${apr-util.lib.name}.dylib"/></condition>
+ <condition property="apr-util.lib.file"
+ value="/usr/lib/lib${apr-util.lib.name}.so">
+ <available file="/usr/lib/lib${apr-util.lib.name}.so"/></condition>
+ <condition property="apr-util.lib.file"
+ value="/usr/lib/lib${apr-util.lib.name}.a">
+ <available file="/usr/lib/lib${apr-util.lib.name}.a"/></condition>
<condition property="apr-util.dir" value="/usr">
<isset property="apr-util.lib.file"/>
</condition>
@@ -89,18 +89,18 @@
</condition>
<!-- start looking at candidates in /usr/local -->
- <available property="apr-util.lib.file"
- value="/usr/local/lib/lib${apr-util.lib.name}.la"
- file="/usr/local/lib/lib${apr-util.lib.name}.la"/>
- <available property="apr-util.lib.file"
- value="/usr/local/lib/lib${apr-util.lib.name}.dylib"
- file="/usr/local/lib/lib${apr-util.lib.name}.dylib"/>
- <available property="apr-util.lib.file"
- value="/usr/local/lib/lib${apr-util.lib.name}.so"
- file="/usr/local/lib/lib${apr-util.lib.name}.so"/>
- <available property="apr-util.lib.file"
- value="/usr/local/lib/lib${apr-util.lib.name}.a"
- file="/usr/local/lib/lib${apr-util.lib.name}.a"/>
+ <condition property="apr-util.lib.file"
+ value="/usr/local/lib/lib${apr-util.lib.name}.la">
+ <available
file="/usr/local/lib/lib${apr-util.lib.name}.la"/></condition>
+ <condition property="apr-util.lib.file"
+ value="/usr/local/lib/lib${apr-util.lib.name}.dylib">
+ <available
file="/usr/local/lib/lib${apr-util.lib.name}.dylib"/></condition>
+ <condition property="apr-util.lib.file"
+ value="/usr/local/lib/lib${apr-util.lib.name}.so">
+ <available
file="/usr/local/lib/lib${apr-util.lib.name}.so"/></condition>
+ <condition property="apr-util.lib.file"
+ value="/usr/local/lib/lib${apr-util.lib.name}.a">
+ <available
file="/usr/local/lib/lib${apr-util.lib.name}.a"/></condition>
<condition property="apr-util.dir" value="/usr/local">
<isset property="apr-util.lib.file"/>
</condition>
@@ -113,37 +113,37 @@
<condition property="apr-util.dir" value="${relative-apr-util}">
<available file="${relative-apr-util}"/>
</condition>
- <available property="apr-util.lib.file"
- value="${apr-util.dir}/lib${apr-util.lib.name}.la"
- file="${apr-util.dir}/lib${apr-util.lib.name}.la"/>
- <available property="apr-util.lib.file"
- value="${apr-util.dir}/lib${apr-util.lib.name}.dylib"
- file="${apr-util.dir}/lib${apr-util.lib.name}.dylib"/>
- <available property="apr-util.lib.file"
- value="${apr-util.dir}/lib${apr-util.lib.name}.so"
- file="${apr-util.dir}/lib${apr-util.lib.name}.so"/>
- <available property="apr-util.lib.file"
- value="${apr-util.dir}/lib${apr-util.lib.name}.a"
- file="${apr-util.dir}/lib${apr-util.lib.name}.a"/>
- <available property="apr-util.lib.file"
- value="${apr-util.dir}/${apr-util.lib.name}.lib"
- file="${apr-util.dir}/${apr-util.lib.name}.lib"/>
+ <condition property="apr-util.lib.file"
+ value="${apr-util.dir}/lib${apr-util.lib.name}.la">
+ <available
file="${apr-util.dir}/lib${apr-util.lib.name}.la"/></condition>
+ <condition property="apr-util.lib.file"
+ value="${apr-util.dir}/lib${apr-util.lib.name}.dylib">
+ <available
file="${apr-util.dir}/lib${apr-util.lib.name}.dylib"/></condition>
+ <condition property="apr-util.lib.file"
+ value="${apr-util.dir}/lib${apr-util.lib.name}.so">
+ <available
file="${apr-util.dir}/lib${apr-util.lib.name}.so"/></condition>
+ <condition property="apr-util.lib.file"
+ value="${apr-util.dir}/lib${apr-util.lib.name}.a">
+ <available
file="${apr-util.dir}/lib${apr-util.lib.name}.a"/></condition>
+ <condition property="apr-util.lib.file"
+ value="${apr-util.dir}/${apr-util.lib.name}.lib">
+ <available
file="${apr-util.dir}/${apr-util.lib.name}.lib"/></condition>
<condition property="apr-util.lib.file.dir" value="${apr-util.dir}">
<isset property="apr-util.lib.file"/>
</condition>
- <available property="apr-util.lib.file"
- value="${apr-util.dir}/.libs/lib${apr-util.lib.name}.la"
- file="${apr-util.dir}/.libs/lib${apr-util.lib.name}.la"/>
- <available property="apr-util.lib.file"
- value="${apr-util.dir}/.libs/lib${apr-util.lib.name}.dylib"
- file="${apr-util.dir}/.libs/lib${apr-util.lib.name}.dylib"/>
- <available property="apr-util.lib.file"
- value="${apr-util.dir}/.libs/lib${apr-util.lib.name}.so"
- file="${apr-util.dir}/.libs/lib${apr-util.lib.name}.so"/>
- <available property="apr-util.lib.file"
- value="${apr-util.dir}/.libs/lib${apr-util.lib.name}.a"
- file="${apr-util.dir}/.libs/lib${apr-util.lib.name}.a"/>
+ <condition property="apr-util.lib.file"
+ value="${apr-util.dir}/.libs/lib${apr-util.lib.name}.la">
+ <available
file="${apr-util.dir}/.libs/lib${apr-util.lib.name}.la"/></condition>
+ <condition property="apr-util.lib.file"
+ value="${apr-util.dir}/.libs/lib${apr-util.lib.name}.dylib">
+ <available
file="${apr-util.dir}/.libs/lib${apr-util.lib.name}.dylib"/></condition>
+ <condition property="apr-util.lib.file"
+ value="${apr-util.dir}/.libs/lib${apr-util.lib.name}.so">
+ <available
file="${apr-util.dir}/.libs/lib${apr-util.lib.name}.so"/></condition>
+ <condition property="apr-util.lib.file"
+ value="${apr-util.dir}/.libs/lib${apr-util.lib.name}.a">
+ <available
file="${apr-util.dir}/.libs/lib${apr-util.lib.name}.a"/></condition>
<condition property="apr-util.lib.file.dir"
value="${apr-util.dir}/.libs">
<isset property="apr-util.lib.file"/>
</condition>
Modified: logging/log4cxx/trunk/src/ant/find-apr.xml
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/ant/find-apr.xml?rev=627982&r1=627981&r2=627982&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/ant/find-apr.xml (original)
+++ logging/log4cxx/trunk/src/ant/find-apr.xml Fri Feb 15 01:37:37 2008
@@ -30,57 +30,57 @@
<target name="find-apr-lib" depends="find-apr-src" unless="force-ant">
- <available property="apr.lib.file"
- value="${apr.dir}/lib${apr.lib.name}.la"
- file="${apr.dir}/lib${apr.lib.name}.la"/>
- <available property="apr.lib.file"
- value="${apr.dir}/lib${apr.lib.name}.dylib"
- file="${apr.dir}/lib${apr.lib.name}.dylib"/>
- <available property="apr.lib.file"
- value="${apr.dir}/lib${apr.lib.name}.so"
- file="${apr.dir}/lib${apr.lib.name}.so"/>
- <available property="apr.lib.file"
- value="${apr.dir}/lib${apr.lib.name}.a"
- file="${apr.dir}/lib${apr.lib.name}.a"/>
- <available property="apr.lib.file"
- value="${apr.dir}/${apr.lib.name}.lib"
- file="${apr.dir}/${apr.lib.name}.lib"/>
+ <condition property="apr.lib.file"
+ value="${apr.dir}/lib${apr.lib.name}.la">
+ <available file="${apr.dir}/lib${apr.lib.name}.la"/></condition>
+ <condition property="apr.lib.file"
+ value="${apr.dir}/lib${apr.lib.name}.dylib">
+ <available file="${apr.dir}/lib${apr.lib.name}.dylib"/></condition>
+ <condition property="apr.lib.file"
+ value="${apr.dir}/lib${apr.lib.name}.so">
+ <available file="${apr.dir}/lib${apr.lib.name}.so"/></condition>
+ <condition property="apr.lib.file"
+ value="${apr.dir}/lib${apr.lib.name}.a">
+ <available file="${apr.dir}/lib${apr.lib.name}.a"/></condition>
+ <condition property="apr.lib.file"
+ value="${apr.dir}/${apr.lib.name}.lib">
+ <available file="${apr.dir}/${apr.lib.name}.lib"/></condition>
<condition property="apr.lib.file.dir" value="${apr.dir}">
<isset property="apr.lib.file"/>
</condition>
- <available property="apr.lib.file"
- value="${apr.dir}/.libs/lib${apr.lib.name}.la"
- file="${apr.dir}/.libs/lib${apr.lib.name}.la"/>
- <available property="apr.lib.file"
- value="${apr.dir}/.libs/lib${apr.lib.name}.dylib"
- file="${apr.dir}/.libs/lib${apr.lib.name}.dylib"/>
- <available property="apr.lib.file"
- value="${apr.dir}/.libs/lib${apr.lib.name}.so"
- file="${apr.dir}/.libs/lib${apr.lib.name}.so"/>
- <available property="apr.lib.file"
- value="${apr.dir}/.libs/lib${apr.lib.name}.a"
- file="${apr.dir}/.libs/lib${apr.lib.name}.a"/>
- <available property="apr.lib.file"
- value="${apr.dir}/.libs/${apr.lib.name}.lib"
- file="${apr.dir}/.libs/${apr.lib.name}.lib"/>
+ <condition property="apr.lib.file"
+ value="${apr.dir}/.libs/lib${apr.lib.name}.la">
+ <available
file="${apr.dir}/.libs/lib${apr.lib.name}.la"/></condition>
+ <condition property="apr.lib.file"
+ value="${apr.dir}/.libs/lib${apr.lib.name}.dylib">
+ <available
file="${apr.dir}/.libs/lib${apr.lib.name}.dylib"/></condition>
+ <condition property="apr.lib.file"
+ value="${apr.dir}/.libs/lib${apr.lib.name}.so">
+ <available
file="${apr.dir}/.libs/lib${apr.lib.name}.so"/></condition>
+ <condition property="apr.lib.file"
+ value="${apr.dir}/.libs/lib${apr.lib.name}.a">
+ <available
file="${apr.dir}/.libs/lib${apr.lib.name}.a"/></condition>
+ <condition property="apr.lib.file"
+ value="${apr.dir}/.libs/${apr.lib.name}.lib">
+ <available
file="${apr.dir}/.libs/${apr.lib.name}.lib"/></condition>
<condition property="apr.lib.file.dir" value="${apr.dir}/.libs">
<isset property="apr.lib.file"/>
</condition>
<!-- start looking at candidates in /usr -->
- <available property="apr.lib.file"
- value="/usr/lib/lib${apr.lib.name}.la"
- file="/usr/lib/lib${apr.lib.name}.la"/>
- <available property="apr.lib.file"
- value="/usr/lib/lib${apr.lib.name}.dylib"
- file="/usr/lib/lib${apr.lib.name}.dylib"/>
- <available property="apr.lib.file"
- value="/usr/lib/lib${apr.lib.name}.so"
- file="/usr/lib/lib${apr.lib.name}.so"/>
- <available property="apr.lib.file"
- value="/usr/lib/lib${apr.lib.name}.a"
- file="/usr/lib/lib${apr.lib.name}.a"/>
+ <condition property="apr.lib.file"
+ value="/usr/lib/lib${apr.lib.name}.la">
+ <available file="/usr/lib/lib${apr.lib.name}.la"/></condition>
+ <condition property="apr.lib.file"
+ value="/usr/lib/lib${apr.lib.name}.dylib">
+ <available file="/usr/lib/lib${apr.lib.name}.dylib"/></condition>
+ <condition property="apr.lib.file"
+ value="/usr/lib/lib${apr.lib.name}.so">
+ <available file="/usr/lib/lib${apr.lib.name}.so"/></condition>
+ <condition property="apr.lib.file"
+ value="/usr/lib/lib${apr.lib.name}.a">
+ <available file="/usr/lib/lib${apr.lib.name}.a"/></condition>
<condition property="apr.dir" value="/usr">
<isset property="apr.lib.file"/>
</condition>
@@ -89,18 +89,18 @@
</condition>
<!-- start looking at candidates in /usr/local -->
- <available property="apr.lib.file"
- value="/usr/local/lib/lib${apr.lib.name}.la"
- file="/usr/local/lib/lib${apr.lib.name}.la"/>
- <available property="apr.lib.file"
- value="/usr/local/lib/lib${apr.lib.name}.dylib"
- file="/usr/local/lib/lib${apr.lib.name}.dylib"/>
- <available property="apr.lib.file"
- value="/usr/local/lib/lib${apr.lib.name}.so"
- file="/usr/local/lib/lib${apr.lib.name}.so"/>
- <available property="apr.lib.file"
- value="/usr/local/lib/lib${apr.lib.name}.a"
- file="/usr/local/lib/lib${apr.lib.name}.a"/>
+ <condition property="apr.lib.file"
+ value="/usr/local/lib/lib${apr.lib.name}.la">
+ <available
file="/usr/local/lib/lib${apr.lib.name}.la"/></condition>
+ <condition property="apr.lib.file"
+ value="/usr/local/lib/lib${apr.lib.name}.dylib">
+ <available
file="/usr/local/lib/lib${apr.lib.name}.dylib"/></condition>
+ <condition property="apr.lib.file"
+ value="/usr/local/lib/lib${apr.lib.name}.so">
+ <available
file="/usr/local/lib/lib${apr.lib.name}.so"/></condition>
+ <condition property="apr.lib.file"
+ value="/usr/local/lib/lib${apr.lib.name}.a">
+ <available file="/usr/local/lib/lib${apr.lib.name}.a"/></condition>
<condition property="apr.dir" value="/usr/local">
<isset property="apr.lib.file"/>
</condition>
@@ -113,37 +113,37 @@
<condition property="apr.dir" value="${relative-apr}">
<available file="${relative-apr}"/>
</condition>
- <available property="apr.lib.file"
- value="${apr.dir}/lib${apr.lib.name}.la"
- file="${apr.dir}/lib${apr.lib.name}.la"/>
- <available property="apr.lib.file"
- value="${apr.dir}/lib${apr.lib.name}.dylib"
- file="${apr.dir}/lib${apr.lib.name}.dylib"/>
- <available property="apr.lib.file"
- value="${apr.dir}/lib${apr.lib.name}.so"
- file="${apr.dir}/lib${apr.lib.name}.so"/>
- <available property="apr.lib.file"
- value="${apr.dir}/lib${apr.lib.name}.a"
- file="${apr.dir}/lib${apr.lib.name}.a"/>
- <available property="apr.lib.file"
- value="${apr.dir}/${apr.lib.name}.lib"
- file="${apr.dir}/${apr.lib.name}.lib"/>
+ <condition property="apr.lib.file"
+ value="${apr.dir}/lib${apr.lib.name}.la">
+ <available file="${apr.dir}/lib${apr.lib.name}.la"/></condition>
+ <condition property="apr.lib.file"
+ value="${apr.dir}/lib${apr.lib.name}.dylib">
+ <available file="${apr.dir}/lib${apr.lib.name}.dylib"/></condition>
+ <condition property="apr.lib.file"
+ value="${apr.dir}/lib${apr.lib.name}.so">
+ <available file="${apr.dir}/lib${apr.lib.name}.so"/></condition>
+ <condition property="apr.lib.file"
+ value="${apr.dir}/lib${apr.lib.name}.a">
+ <available file="${apr.dir}/lib${apr.lib.name}.a"/></condition>
+ <condition property="apr.lib.file"
+ value="${apr.dir}/${apr.lib.name}.lib">
+ <available file="${apr.dir}/${apr.lib.name}.lib"/></condition>
<condition property="apr.lib.file.dir" value="${apr.dir}">
<isset property="apr.lib.file"/>
</condition>
- <available property="apr.lib.file"
- value="${apr.dir}/.libs/lib${apr.lib.name}.la"
- file="${apr.dir}/.libs/lib${apr.lib.name}.la"/>
- <available property="apr.lib.file"
- value="${apr.dir}/.libs/lib${apr.lib.name}.dylib"
- file="${apr.dir}/.libs/lib${apr.lib.name}.dylib"/>
- <available property="apr.lib.file"
- value="${apr.dir}/.libs/lib${apr.lib.name}.so"
- file="${apr.dir}/.libs/lib${apr.lib.name}.so"/>
- <available property="apr.lib.file"
- value="${apr.dir}/.libs/lib${apr.lib.name}.a"
- file="${apr.dir}/.libs/lib${apr.lib.name}.a"/>
+ <condition property="apr.lib.file"
+ value="${apr.dir}/.libs/lib${apr.lib.name}.la">
+ <available
file="${apr.dir}/.libs/lib${apr.lib.name}.la"/></condition>
+ <condition property="apr.lib.file"
+ value="${apr.dir}/.libs/lib${apr.lib.name}.dylib">
+ <available
file="${apr.dir}/.libs/lib${apr.lib.name}.dylib"/></condition>
+ <condition property="apr.lib.file"
+ value="${apr.dir}/.libs/lib${apr.lib.name}.so">
+ <available
file="${apr.dir}/.libs/lib${apr.lib.name}.so"/></condition>
+ <condition property="apr.lib.file"
+ value="${apr.dir}/.libs/lib${apr.lib.name}.a">
+ <available
file="${apr.dir}/.libs/lib${apr.lib.name}.a"/></condition>
<condition property="apr.lib.file.dir" value="${apr.dir}/.libs">
<isset property="apr.lib.file"/>
</condition>
Modified: logging/log4cxx/trunk/src/ant/find-libesmtp.xml
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/ant/find-libesmtp.xml?rev=627982&r1=627981&r2=627982&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/ant/find-libesmtp.xml (original)
+++ logging/log4cxx/trunk/src/ant/find-libesmtp.xml Fri Feb 15 01:37:37 2008
@@ -30,57 +30,57 @@
<target name="find-esmtp-lib" depends="find-esmtp-src" if="has-libesmtp"
unless="force-ant">
- <available property="esmtp.lib.file"
- value="${esmtp.dir}/lib${esmtp.lib.name}.la"
- file="${esmtp.dir}/lib${esmtp.lib.name}.la"/>
- <available property="esmtp.lib.file"
- value="${esmtp.dir}/lib${esmtp.lib.name}.dylib"
- file="${esmtp.dir}/lib${esmtp.lib.name}.dylib"/>
- <available property="esmtp.lib.file"
- value="${esmtp.dir}/lib${esmtp.lib.name}.so"
- file="${esmtp.dir}/lib${esmtp.lib.name}.so"/>
- <available property="esmtp.lib.file"
- value="${esmtp.dir}/lib${esmtp.lib.name}.a"
- file="${esmtp.dir}/lib${esmtp.lib.name}.a"/>
- <available property="esmtp.lib.file"
- value="${esmtp.dir}/${esmtp.lib.name}.lib"
- file="${esmtp.dir}/${esmtp.lib.name}.lib"/>
+ <condition property="esmtp.lib.file"
+ value="${esmtp.dir}/lib${esmtp.lib.name}.la">
+ <available
file="${esmtp.dir}/lib${esmtp.lib.name}.la"/></condition>
+ <condition property="esmtp.lib.file"
+ value="${esmtp.dir}/lib${esmtp.lib.name}.dylib">
+ <available
file="${esmtp.dir}/lib${esmtp.lib.name}.dylib"/></condition>
+ <condition property="esmtp.lib.file"
+ value="${esmtp.dir}/lib${esmtp.lib.name}.so">
+ <available
file="${esmtp.dir}/lib${esmtp.lib.name}.so"/></condition>
+ <condition property="esmtp.lib.file"
+ value="${esmtp.dir}/lib${esmtp.lib.name}.a">
+ <available file="${esmtp.dir}/lib${esmtp.lib.name}.a"/></condition>
+ <condition property="esmtp.lib.file"
+ value="${esmtp.dir}/${esmtp.lib.name}.lib">
+ <available file="${esmtp.dir}/${esmtp.lib.name}.lib"/></condition>
<condition property="esmtp.lib.file.dir" value="${esmtp.dir}">
<isset property="esmtp.lib.file"/>
</condition>
- <available property="esmtp.lib.file"
- value="${esmtp.dir}/.libs/lib${esmtp.lib.name}.la"
- file="${esmtp.dir}/.libs/lib${esmtp.lib.name}.la"/>
- <available property="esmtp.lib.file"
- value="${esmtp.dir}/.libs/lib${esmtp.lib.name}.dylib"
- file="${esmtp.dir}/.libs/lib${esmtp.lib.name}.dylib"/>
- <available property="esmtp.lib.file"
- value="${esmtp.dir}/.libs/lib${esmtp.lib.name}.so"
- file="${esmtp.dir}/.libs/lib${esmtp.lib.name}.so"/>
- <available property="esmtp.lib.file"
- value="${esmtp.dir}/.libs/lib${esmtp.lib.name}.a"
- file="${esmtp.dir}/.libs/lib${esmtp.lib.name}.a"/>
- <available property="esmtp.lib.file"
- value="${esmtp.dir}/.libs/${esmtp.lib.name}.lib"
- file="${esmtp.dir}/.libs/${esmtp.lib.name}.lib"/>
+ <condition property="esmtp.lib.file"
+ value="${esmtp.dir}/.libs/lib${esmtp.lib.name}.la">
+ <available
file="${esmtp.dir}/.libs/lib${esmtp.lib.name}.la"/></condition>
+ <condition property="esmtp.lib.file"
+ value="${esmtp.dir}/.libs/lib${esmtp.lib.name}.dylib">
+ <available
file="${esmtp.dir}/.libs/lib${esmtp.lib.name}.dylib"/></condition>
+ <condition property="esmtp.lib.file"
+ value="${esmtp.dir}/.libs/lib${esmtp.lib.name}.so">
+ <available
file="${esmtp.dir}/.libs/lib${esmtp.lib.name}.so"/></condition>
+ <condition property="esmtp.lib.file"
+ value="${esmtp.dir}/.libs/lib${esmtp.lib.name}.a">
+ <available
file="${esmtp.dir}/.libs/lib${esmtp.lib.name}.a"/></condition>
+ <condition property="esmtp.lib.file"
+ value="${esmtp.dir}/.libs/${esmtp.lib.name}.lib">
+ <available
file="${esmtp.dir}/.libs/${esmtp.lib.name}.lib"/></condition>
<condition property="esmtp.lib.file.dir" value="${esmtp.dir}/.libs">
<isset property="esmtp.lib.file"/>
</condition>
<!-- start looking at candidates in /usr -->
- <available property="esmtp.lib.file"
- value="/usr/lib/lib${esmtp.lib.name}.la"
- file="/usr/lib/lib${esmtp.lib.name}.la"/>
- <available property="esmtp.lib.file"
- value="/usr/lib/lib${esmtp.lib.name}.dylib"
- file="/usr/lib/lib${esmtp.lib.name}.dylib"/>
- <available property="esmtp.lib.file"
- value="/usr/lib/lib${esmtp.lib.name}.so"
- file="/usr/lib/lib${esmtp.lib.name}.so"/>
- <available property="esmtp.lib.file"
- value="/usr/lib/lib${esmtp.lib.name}.a"
- file="/usr/lib/lib${esmtp.lib.name}.a"/>
+ <condition property="esmtp.lib.file"
+ value="/usr/lib/lib${esmtp.lib.name}.la">
+ <available file="/usr/lib/lib${esmtp.lib.name}.la"/></condition>
+ <condition property="esmtp.lib.file"
+ value="/usr/lib/lib${esmtp.lib.name}.dylib">
+ <available file="/usr/lib/lib${esmtp.lib.name}.dylib"/></condition>
+ <condition property="esmtp.lib.file"
+ value="/usr/lib/lib${esmtp.lib.name}.so">
+ <available file="/usr/lib/lib${esmtp.lib.name}.so"/></condition>
+ <condition property="esmtp.lib.file"
+ value="/usr/lib/lib${esmtp.lib.name}.a">
+ <available file="/usr/lib/lib${esmtp.lib.name}.a"/></condition>
<condition property="esmtp.dir" value="/usr">
<isset property="esmtp.lib.file"/>
</condition>
@@ -89,18 +89,18 @@
</condition>
<!-- start looking at candidates in /usr/local -->
- <available property="esmtp.lib.file"
- value="/usr/local/lib/lib${esmtp.lib.name}.la"
- file="/usr/local/lib/lib${esmtp.lib.name}.la"/>
- <available property="esmtp.lib.file"
- value="/usr/local/lib/lib${esmtp.lib.name}.dylib"
- file="/usr/local/lib/lib${esmtp.lib.name}.dylib"/>
- <available property="esmtp.lib.file"
- value="/usr/local/lib/lib${esmtp.lib.name}.so"
- file="/usr/local/lib/lib${esmtp.lib.name}.so"/>
- <available property="esmtp.lib.file"
- value="/usr/local/lib/lib${esmtp.lib.name}.a"
- file="/usr/local/lib/lib${esmtp.lib.name}.a"/>
+ <condition property="esmtp.lib.file"
+ value="/usr/local/lib/lib${esmtp.lib.name}.la">
+ <available
file="/usr/local/lib/lib${esmtp.lib.name}.la"/></condition>
+ <condition property="esmtp.lib.file"
+ value="/usr/local/lib/lib${esmtp.lib.name}.dylib">
+ <available
file="/usr/local/lib/lib${esmtp.lib.name}.dylib"/></condition>
+ <condition property="esmtp.lib.file"
+ value="/usr/local/lib/lib${esmtp.lib.name}.so">
+ <available
file="/usr/local/lib/lib${esmtp.lib.name}.so"/></condition>
+ <condition property="esmtp.lib.file"
+ value="/usr/local/lib/lib${esmtp.lib.name}.a">
+ <available
file="/usr/local/lib/lib${esmtp.lib.name}.a"/></condition>
<condition property="esmtp.dir" value="/usr/local">
<isset property="esmtp.lib.file"/>
</condition>
@@ -113,37 +113,37 @@
<condition property="esmtp.dir" value="${relative-esmtp}">
<available file="${relative-esmtp}"/>
</condition>
- <available property="esmtp.lib.file"
- value="${esmtp.dir}/lib${esmtp.lib.name}.la"
- file="${esmtp.dir}/lib${esmtp.lib.name}.la"/>
- <available property="esmtp.lib.file"
- value="${esmtp.dir}/lib${esmtp.lib.name}.dylib"
- file="${esmtp.dir}/lib${esmtp.lib.name}.dylib"/>
- <available property="esmtp.lib.file"
- value="${esmtp.dir}/lib${esmtp.lib.name}.so"
- file="${esmtp.dir}/lib${esmtp.lib.name}.so"/>
- <available property="esmtp.lib.file"
- value="${esmtp.dir}/lib${esmtp.lib.name}.a"
- file="${esmtp.dir}/lib${esmtp.lib.name}.a"/>
- <available property="esmtp.lib.file"
- value="${esmtp.dir}/${esmtp.lib.name}.lib"
- file="${esmtp.dir}/${esmtp.lib.name}.lib"/>
+ <condition property="esmtp.lib.file"
+ value="${esmtp.dir}/lib${esmtp.lib.name}.la">
+ <available
file="${esmtp.dir}/lib${esmtp.lib.name}.la"/></condition>
+ <condition property="esmtp.lib.file"
+ value="${esmtp.dir}/lib${esmtp.lib.name}.dylib">
+ <available
file="${esmtp.dir}/lib${esmtp.lib.name}.dylib"/></condition>
+ <condition property="esmtp.lib.file"
+ value="${esmtp.dir}/lib${esmtp.lib.name}.so">
+ <available
file="${esmtp.dir}/lib${esmtp.lib.name}.so"/></condition>
+ <condition property="esmtp.lib.file"
+ value="${esmtp.dir}/lib${esmtp.lib.name}.a">
+ <available file="${esmtp.dir}/lib${esmtp.lib.name}.a"/></condition>
+ <condition property="esmtp.lib.file"
+ value="${esmtp.dir}/${esmtp.lib.name}.lib">
+ <available file="${esmtp.dir}/${esmtp.lib.name}.lib"/></condition>
<condition property="esmtp.lib.file.dir" value="${esmtp.dir}">
<isset property="esmtp.lib.file"/>
</condition>
- <available property="esmtp.lib.file"
- value="${esmtp.dir}/.libs/lib${esmtp.lib.name}.la"
- file="${esmtp.dir}/.libs/lib${esmtp.lib.name}.la"/>
- <available property="esmtp.lib.file"
- value="${esmtp.dir}/.libs/lib${esmtp.lib.name}.dylib"
- file="${esmtp.dir}/.libs/lib${esmtp.lib.name}.dylib"/>
- <available property="esmtp.lib.file"
- value="${esmtp.dir}/.libs/lib${esmtp.lib.name}.so"
- file="${esmtp.dir}/.libs/lib${esmtp.lib.name}.so"/>
- <available property="esmtp.lib.file"
- value="${esmtp.dir}/.libs/lib${esmtp.lib.name}.a"
- file="${esmtp.dir}/.libs/lib${esmtp.lib.name}.a"/>
+ <condition property="esmtp.lib.file"
+ value="${esmtp.dir}/.libs/lib${esmtp.lib.name}.la">
+ <available
file="${esmtp.dir}/.libs/lib${esmtp.lib.name}.la"/></condition>
+ <condition property="esmtp.lib.file"
+ value="${esmtp.dir}/.libs/lib${esmtp.lib.name}.dylib">
+ <available
file="${esmtp.dir}/.libs/lib${esmtp.lib.name}.dylib"/></condition>
+ <condition property="esmtp.lib.file"
+ value="${esmtp.dir}/.libs/lib${esmtp.lib.name}.so">
+ <available
file="${esmtp.dir}/.libs/lib${esmtp.lib.name}.so"/></condition>
+ <condition property="esmtp.lib.file"
+ value="${esmtp.dir}/.libs/lib${esmtp.lib.name}.a">
+ <available
file="${esmtp.dir}/.libs/lib${esmtp.lib.name}.a"/></condition>
<condition property="esmtp.lib.file.dir" value="${esmtp.dir}/.libs">
<isset property="esmtp.lib.file"/>
</condition>
