Only build zone2ldap when we build ldapbackend

diff --git a/configure.ac b/configure.ac
index 98017fd06230962fd4efefd31570f4da9611ecfc..6604febd71e965b19bdc37f75b22d2645d9b1efb 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -249,6 +249,7 @@ for a in $modules $dynmodules; do
       ;;
     ldap)
       PDNS_CHECK_LDAP
+      needldap=yes
       ;;
     opendbx)
       PDNS_CHECK_OPENDBX
@@ -272,6 +273,8 @@ done
 
 AM_CONDITIONAL([ORACLE],[test "x$needoracle" = "xyes"])
 
+AM_CONDITIONAL([LDAP],[test "x$needldap" = "xyes"])
+
 AM_CONDITIONAL([LMDB],[test "x$needlmdb" = "xyes"])
 
 PDNS_CHECK_SQLITE3

diff --git a/pdns/Makefile.am b/pdns/Makefile.am
index 9dfe05428418c045df36ed0208795cde411b825b..66351b36ebd9ca81e8e20c94d292c5a23d35872f 100644 (file)
--- a/pdns/Makefile.am
+++ b/pdns/Makefile.am
@@ -58,7 +58,6 @@ bin_PROGRAMS = \
        pdns_control \
        pdnssec \
        zone2sql \
-       zone2ldap \
        zone2json
 
 if TOOLS
@@ -98,6 +97,7 @@ EXTRA_PROGRAMS = \
        testrunner \
        toysdig \
        tsig-tests \
+       zone2ldap \
        zone2lmdb
 
 pdns_server_SOURCES = \
@@ -374,6 +374,10 @@ zone2json_LDADD = $(POLARSSL_LIBS)
 # iputils_la_SOURCES = lua-iputils.cc 
 # iputils_la_LDFLAGS= -module -avoid-version
 
+if LDAP
+bin_PROGRAMS += zone2ldap
+endif
+
 zone2ldap_SOURCES = \
        arguments.cc \
        base32.cc \