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/05 11:38:28 UTC
cvs commit: jakarta-tomcat-connectors/jk/support jk_apr.m4
hgomez 2002/06/05 02:38:28
Modified: jk/native2 configure.in
jk/support jk_apr.m4
Log:
Check that APR is present when JNI support is asked for Apache 1.3
Revision Changes Path
1.6 +10 -13 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- configure.in 4 Jun 2002 10:29:41 -0000 1.5
+++ configure.in 5 Jun 2002 09:38:28 -0000 1.6
@@ -58,7 +58,7 @@
dnl --------------------------------------------------------------------------
dnl Author Henri Gomez <hg...@slib.fr>
dnl
-dnl Version $Id: configure.in,v 1.5 2002/06/04 10:29:41 hgomez Exp $
+dnl Version $Id: configure.in,v 1.6 2002/06/05 09:38:28 hgomez Exp $
dnl --------------------------------------------------------------------------
dnl sinclude(../support/jk_apache_static.m4)
@@ -71,7 +71,7 @@
dnl
dnl Process this file with autoconf to produce a configure script
dnl
-AC_REVISION($Id: configure.in,v 1.5 2002/06/04 10:29:41 hgomez Exp $)dnl
+AC_REVISION($Id: configure.in,v 1.6 2002/06/05 09:38:28 hgomez Exp $)dnl
AC_PREREQ(2.13)
AC_INIT(common/jk_config.c)
@@ -198,17 +198,14 @@
AC_SUBST(WEBSERVERS)
-AM_CONDITIONAL(MAKE_DYNAMIC_APACHE, ${TEST} "${apache_dir_is_src}" = "false")
-
-if ${TEST} "${apache_dir_is_src}" = "false" ; then
-dnl ????
- APACHE20_OEXT=.c
- LIB_JK_TYPE=mod_jk.so
- INSTALL_TYPE=install_dynamic
-else
- APACHE20_OEXT=.lo
- LIB_JK_TYPE=lib_jk.la
- INSTALL_TYPE=install_static
+dnl check if apache 1.3 selected with jni support
+if ! ${TEST} -z "$APACHE_HOME" ; then
+dnl check jni wanted
+ if ${TEST} "${use_jni}" = "true"; then
+ if ! ${TEST} "${use_apr}" = "true"; then
+ AC_MSG_ERROR(Apache 1.3 need apr to use jni)
+ fi
+ fi
fi
AC_SUBST(APACHE20_OEXT)
1.2 +4 -4 jakarta-tomcat-connectors/jk/support/jk_apr.m4
Index: jk_apr.m4
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/support/jk_apr.m4,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jk_apr.m4 24 May 2002 07:05:07 -0000 1.1
+++ jk_apr.m4 5 Jun 2002 09:38:28 -0000 1.2
@@ -60,7 +60,7 @@
dnl
dnl Inspired by Pier works on webapp m4 macros :)
dnl
-dnl Version $Id: jk_apr.m4,v 1.1 2002/05/24 07:05:07 hgomez Exp $
+dnl Version $Id: jk_apr.m4,v 1.2 2002/06/05 09:38:28 hgomez Exp $
dnl --------------------------------------------------------------------------
dnl --------------------------------------------------------------------------
@@ -101,8 +101,8 @@
APR_INCDIR="${tempval}/include"
APR_LDFLAGS="${tempval}/.libs/libapr.a"
APR_LIBDIR=""
+ use_apr=true
COMMON_APR_OBJECTS="\${COMMON_APR_OBJECTS}"
- AC_MSG_RESULT(${APR_DIR})
fi
;;
esac
@@ -148,7 +148,7 @@
APR_DIR=""
APR_INCDIR=${tempval}
COMMON_APR_OBJECTS="\${COMMON_APR_OBJECTS}"
- AC_MSG_RESULT(${APR_INCDIR})
+ use_apr=true
fi
;;
@@ -191,7 +191,7 @@
APR_LIBDIR=${tempval}
APR_LDFLAGS="-lapr -L${tempval}"
COMMON_APR_OBJECTS="\${COMMON_APR_OBJECTS}"
- AC_MSG_RESULT(${APR_LIBDIR})
+ use_apr=true
fi
;;
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>