projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge in additional work to handle "weight" for servers.
[awesomized/libmemcached]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index 4beb8a0ac65436dcd53783860225265ac51f7281..b4581e9f7d15dd767d8b6003a38f65c48a862eee 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
2
],[http://libmemcached.org/])
+AC_INIT([libmemcached],[0.4
8
],[http://libmemcached.org/])
AC_CONFIG_SRCDIR([libmemcached/memcached.c])
AC_CONFIG_AUX_DIR(config)
AC_CONFIG_SRCDIR([libmemcached/memcached.c])
AC_CONFIG_AUX_DIR(config)
-PANDORA_CANONICAL_TARGET
+PANDORA_CANONICAL_TARGET(no-vc-changelog)
+AC_CHECK_PROGS([YACC], ['bison'], [:])
+AC_CHECK_PROGS([LEX], ['flex'], [:])
#shared library versioning
MEMCACHED_UTIL_LIBRARY_VERSION=1:0:0
MEMCACHED_PROTOCAL_LIBRARY_VERSION=0:0:0
#shared library versioning
MEMCACHED_UTIL_LIBRARY_VERSION=1:0:0
MEMCACHED_PROTOCAL_LIBRARY_VERSION=0:0:0
-MEMCACHED_LIBRARY_VERSION=
5:1
:0
+MEMCACHED_LIBRARY_VERSION=
6: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([
@@
-80,6
+83,18
@@
AH_BOTTOM([
#define get_socket_errno() errno
#endif
#define get_socket_errno() errno
#endif
+#ifndef HAVE_MSG_NOSIGNAL
+#define MSG_NOSIGNAL 0
+#endif
+
+#ifndef HAVE_MSG_DONTWAIT
+#define MSG_DONTWAIT 0
+#endif
+
+#ifndef HAVE_MSG_MORE
+#define MSG_MORE 0
+#endif
+
#endif
])
#endif
])
@@
-94,13
+109,13
@@
my_saved_libs="$LIBS"
LIBS=
PANDORA_REQUIRE_PTHREAD
LIBS="$my_saved_libs"
LIBS=
PANDORA_REQUIRE_PTHREAD
LIBS="$my_saved_libs"
-PANDORA_CXX_DEMANGLE
dnl Specialty checks
DETECT_BYTEORDER
ENABLE_UTILLIB
SETSOCKOPT_SANITY
ENABLE_HSIEH_HASH
dnl Specialty checks
DETECT_BYTEORDER
ENABLE_UTILLIB
SETSOCKOPT_SANITY
ENABLE_HSIEH_HASH
+ENABLE_MURMUR_HASH
PROTOCOL_BINARY_TEST
WITH_MEMCACHED
ENABLE_DEPRECATED
PROTOCOL_BINARY_TEST
WITH_MEMCACHED
ENABLE_DEPRECATED
@@
-139,8
+154,12
@@
AC_CHECK_HEADERS_ONCE(winsock2.h poll.h sys/wait.h fnmatch.h)
AM_CONDITIONAL(BUILD_POLL, test "x$ac_cv_header_poll_h" = "xno")
AM_CONDITIONAL(BUILD_WIN32_WRAPPERS, test "x$ac_cv_header_winsock2_h" = "xyes")
AS_IF(test "x$ac_cv_header_winsock2_h" = "xyes",
AM_CONDITIONAL(BUILD_POLL, test "x$ac_cv_header_poll_h" = "xno")
AM_CONDITIONAL(BUILD_WIN32_WRAPPERS, test "x$ac_cv_header_winsock2_h" = "xyes")
AS_IF(test "x$ac_cv_header_winsock2_h" = "xyes",
- AM_LDFLAGS="$AM_LDFLAGS -lws2_32")
+ [AM_LDFLAGS="$AM_LDFLAGS -lws2_32"
+ AM_CFLAGS="$AM_CFLAGS $NO_WERROR"
+ AM_CXXFLAGS="$AM_CXXFLAGS $NO_WERROR"
+ ])
DETECT_EAGAIN
DETECT_EAGAIN
+SOCKET_SEND_FLAGS
AC_CONFIG_FILES([
Makefile
AC_CONFIG_FILES([
Makefile