diff options
Diffstat (limited to 'memcached-fastlz.patch')
-rw-r--r-- | memcached-fastlz.patch | 73 |
1 files changed, 0 insertions, 73 deletions
diff --git a/memcached-fastlz.patch b/memcached-fastlz.patch deleted file mode 100644 index 794b51a..0000000 --- a/memcached-fastlz.patch +++ /dev/null @@ -1,73 +0,0 @@ -From ada08ebfe056514f9e67d84ec7690a8bb5987fc1 Mon Sep 17 00:00:00 2001 -From: Remi Collet <fedora@famillecollet.com> -Date: Fri, 5 Sep 2014 19:42:54 +0200 -Subject: [PATCH] allow to use system FastLZ - ---- - config.m4 | 21 ++++++++++++++++++--- - php_memcached.c | 5 ++++- - 2 files changed, 22 insertions(+), 4 deletions(-) - -diff --git a/config.m4 b/config.m4 -index b484f29..94a0e7d 100644 ---- a/config.m4 -+++ b/config.m4 -@@ -26,6 +26,9 @@ PHP_ARG_ENABLE(memcached-sasl, whether to enable memcached sasl support, - PHP_ARG_ENABLE(memcached-protocol, whether to enable memcached protocol support, - [ --enable-memcached-protocol Enable memcached protocoll support], no, no) - -+PHP_ARG_WITH(system-fastlz, wheter to use system FastLZ bibrary, -+[ --with-system-fastlz Use system FastLZ bibrary], no, no) -+ - if test -z "$PHP_ZLIB_DIR"; then - PHP_ARG_WITH(zlib-dir, for ZLIB, - [ --with-zlib-dir[=DIR] Set the path to ZLIB install prefix.], no) -@@ -336,7 +339,17 @@ if test "$PHP_MEMCACHED" != "no"; then - AC_MSG_RESULT([no]) - fi - -- PHP_MEMCACHED_FILES="php_memcached.c php_libmemcached_compat.c fastlz/fastlz.c g_fmt.c" -+ PHP_MEMCACHED_FILES="php_memcached.c php_libmemcached_compat.c g_fmt.c" -+ -+ if test "$PHP_SYSTEM_FASTLZ" != "no"; then -+ AC_CHECK_HEADERS([fastlz.h], [ac_cv_have_fastlz="yes"], [ac_cv_have_fastlz="no"]) -+ PHP_CHECK_LIBRARY(fastlz, fastlz_compress, -+ [PHP_ADD_LIBRARY(fastlz, 1, MEMCACHED_SHARED_LIBADD)], -+ [AC_MSG_ERROR(FastLZ library not found)]) -+ else -+ ac_cv_have_fastlz="no" -+ PHP_MEMCACHED_FILES="${PHP_MEMCACHED_FILES} fastlz/fastlz.c" -+ fi - - if test "$PHP_MEMCACHED_SESSION" != "no"; then - PHP_MEMCACHED_FILES="${PHP_MEMCACHED_FILES} php_memcached_session.c" -@@ -390,8 +403,10 @@ if test "$PHP_MEMCACHED" != "no"; then - PHP_SUBST(MEMCACHED_SHARED_LIBADD) - - PHP_NEW_EXTENSION(memcached, $PHP_MEMCACHED_FILES, $ext_shared,,$SESSION_INCLUDES $IGBINARY_INCLUDES $LIBEVENT_INCLUDES $MSGPACK_INCLUDES) -- PHP_ADD_BUILD_DIR($ext_builddir/fastlz, 1) -- -+ if test "ac_cv_have_fastlz" != "yes"; then -+ PHP_ADD_BUILD_DIR($ext_builddir/fastlz, 1) -+ fi -+ - ifdef([PHP_ADD_EXTENSION_DEP], - [ - PHP_ADD_EXTENSION_DEP(memcached, spl, true) -diff --git a/php_memcached.c b/php_memcached.c -index b21ecd4..2bd39d1 100644 ---- a/php_memcached.c -+++ b/php_memcached.c -@@ -30,8 +30,11 @@ - #ifdef HAVE_MEMCACHED_SESSION - # include "php_memcached_session.h" - #endif -- -+#ifdef HAVE_FASTLZ_H -+#include <fastlz.h> -+#else - #include "fastlz/fastlz.h" -+#endif - #include <zlib.h> - - #ifdef HAVE_JSON_API |