BIND 10 master, updated. 250ce2abb3d6b48fce778b5e0c651d57582aff7c Merge branch 'master' of ssh://git.bind10.isc.org/var/bind10/git/bind10

[BIND 10 source code commits]

The branch, master has been updated
       via  250ce2abb3d6b48fce778b5e0c651d57582aff7c (commit)
       via  99be45a44f97942f9327b16aff368f1650994e0e (commit)
      from  7592596f7a9f8dce2e5e8d9311cc40c5199c66e3 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 250ce2abb3d6b48fce778b5e0c651d57582aff7c
Merge: 99be45a44f97942f9327b16aff368f1650994e0e 7592596f7a9f8dce2e5e8d9311cc40c5199c66e3
Author: Jelte Jansen <jelte at isc.org>
Date:   Wed Sep 28 11:44:58 2011 -0400

    Merge branch 'master' of ssh://git.bind10.isc.org/var/bind10/git/bind10

commit 99be45a44f97942f9327b16aff368f1650994e0e
Author: Jelte Jansen <jelte at isc.org>
Date:   Wed Sep 28 11:43:29 2011 -0400

    [master] make sure right libsqlite3 is used
    
    by changing the order of the imports, we make sure python doesn't use the first libsqlite3 it encounters that kind of looks right (through the soon to be obsolete sqlite3_ds.py)

-----------------------------------------------------------------------

Summary of changes:
 src/lib/datasrc/Makefile.am            |    1 +
 src/lib/python/isc/datasrc/Makefile.am |    2 +-
 src/lib/python/isc/datasrc/__init__.py |    7 +++++--
 3 files changed, 7 insertions(+), 3 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/datasrc/Makefile.am b/src/lib/datasrc/Makefile.am
index 8f8a5ce..6b71388 100644
--- a/src/lib/datasrc/Makefile.am
+++ b/src/lib/datasrc/Makefile.am
@@ -30,6 +30,7 @@ libdatasrc_la_LIBADD = $(top_builddir)/src/lib/exceptions/libexceptions.la
 libdatasrc_la_LIBADD += $(top_builddir)/src/lib/dns/libdns++.la
 libdatasrc_la_LIBADD += $(top_builddir)/src/lib/log/liblog.la
 libdatasrc_la_LIBADD += $(top_builddir)/src/lib/cc/libcc.la
+libdatasrc_la_LIBADD += $(SQLITE_LIBS)
 
 BUILT_SOURCES = datasrc_messages.h datasrc_messages.cc
 datasrc_messages.h datasrc_messages.cc: Makefile datasrc_messages.mes
diff --git a/src/lib/python/isc/datasrc/Makefile.am b/src/lib/python/isc/datasrc/Makefile.am
index e5f20c1..d8f6b08 100644
--- a/src/lib/python/isc/datasrc/Makefile.am
+++ b/src/lib/python/isc/datasrc/Makefile.am
@@ -25,7 +25,7 @@ datasrc_la_LDFLAGS += -module
 datasrc_la_LIBADD = $(top_builddir)/src/lib/datasrc/libdatasrc.la
 datasrc_la_LIBADD += $(top_builddir)/src/lib/dns/python/libpydnspp.la
 datasrc_la_LIBADD += $(PYTHON_LIB)
-datasrc_la_LIBADD += $(SQLITE_LIBS)
+#datasrc_la_LIBADD += $(SQLITE_LIBS)
 
 EXTRA_DIST = client_inc.cc
 EXTRA_DIST += finder_inc.cc
diff --git a/src/lib/python/isc/datasrc/__init__.py b/src/lib/python/isc/datasrc/__init__.py
index 05911f7..53711db 100644
--- a/src/lib/python/isc/datasrc/__init__.py
+++ b/src/lib/python/isc/datasrc/__init__.py
@@ -1,5 +1,5 @@
-from isc.datasrc.master import *
-from isc.datasrc.sqlite3_ds import *
+import sys
+import os
 
 for base in sys.path[:]:
     datasrc_libdir = os.path.join(base, 'isc/datasrc/.libs')
@@ -7,3 +7,6 @@ for base in sys.path[:]:
         sys.path.insert(0, datasrc_libdir)
 
 from datasrc import *
+from isc.datasrc.sqlite3_ds import *
+from isc.datasrc.master import *
+