mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-01 15:05:23 +00:00
Code Issues Releases Wiki Activity

make the checkds system test dependent on the result of python discovery

Browse Source
This commit is contained in:
Mark Andrews
2012-06-28 23:08:07 +10:00
parent 979763415f
commit 66dddd906a
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bin/tests/system/conf.sh.in
View File

@@ -55,7 +55,7 @@ VERIFY=$TOP/bin/dnssec/dnssec-verify
# load on the machine to make it unusable to other users. # load on the machine to make it unusable to other users.
# v6synth # v6synth
SUBDIRS="acl allow_query addzone autosign builtin cacheclean checkconf 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 dname dns64 dnssec ecdsa forward glue gost ixfr inline limits
logfileconfig lwresd masterfile masterformat metadata notify logfileconfig lwresd masterfile masterformat metadata notify
nsupdate pending pkcs11 redirect resolver rndc rpz rrsetorder nsupdate pending pkcs11 redirect resolver rndc rpz rrsetorder

5
configure.in
View File

@@ -178,7 +178,7 @@ except: exit(1)'
case "$use_python" in case "$use_python" in
unspec) unspec)
PYTHON="" PYTHON=""
AC_SUBST(PYTHON) AC_SUBST(CHECKDS)
AC_MSG_RESULT([not found, python disabled]) AC_MSG_RESULT([not found, python disabled])
;; ;;
yes) yes)
@@ -191,9 +191,12 @@ except: exit(1)'
esac esac
PYTHON_TOOLS='' PYTHON_TOOLS=''
CHECKDS=''
if test "X$PYTHON" != "X"; then if test "X$PYTHON" != "X"; then
PYTHON_TOOLS=python PYTHON_TOOLS=python
CHECKDS=checkds
fi fi
AC_SUBST(CHECKDS)
AC_SUBST(PYTHON_TOOLS) AC_SUBST(PYTHON_TOOLS)
# #