httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ic...@apache.org
Subject svn commit: r1691389 - in /httpd/test/mod_h2/trunk: Makefile.am clients/Makefile.am configure.ac nghttp2/Makefile.am test/test_common.sh
Date Thu, 16 Jul 2015 12:59:52 GMT
Author: icing
Date: Thu Jul 16 12:59:51 2015
New Revision: 1691389

URL: http://svn.apache.org/r1691389
Log:
no longer building local curl/nghttp2/openssl if already present

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

Modified: httpd/test/mod_h2/trunk/Makefile.am
URL: http://svn.apache.org/viewvc/httpd/test/mod_h2/trunk/Makefile.am?rev=1691389&r1=1691388&r2=1691389&view=diff
==============================================================================
--- httpd/test/mod_h2/trunk/Makefile.am (original)
+++ httpd/test/mod_h2/trunk/Makefile.am Thu Jul 16 12:59:51 2015
@@ -45,16 +45,16 @@ SUB_DIRS     = clients
 APACHECTL    = @APACHECTL@ -d $(SERVER_DIR)
 HTTPD        = @HTTPD@
 CURL         = $(prefix)/bin/curl
-NGHTTP       = $(prefix)/bin/nghttp
-H2LOAD       = $(prefix)/bin/h2load
+NGHTTP       = @NGHTTP@
+H2LOAD       = @H2LOAD@
 
-.PHONY: clean test loadtest start stop restart
+.PHONY: clean test loadtest start stop restart install-client install-nghttp2
 
 
 all: install
 
 clean:
-	@rm -rf $(GEN)
+	@rm -rf $(GEN) client/gen nghttp2/gen
 
 distdir:
 	@mkdir -p $(distdir)
@@ -81,51 +81,57 @@ restart: $(SERVER_DIR)/.test-setup
 stop:
 	$(APACHECTL) -k stop
 
-
-install:
+install-nghttp2:
 	@make -C nghttp2 install
+
+install-client: 
 	@make -C clients install
 
+install: @INSTALL_DEP@
+
 ################################################################################
 # Test the local httpd
 #
+
+TESTRUN = PREFIX=$(prefix) NGHTTP=$(NGHTTP) CURL=$(CURL) bash
+
 test: \
 		$(SERVER_DIR)/.test-setup \
 		$(SERVER_DIR)/.curl-installed
 	@rm -rf $(GEN)/tmp
 	@mkdir -p $(GEN)/tmp
