ake         00/12/12 07:54:31

  Modified:    .        Makefile.win
               .        aprutil.dsp
  Log:
  Fix Windows build
  
  Revision  Changes    Path
  1.34      +2 -2      httpd-2.0/Makefile.win
  
  Index: Makefile.win
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/Makefile.win,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- Makefile.win	2000/12/08 19:03:48	1.33
  +++ Makefile.win	2000/12/12 15:54:28	1.34
  @@ -136,8 +136,8 @@
   	copy Apache$(SHORT)\Apache.exe $(INSTDIR)
   	copy Core$(SHORT)\ApacheCore.dll $(INSTDIR)
   	copy srclib\apr\$(LONG)\aprlib.dll $(INSTDIR)
  -        copy srclib\apr-util\$(LONG)\apr-util.dll $(INSTDIR)
  -        copy srclib\expat-lite\expatlib$(SHORT)\expatlib.dll $(INSTDIR)
  +        copy srclib\apr-util\$(LONG)\aprutil.dll $(INSTDIR)
  +        copy srclib\expat-lite\$(LONG)\expatlib.dll $(INSTDIR)
           copy modules\aaa\mod_auth_anon$(SHORT)\mod_auth_anon.dll $(INSTDIR)\modules
   	copy modules\aaa\mod_auth_dbm$(SHORT)\mod_auth_dbm.dll $(INSTDIR)\modules
   	copy modules\aaa\mod_auth_digest$(SHORT)\mod_auth_digest.dll $(INSTDIR)\modules
  
  
  
  1.8       +8 -22     apr-util/aprutil.dsp
  
  Index: aprutil.dsp
  ===================================================================
  RCS file: /home/cvs/apr-util/aprutil.dsp,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- aprutil.dsp	2000/12/08 17:34:30	1.7
  +++ aprutil.dsp	2000/12/12 15:54:30	1.8
  @@ -26,6 +26,7 @@
   # PROP Scc_ProjName ""
   # PROP Scc_LocalPath ""
   CPP=cl.exe
  +RSC=rc.exe
   
   !IF  "$(CFG)" == "aprutil - Win32 Release"
   
  @@ -39,11 +40,10 @@
   # PROP Output_Dir "LibR"
   # PROP Intermediate_Dir "LibR"
   # PROP Target_Dir ""
  -RSC=rc.exe
  -# ADD BASE RSC /l 0x409
  -# ADD RSC /l 0x409
   # 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 "./include" /I "../apr/include" /D "NDEBUG" /D "APR_DECLARE_EXPORT" /D "WIN32" /D "_WINDOWS" /Fd"LibR/apr-util" /FD /c
  +# ADD BASE RSC /l 0x409
  +# ADD RSC /l 0x409
   BSC32=bscmake.exe
   # ADD BASE BSC32 /nologo
   # ADD BSC32 /nologo
  @@ -64,11 +64,10 @@
   # PROP Intermediate_Dir "LibD"
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
  -RSC=rc.exe
  -# ADD BASE RSC /l 0x409
  -# ADD RSC /l 0x409
   # ADD BASE CPP /nologo /MTd /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
   # ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "./include" /I "../apr/include" /I "./dbm/sdbm" /D "_DEBUG" /D "APR_DECLARE_EXPORT" /D "WIN32" /D "_WINDOWS" /D "APU_USE_SDBM" /Fd"LibD/apr-util" /FD /c
  +# ADD BASE RSC /l 0x409
  +# ADD RSC /l 0x409
   BSC32=bscmake.exe
   # ADD BASE BSC32 /nologo
   # ADD BSC32 /nologo
  @@ -88,25 +87,16 @@
   # Begin Source File
   
   SOURCE=.\include\apu_private.hw
  -
  -!IF  "$(CFG)" == "aprlib - Win32 Release"
   
  -# Begin Custom Build
  -InputPath=.\include\apu_private.hw
  -
  -".\include\apu_private.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
  -	copy .\include\apu_private.hw .\include\apu_private.h > nul 
  -	echo Created apu_private.h from apu_private.hw 
  -	
  -# End Custom Build
  +!IF  "$(CFG)" == "aprutil - Win32 Release"
   
  -!ELSEIF  "$(CFG)" == "aprlib - Win32 Debug"
  +!ELSEIF  "$(CFG)" == "aprutil - Win32 Debug"
   
   # Begin Custom Build
   InputPath=.\include\apu_private.hw
   
   ".\include\apu_private.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
  -	copy .\include\apu_private.hw .\include\apu_private.h > nul 
  +	copy .\include\private\apu_private.hw .\include\apu_private.h > nul 
   	echo Created apu_private.h from apu_private.hw 
   	
   # End Custom Build
  @@ -189,10 +179,6 @@
   # Begin Source File
   
   SOURCE=.\src\buckets\ap_buckets_socket.c
  -# End Source File
  -# Begin Source File
  -
  -SOURCE=.\src\buckets\ap_buckets_util.c
   # End Source File
   # End Group
   # Begin Group "crypto"