From 66dddd906ada6035d65bbbad2ecbcd74037759a8 Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Thu, 28 Jun 2012 23:08:07 +1000 Subject: [PATCH] make the checkds system test dependent on the result of python discovery --- bin/tests/system/conf.sh.in | 2 +- configure.in | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/bin/tests/system/conf.sh.in b/bin/tests/system/conf.sh.in index 18ba5440de..b9e31160a5 100644 --- a/bin/tests/system/conf.sh.in +++ b/bin/tests/system/conf.sh.in @@ -55,7 +55,7 @@ VERIFY=$TOP/bin/dnssec/dnssec-verify # load on the machine to make it unusable to other users. # v6synth SUBDIRS="acl allow_query addzone autosign builtin cacheclean checkconf - checkds checknames checkzone database dlv dlvauto dlz dlzexternal + @CHECKDS@ checknames checkzone database dlv dlvauto dlz dlzexternal dname dns64 dnssec ecdsa forward glue gost ixfr inline limits logfileconfig lwresd masterfile masterformat metadata notify nsupdate pending pkcs11 redirect resolver rndc rpz rrsetorder diff --git a/configure.in b/configure.in index 7a2b0831d9..42a6a7f685 100644 --- a/configure.in +++ b/configure.in @@ -178,7 +178,7 @@ except: exit(1)' case "$use_python" in unspec) PYTHON="" - AC_SUBST(PYTHON) + AC_SUBST(CHECKDS) AC_MSG_RESULT([not found, python disabled]) ;; yes) @@ -191,9 +191,12 @@ except: exit(1)' esac PYTHON_TOOLS='' +CHECKDS='' if test "X$PYTHON" != "X"; then PYTHON_TOOLS=python + CHECKDS=checkds fi +AC_SUBST(CHECKDS) AC_SUBST(PYTHON_TOOLS) #