tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jfcl...@apache.org
Subject cvs commit: jakarta-tomcat-connectors/jk/native/common list.mk.in Makefile.in jk_worker_list.h
Date Thu, 14 Jun 2001 14:38:14 GMT
jfclere     01/06/14 07:38:14

  Modified:    jk/native configure.in
               jk/native/apache-1.3 Makefile.am Makefile.apxs.in
               jk/native/apache-2.0 Makefile.apxs.in
               jk/native/common Makefile.in jk_worker_list.h
  Added:       jk/native/common list.mk.in
  Removed:     jk/native Makefile.in
               jk/native/apache-1.3 Makefile.in list.mk
  Log:
  Add logic for --enable-jni. (include of jni.h necessary).
  
  Revision  Changes    Path
  1.5       +21 -7     jakarta-tomcat-connectors/jk/native/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/configure.in,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- configure.in	2001/06/08 12:31:32	1.4
  +++ configure.in	2001/06/14 14:38:13	1.5
  @@ -1,7 +1,7 @@
   dnl
   dnl Process this file with autoconf to produce a configure script
   dnl
  -AC_REVISION($id$)dnl
  +AC_REVISION($Id: configure.in,v 1.5 2001/06/14 14:38:13 jfclere Exp $)dnl
   
   AC_PREREQ(2.13)
   AC_INIT(common/jk_ajp13.h)
  @@ -179,6 +179,17 @@
   APACHE_DIR=${apache_dir}
   AC_SUBST(APACHE_DIR)
   
  +dnl Check for enable-jni
  +JK_JNI_WORKER=""
  +AC_ARG_ENABLE(jni,
  +[  --enable-jni     Build jni_connect.so and enable jni_worker.],
  +[
  +    AC_MSG_RESULT(jni enable (need JDK))
  +    CFLAGS="${CFLAGS} -DHAVE_JNI"
  +    JK_JNI_WORKER="\${JK}/jk_jni_worker\${OEXT}"
  +])dnl
  +AC_SUBST(JK_JNI_WORKER)
  +
   dnl CFLAGS for EAPI mod_ssl (Apache 1.3)
   dnl it also allows the CFLAGS environment variable.
   CFLAGS="${CFLAGS}"
  @@ -209,6 +220,8 @@
   AC_SUBST(APXSCFLAGS)
   AC_SUBST(APXSLDFLAGS)
   
  +if ${TEST} -n "${JK_JNI_WORKER}" ; then
  +                        
   dnl Find the JDK
   dnl Results go in JAVA_HOME
   dnl Also sets JAVA_PLATFORM to 1 for 1.1 and to 2 for 1.2
  @@ -289,7 +302,6 @@
                       do
                           GUESS="${JAVA_PREFIX}/${VARIANT}1.${JAVA_PLATFORM}${subversion}"
   dnl                        AC_MSG_CHECKING([${GUESS}])
  -                        
                           if ${TEST} -d "${GUESS}/bin" \
                           && ${TEST} -d "${GUESS}/include" ; then
                           
  @@ -327,7 +339,7 @@
           fi                                                                      
   
           
  -    else
  +else
       
           AC_MSG_CHECKING(Java platform)
   
  @@ -343,14 +355,13 @@
   
           AC_MSG_RESULT(forced Java ${JAVA_PLATFORM})
   
  -    fi
  +fi
  +dnl end of JServ ;=)
   
  +dnl test if --enable-jni give but not valid JAVA_HOME
   if ${TEST} -z "${JAVA_HOME}" ; then
  -
       AC_MSG_ERROR([JDK home not found, please specify one with --with-java-home option (run
./configure --help for more options)])
   fi
  -dnl end of JServ ;=)
  -AC_SUBST(JAVA_HOME)
   
   dnl guess OS = OS_TYPE for jni_md.h
   OS=""
  @@ -381,6 +392,8 @@
           fi
       fi
   ])
  +fi
  +AC_SUBST(JAVA_HOME)
   AC_SUBST(OS)
   
   
  @@ -405,4 +418,5 @@
   	apache-2.0/Makefile
   	apache-2.0/Makefile.apxs
   	common/Makefile
  +	common/list.mk
   	])
  
  
  
  1.2       +1 -1      jakarta-tomcat-connectors/jk/native/apache-1.3/Makefile.am
  
  Index: Makefile.am
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-1.3/Makefile.am,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Makefile.am	2001/06/05 10:27:52	1.1
  +++ Makefile.am	2001/06/14 14:38:13	1.2
  @@ -15,7 +15,7 @@
   JAVA_LIB=-L ${JAVA_HOME}/jre/lib/${ARCH} -L ${JAVA_HOME}/lib/${ARCH}/native_threads
   AM_CFLAGS=@apache_include@ -I../common
   
  -include list.mk
  +include ../common/list.mk.in
   
   if MAKE_DYNAMIC_APACHE
   
  
  
  
  1.2       +1 -1      jakarta-tomcat-connectors/jk/native/apache-1.3/Makefile.apxs.in
  
  Index: Makefile.apxs.in
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-1.3/Makefile.apxs.in,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Makefile.apxs.in	2001/06/05 10:27:52	1.1
  +++ Makefile.apxs.in	2001/06/14 14:38:13	1.2
  @@ -13,7 +13,7 @@
   
   ## read the object (.c) from the list file.
   OEXT=.c
  -include list.mk
  +include ../common/list.mk
   
   all: mod_jk.so
   
  
  
  
  1.2       +1 -1      jakarta-tomcat-connectors/jk/native/apache-2.0/Makefile.apxs.in
  
  Index: Makefile.apxs.in
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/Makefile.apxs.in,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Makefile.apxs.in	2001/06/08 12:30:07	1.1
  +++ Makefile.apxs.in	2001/06/14 14:38:13	1.2
  @@ -13,7 +13,7 @@
   
   ## read the object (.c) from the list file.
   OEXT=.c
  -include ../apache-1.3/list.mk
  +include ../common/list.mk
   
   all: mod_jk.so
   
  
  
  
  1.2       +1 -1      jakarta-tomcat-connectors/jk/native/common/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/Makefile.in,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Makefile.in	2001/06/05 10:27:55	1.1
  +++ Makefile.in	2001/06/14 14:38:14	1.2
  @@ -1,5 +1,5 @@
   OEXT=.lo
  -include ../apache-1.3/list.mk
  +include list.mk
   
   JAVA_INCL=-I @JAVA_HOME@/include -I @JAVA_HOME@/include/@OS@
   CFLAGS=@apache_include@ @CFLAGS@ ${JAVA_INCL}
  
  
  
  1.3       +3 -3      jakarta-tomcat-connectors/jk/native/common/jk_worker_list.h
  
  Index: jk_worker_list.h
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_worker_list.h,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- jk_worker_list.h	2001/05/18 16:46:19	1.2
  +++ jk_worker_list.h	2001/06/14 14:38:14	1.3
  @@ -56,7 +56,7 @@
   /***************************************************************************
    * Description: Worker list                                                *
    * Author:      Gal Shachor <shachor@il.ibm.com>                           *
  - * Version:     $Revision: 1.2 $                                           *
  + * Version:     $Revision: 1.3 $                                           *
    ***************************************************************************/
   
   /*
  @@ -80,7 +80,7 @@
           #include "jk_ajp12_worker.h"
           #include "jk_ajp13_worker.h"
           #include "jk_ajp14_worker.h"
  -        #ifndef HPUX11GCC
  +        #ifdef HAVE_JNI
               #include "jk_jni_worker.h"
           #endif
           #include "jk_lb_worker.h"
  @@ -110,7 +110,7 @@
                * In process JNI based worker. Requires the server to be 
                * multithreaded and to use native threads.
                */
  -            #ifndef HPUX11GCC
  +            #ifdef HAVE_JNI
                   { JK_JNI_WORKER_NAME, jni_worker_factory},
               #endif
               /*
  
  
  
  1.1                  jakarta-tomcat-connectors/jk/native/common/list.mk.in
  
  Index: list.mk.in
  ===================================================================
  ## Object needed for mod_jk for Apache-1.3
  APACHE_OBJECTS= ${JK}/jk_ajp12_worker${OEXT} ${JK}/jk_connect${OEXT} \
                  ${JK}/jk_msg_buff${OEXT} ${JK}/jk_util${OEXT} \
                  ${JK}/jk_ajp13${OEXT} ${JK}/jk_pool${OEXT} \
                  ${JK}/jk_worker${OEXT} ${JK}/jk_ajp13_worker${OEXT} \
                  ${JK}/jk_lb_worker${OEXT} ${JK}/jk_sockbuf${OEXT} \
                  ${JK}/jk_map${OEXT} ${JK}/jk_uri_worker_map${OEXT} \
                  ${JK}/jk_ajp14${OEXT} ${JK}/jk_ajp14_worker${OEXT} \
                  ${JK}/jk_md5${OEXT} @JK_JNI_WORKER@ \
                  ${JK}/jk_ajp_common${OEXT} ${JK}/jk_context${OEXT}
  
  
  

Mime
View raw message