iconv is only used with if curses is enabled, there's no need to do any
configure checking for iconv, if curses is disabled.  Also, ignore
--enable-iconv if curses is already disabled.

Signed-off-by: Kumar Gala <kumar.g...@linaro.org>
---
 configure | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index d2fc346302..a1b60fa977 100755
--- a/configure
+++ b/configure
@@ -1235,13 +1235,18 @@ for opt do
   ;;
   --disable-stack-protector) stack_protector="no"
   ;;
-  --disable-curses) curses="no"
+  --disable-curses)
+      curses="no"
+      iconv="no"
   ;;
   --enable-curses) curses="yes"
   ;;
   --disable-iconv) iconv="no"
   ;;
-  --enable-iconv) iconv="yes"
+  --enable-iconv)
+      if test "$curses" != "no" ; then
+         iconv="yes"
+      fi
   ;;
   --disable-curl) curl="no"
   ;;
-- 
2.20.1


Reply via email to