-	@PREFIX=$(prefix) bash test/test_curl_altsvc.sh http://$(HTTP_AUTH) https://$(HTTPS_AUTH)
-	@PREFIX=$(prefix) bash test/test_alt_host.sh https://$(HTTPS_AUTH)
-	@PREFIX=$(prefix) bash test/test_nghttp_get.sh  https://$(HTTPS_AUTH)
-	@PREFIX=$(prefix) bash test/test_nghttp_post.sh https://$(HTTPS_AUTH)
-	@PREFIX=$(prefix) bash test/test_curl_get.sh    https://$(HTTPS_AUTH)
-	@PREFIX=$(prefix) bash test/test_curl_post.sh   https://$(HTTPS_AUTH)
-	@PREFIX=$(prefix) bash test/test_nghttp_get.sh  https://$(HTTPS_AUTH)/proxy
-	@PREFIX=$(prefix) bash test/test_nghttp_post.sh https://$(HTTPS_AUTH)/proxy
-	@PREFIX=$(prefix) bash test/test_curl_get.sh    https://$(HTTPS_AUTH)/proxy
-	@PREFIX=$(prefix) bash test/test_curl_post.sh   https://$(HTTPS_AUTH)/proxy
-	@PREFIX=$(prefix) bash test/test_nghttp_get.sh  https://$(HTTPS_AUTH)/rewrite
-	@PREFIX=$(prefix) bash test/test_nghttp_post.sh https://$(HTTPS_AUTH)/rewrite
-	@PREFIX=$(prefix) bash test/test_curl_get.sh    https://$(HTTPS_AUTH)/rewrite
-	@PREFIX=$(prefix) bash test/test_curl_post.sh   https://$(HTTPS_AUTH)/rewrite
-	@PREFIX=$(prefix) bash test/test_nghttp_get.sh  http://$(HTTP_AUTH)
-	@PREFIX=$(prefix) bash test/test_nghttp_post.sh http://$(HTTP_AUTH)
-	@PREFIX=$(prefix) bash test/test_curl_get.sh    http://$(HTTP_AUTH)
-	@PREFIX=$(prefix) bash test/test_curl_post.sh   http://$(HTTP_AUTH)
-	@PREFIX=$(prefix) bash test/test_nghttp_get.sh  http://$(HTTP_AUTH) direct
-	@PREFIX=$(prefix) bash test/test_nghttp_post.sh http://$(HTTP_AUTH) direct
-	@PREFIX=$(prefix) bash test/test_nghttp_get.sh  http://$(HTTP_AUTH)/proxy
-	@PREFIX=$(prefix) bash test/test_nghttp_post.sh http://$(HTTP_AUTH)/proxy
-	@PREFIX=$(prefix) bash test/test_curl_get.sh    http://$(HTTP_AUTH)/proxy
-	@PREFIX=$(prefix) bash test/test_curl_post.sh   http://$(HTTP_AUTH)/proxy
-	@PREFIX=$(prefix) bash test/test_nghttp_get.sh  http://$(HTTP_AUTH)/rewrite
-	@PREFIX=$(prefix) bash test/test_nghttp_post.sh http://$(HTTP_AUTH)/rewrite
-	@PREFIX=$(prefix) bash test/test_curl_get.sh    http://$(HTTP_AUTH)/rewrite
-	@PREFIX=$(prefix) bash test/test_curl_post.sh   http://$(HTTP_AUTH)/rewrite
-	@PREFIX=$(prefix) bash test/test_nghttp_get.sh  https://$(HTTPS_AUTH2)
-	@PREFIX=$(prefix) bash test/test_nghttp_post.sh https://$(HTTPS_AUTH2)
-	@PREFIX=$(prefix) bash test/test_curl_get.sh    https://$(HTTPS_AUTH2)
-	@PREFIX=$(prefix) bash test/test_curl_post.sh   https://$(HTTPS_AUTH2)
+	@$(TESTRUN) test/test_curl_altsvc.sh http://$(HTTP_AUTH) https://$(HTTPS_AUTH)
+	@$(TESTRUN) test/test_alt_host.sh https://$(HTTPS_AUTH)
+	@$(TESTRUN) test/test_nghttp_get.sh  https://$(HTTPS_AUTH)
+	@$(TESTRUN) test/test_nghttp_post.sh https://$(HTTPS_AUTH)
+	@$(TESTRUN) test/test_curl_get.sh    https://$(HTTPS_AUTH)
+	@$(TESTRUN) test/test_curl_post.sh   https://$(HTTPS_AUTH)
+	@$(TESTRUN) test/test_nghttp_get.sh  https://$(HTTPS_AUTH)/proxy
+	@$(TESTRUN) test/test_nghttp_post.sh https://$(HTTPS_AUTH)/proxy
+	@$(TESTRUN) test/test_curl_get.sh    https://$(HTTPS_AUTH)/proxy
+	@$(TESTRUN) test/test_curl_post.sh   https://$(HTTPS_AUTH)/proxy
+	@$(TESTRUN) test/test_nghttp_get.sh  https://$(HTTPS_AUTH)/rewrite
+	@$(TESTRUN) test/test_nghttp_post.sh https://$(HTTPS_AUTH)/rewrite
+	@$(TESTRUN) test/test_curl_get.sh    https://$(HTTPS_AUTH)/rewrite
+	@$(TESTRUN) test/test_curl_post.sh   https://$(HTTPS_AUTH)/rewrite
+	@$(TESTRUN) test/test_nghttp_get.sh  http://$(HTTP_AUTH)
+	@$(TESTRUN) test/test_nghttp_post.sh http://$(HTTP_AUTH)
+	@$(TESTRUN) test/test_curl_get.sh    http://$(HTTP_AUTH)
+	@$(TESTRUN) test/test_curl_post.sh   http://$(HTTP_AUTH)
+	@$(TESTRUN) test/test_nghttp_get.sh  http://$(HTTP_AUTH) direct
+	@$(TESTRUN) test/test_nghttp_post.sh http://$(HTTP_AUTH) direct
+	@$(TESTRUN) test/test_nghttp_get.sh  http://$(HTTP_AUTH)/proxy
+	@$(TESTRUN) test/test_nghttp_post.sh http://$(HTTP_AUTH)/proxy
+	@$(TESTRUN) test/test_curl_get.sh    http://$(HTTP_AUTH)/proxy
+	@$(TESTRUN) test/test_curl_post.sh   http://$(HTTP_AUTH)/proxy
+	@$(TESTRUN) test/test_nghttp_get.sh  http://$(HTTP_AUTH)/rewrite
+	@$(TESTRUN) test/test_nghttp_post.sh http://$(HTTP_AUTH)/rewrite
+	@$(TESTRUN) test/test_curl_get.sh    http://$(HTTP_AUTH)/rewrite
+	@$(TESTRUN) test/test_curl_post.sh   http://$(HTTP_AUTH)/rewrite
+	@$(TESTRUN) test/test_nghttp_get.sh  https://$(HTTPS_AUTH2)
+	@$(TESTRUN) test/test_nghttp_post.sh https://$(HTTPS_AUTH2)
+	@$(TESTRUN) test/test_curl_get.sh    https://$(HTTPS_AUTH2)
+	@$(TESTRUN) test/test_curl_post.sh   https://$(HTTPS_AUTH2)
 
 ################################################################################
 # Load Test

