[Apachetoolbox-commit] Apachetoolbox/bin/contrib mod_jk,1.5,1.6

[<nir...@us...>]

Update of /cvsroot/apachetoolbox//Apachetoolbox/bin/contrib
In directory sc8-pr-cvs1:/tmp/cvs-serv30512

Modified Files:
	mod_jk 
Log Message:
Updated to be Tomcat version independent.

Index: mod_jk
===================================================================
RCS file: /cvsroot/apachetoolbox//Apachetoolbox/bin/contrib/mod_jk,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** mod_jk	4 Nov 2003 21:58:41 -0000	1.5
--- mod_jk	7 Jan 2004 05:11:03 -0000	1.6
***************
*** 1,16 ****
  cd $root/src
  
! check_source "jakarta-tomcat-connectors-$JAKARTA_TOMCAT-src.tar.gz" "http://mirrors.midco.net/pub/apache.org/jakarta/tomcat-4/v$JAKARTA_TOMCAT/src/jakarta-tomcat-connectors-$JAKARTA_TOMCAT-src.tar.gz"
   notice "$MENUTRUE" " Jakarta-Tomcat Connectors begin setup...\n"
  
!  explode jakarta-tomcat-connectors-${JAKARTA_TOMCAT}-src.tar.gz
   notice "$MENUTRUE" "  Jakarta-Tomcat Connectors tarball uncompressed...\n"
  
!   if [ ! -d jakarta-tomcat-connectors-${JAKARTA_TOMCAT}-src ]; then
     notice "$MENUFALSE" " Jakarta-Tomcat Connectors source failed to be uncompressed!\n"
     exit 1
    fi
  
! cd jakarta-tomcat-connectors-${JAKARTA_TOMCAT}-src/jk/native
  ./buildconf.sh &> $logdir/mod_jk-build.log
  ./configure --with-apache=$root/apache_$APACHE &> $logdir/mod_jk-configure.log
--- 1,16 ----
  cd $root/src
  
! check_source "jakarta-tomcat-connectors-jk-$MOD_JK-src.tar.gz" "http://mirrors.midco.net/pub/apache.org/jakarta/tomcat-connectors/jk/source/jakarta-tomcat-connectors-jk-$MOD_JK-src.tar.gz"
   notice "$MENUTRUE" " Jakarta-Tomcat Connectors begin setup...\n"
  
!  explode jakarta-tomcat-connectors-jk-$MOD_JK-src.tar.gz
   notice "$MENUTRUE" "  Jakarta-Tomcat Connectors tarball uncompressed...\n"
  
!   if [ ! -d jakarta-tomcat-connectors-jk-$MOD_JK-src ]; then
     notice "$MENUFALSE" " Jakarta-Tomcat Connectors source failed to be uncompressed!\n"
     exit 1
    fi
  
! cd jakarta-tomcat-connectors-jk-$MOD_JK-src/jk/native
  ./buildconf.sh &> $logdir/mod_jk-build.log
  ./configure --with-apache=$root/apache_$APACHE &> $logdir/mod_jk-configure.log
***************
*** 20,24 ****
  notice "$MENUTRUE" "Mod_JK setup!\n"
  
! $CP $JAKARTA_PATH/jakarta-tomcat-connectors/jk/conf/workers.properties $root/apache_$APACHE/conf
  APACHECFG="$APACHECFG --activate-module=src/modules/jk/libjk.a $r"
  
--- 20,24 ----
  notice "$MENUTRUE" "Mod_JK setup!\n"
  
! #$CP $JAKARTA_PATH/jakarta-tomcat-connectors/jk/conf/workers.properties $root/apache_$APACHE/conf
  APACHECFG="$APACHECFG --activate-module=src/modules/jk/libjk.a $r"