package/sqlite: add optional support for libedit

Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

diff --git a/Config.in.legacy b/Config.in.legacy
index 3677f867d5f53a807a52f9cbaa5c745b021aeb99..0ea8c7d8d137183d2e20d81dc8c0be2399825654 100644 (file)
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -145,6 +145,17 @@ endif
 ###############################################################################
 comment "Legacy options removed in 2016.02"
 
+config BR2_PACKAGE_SQLITE_READLINE
+       bool "command-line editing support was updated"
+       select BR2_PACKAGE_NCURSES
+       select BR2_PACKAGE_READLINE
+       select BR2_LEGACY
+       help
+         This option was removed in favour of the sqlite package
+         deciding itself depending on the enabled packages whether
+         command-line editing should be enabled, it also also takes
+         libedit into account.
+
 config BR2_PACKAGE_OPENPOWERLINK_DEBUG_LEVEL
        bool "openpowerlink debug option has been removed"
        select BR2_LEGACY

diff --git a/package/sqlite/Config.in b/package/sqlite/Config.in
index 7ea9eb15b8ab68f67f3af71c6002ecc3e28665ab..c9fde53b3650206e18d717a8eabfa5c17c9cc7f5 100644 (file)
--- a/package/sqlite/Config.in
+++ b/package/sqlite/Config.in
@@ -8,13 +8,6 @@ config BR2_PACKAGE_SQLITE
 
 if BR2_PACKAGE_SQLITE
 
-config BR2_PACKAGE_SQLITE_READLINE
-       bool "Command-line editing"
-       select BR2_PACKAGE_NCURSES
-       select BR2_PACKAGE_READLINE
-       help
-         Enable command-line editing. This requires ncurses and readline.
-
 config BR2_PACKAGE_SQLITE_STAT3
        bool "Additional query optimizations (stat3)"
        help

diff --git a/package/sqlite/sqlite.mk b/package/sqlite/sqlite.mk
index 0a119cc30e1c7576cc32df7452c54f11623f9642..870b891c4f0fdba7f51dd97a674ccb74bf98a6e2 100644 (file)
--- a/package/sqlite/sqlite.mk
+++ b/package/sqlite/sqlite.mk
@@ -45,11 +45,14 @@ else
 SQLITE_CONF_OPTS += --disable-threadsafe
 endif
 
-ifeq ($(BR2_PACKAGE_SQLITE_READLINE),y)
+ifeq ($(BR2_PACKAGE_NCURSES)$(BR2_PACKAGE_READLINE),yy)
 SQLITE_DEPENDENCIES += ncurses readline
-SQLITE_CONF_OPTS += --enable-readline
+SQLITE_CONF_OPTS += --disable-editline --enable-readline
+else ifeq ($(BR2_PACKAGE_LIBEDIT),y)
+SQLITE_DEPENDENCIES += libedit
+SQLITE_CONF_OPTS += --enable-editline --disable-readline
 else
-SQLITE_CONF_OPTS += --disable-readline
+SQLITE_CONF_OPTS += --disable-editline --disable-readline
 endif
 
 $(eval $(autotools-package))