From 9f62ca8deb3a16ac86ebc35c0093b82423900633 Mon Sep 17 00:00:00 2001
From: Alexey Neyman <stilor@att.net>
Date: Sun, 18 Dec 2016 19:04:37 -0800
Subject: Select libintl from gettext we built.

Also, require gettext for NLS, and require iconv/ncurses for gettext.

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

diff --git a/config/companion_libs.in b/config/companion_libs.in
index e7e3ebb..7d1d4f7 100644
--- a/config/companion_libs.in
+++ b/config/companion_libs.in
@@ -69,6 +69,8 @@ config LIBICONV
 config GETTEXT
     bool "Build local gettext"
     default y if CANADIAN || CROSS_NATIVE
+    select LIBICONV_NEEDED
+    select NCURSES_NEEDED
     select COMPLIBS
 
 config GMP
diff --git a/config/toolchain.in b/config/toolchain.in
index ca74ee7..b8c1b4a 100644
--- a/config/toolchain.in
+++ b/config/toolchain.in
@@ -308,6 +308,7 @@ comment "Misc options"
 config TOOLCHAIN_ENABLE_NLS
     bool
     prompt "Enable nls"
+    select GETTEXT_NEEDED
     help
       Say 'Y' here to enable native language support (nls).
 
diff --git a/scripts/build/cc/100-gcc.sh b/scripts/build/cc/100-gcc.sh
index cb0a4fa..947d4af 100644
--- a/scripts/build/cc/100-gcc.sh
+++ b/scripts/build/cc/100-gcc.sh
@@ -560,7 +560,11 @@ do_gcc_core_backend() {
             ;; # ARCH is mips
     esac
 
-    [ "${CT_TOOLCHAIN_ENABLE_NLS}" != "y" ] && extra_config+=("--disable-nls")
+    if [ "${CT_TOOLCHAIN_ENABLE_NLS}" = "y" ]; then
+        extra_config+=("--with-libintl-prefix=${complibs}")
+    else
+        extra_config+=("--disable-nls")
+    fi
 
     if [ "${CT_CC_GCC_SYSTEM_ZLIB}" = "y" ]; then
         extra_config+=("--with-system-zlib")
@@ -1084,7 +1088,11 @@ do_gcc_backend() {
             ;; # ARCH is mips
     esac
 
-    [ "${CT_TOOLCHAIN_ENABLE_NLS}" != "y" ] && extra_config+=("--disable-nls")
+    if [ "${CT_TOOLCHAIN_ENABLE_NLS}" = "y" ]; then
+        extra_config+=("--with-libintl-prefix=${complibs}")
+    else
+        extra_config+=("--disable-nls")
+    fi
 
     if [ "${CT_CC_GCC_SYSTEM_ZLIB}" = "y" ]; then
         extra_config+=("--with-system-zlib")
-- 
cgit v0.10.2-6-g49f6