summaryrefslogtreecommitdiff
path: root/Makefile.win
diff options
context:
space:
mode:
authorWilliam A. Rowe Jr <wrowe@apache.org>2010-02-04 02:43:31 +0000
committerWilliam A. Rowe Jr <wrowe@apache.org>2010-02-04 02:43:31 +0000
commitdc6e367a4c75600b23d243df7e0563f6e6a1c265 (patch)
treea1212a91608799615cc8b0bf62e4b4c4da86caf8 /Makefile.win
parentf8caa331e08d5ae23d4cec719679c8924f03c026 (diff)
downloadhttpd-dc6e367a4c75600b23d243df7e0563f6e6a1c265.tar.gz
Add mod_serf.dsp at last, based on the patch available in;
http://people.apache.org/~wrowe/fixserf-win32-0.3.0.patch although there is trouble here, and pollset troubleshooting ahead. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@906327 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'Makefile.win')
-rw-r--r--Makefile.win29
1 files changed, 28 insertions, 1 deletions
diff --git a/Makefile.win b/Makefile.win
index 1da0bab7f5..1aac1df423 100644
--- a/Makefile.win
+++ b/Makefile.win
@@ -120,7 +120,31 @@ _tryssl:
@echo recent version confirmed to build with mod_ssl and ab is 0.9.8d.
@echo Available from http://www.openssl.org/
!ENDIF
+# NOT EXIST("srclib\openssl")
+
+!IF EXIST("srclib\serf")
+
+_tryserf:
+!IF $(USEMAK) == 1
+ 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_serf
+!ELSE
+ @msdev Apache.dsw /USEENV /MAKE \
+ "mod_serf - Win32 $(LONG)" /NORECURSE $(CTARGET)
+!ENDIF
+
+!ELSE
+# NOT EXIST("srclib\serf")
+_tryserf:
+ @echo -----
+ @echo mod_serf will not build unless libserf.dll is built in srclib\serf
+
+!ENDIF
+# NOT EXIST("srclib\serf")
!IF EXIST("srclib\zlib")
@@ -141,7 +165,7 @@ _tryzlib:
_tryzlib:
@echo -----
- @echo mod_deflate will not build unless zlib is installed in srclib\zlib.
+ @echo mod_deflate 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 +484,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\serf")
+ $(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)