diff --git a/configure.ac b/configure.ac index 892bc6cb2e..e0eee915a7 100644 --- a/configure.ac +++ b/configure.ac @@ -282,7 +282,10 @@ AC_SUBST(PYTHON_LOGMSGPKG_DIR) # This is python package paths commonly used in python tests. See # README of log_messages for why it's included. -COMMON_PYTHON_PATH="\$(abs_top_builddir)/src/lib/python/isc/log_messages:\$(abs_top_srcdir)/src/lib/python:\$(abs_top_builddir)/src/lib/python" +# lib/dns/python/.libs is necessary because __init__.py of isc package +# automatically imports isc.datasrc, which then requires the DNS loadable +# module. #2145 should eliminate the need for it. +COMMON_PYTHON_PATH="\$(abs_top_builddir)/src/lib/python/isc/log_messages:\$(abs_top_srcdir)/src/lib/python:\$(abs_top_builddir)/src/lib/python:\$(abs_top_builddir)/src/lib/dns/python/.libs" AC_SUBST(COMMON_PYTHON_PATH) # Check for python development environments diff --git a/src/bin/dbutil/run_dbutil.sh.in b/src/bin/dbutil/run_dbutil.sh.in index fea7482cbb..f0c6dbd040 100755 --- a/src/bin/dbutil/run_dbutil.sh.in +++ b/src/bin/dbutil/run_dbutil.sh.in @@ -20,7 +20,10 @@ export PYTHON_EXEC DBUTIL_PATH=@abs_top_builddir@/src/bin/dbutil -PYTHONPATH=@abs_top_srcdir@/src/bin:@abs_top_builddir@/src/lib/python/isc/log_messages:@abs_top_builddir@/src/lib/python:@abs_top_builddir@/src/bin:@abs_top_srcdir@/src/lib/python +# Note: lib/dns/python/.libs is necessary because __init__.py of isc package +# automatically imports isc.datasrc, which then requires the DNS loadable +# module. #2145 should eliminate the need for it. +PYTHONPATH=@abs_top_srcdir@/src/bin:@abs_top_builddir@/src/lib/python/isc/log_messages:@abs_top_builddir@/src/lib/python:@abs_top_builddir@/src/bin:@abs_top_srcdir@/src/lib/python:@abs_top_builddir@/src/lib/dns/python/.libs export PYTHONPATH # If necessary (rare cases), explicitly specify paths to dynamic libraries