Merge

diff --git a/ChangeLog b/ChangeLog
index ae3601fc6b142e6f510aa735a48198ec00e3e0a7..c601718bd529399cded4f1ccf92b35e93e2017dd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
-1.0.3
-
+1.0.3 Sun Jan  8 18:11:36 PST 2012
+* Increased size of sort buffer used during Ketama.
+* Added support for new behavior to handle dead servers.
+* Overall haul of UDP IO.
 * Fixed C compile issue with memcached_exist()
+* Numerous bug fixes.
+* Clang support for OSX.
+* All commands now using vector send support.
 
 1.0.2 Mon Oct 24 08:00:48 PDT 2011
 * Dropped libmemcached/memcached_util.h (undocumented header file)

diff --git a/configure.ac b/configure.ac
index 602b4520bec8dc6bd55d44ea5f89808b9eb128ee..aa91153c1a8a8366b66e5137b29119b10b311b63 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,13 +1,13 @@
 #!/usr/bin/env bash
 # LibmemcacheD
-# Copyright (C) 2011 Data Differential, http://datadifferential.com/
+# Copyright (C) 2011-2012 Data Differential, http://datadifferential.com/
 # Copyright (C) 2006-2010 Brian Aker, Monty Taylor, Trond Norbye
 # All rights reserved.
 #
 # Use and distribution licensed under the BSD license.  See
 # the COPYING file in this directory for full text.
 
-AC_INIT([libmemcached],[1.0.2],[http://libmemcached.org/])
+AC_INIT([libmemcached],[1.0.3],[http://libmemcached.org/])
 
 AC_CONFIG_AUX_DIR(config)
 
@@ -33,7 +33,7 @@ AC_CHECK_PROGS([LEX], ['flex'], [:])
 #shared library versioning
 MEMCACHED_UTIL_LIBRARY_VERSION=2:0:0
 MEMCACHED_PROTOCAL_LIBRARY_VERSION=0:0:0
-MEMCACHED_LIBRARY_VERSION=8:0:0
+MEMCACHED_LIBRARY_VERSION=9:0:0
 #                         | | |
 #                  +------+ | +---+
 #                  |        |     |
@@ -160,6 +160,17 @@ AC_C_RESTRICT
 
 AX_CXX_GCC_ABI_DEMANGLE
 
+AC_CHECK_LIB([rt], [clock_gettime], 
+             [
+              rt_lib="-lrt"
+              AC_DEFINE([HAVE_LIBRT], [ 1 ], [Have clock_gettime])
+              ], 
+             [
+              AC_DEFINE([HAVE_LIBRT], [ 0 ], [Have clock_gettime])
+              ])
+
+AC_CHECK_LIB([m], [floor])
+
 dnl The sasl functions should only be visible if we build with sasl support
 AS_IF([test "x$ac_cv_sasl" = "xyes"],
       [

diff --git a/libhashkit/include.am b/libhashkit/include.am
index 454c4118d8dd5013a6c69cf9a93c61c550fd4497..72c8549ada4a2977cd499e1c8d49b182af7a20ee 100644 (file)
--- a/libhashkit/include.am
+++ b/libhashkit/include.am
@@ -52,9 +52,6 @@ libhashkit_libhashkit_la_CXXFLAGS= -DBUILDING_HASHKIT
 
 libhashkit_libhashkit_la_LIBADD=
 libhashkit_libhashkit_la_LDFLAGS= -version-info $(HASHKIT_LIBRARY_VERSION)
-if TARGET_LINUX
-libhashkit_libhashkit_la_LIBADD+= -lm
-endif
 
 # library used for testing
 noinst_LTLIBRARIES+= libhashkit/libhashkitinc.la

diff --git a/libmemcached/include.am b/libmemcached/include.am
index a1e47ab9fac483795afc8cd4846e2446ee2d9cdf..a10b92a5aa5363fcaeb67b252824d98c37834ba2 100644 (file)
--- a/libmemcached/include.am
+++ b/libmemcached/include.am
@@ -108,9 +108,6 @@ libmemcached/options.cc: libmemcached/csl/parser.h
 libmemcached_libmemcached_la_DEPENDENCIES=
 libmemcached_libmemcached_la_LIBADD=
 libmemcached_libmemcached_la_LDFLAGS=
-if TARGET_LINUX
-libmemcached_libmemcached_la_LIBADD+= -lm
-endif
 libmemcached_libmemcached_la_LDFLAGS+= -version-info ${MEMCACHED_LIBRARY_VERSION}
 
 libmemcached_libmemcached_la_LIBADD+= $(LTLIBSASL) $(LTLIBSASL2)