Cleanup around linking.

[m6w6/libmemcached] / libtest / memcached.cc

diff --git a/libtest/memcached.cc b/libtest/memcached.cc
index b59dc22fa03c7efed4658828aad5a1dc410b5b96..c54c6b9048b68fd7344626b38da16e5f777ee09e 100644 (file)
--- a/libtest/memcached.cc
+++ b/libtest/memcached.cc
@@ -38,9 +38,6 @@
 
 #include <libtest/common.h>
 
-#include <libmemcached-1.0/memcached.h>
-#include <libmemcachedutil-1.0/util.h>
-
 #include <cassert>
 #include <cerrno>
 #include <cstdio>
@@ -89,7 +86,7 @@ public:
 
   virtual const char *sasl() const
   {
-    return NULL;
+    return "-S";
   }
 
   const std::string& password() const
@@ -210,7 +207,7 @@ bool Memcached::build(size_t argc, const char *argv[])
   add_option("-M");
 #endif
 
-  if (sasl())
+  if (_username.size())
   {
     add_option(sasl());
   }