Remove -lm obsolete macro.

Update helgrind rules.
Version information.

diff --git a/ChangeLog b/ChangeLog
index 513ccd5b7060d3402f0b59ec2b81ae4a1fb13e41..b7b735133553804dadacb58dc9418d68fb47f3c0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+0.53
+  * Fix for FreeBSD/OpenBSD and -lm
+  * Added memcached_exist()
+  * Fix for memory when using config test.
+  * CLI gained --quiet
+
 0.52 Sun Sep 11 22:16:08 PDT 2011
   * Build fixes for Ubuntu/Suse.
   * Fixes for OSX Lion.

diff --git a/configure.ac b/configure.ac
index fc349ae02d33c5b0d0ef20ce416fcc8dc7c31014..b00ea9e5614cbf34132d14af2f4664f38ed37eda 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -7,7 +7,7 @@
 # Use and distribution licensed under the BSD license.  See
 # the COPYING file in this directory for full text.
 
-AC_INIT([libmemcached],[0.52],[http://libmemcached.org/])
+AC_INIT([libmemcached],[0.53],[http://libmemcached.org/])
 
 AC_CONFIG_AUX_DIR(config)
 

diff --git a/libmemcached/connect.cc b/libmemcached/connect.cc
index 1c4ea913689ca54b513d7a8ded2660c9ca13100a..09cac309fcd8cf8563d17eff814d0d144bf9b4e3 100644 (file)
--- a/libmemcached/connect.cc
+++ b/libmemcached/connect.cc
@@ -212,9 +212,9 @@ static inline void set_socket_nonblocking(memcached_server_st *server)
     do
     {
       rval= fcntl(server->fd, F_SETFL, flags | O_NONBLOCK);
-    } while (rval == -1 && (errno == EINTR || errno == EAGAIN));
+    } while (rval == -1 && (errno == EINTR or errno == EAGAIN));
 
-    unlikely (rval == -1)
+    if (rval == -1)
     {
       memcached_set_errno(*server, errno, NULL);
     }

diff --git a/libtest/include.am b/libtest/include.am
index 05cc580c54626405b76e7e31713efdf0a8a25f2a..a91cc2ac028c069009ae4c346f83fa59ae7dd0da 100644 (file)
--- a/libtest/include.am
+++ b/libtest/include.am
@@ -22,7 +22,7 @@
 
 LIBTOOL_COMMAND= ${abs_top_builddir}/libtool --mode=execute
 VALGRIND_COMMAND= $(LIBTOOL_COMMAND) valgrind --error-exitcode=1 --leak-check=yes --show-reachable=yes --track-fds=yes --malloc-fill=A5 --free-fill=DE
-HELGRIND_COMMAND= $(LIBTOOL_COMMAND) valgrind --tool=helgrind --read-var-info=yes --error-exitcode=1 
+HELGRIND_COMMAND= $(LIBTOOL_COMMAND) valgrind --tool=helgrind --read-var-info=yes --error-exitcode=1 --read-var-info=yes
 DRD_COMMAND= $(LIBTOOL_COMMAND) valgrind --tool=drd
 GDB_COMMAND= $(LIBTOOL_COMMAND) gdb -f -x libtest/run.gdb
 

diff --git a/m4/pandora_canonical.m4 b/m4/pandora_canonical.m4
index f47cbb04b0cb41bad5d9d5f0eae4d8a58a450fed..8d718a86a64ffe6dc5a1a58ff2dfed892e7df4f4 100644 (file)
--- a/m4/pandora_canonical.m4
+++ b/m4/pandora_canonical.m4
@@ -214,10 +214,6 @@ AC_DEFUN([PANDORA_CANONICAL_TARGET],[
       [Define if system doesn't define])
   ])
 
-  AC_CHECK_LIBM
-  dnl Bug on FreeBSD - LIBM check doesn't set the damn variable
-  AC_SUBST([LIBM])
-  
   AC_CHECK_FUNC(setsockopt, [], [AC_CHECK_LIB(socket, setsockopt)])
   AC_CHECK_FUNC(bind, [], [AC_CHECK_LIB(bind, bind)])
 

diff --git a/m4/pandora_platform.m4 b/m4/pandora_platform.m4
index c8e31197e9c44abc9d01acf8771b16bb7badbe08..d355e1f3f1fda201f7b72be0afce53f12effdf36 100644 (file)
--- a/m4/pandora_platform.m4
+++ b/m4/pandora_platform.m4
@@ -45,6 +45,7 @@ AC_DEFUN([PANDORA_PLATFORM],[
 
   PANDORA_OPTIMIZE_BITFIELD=1
 
+  TARGET_LINUX="false"
   case "$target_os" in
     *linux*)
     TARGET_LINUX="true"

diff --git a/tests/include.am b/tests/include.am
index 9ea0994d9e28ccbe3cfa3a8e3e2088481a466ba9..8e173d88a331f2a63ade91bc8abf520f66bb15ee 100644 (file)
--- a/tests/include.am
+++ b/tests/include.am
@@ -420,23 +420,3 @@ helgrind-hash: tests/testhashkit
 
 helgrind-hashplus: tests/hash_plus
        @$(HELGRIND_COMMAND) tests/hash_plus
-
-.PHONY += helgrind
-helgrind: helgrind-cycle helgrind-mem helgrind-udp helgrind-plus helgrind-hash helgrind-hashplus
-
-.PHONY += cachegrind
-CLEANFILES += tests/cachegrind.out
-cachegrind:
-       rm -f tests/cachegrind.out.*
-       $(LIBTOOL) --mode=execute valgrind --tool=cachegrind --cachegrind-out-file=tests/cachegrind.out.%p --branch-sim=yes tests/testapp
-       cg_annotate tests/cachegrind.out.* --auto=yes > tests/cachegrind.out
-
-.PHONY += callgrind
-CLEANFILES += tests/callgrind.out
-callgrind:
-       rm -f tests/callgrind.out.*
-       $(LIBTOOL) --mode=execute valgrind --tool=callgrind --callgrind-out-file=tests/callgrind.out.%p  tests/testapp
-       callgrind_annotate tests/callgrind.out.* --auto=yes > tests/callgrind.out
-
-hudson-valgrind: tests/testapp
-       $(VALGRIND_COMMAND) --log-file=tests/valgrind.out tests/testapp