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>
This commit is contained in:
Bernd Kuhls 2016-02-08 20:56:41 +01:00 committed by Thomas Petazzoni
parent 6c49ae49d9
commit 007c2ce917
3 changed files with 17 additions and 10 deletions

View File

@ -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

View File

@ -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

View File

@ -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))