[libgda] SQLite: remove embedded source code
- From: Daniel Espinosa Ortiz <despinosa src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libgda] SQLite: remove embedded source code
- Date: Thu, 7 Mar 2019 20:43:43 +0000 (UTC)
commit f38e7982517ae801e8e536e949171331ea27f5c1
Author: Daniel Espinosa Ortiz <esodan gmail com>
Date: Thu Mar 7 14:37:43 2019 -0600
SQLite: remove embedded source code
For now and on, only system installed libraries
will be used for SQLite provider
configure.ac | 1 -
libgda/sqlite/Makefile.am | 10 +-
libgda/sqlite/meson.build | 3 -
libgda/sqlite/sqlite-src/Makefile.am | 17 -
libgda/sqlite/sqlite-src/PragmasPatch | 82 -
libgda/sqlite/sqlite-src/meson.build | 21 -
libgda/sqlite/sqlite-src/sqlite3.c | 221849 -------------------------------
libgda/sqlite/sqlite-src/sqlite3.h | 11716 --
8 files changed, 1 insertion(+), 233698 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 3070b1e09..959d163e5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -974,7 +974,6 @@ libgda/handlers/Makefile
libgda/providers-support/Makefile
libgda/sql-parser/Makefile
libgda/sqlite/Makefile
-libgda/sqlite/sqlite-src/Makefile
libgda/sqlite/virtual/libgda-virtual.h
libgda/sqlite/virtual/Makefile
libgda/thread-wrapper/Makefile
diff --git a/libgda/sqlite/Makefile.am b/libgda/sqlite/Makefile.am
index b38f8c8a9..62257dbec 100644
--- a/libgda/sqlite/Makefile.am
+++ b/libgda/sqlite/Makefile.am
@@ -1,14 +1,6 @@
-if HAVE_SQLITE
-SUBDIRS=
+SUBDIRS= virtual
sqlitelibs= $(SQLITE_LIBS)
sqliteinc= $(SQLITE_CFLAGS)
-else
-SUBDIRS= sqlite-src
-sqlitelibs= $(top_builddir)/libgda/sqlite/sqlite-src/libsqlite.la
-sqliteinc= -I$(top_srcdir)/libgda/sqlite/sqlite-src \
- -I$(top_builddir)/libgda/sqlite/sqlite-src -DSQLITE_API= -DSQLITE_PRIVATE=
-endif
-SUBDIRS+= virtual
noinst_LTLIBRARIES = libgda-sqlite.la
if BDBSQL
diff --git a/libgda/sqlite/meson.build b/libgda/sqlite/meson.build
index 217daee70..8daa49eaa 100644
--- a/libgda/sqlite/meson.build
+++ b/libgda/sqlite/meson.build
@@ -4,9 +4,6 @@ mkkeywordhashf = files([
mkkeywordhash = executable ('mkkeywordhash', mkkeywordhashf)
-if sqlite_internal
- subdir('sqlite-src')
-endif
subdir('virtual')
gen_emb_string = executable('gen_emb_string', 'gen_emb_string.c')
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]