truk 2004/03/18 14:07:38
Modified: jk/native2/server/apache13 Makefile.apxs.in Makefile.in
jk/support jk_pcre.m4
Log:
Arrange --with-pcre support for apache13 for both Makefile.in and
Makefile.apxs.in
Arrange --with-jni support for apache13 for Makefile.apxs.in
(excluding libjkjni.so)
Slight adjustment to the prepare and clean targets in Makefile.in
Revision Changes Path
1.11 +13 -6
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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Makefile.apxs.in 13 Feb 2004 21:38:26 -0000 1.10
+++ Makefile.apxs.in 18 Mar 2004 22:07:38 -0000 1.11
@@ -1,27 +1,34 @@
## configure should make the Makefile out of this file.
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
JK_DIR := ../..
-COMMON_C_FILES := $(wildcard ${JK_DIR}/common/*.c )
[EMAIL PROTECTED]@
-C_FILES=jk_service_apache13.c mod_jk2.c
[EMAIL PROTECTED]@
[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_INCL=-I ${JAVA_HOME}/include -I ${JAVA_HOME}/include/${OS}
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
+INCLUDES= -I${JK_DIR}/include \
+ ${JAVA_INCL}
+
+JK_CFLAGS=-DCHUNK_SIZE=4096 -DUSE_APACHE_MD5 ${APR_CFLAGS} -DHAVE_MMAP @HAVE_JNI@
@HAS_PCRE@
+
+COMMON_C_FILES := $(wildcard ${JK_DIR}/common/*.c )
+JNI_C_FILES := $(wildcard ${JK_DIR}/jni/*.c )
+C_FILES=jk_service_apache13.c mod_jk2.c
all: mod_jk2.so
mod_jk2.so:
- $(APXS) -c -o $@ ${JK_CFLAGS} ${JAVA_INCL} ${C_FILES} ${COMMON_C_FILES} \
- ${APR_LIBS} ${APR_UTIL_LIBS} ${JAVA_LIB}
+ $(APXS) -c -o $@ ${INCLUDES} ${JK_CFLAGS} ${C_FILES} ${COMMON_C_FILES}
${JNI_C_FILES} \
+ ${APR_LIBS} ${APR_UTIL_LIBS} ${JAVA_LIB} @PCRE_LIBS@
install: mod_jk2.so
$(APXS) -i mod_jk2.so
1.16 +7 -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.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- Makefile.in 18 Mar 2004 17:14:45 -0000 1.15
+++ Makefile.in 18 Mar 2004 22:07:38 -0000 1.16
@@ -2,6 +2,8 @@
# use -D options to overrides defaults
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
@@ -29,8 +31,8 @@
${APACHE_INCL} \
${JAVA_INCL}
-JK_CFLAGS=-DCHUNK_SIZE=4096 -DUSE_APACHE_MD5 @APR_CFLAGS@ -DHAVE_MMAP @HAVE_JNI@
-JK_LDFLAGS=${APR_LDFLAGS} ${JAVA_LIB}
+JK_CFLAGS=-DCHUNK_SIZE=4096 -DUSE_APACHE_MD5 @APR_CFLAGS@ -DHAVE_MMAP @HAVE_JNI@
@HAS_PCRE@
+JK_LDFLAGS=${APR_LDFLAGS} ${JAVA_LIB} @PCRE_LIBS@
###### Based on rules.mk ##########################################
ALL_CFLAGS = $(EXTRA_CFLAGS) $(NOTEST_CFLAGS) $(CFLAGS)
@@ -95,14 +97,12 @@
$(CP) $^ $@
${BUILD_DIR}/$(APACHE_LIBEXEC)/mod_jk2.so: ${BUILD_DIR}/mod_jk2.la
- mkdir -p ${BUILD_DIR}$(APACHE_LIBEXEC)
$(MOD_INSTALL) $^ `pwd`/${BUILD_DIR}/$(APACHE_LIBEXEC)
${BUILD_DIR}/libjkjni.so: ${BUILD_DIR}/${APACHE_LIBEXEC}/libjkjni.so
$(CP) $^ $@
${BUILD_DIR}/${APACHE_LIBEXEC}/libjkjni.so: ${BUILD_DIR}/libjkjni.la
- mkdir -p ${BUILD_DIR}/${APACHE_LIBEXEC}
$(MOD_INSTALL) $^ `pwd`/${BUILD_DIR}/${APACHE_LIBEXEC}
${BUILD_DIR}/libjkjni.la: ${JNI_LO_FILES} ${COMMON_LO_FILES}
@@ -114,7 +114,8 @@
${COMMON_C_FILES} ${A_C_FILES}: ${H_FILES}
prepare:
- mkdir -p ${BUILD_DIR}
+ mkdir -p ${BUILD_DIR}${APACHE_LIBEXEC}
clean:
- rm -rf ${BUILD_DIR}/*.lo ${BUILD_DIR}/*.la ${BUILD_DIR}/*.o ${BUILD_DIR}/.libs
${BUILD_DIR}/*.so
+ rm -rf ${BUILD_DIR}/*.lo ${BUILD_DIR}/*.la ${BUILD_DIR}/*.o ${BUILD_DIR}/.libs
\
+ ${BUILD_DIR}/*.so ${BUILD_DIR}${APACHE_LIBEXEC}/*.so
1.5 +2 -2 jakarta-tomcat-connectors/jk/support/jk_pcre.m4
Index: jk_pcre.m4
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/support/jk_pcre.m4,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- jk_pcre.m4 24 Feb 2004 08:41:40 -0000 1.4
+++ jk_pcre.m4 18 Mar 2004 22:07:38 -0000 1.5
@@ -29,8 +29,8 @@
esac
if ${TEST} ${use_pcre} ; then
- HAS_PCRE="-DHAS_PCRE"
- PCRE_LIBS="-lpcre -lpcreposix"
+ HAS_PCRE="-I${includedir} -DHAS_PCRE"
+ PCRE_LIBS="-L${libdir} -lpcre -lpcreposix"
fi
])
])
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
