projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge in fix for reusing active memcached servers.
[m6w6/libmemcached]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index 8657fc6e6133bedda9ee892ada1693299d47d117..d6af0f9568481abfedf5f864795c14108ffdc6d2 100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-1,5
+1,6
@@
#!/usr/bin/env bash
#!/usr/bin/env bash
-# libmemcached
+# LibmemcacheD
+# Copyright (C) 2011 Data Differential, http://datadifferential.com/
# Copyright (C) 2006-2010 Brian Aker, Monty Taylor, Trond Norbye
# All rights reserved.
#
# Copyright (C) 2006-2010 Brian Aker, Monty Taylor, Trond Norbye
# All rights reserved.
#
@@
-7,16
+8,18
@@
# the COPYING file in this directory for full text.
AC_PREREQ(2.59)
# the COPYING file in this directory for full text.
AC_PREREQ(2.59)
-AC_INIT([libmemcached],[0.4
7
],[http://libmemcached.org/])
-AC_CONFIG_SRCDIR([libmemcached/memcached.c])
+AC_INIT([libmemcached],[0.4
9
],[http://libmemcached.org/])
+AC_CONFIG_SRCDIR([libmemcached/memcached.c
c
])
AC_CONFIG_AUX_DIR(config)
PANDORA_CANONICAL_TARGET(no-vc-changelog)
AC_CONFIG_AUX_DIR(config)
PANDORA_CANONICAL_TARGET(no-vc-changelog)
+AC_CHECK_PROGS([YACC], ['bison'], [:])
+AC_CHECK_PROGS([LEX], ['flex'], [:])
#shared library versioning
#shared library versioning
-MEMCACHED_UTIL_LIBRARY_VERSION=
1
:0:0
+MEMCACHED_UTIL_LIBRARY_VERSION=
2
:0:0
MEMCACHED_PROTOCAL_LIBRARY_VERSION=0:0:0
MEMCACHED_PROTOCAL_LIBRARY_VERSION=0:0:0
-MEMCACHED_LIBRARY_VERSION=
6
:0:0
+MEMCACHED_LIBRARY_VERSION=
7
:0:0
# | | |
# +------+ | +---+
# | | |
# | | |
# +------+ | +---+
# | | |
@@
-32,7
+35,7
@@
AC_SUBST(MEMCACHED_PROTOCAL_LIBRARY_VERSION)
AC_SUBST(MEMCACHED_LIBRARY_VERSION)
AC_SUBST(MEMCACHED_LIBRARY_VERSION)
-HASHKIT_LIBRARY_VERSION=
0
:0:0
+HASHKIT_LIBRARY_VERSION=
1
:0:0
AC_SUBST(HASHKIT_LIBRARY_VERSION)
AH_TOP([
AC_SUBST(HASHKIT_LIBRARY_VERSION)
AH_TOP([
@@
-88,6
+91,10
@@
AH_BOTTOM([
#define MSG_DONTWAIT 0
#endif
#define MSG_DONTWAIT 0
#endif
+#ifndef HAVE_MSG_MORE
+#define MSG_MORE 0
+#endif
+
#endif
])
#endif
])
@@
-96,13
+103,11
@@
AC_SEARCH_LIBS(gethostbyname, nsl)
AC_CHECK_FUNCS([getline])
AC_CHECK_FUNCS([getline])
-PANDORA_HAVE_LIBGTEST
PANDORA_HAVE_LIBEVENT
my_saved_libs="$LIBS"
LIBS=
PANDORA_REQUIRE_PTHREAD
LIBS="$my_saved_libs"
PANDORA_HAVE_LIBEVENT
my_saved_libs="$LIBS"
LIBS=
PANDORA_REQUIRE_PTHREAD
LIBS="$my_saved_libs"
-PANDORA_CXX_DEMANGLE
dnl Specialty checks
DETECT_BYTEORDER
dnl Specialty checks
DETECT_BYTEORDER
@@
-110,6
+115,7
@@
ENABLE_UTILLIB
SETSOCKOPT_SANITY
ENABLE_HSIEH_HASH
ENABLE_MURMUR_HASH
SETSOCKOPT_SANITY
ENABLE_HSIEH_HASH
ENABLE_MURMUR_HASH
+ENABLE_MEMASLAP
PROTOCOL_BINARY_TEST
WITH_MEMCACHED
ENABLE_DEPRECATED
PROTOCOL_BINARY_TEST
WITH_MEMCACHED
ENABLE_DEPRECATED