Skip to content

N
nghttp2
Commit 88ce3c31 authored by Tatsuhiro Tsujikawa's avatar Tatsuhiro Tsujikawa Committed by GitHub
Browse files
Options

Merge pull request #1020 from FireBurn/master 

Reduce libxml2 version requirement to 2.6.26
parents 8c72fb35 16320a0f
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
CMakeLists.txt
View file @ 88ce3c31
...@@ -79,7 +79,7 @@ else() ...@@ -79,7 +79,7 @@ else()
set(ENABLE_PYTHON_BINDINGS_DEFAULT OFF) set(ENABLE_PYTHON_BINDINGS_DEFAULT OFF)
endif() endif()
find_package(LibXml2 2.7.7) find_package(LibXml2 2.6.26)
set(WITH_LIBXML2_DEFAULT ${LIBXML2_FOUND}) set(WITH_LIBXML2_DEFAULT ${LIBXML2_FOUND})
find_package(Jemalloc) find_package(Jemalloc)
set(WITH_JEMALLOC_DEFAULT ${JEMALLOC_FOUND}) set(WITH_JEMALLOC_DEFAULT ${JEMALLOC_FOUND})
......
README.rst
View file @ 88ce3c31
...@@ -87,7 +87,7 @@ enabled. SPDY support will be removed soon. ...@@ -87,7 +87,7 @@ enabled. SPDY support will be removed soon.
To enable ``-a`` option (getting linked assets from the downloaded To enable ``-a`` option (getting linked assets from the downloaded
resource) in ``nghttp``, the following package is required: resource) in ``nghttp``, the following package is required:
* libxml2 >= 2.7.7 * libxml2 >= 2.6.26
To enable systemd support in nghttpx, the following package is To enable systemd support in nghttpx, the following package is
required: required:
......
configure.ac
View file @ 88ce3c31
...@@ -410,7 +410,7 @@ if test "x${request_systemd}" = "xyes" && ...@@ -410,7 +410,7 @@ if test "x${request_systemd}" = "xyes" &&
fi fi
# libxml2 (for src/nghttp) # libxml2 (for src/nghttp)
PKG_CHECK_MODULES([LIBXML2], [libxml-2.0 >= 2.7.7], PKG_CHECK_MODULES([LIBXML2], [libxml-2.0 >= 2.6.26],
[have_libxml2=yes], [have_libxml2=no]) [have_libxml2=yes], [have_libxml2=no])
if test "x${have_libxml2}" = "xyes"; then if test "x${have_libxml2}" = "xyes"; then
AC_DEFINE([HAVE_LIBXML2], [1], [Define to 1 if you have `libxml2` library.]) AC_DEFINE([HAVE_LIBXML2], [1], [Define to 1 if you have `libxml2` library.])
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment