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 mod_jk2.dsp
Date Tue, 22 Oct 2002 11:56:42 GMT
mturk       2002/10/22 04:56:42

  Modified:    jk/native2/server/apache2 mod_jk2.dsp
  Log:
  Added HAS_PCRE cause Apache2 comes with pcre.
  
  Revision  Changes    Path
  1.6       +6 -6      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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- mod_jk2.dsp	24 Sep 2002 13:22:14 -0000	1.5
  +++ mod_jk2.dsp	22 Oct 2002 11:56:42 -0000	1.6
  @@ -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 "WIN32" /D "NDEBUG" /D "_WINDOWS"
/D "_MBCS" /D "_USRDLL" /D "MOD_JK2_EXPORTS" /D "HAVE_JNI" /D "HAS_APR" /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_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"
  @@ -53,7 +53,7 @@
   # ADD BSC32 /nologo
   LINK32=link.exe
   # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib
shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
  -# ADD LINK32 libhttpd.lib libapr.lib libaprutil.lib wsock32.lib advapi32.lib /nologo /dll
/machine:I386 /libpath:"$(APACHE2_HOME)\lib"
  +# ADD LINK32 libhttpd.lib libapr.lib libaprutil.lib pcre.lib pcreposix.lib wsock32.lib
advapi32.lib /nologo /dll /machine:I386 /libpath:"$(APACHE2_HOME)\lib"
   
   !ELSEIF  "$(CFG)" == "mod_jk2 - Win32 Debug"
   
  @@ -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 "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MOD_JK2_EXPORTS" /D "HAVE_JNI"
/D "HAS_APR" /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_PCRE" /FR /YX /FD /GZ /c
   # SUBTRACT CPP /X
   # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
   # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
  @@ -80,7 +80,7 @@
   # ADD BSC32 /nologo
   LINK32=link.exe
   # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib
shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386
/pdbtype:sept
  -# ADD LINK32 libhttpd.lib libapr.lib libaprutil.lib wsock32.lib advapi32.lib /nologo /dll
/debug /machine:I386 /pdbtype:sept /libpath:"$(APACHE2_HOME)\lib"
  +# ADD LINK32 libhttpd.lib libapr.lib libaprutil.lib pcre.lib pcreposix.lib wsock32.lib
advapi32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept /libpath:"$(APACHE2_HOME)\lib"
   
   !ENDIF 
   
  @@ -370,7 +370,7 @@
   !IF  "$(CFG)" == "mod_jk2 - Win32 Release"
   
   # Begin Custom Build - Creating resources from $(InputPath)
  -InputDir=\tomcat\jakarta-tomcat-connectors\jk\native2\common
  +InputDir=\WORK\apache\jakarta-tomcat-connectors\jk\native2\common
   InputPath=..\..\common\jk_logger_win32_message.mc
   
   "..\..\common\jk_logger_win32_message.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
  @@ -381,7 +381,7 @@
   !ELSEIF  "$(CFG)" == "mod_jk2 - Win32 Debug"
   
   # Begin Custom Build - Creating resources from $(InputPath)
  -InputDir=\tomcat\jakarta-tomcat-connectors\jk\native2\common
  +InputDir=\WORK\apache\jakarta-tomcat-connectors\jk\native2\common
   InputPath=..\..\common\jk_logger_win32_message.mc
   
   "..\..\common\jk_logger_win32_message.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
  
  
  

--
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