From 9d99c34682f3a56eecdf04ef61e55cd7e43487d7 Mon Sep 17 00:00:00 2001
From: Travis Cross <tc@traviscross.com>
Date: Thu, 22 May 2014 17:37:33 +0000
Subject: [PATCH 1/3] Break on missing ldns lib at configure time

Previously we would detect the missing LDNS system library at
configure time, but would only break during the build of mod_enum.

With this change, if mod_enum is enabled in modules.conf and the
system doesn't have a usable LDNS library we break during configure.
---
 configure.ac | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 77394f74dd..9e497c8117 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1135,6 +1135,10 @@ if test "$cross_compiling" != "yes" && test -f /usr/lib/pkg-config/libldns.pc; t
   path_push_unique PKG_CONFIG_PATH /usr/lib/pkg-config
 fi
 
+module_enabled() {
+  grep -v -e "\#" -e "^\$" modules.conf | sed -e "s|^.*/||" | grep "^${1}\$" >/dev/null
+}
+
 PKG_CHECK_MODULES([SQLITE], [sqlite3 >= 3.6.20])
 PKG_CHECK_MODULES([CURL], [libcurl >= 7.19])
 PKG_CHECK_MODULES([PCRE], [libpcre >= 7.8])
@@ -1146,7 +1150,11 @@ PKG_CHECK_MODULES([LDNS], [libldns >= 1.6.6],[
   AM_CONDITIONAL([HAVE_LDNS],[true])],[
   AC_CHECK_LIB([ldns], [ldns_str2rdf_a], [LDNS_LIBS=-lldns])
   AS_IF([test -z "$LDNS_LIBS"],[
-    AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_LDNS],[false])],[
+    if module_enabled mod_enum; then
+      AC_MSG_ERROR([You need to either install libldns-dev or disable mod_enum in modules.conf])
+    else
+      AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_LDNS],[false])
+    fi],[
     AM_CONDITIONAL([HAVE_LDNS],[true])])])
 
 PKG_CHECK_MODULES([MEMCACHED], [libmemcached >= 0.31],[

From 15766d349d4674c4718cba82c81c4ff35258fc8c Mon Sep 17 00:00:00 2001
From: Travis Cross <tc@traviscross.com>
Date: Thu, 22 May 2014 18:23:07 +0000
Subject: [PATCH 2/3] Drop mod_ldap from sid/jessie build

Ken noticed a build error.  We need to use the system ldap library
anyway, so we'll just drop mod_ldap here until we make that change.
---
 debian/bootstrap.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/debian/bootstrap.sh b/debian/bootstrap.sh
index d51f021dfa..8dacbef1d8 100755
--- a/debian/bootstrap.sh
+++ b/debian/bootstrap.sh
@@ -34,9 +34,11 @@ avoid_mods=(
   xml_int/mod_xml_radius
 )
 avoid_mods_sid=(
+  directories/mod_ldap
   languages/mod_java
 )
 avoid_mods_jessie=(
+  directories/mod_ldap
 )
 avoid_mods_wheezy=(
 )

From ab3e95569c1cbce496d281331f6eb34f6dc772a3 Mon Sep 17 00:00:00 2001
From: Travis Cross <tc@traviscross.com>
Date: Thu, 22 May 2014 18:30:39 +0000
Subject: [PATCH 3/3] Drop mod_java from jessie build

Right now mod_java fails to build on sid and jessie.  We have a
possible solution, but we'll just disable the build of the module
while we test and verify.
---
 debian/bootstrap.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/debian/bootstrap.sh b/debian/bootstrap.sh
index 8dacbef1d8..4457eb7dd9 100755
--- a/debian/bootstrap.sh
+++ b/debian/bootstrap.sh
@@ -39,6 +39,7 @@ avoid_mods_sid=(
 )
 avoid_mods_jessie=(
   directories/mod_ldap
+  languages/mod_java
 )
 avoid_mods_wheezy=(
 )