Return-Path: Delivered-To: apmail-httpd-dev-archive@httpd.apache.org Received: (qmail 66465 invoked by uid 500); 7 May 2002 07:47:34 -0000 Mailing-List: contact dev-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: list-post: Delivered-To: mailing list dev@httpd.apache.org Received: (qmail 66452 invoked from network); 7 May 2002 07:47:34 -0000 Message-ID: <3CD786A2.290A9E9A@weirdness.com> Date: Tue, 07 May 2002 01:47:46 -0600 From: Jerry Baker X-Mailer: Mozilla 4.79 [en] (Windows NT 5.0; U) X-Accept-Language: en MIME-Version: 1.0 To: dev@httpd.apache.org Subject: [PATCH] Re: Apache.dsw Lost mod_deflate (and makefile.win) References: <3CD77FE7.3505AC68@weirdness.com> Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-OriginalArrivalTime: 07 May 2002 07:47:46.0960 (UTC) FILETIME=[7AA73900:01C1F59B] X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N The following appears to work fine here. Index: Apache.dsw =================================================================== RCS file: /home/cvspublic/httpd-2.0/Apache.dsw,v retrieving revision 1.79 diff -u -r1.79 Apache.dsw --- Apache.dsw 1 May 2002 15:23:13 -0000 1.79 +++ Apache.dsw 7 May 2002 07:35:14 -0000 @@ -750,7 +750,7 @@ ############################################################################### -Project: "mod_deflate"=".\modules\experimental\mod_deflate.dsp" - Package Owner=<4> +Project: "mod_deflate"=".\modules\filters\mod_deflate.dsp" - Package Owner=<4> Package=<5> {{{ Index: Makefile.win =================================================================== RCS file: /home/cvspublic/httpd-2.0/Makefile.win,v retrieving revision 1.98 diff -u -r1.98 Makefile.win --- Makefile.win 29 Apr 2002 19:53:55 -0000 1.98 +++ Makefile.win 7 May 2002 07:40:11 -0000 @@ -81,8 +81,8 @@ !IF EXIST("srclib\zlib") _tryzlib: -!IF EXIST("modules\experimental\mod_deflate.mak") - cd modules\experimental +!IF EXIST("modules\filters\mod_deflate.mak") + cd modules\filters $(MAKE) $(MAKEOPT) -f mod_deflate.mak CFG="mod_deflate - Win32 $(LONG)" RECURSE=0 .\$(LONG)\mod_deflate.so cd ..\.. !ELSE @@ -208,11 +208,11 @@ $(MAKE) $(MAKEOPT) -f mod_mem_cache.mak CFG="mod_mem_cache - Win32 $(LONG)" RECURSE=0 $(CTARGET) $(MAKE) $(MAKEOPT) -f mod_disk_cache.mak CFG="mod_disk_cache - Win32 $(LONG)" RECURSE=0 $(CTARGET) $(MAKE) $(MAKEOPT) -f mod_ext_filter.mak CFG="mod_ext_filter - Win32 $(LONG)" RECURSE=0 $(CTARGET) + cd ..\.. + cd modules\filters !IF EXIST("srclib\zlib") $(MAKE) $(MAKEOPT) -f mod_deflate.mak CFG="mod_deflate - Win32 $(LONG)" RECURSE=0 $(CTARGET) !ENDIF - cd ..\.. - cd modules\filters $(MAKE) $(MAKEOPT) -f mod_include.mak CFG="mod_include - Win32 $(LONG)" RECURSE=0 $(CTARGET) cd ..\.. cd modules\generators @@ -459,7 +459,7 @@ } } << - copy modules\experimental\$(LONG)\mod_deflate.so "$(INSTDIR)\modules" <.y + copy modules\filters\$(LONG)\mod_deflate.so "$(INSTDIR)\modules" <.y !ENDIF copy support\$(LONG)\htdbm.exe "$(INSTDIR)\bin" <.y copy support\$(LONG)\htdigest.exe "$(INSTDIR)\bin" <.y -- Jerry Baker