Author: carnold
Date: Mon Feb 25 22:00:33 2008
New Revision: 631094
URL: http://svn.apache.org/viewvc?rev=631094&view=rev
Log:
LOGCXX-247: MSVC projects have wrong include path, revert 630402
Modified:
logging/log4cxx/trunk/src/ant/find-apr-util.xml
logging/log4cxx/trunk/src/ant/find-apr.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=631094&r1=631093&r2=631094&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/ant/find-apr-util.xml (original)
+++ logging/log4cxx/trunk/src/ant/find-apr-util.xml Mon Feb 25 22:00:33 2008
@@ -22,18 +22,9 @@
</condition>
<condition property="apr-util.src.dir" value="${apr-util.dir}">
<available file="${apr-util.dir}/${apr-util.sample.c}"/>
- </condition>
- <property name="apr-util.cwd.parent" location=".."/>
- <condition property="apr-util.src.dir"
value="${apr-util.cwd.parent}/apr-util">
- <available
file="${apr-util.cwd.parent}/apr-util/${apr-util.sample.c}"/>
- </condition>
- <property name="apr-util.cwd.grand" location="../.."/>
- <condition property="apr-util.src.dir"
value="${apr-util.cwd.grand}/apr-util">
- <available
file="${apr-util.cwd.grand}/apr-util/${apr-util.sample.c}"/>
- </condition>
- <property name="apr-util.cwd.great" location="../../.."/>
- <condition property="apr-util.src.dir"
value="${apr-util.cwd.great}/apr-util">
- <available
file="${apr-util.cwd.great}/apr-util/${apr-util.sample.c}"/>
+ </condition>
+ <condition property="apr-util.src.dir" value="../apr-util">
+ <available file="../apr-util/${apr-util.sample.c}"/>
</condition>
</target>
@@ -319,4 +310,4 @@
apr-util.lib.suffix=${apr-util.lib.suffix}
apr-util.lib.type=${apr-util.lib.type}
</echo>
-</target>
+</target>
Modified: logging/log4cxx/trunk/src/ant/find-apr.xml
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/ant/find-apr.xml?rev=631094&r1=631093&r2=631094&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/ant/find-apr.xml (original)
+++ logging/log4cxx/trunk/src/ant/find-apr.xml Mon Feb 25 22:00:33 2008
@@ -22,18 +22,9 @@
</condition>
<condition property="apr.src.dir" value="${apr.dir}">
<available file="${apr.dir}/${apr.sample.c}"/>
- </condition>
- <property name="apr.cwd.parent" location=".."/>
- <condition property="apr.src.dir" value="${apr.cwd.parent}/apr">
- <available file="${apr.cwd.parent}/apr/${apr.sample.c}"/>
- </condition>
- <property name="apr.cwd.grand" location="../.."/>
- <condition property="apr.src.dir" value="${apr.cwd.grand}/apr">
- <available file="${apr.cwd.grand}/apr/${apr.sample.c}"/>
- </condition>
- <property name="apr.cwd.great" location="../../.."/>
- <condition property="apr.src.dir" value="${apr.cwd.great}/apr">
- <available file="${apr.cwd.great}/apr/${apr.sample.c}"/>
+ </condition>
+ <condition property="apr.src.dir" value="../apr">
+ <available file="../apr/${apr.sample.c}"/>
</condition>
</target>
@@ -319,4 +310,4 @@
apr.lib.suffix=${apr.lib.suffix}
apr.lib.type=${apr.lib.type}
</echo>
-</target>
+</target>
