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/31 00:33:04 UTC

svn commit: r616956 - in /logging/log4cxx/trunk: build.xml src/ant/apr-build.xml src/ant/apr-util-build.xml src/ant/common.xml src/ant/find-apr-util.xml src/ant/find-apr.xml src/ant/find-libesmtp.xml

Author: carnold
Date: Wed Jan 30 15:32:55 2008
New Revision: 616956

URL: http://svn.apache.org/viewvc?rev=616956&view=rev
Log:
LOGCXX-230: Improve find-apr logic, finds APR VC build libs

Added:
    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/build.xml
    logging/log4cxx/trunk/src/ant/apr-build.xml
    logging/log4cxx/trunk/src/ant/apr-util-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=616956&r1=616955&r2=616956&view=diff
==============================================================================
--- logging/log4cxx/trunk/build.xml (original)
+++ logging/log4cxx/trunk/build.xml Wed Jan 30 15:32:55 2008
@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE project [
 <!ENTITY libsets '
-        <libset libs="${apr-util.lib.name}${lib-suffix}" dir="${apr-util.lib.dir}" if="apr-util.lib.dir"/>
-        <libset libs="${apr-util.lib.name}${lib-suffix}" unless="apr-util.lib.dir"/>
-        <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"/>
+        <libset libs="${apr-util.lib.prefix}${apr-util.lib.name}${apr-util.lib.suffix}" dir="${apr-util.lib.dir}" if="apr-util.lib.dir"/>
+        <libset libs="${apr-util.lib.prefix}${apr-util.lib.name}${apr-util.lib.suffix}" unless="apr-util.lib.dir"/>
+        <libset libs="${apr.lib.prefix}${apr.lib.name}${apr.lib.suffix}" dir="${apr.lib.dir}" if="apr.lib.dir"/>
+        <libset libs="${apr.lib.prefix}${apr.lib.name}${spr.lib.suffix}" unless="apr.lib.dir"/>
         <libset libs="esmtp" if="has-libesmtp"/>
         <libset libs="iodbc" if="has-iODBC"/>
         <libset libs="unixodbc" if="has-unixODBC"/>
@@ -12,11 +12,14 @@
         <libset libs="iconv" if="has-iconv"/>
         <libset libs="pthread" if="is-unix"/>
         <libset libs="expat" if="has-expat"/>
-        <syslibset libs="advapi32 ws2_32 mswsock" if="is-windows"/>
+        <syslibset libs="advapi32 ws2_32 mswsock shell32" if="is-windows"/>
         <syslibset libs="stdc++" if="is-gcc"/>
         <syslibset libs="cw32mt" if="is-bcc"/>
 '>
 <!ENTITY common SYSTEM 'src/ant/common.xml'>
+<!ENTITY find-apr SYSTEM 'src/ant/find-apr.xml'>
+<!ENTITY find-apr-util SYSTEM 'src/ant/find-apr-util.xml'>
+<!ENTITY find-libesmtp SYSTEM 'src/ant/find-libesmtp.xml'>
 ]>
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
@@ -45,6 +48,9 @@
 <project name="log4cxx" default="check">
 
 &common;
+&find-apr;
+&find-apr-util;
+&find-libesmtp;
 
 <property name="base.dir" location="."/>
 <property name="src.dir" location="${base.dir}/src/main/cpp"/>
@@ -69,6 +75,8 @@
 <property name="doxygen.exe" value="doxygen"/>
 <property name="enable_dot" value="YES"/>
 
+<property name="lib.name" value="log4cxx"/>
+<property name="lib.prefix" value=""/>
 <property name="version" value="0.10.0"/>
 <property name="enable-char" value="1"/>
 <property name="enable-wchar_t" value="1"/>
@@ -170,6 +178,11 @@
             </or>
         </condition>
         <property name="has-ODBC" value="0"/>
+
+		<condition property="lib.suffix" value="d">
+			<istrue value="${debug}"/>
+		</condition>
+		<property name="lib.suffix" value=""/>
 </target>
 
 <target name="clean" depends="init" description="Removes built files">
@@ -324,14 +337,18 @@
 </target>
 
 
-<target name="build-apr" depends="find-apr" unless="apr-available">
+<target name="build-apr" depends="find-apr" unless="apr.lib.file">
     <fail unless="apr.src.dir">Could not locate apr library or source.</fail>
     <property name="apr.lib.type" value="static"/>
+	<property name="apr.lib.prefix" value=""/>
+	<property name="apr.lib.suffix" value=""/>
+	<property name="project.type" value="msvc6"/>
     <ant antfile="src/ant/apr-build.xml" target="build" inheritAll="false">
         <property name="basedir" value="${apr.src.dir}"/>
         <property name="target.dir" value="${target.dir}"/>
         <property name="debug" value="${debug}"/>
-        <property name="lib-suffix" value="${lib-suffix}"/>
+        <property name="lib.prefix" value="${apr.lib.prefix}"/>
+        <property name="lib.suffix" value="${apr.lib.suffix}"/>
         <property name="compiler" value="${compiler}"/>
         <property name="lib.type" value="${apr.lib.type}"/>
         <property name="project.type" value="${project.type}"/>
@@ -348,15 +365,19 @@
 </target>
 
 
-<target name="build-apr-util" depends="build-apr, find-apr-util" unless="apr-util-available">
+<target name="build-apr-util" depends="build-apr, find-apr-util" unless="apr-util.lib.file">
     <fail unless="apr-util.src.dir">Could not locate apr-util library or source.</fail>
-    <property name="apr-util.lib.type" value="static"/>
+    <property name="apr-util.lib.type" value="${apr.lib.type}"/>
+	<property name="apr-util.lib.prefix" value=""/>
+	<property name="apr-util.lib.suffix" value=""/>
+	<property name="project.type" value="msvc6"/>
 
     <ant antfile="src/ant/apr-util-build.xml" target="build" inheritAll="false">
         <property name="target.dir" value="${target.dir}"/>
         <property name="basedir" value="${apr-util.src.dir}"/>
         <property name="debug" value="${debug}"/>
-        <property name="lib-suffix" value="${lib-suffix}"/>
+        <property name="lib.prefix" value="${apr-util.lib.prefix}"/>
+        <property name="lib.suffix" value="${apr-util.lib.suffix}"/>
         <property name="compiler" value="${compiler}"/>
         <property name="apr.include.dir" value="${apr.include.dir}"/>
         <property name="apr.lib.dir" value="${apr.lib.dir}"/>
@@ -376,15 +397,19 @@
     <property name="apr-util.project.file" location="${projects.dir}/apr-util"/>
 </target>
 
-<target name="build-libesmtp" depends="find-libesmtp" if="has-libesmtp" unless="libesmtp.lib.dir">
+<target name="build-libesmtp" depends="find-esmtp" if="has-libesmtp" unless="esmtp.lib.file">
     <fail unless="libesmtp.src.dir">Could not locate libesmtp library or source.</fail>
     <property name="libesmtp.lib.type" value="static"/>
+    <property name="libesmtp.lib.prefix" value=""/>
+    <property name="libesmtp.lib.suffix" value=""/>
+	<property name="project.type" value="msvc6"/>
 
     <ant antfile="src/ant/esmtp-build.xml" target="build" inheritAll="false">
         <property name="target.dir" value="${target.dir}"/>
         <property name="basedir" value="${libesmtp.src.dir}"/>
         <property name="debug" value="${debug}"/>
-        <property name="lib-suffix" value="${lib-suffix}"/>
+        <property name="lib.prefix" value="${libesmtp.lib.prefix}"/>
+        <property name="lib.suffix" value="${libesmtp.lib.suffix}"/>
         <property name="compiler" value="${compiler}"/>
         <property name="lib.type" value="${libesmtp.lib.type}"/>
         <property name="project.type" value="${project.type}"/>
@@ -427,6 +452,7 @@
         <foreach target="make-header-check" param="header">
                 <path><fileset dir="${target.dir}/header-check" includes="**/*.h"/></path>
         </foreach>
+	    <property name="project.type" value="msvc6"/>
         <cc objdir="${target.dir}/header-check"
                 name="gcc"
                 exceptions="true"
@@ -459,10 +485,21 @@
 		<equals arg1="${apr-util.lib.type}" arg2="static"/>
 	</condition>
 
+	<condition property="apr-libs-match" value="1">
+		<equals arg1="${apr.lib.type}" arg2="${apr-util.lib.type}"/>
+	</condition>
+
+	<fail unless="apr-libs-match">apr is ${apr.lib.type} and apr-util is ${apr-util.lib.type}, must be same type.</fail>
+	<property name="lib.name" value="log4cxx"/>
+	<property name="lib.suffix" value=""/>
+	<property name="lib.suffix" value=""/>
+
+
     <property name="project.compiler" value="${compiler}"/>
