projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Updates from ddm4
[awesomized/libmemcached]
/
libtest
/
has.cc
diff --git
a/libtest/has.cc
b/libtest/has.cc
index 10e61cb60d1137d53445dc1eb19e6e0059392570..accadf9839bbf9a1973196d91d001dd1a79aff13 100644
(file)
--- a/
libtest/has.cc
+++ b/
libtest/has.cc
@@
-64,8
+64,10
@@
bool has_libdrizzle(void)
bool has_postgres_support(void)
{
bool has_postgres_support(void)
{
- if (getenv("POSTGES_IS_RUNNING_AND_SETUP"))
+ char *getenv_ptr;
+ if (bool((getenv_ptr= getenv("POSTGES_IS_RUNNING_AND_SETUP"))))
{
{
+ (void)(getenv_ptr);
if (HAVE_LIBPQ)
{
return true;
if (HAVE_LIBPQ)
{
return true;
@@
-80,11
+82,14
@@
bool has_gearmand()
{
if (HAVE_GEARMAND_BINARY)
{
{
if (HAVE_GEARMAND_BINARY)
{
+#if defined(HAVE_GEARMAND_BINARY) && HAVE_GEARMAND_BINARY
std::stringstream arg_buffer;
std::stringstream arg_buffer;
- if (getenv("PWD") and strcmp(MEMCACHED_BINARY, "gearmand/gearmand") == 0)
+ char *getenv_ptr;
+ if (bool((getenv_ptr= getenv("PWD"))) and
+ ((strcmp(GEARMAND_BINARY, "./gearmand/gearmand") == 0) or (strcmp(GEARMAND_BINARY, "gearmand/gearmand") == 0)))
{
{
- arg_buffer << getenv
("PWD")
;
+ arg_buffer << getenv
_ptr
;
arg_buffer << "/";
}
arg_buffer << GEARMAND_BINARY;
arg_buffer << "/";
}
arg_buffer << GEARMAND_BINARY;
@@
-93,6
+98,7
@@
bool has_gearmand()
{
return true;
}
{
return true;
}
+#endif
}
return false;
}
return false;
@@
-100,6
+106,7
@@
bool has_gearmand()
bool has_drizzled()
{
bool has_drizzled()
{
+#if defined(HAVE_DRIZZLED_BINARY) && HAVE_DRIZZLED_BINARY
if (HAVE_DRIZZLED_BINARY)
{
if (access(DRIZZLED_BINARY, X_OK) == 0)
if (HAVE_DRIZZLED_BINARY)
{
if (access(DRIZZLED_BINARY, X_OK) == 0)
@@
-107,6
+114,22
@@
bool has_drizzled()
return true;
}
}
return true;
}
}
+#endif
+
+ return false;
+}
+
+bool has_mysqld()
+{
+#if defined(HAVE_MYSQLD_BUILD) && HAVE_MYSQLD_BUILD
+ if (HAVE_MYSQLD_BUILD)
+ {
+ if (access(MYSQLD_BINARY, X_OK) == 0)
+ {
+ return true;
+ }
+ }
+#endif
return false;
}
return false;
}
@@
-117,9
+140,11
@@
bool has_memcached()
{
std::stringstream arg_buffer;
{
std::stringstream arg_buffer;
- if (getenv("PWD") and strcmp(MEMCACHED_BINARY, "memcached/memcached") == 0)
+
+ char *getenv_ptr;
+ if (bool((getenv_ptr= getenv("PWD"))) and strcmp(MEMCACHED_BINARY, "memcached/memcached") == 0)
{
{
- arg_buffer << getenv
("PWD")
;
+ arg_buffer << getenv
_ptr
;
arg_buffer << "/";
}
arg_buffer << MEMCACHED_BINARY;
arg_buffer << "/";
}
arg_buffer << MEMCACHED_BINARY;
@@
-135,6
+160,7
@@
bool has_memcached()
bool has_memcached_sasl()
{
bool has_memcached_sasl()
{
+#if defined(HAVE_MEMCACHED_SASL_BINARY) && HAVE_MEMCACHED_SASL_BINARY
if (HAVE_MEMCACHED_SASL_BINARY)
{
if (access(MEMCACHED_SASL_BINARY, X_OK) == 0)
if (HAVE_MEMCACHED_SASL_BINARY)
{
if (access(MEMCACHED_SASL_BINARY, X_OK) == 0)
@@
-142,6
+168,7
@@
bool has_memcached_sasl()
return true;
}
}
return true;
}
}
+#endif
return false;
}
return false;
}