truk 2004/02/27 11:14:33
Modified: jk/native2/server/apache2 Makefile.apxs.in Makefile.in
NWGNUmakefile mod_jk2.dsp
Log:
Remove HAS_PCRE and add HAS_AP_PCRE. From Guenter Knauf.
apache2 doesn't need --with-pcre now and is silently ignored.
pcre support is always included for apache2
Revision Changes Path
1.9 +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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Makefile.apxs.in 10 Feb 2004 04:39:51 -0000 1.8
+++ Makefile.apxs.in 27 Feb 2004 19:14:33 -0000 1.9
@@ -11,7 +11,7 @@
JK=${JK_DIR}/common/
JKINC=${JK_DIR}/include/
-JK_INCL=-DUSE_APACHE_MD5 -I ${JK} -I ${JKINC} -DHAS_APR @HAVE_JNI@ @HAS_PCRE@
+JK_INCL=-DUSE_APACHE_MD5 -I ${JK} -I ${JKINC} -DHAS_APR -DHAS_AP_PCRE @HAVE_JNI@
ifneq ($(strip $(JAVA_HOME)),)
JAVA_INCL=-I ${JAVA_HOME}/include -I ${JAVA_HOME}/include/${OS}
1.20 +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.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- Makefile.in 24 Feb 2004 04:00:30 -0000 1.19
+++ Makefile.in 27 Feb 2004 19:14:33 -0000 1.20
@@ -37,11 +37,11 @@
${APR_INCL} \
${JAVA_INCL}
-JK_CFLAGS=-DCHUNK_SIZE=4096 -DUSE_APACHE_MD5 -DHAS_APR @HAVE_JNI@ @HAS_PCRE@
+JK_CFLAGS=-DCHUNK_SIZE=4096 -DUSE_APACHE_MD5 -DHAS_APR -DHAS_AP_PCRE @HAVE_JNI@
ifdef APR_LIBDIR_LA
-JK_LDFLAGS=-L${APACHE2_LIBDIR} -lcrypt @PCRE_LIBS@
+JK_LDFLAGS=-L${APACHE2_LIBDIR} -lcrypt
else
-JK_LDFLAGS=-L${APACHE2_LIBDIR} -lcrypt -lapr-0 @PCRE_LIBS@
+JK_LDFLAGS=-L${APACHE2_LIBDIR} -lcrypt -lapr-0
endif
###### Based on rules.mk ##########################################
1.2 +1 -2
jakarta-tomcat-connectors/jk/native2/server/apache2/NWGNUmakefile
Index: NWGNUmakefile
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/NWGNUmakefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- NWGNUmakefile 20 Nov 2003 00:26:30 -0000 1.1
+++ NWGNUmakefile 27 Feb 2004 19:14:33 -0000 1.2
@@ -59,9 +59,8 @@
-D__NOVELL_LIBC__ \
-D_POSIX_SOURCE \
-DHAS_APR \
+ -DHAS_AP_PCRE \
$(EOLIST)
-
-# -DHAS_PCRE
#
# These flags will be added to the link.opt file
1.8 +2 -2 jakarta-tomcat-connectors/jk/native2/server/apache2/mod_jk2.dsp
Index: mod_jk2.dsp
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/mod_jk2.dsp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- mod_jk2.dsp 2 Feb 2004 21:58:55 -0000 1.7
+++ mod_jk2.dsp 27 Feb 2004 19:14:33 -0000 1.8
@@ -43,7 +43,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D
"_MBCS" /D "_USRDLL" /D "MOD_JK2_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /I "$(JAVA_HOME)\include" /I
"$(JAVA_HOME)\include\win32" /I "$(APACHE2_HOME)\include" /I
"$(APACHE2_HOME)\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D
"_USRDLL" /D "MOD_JK2_EXPORTS" /D "HAVE_JNI" /D "HAS_APR" /D "HAS_PCRE" /FR /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /I "$(JAVA_HOME)\include" /I
"$(JAVA_HOME)\include\win32" /I "$(APACHE2_HOME)\include" /I
"$(APACHE2_HOME)\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D
"_USRDLL" /D "MOD_JK2_EXPORTS" /D "HAVE_JNI" /D "HAS_APR" /D "HAS_AP_PCRE" /FR /YX /FD
/c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0xc0a /d "NDEBUG"
@@ -69,7 +69,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D
"_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MOD_JK2_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\include" /I
"$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32" /I "$(APACHE2_HOME)\include" /I
"$(APACHE2_HOME)\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D
"_USRDLL" /D "MOD_JK2_EXPORTS" /D "HAVE_JNI" /D "HAS_APR" /D "HAS_PCRE" /FR /YX /FD
/GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\include" /I
"$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32" /I "$(APACHE2_HOME)\include" /I
"$(APACHE2_HOME)\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D
"_USRDLL" /D "MOD_JK2_EXPORTS" /D "HAVE_JNI" /D "HAS_APR" /D "HAS_AP_PCRE" /FR /YX /FD
/GZ /c
# SUBTRACT CPP /X
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
