truk 2004/03/10 11:07:41
Modified: jk/native2 configure.in
jk/native2/server/apache2 Makefile.in
jk/support jk_java.m4
Log:
Only build libjkjni.so when --with-jni is specified.
Revision Changes Path
1.22 +3 -2 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.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- configure.in 27 Feb 2004 16:07:39 -0000 1.21
+++ configure.in 10 Mar 2004 19:07:40 -0000 1.22
@@ -142,6 +142,7 @@
AC_SUBST(JAVA_PLATFORM)
AC_SUBST(OS)
AC_SUBST(HAVE_JNI)
+AC_SUBST(JNI_BUILD)
AC_SUBST(HAS_PCRE)
AC_SUBST(PCRE_LIBS)
1.21 +3 -1 jakarta-tomcat-connectors/jk/native2/server/apache2/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/Makefile.in,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- Makefile.in 27 Feb 2004 19:14:33 -0000 1.20
+++ Makefile.in 10 Mar 2004 19:07:40 -0000 1.21
@@ -99,7 +99,9 @@
# ---------- Targets --------------------
-all: prepare ${BUILD_DIR}/mod_jk2.so ${BUILD_DIR}/libjkjni.so
+all: prepare ${BUILD_DIR}/mod_jk2.so @JNI_BUILD@
+
+jni-build: ${BUILD_DIR}/libjkjni.so
${BUILD_DIR}/mod_jk2.so: ${BUILD_DIR}/mod_jk2.la
$(MOD_INSTALL) $^ `pwd`/${BUILD_DIR}
1.8 +2 -1 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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- jk_java.m4 24 Feb 2004 08:41:40 -0000 1.7
+++ jk_java.m4 10 Mar 2004 19:07:41 -0000 1.8
@@ -43,6 +43,7 @@
if ${TEST} ${use_jni} ; then
HAVE_JNI="-DHAVE_JNI"
+ JNI_BUILD="jni-build"
fi
])
])
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
