Commit 99be45a4 authored by Jelte Jansen's avatar Jelte Jansen

[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)
parent c24c42a5
......@@ -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
......
......@@ -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
......
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 *
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment