cvs commit: apachen/src/os/win32 ApacheModuleAuthAnon.dsp ApacheModuleAuthAnon.mak ApacheModuleCERNMeta.dsp ApacheModuleCERNMeta.mak ApacheModuleDigest.dsp ApacheModuleDigest.mak ApacheModuleExpires.dsp ApacheModuleExpires.mak ApacheModuleHeaders.dsp ApacheModuleHeaders.mak ApacheModuleInfo.dsp ApacheModuleInfo.mak ApacheModuleRewrite.dsp ApacheModuleRewrite.mak ApacheModuleStatus.dsp ApacheModuleStatus.mak ApacheModuleUserTrack.dsp ApacheModuleUserTrack.mak

1997-10-20 Thread pcs 
pcs 97/10/20 13:19:31

  Modified:src  Apache.dsp Apache.mak ApacheCore.dsp ApacheCore.mak
   src/os/win32 ApacheModuleAuthAnon.dsp
ApacheModuleAuthAnon.mak ApacheModuleCERNMeta.dsp
ApacheModuleCERNMeta.mak ApacheModuleDigest.dsp
ApacheModuleDigest.mak ApacheModuleExpires.dsp
ApacheModuleExpires.mak ApacheModuleHeaders.dsp
ApacheModuleHeaders.mak ApacheModuleInfo.dsp
ApacheModuleInfo.mak ApacheModuleRewrite.dsp
ApacheModuleRewrite.mak ApacheModuleStatus.dsp
ApacheModuleStatus.mak ApacheModuleUserTrack.dsp
ApacheModuleUserTrack.mak
  Log:
  Do not link with unnecessary libraries (OLE, ODBC). Avoids link errors
  on systems where this libraries have not been installed.
  PR: 1260
  
  Revision  ChangesPath
  1.6   +2 -2  apachen/src/Apache.dsp
  
  Index: Apache.dsp
  ===
  RCS file: /export/home/cvs/apachen/src/Apache.dsp,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Apache.dsp1997/08/24 16:12:26 1.5
  +++ Apache.dsp1997/10/20 20:19:07 1.6
  @@ -49,7 +49,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 /subsystem:console /machine:I386
  -# ADD LINK32 CoreR\ApacheCore.lib 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 /subsystem:console /machine:I386
  +# ADD LINK32 CoreR\ApacheCore.lib kernel32.lib user32.lib gdi32.lib 
winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:console 
/machine:I386
   
   !ELSEIF  "$(CFG)" == "Apache - Win32 Debug"
   
  @@ -73,7 +73,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 /subsystem:console /debug /machine:I386
  -# ADD LINK32 CoreD\ApacheCore.lib 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 /subsystem:console /debug /machine:I386
  +# ADD LINK32 CoreD\ApacheCore.lib kernel32.lib user32.lib gdi32.lib 
winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:console 
/debug /machine:I386
   
   !ENDIF 
   
  
  
  
  1.6   +6 -6  apachen/src/Apache.mak
  
  Index: Apache.mak
  ===
  RCS file: /export/home/cvs/apachen/src/Apache.mak,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Apache.mak1997/08/23 04:00:16 1.5
  +++ Apache.mak1997/10/20 20:19:08 1.6
  @@ -64,9 +64,9 @@

   LINK32=link.exe
   LINK32_FLAGS=CoreR\ApacheCore.lib 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 /subsystem:console /incremental:no\
  - /pdb:"$(OUTDIR)\Apache.pdb" /machine:I386 /out:"$(OUTDIR)\Apache.exe" 
  + winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo 
/subsystem:console\
  + /incremental:no /pdb:"$(OUTDIR)\Apache.pdb" /machine:I386\
  + /out:"$(OUTDIR)\Apache.exe" 
   LINK32_OBJS= \
"$(INTDIR)\dummy.obj"
   
  @@ -114,9 +114,9 @@

   LINK32=link.exe
   LINK32_FLAGS=CoreD\ApacheCore.lib 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 /subsystem:console 
/incremental:yes\
  - /pdb:"$(OUTDIR)\Apache.pdb" /debug /machine:I386 
/out:"$(OUTDIR)\Apache.exe" 
  + winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo 
/subsystem:console\
  + /incremental:yes /pdb:"$(OUTDIR)\Apache.pdb" /debug /machine:I386\
  + /out:"$(OUTDIR)\Apache.exe" 
   LINK32_OBJS= \
"$(INTDIR)\dummy.obj"
   
  
  
  
  1.13  +2 -2  apachen/src/ApacheCore.dsp
  
  Index: ApacheCore.dsp
  ===
  RCS file: /export/home/cvs/apachen/src/ApacheCore.dsp,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- ApacheCore.dsp1997/10/10 08:57:59 1.12
  +++ ApacheCore.dsp1997/10/20 20:19:09 1.13
  @@ -54,7 +54,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 /subsystem:windows /dll /machine:I386
  -# ADD LINK32 os\wi

cvs commit: apachen/src/os/win32 ApacheModuleAuthAnon.dsp ApacheModuleAuthAnon.mak ApacheModuleCERNMeta.dsp ApacheModuleCERNMeta.mak ApacheModuleDigest.dsp ApacheModuleDigest.mak ApacheModuleExpires.dsp ApacheModuleExpires.mak ApacheModuleHeaders.dsp ApacheModuleHeaders.mak ApacheModuleInfo.dsp ApacheModuleInfo.mak ApacheModuleRewrite.dsp ApacheModuleRewrite.mak ApacheModuleStatus.dsp ApacheModuleStatus.mak ApacheModuleUserTrack.dsp ApacheModuleUserTrack.mak

