projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
configure: fix libtool
[awesomized/libmemcached]
/
libtest
/
memcached.cc
diff --git
a/libtest/memcached.cc
b/libtest/memcached.cc
index ff246b5a50f27bc1f4be63f304c9aa229a521bee..15fcbffa834722fd09b093b59bc3dd79092e811b 100644
(file)
--- a/
libtest/memcached.cc
+++ b/
libtest/memcached.cc
@@
-72,14
+72,14
@@
public:
const std::string& username_arg,
const std::string& password_arg) :
libtest::Server(host_arg, port_arg,
const std::string& username_arg,
const std::string& password_arg) :
libtest::Server(host_arg, port_arg,
-
MEMCACHED_BINARY
, false, is_socket_arg),
+
memcached_binary()
, false, is_socket_arg),
_username(username_arg),
_password(password_arg)
{ }
Memcached(const std::string& host_arg, const in_port_t port_arg, const bool is_socket_arg) :
libtest::Server(host_arg, port_arg,
_username(username_arg),
_password(password_arg)
{ }
Memcached(const std::string& host_arg, const in_port_t port_arg, const bool is_socket_arg) :
libtest::Server(host_arg, port_arg,
-
MEMCACHED_BINARY
, false, is_socket_arg)
+
memcached_binary()
, false, is_socket_arg)
{
set_pid_file();
}
{
set_pid_file();
}
@@
-131,7
+131,7
@@
public:
const char *executable()
{
const char *executable()
{
- return
MEMCACHED_BINARY
;
+ return
memcached_binary()
;
}
bool is_libtool()
}
bool is_libtool()
@@
-188,13
+188,13
@@
public:
return true;
}
return true;
}
- bool build(
size_t argc, const char *argv[]
);
+ bool build();
};
#include <sstream>
};
#include <sstream>
-bool Memcached::build(
size_t argc, const char *argv[]
)
+bool Memcached::build()
{
if (getuid() == 0 or geteuid() == 0)
{
{
if (getuid() == 0 or geteuid() == 0)
{
@@
-202,7
+202,8
@@
bool Memcached::build(size_t argc, const char *argv[])
}
add_option("-l", "localhost");
}
add_option("-l", "localhost");
-#ifndef TARGET_OS_OSX
+#ifdef __APPLE__
+#else
add_option("-m", "128");
add_option("-M");
#endif
add_option("-m", "128");
add_option("-M");
#endif
@@
-212,17
+213,12
@@
bool Memcached::build(size_t argc, const char *argv[])
add_option(sasl());
}
add_option(sasl());
}
- for (size_t x= 0 ; x < argc ; x++)
- {
- add_option(argv[x]);
- }
-
return true;
}
libtest::Server *build_memcached(const std::string& hostname, const in_port_t try_port)
{
return true;
}
libtest::Server *build_memcached(const std::string& hostname, const in_port_t try_port)
{
- if (
HAVE_MEMCACHED_BINARY
)
+ if (
has_memcached()
)
{
return new Memcached(hostname, try_port, false);
}
{
return new Memcached(hostname, try_port, false);
}
@@
-232,7
+228,7
@@
libtest::Server *build_memcached(const std::string& hostname, const in_port_t tr
libtest::Server *build_memcached_socket(const std::string& socket_file, const in_port_t try_port)
{
libtest::Server *build_memcached_socket(const std::string& socket_file, const in_port_t try_port)
{
- if (
HAVE_MEMCACHED_BINARY
)
+ if (
has_memcached()
)
{
return new Memcached(socket_file, try_port, true);
}
{
return new Memcached(socket_file, try_port, true);
}