+	<property name="project.type" value="msvc6"/>
     <cc name="${project.compiler}"
                 exceptions="true"
-                outfile="${log4cxx.lib.dir}/log4cxx${lib-suffix}"
+                outfile="${log4cxx.lib.dir}/${lib.prefix}${lib.name}${lib.suffix}"
                 subsystem="console"
                 multithreaded="true"
                 outtype="${lib.type}"
@@ -490,6 +527,7 @@
 <target name="build-example">
     <mkdir dir="${log4cxx.lib.dir}/${example.name}_obj"/>
     <property name="project.compiler" value="${compiler}"/>
+	<property name="project.type" value="msvc6"/>
     <property name="example.include.dir" value="${example.src.dir}"/>
     <cc name="${project.compiler}"
                 exceptions="true"
@@ -511,7 +549,7 @@
 
         <compilerarg value="${pic-option}" if="pic-option"/>
 
-        <libset libs="log4cxx${lib-suffix}" dir="${log4cxx.lib.dir}"/>
+        <libset libs="${lib.prefix}${lib.name}${lib.suffix}" dir="${log4cxx.lib.dir}"/>
         &libsets;
 
         <project outfile="${projects.dir}/${example.name}" type="${project.type}" if="project.if"/>
@@ -586,6 +624,7 @@
     <mkdir dir="${log4cxx.lib.dir}/testsuite_obj"/>
 
     <property name="project.compiler" value="${compiler}"/>
+	<property name="project.type" value="msvc6"/>
     <cc name="${project.compiler}"
                 exceptions="true"
                 outfile="${log4cxx.lib.dir}/testsuite"
@@ -606,7 +645,7 @@
         <defineset define="WIN32" if="is-windows"/>
         <compilerarg value="${pic-option}" if="pic-option"/>
 
-        <libset libs="log4cxx${lib-suffix}" dir="${log4cxx.lib.dir}"/>
+        <libset libs="${lib.prefix}${lib.name}${lib.suffix}" dir="${log4cxx.lib.dir}"/>
         <libset libs="dl" if="is-unix"/>
         &libsets;
 
@@ -621,6 +660,7 @@
     description="Builds a unit tests + log4cxx executable">
     <mkdir dir="${executable.dir}/static/testsuite-standalone_obj"/>
     <property name="project.compiler" value="${compiler}"/>
+	<property name="project.type" value="msvc6"/>
     <cc name="${project.compiler}"
                 exceptions="true"
                 outfile="${executable.dir}/static/testsuite-standalone"
@@ -827,6 +867,7 @@
 
 <target name="build-projects">
         <mkdir dir="${projects.dir}"/>
+	    <property name="project.type" value="msvc6"/>
         <antcall target="build">
                 <param name="project.if" value="true"/>
                 <param name="project.type" value="${project.type}"/>
@@ -984,80 +1025,6 @@
 	</target>
 
 
-<target name="find-libesmtp" depends="init" if="has-libesmtp">
-    <property name="libesmtp.lib.name" value="esmtp"/>
-    <condition property="libesmtp.dir" value="/usr">
-        <or>
-            <available file="/usr/lib/lib${libesmtp.lib.name}.a"/>
-            <available file="/usr/lib/lib${libesmtp.lib.name}.la"/>
-        </or>
-    </condition>
-    <condition property="libesmtp.dir" value="/usr/local">
-        <or>
-            <available file="/usr/local/lib/lib${libesmtp.lib.name}.a"/>
-            <available file="/usr/local/lib/lib${libesmtp.lib.name}.la"/>
-        </or>
-    </condition>
-    <property name="relative-libesmtp" location="../libesmtp"/>
-    <condition property="libesmtp.dir" value="${relative-libesmtp}">
-        <available file="${relative-libesmtp}"/>
-    </condition>
-    <fail unless="libesmtp.dir">Unable to locate libesmtp base directory.</fail>
-    
-    <condition property="libesmtp.include.dir" value="${libesmtp.dir}/include">
-        <available file="${libesmtp.dir}/include/libesmtp.h"/>
-    </condition>
-    <condition property="libesmtp.include.dir" value="${libesmtp.dir}">
-        <available file="${libesmtp.dir}/libesmtp.h"/>
-    </condition>
-    <fail unless="libesmtp.include.dir">Unable to locate libesmtp include directory.</fail>
-
-    <condition property="libesmtp.lib.dir" value="${libesmtp.dir}/lib">
-       <and>
-            <not><equals arg1="${libesmtp.dir}" arg2="/usr"/></not>
-            <or>
-                <available file="${libesmtp.dir}/lib/lib${libesmtp.lib.name}.a"/>
-                <available file="${libesmtp.dir}/lib/lib${libesmtp.lib.name}.la"/>
-                <available file="${libesmtp.dir}/lib/${libesmtp.lib.name}.lib"/>
-                <available file="${libesmtp.dir}/lib/${libesmtp.lib.name}d.lib"/>
-            </or>
-        </and>
-    </condition>
-    <condition property="libesmtp.lib.dir" value="${libesmtp.dir}/.libs">
-            <or>
-                <available file="${libesmtp.dir}/.libs/lib${libesmtp.lib.name}.a"/>
-                <available file="${libesmtp.dir}/.libs/lib${libesmtp.lib.name}.la"/>
-                <available file="${libesmtp.dir}/.libs/${libesmtp.lib.name}.lib"/>
-                <available file="${libesmtp.dir}/.libs/${libesmtp.lib.name}d.lib"/>
-            </or>
-    </condition>
-    <condition property="libesmtp.lib.dir" value="${libesmtp.dir}/target/${debug.release}/static">
-            <or>
-                <available file="${libesmtp.dir}/target/${debug.release}/static/lib${libesmtp.lib.name}${lib-suffix}.a"/>
-                <available file="${libesmtp.dir}/target/${debug.release}/static/lib${libesmtp.lib.name}${lib-suffix}.la"/>
-                <available file="${libesmtp.dir}/target/${debug.release}/static/${libesmtp.lib.name}${lib-suffix}.lib"/>
-            </or>
-    </condition>    
-    <condition property="libesmtp.lib.dir" value="${libesmtp.dir}/target/${debug.release}/shared">
-            <or>
-                <available file="${libesmtp.dir}/target/${debug.release}/shared/lib${libesmtp.lib.name}${lib-suffix}.a"/>
-                <available file="${libesmtp.dir}/target/${debug.release}/shared/lib${libesmtp.lib.name}${lib-suffix}.la"/>
-                <available file="${libesmtp.dir}/target/${debug.release}/shared/${libesmtp.lib.name}${lib-suffix}.lib"/>
-            </or>
-    </condition>    
-    
-    
-    <condition property="libesmtp-available" value="1">
-        <or>
-            <equals arg1="${libesmtp.dir}" arg2="/usr"/>
-            <isset property="libesmtp.lib.dir"/>
-        </or>
-    </condition>
-
-    <condition property="libesmtp.src.dir" value="${libesmtp-util}">
-        <available file="${relative-libesmtp}/smtpauth.c"/>
-    </condition>
-</target>
 
 
 </project>

Modified: logging/log4cxx/trunk/src/ant/apr-build.xml
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/ant/apr-build.xml?rev=616956&r1=616955&r2=616956&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/ant/apr-build.xml (original)
+++ logging/log4cxx/trunk/src/ant/apr-build.xml Wed Jan 30 15:32:55 2008
@@ -36,6 +36,8 @@
 <property name="target.dir" location="${basedir}/target"/>
 <property name="lib.type" value="shared"/>
 <property name="projects.dir" location="${target.dir}"/>
+<property name="lib.name" value="apr-1"/>
+<property name="lib.prefix" value=""/>
 
 <target name="usage" description="Displays usage notes on build">
         <echo>
@@ -84,8 +86,9 @@
 <target name="build" depends="configure" description="Build library">
     <mkdir dir="${executable.dir}/apr-ofiles"/>
     <property name="project.compiler" value="${compiler}"/>
+	<property name="project.type" value="msvc6"/>
     <cc name="${project.compiler}"
-        outfile="${executable.dir}/apr-1${lib-suffix}"
+        outfile="${executable.dir}/${lib.prefix}${lib.name}${lib.suffix}"
         subsystem="console"
         multithreaded="true"
         outtype="${lib.type}"
@@ -135,6 +138,7 @@
 <target name="build-test">
     <mkdir dir="${executable.dir}/apr-test-ofiles"/>
     <property name="project.compiler" value="${compiler}"/>
+	<property name="project.type" value="msvc6"/>
     <cc name="${project.compiler}"
         outfile="${executable.dir}/${test}"
         subsystem="console"
