[bind10-dev] reverting #2145

[JINMEI Tatuya / 神明達哉]

As we discussed we're going to revert changes made in #2145 for the
RC.  I've created trac2145-revert branch, made corresponding changes
and pushed it.

You can cherry-pick be4d9fa and then 5c11148 (the latter is optional
as it's only for additional comments).  Note that be4d9fa will cause a
conflict.  You'll need the patch pasted below to resolve it.

---
JINMEI, Tatuya

diff --cc src/bin/bindctl/run_bindctl.sh.in
index 8a5d00b,1d48e5a..0000000
--- a/src/bin/bindctl/run_bindctl.sh.in
+++ b/src/bin/bindctl/run_bindctl.sh.in
@@@ -23,7 -23,7 +23,7 @@@ BINDCTL_PATH=@abs_top_builddir@/src/bin
  # 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
 -PYTHONPATH=@abs_top_srcdir@/src/bin:@abs_top_builddir@/src/lib/python/isc/log_messages:@abs_top_builddir@/src/lib/python/isc/cc:@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
++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