1997-08-23 Thread Paul Sutton 
pcs 97/08/23 07:12:55

  Modified:src/modules/proxy ApacheModuleProxy.dsp
ApacheModuleProxy.mak
   src/os/win32 ApacheModuleAuthAnon.dsp
ApacheModuleAuthAnon.mak ApacheModuleCERNMeta.dsp
ApacheModuleCERNMeta.mak ApacheModuleDigest.dsp
ApacheModuleDigest.mak ApacheModuleExpires.dsp
ApacheModuleExpires.mak ApacheModuleHeaders.dsp
ApacheModuleHeaders.mak ApacheModuleInfo.dsp
ApacheModuleInfo.mak ApacheModuleRewrite.dsp
ApacheModuleRewrite.mak ApacheModuleStatus.dsp
ApacheModuleStatus.mak ApacheModuleUserTrack.dsp
ApacheModuleUserTrack.mak
  Log:
  Update module makefiles for core to main directory rename
  
  Revision  ChangesPath
  1.3   +2 -2  apachen/src/modules/proxy/ApacheModuleProxy.dsp
  
  Index: ApacheModuleProxy.dsp
  ===
  RCS file: /export/home/cvs/apachen/src/modules/proxy/ApacheModuleProxy.dsp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ApacheModuleProxy.dsp 1997/08/13 08:37:20 1.2
  +++ ApacheModuleProxy.dsp 1997/08/23 14:12:42 1.3
  @@ -45,7 +45,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" 
/YX /c
  -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\core" /I "..\..\regex" /D 
"WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
  +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\main" /I "..\..\regex" /D 
"WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
   # ADD BASE MTL /nologo /D "NDEBUG" /win32
   # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
   # ADD BASE RSC /l 0x809 /d "NDEBUG"
  @@ -71,7 +71,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" /YX /c
  -# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\core" /I "..\..\regex" 
/D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
  +# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\main" /I "..\..\regex" 
/D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
   # ADD BASE MTL /nologo /D "_DEBUG" /win32
   # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
   # ADD BASE RSC /l 0x809 /d "_DEBUG"
  
  
  
  1.4   +85 -209   apachen/src/modules/proxy/ApacheModuleProxy.mak
  
  Index: ApacheModuleProxy.mak
  ===
  RCS file: /export/home/cvs/apachen/src/modules/proxy/ApacheModuleProxy.mak,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ApacheModuleProxy.mak 1997/08/17 13:56:26 1.3
  +++ ApacheModuleProxy.mak 1997/08/23 14:12:43 1.4
  @@ -67,7 +67,7 @@
   "$(OUTDIR)" :
   if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  -CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\core" /I "..\..\regex" /D "WIN32" 
/D\
  +CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\main" /I "..\..\regex" /D "WIN32" 
/D\
"NDEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\ApacheModuleProxy.pch" /YX\
/Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
   CPP_OBJS=.\Release/
  @@ -133,7 +133,7 @@
   "$(OUTDIR)" :
   if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  -CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\core" /I "..\..\regex" 
/D\
  +CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\main" /I "..\..\regex" 
/D\
"WIN32" /D "_DEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\ApacheModuleProxy.pch" /YX\
/Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
   CPP_OBJS=.\Debug/
  @@ -199,278 +199,154 @@
   !IF "$(CFG)" == "ApacheModuleProxy - Win32 Release" || "$(CFG)" ==\
"ApacheModuleProxy - Win32 Debug"
   SOURCE=.\mod_proxy.c
  -
  -!IF  "$(CFG)" == "ApacheModuleProxy - Win32 Release"
  -
   DEP_CPP_MOD_P=\
  - "..\..\core\alloc.h"\
  - "..\..\core\buff.h"\
  - "..\..\core\conf.h"\
  - "..\..\core\explain.h"\
  - "..\..\core\http_config.h"\
  - "..\..\core\http_log.h"\
  - "..\..\core\http_protocol.h"\
  - "..\..\core\httpd.h"\
  + "..\..\main\alloc.h"\
  + "..\..\main\buff.h"\
  + "..\..\main\conf.h"\
  + "..\..\main\explain.h"\
  + "..\..\main\http_config.h"\
  + "..\..\main\http_log.h"\
  + "..\..\main\http_protocol.h"\
  + "..\..\main\httpd.h"\
"..\..\os\win32\readdir.h"\
"..\..\regex\regex.h"\
".\mod_proxy.h"\
  + {$(INCLUDE)}"sys\stat.h"\
  + {$(INCLUDE)}"sys\types.h"\

  -
  -"$(INTDIR)\mod_proxy.obj" : $(SOURCE) $(DEP_CPP_MOD_P) "$(INTDIR)"
  -
  -
  -!ELSEIF  "$(CFG)" == "ApacheModuleProxy - Win32 Debug"
  -
  -DEP_CPP_MOD_P=\
  - "..\..\core\alloc.h"\
  - "..\..\core\buff.h"\
  - "..\..\core\conf.h"\
  - "..\..\core\explain.h"\
  - "..\..\core\http_config.h"\
  - "..\..\core\http_