Commit 12d92a62 authored by Tatsuhiro Tsujikawa's avatar Tatsuhiro Tsujikawa

Add --with-spdylay configure option

parent 7f18eced
...@@ -93,6 +93,11 @@ AC_ARG_WITH([jemalloc], ...@@ -93,6 +93,11 @@ AC_ARG_WITH([jemalloc],
[Use jemalloc [default=check]])], [Use jemalloc [default=check]])],
[request_jemalloc=$withval], [request_jemalloc=check]) [request_jemalloc=$withval], [request_jemalloc=check])
AC_ARG_WITH([spdylay],
[AS_HELP_STRING([--with-spdylay],
[Use spdylay [default=check]])],
[request_spdylay=$withval], [request_spdylay=check])
AC_ARG_WITH([cython], AC_ARG_WITH([cython],
[AS_HELP_STRING([--with-cython=PATH], [AS_HELP_STRING([--with-cython=PATH],
[Use cython in given PATH])], [Use cython in given PATH])],
...@@ -271,15 +276,24 @@ if test "x${request_jemalloc}" = "xyes" && ...@@ -271,15 +276,24 @@ if test "x${request_jemalloc}" = "xyes" &&
AC_MSG_ERROR([jemalloc was requested (--with-jemalloc) but not found]) AC_MSG_ERROR([jemalloc was requested (--with-jemalloc) but not found])
fi fi
# spdylay (for src/nghttpx) # spdylay (for src/nghttpx and src/h2load)
PKG_CHECK_MODULES([LIBSPDYLAY], [libspdylay >= 1.2.3], have_spdylay=no
[have_spdylay=yes], [have_spdylay=no]) if test "x${request_spdylay}" != "xno"; then
if test "x${have_spdylay}" = "xyes"; then PKG_CHECK_MODULES([LIBSPDYLAY], [libspdylay >= 1.2.3],
AC_DEFINE([HAVE_SPDYLAY], [1], [Define to 1 if you have `spdylay` library.]) [have_spdylay=yes], [have_spdylay=no])
else if test "x${have_spdylay}" = "xyes"; then
AC_MSG_NOTICE($LIBSPDYLAY_PKG_ERRORS) AC_DEFINE([HAVE_SPDYLAY], [1], [Define to 1 if you have `spdylay` library.])
AC_MSG_NOTICE([The SPDY support in nghttpx will be disabled.]) else
AC_MSG_NOTICE($LIBSPDYLAY_PKG_ERRORS)
AC_MSG_NOTICE([The SPDY support in nghttpx and h2load will be disabled.])
fi
fi fi
if test "x${request_spdylay}" = "xyes" &&
test "x${have_spdylay}" != "xyes"; then
AC_MSG_ERROR([spdylay was requested (--with-spdylay) but not found])
fi
AM_CONDITIONAL([HAVE_SPDYLAY], [ test "x${have_spdylay}" = "xyes" ]) AM_CONDITIONAL([HAVE_SPDYLAY], [ test "x${have_spdylay}" = "xyes" ])
# The nghttp, nghttpd and nghttpx under src depend on OpenSSL and # The nghttp, nghttpd and nghttpx under src depend on OpenSSL and
......
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