@@ -152,7 +156,7 @@
         <defineset define="APR_DECLARE_STATIC" unless="is-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 dir="${apr.lib.dir}" libs="${lib.prefix}${lib.name}${lib.suffix}"/>
         <libset libs="cw32mt" if="is-bcc"/>
         <libset libs="pthread dl" if="is-unix"/>
         <libset libs="advapi32 ws2_32 mswsock rpcrt4" if="is-windows"/>
@@ -270,6 +274,7 @@
     <mkdir dir="${executable.dir}/test-ofiles"/>
     <mkdir dir="${executable.dir}/.libs"/>
     <property name="project.compiler" value="${compiler}"/>
+	<property name="project.type" value="msvc6"/>
     <cc name="${project.compiler}"
         outfile="${executable.dir}/.libs/mod_test"
         subsystem="console"
@@ -288,7 +293,7 @@
         <defineset define="APR_DECLARE_STATIC" unless="is-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 dir="${apr.lib.dir}" libs="${lib.prefix}${lib.name}${lib.suffix}"/>
         <libset libs="cw32mt" if="is-bcc"/>
         <libset libs="advapi32 ws2_32 mswsock rpcrt4" if="is-windows"/>
         <project type="${project.type}" outfile="${projects.dir}/mod_test" if="project.if"/>
@@ -300,6 +305,7 @@
 <target name="build-testall" depends="build">
     <mkdir dir="${executable.dir}/test-ofiles"/>
     <property name="project.compiler" value="${compiler}"/>
+	<property name="project.type" value="msvc6"/>
     <cc name="${project.compiler}"
         outfile="${executable.dir}/testall"
         subsystem="console"
@@ -334,7 +340,7 @@
         <defineset define="APR_DECLARE_STATIC" unless="is-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 dir="${apr.lib.dir}" libs="${lib.prefix}${lib.name}${lib.suffix}"/>
         <libset libs="cw32mt" if="is-bcc"/>
         <libset libs="pthread dl" if="is-unix"/>
         <libset libs="advapi32 ws2_32 mswsock rpcrt4" if="is-windows"/>

Modified: logging/log4cxx/trunk/src/ant/apr-util-build.xml
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/ant/apr-util-build.xml?rev=616956&r1=616955&r2=616956&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/ant/apr-util-build.xml (original)
+++ logging/log4cxx/trunk/src/ant/apr-util-build.xml Wed Jan 30 15:32:55 2008
@@ -18,6 +18,7 @@
 -->
 <!DOCTYPE project [
 <!ENTITY common SYSTEM 'common.xml'>
+<!ENTITY find-apr SYSTEM 'find-apr.xml'>
 ]>
 
 <!--
@@ -30,6 +31,7 @@
 <project name="aprutil" default="check" basedir=".">
 
 &common;
+&find-apr;
 
 <property name="src.dir" location="${basedir}"/>
 <property name="include.dir" location="${src.dir}/include"/>
@@ -117,6 +119,7 @@
        <replacefilter token="VERSION" value='"expat_1.95.1"'/>
     </replace>
     <property name="project.compiler" value="${compiler}"/>
+	<property name="project.type" value="msvc6"/>
     <cc name="${project.compiler}"
         outfile="${executable.dir}/aprutil-1${lib-suffix}"
         subsystem="console"
@@ -162,6 +165,7 @@
 <target name="build-test">
     <mkdir dir="${executable.dir}/apr-util-test-ofiles"/>
     <property name="project.compiler" value="${compiler}"/>
+	<property name="project.type" value="msvc6"/>
     <cc name="${project.compiler}"
         outfile="${executable.dir}/${test}"
         subsystem="console"

Modified: logging/log4cxx/trunk/src/ant/common.xml
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/ant/common.xml?rev=616956&r1=616955&r2=616956&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/ant/common.xml (original)
+++ logging/log4cxx/trunk/src/ant/common.xml Wed Jan 30 15:32:55 2008
@@ -14,8 +14,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 
--->
-
+-->
 
 <property file="build.properties"/>
 <property name="debug" value="true"/>
@@ -61,9 +60,6 @@
 
 
 <target name="win-init" depends="os-detect" if="is-windows">
-    <property name="lib.prefix" value=""/>
-    <property name="lib.extension" value=".lib"/>
-    <property name="project.type" value="msvc6"/>
     <property name="compiler" value="msvc"/>
 
     <condition property="is-bcc" value="true">
@@ -84,13 +80,7 @@
 
 <target name="unix-init" depends="mac-init" if="is-unix">
 
-    <property name="compiler" value="gcc"/>
-
-    <property name="lib.prefix" value="lib"/>
-    <property name="lib.extension" value=".a"/>
-    <property name="project.type" value="cbuilderx"/>
     <property name="compiler" value="g++"/>
-    <property name="lib-suffix" value=""/>
 
     <condition property="has-expat" value="true">
          <not><isset property="is-mac"/></not>
@@ -143,11 +133,18 @@
         <property name="debug.release" value="release"/>
 
 
-        <condition property="lib-suffix" value="d">
+        <condition property="D.debug" value="d">
             <isset property="is-debug"/>
         </condition>
-        <property name="lib-suffix" value=""/>
+        <property name="D.debug" value=""/>
+
+        <condition property="D.R" value="d">
+            <isset property="is-debug"/>
+        </condition>
+        <property name="D.R" value="r"/>
 
+
+		<property name="lib-suffix" value=""/>
 
         <condition property="is-static" value="1">
               <equals arg1="${lib.type}" arg2="static"/>
@@ -159,7 +156,13 @@
         <property name="executable.dir" value="${target.dir}/${debug.release}/${lib.type}"/>
 
         <property name="projectsOnly" value="false"/>
-        
+        
+        <property name="apr.lib.name" value="apr-1"/>
+		<property name="apr.sample.h" value="apr_pools.h"/>
+		<property name="apr.sample.c" value="file_io/unix/dir.c"/>
+        <property name="apr-util.lib.name" value="aprutil-1"/>
+		<property name="apr-util.sample.h" value="apr_xml.h"/>
+		<property name="apr-util.sample.c" value="xml/apr_xml.c"/>
 </target>
 
 
@@ -174,186 +177,4 @@
 </target>
 
 
-<target name="find-apr" depends="init">
-    <condition property="apr.dir" value="${with-apr}">
-        <available file="${with-apr}"/>
-    </condition>
-    <property name="apr.lib.name" value="apr-1"/>
-    <condition property="apr.dir" value="/usr">
-        <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">
-        <available file="/usr/local/apr"/>
-    </condition>
-    <property name="relative-apr" location="../apr"/>
-    <condition property="apr.dir" value="${relative-apr}">
-        <available file="${relative-apr}"/>
-    </condition>
-    <fail unless="apr.dir">Unable to locate APR base directory.</fail>
-    
-    <condition property="apr.include.dir" value="${apr.dir}/include/apr-1.0">
-        <available file="${apr.dir}/include/apr-1.0/apr_pools.h"/>
-    </condition>
-    <condition property="apr.include.dir" value="${apr.dir}/include/apr-1">
-        <available file="${apr.dir}/include/apr-1/apr_pools.h"/>
-    </condition>
-    <condition property="apr.include.dir" value="${apr.dir}/include">
-        <available file="${apr.dir}/include/apr_pools.h"/>
-    </condition>
-    <fail unless="apr.include.dir">Unable to locate APR include directory.</fail>
-
-    <condition property="apr.lib.dir" value="${apr.dir}/lib">
-        <and>
-            <not><equals arg1="${apr.dir}" arg2="/usr"/></not>
-            <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>
-        </and>
-    </condition>
-    <condition property="apr.lib.dir" value="${apr.dir}/.libs">
-        <and>
-            <not><equals arg1="${apr.dir}" arg2="/usr"/></not>
-            <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>
-        </and>
-    </condition>
-    <condition property="apr.lib.dir" value="${apr.dir}/target/${debug.release}/static">
-            <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>    
-    <condition property="apr.lib.dir" value="${apr.dir}/target/${debug.release}/shared">
-            <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>    
-    
-    <condition property="apr-available" value="1">
-        <or>
-            <equals arg1="${apr.dir}" arg2="/usr"/>
-            <isset property="apr.lib.dir"/>
-        </or>
-    </condition>
-        
-    <condition property="apr.src.dir" value="${with-apr}">
-        <available file="${with-apr}/file_io/unix/dir.c"/>
-    </condition>
-    
-    <condition property="apr.src.dir" value="${relative-apr}">
-        <available file="${relative-apr}/file_io/unix/dir.c"/>
-    </condition>
-</target>
-
-
-
-
-<target name="find-apr-util" depends="init">
-    <condition property="apr-util.dir" value="${with-apr-util}">
-        <available file="${with-apr-util}"/>
-    </condition>
-    <property name="apr-util.lib.name" value="aprutil-1"/>
-    <condition property="apr-util.dir" value="/usr">
-        <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">
-        <available file="/usr/local/apr"/>
-    </condition>
-    <property name="relative-apr-util" location="../apr-util"/>
-    <condition property="apr-util.dir" value="${relative-apr-util}">
-        <available file="${relative-apr-util}"/>
-    </condition>
-    <fail unless="apr.dir">Unable to locate APR-Util base directory.</fail>
-    
-    <condition property="apr-util.include.dir" value="${apr-util.dir}/include/apr-1.0">
-        <available file="${apr-util.dir}/include/apr-1.0/apr_xml.h"/>
-    </condition>
-    <condition property="apr-util.include.dir" value="${apr-util.dir}/include/apr-1">
-        <available file="${apr-util.dir}/include/apr-1/apr_xml.h"/>
-    </condition>
-    <condition property="apr-util.include.dir" value="${apr-util.dir}/include">
-        <available file="${apr-util.dir}/include/apr_xml.h"/>
-    </condition>
-    <fail unless="apr-util.include.dir">Unable to locate APR include directory.</fail>
-
-    <condition property="apr-util.lib.dir" value="${apr-util.dir}/lib">
-       <and>
-            <not><equals arg1="${apr-util.dir}" arg2="/usr"/></not>
-            <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>
-        </and>
-    </condition>
-    <condition property="apr-util.lib.dir" value="${apr-util.dir}/.libs">
-       <and>
-            <not><equals arg1="${apr-util.dir}" arg2="/usr"/></not>
-            <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>
-        </and>
-    </condition>
-    <condition property="apr-util.lib.dir" value="${apr-util.dir}/target/${debug.release}/static">
-            <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>    
-    <condition property="apr-util.lib.dir" value="${apr-util.dir}/target/${debug.release}/shared">
-            <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>    
-    
-    
-    <condition property="apr-util-available" value="1">
-        <or>
-            <equals arg1="${apr-util.dir}" arg2="/usr"/>
-            <isset property="apr-util.lib.dir"/>
-        </or>
-    </condition>
-
-    <condition property="apr-util.src.dir" value="${with-apr-util}">
-        <available file="${with-apr-util}/xml/apr_xml.c"/>
-    </condition>
-    
-    <condition property="apr-util.src.dir" value="${relative-apr-util}">
-        <available file="${relative-apr-util}/xml/apr_xml.c"/>
-    </condition>
-</target>
 

