httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@locus.apache.org
Subject cvs commit: httpd-2.0/support ab.dsp htdigest.dsp htpasswd.dsp logresolve.dsp rotatelogs.dsp
Date Tue, 05 Dec 2000 16:38:33 GMT
wrowe       00/12/05 08:38:31

  Modified:    .        Apache.dsp Apache.dsw ApacheCore.dsp
               modules/aaa mod_auth_anon.dsp mod_auth_dbm.dsp
                        mod_auth_digest.dsp
               modules/cache mod_file_cache.dsp
               modules/dav/fs mod_dav_fs.dsp
               modules/dav/main mod_dav.dsp
               modules/generators mod_info.dsp mod_status.dsp
               modules/mappers mod_rewrite.dsp mod_speling.dsp
               modules/metadata mod_cern_meta.dsp mod_expires.dsp
                        mod_headers.dsp mod_usertrack.dsp
               modules/proxy mod_proxy.dsp
               os/win32/installer/installdll install.dsp
               server   gen_test_char.dsp
               srclib/expat-lite expatlib.dsp xmlparse.dsp xmltok.dsp
               support  ab.dsp htdigest.dsp htpasswd.dsp logresolve.dsp
                        rotatelogs.dsp
  Log:
    This patch illustrates the new locations, and makes the majority of the
    adjustments.  Now to actually try to build the thing.
  
  Revision  Changes    Path
  1.14      +5 -5      httpd-2.0/Apache.dsp
  
  Index: Apache.dsp
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/Apache.dsp,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- Apache.dsp	2000/10/11 17:19:22	1.13
  +++ Apache.dsp	2000/12/05 16:34:17	1.14
  @@ -41,8 +41,8 @@
   # PROP Intermediate_Dir ".\ApacheR"
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
  -# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "./include" /I "./os/win32" /I "./lib/apr/include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "SHARED_MODULE" /YX /FD /c
  -# ADD CPP /nologo /MD /W3 /GX /O2 /I "./include" /I "./os/win32" /I "./lib/apr/include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c
  +# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "./include" /I "./os/win32" /I "./srclib/apr/include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "SHARED_MODULE" /YX /FD /c
  +# ADD CPP /nologo /MD /W3 /GX /O2 /I "./include" /I "./os/win32" /I "./srclib/apr/include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c
   # SUBTRACT CPP /YX
   # ADD BASE RSC /l 0x809 /d "NDEBUG"
   # ADD RSC /l 0x809 /d "NDEBUG"
  @@ -66,8 +66,8 @@
   # PROP Intermediate_Dir ".\ApacheD"
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
  -# ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /I "./include" /I "./os/win32" /I "./lib/apr/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
  -# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "./include" /I "./os/win32" /I "./lib/apr/include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /FD /c
  +# ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /I "./include" /I "./os/win32" /I "./srclib/apr/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c
  +# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "./include" /I "./os/win32" /I "./srclib/apr/include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /FD /c
   # SUBTRACT CPP /YX
   # ADD BASE RSC /l 0x809 /d "_DEBUG"
   # ADD RSC /l 0x809 /d "_DEBUG"
  @@ -95,7 +95,7 @@
   # End Source File
   # Begin Source File
   
  -SOURCE=.\main\http_main.c
  +SOURCE=.\server\http_main.c
   # End Source File
   # End Target
   # End Project
  
  
  
  1.30      +21 -21    httpd-2.0/Apache.dsw
  
  Index: Apache.dsw
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/Apache.dsw,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- Apache.dsw	2000/11/29 17:11:46	1.29
  +++ Apache.dsw	2000/12/05 16:34:18	1.30
  @@ -171,7 +171,7 @@
   
   ###############################################################################
   
  -Project: "aprlib"=".\lib\apr\aprlib.dsp" - Package Owner=<4>
  +Project: "aprlib"=".\srclib\apr\aprlib.dsp" - Package Owner=<4>
   
   Package=<5>
   {{{
  @@ -183,7 +183,7 @@
   
   ###############################################################################
   
  -Project: "aprlibdll"=".\lib\apr\aprlibdll.dsp" - Package Owner=<4>
  +Project: "aprlibdll"=".\srclib\apr\aprlibdll.dsp" - Package Owner=<4>
   
   Package=<5>
   {{{
  @@ -198,7 +198,7 @@
   
   ###############################################################################
   
  -Project: "dftables"=".\lib\pcre\dftables.dsp" - Package Owner=<4>
  +Project: "dftables"=".\srclib\pcre\dftables.dsp" - Package Owner=<4>
   
   Package=<5>
   {{{
  @@ -210,7 +210,7 @@
   
   ###############################################################################
   
  -Project: "expatlib"=".\lib\expat-lite\expatlib.dsp" - Package Owner=<4>
  +Project: "expatlib"=".\srclib\expat-lite\expatlib.dsp" - Package Owner=<4>
   
   Package=<5>
   {{{
  @@ -222,7 +222,7 @@
   
   ###############################################################################
   
  -Project: "gen_test_char"=".\main\gen_test_char.dsp" - Package Owner=<4>
  +Project: "gen_test_char"=".\server\gen_test_char.dsp" - Package Owner=<4>
   
   Package=<5>
   {{{
  @@ -237,7 +237,7 @@
   
   ###############################################################################
   
  -Project: "gen_uri_delims"=".\main\gen_uri_delims.dsp" - Package Owner=<4>
  +Project: "gen_uri_delims"=".\server\gen_uri_delims.dsp" - Package Owner=<4>
   
   Package=<5>
   {{{
  @@ -315,7 +315,7 @@
   
   ###############################################################################
   
  -Project: "mod_auth_anon"=".\os\win32\mod_auth_anon.dsp" - Package Owner=<4>
  +Project: "mod_auth_anon"=".\modules\aaa\mod_auth_anon.dsp" - Package Owner=<4>
   
   Package=<5>
   {{{
  @@ -333,7 +333,7 @@
   
   ###############################################################################
   
  -Project: "mod_auth_dbm"=".\os\win32\mod_auth_dbm.dsp" - Package Owner=<4>
  +Project: "mod_auth_dbm"=".\modules\aaa\mod_auth_dbm.dsp" - Package Owner=<4>
   
   Package=<5>
   {{{
  @@ -354,7 +354,7 @@
   
   ###############################################################################
   
  -Project: "mod_auth_digest"=".\os\win32\mod_auth_digest.dsp" - Package Owner=<4>
  +Project: "mod_auth_digest"=".\modules\aaa\mod_auth_digest.dsp" - Package Owner=<4>
   
   Package=<5>
   {{{
  @@ -372,7 +372,7 @@
   
   ###############################################################################
   
  -Project: "mod_cern_meta"=".\os\win32\mod_cern_meta.dsp" - Package Owner=<4>
  +Project: "mod_cern_meta"=".\modules\metadata\mod_cern_meta.dsp" - Package Owner=<4>
   
   Package=<5>
   {{{
  @@ -390,7 +390,7 @@
   
   ###############################################################################
   
  -Project: "mod_dav"=".\os\win32\mod_dav.dsp" - Package Owner=<4>
  +Project: "mod_dav"=".\modules\dav\main\mod_dav.dsp" - Package Owner=<4>
   
   Package=<5>
   {{{
  @@ -408,7 +408,7 @@
   
   ###############################################################################
   
  -Project: "mod_dav_fs"=".\os\win32\mod_dav_fs.dsp" - Package Owner=<4>
  +Project: "mod_dav_fs"=".\modules\dav\fs\mod_dav_fs.dsp" - Package Owner=<4>
   
   Package=<5>
   {{{
  @@ -435,7 +435,7 @@
   
   ###############################################################################
   
  -Project: "mod_expires"=".\os\win32\mod_expires.dsp" - Package Owner=<4>
  +Project: "mod_expires"=".\modules\metadata\mod_expires.dsp" - Package Owner=<4>
   
   Package=<5>
   {{{
  @@ -453,7 +453,7 @@
   
   ###############################################################################
   
  -Project: "mod_file_cache"=".\os\win32\mod_file_cache.dsp" - Package Owner=<4>
  +Project: "mod_file_cache"=".\modules\cache\mod_file_cache.dsp" - Package Owner=<4>
   
   Package=<5>
   {{{
  @@ -471,7 +471,7 @@
   
   ###############################################################################
   
  -Project: "mod_headers"=".\os\win32\mod_headers.dsp" - Package Owner=<4>
  +Project: "mod_headers"=".\modules\metadata\mod_headers.dsp" - Package Owner=<4>
   
   Package=<5>
   {{{
  @@ -489,7 +489,7 @@
   
   ###############################################################################
   
  -Project: "mod_info"=".\os\win32\mod_info.dsp" - Package Owner=<4>
  +Project: "mod_info"=".\modules\generators\mod_info.dsp" - Package Owner=<4>
   
   Package=<5>
   {{{
  @@ -507,7 +507,7 @@
   
   ###############################################################################
   
  -Project: "mod_proxy"=".\os\win32\mod_proxy.dsp" - Package Owner=<4>
  +Project: "mod_proxy"=".\modules\proxy\mod_proxy.dsp" - Package Owner=<4>
   
   Package=<5>
   {{{
  @@ -525,7 +525,7 @@
   
   ###############################################################################
   
  -Project: "mod_rewrite"=".\os\win32\mod_rewrite.dsp" - Package Owner=<4>
  +Project: "mod_rewrite"=".\modules\mappers\mod_rewrite.dsp" - Package Owner=<4>
   
   Package=<5>
   {{{
  @@ -543,7 +543,7 @@
   
   ###############################################################################
   
  -Project: "mod_speling"=".\os\win32\mod_speling.dsp" - Package Owner=<4>
  +Project: "mod_speling"=".\modules\mappers\mod_speling.dsp" - Package Owner=<4>
   
   Package=<5>
   {{{
  @@ -561,7 +561,7 @@
   
   ###############################################################################
   
  -Project: "mod_status"=".\os\win32\mod_status.dsp" - Package Owner=<4>
  +Project: "mod_status"=".\modules\generators\mod_status.dsp" - Package Owner=<4>
   
   Package=<5>
   {{{
  @@ -579,7 +579,7 @@
   
   ###############################################################################
   
  -Project: "mod_usertrack"=".\os\win32\mod_usertrack.dsp" - Package Owner=<4>
  +Project: "mod_usertrack"=".\modules\metadata\mod_usertrack.dsp" - Package Owner=<4>
   
   Package=<5>
   {{{
  
  
  
  1.47      +70 -70    httpd-2.0/ApacheCore.dsp
  
  Index: ApacheCore.dsp
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/ApacheCore.dsp,v
  retrieving revision 1.46
  retrieving revision 1.47
  diff -u -r1.46 -r1.47
  --- ApacheCore.dsp	2000/12/04 19:13:55	1.46
  +++ ApacheCore.dsp	2000/12/05 16:34:20	1.47
  @@ -40,8 +40,8 @@
   # PROP Output_Dir "LibR"
   # PROP Intermediate_Dir "LibR"
   # PROP Target_Dir ""
  -# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I ".\include" /I ".\lib\apr\include" /I ".\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /FD /c
  -# ADD CPP /nologo /MD /W3 /GX /O2 /I ".\include" /I ".\lib\apr\include" /I ".\lib\aputil" /I ".\lib\sdbm" /I ".\os\win32" /I ".\modules\mpm\winnt" /I ".\lib\expat-lite" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /FD /c
  +# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I ".\include" /I ".\srclib\apr\include" /I ".\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /FD /c
  +# ADD CPP /nologo /MD /W3 /GX /O2 /I ".\include" /I ".\srclib\apr\include" /I ".\srclib\apr-util" /I ".\srclib\sdbm" /I ".\os\win32" /I ".\server\mpm\winnt" /I ".\srclib\expat-lite" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /FD /c
   # ADD BASE RSC /l 0x409
   # ADD RSC /l 0x409
   BSC32=bscmake.exe
  @@ -64,8 +64,8 @@
   # PROP Intermediate_Dir "LibD"
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
  -# ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /I ".\include" /I ".\lib\apr\include" /I ".\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /FD /c
  -# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I ".\include" /I ".\lib\apr\include" /I ".\lib\aputil" /I ".\lib\sdbm" /I ".\os\win32" /I ".\modules\mpm\winnt" /I ".\lib\expat-lite" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /FD /c
  +# ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /I ".\include" /I ".\srclib\apr\include" /I ".\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /FD /c
  +# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I ".\include" /I ".\srclib\apr\include" /I ".\srclib\apr-util" /I ".\srclib\sdbm" /I ".\os\win32" /I ".\server\mpm\winnt" /I ".\srclib\expat-lite" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /FD /c
   # ADD BASE RSC /l 0x409
   # ADD RSC /l 0x409
   BSC32=bscmake.exe
  @@ -119,27 +119,27 @@
   # PROP Default_Filter ""
   # Begin Source File
   
  -SOURCE=.\lib\aputil\apu_private.hw
  +SOURCE=.\srclib\apr-util\apu_private.hw
   
   !IF  "$(CFG)" == "ApacheCore - Win32 Release"
   
   # Begin Custom Build
  -InputPath=.\lib\aputil\apu_private.hw
  +InputPath=.\srclib\apr-util\apu_private.hw
   
  -".\lib\aputil\apu_private.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
  -	copy .\lib\aputil\apu_private.hw .\lib\aputil\apu_private.h >nul 
  -	echo Created aputil apu_private.h from apu_private.hw 
  +".\srclib\apr-util\apu_private.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
  +	copy .\srclib\apr-util\apu_private.hw .\srclib\apr-util\apu_private.h >nul 
  +	echo Created apr-util apu_private.h from apu_private.hw 
   	
   # End Custom Build
   
   !ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
   
   # Begin Custom Build
  -InputPath=.\lib\aputil\apu_private.hw
  +InputPath=.\srclib\apr-util\apu_private.hw
   
  -".\lib\aputil\apu_private.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
  -	copy .\lib\aputil\apu_private.hw .\lib\aputil\apu_private.h >nul 
  -	echo Created aputil apu_private.h from apu_private.hw 
  +".\srclib\apr-util\apu_private.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
  +	copy .\srclib\apr-util\apu_private.hw .\srclib\apr-util\apu_private.h >nul 
  +	echo Created apr-util apu_private.h from apu_private.hw 
   	
   # End Custom Build
   
  @@ -148,15 +148,15 @@
   # End Source File
   # Begin Source File
   
  -SOURCE=.\main\gen_test_char.exe
  +SOURCE=.\server\gen_test_char.exe
   
   !IF  "$(CFG)" == "ApacheCore - Win32 Release"
   
   # Begin Custom Build - Generating test_char.h
  -InputPath=.\main\gen_test_char.exe
  +InputPath=.\server\gen_test_char.exe
   
  -".\main\test_char.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
  -	.\main\gen_test_char.exe >.\main\test_char.h 
  +".\server\test_char.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
  +	.\server\gen_test_char.exe >.\server\test_char.h 
   	echo Generated test_char.h from gen_test_char.exe 
   	
   # End Custom Build
  @@ -164,10 +164,10 @@
   !ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
   
   # Begin Custom Build - Generating test_char.h
  -InputPath=.\main\gen_test_char.exe
  +InputPath=.\server\gen_test_char.exe
   
  -".\main\test_char.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
  -	.\main\gen_test_char.exe >.\main\test_char.h 
  +".\server\test_char.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
  +	.\server\gen_test_char.exe >.\server\test_char.h 
   	echo Generated test_char.h from gen_test_char.exe 
   	
   # End Custom Build
  @@ -177,15 +177,15 @@
   # End Source File
   # Begin Source File
   
  -SOURCE=.\main\gen_uri_delims.exe
  +SOURCE=.\server\gen_uri_delims.exe
   
   !IF  "$(CFG)" == "ApacheCore - Win32 Release"
   
   # Begin Custom Build - Generating uri_delims.h
  -InputPath=.\main\gen_uri_delims.exe
  +InputPath=.\server\gen_uri_delims.exe
   
  -".\main\uri_delims.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
  -	.\main\gen_uri_delims.exe >.\main\uri_delims.h 
  +".\server\uri_delims.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
  +	.\server\gen_uri_delims.exe >.\server\uri_delims.h 
   	echo Generated uri_delims.h from gen_uri_delims.exe 
   	
   # End Custom Build
  @@ -193,10 +193,10 @@
   !ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
   
   # Begin Custom Build - Generating uri_delims.h
  -InputPath=.\main\gen_uri_delims.exe
  +InputPath=.\server\gen_uri_delims.exe
   
  -".\main\uri_delims.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
  -	.\main\gen_uri_delims.exe >.\main\uri_delims.h 
  +".\server\uri_delims.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
  +	.\server\gen_uri_delims.exe >.\server\uri_delims.h 
   	echo Generated uri_delims.h from gen_uri_delims.exe 
   	
   # End Custom Build
  @@ -206,11 +206,11 @@
   # End Source File
   # Begin Source File
   
  -SOURCE=.\main\test_char.h
  +SOURCE=.\server\test_char.h
   # End Source File
   # Begin Source File
   
  -SOURCE=.\main\uri_delims.h
  +SOURCE=.\server\uri_delims.h
   # End Source File
   # End Group
   # Begin Group "ap_buckets"
  @@ -294,7 +294,7 @@
   # End Source File
   # Begin Source File
   
  -SOURCE=.\lib\aputil\apu_dbm.c
  +SOURCE=.\srclib\apr-util\apu_dbm.c
   # End Source File
   # End Group
   # Begin Group "httpd"
  @@ -302,7 +302,7 @@
   # PROP Default_Filter ""
   # Begin Source File
   
  -SOURCE=.\main\http_config.c
  +SOURCE=.\server\http_config.c
   # End Source File
   # Begin Source File
   
  @@ -310,7 +310,7 @@
   # End Source File
   # Begin Source File
   
  -SOURCE=.\main\http_connection.c
  +SOURCE=.\server\http_connection.c
   # End Source File
   # Begin Source File
   
  @@ -318,7 +318,7 @@
   # End Source File
   # Begin Source File
   
  -SOURCE=.\main\http_core.c
  +SOURCE=.\server\http_core.c
   # End Source File
   # Begin Source File
   
  @@ -326,7 +326,7 @@
   # End Source File
   # Begin Source File
   
  -SOURCE=.\main\http_log.c
  +SOURCE=.\server\http_log.c
   # End Source File
   # Begin Source File
   
  @@ -338,7 +338,7 @@
   # End Source File
   # Begin Source File
   
  -SOURCE=.\main\http_protocol.c
  +SOURCE=.\server\http_protocol.c
   # End Source File
   # Begin Source File
   
  @@ -346,7 +346,7 @@
   # End Source File
   # Begin Source File
   
  -SOURCE=.\main\http_request.c
  +SOURCE=.\server\http_request.c
   # End Source File
   # Begin Source File
   
  @@ -354,7 +354,7 @@
   # End Source File
   # Begin Source File
   
  -SOURCE=.\main\http_vhost.c
  +SOURCE=.\server\http_vhost.c
   # End Source File
   # Begin Source File
   
  @@ -370,47 +370,47 @@
   # PROP Default_Filter ""
   # Begin Source File
   
  -SOURCE=.\modules\standard\mod_access.c
  +SOURCE=.\modules\aaa\mod_access.c
   # End Source File
   # Begin Source File
   
  -SOURCE=.\modules\standard\mod_actions.c
  +SOURCE=.\modules\mappers\mod_actions.c
   # End Source File
   # Begin Source File
   
  -SOURCE=.\modules\standard\mod_alias.c
  +SOURCE=.\modules\mappers\mod_alias.c
   # End Source File
   # Begin Source File
   
  -SOURCE=.\modules\standard\mod_asis.c
  +SOURCE=.\modules\generators\mod_asis.c
   # End Source File
   # Begin Source File
   
  -SOURCE=.\modules\standard\mod_auth.c
  +SOURCE=.\modules\aaa\mod_auth.c
   # End Source File
   # Begin Source File
   
  -SOURCE=.\modules\standard\mod_autoindex.c
  +SOURCE=.\modules\generators\mod_autoindex.c
   # End Source File
   # Begin Source File
   
  -SOURCE=.\modules\standard\mod_cgi.c
  +SOURCE=.\modules\generators\mod_cgi.c
   # End Source File
   # Begin Source File
   
  -SOURCE=.\modules\standard\mod_dir.c
  +SOURCE=.\modules\mappers\mod_dir.c
   # End Source File
   # Begin Source File
   
  -SOURCE=.\modules\standard\mod_env.c
  +SOURCE=.\modules\metadata\mod_env.c
   # End Source File
   # Begin Source File
   
  -SOURCE=.\modules\standard\mod_imap.c
  +SOURCE=.\modules\mappers\mod_imap.c
   # End Source File
   # Begin Source File
   
  -SOURCE=.\modules\standard\mod_include.c
  +SOURCE=.\modules\filters\mod_include.c
   # End Source File
   # Begin Source File
   
  @@ -418,27 +418,27 @@
   # End Source File
   # Begin Source File
   
  -SOURCE=.\modules\standard\mod_log_config.c
  +SOURCE=.\modules\loggers\mod_log_config.c
   # End Source File
   # Begin Source File
   
  -SOURCE=.\modules\standard\mod_mime.c
  +SOURCE=.\modules\http\mod_mime.c
   # End Source File
   # Begin Source File
   
  -SOURCE=.\modules\standard\mod_negotiation.c
  +SOURCE=.\modules\mappers\mod_negotiation.c
   # End Source File
   # Begin Source File
   
  -SOURCE=.\modules\standard\mod_setenvif.c
  +SOURCE=.\modules\metadata\mod_setenvif.c
   # End Source File
   # Begin Source File
   
  -SOURCE=.\modules\standard\mod_so.c
  +SOURCE=.\modules\mappers\mod_so.c
   # End Source File
   # Begin Source File
   
  -SOURCE=.\modules\standard\mod_userdir.c
  +SOURCE=.\modules\mappers\mod_userdir.c
   # End Source File
   # End Group
   # Begin Group "util"
  @@ -446,7 +446,7 @@
   # PROP Default_Filter ""
   # Begin Source File
   
  -SOURCE=.\main\rfc1413.c
  +SOURCE=.\server\rfc1413.c
   # End Source File
   # Begin Source File
   
  @@ -454,11 +454,11 @@
   # End Source File
   # Begin Source File
   
  -SOURCE=.\main\util.c
  +SOURCE=.\server\util.c
   # End Source File
   # Begin Source File
   
  -SOURCE=.\main\util_cfgtree.c
  +SOURCE=.\server\util_cfgtree.c
   # End Source File
   # Begin Source File
   
  @@ -470,7 +470,7 @@
   # End Source File
   # Begin Source File
   
  -SOURCE=.\main\util_date.c
  +SOURCE=.\server\util_date.c
   # End Source File
   # Begin Source File
   
  @@ -482,7 +482,7 @@
   # End Source File
   # Begin Source File
   
  -SOURCE=.\main\util_filter.c
  +SOURCE=.\server\util_filter.c
   # End Source File
   # Begin Source File
   
  @@ -490,7 +490,7 @@
   # End Source File
   # Begin Source File
   
  -SOURCE=.\main\util_md5.c
  +SOURCE=.\server\util_md5.c
   # End Source File
   # Begin Source File
   
  @@ -498,7 +498,7 @@
   # End Source File
   # Begin Source File
   
  -SOURCE=.\main\util_script.c
  +SOURCE=.\server\util_script.c
   # End Source File
   # Begin Source File
   
  @@ -506,7 +506,7 @@
   # End Source File
   # Begin Source File
   
  -SOURCE=.\main\util_uri.c
  +SOURCE=.\server\util_uri.c
   # End Source File
   # Begin Source File
   
  @@ -518,7 +518,7 @@
   # End Source File
   # Begin Source File
   
  -SOURCE=.\main\util_xml.c
  +SOURCE=.\server\util_xml.c
   # End Source File
   # Begin Source File
   
  @@ -538,11 +538,11 @@
   # End Source File
   # Begin Source File
   
  -SOURCE=.\main\listen.c
  +SOURCE=.\server\listen.c
   # End Source File
   # Begin Source File
   
  -SOURCE=.\modules\mpm\winnt\mpm.h
  +SOURCE=.\server\mpm\winnt\mpm.h
   # End Source File
   # Begin Source File
   
  @@ -550,7 +550,7 @@
   # End Source File
   # Begin Source File
   
  -SOURCE=.\modules\mpm\winnt\mpm_default.h
  +SOURCE=.\server\mpm\winnt\mpm_default.h
   # End Source File
   # Begin Source File
   
  @@ -558,19 +558,19 @@
   # End Source File
   # Begin Source File
   
  -SOURCE=.\modules\mpm\winnt\mpm_winnt.c
  +SOURCE=.\server\mpm\winnt\mpm_winnt.c
   # End Source File
   # Begin Source File
   
  -SOURCE=.\modules\mpm\winnt\mpm_winnt.h
  +SOURCE=.\server\mpm\winnt\mpm_winnt.h
   # End Source File
   # Begin Source File
   
  -SOURCE=.\modules\mpm\winnt\registry.c
  +SOURCE=.\server\mpm\winnt\registry.c
   # End Source File
   # Begin Source File
   
  -SOURCE=.\modules\mpm\winnt\service.c
  +SOURCE=.\server\mpm\winnt\service.c
   # End Source File
   # End Group
   # End Target
  
  
  
  1.11      +7 -7      httpd-2.0/modules/aaa/mod_auth_anon.dsp
  
  Index: mod_auth_anon.dsp
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/aaa/mod_auth_anon.dsp,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- mod_auth_anon.dsp	2000/10/11 17:19:36	1.10
  +++ mod_auth_anon.dsp	2000/12/05 16:34:51	1.11
  @@ -43,7 +43,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 "..\..\include" /I ".\\" /I "..\..\lib\apr\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /FD /c
  +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /I "..\..\os\win32" /I "..\..\srclib\apr\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /FD /c
   # SUBTRACT CPP /YX
   # ADD BASE MTL /nologo /D "NDEBUG" /win32
   # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
  @@ -53,8 +53,8 @@
   # ADD BASE BSC32 /nologo
   # ADD BSC32 /nologo
   LINK32=link.exe
  -# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release" /base:@BaseAddr.ref,mod_auth_anon
  -# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release" /base:@BaseAddr.ref,mod_auth_anon
  +# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\srclib\apr\Release" /base:@BaseAddr.ref,mod_auth_anon
  +# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\srclib\apr\Release" /base:@BaseAddr.ref,mod_auth_anon
   
   !ELSEIF  "$(CFG)" == "mod_auth_anon - Win32 Debug"
   
  @@ -70,7 +70,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 "..\..\include" /I ".\\" /I "..\..\lib\apr\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /FD /c
  +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\include" /I "..\..\os\win32" /I "..\..\srclib\apr\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /FD /c
   # SUBTRACT CPP /YX
   # ADD BASE MTL /nologo /D "_DEBUG" /win32
   # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
  @@ -80,8 +80,8 @@
   # ADD BASE BSC32 /nologo
   # ADD BSC32 /nologo
   LINK32=link.exe
  -# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug" /base:@BaseAddr.ref,mod_auth_anon
  -# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug" /base:@BaseAddr.ref,mod_auth_anon
  +# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\srclib\apr\Debug" /base:@BaseAddr.ref,mod_auth_anon
  +# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\srclib\apr\Debug" /base:@BaseAddr.ref,mod_auth_anon
   # SUBTRACT LINK32 /incremental:no /map
   
   !ENDIF 
  @@ -92,7 +92,7 @@
   # Name "mod_auth_anon - Win32 Debug"
   # Begin Source File
   
  -SOURCE=..\..\modules\standard\mod_auth_anon.c
  +SOURCE=.\mod_auth_anon.c
   # End Source File
   # End Target
   # End Project
  
  
  
  1.4       +7 -7      httpd-2.0/modules/aaa/mod_auth_dbm.dsp
  
  Index: mod_auth_dbm.dsp
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/aaa/mod_auth_dbm.dsp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- mod_auth_dbm.dsp	2000/10/11 17:19:37	1.3
  +++ mod_auth_dbm.dsp	2000/12/05 16:35:06	1.4
  @@ -43,7 +43,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 "..\..\include" /I "..\..\lib\apr\include" /I "..\..\lib\sdbm" /I ".\\" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /FD /c
  +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /I "..\..\srclib\apr\include" /I "..\..\srclib\sdbm" /I "..\..\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /FD /c
   # ADD BASE MTL /nologo /D "NDEBUG" /win32
   # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
   # ADD BASE RSC /l 0x809 /d "NDEBUG"
  @@ -52,8 +52,8 @@
   # ADD BASE BSC32 /nologo
   # ADD BSC32 /nologo
   LINK32=link.exe
  -# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release" /base:@BaseAddr.ref,mod_auth_dbm
  -# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release" /base:@BaseAddr.ref,mod_auth_dbm
  +# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\srclib\apr\Release" /base:@BaseAddr.ref,mod_auth_dbm
  +# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\srclib\apr\Release" /base:@BaseAddr.ref,mod_auth_dbm
   
   !ELSEIF  "$(CFG)" == "mod_auth_dbm - 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" /YX /c
  -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\include" /I "..\..\lib\apr\include" /I "..\..\lib\sdbm" /I ".\\" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /FD /c
  +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\include" /I "..\..\srclib\apr\include" /I "..\..\srclib\sdbm" /I "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /FD /c
   # ADD BASE MTL /nologo /D "_DEBUG" /win32
   # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
   # ADD BASE RSC /l 0x809 /d "_DEBUG"
  @@ -78,8 +78,8 @@
   # ADD BASE BSC32 /nologo
   # ADD BSC32 /nologo
   LINK32=link.exe
  -# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug" /base:@BaseAddr.ref,mod_auth_dbm
  -# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug" /base:@BaseAddr.ref,mod_auth_dbm
  +# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\srclib\apr\Debug" /base:@BaseAddr.ref,mod_auth_dbm
  +# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\srclib\apr\Debug" /base:@BaseAddr.ref,mod_auth_dbm
   # SUBTRACT LINK32 /incremental:no /map
   
   !ENDIF 
  @@ -90,7 +90,7 @@
   # Name "mod_auth_dbm - Win32 Debug"
   # Begin Source File
   
  -SOURCE=..\..\modules\standard\mod_auth_dbm.c
  +SOURCE=.\mod_auth_dbm.c
   # End Source File
   # End Target
   # End Project
  
  
  
  1.11      +5 -5      httpd-2.0/modules/aaa/mod_auth_digest.dsp
  
  Index: mod_auth_digest.dsp
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/aaa/mod_auth_digest.dsp,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- mod_auth_digest.dsp	2000/10/11 17:19:38	1.10
  +++ mod_auth_digest.dsp	2000/12/05 16:35:07	1.11
  @@ -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" /FD /c
  -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /I ".\\" /I "..\..\lib\apr\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /FD /c
  +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /I "..\..\os\win32" /I "..\..\srclib\apr\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /FD /c
   # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
   # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
   # ADD BASE RSC /l 0x409 /d "NDEBUG"
  @@ -53,7 +53,7 @@
   # ADD BSC32 /nologo
   LINK32=link.exe
   # ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /machine:I386
  -# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release" /base:@BaseAddr.ref,mod_auth_digest
  +# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\srclib\apr\Release" /base:@BaseAddr.ref,mod_auth_digest
   # SUBTRACT LINK32 /pdb:none
   
   !ELSEIF  "$(CFG)" == "mod_auth_digest - Win32 Debug"
  @@ -70,7 +70,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
  -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\include" /I ".\\" /I "..\..\lib\apr\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /FD /c
  +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\include" /I "..\..\os\win32" /I "..\..\srclib\apr\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /FD /c
   # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
   # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
   # ADD BASE RSC /l 0x409 /d "_DEBUG"
  @@ -80,7 +80,7 @@
   # ADD BSC32 /nologo
   LINK32=link.exe
   # ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
  -# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug" /base:@BaseAddr.ref,mod_auth_digest
  +# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept /libpath:"..\..\CoreD" /libpath:"..\..\srclib\apr\Debug" /base:@BaseAddr.ref,mod_auth_digest
   # SUBTRACT LINK32 /pdb:none /incremental:no /map
   
   !ENDIF 
  @@ -91,7 +91,7 @@
   # Name "mod_auth_digest - Win32 Debug"
   # Begin Source File
   
  -SOURCE=..\..\modules\standard\mod_auth_digest.c
  +SOURCE=.\mod_auth_digest.c
   # End Source File
   # End Target
   # End Project
  
  
  
  1.8       +5 -5      httpd-2.0/modules/cache/mod_file_cache.dsp
  
  Index: mod_file_cache.dsp
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/cache/mod_file_cache.dsp,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- mod_file_cache.dsp	2000/10/11 17:19:40	1.7
  +++ mod_file_cache.dsp	2000/12/05 16:35:16	1.8
  @@ -43,7 +43,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
  -# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\include" /I ".\\" /I "..\..\lib\apr\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /FD /c
  +# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\include" /I "..\..\os\win32" /I "..\..\srclib\apr\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /FD /c
   # SUBTRACT CPP /YX
   # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
   # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
  @@ -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 user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release"
  +# ADD LINK32 user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\srclib\apr\Release"
   
   !ELSEIF  "$(CFG)" == "mod_file_cache - Win32 Debug"
   
  @@ -70,7 +70,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 /FD /c
  -# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\..\include" /I ".\\" /I "..\..\lib\apr\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /FD /c
  +# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\..\include" /I "..\..\os\win32" /I "..\..\srclib\apr\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /FD /c
   # SUBTRACT CPP /YX
   # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
   # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
  @@ -81,7 +81,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 /debug /machine:I386 /pdbtype:sept
  -# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug"
  +# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept /libpath:"..\..\CoreD" /libpath:"..\..\srclib\apr\Debug"
   # SUBTRACT LINK32 /incremental:no /map
   
   !ENDIF 
  @@ -92,7 +92,7 @@
   # Name "mod_file_cache - Win32 Debug"
   # Begin Source File
   
  -SOURCE=..\..\modules\standard\mod_file_cache.c
  +SOURCE=.\mod_file_cache.c
   # End Source File
   # End Target
   # End Project
  
  
  
  1.4       +11 -11    httpd-2.0/modules/dav/fs/mod_dav_fs.dsp
  
  Index: mod_dav_fs.dsp
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/dav/fs/mod_dav_fs.dsp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- mod_dav_fs.dsp	2000/11/29 17:12:00	1.3
  +++ mod_dav_fs.dsp	2000/12/05 16:35:19	1.4
  @@ -43,7 +43,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 "..\..\modules\dav\main" /I "..\..\lib\aputil" /I "..\..\lib\sdbm" /I "..\..\lib\expat-lite" /I "..\..\lib\apr\include" /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /c
  +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\main" /I "..\..\..\srclib\aputil" /I "..\..\..\srclib\sdbm" /I "..\..\..\srclib\expat-lite" /I "..\..\..\srclib\apr\include" /I "..\..\..\include" /I "..\..\..\os\win32" /D "NDEBUG" /D "WIN32" /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"
  @@ -52,8 +52,8 @@
   # ADD BASE BSC32 /nologo
   # ADD BSC32 /nologo
   LINK32=link.exe
  -# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release" /base:@BaseAddr.ref,mod_dav_fs
  -# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release" /base:@BaseAddr.ref,mod_dav_fs
  +# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\..\CoreR" /libpath:"..\..\..\srclib\apr\Release" /base:@BaseAddr.ref,mod_dav_fs
  +# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\..\CoreR" /libpath:"..\..\..\srclib\apr\Release" /base:@BaseAddr.ref,mod_dav_fs
   
   !ELSEIF  "$(CFG)" == "mod_dav_fs - Win32 Debug"
   
  @@ -69,7 +69,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /MTd /W3 /GX /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /ZI /c
  -# ADD CPP /nologo /MDd /W3 /GX /Od /I "..\..\modules\dav\main" /I "..\..\lib\aputil" /I "..\..\lib\sdbm" /I "..\..\lib\expat-lite" /I "..\..\lib\apr\include" /I "..\..\include" /I "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /ZI /c
  +# ADD CPP /nologo /MDd /W3 /GX /Od /I "..\main" /I "..\..\..\srclib\aputil" /I "..\..\..\srclib\sdbm" /I "..\..\..\srclib\expat-lite" /I "..\..\..\srclib\apr\include" /I "..\..\..\include" /I "..\..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /ZI /c
   # ADD BASE MTL /nologo /D "_DEBUG" /win32
   # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
   # ADD BASE RSC /l 0x809 /d "_DEBUG"
  @@ -78,8 +78,8 @@
   # ADD BASE BSC32 /nologo
   # ADD BSC32 /nologo
   LINK32=link.exe
  -# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug" /base:@BaseAddr.ref,mod_dav_fs
  -# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug" /base:@BaseAddr.ref,mod_dav_fs
  +# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\..\CoreD" /libpath:"..\..\..\srclib\apr\Debug" /base:@BaseAddr.ref,mod_dav_fs
  +# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /debug /machine:I386 /libpath:"..\..\..\CoreD" /libpath:"..\..\..\srclib\apr\Debug" /base:@BaseAddr.ref,mod_dav_fs
   # SUBTRACT LINK32 /incremental:no /map
   
   !ENDIF 
  @@ -93,19 +93,19 @@
   # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
   # Begin Source File
   
  -SOURCE=..\..\modules\dav\fs\dbm.c
  +SOURCE=.\dbm.c
   # End Source File
   # Begin Source File
   
  -SOURCE=..\..\modules\dav\fs\lock.c
  +SOURCE=.\lock.c
   # End Source File
   # Begin Source File
   
  -SOURCE=..\..\modules\dav\fs\mod_dav_fs.c
  +SOURCE=.\mod_dav_fs.c
   # End Source File
   # Begin Source File
   
  -SOURCE=..\..\modules\dav\fs\repos.c
  +SOURCE=.\repos.c
   # End Source File
   # End Group
   # Begin Group "Header Files"
  @@ -113,7 +113,7 @@
   # PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
   # Begin Source File
   
  -SOURCE=..\..\modules\dav\fs\repos.h
  +SOURCE=.\repos.h
   # End Source File
   # End Group
   # End Target
  
  
  
  1.4       +14 -14    httpd-2.0/modules/dav/main/mod_dav.dsp
  
  Index: mod_dav.dsp
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/dav/main/mod_dav.dsp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- mod_dav.dsp	2000/11/29 17:11:58	1.3
  +++ mod_dav.dsp	2000/12/05 16:35:21	1.4
  @@ -43,7 +43,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 "..\..\modules\dav\main" /I "..\..\lib\aputil" /I "..\..\lib\sdbm" /I "..\..\lib\expat-lite" /I "..\..\lib\apr\include" /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "DAV_DECLARE_EXPORT" /YX /FD /c
  +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\srclib\aputil" /I "..\..\..\srclib\sdbm" /I "..\..\..\srclib\expat-lite" /I "..\..\..\srclib\apr\include" /I "..\..\..\include" /I "..\..\..\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "DAV_DECLARE_EXPORT" /YX /FD /c
   # ADD BASE MTL /nologo /D "NDEBUG" /win32
   # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
   # ADD BASE RSC /l 0x809 /d "NDEBUG"
  @@ -52,8 +52,8 @@
   # ADD BASE BSC32 /nologo
   # ADD BSC32 /nologo
   LINK32=link.exe
  -# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release" /base:@BaseAddr.ref,mod_dav
  -# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release" /base:@BaseAddr.ref,mod_dav
  +# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\..\CoreR" /libpath:"..\..\..\srclib\apr\Release" /base:@BaseAddr.ref,mod_dav
  +# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\..\CoreR" /libpath:"..\..\..\srclib\apr\Release" /base:@BaseAddr.ref,mod_dav
   
   !ELSEIF  "$(CFG)" == "mod_dav - Win32 Debug"
   
  @@ -69,7 +69,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /MTd /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c
  -# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "..\..\modules\dav\main" /I "..\..\lib\aputil" /I "..\..\lib\sdbm" /I "..\..\lib\expat-lite" /I "..\..\lib\apr\include" /I "..\..\include" /I "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "DAV_DECLARE_EXPORT" /YX /FD /c
  +# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "..\..\..\srclib\aputil" /I "..\..\..\srclib\sdbm" /I "..\..\..\srclib\expat-lite" /I "..\..\..\srclib\apr\include" /I "..\..\..\include" /I "..\..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "DAV_DECLARE_EXPORT" /YX /FD /c
   # ADD BASE MTL /nologo /D "_DEBUG" /win32
   # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
   # ADD BASE RSC /l 0x809 /d "_DEBUG"
  @@ -78,8 +78,8 @@
   # ADD BASE BSC32 /nologo
   # ADD BSC32 /nologo
   LINK32=link.exe
  -# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug" /base:@BaseAddr.ref,mod_dav
  -# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug" /base:@BaseAddr.ref,mod_dav
  +# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\..\CoreD" /libpath:"..\..\..\srclib\apr\Debug" /base:@BaseAddr.ref,mod_dav
  +# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /debug /machine:I386 /libpath:"..\..\..\CoreD" /libpath:"..\..\..\srclib\apr\Debug" /base:@BaseAddr.ref,mod_dav
   # SUBTRACT LINK32 /incremental:no /map
   
   !ENDIF 
  @@ -93,31 +93,31 @@
   # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
   # Begin Source File
   
  -SOURCE=..\..\modules\dav\main\liveprop.c
  +SOURCE=.\liveprop.c
   # End Source File
   # Begin Source File
   
  -SOURCE=..\..\modules\dav\main\mod_dav.c
  +SOURCE=.\mod_dav.c
   # End Source File
   # Begin Source File
   
  -SOURCE=..\..\modules\dav\main\props.c
  +SOURCE=.\props.c
   # End Source File
   # Begin Source File
   
  -SOURCE=..\..\modules\dav\main\providers.c
  +SOURCE=.\providers.c
   # End Source File
   # Begin Source File
   
  -SOURCE=..\..\modules\dav\main\std_liveprop.c
  +SOURCE=.\std_liveprop.c
   # End Source File
   # Begin Source File
   
  -SOURCE=..\..\modules\dav\main\util.c
  +SOURCE=.\util.c
   # End Source File
   # Begin Source File
   
  -SOURCE=..\..\modules\dav\main\util_lock.c
  +SOURCE=.\util_lock.c
   # End Source File
   # End Group
   # Begin Group "Header Files"
  @@ -125,7 +125,7 @@
   # PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
   # Begin Source File
   
  -SOURCE=..\..\modules\dav\main\mod_dav.h
  +SOURCE=.\mod_dav.h
   # End Source File
   # End Group
   # End Target
  
  
  
  1.12      +7 -7      httpd-2.0/modules/generators/mod_info.dsp
  
  Index: mod_info.dsp
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/generators/mod_info.dsp,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- mod_info.dsp	2000/10/11 17:19:42	1.11
  +++ mod_info.dsp	2000/12/05 16:35:24	1.12
  @@ -43,7 +43,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 "..\..\include" /I ".\\" /I "..\..\lib\apr\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /FD /c
  +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /I "..\..\os\win32" /I "..\..\srclib\apr\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /FD /c
   # SUBTRACT CPP /YX
   # ADD BASE MTL /nologo /D "NDEBUG" /win32
   # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
  @@ -53,8 +53,8 @@
   # ADD BASE BSC32 /nologo
   # ADD BSC32 /nologo
   LINK32=link.exe
  -# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release" /base:@BaseAddr.ref,mod_info
  -# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release" /base:@BaseAddr.ref,mod_info
  +# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\srclib\apr\Release" /base:@BaseAddr.ref,mod_info
  +# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\srclib\apr\Release" /base:@BaseAddr.ref,mod_info
   
   !ELSEIF  "$(CFG)" == "mod_info - Win32 Debug"
   
  @@ -70,7 +70,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 "..\..\include" /I ".\\" /I "..\..\lib\apr\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /FD /c
  +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\include" /I "..\..\os\win32" /I "..\..\srclib\apr\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /FD /c
   # SUBTRACT CPP /YX
   # ADD BASE MTL /nologo /D "_DEBUG" /win32
   # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
  @@ -80,8 +80,8 @@
   # ADD BASE BSC32 /nologo
   # ADD BSC32 /nologo
   LINK32=link.exe
  -# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug" /base:@BaseAddr.ref,mod_info
  -# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug" /base:@BaseAddr.ref,mod_info
  +# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\srclib\apr\Debug" /base:@BaseAddr.ref,mod_info
  +# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\srclib\apr\Debug" /base:@BaseAddr.ref,mod_info
   # SUBTRACT LINK32 /incremental:no /map
   
   !ENDIF 
  @@ -92,7 +92,7 @@
   # Name "mod_info - Win32 Debug"
   # Begin Source File
   
  -SOURCE=..\..\modules\standard\mod_info.c
  +SOURCE=.\mod_info.c
   # End Source File
   # End Target
   # End Project
  
  
  
  1.12      +7 -7      httpd-2.0/modules/generators/mod_status.dsp
  
  Index: mod_status.dsp
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/generators/mod_status.dsp,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- mod_status.dsp	2000/10/11 17:19:45	1.11
  +++ mod_status.dsp	2000/12/05 16:35:25	1.12
  @@ -43,7 +43,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 "..\..\include" /I ".\\" /I "..\..\lib\apr\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /FD /c
  +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /I "..\..\os\win32" /I "..\..\srclib\apr\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /FD /c
   # SUBTRACT CPP /YX
   # ADD BASE MTL /nologo /D "NDEBUG" /win32
   # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
  @@ -53,8 +53,8 @@
   # ADD BASE BSC32 /nologo
   # ADD BSC32 /nologo
   LINK32=link.exe
  -# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release" /base:@BaseAddr.ref,mod_status
  -# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release" /base:@BaseAddr.ref,mod_status
  +# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\srclib\apr\Release" /base:@BaseAddr.ref,mod_status
  +# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\srclib\apr\Release" /base:@BaseAddr.ref,mod_status
   
   !ELSEIF  "$(CFG)" == "mod_status - Win32 Debug"
   
  @@ -70,7 +70,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 "..\..\include" /I ".\\" /I "..\..\lib\apr\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /FD /c
  +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\include" /I "..\..\os\win32" /I "..\..\srclib\apr\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /FD /c
   # SUBTRACT CPP /YX
   # ADD BASE MTL /nologo /D "_DEBUG" /win32
   # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
  @@ -80,8 +80,8 @@
   # ADD BASE BSC32 /nologo
   # ADD BSC32 /nologo
   LINK32=link.exe
  -# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug" /base:@BaseAddr.ref,mod_status
  -# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug" /base:@BaseAddr.ref,mod_status
  +# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\srclib\apr\Debug" /base:@BaseAddr.ref,mod_status
  +# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\srclib\apr\Debug" /base:@BaseAddr.ref,mod_status
   # SUBTRACT LINK32 /incremental:no /map
   
   !ENDIF 
  @@ -92,7 +92,7 @@
   # Name "mod_status - Win32 Debug"
   # Begin Source File
   
  -SOURCE=..\..\modules\standard\mod_status.c
  +SOURCE=.\mod_status.c
   # End Source File
   # End Target
   # End Project
  
  
  
  1.14      +7 -7      httpd-2.0/modules/mappers/mod_rewrite.dsp
  
  Index: mod_rewrite.dsp
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/mappers/mod_rewrite.dsp,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- mod_rewrite.dsp	2000/11/29 00:47:38	1.13
  +++ mod_rewrite.dsp	2000/12/05 16:35:30	1.14
  @@ -43,7 +43,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 "..\..\include" /I ".\\" /I "..\..\lib\apr\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "NO_DBM_REWRITEMAP" /FD /c
  +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /I "..\..\os\win32" /I "..\..\srclib\apr\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "NO_DBM_REWRITEMAP" /FD /c
   # SUBTRACT CPP /YX
   # ADD BASE MTL /nologo /D "NDEBUG" /win32
   # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
  @@ -53,8 +53,8 @@
   # ADD BASE BSC32 /nologo
   # ADD BSC32 /nologo
   LINK32=link.exe
  -# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release" /base:@BaseAddr.ref,mod_rewrite
  -# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release" /base:@BaseAddr.ref,mod_rewrite
  +# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\srclib\apr\Release" /base:@BaseAddr.ref,mod_rewrite
  +# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\srclib\apr\Release" /base:@BaseAddr.ref,mod_rewrite
   
   !ELSEIF  "$(CFG)" == "mod_rewrite - Win32 Debug"
   
  @@ -70,7 +70,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /MTd /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c
  -# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "..\..\include" /I ".\\" /I "..\..\lib\apr\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "NO_DBM_REWRITEMAP" /FD /c
  +# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "..\..\include" /I "..\..\os\win32" /I "..\..\srclib\apr\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "NO_DBM_REWRITEMAP" /FD /c
   # SUBTRACT CPP /YX
   # ADD BASE MTL /nologo /D "_DEBUG" /win32
   # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
  @@ -80,8 +80,8 @@
   # ADD BASE BSC32 /nologo
   # ADD BSC32 /nologo
   LINK32=link.exe
  -# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug" /base:@BaseAddr.ref,mod_rewrite
  -# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug" /base:@BaseAddr.ref,mod_rewrite
  +# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\srclib\apr\Debug" /base:@BaseAddr.ref,mod_rewrite
  +# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\srclib\apr\Debug" /base:@BaseAddr.ref,mod_rewrite
   # SUBTRACT LINK32 /incremental:no /map
   
   !ENDIF 
  @@ -92,7 +92,7 @@
   # Name "mod_rewrite - Win32 Debug"
   # Begin Source File
   
  -SOURCE=..\..\modules\standard\mod_rewrite.c
  +SOURCE=.\mod_rewrite.c
   # End Source File
   # End Target
   # End Project
  
  
  
  1.12      +7 -7      httpd-2.0/modules/mappers/mod_speling.dsp
  
  Index: mod_speling.dsp
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/mappers/mod_speling.dsp,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- mod_speling.dsp	2000/10/11 17:19:44	1.11
  +++ mod_speling.dsp	2000/12/05 16:35:31	1.12
  @@ -43,7 +43,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 "..\..\include" /I ".\\" /I "..\..\lib\apr\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /FD /c
  +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /I "..\..\os\win32" /I "..\..\srclib\apr\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /FD /c
   # SUBTRACT CPP /YX
   # ADD BASE MTL /nologo /D "NDEBUG" /win32
   # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
  @@ -53,8 +53,8 @@
   # ADD BASE BSC32 /nologo
   # ADD BSC32 /nologo
   LINK32=link.exe
  -# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release" /base:@BaseAddr.ref,mod_speling
  -# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release" /base:@BaseAddr.ref,mod_speling
  +# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\srclib\apr\Release" /base:@BaseAddr.ref,mod_speling
  +# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\srclib\apr\Release" /base:@BaseAddr.ref,mod_speling
   
   !ELSEIF  "$(CFG)" == "mod_speling - Win32 Debug"
   
  @@ -70,7 +70,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 "..\..\include" /I ".\\" /I "..\..\lib\apr\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /FD /c
  +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\include" /I "..\..\os\win32" /I "..\..\srclib\apr\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /FD /c
   # SUBTRACT CPP /YX
   # ADD BASE MTL /nologo /D "_DEBUG" /win32
   # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
  @@ -80,8 +80,8 @@
   # ADD BASE BSC32 /nologo
   # ADD BSC32 /nologo
   LINK32=link.exe
  -# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug" /base:@BaseAddr.ref,mod_speling
  -# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug" /base:@BaseAddr.ref,mod_speling
  +# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\srclib\apr\Debug" /base:@BaseAddr.ref,mod_speling
  +# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\srclib\apr\Debug" /base:@BaseAddr.ref,mod_speling
   # SUBTRACT LINK32 /incremental:no /map
   
   !ENDIF 
  @@ -92,7 +92,7 @@
   # Name "mod_speling - Win32 Debug"
   # Begin Source File
   
  -SOURCE=..\..\modules\standard\mod_speling.c
  +SOURCE=.\mod_speling.c
   # End Source File
   # End Target
   # End Project
  
  
  
  1.12      +7 -7      httpd-2.0/modules/metadata/mod_cern_meta.dsp
  
  Index: mod_cern_meta.dsp
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/metadata/mod_cern_meta.dsp,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- mod_cern_meta.dsp	2000/10/11 17:19:38	1.11
  +++ mod_cern_meta.dsp	2000/12/05 16:35:34	1.12
  @@ -43,7 +43,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 "..\..\include" /I ".\\" /I "..\..\lib\apr\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /FD /c
  +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /I "..\..\os\win32" /I "..\..\srclib\apr\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /FD /c
   # SUBTRACT CPP /YX
   # ADD BASE MTL /nologo /D "NDEBUG" /win32
   # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
  @@ -53,8 +53,8 @@
   # ADD BASE BSC32 /nologo
   # ADD BSC32 /nologo
   LINK32=link.exe
  -# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release" /base:@BaseAddr.ref,mod_cern_meta
  -# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release" /base:@BaseAddr.ref,mod_cern_meta
  +# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\srclib\apr\Release" /base:@BaseAddr.ref,mod_cern_meta
  +# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\srclib\apr\Release" /base:@BaseAddr.ref,mod_cern_meta
   
   !ELSEIF  "$(CFG)" == "mod_cern_meta - Win32 Debug"
   
  @@ -70,7 +70,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 "..\..\include" /I ".\\" /I "..\..\lib\apr\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /FD /c
  +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\include" /I "..\..\os\win32" /I "..\..\srclib\apr\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /FD /c
   # SUBTRACT CPP /YX
   # ADD BASE MTL /nologo /D "_DEBUG" /win32
   # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
  @@ -80,8 +80,8 @@
   # ADD BASE BSC32 /nologo
   # ADD BSC32 /nologo
   LINK32=link.exe
  -# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug" /base:@BaseAddr.ref,mod_cern_meta
  -# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug" /base:@BaseAddr.ref,mod_cern_meta
  +# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\srclib\apr\Debug" /base:@BaseAddr.ref,mod_cern_meta
  +# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\srclib\apr\Debug" /base:@BaseAddr.ref,mod_cern_meta
   # SUBTRACT LINK32 /incremental:no /map
   
   !ENDIF 
  @@ -92,7 +92,7 @@
   # Name "mod_cern_meta - Win32 Debug"
   # Begin Source File
   
  -SOURCE=..\..\modules\standard\mod_cern_meta.c
  +SOURCE=.\mod_cern_meta.c
   # End Source File
   # End Target
   # End Project
  
  
  
  1.12      +7 -7      httpd-2.0/modules/metadata/mod_expires.dsp
  
  Index: mod_expires.dsp
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/metadata/mod_expires.dsp,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- mod_expires.dsp	2000/10/11 17:19:39	1.11
  +++ mod_expires.dsp	2000/12/05 16:35:35	1.12
  @@ -43,7 +43,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 "..\..\include" /I ".\\" /I "..\..\lib\apr\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /FD /c
  +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /I "..\..\os\win32" /I "..\..\srclib\apr\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /FD /c
   # SUBTRACT CPP /YX
   # ADD BASE MTL /nologo /D "NDEBUG" /win32
   # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
  @@ -53,8 +53,8 @@
   # ADD BASE BSC32 /nologo
   # ADD BSC32 /nologo
   LINK32=link.exe
  -# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release" /base:@BaseAddr.ref,mod_expires
  -# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release" /base:@BaseAddr.ref,mod_expires
  +# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\srclib\apr\Release" /base:@BaseAddr.ref,mod_expires
  +# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\srclib\apr\Release" /base:@BaseAddr.ref,mod_expires
   
   !ELSEIF  "$(CFG)" == "mod_expires - Win32 Debug"
   
  @@ -70,7 +70,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 "..\..\include" /I ".\\" /I "..\..\lib\apr\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /FD /c
  +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\include" /I "..\..\os\win32" /I "..\..\srclib\apr\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /FD /c
   # SUBTRACT CPP /YX
   # ADD BASE MTL /nologo /D "_DEBUG" /win32
   # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
  @@ -80,8 +80,8 @@
   # ADD BASE BSC32 /nologo
   # ADD BSC32 /nologo
   LINK32=link.exe
  -# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug" /base:@BaseAddr.ref,mod_expires
  -# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug" /base:@BaseAddr.ref,mod_expires
  +# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\srclib\apr\Debug" /base:@BaseAddr.ref,mod_expires
  +# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\srclib\apr\Debug" /base:@BaseAddr.ref,mod_expires
   # SUBTRACT LINK32 /incremental:no /map
   
   !ENDIF 
  @@ -92,7 +92,7 @@
   # Name "mod_expires - Win32 Debug"
   # Begin Source File
   
  -SOURCE=..\..\modules\standard\mod_expires.c
  +SOURCE=.\mod_expires.c
   # End Source File
   # End Target
   # End Project
  
  
  
  1.12      +7 -7      httpd-2.0/modules/metadata/mod_headers.dsp
  
  Index: mod_headers.dsp
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/metadata/mod_headers.dsp,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- mod_headers.dsp	2000/10/11 17:19:41	1.11
  +++ mod_headers.dsp	2000/12/05 16:35:35	1.12
  @@ -43,7 +43,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 "..\..\include" /I ".\\" /I "..\..\lib\apr\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /FD /c
  +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /I "..\..\os\win32" /I "..\..\srclib\apr\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /FD /c
   # SUBTRACT CPP /YX
   # ADD BASE MTL /nologo /D "NDEBUG" /win32
   # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
  @@ -53,8 +53,8 @@
   # ADD BASE BSC32 /nologo
   # ADD BSC32 /nologo
   LINK32=link.exe
  -# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release" /base:@BaseAddr.ref,mod_headers
  -# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release" /base:@BaseAddr.ref,mod_headers
  +# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\srclib\apr\Release" /base:@BaseAddr.ref,mod_headers
  +# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\srclib\apr\Release" /base:@BaseAddr.ref,mod_headers
   
   !ELSEIF  "$(CFG)" == "mod_headers - Win32 Debug"
   
  @@ -70,7 +70,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 "..\..\include" /I ".\\" /I "..\..\lib\apr\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /FD /c
  +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\include" /I "..\..\os\win32" /I "..\..\srclib\apr\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /FD /c
   # SUBTRACT CPP /YX
   # ADD BASE MTL /nologo /D "_DEBUG" /win32
   # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
  @@ -80,8 +80,8 @@
   # ADD BASE BSC32 /nologo
   # ADD BSC32 /nologo
   LINK32=link.exe
  -# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug" /base:@BaseAddr.ref,mod_headers
  -# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug" /base:@BaseAddr.ref,mod_headers
  +# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\srclib\apr\Debug" /base:@BaseAddr.ref,mod_headers
  +# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\srclib\apr\Debug" /base:@BaseAddr.ref,mod_headers
   # SUBTRACT LINK32 /incremental:no /map
   
   !ENDIF 
  @@ -92,7 +92,7 @@
   # Name "mod_headers - Win32 Debug"
   # Begin Source File
   
  -SOURCE=..\..\modules\standard\mod_headers.c
  +SOURCE=.\mod_headers.c
   # End Source File
   # End Target
   # End Project
  
  
  
  1.12      +7 -7      httpd-2.0/modules/metadata/mod_usertrack.dsp
  
  Index: mod_usertrack.dsp
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/metadata/mod_usertrack.dsp,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- mod_usertrack.dsp	2000/10/11 17:19:46	1.11
  +++ mod_usertrack.dsp	2000/12/05 16:35:36	1.12
  @@ -43,7 +43,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 "..\..\include" /I ".\\" /I "..\..\lib\apr\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /FD /c
  +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /I "..\..\os\win32" /I "..\..\srclib\apr\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /FD /c
   # SUBTRACT CPP /YX
   # ADD BASE MTL /nologo /D "NDEBUG" /win32
   # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
  @@ -53,8 +53,8 @@
   # ADD BASE BSC32 /nologo
   # ADD BSC32 /nologo
   LINK32=link.exe
  -# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release" /base:@BaseAddr.ref,mod_usertrack
  -# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release" /base:@BaseAddr.ref,mod_usertrack
  +# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\srclib\apr\Release" /base:@BaseAddr.ref,mod_usertrack
  +# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\srclib\apr\Release" /base:@BaseAddr.ref,mod_usertrack
   
   !ELSEIF  "$(CFG)" == "mod_usertrack - Win32 Debug"
   
  @@ -70,7 +70,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 "..\..\include" /I ".\\" /I "..\..\lib\apr\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /FD /c
  +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\include" /I "..\..\os\win32" /I "..\..\srclib\apr\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /FD /c
   # SUBTRACT CPP /YX
   # ADD BASE MTL /nologo /D "_DEBUG" /win32
   # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
  @@ -80,8 +80,8 @@
   # ADD BASE BSC32 /nologo
   # ADD BSC32 /nologo
   LINK32=link.exe
  -# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug" /base:@BaseAddr.ref,mod_usertrack
  -# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug" /base:@BaseAddr.ref,mod_usertrack
  +# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\srclib\apr\Debug" /base:@BaseAddr.ref,mod_usertrack
  +# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\srclib\apr\Debug" /base:@BaseAddr.ref,mod_usertrack
   # SUBTRACT LINK32 /incremental:no /map
   
   !ENDIF 
  @@ -92,7 +92,7 @@
   # Name "mod_usertrack - Win32 Debug"
   # Begin Source File
   
  -SOURCE=..\..\modules\standard\mod_usertrack.c
  +SOURCE=.\mod_usertrack.c
   # End Source File
   # End Target
   # End Project
  
  
  
  1.12      +12 -12    httpd-2.0/modules/proxy/mod_proxy.dsp
  
  Index: mod_proxy.dsp
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/proxy/mod_proxy.dsp,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- mod_proxy.dsp	2000/10/11 17:19:42	1.11
  +++ mod_proxy.dsp	2000/12/05 16:35:47	1.12
  @@ -43,7 +43,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 "..\..\modules\proxy" /I "..\..\lib\apr\include" /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /c
  +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\srclib\apr\include" /I "..\..\include" /I "..\..\os\win32" /D "NDEBUG" /D "WIN32" /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"
  @@ -52,8 +52,8 @@
   # ADD BASE BSC32 /nologo
   # ADD BSC32 /nologo
   LINK32=link.exe
  -# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release" /base:@BaseAddr.ref,mod_proxy
  -# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release" /base:@BaseAddr.ref,mod_proxy
  +# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\srclib\apr\Release" /base:@BaseAddr.ref,mod_proxy
  +# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\srclib\apr\Release" /base:@BaseAddr.ref,mod_proxy
   
   !ELSEIF  "$(CFG)" == "mod_proxy - 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" /YX /c
  -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\modules\proxy" /I "..\..\lib\apr\include" /I "..\..\include" /I "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /c
  +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\srclib\apr\include" /I "..\..\include" /I "..\..\os\win32" /D "_DEBUG" /D "WIN32" /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"
  @@ -78,8 +78,8 @@
   # ADD BASE BSC32 /nologo
   # ADD BSC32 /nologo
   LINK32=link.exe
  -# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug" /base:@BaseAddr.ref,mod_proxy
  -# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug" /base:@BaseAddr.ref,mod_proxy
  +# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\srclib\apr\Debug" /base:@BaseAddr.ref,mod_proxy
  +# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\srclib\apr\Debug" /base:@BaseAddr.ref,mod_proxy
   # SUBTRACT LINK32 /incremental:no /map
   
   !ENDIF 
  @@ -93,23 +93,23 @@
   # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
   # Begin Source File
   
  -SOURCE=..\..\modules\proxy\mod_proxy.c
  +SOURCE=.\mod_proxy.c
   # End Source File
   # Begin Source File
   
  -SOURCE=..\..\modules\proxy\proxy_connect.c
  +SOURCE=.\proxy_connect.c
   # End Source File
   # Begin Source File
   
  -SOURCE=..\..\modules\proxy\proxy_ftp.c
  +SOURCE=.\proxy_ftp.c
   # End Source File
   # Begin Source File
   
  -SOURCE=..\..\modules\proxy\proxy_http.c
  +SOURCE=.\proxy_http.c
   # End Source File
   # Begin Source File
   
  -SOURCE=..\..\modules\proxy\proxy_util.c
  +SOURCE=.\proxy_util.c
   # End Source File
   # End Group
   # Begin Group "Header Files"
  @@ -117,7 +117,7 @@
   # PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
   # Begin Source File
   
  -SOURCE=..\..\modules\proxy\mod_proxy.h
  +SOURCE=.\mod_proxy.h
   # End Source File
   # End Group
   # End Target
  
  
  
  1.10      +2 -2      httpd-2.0/os/win32/installer/installdll/install.dsp
  
  Index: install.dsp
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/os/win32/installer/installdll/install.dsp,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- install.dsp	2000/10/11 17:20:04	1.9
  +++ install.dsp	2000/12/05 16:35:51	1.10
  @@ -43,7 +43,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
  -# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../../../lib/apr/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "APR_DECLARE_STATIC" /D "AP_DECLARE_STATIC" /FD /c
  +# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../../../srclib/apr/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "APR_DECLARE_STATIC" /D "AP_DECLARE_STATIC" /FD /c
   # SUBTRACT CPP /YX
   # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
   # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
  @@ -70,7 +70,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 /FD /c
  -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../../../lib/apr/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "APR_DECLARE_STATIC" /D "AP_DECLARE_STATIC" /FD /c
  +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../../../srclib/apr/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "APR_DECLARE_STATIC" /D "AP_DECLARE_STATIC" /FD /c
   # SUBTRACT CPP /YX
   # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
   # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
  
  
  
  1.12      +2 -2      httpd-2.0/server/gen_test_char.dsp
  
  Index: gen_test_char.dsp
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/gen_test_char.dsp,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- gen_test_char.dsp	2000/05/30 22:56:36	1.11
  +++ gen_test_char.dsp	2000/12/05 16:36:12	1.12
  @@ -42,7 +42,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
  -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\include" /I "..\lib\apr\include" /I "..\os\win32" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
  +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\include" /I "..\srclib\apr\include" /I "..\os\win32" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
   # ADD BASE RSC /l 0x809 /d "NDEBUG"
   # ADD RSC /l 0x809 /d "NDEBUG"
   BSC32=bscmake.exe
  @@ -66,7 +66,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
  -# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /I "..\include" /I "..\lib\apr\include" /I "..\os\win32" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
  +# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /I "..\include" /I "..\srclib\apr\include" /I "..\os\win32" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
   # SUBTRACT CPP /Fr
   # ADD BASE RSC /l 0x809 /d "_DEBUG"
   # ADD RSC /l 0x809 /d "_DEBUG"
  
  
  
  1.2       +7 -7      httpd-2.0/srclib/expat-lite/expatlib.dsp
  
  Index: expatlib.dsp
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/srclib/expat-lite/expatlib.dsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- expatlib.dsp	2000/10/18 17:37:02	1.1
  +++ expatlib.dsp	2000/12/05 16:36:27	1.2
  @@ -93,31 +93,31 @@
   # Name "expatlib - Win32 Debug"
   # Begin Source File
   
  -SOURCE="..\..\lib\expat-lite\hashtable.c"
  +SOURCE=".\hashtable.c"
   # End Source File
   # Begin Source File
   
  -SOURCE="..\..\lib\expat-lite\xmlparse.c"
  +SOURCE=".\xmlparse.c"
   # End Source File
   # Begin Source File
   
  -SOURCE="..\..\lib\expat-lite\xmlparse.h"
  +SOURCE=".\xmlparse.h"
   # End Source File
   # Begin Source File
   
  -SOURCE="..\..\lib\expat-lite\dllmain.c"
  +SOURCE=".\dllmain.c"
   # End Source File
   # Begin Source File
   
  -SOURCE="..\..\lib\expat-lite\xmlrole.c"
  +SOURCE=".\xmlrole.c"
   # End Source File
   # Begin Source File
   
  -SOURCE="..\..\lib\expat-lite\xmltok.c"
  +SOURCE=".\xmltok.c"
   # End Source File
   # Begin Source File
   
  -SOURCE="..\..\lib\expat-lite\expatlib.def"
  +SOURCE=".\expatlib.def"
   # End Source File
   
   # End Target
  
  
  
  1.5       +4 -4      httpd-2.0/srclib/expat-lite/xmlparse.dsp
  
  Index: xmlparse.dsp
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/srclib/expat-lite/xmlparse.dsp,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- xmlparse.dsp	2000/10/11 04:32:34	1.4
  +++ xmlparse.dsp	2000/12/05 16:36:28	1.5
  @@ -93,20 +93,20 @@
   # Name "xmlparse - Win32 Debug"
   # Begin Source File
   
  -SOURCE="..\..\lib\expat-lite\hashtable.c"
  +SOURCE=".\hashtable.c"
   # End Source File
   # Begin Source File
   
  -SOURCE="..\..\lib\expat-lite\xmlparse.c"
  +SOURCE=".\xmlparse.c"
   # End Source File
   # Begin Source File
   
  -SOURCE="..\..\lib\expat-lite\xmlparse.def"
  +SOURCE=".\xmlparse.def"
   # PROP Exclude_From_Build 1
   # End Source File
   # Begin Source File
   
  -SOURCE="..\..\lib\expat-lite\xmlparse.h"
  +SOURCE=".\xmlparse.h"
   # End Source File
   # End Target
   # End Project
  
  
  
  1.5       +4 -4      httpd-2.0/srclib/expat-lite/xmltok.dsp
  
  Index: xmltok.dsp
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/srclib/expat-lite/xmltok.dsp,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- xmltok.dsp	2000/10/11 04:32:34	1.4
  +++ xmltok.dsp	2000/12/05 16:36:30	1.5
  @@ -93,19 +93,19 @@
   # Name "xmltok - Win32 Debug"
   # Begin Source File
   
  -SOURCE="..\..\lib\expat-lite\dllmain.c"
  +SOURCE=".\dllmain.c"
   # End Source File
   # Begin Source File
   
  -SOURCE="..\..\lib\expat-lite\xmlrole.c"
  +SOURCE=".\xmlrole.c"
   # End Source File
   # Begin Source File
   
  -SOURCE="..\..\lib\expat-lite\xmltok.c"
  +SOURCE=".\xmltok.c"
   # End Source File
   # Begin Source File
   
  -SOURCE="..\..\lib\expat-lite\xmltok.def"
  +SOURCE=".\xmltok.def"
   # PROP Exclude_From_Build 1
   # End Source File
   # End Target
  
  
  
  1.11      +2 -2      httpd-2.0/support/ab.dsp
  
  Index: ab.dsp
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/support/ab.dsp,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- ab.dsp	2000/10/11 17:20:10	1.10
  +++ ab.dsp	2000/12/05 16:37:31	1.11
  @@ -42,7 +42,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
  -# ADD CPP /nologo /MD /W3 /GX /O2 /I "../lib/apr/include" /I "../include" /I "../os/win32" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "APR_DECLARE_STATIC" /D "AP_DECLARE_STATIC" /FD /c
  +# ADD CPP /nologo /MD /W3 /GX /O2 /I "../srclib/apr/include" /I "../include" /I "../os/win32" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "APR_DECLARE_STATIC" /D "AP_DECLARE_STATIC" /FD /c
   # ADD BASE RSC /l 0x409 /d "NDEBUG"
   # ADD RSC /l 0x409 /d "NDEBUG"
   BSC32=bscmake.exe
  @@ -67,7 +67,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
  -# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "../lib/apr/include" /I "../include" /I "../os/win32" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "APR_DECLARE_STATIC" /D "AP_DECLARE_STATIC" /FD /c
  +# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "../srclib/apr/include" /I "../include" /I "../os/win32" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "APR_DECLARE_STATIC" /D "AP_DECLARE_STATIC" /FD /c
   # SUBTRACT CPP /YX
   # ADD BASE RSC /l 0x409 /d "_DEBUG"
   # ADD RSC /l 0x409 /d "_DEBUG"
  
  
  
  1.12      +2 -2      httpd-2.0/support/htdigest.dsp
  
  Index: htdigest.dsp
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/support/htdigest.dsp,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- htdigest.dsp	2000/10/11 17:20:11	1.11
  +++ htdigest.dsp	2000/12/05 16:37:41	1.12
  @@ -42,7 +42,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
  -# ADD CPP /nologo /MD /W3 /GX /O2 /I "../lib/apr/include" /I "../include" /I "../os/win32" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "APR_DECLARE_STATIC" /D "AP_DECLARE_STATIC" /FD /c
  +# ADD CPP /nologo /MD /W3 /GX /O2 /I "../srclib/apr/include" /I "../include" /I "../os/win32" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "APR_DECLARE_STATIC" /D "AP_DECLARE_STATIC" /FD /c
   # ADD BASE RSC /l 0x409 /d "NDEBUG"
   # ADD RSC /l 0x409 /d "NDEBUG"
   BSC32=bscmake.exe
  @@ -67,7 +67,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
  -# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "../lib/apr/include" /I "../include" /I "../os/win32" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "APR_DECLARE_STATIC" /D "AP_DECLARE_STATIC" /FD /c
  +# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "../srclib/apr/include" /I "../include" /I "../os/win32" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "APR_DECLARE_STATIC" /D "AP_DECLARE_STATIC" /FD /c
   # SUBTRACT CPP /YX
   # ADD BASE RSC /l 0x409 /d "_DEBUG"
   # ADD RSC /l 0x409 /d "_DEBUG"
  
  
  
  1.12      +2 -2      httpd-2.0/support/htpasswd.dsp
  
  Index: htpasswd.dsp
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/support/htpasswd.dsp,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- htpasswd.dsp	2000/10/11 17:20:11	1.11
  +++ htpasswd.dsp	2000/12/05 16:37:48	1.12
  @@ -42,7 +42,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
  -# ADD CPP /nologo /MD /W3 /GX /O2 /I "../lib/apr/include" /I "../include" /I "../os/win32" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "APR_DECLARE_STATIC" /D "AP_DECLARE_STATIC" /FD /c
  +# ADD CPP /nologo /MD /W3 /GX /O2 /I "../srclib/apr/include" /I "../include" /I "../os/win32" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "APR_DECLARE_STATIC" /D "AP_DECLARE_STATIC" /FD /c
   # SUBTRACT CPP /YX
   # ADD BASE RSC /l 0x409 /d "NDEBUG"
   # ADD RSC /l 0x409 /d "NDEBUG"
  @@ -67,7 +67,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
  -# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "../lib/apr/include" /I "../include" /I "../os/win32" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "APR_DECLARE_STATIC" /D "AP_DECLARE_STATIC" /FD /c
  +# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "../srclib/apr/include" /I "../include" /I "../os/win32" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "APR_DECLARE_STATIC" /D "AP_DECLARE_STATIC" /FD /c
   # SUBTRACT CPP /YX
   # ADD BASE RSC /l 0x409 /d "_DEBUG"
   # ADD RSC /l 0x409 /d "_DEBUG"
  
  
  
  1.10      +2 -2      httpd-2.0/support/logresolve.dsp
  
  Index: logresolve.dsp
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/support/logresolve.dsp,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- logresolve.dsp	2000/10/11 17:20:12	1.9
  +++ logresolve.dsp	2000/12/05 16:37:49	1.10
  @@ -42,7 +42,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
  -# ADD CPP /nologo /MD /W3 /GX /O2 /I "../lib/apr/include" /I "../include" /I "../os/win32" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "APR_DECLARE_STATIC" /D "AP_DECLARE_STATIC" /FD /c
  +# ADD CPP /nologo /MD /W3 /GX /O2 /I "../srclib/apr/include" /I "../include" /I "../os/win32" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "APR_DECLARE_STATIC" /D "AP_DECLARE_STATIC" /FD /c
   # ADD BASE RSC /l 0x409 /d "NDEBUG"
   # ADD RSC /l 0x409 /d "NDEBUG"
   BSC32=bscmake.exe
  @@ -67,7 +67,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
  -# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "../lib/apr/include" /I "../include" /I "../os/win32" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "APR_DECLARE_STATIC" /D "AP_DECLARE_STATIC" /FD /c
  +# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "../srclib/apr/include" /I "../include" /I "../os/win32" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "APR_DECLARE_STATIC" /D "AP_DECLARE_STATIC" /FD /c
   # SUBTRACT CPP /Fr
   # ADD BASE RSC /l 0x409 /d "_DEBUG"
   # ADD RSC /l 0x409 /d "_DEBUG"
  
  
  
  1.11      +2 -2      httpd-2.0/support/rotatelogs.dsp
  
  Index: rotatelogs.dsp
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/support/rotatelogs.dsp,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- rotatelogs.dsp	2000/10/11 17:20:12	1.10
  +++ rotatelogs.dsp	2000/12/05 16:37:50	1.11
  @@ -42,7 +42,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
  -# ADD CPP /nologo /MD /W3 /GX /O2 /I "../lib/apr/include" /I "../include" /I "../os/win32" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "APR_DECLARE_STATIC" /D "AP_DECLARE_STATIC" /FD /c
  +# ADD CPP /nologo /MD /W3 /GX /O2 /I "../srclib/apr/include" /I "../include" /I "../os/win32" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "APR_DECLARE_STATIC" /D "AP_DECLARE_STATIC" /FD /c
   # SUBTRACT CPP /YX
   # ADD BASE RSC /l 0x409 /d "NDEBUG"
   # ADD RSC /l 0x409 /d "NDEBUG"
  @@ -67,7 +67,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
  -# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "../lib/apr/include" /I "../include" /I "../os/win32" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "APR_DECLARE_STATIC" /D "AP_DECLARE_STATIC" /FD /c
  +# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "../srclib/apr/include" /I "../include" /I "../os/win32" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "APR_DECLARE_STATIC" /D "AP_DECLARE_STATIC" /FD /c
   # SUBTRACT CPP /YX
   # ADD BASE RSC /l 0x409 /d "_DEBUG"
   # ADD RSC /l 0x409 /d "_DEBUG"
  
  
  

Mime
View raw message