diff options
| -rw-r--r-- | Apache.dsw | 25 | ||||
| -rw-r--r-- | Makefile.win | 11 |
2 files changed, 35 insertions, 1 deletions
diff --git a/Apache.dsw b/Apache.dsw index db996a76ea..6e47b81396 100644 --- a/Apache.dsw +++ b/Apache.dsw @@ -2565,6 +2565,31 @@ Package=<4> ############################################################################### +Project: "mod_proxy_serf"=.\modules\proxy\mod_proxy_serf.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name libapr + End Project Dependency + Begin Project Dependency + Project_Dep_Name libaprutil + End Project Dependency + Begin Project Dependency + Project_Dep_Name libhttpd + End Project Dependency + Begin Project Dependency + Project_Dep_Name mod_proxy + End Project Dependency +}}} + + +############################################################################### + Project: "mod_ratelimit"=.\modules\filters\mod_ratelimit.dsp - Package Owner=<4> Package=<5> diff --git a/Makefile.win b/Makefile.win index 1da0bab7f5..23910fec5c 100644 --- a/Makefile.win +++ b/Makefile.win @@ -129,11 +129,17 @@ _tryzlib: cd modules\filters $(MAKE) $(MAKEOPT) -f mod_deflate.mak CFG="mod_deflate - Win32 $(LONG)" RECURSE=0 $(CTARGET) cd ..\.. + cd modules\proxy + $(MAKE) $(MAKEOPT) -f mod_serf.mak CFG="mod_serf - Win32 $(LONG)" RECURSE=0 $(CTARGET) + cd ..\.. !ELSEIF $(USESLN) == 1 devenv Apache.sln /useenv $(CTARGET) $(LONG) /project mod_deflate + devenv Apache.sln /useenv $(CTARGET) $(LONG) /project mod_serf !ELSE @msdev Apache.dsw /USEENV /MAKE \ "mod_deflate - Win32 $(LONG)" /NORECURSE $(CTARGET) + @msdev Apache.dsw /USEENV /MAKE \ + "mod_serf - Win32 $(LONG)" /NORECURSE $(CTARGET) !ENDIF !ELSE @@ -141,7 +147,7 @@ _tryzlib: _tryzlib: @echo ----- - @echo mod_deflate will not build unless zlib is installed in srclib\zlib. + @echo mod_deflate and mod_serf will not build unless zlib is built in srclib\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. @@ -460,6 +466,9 @@ _build: $(MAKE) $(MAKEOPT) -f mod_proxy_ftp.mak CFG="mod_proxy_ftp - Win32 $(LONG)" RECURSE=0 $(CTARGET) $(MAKE) $(MAKEOPT) -f mod_proxy_http.mak CFG="mod_proxy_http - Win32 $(LONG)" RECURSE=0 $(CTARGET) $(MAKE) $(MAKEOPT) -f mod_proxy_scgi.mak CFG="mod_proxy_scgi - Win32 $(LONG)" RECURSE=0 $(CTARGET) +!IF EXIST("srclib\zlib") + $(MAKE) $(MAKEOPT) -f mod_serf.mak CFG="mod_serf - Win32 $(LONG)" RECURSE=0 $(CTARGET) +!ENDIF cd ..\.. cd modules\proxy\balancers $(MAKE) $(MAKEOPT) -f mod_lbmethod_bybusyness.mak CFG="mod_lbmethod_bybusyness - Win32 $(LONG)" RECURSE=0 $(CTARGET) |