Added: 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=616956&view=auto
==============================================================================
--- logging/log4cxx/trunk/src/ant/find-apr-util.xml (added)
+++ logging/log4cxx/trunk/src/ant/find-apr-util.xml Wed Jan 30 15:32:55 2008
@@ -0,0 +1,425 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
+<target name="find-apr-util" depends="init">
+    <condition property="apr-util.dir" value="${with-apr-util}">
+        <available file="${with-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.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.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.dir" value="/usr">
+		<isset property="apr-util.lib.file"/>
+	</condition>
+	<condition property="apr-util.lib.file.dir" value="/usr/lib">
+		<isset property="apr-util.lib.file"/>
+	</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.dir" value="/usr/local">
+		<isset property="apr-util.lib.file"/>
+	</condition>
+	<condition property="apr-util.lib.file.dir" value="/usr/local/lib">
+		<isset property="apr-util.lib.file"/>
+	</condition>
+
+
+    <property name="relative-apr-util" location="../apr-util"/>
+    <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.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.dir" value="${apr-util.dir}/.libs">
+		<isset property="apr-util.lib.file"/>
+	</condition>
+    <fail unless="apr-util.dir">Unable to locate apr-util base directory.</fail>
+    
+	<!--   use character ref to prevent directory name from
+	          being changed on global search and replacements -->
+    <condition property="apr.include.dir" value="${apr.dir}/include/ap&#x72;-1.0">
+        <available file="${apr.dir}/include/ap&#x72;-1.0/${apr-util.sample.h}"/>
+    </condition>
+    <condition property="apr.include.dir" value="${apr.dir}/include/ap&#x72;-1">
+        <available file="${apr.dir}/include/ap&#x72;-1/${apr-util.sample.h}"/>
+    </condition>
+    <condition property="apr-util.include.dir" value="${apr-util.dir}/include">
+        <available file="${apr-util.dir}/include/${apr-util.sample.h}"/>
+    </condition>
+    <fail unless="apr-util.include.dir">Unable to locate apr-util include directory.</fail>
+
+
+	<!--   Static debug libraries in Ant's typical location (ignored unless debug build)   -->
+	<condition property="apr-util.lib.file"
+		value="${apr-util.dir}/target/debug/static/lib${apr-util.lib.name}.a">
+		<and>
+			<isset property="is-debug"/>
+			<available file="${apr-util.dir}/target/debug/static/lib${apr-util.lib.name}.a"/>
+		</and>
+	</condition>
+	<condition property="apr-util.lib.file"
+		value="${apr-util.dir}/target/debug/static/${apr-util.lib.name}.lib">
+		<and>
+			<isset property="is-debug"/>
+			<available file="${apr-util.dir}/target/debug/static/${apr-util.lib.name}.lib"/>
+		</and>
+	</condition>
+	<condition property="apr-util.lib.file"
+		value="${apr-util.dir}/target/debug/static/${apr-util.lib.name}d.lib">
+		<and>
+			<isset property="is-debug"/>
+			<available file="${apr-util.dir}/target/debug/static/${apr-util.lib.name}d.lib"/>
+		</and>
+	</condition>
+	<condition property="apr-util.lib.file"
+		value="${apr-util.dir}/target/debug/static/lib${apr-util.lib.name}.lib">
+		<and>
+			<isset property="is-debug"/>
+			<available file="${apr-util.dir}/target/debug/static/lib${apr-util.lib.name}.lib"/>
+		</and>
+	</condition>
+	<condition property="apr-util.lib.file"
+		value="${apr-util.dir}/target/debug/static/lib${apr-util.lib.name}d.lib">
+		<and>
+			<isset property="is-debug"/>
+			<available file="${apr-util.dir}/target/debug/static/lib${apr-util.lib.name}d.lib"/>
+		</and>
+	</condition>
+	<condition property="apr-util.lib.file.dir"
+		value="${apr-util.dir}/target/debug/static">
+			<isset property="apr-util.lib.file"/>
+	</condition>
+
+
+	<!--   Static debug libraries in APR's VC6 projects typical location (ignored unless debug build)   -->
+	<condition property="apr-util.lib.file"
+		value="${apr-util.dir}/LibD/${apr-util.lib.name}.lib">
+		<and>
+			<isset property="is-debug"/>
+			<available file="${apr-util.dir}/LibD/${apr-util.lib.name}.lib"/>
+		</and>
+	</condition>
+	<condition property="apr-util.lib.file.dir"
+		value="${apr-util.dir}/LibD">
+			<isset property="apr-util.lib.file"/>
+	</condition>
+
+
+	<!--   Shared debug libraries in Ant's typical location (ignored unless debug build)   -->
+	<condition property="apr-util.lib.file"
+		value="${apr-util.dir}/target/debug/shared/lib${apr-util.lib.name}.la">
+		<and>
+			<isset property="is-debug"/>
+			<available file="${apr-util.dir}/target/debug/shared/lib${apr-util.lib.name}.la"/>
+		</and>
+	</condition>
+	<condition property="apr-util.lib.file"
+		value="${apr-util.dir}/target/debug/shared/${apr-util.lib.name}.lib">
+		<and>
+			<isset property="is-debug"/>
+			<available file="${apr-util.dir}/target/debug/shared/${apr-util.lib.name}.lib"/>
+		</and>
+	</condition>
+	<condition property="apr-util.lib.file"
+		value="${apr-util.dir}/target/debug/shared/${apr-util.lib.name}d.lib">
+		<and>
+			<isset property="is-debug"/>
+			<available file="${apr-util.dir}/target/debug/shared/${apr-util.lib.name}d.lib"/>
+		</and>
+	</condition>
+	<condition property="apr-util.lib.file"
+		value="${apr-util.dir}/target/debug/shared/lib${apr-util.lib.name}.lib">
+		<and>
+			<isset property="is-debug"/>
+			<available file="${apr-util.dir}/target/debug/shared/lib${apr-util.lib.name}.lib"/>
+		</and>
+	</condition>
+	<condition property="apr-util.lib.file"
+		value="${apr-util.dir}/target/debug/shared/lib${apr-util.lib.name}d.lib">
+		<and>
+			<isset property="is-debug"/>
+			<available file="${apr-util.dir}/target/debug/shared/lib${apr-util.lib.name}d.lib"/>
+		</and>
+	</condition>
+	<condition property="apr-util.lib.file.dir"
+		value="${apr-util.dir}/target/debug/shared">
+			<isset property="apr-util.lib.file"/>
+	</condition>
+
+
+	<!--   Shared debug libraries in APR's VC6 projects typical location (ignored unless debug build)   -->
+	<condition property="apr-util.lib.file"
+		value="${apr-util.dir}/Debug/lib${apr-util.lib.name}.lib">
+		<and>
+			<isset property="is-debug"/>
+			<available file="${apr-util.dir}/Debug/lib${apr-util.lib.name}.lib"/>
+		</and>
+	</condition>
+	<condition property="apr-util.lib.file.dir"
+		value="${apr-util.dir}/Debug">
+			<isset property="apr-util.lib.file"/>
+	</condition>
+
+
+
+	<!--   Static release libraries in Ant's typical location   -->
+	<condition property="apr-util.lib.file"
+		value="${apr-util.dir}/target/release/static/lib${apr-util.lib.name}.a">
+			<available file="${apr-util.dir}/target/release/static/lib${apr-util.lib.name}.a"/>
+	</condition>
+	<condition property="apr-util.lib.file"
+		value="${apr-util.dir}/target/release/static/${apr-util.lib.name}.lib">
+			<available file="${apr-util.dir}/target/release/static/${apr-util.lib.name}.lib"/>
+	</condition>
+	<condition property="apr-util.lib.file"
+		value="${apr-util.dir}/target/release/static/lib${apr-util.lib.name}.lib">
+			<available file="${apr-util.dir}/target/release/static/lib${apr-util.lib.name}.lib"/>
+	</condition>
+	<condition property="apr-util.lib.file"
+		value="${apr-util.dir}/target/release/static/lib${apr-util.lib.name}d.lib">
+			<available file="${apr-util.dir}/target/release/static/lib${apr-util.lib.name}d.lib"/>
+	</condition>
+	<condition property="apr-util.lib.file.dir"
+		value="${apr-util.dir}/target/release/static">
+			<isset property="apr-util.lib.file"/>
+	</condition>
+
+
+
+	<!--   Static release libraries in APR's VC6 projects typical location (ignored unless debug build)   -->
+	<condition property="apr-util.lib.file"
+		value="${apr-util.dir}/LibR/${apr-util.lib.name}.lib">
+			<available file="${apr-util.dir}/LibR/${apr-util.lib.name}.lib"/>
+	</condition>
+	<condition property="apr-util.lib.file.dir"
+		value="${apr-util.dir}/LibR">
+			<isset property="apr-util.lib.file"/>
+	</condition>
+
+
+	<!--   Shared release libraries in Ant's typical location (ignored unless debug build)   -->
+	<condition property="apr-util.lib.file"
+		value="${apr-util.dir}/target/release/shared/lib${apr-util.lib.name}.la">
+			<available file="${apr-util.dir}/target/release/shared/lib${apr-util.lib.name}.la"/>
+	</condition>
+	<condition property="apr-util.lib.file"
+		value="${apr-util.dir}/target/release/shared/${apr-util.lib.name}.lib">
+			<available file="${apr-util.dir}/target/release/shared/${apr-util.lib.name}.lib"/>
+	</condition>
+	<condition property="apr-util.lib.file"
+		value="${apr-util.dir}/target/release/shared/lib${apr-util.lib.name}.lib">
+			<available file="${apr-util.dir}/target/release/shared/lib${apr-util.lib.name}.lib"/>
+	</condition>
+	<condition property="apr-util.lib.file.dir"
+		value="${apr-util.dir}/target/release/shared">
+			<isset property="apr-util.lib.file"/>
+	</condition>
+
+
+
+	<!--   Shared release libraries in APR's VC6 projects typical location   -->
+	<condition property="apr-util.lib.file"
+		value="${apr-util.dir}/Release/lib${apr-util.lib.name}.lib">
+			<available file="${apr-util.dir}/Release/lib${apr-util.lib.name}.lib"/>
+	</condition>
+	<condition property="apr-util.lib.file.dir"
+		value="${apr-util.dir}/Release">
+			<isset property="apr-util.lib.file"/>
+	</condition>
+
+
+
+	<condition property="apr-util.lib.dir" value="${apr-util.lib.file.dir}">
+		<and>
+			<isset property="apr-util.lib.file.dir"/>
+			<not>
+				<or>
+					<!--  default search path -->
+					<equals arg1="${apr-util.lib.file.dir}" arg2="/usr"/>
+				</or>
+			</not>
+		</and>
+	</condition>
+
+	<condition property="apr-util.lib.suffix" value="d">
+		<or>
+			<contains string="${apr-util.lib.file}" substring="/lib${apr-util.lib.name}d."/>
+			<contains string="${apr-util.lib.file}" substring="/${apr-util.lib.name}d."/>
+		</or>
+	</condition>
+	<condition property="apr-util.lib.suffix" value="D">
+		<or>
+			<contains string="${apr-util.lib.file}" substring="/lib${apr-util.lib.name}D."/>
+			<contains string="${apr-util.lib.file}" substring="/${apr-util.lib.name}D."/>
+		</or>
+	</condition>
+	<condition property="apr-util.lib.suffix" value="">
+		<isset property="apr-util.lib.file"/>
+	</condition>
+
+	<condition property="apr-util.lib.prefix" value="lib">
+		<or>
+			<contains string="[${apr-util.lib.file}]" substring="/lib${apr-util.lib.name}.lib]"/>
+		</or>
+	</condition>
+	<condition property="apr-util.lib.prefix" value="">
+		<isset property="apr-util.lib.file"/>
+	</condition>
+
+	<condition property="apr-util.lib.type" value="shared">
+		<or>
+			<contains string="${apr-util.lib.file}]" 
+				substring=".dylib]" 
+				casesensitive="no"/>
+			<contains string="${apr-util.lib.file}]" 
+				substring=".so]" 
+				casesensitive="no"/>
+			<contains string="${apr-util.lib.file}]" 
+				substring=".la]" 
+				casesensitive="no"/>
+			<and>
+				<!--   if we have just a .lib, guess based on file size.
+				      Import libs should be much smaller.  -->
+				<contains string="${apr-util.lib.file}]" 
+					substring=".lib]" 
+					casesensitive="no"/>
+				<isfileselected file="${apr-util.lib.file}">
+					<size value="250000" when="less"/>
+				</isfileselected>
+			</and>
+		</or>
+	</condition>
+
+
+	<condition property="apr-util.lib.type" value="static">
+		<isset property="apr-util.lib.file"/>
+	</condition>
+
+        
+    <condition property="apr-util.src.dir" value="${with-apr-util}">
+        <available file="${with-apr-util}/${apr-util.sample.c}"/>
+    </condition>
+    
+    <condition property="apr-util.src.dir" value="${apr-util.dir}">
+        <available file="${apr-util.dir}/${apr-util.sample.c}"/>
+    </condition>
+
+    <condition property="apr-util.src.dir" value="${relative-apr-util}">
+        <available file="${relative-apr-util}/${apr-util.sample.c}"/>
+    </condition>
+
+	<echo>apr-util-find:
+apr-util.dir=${apr-util.dir}
+apr-util.include.dir=${apr-util.include.dir}
+apr-util.src.dir=${apr-util.src.dir}
+apr-util.lib.file=${apr-util.lib.file}
+apr-util.lib.file.dir=${apr-util.lib.file.dir}
+apr-util.lib.dir=${apr-util.lib.dir}
+apr-util.lib.prefix=${apr-util.lib.prefix}
+apr-util.lib.suffix=${apr-util.lib.suffix}
+apr-util.lib.type=${apr-util.lib.type}
+</echo>
+</target>

