File external-sqlite.diff of Package hk_classes

--- hk_sqlite3classes/Makefile.am
+++ hk_sqlite3classes/Makefile.am
@@ -35,12 +35,6 @@ extra_src = 			sqlite/alter.c    sqlite/
 				sqlite/os_unix.c  sqlite/pragma.c  sqlite/random.c   sqlite/table.c   sqlite/trigger.c \
 				sqlite/util.c    sqlite/vdbeaux.c  sqlite/vdbemem.c sqlite/parse.c   sqlite/opcodes.c
 
-if USESQLITE3LIBRARY
- INCLUDES= -I../hk_classes -I@SQLITE3INCDIR@
+ INCLUDES= -I../hk_classes
  libhk_sqlite3driver_la_LDFLAGS = -version-info 0:0:0 -lsqlite3 -L../hk_classes -L@SQLITE3LIBDIR@ -lhk_classes
  libhk_sqlite3driver_la_SOURCES= $(normal_src)
-else
- INCLUDES= -I../hk_classes -I ./sqlite 
- libhk_sqlite3driver_la_LDFLAGS = -version-info 0:0:0
- libhk_sqlite3driver_la_SOURCES= $(normal_src)  $(extra_src)
-endif
--- hk_sqliteclasses/Makefile.am
+++ hk_sqliteclasses/Makefile.am
@@ -36,12 +36,6 @@ extra_src = sqlite/attach.c     \
 				sqlite/hash.c      sqlite/table.c      sqlite/where.c \
 				sqlite/insert.c    sqlite/tclsqlite.c  sqlite/opcodes.c
 
-if USESQLITE2LIBRARY
- INCLUDES= -I../hk_classes -I@SQLITEINCDIR@
+ INCLUDES= -I../hk_classes
  libhk_sqlite2driver_la_LDFLAGS = -version-info 0:0:0 -lsqlite -L../hk_classes -L@SQLITELIBDIR@ -lhk_classes
  libhk_sqlite2driver_la_SOURCES= $(normal_src)
-else
- INCLUDES= -I../hk_classes -I ./sqlite 
- libhk_sqlite2driver_la_LDFLAGS = -version-info 0:0:0
- libhk_sqlite2driver_la_SOURCES= $(normal_src)  $(extra_src)
-endif
--- hk_sqlite3classes/Makefile.am
+++ hk_sqlite3classes/Makefile.am
@@ -10,10 +10,7 @@ lib_LTLIBRARIES = 	libhk_sqlite3driver.l
 
 noinst_HEADERS = 	hk_sqlite3column.h hk_sqlite3connection.h hk_sqlite3database.h\
 			hk_sqlite3datasource.h hk_sqlite3actionquery.h hk_sqlite3resultquery.h\
-			hk_sqlite3table.h hk_sqlite3view.h \
-			sqlite/sqlite3.h sqlite/parse.h sqlite/opcodes.h sqlite/keywordhash.h \
-			sqlite/btree.h  sqlite/hash.h  sqlite/os_common.h  sqlite/os.h  sqlite/pager.h \
-			sqlite/sqliteInt.h  sqlite/vdbe.h  sqlite/vdbeInt.h
+			hk_sqlite3table.h hk_sqlite3view.h
 
 
 
--- hk_sqliteclasses/Makefile.am
+++ hk_sqliteclasses/Makefile.am
@@ -10,11 +10,7 @@ lib_LTLIBRARIES = 	libhk_sqlite2driver.l
 
 noinst_HEADERS = 	hk_sqlitecolumn.h hk_sqliteconnection.h hk_sqlitedatabase.h\
 			hk_sqlitedatasource.h hk_sqliteactionquery.h hk_sqliteresultquery.h\
-			hk_sqlitetable.h hk_sqliteview.h \
-			sqlite/btree.h    sqlite/os.h      sqlite/sqliteInt.h \
-			sqlite/config.h   sqlite/pager.h   sqlite/vdbe.h \
-			sqlite/hash.h     sqlite/parse.h   sqlite/vdbeInt.h \
-			sqlite/opcodes.h  sqlite/sqlite.h
+			hk_sqlitetable.h hk_sqliteview.h 
 
 
 
--- hk_sqliteclasses/hk_sqlitedatabase.h
+++ hk_sqliteclasses/hk_sqlitedatabase.h
@@ -12,7 +12,7 @@
 #define HK_SQLITEDATABASE
 #include "hk_database.h"
 #include "hk_sqlitedatasource.h"
-#include "sqlite/sqlite.h"
+#include <sqlite.h>
 
 class hk_sqliteconnection;
 class hk_presentation;
--- hk_sqliteclasses/hk_sqlitedatasource.h
+++ hk_sqliteclasses/hk_sqlitedatasource.h
@@ -10,7 +10,7 @@
 // ****************************************************************************
 #ifndef HK_SQLITEDATASOURCE
 #define HK_SQLITEDATASOURCE
-#include "sqlite/sqlite.h"
+#include <sqlite.h>
 #include "hk_storagedatasource.h"
 #include "hk_sqlitecolumn.h"
 #include "hk_column.h"
--- hk_sqliteclasses/hk_sqliteconnection.h
+++ hk_sqliteclasses/hk_sqliteconnection.h
@@ -10,7 +10,7 @@
 // ****************************************************************************
 #ifndef HK_SQLITECONNECTION
 #define HK_SQLITECONNECTION
-#include "sqlite/sqlite.h"
+#include <sqlite.h>
 #include "hk_connection.h"
 #include <list>
 #include <vector>
--- hk_sqlite3classes/Makefile.am
+++ hk_sqlite3classes/Makefile.am
@@ -33,5 +33,5 @@ extra_src = 			sqlite/alter.c    sqlite/
 				sqlite/util.c    sqlite/vdbeaux.c  sqlite/vdbemem.c sqlite/parse.c   sqlite/opcodes.c
 
  INCLUDES= -I../hk_classes
- libhk_sqlite3driver_la_LDFLAGS = -version-info 0:0:0 -lsqlite3 -L../hk_classes -L@SQLITE3LIBDIR@ -lhk_classes
+ libhk_sqlite3driver_la_LDFLAGS = -version-info 0:0:0 -lsqlite3 ../hk_classes/libhk_classes.la
  libhk_sqlite3driver_la_SOURCES= $(normal_src)
--- hk_sqliteclasses/Makefile.am
+++ hk_sqliteclasses/Makefile.am
@@ -33,5 +33,5 @@ extra_src = sqlite/attach.c     \
 				sqlite/insert.c    sqlite/tclsqlite.c  sqlite/opcodes.c
 
  INCLUDES= -I../hk_classes
- libhk_sqlite2driver_la_LDFLAGS = -version-info 0:0:0 -lsqlite -L../hk_classes -L@SQLITELIBDIR@ -lhk_classes
+ libhk_sqlite2driver_la_LDFLAGS = -version-info 0:0:0 -lsqlite ../hk_classes/libhk_classes.la
  libhk_sqlite2driver_la_SOURCES= $(normal_src)