# The following install defaults may be customized;
#
# Option Default
-# INSTDIR /Apache2x
+# INSTDIR /Apache24
# PORT 80
# SSLPORT 443
# DOMAINNAME example.com
# so the server root should be given in forward slashes (quoted),
# preferably with the drive designation!
-!IF EXIST("httpd.vcproj") && ([devenv /help > NUL 2>&1] == 0) \
+!IF EXIST("Apache.sln") && ([devenv /help > NUL 2>&1] == 0) \
&& !defined(USEMAK) && !defined(USEDSW)
USESLN=1
USEMAK=0
!ENDIF
# NOT EXIST("srclib\openssl")
-!IF EXIST("srclib\serf")
+!IF EXIST("srclib\zlib")
-_tryserf:
+_tryzlib:
!IF $(USEMAK) == 1
- cd modules\proxy
- $(MAKE) $(MAKEOPT) -f mod_serf.mak CFG="mod_serf - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+ cd modules\filters
+ $(MAKE) $(MAKEOPT) -f mod_deflate.mak CFG="mod_deflate - Win32 $(LONG)" RECURSE=0 $(CTARGET)
cd ..\..
!ELSEIF $(USESLN) == 1
- devenv $(TLP).sln /useenv $(CTARGET) $(LONG) /project mod_serf
+ devenv $(TLP).sln /useenv $(CTARGET) $(LONG) /project mod_deflate
!ELSE
@msdev $(TLP).dsw /USEENV /MAKE \
- "mod_serf - Win32 $(LONG)" /NORECURSE $(CTARGET)
+ "mod_deflate - Win32 $(LONG)" /NORECURSE $(CTARGET)
!ENDIF
!ELSE
-# NOT EXIST("srclib\serf")
+# NOT EXIST("srclib\zlib")
-_tryserf:
+_tryzlib:
@echo -----
- @echo mod_serf will not build unless libserf.dll is built in srclib\serf
- @echo For purposes of alpha, libserf release 0.3.0 works, but only with
- @echo http://people.apache.org/~wrowe/fixserf-win32-0.3.0.patch
+ @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.
!ENDIF
-# NOT EXIST("srclib\serf")
-!IF EXIST("srclib\zlib")
+!IF EXIST("srclib\libxml2")
-_tryzlib:
+_tryxml:
!IF $(USEMAK) == 1
cd modules\filters
- $(MAKE) $(MAKEOPT) -f mod_deflate.mak CFG="mod_deflate - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+ $(MAKE) $(MAKEOPT) -f mod_proxy_html.mak CFG="mod_proxy_html - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+ $(MAKE) $(MAKEOPT) -f mod_xml2enc.mak CFG="mod_xml2enc - Win32 $(LONG)" RECURSE=0 $(CTARGET)
cd ..\..
!ELSEIF $(USESLN) == 1
- devenv $(TLP).sln /useenv $(CTARGET) $(LONG) /project mod_deflate
+ devenv $(TLP).sln /useenv $(CTARGET) $(LONG) /project mod_proxy_html
+ devenv $(TLP).sln /useenv $(CTARGET) $(LONG) /project mod_xml2enc
!ELSE
@msdev $(TLP).dsw /USEENV /MAKE \
- "mod_deflate - Win32 $(LONG)" /NORECURSE $(CTARGET)
+ "mod_proxy_html - Win32 $(LONG)" /NORECURSE $(CTARGET)
+ @msdev $(TLP).dsw /USEENV /MAKE \
+ "mod_xml2enc - Win32 $(LONG)" /NORECURSE $(CTARGET)
!ENDIF
!ELSE
-# NOT EXIST("srclib\zlib")
+# NOT EXIST("srclib\libxml2")
-_tryzlib:
+_tryxml:
@echo -----
- @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.
+ @echo mod_proxy_html and mod_xml2enc will not build unless libxml2 is
+ @echo built in srclib\libxml2. Version 2.7.7 and later available from
+ @echo http://xmlsoft.org/ will satisfy this requirement.
!ENDIF
!ENDIF
+!IF EXIST("srclib\nghttp2")
+
+_trynghttp2:
+!IF $(USEMAK) == 1
+ cd modules\http2
+ $(MAKE) $(MAKEOPT) -f mod_http2.mak CFG="mod_http2 - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+ $(MAKE) $(MAKEOPT) -f mod_proxy_http2.mak CFG="mod_proxy_http2 - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+ cd ..\..
+!ELSEIF $(USESLN) == 1
+ devenv $(TLP).sln /useenv $(CTARGET) $(LONG) /project mod_http2
+ devenv $(TLP).sln /useenv $(CTARGET) $(LONG) /project mod_proxy_http2
+!ELSE
+ @msdev $(TLP).dsw /USEENV /MAKE \
+ "mod_http2 - Win32 $(LONG)" /NORECURSE $(CTARGET)
+ @msdev $(TLP).dsw /USEENV /MAKE \
+ "mod_proxy_http2 - Win32 $(LONG)" /NORECURSE $(CTARGET)
+!ENDIF
+
+!ELSE
+# NOT EXIST("srclib\nghttp2")
+
+_trynghttp2:
+ @echo -----
+ @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.
+
+!ENDIF
_trydb:
!IF $(USEMAK) == 1
!IF "$(INSTDIR)" == ""
-INSTDIR=\Apache2x
+INSTDIR=\Apache24
!ENDIF
!IF "$(DOMAINNAME)" == ""
DOMAINNAME=example.com
cd ..\..
cd modules\aaa
$(MAKE) $(MAKEOPT) -f mod_access_compat.mak CFG="mod_access_compat - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+ $(MAKE) $(MAKEOPT) -f mod_allowmethods.mak CFG="mod_allowmethods - Win32 $(LONG)" RECURSE=0 $(CTARGET)
$(MAKE) $(MAKEOPT) -f mod_auth_basic.mak CFG="mod_auth_basic - Win32 $(LONG)" RECURSE=0 $(CTARGET)
$(MAKE) $(MAKEOPT) -f mod_auth_digest.mak CFG="mod_auth_digest - Win32 $(LONG)" RECURSE=0 $(CTARGET)
$(MAKE) $(MAKEOPT) -f mod_auth_form.mak CFG="mod_auth_form - Win32 $(LONG)" RECURSE=0 $(CTARGET)
$(MAKE) $(MAKEOPT) -f mod_authn_dbd.mak CFG="mod_authn_dbd - Win32 $(LONG)" RECURSE=0 $(CTARGET)
$(MAKE) $(MAKEOPT) -f mod_authn_dbm.mak CFG="mod_authn_dbm - Win32 $(LONG)" RECURSE=0 $(CTARGET)
$(MAKE) $(MAKEOPT) -f mod_authn_file.mak CFG="mod_authn_file - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+ $(MAKE) $(MAKEOPT) -f mod_authn_socache.mak CFG="mod_authn_socache - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+ $(MAKE) $(MAKEOPT) -f mod_authnz_fcgi.mak CFG="mod_authnz_fcgi - Win32 $(LONG)" RECURSE=0 $(CTARGET)
$(MAKE) $(MAKEOPT) -f mod_authnz_ldap.mak CFG="mod_authnz_ldap - Win32 $(LONG)" RECURSE=0 $(CTARGET)
$(MAKE) $(MAKEOPT) -f mod_authz_core.mak CFG="mod_authz_core - Win32 $(LONG)" RECURSE=0 $(CTARGET)
$(MAKE) $(MAKEOPT) -f mod_authz_dbd.mak CFG="mod_authz_dbd - Win32 $(LONG)" RECURSE=0 $(CTARGET)
cd modules\cache
$(MAKE) $(MAKEOPT) -f mod_cache.mak CFG="mod_cache - Win32 $(LONG)" RECURSE=0 $(CTARGET)
$(MAKE) $(MAKEOPT) -f mod_cache_disk.mak CFG="mod_cache_disk - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+ $(MAKE) $(MAKEOPT) -f mod_cache_socache.mak CFG="mod_cache_socache - Win32 $(LONG)" RECURSE=0 $(CTARGET)
$(MAKE) $(MAKEOPT) -f mod_file_cache.mak CFG="mod_file_cache - Win32 $(LONG)" RECURSE=0 $(CTARGET)
$(MAKE) $(MAKEOPT) -f mod_socache_dbm.mak CFG="mod_socache_dbm - Win32 $(LONG)" RECURSE=0 $(CTARGET)
# $(MAKE) $(MAKEOPT) -f mod_socache_dc.mak CFG="mod_socache_dc - Win32 $(LONG)" RECURSE=0 $(CTARGET)
$(MAKE) $(MAKEOPT) -f mod_socache_shmcb.mak CFG="mod_socache_shmcb - Win32 $(LONG)" RECURSE=0 $(CTARGET)
cd ..\..
cd modules\core
+ $(MAKE) $(MAKEOPT) -f mod_macro.mak CFG="mod_macro - Win32 $(LONG)" RECURSE=0 $(CTARGET)
$(MAKE) $(MAKEOPT) -f mod_watchdog.mak CFG="mod_watchdog - Win32 $(LONG)" RECURSE=0 $(CTARGET)
cd ..\..
cd modules\cluster
cd modules\filters
$(MAKE) $(MAKEOPT) -f mod_buffer.mak CFG="mod_buffer - Win32 $(LONG)" RECURSE=0 $(CTARGET)
$(MAKE) $(MAKEOPT) -f mod_charset_lite.mak CFG="mod_charset_lite - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+ $(MAKE) $(MAKEOPT) -f mod_data.mak CFG="mod_data - Win32 $(LONG)" RECURSE=0 $(CTARGET)
!IF EXIST("srclib\zlib")
$(MAKE) $(MAKEOPT) -f mod_deflate.mak CFG="mod_deflate - Win32 $(LONG)" RECURSE=0 $(CTARGET)
!ENDIF
$(MAKE) $(MAKEOPT) -f mod_ext_filter.mak CFG="mod_ext_filter - Win32 $(LONG)" RECURSE=0 $(CTARGET)
$(MAKE) $(MAKEOPT) -f mod_filter.mak CFG="mod_filter - Win32 $(LONG)" RECURSE=0 $(CTARGET)
$(MAKE) $(MAKEOPT) -f mod_include.mak CFG="mod_include - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+!IF EXIST("srclib\libxml2")
+ $(MAKE) $(MAKEOPT) -f mod_proxy_html.mak CFG="mod_proxy_html - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+ $(MAKE) $(MAKEOPT) -f mod_xml2enc.mak CFG="mod_xml2enc - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+!ENDIF
$(MAKE) $(MAKEOPT) -f mod_ratelimit.mak CFG="mod_ratelimit - Win32 $(LONG)" RECURSE=0 $(CTARGET)
$(MAKE) $(MAKEOPT) -f mod_reflector.mak CFG="mod_reflector - Win32 $(LONG)" RECURSE=0 $(CTARGET)
$(MAKE) $(MAKEOPT) -f mod_reqtimeout.mak CFG="mod_reqtimeout - Win32 $(LONG)" RECURSE=0 $(CTARGET)
cd ..\..
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)
$(MAKE) $(MAKEOPT) -f mod_log_forensic.mak CFG="mod_log_forensic - Win32 $(LONG)" RECURSE=0 $(CTARGET)
$(MAKE) $(MAKEOPT) -f mod_logio.mak CFG="mod_logio - Win32 $(LONG)" RECURSE=0 $(CTARGET)
cd ..\..
$(MAKE) $(MAKEOPT) -f mod_proxy_ajp.mak CFG="mod_proxy_ajp - Win32 $(LONG)" RECURSE=0 $(CTARGET)
$(MAKE) $(MAKEOPT) -f mod_proxy_balancer.mak CFG="mod_proxy_balancer - Win32 $(LONG)" RECURSE=0 $(CTARGET)
$(MAKE) $(MAKEOPT) -f mod_proxy_connect.mak CFG="mod_proxy_connect - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+ $(MAKE) $(MAKEOPT) -f mod_proxy_express.mak CFG="mod_proxy_express - Win32 $(LONG)" RECURSE=0 $(CTARGET)
$(MAKE) $(MAKEOPT) -f mod_proxy_fcgi.mak CFG="mod_proxy_fcgi - Win32 $(LONG)" RECURSE=0 $(CTARGET)
$(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
+ $(MAKE) $(MAKEOPT) -f mod_proxy_wstunnel.mak CFG="mod_proxy_wstunnel - Win32 $(LONG)" RECURSE=0 $(CTARGET)
cd ..\..
cd modules\proxy\balancers
$(MAKE) $(MAKEOPT) -f mod_lbmethod_bybusyness.mak CFG="mod_lbmethod_bybusyness - Win32 $(LONG)" RECURSE=0 $(CTARGET)
$(MAKE) $(MAKEOPT) -f mod_lbmethod_bytraffic.mak CFG="mod_lbmethod_bytraffic - Win32 $(LONG)" RECURSE=0 $(CTARGET)
$(MAKE) $(MAKEOPT) -f mod_lbmethod_heartbeat.mak CFG="mod_lbmethod_heartbeat - Win32 $(LONG)" RECURSE=0 $(CTARGET)
cd ..\..\..
-!IFDEF ALL
- cd modules\proxy\examples
- $(MAKE) $(MAKEOPT) -f mod_lbmethod_rr.mak CFG="mod_lbmethod_rr - Win32 $(LONG)" RECURSE=0 $(CTARGET)
- cd ..\..\..
+# mod_proxy_http2 must be built after mod_proxy and mod_http2
+!IF EXIST("srclib\nghttp2")
+ cd modules\http2
+ $(MAKE) $(MAKEOPT) -f mod_http2.mak CFG="mod_http2 - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+ $(MAKE) $(MAKEOPT) -f mod_proxy_http2.mak CFG="mod_proxy_http2 - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+ cd ..\..
!ENDIF
cd modules\session
$(MAKE) $(MAKEOPT) -f mod_session.mak CFG="mod_session - Win32 $(LONG)" RECURSE=0 $(CTARGET)
!IF EXIST("srclib\lua")
devenv $(TLP).sln /useenv $(CTARGET) $(LONG) /project mod_lua
!ENDIF
+!IF EXIST("srclib\libxml2")
+ devenv $(TLP).sln /useenv $(CTARGET) $(LONG) /project mod_proxy_html
+ devenv $(TLP).sln /useenv $(CTARGET) $(LONG) /project mod_xml2enc
+!ENDIF
!ELSE
@msdev $(TLP).dsw /USEENV /MAKE \
"mod_lua - Win32 $(LONG)" /NORECURSE $(CTARGET)
!ENDIF
+!IF EXIST("srclib\libxml2")
+ @msdev $(TLP).dsw /USEENV /MAKE \
+ "mod_proxy_html - Win32 $(LONG)" /NORECURSE $(CTARGET)
+ @msdev $(TLP).dsw /USEENV /MAKE \
+ "mod_xml2enc - Win32 $(LONG)" /NORECURSE $(CTARGET)
+!ENDIF
!ENDIF
for %d in ($(DBM_LIST) x) do if not %d == x ( \
copy srclib\$(UTILDIR)\dbm\$(LONG)\apr_dbm_%d-1.$(src_dll) "$(inst_dll)" <.y \
)
-!IF EXIST("srclib\serf")
- copy srclib\serf\$(LONG)\libserf.$(src_dll) "$(inst_dll)" <.y
-!ENDIF
+!IF "$(SHORT)" == "D"
+ copy srclib\pcre\pcred.$(src_dll) "$(inst_dll)" <.y
+!ELSE
copy srclib\pcre\pcre.$(src_dll) "$(inst_dll)" <.y
+!ENDIF
copy modules\aaa\$(LONG)\mod_access_compat.$(src_so) "$(inst_so)" <.y
+ copy modules\aaa\$(LONG)\mod_allowmethods.$(src_so) "$(inst_so)" <.y
copy modules\aaa\$(LONG)\mod_auth_basic.$(src_so) "$(inst_so)" <.y
copy modules\aaa\$(LONG)\mod_auth_digest.$(src_so) "$(inst_so)" <.y
copy modules\aaa\$(LONG)\mod_auth_form.$(src_so) "$(inst_so)" <.y
copy modules\aaa\$(LONG)\mod_authn_dbd.$(src_so) "$(inst_so)" <.y
copy modules\aaa\$(LONG)\mod_authn_dbm.$(src_so) "$(inst_so)" <.y
copy modules\aaa\$(LONG)\mod_authn_file.$(src_so) "$(inst_so)" <.y
+ copy modules\aaa\$(LONG)\mod_authn_socache.$(src_so) "$(inst_so)" <.y
+ copy modules\aaa\$(LONG)\mod_authnz_fcgi.$(src_so) "$(inst_so)" <.y
copy modules\aaa\$(LONG)\mod_authnz_ldap.$(src_so) "$(inst_so)" <.y
copy modules\aaa\$(LONG)\mod_authz_core.$(src_so) "$(inst_so)" <.y
copy modules\aaa\$(LONG)\mod_authz_dbd.$(src_so) "$(inst_so)" <.y
copy modules\arch\win32\$(LONG)\mod_isapi.$(src_so) "$(inst_so)" <.y
copy modules\cache\$(LONG)\mod_cache.$(src_so) "$(inst_so)" <.y
copy modules\cache\$(LONG)\mod_cache_disk.$(src_so) "$(inst_so)" <.y
+ copy modules\cache\$(LONG)\mod_cache_socache.$(src_so) "$(inst_so)" <.y
copy modules\cache\$(LONG)\mod_file_cache.$(src_so) "$(inst_so)" <.y
copy modules\cache\$(LONG)\mod_socache_dbm.$(src_so) "$(inst_so)" <.y
# copy modules\cache\$(LONG)\mod_socache_dc.$(src_so) "$(inst_so)" <.y
copy modules\cache\$(LONG)\mod_socache_memcache.$(src_so) "$(inst_so)" <.y
copy modules\cache\$(LONG)\mod_socache_shmcb.$(src_so) "$(inst_so)" <.y
+ copy modules\core\$(LONG)\mod_macro.$(src_so) "$(inst_so)" <.y
copy modules\core\$(LONG)\mod_watchdog.$(src_so) "$(inst_so)" <.y
copy modules\cluster\$(LONG)\mod_heartbeat.$(src_so) "$(inst_so)" <.y
copy modules\cluster\$(LONG)\mod_heartmonitor.$(src_so) "$(inst_so)" <.y
!ENDIF
copy modules\filters\$(LONG)\mod_buffer.$(src_so) "$(inst_so)" <.y
copy modules\filters\$(LONG)\mod_charset_lite.$(src_so) "$(inst_so)" <.y
+ copy modules\filters\$(LONG)\mod_data.$(src_so) "$(inst_so)" <.y
!IF EXIST("srclib\zlib")
copy modules\filters\$(LONG)\mod_deflate.$(src_so) "$(inst_so)" <.y
!IF EXIST("srclib\zlib\zlib1.$(src_dll)")
copy modules\filters\$(LONG)\mod_ext_filter.$(src_so) "$(inst_so)" <.y
copy modules\filters\$(LONG)\mod_filter.$(src_so) "$(inst_so)" <.y
copy modules\filters\$(LONG)\mod_include.$(src_so) "$(inst_so)" <.y
+!IF EXIST("srclib\libxml2")
+ copy modules\filters\$(LONG)\mod_proxy_html.$(src_so) "$(inst_so)" <.y
+ copy modules\filters\$(LONG)\mod_xml2enc.$(src_so) "$(inst_so)" <.y
+!IF EXIST("srclib\libxml2\win32\bin.msvc\libxml2.$(src_dll)")
+ copy srclib\libxml2\win32\bin.msvc\libxml2.$(src_dll) "$(inst_dll)" <.y
+!ENDIF
+!ENDIF
copy modules\filters\$(LONG)\mod_ratelimit.$(src_so) "$(inst_so)" <.y
copy modules\filters\$(LONG)\mod_reflector.$(src_so) "$(inst_so)" <.y
copy modules\filters\$(LONG)\mod_reqtimeout.$(src_so) "$(inst_so)" <.y
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_http2.$(src_so) "$(inst_so)" <.y
+ copy modules\http2\$(LONG)\mod_proxy_http2.$(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
copy modules\loggers\$(LONG)\mod_log_forensic.$(src_so) "$(inst_so)" <.y
copy modules\loggers\$(LONG)\mod_logio.$(src_so) "$(inst_so)" <.y
!IF EXIST("srclib\lua")
copy modules\proxy\$(LONG)\mod_proxy_ajp.$(src_so) "$(inst_so)" <.y
copy modules\proxy\$(LONG)\mod_proxy_balancer.$(src_so) "$(inst_so)" <.y
copy modules\proxy\$(LONG)\mod_proxy_connect.$(src_so) "$(inst_so)" <.y
+ copy modules\proxy\$(LONG)\mod_proxy_express.$(src_so) "$(inst_so)" <.y
copy modules\proxy\$(LONG)\mod_proxy_fcgi.$(src_so) "$(inst_so)" <.y
copy modules\proxy\$(LONG)\mod_proxy_ftp.$(src_so) "$(inst_so)" <.y
copy modules\proxy\$(LONG)\mod_proxy_http.$(src_so) "$(inst_so)" <.y
copy modules\proxy\$(LONG)\mod_proxy_scgi.$(src_so) "$(inst_so)" <.y
-!IF EXIST("srclib\serf")
- copy modules\proxy\$(LONG)\mod_serf.$(src_so) "$(inst_so)" <.y
-!ENDIF
+ copy modules\proxy\$(LONG)\mod_proxy_wstunnel.$(src_so) "$(inst_so)" <.y
copy modules\proxy\balancers\$(LONG)\mod_lbmethod_bybusyness.$(src_so) "$(inst_so)" <.y
copy modules\proxy\balancers\$(LONG)\mod_lbmethod_byrequests.$(src_so) "$(inst_so)" <.y
copy modules\proxy\balancers\$(LONG)\mod_lbmethod_bytraffic.$(src_so) "$(inst_so)" <.y
copy modules\proxy\balancers\$(LONG)\mod_lbmethod_heartbeat.$(src_so) "$(inst_so)" <.y
-!IFDEF ALL
- copy modules\proxy\examples\$(LONG)\mod_lbmethod_rr.$(src_so) "$(inst_so)" <.y
-!ENDIF
copy modules\session\$(LONG)\mod_session.$(src_so) "$(inst_so)" <.y
copy modules\session\$(LONG)\mod_session_cookie.$(src_so) "$(inst_so)" <.y
copy modules\session\$(LONG)\mod_session_dbd.$(src_so) "$(inst_so)" <.y
<<
copy << "$(INSTDIR)\OPENSSL-NEWS.txt" <.y
- Apache HTTP Server 2.3 Limited OpenSSL Distribution
+ Apache HTTP Server 2.4 Limited OpenSSL Distribution
This binary distribution includes the minimal components of OpenSSL required
- to support mod_ssl for Apache HTTP Server version 2.3 (details are listed
+ to support mod_ssl for Apache HTTP Server version 2.4 (details are listed
in OPENSSL-README.txt.) For the complete list of CHANGES to this and later
versions of OpenSSL, please refer to the definative source,
<http://www.openssl.org/news/changelog.html>, or see the CHANGES file in the
+ srclib\openssl\NEWS "$(INSTDIR)\OPENSSL-NEWS.txt"
copy << "$(INSTDIR)\OPENSSL-README.txt" <.y
- Apache HTTP Server 2.3 Limited OpenSSL Distribution
+ Apache HTTP Server 2.4 Limited OpenSSL Distribution
This binary installation of OpenSSL is a limited distribution of the
files derived from the OpenSSL project:
bin\openssl.exe
These are the minimal libraries and tools required to use mod_ssl as
- distributed with Apache HTTP Server version 2.3. No library link files,
+ distributed with Apache HTTP Server version 2.4. No library link files,
headers or sources are distributed with this binary distribution. Please
refer to the <http://www.openssl.org/> site for complete source or binary
distributions.
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 \
srclib\apr-util\xml\expat\lib\expat.h \
srclib\apr\include\*.h \
srclib\apr-util\include\*.h \
-!IF EXIST("srclib\serf")
- srclib\serf\*.h \
-!ENDIF
include\*.h \
os\win32\os.h \
modules\cache\mod_cache.h \
+ modules\cache\cache_common.h \
modules\core\mod_so.h \
modules\core\mod_watchdog.h \
modules\database\mod_dbd.h \
modules\loggers\mod_log_config.h \
modules\mappers\mod_rewrite.h \
modules\proxy\mod_proxy.h \
- modules\proxy\mod_serf.h \
modules\ssl\mod_ssl.h \
+ modules\ssl\mod_ssl_openssl.h \
) do \
@copy %f "$(INSTDIR)\include" < .y > nul
copy srclib\apr\Lib$(SHORT)\apr-1.lib "$(INSTDIR)\lib" <.y
copy srclib\expat\win32\$(LONG)\libexpat.lib "$(INSTDIR)\lib" <.y
copy srclib\expat\win32\$(LONG)\libexpat.exp "$(INSTDIR)\lib" <.y
copy srclib\expat\win32\$(LONG)\libexpat.dll "$(INSTDIR)\bin" <.y
-!ENDIF
-!IF EXIST("srclib\serf")
- copy srclib\serf\$(LONG)\libserf.lib "$(INSTDIR)\lib" <.y
- copy srclib\serf\$(LONG)\libserf.exp "$(INSTDIR)\lib" <.y
!ENDIF
copy $(LONG)\libhttpd.exp "$(INSTDIR)\lib" <.y
copy $(LONG)\libhttpd.lib "$(INSTDIR)\lib" <.y
projects / apache / blobdiff