Added: logging/log4cxx/trunk/src/ant/find-apr.xml
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/ant/find-apr.xml?rev=616956&view=auto
==============================================================================
--- logging/log4cxx/trunk/src/ant/find-apr.xml (added)
+++ logging/log4cxx/trunk/src/ant/find-apr.xml Wed Jan 30 15:32:55 2008
@@ -0,0 +1,425 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
+<target name="find-apr" depends="init">
+    <condition property="apr.dir" value="${with-apr}">
+        <available file="${with-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.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.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.dir" value="/usr">
+		<isset property="apr.lib.file"/>
+	</condition>
+	<condition property="apr.lib.file.dir" value="/usr/lib">
+		<isset property="apr.lib.file"/>
+	</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.dir" value="/usr/local">
+		<isset property="apr.lib.file"/>
+	</condition>
+	<condition property="apr.lib.file.dir" value="/usr/local/lib">
+		<isset property="apr.lib.file"/>
+	</condition>
+
+
+    <property name="relative-apr" location="../apr"/>
+    <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.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.dir" value="${apr.dir}/.libs">
+		<isset property="apr.lib.file"/>
+	</condition>
+    <fail unless="apr.dir">Unable to locate apr base directory.</fail>
+    
+	<!--   use character ref to prevent directory name from
+	          being changed on global search and replacements -->
+    <condition property="apr.include.dir" value="${apr.dir}/include/ap&#x72;-1.0">
+        <available file="${apr.dir}/include/ap&#x72;-1.0/${apr.sample.h}"/>
+    </condition>
+    <condition property="apr.include.dir" value="${apr.dir}/include/ap&#x72;-1">
+        <available file="${apr.dir}/include/ap&#x72;-1/${apr.sample.h}"/>
+    </condition>
+    <condition property="apr.include.dir" value="${apr.dir}/include">
+        <available file="${apr.dir}/include/${apr.sample.h}"/>
+    </condition>
+    <fail unless="apr.include.dir">Unable to locate apr include directory.</fail>
+
+
+	<!--   Static debug libraries in Ant's typical location (ignored unless debug build)   -->
+	<condition property="apr.lib.file"
+		value="${apr.dir}/target/debug/static/lib${apr.lib.name}.a">
+		<and>
+			<isset property="is-debug"/>
+			<available file="${apr.dir}/target/debug/static/lib${apr.lib.name}.a"/>
+		</and>
+	</condition>
+	<condition property="apr.lib.file"
+		value="${apr.dir}/target/debug/static/${apr.lib.name}.lib">
+		<and>
+			<isset property="is-debug"/>
+			<available file="${apr.dir}/target/debug/static/${apr.lib.name}.lib"/>
+		</and>
+	</condition>
+	<condition property="apr.lib.file"
+		value="${apr.dir}/target/debug/static/${apr.lib.name}d.lib">
+		<and>
+			<isset property="is-debug"/>
+			<available file="${apr.dir}/target/debug/static/${apr.lib.name}d.lib"/>
+		</and>
+	</condition>
+	<condition property="apr.lib.file"
+		value="${apr.dir}/target/debug/static/lib${apr.lib.name}.lib">
+		<and>
+			<isset property="is-debug"/>
+			<available file="${apr.dir}/target/debug/static/lib${apr.lib.name}.lib"/>
+		</and>
+	</condition>
+	<condition property="apr.lib.file"
+		value="${apr.dir}/target/debug/static/lib${apr.lib.name}d.lib">
+		<and>
+			<isset property="is-debug"/>
+			<available file="${apr.dir}/target/debug/static/lib${apr.lib.name}d.lib"/>
+		</and>
+	</condition>
+	<condition property="apr.lib.file.dir"
+		value="${apr.dir}/target/debug/static">
+			<isset property="apr.lib.file"/>
+	</condition>
+
+
+	<!--   Static debug libraries in APR's VC6 projects typical location (ignored unless debug build)   -->
+	<condition property="apr.lib.file"
+		value="${apr.dir}/LibD/${apr.lib.name}.lib">
+		<and>
+			<isset property="is-debug"/>
+			<available file="${apr.dir}/LibD/${apr.lib.name}.lib"/>
+		</and>
+	</condition>
+	<condition property="apr.lib.file.dir"
+		value="${apr.dir}/LibD">
+			<isset property="apr.lib.file"/>
+	</condition>
+
+
+	<!--   Shared debug libraries in Ant's typical location (ignored unless debug build)   -->
+	<condition property="apr.lib.file"
+		value="${apr.dir}/target/debug/shared/lib${apr.lib.name}.la">
+		<and>
+			<isset property="is-debug"/>
+			<available file="${apr.dir}/target/debug/shared/lib${apr.lib.name}.la"/>
+		</and>
+	</condition>
+	<condition property="apr.lib.file"
+		value="${apr.dir}/target/debug/shared/${apr.lib.name}.lib">
+		<and>
+			<isset property="is-debug"/>
+			<available file="${apr.dir}/target/debug/shared/${apr.lib.name}.lib"/>
+		</and>
+	</condition>
+	<condition property="apr.lib.file"
+		value="${apr.dir}/target/debug/shared/${apr.lib.name}d.lib">
+		<and>
+			<isset property="is-debug"/>
+			<available file="${apr.dir}/target/debug/shared/${apr.lib.name}d.lib"/>
+		</and>
+	</condition>
+	<condition property="apr.lib.file"
+		value="${apr.dir}/target/debug/shared/lib${apr.lib.name}.lib">
+		<and>
+			<isset property="is-debug"/>
+			<available file="${apr.dir}/target/debug/shared/lib${apr.lib.name}.lib"/>
+		</and>
+	</condition>
+	<condition property="apr.lib.file"
+		value="${apr.dir}/target/debug/shared/lib${apr.lib.name}d.lib">
+		<and>
+			<isset property="is-debug"/>
+			<available file="${apr.dir}/target/debug/shared/lib${apr.lib.name}d.lib"/>
+		</and>
+	</condition>
+	<condition property="apr.lib.file.dir"
+		value="${apr.dir}/target/debug/shared">
+			<isset property="apr.lib.file"/>
+	</condition>
+
+
+	<!--   Shared debug libraries in APR's VC6 projects typical location (ignored unless debug build)   -->
+	<condition property="apr.lib.file"
+		value="${apr.dir}/Debug/lib${apr.lib.name}.lib">
+		<and>
+			<isset property="is-debug"/>
+			<available file="${apr.dir}/Debug/lib${apr.lib.name}.lib"/>
+		</and>
+	</condition>
+	<condition property="apr.lib.file.dir"
+		value="${apr.dir}/Debug">
+			<isset property="apr.lib.file"/>
+	</condition>
+
+
+
+	<!--   Static release libraries in Ant's typical location   -->
+	<condition property="apr.lib.file"
+		value="${apr.dir}/target/release/static/lib${apr.lib.name}.a">
+			<available file="${apr.dir}/target/release/static/lib${apr.lib.name}.a"/>
+	</condition>
+	<condition property="apr.lib.file"
+		value="${apr.dir}/target/release/static/${apr.lib.name}.lib">
+			<available file="${apr.dir}/target/release/static/${apr.lib.name}.lib"/>
+	</condition>
+	<condition property="apr.lib.file"
+		value="${apr.dir}/target/release/static/lib${apr.lib.name}.lib">
+			<available file="${apr.dir}/target/release/static/lib${apr.lib.name}.lib"/>
+	</condition>
+	<condition property="apr.lib.file"
+		value="${apr.dir}/target/release/static/lib${apr.lib.name}d.lib">
+			<available file="${apr.dir}/target/release/static/lib${apr.lib.name}d.lib"/>
+	</condition>
+	<condition property="apr.lib.file.dir"
+		value="${apr.dir}/target/release/static">
+			<isset property="apr.lib.file"/>
+	</condition>
+
+
+
+	<!--   Static release libraries in APR's VC6 projects typical location (ignored unless debug build)   -->
+	<condition property="apr.lib.file"
+		value="${apr.dir}/LibR/${apr.lib.name}.lib">
+			<available file="${apr.dir}/LibR/${apr.lib.name}.lib"/>
+	</condition>
+	<condition property="apr.lib.file.dir"
+		value="${apr.dir}/LibR">
+			<isset property="apr.lib.file"/>
+	</condition>
+
+
+	<!--   Shared release libraries in Ant's typical location (ignored unless debug build)   -->
+	<condition property="apr.lib.file"
+		value="${apr.dir}/target/release/shared/lib${apr.lib.name}.la">
+			<available file="${apr.dir}/target/release/shared/lib${apr.lib.name}.la"/>
+	</condition>
+	<condition property="apr.lib.file"
+		value="${apr.dir}/target/release/shared/${apr.lib.name}.lib">
+			<available file="${apr.dir}/target/release/shared/${apr.lib.name}.lib"/>
+	</condition>
+	<condition property="apr.lib.file"
+		value="${apr.dir}/target/release/shared/lib${apr.lib.name}.lib">
+			<available file="${apr.dir}/target/release/shared/lib${apr.lib.name}.lib"/>
+	</condition>
+	<condition property="apr.lib.file.dir"
+		value="${apr.dir}/target/release/shared">
+			<isset property="apr.lib.file"/>
+	</condition>
+
+
+
+	<!--   Shared release libraries in APR's VC6 projects typical location   -->
+	<condition property="apr.lib.file"
+		value="${apr.dir}/Release/lib${apr.lib.name}.lib">
+			<available file="${apr.dir}/Release/lib${apr.lib.name}.lib"/>
+	</condition>
+	<condition property="apr.lib.file.dir"
+		value="${apr.dir}/Release">
+			<isset property="apr.lib.file"/>
+	</condition>
+
+
+
+	<condition property="apr.lib.dir" value="${apr.lib.file.dir}">
+		<and>
+			<isset property="apr.lib.file.dir"/>
+			<not>
+				<or>
+					<!--  default search path -->
+					<equals arg1="${apr.lib.file.dir}" arg2="/usr"/>
+				</or>
+			</not>
+		</and>
+	</condition>
+
+	<condition property="apr.lib.suffix" value="d">
+		<or>
+			<contains string="${apr.lib.file}" substring="/lib${apr.lib.name}d."/>
+			<contains string="${apr.lib.file}" substring="/${apr.lib.name}d."/>
+		</or>
+	</condition>
+	<condition property="apr.lib.suffix" value="D">
+		<or>
+			<contains string="${apr.lib.file}" substring="/lib${apr.lib.name}D."/>
+			<contains string="${apr.lib.file}" substring="/${apr.lib.name}D."/>
+		</or>
+	</condition>
+	<condition property="apr.lib.suffix" value="">
+		<isset property="apr.lib.file"/>
+	</condition>
+
+	<condition property="apr.lib.prefix" value="lib">
+		<or>
+			<contains string="[${apr.lib.file}]" substring="/lib${apr.lib.name}.lib]"/>
+		</or>
+	</condition>
+	<condition property="apr.lib.prefix" value="">
+		<isset property="apr.lib.file"/>
+	</condition>
+
+	<condition property="apr.lib.type" value="shared">
+		<or>
+			<contains string="${apr.lib.file}]" 
+				substring=".dylib]" 
+				casesensitive="no"/>
+			<contains string="${apr.lib.file}]" 
+				substring=".so]" 
+				casesensitive="no"/>
+			<contains string="${apr.lib.file}]" 
+				substring=".la]" 
+				casesensitive="no"/>
+			<and>
+				<!--   if we have just a .lib, guess based on file size.
+				      Import libs should be much smaller.  -->
+				<contains string="${apr.lib.file}]" 
+					substring=".lib]" 
+					casesensitive="no"/>
+				<isfileselected file="${apr.lib.file}">
+					<size value="250000" when="less"/>
+				</isfileselected>
+			</and>
+		</or>
+	</condition>
+
+
+	<condition property="apr.lib.type" value="static">
+		<isset property="apr.lib.file"/>
+	</condition>
+
+        
+    <condition property="apr.src.dir" value="${with-apr}">
+        <available file="${with-apr}/${apr.sample.c}"/>
+    </condition>
+    
+    <condition property="apr.src.dir" value="${apr.dir}">
+        <available file="${apr.dir}/${apr.sample.c}"/>
+    </condition>
+
+    <condition property="apr.src.dir" value="${relative-apr}">
+        <available file="${relative-apr}/${apr.sample.c}"/>
+    </condition>
+
+	<echo>apr-find:
+apr.dir=${apr.dir}
+apr.include.dir=${apr.include.dir}
+apr.src.dir=${apr.src.dir}
+apr.lib.file=${apr.lib.file}
+apr.lib.file.dir=${apr.lib.file.dir}
+apr.lib.dir=${apr.lib.dir}
+apr.lib.prefix=${apr.lib.prefix}
+apr.lib.suffix=${apr.lib.suffix}
+apr.lib.type=${apr.lib.type}
+</echo>
+</target>

