diff --git a/CMakeLists.txt b/CMakeLists.txt index 50e99a1d..86b5529a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -84,8 +84,6 @@ find_package(LibXml2 2.6.26) set(WITH_LIBXML2_DEFAULT ${LIBXML2_FOUND}) find_package(Jemalloc) set(WITH_JEMALLOC_DEFAULT ${JEMALLOC_FOUND}) -find_package(Spdylay 1.3.2) -set(WITH_SPDYLAY_DEFAULT ${SPDYLAY_FOUND}) include(CMakeOptions.txt) @@ -220,8 +218,6 @@ else() endif() # jemalloc set(HAVE_JEMALLOC ${JEMALLOC_FOUND}) -# spdylay (for src/nghttpx and src/h2load) -set(HAVE_SPDYLAY ${SPDYLAY_FOUND}) if(ENABLE_ASIO_LIB) find_package(Boost 1.54.0 REQUIRED system thread) @@ -504,7 +500,6 @@ message(STATUS "summary of build options: Libev: ${HAVE_LIBEV} (LIBS='${LIBEV_LIBRARIES}') Libc-ares: ${HAVE_LIBCARES} (LIBS='${LIBCARES_LIBRARIES}') Libevent(SSL): ${HAVE_LIBEVENT_OPENSSL} (LIBS='${LIBEVENT_OPENSSL_LIBRARIES}') - Spdylay: ${HAVE_SPDYLAY} (LIBS='${SPDYLAY_LIBRARIES}') Jansson: ${HAVE_JANSSON} (LIBS='${JANSSON_LIBRARIES}') Jemalloc: ${HAVE_JEMALLOC} (LIBS='${JEMALLOC_LIBRARIES}') Zlib: ${HAVE_ZLIB} (LIBS='${ZLIB_LIBRARIES}') diff --git a/Makefile.am b/Makefile.am index af0e1858..0f24af4b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -37,7 +37,6 @@ EXTRA_DIST = nghttpx.conf.sample proxy.pac.sample android-config android-make \ cmakeconfig.h.in \ CMakeLists.txt \ CMakeOptions.txt \ - cmake/FindSpdylay.cmake \ cmake/ExtractValidFlags.cmake \ cmake/FindJemalloc.cmake \ cmake/FindLibev.cmake \ diff --git a/cmake/FindSpdylay.cmake b/cmake/FindSpdylay.cmake deleted file mode 100644 index 6a76d28e..00000000 --- a/cmake/FindSpdylay.cmake +++ /dev/null @@ -1,40 +0,0 @@ -# - Try to find spdylay -# Once done this will define -# SPDYLAY_FOUND - System has spdylay -# SPDYLAY_INCLUDE_DIRS - The spdylay include directories -# SPDYLAY_LIBRARIES - The libraries needed to use spdylay - -find_package(PkgConfig QUIET) -pkg_check_modules(PC_SPDYLAY QUIET libspdylay) - -find_path(SPDYLAY_INCLUDE_DIR - NAMES spdylay/spdylay.h - HINTS ${PC_SPDYLAY_INCLUDE_DIRS} -) -find_library(SPDYLAY_LIBRARY - NAMES spdylay - HINTS ${PC_SPDYLAY_LIBRARY_DIRS} -) - -if(SPDYLAY_INCLUDE_DIR) - set(_version_regex "^#define[ \t]+SPDYLAY_VERSION[ \t]+\"([^\"]+)\".*") - file(STRINGS "${SPDYLAY_INCLUDE_DIR}/spdylay/spdylayver.h" - SPDYLAY_VERSION REGEX "${_version_regex}") - string(REGEX REPLACE "${_version_regex}" "\\1" - SPDYLAY_VERSION "${SPDYLAY_VERSION}") - unset(_version_regex) -endif() - -include(FindPackageHandleStandardArgs) -# handle the QUIETLY and REQUIRED arguments and set SPDYLAY_FOUND to TRUE -# if all listed variables are TRUE and the requested version matches. -find_package_handle_standard_args(Spdylay REQUIRED_VARS - SPDYLAY_LIBRARY SPDYLAY_INCLUDE_DIR - VERSION_VAR SPDYLAY_VERSION) - -if(SPDYLAY_FOUND) - set(SPDYLAY_LIBRARIES ${SPDYLAY_LIBRARY}) - set(SPDYLAY_INCLUDE_DIRS ${SPDYLAY_INCLUDE_DIR}) -endif() - -mark_as_advanced(SPDYLAY_INCLUDE_DIR SPDYLAY_LIBRARY) diff --git a/cmakeconfig.h.in b/cmakeconfig.h.in index d67b5409..6c96f70a 100644 --- a/cmakeconfig.h.in +++ b/cmakeconfig.h.in @@ -13,9 +13,6 @@ /* Define to 1 if you have `libxml2` library. */ #cmakedefine HAVE_LIBXML2 1 -/* Define to 1 if you have `spdylay` library. */ -#cmakedefine HAVE_SPDYLAY 1 - /* Define to 1 if you have `mruby` library. */ #cmakedefine HAVE_MRUBY 1