diff options
| author | Stefan Eissing <icing@apache.org> | 2015-09-07 17:37:19 +0000 |
|---|---|---|
| committer | Stefan Eissing <icing@apache.org> | 2015-09-07 17:37:19 +0000 |
| commit | 0e132fa7f349cfa6bd745ae85b428e9f514464a1 (patch) | |
| tree | e6877f36997fd1c0b73ed5ddef632589dbdee6d7 /Makefile.win | |
| parent | c75f264a8542b27ddeada7f3ffaa470ed997fa6d (diff) | |
| download | httpd-0e132fa7f349cfa6bd745ae85b428e9f514464a1.tar.gz | |
merge of protocols + http2 relevant changes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.17-protocols-http2@1701655 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'Makefile.win')
| -rw-r--r-- | Makefile.win | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/Makefile.win b/Makefile.win index 35d9b8eab0..2dade641e9 100644 --- a/Makefile.win +++ b/Makefile.win @@ -215,6 +215,30 @@ _trylua: !ENDIF +!IF EXIST("srclib\nghttp2") + +_trynghttp2: +!IF $(USEMAK) == 1 + cd modules\http2 + $(MAKE) $(MAKEOPT) -f mod_h2.mak CFG="mod_h2 - Win32 $(LONG)" RECURSE=0 $(CTARGET) + cd ..\.. +!ELSEIF $(USESLN) == 1 + devenv $(TLP).sln /useenv $(CTARGET) $(LONG) /project mod_h2 +!ELSE + @msdev $(TLP).dsw /USEENV /MAKE \ + "mod_h2 - Win32 $(LONG)" /NORECURSE $(CTARGET) +!ENDIF + +!ELSE +# NOT EXIST("srclib\lua") + +_trynghttp2: + @echo ----- + @echo mod_h2 will not build unless nghttp2 is installed in srclib\nghttp2. + @echo Version 1.0 includes an lib\makefile.msvc that will satisfy this + @echo requirement. + +!ENDIF _trydb: !IF $(USEMAK) == 1 @@ -754,6 +778,14 @@ _copybin: copy modules\generators\$(LONG)\mod_info.$(src_so) "$(inst_so)" <.y copy modules\generators\$(LONG)\mod_status.$(src_so) "$(inst_so)" <.y copy modules\http\$(LONG)\mod_mime.$(src_so) "$(inst_so)" <.y +!IF EXIST("srclib\nghttp2") + copy modules\http2\$(LONG)\mod_h2.$(src_so) "$(inst_so)" <.y +!IF "$(SHORT)" == "D" + copy srclib\nghttp2\lib\MSVC_obj\nghttp2d.$(src_dll) "$(inst_dll)" <.y +!ELSE + copy srclib\nghttp2\lib\MSVC_obj\nghttp2.$(src_dll) "$(inst_dll)" <.y +!ENDIF +!ENDIF copy modules\ldap\$(LONG)\mod_ldap.$(src_so) "$(inst_so)" <.y copy modules\loggers\$(LONG)\mod_log_config.$(src_so) "$(inst_so)" <.y copy modules\loggers\$(LONG)\mod_log_debug.$(src_so) "$(inst_so)" <.y |