tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mt...@apache.org
Subject cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache2 Makefile.in Makefile.apxs.in
Date Tue, 22 Oct 2002 19:41:03 GMT
mturk       2002/10/22 12:41:03

  Modified:    jk/native2/server/apache2 Makefile.in Makefile.apxs.in
  Log:
  Add conditional pcre compile
  
  Revision  Changes    Path
  1.11      +2 -2      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.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- Makefile.in	16 Jun 2002 20:55:21 -0000	1.10
  +++ Makefile.in	22 Oct 2002 19:41:03 -0000	1.11
  @@ -33,8 +33,8 @@
             ${APR_INCL} \
             ${JAVA_INCL}
   
  -JK_CFLAGS=-DCHUNK_SIZE=4096 -DUSE_APACHE_MD5 -DHAS_APR @HAVE_JNI@
  -JK_LDFLAGS=-L${APACHE2_LIBDIR} -lcrypt -lapr
  +JK_CFLAGS=-DCHUNK_SIZE=4096 -DUSE_APACHE_MD5 -DHAS_APR @HAVE_JNI@ @HAS_PCRE@
  +JK_LDFLAGS=-L${APACHE2_LIBDIR} -lcrypt -lapr-0 @PCRE_LIBS@
   
   ###### Based on rules.mk ##########################################
   ALL_CFLAGS   = $(EXTRA_CFLAGS) $(NOTEST_CFLAGS) $(CFLAGS)
  
  
  
  1.6       +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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Makefile.apxs.in	4 Jun 2002 10:33:45 -0000	1.5
  +++ Makefile.apxs.in	22 Oct 2002 19:41:03 -0000	1.6
  @@ -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@
  +JK_INCL=-DUSE_APACHE_MD5 -I ${JK} -I ${JKINC} -DHAS_APR @HAVE_JNI@ @HAS_PCRE@
   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
   
  
  
  

--
To unsubscribe, e-mail:   <mailto:tomcat-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:tomcat-dev-help@jakarta.apache.org>


Mime
View raw message