Fail in a more sensible way when APR-util is missing its LDAP support

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95165 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/modules/experimental/mod_auth_ldap.c b/modules/experimental/mod_auth_ldap.c
index 54bc07ac80b0d0dd260e3f0058a0c5db4b70fca8..f3fb12ad3c6f008075dd40b3c2edb381e4699927 100644 (file)
--- a/modules/experimental/mod_auth_ldap.c
+++ b/modules/experimental/mod_auth_ldap.c
@@ -78,6 +78,10 @@
 #include "http_request.h"
 #include "util_ldap.h"
 
+#ifndef APU_HAS_LDAP
+#error mod_auth_ldap requires APR-util to have LDAP support built in
+#endif
+
 /* per directory configuration */
 typedef struct {
     apr_pool_t *pool;                  /* Pool that this config is allocated from */

diff --git a/modules/experimental/util_ldap.c b/modules/experimental/util_ldap.c
index 5ff3dd1eae8c56b319da670290d8853beb90c143..c9de56c6be9ab844ee7f6a84a4e220199033dee5 100644 (file)
--- a/modules/experimental/util_ldap.c
+++ b/modules/experimental/util_ldap.c
@@ -61,9 +61,6 @@
  */
 
 #include <apr_ldap.h>
-
-#ifdef APU_HAS_LDAP
-
 #include <apr_strings.h>
 
 #include "ap_config.h"
@@ -80,6 +77,10 @@
 #include <unistd.h>
 #endif
 
+#ifndef APU_HAS_LDAP
+#error mod_ldap requires APR-util to have LDAP support built in
+#endif
+
 module AP_MODULE_DECLARE_DATA ldap_module;
 
 int util_ldap_handler(request_rec *r);
@@ -906,8 +907,6 @@ start_over:
     return LDAP_SUCCESS;
 }
 
-#endif /* APU_HAS_LDAP */
-
 
 
 /* ---------------------------------------- */