jfclere 2002/09/09 08:35:49
Modified: jk/native configure.in
jk/native/apache-2.0 Makefile.in
Log:
Arrange the --with-apache when using Apache-2.0
Note:
* It only allow a staticly link mod_jk (use with --with-apxs for dso!).
* A buildconf is needed before the configure of httpd-2.0
Revision Changes Path
1.19 +3 -2 jakarta-tomcat-connectors/jk/native/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/configure.in,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- configure.in 6 Sep 2002 14:42:54 -0000 1.18
+++ configure.in 9 Sep 2002 15:35:49 -0000 1.19
@@ -159,6 +159,7 @@
apache_include="-I${withval}/src/include \
-I${withval}/src/${osdir}"
WEBSERVER="apache-1.3"
+ LIB_JK_TYPE=mod_jk.a
AC_MSG_RESULT([${apache_include}, version 1.3])
else
AC_MSG_ERROR([Sorry Apache 1.2.x is no longer supported.])
@@ -169,6 +170,7 @@
WEBSERVER="apache-2.0"
apache_dir=${withval}
apache_dir_is_src="true"
+ LIB_JK_TYPE=lib_jk.la
apache_include="-I${withval}/include -I${withval}/srclib/apr/include
-I${withval}/os/${OS_APACHE_DIR} -I${withval}/srclib/apr-util/include"
AC_MSG_RESULT(${apache_dir})
fi
@@ -435,7 +437,6 @@
else
dnl install static library in apache sources.
APACHE20_OEXT=.lo
- LIB_JK_TYPE=mod_jk.a
INSTALL_TYPE=install_static
fi
AC_SUBST(APACHE20_OEXT)
1.15 +2 -2 jakarta-tomcat-connectors/jk/native/apache-2.0/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/Makefile.in,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- Makefile.in 27 Jun 2002 15:57:03 -0000 1.14
+++ Makefile.in 9 Sep 2002 15:35:49 -0000 1.15
@@ -41,7 +41,7 @@
( cd ..; ./config.status )
lib_jk.la: mod_jk.lo ${APACHE_OBJECTS}
- $(LIBTOOL) --mode=link $(CC) -o lib_jk.la -static -rpath ${libexecdir}
mod_jk.lo $(APACHE_OBJECTS)
+ $(LIBTOOL) --mode=link $(CC) -o lib_jk.la -static -rpath ${libexecdir}/jk
mod_jk.lo $(APACHE_OBJECTS)
install_static:
@echo ""
@@ -54,7 +54,7 @@
@echo ""
@echo "cd ${APACHE_DIR}"
@echo "./buildconf"
- @echo "./configure --with-mod_jk=static"
+ @echo "./configure --with-mod_jk"
@echo "make"
@echo ""
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
