X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Fserver_container.cc;h=05997238bb2379624f048217d9d4b488639f22f1;hb=99332db60646cb1b06a61d1636eddbbf0b5d0b40;hp=f87a9fba126cde97070b3b1525bb19a007c63d52;hpb=a0a194ba0789e0650329d81a5ed12620360789eb;p=awesomized%2Flibmemcached

diff --git a/libtest/server_container.cc b/libtest/server_container.cc
index f87a9fba..05997238 100644
--- a/libtest/server_container.cc
+++ b/libtest/server_container.cc
@@ -34,7 +34,7 @@
  *
  */
 
-#include <config.h>
+#include "mem_config.h"
 #include <libtest/common.h>
 
 #include <cassert>
@@ -241,7 +241,7 @@ bool server_startup_st::start_server(const std::string& server_type, in_port_t t
     }
     else if (server_type.compare("memcached-sasl") == 0)
     {
-      if (MEMCACHED_SASL_BINARY)
+      if (MEMCACHED_BINARY)
       {
         if (HAVE_LIBMEMCACHED)
         {
@@ -259,16 +259,6 @@ bool server_startup_st::start_server(const std::string& server_type, in_port_t t
         }
       }
     }
-    else if (server_type.compare("memcached-light") == 0)
-    {
-      if (MEMCACHED_LIGHT_BINARY)
-      {
-        if (HAVE_LIBMEMCACHED)
-        {
-          server= build_memcached_light("localhost", try_port);
-        }
-      }
-    }
 
     if (server == NULL)
     {
@@ -353,24 +343,6 @@ bool server_startup_st::start_socket_server(const std::string& server_type, cons
     {
       Error << "Socket files are not supported for gearmand yet";
     }
-    else if (server_type.compare("memcached-sasl") == 0)
-    {
-      if (MEMCACHED_SASL_BINARY)
-      {
-        if (HAVE_LIBMEMCACHED)
-        {
-          server= build_memcached_sasl_socket("localhost", try_port, username(), password());
-        }
-        else
-        {
-          Error << "Libmemcached was not found";
-        }
-      }
-      else
-      {
-        Error << "No memcached binary is available";
-      }
-    }
     else if (server_type.compare("memcached") == 0)
     {
       if (MEMCACHED_BINARY)