Blob Blame History Raw
diff -up sleuthkit-4.2.0/framework/tsk/framework/services/TskImgDBSqlite.h.system-sqlite sleuthkit-4.2.0/framework/tsk/framework/services/TskImgDBSqlite.h
--- sleuthkit-4.2.0/framework/tsk/framework/services/TskImgDBSqlite.h.system-sqlite	2015-09-16 19:07:12.000000000 +0200
+++ sleuthkit-4.2.0/framework/tsk/framework/services/TskImgDBSqlite.h	2015-09-16 19:07:12.000000000 +0200
@@ -27,7 +27,7 @@ using namespace std;
 #include "TskBlackboardAttribute.h"
 
 #include "tsk/libtsk.h"
-#include "tsk/auto/sqlite3.h"
+#include <sqlite3.h>
 
 /** 
  * Implementation of TskImgDB that uses SQLite to store the data.
diff -up sleuthkit-4.2.0/Makefile.am.system-sqlite sleuthkit-4.2.0/Makefile.am
--- sleuthkit-4.2.0/Makefile.am.system-sqlite	2015-09-16 19:07:11.000000000 +0200
+++ sleuthkit-4.2.0/Makefile.am	2015-09-16 19:07:11.000000000 +0200
@@ -79,7 +79,7 @@ nobase_include_HEADERS = tsk/libtsk.h ts
     tsk/fs/tsk_fs.h tsk/fs/tsk_ffs.h tsk/fs/tsk_ext2fs.h tsk/fs/tsk_fatfs.h \
     tsk/fs/tsk_ntfs.h tsk/fs/tsk_iso9660.h tsk/fs/tsk_hfs.h tsk/fs/tsk_yaffs.h \
     tsk/fs/tsk_exfatfs.h tsk/fs/tsk_fatxxfs.h \
-    tsk/hashdb/tsk_hashdb.h tsk/auto/tsk_auto.h tsk/auto/sqlite3.h
+    tsk/hashdb/tsk_hashdb.h tsk/auto/tsk_auto.h
 
 nobase_dist_data_DATA = tsk/sorter/default.sort tsk/sorter/freebsd.sort \
     tsk/sorter/images.sort tsk/sorter/linux.sort tsk/sorter/openbsd.sort \
diff -up sleuthkit-4.2.0/Makefile.in.system-sqlite sleuthkit-4.2.0/Makefile.in
--- sleuthkit-4.2.0/Makefile.in.system-sqlite	2015-09-16 19:54:06.000000000 +0200
+++ sleuthkit-4.2.0/Makefile.in	2015-09-16 19:54:06.000000000 +0200
@@ -457,7 +457,7 @@ nobase_include_HEADERS = tsk/libtsk.h ts
     tsk/fs/tsk_fs.h tsk/fs/tsk_ffs.h tsk/fs/tsk_ext2fs.h tsk/fs/tsk_fatfs.h \
     tsk/fs/tsk_ntfs.h tsk/fs/tsk_iso9660.h tsk/fs/tsk_hfs.h tsk/fs/tsk_yaffs.h \
     tsk/fs/tsk_exfatfs.h tsk/fs/tsk_fatxxfs.h \
-    tsk/hashdb/tsk_hashdb.h tsk/auto/tsk_auto.h tsk/auto/sqlite3.h
+    tsk/hashdb/tsk_hashdb.h tsk/auto/tsk_auto.h
 
 nobase_dist_data_DATA = tsk/sorter/default.sort tsk/sorter/freebsd.sort \
     tsk/sorter/images.sort tsk/sorter/linux.sort tsk/sorter/openbsd.sort \
diff -up sleuthkit-4.2.0/tsk/auto/Makefile.am.system-sqlite sleuthkit-4.2.0/tsk/auto/Makefile.am
--- sleuthkit-4.2.0/tsk/auto/Makefile.am.system-sqlite	2015-09-16 19:07:12.000000000 +0200
+++ sleuthkit-4.2.0/tsk/auto/Makefile.am	2015-09-16 19:07:12.000000000 +0200
@@ -3,7 +3,8 @@ EXTRA_DIST = .indent.pro
 
 noinst_LTLIBRARIES = libtskauto.la
 # Note that the .h files are in the top-level Makefile
-libtskauto_la_SOURCES = auto.cpp tsk_auto_i.h auto_db.cpp sqlite3.c sqlite3.h db_sqlite.cpp tsk_db_sqlite.h case_db.cpp tsk_case_db.h
+libtskauto_la_SOURCES = auto.cpp tsk_auto_i.h auto_db.cpp db_sqlite.cpp tsk_db_sqlite.h case_db.cpp tsk_case_db.h
+libtskauto_la_LIBADD = -lsqlite3
 
 indent:
 	indent *.cpp *.h
diff -up sleuthkit-4.2.0/tsk/auto/Makefile.in.system-sqlite sleuthkit-4.2.0/tsk/auto/Makefile.in
--- sleuthkit-4.2.0/tsk/auto/Makefile.in.system-sqlite	2015-09-16 19:54:08.000000000 +0200
+++ sleuthkit-4.2.0/tsk/auto/Makefile.in	2015-09-16 19:54:08.000000000 +0200
@@ -106,7 +106,7 @@ CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 LTLIBRARIES = $(noinst_LTLIBRARIES)
 libtskauto_la_LIBADD =
-am_libtskauto_la_OBJECTS = auto.lo auto_db.lo sqlite3.lo db_sqlite.lo \
+am_libtskauto_la_OBJECTS = auto.lo auto_db.lo db_sqlite.lo \
 	case_db.lo
 libtskauto_la_OBJECTS = $(am_libtskauto_la_OBJECTS)
 AM_V_lt = $(am__v_lt_@AM_V@)
@@ -335,7 +335,8 @@ AM_CPPFLAGS = -I../.. -I$(srcdir)/../.. 
 EXTRA_DIST = .indent.pro
 noinst_LTLIBRARIES = libtskauto.la
 # Note that the .h files are in the top-level Makefile
-libtskauto_la_SOURCES = auto.cpp tsk_auto_i.h auto_db.cpp sqlite3.c sqlite3.h db_sqlite.cpp tsk_db_sqlite.h case_db.cpp tsk_case_db.h
+libtskauto_la_SOURCES = auto.cpp tsk_auto_i.h auto_db.cpp db_sqlite.cpp tsk_db_sqlite.h case_db.cpp tsk_case_db.h
+libtskauto_la_LIBADD = -lsqlite3
 all: all-am
 
 .SUFFIXES:
diff -up sleuthkit-4.2.0/tsk/hashdb/tsk_hashdb.h.system-sqlite sleuthkit-4.2.0/tsk/hashdb/tsk_hashdb.h
--- sleuthkit-4.2.0/tsk/hashdb/tsk_hashdb.h.system-sqlite	2015-09-16 19:07:12.000000000 +0200
+++ sleuthkit-4.2.0/tsk/hashdb/tsk_hashdb.h	2015-09-16 19:07:12.000000000 +0200
@@ -17,7 +17,7 @@
 * \defgroup hashdblib_cpp C++ Hash Database Classes
 */
 
-#include "tsk/auto/sqlite3.h"
+#include <sqlite3.h>
 
 #ifndef _TSK_HDB_H
 #define _TSK_HDB_H