From: Brian Aker <brian@gaz>
Date: Wed, 30 Jun 2010 19:44:33 +0000 (-0700)
Subject: Updates for RPM
X-Git-Tag: 0.41
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=1ae253f1a0e319f9da0438f0117ef9ccba321a7a;p=awesomized%2Flibmemcached

Updates for RPM
---

diff --git a/support/libmemcached.spec.in b/support/libmemcached.spec.in
index d181d966..daab44eb 100644
--- a/support/libmemcached.spec.in
+++ b/support/libmemcached.spec.in
@@ -104,14 +104,6 @@ you will need to install %{name}-devel.
 %{_includedir}/libmemcached/delete.h
 %{_includedir}/libmemcached/fetch.h
 %{_includedir}/libmemcached/flush.h
-%{_includedir}/libmemcached/flush_buffers.h
-%{_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
 %{_includedir}/libhashkit/algorithm.h
 %{_includedir}/libhashkit/behavior.h
 %{_includedir}/libhashkit/configure.h
@@ -129,21 +121,32 @@ you will need to install %{name}-devel.
 %{_includedir}/libmemcached/constants.h
 %{_includedir}/libmemcached/dump.h
 %{_includedir}/libmemcached/exception.hpp
+%{_includedir}/libmemcached/flush_buffers.h
 %{_includedir}/libmemcached/get.h
+%{_includedir}/libmemcached/hash.h
 %{_includedir}/libmemcached/memcached.h
 %{_includedir}/libmemcached/memcached.hpp
 %{_includedir}/libmemcached/memcached_util.h
+%{_includedir}/libmemcached/parse.h
 %{_includedir}/libmemcached/protocol/cache.h
 %{_includedir}/libmemcached/protocol/callback.h
 %{_includedir}/libmemcached/protocol_handler.h
+%{_includedir}/libmemcached/quit.h
 %{_includedir}/libmemcached/result.h
+%{_includedir}/libmemcached/sasl.h
 %{_includedir}/libmemcached/server.h
 %{_includedir}/libmemcached/server_list.h
 %{_includedir}/libmemcached/stats.h
 %{_includedir}/libmemcached/storage.h
+%{_includedir}/libmemcached/strerror.h
 %{_includedir}/libmemcached/string.h
 %{_includedir}/libmemcached/types.h
+%{_includedir}/libmemcached/util.h
+%{_includedir}/libmemcached/util/ping.h
 %{_includedir}/libmemcached/util/pool.h
+%{_includedir}/libmemcached/util/version.h
+%{_includedir}/libmemcached/verbosity.h
+%{_includedir}/libmemcached/version.h
 %{_includedir}/libmemcached/visibility.h
 %{_includedir}/libmemcached/watchpoint.h
 %{_includedir}/libmemcached/memcached/protocol_binary.h
@@ -187,6 +190,7 @@ you will need to install %{name}-devel.
 %{_mandir}/man3/memcached_decrement_with_initial.3.gz
 %{_mandir}/man3/memcached_delete.3.gz
 %{_mandir}/man3/memcached_delete_by_key.3.gz
+%{_mandir}/man3/memcached_destroy_sasl_auth_data.3.gz
 %{_mandir}/man3/memcached_dump.3.gz
 %{_mandir}/man3/memcached_fetch.3.gz
 %{_mandir}/man3/memcached_fetch_execute.3.gz
@@ -197,6 +201,7 @@ you will need to install %{name}-devel.
 %{_mandir}/man3/memcached_get.3.gz
 %{_mandir}/man3/memcached_get_by_key.3.gz
 %{_mandir}/man3/memcached_get_memory_allocators.3.gz
+%{_mandir}/man3/memcached_get_sasl_callbacks.3.gz
 %{_mandir}/man3/memcached_get_user_data.3.gz
 %{_mandir}/man3/memcached_increment.3.gz
 %{_mandir}/man3/memcached_increment_with_initial.3.gz
@@ -216,6 +221,7 @@ you will need to install %{name}-devel.
 %{_mandir}/man3/memcached_quit.3.gz
 %{_mandir}/man3/memcached_replace.3.gz
 %{_mandir}/man3/memcached_replace_by_key.3.gz
+%{_mandir}/man3/memcached_sasl_set_auth_data.3.gz
 %{_mandir}/man3/memcached_server_add.3.gz
 %{_mandir}/man3/memcached_server_count.3.gz
 %{_mandir}/man3/memcached_server_cursor.3.gz
@@ -228,6 +234,7 @@ you will need to install %{name}-devel.
 %{_mandir}/man3/memcached_set.3.gz
 %{_mandir}/man3/memcached_set_by_key.3.gz
 %{_mandir}/man3/memcached_set_memory_allocators.3.gz
+%{_mandir}/man3/memcached_set_sasl_callbacks.3.gz
 %{_mandir}/man3/memcached_set_user_data.3.gz
 %{_mandir}/man3/memcached_stat.3.gz
 %{_mandir}/man3/memcached_stat_get_keys.3.gz
diff --git a/tests/include.am b/tests/include.am
index 593c98fa..3d0d7760 100644
--- a/tests/include.am
+++ b/tests/include.am
@@ -87,7 +87,7 @@ tests_hashplus_LDADD = $(tests_testhashkit_DEPENDENCIES) $(LIBSASL)
 tests_memplus_SOURCES = tests/mem_plus.cc
 tests_memplus_CXXFLAGS = $(AM_CXXFLAGS) $(NO_EFF_CXX)
 tests_memplus_DEPENDENCIES = tests/libtest.la tests/libserver.la libmemcached/libmemcached.la
-tests_memplus_LDADD = $(tests_memplus_DEPENDENCIES)
+tests_memplus_LDADD = $(tests_memplus_DEPENDENCIES) $(LIBSASL)
 
 test: check
 
diff --git a/tests/test.c b/tests/test.c
index 215218c5..58355f41 100644
--- a/tests/test.c
+++ b/tests/test.c
@@ -25,6 +25,7 @@
 #include <stdint.h>
 
 #include "libmemcached/memcached.h"
+
 #include "test.h"
 
 static void world_stats_print(world_stats_st *stats)