You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by co...@apache.org on 2003/05/02 21:52:06 UTC

cvs commit: jakarta-tomcat-connectors/jk/native2 build.xml

costin      2003/05/02 12:52:06

  Modified:    jk/native2 build.xml
  Log:
  Move properties - they are used in multiple targets
  
  Revision  Changes    Path
  1.42      +4 -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.41
  retrieving revision 1.42
  diff -u -r1.41 -r1.42
  --- build.xml	9 Apr 2003 17:40:00 -0000	1.41
  +++ build.xml	2 May 2003 19:52:05 -0000	1.42
  @@ -24,6 +24,9 @@
     <!-- Uncomment if you want to use APR in apache1.3 
     <property name="APACHE13_APR" value="true" />
       -->
  +
  +  <property name="apache2.include" value="${apache2.home}/include" />
  +  <property name="apr.include" location="${apache2.include}" />
    
     <!-- ========== Build options ========== -->
   
  @@ -268,8 +271,6 @@
     </target>
     
     <target name="apache20" depends="init" if="apache2.detect">
  -    <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}"
  @@ -337,6 +338,7 @@
       <property name="apr.home" location="${apache2.home}" />
       <property name="apr.include" location="${apr.home}/include" />
       <property name="apr.lib" location="${apr.home}/lib" />
  +
       <so sofile="libjkjni" 
   	buildDir="${build.dir}/jni${arch.prefix}" 
   	optimize="${so.optimize}"
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org