]> git.ipfire.org Git - thirdparty/bind9.git/commitdiff
make the checkds system test dependent on the result of python discovery
authorMark Andrews <marka@isc.org>
Thu, 28 Jun 2012 13:08:07 +0000 (23:08 +1000)
committerMark Andrews <marka@isc.org>
Thu, 28 Jun 2012 13:08:07 +0000 (23:08 +1000)
bin/tests/system/conf.sh.in
configure.in

index 18ba5440de4177bad94f3b3b372f6cca3b7777fc..b9e31160a5b03bada057e3bc637a38c59979b83a 100644 (file)
@@ -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
index 7a2b0831d9a7d40a913fa8bbbadd43d831a7870a..42a6a7f6853d87e5ca71abb83a07bd7b80a0be5a 100644 (file)
@@ -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)
 
 #