truk 2004/02/13 13:38:26
Modified: jk/native2 Makefile.in
jk/native2/server/apache13 Makefile.apxs.in
jk/support jk_apr.m4
Log:
add apxs meta targets and jk2-install-apxs from Guenter Knauf
For apache13:
Change apr and apr-util to install into build dirs
Fixup apxs build and add install target
apxs build is the only way to build on OpenBSD right now
due to libtool issues.
Tested on FreeBSD and OpenBSD so far.
Revision Changes Path
1.5 +16 -1 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Makefile.in 10 Nov 2003 11:05:33 -0000 1.4
+++ Makefile.in 13 Feb 2004 21:38:26 -0000 1.5
@@ -4,6 +4,12 @@
clean: @APR_CLEAN@ jk2-clean
+build-apxs: @APR_BUILD@ jk2-build-apxs
+
+clean-apxs: @APR_CLEAN@ jk2-clean-apxs
+
+install-apxs: jk2-install-apxs
+
jk2-build:
list='@WEBSERVERS@'; \
for i in $$list; do \
@@ -22,6 +28,15 @@
fi; \
done;
+jk2-install-apxs:
+ list='@WEBSERVERS@'; \
+ for i in $$list; do \
+ echo "Making $$target in $$i"; \
+ if test "$$i" != "."; then \
+ (cd $$i && $(MAKE) -f Makefile.apxs install) || exit 1; \
+ fi; \
+ done;
+
jk2-clean:
list='@WEBSERVERS@'; \
for i in $$list; do \
@@ -41,7 +56,7 @@
done;
apr-build:
- ( cd @APR_DIR@ && make && cd @APR_UTIL_DIR@ && make )
+ ( cd @APR_DIR@ && make install && cd @APR_UTIL_DIR@ && make install )
apr-clean:
( cd @APR_DIR@ && make clean && cd @APR_UTIL_DIR@ && make clean )
1.10 +9 -9
jakarta-tomcat-connectors/jk/native2/server/apache13/Makefile.apxs.in
Index: Makefile.apxs.in
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache13/Makefile.apxs.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Makefile.apxs.in 10 Feb 2004 04:39:51 -0000 1.9
+++ Makefile.apxs.in 13 Feb 2004 21:38:26 -0000 1.10
@@ -3,28 +3,28 @@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
JK_DIR := ../..
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
COMMON_C_FILES := $(wildcard ${JK_DIR}/common/*.c )
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
C_FILES=jk_service_apache13.c mod_jk2.c
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@/apr-config --libs`
-
-JK=../../common/
-JKINC=../../include/
-JK_INCL=-DUSE_APACHE_MD5 -I ${JK} -I ${JKINC} -DHAVE_MMAP
[EMAIL PROTECTED]@/bin/apr-config --link-ld`
[EMAIL PROTECTED]@/bin/apu-config --link-ld`
ifneq ($(strip $(JAVA_HOME)),)
JAVA_INCL=-I ${JAVA_HOME}/include -I ${JAVA_HOME}/include/${OS} @HAVE_JNI@
JAVA_LIB=-L ${JAVA_HOME}/jre/lib/${ARCH} -L ${JAVA_HOME}/lib/${ARCH}/native_threads
endif
+JK_CFLAGS=-I ${JK_DIR}/include -DCHUNK_SIZE=4096 -DUSE_APACHE_MD5 ${APR_CFLAGS}
-DHAVE_MMAP
+
all: mod_jk2.so
mod_jk2.so:
- $(APXS) -c -o $@ -Wc,"${JK_INCL} ${APR_CFLAGS} ${APR_LDFLAGS}" "${JAVA_INCL}"
${C_FILES} ${COMMON_C_FILES} ${APR_LIBS}
+ $(APXS) -c -o $@ ${JK_CFLAGS} ${JAVA_INCL} ${C_FILES} ${COMMON_C_FILES} \
+ ${APR_LIBS} ${APR_UTIL_LIBS} ${JAVA_LIB}
+
+install: mod_jk2.so
+ $(APXS) -i mod_jk2.so
clean:
rm -f *.o *.so
1.12 +5 -5 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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- jk_apr.m4 11 Feb 2004 15:08:14 -0000 1.11
+++ jk_apr.m4 13 Feb 2004 21:38:26 -0000 1.12
@@ -129,7 +129,7 @@
tempret="0"
JK_EXEC(
[tempret],
- [${SHELL} ./configure --enable-static --disable-shared
${APR_CONFIGURE_ARGS}],
+ [${SHELL} ./configure --prefix=${APR_DIR}
--with-installbuilddir=${APR_DIR}/instbuild --disable-shared ${APR_CONFIGURE_ARGS}],
[apr],
[${APR_DIR}])
if ${TEST} "${tempret}" = "0"; then
@@ -138,7 +138,7 @@
AC_MSG_ERROR(apr configure failed with ${tempret})
fi
JK_APR_LIBNAME(apr_libname,${APR_DIR})
- APR_LDFLAGS="${APR_DIR}/${apr_libname}"
+ APR_LDFLAGS="${APR_DIR}/lib/${apr_libname}"
APR_LIBDIR=""
use_apr=true
COMMON_APR_OBJECTS="\${COMMON_APR_OBJECTS}"
@@ -195,7 +195,7 @@
tempret="0"
JK_EXEC(
[tempret],
- [${SHELL} ./configure --with-apr=${APR_DIR}],
+ [${SHELL} ./configure --prefix=${APR_UTIL_DIR} --with-apr=${APR_DIR}],
[apr-util],
[${APR_UTIL_DIR}])
if ${TEST} "${tempret}" = "0"; then
@@ -204,7 +204,7 @@
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}/${apr_util_libname}"
+ APR_LDFLAGS="${APR_LDFLAGS} ${APR_UTIL_DIR}/lib/${apr_util_libname}"
APR_UTIL_LIBDIR=""
use_apr=true
COMMON_APR_OBJECTS="\${COMMON_APR_OBJECTS}"
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
