Browse Source

[2438] other distcheck fixes: need to add dns/python/.libs to some PYTHONPATHs

as commented, #2145 should eliminate the need for it, but until it's fixed
this seems to be the easiest and smallest workaround.
JINMEI Tatuya 12 years ago
parent
commit
003f49d979
2 changed files with 8 additions and 2 deletions
  1. 4 1
      configure.ac
  2. 4 1
      src/bin/dbutil/run_dbutil.sh.in

+ 4 - 1
configure.ac

@@ -282,7 +282,10 @@ AC_SUBST(PYTHON_LOGMSGPKG_DIR)
 
 
 # This is python package paths commonly used in python tests.  See
 # This is python package paths commonly used in python tests.  See
 # README of log_messages for why it's included.
 # 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)
 AC_SUBST(COMMON_PYTHON_PATH)
 
 
 # Check for python development environments
 # Check for python development environments

+ 4 - 1
src/bin/dbutil/run_dbutil.sh.in

@@ -20,7 +20,10 @@ export PYTHON_EXEC
 
 
 DBUTIL_PATH=@abs_top_builddir@/src/bin/dbutil
 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
 export PYTHONPATH
 
 
 # If necessary (rare cases), explicitly specify paths to dynamic libraries
 # If necessary (rare cases), explicitly specify paths to dynamic libraries