costin 2003/03/03 23:12:14
Modified: jk/native2 build.xml
Log:
Few fixes to get it to compile with the default redhat apache.
As is common those days, RedHat decided to make the life easy for developers
by messing out the file locations used by apache - since they know better
how files should be named...
Revision Changes Path
1.40 +5 -2 jakarta-tomcat-connectors/jk/native2/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/build.xml,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- build.xml 9 Feb 2003 21:29:17 -0000 1.39
+++ build.xml 4 Mar 2003 07:12:13 -0000 1.40
@@ -223,6 +223,7 @@
<includepath location="${native.dir}/include" />
<sysincludepath location="${apache2.home}/include" />
+ <sysincludepath location="${apache2.home}/include/httpd" />
<sysincludepath location="${apr.include}" />
<sysincludepath location="${apr-util.include}" />
@@ -267,7 +268,8 @@
</target>
<target name="apache20" depends="init" if="apache2.detect">
- <property name="apr.include" location="${apache2.home}/include" />
+ <property name="apache2.include" value="${apache2.home}/include" />
+ <property name="apr.include" location="${apache2.include}" />
<mkdir dir="${build.dir}/apache2${arch.prefix}" />
<so sofile="mod_jk2"
buildDir="${build.dir}/apache2${arch.prefix}"
@@ -297,7 +299,7 @@
</src>
<includes>
<include name="${native.dir}/common" />
- <include name="${apache2.home}/include" />
+ <include name="${apache2.include}" />
<include name="${apr.include}" />
<include name="${apr-util.include}" />
<include name="${native.dir}/include" />
@@ -352,6 +354,7 @@
<include name="${java.home}/../include" />
<include name="${build.compiler.base}/include" />
<include name="${apr.include}" />
+ <include name="${apr.include}/httpd" />
<!-- Platform specific includes -->
<include name="${novellndk.home}/include/nlm" if="netware" />
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