Modified: httpd/test/mod_h2/trunk/clients/Makefile.am
URL: http://svn.apache.org/viewvc/httpd/test/mod_h2/trunk/clients/Makefile.am?rev=1691389&r1=1691388&r2=1691389&view=diff
==============================================================================
--- httpd/test/mod_h2/trunk/clients/Makefile.am (original)
+++ httpd/test/mod_h2/trunk/clients/Makefile.am Thu Jul 16 12:59:51 2015
@@ -13,7 +13,7 @@
 # limitations under the License.
 #
 
-CURL_VERSION = 7.43.0
+CURL_VERSION = @CURL_VERSION@
 CURL_DIR     = curl-$(CURL_VERSION)
 CURL_TAR     = $(CURL_DIR).tar.gz
 CURL_URL     = http://curl.haxx.se/download/$(CURL_TAR)

Modified: httpd/test/mod_h2/trunk/configure.ac
URL: http://svn.apache.org/viewvc/httpd/test/mod_h2/trunk/configure.ac?rev=1691389&r1=1691388&r2=1691389&view=diff
==============================================================================
--- httpd/test/mod_h2/trunk/configure.ac (original)
+++ httpd/test/mod_h2/trunk/configure.ac Thu Jul 16 12:59:51 2015
@@ -44,11 +44,6 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_R
 
 OS=$( uname -s )
 
-AC_ARG_ENABLE([werror],
-    [AS_HELP_STRING([--enable-werror],
-                    [Turn on compile time warnings])],
-    [werror=$enableval], [werror=no])
-
 AC_ARG_WITH([apxs], [AS_HELP_STRING([--with-apxs],
     [Use APXS executable [default=check]])],
     [request_apxs=$withval], [request_apxs=check])
