projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge lp:~tangent-org/libmemcached/1.0-build Build: jenkins-Libmemcached-1.0-95
[awesomized/libmemcached]
/
libtest
/
has.cc
diff --git
a/libtest/has.cc
b/libtest/has.cc
index accadf9839bbf9a1973196d91d001dd1a79aff13..1e020a20047da1301c492dcb923ec95e302975c1 100644
(file)
--- a/
libtest/has.cc
+++ b/
libtest/has.cc
@@
-34,7
+34,7
@@
*
*/
*
*/
-#include
<config.h>
+#include
"mem_config.h"
#include <libtest/common.h>
#include <cstdlib>
#include <libtest/common.h>
#include <cstdlib>
@@
-44,20
+44,24
@@
namespace libtest {
bool has_libmemcached(void)
{
bool has_libmemcached(void)
{
+#if defined(HAVE_LIBMEMCACHED) && HAVE_LIBMEMCACHED
if (HAVE_LIBMEMCACHED)
{
return true;
}
if (HAVE_LIBMEMCACHED)
{
return true;
}
+#endif
return false;
}
bool has_libdrizzle(void)
{
return false;
}
bool has_libdrizzle(void)
{
+#if defined(HAVE_LIBDRIZZLE) && HAVE_LIBDRIZZLE
if (HAVE_LIBDRIZZLE)
{
return true;
}
if (HAVE_LIBDRIZZLE)
{
return true;
}
+#endif
return false;
}
return false;
}
@@
-80,9
+84,9
@@
bool has_postgres_support(void)
bool has_gearmand()
{
bool has_gearmand()
{
+#if defined(HAVE_GEARMAND_BINARY) && HAVE_GEARMAND_BINARY
if (HAVE_GEARMAND_BINARY)
{
if (HAVE_GEARMAND_BINARY)
{
-#if defined(HAVE_GEARMAND_BINARY) && HAVE_GEARMAND_BINARY
std::stringstream arg_buffer;
char *getenv_ptr;
std::stringstream arg_buffer;
char *getenv_ptr;
@@
-98,8
+102,8
@@
bool has_gearmand()
{
return true;
}
{
return true;
}
-#endif
}
}
+#endif
return false;
}
return false;
}
@@
-136,6
+140,7
@@
bool has_mysqld()
bool has_memcached()
{
bool has_memcached()
{
+#if defined(HAVE_MEMCACHED_BINARY) && HAVE_MEMCACHED_BINARY
if (HAVE_MEMCACHED_BINARY)
{
std::stringstream arg_buffer;
if (HAVE_MEMCACHED_BINARY)
{
std::stringstream arg_buffer;
@@
-154,6
+159,7
@@
bool has_memcached()
return true;
}
}
return true;
}
}
+#endif
return false;
}
return false;
}