Merge r1734006 from trunk:

[apache] / Makefile.win

diff --git a/Makefile.win b/Makefile.win
index 2dade641e9c3b9d78b3f98b8795780b2c1f66e29..570037fa843e1d14fe11b00ad8d359463f8496d9 100644 (file)
--- a/Makefile.win
+++ b/Makefile.win
@@ -220,21 +220,21 @@ _trylua:
 _trynghttp2:
 !IF $(USEMAK) == 1
        cd modules\http2
-       $(MAKE) $(MAKEOPT) -f mod_h2.mak CFG="mod_h2 - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+       $(MAKE) $(MAKEOPT) -f mod_http2.mak CFG="mod_http2 - Win32 $(LONG)" RECURSE=0 $(CTARGET)
        cd ..\..
 !ELSEIF $(USESLN) == 1
-       devenv $(TLP).sln /useenv $(CTARGET) $(LONG) /project mod_h2
+       devenv $(TLP).sln /useenv $(CTARGET) $(LONG) /project mod_http2
 !ELSE
        @msdev $(TLP).dsw /USEENV /MAKE \
-               "mod_h2 - Win32 $(LONG)" /NORECURSE $(CTARGET)
+               "mod_http2 - Win32 $(LONG)" /NORECURSE $(CTARGET)
 !ENDIF
 
 !ELSE
-#     NOT EXIST("srclib\lua")
+#     NOT EXIST("srclib\nghttp2")
 
 _trynghttp2:
        @echo -----
-       @echo mod_h2 will not build unless nghttp2 is installed in srclib\nghttp2.
+       @echo mod_http2 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.
 
@@ -506,6 +506,11 @@ _build:
        cd modules\http
         $(MAKE) $(MAKEOPT) -f mod_mime.mak        CFG="mod_mime - Win32 $(LONG)" RECURSE=0 $(CTARGET)
        cd ..\..
+!IF EXIST("srclib\nghttp2")
+       cd modules\http2
+        $(MAKE) $(MAKEOPT) -f mod_http2.mak         CFG="mod_http2 - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+       cd ..\..
+!ENDIF
        cd modules\loggers
         $(MAKE) $(MAKEOPT) -f mod_log_config.mak  CFG="mod_log_config - Win32 $(LONG)" RECURSE=0 $(CTARGET)
         $(MAKE) $(MAKEOPT) -f mod_log_debug.mak  CFG="mod_log_debug - Win32 $(LONG)" RECURSE=0 $(CTARGET)
@@ -779,7 +784,7 @@ _copybin:
        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
+       copy modules\http2\$(LONG)\mod_http2.$(src_so)          "$(inst_so)" <.y
 !IF "$(SHORT)" == "D"
        copy srclib\nghttp2\lib\MSVC_obj\nghttp2d.$(src_dll)                    "$(inst_dll)" <.y
 !ELSE
@@ -1031,6 +1036,46 @@ BEGIN {
     exit 0;
 }
 <<
+!ENDIF
+!IF EXIST("srclib\libxml2")
+       type << >> "$(INSTDIR)\NOTICE.txt"
+
+This binary distributions of mod_proxy_html.so and mod_xml2enc.so include the
+libxml2 C library written by Daniel Veillard (daniel veillard.com), Bjorn 
+Reese (breese users.sourceforge.net) and Gary Pennington (Gary.Pennington 
+uk.sun.com). For complete information, visit LibXML2's web site at 
+https://http://www.xmlsoft.org/
+<<
+       -awk -f <<script.awk < "srclib\libxml2\Copyright" >> "$(INSTDIR)\LICENSE.txt"
+BEGIN {
+    print "";
+    print "For the mod_proxy_html and mod_xml2enc components:";
+    print "";
+           while ( getline > 0 ) {
+       print $$0;
+    }
+    exit 0;
+}
+<<
+!ENDIF
+!IF EXIST("srclib\nghttp2")
+       type << >> "$(INSTDIR)\NOTICE.txt"
+
+This binary distribution of mod_http2.so includes nghttp2 C library written 
+by Tatsuhiro Tsujikawa. For complete information, visit nghttp2's web site 
+at https://nghttp2.org/
+<<
+       -awk -f <<script.awk < "srclib\nghttp2\COPYING" >> "$(INSTDIR)\LICENSE.txt"
+BEGIN {
+    print "";
+    print "For the mod_http2 component:";
+    print "";
+           while ( getline > 0 ) {
+       print $$0;
+    }
+    exit 0;
+}
+<<
 !ENDIF
        $(MAKE) $(MAKEOPT) -f Makefile.win SHORT=$(SHORT) LONG=$(LONG) \
                _copybin src_exe=exe src_dll=dll src_so=so             \