@@ -58,7 +53,7 @@ AC_ARG_WITH([serverdir], [AS_HELP_STRING
     [request_serverdir=$withval], [request_serverdir=$PWD/gen/apache])
 
 
-export BUILD_SUBDIRS="nghttp2 clients"
+export BUILD_SUBDIRS="clients"
 
 AC_MSG_NOTICE("configuring build")
 
@@ -80,38 +75,6 @@ fi
 AC_PROG_CC
 AC_PROG_CC_STDC
 
-if test "x$werror" != "xno"; then
-    AX_CHECK_COMPILE_FLAG([-Wall], [CFLAGS="$CFLAGS -Wall"])
-    AX_CHECK_COMPILE_FLAG([-Wextra], [CFLAGS="$CFLAGS -Wextra"])
-    AX_CHECK_COMPILE_FLAG([-Werror], [CFLAGS="$CFLAGS -Werror"])
-    AX_CHECK_COMPILE_FLAG([-Wmissing-prototypes], [CFLAGS="$CFLAGS -Wmissing-prototypes"])
-    AX_CHECK_COMPILE_FLAG([-Wstrict-prototypes], [CFLAGS="$CFLAGS -Wstrict-prototypes"])
-    AX_CHECK_COMPILE_FLAG([-Wmissing-declarations], [CFLAGS="$CFLAGS -Wmissing-declarations"])
-    AX_CHECK_COMPILE_FLAG([-Wpointer-arith], [CFLAGS="$CFLAGS -Wpointer-arith"])
-    # we like to use such things...
-    #AX_CHECK_COMPILE_FLAG([-Wdeclaration-after-statement], [CFLAGS="$CFLAGS -Wdeclaration-after-statement"])
-    AX_CHECK_COMPILE_FLAG([-Wformat-security], [CFLAGS="$CFLAGS -Wformat-security"])
-    AX_CHECK_COMPILE_FLAG([-Wwrite-strings], [CFLAGS="$CFLAGS -Wwrite-strings"])
-    AX_CHECK_COMPILE_FLAG([-Wshadow], [CFLAGS="$CFLAGS -Wshadow"])
-    AX_CHECK_COMPILE_FLAG([-Winline], [CFLAGS="$CFLAGS -Winline"])
-    AX_CHECK_COMPILE_FLAG([-Wnested-externs], [CFLAGS="$CFLAGS -Wnested-externs"])
-    AX_CHECK_COMPILE_FLAG([-Wfloat-equal], [CFLAGS="$CFLAGS -Wfloat-equal"])
-    AX_CHECK_COMPILE_FLAG([-Wundef], [CFLAGS="$CFLAGS -Wundef"])
-    AX_CHECK_COMPILE_FLAG([-Wendif-labels], [CFLAGS="$CFLAGS -Wendif-labels"])
-    AX_CHECK_COMPILE_FLAG([-Wempty-body], [CFLAGS="$CFLAGS -Wempty-body"])
-# does not make sense with APR as it prefers char* to void*
-#    AX_CHECK_COMPILE_FLAG([-Wcast-align], [CFLAGS="$CFLAGS -Wcast-align"])
-    AX_CHECK_COMPILE_FLAG([-Wclobbered], [CFLAGS="$CFLAGS -Wclobbered"])
-    AX_CHECK_COMPILE_FLAG([-Wvla], [CFLAGS="$CFLAGS -Wvla"])
-    AX_CHECK_COMPILE_FLAG([-Wpragmas], [CFLAGS="$CFLAGS -Wpragmas"])
-    AX_CHECK_COMPILE_FLAG([-Wunreachable-code], [CFLAGS="$CFLAGS -Wunreachable-code"])
-    AX_CHECK_COMPILE_FLAG([-Waddress], [CFLAGS="$CFLAGS -Waddress"])
-    AX_CHECK_COMPILE_FLAG([-Wattributes], [CFLAGS="$CFLAGS -Wattributes"])
-    AX_CHECK_COMPILE_FLAG([-Wdiv-by-zero], [CFLAGS="$CFLAGS -Wdiv-by-zero"])
-    AX_CHECK_COMPILE_FLAG([-Wshorten-64-to-32], [CFLAGS="$CFLAGS -Wshorten-64-to-32"])
-fi
-
-
 if test -x "${APXS}"; then
     if test "$prefix" = "NONE"; then
         prefix="$($APXS -q prefix)"
@@ -152,49 +115,172 @@ if test "x${PHPCGI}" = "x"; then
     AC_MSG_ERROR("no php-cgi installation found")
 fi
 
+INSTALL_DEP=""
+INSTALL_ADDITIONAL=""
+
+################################################################################
+# curl 
+################################################################################
+CURL_VERSION=7.43.0
+
+AC_PATH_PROG([CURL], [curl])
+if test "x${CURL}" != "x"; then
+    feats="$( ${CURL} -V | grep 'Features:.*HTTP2' )"
+    if test "x$feats" = "x"; then
+        CURL=""
+        AC_MSG_NOTICE([std curl does not implement HTTP2])
+    fi
+fi
+
+if test -x "${prefix}/bin/curl"; then
+    feats="$( ${prefix}/bin/curl -V | grep 'Features:.*HTTP2' )"
+    if test "x$feats" != "x"; then
+        CURL="${prefix}/bin/curl"
+        AC_MSG_NOTICE([$CURL however implements HTTP2])
+    fi
+fi
+
+if test "x${CURL}" = "x"; then
+    CURL="${prefix}/bin/curl"
+    INSTALL_DEP="install-client"
+    INSTALL_ADDITIONAL="curl($CURL_VERSION)"
+fi
+
 ################################################################################
 # nghttp2 
 ################################################################################
 
-NGHTTP2_VERSION=1.0.5
+NGHTTP2_VERSION=1.1.1
 NGHTTP2_DEPS=""
 
+
+# Before doing anything else, load in pkg-config variables
+if test -n "$PKGCONFIG"; then
+  saved_PKG_CONFIG_PATH="$PKG_CONFIG_PATH"
+  AC_MSG_CHECKING([for pkg-config along $PKG_CONFIG_PATH])
+  if test "x$prefix" != "x" -a -f "${prefix}/lib/pkgconfig/libnghttp2.pc"; then
+    # Ensure that the given path is used by pkg-config too, otherwise
+    # the system libnghttp2.pc might be picked up instead.
+    PKG_CONFIG_PATH="${prefix}/lib/pkgconfig${PKG_CONFIG_PATH+:}${PKG_CONFIG_PATH}"
+    export PKG_CONFIG_PATH
+  fi
+  ap_nghttp2_libs="`$PKGCONFIG $PKGCONFIG_LIBOPTS --libs-only-l --silence-errors libnghttp2`"
+  if test $? -eq 0; then
+    ap_nghttp2_found="yes"
+    pkglookup="`$PKGCONFIG --cflags-only-I libnghttp2`"
+    CPPFLAGS="$CPPFLAGS $pkglookup"
+    pkglookup="`$PKGCONFIG $PKGCONFIG_LIBOPTS --libs-only-L libnghttp2`"
+    LDFLAGS="$LDFLAGS $pkglookup"
+    pkglookup="`$PKGCONFIG $PKGCONFIG_LIBOPTS --libs-only-other libnghttp2`"
+    LDFLAGS="$LDFLAGS $pkglookup"
+  fi
+  PKG_CONFIG_PATH="$saved_PKG_CONFIG_PATH"
+fi
+
+# fall back to the user-supplied directory if not found via pkg-config
+if test "x$prefix" != "x" -a "x$ap_nghttp2_found" = "x"; then
+  CPPFLAGS="$CPPFLAGS -I$prefix/include"
+  LDFLAGS="$LDFLAGS -L$prefix/lib"
+fi
+
+AC_MSG_CHECKING([for nghttp2 version >= 1.0.0])
+AC_TRY_COMPILE([#include <nghttp2/nghttp2ver.h>],[
+#if !defined(NGHTTP2_VERSION_NUM)
+#error "Missing nghttp2 version"
+#endif
+#if NGHTTP2_VERSION_NUM < 0x010000
+#error "Unsupported nghttp2 version " NGHTTP2_VERSION_TEXT
+#endif],
+      [AC_MSG_RESULT(OK) 
+        ac_cv_nghttp2=yes],
+      [AC_MSG_RESULT(FAILED)])
+
+if test "x$ac_cv_nghttp2" = "xyes"; then
+    AC_PATH_PROG([NGHTTP], [nghttp])
+    if test "x${NGHTTP}" = "x"; then
+        NGHTTP="${prefix}/bin/nghttp"
+        if test !  -x "${NGHTTP}"; then
+            AC_MSG_WARN([no nghttp executable found])
+            ac_cv_nghttp2=no
+        fi
+    fi
+fi
+if test "x$ac_cv_nghttp2" = "xyes"; then
+    AC_PATH_PROG([H2LOAD], [h2load])
+    if test "x${H2LOAD}" = "x"; then
+        H2LOAD="${prefix}/bin/h2load"
+        if test !  -x "${H2LOAD}"; then
+            AC_MSG_WARN([no h2load executable found])
+            ac_cv_nghttp2=no
+        fi
+    fi
+fi
+
+if test "x$ac_cv_nghttp2" = "xyes"; then
+    ap_nghttp2_libs="${ap_nghttp2_libs:--lnghttp2} `$apr_config --libs`"    
+    LIBS="$LIBS $ap_nghttp2_libs"
+
+    # Run library and function checks
+    liberrors=""
+    AC_CHECK_HEADERS([nghttp2/nghttp2.h])
+    AC_CHECK_FUNCS([nghttp2_session_server_new2], [], [liberrors="yes"])
+    if test "x$liberrors" != "x"; then
+        AC_MSG_WARN([nghttp2 library is unusable])
+    fi
+else
+    BUILD_SUBDIRS="nghttp2 $BUILD_SUBDIRS"
+    AC_MSG_NOTICE([no suitable nghttp2 found])
+    INSTALL_DEP="install-nghttp2 ${INSTALL_DEP}"
+    INSTALL_ADDITIONAL="nghttp2($NGHTTP2_VERSION)"
+fi
+
 ################################################################################
 # openssl 
 ################################################################################
 
-AC_PATH_PROG([OPENSSL], [openssl])
-if test "x${OPENSSL}" = "x"; then
-    OPENSSL_VERSION="na"
-else 
-    OPENSSL_VERSION=$( ${OPENSSL} version -v | sed -e 's/OpenSSL *//g' -e 's/[a-z]* .*//g')
-fi
-
-OPENSSL_SRC="installed"
-case "$OPENSSL_VERSION" in
-    1.0.2*)
-        # acceptable
-        ;;
-    *)
-        OPENSSL_VERSION="1.0.2d"
-        OPENSSL_SRC="download+install in $prefix"
-        NGHTTP2_DEPS="$NGHTTP2_DEPS gen/.openssl-installed"
-        CURL_CONF='--with-nghttp2=$(prefix) --with-ssl=$(prefix)'
-        if test "$OS" = "Darwin"; then
-            OPENSSL_CONF_CMD="./Configure"
-            OPENSSL_CONF="shared -fPIC darwin64-x86_64-cc"
-        else 
-            OPENSSL_CONF_CMD="./config"
-            OPENSSL_CONF="shared -fPIC"
-            NGHTTP2_DEPS="$NGHTTP2_DEPS gen/.libevent-installed"
-        fi
-        ;;
-esac
+OPENSSL_VERSION=1.0.2d
+LIBEVENT_VERSION=2.0.22-stable
+LIBEV_VERSION=4.20
+ZLIB_VERSION=1.2.8
+
+if test "x$ac_cv_nghttp2" != "xyes"; then
+
+    AC_PATH_PROG([OPENSSL], [openssl])
+    if test "x${OPENSSL}" = "x"; then
+        OPENSSL_VERSION_PRESENT="na"
+    else 
+        OPENSSL_VERSION_PRESENT=$( ${OPENSSL} version -v | sed -e 's/OpenSSL *//g' -e 's/[a-z]*
.*//g')
+    fi
+
+    case "$OPENSSL_VERSION_PRESENT" in
+        1.0.2*)
+            # acceptable
+            ;;
+        *)
+            NGHTTP2_DEPS="$NGHTTP2_DEPS gen/.openssl-installed"
+            INSTALL_ADDITIONAL="$INSTALL_ADDITIONAL openssl($OPENSSL_VERSION)"
+            CURL_CONF='--with-nghttp2=$(prefix) --with-ssl=$(prefix)'
+            if test "$OS" = "Darwin"; then
+                OPENSSL_CONF_CMD="./Configure"
+                OPENSSL_CONF="shared -fPIC darwin64-x86_64-cc"
+            else 
+                OPENSSL_CONF_CMD="./config"
+                OPENSSL_CONF="shared -fPIC"
+                NGHTTP2_DEPS="$NGHTTP2_DEPS gen/.libevent-installed"
+                INSTALL_ADDITIONAL="$INSTALL_ADDITIONAL libevent($LIBEVENT_VERSION)"
+            fi
+            ;;
+    esac
+
+    if test "$OS" = "Darwin"; then
+        NGHTTP2_DEPS="$NGHTTP2_DEPS gen/.zlib-installed gen/.libev-installed"
+        INSTALL_ADDITIONAL="$INSTALL_ADDITIONAL libev($LIBEV_VERSION) zlib($ZLIB_VERSION)"
+    fi
 
