From a417c3187552f75df9db707bc99c8fa1f12d6a3b Mon Sep 17 00:00:00 2001
From: Alexey Neyman <stilor@att.net>
Date: Fri, 17 Feb 2017 12:07:39 -0800
Subject: Add --disable-database and --with-fallbacks separately

The dependency between them has been removed in Kconfig.

Signed-off-by: Alexey Neyman <stilor@att.net>

diff --git a/scripts/build/companion_libs/220-ncurses.sh b/scripts/build/companion_libs/220-ncurses.sh
index 962e8ad..573523b 100644
--- a/scripts/build/companion_libs/220-ncurses.sh
+++ b/scripts/build/companion_libs/220-ncurses.sh
@@ -39,7 +39,10 @@ do_ncurses_for_build() {
     case "${CT_TOOLCHAIN_TYPE}" in
         native|cross)
             if [ "${CT_NCURSES_HOST_DISABLE_DB}" = "y" ]; then
-                opts+=( "--disable-database" "--with-fallbacks=${CT_NCURSES_HOST_FALLBACKS}" )
+                opts+=( "--disable-database" )
+            fi
+            if [ -n "${CT_NCURSES_HOST_FALLBACKS}" ]; then
+                opts+=( "--with-fallbacks=${CT_NCURSES_HOST_FALLBACKS}" )
             fi
             opts+=( "${CT_NCURSES_HOST_CONFIG_ARGS[@]}" )
             ;;
@@ -73,7 +76,10 @@ do_ncurses_for_host() {
           "--without-cxx-binding" \
           "--without-ada" )
     if [ "${CT_NCURSES_HOST_DISABLE_DB}" = "y" ]; then
-        opts+=( "--disable-database" "--with-fallbacks=${CT_NCURSES_HOST_FALLBACKS}" )
+        opts+=( "--disable-database" )
+    fi
+    if [ -n "${CT_NCURSES_HOST_FALLBACKS}" ]; then
+        opts+=( "--with-fallbacks=${CT_NCURSES_HOST_FALLBACKS}" )
     fi
     opts+=( "${CT_NCURSES_HOST_CONFIG_ARGS[@]}" )
     do_ncurses_backend host="${CT_HOST}" \
@@ -96,7 +102,10 @@ do_ncurses_for_target() {
     [ "${CT_CC_LANG_CXX}" = "y" ] || opts+=("--without-cxx" "--without-cxx-binding")
     [ "${CT_CC_LANG_ADA}" = "y" ] || opts+=("--without-ada")
     if [ "${CT_NCURSES_TARGET_DISABLE_DB}" = "y" ]; then
-        opts+=( "--disable-database" "--with-fallbacks=${CT_NCURSES_TARGET_FALLBACKS}" )
+        opts+=( "--disable-database" )
+    fi
+    if [ -n "${CT_NCURSES_TARGET_FALLBACKS}" ]; then
+        opts+=( "--with-fallbacks=${CT_NCURSES_TARGET_FALLBACKS}" )
     fi
     opts+=( "${CT_NCURSES_TARGET_CONFIG_ARGS[@]}" )
     case "${CT_TARGET}" in
-- 
cgit v0.10.2-6-g49f6