From b63843d9ca04acb0a3eb30c97f7325214bae61eb Mon Sep 17 00:00:00 2001 From: Ruben Kerkhof Date: Tue, 13 Jan 2015 21:06:05 +0100 Subject: [PATCH] Only build zone2ldap when we build ldapbackend --- configure.ac | 3 +++ pdns/Makefile.am | 6 +++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 98017fd06..6604febd7 100644 --- 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 9dfe05428..66351b36e 100644 --- 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 \ -- 2.40.0