-if test "$OS" = "Darwin"; then
-    NGHTTP2_DEPS="$NGHTTP2_DEPS gen/.zlib-installed gen/.libev-installed"
 fi
 
+INSTALL_ADDITIONAL="${INSTALL_ADDITIONAL# }"
+
 ################################################################################
 # generate files 
 ################################################################################
@@ -214,8 +300,15 @@ AC_SUBST(NGHTTP2_DEPS)
 AC_SUBST(OPENSSL_CONF_CMD)
 AC_SUBST(OPENSSL_CONF)
 AC_SUBST(CURL_CONF)
-AC_SUBST(OPENSSL_VERSION)
 AC_SUBST(NGHTTP2_VERSION)
+AC_SUBST(NGHTTP)
+AC_SUBST(H2LOAD)
+AC_SUBST(CURL_VERSION)
+AC_SUBST(OPENSSL_VERSION)
+AC_SUBST(LIBEV_VERSION)
+AC_SUBST(LIBEVENT_VERSION)
+AC_SUBST(ZLIB_VERSION)
+AC_SUBST(INSTALL_DEP)
 
 AC_CONFIG_FILES([
     Makefile
@@ -227,10 +320,11 @@ AC_OUTPUT
 
 AC_MSG_NOTICE([summary of build options:
 
-    Version:        ${VERSION} shared $LT_CURRENT:$LT_REVISION:$LT_AGE
-    Host type:      ${host}
-    prefix:         ${prefix}
-    APXS:           ${APXS}
-    nghttp2:        ${NGHTTP2_VERSION} (download+install in $prefix)
-    OPENSSL:        ${OPENSSL_VERSION} (${OPENSSL_SRC})
+    Version:          ${VERSION} shared $LT_CURRENT:$LT_REVISION:$LT_AGE
+    Host type:        ${host}
+    prefix:           ${prefix}
+    APXS:             ${APXS}
+    NGHTTP:           ${NGHTTP}
+    CURL:             ${CURL}
+    download+install: ${INSTALL_ADDITIONAL:-n.a.}
 ])

Modified: httpd/test/mod_h2/trunk/nghttp2/Makefile.am
URL: http://svn.apache.org/viewvc/httpd/test/mod_h2/trunk/nghttp2/Makefile.am?rev=1691389&r1=1691388&r2=1691389&view=diff
==============================================================================
--- httpd/test/mod_h2/trunk/nghttp2/Makefile.am (original)
+++ httpd/test/mod_h2/trunk/nghttp2/Makefile.am Thu Jul 16 12:59:51 2015
@@ -25,19 +25,19 @@ NGHTTP2_CONF_ENV=
 NGHTTP2_DEPS    = @NGHTTP2_DEPS@
 NGHTTP2_CONF    = --prefix=$(prefix) --enable-app
 
-ZLIB_VERSION    = 1.2.8
+ZLIB_VERSION    = @ZLIB_VERSION@
 ZLIB_DIR        = zlib-$(ZLIB_VERSION)
 ZLIB_TAR        = $(ZLIB_DIR).tar.gz
 ZLIB_URL        = http://zlib.net/$(ZLIB_TAR)
 
-LIBEV_VERSION    = 4.20
+LIBEV_VERSION    = @LIBEV_VERSION@
 LIBEV_DIR        = libev-$(LIBEV_VERSION)
 LIBEV_TAR        = $(LIBEV_DIR).tar.gz
 LIBEV_URL        = http://dist.schmorp.de/libev/$(LIBEV_TAR)
 LIBEV_CONF_ENV   = PKG_CONFIG_PATH=$(prefix)/lib/pkgconfig \
     LDFLAGS=-L$(prefix)/lib CFLAGS=-I$(prefix)/include
 
-LIBEVENT_VERSION = 2.0.22-stable
+LIBEVENT_VERSION = @LIBEVENT_VERSION@
 LIBEVENT_DIR     = libevent-$(LIBEVENT_VERSION)
 LIBEVENT_TAR     = $(LIBEVENT_DIR).tar.gz
 LIBEVENT_URL     = https://github.com/libevent/libevent/releases/download/release-2.0.22-stable/$(LIBEVENT_TAR)
@@ -45,7 +45,7 @@ LIBEVENT_CONF_ENV = PKG_CONFIG_PATH=$(pr
     LDFLAGS=-L$(prefix)/lib CFLAGS=-I$(prefix)/include
 
 
-OPENSSL_VERSION  = 1.0.2d
+OPENSSL_VERSION  = @OPENSSL_VERSION@
 OPENSSL_BASE     = http://www.openssl.org
 OPENSSL_DIR      = openssl-$(OPENSSL_VERSION)
 OPENSSL_TAR      = $(OPENSSL_DIR).tar.gz

Modified: httpd/test/mod_h2/trunk/test/test_common.sh
URL: http://svn.apache.org/viewvc/httpd/test/mod_h2/trunk/test/test_common.sh?rev=1691389&r1=1691388&r2=1691389&view=diff
==============================================================================
--- httpd/test/mod_h2/trunk/test/test_common.sh (original)
+++ httpd/test/mod_h2/trunk/test/test_common.sh Thu Jul 16 12:59:51 2015
@@ -38,8 +38,8 @@ fi
 GEN="gen"
 TMP="$GEN/tmp"
 
-CURL="${BIN_DIR}/curl  -sk --resolv ${HOST#*://}:127.0.0.1"
-NGHTTP="${BIN_DIR}/nghttp"
+CURL="${CURL:-${BIN_DIR}/curl}  -sk --resolv ${HOST#*://}:127.0.0.1"
+NGHTTP="${NGHTTP:-${BIN_DIR}/nghttp}"
 
 
 fail() {



Mime
View raw message