summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGustavo Zacarias <gustavo@zacarias.com.ar>2011-03-01 11:34:00 -0300
committerPeter Korsgaard <jacmet@sunsite.dk>2011-03-05 15:32:01 +0100
commit7bdbdd3c38a4ad2c8273039bb17d0cd2ec664f82 (patch)
treea495f58ba46c63e7cc0bcff5fd3ff5c927ca0650
parent0cab96376125ad88b4f28a649a54c601d1f4d772 (diff)
qt: add option for system sqlite
Add an option to use the system sqlite library. Also drop sqlite2 stub since it's pointless. Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--package/qt/Config.sql.in30
-rw-r--r--package/qt/qt.mk7
2 files changed, 27 insertions, 10 deletions
diff --git a/package/qt/Config.sql.in b/package/qt/Config.sql.in
index b982fdb4d..eceb15d64 100644
--- a/package/qt/Config.sql.in
+++ b/package/qt/Config.sql.in
@@ -34,16 +34,28 @@ config BR2_PACKAGE_QT_PSQL
Build PostgreSQL driver
If unsure, say n.
-config BR2_PACKAGE_QT_SQLITE
- bool "SQLite 3 Driver"
+choice
+ prompt "SQLite 3 support"
+ default BR2_PACKAGE_QT_SQLITE_NONE
help
- Build SQLite driver
- If unsure, say n.
+ Select SQLite support.
-config BR2_PACKAGE_QT_SQLITE2
- bool "SQLite 2 Driver"
- depends on BROKEN # sqlite2 not in BR
+config BR2_PACKAGE_QT_SQLITE_NONE
+ bool "No sqlite support"
help
- Build SQLite 2 driver
- If unsure, say n.
+ Do not compile any kind of SQLite support.
+
+config BR2_PACKAGE_QT_SQLITE_QT
+ bool "Qt SQLite"
+ help
+ Use Qt bundled SQLite support.
+
+config BR2_PACKAGE_QT_SQLITE_SYSTEM
+ bool "System SQLite"
+ select BR2_PACKAGE_SQLITE
+ help
+ Use system SQLite.
+
+endchoice
+
endif
diff --git a/package/qt/qt.mk b/package/qt/qt.mk
index e8fff73c4..6974b2f1f 100644
--- a/package/qt/qt.mk
+++ b/package/qt/qt.mk
@@ -295,11 +295,16 @@ endif
ifeq ($(BR2_PACKAGE_QT_PSQL),y)
QT_CONFIGURE+= -qt-sql-psql
endif
-ifeq ($(BR2_PACKAGE_QT_SQLITE),y)
+ifeq ($(BR2_PACKAGE_QT_SQLITE_QT),y)
QT_CONFIGURE+= -qt-sql-sqlite
else
+ifeq ($(BR2_PACKAGE_QT_SQLITE_SYSTEM),y)
+QT_CONFIGURE+= -system-sqlite
+QT_DEP_LIBS+= sqlite
+else
QT_CONFIGURE+= -no-sql-sqlite
endif
+endif
ifeq ($(BR2_PACKAGE_QT_SQLITE2),y)
QT_CONFIGURE+= -qt-sql-sqlite2
endif