hgomez 01/11/20 13:32:59
Modified: jk/native build.xml
Log:
Fix apache includes when they are not under
apache home, ie follow FHS and live for
example in /usr/include/apache anf /usr/include/apache2
Just have to define apache13.include, apache2.include
to ovveride default setting
Revision Changes Path
1.18 +6 -4 jakarta-tomcat-connectors/jk/native/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/build.xml,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- build.xml 2001/11/17 06:00:24 1.17
+++ build.xml 2001/11/20 21:32:59 1.18
@@ -22,13 +22,16 @@
<property name="apache2.home" location="/opt/apache2" />
<property name="apache13.home" location="/usr" />
+ <property name="apache2.include" location="${apache2.home}/include" />
+ <property name="apache13.include" location="${apache13.home}/include" />
+
<property name="so.debug" value="true" />
<property name="so.optimize" value="false" />
<property name="so.profile" value="false" />
<!-- ==================== Targets ==================== -->
- <target name="main" depends="init,apache20,jni">
+ <target name="main" depends="init,apache20,apache13,jni">
</target>
<target name="init" >
@@ -126,7 +129,7 @@
</src>
<includes>
<include name="${native.dir}/common" />
- <include name="${apache2.home}/include" />
+ <include name="${apache2.include}" />
<include name="${java.home}/../include" />
</includes>
<depends>
@@ -154,8 +157,7 @@
<includes>
<include name="${native.dir}/common" />
<include name="${build.compiler.base}/include" />
- <include name="${apache13.home}/include/apache" />
- <include name="${apache13.home}/include" />
+ <include name="${apache13.include}" />
<include name="${java.home}/../include" />
<!-- Platform specific includes -->
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
