httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ic...@apache.org
Subject svn commit: r1748856 - in /httpd/test/mod_h2/trunk: configure.ac nghttp2/Makefile.am
Date Fri, 17 Jun 2016 13:43:40 GMT
Author: icing
Date: Fri Jun 17 13:43:40 2016
New Revision: 1748856

URL: http://svn.apache.org/viewvc?rev=1748856&view=rev
Log:
version update of libs, added spdylay as possible dependency to install

Modified:
    httpd/test/mod_h2/trunk/configure.ac
    httpd/test/mod_h2/trunk/nghttp2/Makefile.am

Modified: httpd/test/mod_h2/trunk/configure.ac
URL: http://svn.apache.org/viewvc/httpd/test/mod_h2/trunk/configure.ac?rev=1748856&r1=1748855&r2=1748856&view=diff
==============================================================================
--- httpd/test/mod_h2/trunk/configure.ac (original)
+++ httpd/test/mod_h2/trunk/configure.ac Fri Jun 17 13:43:40 2016
@@ -52,7 +52,7 @@ AC_ARG_WITH([serverdir], [AS_HELP_STRING
     [Use serverdir directory for setup [default=gen/apache]])],
     [request_serverdir=$withval], [request_serverdir=$PWD/gen/apache])
 
-NGHTTP2_VERSION=1.10.0
+NGHTTP2_VERSION=1.11.1
 
 AC_ARG_WITH([nghttp2-version], [AS_HELP_STRING([--with-nghttp2-version],
     [Use nghttp2 of specified version [default=<ignore>]])],
@@ -267,7 +267,7 @@ fi
 # openssl 
 ################################################################################
 
-OPENSSL_VERSION=1.0.2g
+OPENSSL_VERSION=1.0.2h
 LIBEVENT_VERSION=2.0.22-stable
 LIBEV_VERSION=4.22
 ZLIB_VERSION=1.2.8
@@ -311,6 +311,20 @@ fi
 INSTALL_ADDITIONAL="${INSTALL_ADDITIONAL# }"
 
 ################################################################################
+# spdylay 
+################################################################################
+
+SPDYLAY_VERSION=1.3.2
+
+if test "x$ac_cv_nghttp2" != "xyes"; then
+
+    NGHTTP2_DEPS="$NGHTTP2_DEPS gen/.spdylay-installed"
+    INSTALL_ADDITIONAL="$INSTALL_ADDITIONAL libspdylay($SPDYLAY_VERSION)"
+fi
+
+INSTALL_ADDITIONAL="${INSTALL_ADDITIONAL# }"
+
+################################################################################
 # php stuff 
 ################################################################################
 
@@ -353,6 +367,7 @@ AC_SUBST(CURL_VERSION)
 AC_SUBST(OPENSSL_VERSION)
 AC_SUBST(LIBEV_VERSION)
 AC_SUBST(LIBEVENT_VERSION)
+AC_SUBST(SPDYLAY_VERSION)
 AC_SUBST(ZLIB_VERSION)
 AC_SUBST(INSTALL_DEP)
 AC_SUBST(PHP_FPM)

Modified: httpd/test/mod_h2/trunk/nghttp2/Makefile.am
URL: http://svn.apache.org/viewvc/httpd/test/mod_h2/trunk/nghttp2/Makefile.am?rev=1748856&r1=1748855&r2=1748856&view=diff
==============================================================================
--- httpd/test/mod_h2/trunk/nghttp2/Makefile.am (original)
+++ httpd/test/mod_h2/trunk/nghttp2/Makefile.am Fri Jun 17 13:43:40 2016
@@ -31,6 +31,12 @@ ZLIB_DIR        = zlib-$(ZLIB_VERSION)
 ZLIB_TAR        = $(ZLIB_DIR).tar.gz
 ZLIB_URL        = http://zlib.net/$(ZLIB_TAR)
 
+SPDYLAY_VERSION = @SPDYLAY_VERSION@
+SPDYLAY_DIR     = spdylay-$(SPDYLAY_VERSION)
+SPDYLAY_TAR     = $(SPDYLAY_DIR).tar.gz
+SPDYLAY_URL     = https://github.com/tatsuhiro-t/spdylay/releases/download/v$(SPDYLAY_VERSION)/$(SPDYLAY_TAR)
+SPDYLAY_CONF_ENV= PKG_CONFIG_PATH=$(prefix)/lib/pkgconfig
+
 LIBEV_VERSION    = @LIBEV_VERSION@
 LIBEV_DIR        = libev-$(LIBEV_VERSION)
 LIBEV_TAR        = $(LIBEV_DIR).tar.gz
@@ -273,3 +279,33 @@ $(GEN)/$(ZLIB_TAR):
 	@mkdir -p $(GEN)
 	curl $(CURL_OPTS) -L $(ZLIB_URL) > $(GEN)/$(ZLIB_TAR)
 
+################################################################################
+# Build + install a local spdylay library (if needed)
+#
+$(GEN)/.spdylay-installed: \
+		$(GEN)/$(SPDYLAY_DIR)/.spdylay-built
+	@echo -n installing spdylay locally...
+	@cd $(GEN)/$(SPDYLAY_DIR) && make install
+	@echo done.
+	@touch $(GEN)/.spdylay-installed
+
+$(GEN)/$(SPDYLAY_DIR)/.spdylay-built: \
+		$(GEN)/$(SPDYLAY_DIR)/.spdylay-configured
+	@echo -n building spdylay locally...
+	@cd $(GEN)/$(SPDYLAY_DIR) && make
+	@echo done.
+	@touch $(GEN)/$(SPDYLAY_DIR)/.spdylay-built
+
+$(GEN)/$(SPDYLAY_DIR)/.spdylay-configured: $(GEN)/$(SPDYLAY_TAR) \
+		$(GEN)/.zlib-installed
+	@rm -rf $(GEN)/$(SPDYLAY_DIR)
+	@cd $(GEN) && tar xfz $(SPDYLAY_TAR)
+	@echo -n configuring spdylay...
+	@cd $(GEN)/$(SPDYLAY_DIR) &&  $(SPDYLAY_CONF_ENV) ./configure --prefix=$(prefix)
+	@echo done.
+	@touch $(GEN)/$(SPDYLAY_DIR)/.spdylay-configured
+
+$(GEN)/$(SPDYLAY_TAR):
+	@mkdir -p $(GEN)
+	curl $(CURL_OPTS) -L $(SPDYLAY_URL) > $(GEN)/$(SPDYLAY_TAR)
+



Mime
View raw message