Add mod_serf to the win32 build

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@901539 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/Apache.dsw b/Apache.dsw
index db996a76ea298d63c50856ecf2257dc5cca05b39..6e47b81396abe87197938be761abf35ea18c5da3 100644 (file)
--- a/Apache.dsw
+++ b/Apache.dsw
@@ -2563,6 +2563,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>

diff --git a/Makefile.win b/Makefile.win
index 1da0bab7f5b0f4b9e9079ef907e4c5dabd8fe943..23910fec5cdf739dfcdfdc6354f4435bbe3c7836 100644 (file)
--- 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)