Commit 4fda71b6 authored by William A. Rowe Jr's avatar William A. Rowe Jr
Browse files

zlib 1.1.4/openssl 0.9.7 cannot be sustained, period. bump. 

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@1006128 13f79535-47bb-0310-9956-ffa450edef68
parent ae237066

Makefile.win

+5 −2
Changes for Makefile.win: 5 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -99,8 +99,8 @@ _tryzlib: 
_tryzlib:

	@echo -----

	@echo mod_deflate will not build unless zlib is installed in srclib\zlib.  

	@echo zlib does not need to be built, we compile the sources directly.

	@echo Available from http://www.gzip.org/zlib/

	@echo Version 1.2.1 and later available from http://www.gzip.org/zlib/

	@echo built w/ nmake -f win32/Makefile.msc will satisfy this requirement.



!ENDIF
@@ -390,6 +390,9 @@ _copybin: 
	copy modules\experimental\$(LONG)\mod_auth_ldap.$(src_so)	"$(inst_so)" <.y

!IF EXIST("srclib\zlib")

	copy modules\filters\$(LONG)\mod_deflate.$(src_so) 	"$(inst_so)" <.y

!IF EXIST("srclib\zlib\zlib1.$(src_dll)")

	copy srclib\zlib\zlib1.$(src_dll)		 	"$(inst_dll)" <.y

!ENDIF

!ENDIF

	copy modules\filters\$(LONG)\mod_ext_filter.$(src_so) 	"$(inst_so)" <.y

	copy modules\filters\$(LONG)\mod_include.$(src_so) 	"$(inst_so)" <.y

modules/filters/mod_deflate.dsp

+5 −54
Changes for modules/filters/mod_deflate.dsp: 5 added lines, 54 removed lines.
Original line number Diff line number Diff line
@@ -43,17 +43,16 @@ RSC=rc.exe 
# PROP Ignore_Export_Lib 0

# PROP Target_Dir ""

# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "HAVE_ZUTIL_H" /FD /c

# ADD CPP /nologo /MD /W3 /Zi /O2 /I "../../include" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" /I "../../srclib/zlib" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Release\mod_deflate_src" /FD /c

# ADD CPP /nologo /MD /W3 /O2 /Oy- /Zi /I "../../include" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" /I "../../srclib/zlib" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Release\mod_deflate_src" /FD /c

# ADD BASE MTL /nologo /D "NDEBUG" /win32

# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32

# ADD BASE RSC /l 0x409 /d "NDEBUG"

# ADD RSC /l 0x409 /d "NDEBUG"

BSC32=bscmake.exe

# ADD BASE BSC32 /nologo

# ADD BSC32 /nologo

LINK32=link.exe

# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /out:"Release/mod_deflate.so" /base:@..\..\os\win32\BaseAddr.ref,mod_deflate.so

# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /out:"Release/mod_deflate.so" /base:@..\..\os\win32\BaseAddr.ref,mod_deflate.so /opt:ref

# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /out:".\Release\mod_deflate.so" /base:@..\..\os\win32\BaseAddr.ref,mod_deflate.so

# ADD LINK32 kernel32.lib zdll.lib /nologo /subsystem:windows /dll /incremental:no /debug /out:".\Release\mod_deflate.so" /libpath:"../../srclib/zlib" /base:@..\..\os\win32\BaseAddr.ref,mod_deflate.so /opt:ref



!ELSEIF  "$(CFG)" == "mod_deflate - Win32 Debug"
@@ -78,8 +77,8 @@ BSC32=bscmake.exe 
# ADD BASE BSC32 /nologo

# ADD BSC32 /nologo

LINK32=link.exe

# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /out:"Debug/mod_deflate.so" /base:@..\..\os\win32\BaseAddr.ref,mod_deflate.so

# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /out:"Debug/mod_deflate.so" /base:@..\..\os\win32\BaseAddr.ref,mod_deflate.so

# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /out:".\Debug\mod_deflate.so" /base:@..\..\os\win32\BaseAddr.ref,mod_deflate.so

# ADD LINK32 kernel32.lib zdll.lib /nologo /subsystem:windows /dll /incremental:no /debug /out:".\Debug\mod_deflate.so" /libpath:"../../srclib/zlib" /base:@..\..\os\win32\BaseAddr.ref,mod_deflate.so



!ENDIF
@@ -87,54 +86,6 @@ LINK32=link.exe 


# Name "mod_deflate - Win32 Release"

# Name "mod_deflate - Win32 Debug"

# Begin Group "zlib"



# PROP Default_Filter ""

# Begin Source File



SOURCE=..\..\srclib\zlib\adler32.c

# End Source File

# Begin Source File



SOURCE=..\..\srclib\zlib\crc32.c

# End Source File

# Begin Source File



SOURCE=..\..\srclib\zlib\deflate.c

# End Source File

# Begin Source File



SOURCE=..\..\srclib\zlib\infblock.c

# End Source File

# Begin Source File



SOURCE=..\..\srclib\zlib\infcodes.c

# End Source File

# Begin Source File



SOURCE=..\..\srclib\zlib\inffast.c

# End Source File

# Begin Source File



SOURCE=..\..\srclib\zlib\inflate.c

# End Source File

# Begin Source File



SOURCE=..\..\srclib\zlib\inftrees.c

# End Source File

# Begin Source File



SOURCE=..\..\srclib\zlib\infutil.c

# End Source File

# Begin Source File



SOURCE=..\..\srclib\zlib\trees.c

# End Source File

# Begin Source File



SOURCE=..\..\srclib\zlib\zutil.c

# End Source File

# End Group

# Begin Source File



SOURCE=.\mod_deflate.c