Build system: mv ncurses kconfig in main kconfig, it is needed by standalone toolchain

Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>

2 files changed, 31 insertions, 42 deletions

diff --git a/packages/misc/misc.kconfig b/packages/misc/misc.kconfig
index 2c62f69..1c00f69 100644
--- a/packages/misc/misc.kconfig
+++ b/packages/misc/misc.kconfig
@@ -1,21 +1,20 @@
 ################################################################################
 # Embtoolkit
-# Copyright(C) 2010-2011 GAYE Abdoulaye Walsimou.
-# For Copyrright from linux kernel's build/configure system, see their source
-# code.
+# Copyright(C) 2010-2012 GAYE Abdoulaye Walsimou.
 #
-# This program is free software; you can distribute it and/or modify it
-# under the terms of the GNU General Public License
-# (Version 2 or later) published by the Free Software Foundation.
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
 #
-# This program is distributed in the hope it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# for more details.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
 ################################################################################
 #
 # \file         misc.kconfig
@@ -31,7 +30,5 @@ source packages/misc/gperf/gperf.kconfig
 source packages/misc/intltool/intltool.kconfig
 source packages/misc/libelf/libelf.kconfig
 source packages/misc/libxml/libxml.kconfig
-source packages/misc/ncurses/ncurses.kconfig
+# ncurses included in main Kconfig
 source packages/misc/tslib/tslib.kconfig
-
-
diff --git a/packages/misc/ncurses/ncurses.kconfig b/packages/misc/ncurses/ncurses.kconfig
index 61a5e70..ae9ed6b 100644
--- a/packages/misc/ncurses/ncurses.kconfig
+++ b/packages/misc/ncurses/ncurses.kconfig
@@ -1,19 +1,20 @@
 ################################################################################
 # Embtoolkit
-# Copyright(C) 2010-2011 GAYE Abdoulaye Walsimou.
+# Copyright(C) 2010-2012 GAYE Abdoulaye Walsimou.
 #
-# This program is free software; you can distribute it and/or modify it
-# under the terms of the GNU General Public License
-# (Version 2 or later) published by the Free Software Foundation.
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
 #
-# This program is distributed in the hope it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# for more details.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
 ################################################################################
 #
 # \file         ncurses.kconfig
@@ -23,7 +24,7 @@
 ################################################################################
 
 config EMBTK_HAVE_NCURSES
-	bool "Have ncurses"
+	bool
 	help
 		The Ncurses (new curses) library is a free software emulation of
 		curses in System V Release 4.0, and more. It uses Terminfo
@@ -33,25 +34,16 @@ config EMBTK_HAVE_NCURSES
 		The distribution includes the library and support utilities,
 		including a terminfo compiler tic, a decompiler infocmp, clear,
 		tput, tset, and a termcap conversion tool captoinfo.
-choice
-	prompt "ncurses version you wish"
-	depends on EMBTK_HAVE_NCURSES
-	help
-	 Here you can choose which version of ncurses you want to use.
-
-	config  EMBTK_NCURSES_VERSION_5_9
-		bool "ncurses-5.9"
-endchoice
 
 config EMBTK_NCURSES_VERSION_STRING
 	string
-	default "5.9"	if EMBTK_NCURSES_VERSION_5_9
+	default "5.9"
+	depends on EMBTK_HAVE_NCURSES
 
 config EMBTK_NCURSES_NEED_PATCH
 	bool
+	depends on EMBTK_HAVE_NCURSES
+
 config EMBTK_NCURSES_NEED_AUTORECONF
 	bool
-config EMBTK_NCURSES_PKG_IS_TARGZ
-	bool
-config EMBTK_NCURSES_PKG_IS_TARBZ2
-	bool
+	depends on EMBTK_HAVE_NCURSES