jfclere 2004/02/09 01:20:28
Modified: jk/native2 configure.in
jk/native2/server/apache2 Makefile.in
jk/support jk_ws.m4
Log:
Now --with-apache2 works OK.
Note apache-2.0 MUST be configured before configuring mod_jk2.
Revision Changes Path
1.19 +4 -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.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- configure.in 8 Feb 2004 22:05:56 -0000 1.18
+++ configure.in 9 Feb 2004 09:20:28 -0000 1.19
@@ -118,6 +118,8 @@
AC_SUBST(MKDIR)
dnl APXS settings
+APR_LIBDIR_LA=""
+AC_SUBST(APR_LIBDIR_LA)
JK_APXS([], [location of apxs for Apache 1.3])
JK_APXS([2], [location of apxs for Apache 2.0])
1.17 +5 -0 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.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- Makefile.in 6 Feb 2004 09:10:40 -0000 1.16
+++ Makefile.in 9 Feb 2004 09:20:28 -0000 1.17
@@ -10,6 +10,7 @@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@/lib
[EMAIL PROTECTED]@ @APR_UTIL_INCDIR@ @APR_INCDIR@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
@@ -37,7 +38,11 @@
${JAVA_INCL}
JK_CFLAGS=-DCHUNK_SIZE=4096 -DUSE_APACHE_MD5 -DHAS_APR @HAVE_JNI@ @HAS_PCRE@
+ifdef APR_LIBDIR_LA
+JK_LDFLAGS=-L${APACHE2_LIBDIR} -lcrypt @PCRE_LIBS@
+else
JK_LDFLAGS=-L${APACHE2_LIBDIR} -lcrypt -lapr-0 @PCRE_LIBS@
+endif
###### Based on rules.mk ##########################################
ALL_CFLAGS = $(EXTRA_CFLAGS) $(NOTEST_CFLAGS) $(CFLAGS)
1.6 +20 -1 jakarta-tomcat-connectors/jk/support/jk_ws.m4
Index: jk_ws.m4
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/support/jk_ws.m4,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- jk_ws.m4 8 Feb 2004 22:05:56 -0000 1.5
+++ jk_ws.m4 9 Feb 2004 09:20:28 -0000 1.6
@@ -114,6 +114,25 @@
$2_INCL="-I${tempval}/src/include -I${withval}/src/${osdir}"
$2_INCDIR="${tempval}/src/include"
fi
+ if ${TEST} -d ${tempval}/srclib/apr ; then
+ # Apache 2 contains apr.
+ if ${TEST} ! -f ${tempval}/srclib/apr/config.status ; then
+ AC_MSG_ERROR(configure Apache2 before mod_jk2)
+ fi
+ osdir=`${GREP} @OSDIR@ ${tempval}/srclib/apr/config.status | sed
's:s,@OSDIR@,::' | sed 's:,;t t::'`
+ $2_INCL="-I${tempval}/include -I${withval}/os/${osdir}"
+ $2_LIBEXEC=`${GREP} "^exp_libexecdir =" ${tempval}/build/config_vars.mk
| sed 's:exp_libexecdir = ::'`
+ LIBTOOL=${tempval}/srclib/apr/libtool
+ APR_INCDIR=-I${tempval}/srclib/apr/include
+ APR_CFLAGS=`${tempval}/srclib/apr/apr-config --cflags`
+ APR_UTIL_INCDIR=-I${tempval}/srclib/apr-util/include
+ APR_LIBDIR_LA=`${tempval}/srclib/apr/apr-config --apr-la-file`
+
+ AC_SUBST(APR_INCDIR)
+ AC_SUBST(APR_CFLAGS)
+ AC_SUBST(APR_INCDIR)
+ AC_SUBST(APR_UTIL_INCDIR)
+ fi
$2_LDFLAGS=""
$2_LIBDIR=""
WEBSERVERS="${WEBSERVERS} $4"
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
