You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ic...@apache.org on 2019/11/26 11:31:23 UTC
svn commit: r1870457 - in /httpd/test/mod_h2/trunk: configure.ac
nghttp2/Makefile.am
Author: icing
Date: Tue Nov 26 11:31:23 2019
New Revision: 1870457
URL: http://svn.apache.org/viewvc?rev=1870457&view=rev
Log:
updated lib versions
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=1870457&r1=1870456&r2=1870457&view=diff
==============================================================================
--- httpd/test/mod_h2/trunk/configure.ac (original)
+++ httpd/test/mod_h2/trunk/configure.ac Tue Nov 26 11:31:23 2019
@@ -45,14 +45,14 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_R
OS=$( uname -s )
# Version of things we try to install when missing
-NGHTTP2_VERSION=1.33.0
-CURL_VERSION=7.61.1
-OPENSSL_VERSION=1.1.1
-LIBEVENT_VERSION=2.0.22-stable
-LIBEV_VERSION=4.24
+NGHTTP2_VERSION=1.40.0
+CURL_VERSION=7.67.1
+OPENSSL_VERSION=1.1.1d
+LIBEVENT_VERSION=2.1.11-stable
+LIBEV_VERSION=4.27
ZLIB_VERSION=1.2.11
-SPDYLAY_VERSION=1.3.2
-CARES_VERSION=1.12.0
+SPDYLAY_VERSION=1.4.0
+CARES_VERSION=1.15.0
AC_ARG_WITH([apxs], [AS_HELP_STRING([--with-apxs],
@@ -334,10 +334,10 @@ case "$OPENSSL_VERSION_PRESENT" in
;;
esac
-#if test "$OS" = "Darwin" -a "x$MACOS_OK" != "xyes"; 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" -a "x$MACOS_OK" != "xyes"; then
+ NGHTTP2_DEPS="$NGHTTP2_DEPS gen/.zlib-installed gen/.libev-installed"
+ INSTALL_ADDITIONAL="$INSTALL_ADDITIONAL libev($LIBEV_VERSION) zlib($ZLIB_VERSION)"
+fi
INSTALL_ADDITIONAL="${INSTALL_ADDITIONAL# }"
@@ -378,6 +378,22 @@ else
AC_MSG_NOTICE([no suitable php-fpm found])
fi
+################################################################################
+# libxml2
+################################################################################
+LIBXML2_CPPFLAGS=""
+LIBXML2_HEADERS=""
+if test -d "$prefix/include/libxml2"; then
+ LIBXML2_HEADERS="$prefix/include/libxml2"
+elif test -d "/usr/include/libxml2"; then
+ LIBXML2_HEADERS="/usr/include/libxml2"
+elif test -d "/usr/local/include/libxml2"; then
+ LIBXML2_HEADERS="/usr/local/include/libxml2"
+fi
+
+if test "x$LIBXML2_HEADERS" != "x"; then
+ LIBXML2_CPPFLAGS="-I$LIBXML2_HEADERS"
+fi
################################################################################
# generate files
@@ -414,6 +430,7 @@ AC_SUBST(ZLIB_VERSION)
AC_SUBST(INSTALL_DEP)
AC_SUBST(PHP_FPM)
AC_SUBST(TEST_DEP)
+AC_SUBST(LIBXML2_CPPFLAGS)
AC_CONFIG_FILES([
Makefile
Modified: httpd/test/mod_h2/trunk/nghttp2/Makefile.am
URL: http://svn.apache.org/viewvc/httpd/test/mod_h2/trunk/nghttp2/Makefile.am?rev=1870457&r1=1870456&r2=1870457&view=diff
==============================================================================
--- httpd/test/mod_h2/trunk/nghttp2/Makefile.am (original)
+++ httpd/test/mod_h2/trunk/nghttp2/Makefile.am Tue Nov 26 11:31:23 2019
@@ -69,7 +69,7 @@ OPENSSL_CONF = @OPENSSL_CONF@
NGHTTP2_CONF_ENV += PKG_CONFIG_PATH=$(prefix)/lib/pkgconfig \
- LDFLAGS=-L$(prefix)/lib CFLAGS="-I$(prefix)/include" LIBXML2_CPPFLAGS="-I/usr/include/libxml2"
+ LDFLAGS=-L$(prefix)/lib CFLAGS="-I$(prefix)/include" LIBXML2_CPPFLAGS="@LIBXML2_CPPFLAGS@"
all: install