summaryrefslogtreecommitdiff
path: root/src/configfile.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/configfile.c')
-rw-r--r--src/configfile.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/configfile.c b/src/configfile.c
index 5333e0a3..c658d5b8 100644
--- a/src/configfile.c
+++ b/src/configfile.c
@@ -24,7 +24,7 @@
#include <glob.h>
-#if defined(HAVE_MYSQL) || (defined(HAVE_LDAP_H) && defined(HAVE_LBER_H) && defined(HAVE_LIBLDAP) && defined(HAVE_LIBLBER))
+#if defined(WITH_MYSQL) || defined(WITH_LDAP)
static void config_warn_authn_module (server *srv, const char *module) {
size_t len = strlen(module);
for (size_t i = 0; i < srv->config_context->used; ++i) {
@@ -45,7 +45,7 @@ static void config_warn_authn_module (server *srv, const char *module) {
}
#endif
-#if defined HAVE_LIBSSL && defined HAVE_OPENSSL_SSL_H
+#if defined(WITH_OPENSSL)
static void config_warn_openssl_module (server *srv) {
for (size_t i = 0; i < srv->config_context->used; ++i) {
const data_config *config = (data_config const*)srv->config_context->data[i];
@@ -347,7 +347,7 @@ static int config_insert(server *srv) {
"unexpected value for mimetype.assign; expected list of \"ext\" => \"mimetype\"");
}
-#if !(defined HAVE_LIBSSL && defined HAVE_OPENSSL_SSL_H)
+#if defined(WITH_OPENSSL)
if (s->ssl_enabled) {
log_error_write(srv, __FILE__, __LINE__, "s",
"ssl support is missing, recompile with --with-openssl");
@@ -370,7 +370,7 @@ static int config_insert(server *srv) {
srv->srvconf.stat_cache_engine = STAT_CACHE_ENGINE_SIMPLE;
} else if (buffer_is_equal_string(stat_cache_string, CONST_STR_LEN("simple"))) {
srv->srvconf.stat_cache_engine = STAT_CACHE_ENGINE_SIMPLE;
-#ifdef HAVE_FAM_H
+#if defined(WITH_FAM)
} else if (buffer_is_equal_string(stat_cache_string, CONST_STR_LEN("fam"))) {
srv->srvconf.stat_cache_engine = STAT_CACHE_ENGINE_FAM;
#endif
@@ -379,7 +379,7 @@ static int config_insert(server *srv) {
} else {
log_error_write(srv, __FILE__, __LINE__, "sb",
"server.stat-cache-engine can be one of \"disable\", \"simple\","
-#ifdef HAVE_FAM_H
+#if defined(WITH_FAM)
" \"fam\","
#endif
" but not:", stat_cache_string);
@@ -488,7 +488,7 @@ static int config_insert(server *srv) {
}
if (append_mod_openssl) {
- #if defined HAVE_LIBSSL && defined HAVE_OPENSSL_SSL_H
+ #if defined(WITH_OPENSSL)
config_warn_openssl_module(srv);
#endif
}
@@ -503,12 +503,12 @@ static int config_insert(server *srv) {
array_insert_unique(srv->srvconf.modules, (data_unset *)ds);
}
if (append_mod_authn_ldap) {
- #if defined(HAVE_LDAP_H) && defined(HAVE_LBER_H) && defined(HAVE_LIBLDAP) && defined(HAVE_LIBLBER)
+ #if defined(WITH_LDAP)
config_warn_authn_module(srv, "ldap");
#endif
}
if (append_mod_authn_mysql) {
- #if defined(HAVE_MYSQL)
+ #if defined(WITH_MYSQL)
config_warn_authn_module(srv, "mysql");
#endif
}
@@ -1400,7 +1400,7 @@ int config_set_defaults(server *srv) {
#ifdef USE_SELECT
{ FDEVENT_HANDLER_SELECT, "select" },
#endif
-#ifdef USE_LIBEV
+#if defined(WITH_LIBEV)
{ FDEVENT_HANDLER_LIBEV, "libev" },
#endif
#ifdef USE_SOLARIS_DEVPOLL