Added: logging/log4cxx/trunk/src/ant/find-libesmtp.xml
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/ant/find-libesmtp.xml?rev=616956&view=auto
==============================================================================
--- logging/log4cxx/trunk/src/ant/find-libesmtp.xml (added)
+++ logging/log4cxx/trunk/src/ant/find-libesmtp.xml Wed Jan 30 15:32:55 2008
@@ -0,0 +1,425 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
+<target name="find-esmtp" depends="init" if="has-libesmtp">
+    <condition property="esmtp.dir" value="${with-libesmtp}">
+        <available file="${with-libesmtp}"/>
+    </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.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.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.dir" value="/usr">
+		<isset property="esmtp.lib.file"/>
+	</condition>
+	<condition property="esmtp.lib.file.dir" value="/usr/lib">
+		<isset property="esmtp.lib.file"/>
+	</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.dir" value="/usr/local">
+		<isset property="esmtp.lib.file"/>
+	</condition>
+	<condition property="esmtp.lib.file.dir" value="/usr/local/lib">
+		<isset property="esmtp.lib.file"/>
+	</condition>
+
+
+    <property name="relative-esmtp" location="../esmtp"/>
+    <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.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.dir" value="${esmtp.dir}/.libs">
+		<isset property="esmtp.lib.file"/>
+	</condition>
+    <fail unless="esmtp.dir">Unable to locate esmtp base directory.</fail>
+    
+	<!--   use character ref to prevent directory name from
+	          being changed on global search and replacements -->
+    <condition property="apr.include.dir" value="${apr.dir}/include/ap&#x72;-1.0">
+        <available file="${apr.dir}/include/ap&#x72;-1.0/${esmtp.sample.h}"/>
+    </condition>
+    <condition property="apr.include.dir" value="${apr.dir}/include/ap&#x72;-1">
+        <available file="${apr.dir}/include/ap&#x72;-1/${esmtp.sample.h}"/>
+    </condition>
+    <condition property="esmtp.include.dir" value="${esmtp.dir}/include">
+        <available file="${esmtp.dir}/include/${esmtp.sample.h}"/>
+    </condition>
+    <fail unless="esmtp.include.dir">Unable to locate esmtp include directory.</fail>
+
+
+	<!--   Static debug libraries in Ant's typical location (ignored unless debug build)   -->
+	<condition property="esmtp.lib.file"
+		value="${esmtp.dir}/target/debug/static/lib${esmtp.lib.name}.a">
+		<and>
+			<isset property="is-debug"/>
+			<available file="${esmtp.dir}/target/debug/static/lib${esmtp.lib.name}.a"/>
+		</and>
+	</condition>
+	<condition property="esmtp.lib.file"
+		value="${esmtp.dir}/target/debug/static/${esmtp.lib.name}.lib">
+		<and>
+			<isset property="is-debug"/>
+			<available file="${esmtp.dir}/target/debug/static/${esmtp.lib.name}.lib"/>
+		</and>
+	</condition>
+	<condition property="esmtp.lib.file"
+		value="${esmtp.dir}/target/debug/static/${esmtp.lib.name}d.lib">
+		<and>
+			<isset property="is-debug"/>
+			<available file="${esmtp.dir}/target/debug/static/${esmtp.lib.name}d.lib"/>
+		</and>
+	</condition>
+	<condition property="esmtp.lib.file"
+		value="${esmtp.dir}/target/debug/static/lib${esmtp.lib.name}.lib">
+		<and>
+			<isset property="is-debug"/>
+			<available file="${esmtp.dir}/target/debug/static/lib${esmtp.lib.name}.lib"/>
+		</and>
+	</condition>
+	<condition property="esmtp.lib.file"
+		value="${esmtp.dir}/target/debug/static/lib${esmtp.lib.name}d.lib">
+		<and>
+			<isset property="is-debug"/>
+			<available file="${esmtp.dir}/target/debug/static/lib${esmtp.lib.name}d.lib"/>
+		</and>
+	</condition>
+	<condition property="esmtp.lib.file.dir"
+		value="${esmtp.dir}/target/debug/static">
+			<isset property="esmtp.lib.file"/>
+	</condition>
+
+
+	<!--   Static debug libraries in APR's VC6 projects typical location (ignored unless debug build)   -->
+	<condition property="esmtp.lib.file"
+		value="${esmtp.dir}/LibD/${esmtp.lib.name}.lib">
+		<and>
+			<isset property="is-debug"/>
+			<available file="${esmtp.dir}/LibD/${esmtp.lib.name}.lib"/>
+		</and>
+	</condition>
+	<condition property="esmtp.lib.file.dir"
+		value="${esmtp.dir}/LibD">
+			<isset property="esmtp.lib.file"/>
+	</condition>
+
+
+	<!--   Shared debug libraries in Ant's typical location (ignored unless debug build)   -->
+	<condition property="esmtp.lib.file"
+		value="${esmtp.dir}/target/debug/shared/lib${esmtp.lib.name}.la">
+		<and>
+			<isset property="is-debug"/>
+			<available file="${esmtp.dir}/target/debug/shared/lib${esmtp.lib.name}.la"/>
+		</and>
+	</condition>
+	<condition property="esmtp.lib.file"
+		value="${esmtp.dir}/target/debug/shared/${esmtp.lib.name}.lib">
+		<and>
+			<isset property="is-debug"/>
+			<available file="${esmtp.dir}/target/debug/shared/${esmtp.lib.name}.lib"/>
+		</and>
+	</condition>
+	<condition property="esmtp.lib.file"
+		value="${esmtp.dir}/target/debug/shared/${esmtp.lib.name}d.lib">
+		<and>
+			<isset property="is-debug"/>
+			<available file="${esmtp.dir}/target/debug/shared/${esmtp.lib.name}d.lib"/>
+		</and>
+	</condition>
+	<condition property="esmtp.lib.file"
+		value="${esmtp.dir}/target/debug/shared/lib${esmtp.lib.name}.lib">
+		<and>
+			<isset property="is-debug"/>
+			<available file="${esmtp.dir}/target/debug/shared/lib${esmtp.lib.name}.lib"/>
+		</and>
+	</condition>
+	<condition property="esmtp.lib.file"
+		value="${esmtp.dir}/target/debug/shared/lib${esmtp.lib.name}d.lib">
+		<and>
+			<isset property="is-debug"/>
+			<available file="${esmtp.dir}/target/debug/shared/lib${esmtp.lib.name}d.lib"/>
+		</and>
+	</condition>
+	<condition property="esmtp.lib.file.dir"
+		value="${esmtp.dir}/target/debug/shared">
+			<isset property="esmtp.lib.file"/>
+	</condition>
+
+
+	<!--   Shared debug libraries in APR's VC6 projects typical location (ignored unless debug build)   -->
+	<condition property="esmtp.lib.file"
+		value="${esmtp.dir}/Debug/lib${esmtp.lib.name}.lib">
+		<and>
+			<isset property="is-debug"/>
+			<available file="${esmtp.dir}/Debug/lib${esmtp.lib.name}.lib"/>
+		</and>
+	</condition>
+	<condition property="esmtp.lib.file.dir"
+		value="${esmtp.dir}/Debug">
+			<isset property="esmtp.lib.file"/>
+	</condition>
+
+
+
+	<!--   Static release libraries in Ant's typical location   -->
+	<condition property="esmtp.lib.file"
+		value="${esmtp.dir}/target/release/static/lib${esmtp.lib.name}.a">
+			<available file="${esmtp.dir}/target/release/static/lib${esmtp.lib.name}.a"/>
+	</condition>
+	<condition property="esmtp.lib.file"
+		value="${esmtp.dir}/target/release/static/${esmtp.lib.name}.lib">
+			<available file="${esmtp.dir}/target/release/static/${esmtp.lib.name}.lib"/>
+	</condition>
+	<condition property="esmtp.lib.file"
+		value="${esmtp.dir}/target/release/static/lib${esmtp.lib.name}.lib">
+			<available file="${esmtp.dir}/target/release/static/lib${esmtp.lib.name}.lib"/>
+	</condition>
+	<condition property="esmtp.lib.file"
+		value="${esmtp.dir}/target/release/static/lib${esmtp.lib.name}d.lib">
+			<available file="${esmtp.dir}/target/release/static/lib${esmtp.lib.name}d.lib"/>
+	</condition>
+	<condition property="esmtp.lib.file.dir"
+		value="${esmtp.dir}/target/release/static">
+			<isset property="esmtp.lib.file"/>
+	</condition>
+
+
+
+	<!--   Static release libraries in APR's VC6 projects typical location (ignored unless debug build)   -->
+	<condition property="esmtp.lib.file"
+		value="${esmtp.dir}/LibR/${esmtp.lib.name}.lib">
+			<available file="${esmtp.dir}/LibR/${esmtp.lib.name}.lib"/>
+	</condition>
+	<condition property="esmtp.lib.file.dir"
+		value="${esmtp.dir}/LibR">
+			<isset property="esmtp.lib.file"/>
+	</condition>
+
+
+	<!--   Shared release libraries in Ant's typical location (ignored unless debug build)   -->
+	<condition property="esmtp.lib.file"
+		value="${esmtp.dir}/target/release/shared/lib${esmtp.lib.name}.la">
+			<available file="${esmtp.dir}/target/release/shared/lib${esmtp.lib.name}.la"/>
+	</condition>
+	<condition property="esmtp.lib.file"
+		value="${esmtp.dir}/target/release/shared/${esmtp.lib.name}.lib">
+			<available file="${esmtp.dir}/target/release/shared/${esmtp.lib.name}.lib"/>
+	</condition>
+	<condition property="esmtp.lib.file"
+		value="${esmtp.dir}/target/release/shared/lib${esmtp.lib.name}.lib">
+			<available file="${esmtp.dir}/target/release/shared/lib${esmtp.lib.name}.lib"/>
+	</condition>
+	<condition property="esmtp.lib.file.dir"
+		value="${esmtp.dir}/target/release/shared">
+			<isset property="esmtp.lib.file"/>
+	</condition>
+
+
+
+	<!--   Shared release libraries in APR's VC6 projects typical location   -->
+	<condition property="esmtp.lib.file"
+		value="${esmtp.dir}/Release/lib${esmtp.lib.name}.lib">
+			<available file="${esmtp.dir}/Release/lib${esmtp.lib.name}.lib"/>
+	</condition>
+	<condition property="esmtp.lib.file.dir"
+		value="${esmtp.dir}/Release">
+			<isset property="esmtp.lib.file"/>
+	</condition>
+
+
+
+	<condition property="esmtp.lib.dir" value="${esmtp.lib.file.dir}">
+		<and>
+			<isset property="esmtp.lib.file.dir"/>
+			<not>
+				<or>
+					<!--  default search path -->
+					<equals arg1="${esmtp.lib.file.dir}" arg2="/usr"/>
+				</or>
+			</not>
+		</and>
+	</condition>
+
+	<condition property="esmtp.lib.suffix" value="d">
+		<or>
+			<contains string="${esmtp.lib.file}" substring="/lib${esmtp.lib.name}d."/>
+			<contains string="${esmtp.lib.file}" substring="/${esmtp.lib.name}d."/>
+		</or>
+	</condition>
+	<condition property="esmtp.lib.suffix" value="D">
+		<or>
+			<contains string="${esmtp.lib.file}" substring="/lib${esmtp.lib.name}D."/>
+			<contains string="${esmtp.lib.file}" substring="/${esmtp.lib.name}D."/>
+		</or>
+	</condition>
+	<condition property="esmtp.lib.suffix" value="">
+		<isset property="esmtp.lib.file"/>
+	</condition>
+
+	<condition property="esmtp.lib.prefix" value="lib">
+		<or>
+			<contains string="[${esmtp.lib.file}]" substring="/lib${esmtp.lib.name}.lib]"/>
+		</or>
+	</condition>
+	<condition property="esmtp.lib.prefix" value="">
+		<isset property="esmtp.lib.file"/>
+	</condition>
+
+	<condition property="esmtp.lib.type" value="shared">
+		<or>
+			<contains string="${esmtp.lib.file}]" 
+				substring=".dylib]" 
+				casesensitive="no"/>
+			<contains string="${esmtp.lib.file}]" 
+				substring=".so]" 
+				casesensitive="no"/>
+			<contains string="${esmtp.lib.file}]" 
+				substring=".la]" 
+				casesensitive="no"/>
+			<and>
+				<!--   if we have just a .lib, guess based on file size.
+				      Import libs should be much smaller.  -->
+				<contains string="${esmtp.lib.file}]" 
+					substring=".lib]" 
+					casesensitive="no"/>
+				<isfileselected file="${esmtp.lib.file}">
+					<size value="250000" when="less"/>
+				</isfileselected>
+			</and>
+		</or>
+	</condition>
+
+
+	<condition property="esmtp.lib.type" value="static">
+		<isset property="esmtp.lib.file"/>
+	</condition>
+
+        
+    <condition property="esmtp.src.dir" value="${with-esmtp}">
+        <available file="${with-esmtp}/${esmtp.sample.c}"/>
+    </condition>
+    
+    <condition property="esmtp.src.dir" value="${esmtp.dir}">
+        <available file="${esmtp.dir}/${esmtp.sample.c}"/>
+    </condition>
+
+    <condition property="esmtp.src.dir" value="${relative-esmtp}">
+        <available file="${relative-esmtp}/${esmtp.sample.c}"/>
+    </condition>
+
+	<echo>esmtp-find:
+esmtp.dir=${esmtp.dir}
+esmtp.include.dir=${esmtp.include.dir}
+esmtp.src.dir=${esmtp.src.dir}
+esmtp.lib.file=${esmtp.lib.file}
+esmtp.lib.file.dir=${esmtp.lib.file.dir}
+esmtp.lib.dir=${esmtp.lib.dir}
+esmtp.lib.prefix=${esmtp.lib.prefix}
+esmtp.lib.suffix=${esmtp.lib.suffix}
+esmtp.lib.type=${esmtp.lib.type}
+</echo>
+</target>