hgomez 2003/11/10 03:05:33
Modified: jk/native2 configure.in Makefile.in
jk/support jk_apr.m4 jk_exec.m4
jk/native2/server/apache13 mod_jk2.c Makefile.in
Log:
Latest jk2/apache 1.3 patch
Obtained from: Kurt Miller
Revision Changes Path
1.14 +14 -11 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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- configure.in 5 Nov 2003 09:15:19 -0000 1.13
+++ configure.in 10 Nov 2003 11:05:33 -0000 1.14
@@ -175,15 +175,10 @@
JK_APR_THREADS()
JK_APR([include/apr.h.in])
+JK_APR_UTIL([include/apu.h.in])
JK_APR_INCDIR([apr.h])
JK_APR_LIBDIR()
-dnl Set these to empty until we know what to do with them
-
-AC_SUBST(APR_UTIL_INCL)
-AC_SUBST(APR_UTIL_LIB)
-
-
dnl Java settings
JK_JNI()
@@ -205,11 +200,16 @@
AC_SUBST(WEBSERVERS)
+dnl if --with-apr is specified, --with-apr-util must be too
+if ${TEST} ! -z "$APR_BUILD" -a -z "$APR_UTIL_DIR"; then
+ AC_MSG_ERROR([--with-apr and --with-apr-util must be used together])
+fi
+
dnl apache 1.3 consistancy checks
if ! ${TEST} -z "$APACHE_HOME" ; then
dnl check if apache 1.3 was selected without apr sources
if ${TEST} -z "$APR_BUILD"; then
- AC_MSG_ERROR([Apache 1.3 requires apr to built from source, use
--with-apr])
+ AC_MSG_ERROR([Apache 1.3 requires apr to built from source, use
--with-apr and --with-apr-util])
fi
dnl make sure compiler matchs apxs
if ${TEST} "$APACHE_CC" != "$CC"; then
@@ -222,9 +222,9 @@
fi
dnl apache 2 consistancy checks
-if ! ${TEST} -z "$APACHE2_HOME" ; then
+if ${TEST} ! -z "$APACHE2_HOME" ; then
dnl check if apache 2 was selected with apr sources
- if ${TEST} -z "$APR_BUILD"; then
+ if ${TEST} ! -z "$APR_BUILD"; then
AC_MSG_ERROR([Use apr that comes with Apache 2, remove --with-apr])
fi
dnl make sure compiler matchs apxs
@@ -245,9 +245,12 @@
AC_SUBST(APR_CFLAGS)
AC_SUBST(APR_CLEAN)
AC_SUBST(APR_DIR)
+AC_SUBST(APR_UTIL_DIR)
AC_SUBST(APR_HOME)
AC_SUBST(APR_INCDIR)
+AC_SUBST(APR_UTIL_INCDIR)
AC_SUBST(APR_LIBDIR)
+AC_SUBST(APR_UTIL_LIBDIR)
AC_SUBST(APR_CONFIGURE_ARGS)
AC_SUBST(APR_LDFLAGS)
AC_SUBST(COMMON_APR_OBJECTS)
1.4 +2 -2 jakarta-tomcat-connectors/jk/native2/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/Makefile.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Makefile.in 4 Nov 2003 12:48:05 -0000 1.3
+++ Makefile.in 10 Nov 2003 11:05:33 -0000 1.4
@@ -41,10 +41,10 @@
done;
apr-build:
- ( cd @APR_DIR@ && make )
+ ( cd @APR_DIR@ && make && cd @APR_UTIL_DIR@ && make )
apr-clean:
- ( cd @APR_DIR@ && make clean )
+ ( cd @APR_DIR@ && make clean && cd @APR_UTIL_DIR@ && make clean )
apidocs: common/*.h
mkdir -p ./docs/api
1.8 +100 -9 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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- jk_apr.m4 5 Nov 2003 09:14:28 -0000 1.7
+++ jk_apr.m4 10 Nov 2003 11:05:33 -0000 1.8
@@ -103,6 +103,7 @@
[
case "${withval}" in
""|"yes"|"YES"|"true"|"TRUE")
+ AC_MSG_ERROR(valid apr source dir location required)
;;
"no"|"NO"|"false"|"FALSE")
AC_MSG_ERROR(valid apr source dir location required)
@@ -120,16 +121,15 @@
if ${TEST} ! -z "$tempval" ; then
APR_BUILD="apr-build"
- APR_CFLAGS="-I ${tempval}/include -DHAS_APR"
+ APR_CFLAGS="-I ${tempval}/include"
APR_CLEAN="apr-clean"
APR_DIR=${tempval}
APR_INCDIR="${tempval}/include"
AC_MSG_RESULT(configuring apr...)
- APR_CONFIGURE_ARGS="--enable-static --disable-shared
${APR_CONFIGURE_ARGS}"
tempret="0"
JK_EXEC(
[tempret],
- [./configure ${APR_CONFIGURE_ARGS}],
+ [./configure --enable-static --disable-shared ${APR_CONFIGURE_ARGS}],
[apr],
[${APR_DIR}])
if ${TEST} "${tempret}" = "0"; then
@@ -137,8 +137,8 @@
else
AC_MSG_ERROR(apr configure failed with ${tempret})
fi
- JK_APR_LIBNAME(APR_LDFLAGS,${APR_DIR})
- APR_LDFLAGS="${APR_DIR}/.libs/${APR_LDFLAGS}"
+ JK_APR_LIBNAME(apr_libname,${APR_DIR})
+ APR_LDFLAGS="${APR_DIR}/.libs/${apr_libname}"
APR_LIBDIR=""
use_apr=true
COMMON_APR_OBJECTS="\${COMMON_APR_OBJECTS}"
@@ -149,6 +149,73 @@
unset tempret
unset tempval
+ unset apr_libname
+ ])
+
+dnl --------------------------------------------------------------------------
+dnl JK_APR_UTIL
+dnl Set the APR-UTIL source dir.
+dnl $1 => File which should be present
+dnl --------------------------------------------------------------------------
+AC_DEFUN(
+ [JK_APR_UTIL],
+ [
+ tempval=""
+ AC_ARG_WITH(
+ [apr-util],
+ [ --with-apr-util=DIR Location of APR-UTIL source dir ],
+ [
+ case "${withval}" in
+ ""|"yes"|"YES"|"true"|"TRUE")
+ AC_MSG_ERROR(valid apr-util source dir location required)
+ ;;
+ "no"|"NO"|"false"|"FALSE")
+ AC_MSG_ERROR(valid apr-util source dir location required)
+ ;;
+ *)
+ tempval="${withval}"
+
+ if ${TEST} ! -d ${tempval} ; then
+ AC_MSG_ERROR(Not a directory: ${tempval})
+ fi
+
+ if ${TEST} ! -f ${tempval}/$1; then
+ AC_MSG_ERROR(can't locate ${tempval}/$1)
+ fi
+
+ if ${TEST} -z "${APR_BUILD}"; then
+ AC_MSG_ERROR([--with-apr and --with-apr-util must be used together])
+ fi
+
+ if ${TEST} ! -z "$tempval" ; then
+ APR_UTIL_DIR=${tempval}
+ APR_CFLAGS="${APR_CFLAGS} -I ${APR_UTIL_DIR}/include"
+ APR_UTIL_INCDIR="${APR_UTIL_DIR}/include"
+ AC_MSG_RESULT(configuring apr-util...)
+ tempret="0"
+ JK_EXEC(
+ [tempret],
+ [./configure --with-apr=${APR_DIR}],
+ [apr-util],
+ [${APR_UTIL_DIR}])
+ if ${TEST} "${tempret}" = "0"; then
+ AC_MSG_RESULT(apr-util configure ok)
+ else
+ AC_MSG_ERROR(apr-util configure failed with ${tempret})
+ fi
+ JK_APR_UTIL_LIBNAME(apr_util_libname,${APR_UTIL_DIR})
+ APR_LDFLAGS="${APR_LDFLAGS} ${APR_UTIL_DIR}/.libs/${apr_util_libname}"
+ APR_UTIL_LIBDIR=""
+ use_apr=true
+ COMMON_APR_OBJECTS="\${COMMON_APR_OBJECTS}"
+ fi
+ ;;
+ esac
+ ])
+
+ unset tempret
+ unset tempval
+ unset apr_util_libname
])
@@ -183,7 +250,7 @@
if ${TEST} ! -z "$tempval" ; then
APR_BUILD=""
- APR_CFLAGS="-I${tempval} -DHAS_APR"
+ APR_CFLAGS="-I${tempval}"
APR_CLEAN=""
APR_DIR=""
APR_INCDIR=${tempval}
@@ -252,17 +319,41 @@
[JK_APR_LIBNAME],
[
AC_MSG_CHECKING([for apr APR_LIBNAME])
- if test ! -f "$2/apr-config" ; then
+ if ${TEST} ! -f "$2/apr-config" ; then
AC_MSG_ERROR([cannot find apr-config file in $2])
fi
jk_apr_get_tempval=`$2/apr-config --link-libtool 2> /dev/null`
- if test -z "${jk_apr_get_tempval}" ; then
+ if ${TEST} -z "${jk_apr_get_tempval}" ; then
AC_MSG_ERROR([$2/apr-config --link-libtool failed])
fi
jk_apr_get_tempval=`basename ${jk_apr_get_tempval} | sed 's/\.la/\.a/g'`
$1="${jk_apr_get_tempval}"
AC_MSG_RESULT([${jk_apr_get_tempval}])
unset jk_apr_get_tempval
+ ])
+
+
+dnl --------------------------------------------------------------------------
+dnl JK_APR_UTIL_LIBNAME
+dnl Retrieve the complete name of the library.
+dnl $1 => Environment variable name for the returned value
+dnl $2 => APR_UTIL sources directory
+dnl --------------------------------------------------------------------------
+AC_DEFUN(
+ [JK_APR_UTIL_LIBNAME],
+ [
+ AC_MSG_CHECKING([for apr-util APR_UTIL_LIBNAME])
+ if ${TEST} ! -f "$2/apu-config" ; then
+ AC_MSG_ERROR([cannot find apu-config file in $2])
+ fi
+ jk_apu_get_tempval=`$2/apu-config --link-libtool 2> /dev/null`
+ if ${TEST} -z "${jk_apu_get_tempval}" ; then
+ AC_MSG_ERROR([$2/apu-config --link-libtool failed])
+ fi
+ jk_apu_get_tempval=`basename ${jk_apu_get_tempval} | sed 's/\.la/\.a/g'`
+ $1="${jk_apu_get_tempval}"
+ AC_MSG_RESULT([${jk_apu_get_tempval}])
+ unset jk_apu_get_tempval
])
dnl vi:set sts=2 sw=2 autoindent:
1.2 +2 -2 jakarta-tomcat-connectors/jk/support/jk_exec.m4
Index: jk_exec.m4
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/support/jk_exec.m4,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jk_exec.m4 5 Nov 2003 09:14:28 -0000 1.1
+++ jk_exec.m4 10 Nov 2003 11:05:33 -0000 1.2
@@ -97,7 +97,7 @@
{
$2
- echo "jk_exec_retvalue $?"
+ echo "\njk_exec_retvalue $?"
} | {
jk_exec_ret=0
while true ; do
1.29 +1 -10 jakarta-tomcat-connectors/jk/native2/server/apache13/mod_jk2.c
Index: mod_jk2.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache13/mod_jk2.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- mod_jk2.c 25 Sep 2003 15:23:23 -0000 1.28
+++ mod_jk2.c 10 Nov 2003 11:05:33 -0000 1.29
@@ -299,9 +299,7 @@
-#ifdef HAS_APR
apr_pool_t *jk_globalPool;
-#endif
/* Create the initial set of objects. You need to cut&paste this and
adapt to your server.
@@ -312,17 +310,10 @@
jk_pool_t *globalPool;
jk_bean_t *jkb;
-#ifdef HAS_APR
apr_initialize();
apr_pool_create( &jk_globalPool, NULL );
jk2_pool_apr_create( NULL, &globalPool, NULL, jk_globalPool );
-#else
- /** First create a pool. We use the default ( jk ) pool impl,
- * other choices are apr or native.
- */
- jk2_pool_create( NULL, &globalPool, NULL, 2048 );
-#endif
/** Create the global environment. This will register the default
factories, to be overriten later.
1.8 +3 -6 jakarta-tomcat-connectors/jk/native2/server/apache13/Makefile.in
Index: Makefile.in
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache13/Makefile.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Makefile.in 28 Nov 2002 15:54:51 -0000 1.7
+++ Makefile.in 10 Nov 2003 11:05:33 -0000 1.8
@@ -23,7 +23,7 @@
${APACHE_INCL}
JK_CFLAGS=-DCHUNK_SIZE=4096 -DUSE_APACHE_MD5 @APR_CFLAGS@ -DHAVE_MMAP ${JAVA_INCL}
-JK_LDFLAGS=-L${APACHE_HOME}/lib -lcrypt @APR_LDFLAGS@ ${JAVA_LIB}
+JK_LDFLAGS=-L${APACHE_HOME}/lib ${JAVA_LIB}
###### Based on rules.mk ##########################################
ALL_CFLAGS = $(EXTRA_CFLAGS) $(NOTEST_CFLAGS) $(CFLAGS)
@@ -36,7 +36,7 @@
COMPILE = $(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(ALL_INCLUDES)
SH_COMPILE = $(LIBTOOL) --mode=compile $(COMPILE) $(JK_CFLAGS)
-MOD_LINK = $(LIBTOOL) --mode=link $(CC) -avoid-version -module -rpath
$(APACHE_LIBEXEC) $(LT_LDFLAGS) $(ALL_LDFLAGS) $(JK_LDFLAGS)
+MOD_LINK = $(LIBTOOL) --mode=link $(CC) -avoid-version -module -shared -rpath
$(APACHE_LIBEXEC) $(LT_LDFLAGS) $(ALL_LDFLAGS) $(JK_LDFLAGS)
MOD_INSTALL = $(LIBTOOL) --mode=install $(CP)
#############################################################################
@@ -76,10 +76,7 @@
all: prepare ${BUILD_DIR}/mod_jk2.so
-${BUILD_DIR}/mod_jk2.so: ${BUILD_DIR}/mod_jk2.la
- $(MOD_INSTALL) cp $^ `pwd`/${BUILD_DIR}
-
-${BUILD_DIR}/mod_jk2.la: ${COMMON_LO_FILES} ${A_LO_FILES}
+${BUILD_DIR}/mod_jk2.so: ${COMMON_LO_FILES} ${A_LO_FILES}
${MOD_LINK} -o $@ $^ @APR_LDFLAGS@
${COMMON_C_FILES} ${A_C_FILES}: ${H_FILES}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
