You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by tr...@apache.org on 2004/03/11 00:52:35 UTC
cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache2 Makefile.apxs.in Makefile.in
truk 2004/03/10 15:52:34
Modified: jk/native2/server/apache2 Makefile.apxs.in Makefile.in
Log:
Go back to using HAS_PCRE to fix libjkjni unresolved references.
This reverts Apache2 back to its original behavior for pcre
(for platforms that use configure). If you want pcre support
then configure with --with-pcre.
Revision Changes Path
1.10 +1 -1 jakarta-tomcat-connectors/jk/native2/server/apache2/Makefile.apxs.in
Index: Makefile.apxs.in
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/Makefile.apxs.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Makefile.apxs.in 27 Feb 2004 19:14:33 -0000 1.9
+++ Makefile.apxs.in 10 Mar 2004 23:52:34 -0000 1.10
@@ -11,7 +11,7 @@
JK=${JK_DIR}/common/
JKINC=${JK_DIR}/include/
-JK_INCL=-DUSE_APACHE_MD5 -I ${JK} -I ${JKINC} -DHAS_APR -DHAS_AP_PCRE @HAVE_JNI@
+JK_INCL=-DUSE_APACHE_MD5 -I ${JK} -I ${JKINC} -DHAS_APR @HAVE_JNI@ @HAS_PCRE@
ifneq ($(strip $(JAVA_HOME)),)
JAVA_INCL=-I ${JAVA_HOME}/include -I ${JAVA_HOME}/include/${OS}
1.22 +3 -3 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.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- Makefile.in 10 Mar 2004 19:07:40 -0000 1.21
+++ Makefile.in 10 Mar 2004 23:52:34 -0000 1.22
@@ -37,11 +37,11 @@
${APR_INCL} \
${JAVA_INCL}
-JK_CFLAGS=-DCHUNK_SIZE=4096 -DUSE_APACHE_MD5 -DHAS_APR -DHAS_AP_PCRE @HAVE_JNI@
+JK_CFLAGS=-DCHUNK_SIZE=4096 -DUSE_APACHE_MD5 -DHAS_APR @HAVE_JNI@ @HAS_PCRE@
ifdef APR_LIBDIR_LA
-JK_LDFLAGS=-L${APACHE2_LIBDIR} -lcrypt
+JK_LDFLAGS=-L${APACHE2_LIBDIR} -lcrypt @PCRE_LIBS@
else
-JK_LDFLAGS=-L${APACHE2_LIBDIR} -lcrypt -lapr-0
+JK_LDFLAGS=-L${APACHE2_LIBDIR} -lcrypt -lapr-0 @PCRE_LIBS@
endif
###### Based on rules.mk ##########################################
---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org