You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by hg...@apache.org on 2002/06/04 12:29:41 UTC
cvs commit: jakarta-tomcat-connectors/jk/support jk_java.m4
hgomez 2002/06/04 03:29:41
Modified: jk/native2 configure.in
jk/support jk_java.m4
Removed: jk/native2/common list.mk
Log:
Updated configure.in to handle -with-jni
Removed list.mk, we use wildcard instead
Revision Changes Path
1.5 +5 -6 jakarta-tomcat-connectors/jk/native2/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/configure.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- configure.in 27 May 2002 13:25:44 -0000 1.4
+++ configure.in 4 Jun 2002 10:29:41 -0000 1.5
@@ -58,7 +58,7 @@
dnl --------------------------------------------------------------------------
dnl Author Henri Gomez <hg...@slib.fr>
dnl
-dnl Version $Id: configure.in,v 1.4 2002/05/27 13:25:44 jfclere Exp $
+dnl Version $Id: configure.in,v 1.5 2002/06/04 10:29:41 hgomez Exp $
dnl --------------------------------------------------------------------------
dnl sinclude(../support/jk_apache_static.m4)
@@ -71,17 +71,19 @@
dnl
dnl Process this file with autoconf to produce a configure script
dnl
-AC_REVISION($Id: configure.in,v 1.4 2002/05/27 13:25:44 jfclere Exp $)dnl
+AC_REVISION($Id: configure.in,v 1.5 2002/06/04 10:29:41 hgomez Exp $)dnl
AC_PREREQ(2.13)
AC_INIT(common/jk_config.c)
AC_CONFIG_AUX_DIR(scripts/build/unix)
dnl package and version. (synchronization with common/jk_version.h ?)
-AM_INIT_AUTOMAKE(mod_jk2, 2.0.0)
PACKAGE=mod_jk2
VERSION=2.0.0
+AC_PROG_CC
+AC_PROG_LD
+
dnl Not sure what it does, but the libtool manual seems to require this
dnl It should use the native platform dlopen ( if available )
AC_LIBTOOL_DLOPEN
@@ -90,10 +92,6 @@
dnl I have solved them once using aclocal --acdir=/usr/local/share/aclocal/
AM_PROG_LIBTOOL
-AC_PROG_CC
-
-AC_PROG_LD
-
AC_PATH_PROG(TEST,test,$PATH)dnl
AC_SUBST(TEST)
@@ -184,11 +182,13 @@
dnl Java settings
JK_JDK()
+JK_JDK_OS()
JK_JNI()
AC_SUBST(JAVA_HOME)
AC_SUBST(JAVA_PLATFORM)
AC_SUBST(OS)
+AC_SUBST(HAVE_JNI)
dnl Check that at least one WEBSERVER has been given
@@ -235,5 +235,4 @@
server/apache2/Makefile
server/apache2/Makefile.apxs
../build.properties:../build.properties.autoconf
- scripts/build/unix/dummy
])
1.2 +20 -2 jakarta-tomcat-connectors/jk/support/jk_java.m4
Index: jk_java.m4
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/support/jk_java.m4,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jk_java.m4 24 May 2002 07:05:07 -0000 1.1
+++ jk_java.m4 4 Jun 2002 10:29:41 -0000 1.2
@@ -60,7 +60,7 @@
dnl
dnl Inspired by Pier works on webapp m4 macros :)
dnl
-dnl Version $Id: jk_java.m4,v 1.1 2002/05/24 07:05:07 hgomez Exp $
+dnl Version $Id: jk_java.m4,v 1.2 2002/06/04 10:29:41 hgomez Exp $
dnl --------------------------------------------------------------------------
dnl --------------------------------------------------------------------------
@@ -198,7 +198,7 @@
AC_DEFUN(
- [JK_JNI],
+ [JK_JDK_OS],
[
tempval=""
OS=""
@@ -230,6 +230,24 @@
AC_MSG_ERROR(You should retry --with-os-type=SUBDIR)
fi
fi
+ ])
+ ])
+
+AC_DEFUN(
+ [JK_JNI],
+ [
+ AC_ARG_WITH(jni,
+ [ --with-jni Build jni support],
+ [
+ case "${withval}" in
+ y | yes | true) use_jni=true ;;
+ n | no | false) use_jni=false ;;
+ *) use_jni=true ;;
+ esac
+
+ if ${TEST} ${use_jni} ; then
+ HAVE_JNI="-DHAVE_JNI"
+ fi
])
])
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>