From f3e57017272f082ff5319877af22fbe3a3d78511 Mon Sep 17 00:00:00 2001
From: Brian Aker <brian@gaz>
Date: Mon, 5 Apr 2010 09:41:24 -0700
Subject: [PATCH] Fix for rpm buidling/make --with-debug

---
 ChangeLog                       | 1 +
 Makefile.am                     | 4 ++++
 configure.ac                    | 4 ++--
 docs/memcached_sasl.pod         | 2 +-
 libmemcached/do.c               | 4 ++--
 m4/pandora_sasl.m4              | 2 +-
 support/libmemcached-fc.spec.in | 2 +-
 support/libmemcached.spec.in    | 1 +
 8 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index cea940aa..354ebe01 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,7 @@
   * memcached_server_error_reset() has been deprecated.
   * memcached_server_list() has been deprecated. Use memcached_server_cursor() to walk the servers found in a memcached_st() structure.
   * memcached_verbosity() can now be run concurrently with other operations.
+  * SASL support.
 
 0.38 Wed Feb 10 09:40:33 PST 2010
   * C++ interface for libhashkit.
diff --git a/Makefile.am b/Makefile.am
index 99687ed6..7bbac703 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -49,8 +49,12 @@ generic:
 rpm: all dist generic fedora
 
 merge-clean:
+	find ./ | $(GREP) \.gcda | xargs rm -f
+	find ./ | $(GREP) \.gcno | xargs rm -f
+	find ./ | $(GREP) \.gz | xargs rm -f
 	find ./ | $(GREP) \.orig | xargs rm -f
 	find ./ | $(GREP) \.rej | xargs rm -f
+	find ./ | $(GREP) \.rpm | xargs rm -f
 	find ./ | $(GREP) \~$$ | xargs rm -f
 	bzr unknowns
 
diff --git a/configure.ac b/configure.ac
index 1da5f93f..b6d8b2f3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,7 +7,7 @@
 # the COPYING file in this directory for full text.
 
 AC_PREREQ(2.59)
-AC_INIT([libmemcached],[0.38],[http://tangent.org/552/libmemcached.html])
+AC_INIT([libmemcached],[0.39],[http://libmemcached.org/])
 AC_CONFIG_SRCDIR([libmemcached/memcached.c])
 AC_CONFIG_AUX_DIR(config)
 AM_CONFIG_HEADER([config.h])
@@ -16,7 +16,7 @@ AC_CONFIG_MACRO_DIR([m4])
 PANDORA_CANONICAL_TARGET
 
 #shared library versioning
-MEMCACHED_LIBRARY_VERSION=3:0:0
+MEMCACHED_LIBRARY_VERSION=4:0:0
 #                         | | |
 #                  +------+ | +---+
 #                  |        |     |
diff --git a/docs/memcached_sasl.pod b/docs/memcached_sasl.pod
index 0d182c96..541cd487 100644
--- a/docs/memcached_sasl.pod
+++ b/docs/memcached_sasl.pod
@@ -51,7 +51,7 @@ memcached_get_sasl_set_auth_data() returns MEMCACHED_SUCCESS upon success.
 =head1 HOME
 
 To find out more information please check:
-L<http://tangent.org/552/libmemcached.html>
+L<http://libmemcached.org/>
 
 =head1 AUTHOR
 
diff --git a/libmemcached/do.c b/libmemcached/do.c
index dcc09afb..794303a8 100644
--- a/libmemcached/do.c
+++ b/libmemcached/do.c
@@ -57,8 +57,8 @@ memcached_return_t memcached_vdo(memcached_server_write_instance_st ptr,
   memcached_return_t rc;
   ssize_t sent_length;
 
-  WATCHPOINT_ASSERT(command_length);
-  WATCHPOINT_ASSERT(command);
+  WATCHPOINT_ASSERT(count);
+  WATCHPOINT_ASSERT(vector);
 
   if ((rc= memcached_connect(ptr)) != MEMCACHED_SUCCESS)
   {
diff --git a/m4/pandora_sasl.m4 b/m4/pandora_sasl.m4
index 75513d12..70750abf 100644
--- a/m4/pandora_sasl.m4
+++ b/m4/pandora_sasl.m4
@@ -13,7 +13,7 @@ AC_DEFUN([_PANDORA_SEARCH_SASL],[
     [AS_HELP_STRING([--disable-sasl],
       [Build with sasl support @<:@default=on@:>@])],
     [ac_enable_sasl="$enableval"],
-    [ac_enable_sasl="yes"])
+    [ac_enable_sasl="no"])
 
   AS_IF([test "x$ac_enable_sasl" = "xyes"],
     [
diff --git a/support/libmemcached-fc.spec.in b/support/libmemcached-fc.spec.in
index 2ad61dee..05f369a8 100644
--- a/support/libmemcached-fc.spec.in
+++ b/support/libmemcached-fc.spec.in
@@ -4,7 +4,7 @@ Version: @VERSION@
 Release:   1%{?dist}
 License:   BSD
 Group:     System Environment/Libraries
-URL:       http://tangent.org/552/libmemcached.html
+URL:       http://libmemcached.org/
 Source0:   http://download.tangent.org/libmemcached-%{version}.tar.gz
 
 # For test suite
diff --git a/support/libmemcached.spec.in b/support/libmemcached.spec.in
index 1bfc01ad..d181d966 100644
--- a/support/libmemcached.spec.in
+++ b/support/libmemcached.spec.in
@@ -108,6 +108,7 @@ you will need to install %{name}-devel.
 %{_includedir}/libmemcached/hash.h
 %{_includedir}/libmemcached/parse.h
 %{_includedir}/libmemcached/quit.h
+%{_includedir}/libmemcached/sasl.h
 %{_includedir}/libmemcached/strerror.h
 %{_includedir}/libmemcached/verbosity.h
 %{_includedir}/libmemcached/version.h
-- 
2.30.2