62 files changed, 13232 insertions, 7645 deletions

diff --git a/scripts/Kbuild b/scripts/Kbuild
new file mode 100644
index 000000000..80c60733e
--- /dev/null
+++ b/scripts/Kbuild
@@ -0,0 +1,11 @@
+###
+# scripts contains sources for various helper programs used throughout
+# the kernel for the build process.
+# ---------------------------------------------------------------------------
+
+hostprogs-y += usage
+
+always := $(hostprogs-y)
+
+# Let clean descend into subdirs
+subdir- += basic kconfig
diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include
new file mode 100644
index 000000000..b0d067be7
--- /dev/null
+++ b/scripts/Kbuild.include
@@ -0,0 +1,148 @@
+####
+# kbuild: Generic definitions
+
+# Convinient variables
+comma   := ,
+squote  := '
+empty   :=
+space   := $(empty) $(empty)
+
+###
+# The temporary file to save gcc -MD generated dependencies must not
+# contain a comma
+depfile = $(subst $(comma),_,$(@D)/.$(@F).d)
+
+###
+# Escape single quote for use in echo statements
+escsq = $(subst $(squote),'\$(squote)',$1)
+
+###
+# filechk is used to check if the content of a generated file is updated.
+# Sample usage:
+# define filechk_sample
+#       echo $KERNELRELEASE
+# endef
+# version.h : Makefile
+#       $(call filechk,sample)
+# The rule defined shall write to stdout the content of the new file.
+# The existing file will be compared with the new one.
+# - If no file exist it is created
+# - If the content differ the new file is used
+# - If they are equal no change, and no timestamp update
+# - stdin is piped in from the first prerequisite ($<) so one has
+#   to specify a valid file as first prerequisite (often the kbuild file)
+define filechk
+        $(Q)set -e;                             \
+        echo '  CHK     $@';                    \
+        mkdir -p $(dir $@);                     \
+        $(filechk_$(1)) < $< > $@.tmp;          \
+        if [ -r $@ ] && cmp -s $@ $@.tmp; then  \
+                rm -f $@.tmp;                   \
+        else                                    \
+                echo '  UPD     $@';            \
+                mv -f $@.tmp $@;                \
+        fi
+endef
+
+######
+# gcc support functions
+# See documentation in Documentation/kbuild/makefiles.txt
+
+# as-option
+# Usage: cflags-y += $(call as-option, -Wa$(comma)-isa=foo,)
+
+as-option = $(shell if $(CC) $(CFLAGS) $(1) -Wa,-Z -c -o /dev/null \
+             -xassembler /dev/null > /dev/null 2>&1; then echo "$(1)"; \
+             else echo "$(2)"; fi ;)
+
+# cc-option
+# Usage: cflags-y += $(call cc-option, -march=winchip-c6, -march=i586)
+
+cc-option = $(shell if $(CC) $(CFLAGS) $(1) -S -o /dev/null -xc /dev/null \
+             > /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi ;)
+
+# cc-option-yn
+# Usage: flag := $(call cc-option-yn, -march=winchip-c6)
+cc-option-yn = $(shell if $(CC) $(CFLAGS) $(1) -S -o /dev/null -xc /dev/null \
+                > /dev/null 2>&1; then echo "y"; else echo "n"; fi;)
+
+# cc-option-align
+# Prefix align with either -falign or -malign
+cc-option-align = $(subst -functions=0,,\
+        $(call cc-option,-falign-functions=0,-malign-functions=0))
+
+# cc-version
+# Usage gcc-ver := $(call cc-version, $(CC))
+cc-version = $(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-version.sh \
+              $(if $(1), $(1), $(CC)))
+
+# cc-ifversion
+# Usage:  EXTRA_CFLAGS += $(call cc-ifversion, -lt, 0402, -O1)
+cc-ifversion = $(shell if [ $(call cc-version, $(CC)) $(1) $(2) ]; then \
+                       echo $(3); fi;)
+
+###
+# Shorthand for $(Q)$(MAKE) -f scripts/Makefile.build obj=
+# Usage:
+# $(Q)$(MAKE) $(build)=dir
+build := -f $(if $(KBUILD_SRC),$(srctree)/)scripts/Makefile.build obj
+
+# Prefix -I with $(srctree) if it is not an absolute path
+addtree = $(if $(filter-out -I/%,$(1)),$(patsubst -I%,-I$(srctree)/%,$(1))) $(1)
+# Find all -I options and call addtree
+flags = $(foreach o,$($(1)),$(if $(filter -I%,$(o)),$(call addtree,$(o)),$(o)))
+
+# If quiet is set, only print short version of command
+cmd = @$(echo-cmd) $(cmd_$(1))
+
+# Add $(obj)/ for paths that is not absolute
+objectify = $(foreach o,$(1),$(if $(filter /%,$(o)),$(o),$(obj)/$(o)))
+
+###
+# if_changed      - execute command if any prerequisite is newer than 
+#                   target, or command line has changed
+# if_changed_dep  - as if_changed, but uses fixdep to reveal dependencies
+#                   including used config symbols
+# if_changed_rule - as if_changed but execute rule instead
+# See Documentation/kbuild/makefiles.txt for more info
+
+ifneq ($(KBUILD_NOCMDDEP),1)
+# Check if both arguments has same arguments. Result in empty string if equal
+# User may override this check using make KBUILD_NOCMDDEP=1
+arg-check = $(strip $(filter-out $(1), $(2)) $(filter-out $(2), $(1)) )
+endif
+
+# echo command. Short version is $(quiet) equals quiet, otherwise full command
+echo-cmd = $(if $($(quiet)cmd_$(1)), \
+        echo '  $(call escsq,$($(quiet)cmd_$(1)))';)
+
+make-cmd = $(subst \#,\\\#,$(subst $$,$$$$,$(call escsq,$(cmd_$(1)))))
+
+# function to only execute the passed command if necessary
+# >'< substitution is for echo to work, >$< substitution to preserve $ when reloading .cmd file
+# note: when using inline perl scripts [perl -e '...$$t=1;...'] in $(cmd_xxx) double $$ your perl vars
+#
+if_changed = $(if $(strip $(filter-out $(PHONY),$?)          \
+                $(call arg-check, $(cmd_$(1)), $(cmd_$@)) ), \
+        @set -e; \
+        $(echo-cmd) $(cmd_$(1)); \
+        echo 'cmd_$@ := $(make-cmd)' > $(@D)/.$(@F).cmd)
+
+# execute the command and also postprocess generated .d dependencies
+# file
+if_changed_dep = $(if $(strip $(filter-out $(PHONY),$?)  \
+                $(filter-out FORCE $(wildcard $^),$^)    \
+        $(call arg-check, $(cmd_$(1)), $(cmd_$@)) ),     \
+        @set -e; \
+        $(echo-cmd) $(cmd_$(1)); \
+        scripts/basic/fixdep $(depfile) $@ '$(make-cmd)' > $(@D)/.$(@F).tmp; \
+        rm -f $(depfile); \
+        mv -f $(@D)/.$(@F).tmp $(@D)/.$(@F).cmd)
+
+# Usage: $(call if_changed_rule,foo)
+# will check if $(cmd_foo) changed, or any of the prequisites changed,
+# and if so will execute $(rule_foo)
+if_changed_rule = $(if $(strip $(filter-out $(PHONY),$?)            \
+                        $(call arg-check, $(cmd_$(1)), $(cmd_$@)) ),\
+                        @set -e; \
+                        $(rule_$(1)))
diff --git a/scripts/Makefile.build b/scripts/Makefile.build
new file mode 100644
index 000000000..e48e60da3
--- /dev/null
+++ b/scripts/Makefile.build
@@ -0,0 +1,338 @@
+# ==========================================================================
+# Building
+# ==========================================================================
+
+src := $(obj)
+
+PHONY := __build
+__build:
+
+# Read .config if it exist, otherwise ignore
+-include .config
+
+include scripts/Kbuild.include
+
+# The filename Kbuild has precedence over Makefile
+kbuild-dir := $(if $(filter /%,$(src)),$(src),$(srctree)/$(src))
+include $(if $(wildcard $(kbuild-dir)/Kbuild), $(kbuild-dir)/Kbuild, $(kbuild-dir)/Makefile)
+
+include scripts/Makefile.lib
+
+ifdef host-progs
+ifneq ($(hostprogs-y),$(host-progs))
+$(warning kbuild: $(obj)/Makefile - Usage of host-progs is deprecated. Please replace with hostprogs-y!)
+hostprogs-y += $(host-progs)
+endif
+endif
+
+# Do not include host rules unles needed
+ifneq ($(hostprogs-y)$(hostprogs-m),)
+include scripts/Makefile.host
+endif
+
+ifneq ($(KBUILD_SRC),)
+# Create output directory if not already present
+_dummy := $(shell [ -d $(obj) ] || mkdir -p $(obj))
+
+# Create directories for object files if directory does not exist
+# Needed when obj-y := dir/file.o syntax is used
+_dummy := $(foreach d,$(obj-dirs), $(shell [ -d $(d) ] || mkdir -p $(d)))
+endif
+
+
+ifdef EXTRA_TARGETS
+$(warning kbuild: $(obj)/Makefile - Usage of EXTRA_TARGETS is obsolete in 2.6. Please fix!)
+endif
+
+ifdef build-targets
+$(warning kbuild: $(obj)/Makefile - Usage of build-targets is obsolete in 2.6. Please fix!)
+endif
+
+ifdef export-objs
+$(warning kbuild: $(obj)/Makefile - Usage of export-objs is obsolete in 2.6. Please fix!)
+endif
+
+ifdef O_TARGET
+$(warning kbuild: $(obj)/Makefile - Usage of O_TARGET := $(O_TARGET) is obsolete in 2.6. Please fix!)
+endif
+
+ifdef L_TARGET
+$(error kbuild: $(obj)/Makefile - Use of L_TARGET is replaced by lib-y in 2.6. Please fix!)
+endif
+
+ifdef list-multi
+$(warning kbuild: $(obj)/Makefile - list-multi := $(list-multi) is obsolete in 2.6. Please fix!)
+endif
+
+ifndef obj
+$(warning kbuild: Makefile.build is included improperly)
+endif
+
+# ===========================================================================
+
+ifneq ($(strip $(lib-y) $(lib-m) $(lib-n) $(lib-)),)
+lib-target := $(obj)/lib.a
+endif
+
+ifneq ($(strip $(obj-y) $(obj-m) $(obj-n) $(obj-) $(lib-target)),)
+builtin-target := $(obj)/built-in.o
+endif
+
+# We keep a list of all modules in $(MODVERDIR)
+
+__build: $(if $(KBUILD_BUILTIN),$(builtin-target) $(lib-target) $(extra-y)) \
+         $(if $(KBUILD_MODULES),$(obj-m)) \
+         $(subdir-ym) $(always)
+        @:
+
+# Linus' kernel sanity checking tool
+ifneq ($(KBUILD_CHECKSRC),0)
+  ifeq ($(KBUILD_CHECKSRC),2)
+    quiet_cmd_force_checksrc = CHECK   $<
+          cmd_force_checksrc = $(CHECK) $(CHECKFLAGS) $(c_flags) $< ;
+  else
+      quiet_cmd_checksrc     = CHECK   $<
+            cmd_checksrc     = $(CHECK) $(CHECKFLAGS) $(c_flags) $< ;
+  endif
+endif
+
+
+# Compile C sources (.c)
+# ---------------------------------------------------------------------------
+
+# Default is built-in, unless we know otherwise
+modkern_cflags := $(CFLAGS_KERNEL)
+quiet_modtag := $(empty)   $(empty)
+
+$(real-objs-m)        : modkern_cflags := $(CFLAGS_MODULE)
+$(real-objs-m:.o=.i)  : modkern_cflags := $(CFLAGS_MODULE)
+$(real-objs-m:.o=.s)  : modkern_cflags := $(CFLAGS_MODULE)
+$(real-objs-m:.o=.lst): modkern_cflags := $(CFLAGS_MODULE)
+
+$(real-objs-m)        : quiet_modtag := [M]
+$(real-objs-m:.o=.i)  : quiet_modtag := [M]
+$(real-objs-m:.o=.s)  : quiet_modtag := [M]
+$(real-objs-m:.o=.lst): quiet_modtag := [M]
+
+$(obj-m)              : quiet_modtag := [M]
+
+# Default for not multi-part modules
+modname = $(*F)
+
+$(multi-objs-m)         : modname = $(modname-multi)
+$(multi-objs-m:.o=.i)   : modname = $(modname-multi)
+$(multi-objs-m:.o=.s)   : modname = $(modname-multi)
+$(multi-objs-m:.o=.lst) : modname = $(modname-multi)
+$(multi-objs-y)         : modname = $(modname-multi)
+$(multi-objs-y:.o=.i)   : modname = $(modname-multi)
+$(multi-objs-y:.o=.s)   : modname = $(modname-multi)
+$(multi-objs-y:.o=.lst) : modname = $(modname-multi)
+
+quiet_cmd_cc_s_c = CC $(quiet_modtag)  $@
+cmd_cc_s_c       = $(CC) $(c_flags) -fverbose-asm -S -o $@ $<
+
+%.s: %.c FORCE
+        $(call if_changed_dep,cc_s_c)
+
+quiet_cmd_cc_i_c = CPP $(quiet_modtag) $@
+cmd_cc_i_c       = $(CPP) $(c_flags)   -o $@ $<
+
+%.i: %.c FORCE
+        $(call if_changed_dep,cc_i_c)
+
+# C (.c) files
+# The C file is compiled and updated dependency information is generated.
+# (See cmd_cc_o_c + relevant part of rule_cc_o_c)
+
+quiet_cmd_cc_o_c = CC $(quiet_modtag)  $@
+
+ifndef CONFIG_MODVERSIONS
+cmd_cc_o_c = $(CC) $(c_flags) -c -o $@ $<
+
+else
+# When module versioning is enabled the following steps are executed:
+# o compile a .tmp_<file>.o from <file>.c
+# o if .tmp_<file>.o doesn't contain a __ksymtab version, i.e. does
+#   not export symbols, we just rename .tmp_<file>.o to <file>.o and
+#   are done.
+# o otherwise, we calculate symbol versions using the good old
+#   genksyms on the preprocessed source and postprocess them in a way
+#   that they are usable as a linker script
+# o generate <file>.o from .tmp_<file>.o using the linker to
+#   replace the unresolved symbols __crc_exported_symbol with
+#   the actual value of the checksum generated by genksyms
+
+cmd_cc_o_c = $(CC) $(c_flags) -c -o $(@D)/.tmp_$(@F) $<
+cmd_modversions =                                                       \
+        if $(OBJDUMP) -h $(@D)/.tmp_$(@F) | grep -q __ksymtab; then     \
+                $(CPP) -D__GENKSYMS__ $(c_flags) $<                     \
+                | $(GENKSYMS) -a $(ARCH)                                \
+                > $(@D)/.tmp_$(@F:.o=.ver);                             \
+                                                                        \
+                $(LD) $(LDFLAGS) -r -o $@ $(@D)/.tmp_$(@F)              \
+                        -T $(@D)/.tmp_$(@F:.o=.ver);                    \
+                rm -f $(@D)/.tmp_$(@F) $(@D)/.tmp_$(@F:.o=.ver);        \
+        else                                                            \
+                mv -f $(@D)/.tmp_$(@F) $@;                              \
+        fi;
+endif
+
+define rule_cc_o_c
+        $(call echo-cmd,checksrc) $(cmd_checksrc)                         \
+        $(call echo-cmd,cc_o_c) $(cmd_cc_o_c);                            \
+        $(cmd_modversions)                                                \
+        scripts/basic/fixdep $(depfile) $@ '$(call make-cmd,cc_o_c)' > $(@D)/.$(@F).tmp;  \
+        rm -f $(depfile);                                                 \
+        mv -f $(@D)/.$(@F).tmp $(@D)/.$(@F).cmd
+endef
+
+# Built-in and composite module parts
+
+%.o: %.c FORCE
+        $(call cmd,force_checksrc)
+        $(call if_changed_rule,cc_o_c)
+
+# Single-part modules are special since we need to mark them in $(MODVERDIR)
+
+$(single-used-m): %.o: %.c FORCE
+        $(call cmd,force_checksrc)
+        $(call if_changed_rule,cc_o_c)
+        @{ echo $(@:.o=.ko); echo $@; } > $(MODVERDIR)/$(@F:.o=.mod)
+
+quiet_cmd_cc_lst_c = MKLST   $@
+      cmd_cc_lst_c = $(CC) $(c_flags) -g -c -o $*.o $< && \
+                     $(CONFIG_SHELL) $(srctree)/scripts/makelst $*.o \
+                                     System.map $(OBJDUMP) > $@
+
+%.lst: %.c FORCE
+        $(call if_changed_dep,cc_lst_c)
+
+# Compile assembler sources (.S)
+# ---------------------------------------------------------------------------
+
+modkern_aflags := $(AFLAGS_KERNEL)
+
+$(real-objs-m)      : modkern_aflags := $(AFLAGS_MODULE)
+$(real-objs-m:.o=.s): modkern_aflags := $(AFLAGS_MODULE)
+
+quiet_cmd_as_s_S = CPP $(quiet_modtag) $@
+cmd_as_s_S       = $(CPP) $(a_flags)   -o $@ $< 
+
+%.s: %.S FORCE
+        $(call if_changed_dep,as_s_S)
+
+quiet_cmd_as_o_S = AS $(quiet_modtag)  $@
+cmd_as_o_S       = $(CC) $(a_flags) -c -o $@ $<
+
+%.o: %.S FORCE
+        $(call if_changed_dep,as_o_S)
+
+targets += $(real-objs-y) $(real-objs-m) $(lib-y)
+targets += $(extra-y) $(MAKECMDGOALS) $(always)
+
+# Linker scripts preprocessor (.lds.S -> .lds)
+# ---------------------------------------------------------------------------
+quiet_cmd_cpp_lds_S = LDS     $@
+      cmd_cpp_lds_S = $(CPP) $(cpp_flags) -D__ASSEMBLY__ -o $@ $<
+
+%.lds: %.lds.S FORCE
+        $(call if_changed_dep,cpp_lds_S)
+
+# Build the compiled-in targets
+# ---------------------------------------------------------------------------
+
+# To build objects in subdirs, we need to descend into the directories
+$(sort $(subdir-obj-y)): $(subdir-ym) ;
+
+#
+# Rule to compile a set of .o files into one .o file
+#
+ifdef builtin-target
+quiet_cmd_link_o_target = LD      $@
+# If the list of objects to link is empty, just create an empty built-in.o
+cmd_link_o_target = $(if $(strip $(obj-y)),\
+                      $(LD) $(ld_flags) -r -o $@ $(filter $(obj-y), $^),\
+                      rm -f $@; $(AR) rcs $@)
+
+$(builtin-target): $(obj-y) FORCE
+        $(call if_changed,link_o_target)
+
+targets += $(builtin-target)
+endif # builtin-target
+
+#
+# Rule to compile a set of .o files into one .a file
+#
+ifdef lib-target
+quiet_cmd_link_l_target = AR      $@
+cmd_link_l_target = rm -f $@; $(AR) $(EXTRA_ARFLAGS) rcs $@ $(lib-y)
+
+$(lib-target): $(lib-y) FORCE
+        $(call if_changed,link_l_target)
+
+targets += $(lib-target)
+endif
+
+#
+# Rule to link composite objects
+#
+#  Composite objects are specified in kbuild makefile as follows:
+#    <composite-object>-objs := <list of .o files>
+#  or
+#    <composite-object>-y    := <list of .o files>
+link_multi_deps =                     \
+$(filter $(addprefix $(obj)/,         \
+$($(subst $(obj)/,,$(@:.o=-objs)))    \
+$($(subst $(obj)/,,$(@:.o=-y)))), $^)
+ 
+quiet_cmd_link_multi-y = LD      $@
+cmd_link_multi-y = $(LD) $(ld_flags) -r -o $@ $(link_multi_deps)
+
+quiet_cmd_link_multi-m = LD [M]  $@
+cmd_link_multi-m = $(LD) $(ld_flags) $(LDFLAGS_MODULE) -o $@ $(link_multi_deps)
+
+# We would rather have a list of rules like
+#       foo.o: $(foo-objs)
+# but that's not so easy, so we rather make all composite objects depend
+# on the set of all their parts
+$(multi-used-y) : %.o: $(multi-objs-y) FORCE
+        $(call if_changed,link_multi-y)
+
+$(multi-used-m) : %.o: $(multi-objs-m) FORCE
+        $(call if_changed,link_multi-m)
+        @{ echo $(@:.o=.ko); echo $(link_multi_deps); } > $(MODVERDIR)/$(@F:.o=.mod)
+
+targets += $(multi-used-y) $(multi-used-m)
+
+
+# Descending
+# ---------------------------------------------------------------------------
+
+PHONY += $(subdir-ym)
+$(subdir-ym):
+        $(Q)$(MAKE) $(build)=$@
+
+# Add FORCE to the prequisites of a target to force it to be always rebuilt.
+# ---------------------------------------------------------------------------
+
+PHONY += FORCE
+
+FORCE:
+
+# Read all saved command lines and dependencies for the $(targets) we
+# may be building above, using $(if_changed{,_dep}). As an
+# optimization, we don't need to read them if the target does not
+# exist, we will rebuild anyway in that case.
+
+targets := $(wildcard $(sort $(targets)))
+cmd_files := $(wildcard $(foreach f,$(targets),$(dir $(f)).$(notdir $(f)).cmd))
+
+ifneq ($(cmd_files),)
+  include $(cmd_files)
+endif
+
+
+# Declare the contents of the .PHONY variable as phony.  We keep that
+# information in a variable se we can use it in if_changed and friends.
+
+.PHONY: $(PHONY)
diff --git a/scripts/Makefile.host b/scripts/Makefile.host
new file mode 100644
index 000000000..2d519704b
--- /dev/null
+++ b/scripts/Makefile.host
@@ -0,0 +1,156 @@
+# ==========================================================================
+# Building binaries on the host system
+# Binaries are used during the compilation of the kernel, for example
+# to preprocess a data file.
+#
+# Both C and C++ is supported, but preferred language is C for such utilities.
+#
+# Samle syntax (see Documentation/kbuild/makefile.txt for reference)
+# hostprogs-y := bin2hex
+# Will compile bin2hex.c and create an executable named bin2hex
+#
+# hostprogs-y    := lxdialog
+# lxdialog-objs := checklist.o lxdialog.o
+# Will compile lxdialog.c and checklist.c, and then link the executable
+# lxdialog, based on checklist.o and lxdialog.o
+#
+# hostprogs-y      := qconf
+# qconf-cxxobjs   := qconf.o
+# qconf-objs      := menu.o
+# Will compile qconf as a C++ program, and menu as a C program.
+# They are linked as C++ code to the executable qconf
+
+# hostprogs-y := conf
+# conf-objs  := conf.o libkconfig.so
+# libkconfig-objs := expr.o type.o
+# Will create a shared library named libkconfig.so that consist of
+# expr.o and type.o (they are both compiled as C code and the object file
+# are made as position independent code).
+# conf.c is compiled as a c program, and conf.o is linked together with
+# libkconfig.so as the executable conf.
+# Note: Shared libraries consisting of C++ files are not supported
+
+__hostprogs := $(sort $(hostprogs-y)$(hostprogs-m))
+
+# hostprogs-y := tools/build may have been specified. Retreive directory
+obj-dirs += $(foreach f,$(__hostprogs), $(if $(dir $(f)),$(dir $(f))))
+obj-dirs := $(strip $(sort $(filter-out ./,$(obj-dirs))))
+
+
+# C code
+# Executables compiled from a single .c file
+host-csingle    := $(foreach m,$(__hostprogs),$(if $($(m)-objs),,$(m)))
+
+# C executables linked based on several .o files
+host-cmulti     := $(foreach m,$(__hostprogs),\
+                   $(if $($(m)-cxxobjs),,$(if $($(m)-objs),$(m))))
+
+# Object (.o) files compiled from .c files
+host-cobjs      := $(sort $(foreach m,$(__hostprogs),$($(m)-objs)))
+
+# C++ code
+# C++ executables compiled from at least on .cc file
+# and zero or more .c files
+host-cxxmulti   := $(foreach m,$(__hostprogs),$(if $($(m)-cxxobjs),$(m)))
+
+# C++ Object (.o) files compiled from .cc files
+host-cxxobjs    := $(sort $(foreach m,$(host-cxxmulti),$($(m)-cxxobjs)))
+
+# Shared libaries (only .c supported)
+# Shared libraries (.so) - all .so files referenced in "xxx-objs"
+host-cshlib     := $(sort $(filter %.so, $(host-cobjs)))
+# Remove .so files from "xxx-objs"
+host-cobjs      := $(filter-out %.so,$(host-cobjs))
+
+#Object (.o) files used by the shared libaries
+host-cshobjs    := $(sort $(foreach m,$(host-cshlib),$($(m:.so=-objs))))
+
+__hostprogs     := $(addprefix $(obj)/,$(__hostprogs))
+host-csingle    := $(addprefix $(obj)/,$(host-csingle))
+host-cmulti     := $(addprefix $(obj)/,$(host-cmulti))
+host-cobjs      := $(addprefix $(obj)/,$(host-cobjs))
+host-cxxmulti   := $(addprefix $(obj)/,$(host-cxxmulti))
+host-cxxobjs    := $(addprefix $(obj)/,$(host-cxxobjs))
+host-cshlib     := $(addprefix $(obj)/,$(host-cshlib))
+host-cshobjs    := $(addprefix $(obj)/,$(host-cshobjs))
+obj-dirs        := $(addprefix $(obj)/,$(obj-dirs))
+
+#####
+# Handle options to gcc. Support building with separate output directory
+
+_hostc_flags   = $(HOSTCFLAGS)   $(HOST_EXTRACFLAGS)   $(HOSTCFLAGS_$(*F).o)
+_hostcxx_flags = $(HOSTCXXFLAGS) $(HOST_EXTRACXXFLAGS) $(HOSTCXXFLAGS_$(*F).o)
+
+ifeq ($(KBUILD_SRC),)
+__hostc_flags   = $(_hostc_flags)
+__hostcxx_flags = $(_hostcxx_flags)
+else
+__hostc_flags   = -I$(obj) $(call flags,_hostc_flags)
+__hostcxx_flags = -I$(obj) $(call flags,_hostcxx_flags)
+endif
+
+hostc_flags    = -Wp,-MD,$(depfile) $(__hostc_flags)
+hostcxx_flags  = -Wp,-MD,$(depfile) $(__hostcxx_flags)
+
+#####
+# Compile programs on the host
+
+# Create executable from a single .c file
+# host-csingle -> Executable
+quiet_cmd_host-csingle  = HOSTCC  $@
+      cmd_host-csingle  = $(HOSTCC) $(hostc_flags) -o $@ $< \
+                $(HOST_LOADLIBES) $(HOSTLOADLIBES_$(@F))
+$(host-csingle): %: %.c FORCE
+        $(call if_changed_dep,host-csingle)
+
+# Link an executable based on list of .o files, all plain c
+# host-cmulti -> executable
+quiet_cmd_host-cmulti   = HOSTLD  $@
+      cmd_host-cmulti   = $(HOSTCC) $(HOSTLDFLAGS) -o $@ \
+                          $(addprefix $(obj)/,$($(@F)-objs)) \
+                          $(HOST_LOADLIBES) $(HOSTLOADLIBES_$(@F))
+$(host-cmulti): %: $(host-cobjs) $(host-cshlib) FORCE
+        $(call if_changed,host-cmulti)
+
+# Create .o file from a single .c file
+# host-cobjs -> .o
+quiet_cmd_host-cobjs    = HOSTCC  $@
+      cmd_host-cobjs    = $(HOSTCC) $(hostc_flags) -c -o $@ $<
+$(host-cobjs): %.o: %.c FORCE
+        $(call if_changed_dep,host-cobjs)
+
+# Link an executable based on list of .o files, a mixture of .c and .cc
+# host-cxxmulti -> executable
+quiet_cmd_host-cxxmulti = HOSTLD  $@
+      cmd_host-cxxmulti = $(HOSTCXX) $(HOSTLDFLAGS) -o $@ \
+                          $(foreach o,objs cxxobjs,\
+                          $(addprefix $(obj)/,$($(@F)-$(o)))) \
+                          $(HOST_LOADLIBES) $(HOSTLOADLIBES_$(@F))
+$(host-cxxmulti): %: $(host-cobjs) $(host-cxxobjs) $(host-cshlib) FORCE
+        $(call if_changed,host-cxxmulti)
+
+# Create .o file from a single .cc (C++) file
+quiet_cmd_host-cxxobjs  = HOSTCXX $@
+      cmd_host-cxxobjs  = $(HOSTCXX) $(hostcxx_flags) -c -o $@ $<
+$(host-cxxobjs): %.o: %.cc FORCE
+        $(call if_changed_dep,host-cxxobjs)
+
+# Compile .c file, create position independent .o file
+# host-cshobjs -> .o
+quiet_cmd_host-cshobjs  = HOSTCC  -fPIC $@
+      cmd_host-cshobjs  = $(HOSTCC) $(hostc_flags) -fPIC -c -o $@ $<
+$(host-cshobjs): %.o: %.c FORCE
+        $(call if_changed_dep,host-cshobjs)
+
+# Link a shared library, based on position independent .o files
+# *.o -> .so shared library (host-cshlib)
+quiet_cmd_host-cshlib   = HOSTLLD -shared $@
+      cmd_host-cshlib   = $(HOSTCC) $(HOSTLDFLAGS) -shared -o $@ \
+                          $(addprefix $(obj)/,$($(@F:.so=-objs))) \
+                          $(HOST_LOADLIBES) $(HOSTLOADLIBES_$(@F))
+$(host-cshlib): %: $(host-cshobjs) FORCE
+        $(call if_changed,host-cshlib)
+
+targets += $(host-csingle)  $(host-cmulti) $(host-cobjs)\
+           $(host-cxxmulti) $(host-cxxobjs) $(host-cshlib) $(host-cshobjs) 
+
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
new file mode 100644
index 000000000..2cb4935e8
--- /dev/null
+++ b/scripts/Makefile.lib
@@ -0,0 +1,165 @@
+# Backward compatibility - to be removed...
+extra-y += $(EXTRA_TARGETS)
+# Figure out what we need to build from the various variables
+# ===========================================================================
+
+# When an object is listed to be built compiled-in and modular,
+# only build the compiled-in version
+
+obj-m := $(filter-out $(obj-y),$(obj-m))
+
+# Libraries are always collected in one lib file.
+# Filter out objects already built-in
+
+lib-y := $(filter-out $(obj-y), $(sort $(lib-y) $(lib-m)))
+
+
+# Handle objects in subdirs
+# ---------------------------------------------------------------------------
+# o if we encounter foo/ in $(obj-y), replace it by foo/built-in.o
+#   and add the directory to the list of dirs to descend into: $(subdir-y)
+# o if we encounter foo/ in $(obj-m), remove it from $(obj-m) 
+#   and add the directory to the list of dirs to descend into: $(subdir-m)
+
+__subdir-y      := $(patsubst %/,%,$(filter %/, $(obj-y)))
+subdir-y        += $(__subdir-y)
+__subdir-m      := $(patsubst %/,%,$(filter %/, $(obj-m)))
+subdir-m        += $(__subdir-m)
+obj-y           := $(patsubst %/, %/built-in.o, $(obj-y))
+obj-m           := $(filter-out %/, $(obj-m))
+
+# Subdirectories we need to descend into
+
+subdir-ym       := $(sort $(subdir-y) $(subdir-m))
+
+# if $(foo-objs) exists, foo.o is a composite object 
+multi-used-y := $(sort $(foreach m,$(obj-y), $(if $(strip $($(m:.o=-objs)) $($(m:.o=-y))), $(m))))
+multi-used-m := $(sort $(foreach m,$(obj-m), $(if $(strip $($(m:.o=-objs)) $($(m:.o=-y))), $(m))))
+multi-used   := $(multi-used-y) $(multi-used-m)
+single-used-m := $(sort $(filter-out $(multi-used-m),$(obj-m)))
+
+# Build list of the parts of our composite objects, our composite
+# objects depend on those (obviously)
+multi-objs-y := $(foreach m, $(multi-used-y), $($(m:.o=-objs)) $($(m:.o=-y)))
+multi-objs-m := $(foreach m, $(multi-used-m), $($(m:.o=-objs)) $($(m:.o=-y)))
+multi-objs   := $(multi-objs-y) $(multi-objs-m)
+
+# $(subdir-obj-y) is the list of objects in $(obj-y) which do not live
+# in the local directory
+subdir-obj-y := $(foreach o,$(obj-y),$(if $(filter-out $(o),$(notdir $(o))),$(o)))
+
+# $(obj-dirs) is a list of directories that contain object files
+obj-dirs := $(dir $(multi-objs) $(subdir-obj-y))
+
+# Replace multi-part objects by their individual parts, look at local dir only
+real-objs-y := $(foreach m, $(filter-out $(subdir-obj-y), $(obj-y)), $(if $(strip $($(m:.o=-objs)) $($(m:.o=-y))),$($(m:.o=-objs)) $($(m:.o=-y)),$(m))) $(extra-y)
+real-objs-m := $(foreach m, $(obj-m), $(if $(strip $($(m:.o=-objs)) $($(m:.o=-y))),$($(m:.o=-objs)) $($(m:.o=-y)),$(m)))
+
+# Add subdir path
+
+extra-y         := $(addprefix $(obj)/,$(extra-y))
+always          := $(addprefix $(obj)/,$(always))
+targets         := $(addprefix $(obj)/,$(targets))
+obj-y           := $(addprefix $(obj)/,$(obj-y))
+obj-m           := $(addprefix $(obj)/,$(obj-m))
+lib-y           := $(addprefix $(obj)/,$(lib-y))
+subdir-obj-y    := $(addprefix $(obj)/,$(subdir-obj-y))
+real-objs-y     := $(addprefix $(obj)/,$(real-objs-y))
+real-objs-m     := $(addprefix $(obj)/,$(real-objs-m))
+single-used-m   := $(addprefix $(obj)/,$(single-used-m))
+multi-used-y    := $(addprefix $(obj)/,$(multi-used-y))
+multi-used-m    := $(addprefix $(obj)/,$(multi-used-m))
+multi-objs-y    := $(addprefix $(obj)/,$(multi-objs-y))
+multi-objs-m    := $(addprefix $(obj)/,$(multi-objs-m))
+subdir-ym       := $(addprefix $(obj)/,$(subdir-ym))
+obj-dirs        := $(addprefix $(obj)/,$(obj-dirs))
+
+# These flags are needed for modversions and compiling, so we define them here
+# already
+# $(modname_flags) #defines KBUILD_MODNAME as the name of the module it will 
+# end up in (or would, if it gets compiled in)
+# Note: It's possible that one object gets potentially linked into more
+#       than one module. In that case KBUILD_MODNAME will be set to foo_bar,
+#       where foo and bar are the name of the modules.
+name-fix = $(subst $(comma),_,$(subst -,_,$1))
+basename_flags = -D"KBUILD_BASENAME=KBUILD_STR($(call name-fix,$(*F)))"
+modname_flags  = $(if $(filter 1,$(words $(modname))),\
+                 -D"KBUILD_MODNAME=KBUILD_STR($(call name-fix,$(modname)))")
+
+_c_flags       = $(CFLAGS) $(EXTRA_CFLAGS) $(CFLAGS_$(*F).o)
+_a_flags       = $(AFLAGS) $(EXTRA_AFLAGS) $(AFLAGS_$(*F).o)
+_cpp_flags     = $(CPPFLAGS) $(EXTRA_CPPFLAGS) $(CPPFLAGS_$(@F))
+
+# If building the kernel in a separate objtree expand all occurrences
+# of -Idir to -I$(srctree)/dir except for absolute paths (starting with '/').
+
+ifeq ($(KBUILD_SRC),)
+__c_flags       = $(_c_flags)
+__a_flags       = $(_a_flags)
+__cpp_flags     = $(_cpp_flags)
+else
+
+# -I$(obj) locates generated .h files
+# $(call addtree,-I$(obj)) locates .h files in srctree, from generated .c files
+#   and locates generated .h files
+# FIXME: Replace both with specific CFLAGS* statements in the makefiles
+__c_flags       = $(call addtree,-I$(obj)) $(call flags,_c_flags)
+__a_flags       =                          $(call flags,_a_flags)
+__cpp_flags     =                          $(call flags,_cpp_flags)
+endif
+
+c_flags        = -Wp,-MD,$(depfile) $(NOSTDINC_FLAGS) $(CPPFLAGS) \
+                 $(__c_flags) $(modkern_cflags) \
+                 -D"KBUILD_STR(s)=\#s" $(basename_flags) $(modname_flags)
+
+a_flags        = -Wp,-MD,$(depfile) $(NOSTDINC_FLAGS) $(CPPFLAGS) \
+                 $(__a_flags) $(modkern_aflags)
+
+cpp_flags      = -Wp,-MD,$(depfile) $(NOSTDINC_FLAGS) $(__cpp_flags)
+
+ld_flags       = $(LDFLAGS) $(EXTRA_LDFLAGS)
+
+# Finds the multi-part object the current object will be linked into
+modname-multi = $(sort $(foreach m,$(multi-used),\
+                $(if $(filter $(subst $(obj)/,,$*.o), $($(m:.o=-objs)) $($(m:.o=-y))),$(m:.o=))))
+
+# Shipped files
+# ===========================================================================
+
+quiet_cmd_shipped = SHIPPED $@
+cmd_shipped = cat $< > $@
+
+$(obj)/%:: $(src)/%_shipped
+        $(call cmd,shipped)
+
+# Commands useful for building a boot image
+# ===========================================================================
+# 
+#       Use as following:
+#
+#       target: source(s) FORCE
+#               $(if_changed,ld/objcopy/gzip)
+#
+#       and add target to EXTRA_TARGETS so that we know we have to
+#       read in the saved command line
+
+# Linking
+# ---------------------------------------------------------------------------
+
+quiet_cmd_ld = LD      $@
+cmd_ld = $(LD) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LDFLAGS_$(@F)) \
+               $(filter-out FORCE,$^) -o $@ 
+
+# Objcopy
+# ---------------------------------------------------------------------------
+
+quiet_cmd_objcopy = OBJCOPY $@
+cmd_objcopy = $(OBJCOPY) $(OBJCOPYFLAGS) $(OBJCOPYFLAGS_$(@F)) $< $@
+
+# Gzip
+# ---------------------------------------------------------------------------
+
+quiet_cmd_gzip = GZIP    $@
+cmd_gzip = gzip -f -9 < $< > $@
+
+
diff --git a/scripts/basic/Makefile b/scripts/basic/Makefile
new file mode 100644
index 000000000..f22e94c3a
--- /dev/null
+++ b/scripts/basic/Makefile
@@ -0,0 +1,18 @@
+###
+# Makefile.basic list the most basic programs used during the build process.
+# The programs listed herein is what is needed to do the basic stuff,
+# such as splitting .config and fix dependency file.
+# This initial step is needed to avoid files to be recompiled
+# when kernel configuration changes (which is what happens when
+# .config is included by main Makefile.
+# ---------------------------------------------------------------------------
+# fixdep:        Used to generate dependency information during build process
+# split-include: Divide all config symbols up in a number of files in
+#                include/config/...
+# docproc:       Used in Documentation/docbook
+
+hostprogs-y     := fixdep split-include docproc
+always          := $(hostprogs-y)
+
+# fixdep is needed to compile other host programs
+$(addprefix $(obj)/,$(filter-out fixdep,$(always))): $(obj)/fixdep
diff --git a/scripts/basic/docproc.c b/scripts/basic/docproc.c
new file mode 100644
index 000000000..cb02baa63
--- /dev/null
+++ b/scripts/basic/docproc.c
@@ -0,0 +1,398 @@
+/*
+ *      docproc is a simple preprocessor for the template files
+ *      used as placeholders for the kernel internal documentation.
+ *      docproc is used for documentation-frontend and
+ *      dependency-generator.
+ *      The two usages have in common that they require
+ *      some knowledge of the .tmpl syntax, therefore they
+ *      are kept together.
+ *
+ *      documentation-frontend
+ *              Scans the template file and call kernel-doc for
+ *              all occurrences of ![EIF]file
+ *              Beforehand each referenced file are scanned for
+ *              any exported sympols "EXPORT_SYMBOL()" statements.
+ *              This is used to create proper -function and
+ *              -nofunction arguments in calls to kernel-doc.
+ *              Usage: docproc doc file.tmpl
+ *
+ *      dependency-generator:
+ *              Scans the template file and list all files
+ *              referenced in a format recognized by make.
+ *              Usage:  docproc depend file.tmpl
+ *              Writes dependency information to stdout
+ *              in the following format:
+ *              file.tmpl src.c src2.c
+ *              The filenames are obtained from the following constructs:
+ *              !Efilename
+ *              !Ifilename
+ *              !Dfilename
+ *              !Ffilename
+ *
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <unistd.h>
+#include <limits.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+
+/* exitstatus is used to keep track of any failing calls to kernel-doc,
+ * but execution continues. */
+int exitstatus = 0;
+
+typedef void DFL(char *);
+DFL *defaultline;
+
+typedef void FILEONLY(char * file);
+FILEONLY *internalfunctions;
+FILEONLY *externalfunctions;
+FILEONLY *symbolsonly;
+
+typedef void FILELINE(char * file, char * line);
+FILELINE * singlefunctions;
+FILELINE * entity_system;
+
+#define MAXLINESZ     2048
+#define MAXFILES      250
+#define KERNELDOCPATH "scripts/"
+#define KERNELDOC     "kernel-doc"
+#define DOCBOOK       "-docbook"
+#define FUNCTION      "-function"
+#define NOFUNCTION    "-nofunction"
+
+void usage (void)
+{
+        fprintf(stderr, "Usage: docproc {doc|depend} file\n");
+        fprintf(stderr, "Input is read from file.tmpl. Output is sent to stdout\n");
+        fprintf(stderr, "doc: frontend when generating kernel documentation\n");
+        fprintf(stderr, "depend: generate list of files referenced within file\n");
+}
+
+/*
+ * Execute kernel-doc with parameters givin in svec
+ */
+void exec_kernel_doc(char **svec)
+{
+        pid_t pid;
+        int ret;
+        char real_filename[PATH_MAX + 1];
+        /* Make sure output generated so far are flushed */
+        fflush(stdout);
+        switch(pid=fork()) {
+                case -1:
+                        perror("fork");
+                        exit(1);
+                case  0:
+                        memset(real_filename, 0, sizeof(real_filename));
+                        strncat(real_filename, getenv("SRCTREE"), PATH_MAX);
+                        strncat(real_filename, KERNELDOCPATH KERNELDOC,
+                                        PATH_MAX - strlen(real_filename));
+                        execvp(real_filename, svec);
+                        fprintf(stderr, "exec ");
+                        perror(real_filename);
+                        exit(1);
+                default:
+                        waitpid(pid, &ret ,0);
+        }
+        if (WIFEXITED(ret))
+                exitstatus |= WEXITSTATUS(ret);
+        else
+                exitstatus = 0xff;
+}
+
+/* Types used to create list of all exported symbols in a number of files */
+struct symbols
+{
+        char *name;
+};
+
+struct symfile
+{
+        char *filename;
+        struct symbols *symbollist;
+        int symbolcnt;
+};
+
+struct symfile symfilelist[MAXFILES];
+int symfilecnt = 0;
+
+void add_new_symbol(struct symfile *sym, char * symname)
+{
+        sym->symbollist =
+          realloc(sym->symbollist, (sym->symbolcnt + 1) * sizeof(char *));
+        sym->symbollist[sym->symbolcnt++].name = strdup(symname);
+}
+
+/* Add a filename to the list */
+struct symfile * add_new_file(char * filename)
+{
+        symfilelist[symfilecnt++].filename = strdup(filename);
+        return &symfilelist[symfilecnt - 1];
+}
+/* Check if file already are present in the list */
+struct symfile * filename_exist(char * filename)
+{
+        int i;
+        for (i=0; i < symfilecnt; i++)
+                if (strcmp(symfilelist[i].filename, filename) == 0)
+                        return &symfilelist[i];
+        return NULL;
+}
+
+/*
+ * List all files referenced within the template file.
+ * Files are separated by tabs.
+ */
+void adddep(char * file)                   { printf("\t%s", file); }
+void adddep2(char * file, char * line)     { line = line; adddep(file); }
+void noaction(char * line)                 { line = line; }
+void noaction2(char * file, char * line)   { file = file; line = line; }
+
+/* Echo the line without further action */
+void printline(char * line)               { printf("%s", line); }
+
+/*
+ * Find all symbols exported with EXPORT_SYMBOL and EXPORT_SYMBOL_GPL
+ * in filename.
+ * All symbols located are stored in symfilelist.
+ */
+void find_export_symbols(char * filename)
+{
+        FILE * fp;
+        struct symfile *sym;
+        char line[MAXLINESZ];
+        if (filename_exist(filename) == NULL) {
+                char real_filename[PATH_MAX + 1];
+                memset(real_filename, 0, sizeof(real_filename));
+                strncat(real_filename, getenv("SRCTREE"), PATH_MAX);
+                strncat(real_filename, filename,
+                                PATH_MAX - strlen(real_filename));
+                sym = add_new_file(filename);
+                fp = fopen(real_filename, "r");
+                if (fp == NULL)
+                {
+                        fprintf(stderr, "docproc: ");
+                        perror(real_filename);
+                }
+                while(fgets(line, MAXLINESZ, fp)) {
+                        char *p;
+                        char *e;
+                        if (((p = strstr(line, "EXPORT_SYMBOL_GPL")) != 0) ||
+                            ((p = strstr(line, "EXPORT_SYMBOL")) != 0)) {
+                                /* Skip EXPORT_SYMBOL{_GPL} */
+                                while (isalnum(*p) || *p == '_')
+                                        p++;
+                                /* Remove paranteses and additional ws */
+                                while (isspace(*p))
+                                        p++;
+                                if (*p != '(')
+                                        continue; /* Syntax error? */
+                                else
+                                        p++;
+                                while (isspace(*p))
+                                        p++;
+                                e = p;
+                                while (isalnum(*e) || *e == '_')
+                                        e++;
+                                *e = '\0';
+                                add_new_symbol(sym, p);
+                        }
+                }
+                fclose(fp);
+        }
+}
+
+/*
+ * Document all external or internal functions in a file.
+ * Call kernel-doc with following parameters:
+ * kernel-doc -docbook -nofunction function_name1 filename
+ * function names are obtained from all the the src files
+ * by find_export_symbols.
+ * intfunc uses -nofunction
+ * extfunc uses -function
+ */
+void docfunctions(char * filename, char * type)
+{
+        int i,j;
+        int symcnt = 0;
+        int idx = 0;
+        char **vec;
+
+        for (i=0; i <= symfilecnt; i++)
+                symcnt += symfilelist[i].symbolcnt;
+        vec = malloc((2 + 2 * symcnt + 2) * sizeof(char*));
+        if (vec == NULL) {
+                perror("docproc: ");
+                exit(1);
+        }
+        vec[idx++] = KERNELDOC;
+        vec[idx++] = DOCBOOK;
+        for (i=0; i < symfilecnt; i++) {
+                struct symfile * sym = &symfilelist[i];
+                for (j=0; j < sym->symbolcnt; j++) {
+                        vec[idx++]     = type;
+                        vec[idx++] = sym->symbollist[j].name;
+                }
+        }
+        vec[idx++]     = filename;
+        vec[idx] = NULL;
+        printf("<!-- %s -->\n", filename);
+        exec_kernel_doc(vec);
+        fflush(stdout);
+        free(vec);
+}
+void intfunc(char * filename) { docfunctions(filename, NOFUNCTION); }
+void extfunc(char * filename) { docfunctions(filename, FUNCTION);   }
+
+/*
+ * Document spåecific function(s) in a file.
+ * Call kernel-doc with the following parameters:
+ * kernel-doc -docbook -function function1 [-function function2]
+ */
+void singfunc(char * filename, char * line)
+{
+        char *vec[200]; /* Enough for specific functions */
+        int i, idx = 0;
+        int startofsym = 1;
+        vec[idx++] = KERNELDOC;
+        vec[idx++] = DOCBOOK;
+
+        /* Split line up in individual parameters preceeded by FUNCTION */
+        for (i=0; line[i]; i++) {
+                if (isspace(line[i])) {
+                        line[i] = '\0';
+                        startofsym = 1;
+                        continue;
+                }
+                if (startofsym) {
+                        startofsym = 0;
+                        vec[idx++] = FUNCTION;
+                        vec[idx++] = &line[i];
+                }
+        }
+        vec[idx++] = filename;
+        vec[idx] = NULL;
+        exec_kernel_doc(vec);
+}
+
+/*
+ * Parse file, calling action specific functions for:
+ * 1) Lines containing !E
+ * 2) Lines containing !I
+ * 3) Lines containing !D
+ * 4) Lines containing !F
+ * 5) Default lines - lines not matching the above
+ */
+void parse_file(FILE *infile)
+{
+        char line[MAXLINESZ];
+        char * s;
+        while(fgets(line, MAXLINESZ, infile)) {
+                if (line[0] == '!') {
+                        s = line + 2;
+                        switch (line[1]) {
+                                case 'E':
+                                        while (*s && !isspace(*s)) s++;
+                                        *s = '\0';
+                                        externalfunctions(line+2);
+                                        break;
+                                case 'I':
+                                        while (*s && !isspace(*s)) s++;
+                                        *s = '\0';
+                                        internalfunctions(line+2);
+                                        break;
+                                case 'D':
+                                        while (*s && !isspace(*s)) s++;
+                                        *s = '\0';
+                                        symbolsonly(line+2);
+                                        break;
+                                case 'F':
+                                        /* filename */
+                                        while (*s && !isspace(*s)) s++;
+                                        *s++ = '\0';
+                                        /* function names */
+                                        while (isspace(*s))
+                                                s++;
+                                        singlefunctions(line +2, s);
+                                        break;
+                                default:
+                                        defaultline(line);
+                        }
+                }
+                else {
+                        defaultline(line);
+                }
+        }
+        fflush(stdout);
+}
+
+
+int main(int argc, char *argv[])
+{
+        FILE * infile;
+        if (argc != 3) {
+                usage();
+                exit(1);
+        }
+        /* Open file, exit on error */
+        infile = fopen(argv[2], "r");
+        if (infile == NULL) {
+                fprintf(stderr, "docproc: ");
+                perror(argv[2]);
+                exit(2);
+        }
+
+        if (strcmp("doc", argv[1]) == 0)
+        {
+                /* Need to do this in two passes.
+                 * First pass is used to collect all symbols exported
+                 * in the various files.
+                 * Second pass generate the documentation.
+                 * This is required because function are declared
+                 * and exported in different files :-((
+                 */
+                /* Collect symbols */
+                defaultline       = noaction;
+                internalfunctions = find_export_symbols;
+                externalfunctions = find_export_symbols;
+                symbolsonly       = find_export_symbols;
+                singlefunctions   = noaction2;
+                parse_file(infile);
+
+                /* Rewind to start from beginning of file again */
+                fseek(infile, 0, SEEK_SET);
+                defaultline       = printline;
+                internalfunctions = intfunc;
+                externalfunctions = extfunc;
+                symbolsonly       = printline;
+                singlefunctions   = singfunc;
+
+                parse_file(infile);
+        }
+        else if (strcmp("depend", argv[1]) == 0)
+        {
+                /* Create first part of dependency chain
+                 * file.tmpl */
+                printf("%s\t", argv[2]);
+                defaultline       = noaction;
+                internalfunctions = adddep;
+                externalfunctions = adddep;
+                symbolsonly       = adddep;
+                singlefunctions   = adddep2;
+                parse_file(infile);
+                printf("\n");
+        }
+        else
+        {
+                fprintf(stderr, "Unknown option: %s\n", argv[1]);
+                exit(1);
+        }
+        fclose(infile);
+        fflush(stdout);
+        return exitstatus;
+}
+
diff --git a/scripts/basic/fixdep.c b/scripts/basic/fixdep.c
new file mode 100644
index 000000000..cc2c6541b
--- /dev/null
+++ b/scripts/basic/fixdep.c
@@ -0,0 +1,393 @@
+/*
+ * "Optimize" a list of dependencies as spit out by gcc -MD
+ * for the kernel build
+ * ===========================================================================
+ *
+ * Author       Kai Germaschewski
+ * Copyright    2002 by Kai Germaschewski  <kai.germaschewski@gmx.de>
+ *
+ * This software may be used and distributed according to the terms
+ * of the GNU General Public License, incorporated herein by reference.
+ *
+ *
+ * Introduction:
+ *
+ * gcc produces a very nice and correct list of dependencies which
+ * tells make when to remake a file.
+ *
+ * To use this list as-is however has the drawback that virtually
+ * every file in the kernel includes <linux/config.h> which then again
+ * includes <linux/autoconf.h>
+ *
+ * If the user re-runs make *config, linux/autoconf.h will be
+ * regenerated.  make notices that and will rebuild every file which
+ * includes autoconf.h, i.e. basically all files. This is extremely
+ * annoying if the user just changed CONFIG_HIS_DRIVER from n to m.
+ *
+ * So we play the same trick that "mkdep" played before. We replace
+ * the dependency on linux/autoconf.h by a dependency on every config
+ * option which is mentioned in any of the listed prequisites.
+ *
+ * To be exact, split-include populates a tree in include/config/,
+ * e.g. include/config/his/driver.h, which contains the #define/#undef
+ * for the CONFIG_HIS_DRIVER option.
+ *
+ * So if the user changes his CONFIG_HIS_DRIVER option, only the objects
+ * which depend on "include/linux/config/his/driver.h" will be rebuilt,
+ * so most likely only his driver ;-)
+ *
+ * The idea above dates, by the way, back to Michael E Chastain, AFAIK.
+ *
+ * So to get dependencies right, there are two issues:
+ * o if any of the files the compiler read changed, we need to rebuild
+ * o if the command line given to the compile the file changed, we
+ *   better rebuild as well.
+ *
+ * The former is handled by using the -MD output, the later by saving
+ * the command line used to compile the old object and comparing it
+ * to the one we would now use.
+ *
+ * Again, also this idea is pretty old and has been discussed on
+ * kbuild-devel a long time ago. I don't have a sensibly working
+ * internet connection right now, so I rather don't mention names
+ * without double checking.
+ *
+ * This code here has been based partially based on mkdep.c, which
+ * says the following about its history:
+ *
+ *   Copyright abandoned, Michael Chastain, <mailto:mec@shout.net>.
+ *   This is a C version of syncdep.pl by Werner Almesberger.
+ *
+ *
+ * It is invoked as
+ *
+ *   fixdep <depfile> <target> <cmdline>
+ *
+ * and will read the dependency file <depfile>
+ *
+ * The transformed dependency snipped is written to stdout.
+ *
+ * It first generates a line
+ *
+ *   cmd_<target> = <cmdline>
+ *
+ * and then basically copies the .<target>.d file to stdout, in the
+ * process filtering out the dependency on linux/autoconf.h and adding
+ * dependencies on include/config/my/option.h for every
+ * CONFIG_MY_OPTION encountered in any of the prequisites.
+ *
+ * It will also filter out all the dependencies on *.ver. We need
+ * to make sure that the generated version checksum are globally up
+ * to date before even starting the recursive build, so it's too late
+ * at this point anyway.
+ *
+ * The algorithm to grep for "CONFIG_..." is bit unusual, but should
+ * be fast ;-) We don't even try to really parse the header files, but
+ * merely grep, i.e. if CONFIG_FOO is mentioned in a comment, it will
+ * be picked up as well. It's not a problem with respect to
+ * correctness, since that can only give too many dependencies, thus
+ * we cannot miss a rebuild. Since people tend to not mention totally
+ * unrelated CONFIG_ options all over the place, it's not an
+ * efficiency problem either.
+ *
+ * (Note: it'd be easy to port over the complete mkdep state machine,
+ *  but I don't think the added complexity is worth it)
+ */
+/*
+ * Note 2: if somebody writes HELLO_CONFIG_BOOM in a file, it will depend onto
+ * CONFIG_BOOM. This could seem a bug (not too hard to fix), but please do not
+ * fix it! Some UserModeLinux files (look at arch/um/) call CONFIG_BOOM as
+ * UML_CONFIG_BOOM, to avoid conflicts with /usr/include/linux/autoconf.h,
+ * through arch/um/include/uml-config.h; this fixdep "bug" makes sure that
+ * those files will have correct dependencies.
+ */
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/mman.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <limits.h>
+#include <ctype.h>
+#include <arpa/inet.h>
+
+#define INT_CONF ntohl(0x434f4e46)
+#define INT_ONFI ntohl(0x4f4e4649)
+#define INT_NFIG ntohl(0x4e464947)
+#define INT_FIG_ ntohl(0x4649475f)
+
+char *target;
+char *depfile;
+char *cmdline;
+
+void usage(void)
+
+{
+        fprintf(stderr, "Usage: fixdep <depfile> <target> <cmdline>\n");
+        exit(1);
+}
+
+/*
+ * Print out the commandline prefixed with cmd_<target filename> :=
+ */
+void print_cmdline(void)
+{
+        printf("cmd_%s := %s\n\n", target, cmdline);
+}
+
+char * str_config  = NULL;
+int    size_config = 0;
+int    len_config  = 0;
+
+/*
+ * Grow the configuration string to a desired length.
+ * Usually the first growth is plenty.
+ */
+void grow_config(int len)
+{
+        while (len_config + len > size_config) {
+                if (size_config == 0)
+                        size_config = 2048;
+                str_config = realloc(str_config, size_config *= 2);
+                if (str_config == NULL)
+                        { perror("fixdep:malloc"); exit(1); }
+        }
+}
+
+
+
+/*
+ * Lookup a value in the configuration string.
+ */
+int is_defined_config(const char * name, int len)
+{
+        const char * pconfig;
+        const char * plast = str_config + len_config - len;
+        for ( pconfig = str_config + 1; pconfig < plast; pconfig++ ) {
+                if (pconfig[ -1] == '\n'
+                &&  pconfig[len] == '\n'
+                &&  !memcmp(pconfig, name, len))
+                        return 1;
+        }
+        return 0;
+}
+
+/*
+ * Add a new value to the configuration string.
+ */
+void define_config(const char * name, int len)
+{
+        grow_config(len + 1);
+
+        memcpy(str_config+len_config, name, len);
+        len_config += len;
+        str_config[len_config++] = '\n';
+}
+
+/*
+ * Clear the set of configuration strings.
+ */
+void clear_config(void)
+{
+        len_config = 0;
+        define_config("", 0);
+}
+
+/*
+ * Record the use of a CONFIG_* word.
+ */
+void use_config(char *m, int slen)
+{
+        char s[PATH_MAX];
+        char *p;
+
+        if (is_defined_config(m, slen))
+            return;
+
+        define_config(m, slen);
+
+        memcpy(s, m, slen); s[slen] = 0;
+
+        for (p = s; p < s + slen; p++) {
+                if (*p == '_')
+                        *p = '/';
+                else
+                        *p = tolower((int)*p);
+        }
+        printf("    $(wildcard include/config/%s.h) \\\n", s);
+}
+
+void parse_config_file(char *map, size_t len)
+{
+        int *end = (int *) (map + len);
+        /* start at +1, so that p can never be < map */
+        int *m   = (int *) map + 1;
+        char *p, *q;
+
+        for (; m < end; m++) {
+                if (*m == INT_CONF) { p = (char *) m  ; goto conf; }
+                if (*m == INT_ONFI) { p = (char *) m-1; goto conf; }
+                if (*m == INT_NFIG) { p = (char *) m-2; goto conf; }
+                if (*m == INT_FIG_) { p = (char *) m-3; goto conf; }
+                continue;
+        conf:
+                if (p > map + len - 7)
+                        continue;
+                if (memcmp(p, "CONFIG_", 7))
+                        continue;
+                for (q = p + 7; q < map + len; q++) {
+                        if (!(isalnum(*q) || *q == '_'))
+                                goto found;
+                }
+                continue;
+
+        found:
+                use_config(p+7, q-p-7);
+        }
+}
+
+/* test is s ends in sub */
+int strrcmp(char *s, char *sub)
+{
+        int slen = strlen(s);
+        int sublen = strlen(sub);
+
+        if (sublen > slen)
+                return 1;
+
+        return memcmp(s + slen - sublen, sub, sublen);
+}
+
+void do_config_file(char *filename)
+{
+        struct stat st;
+        int fd;
+        void *map;
+
+        fd = open(filename, O_RDONLY);
+        if (fd < 0) {
+                fprintf(stderr, "fixdep: ");
+                perror(filename);
+                exit(2);
+        }
+        fstat(fd, &st);
+        if (st.st_size == 0) {
+                close(fd);
+                return;
+        }
+        map = mmap(NULL, st.st_size, PROT_READ, MAP_PRIVATE, fd, 0);
+        if ((long) map == -1) {
+                perror("fixdep: mmap");
+                close(fd);
+                return;
+        }
+
+        parse_config_file(map, st.st_size);
+
+        munmap(map, st.st_size);
+
+        close(fd);
+}
+
+void parse_dep_file(void *map, size_t len)
+{
+        char *m = map;
+        char *end = m + len;
+        char *p;
+        char s[PATH_MAX];
+
+        p = strchr(m, ':');
+        if (!p) {
+                fprintf(stderr, "fixdep: parse error\n");
+                exit(1);
+        }
+        memcpy(s, m, p-m); s[p-m] = 0;
+        printf("deps_%s := \\\n", target);
+        m = p+1;
+
+        clear_config();
+
+        while (m < end) {
+                while (m < end && (*m == ' ' || *m == '\\' || *m == '\n'))
+                        m++;
+                p = m;
+                while (p < end && *p != ' ') p++;
+                if (p == end) {
+                        do p--; while (!isalnum(*p));
+                        p++;
+                }
+                memcpy(s, m, p-m); s[p-m] = 0;
+                if (strrcmp(s, "include/autoconf.h") &&
+                    strrcmp(s, "arch/um/include/uml-config.h") &&
+                    strrcmp(s, ".ver")) {
+                        printf("  %s \\\n", s);
+                        do_config_file(s);
+                }
+                m = p + 1;
+        }
+        printf("\n%s: $(deps_%s)\n\n", target, target);
+        printf("$(deps_%s):\n", target);
+}
+
+void print_deps(void)
+{
+        struct stat st;
+        int fd;
+        void *map;
+
+        fd = open(depfile, O_RDONLY);
+        if (fd < 0) {
+                fprintf(stderr, "fixdep: ");
+                perror(depfile);
+                exit(2);
+        }
+        fstat(fd, &st);
+        if (st.st_size == 0) {
+                fprintf(stderr,"fixdep: %s is empty\n",depfile);
+                close(fd);
+                return;
+        }
+        map = mmap(NULL, st.st_size, PROT_READ, MAP_PRIVATE, fd, 0);
+        if ((long) map == -1) {
+                perror("fixdep: mmap");
+                close(fd);
+                return;
+        }
+
+        parse_dep_file(map, st.st_size);
+
+        munmap(map, st.st_size);
+
+        close(fd);
+}
+
+void traps(void)
+{
+        static char test[] __attribute__((aligned(sizeof(int)))) = "CONF";
+
+        if (*(int *)test != INT_CONF) {
+                fprintf(stderr, "fixdep: sizeof(int) != 4 or wrong endianess? %#x\n",
+                        *(int *)test);
+                exit(2);
+        }
+}
+
+int main(int argc, char *argv[])
+{
+        traps();
+
+        if (argc != 4)
+                usage();
+
+        depfile = argv[1];
+        target = argv[2];
+        cmdline = argv[3];
+
+        print_cmdline();
+        print_deps();
+
+        return 0;
+}
diff --git a/scripts/basic/split-include.c b/scripts/basic/split-include.c
new file mode 100644
index 000000000..459c45276
--- /dev/null
+++ b/scripts/basic/split-include.c
@@ -0,0 +1,226 @@
+/*
+ * split-include.c
+ *
+ * Copyright abandoned, Michael Chastain, <mailto:mec@shout.net>.
+ * This is a C version of syncdep.pl by Werner Almesberger.
+ *
+ * This program takes autoconf.h as input and outputs a directory full
+ * of one-line include files, merging onto the old values.
+ *
+ * Think of the configuration options as key-value pairs.  Then there
+ * are five cases:
+ *
+ *    key      old value   new value   action
+ *
+ *    KEY-1    VALUE-1     VALUE-1     leave file alone
+ *    KEY-2    VALUE-2A    VALUE-2B    write VALUE-2B into file
+ *    KEY-3    -           VALUE-3     write VALUE-3  into file
+ *    KEY-4    VALUE-4     -           write an empty file
+ *    KEY-5    (empty)     -           leave old empty file alone
+ */
+
+#include <sys/stat.h>
+#include <sys/types.h>
+
+#include <ctype.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#define ERROR_EXIT(strExit)                                             \
+    {                                                                   \
+        const int errnoSave = errno;                                    \
+        fprintf(stderr, "%s: ", str_my_name);                           \
+        errno = errnoSave;                                              \
+        perror((strExit));                                              \
+        exit(1);                                                        \
+    }
+
+
+
+int main(int argc, const char * argv [])
+{
+    const char * str_my_name;
+    const char * str_file_autoconf;
+    const char * str_dir_config;
+
+    FILE * fp_config;
+    FILE * fp_target;
+    FILE * fp_find;
+
+    int buffer_size;
+
+    char * line;
+    char * old_line;
+    char * list_target;
+    char * ptarget;
+
+    struct stat stat_buf;
+
+    /* Check arg count. */
+    if (argc != 3)
+    {
+        fprintf(stderr, "%s: wrong number of arguments.\n", argv[0]);
+        exit(1);
+    }
+
+    str_my_name       = argv[0];
+    str_file_autoconf = argv[1];
+    str_dir_config    = argv[2];
+
+    /* Find a buffer size. */
+    if (stat(str_file_autoconf, &stat_buf) != 0)
+        ERROR_EXIT(str_file_autoconf);
+    buffer_size = 2 * stat_buf.st_size + 4096;
+
+    /* Allocate buffers. */
+    if ( (line        = malloc(buffer_size)) == NULL
+    ||   (old_line    = malloc(buffer_size)) == NULL
+    ||   (list_target = malloc(buffer_size)) == NULL )
+        ERROR_EXIT(str_file_autoconf);
+
+    /* Open autoconfig file. */
+    if ((fp_config = fopen(str_file_autoconf, "r")) == NULL)
+        ERROR_EXIT(str_file_autoconf);
+
+    /* Make output directory if needed. */
+    if (stat(str_dir_config, &stat_buf) != 0)
+    {
+        if (mkdir(str_dir_config, 0755) != 0)
+            ERROR_EXIT(str_dir_config);
+    }
+
+    /* Change to output directory. */
+    if (chdir(str_dir_config) != 0)
+        ERROR_EXIT(str_dir_config);
+
+    /* Put initial separator into target list. */
+    ptarget = list_target;
+    *ptarget++ = '\n';
+
+    /* Read config lines. */
+    while (fgets(line, buffer_size, fp_config))
+    {
+        const char * str_config;
+        int is_same;
+        int itarget;
+
+        if (line[0] != '#')
+            continue;
+        if ((str_config = strstr(line, "CONFIG_")) == NULL)
+            continue;
+
+        /* Make the output file name. */
+        str_config += sizeof("CONFIG_") - 1;
+        for (itarget = 0; !isspace(str_config[itarget]); itarget++)
+        {
+            int c = (unsigned char) str_config[itarget];
+            if (isupper(c)) c = tolower(c);
+            if (c == '_')   c = '/';
+            ptarget[itarget] = c;
+        }
+        ptarget[itarget++] = '.';
+        ptarget[itarget++] = 'h';
+        ptarget[itarget++] = '\0';
+
+        /* Check for existing file. */
+        is_same = 0;
+        if ((fp_target = fopen(ptarget, "r")) != NULL)
+        {
+            fgets(old_line, buffer_size, fp_target);
+            if (fclose(fp_target) != 0)
+                ERROR_EXIT(ptarget);
+            if (!strcmp(line, old_line))
+                is_same = 1;
+        }
+
+        if (!is_same)
+        {
+            /* Auto-create directories. */
+            int islash;
+            for (islash = 0; islash < itarget; islash++)
+            {
+                if (ptarget[islash] == '/')
+                {
+                    ptarget[islash] = '\0';
+                    if (stat(ptarget, &stat_buf) != 0
+                    &&  mkdir(ptarget, 0755)     != 0)
+                        ERROR_EXIT( ptarget );
+                    ptarget[islash] = '/';
+                }
+            }
+
+            /* Write the file. */
+            if ((fp_target = fopen(ptarget, "w" )) == NULL)
+                ERROR_EXIT(ptarget);
+            fputs(line, fp_target);
+            if (ferror(fp_target) || fclose(fp_target) != 0)
+                ERROR_EXIT(ptarget);
+        }
+
+        /* Update target list */
+        ptarget += itarget;
+        *(ptarget-1) = '\n';
+    }
+
+    /*
+     * Close autoconfig file.
+     * Terminate the target list.
+     */
+    if (fclose(fp_config) != 0)
+        ERROR_EXIT(str_file_autoconf);
+    *ptarget = '\0';
+
+    /*
+     * Fix up existing files which have no new value.
+     * This is Case 4 and Case 5.
+     *
+     * I re-read the tree and filter it against list_target.
+     * This is crude.  But it avoids data copies.  Also, list_target
+     * is compact and contiguous, so it easily fits into cache.
+     *
+     * Notice that list_target contains strings separated by \n,
+     * with a \n before the first string and after the last.
+     * fgets gives the incoming names a terminating \n.
+     * So by having an initial \n, strstr will find exact matches.
+     */
+
+    fp_find = popen("find * -type f -name \"*.h\" -print", "r");
+    if (fp_find == 0)
+        ERROR_EXIT( "find" );
+
+    line[0] = '\n';
+    while (fgets(line+1, buffer_size, fp_find))
+    {
+        if (strstr(list_target, line) == NULL)
+        {
+            /*
+             * This is an old file with no CONFIG_* flag in autoconf.h.
+             */
+
+            /* First strip the \n. */
+            line[strlen(line)-1] = '\0';
+
+            /* Grab size. */
+            if (stat(line+1, &stat_buf) != 0)
+                ERROR_EXIT(line);
+
+            /* If file is not empty, make it empty and give it a fresh date. */
+            if (stat_buf.st_size != 0)
+            {
+                if ((fp_target = fopen(line+1, "w")) == NULL)
+                    ERROR_EXIT(line);
+                if (fclose(fp_target) != 0)
+                    ERROR_EXIT(line);
+            }
+        }
+    }
+
+    if (pclose(fp_find) != 0)
+        ERROR_EXIT("find");
+
+    return 0;
+}
diff --git a/scripts/config/Kconfig-language.txt b/scripts/config/Kconfig-language.txt
deleted file mode 100644
index 9b90bc392..000000000
--- a/scripts/config/Kconfig-language.txt
+++ /dev/null
@@ -1,255 +0,0 @@
-Introduction
-------------
-
-The configuration database is collection of configuration options
-organized in a tree structure:
-
-        +- Code maturity level options
-        |  +- Prompt for development and/or incomplete code/drivers
-        +- General setup
-        |  +- Networking support
-        |  +- System V IPC
-        |  +- BSD Process Accounting
-        |  +- Sysctl support
-        +- Loadable module support
-        |  +- Enable loadable module support
-        |     +- Set version information on all module symbols
-        |     +- Kernel module loader
-        +- ...
-
-Every entry has its own dependencies. These dependencies are used
-to determine the visible of an entry. Any child entry is only
-visible if its parent entry is also visible.
-
-Menu entries
-------------
-
-Most entries define a config option, all other entries help to organize
-them. A single configuration option is defined like this:
-
-config MODVERSIONS
-        bool "Set version information on all module symbols"
-        depends MODULES
-        help
-          Usually, modules have to be recompiled whenever you switch to a new
-          kernel.  ...
-
-Every line starts with a key word and can be followed by multiple
-arguments.  "config" starts a new config entry. The following lines
-define attributes for this config option. Attributes can be the type of
-the config option, input prompt, dependencies, help text and default
-values. A config option can be defined multiple times with the same
-name, but every definition can have only a single input prompt and the
-type must not conflict.
-
-Menu attributes
----------------
-
-A menu entry can have a number of attributes. Not all of them are
-applicable everywhere (see syntax).
-
-- type definition: "bool"/"tristate"/"string"/"hex"/"integer"
-  Every config option must have a type. There are only two basic types:
-  tristate and string, the other types base on these two. The type
-  definition optionally accepts an input prompt, so these two examples
-  are equivalent:
-
-        bool "Networking support"
-  and
-        bool
-        prompt "Networking support"
-
-- input prompt: "prompt" <prompt> ["if" <expr>]
-  Every menu entry can have at most one prompt, which is used to display
-  to the user. Optionally dependencies only for this prompt can be added
-  with "if".
-
-- default value: "default" <symbol> ["if" <expr>]
-  A config option can have any number of default values. If multiple
-  default values are visible, only the first defined one is active.
-  Default values are not limited to the menu entry, where they are
-  defined, this means the default can be defined somewhere else or be
-  overridden by an earlier definition.
-  The default value is only assigned to the config symbol if no other
-  value was set by the user (via the input prompt above). If an input
-  prompt is visible the default value is presented to the user and can
-  be overridden by him.
-  Optionally dependencies only for this default value can be added with
-  "if".
-
-- dependencies: "depends on"/"requires" <expr>
-  This defines a dependency for this menu entry. If multiple
-  dependencies are defined they are connected with '&&'. Dependencies
-  are applied to all other options within this menu entry (which also
-  accept "if" expression), so these two examples are equivalent:
-
-        bool "foo" if BAR
-        default y if BAR
-  and
-        depends on BAR
-        bool "foo"
-        default y
-
-- help text: "help"
-  This defines a help text. The end of the help text is determined by
-  the level indentation, this means it ends at the first line which has
-  a smaller indentation than the first line of the help text.
-
-
-Menu dependencies
------------------
-
-Dependencies define the visibility of a menu entry and can also reduce
-the input range of tristate symbols. The tristate logic used in the
-expressions uses one more state than normal boolean logic to express the
-module state. Dependency expressions have the following syntax:
-
-<expr> ::= <symbol>                             (1)
-           <symbol> '=' <symbol>                (2)
-           <symbol> '!=' <symbol>               (3)
-           '(' <expr> ')'                       (4)
-           '!' <expr>                           (5)
-           <expr> '||' <expr>                   (6)
-           <expr> '&&' <expr>                   (7)
-
-Expressions are listed in decreasing order of precedence.
-
-(1) Convert the symbol into an expression. Boolean and tristate symbols
-    are simply converted into the respective expression values. All
-    other symbol types result in 'n'.
-(2) If the values of both symbols are equal, it returns 'y',
-    otherwise 'n'.
-(3) If the values of both symbols are equal, it returns 'n',
-    otherwise 'y'.
-(4) Returns the value of the expression. Used to override precedence.
-(5) Returns the result of (2-/expr/).
-(6) Returns the result of min(/expr/, /expr/).
-(7) Returns the result of max(/expr/, /expr/).
-
-An expression can have a value of 'n', 'm' or 'y' (or 0, 1, 2
-respectively for calculations). A menu entry becomes visible when it's
-expression evaluates to 'm' or 'y'.
-
-There are two type of symbols: constant and nonconstant symbols.
-Nonconstant symbols are the most common ones and are defined with the
-'config' statement. Nonconstant symbols consist entirely of alphanumeric
-characters or underscores.
-Constant symbols are only part of expressions. Constant symbols are
-always surrounded by single or double quotes. Within the quote any
-other character is allowed and the quotes can be escaped using '\'.
-
-Menu structure
---------------
-
-The position of a menu entry in the tree is determined in two ways. First
-it can be specified explicitely:
-
-menu "Network device support"
-        depends NET
-
-config NETDEVICES
-        ...
-
-endmenu
-
-All entries within the "menu" ... "endmenu" block become a submenu of
-"Network device support". All subentries inherit the dependencies from
-the menu entry, e.g. this means the dependency "NET" is added to the
-dependency list of the config option NETDEVICES.
-
-The other way to generate the menu structure is done by analyzing the
-dependencies. If a menu entry somehow depends on the previous entry, it
-can be made a submenu of it. First the the previous (parent) symbol must
-be part of the dependency list and then one of these two condititions
-must be true:
-- the child entry must become invisible, if the parent is set to 'n'
-- the child entry must only be visible, if the parent is visible
-
-config MODULES
-        bool "Enable loadable module support"
-
-config MODVERSIONS
-        bool "Set version information on all module symbols"
-        depends MODULES
-
-comment "module support disabled"
-        depends !MODULES
-
-MODVERSIONS directly depends on MODULES, this means it's only visible if
-MODULES is different from 'n'. The comment on the other hand is always
-visible when MODULES it's visible (the (empty) dependency of MODULES is
-also part of the comment dependencies).
-
-
-Kconfig syntax
---------------
-
-The configuration file describes a series of menu entries, where every
-line starts with a keyword (except help texts). The following keywords
-end a menu entry:
-- config
-- choice/endchoice
-- comment
-- menu/endmenu
-- if/endif
-- source
-The first four also start the definition of a menu entry.
-
-config:
-
-        "config" <symbol>
-        <config options>
-
-This defines a config symbol <symbol> and accepts any of above
-attributes as options.
-
-choices:
-
-        "choice"
-        <choice options>
-        <choice block>
-        "endchoice"
-
-This defines a choice group and accepts any of above attributes as
-options. A choice can only be of type bool or tristate, while a boolean
-choice only allows a single config entry to be selected, a tristate
-choice also allows any number of config entries to be set to 'm'. This
-can be used if multiple drivers for a single hardware exists and only a
-single driver can be compiled/loaded into the kernel, but all drivers
-can be compiled as modules.
-A choice accepts another option "optional", which allows to set the
-choice to 'n' and no entry needs to be selected.
-
-comment:
-
-        "comment" <prompt>
-        <comment options>
-
-This defines a comment which is displayed to the user during the
-configuration process and is also echoed to the output files. The only
-possible options are dependencies.
-
-menu:
-
-        "menu" <prompt>
-        <menu options>
-        <menu block>
-        "endmenu"
-
-This defines a menu block, see "Menu structure" above for more
-information. The only possible options are dependencies.
-
-if:
-
-        "if" <expr>
-        <if block>
-        "endif"
-
-This defines an if block. The dependency expression <expr> is appended
-to all enclosed menu entries.
-
-source:
-
-        "source" <prompt>
-
-This reads the specified configuration file. This file is always parsed.
diff --git a/scripts/config/Makefile b/scripts/config/Makefile
deleted file mode 100644
index 4c966f7a6..000000000
--- a/scripts/config/Makefile
+++ /dev/null
@@ -1,122 +0,0 @@
-# Makefile for BusyBox
-#
-# Copyright (C) 2002 Erik Andersen <andersen@codepoet.org>
-
-top_srcdir=../..
-top_builddir=../..
-srcdir=$(top_srcdir)/scripts/config
-include $(top_srcdir)/Rules.mak
-
-all: ncurses conf mconf
-
-ifeq ($(shell uname),SunOS)
-LIBS = -lcurses
-else
-LIBS = -lncurses
-endif
-ifeq (/usr/include/ncurses/ncurses.h, $(wildcard /usr/include/ncurses/ncurses.h))
-        HOSTNCURSES += -I/usr/include/ncurses -DCURSES_LOC="<ncurses.h>"
-else
-ifeq (/usr/include/ncurses/curses.h, $(wildcard /usr/include/ncurses/curses.h))
-        HOSTNCURSES += -I/usr/include/ncurses -DCURSES_LOC="<ncurses/curses.h>"
-else
-ifeq (/usr/local/include/ncurses/ncurses.h, $(wildcard /usr/local/include/ncurses/ncurses.h))
-        HOSTCFLAGS += -I/usr/local/include/ncurses -DCURSES_LOC="<ncurses.h>"
-else
-ifeq (/usr/local/include/ncurses/curses.h, $(wildcard /usr/local/include/ncurses/curses.h))
-        HOSTCFLAGS += -I/usr/local/include/ncurses -DCURSES_LOC="<ncurses/curses.h>"
-else
-ifeq (/usr/include/ncurses.h, $(wildcard /usr/include/ncurses.h))
-        HOSTNCURSES += -DCURSES_LOC="<ncurses.h>"
-else
-        HOSTNCURSES += -DCURSES_LOC="<curses.h>"
-endif
-endif
-endif
-endif
-endif
-
-CONF_SRC     = conf.c
-MCONF_SRC    = mconf.c
-LXD_SRC      = lxdialog/checklist.c lxdialog/menubox.c lxdialog/textbox.c \
-               lxdialog/yesno.c lxdialog/inputbox.c lxdialog/util.c \
-               lxdialog/msgbox.c
-
-SHARED_SRC   = zconf.tab.c
-SHARED_DEPS := $(srcdir)/lkc.h $(srcdir)/lkc_proto.h \
-               lkc_defs.h $(srcdir)/expr.h zconf.tab.h
-CONF_OBJS    = $(patsubst %.c,%.o, $(CONF_SRC))
-MCONF_OBJS   = $(patsubst %.c,%.o, $(MCONF_SRC) $(LXD_SRC))
-SHARED_OBJS  = $(patsubst %.c,%.o, $(SHARED_SRC))
-
-conf: $(CONF_OBJS) $(SHARED_OBJS)
-        $(SECHO) "  "HOSTCC $@ ; true
-        $(Q)$(HOSTCC) $(NATIVE_LDFLAGS) $^ -o $@
-
-mconf: $(MCONF_OBJS) $(SHARED_OBJS)
-        $(SECHO) "  "HOSTCC $@ ; true
-        $(Q)$(HOSTCC) $(NATIVE_LDFLAGS) $^ -o $@ $(LIBS)
-
-$(CONF_OBJS): %.o : $(srcdir)/%.c $(SHARED_DEPS)
-        $(compile.h) -I.
-
-$(MCONF_OBJS): %.o : $(srcdir)/%.c $(SHARED_DEPS)
-        @[ -d $(@D) ] || mkdir $(@D)
-        $(compile.h) $(HOSTNCURSES) -I.
-
-lkc_defs.h: $(srcdir)/lkc_proto.h
-        @$(SED) < $< > $@ 's/P(\([^,]*\),.*/#define \1 (\*\1_p)/'
-
-###
-# The following requires flex/bison
-# By default we use the _shipped versions, uncomment the
-# following line if you are modifying the flex/bison src.
-#LKC_GENPARSER := 1
-
-ifdef LKC_GENPARSER
-
-%.tab.c %.tab.h: $(srcdir)/%.y
-        bison -t -d -v -b $* -p $(notdir $*) $<
-
-lex.%.c: $(srcdir)/%.l
-        flex -P$(notdir $*) -o$@ $<
-else
-
-lex.zconf.o: lex.zconf.c $(SHARED_DEPS)
-        $(compile.h) -I$(srcdir)
-
-lex.zconf.c: $(srcdir)/lex.zconf.c_shipped
-        $(Q)cp $< $@
-
-zconf.tab.c: $(srcdir)/zconf.tab.c_shipped
-        $(Q)cp $< $@
-
-zconf.tab.h: $(srcdir)/zconf.tab.h_shipped
-        $(Q)cp $< $@
-endif
-
-zconf.tab.o: zconf.tab.c lex.zconf.c $(srcdir)/confdata.c $(srcdir)/expr.c \
-             $(srcdir)/symbol.c $(srcdir)/menu.c $(SHARED_DEPS)
-        $(compile.h) -I$(srcdir) -I.
-
-.PHONY: ncurses
-
-ncurses:
-        @echo "main() {}" > lxtemp.c
-        @if $(HOSTCC) lxtemp.c $(LIBS) ; then \
-                rm -f lxtemp.c a.out; \
-        else \
-                rm -f lxtemp.c; \
-                echo -e "\007" ;\
-                echo ">> Unable to find the Ncurses libraries." ;\
-                echo ">>" ;\
-                echo ">> You must have Ncurses installed in order" ;\
-                echo ">> to use 'make menuconfig'" ;\
-                echo ;\
-                exit 1 ;\
-        fi
-
-clean:
-        rm -f *.o *~ core $(TARGETS) $(MCONF_OBJS) $(CONF_OBJS) \
-                conf mconf zconf.tab.c zconf.tab.h lex.zconf.c lkc_defs.h
-
diff --git a/scripts/config/lex.zconf.c_shipped b/scripts/config/lex.zconf.c_shipped
deleted file mode 100644
index 8e5e85e4c..000000000
--- a/scripts/config/lex.zconf.c_shipped
+++ /dev/null
@@ -1,3688 +0,0 @@
-
-#line 3 "lex.zconf.c"
-
-#define  YY_INT_ALIGNED short int
-
-/* A lexical scanner generated by flex */
-
-#define FLEX_SCANNER
-#define YY_FLEX_MAJOR_VERSION 2
-#define YY_FLEX_MINOR_VERSION 5
-#define YY_FLEX_SUBMINOR_VERSION 31
-#if YY_FLEX_SUBMINOR_VERSION > 0
-#define FLEX_BETA
-#endif
-
-/* First, we deal with  platform-specific or compiler-specific issues. */
-
-/* begin standard C headers. */
-#include <stdio.h>
-#include <string.h>
-#include <errno.h>
-#include <stdlib.h>
-
-/* end standard C headers. */
-
-/* flex integer type definitions */
-
-#ifndef FLEXINT_H
-#define FLEXINT_H
-
-/* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */
-
-#if defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L
-#include <inttypes.h>
-typedef int8_t flex_int8_t;
-typedef uint8_t flex_uint8_t;
-typedef int16_t flex_int16_t;
-typedef uint16_t flex_uint16_t;
-typedef int32_t flex_int32_t;
-typedef uint32_t flex_uint32_t;
-#else
-typedef signed char flex_int8_t;
-typedef short int flex_int16_t;
-typedef int flex_int32_t;
-typedef unsigned char flex_uint8_t;
-typedef unsigned short int flex_uint16_t;
-typedef unsigned int flex_uint32_t;
-#endif /* ! C99 */
-
-/* Limits of integral types. */
-#ifndef INT8_MIN
-#define INT8_MIN               (-128)
-#endif
-#ifndef INT16_MIN
-#define INT16_MIN              (-32767-1)
-#endif
-#ifndef INT32_MIN
-#define INT32_MIN              (-2147483647-1)
-#endif
-#ifndef INT8_MAX
-#define INT8_MAX               (127)
-#endif
-#ifndef INT16_MAX
-#define INT16_MAX              (32767)
-#endif
-#ifndef INT32_MAX
-#define INT32_MAX              (2147483647)
-#endif
-#ifndef UINT8_MAX
-#define UINT8_MAX              (255U)
-#endif
-#ifndef UINT16_MAX
-#define UINT16_MAX             (65535U)
-#endif
-#ifndef UINT32_MAX
-#define UINT32_MAX             (4294967295U)
-#endif
-
-#endif /* ! FLEXINT_H */
-
-#ifdef __cplusplus
-
-/* The "const" storage-class-modifier is valid. */
-#define YY_USE_CONST
-
-#else   /* ! __cplusplus */
-
-#if __STDC__
-
-#define YY_USE_CONST
-
-#endif  /* __STDC__ */
-#endif  /* ! __cplusplus */
-
-#ifdef YY_USE_CONST
-#define yyconst const
-#else
-#define yyconst
-#endif
-
-/* Returned upon end-of-file. */
-#define YY_NULL 0
-
-/* Promotes a possibly negative, possibly signed char to an unsigned
- * integer for use as an array index.  If the signed char is negative,
- * we want to instead treat it as an 8-bit unsigned char, hence the
- * double cast.
- */
-#define YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c)
-
-/* Enter a start condition.  This macro really ought to take a parameter,
- * but we do it the disgusting crufty way forced on us by the ()-less
- * definition of BEGIN.
- */
-#define BEGIN (yy_start) = 1 + 2 *
-
-/* Translate the current start state into a value that can be later handed
- * to BEGIN to return to the state.  The YYSTATE alias is for lex
- * compatibility.
- */
-#define YY_START (((yy_start) - 1) / 2)
-#define YYSTATE YY_START
-
-/* Action number for EOF rule of a given start state. */
-#define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1)
-
-/* Special action meaning "start processing a new file". */
-#define YY_NEW_FILE zconfrestart(zconfin  )
-
-#define YY_END_OF_BUFFER_CHAR 0
-
-/* Size of default input buffer. */
-#ifndef YY_BUF_SIZE
-#define YY_BUF_SIZE 16384
-#endif
-
-#ifndef YY_TYPEDEF_YY_BUFFER_STATE
-#define YY_TYPEDEF_YY_BUFFER_STATE
-typedef struct yy_buffer_state *YY_BUFFER_STATE;
-#endif
-
-extern int zconfleng;
-
-extern FILE *zconfin, *zconfout;
-
-#define EOB_ACT_CONTINUE_SCAN 0
-#define EOB_ACT_END_OF_FILE 1
-#define EOB_ACT_LAST_MATCH 2
-
-    #define YY_LESS_LINENO(n)
-
-/* Return all but the first "n" matched characters back to the input stream. */
-#define yyless(n) \
-        do \
-                { \
-                /* Undo effects of setting up zconftext. */ \
-        int yyless_macro_arg = (n); \
-        YY_LESS_LINENO(yyless_macro_arg);\
-                *yy_cp = (yy_hold_char); \
-                YY_RESTORE_YY_MORE_OFFSET \
-                (yy_c_buf_p) = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \
-                YY_DO_BEFORE_ACTION; /* set up zconftext again */ \
-                } \
-        while ( 0 )
-
-#define unput(c) yyunput( c, (yytext_ptr)  )
-
-/* The following is because we cannot portably get our hands on size_t
- * (without autoconf's help, which isn't available because we want
- * flex-generated scanners to compile on their own).
- */
-
-#ifndef YY_TYPEDEF_YY_SIZE_T
-#define YY_TYPEDEF_YY_SIZE_T
-typedef unsigned int yy_size_t;
-#endif
-
-#ifndef YY_STRUCT_YY_BUFFER_STATE
-#define YY_STRUCT_YY_BUFFER_STATE
-struct yy_buffer_state
-        {
-        FILE *yy_input_file;
-
-        char *yy_ch_buf;                /* input buffer */
-        char *yy_buf_pos;               /* current position in input buffer */
-
-        /* Size of input buffer in bytes, not including room for EOB
-         * characters.
-         */
-        yy_size_t yy_buf_size;
-
-        /* Number of characters read into yy_ch_buf, not including EOB
-         * characters.
-         */
-        int yy_n_chars;
-
-        /* Whether we "own" the buffer - i.e., we know we created it,
-         * and can realloc() it to grow it, and should free() it to
-         * delete it.
-         */
-        int yy_is_our_buffer;
-
-        /* Whether this is an "interactive" input source; if so, and
-         * if we're using stdio for input, then we want to use getc()
-         * instead of fread(), to make sure we stop fetching input after
-         * each newline.
-         */
-        int yy_is_interactive;
-
-        /* Whether we're considered to be at the beginning of a line.
-         * If so, '^' rules will be active on the next match, otherwise
-         * not.
-         */
-        int yy_at_bol;
-
-    int yy_bs_lineno; /**< The line count. */
-    int yy_bs_column; /**< The column count. */
-
-        /* Whether to try to fill the input buffer when we reach the
-         * end of it.
-         */
-        int yy_fill_buffer;
-
-        int yy_buffer_status;
-
-#define YY_BUFFER_NEW 0
-#define YY_BUFFER_NORMAL 1
-        /* When an EOF's been seen but there's still some text to process
-         * then we mark the buffer as YY_EOF_PENDING, to indicate that we
-         * shouldn't try reading from the input source any more.  We might
-         * still have a bunch of tokens to match, though, because of
-         * possible backing-up.
-         *
-         * When we actually see the EOF, we change the status to "new"
-         * (via zconfrestart()), so that the user can continue scanning by
-         * just pointing zconfin at a new input file.
-         */
-#define YY_BUFFER_EOF_PENDING 2
-
-        };
-#endif /* !YY_STRUCT_YY_BUFFER_STATE */
-
-/* Stack of input buffers. */
-static size_t yy_buffer_stack_top = 0; /**< index of top of stack. */
-static size_t yy_buffer_stack_max = 0; /**< capacity of stack. */
-static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */
-
-/* We provide macros for accessing buffer states in case in the
- * future we want to put the buffer states in a more general
- * "scanner state".
- *
- * Returns the top of the stack, or NULL.
- */
-#define YY_CURRENT_BUFFER ( (yy_buffer_stack) \
-                          ? (yy_buffer_stack)[(yy_buffer_stack_top)] \
-                          : NULL)
-
-/* Same as previous macro, but useful when we know that the buffer stack is not
- * NULL or when we need an lvalue. For internal use only.
- */
-#define YY_CURRENT_BUFFER_LVALUE (yy_buffer_stack)[(yy_buffer_stack_top)]
-
-/* yy_hold_char holds the character lost when zconftext is formed. */
-static char yy_hold_char;
-static int yy_n_chars;          /* number of characters read into yy_ch_buf */
-int zconfleng;
-
-/* Points to current character in buffer. */
-static char *yy_c_buf_p = (char *) 0;
-static int yy_init = 1;         /* whether we need to initialize */
-static int yy_start = 0;        /* start state number */
-
-/* Flag which is used to allow zconfwrap()'s to do buffer switches
- * instead of setting up a fresh zconfin.  A bit of a hack ...
- */
-static int yy_did_buffer_switch_on_eof;
-
-void zconfrestart (FILE *input_file  );
-void zconf_switch_to_buffer (YY_BUFFER_STATE new_buffer  );
-YY_BUFFER_STATE zconf_create_buffer (FILE *file,int size  );
-void zconf_delete_buffer (YY_BUFFER_STATE b  );
-void zconf_flush_buffer (YY_BUFFER_STATE b  );
-void zconfpush_buffer_state (YY_BUFFER_STATE new_buffer  );
-void zconfpop_buffer_state (void );
-
-static void zconfensure_buffer_stack (void );
-static void zconf_load_buffer_state (void );
-static void zconf_init_buffer (YY_BUFFER_STATE b,FILE *file  );
-
-#define YY_FLUSH_BUFFER zconf_flush_buffer(YY_CURRENT_BUFFER )
-
-YY_BUFFER_STATE zconf_scan_buffer (char *base,yy_size_t size  );
-YY_BUFFER_STATE zconf_scan_string (yyconst char *yy_str  );
-YY_BUFFER_STATE zconf_scan_bytes (yyconst char *bytes,int len  );
-
-void *zconfalloc (yy_size_t  );
-void *zconfrealloc (void *,yy_size_t  );
-void zconffree (void *  );
-
-#define yy_new_buffer zconf_create_buffer
-
-#define yy_set_interactive(is_interactive) \
-        { \
-        if ( ! YY_CURRENT_BUFFER ){ \
-        zconfensure_buffer_stack (); \
-                YY_CURRENT_BUFFER_LVALUE =    \
-            zconf_create_buffer(zconfin,YY_BUF_SIZE ); \
-        } \
-        YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \
-        }
-
-#define yy_set_bol(at_bol) \
-        { \
-        if ( ! YY_CURRENT_BUFFER ){\
-        zconfensure_buffer_stack (); \
-                YY_CURRENT_BUFFER_LVALUE =    \
-            zconf_create_buffer(zconfin,YY_BUF_SIZE ); \
-        } \
-        YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \
-        }
-
-#define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol)
-
-/* Begin user sect3 */
-
-#define zconfwrap(n) 1
-#define YY_SKIP_YYWRAP
-
-typedef unsigned char YY_CHAR;
-
-FILE *zconfin = (FILE *) 0, *zconfout = (FILE *) 0;
-
-typedef int yy_state_type;
-
-extern int zconflineno;
-
-int zconflineno = 1;
-
-extern char *zconftext;
-#define yytext_ptr zconftext
-static yyconst flex_int16_t yy_nxt[][38] =
-    {
-    {
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0
-    },
-
-    {
-       11,   12,   13,   14,   12,   12,   15,   12,   12,   12,
-       12,   12,   12,   12,   12,   12,   12,   12,   12,   12,
-       12,   12,   12,   12,   12,   12,   12,   12,   12,   12,
-       12,   12,   12,   12,   12,   12,   12,   12
-    },
-
-    {
-       11,   12,   13,   14,   12,   12,   15,   12,   12,   12,
-       12,   12,   12,   12,   12,   12,   12,   12,   12,   12,
-
-       12,   12,   12,   12,   12,   12,   12,   12,   12,   12,
-       12,   12,   12,   12,   12,   12,   12,   12
-    },
-
-    {
-       11,   16,   16,   17,   16,   16,   16,   16,   16,   16,
-       16,   16,   16,   18,   16,   16,   18,   18,   19,   20,
-       21,   22,   18,   18,   23,   24,   18,   25,   18,   26,
-       27,   18,   28,   29,   30,   18,   18,   16
-    },
-
-    {
-       11,   16,   16,   17,   16,   16,   16,   16,   16,   16,
-       16,   16,   16,   18,   16,   16,   18,   18,   19,   20,
-       21,   22,   18,   18,   23,   24,   18,   25,   18,   26,
-       27,   18,   28,   29,   30,   18,   18,   16
-
-    },
-
-    {
-       11,   31,   32,   33,   31,   31,   31,   31,   31,   31,
-       31,   31,   31,   31,   31,   31,   31,   31,   31,   31,
-       31,   31,   31,   31,   31,   31,   31,   31,   31,   31,
-       31,   31,   31,   31,   31,   31,   31,   31
-    },
-
-    {
-       11,   31,   32,   33,   31,   31,   31,   31,   31,   31,
-       31,   31,   31,   31,   31,   31,   31,   31,   31,   31,
-       31,   31,   31,   31,   31,   31,   31,   31,   31,   31,
-       31,   31,   31,   31,   31,   31,   31,   31
-    },
-
-    {
-       11,   34,   34,   35,   34,   36,   34,   34,   36,   34,
-       34,   34,   34,   34,   34,   37,   34,   34,   34,   34,
-
-       34,   34,   34,   34,   34,   34,   34,   34,   34,   34,
-       34,   34,   34,   34,   34,   34,   34,   34
-    },
-
-    {
-       11,   34,   34,   35,   34,   36,   34,   34,   36,   34,
-       34,   34,   34,   34,   34,   37,   34,   34,   34,   34,
-       34,   34,   34,   34,   34,   34,   34,   34,   34,   34,
-       34,   34,   34,   34,   34,   34,   34,   34
-    },
-
-    {
-       11,   38,   38,   39,   40,   41,   42,   43,   41,   44,
-       45,   46,   47,   47,   48,   49,   47,   47,   47,   47,
-       47,   47,   47,   47,   47,   50,   47,   47,   47,   51,
-       47,   47,   47,   47,   47,   47,   47,   52
-
-    },
-
-    {
-       11,   38,   38,   39,   40,   41,   42,   43,   41,   44,
-       45,   46,   47,   47,   48,   49,   47,   47,   47,   47,
-       47,   47,   47,   47,   47,   50,   47,   47,   47,   51,
-       47,   47,   47,   47,   47,   47,   47,   52
-    },
-
-    {
-      -11,  -11,  -11,  -11,  -11,  -11,  -11,  -11,  -11,  -11,
-      -11,  -11,  -11,  -11,  -11,  -11,  -11,  -11,  -11,  -11,
-      -11,  -11,  -11,  -11,  -11,  -11,  -11,  -11,  -11,  -11,
-      -11,  -11,  -11,  -11,  -11,  -11,  -11,  -11
-    },
-
-    {
-       11,  -12,  -12,  -12,  -12,  -12,  -12,  -12,  -12,  -12,
-      -12,  -12,  -12,  -12,  -12,  -12,  -12,  -12,  -12,  -12,
-
-      -12,  -12,  -12,  -12,  -12,  -12,  -12,  -12,  -12,  -12,
-      -12,  -12,  -12,  -12,  -12,  -12,  -12,  -12
-    },
-
-    {
-       11,  -13,   53,   54,  -13,  -13,   55,  -13,  -13,  -13,
-      -13,  -13,  -13,  -13,  -13,  -13,  -13,  -13,  -13,  -13,
-      -13,  -13,  -13,  -13,  -13,  -13,  -13,  -13,  -13,  -13,
-      -13,  -13,  -13,  -13,  -13,  -13,  -13,  -13
-    },
-
-    {
-       11,  -14,  -14,  -14,  -14,  -14,  -14,  -14,  -14,  -14,
-      -14,  -14,  -14,  -14,  -14,  -14,  -14,  -14,  -14,  -14,
-      -14,  -14,  -14,  -14,  -14,  -14,  -14,  -14,  -14,  -14,
-      -14,  -14,  -14,  -14,  -14,  -14,  -14,  -14
-
-    },
-
-    {
-       11,   56,   56,   57,   56,   56,   56,   56,   56,   56,
-       56,   56,   56,   56,   56,   56,   56,   56,   56,   56,
-       56,   56,   56,   56,   56,   56,   56,   56,   56,   56,
-       56,   56,   56,   56,   56,   56,   56,   56
-    },
-
-    {
-       11,  -16,  -16,  -16,  -16,  -16,  -16,  -16,  -16,  -16,
-      -16,  -16,  -16,  -16,  -16,  -16,  -16,  -16,  -16,  -16,
-      -16,  -16,  -16,  -16,  -16,  -16,  -16,  -16,  -16,  -16,
-      -16,  -16,  -16,  -16,  -16,  -16,  -16,  -16
-    },
-
-    {
-       11,  -17,  -17,  -17,  -17,  -17,  -17,  -17,  -17,  -17,
-      -17,  -17,  -17,  -17,  -17,  -17,  -17,  -17,  -17,  -17,
-
-      -17,  -17,  -17,  -17,  -17,  -17,  -17,  -17,  -17,  -17,
-      -17,  -17,  -17,  -17,  -17,  -17,  -17,  -17
-    },
-
-    {
-       11,  -18,  -18,  -18,  -18,  -18,  -18,  -18,  -18,  -18,
-      -18,  -18,  -18,   58,  -18,  -18,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58,  -18
-    },
-
-    {
-       11,  -19,  -19,  -19,  -19,  -19,  -19,  -19,  -19,  -19,
-      -19,  -19,  -19,   58,  -19,  -19,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58,   58,   58,   59,
-       58,   58,   58,   58,   58,   58,   58,  -19
-
-    },
-
-    {
-       11,  -20,  -20,  -20,  -20,  -20,  -20,  -20,  -20,  -20,
-      -20,  -20,  -20,   58,  -20,  -20,   58,   58,   58,   58,
-       58,   58,   58,   58,   60,   58,   58,   58,   58,   61,
-       58,   58,   58,   58,   58,   58,   58,  -20
-    },
-
-    {
-       11,  -21,  -21,  -21,  -21,  -21,  -21,  -21,  -21,  -21,
-      -21,  -21,  -21,   58,  -21,  -21,   58,   58,   58,   58,
-       58,   62,   58,   58,   58,   58,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58,  -21
-    },
-
-    {
-       11,  -22,  -22,  -22,  -22,  -22,  -22,  -22,  -22,  -22,
-      -22,  -22,  -22,   58,  -22,  -22,   58,   58,   58,   58,
-
-       58,   58,   58,   58,   58,   58,   58,   58,   63,   58,
-       58,   58,   58,   58,   58,   58,   58,  -22
-    },
-
-    {
-       11,  -23,  -23,  -23,  -23,  -23,  -23,  -23,  -23,  -23,
-      -23,  -23,  -23,   58,  -23,  -23,   58,   58,   58,   58,
-       58,   64,   58,   58,   58,   58,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58,  -23
-    },
-
-    {
-       11,  -24,  -24,  -24,  -24,  -24,  -24,  -24,  -24,  -24,
-      -24,  -24,  -24,   58,  -24,  -24,   58,   58,   58,   58,
-       58,   58,   65,   58,   58,   58,   58,   58,   66,   58,
-       58,   58,   58,   58,   58,   58,   58,  -24
-
-    },
-
-    {
-       11,  -25,  -25,  -25,  -25,  -25,  -25,  -25,  -25,  -25,
-      -25,  -25,  -25,   58,  -25,  -25,   58,   67,   58,   58,
-       58,   68,   58,   58,   58,   58,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58,  -25
-    },
-
-    {
-       11,  -26,  -26,  -26,  -26,  -26,  -26,  -26,  -26,  -26,
-      -26,  -26,  -26,   58,  -26,  -26,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
-       69,   58,   58,   58,   58,   58,   58,  -26
-    },
-
-    {
-       11,  -27,  -27,  -27,  -27,  -27,  -27,  -27,  -27,  -27,
-      -27,  -27,  -27,   58,  -27,  -27,   58,   58,   58,   58,
-
-       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
-       58,   58,   70,   58,   58,   58,   58,  -27
-    },
-
-    {
-       11,  -28,  -28,  -28,  -28,  -28,  -28,  -28,  -28,  -28,
-      -28,  -28,  -28,   58,  -28,  -28,   58,   71,   58,   58,
-       58,   72,   58,   58,   58,   58,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58,  -28
-    },
-
-    {
-       11,  -29,  -29,  -29,  -29,  -29,  -29,  -29,  -29,  -29,
-      -29,  -29,  -29,   58,  -29,  -29,   58,   58,   58,   58,
-       58,   73,   58,   58,   58,   58,   58,   58,   58,   74,
-       58,   58,   58,   58,   75,   58,   58,  -29
-
-    },
-
-    {
-       11,  -30,  -30,  -30,  -30,  -30,  -30,  -30,  -30,  -30,
-      -30,  -30,  -30,   58,  -30,  -30,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
-       58,   58,   76,   58,   58,   58,   58,  -30
-    },
-
-    {
-       11,   77,   77,  -31,   77,   77,   77,   77,   77,   77,
-       77,   77,   77,   77,   77,   77,   77,   77,   77,   77,
-       77,   77,   77,   77,   77,   77,   77,   77,   77,   77,
-       77,   77,   77,   77,   77,   77,   77,   77
-    },
-
-    {
-       11,  -32,   78,   79,  -32,  -32,  -32,  -32,  -32,  -32,
-      -32,  -32,  -32,  -32,  -32,  -32,  -32,  -32,  -32,  -32,
-
-      -32,  -32,  -32,  -32,  -32,  -32,  -32,  -32,  -32,  -32,
-      -32,  -32,  -32,  -32,  -32,  -32,  -32,  -32
-    },
-
-    {
-       11,   80,  -33,  -33,   80,   80,   80,   80,   80,   80,
-       80,   80,   80,   80,   80,   80,   80,   80,   80,   80,
-       80,   80,   80,   80,   80,   80,   80,   80,   80,   80,
-       80,   80,   80,   80,   80,   80,   80,   80
-    },
-
-    {
-       11,   81,   81,   82,   81,  -34,   81,   81,  -34,   81,
-       81,   81,   81,   81,   81,  -34,   81,   81,   81,   81,
-       81,   81,   81,   81,   81,   81,   81,   81,   81,   81,
-       81,   81,   81,   81,   81,   81,   81,   81
-
-    },
-
-    {
-       11,  -35,  -35,  -35,  -35,  -35,  -35,  -35,  -35,  -35,
-      -35,  -35,  -35,  -35,  -35,  -35,  -35,  -35,  -35,  -35,
-      -35,  -35,  -35,  -35,  -35,  -35,  -35,  -35,  -35,  -35,
-      -35,  -35,  -35,  -35,  -35,  -35,  -35,  -35
-    },
-
-    {
-       11,  -36,  -36,  -36,  -36,  -36,  -36,  -36,  -36,  -36,
-      -36,  -36,  -36,  -36,  -36,  -36,  -36,  -36,  -36,  -36,
-      -36,  -36,  -36,  -36,  -36,  -36,  -36,  -36,  -36,  -36,
-      -36,  -36,  -36,  -36,  -36,  -36,  -36,  -36
-    },
-
-    {
-       11,   83,   83,   84,   83,   83,   83,   83,   83,   83,
-       83,   83,   83,   83,   83,   83,   83,   83,   83,   83,
-
-       83,   83,   83,   83,   83,   83,   83,   83,   83,   83,
-       83,   83,   83,   83,   83,   83,   83,   83
-    },
-
-    {
-       11,  -38,  -38,  -38,  -38,  -38,  -38,  -38,  -38,  -38,
-      -38,  -38,  -38,  -38,  -38,  -38,  -38,  -38,  -38,  -38,
-      -38,  -38,  -38,  -38,  -38,  -38,  -38,  -38,  -38,  -38,
-      -38,  -38,  -38,  -38,  -38,  -38,  -38,  -38
-    },
-
-    {
-       11,  -39,  -39,  -39,  -39,  -39,  -39,  -39,  -39,  -39,
-      -39,  -39,  -39,  -39,  -39,  -39,  -39,  -39,  -39,  -39,
-      -39,  -39,  -39,  -39,  -39,  -39,  -39,  -39,  -39,  -39,
-      -39,  -39,  -39,  -39,  -39,  -39,  -39,  -39
-
-    },
-
-    {
-       11,  -40,  -40,  -40,  -40,  -40,  -40,  -40,  -40,  -40,
-      -40,  -40,  -40,  -40,   85,  -40,  -40,  -40,  -40,  -40,
-      -40,  -40,  -40,  -40,  -40,  -40,  -40,  -40,  -40,  -40,
-      -40,  -40,  -40,  -40,  -40,  -40,  -40,  -40
-    },
-
-    {
-       11,  -41,  -41,  -41,  -41,  -41,  -41,  -41,  -41,  -41,
-      -41,  -41,  -41,  -41,  -41,  -41,  -41,  -41,  -41,  -41,
-      -41,  -41,  -41,  -41,  -41,  -41,  -41,  -41,  -41,  -41,
-      -41,  -41,  -41,  -41,  -41,  -41,  -41,  -41
-    },
-
-    {
-       11,   86,   86,  -42,   86,   86,   86,   86,   86,   86,
-       86,   86,   86,   86,   86,   86,   86,   86,   86,   86,
-
-       86,   86,   86,   86,   86,   86,   86,   86,   86,   86,
-       86,   86,   86,   86,   86,   86,   86,   86
-    },
-
-    {
-       11,  -43,  -43,  -43,  -43,  -43,  -43,   87,  -43,  -43,
-      -43,  -43,  -43,  -43,  -43,  -43,  -43,  -43,  -43,  -43,
-      -43,  -43,  -43,  -43,  -43,  -43,  -43,  -43,  -43,  -43,
-      -43,  -43,  -43,  -43,  -43,  -43,  -43,  -43
-    },
-
-    {
-       11,  -44,  -44,  -44,  -44,  -44,  -44,  -44,  -44,  -44,
-      -44,  -44,  -44,  -44,  -44,  -44,  -44,  -44,  -44,  -44,
-      -44,  -44,  -44,  -44,  -44,  -44,  -44,  -44,  -44,  -44,
-      -44,  -44,  -44,  -44,  -44,  -44,  -44,  -44
-
-    },
-
-    {
-       11,  -45,  -45,  -45,  -45,  -45,  -45,  -45,  -45,  -45,
-      -45,  -45,  -45,  -45,  -45,  -45,  -45,  -45,  -45,  -45,
-      -45,  -45,  -45,  -45,  -45,  -45,  -45,  -45,  -45,  -45,
-      -45,  -45,  -45,  -45,  -45,  -45,  -45,  -45
-    },
-
-    {
-       11,  -46,  -46,  -46,  -46,  -46,  -46,  -46,  -46,  -46,
-      -46,   88,   89,   89,  -46,  -46,   89,   89,   89,   89,
-       89,   89,   89,   89,   89,   89,   89,   89,   89,   89,
-       89,   89,   89,   89,   89,   89,   89,  -46
-    },
-
-    {
-       11,  -47,  -47,  -47,  -47,  -47,  -47,  -47,  -47,  -47,
-      -47,   89,   89,   89,  -47,  -47,   89,   89,   89,   89,
-
-       89,   89,   89,   89,   89,   89,   89,   89,   89,   89,
-       89,   89,   89,   89,   89,   89,   89,  -47
-    },
-
-    {
-       11,  -48,  -48,  -48,  -48,  -48,  -48,  -48,  -48,  -48,
-      -48,  -48,  -48,  -48,  -48,  -48,  -48,  -48,  -48,  -48,
-      -48,  -48,  -48,  -48,  -48,  -48,  -48,  -48,  -48,  -48,
-      -48,  -48,  -48,  -48,  -48,  -48,  -48,  -48
-    },
-
-    {
-       11,  -49,  -49,   90,  -49,  -49,  -49,  -49,  -49,  -49,
-      -49,  -49,  -49,  -49,  -49,  -49,  -49,  -49,  -49,  -49,
-      -49,  -49,  -49,  -49,  -49,  -49,  -49,  -49,  -49,  -49,
-      -49,  -49,  -49,  -49,  -49,  -49,  -49,  -49
-
-    },
-
-    {
-       11,  -50,  -50,  -50,  -50,  -50,  -50,  -50,  -50,  -50,
-      -50,   89,   89,   89,  -50,  -50,   89,   89,   89,   89,
-       89,   89,   91,   89,   89,   89,   89,   89,   89,   89,
-       89,   89,   89,   89,   89,   89,   89,  -50
-    },
-
-    {
-       11,  -51,  -51,  -51,  -51,  -51,  -51,  -51,  -51,  -51,
-      -51,   89,   89,   89,  -51,  -51,   89,   89,   89,   89,
-       89,   89,   89,   89,   89,   89,   89,   89,   92,   89,
-       89,   89,   89,   89,   89,   89,   89,  -51
-    },
-
-    {
-       11,  -52,  -52,  -52,  -52,  -52,  -52,  -52,  -52,  -52,
-      -52,  -52,  -52,  -52,  -52,  -52,  -52,  -52,  -52,  -52,
-
-      -52,  -52,  -52,  -52,  -52,  -52,  -52,  -52,  -52,  -52,
-      -52,  -52,  -52,  -52,  -52,  -52,  -52,   93
-    },
-
-    {
-       11,  -53,   53,   54,  -53,  -53,   55,  -53,  -53,  -53,
-      -53,  -53,  -53,  -53,  -53,  -53,  -53,  -53,  -53,  -53,
-      -53,  -53,  -53,  -53,  -53,  -53,  -53,  -53,  -53,  -53,
-      -53,  -53,  -53,  -53,  -53,  -53,  -53,  -53
-    },
-
-    {
-       11,  -54,  -54,  -54,  -54,  -54,  -54,  -54,  -54,  -54,
-      -54,  -54,  -54,  -54,  -54,  -54,  -54,  -54,  -54,  -54,
-      -54,  -54,  -54,  -54,  -54,  -54,  -54,  -54,  -54,  -54,
-      -54,  -54,  -54,  -54,  -54,  -54,  -54,  -54
-
-    },
-
-    {
-       11,   56,   56,   57,   56,   56,   56,   56,   56,   56,
-       56,   56,   56,   56,   56,   56,   56,   56,   56,   56,
-       56,   56,   56,   56,   56,   56,   56,   56,   56,   56,
-       56,   56,   56,   56,   56,   56,   56,   56
-    },
-
-    {
-       11,   56,   56,   57,   56,   56,   56,   56,   56,   56,
-       56,   56,   56,   56,   56,   56,   56,   56,   56,   56,
-       56,   56,   56,   56,   56,   56,   56,   56,   56,   56,
-       56,   56,   56,   56,   56,   56,   56,   56
-    },
-
-    {
-       11,  -57,  -57,  -57,  -57,  -57,  -57,  -57,  -57,  -57,
-      -57,  -57,  -57,  -57,  -57,  -57,  -57,  -57,  -57,  -57,
-
-      -57,  -57,  -57,  -57,  -57,  -57,  -57,  -57,  -57,  -57,
-      -57,  -57,  -57,  -57,  -57,  -57,  -57,  -57
-    },
-
-    {
-       11,  -58,  -58,  -58,  -58,  -58,  -58,  -58,  -58,  -58,
-      -58,  -58,  -58,   58,  -58,  -58,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58,  -58
-    },
-
-    {
-       11,  -59,  -59,  -59,  -59,  -59,  -59,  -59,  -59,  -59,
-      -59,  -59,  -59,   58,  -59,  -59,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58,   58,   58,   94,
-       58,   58,   58,   58,   58,   58,   58,  -59
-
-    },
-
-    {
-       11,  -60,  -60,  -60,  -60,  -60,  -60,  -60,  -60,  -60,
-      -60,  -60,  -60,   58,  -60,  -60,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58,   58,   58,   95,
-       58,   58,   58,   58,   58,   58,   58,  -60
-    },
-
-    {
-       11,  -61,  -61,  -61,  -61,  -61,  -61,  -61,  -61,  -61,
-      -61,  -61,  -61,   58,  -61,  -61,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58,   96,   97,   58,
-       58,   58,   58,   58,   58,   58,   58,  -61
-    },
-
-    {
-       11,  -62,  -62,  -62,  -62,  -62,  -62,  -62,  -62,  -62,
-      -62,  -62,  -62,   58,  -62,  -62,   58,   58,   58,   58,
-
-       58,   58,   98,   58,   58,   58,   58,   58,   58,   58,
-       99,   58,   58,   58,   58,   58,   58,  -62
-    },
-
-    {
-       11,  -63,  -63,  -63,  -63,  -63,  -63,  -63,  -63,  -63,
-      -63,  -63,  -63,   58,  -63,  -63,   58,  100,   58,   58,
-      101,   58,   58,   58,   58,   58,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58,  -63
-    },
-
-    {
-       11,  -64,  -64,  -64,  -64,  -64,  -64,  -64,  -64,  -64,
-      -64,  -64,  -64,   58,  -64,  -64,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,  102,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,  103,  -64
-
-    },
-
-    {
-       11,  -65,  -65,  -65,  -65,  -65,  -65,  -65,  -65,  -65,
-      -65,  -65,  -65,   58,  -65,  -65,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58,  -65
-    },
-
-    {
-       11,  -66,  -66,  -66,  -66,  -66,  -66,  -66,  -66,  -66,
-      -66,  -66,  -66,   58,  -66,  -66,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
-       58,   58,   58,   58,  104,   58,   58,  -66
-    },
-
-    {
-       11,  -67,  -67,  -67,  -67,  -67,  -67,  -67,  -67,  -67,
-      -67,  -67,  -67,   58,  -67,  -67,   58,   58,   58,   58,
-
-       58,   58,   58,   58,   58,  105,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58,  -67
-    },
-
-    {
-       11,  -68,  -68,  -68,  -68,  -68,  -68,  -68,  -68,  -68,
-      -68,  -68,  -68,   58,  -68,  -68,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58,   58,  106,   58,
-       58,   58,   58,   58,   58,   58,   58,  -68
-    },
-
-    {
-       11,  -69,  -69,  -69,  -69,  -69,  -69,  -69,  -69,  -69,
-      -69,  -69,  -69,   58,  -69,  -69,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
-       58,   58,   58,   58,  107,   58,   58,  -69
-
-    },
-
-    {
-       11,  -70,  -70,  -70,  -70,  -70,  -70,  -70,  -70,  -70,
-      -70,  -70,  -70,   58,  -70,  -70,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58,   58,   58,  108,
-       58,   58,   58,   58,   58,   58,   58,  -70
-    },
-
-    {
-       11,  -71,  -71,  -71,  -71,  -71,  -71,  -71,  -71,  -71,
-      -71,  -71,  -71,   58,  -71,  -71,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58,   58,  109,   58,
-       58,   58,   58,   58,   58,   58,   58,  -71
-    },
-
-    {
-       11,  -72,  -72,  -72,  -72,  -72,  -72,  -72,  -72,  -72,
-      -72,  -72,  -72,   58,  -72,  -72,   58,   58,   58,   58,
-
-       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
-       58,  110,   58,   58,   58,   58,   58,  -72
-    },
-
-    {
-       11,  -73,  -73,  -73,  -73,  -73,  -73,  -73,  -73,  -73,
-      -73,  -73,  -73,   58,  -73,  -73,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,  111,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58,  -73
-    },
-
-    {
-       11,  -74,  -74,  -74,  -74,  -74,  -74,  -74,  -74,  -74,
-      -74,  -74,  -74,   58,  -74,  -74,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,  112,   58,  -74
-
-    },
-
-    {
-       11,  -75,  -75,  -75,  -75,  -75,  -75,  -75,  -75,  -75,
-      -75,  -75,  -75,   58,  -75,  -75,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
-       58,   58,  113,   58,   58,   58,   58,  -75
-    },
-
-    {
-       11,  -76,  -76,  -76,  -76,  -76,  -76,  -76,  -76,  -76,
-      -76,  -76,  -76,   58,  -76,  -76,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,  114,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58,  -76
-    },
-
-    {
-       11,   77,   77,  -77,   77,   77,   77,   77,   77,   77,
-       77,   77,   77,   77,   77,   77,   77,   77,   77,   77,
-
-       77,   77,   77,   77,   77,   77,   77,   77,   77,   77,
-       77,   77,   77,   77,   77,   77,   77,   77
-    },
-
-    {
-       11,  -78,   78,   79,  -78,  -78,  -78,  -78,  -78,  -78,
-      -78,  -78,  -78,  -78,  -78,  -78,  -78,  -78,  -78,  -78,
-      -78,  -78,  -78,  -78,  -78,  -78,  -78,  -78,  -78,  -78,
-      -78,  -78,  -78,  -78,  -78,  -78,  -78,  -78
-    },
-
-    {
-       11,   80,  -79,  -79,   80,   80,   80,   80,   80,   80,
-       80,   80,   80,   80,   80,   80,   80,   80,   80,   80,
-       80,   80,   80,   80,   80,   80,   80,   80,   80,   80,
-       80,   80,   80,   80,   80,   80,   80,   80
-
-    },
-
-    {
-       11,  -80,  -80,  -80,  -80,  -80,  -80,  -80,  -80,  -80,
-      -80,  -80,  -80,  -80,  -80,  -80,  -80,  -80,  -80,  -80,
-      -80,  -80,  -80,  -80,  -80,  -80,  -80,  -80,  -80,  -80,
-      -80,  -80,  -80,  -80,  -80,  -80,  -80,  -80
-    },
-
-    {
-       11,   81,   81,   82,   81,  -81,   81,   81,  -81,   81,
-       81,   81,   81,   81,   81,  -81,   81,   81,   81,   81,
-       81,   81,   81,   81,   81,   81,   81,   81,   81,   81,
-       81,   81,   81,   81,   81,   81,   81,   81
-    },
-
-    {
-       11,  -82,  -82,  -82,  -82,  -82,  -82,  -82,  -82,  -82,
-      -82,  -82,  -82,  -82,  -82,  -82,  -82,  -82,  -82,  -82,
-
-      -82,  -82,  -82,  -82,  -82,  -82,  -82,  -82,  -82,  -82,
-      -82,  -82,  -82,  -82,  -82,  -82,  -82,  -82
-    },
-
-    {
-       11,  -83,  -83,   84,  -83,  -83,  -83,  -83,  -83,  -83,
-      -83,  -83,  -83,  -83,  -83,  -83,  -83,  -83,  -83,  -83,
-      -83,  -83,  -83,  -83,  -83,  -83,  -83,  -83,  -83,  -83,
-      -83,  -83,  -83,  -83,  -83,  -83,  -83,  -83
-    },
-
-    {
-       11,  -84,  -84,  -84,  -84,  -84,  -84,  -84,  -84,  -84,
-      -84,  -84,  -84,  -84,  -84,  -84,  -84,  -84,  -84,  -84,
-      -84,  -84,  -84,  -84,  -84,  -84,  -84,  -84,  -84,  -84,
-      -84,  -84,  -84,  -84,  -84,  -84,  -84,  -84
-
-    },
-
-    {
-       11,  -85,  -85,  -85,  -85,  -85,  -85,  -85,  -85,  -85,
-      -85,  -85,  -85,  -85,  -85,  -85,  -85,  -85,  -85,  -85,
-      -85,  -85,  -85,  -85,  -85,  -85,  -85,  -85,  -85,  -85,
-      -85,  -85,  -85,  -85,  -85,  -85,  -85,  -85
-    },
-
-    {
-       11,   86,   86,  -86,   86,   86,   86,   86,   86,   86,
-       86,   86,   86,   86,   86,   86,   86,   86,   86,   86,
-       86,   86,   86,   86,   86,   86,   86,   86,   86,   86,
-       86,   86,   86,   86,   86,   86,   86,   86
-    },
-
-    {
-       11,  -87,  -87,  -87,  -87,  -87,  -87,  -87,  -87,  -87,
-      -87,  -87,  -87,  -87,  -87,  -87,  -87,  -87,  -87,  -87,
-
-      -87,  -87,  -87,  -87,  -87,  -87,  -87,  -87,  -87,  -87,
-      -87,  -87,  -87,  -87,  -87,  -87,  -87,  -87
-    },
-
-    {
-       11,  -88,  -88,  -88,  -88,  -88,  -88,  -88,  -88,  -88,
-      -88,  115,   89,   89,  -88,  -88,   89,   89,   89,   89,
-       89,   89,   89,   89,   89,   89,   89,   89,   89,   89,
-       89,   89,   89,   89,   89,   89,   89,  -88
-    },
-
-    {
-       11,  -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,
-      -89,   89,   89,   89,  -89,  -89,   89,   89,   89,   89,
-       89,   89,   89,   89,   89,   89,   89,   89,   89,   89,
-       89,   89,   89,   89,   89,   89,   89,  -89
-
-    },
-
-    {
-       11,  -90,  -90,  -90,  -90,  -90,  -90,  -90,  -90,  -90,
-      -90,  -90,  -90,  -90,  -90,  -90,  -90,  -90,  -90,  -90,
-      -90,  -90,  -90,  -90,  -90,  -90,  -90,  -90,  -90,  -90,
-      -90,  -90,  -90,  -90,  -90,  -90,  -90,  -90
-    },
-
-    {
-       11,  -91,  -91,  -91,  -91,  -91,  -91,  -91,  -91,  -91,
-      -91,   89,   89,   89,  -91,  -91,   89,   89,   89,   89,
-       89,   89,   89,   89,   89,   89,   89,   89,   89,   89,
-       89,   89,   89,   89,   89,   89,   89,  -91
-    },
-
-    {
-       11,  -92,  -92,  -92,  -92,  -92,  -92,  -92,  -92,  -92,
-      -92,   89,   89,   89,  -92,  -92,   89,   89,   89,   89,
-
-       89,   89,   89,   89,   89,   89,   89,   89,   89,   89,
-       89,   89,   89,   89,   89,   89,   89,  -92
-    },
-
-    {
-       11,  -93,  -93,  -93,  -93,  -93,  -93,  -93,  -93,  -93,
-      -93,  -93,  -93,  -93,  -93,  -93,  -93,  -93,  -93,  -93,
-      -93,  -93,  -93,  -93,  -93,  -93,  -93,  -93,  -93,  -93,
-      -93,  -93,  -93,  -93,  -93,  -93,  -93,  -93
-    },
-
-    {
-       11,  -94,  -94,  -94,  -94,  -94,  -94,  -94,  -94,  -94,
-      -94,  -94,  -94,   58,  -94,  -94,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,  116,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58,  -94
-
-    },
-
-    {
-       11,  -95,  -95,  -95,  -95,  -95,  -95,  -95,  -95,  -95,
-      -95,  -95,  -95,   58,  -95,  -95,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,  117,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58,  -95
-    },
-
-    {
-       11,  -96,  -96,  -96,  -96,  -96,  -96,  -96,  -96,  -96,
-      -96,  -96,  -96,   58,  -96,  -96,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58,  118,   58,   58,
-       58,   58,   58,   58,   58,   58,   58,  -96
-    },
-
-    {
-       11,  -97,  -97,  -97,  -97,  -97,  -97,  -97,  -97,  -97,
-      -97,  -97,  -97,   58,  -97,  -97,   58,   58,   58,   58,
-
-       58,   58,  119,   58,   58,   58,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58,  -97
-    },
-
-    {
-       11,  -98,  -98,  -98,  -98,  -98,  -98,  -98,  -98,  -98,
-      -98,  -98,  -98,   58,  -98,  -98,  120,  121,   58,   58,
-       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58,  -98
-    },
-
-    {
-       11,  -99,  -99,  -99,  -99,  -99,  -99,  -99,  -99,  -99,
-      -99,  -99,  -99,   58,  -99,  -99,   58,   58,   58,   58,
-       58,  122,   58,   58,   58,   58,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58,  -99
-
-    },
-
-    {
-       11, -100, -100, -100, -100, -100, -100, -100, -100, -100,
-     -100, -100, -100,   58, -100, -100,   58,   58,  123,   58,
-       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58, -100
-    },
-
-    {
-       11, -101, -101, -101, -101, -101, -101, -101, -101, -101,
-     -101, -101, -101,   58, -101, -101,   58,   58,   58,  124,
-       58,   58,   58,   58,   58,  125,   58,  126,   58,   58,
-       58,   58,   58,   58,   58,   58,   58, -101
-    },
-
-    {
-       11, -102, -102, -102, -102, -102, -102, -102, -102, -102,
-     -102, -102, -102,   58, -102, -102,   58,   58,   58,   58,
-
-       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
-      127,   58,   58,   58,   58,   58,   58, -102
-    },
-
-    {
-       11, -103, -103, -103, -103, -103, -103, -103, -103, -103,
-     -103, -103, -103,   58, -103, -103,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58, -103
-    },
-
-    {
-       11, -104, -104, -104, -104, -104, -104, -104, -104, -104,
-     -104, -104, -104,   58, -104, -104,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58, -104
-
-    },
-
-    {
-       11, -105, -105, -105, -105, -105, -105, -105, -105, -105,
-     -105, -105, -105,   58, -105, -105,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58,   58,  128,   58,
-       58,   58,   58,   58,   58,   58,   58, -105
-    },
-
-    {
-       11, -106, -106, -106, -106, -106, -106, -106, -106, -106,
-     -106, -106, -106,   58, -106, -106,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,  129,   58, -106
-    },
-
-    {
-       11, -107, -107, -107, -107, -107, -107, -107, -107, -107,
-     -107, -107, -107,   58, -107, -107,   58,   58,   58,   58,
-
-       58,   58,   58,   58,   58,  130,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58, -107
-    },
-
-    {
-       11, -108, -108, -108, -108, -108, -108, -108, -108, -108,
-     -108, -108, -108,   58, -108, -108,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58,  131,   58,   58,
-       58,   58,   58,   58,   58,   58,   58, -108
-    },
-
-    {
-       11, -109, -109, -109, -109, -109, -109, -109, -109, -109,
-     -109, -109, -109,   58, -109, -109,   58,   58,   58,   58,
-       58,   58,   58,  132,   58,   58,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58, -109
-
-    },
-
-    {
-       11, -110, -110, -110, -110, -110, -110, -110, -110, -110,
-     -110, -110, -110,   58, -110, -110,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,  133,   58, -110
-    },
-
-    {
-       11, -111, -111, -111, -111, -111, -111, -111, -111, -111,
-     -111, -111, -111,   58, -111, -111,   58,   58,   58,   58,
-       58,  134,   58,   58,   58,   58,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58, -111
-    },
-
-    {
-       11, -112, -112, -112, -112, -112, -112, -112, -112, -112,
-     -112, -112, -112,   58, -112, -112,   58,   58,   58,   58,
-
-       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
-       58,   58,  135,   58,   58,   58,   58, -112
-    },
-
-    {
-       11, -113, -113, -113, -113, -113, -113, -113, -113, -113,
-     -113, -113, -113,   58, -113, -113,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,  136,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58, -113
-    },
-
-    {
-       11, -114, -114, -114, -114, -114, -114, -114, -114, -114,
-     -114, -114, -114,   58, -114, -114,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
-       58,   58,   58,  137,   58,   58,   58, -114
-
-    },
-
-    {
-       11, -115, -115, -115, -115, -115, -115, -115, -115, -115,
-     -115,   89,   89,   89, -115, -115,   89,   89,   89,   89,
-       89,   89,   89,   89,   89,   89,   89,   89,   89,   89,
-       89,   89,   89,   89,   89,   89,   89, -115
-    },
-
-    {
-       11, -116, -116, -116, -116, -116, -116, -116, -116, -116,
-     -116, -116, -116,   58, -116, -116,   58,   58,   58,   58,
-       58,  138,   58,   58,   58,   58,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58, -116
-    },
-
-    {
-       11, -117, -117, -117, -117, -117, -117, -117, -117, -117,
-     -117, -117, -117,   58, -117, -117,   58,   58,   58,  139,
-
-       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58, -117
-    },
-
-    {
-       11, -118, -118, -118, -118, -118, -118, -118, -118, -118,
-     -118, -118, -118,   58, -118, -118,   58,   58,   58,   58,
-       58,  140,   58,   58,   58,   58,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58, -118
-    },
-
-    {
-       11, -119, -119, -119, -119, -119, -119, -119, -119, -119,
-     -119, -119, -119,   58, -119, -119,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,  141,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58, -119
-
-    },
-
-    {
-       11, -120, -120, -120, -120, -120, -120, -120, -120, -120,
-     -120, -120, -120,   58, -120, -120,   58,   58,  142,   58,
-       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
-       58,   58,   58,   58,  143,   58,   58, -120
-    },
-
-    {
-       11, -121, -121, -121, -121, -121, -121, -121, -121, -121,
-     -121, -121, -121,   58, -121, -121,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,  144,   58, -121
-    },
-
-    {
-       11, -122, -122, -122, -122, -122, -122, -122, -122, -122,
-     -122, -122, -122,   58, -122, -122,   58,   58,   58,   58,
-
-       58,   58,   58,   58,   58,   58,   58,   58,  145,   58,
-       58,   58,   58,   58,   58,   58,   58, -122
-    },
-
-    {
-       11, -123, -123, -123, -123, -123, -123, -123, -123, -123,
-     -123, -123, -123,   58, -123, -123,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,  146,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58, -123
-    },
-
-    {
-       11, -124, -124, -124, -124, -124, -124, -124, -124, -124,
-     -124, -124, -124,   58, -124, -124,   58,   58,   58,   58,
-       58,   58,   58,   58,  147,   58,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58, -124
-
-    },
-
-    {
-       11, -125, -125, -125, -125, -125, -125, -125, -125, -125,
-     -125, -125, -125,   58, -125, -125,   58,   58,   58,   58,
-       58,   58,  148,   58,   58,   58,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58, -125
-    },
-
-    {
-       11, -126, -126, -126, -126, -126, -126, -126, -126, -126,
-     -126, -126, -126,   58, -126, -126,   58,   58,   58,   58,
-       58,  149,   58,   58,   58,   58,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58, -126
-    },
-
-    {
-       11, -127, -127, -127, -127, -127, -127, -127, -127, -127,
-     -127, -127, -127,   58, -127, -127,   58,   58,   58,   58,
-
-       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58, -127
-    },
-
-    {
-       11, -128, -128, -128, -128, -128, -128, -128, -128, -128,
-     -128, -128, -128,   58, -128, -128,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58,  150,   58,   58,
-       58,   58,   58,   58,   58,   58,   58, -128
-    },
-
-    {
-       11, -129, -129, -129, -129, -129, -129, -129, -129, -129,
-     -129, -129, -129,   58, -129, -129,   58,   58,   58,  151,
-       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58, -129
-
-    },
-
-    {
-       11, -130, -130, -130, -130, -130, -130, -130, -130, -130,
-     -130, -130, -130,   58, -130, -130,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58,   58,   58,  152,
-       58,   58,   58,   58,   58,   58,   58, -130
-    },
-
-    {
-       11, -131, -131, -131, -131, -131, -131, -131, -131, -131,
-     -131, -131, -131,   58, -131, -131,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
-      153,   58,   58,   58,   58,   58,   58, -131
-    },
-
-    {
-       11, -132, -132, -132, -132, -132, -132, -132, -132, -132,
-     -132, -132, -132,   58, -132, -132,   58,   58,   58,   58,
-
-       58,  154,   58,   58,   58,   58,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58, -132
-    },
-
-    {
-       11, -133, -133, -133, -133, -133, -133, -133, -133, -133,
-     -133, -133, -133,   58, -133, -133,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,  155,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58, -133
-    },
-
-    {
-       11, -134, -134, -134, -134, -134, -134, -134, -134, -134,
-     -134, -134, -134,   58, -134, -134,   58,   58,   58,  156,
-       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58, -134
-
-    },
-
-    {
-       11, -135, -135, -135, -135, -135, -135, -135, -135, -135,
-     -135, -135, -135,   58, -135, -135,   58,   58,   58,  157,
-       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58, -135
-    },
-
-    {
-       11, -136, -136, -136, -136, -136, -136, -136, -136, -136,
-     -136, -136, -136,   58, -136, -136,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58,   58,  158,   58,
-       58,   58,   58,   58,   58,   58,   58, -136
-    },
-
-    {
-       11, -137, -137, -137, -137, -137, -137, -137, -137, -137,
-     -137, -137, -137,   58, -137, -137,   58,   58,   58,   58,
-
-       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
-       58,   58,   58,   58,  159,   58,   58, -137
-    },
-
-    {
-       11, -138, -138, -138, -138, -138, -138, -138, -138, -138,
-     -138, -138, -138,   58, -138, -138,   58,  160,   58,   58,
-       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58, -138
-    },
-
-    {
-       11, -139, -139, -139, -139, -139, -139, -139, -139, -139,
-     -139, -139, -139,   58, -139, -139,   58,   58,   58,   58,
-       58,  161,   58,   58,   58,   58,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58, -139
-
-    },
-
-    {
-       11, -140, -140, -140, -140, -140, -140, -140, -140, -140,
-     -140, -140, -140,   58, -140, -140,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58,   58,  162,   58,
-       58,   58,   58,   58,   58,   58,   58, -140
-    },
-
-    {
-       11, -141, -141, -141, -141, -141, -141, -141, -141, -141,
-     -141, -141, -141,   58, -141, -141,   58,   58,   58,   58,
-       58,   58,   58,  163,   58,   58,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58, -141
-    },
-
-    {
-       11, -142, -142, -142, -142, -142, -142, -142, -142, -142,
-     -142, -142, -142,   58, -142, -142,   58,   58,   58,   58,
-
-       58,   58,   58,   58,   58,   58,   58,   58,   58,  164,
-       58,   58,   58,   58,   58,   58,   58, -142
-    },
-
-    {
-       11, -143, -143, -143, -143, -143, -143, -143, -143, -143,
-     -143, -143, -143,   58, -143, -143,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
-       58,   58,  165,   58,   58,   58,   58, -143
-    },
-
-    {
-       11, -144, -144, -144, -144, -144, -144, -144, -144, -144,
-     -144, -144, -144,   58, -144, -144,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,  166,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58, -144
-
-    },
-
-    {
-       11, -145, -145, -145, -145, -145, -145, -145, -145, -145,
-     -145, -145, -145,   58, -145, -145,   58,   58,   58,   58,
-      167,   58,   58,   58,   58,   58,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58, -145
-    },
-
-    {
-       11, -146, -146, -146, -146, -146, -146, -146, -146, -146,
-     -146, -146, -146,   58, -146, -146,   58,   58,   58,   58,
-       58,  168,   58,   58,   58,   58,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58, -146
-    },
-
-    {
-       11, -147, -147, -147, -147, -147, -147, -147, -147, -147,
-     -147, -147, -147,   58, -147, -147,   58,   58,   58,   58,
-
-       58,   58,   58,   58,   58,   58,   58,   58,   58,  169,
-       58,   58,   58,   58,   58,   58,   58, -147
-    },
-
-    {
-       11, -148, -148, -148, -148, -148, -148, -148, -148, -148,
-     -148, -148, -148,   58, -148, -148,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58, -148
-    },
-
-    {
-       11, -149, -149, -149, -149, -149, -149, -149, -149, -149,
-     -149, -149, -149,   58, -149, -149,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58,   58,  170,   58,
-       58,   58,   58,   58,   58,   58,   58, -149
-
-    },
-
-    {
-       11, -150, -150, -150, -150, -150, -150, -150, -150, -150,
-     -150, -150, -150,   58, -150, -150,   58,   58,   58,   58,
-       58,  171,   58,   58,   58,   58,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58, -150
-    },
-
-    {
-       11, -151, -151, -151, -151, -151, -151, -151, -151, -151,
-     -151, -151, -151,   58, -151, -151,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58,   58,   58,  172,
-       58,   58,   58,   58,   58,   58,   58, -151
-    },
-
-    {
-       11, -152, -152, -152, -152, -152, -152, -152, -152, -152,
-     -152, -152, -152,   58, -152, -152,   58,   58,   58,   58,
-
-       58,   58,   58,   58,   58,   58,   58,   58,  173,   58,
-       58,   58,   58,   58,   58,   58,   58, -152
-    },
-
-    {
-       11, -153, -153, -153, -153, -153, -153, -153, -153, -153,
-     -153, -153, -153,   58, -153, -153,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
-       58,   58,   58,   58,  174,   58,   58, -153
-    },
-
-    {
-       11, -154, -154, -154, -154, -154, -154, -154, -154, -154,
-     -154, -154, -154,   58, -154, -154,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58, -154
-
-    },
-
-    {
-       11, -155, -155, -155, -155, -155, -155, -155, -155, -155,
-     -155, -155, -155,   58, -155, -155,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
-       58,   58,  175,   58,   58,   58,   58, -155
-    },
-
-    {
-       11, -156, -156, -156, -156, -156, -156, -156, -156, -156,
-     -156, -156, -156,   58, -156, -156,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
-       58,   58,   58,   58,  176,   58,   58, -156
-    },
-
-    {
-       11, -157, -157, -157, -157, -157, -157, -157, -157, -157,
-     -157, -157, -157,   58, -157, -157,   58,   58,   58,   58,
-
-       58,  177,   58,   58,   58,   58,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58, -157
-    },
-
-    {
-       11, -158, -158, -158, -158, -158, -158, -158, -158, -158,
-     -158, -158, -158,   58, -158, -158,   58,   58,   58,   58,
-       58,   58,   58,  178,   58,   58,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58, -158
-    },
-
-    {
-       11, -159, -159, -159, -159, -159, -159, -159, -159, -159,
-     -159, -159, -159,   58, -159, -159,   58,  179,   58,   58,
-       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58, -159
-
-    },
-
-    {
-       11, -160, -160, -160, -160, -160, -160, -160, -160, -160,
-     -160, -160, -160,   58, -160, -160,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58,   58,  180,   58,
-       58,   58,   58,   58,   58,   58,   58, -160
-    },
-
-    {
-       11, -161, -161, -161, -161, -161, -161, -161, -161, -161,
-     -161, -161, -161,   58, -161, -161,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58, -161
-    },
-
-    {
-       11, -162, -162, -162, -162, -162, -162, -162, -162, -162,
-     -162, -162, -162,   58, -162, -162,   58,   58,   58,   58,
-
-       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
-       58,   58,   58,   58,  181,   58,   58, -162
-    },
-
-    {
-       11, -163, -163, -163, -163, -163, -163, -163, -163, -163,
-     -163, -163, -163,   58, -163, -163,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58, -163
-    },
-
-    {
-       11, -164, -164, -164, -164, -164, -164, -164, -164, -164,
-     -164, -164, -164,   58, -164, -164,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58,   58,   58,  182,
-       58,   58,   58,   58,   58,   58,   58, -164
-
-    },
-
-    {
-       11, -165, -165, -165, -165, -165, -165, -165, -165, -165,
-     -165, -165, -165,   58, -165, -165,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,  183,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58, -165
-    },
-
-    {
-       11, -166, -166, -166, -166, -166, -166, -166, -166, -166,
-     -166, -166, -166,   58, -166, -166,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
-       58,   58,   58,   58,  184,   58,   58, -166
-    },
-
-    {
-       11, -167, -167, -167, -167, -167, -167, -167, -167, -167,
-     -167, -167, -167,   58, -167, -167,   58,   58,   58,   58,
-
-       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
-       58,   58,   58,  185,   58,   58,   58, -167
-    },
-
-    {
-       11, -168, -168, -168, -168, -168, -168, -168, -168, -168,
-     -168, -168, -168,   58, -168, -168,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58, -168
-    },
-
-    {
-       11, -169, -169, -169, -169, -169, -169, -169, -169, -169,
-     -169, -169, -169,   58, -169, -169,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,  186,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58, -169
-
-    },
-
-    {
-       11, -170, -170, -170, -170, -170, -170, -170, -170, -170,
-     -170, -170, -170,   58, -170, -170,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,  187,   58, -170
-    },
-
-    {
-       11, -171, -171, -171, -171, -171, -171, -171, -171, -171,
-     -171, -171, -171,   58, -171, -171,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58,   58,  188,   58,
-       58,   58,   58,   58,   58,   58,   58, -171
-    },
-
-    {
-       11, -172, -172, -172, -172, -172, -172, -172, -172, -172,
-     -172, -172, -172,   58, -172, -172,   58,   58,   58,   58,
-
-       58,   58,   58,   58,   58,   58,   58,   58,  189,   58,
-       58,   58,   58,   58,   58,   58,   58, -172
-    },
-
-    {
-       11, -173, -173, -173, -173, -173, -173, -173, -173, -173,
-     -173, -173, -173,   58, -173, -173,   58,  190,   58,   58,
-       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58, -173
-    },
-
-    {
-       11, -174, -174, -174, -174, -174, -174, -174, -174, -174,
-     -174, -174, -174,   58, -174, -174,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58, -174
-
-    },
-
-    {
-       11, -175, -175, -175, -175, -175, -175, -175, -175, -175,
-     -175, -175, -175,   58, -175, -175,   58,   58,   58,   58,
-       58,  191,   58,   58,   58,   58,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58, -175
-    },
-
-    {
-       11, -176, -176, -176, -176, -176, -176, -176, -176, -176,
-     -176, -176, -176,   58, -176, -176,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58, -176
-    },
-
-    {
-       11, -177, -177, -177, -177, -177, -177, -177, -177, -177,
-     -177, -177, -177,   58, -177, -177,   58,   58,   58,   58,
-
-       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58, -177
-    },
-
-    {
-       11, -178, -178, -178, -178, -178, -178, -178, -178, -178,
-     -178, -178, -178,   58, -178, -178,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58, -178
-    },
-
-    {
-       11, -179, -179, -179, -179, -179, -179, -179, -179, -179,
-     -179, -179, -179,   58, -179, -179,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
-       58,   58,   58,   58,  192,   58,   58, -179
-
-    },
-
-    {
-       11, -180, -180, -180, -180, -180, -180, -180, -180, -180,
-     -180, -180, -180,   58, -180, -180,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58, -180
-    },
-
-    {
-       11, -181, -181, -181, -181, -181, -181, -181, -181, -181,
-     -181, -181, -181,   58, -181, -181,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58, -181
-    },
-
-    {
-       11, -182, -182, -182, -182, -182, -182, -182, -182, -182,
-     -182, -182, -182,   58, -182, -182,   58,   58,   58,   58,
-
-       58,   58,   58,   58,   58,   58,  193,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58, -182
-    },
-
-    {
-       11, -183, -183, -183, -183, -183, -183, -183, -183, -183,
-     -183, -183, -183,   58, -183, -183,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
-       58,   58,   58,  194,   58,   58,   58, -183
-    },
-
-    {
-       11, -184, -184, -184, -184, -184, -184, -184, -184, -184,
-     -184, -184, -184,   58, -184, -184,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58, -184
-
-    },
-
-    {
-       11, -185, -185, -185, -185, -185, -185, -185, -185, -185,
-     -185, -185, -185,   58, -185, -185,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58, -185
-    },
-
-    {
-       11, -186, -186, -186, -186, -186, -186, -186, -186, -186,
-     -186, -186, -186,   58, -186, -186,   58,   58,   58,  195,
-       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58, -186
-    },
-
-    {
-       11, -187, -187, -187, -187, -187, -187, -187, -187, -187,
-     -187, -187, -187,   58, -187, -187,   58,   58,   58,   58,
-
-       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58, -187
-    },
-
-    {
-       11, -188, -188, -188, -188, -188, -188, -188, -188, -188,
-     -188, -188, -188,   58, -188, -188,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,  196,   58, -188
-    },
-
-    {
-       11, -189, -189, -189, -189, -189, -189, -189, -189, -189,
-     -189, -189, -189,   58, -189, -189,   58,   58,   58,   58,
-       58,   58,  197,   58,   58,   58,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58, -189
-
-    },
-
-    {
-       11, -190, -190, -190, -190, -190, -190, -190, -190, -190,
-     -190, -190, -190,   58, -190, -190,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,  198,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58, -190
-    },
-
-    {
-       11, -191, -191, -191, -191, -191, -191, -191, -191, -191,
-     -191, -191, -191,   58, -191, -191,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
-       58,   58,   58,  199,   58,   58,   58, -191
-    },
-
-    {
-       11, -192, -192, -192, -192, -192, -192, -192, -192, -192,
-     -192, -192, -192,   58, -192, -192,   58,   58,   58,   58,
-
-       58,  200,   58,   58,   58,   58,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58, -192
-    },
-
-    {
-       11, -193, -193, -193, -193, -193, -193, -193, -193, -193,
-     -193, -193, -193,   58, -193, -193,   58,   58,   58,   58,
-       58,  201,   58,   58,   58,   58,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58, -193
-    },
-
-    {
-       11, -194, -194, -194, -194, -194, -194, -194, -194, -194,
-     -194, -194, -194,   58, -194, -194,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
-       58,   58,   58,   58,  202,   58,   58, -194
-
-    },
-
-    {
-       11, -195, -195, -195, -195, -195, -195, -195, -195, -195,
-     -195, -195, -195,   58, -195, -195,   58,   58,   58,   58,
-       58,  203,   58,   58,   58,   58,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58, -195
-    },
-
-    {
-       11, -196, -196, -196, -196, -196, -196, -196, -196, -196,
-     -196, -196, -196,   58, -196, -196,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58, -196
-    },
-
-    {
-       11, -197, -197, -197, -197, -197, -197, -197, -197, -197,
-     -197, -197, -197,   58, -197, -197,   58,   58,   58,   58,
-
-       58,   58,   58,   58,   58,  204,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58, -197
-    },
-
-    {
-       11, -198, -198, -198, -198, -198, -198, -198, -198, -198,
-     -198, -198, -198,   58, -198, -198,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58, -198
-    },
-
-    {
-       11, -199, -199, -199, -199, -199, -199, -199, -199, -199,
-     -199, -199, -199,   58, -199, -199,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58, -199
-
-    },
-
-    {
-       11, -200, -200, -200, -200, -200, -200, -200, -200, -200,
-     -200, -200, -200,   58, -200, -200,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58, -200
-    },
-
-    {
-       11, -201, -201, -201, -201, -201, -201, -201, -201, -201,
-     -201, -201, -201,   58, -201, -201,   58,  205,   58,   58,
-       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58, -201
-    },
-
-    {
-       11, -202, -202, -202, -202, -202, -202, -202, -202, -202,
-     -202, -202, -202,   58, -202, -202,   58,  206,   58,   58,
-
-       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58, -202
-    },
-
-    {
-       11, -203, -203, -203, -203, -203, -203, -203, -203, -203,
-     -203, -203, -203,   58, -203, -203,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58, -203
-    },
-
-    {
-       11, -204, -204, -204, -204, -204, -204, -204, -204, -204,
-     -204, -204, -204,   58, -204, -204,   58,   58,   58,   58,
-       58,   58,   58,  207,   58,   58,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58, -204
-
-    },
-
-    {
-       11, -205, -205, -205, -205, -205, -205, -205, -205, -205,
-     -205, -205, -205,   58, -205, -205,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58,   58,  208,   58,
-       58,   58,   58,   58,   58,   58,   58, -205
-    },
-
-    {
-       11, -206, -206, -206, -206, -206, -206, -206, -206, -206,
-     -206, -206, -206,   58, -206, -206,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
-       58,   58,   58,   58,  209,   58,   58, -206
-    },
-
-    {
-       11, -207, -207, -207, -207, -207, -207, -207, -207, -207,
-     -207, -207, -207,   58, -207, -207,   58,   58,   58,   58,
-
-       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58, -207
-    },
-
-    {
-       11, -208, -208, -208, -208, -208, -208, -208, -208, -208,
-     -208, -208, -208,   58, -208, -208,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58, -208
-    },
-
-    {
-       11, -209, -209, -209, -209, -209, -209, -209, -209, -209,
-     -209, -209, -209,   58, -209, -209,   58,   58,   58,   58,
-       58,  210,   58,   58,   58,   58,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58, -209
-
-    },
-
-    {
-       11, -210, -210, -210, -210, -210, -210, -210, -210, -210,
-     -210, -210, -210,   58, -210, -210,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58, -210
-    },
-
-    } ;
-
-static yy_state_type yy_get_previous_state (void );
-static yy_state_type yy_try_NUL_trans (yy_state_type current_state  );
-static int yy_get_next_buffer (void );
-static void yy_fatal_error (yyconst char msg[]  );
-
-/* Done after the current pattern has been matched and before the
- * corresponding action - sets up zconftext.
- */
-#define YY_DO_BEFORE_ACTION \
-        (yytext_ptr) = yy_bp; \
-        zconfleng = (size_t) (yy_cp - yy_bp); \
-        (yy_hold_char) = *yy_cp; \
-        *yy_cp = '\0'; \
-        (yy_c_buf_p) = yy_cp;
-
-#define YY_NUM_RULES 64
-#define YY_END_OF_BUFFER 65
-/* This struct is not used in this scanner,
-   but its presence is necessary. */
-struct yy_trans_info
-        {
-        flex_int32_t yy_verify;
-        flex_int32_t yy_nxt;
-        };
-static yyconst flex_int16_t yy_accept[211] =
-    {   0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-       65,    5,    4,    3,    2,   36,   37,   35,   35,   35,
-       35,   35,   35,   35,   35,   35,   35,   35,   35,   35,
-       63,   60,   62,   55,   59,   58,   57,   53,   48,   42,
-       47,   51,   53,   40,   41,   50,   50,   43,   53,   50,
-       50,   53,    4,    3,    2,    2,    1,   35,   35,   35,
-       35,   35,   35,   35,   16,   35,   35,   35,   35,   35,
-       35,   35,   35,   35,   35,   35,   63,   60,   62,   61,
-       55,   54,   57,   56,   44,   51,   38,   50,   50,   52,
-       45,   46,   39,   35,   35,   35,   35,   35,   35,   35,
-
-       35,   35,   30,   29,   35,   35,   35,   35,   35,   35,
-       35,   35,   35,   35,   49,   25,   35,   35,   35,   35,
-       35,   35,   35,   35,   35,   35,   15,   35,    7,   35,
-       35,   35,   35,   35,   35,   35,   35,   35,   35,   35,
-       35,   35,   35,   35,   35,   35,   35,   17,   35,   35,
-       35,   35,   35,   34,   35,   35,   35,   35,   35,   35,
-       10,   35,   13,   35,   35,   35,   35,   33,   35,   35,
-       35,   35,   35,   22,   35,   32,    9,   31,   35,   26,
-       12,   35,   35,   21,   18,   35,    8,   35,   35,   35,
-       35,   35,   27,   35,   35,    6,   35,   20,   19,   23,
-
-       35,   35,   11,   35,   35,   35,   14,   28,   35,   24
-    } ;
-
-static yyconst flex_int32_t yy_ec[256] =
-    {   0,
-        1,    1,    1,    1,    1,    1,    1,    1,    2,    3,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    2,    4,    5,    6,    1,    1,    7,    8,    9,
-       10,    1,    1,    1,   11,   12,   12,   13,   13,   13,
-       13,   13,   13,   13,   13,   13,   13,    1,    1,    1,
-       14,    1,    1,    1,   13,   13,   13,   13,   13,   13,
-       13,   13,   13,   13,   13,   13,   13,   13,   13,   13,
-       13,   13,   13,   13,   13,   13,   13,   13,   13,   13,
-        1,   15,    1,    1,   16,    1,   17,   18,   19,   20,
-
-       21,   22,   23,   24,   25,   13,   13,   26,   27,   28,
-       29,   30,   31,   32,   33,   34,   35,   13,   13,   36,
-       13,   13,    1,   37,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1
-    } ;
-
-extern int zconf_flex_debug;
-int zconf_flex_debug = 0;
-
-/* The intent behind this definition is that it'll catch
- * any uses of REJECT which flex missed.
- */
-#define REJECT reject_used_but_not_detected
-#define yymore() yymore_used_but_not_detected
-#define YY_MORE_ADJ 0
-#define YY_RESTORE_YY_MORE_OFFSET
-char *zconftext;
-
-/*
- * Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org>
- * Released under the terms of the GNU GPL v2.0.
- */
-
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#define LKC_DIRECT_LINK
-#include "lkc.h"
-
-#define START_STRSIZE   16
-
-char *text;
-static char *text_ptr;
-static int text_size, text_asize;
-
-struct buffer {
-        struct buffer *parent;
-        YY_BUFFER_STATE state;
-};
-
-struct buffer *current_buf;
-
-static int last_ts, first_ts;
-
-static void zconf_endhelp(void);
-static struct buffer *zconf_endfile(void);
-
-void new_string(void)
-{
-        text = malloc(START_STRSIZE);
-        text_asize = START_STRSIZE;
-        text_ptr = text;
-        text_size = 0;
-        *text_ptr = 0;
-}
-
-void append_string(const char *str, int size)
-{
-        int new_size = text_size + size + 1;
-        if (new_size > text_asize) {
-                text = realloc(text, new_size);
-                text_asize = new_size;
-                text_ptr = text + text_size;
-        }
-        memcpy(text_ptr, str, size);
-        text_ptr += size;
-        text_size += size;
-        *text_ptr = 0;
-}
-
-void alloc_string(const char *str, int size)
-{
-        text = malloc(size + 1);
-        memcpy(text, str, size);
-        text[size] = 0;
-}
-
-#define INITIAL 0
-#define COMMAND 1
-#define HELP 2
-#define STRING 3
-#define PARAM 4
-
-/* Special case for "unistd.h", since it is non-ANSI. We include it way
- * down here because we want the user's section 1 to have been scanned first.
- * The user has a chance to override it with an option.
- */
-#include <unistd.h>
-
-#ifndef YY_EXTRA_TYPE
-#define YY_EXTRA_TYPE void *
-#endif
-
-/* Macros after this point can all be overridden by user definitions in
- * section 1.
- */
-
-#ifndef YY_SKIP_YYWRAP
-#ifdef __cplusplus
-extern "C" int zconfwrap (void );
-#else
-extern int zconfwrap (void );
-#endif
-#endif
-
-    static void yyunput (int c,char *buf_ptr  );
-
-#ifndef yytext_ptr
-static void yy_flex_strncpy (char *,yyconst char *,int );
-#endif
-
-#ifdef YY_NEED_STRLEN
-static int yy_flex_strlen (yyconst char * );
-#endif
-
-#ifndef YY_NO_INPUT
-
-#ifdef __cplusplus
-static int yyinput (void );
-#else
-static int input (void );
-#endif
-
-#endif
-
-/* Amount of stuff to slurp up with each read. */
-#ifndef YY_READ_BUF_SIZE
-#define YY_READ_BUF_SIZE 8192
-#endif
-
-/* Copy whatever the last rule matched to the standard output. */
-#ifndef ECHO
-/* This used to be an fputs(), but since the string might contain NUL's,
- * we now use fwrite().
- */
-#define ECHO (void) fwrite( zconftext, zconfleng, 1, zconfout )
-#endif
-
-/* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
- * is returned in "result".
- */
-#ifndef YY_INPUT
-#define YY_INPUT(buf,result,max_size) \
-        errno=0; \
-        while ( (result = read( fileno(zconfin), (char *) buf, max_size )) < 0 ) \
-        { \
-                if( errno != EINTR) \
-                { \
-                        YY_FATAL_ERROR( "input in flex scanner failed" ); \
-                        break; \
-                } \
-                errno=0; \
-                clearerr(zconfin); \
-        }\
-\
-
-#endif
-
-/* No semi-colon after return; correct usage is to write "yyterminate();" -
- * we don't want an extra ';' after the "return" because that will cause
- * some compilers to complain about unreachable statements.
- */
-#ifndef yyterminate
-#define yyterminate() return YY_NULL
-#endif
-
-/* Number of entries by which start-condition stack grows. */
-#ifndef YY_START_STACK_INCR
-#define YY_START_STACK_INCR 25
-#endif
-
-/* Report a fatal error. */
-#ifndef YY_FATAL_ERROR
-#define YY_FATAL_ERROR(msg) yy_fatal_error( msg )
-#endif
-
-/* end tables serialization structures and prototypes */
-
-/* Default declaration of generated scanner - a define so the user can
- * easily add parameters.
- */
-#ifndef YY_DECL
-#define YY_DECL_IS_OURS 1
-
-extern int zconflex (void);
-
-#define YY_DECL int zconflex (void)
-#endif /* !YY_DECL */
-
-/* Code executed at the beginning of each rule, after zconftext and zconfleng
- * have been set up.
- */
-#ifndef YY_USER_ACTION
-#define YY_USER_ACTION
-#endif
-
-/* Code executed at the end of each rule. */
-#ifndef YY_BREAK
-#define YY_BREAK break;
-#endif
-
-#define YY_RULE_SETUP \
-        YY_USER_ACTION
-
-/** The main scanner function which does all the work.
- */
-YY_DECL
-{
-        register yy_state_type yy_current_state;
-        register char *yy_cp, *yy_bp;
-        register int yy_act;
-
-        int str = 0;
-        int ts, i;
-
-        if ( (yy_init) )
-                {
-                (yy_init) = 0;
-
-#ifdef YY_USER_INIT
-                YY_USER_INIT;
-#endif
-
-                if ( ! (yy_start) )
-                        (yy_start) = 1; /* first start state */
-
-                if ( ! zconfin )
-                        zconfin = stdin;
-
-                if ( ! zconfout )
-                        zconfout = stdout;
-
-                if ( ! YY_CURRENT_BUFFER ) {
-                        zconfensure_buffer_stack ();
-                        YY_CURRENT_BUFFER_LVALUE =
-                                zconf_create_buffer(zconfin,YY_BUF_SIZE );
-                }
-
-                zconf_load_buffer_state( );
-                }
-
-        while ( 1 )             /* loops until end-of-file is reached */
-                {
-                yy_cp = (yy_c_buf_p);
-
-                /* Support of zconftext. */
-                *yy_cp = (yy_hold_char);
-
-                /* yy_bp points to the position in yy_ch_buf of the start of
-                 * the current run.
-                 */
-                yy_bp = yy_cp;
-
-                yy_current_state = (yy_start);
-yy_match:
-                while ( (yy_current_state = yy_nxt[yy_current_state][ yy_ec[YY_SC_TO_UI(*yy_cp)]  ]) > 0 )
-                        ++yy_cp;
-
-                yy_current_state = -yy_current_state;
-
-yy_find_action:
-                yy_act = yy_accept[yy_current_state];
-
-                YY_DO_BEFORE_ACTION;
-
-do_action:      /* This label is used only to access EOF actions. */
-
-                switch ( yy_act )
-        { /* beginning of action switch */
-case 1:
-/* rule 1 can match eol */
-YY_RULE_SETUP
-current_file->lineno++;
-        YY_BREAK
-case 2:
-YY_RULE_SETUP
-
-        YY_BREAK
-case 3:
-/* rule 3 can match eol */
-YY_RULE_SETUP
-current_file->lineno++; return T_EOL;
-        YY_BREAK
-case 4:
-YY_RULE_SETUP
-{
-        BEGIN(COMMAND);
-}
-        YY_BREAK
-case 5:
-YY_RULE_SETUP
-{
-        unput(zconftext[0]);
-        BEGIN(COMMAND);
-}
-        YY_BREAK
-
-case 6:
-YY_RULE_SETUP
-BEGIN(PARAM); return T_MAINMENU;
-        YY_BREAK
-case 7:
-YY_RULE_SETUP
-BEGIN(PARAM); return T_MENU;
-        YY_BREAK
-case 8:
-YY_RULE_SETUP
-BEGIN(PARAM); return T_ENDMENU;
-        YY_BREAK
-case 9:
-YY_RULE_SETUP
-BEGIN(PARAM); return T_SOURCE;
-        YY_BREAK
-case 10:
-YY_RULE_SETUP
-BEGIN(PARAM); return T_CHOICE;
-        YY_BREAK
-case 11:
-YY_RULE_SETUP
-BEGIN(PARAM); return T_ENDCHOICE;
-        YY_BREAK
-case 12:
-YY_RULE_SETUP
-BEGIN(PARAM); return T_COMMENT;
-        YY_BREAK
-case 13:
-YY_RULE_SETUP
-BEGIN(PARAM); return T_CONFIG;
-        YY_BREAK
-case 14:
-YY_RULE_SETUP
-BEGIN(PARAM); return T_MENUCONFIG;
-        YY_BREAK
-case 15:
-YY_RULE_SETUP
-BEGIN(PARAM); return T_HELP;
-        YY_BREAK
-case 16:
-YY_RULE_SETUP
-BEGIN(PARAM); return T_IF;
-        YY_BREAK
-case 17:
-YY_RULE_SETUP
-BEGIN(PARAM); return T_ENDIF;
-        YY_BREAK
-case 18:
-YY_RULE_SETUP
-BEGIN(PARAM); return T_DEPENDS;
-        YY_BREAK
-case 19:
-YY_RULE_SETUP
-BEGIN(PARAM); return T_REQUIRES;
-        YY_BREAK
-case 20:
-YY_RULE_SETUP
-BEGIN(PARAM); return T_OPTIONAL;
-        YY_BREAK
-case 21:
-YY_RULE_SETUP
-BEGIN(PARAM); return T_DEFAULT;
-        YY_BREAK
-case 22:
-YY_RULE_SETUP
-BEGIN(PARAM); return T_PROMPT;
-        YY_BREAK
-case 23:
-YY_RULE_SETUP
-BEGIN(PARAM); return T_TRISTATE;
-        YY_BREAK
-case 24:
-YY_RULE_SETUP
-BEGIN(PARAM); return T_DEF_TRISTATE;
-        YY_BREAK
-case 25:
-YY_RULE_SETUP
-BEGIN(PARAM); return T_BOOLEAN;
-        YY_BREAK
-case 26:
-YY_RULE_SETUP
-BEGIN(PARAM); return T_BOOLEAN;
-        YY_BREAK
-case 27:
-YY_RULE_SETUP
-BEGIN(PARAM); return T_DEF_BOOLEAN;
-        YY_BREAK
-case 28:
-YY_RULE_SETUP
-BEGIN(PARAM); return T_DEF_BOOLEAN;
-        YY_BREAK
-case 29:
-YY_RULE_SETUP
-BEGIN(PARAM); return T_INT;
-        YY_BREAK
-case 30:
-YY_RULE_SETUP
-BEGIN(PARAM); return T_HEX;
-        YY_BREAK
-case 31:
-YY_RULE_SETUP
-BEGIN(PARAM); return T_STRING;
-        YY_BREAK
-case 32:
-YY_RULE_SETUP
-BEGIN(PARAM); return T_SELECT;
-        YY_BREAK
-case 33:
-YY_RULE_SETUP
-BEGIN(PARAM); return T_SELECT;
-        YY_BREAK
-case 34:
-YY_RULE_SETUP
-BEGIN(PARAM); return T_RANGE;
-        YY_BREAK
-case 35:
-YY_RULE_SETUP
-{
-                alloc_string(zconftext, zconfleng);
-                zconflval.string = text;
-                return T_WORD;
-        }
-        YY_BREAK
-case 36:
-YY_RULE_SETUP
-
-        YY_BREAK
-case 37:
-/* rule 37 can match eol */
-YY_RULE_SETUP
-current_file->lineno++; BEGIN(INITIAL);
-        YY_BREAK
-
-case 38:
-YY_RULE_SETUP
-return T_AND;
-        YY_BREAK
-case 39:
-YY_RULE_SETUP
-return T_OR;
-        YY_BREAK
-case 40:
-YY_RULE_SETUP
-return T_OPEN_PAREN;
-        YY_BREAK
-case 41:
-YY_RULE_SETUP
-return T_CLOSE_PAREN;
-        YY_BREAK
-case 42:
-YY_RULE_SETUP
-return T_NOT;
-        YY_BREAK
-case 43:
-YY_RULE_SETUP
-return T_EQUAL;
-        YY_BREAK
-case 44:
-YY_RULE_SETUP
-return T_UNEQUAL;
-        YY_BREAK
-case 45:
-YY_RULE_SETUP
-return T_IF;
-        YY_BREAK
-case 46:
-YY_RULE_SETUP
-return T_ON;
-        YY_BREAK
-case 47:
-YY_RULE_SETUP
-{
-                str = zconftext[0];
-                new_string();
-                BEGIN(STRING);
-        }
-        YY_BREAK
-case 48:
-/* rule 48 can match eol */
-YY_RULE_SETUP
-BEGIN(INITIAL); current_file->lineno++; return T_EOL;
-        YY_BREAK
-case 49:
-YY_RULE_SETUP
-/* ignore */
-        YY_BREAK
-case 50:
-YY_RULE_SETUP
-{
-                alloc_string(zconftext, zconfleng);
-                zconflval.string = text;
-                return T_WORD;
-        }
-        YY_BREAK
-case 51:
-YY_RULE_SETUP
-/* comment */
-        YY_BREAK
-case 52:
-/* rule 52 can match eol */
-YY_RULE_SETUP
-current_file->lineno++;
-        YY_BREAK
-case 53:
-YY_RULE_SETUP
-
-        YY_BREAK
-case YY_STATE_EOF(PARAM):
-{
-                BEGIN(INITIAL);
-        }
-        YY_BREAK
-
-case 54:
-/* rule 54 can match eol */
-*yy_cp = (yy_hold_char); /* undo effects of setting up zconftext */
-(yy_c_buf_p) = yy_cp -= 1;
-YY_DO_BEFORE_ACTION; /* set up zconftext again */
-YY_RULE_SETUP
-{
-                append_string(zconftext, zconfleng);
-                zconflval.string = text;
-                return T_WORD_QUOTE;
-        }
-        YY_BREAK
-case 55:
-YY_RULE_SETUP
-{
-                append_string(zconftext, zconfleng);
-        }
-        YY_BREAK
-case 56:
-/* rule 56 can match eol */
-*yy_cp = (yy_hold_char); /* undo effects of setting up zconftext */
-(yy_c_buf_p) = yy_cp -= 1;
-YY_DO_BEFORE_ACTION; /* set up zconftext again */
-YY_RULE_SETUP
-{
-                append_string(zconftext + 1, zconfleng - 1);
-                zconflval.string = text;
-                return T_WORD_QUOTE;
-        }
-        YY_BREAK
-case 57:
-YY_RULE_SETUP
-{
-                append_string(zconftext + 1, zconfleng - 1);
-        }
-        YY_BREAK
-case 58:
-YY_RULE_SETUP
-{
-                if (str == zconftext[0]) {
-                        BEGIN(PARAM);
-                        zconflval.string = text;
-                        return T_WORD_QUOTE;
-                } else
-                        append_string(zconftext, 1);
-        }
-        YY_BREAK
-case 59:
-/* rule 59 can match eol */
-YY_RULE_SETUP
-{
-                printf("%s:%d:warning: multi-line strings not supported\n", zconf_curname(), zconf_lineno());
-                current_file->lineno++;
-                BEGIN(INITIAL);
-                return T_EOL;
-        }
-        YY_BREAK
-case YY_STATE_EOF(STRING):
-{
-                BEGIN(INITIAL);
-        }
-        YY_BREAK
-
-case 60:
-YY_RULE_SETUP
-{
-                ts = 0;
-                for (i = 0; i < zconfleng; i++) {
-                        if (zconftext[i] == '\t')
-                                ts = (ts & ~7) + 8;
-                        else
-                                ts++;
-                }
-                last_ts = ts;
-                if (first_ts) {
-                        if (ts < first_ts) {
-                                zconf_endhelp();
-                                return T_HELPTEXT;
-                        }
-                        ts -= first_ts;
-                        while (ts > 8) {
-                                append_string("        ", 8);
-                                ts -= 8;
-                        }
-                        append_string("        ", ts);
-                }
-        }
-        YY_BREAK
-case 61:
-/* rule 61 can match eol */
-*yy_cp = (yy_hold_char); /* undo effects of setting up zconftext */
-(yy_c_buf_p) = yy_cp -= 1;
-YY_DO_BEFORE_ACTION; /* set up zconftext again */
-YY_RULE_SETUP
-{
-                current_file->lineno++;
-                zconf_endhelp();
-                return T_HELPTEXT;
-        }
-        YY_BREAK
-case 62:
-/* rule 62 can match eol */
-YY_RULE_SETUP
-{
-                current_file->lineno++;
-                append_string("\n", 1);
-        }
-        YY_BREAK
-case 63:
-YY_RULE_SETUP
-{
-                append_string(zconftext, zconfleng);
-                if (!first_ts)
-                        first_ts = last_ts;
-        }
-        YY_BREAK
-case YY_STATE_EOF(HELP):
-{
-                zconf_endhelp();
-                return T_HELPTEXT;
-        }
-        YY_BREAK
-
-case YY_STATE_EOF(INITIAL):
-case YY_STATE_EOF(COMMAND):
-{
-        if (current_buf) {
-                zconf_endfile();
-                return T_EOF;
-        }
-        fclose(zconfin);
-        yyterminate();
-}
-        YY_BREAK
-case 64:
-YY_RULE_SETUP
-YY_FATAL_ERROR( "flex scanner jammed" );
-        YY_BREAK
-
-        case YY_END_OF_BUFFER:
-                {
-                /* Amount of text matched not including the EOB char. */
-                int yy_amount_of_matched_text = (int) (yy_cp - (yytext_ptr)) - 1;
-
-                /* Undo the effects of YY_DO_BEFORE_ACTION. */
-                *yy_cp = (yy_hold_char);
-                YY_RESTORE_YY_MORE_OFFSET
-
-                if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_NEW )
-                        {
-                        /* We're scanning a new file or input source.  It's
-                         * possible that this happened because the user
-                         * just pointed zconfin at a new source and called
-                         * zconflex().  If so, then we have to assure
-                         * consistency between YY_CURRENT_BUFFER and our
-                         * globals.  Here is the right place to do so, because
-                         * this is the first action (other than possibly a
-                         * back-up) that will match for the new input source.
-                         */
-                        (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
-                        YY_CURRENT_BUFFER_LVALUE->yy_input_file = zconfin;
-                        YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL;
-                        }
-
-                /* Note that here we test for yy_c_buf_p "<=" to the position
-                 * of the first EOB in the buffer, since yy_c_buf_p will
-                 * already have been incremented past the NUL character
-                 * (since all states make transitions on EOB to the
-                 * end-of-buffer state).  Contrast this with the test
-                 * in input().
-                 */
-                if ( (yy_c_buf_p) <= &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] )
-                        { /* This was really a NUL. */
-                        yy_state_type yy_next_state;
-
-                        (yy_c_buf_p) = (yytext_ptr) + yy_amount_of_matched_text;
-
-                        yy_current_state = yy_get_previous_state(  );
-
-                        /* Okay, we're now positioned to make the NUL
-                         * transition.  We couldn't have
-                         * yy_get_previous_state() go ahead and do it
-                         * for us because it doesn't know how to deal
-                         * with the possibility of jamming (and we don't
-                         * want to build jamming into it because then it
-                         * will run more slowly).
-                         */
-
-                        yy_next_state = yy_try_NUL_trans( yy_current_state );
-
-                        yy_bp = (yytext_ptr) + YY_MORE_ADJ;
-
-                        if ( yy_next_state )
-                                {
-                                /* Consume the NUL. */
-                                yy_cp = ++(yy_c_buf_p);
-                                yy_current_state = yy_next_state;
-                                goto yy_match;
-                                }
-
-                        else
-                                {
-                                yy_cp = (yy_c_buf_p);
-                                goto yy_find_action;
-                                }
-                        }
-
-                else switch ( yy_get_next_buffer(  ) )
-                        {
-                        case EOB_ACT_END_OF_FILE:
-                                {
-                                (yy_did_buffer_switch_on_eof) = 0;
-
-                                if ( zconfwrap( ) )
-                                        {
-                                        /* Note: because we've taken care in
-                                         * yy_get_next_buffer() to have set up
-                                         * zconftext, we can now set up
-                                         * yy_c_buf_p so that if some total
-                                         * hoser (like flex itself) wants to
-                                         * call the scanner after we return the
-                                         * YY_NULL, it'll still work - another
-                                         * YY_NULL will get returned.
-                                         */
-                                        (yy_c_buf_p) = (yytext_ptr) + YY_MORE_ADJ;
-
-                                        yy_act = YY_STATE_EOF(YY_START);
-                                        goto do_action;
-                                        }
-
-                                else
-                                        {
-                                        if ( ! (yy_did_buffer_switch_on_eof) )
-                                                YY_NEW_FILE;
-                                        }
-                                break;
-                                }
-
-                        case EOB_ACT_CONTINUE_SCAN:
-                                (yy_c_buf_p) =
-                                        (yytext_ptr) + yy_amount_of_matched_text;
-
-                                yy_current_state = yy_get_previous_state(  );
-
-                                yy_cp = (yy_c_buf_p);
-                                yy_bp = (yytext_ptr) + YY_MORE_ADJ;
-                                goto yy_match;
-
-                        case EOB_ACT_LAST_MATCH:
-                                (yy_c_buf_p) =
-                                &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)];
-
-                                yy_current_state = yy_get_previous_state(  );
-
-                                yy_cp = (yy_c_buf_p);
-                                yy_bp = (yytext_ptr) + YY_MORE_ADJ;
-                                goto yy_find_action;
-                        }
-                break;
-                }
-
-        default:
-                YY_FATAL_ERROR(
-                        "fatal flex scanner internal error--no action found" );
-        } /* end of action switch */
-                } /* end of scanning one token */
-} /* end of zconflex */
-
-/* yy_get_next_buffer - try to read in a new buffer
- *
- * Returns a code representing an action:
- *      EOB_ACT_LAST_MATCH -
- *      EOB_ACT_CONTINUE_SCAN - continue scanning from current position
- *      EOB_ACT_END_OF_FILE - end of file
- */
-static int yy_get_next_buffer (void)
-{
-        register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
-        register char *source = (yytext_ptr);
-        register int number_to_move, i;
-        int ret_val;
-
-        if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] )
-                YY_FATAL_ERROR(
-                "fatal flex scanner internal error--end of buffer missed" );
-
-        if ( YY_CURRENT_BUFFER_LVALUE->yy_fill_buffer == 0 )
-                { /* Don't try to fill the buffer, so this is an EOF. */
-                if ( (yy_c_buf_p) - (yytext_ptr) - YY_MORE_ADJ == 1 )
-                        {
-                        /* We matched a single character, the EOB, so
-                         * treat this as a final EOF.
-                         */
-                        return EOB_ACT_END_OF_FILE;
-                        }
-
-                else
-                        {
-                        /* We matched some text prior to the EOB, first
-                         * process it.
-                         */
-                        return EOB_ACT_LAST_MATCH;
-                        }
-                }
-
-        /* Try to read more data. */
-
-        /* First move last chars to start of buffer. */
-        number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr)) - 1;
-
-        for ( i = 0; i < number_to_move; ++i )
-                *(dest++) = *(source++);
-
-        if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_EOF_PENDING )
-                /* don't do the read, it's not guaranteed to return an EOF,
-                 * just force an EOF
-                 */
-                YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars) = 0;
-
-        else
-                {
-                        size_t num_to_read =
-                        YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
-
-                while ( num_to_read <= 0 )
-                        { /* Not enough room in the buffer - grow it. */
-
-                        /* just a shorter name for the current buffer */
-                        YY_BUFFER_STATE b = YY_CURRENT_BUFFER;
-
-                        int yy_c_buf_p_offset =
-                                (int) ((yy_c_buf_p) - b->yy_ch_buf);
-
-                        if ( b->yy_is_our_buffer )
-                                {
-                                int new_size = b->yy_buf_size * 2;
-
-                                if ( new_size <= 0 )
-                                        b->yy_buf_size += b->yy_buf_size / 8;
-                                else
-                                        b->yy_buf_size *= 2;
-
-                                b->yy_ch_buf = (char *)
-                                        /* Include room in for 2 EOB chars. */
-                                        zconfrealloc((void *) b->yy_ch_buf,b->yy_buf_size + 2  );
-                                }
-                        else
-                                /* Can't grow it, we don't own it. */
-                                b->yy_ch_buf = 0;
-
-                        if ( ! b->yy_ch_buf )
-                                YY_FATAL_ERROR(
-                                "fatal error - scanner input buffer overflow" );
-
-                        (yy_c_buf_p) = &b->yy_ch_buf[yy_c_buf_p_offset];
-
-                        num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size -
-                                                number_to_move - 1;
-
-                        }
-
-                if ( num_to_read > YY_READ_BUF_SIZE )
-                        num_to_read = YY_READ_BUF_SIZE;
-
-                /* Read in more data. */
-                YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
-                        (yy_n_chars), num_to_read );
-
-                YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
-                }
-
-        if ( (yy_n_chars) == 0 )
-                {
-                if ( number_to_move == YY_MORE_ADJ )
-                        {
-                        ret_val = EOB_ACT_END_OF_FILE;
-                        zconfrestart(zconfin  );
-                        }
-
-                else
-                        {
-                        ret_val = EOB_ACT_LAST_MATCH;
-                        YY_CURRENT_BUFFER_LVALUE->yy_buffer_status =
-                                YY_BUFFER_EOF_PENDING;
-                        }
-                }
-
-        else
-                ret_val = EOB_ACT_CONTINUE_SCAN;
-
-        (yy_n_chars) += number_to_move;
-        YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] = YY_END_OF_BUFFER_CHAR;
-        YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] = YY_END_OF_BUFFER_CHAR;
-
-        (yytext_ptr) = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[0];
-
-        return ret_val;
-}
-
-/* yy_get_previous_state - get the state just before the EOB char was reached */
-
-    static yy_state_type yy_get_previous_state (void)
-{
-        register yy_state_type yy_current_state;
-        register char *yy_cp;
-
-        yy_current_state = (yy_start);
-
-        for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp )
-                {
-                yy_current_state = yy_nxt[yy_current_state][(*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1)];
-                }
-
-        return yy_current_state;
-}
-
-/* yy_try_NUL_trans - try to make a transition on the NUL character
- *
- * synopsis
- *      next_state = yy_try_NUL_trans( current_state );
- */
-    static yy_state_type yy_try_NUL_trans  (yy_state_type yy_current_state )
-{
-        register int yy_is_jam;
-
-        yy_current_state = yy_nxt[yy_current_state][1];
-        yy_is_jam = (yy_current_state <= 0);
-
-        return yy_is_jam ? 0 : yy_current_state;
-}
-
-    static void yyunput (int c, register char * yy_bp )
-{
-        register char *yy_cp;
-
-    yy_cp = (yy_c_buf_p);
-
-        /* undo effects of setting up zconftext */
-        *yy_cp = (yy_hold_char);
-
-        if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
-                { /* need to shift things up to make room */
-                /* +2 for EOB chars. */
-                register int number_to_move = (yy_n_chars) + 2;
-                register char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[
-                                        YY_CURRENT_BUFFER_LVALUE->yy_buf_size + 2];
-                register char *source =
-                                &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move];
-
-                while ( source > YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
-                        *--dest = *--source;
-
-                yy_cp += (int) (dest - source);
-                yy_bp += (int) (dest - source);
-                YY_CURRENT_BUFFER_LVALUE->yy_n_chars =
-                        (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_buf_size;
-
-                if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
-                        YY_FATAL_ERROR( "flex scanner push-back overflow" );
-                }
-
-        *--yy_cp = (char) c;
-
-        (yytext_ptr) = yy_bp;
-        (yy_hold_char) = *yy_cp;
-        (yy_c_buf_p) = yy_cp;
-}
-
-#ifndef YY_NO_INPUT
-#ifdef __cplusplus
-    static int yyinput (void)
-#else
-    static int input  (void)
-#endif
-
-{
-        int c;
-
-        *(yy_c_buf_p) = (yy_hold_char);
-
-        if ( *(yy_c_buf_p) == YY_END_OF_BUFFER_CHAR )
-                {
-                /* yy_c_buf_p now points to the character we want to return.
-                 * If this occurs *before* the EOB characters, then it's a
-                 * valid NUL; if not, then we've hit the end of the buffer.
-                 */
-                if ( (yy_c_buf_p) < &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] )
-                        /* This was really a NUL. */
-                        *(yy_c_buf_p) = '\0';
-
-                else
-                        { /* need more input */
-                        int offset = (yy_c_buf_p) - (yytext_ptr);
-                        ++(yy_c_buf_p);
-
-                        switch ( yy_get_next_buffer(  ) )
-                                {
-                                case EOB_ACT_LAST_MATCH:
-                                        /* This happens because yy_g_n_b()
-                                         * sees that we've accumulated a
-                                         * token and flags that we need to
-                                         * try matching the token before
-                                         * proceeding.  But for input(),
-                                         * there's no matching to consider.
-                                         * So convert the EOB_ACT_LAST_MATCH
-                                         * to EOB_ACT_END_OF_FILE.
-                                         */
-
-                                        /* Reset buffer status. */
-                                        zconfrestart(zconfin );
-
-                                        /*FALLTHROUGH*/
-
-                                case EOB_ACT_END_OF_FILE:
-                                        {
-                                        if ( zconfwrap( ) )
-                                                return EOF;
-
-                                        if ( ! (yy_did_buffer_switch_on_eof) )
-                                                YY_NEW_FILE;
-#ifdef __cplusplus
-                                        return yyinput();
-#else
-                                        return input();
-#endif
-                                        }
-
-                                case EOB_ACT_CONTINUE_SCAN:
-                                        (yy_c_buf_p) = (yytext_ptr) + offset;
-                                        break;
-                                }
-                        }
-                }
-
-        c = *(unsigned char *) (yy_c_buf_p);    /* cast for 8-bit char's */
-        *(yy_c_buf_p) = '\0';   /* preserve zconftext */
-        (yy_hold_char) = *++(yy_c_buf_p);
-
-        return c;
-}
-#endif  /* ifndef YY_NO_INPUT */
-
-/** Immediately switch to a different input stream.
- * @param input_file A readable stream.
- *
- * @note This function does not reset the start condition to @c INITIAL .
- */
-    void zconfrestart  (FILE * input_file )
-{
-
-        if ( ! YY_CURRENT_BUFFER ){
-        zconfensure_buffer_stack ();
-                YY_CURRENT_BUFFER_LVALUE =
-            zconf_create_buffer(zconfin,YY_BUF_SIZE );
-        }
-
-        zconf_init_buffer(YY_CURRENT_BUFFER,input_file );
-        zconf_load_buffer_state( );
-}
-
-/** Switch to a different input buffer.
- * @param new_buffer The new input buffer.
- *
- */
-    void zconf_switch_to_buffer  (YY_BUFFER_STATE  new_buffer )
-{
-
-        /* TODO. We should be able to replace this entire function body
-         * with
-         *              zconfpop_buffer_state();
-         *              zconfpush_buffer_state(new_buffer);
-     */
-        zconfensure_buffer_stack ();
-        if ( YY_CURRENT_BUFFER == new_buffer )
-                return;
-
-        if ( YY_CURRENT_BUFFER )
-                {
-                /* Flush out information for old buffer. */
-                *(yy_c_buf_p) = (yy_hold_char);
-                YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
-                YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
-                }
-
-        YY_CURRENT_BUFFER_LVALUE = new_buffer;
-        zconf_load_buffer_state( );
-
-        /* We don't actually know whether we did this switch during
-         * EOF (zconfwrap()) processing, but the only time this flag
-         * is looked at is after zconfwrap() is called, so it's safe
-         * to go ahead and always set it.
-         */
-        (yy_did_buffer_switch_on_eof) = 1;
-}
-
-static void zconf_load_buffer_state  (void)
-{
-        (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
-        (yytext_ptr) = (yy_c_buf_p) = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos;
-        zconfin = YY_CURRENT_BUFFER_LVALUE->yy_input_file;
-        (yy_hold_char) = *(yy_c_buf_p);
-}
-
-/** Allocate and initialize an input buffer state.
- * @param file A readable stream.
- * @param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE.
- *
- * @return the allocated buffer state.
- */
-    YY_BUFFER_STATE zconf_create_buffer  (FILE * file, int  size )
-{
-        YY_BUFFER_STATE b;
-
-        b = (YY_BUFFER_STATE) zconfalloc(sizeof( struct yy_buffer_state )  );
-        if ( ! b )
-                YY_FATAL_ERROR( "out of dynamic memory in zconf_create_buffer()" );
-
-        b->yy_buf_size = size;
-
-        /* yy_ch_buf has to be 2 characters longer than the size given because
-         * we need to put in 2 end-of-buffer characters.
-         */
-        b->yy_ch_buf = (char *) zconfalloc(b->yy_buf_size + 2  );
-        if ( ! b->yy_ch_buf )
-                YY_FATAL_ERROR( "out of dynamic memory in zconf_create_buffer()" );
-
-        b->yy_is_our_buffer = 1;
-
-        zconf_init_buffer(b,file );
-
-        return b;
-}
-
-/** Destroy the buffer.
- * @param b a buffer created with zconf_create_buffer()
- *
- */
-    void zconf_delete_buffer (YY_BUFFER_STATE  b )
-{
-
-        if ( ! b )
-                return;
-
-        if ( b == YY_CURRENT_BUFFER ) /* Not sure if we should pop here. */
-                YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0;
-
-        if ( b->yy_is_our_buffer )
-                zconffree((void *) b->yy_ch_buf  );
-
-        zconffree((void *) b  );
-}
-
-/* Initializes or reinitializes a buffer.
- * This function is sometimes called more than once on the same buffer,
- * such as during a zconfrestart() or at EOF.
- */
-    static void zconf_init_buffer  (YY_BUFFER_STATE  b, FILE * file )
-
-{
-        int oerrno = errno;
-
-        zconf_flush_buffer(b );
-
-        b->yy_input_file = file;
-        b->yy_fill_buffer = 1;
-
-    /* If b is the current buffer, then zconf_init_buffer was _probably_
-     * called from zconfrestart() or through yy_get_next_buffer.
-     * In that case, we don't want to reset the lineno or column.
-     */
-    if (b != YY_CURRENT_BUFFER){
-        b->yy_bs_lineno = 1;
-        b->yy_bs_column = 0;
-    }
-
-        b->yy_is_interactive = 0;
-
-        errno = oerrno;
-}
-
-/** Discard all buffered characters. On the next scan, YY_INPUT will be called.
- * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER.
- *
- */
-    void zconf_flush_buffer (YY_BUFFER_STATE  b )
-{
-        if ( ! b )
-                return;
-
-        b->yy_n_chars = 0;
-
-        /* We always need two end-of-buffer characters.  The first causes
-         * a transition to the end-of-buffer state.  The second causes
-         * a jam in that state.
-         */
-        b->yy_ch_buf[0] = YY_END_OF_BUFFER_CHAR;
-        b->yy_ch_buf[1] = YY_END_OF_BUFFER_CHAR;
-
-        b->yy_buf_pos = &b->yy_ch_buf[0];
-
-        b->yy_at_bol = 1;
-        b->yy_buffer_status = YY_BUFFER_NEW;
-
-        if ( b == YY_CURRENT_BUFFER )
-                zconf_load_buffer_state( );
-}
-
-/** Pushes the new state onto the stack. The new state becomes
- *  the current state. This function will allocate the stack
- *  if necessary.
- *  @param new_buffer The new state.
- *
- */
-void zconfpush_buffer_state (YY_BUFFER_STATE new_buffer )
-{
-        if (new_buffer == NULL)
-                return;
-
-        zconfensure_buffer_stack();
-
-        /* This block is copied from zconf_switch_to_buffer. */
-        if ( YY_CURRENT_BUFFER )
-                {
-                /* Flush out information for old buffer. */
-                *(yy_c_buf_p) = (yy_hold_char);
-                YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
-                YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
-                }
-
-        /* Only push if top exists. Otherwise, replace top. */
-        if (YY_CURRENT_BUFFER)
-                (yy_buffer_stack_top)++;
-        YY_CURRENT_BUFFER_LVALUE = new_buffer;
-
-        /* copied from zconf_switch_to_buffer. */
-        zconf_load_buffer_state( );
-        (yy_did_buffer_switch_on_eof) = 1;
-}
-
-/** Removes and deletes the top of the stack, if present.
- *  The next element becomes the new top.
- *
- */
-void zconfpop_buffer_state (void)
-{
-        if (!YY_CURRENT_BUFFER)
-                return;
-
-        zconf_delete_buffer(YY_CURRENT_BUFFER );
-        YY_CURRENT_BUFFER_LVALUE = NULL;
-        if ((yy_buffer_stack_top) > 0)
-                --(yy_buffer_stack_top);
-
-        if (YY_CURRENT_BUFFER) {
-                zconf_load_buffer_state( );
-                (yy_did_buffer_switch_on_eof) = 1;
-        }
-}
-
-/* Allocates the stack if it does not exist.
- *  Guarantees space for at least one push.
- */
-static void zconfensure_buffer_stack (void)
-{
-        int num_to_alloc;
-
-        if (!(yy_buffer_stack)) {
-
-                /* First allocation is just for 2 elements, since we don't know if this
-                 * scanner will even need a stack. We use 2 instead of 1 to avoid an
-                 * immediate realloc on the next call.
-         */
-                num_to_alloc = 1;
-                (yy_buffer_stack) = (struct yy_buffer_state**)zconfalloc
-                                                                (num_to_alloc * sizeof(struct yy_buffer_state*)
-                                                                );
-
-                memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*));
-
-                (yy_buffer_stack_max) = num_to_alloc;
-                (yy_buffer_stack_top) = 0;
-                return;
-        }
-
-        if ((yy_buffer_stack_top) >= ((yy_buffer_stack_max)) - 1){
-
-                /* Increase the buffer to prepare for a possible push. */
-                int grow_size = 8 /* arbitrary grow size */;
-
-                num_to_alloc = (yy_buffer_stack_max) + grow_size;
-                (yy_buffer_stack) = (struct yy_buffer_state**)zconfrealloc
-                                                                ((yy_buffer_stack),
-                                                                num_to_alloc * sizeof(struct yy_buffer_state*)
-                                                                );
-
-                /* zero only the new slots.*/
-                memset((yy_buffer_stack) + (yy_buffer_stack_max), 0, grow_size * sizeof(struct yy_buffer_state*));
-                (yy_buffer_stack_max) = num_to_alloc;
-        }
-}
-
-/** Setup the input buffer state to scan directly from a user-specified character buffer.
- * @param base the character buffer
- * @param size the size in bytes of the character buffer
- *
- * @return the newly allocated buffer state object.
- */
-YY_BUFFER_STATE zconf_scan_buffer  (char * base, yy_size_t  size )
-{
-        YY_BUFFER_STATE b;
-
-        if ( size < 2 ||
-             base[size-2] != YY_END_OF_BUFFER_CHAR ||
-             base[size-1] != YY_END_OF_BUFFER_CHAR )
-                /* They forgot to leave room for the EOB's. */
-                return 0;
-
-        b = (YY_BUFFER_STATE) zconfalloc(sizeof( struct yy_buffer_state )  );
-        if ( ! b )
-                YY_FATAL_ERROR( "out of dynamic memory in zconf_scan_buffer()" );
-
-        b->yy_buf_size = size - 2;      /* "- 2" to take care of EOB's */
-        b->yy_buf_pos = b->yy_ch_buf = base;
-        b->yy_is_our_buffer = 0;
-        b->yy_input_file = 0;
-        b->yy_n_chars = b->yy_buf_size;
-        b->yy_is_interactive = 0;
-        b->yy_at_bol = 1;
-        b->yy_fill_buffer = 0;
-        b->yy_buffer_status = YY_BUFFER_NEW;
-
-        zconf_switch_to_buffer(b  );
-
-        return b;
-}
-
-/** Setup the input buffer state to scan a string. The next call to zconflex() will
- * scan from a @e copy of @a str.
- * @param str a NUL-terminated string to scan
- *
- * @return the newly allocated buffer state object.
- * @note If you want to scan bytes that may contain NUL values, then use
- *       zconf_scan_bytes() instead.
- */
-YY_BUFFER_STATE zconf_scan_string (yyconst char * str )
-{
-
-        return zconf_scan_bytes(str,strlen(str) );
-}
-
-/** Setup the input buffer state to scan the given bytes. The next call to zconflex() will
- * scan from a @e copy of @a bytes.
- * @param bytes the byte buffer to scan
- * @param len the number of bytes in the buffer pointed to by @a bytes.
- *
- * @return the newly allocated buffer state object.
- */
-YY_BUFFER_STATE zconf_scan_bytes  (yyconst char * bytes, int  len )
-{
-        YY_BUFFER_STATE b;
-        char *buf;
-        yy_size_t n;
-        int i;
-
-        /* Get memory for full buffer, including space for trailing EOB's. */
-        n = len + 2;
-        buf = (char *) zconfalloc(n  );
-        if ( ! buf )
-                YY_FATAL_ERROR( "out of dynamic memory in zconf_scan_bytes()" );
-
-        for ( i = 0; i < len; ++i )
-                buf[i] = bytes[i];
-
-        buf[len] = buf[len+1] = YY_END_OF_BUFFER_CHAR;
-
-        b = zconf_scan_buffer(buf,n );
-        if ( ! b )
-                YY_FATAL_ERROR( "bad buffer in zconf_scan_bytes()" );
-
-        /* It's okay to grow etc. this buffer, and we should throw it
-         * away when we're done.
-         */
-        b->yy_is_our_buffer = 1;
-
-        return b;
-}
-
-#ifndef YY_EXIT_FAILURE
-#define YY_EXIT_FAILURE 2
-#endif
-
-static void yy_fatal_error (yyconst char* msg )
-{
-        (void) fprintf( stderr, "%s\n", msg );
-        exit( YY_EXIT_FAILURE );
-}
-
-/* Redefine yyless() so it works in section 3 code. */
-
-#undef yyless
-#define yyless(n) \
-        do \
-                { \
-                /* Undo effects of setting up zconftext. */ \
-        int yyless_macro_arg = (n); \
-        YY_LESS_LINENO(yyless_macro_arg);\
-                zconftext[zconfleng] = (yy_hold_char); \
-                (yy_c_buf_p) = zconftext + yyless_macro_arg; \
-                (yy_hold_char) = *(yy_c_buf_p); \
-                *(yy_c_buf_p) = '\0'; \
-                zconfleng = yyless_macro_arg; \
-                } \
-        while ( 0 )
-
-/* Accessor  methods (get/set functions) to struct members. */
-
-/** Get the current line number.
- *
- */
-int zconfget_lineno  (void)
-{
-
-    return zconflineno;
-}
-
-/** Get the input stream.
- *
- */
-FILE *zconfget_in  (void)
-{
-        return zconfin;
-}
-
-/** Get the output stream.
- *
- */
-FILE *zconfget_out  (void)
-{
-        return zconfout;
-}
-
-/** Get the length of the current token.
- *
- */
-int zconfget_leng  (void)
-{
-        return zconfleng;
-}
-
-/** Get the current token.
- *
- */
-
-char *zconfget_text  (void)
-{
-        return zconftext;
-}
-
-/** Set the current line number.
- * @param line_number
- *
- */
-void zconfset_lineno (int  line_number )
-{
-
-    zconflineno = line_number;
-}
-
-/** Set the input stream. This does not discard the current
- * input buffer.
- * @param in_str A readable stream.
- *
- * @see zconf_switch_to_buffer
- */
-void zconfset_in (FILE *  in_str )
-{
-        zconfin = in_str ;
-}
-
-void zconfset_out (FILE *  out_str )
-{
-        zconfout = out_str ;
-}
-
-int zconfget_debug  (void)
-{
-        return zconf_flex_debug;
-}
-
-void zconfset_debug (int  bdebug )
-{
-        zconf_flex_debug = bdebug ;
-}
-
-/* zconflex_destroy is for both reentrant and non-reentrant scanners. */
-int zconflex_destroy  (void)
-{
-
-    /* Pop the buffer stack, destroying each element. */
-        while(YY_CURRENT_BUFFER){
-                zconf_delete_buffer(YY_CURRENT_BUFFER  );
-                YY_CURRENT_BUFFER_LVALUE = NULL;
-                zconfpop_buffer_state();
-        }
-
-        /* Destroy the stack itself. */
-        zconffree((yy_buffer_stack) );
-        (yy_buffer_stack) = NULL;
-
-    return 0;
-}
-
-/*
- * Internal utility routines.
- */
-
-#ifndef yytext_ptr
-static void yy_flex_strncpy (char* s1, yyconst char * s2, int n )
-{
-        register int i;
-        for ( i = 0; i < n; ++i )
-                s1[i] = s2[i];
-}
-#endif
-
-#ifdef YY_NEED_STRLEN
-static int yy_flex_strlen (yyconst char * s )
-{
-        register int n;
-        for ( n = 0; s[n]; ++n )
-                ;
-
-        return n;
-}
-#endif
-
-void *zconfalloc (yy_size_t  size )
-{
-        return (void *) malloc( size );
-}
-
-void *zconfrealloc  (void * ptr, yy_size_t  size )
-{
-        /* The cast to (char *) in the following accommodates both
-         * implementations that use char* generic pointers, and those
-         * that use void* generic pointers.  It works with the latter
-         * because both ANSI C and C++ allow castless assignment from
-         * any pointer type to void*, and deal with argument conversions
-         * as though doing an assignment.
-         */
-        return (void *) realloc( (char *) ptr, size );
-}
-
-void zconffree (void * ptr )
-{
-        free( (char *) ptr );   /* see zconfrealloc() for (char *) cast */
-}
-
-#define YYTABLES_NAME "yytables"
-
-#undef YY_NEW_FILE
-#undef YY_FLUSH_BUFFER
-#undef yy_set_bol
-#undef yy_new_buffer
-#undef yy_set_interactive
-#undef yytext_ptr
-#undef YY_DO_BEFORE_ACTION
-
-#ifdef YY_DECL_IS_OURS
-#undef YY_DECL_IS_OURS
-#undef YY_DECL
-#endif
-
-void zconf_starthelp(void)
-{
-        new_string();
-        last_ts = first_ts = 0;
-        BEGIN(HELP);
-}
-
-static void zconf_endhelp(void)
-{
-        zconflval.string = text;
-        BEGIN(INITIAL);
-}
-
-/*
- * Try to open specified file with following names:
- * ./name
- * $(srctree)/name
- * The latter is used when srctree is separate from objtree
- * when compiling the kernel.
- * Return NULL if file is not found.
- */
-FILE *zconf_fopen(const char *name)
-{
-        char *env, fullname[PATH_MAX+1];
-        FILE *f;
-
-        f = fopen(name, "r");
-        if (!f && name[0] != '/') {
-                env = getenv(SRCTREE);
-                if (env) {
-                        sprintf(fullname, "%s/%s", env, name);
-                        f = fopen(fullname, "r");
-                }
-        }
-        return f;
-}
-
-void zconf_initscan(const char *name)
-{
-        zconfin = zconf_fopen(name);
-        if (!zconfin) {
-                printf("can't find file %s\n", name);
-                exit(1);
-        }
-
-        current_buf = malloc(sizeof(*current_buf));
-        memset(current_buf, 0, sizeof(*current_buf));
-
-        current_file = file_lookup(name);
-        current_file->lineno = 1;
-        current_file->flags = FILE_BUSY;
-}
-
-void zconf_nextfile(const char *name)
-{
-        struct file *file = file_lookup(name);
-        struct buffer *buf = malloc(sizeof(*buf));
-        memset(buf, 0, sizeof(*buf));
-
-        current_buf->state = YY_CURRENT_BUFFER;
-        zconfin = zconf_fopen(name);
-        if (!zconfin) {
-                printf("%s:%d: can't open file \"%s\"\n", zconf_curname(), zconf_lineno(), name);
-                exit(1);
-        }
-        zconf_switch_to_buffer(zconf_create_buffer(zconfin,YY_BUF_SIZE));
-        buf->parent = current_buf;
-        current_buf = buf;
-
-        if (file->flags & FILE_BUSY) {
-                printf("recursive scan (%s)?\n", name);
-                exit(1);
-        }
-        if (file->flags & FILE_SCANNED) {
-                printf("file %s already scanned?\n", name);
-                exit(1);
-        }
-        file->flags |= FILE_BUSY;
-        file->lineno = 1;
-        file->parent = current_file;
-        current_file = file;
-}
-
-static struct buffer *zconf_endfile(void)
-{
-        struct buffer *parent;
-
-        current_file->flags |= FILE_SCANNED;
-        current_file->flags &= ~FILE_BUSY;
-        current_file = current_file->parent;
-
-        parent = current_buf->parent;
-        if (parent) {
-                fclose(zconfin);
-                zconf_delete_buffer(YY_CURRENT_BUFFER);
-                zconf_switch_to_buffer(parent->state);
-        }
-        free(current_buf);
-        current_buf = parent;
-
-        return parent;
-}
-
-int zconf_lineno(void)
-{
-        if (current_buf)
-                return current_file->lineno - 1;
-        else
-                return 0;
-}
-
-char *zconf_curname(void)
-{
-        if (current_buf)
-                return current_file->name;
-        else
-                return "<none>";
-}
-
diff --git a/scripts/config/lxdialog/checklist.c b/scripts/config/lxdialog/checklist.c
deleted file mode 100644
index 1513a8966..000000000
--- a/scripts/config/lxdialog/checklist.c
+++ /dev/null
@@ -1,373 +0,0 @@
-/* vi: set sw=4 ts=4: */
-/*
- *  checklist.c -- implements the checklist box
- *
- *  ORIGINAL AUTHOR: Savio Lam (lam836@cs.cuhk.hk)
- *     Stuart Herbert - S.Herbert@sheffield.ac.uk: radiolist extension
- *     Alessandro Rubini - rubini@ipvvis.unipv.it: merged the two
- *  MODIFIED FOR LINUX KERNEL CONFIG BY: William Roadcap (roadcap@cfw.com)
- *
- *  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 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, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include "dialog.h"
-
-static int list_width, check_x, item_x, checkflag;
-
-/*
- * Print list item
- */
-static void
-print_item (WINDOW * win, const char *item, int status,
-            int choice, int selected)
-{
-    int i;
-
-    /* Clear 'residue' of last item */
-    wattrset (win, menubox_attr);
-    wmove (win, choice, 0);
-    for (i = 0; i < list_width; i++)
-        waddch (win, ' ');
-
-    wmove (win, choice, check_x);
-    wattrset (win, selected ? check_selected_attr : check_attr);
-    if (checkflag == FLAG_CHECK)
-        wprintw (win, "[%c]", status ? 'X' : ' ');
-    else
-        wprintw (win, "(%c)", status ? 'X' : ' ');
-
-    wattrset (win, selected ? tag_selected_attr : tag_attr);
-    mvwaddch(win, choice, item_x, item[0]);
-    wattrset (win, selected ? item_selected_attr : item_attr);
-    waddstr (win, (char *)item+1);
-    if (selected) {
-        wmove (win, choice, check_x+1);
-        wrefresh (win);
-    }
-}
-
-/*
- * Print the scroll indicators.
- */
-static void
-print_arrows (WINDOW * win, int choice, int item_no, int scroll,
-                int y, int x, int height)
-{
-    wmove(win, y, x);
-
-    if (scroll > 0) {
-        wattrset (win, uarrow_attr);
-        waddch (win, ACS_UARROW);
-        waddstr (win, "(-)");
-    }
-    else {
-        wattrset (win, menubox_attr);
-        waddch (win, ACS_HLINE);
-        waddch (win, ACS_HLINE);
-        waddch (win, ACS_HLINE);
-        waddch (win, ACS_HLINE);
-    }
-
-   y = y + height + 1;
-   wmove(win, y, x);
-
-   if ((height < item_no) && (scroll + choice < item_no - 1)) {
-        wattrset (win, darrow_attr);
-        waddch (win, ACS_DARROW);
-        waddstr (win, "(+)");
-    }
-    else {
-        wattrset (win, menubox_border_attr);
-        waddch (win, ACS_HLINE);
-        waddch (win, ACS_HLINE);
-        waddch (win, ACS_HLINE);
-        waddch (win, ACS_HLINE);
-   }
-}
-
-/*
- *  Display the termination buttons
- */
-static void
-print_buttons( WINDOW *dialog, int height, int width, int selected)
-{
-    int x = width / 2 - 11;
-    int y = height - 2;
-
-    print_button (dialog, "Select", y, x, selected == 0);
-    print_button (dialog, " Help ", y, x + 14, selected == 1);
-
-    wmove(dialog, y, x+1 + 14*selected);
-    wrefresh (dialog);
-}
-
-/*
- * Display a dialog box with a list of options that can be turned on or off
- * The `flag' parameter is used to select between radiolist and checklist.
- */
-int
-dialog_checklist (const char *title, const char *prompt, int height, int width,
-        int list_height, int item_no, struct dialog_list_item ** items,
-        int flag)
-
-{
-    int i, x, y, box_x, box_y;
-    int key = 0, button = 0, choice = 0, scroll = 0, max_choice, *status;
-    WINDOW *dialog, *list;
-
-    checkflag = flag;
-
-    /* Allocate space for storing item on/off status */
-    if ((status = malloc (sizeof (int) * item_no)) == NULL) {
-        endwin ();
-        fprintf (stderr,
-                 "\nCan't allocate memory in dialog_checklist().\n");
-        exit (-1);
-    }
-
-    /* Initializes status */
-    for (i = 0; i < item_no; i++) {
-        status[i] = (items[i]->selected == 1); /* ON */
-        if ((!choice && status[i]) || items[i]->selected == 2) /* SELECTED */
-            choice = i + 1;
-    }
-    if (choice)
-            choice--;
-
-    max_choice = MIN (list_height, item_no);
-
-    /* center dialog box on screen */
-    x = (COLS - width) / 2;
-    y = (LINES - height) / 2;
-
-    draw_shadow (stdscr, y, x, height, width);
-
-    dialog = newwin (height, width, y, x);
-    keypad (dialog, TRUE);
-
-    draw_box (dialog, 0, 0, height, width, dialog_attr, border_attr);
-    wattrset (dialog, border_attr);
-    mvwaddch (dialog, height-3, 0, ACS_LTEE);
-    for (i = 0; i < width - 2; i++)
-        waddch (dialog, ACS_HLINE);
-    wattrset (dialog, dialog_attr);
-    waddch (dialog, ACS_RTEE);
-
-    if (title != NULL && strlen(title) >= width-2 ) {
-        /* truncate long title -- mec */
-        char * title2 = malloc(width-2+1);
-        memcpy( title2, title, width-2 );
-        title2[width-2] = '\0';
-        title = title2;
-    }
-
-    if (title != NULL) {
-        wattrset (dialog, title_attr);
-        mvwaddch (dialog, 0, (width - strlen(title))/2 - 1, ' ');
-        waddstr (dialog, (char *)title);
-        waddch (dialog, ' ');
-    }
-
-    wattrset (dialog, dialog_attr);
-    print_autowrap (dialog, prompt, width - 2, 1, 3);
-
-    list_width = width - 6;
-    box_y = height - list_height - 5;
-    box_x = (width - list_width) / 2 - 1;
-
-    /* create new window for the list */
-    list = subwin (dialog, list_height, list_width, y+box_y+1, x+box_x+1);
-
-    keypad (list, TRUE);
-
-    /* draw a box around the list items */
-    draw_box (dialog, box_y, box_x, list_height + 2, list_width + 2,
-              menubox_border_attr, menubox_attr);
-
-    /* Find length of longest item in order to center checklist */
-    check_x = 0;
-    for (i = 0; i < item_no; i++)
-        check_x = MAX (check_x, + strlen (items[i]->name) + 4);
-
-    check_x = (list_width - check_x) / 2;
-    item_x = check_x + 4;
-
-    if (choice >= list_height) {
-        scroll = choice - list_height + 1;
-        choice -= scroll;
-    }
-
-    /* Print the list */
-    for (i = 0; i < max_choice; i++) {
-        print_item (list, items[scroll + i]->name,
-                    status[i+scroll], i, i == choice);
-    }
-
-    print_arrows(dialog, choice, item_no, scroll,
-                        box_y, box_x + check_x + 5, list_height);
-
-    print_buttons(dialog, height, width, 0);
-
-    wnoutrefresh (list);
-    wnoutrefresh (dialog);
-    doupdate ();
-
-    while (key != ESC) {
-        key = wgetch (dialog);
-
-        for (i = 0; i < max_choice; i++)
-            if (toupper(key) == toupper(items[scroll + i]->name[0]))
-                break;
-
-
-        if ( i < max_choice || key == KEY_UP || key == KEY_DOWN ||
-            key == '+' || key == '-' ) {
-            if (key == KEY_UP || key == '-') {
-                if (!choice) {
-                    if (!scroll)
-                        continue;
-                    /* Scroll list down */
-                    if (list_height > 1) {
-                        /* De-highlight current first item */
-                        print_item (list, items[scroll]->name,
-                                        status[scroll], 0, FALSE);
-                        scrollok (list, TRUE);
-                        wscrl (list, -1);
-                        scrollok (list, FALSE);
-                    }
-                    scroll--;
-                    print_item (list, items[scroll]->name,
-                                status[scroll], 0, TRUE);
-                    wnoutrefresh (list);
-
-                    print_arrows(dialog, choice, item_no, scroll,
-                                box_y, box_x + check_x + 5, list_height);
-
-                    wrefresh (dialog);
-
-                    continue;   /* wait for another key press */
-                } else
-                    i = choice - 1;
-            } else if (key == KEY_DOWN || key == '+') {
-                if (choice == max_choice - 1) {
-                    if (scroll + choice >= item_no - 1)
-                        continue;
-                    /* Scroll list up */
-                    if (list_height > 1) {
-                        /* De-highlight current last item before scrolling up */
-                        print_item (list, items[scroll + max_choice - 1]->name,
-                                    status[scroll + max_choice - 1],
-                                    max_choice - 1, FALSE);
-                        scrollok (list, TRUE);
-                        scroll (list);
-                        scrollok (list, FALSE);
-                    }
-                    scroll++;
-                    print_item (list, items[scroll + max_choice - 1]->name,
-                                status[scroll + max_choice - 1],
-                                max_choice - 1, TRUE);
-                    wnoutrefresh (list);
-
-                    print_arrows(dialog, choice, item_no, scroll,
-                                box_y, box_x + check_x + 5, list_height);
-
-                    wrefresh (dialog);
-
-                    continue;   /* wait for another key press */
-                } else
-                    i = choice + 1;
-            }
-            if (i != choice) {
-                /* De-highlight current item */
-                print_item (list, items[scroll + choice]->name,
-                            status[scroll + choice], choice, FALSE);
-                /* Highlight new item */
-                choice = i;
-                print_item (list, items[scroll + choice]->name,
-                            status[scroll + choice], choice, TRUE);
-                wnoutrefresh (list);
-                wrefresh (dialog);
-            }
-            continue;           /* wait for another key press */
-        }
-        switch (key) {
-        case 'H':
-        case 'h':
-        case '?':
-            for (i = 0; i < item_no; i++)
-                items[i]->selected = 0;
-            items[scroll + choice]->selected = 1;
-            delwin (dialog);
-            free (status);
-            return 1;
-        case TAB:
-        case KEY_LEFT:
-        case KEY_RIGHT:
-            button = ((key == KEY_LEFT ? --button : ++button) < 0)
-                        ? 1 : (button > 1 ? 0 : button);
-
-            print_buttons(dialog, height, width, button);
-            wrefresh (dialog);
-            break;
-        case 'S':
-        case 's':
-        case ' ':
-        case '\n':
-            if (!button) {
-                if (flag == FLAG_CHECK) {
-                    status[scroll + choice] = !status[scroll + choice];
-                    wmove (list, choice, check_x);
-                    wattrset (list, check_selected_attr);
-                    wprintw (list, "[%c]", status[scroll + choice] ? 'X' : ' ');
-                } else {
-                    if (!status[scroll + choice]) {
-                        for (i = 0; i < item_no; i++)
-                            status[i] = 0;
-                        status[scroll + choice] = 1;
-                        for (i = 0; i < max_choice; i++)
-                            print_item (list, items[scroll + i]->name,
-                                        status[scroll + i], i, i == choice);
-                    }
-                }
-                wnoutrefresh (list);
-                wrefresh (dialog);
-
-                for (i = 0; i < item_no; i++) {
-                        items[i]->selected = status[i];
-                }
-            } else {
-                    for (i = 0; i < item_no; i++)
-                            items[i]->selected = 0;
-                    items[scroll + choice]->selected = 1;
-            }
-            delwin (dialog);
-            free (status);
-            return button;
-        case 'X':
-        case 'x':
-            key = ESC;
-        case ESC:
-            break;
-        }
-
-        /* Now, update everything... */
-        doupdate ();
-    }
-
-
-    delwin (dialog);
-    free (status);
-    return -1;                  /* ESC pressed */
-}
diff --git a/scripts/config/lxdialog/inputbox.c b/scripts/config/lxdialog/inputbox.c
deleted file mode 100644
index a42f8127d..000000000
--- a/scripts/config/lxdialog/inputbox.c
+++ /dev/null
@@ -1,241 +0,0 @@
-/* vi: set sw=4 ts=4: */
-/*
- *  inputbox.c -- implements the input box
- *
- *  ORIGINAL AUTHOR: Savio Lam (lam836@cs.cuhk.hk)
- *  MODIFIED FOR LINUX KERNEL CONFIG BY: William Roadcap (roadcap@cfw.com)
- *
- *  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 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, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include "dialog.h"
-
-char dialog_input_result[MAX_LEN + 1];
-
-/*
- *  Print the termination buttons
- */
-static void
-print_buttons(WINDOW *dialog, int height, int width, int selected)
-{
-    int x = width / 2 - 11;
-    int y = height - 2;
-
-    print_button (dialog, "  Ok  ", y, x, selected==0);
-    print_button (dialog, " Help ", y, x + 14, selected==1);
-
-    wmove(dialog, y, x+1+14*selected);
-    wrefresh(dialog);
-}
-
-/*
- * Display a dialog box for inputing a string
- */
-int
-dialog_inputbox (const char *title, const char *prompt, int height, int width,
-                 const char *init)
-{
-    int i, x, y, box_y, box_x, box_width;
-    int input_x = 0, scroll = 0, key = 0, button = -1;
-    char *instr = dialog_input_result;
-    WINDOW *dialog;
-
-    /* center dialog box on screen */
-    x = (COLS - width) / 2;
-    y = (LINES - height) / 2;
-
-
-    draw_shadow (stdscr, y, x, height, width);
-
-    dialog = newwin (height, width, y, x);
-    keypad (dialog, TRUE);
-
-    draw_box (dialog, 0, 0, height, width, dialog_attr, border_attr);
-    wattrset (dialog, border_attr);
-    mvwaddch (dialog, height-3, 0, ACS_LTEE);
-    for (i = 0; i < width - 2; i++)
-        waddch (dialog, ACS_HLINE);
-    wattrset (dialog, dialog_attr);
-    waddch (dialog, ACS_RTEE);
-
-    if (title != NULL && strlen(title) >= width-2 ) {
-        /* truncate long title -- mec */
-        char * title2 = malloc(width-2+1);
-        memcpy( title2, title, width-2 );
-        title2[width-2] = '\0';
-        title = title2;
-    }
-
-    if (title != NULL) {
-        wattrset (dialog, title_attr);
-        mvwaddch (dialog, 0, (width - strlen(title))/2 - 1, ' ');
-        waddstr (dialog, (char *)title);
-        waddch (dialog, ' ');
-    }
-
-    wattrset (dialog, dialog_attr);
-    print_autowrap (dialog, prompt, width - 2, 1, 3);
-
-    /* Draw the input field box */
-    box_width = width - 6;
-    getyx (dialog, y, x);
-    box_y = y + 2;
-    box_x = (width - box_width) / 2;
-    draw_box (dialog, y + 1, box_x - 1, 3, box_width + 2,
-              border_attr, dialog_attr);
-
-    print_buttons(dialog, height, width, 0);
-
-    /* Set up the initial value */
-    wmove (dialog, box_y, box_x);
-    wattrset (dialog, inputbox_attr);
-
-    if (!init)
-        instr[0] = '\0';
-    else
-        strcpy (instr, init);
-
-    input_x = strlen (instr);
-
-    if (input_x >= box_width) {
-        scroll = input_x - box_width + 1;
-        input_x = box_width - 1;
-        for (i = 0; i < box_width - 1; i++)
-            waddch (dialog, instr[scroll + i]);
-    } else
-        waddstr (dialog, instr);
-
-    wmove (dialog, box_y, box_x + input_x);
-
-    wrefresh (dialog);
-
-    while (key != ESC) {
-        key = wgetch (dialog);
-
-        if (button == -1) {     /* Input box selected */
-            switch (key) {
-            case TAB:
-            case KEY_UP:
-            case KEY_DOWN:
-                break;
-            case KEY_LEFT:
-                continue;
-            case KEY_RIGHT:
-                continue;
-            case KEY_BACKSPACE:
-            case 127:
-                if (input_x || scroll) {
-                    wattrset (dialog, inputbox_attr);
-                    if (!input_x) {
-                        scroll = scroll < box_width - 1 ?
-                            0 : scroll - (box_width - 1);
-                        wmove (dialog, box_y, box_x);
-                        for (i = 0; i < box_width; i++)
-                            waddch (dialog, instr[scroll + input_x + i] ?
-                                    instr[scroll + input_x + i] : ' ');
-                        input_x = strlen (instr) - scroll;
-                    } else
-                        input_x--;
-                    instr[scroll + input_x] = '\0';
-                    mvwaddch (dialog, box_y, input_x + box_x, ' ');
-                    wmove (dialog, box_y, input_x + box_x);
-                    wrefresh (dialog);
-                }
-                continue;
-            default:
-                if (key < 0x100 && isprint (key)) {
-                    if (scroll + input_x < MAX_LEN) {
-                        wattrset (dialog, inputbox_attr);
-                        instr[scroll + input_x] = key;
-                        instr[scroll + input_x + 1] = '\0';
-                        if (input_x == box_width - 1) {
-                            scroll++;
-                            wmove (dialog, box_y, box_x);
-                            for (i = 0; i < box_width - 1; i++)
-                                waddch (dialog, instr[scroll + i]);
-                        } else {
-                            wmove (dialog, box_y, input_x++ + box_x);
-                            waddch (dialog, key);
-                        }
-                        wrefresh (dialog);
-                    } else
-                        flash ();       /* Alarm user about overflow */
-                    continue;
-                }
-            }
-        }
-        switch (key) {
-        case 'O':
-        case 'o':
-            delwin (dialog);
-            return 0;
-        case 'H':
-        case 'h':
-            delwin (dialog);
-            return 1;
-        case KEY_UP:
-        case KEY_LEFT:
-            switch (button) {
-            case -1:
-                button = 1;     /* Indicates "Cancel" button is selected */
-                print_buttons(dialog, height, width, 1);
-                break;
-            case 0:
-                button = -1;    /* Indicates input box is selected */
-                print_buttons(dialog, height, width, 0);
-                wmove (dialog, box_y, box_x + input_x);
-                wrefresh (dialog);
-                break;
-            case 1:
-                button = 0;     /* Indicates "OK" button is selected */
-                print_buttons(dialog, height, width, 0);
-                break;
-            }
-            break;
-        case TAB:
-        case KEY_DOWN:
-        case KEY_RIGHT:
-            switch (button) {
-            case -1:
-                button = 0;     /* Indicates "OK" button is selected */
-                print_buttons(dialog, height, width, 0);
-                break;
-            case 0:
-                button = 1;     /* Indicates "Cancel" button is selected */
-                print_buttons(dialog, height, width, 1);
-                break;
-            case 1:
-                button = -1;    /* Indicates input box is selected */
-                print_buttons(dialog, height, width, 0);
-                wmove (dialog, box_y, box_x + input_x);
-                wrefresh (dialog);
-                break;
-            }
-            break;
-        case ' ':
-        case '\n':
-            delwin (dialog);
-            return (button == -1 ? 0 : button);
-        case 'X':
-        case 'x':
-            key = ESC;
-        case ESC:
-            break;
-        }
-    }
-
-    delwin (dialog);
-    return -1;                  /* ESC pressed */
-}
diff --git a/scripts/config/lxdialog/menubox.c b/scripts/config/lxdialog/menubox.c
deleted file mode 100644
index bdaaa1040..000000000
--- a/scripts/config/lxdialog/menubox.c
+++ /dev/null
@@ -1,439 +0,0 @@
-/* vi: set sw=4 ts=4: */
-/*
- *  menubox.c -- implements the menu box
- *
- *  ORIGINAL AUTHOR: Savio Lam (lam836@cs.cuhk.hk)
- *  MODIFIED FOR LINUX KERNEL CONFIG BY: William Roadcap (roadcapw@cfw.com)
- *
- *  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 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, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-/*
- *  Changes by Clifford Wolf (god@clifford.at)
- *
- *  [ 1998-06-13 ]
- *
- *    *)  A bugfix for the Page-Down problem
- *
- *    *)  Formerly when I used Page Down and Page Up, the cursor would be set
- *        to the first position in the menu box.  Now lxdialog is a bit
- *        smarter and works more like other menu systems (just have a look at
- *        it).
- *
- *    *)  Formerly if I selected something my scrolling would be broken because
- *        lxdialog is re-invoked by the Menuconfig shell script, can't
- *        remember the last scrolling position, and just sets it so that the
- *        cursor is at the bottom of the box.  Now it writes the temporary file
- *        lxdialog.scrltmp which contains this information. The file is
- *        deleted by lxdialog if the user leaves a submenu or enters a new
- *        one, but it would be nice if Menuconfig could make another "rm -f"
- *        just to be sure.  Just try it out - you will recognise a difference!
- *
- *  [ 1998-06-14 ]
- *
- *    *)  Now lxdialog is crash-safe against broken "lxdialog.scrltmp" files
- *        and menus change their size on the fly.
- *
- *    *)  If for some reason the last scrolling position is not saved by
- *        lxdialog, it sets the scrolling so that the selected item is in the
- *        middle of the menu box, not at the bottom.
- *
- * 02 January 1999, Michael Elizabeth Chastain (mec@shout.net)
- * Reset 'scroll' to 0 if the value from lxdialog.scrltmp is bogus.
- * This fixes a bug in Menuconfig where using ' ' to descend into menus
- * would leave mis-synchronized lxdialog.scrltmp files lying around,
- * fscanf would read in 'scroll', and eventually that value would get used.
- */
-
-#include "dialog.h"
-
-static int menu_width, item_x;
-
-/*
- * Print menu item
- */
-static void
-print_item (WINDOW * win, const char *item, int choice, int selected, int hotkey)
-{
-    int j;
-    char menu_item[menu_width+1];
-
-    strncpy(menu_item, item, menu_width);
-    menu_item[menu_width] = 0;
-    j = first_alpha(menu_item, "YyNnMmHh");
-
-    /* Clear 'residue' of last item */
-    wattrset (win, menubox_attr);
-    wmove (win, choice, 0);
-#if OLD_NCURSES
-    {
-        int i;
-        for (i = 0; i < menu_width; i++)
-            waddch (win, ' ');
-    }
-#else
-    wclrtoeol(win);
-#endif
-    wattrset (win, selected ? item_selected_attr : item_attr);
-    mvwaddstr (win, choice, item_x, menu_item);
-    if (hotkey) {
-        wattrset (win, selected ? tag_key_selected_attr : tag_key_attr);
-        mvwaddch(win, choice, item_x+j, menu_item[j]);
-    }
-    if (selected) {
-        wmove (win, choice, item_x+1);
-        wrefresh (win);
-    }
-}
-
-/*
- * Print the scroll indicators.
- */
-static void
-print_arrows (WINDOW * win, int item_no, int scroll,
-                int y, int x, int height)
-{
-    int cur_y, cur_x;
-
-    getyx(win, cur_y, cur_x);
-
-    wmove(win, y, x);
-
-    if (scroll > 0) {
-        wattrset (win, uarrow_attr);
-        waddch (win, ACS_UARROW);
-        waddstr (win, "(-)");
-    }
-    else {
-        wattrset (win, menubox_attr);
-        waddch (win, ACS_HLINE);
-        waddch (win, ACS_HLINE);
-        waddch (win, ACS_HLINE);
-        waddch (win, ACS_HLINE);
-    }
-
-   y = y + height + 1;
-   wmove(win, y, x);
-
-   if ((height < item_no) && (scroll + height < item_no)) {
-        wattrset (win, darrow_attr);
-        waddch (win, ACS_DARROW);
-        waddstr (win, "(+)");
-    }
-    else {
-        wattrset (win, menubox_border_attr);
-        waddch (win, ACS_HLINE);
-        waddch (win, ACS_HLINE);
-        waddch (win, ACS_HLINE);
-        waddch (win, ACS_HLINE);
-   }
-
-   wmove(win, cur_y, cur_x);
-}
-
-/*
- * Display the termination buttons.
- */
-static void
-print_buttons (WINDOW *win, int height, int width, int selected)
-{
-    int x = width / 2 - 16;
-    int y = height - 2;
-
-    print_button (win, "Select", y, x, selected == 0);
-    print_button (win, " Exit ", y, x + 12, selected == 1);
-    print_button (win, " Help ", y, x + 24, selected == 2);
-
-    wmove(win, y, x+1+12*selected);
-    wrefresh (win);
-}
-
-/*
- * Display a menu for choosing among a number of options
- */
-int
-dialog_menu (const char *title, const char *prompt, int height, int width,
-                int menu_height, const char *current, int item_no,
-                struct dialog_list_item ** items)
-{
-    int i, j, x, y, box_x, box_y;
-    int key = 0, button = 0, scroll = 0, choice = 0, first_item = 0, max_choice;
-    WINDOW *dialog, *menu;
-    FILE *f;
-
-    max_choice = MIN (menu_height, item_no);
-
-    /* center dialog box on screen */
-    x = (COLS - width) / 2;
-    y = (LINES - height) / 2;
-
-    draw_shadow (stdscr, y, x, height, width);
-
-    dialog = newwin (height, width, y, x);
-    keypad (dialog, TRUE);
-
-    draw_box (dialog, 0, 0, height, width, dialog_attr, border_attr);
-    wattrset (dialog, border_attr);
-    mvwaddch (dialog, height - 3, 0, ACS_LTEE);
-    for (i = 0; i < width - 2; i++)
-        waddch (dialog, ACS_HLINE);
-    wattrset (dialog, dialog_attr);
-    wbkgdset (dialog, dialog_attr & A_COLOR);
-    waddch (dialog, ACS_RTEE);
-
-    if (title != NULL && strlen(title) >= width-2 ) {
-        /* truncate long title -- mec */
-        char * title2 = malloc(width-2+1);
-        memcpy( title2, title, width-2 );
-        title2[width-2] = '\0';
-        title = title2;
-    }
-
-    if (title != NULL) {
-        wattrset (dialog, title_attr);
-        mvwaddch (dialog, 0, (width - strlen(title))/2 - 1, ' ');
-        waddstr (dialog, (char *)title);
-        waddch (dialog, ' ');
-    }
-
-    wattrset (dialog, dialog_attr);
-    print_autowrap (dialog, prompt, width - 2, 1, 3);
-
-    menu_width = width - 6;
-    box_y = height - menu_height - 5;
-    box_x = (width - menu_width) / 2 - 1;
-
-    /* create new window for the menu */
-    menu = subwin (dialog, menu_height, menu_width,
-                y + box_y + 1, x + box_x + 1);
-    keypad (menu, TRUE);
-
-    /* draw a box around the menu items */
-    draw_box (dialog, box_y, box_x, menu_height + 2, menu_width + 2,
-              menubox_border_attr, menubox_attr);
-
-    /*
-     * Find length of longest item in order to center menu.
-     * Set 'choice' to default item.
-     */
-    item_x = 0;
-    for (i = 0; i < item_no; i++) {
-        item_x = MAX (item_x, MIN(menu_width, strlen (items[i]->name) + 2));
-        if (strcmp(current, items[i]->tag) == 0) choice = i;
-    }
-
-    item_x = (menu_width - item_x) / 2;
-
-    /* get the scroll info from the temp file */
-    if ( (f=fopen("lxdialog.scrltmp","r")) != NULL ) {
-        if ( (fscanf(f,"%d\n",&scroll) == 1) && (scroll <= choice) &&
-             (scroll+max_choice > choice) && (scroll >= 0) &&
-             (scroll+max_choice <= item_no) ) {
-            first_item = scroll;
-            choice = choice - scroll;
-            fclose(f);
-        } else {
-            scroll=0;
-            remove("lxdialog.scrltmp");
-            fclose(f);
-            f=NULL;
-        }
-    }
-    if ( (choice >= max_choice) || (f==NULL && choice >= max_choice/2) ) {
-        if (choice >= item_no-max_choice/2)
-            scroll = first_item = item_no-max_choice;
-        else
-            scroll = first_item = choice - max_choice/2;
-        choice = choice - scroll;
-    }
-
-    /* Print the menu */
-    for (i=0; i < max_choice; i++) {
-        print_item (menu, items[first_item + i]->name, i, i == choice,
-                    (items[first_item + i]->tag[0] != ':'));
-    }
-
-    wnoutrefresh (menu);
-
-    print_arrows(dialog, item_no, scroll,
-                 box_y, box_x+item_x+1, menu_height);
-
-    print_buttons (dialog, height, width, 0);
-    wmove (menu, choice, item_x+1);
-    wrefresh (menu);
-
-    while (key != ESC) {
-        key = wgetch(menu);
-
-        if (key < 256 && isalpha(key)) key = tolower(key);
-
-        if (strchr("ynmh", key))
-                i = max_choice;
-        else {
-        for (i = choice+1; i < max_choice; i++) {
-                j = first_alpha(items[scroll + i]->name, "YyNnMmHh");
-                if (key == tolower(items[scroll + i]->name[j]))
-                        break;
-        }
-        if (i == max_choice)
-                for (i = 0; i < max_choice; i++) {
-                        j = first_alpha(items[scroll + i]->name, "YyNnMmHh");
-                        if (key == tolower(items[scroll + i]->name[j]))
-                                break;
-                }
-        }
-
-        if (i < max_choice ||
-            key == KEY_UP || key == KEY_DOWN ||
-            key == '-' || key == '+' ||
-            key == KEY_PPAGE || key == KEY_NPAGE) {
-
-            print_item (menu, items[scroll + choice]->name, choice, FALSE,
-                       (items[scroll + choice]->tag[0] != ':'));
-
-            if (key == KEY_UP || key == '-') {
-                if (choice < 2 && scroll) {
-                    /* Scroll menu down */
-                    scrollok (menu, TRUE);
-                    wscrl (menu, -1);
-                    scrollok (menu, FALSE);
-
-                    scroll--;
-
-                    print_item (menu, items[scroll]->name, 0, FALSE,
-                               (items[scroll]->tag[0] != ':'));
-                } else
-                    choice = MAX(choice - 1, 0);
-
-            } else if (key == KEY_DOWN || key == '+')  {
-
-                print_item (menu, items[scroll + choice]->name, choice, FALSE,
-                                (items[scroll + choice]->tag[0] != ':'));
-
-                if ((choice > max_choice-3) &&
-                    (scroll + max_choice < item_no)
-                   ) {
-                    /* Scroll menu up */
-                    scrollok (menu, TRUE);
-                    scroll (menu);
-                    scrollok (menu, FALSE);
-
-                    scroll++;
-
-                    print_item (menu, items[scroll + max_choice - 1]->name,
-                               max_choice-1, FALSE,
-                               (items[scroll + max_choice - 1]->tag[0] != ':'));
-                } else
-                    choice = MIN(choice+1, max_choice-1);
-
-            } else if (key == KEY_PPAGE) {
-                scrollok (menu, TRUE);
-                for (i=0; (i < max_choice); i++) {
-                    if (scroll > 0) {
-                        wscrl (menu, -1);
-                        scroll--;
-                        print_item (menu, items[scroll]->name, 0, FALSE,
-                        (items[scroll]->tag[0] != ':'));
-                    } else {
-                        if (choice > 0)
-                            choice--;
-                    }
-                }
-                scrollok (menu, FALSE);
-
-            } else if (key == KEY_NPAGE) {
-                for (i=0; (i < max_choice); i++) {
-                    if (scroll+max_choice < item_no) {
-                        scrollok (menu, TRUE);
-                        scroll(menu);
-                        scrollok (menu, FALSE);
-                        scroll++;
-                        print_item (menu, items[scroll + max_choice - 1]->name,
-                                    max_choice-1, FALSE,
-                                    (items[scroll + max_choice - 1]->tag[0] != ':'));
-                    } else {
-                        if (choice+1 < max_choice)
-                            choice++;
-                    }
-                }
-
-            } else
-                choice = i;
-
-            print_item (menu, items[scroll + choice]->name, choice, TRUE,
-                       (items[scroll + choice]->tag[0] != ':'));
-
-            print_arrows(dialog, item_no, scroll,
-                         box_y, box_x+item_x+1, menu_height);
-
-            wnoutrefresh (dialog);
-            wrefresh (menu);
-
-            continue;           /* wait for another key press */
-        }
-
-        switch (key) {
-        case KEY_LEFT:
-        case TAB:
-        case KEY_RIGHT:
-            button = ((key == KEY_LEFT ? --button : ++button) < 0)
-                        ? 2 : (button > 2 ? 0 : button);
-
-            print_buttons(dialog, height, width, button);
-            wrefresh (menu);
-            break;
-        case ' ':
-        case 's':
-        case 'y':
-        case 'n':
-        case 'm':
-        case '/':
-            /* save scroll info */
-            if ( (f=fopen("lxdialog.scrltmp","w")) != NULL ) {
-                fprintf(f,"%d\n",scroll);
-                fclose(f);
-            }
-            delwin (dialog);
-            items[scroll + choice]->selected = 1;
-            switch (key) {
-            case 's': return 3;
-            case 'y': return 3;
-            case 'n': return 4;
-            case 'm': return 5;
-            case ' ': return 6;
-            case '/': return 7;
-            }
-            return 0;
-        case 'h':
-        case '?':
-            button = 2;
-        case '\n':
-            delwin (dialog);
-            items[scroll + choice]->selected = 1;
-
-            remove("lxdialog.scrltmp");
-            return button;
-        case 'e':
-        case 'x':
-            key = ESC;
-        case ESC:
-            break;
-        }
-    }
-
-    delwin (dialog);
-    remove("lxdialog.scrltmp");
-    return -1;                  /* ESC pressed */
-}
diff --git a/scripts/config/lxdialog/msgbox.c b/scripts/config/lxdialog/msgbox.c
deleted file mode 100644
index a13bcbafb..000000000
--- a/scripts/config/lxdialog/msgbox.c
+++ /dev/null
@@ -1,86 +0,0 @@
-/* vi: set sw=4 ts=4: */
-/*
- *  msgbox.c -- implements the message box and info box
- *
- *  ORIGINAL AUTHOR: Savio Lam (lam836@cs.cuhk.hk)
- *  MODIFIED FOR LINUX KERNEL CONFIG BY: William Roadcap (roadcapw@cfw.com)
- *
- *  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 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, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include "dialog.h"
-
-/*
- * Display a message box. Program will pause and display an "OK" button
- * if the parameter 'pause' is non-zero.
- */
-int
-dialog_msgbox (const char *title, const char *prompt, int height, int width,
-                int pause)
-{
-    int i, x, y, key = 0;
-    WINDOW *dialog;
-
-    /* center dialog box on screen */
-    x = (COLS - width) / 2;
-    y = (LINES - height) / 2;
-
-    draw_shadow (stdscr, y, x, height, width);
-
-    dialog = newwin (height, width, y, x);
-    keypad (dialog, TRUE);
-
-    draw_box (dialog, 0, 0, height, width, dialog_attr, border_attr);
-
-    if (title != NULL && strlen(title) >= width-2 ) {
-        /* truncate long title -- mec */
-        char * title2 = malloc(width-2+1);
-        memcpy( title2, title, width-2 );
-        title2[width-2] = '\0';
-        title = title2;
-    }
-
-    if (title != NULL) {
-        wattrset (dialog, title_attr);
-        mvwaddch (dialog, 0, (width - strlen(title))/2 - 1, ' ');
-        waddstr (dialog, (char *)title);
-        waddch (dialog, ' ');
-    }
-    wattrset (dialog, dialog_attr);
-    print_autowrap (dialog, prompt, width - 2, 1, 2);
-
-    if (pause) {
-        wattrset (dialog, border_attr);
-        mvwaddch (dialog, height - 3, 0, ACS_LTEE);
-        for (i = 0; i < width - 2; i++)
-            waddch (dialog, ACS_HLINE);
-        wattrset (dialog, dialog_attr);
-        waddch (dialog, ACS_RTEE);
-
-        print_button (dialog, "  Ok  ",
-                      height - 2, width / 2 - 4, TRUE);
-
-        wrefresh (dialog);
-        while (key != ESC && key != '\n' && key != ' ' &&
-               key != 'O' && key != 'o' && key != 'X' && key != 'x')
-            key = wgetch (dialog);
-    } else {
-        key = '\n';
-        wrefresh (dialog);
-    }
-
-    delwin (dialog);
-    return key == ESC ? -1 : 0;
-}
diff --git a/scripts/config/lxdialog/textbox.c b/scripts/config/lxdialog/textbox.c
deleted file mode 100644
index aa7f5afe2..000000000
--- a/scripts/config/lxdialog/textbox.c
+++ /dev/null
@@ -1,557 +0,0 @@
-/* vi: set sw=4 ts=4: */
-/*
- *  textbox.c -- implements the text box
- *
- *  ORIGINAL AUTHOR: Savio Lam (lam836@cs.cuhk.hk)
- *  MODIFIED FOR LINUX KERNEL CONFIG BY: William Roadcap (roadcap@cfw.com)
- *
- *  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 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, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include "dialog.h"
-
-static void back_lines (int n);
-static void print_page (WINDOW * win, int height, int width);
-static void print_line (WINDOW * win, int row, int width);
-static char *get_line (void);
-static void print_position (WINDOW * win, int height, int width);
-
-static int hscroll, fd, file_size, bytes_read;
-static int begin_reached = 1, end_reached, page_length;
-static char *buf, *page;
-
-/*
- * Display text from a file in a dialog box.
- */
-int
-dialog_textbox (const char *title, const char *file, int height, int width)
-{
-    int i, x, y, cur_x, cur_y, fpos, key = 0;
-    int passed_end;
-    char search_term[MAX_LEN + 1];
-    WINDOW *dialog, *text;
-
-    search_term[0] = '\0';      /* no search term entered yet */
-
-    /* Open input file for reading */
-    if ((fd = open (file, O_RDONLY)) == -1) {
-        endwin ();
-        fprintf (stderr,
-                 "\nCan't open input file in dialog_textbox().\n");
-        exit (-1);
-    }
-    /* Get file size. Actually, 'file_size' is the real file size - 1,
-       since it's only the last byte offset from the beginning */
-    if ((file_size = lseek (fd, 0, SEEK_END)) == -1) {
-        endwin ();
-        fprintf (stderr, "\nError getting file size in dialog_textbox().\n");
-        exit (-1);
-    }
-    /* Restore file pointer to beginning of file after getting file size */
-    if (lseek (fd, 0, SEEK_SET) == -1) {
-        endwin ();
-        fprintf (stderr, "\nError moving file pointer in dialog_textbox().\n");
-        exit (-1);
-    }
-    /* Allocate space for read buffer */
-    if ((buf = malloc (BUF_SIZE + 1)) == NULL) {
-        endwin ();
-        fprintf (stderr, "\nCan't allocate memory in dialog_textbox().\n");
-        exit (-1);
-    }
-    if ((bytes_read = read (fd, buf, BUF_SIZE)) == -1) {
-        endwin ();
-        fprintf (stderr, "\nError reading file in dialog_textbox().\n");
-        exit (-1);
-    }
-    buf[bytes_read] = '\0';     /* mark end of valid data */
-    page = buf;                 /* page is pointer to start of page to be displayed */
-
-    /* center dialog box on screen */
-    x = (COLS - width) / 2;
-    y = (LINES - height) / 2;
-
-
-    draw_shadow (stdscr, y, x, height, width);
-
-    dialog = newwin (height, width, y, x);
-    keypad (dialog, TRUE);
-
-    /* Create window for text region, used for scrolling text */
-    text = subwin (dialog, height - 4, width - 2, y + 1, x + 1);
-    wattrset (text, dialog_attr);
-    wbkgdset (text, dialog_attr & A_COLOR);
-
-    keypad (text, TRUE);
-
-    /* register the new window, along with its borders */
-    draw_box (dialog, 0, 0, height, width, dialog_attr, border_attr);
-
-    wattrset (dialog, border_attr);
-    mvwaddch (dialog, height-3, 0, ACS_LTEE);
-    for (i = 0; i < width - 2; i++)
-        waddch (dialog, ACS_HLINE);
-    wattrset (dialog, dialog_attr);
-    wbkgdset (dialog, dialog_attr & A_COLOR);
-    waddch (dialog, ACS_RTEE);
-
-    if (title != NULL && strlen(title) >= width-2 ) {
-        /* truncate long title -- mec */
-        char * title2 = malloc(width-2+1);
-        memcpy( title2, title, width-2 );
-        title2[width-2] = '\0';
-        title = title2;
-    }
-
-    if (title != NULL) {
-        wattrset (dialog, title_attr);
-        mvwaddch (dialog, 0, (width - strlen(title))/2 - 1, ' ');
-        waddstr (dialog, (char *)title);
-        waddch (dialog, ' ');
-    }
-    print_button (dialog, " Exit ", height - 2, width / 2 - 4, TRUE);
-    wnoutrefresh (dialog);
-    getyx (dialog, cur_y, cur_x);       /* Save cursor position */
-
-    /* Print first page of text */
-    attr_clear (text, height - 4, width - 2, dialog_attr);
-    print_page (text, height - 4, width - 2);
-    print_position (dialog, height, width);
-    wmove (dialog, cur_y, cur_x);       /* Restore cursor position */
-    wrefresh (dialog);
-
-    while ((key != ESC) && (key != '\n')) {
-        key = wgetch (dialog);
-        switch (key) {
-        case 'E':               /* Exit */
-        case 'e':
-        case 'X':
-        case 'x':
-            delwin (dialog);
-            free (buf);
-            close (fd);
-            return 0;
-        case 'g':               /* First page */
-        case KEY_HOME:
-            if (!begin_reached) {
-                begin_reached = 1;
-                /* First page not in buffer? */
-                if ((fpos = lseek (fd, 0, SEEK_CUR)) == -1) {
-                    endwin ();
-                    fprintf (stderr,
-                      "\nError moving file pointer in dialog_textbox().\n");
-                    exit (-1);
-                }
-                if (fpos > bytes_read) {        /* Yes, we have to read it in */
-                    if (lseek (fd, 0, SEEK_SET) == -1) {
-                        endwin ();
-                        fprintf (stderr, "\nError moving file pointer in "
-                                 "dialog_textbox().\n");
-                        exit (-1);
-                    }
-                    if ((bytes_read = read (fd, buf, BUF_SIZE)) == -1) {
-                        endwin ();
-                        fprintf (stderr,
-                             "\nError reading file in dialog_textbox().\n");
-                        exit (-1);
-                    }
-                    buf[bytes_read] = '\0';
-                }
-                page = buf;
-                print_page (text, height - 4, width - 2);
-                print_position (dialog, height, width);
-                wmove (dialog, cur_y, cur_x);   /* Restore cursor position */
-                wrefresh (dialog);
-            }
-            break;
-        case 'G':               /* Last page */
-        case KEY_END:
-
-            end_reached = 1;
-            /* Last page not in buffer? */
-            if ((fpos = lseek (fd, 0, SEEK_CUR)) == -1) {
-                endwin ();
-                fprintf (stderr,
-                      "\nError moving file pointer in dialog_textbox().\n");
-                exit (-1);
-            }
-            if (fpos < file_size) {     /* Yes, we have to read it in */
-                if (lseek (fd, -BUF_SIZE, SEEK_END) == -1) {
-                    endwin ();
-                    fprintf (stderr,
-                      "\nError moving file pointer in dialog_textbox().\n");
-                    exit (-1);
-                }
-                if ((bytes_read = read (fd, buf, BUF_SIZE)) == -1) {
-                    endwin ();
-                    fprintf (stderr,
-                             "\nError reading file in dialog_textbox().\n");
-                    exit (-1);
-                }
-                buf[bytes_read] = '\0';
-            }
-            page = buf + bytes_read;
-            back_lines (height - 4);
-            print_page (text, height - 4, width - 2);
-            print_position (dialog, height, width);
-            wmove (dialog, cur_y, cur_x);       /* Restore cursor position */
-            wrefresh (dialog);
-            break;
-        case 'K':               /* Previous line */
-        case 'k':
-        case KEY_UP:
-            if (!begin_reached) {
-                back_lines (page_length + 1);
-
-                /* We don't call print_page() here but use scrolling to ensure
-                   faster screen update. However, 'end_reached' and
-                   'page_length' should still be updated, and 'page' should
-                   point to start of next page. This is done by calling
-                   get_line() in the following 'for' loop. */
-                scrollok (text, TRUE);
-                wscrl (text, -1);       /* Scroll text region down one line */
-                scrollok (text, FALSE);
-                page_length = 0;
-                passed_end = 0;
-                for (i = 0; i < height - 4; i++) {
-                    if (!i) {
-                        /* print first line of page */
-                        print_line (text, 0, width - 2);
-                        wnoutrefresh (text);
-                    } else
-                        /* Called to update 'end_reached' and 'page' */
-                        get_line ();
-                    if (!passed_end)
-                        page_length++;
-                    if (end_reached && !passed_end)
-                        passed_end = 1;
-                }
-
-                print_position (dialog, height, width);
-                wmove (dialog, cur_y, cur_x);   /* Restore cursor position */
-                wrefresh (dialog);
-            }
-            break;
-        case 'B':               /* Previous page */
-        case 'b':
-        case KEY_PPAGE:
-            if (begin_reached)
-                break;
-            back_lines (page_length + height - 4);
-            print_page (text, height - 4, width - 2);
-            print_position (dialog, height, width);
-            wmove (dialog, cur_y, cur_x);
-            wrefresh (dialog);
-            break;
-        case 'J':               /* Next line */
-        case 'j':
-        case KEY_DOWN:
-            if (!end_reached) {
-                begin_reached = 0;
-                scrollok (text, TRUE);
-                scroll (text);  /* Scroll text region up one line */
-                scrollok (text, FALSE);
-                print_line (text, height - 5, width - 2);
-                wnoutrefresh (text);
-                print_position (dialog, height, width);
-                wmove (dialog, cur_y, cur_x);   /* Restore cursor position */
-                wrefresh (dialog);
-            }
-            break;
-        case KEY_NPAGE:         /* Next page */
-        case ' ':
-            if (end_reached)
-                break;
-
-            begin_reached = 0;
-            print_page (text, height - 4, width - 2);
-            print_position (dialog, height, width);
-            wmove (dialog, cur_y, cur_x);
-            wrefresh (dialog);
-            break;
-        case '0':               /* Beginning of line */
-        case 'H':               /* Scroll left */
-        case 'h':
-        case KEY_LEFT:
-            if (hscroll <= 0)
-                break;
-
-            if (key == '0')
-                hscroll = 0;
-            else
-                hscroll--;
-            /* Reprint current page to scroll horizontally */
-            back_lines (page_length);
-            print_page (text, height - 4, width - 2);
-            wmove (dialog, cur_y, cur_x);
-            wrefresh (dialog);
-            break;
-        case 'L':               /* Scroll right */
-        case 'l':
-        case KEY_RIGHT:
-            if (hscroll >= MAX_LEN)
-                break;
-            hscroll++;
-            /* Reprint current page to scroll horizontally */
-            back_lines (page_length);
-            print_page (text, height - 4, width - 2);
-            wmove (dialog, cur_y, cur_x);
-            wrefresh (dialog);
-            break;
-        case ESC:
-            break;
-        }
-    }
-
-    delwin (dialog);
-    free (buf);
-    close (fd);
-    return 1;                   /* ESC pressed */
-}
-
-/*
- * Go back 'n' lines in text file. Called by dialog_textbox().
- * 'page' will be updated to point to the desired line in 'buf'.
- */
-static void
-back_lines (int n)
-{
-    int i, fpos;
-
-    begin_reached = 0;
-    /* We have to distinguish between end_reached and !end_reached
-       since at end of file, the line is not ended by a '\n'.
-       The code inside 'if' basically does a '--page' to move one
-       character backward so as to skip '\n' of the previous line */
-    if (!end_reached) {
-        /* Either beginning of buffer or beginning of file reached? */
-        if (page == buf) {
-            if ((fpos = lseek (fd, 0, SEEK_CUR)) == -1) {
-                endwin ();
-                fprintf (stderr, "\nError moving file pointer in "
-                         "back_lines().\n");
-                exit (-1);
-            }
-            if (fpos > bytes_read) {    /* Not beginning of file yet */
-                /* We've reached beginning of buffer, but not beginning of
-                   file yet, so read previous part of file into buffer.
-                   Note that we only move backward for BUF_SIZE/2 bytes,
-                   but not BUF_SIZE bytes to avoid re-reading again in
-                   print_page() later */
-                /* Really possible to move backward BUF_SIZE/2 bytes? */
-                if (fpos < BUF_SIZE / 2 + bytes_read) {
-                    /* No, move less then */
-                    if (lseek (fd, 0, SEEK_SET) == -1) {
-                        endwin ();
-                        fprintf (stderr, "\nError moving file pointer in "
-                                 "back_lines().\n");
-                        exit (-1);
-                    }
-                    page = buf + fpos - bytes_read;
-                } else {        /* Move backward BUF_SIZE/2 bytes */
-                    if (lseek (fd, -(BUF_SIZE / 2 + bytes_read), SEEK_CUR)
-                        == -1) {
-                        endwin ();
-                        fprintf (stderr, "\nError moving file pointer "
-                                 "in back_lines().\n");
-                        exit (-1);
-                    }
-                    page = buf + BUF_SIZE / 2;
-                }
-                if ((bytes_read = read (fd, buf, BUF_SIZE)) == -1) {
-                    endwin ();
-                    fprintf (stderr, "\nError reading file in back_lines().\n");
-                    exit (-1);
-                }
-                buf[bytes_read] = '\0';
-            } else {            /* Beginning of file reached */
-                begin_reached = 1;
-                return;
-            }
-        }
-        if (*(--page) != '\n') {        /* '--page' here */
-            /* Something's wrong... */
-            endwin ();
-            fprintf (stderr, "\nInternal error in back_lines().\n");
-            exit (-1);
-        }
-    }
-    /* Go back 'n' lines */
-    for (i = 0; i < n; i++)
-        do {
-            if (page == buf) {
-                if ((fpos = lseek (fd, 0, SEEK_CUR)) == -1) {
-                    endwin ();
-                    fprintf (stderr,
-                          "\nError moving file pointer in back_lines().\n");
-                    exit (-1);
-                }
-                if (fpos > bytes_read) {
-                    /* Really possible to move backward BUF_SIZE/2 bytes? */
-                    if (fpos < BUF_SIZE / 2 + bytes_read) {
-                        /* No, move less then */
-                        if (lseek (fd, 0, SEEK_SET) == -1) {
-                            endwin ();
-                            fprintf (stderr, "\nError moving file pointer "
-                                     "in back_lines().\n");
-                            exit (-1);
-                        }
-                        page = buf + fpos - bytes_read;
-                    } else {    /* Move backward BUF_SIZE/2 bytes */
-                        if (lseek (fd, -(BUF_SIZE / 2 + bytes_read),
-                                   SEEK_CUR) == -1) {
-                            endwin ();
-                            fprintf (stderr, "\nError moving file pointer"
-                                     " in back_lines().\n");
-                            exit (-1);
-                        }
-                        page = buf + BUF_SIZE / 2;
-                    }
-                    if ((bytes_read = read (fd, buf, BUF_SIZE)) == -1) {
-                        endwin ();
-                        fprintf (stderr, "\nError reading file in "
-                                 "back_lines().\n");
-                        exit (-1);
-                    }
-                    buf[bytes_read] = '\0';
-                } else {        /* Beginning of file reached */
-                    begin_reached = 1;
-                    return;
-                }
-            }
-        } while (*(--page) != '\n');
-    page++;
-}
-
-/*
- * Print a new page of text. Called by dialog_textbox().
- */
-static void
-print_page (WINDOW * win, int height, int width)
-{
-    int i, passed_end = 0;
-
-    page_length = 0;
-    for (i = 0; i < height; i++) {
-        print_line (win, i, width);
-        if (!passed_end)
-            page_length++;
-        if (end_reached && !passed_end)
-            passed_end = 1;
-    }
-    wnoutrefresh (win);
-}
-
-/*
- * Print a new line of text. Called by dialog_textbox() and print_page().
- */
-static void
-print_line (WINDOW * win, int row, int width)
-{
-    int y, x;
-    char *line;
-
-    line = get_line ();
-    line += MIN (strlen (line), hscroll);       /* Scroll horizontally */
-    wmove (win, row, 0);        /* move cursor to correct line */
-    waddch (win, ' ');
-    waddnstr (win, line, MIN (strlen (line), width - 2));
-
-    getyx (win, y, x);
-    /* Clear 'residue' of previous line */
-#if OLD_NCURSES
-    {
-        int i;
-        for (i = 0; i < width - x; i++)
-            waddch (win, ' ');
-    }
-#else
-    wclrtoeol(win);
-#endif
-}
-
-/*
- * Return current line of text. Called by dialog_textbox() and print_line().
- * 'page' should point to start of current line before calling, and will be
- * updated to point to start of next line.
- */
-static char *
-get_line (void)
-{
-    int i = 0, fpos;
-    static char line[MAX_LEN + 1];
-
-    end_reached = 0;
-    while (*page != '\n') {
-        if (*page == '\0') {
-            /* Either end of file or end of buffer reached */
-            if ((fpos = lseek (fd, 0, SEEK_CUR)) == -1) {
-                endwin ();
-                fprintf (stderr, "\nError moving file pointer in "
-                         "get_line().\n");
-                exit (-1);
-            }
-            if (fpos < file_size) {     /* Not end of file yet */
-                /* We've reached end of buffer, but not end of file yet,
-                   so read next part of file into buffer */
-                if ((bytes_read = read (fd, buf, BUF_SIZE)) == -1) {
-                    endwin ();
-                    fprintf (stderr, "\nError reading file in get_line().\n");
-                    exit (-1);
-                }
-                buf[bytes_read] = '\0';
-                page = buf;
-            } else {
-                if (!end_reached)
-                    end_reached = 1;
-                break;
-            }
-        } else if (i < MAX_LEN)
-            line[i++] = *(page++);
-        else {
-            /* Truncate lines longer than MAX_LEN characters */
-            if (i == MAX_LEN)
-                line[i++] = '\0';
-            page++;
-        }
-    }
-    if (i <= MAX_LEN)
-        line[i] = '\0';
-    if (!end_reached)
-        page++;                 /* move pass '\n' */
-
-    return line;
-}
-
-/*
- * Print current position
- */
-static void
-print_position (WINDOW * win, int height, int width)
-{
-    int fpos, percent;
-
-    if ((fpos = lseek (fd, 0, SEEK_CUR)) == -1) {
-        endwin ();
-        fprintf (stderr, "\nError moving file pointer in print_position().\n");
-        exit (-1);
-    }
-    wattrset (win, position_indicator_attr);
-    wbkgdset (win, position_indicator_attr & A_COLOR);
-    percent = !file_size ?
-        100 : ((fpos - bytes_read + page - buf) * 100) / file_size;
-    wmove (win, height - 3, width - 9);
-    wprintw (win, "(%3d%%)", percent);
-}
diff --git a/scripts/config/lxdialog/util.c b/scripts/config/lxdialog/util.c
deleted file mode 100644
index 26dd376b9..000000000
--- a/scripts/config/lxdialog/util.c
+++ /dev/null
@@ -1,376 +0,0 @@
-/* vi: set sw=4 ts=4: */
-/*
- *  util.c
- *
- *  ORIGINAL AUTHOR: Savio Lam (lam836@cs.cuhk.hk)
- *  MODIFIED FOR LINUX KERNEL CONFIG BY: William Roadcap (roadcap@cfw.com)
- *
- *  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 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, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include "dialog.h"
-
-
-/* use colors by default? */
-bool use_colors = 1;
-
-const char *backtitle = NULL;
-
-const char *dialog_result;
-
-/*
- * Attribute values, default is for mono display
- */
-chtype attributes[] =
-{
-    A_NORMAL,                   /* screen_attr */
-    A_NORMAL,                   /* shadow_attr */
-    A_NORMAL,                   /* dialog_attr */
-    A_BOLD,                     /* title_attr */
-    A_NORMAL,                   /* border_attr */
-    A_REVERSE,                  /* button_active_attr */
-    A_DIM,                      /* button_inactive_attr */
-    A_REVERSE,                  /* button_key_active_attr */
-    A_BOLD,                     /* button_key_inactive_attr */
-    A_REVERSE,                  /* button_label_active_attr */
-    A_NORMAL,                   /* button_label_inactive_attr */
-    A_NORMAL,                   /* inputbox_attr */
-    A_NORMAL,                   /* inputbox_border_attr */
-    A_NORMAL,                   /* searchbox_attr */
-    A_BOLD,                     /* searchbox_title_attr */
-    A_NORMAL,                   /* searchbox_border_attr */
-    A_BOLD,                     /* position_indicator_attr */
-    A_NORMAL,                   /* menubox_attr */
-    A_NORMAL,                   /* menubox_border_attr */
-    A_NORMAL,                   /* item_attr */
-    A_REVERSE,                  /* item_selected_attr */
-    A_BOLD,                     /* tag_attr */
-    A_REVERSE,                  /* tag_selected_attr */
-    A_BOLD,                     /* tag_key_attr */
-    A_REVERSE,                  /* tag_key_selected_attr */
-    A_BOLD,                     /* check_attr */
-    A_REVERSE,                  /* check_selected_attr */
-    A_BOLD,                     /* uarrow_attr */
-    A_BOLD                      /* darrow_attr */
-};
-
-
-#include "colors.h"
-
-/*
- * Table of color values
- */
-int color_table[][3] =
-{
-    {SCREEN_FG, SCREEN_BG, SCREEN_HL},
-    {SHADOW_FG, SHADOW_BG, SHADOW_HL},
-    {DIALOG_FG, DIALOG_BG, DIALOG_HL},
-    {TITLE_FG, TITLE_BG, TITLE_HL},
-    {BORDER_FG, BORDER_BG, BORDER_HL},
-    {BUTTON_ACTIVE_FG, BUTTON_ACTIVE_BG, BUTTON_ACTIVE_HL},
-    {BUTTON_INACTIVE_FG, BUTTON_INACTIVE_BG, BUTTON_INACTIVE_HL},
-    {BUTTON_KEY_ACTIVE_FG, BUTTON_KEY_ACTIVE_BG, BUTTON_KEY_ACTIVE_HL},
-    {BUTTON_KEY_INACTIVE_FG, BUTTON_KEY_INACTIVE_BG, BUTTON_KEY_INACTIVE_HL},
-    {BUTTON_LABEL_ACTIVE_FG, BUTTON_LABEL_ACTIVE_BG, BUTTON_LABEL_ACTIVE_HL},
-    {BUTTON_LABEL_INACTIVE_FG, BUTTON_LABEL_INACTIVE_BG,
-     BUTTON_LABEL_INACTIVE_HL},
-    {INPUTBOX_FG, INPUTBOX_BG, INPUTBOX_HL},
-    {INPUTBOX_BORDER_FG, INPUTBOX_BORDER_BG, INPUTBOX_BORDER_HL},
-    {SEARCHBOX_FG, SEARCHBOX_BG, SEARCHBOX_HL},
-    {SEARCHBOX_TITLE_FG, SEARCHBOX_TITLE_BG, SEARCHBOX_TITLE_HL},
-    {SEARCHBOX_BORDER_FG, SEARCHBOX_BORDER_BG, SEARCHBOX_BORDER_HL},
-    {POSITION_INDICATOR_FG, POSITION_INDICATOR_BG, POSITION_INDICATOR_HL},
-    {MENUBOX_FG, MENUBOX_BG, MENUBOX_HL},
-    {MENUBOX_BORDER_FG, MENUBOX_BORDER_BG, MENUBOX_BORDER_HL},
-    {ITEM_FG, ITEM_BG, ITEM_HL},
-    {ITEM_SELECTED_FG, ITEM_SELECTED_BG, ITEM_SELECTED_HL},
-    {TAG_FG, TAG_BG, TAG_HL},
-    {TAG_SELECTED_FG, TAG_SELECTED_BG, TAG_SELECTED_HL},
-    {TAG_KEY_FG, TAG_KEY_BG, TAG_KEY_HL},
-    {TAG_KEY_SELECTED_FG, TAG_KEY_SELECTED_BG, TAG_KEY_SELECTED_HL},
-    {CHECK_FG, CHECK_BG, CHECK_HL},
-    {CHECK_SELECTED_FG, CHECK_SELECTED_BG, CHECK_SELECTED_HL},
-    {UARROW_FG, UARROW_BG, UARROW_HL},
-    {DARROW_FG, DARROW_BG, DARROW_HL},
-};                              /* color_table */
-
-/*
- * Set window to attribute 'attr'
- */
-void
-attr_clear (WINDOW * win, int height, int width, chtype attr)
-{
-    int i, j;
-
-    wattrset (win, attr);
-    for (i = 0; i < height; i++) {
-        wmove (win, i, 0);
-        for (j = 0; j < width; j++)
-            waddch (win, ' ');
-    }
-    touchwin (win);
-}
-
-void dialog_clear (void)
-{
-    attr_clear (stdscr, LINES, COLS, screen_attr);
-    /* Display background title if it exists ... - SLH */
-    if (backtitle != NULL) {
-        int i;
-
-        wattrset (stdscr, screen_attr);
-        mvwaddstr (stdscr, 0, 1, (char *)backtitle);
-        wmove (stdscr, 1, 1);
-        for (i = 1; i < COLS - 1; i++)
-            waddch (stdscr, ACS_HLINE);
-    }
-    wnoutrefresh (stdscr);
-}
-
-/*
- * Do some initialization for dialog
- */
-void
-init_dialog (void)
-{
-    initscr ();                 /* Init curses */
-    keypad (stdscr, TRUE);
-    cbreak ();
-    noecho ();
-
-
-    if (use_colors)     /* Set up colors */
-        color_setup ();
-
-
-    dialog_clear ();
-}
-
-/*
- * Setup for color display
- */
-void
-color_setup (void)
-{
-    int i;
-
-    if (has_colors ()) {        /* Terminal supports color? */
-        start_color ();
-
-        /* Initialize color pairs */
-        for (i = 0; i < ATTRIBUTE_COUNT; i++)
-            init_pair (i + 1, color_table[i][0], color_table[i][1]);
-
-        /* Setup color attributes */
-        for (i = 0; i < ATTRIBUTE_COUNT; i++)
-            attributes[i] = C_ATTR (color_table[i][2], i + 1);
-    }
-}
-
-/*
- * End using dialog functions.
- */
-void
-end_dialog (void)
-{
-    endwin ();
-}
-
-
-/*
- * Print a string of text in a window, automatically wrap around to the
- * next line if the string is too long to fit on one line. Newline
- * characters '\n' are replaced by spaces.  We start on a new line
- * if there is no room for at least 4 nonblanks following a double-space.
- */
-void
-print_autowrap (WINDOW * win, const char *prompt, int width, int y, int x)
-{
-    int newl, cur_x, cur_y;
-    int i, prompt_len, room, wlen;
-    char tempstr[MAX_LEN + 1], *word, *sp, *sp2;
-
-    strcpy (tempstr, prompt);
-
-    prompt_len = strlen(tempstr);
-
-    /*
-     * Remove newlines
-     */
-    for(i=0; i<prompt_len; i++) {
-        if(tempstr[i] == '\n') tempstr[i] = ' ';
-    }
-
-    if (prompt_len <= width - x * 2) {  /* If prompt is short */
-        wmove (win, y, (width - prompt_len) / 2);
-        waddstr (win, tempstr);
-    } else {
-        cur_x = x;
-        cur_y = y;
-        newl = 1;
-        word = tempstr;
-        while (word && *word) {
-            sp = strchr(word, ' ');
-            if (sp)
-                *sp++ = 0;
-
-            /* Wrap to next line if either the word does not fit,
-               or it is the first word of a new sentence, and it is
-               short, and the next word does not fit. */
-            room = width - cur_x;
-            wlen = strlen(word);
-            if (wlen > room ||
-               (newl && wlen < 4 && sp && wlen+1+strlen(sp) > room
-                     && (!(sp2 = strchr(sp, ' ')) || wlen+1+(sp2-sp) > room))) {
-                cur_y++;
-                cur_x = x;
-            }
-            wmove (win, cur_y, cur_x);
-            waddstr (win, word);
-            getyx (win, cur_y, cur_x);
-            cur_x++;
-            if (sp && *sp == ' ') {
-                cur_x++;        /* double space */
-                while (*++sp == ' ');
-                newl = 1;
-            } else
-                newl = 0;
-            word = sp;
-        }
-    }
-}
-
-/*
- * Print a button
- */
-void
-print_button (WINDOW * win, const char *label, int y, int x, int selected)
-{
-    int i, temp;
-
-    wmove (win, y, x);
-    wattrset (win, selected ? button_active_attr : button_inactive_attr);
-    waddstr (win, "<");
-    temp = strspn (label, " ");
-    label += temp;
-    wattrset (win, selected ? button_label_active_attr
-              : button_label_inactive_attr);
-    for (i = 0; i < temp; i++)
-        waddch (win, ' ');
-    wattrset (win, selected ? button_key_active_attr
-              : button_key_inactive_attr);
-    waddch (win, label[0]);
-    wattrset (win, selected ? button_label_active_attr
-              : button_label_inactive_attr);
-    waddstr (win, (char *)label + 1);
-    wattrset (win, selected ? button_active_attr : button_inactive_attr);
-    waddstr (win, ">");
-    wmove (win, y, x + temp + 1);
-}
-
-/*
- * Draw a rectangular box with line drawing characters
- */
-void
-draw_box (WINDOW * win, int y, int x, int height, int width,
-          chtype box, chtype border)
-{
-    int i, j;
-
-    wattrset (win, 0);
-    for (i = 0; i < height; i++) {
-        wmove (win, y + i, x);
-        for (j = 0; j < width; j++)
-            if (!i && !j)
-                waddch (win, border | ACS_ULCORNER);
-            else if (i == height - 1 && !j)
-                waddch (win, border | ACS_LLCORNER);
-            else if (!i && j == width - 1)
-                waddch (win, box | ACS_URCORNER);
-            else if (i == height - 1 && j == width - 1)
-                waddch (win, box | ACS_LRCORNER);
-            else if (!i)
-                waddch (win, border | ACS_HLINE);
-            else if (i == height - 1)
-                waddch (win, box | ACS_HLINE);
-            else if (!j)
-                waddch (win, border | ACS_VLINE);
-            else if (j == width - 1)
-                waddch (win, box | ACS_VLINE);
-            else
-                waddch (win, box | ' ');
-    }
-}
-
-/*
- * Draw shadows along the right and bottom edge to give a more 3D look
- * to the boxes
- */
-void
-draw_shadow (WINDOW * win, int y, int x, int height, int width)
-{
-    int i;
-
-    if (has_colors ()) {        /* Whether terminal supports color? */
-        wattrset (win, shadow_attr);
-        wmove (win, y + height, x + 2);
-        for (i = 0; i < width; i++)
-            waddch (win, winch (win) & A_CHARTEXT);
-        for (i = y + 1; i < y + height + 1; i++) {
-            wmove (win, i, x + width);
-            waddch (win, winch (win) & A_CHARTEXT);
-            waddch (win, winch (win) & A_CHARTEXT);
-        }
-        wnoutrefresh (win);
-    }
-}
-
-/*
- *  Return the position of the first alphabetic character in a string.
- */
-int
-first_alpha(const char *string, const char *exempt)
-{
-        int i, in_paren=0, c;
-
-        for (i = 0; i < strlen(string); i++) {
-                c = tolower(string[i]);
-
-                if (strchr("<[(", c)) ++in_paren;
-                if (strchr(">])", c) && in_paren > 0) --in_paren;
-
-                if ((! in_paren) && isalpha(c) &&
-                     strchr(exempt, c) == 0)
-                        return i;
-        }
-
-        return 0;
-}
-
-/*
- * Get the first selected item in the dialog_list_item list.
- */
-struct dialog_list_item *
-first_sel_item(int item_no, struct dialog_list_item ** items)
-{
-        int i;
-
-        for (i = 0; i < item_no; i++) {
-                if (items[i]->selected)
-                        return items[i];
-        }
-
-        return NULL;
-}
diff --git a/scripts/config/lxdialog/yesno.c b/scripts/config/lxdialog/yesno.c
deleted file mode 100644
index 98562d8a9..000000000
--- a/scripts/config/lxdialog/yesno.c
+++ /dev/null
@@ -1,119 +0,0 @@
-/* vi: set sw=4 ts=4: */
-/*
- *  yesno.c -- implements the yes/no box
- *
- *  ORIGINAL AUTHOR: Savio Lam (lam836@cs.cuhk.hk)
- *  MODIFIED FOR LINUX KERNEL CONFIG BY: William Roadcap (roadcap@cfw.com)
- *
- *  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 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, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include "dialog.h"
-
-/*
- * Display termination buttons
- */
-static void
-print_buttons(WINDOW *dialog, int height, int width, int selected)
-{
-    int x = width / 2 - 10;
-    int y = height - 2;
-
-    print_button (dialog, " Yes ", y, x, selected == 0);
-    print_button (dialog, "  No  ", y, x + 13, selected == 1);
-
-    wmove(dialog, y, x+1 + 13*selected );
-    wrefresh (dialog);
-}
-
-/*
- * Display a dialog box with two buttons - Yes and No
- */
-int
-dialog_yesno (const char *title, const char *prompt, int height, int width)
-{
-    int i, x, y, key = 0, button = 0;
-    WINDOW *dialog;
-
-    /* center dialog box on screen */
-    x = (COLS - width) / 2;
-    y = (LINES - height) / 2;
-
-    draw_shadow (stdscr, y, x, height, width);
-
-    dialog = newwin (height, width, y, x);
-    keypad (dialog, TRUE);
-
-    draw_box (dialog, 0, 0, height, width, dialog_attr, border_attr);
-    wattrset (dialog, border_attr);
-    mvwaddch (dialog, height-3, 0, ACS_LTEE);
-    for (i = 0; i < width - 2; i++)
-        waddch (dialog, ACS_HLINE);
-    wattrset (dialog, dialog_attr);
-    waddch (dialog, ACS_RTEE);
-
-    if (title != NULL && strlen(title) >= width-2 ) {
-        /* truncate long title -- mec */
-        char * title2 = malloc(width-2+1);
-        memcpy( title2, title, width-2 );
-        title2[width-2] = '\0';
-        title = title2;
-    }
-
-    if (title != NULL) {
-        wattrset (dialog, title_attr);
-        mvwaddch (dialog, 0, (width - strlen(title))/2 - 1, ' ');
-        waddstr (dialog, (char *)title);
-        waddch (dialog, ' ');
-    }
-
-    wattrset (dialog, dialog_attr);
-    print_autowrap (dialog, prompt, width - 2, 1, 3);
-
-    print_buttons(dialog, height, width, 0);
-
-    while (key != ESC) {
-        key = wgetch (dialog);
-        switch (key) {
-        case 'Y':
-        case 'y':
-            delwin (dialog);
-            return 0;
-        case 'N':
-        case 'n':
-            delwin (dialog);
-            return 1;
-
-        case TAB:
-        case KEY_LEFT:
-        case KEY_RIGHT:
-            button = ((key == KEY_LEFT ? --button : ++button) < 0)
-                        ? 1 : (button > 1 ? 0 : button);
-
-            print_buttons(dialog, height, width, button);
-            wrefresh (dialog);
-            break;
-        case ' ':
-        case '\n':
-            delwin (dialog);
-            return button;
-        case ESC:
-            break;
-        }
-    }
-
-    delwin (dialog);
-    return -1;                  /* ESC pressed */
-}
diff --git a/scripts/config/zconf.tab.h_shipped b/scripts/config/zconf.tab.h_shipped
deleted file mode 100644
index 3b191ef59..000000000
--- a/scripts/config/zconf.tab.h_shipped
+++ /dev/null
@@ -1,125 +0,0 @@
-/* A Bison parser, made from zconf.y, by GNU bison 1.75.  */
-
-/* Skeleton parser for Yacc-like parsing with Bison,
-   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002 Free Software Foundation, Inc.
-
-   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, or (at your option)
-   any later version.
-
-   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, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-/* As a special exception, when this file is copied by Bison into a
-   Bison output file, you may use that output file without restriction.
-   This special exception was added by the Free Software Foundation
-   in version 1.24 of Bison.  */
-
-#ifndef BISON_ZCONF_TAB_H
-# define BISON_ZCONF_TAB_H
-
-/* Tokens.  */
-#ifndef YYTOKENTYPE
-# define YYTOKENTYPE
-   /* Put the tokens into the symbol table, so that GDB and other debuggers
-      know about them.  */
-   enum yytokentype {
-     T_MAINMENU = 258,
-     T_MENU = 259,
-     T_ENDMENU = 260,
-     T_SOURCE = 261,
-     T_CHOICE = 262,
-     T_ENDCHOICE = 263,
-     T_COMMENT = 264,
-     T_CONFIG = 265,
-     T_HELP = 266,
-     T_HELPTEXT = 267,
-     T_IF = 268,
-     T_ENDIF = 269,
-     T_DEPENDS = 270,
-     T_REQUIRES = 271,
-     T_OPTIONAL = 272,
-     T_PROMPT = 273,
-     T_DEFAULT = 274,
-     T_TRISTATE = 275,
-     T_BOOLEAN = 276,
-     T_INT = 277,
-     T_HEX = 278,
-     T_WORD = 279,
-     T_STRING = 280,
-     T_UNEQUAL = 281,
-     T_EOF = 282,
-     T_EOL = 283,
-     T_CLOSE_PAREN = 284,
-     T_OPEN_PAREN = 285,
-     T_ON = 286,
-     T_OR = 287,
-     T_AND = 288,
-     T_EQUAL = 289,
-     T_NOT = 290
-   };
-#endif
-#define T_MAINMENU 258
-#define T_MENU 259
-#define T_ENDMENU 260
-#define T_SOURCE 261
-#define T_CHOICE 262
-#define T_ENDCHOICE 263
-#define T_COMMENT 264
-#define T_CONFIG 265
-#define T_HELP 266
-#define T_HELPTEXT 267
-#define T_IF 268
-#define T_ENDIF 269
-#define T_DEPENDS 270
-#define T_REQUIRES 271
-#define T_OPTIONAL 272
-#define T_PROMPT 273
-#define T_DEFAULT 274
-#define T_TRISTATE 275
-#define T_BOOLEAN 276
-#define T_INT 277
-#define T_HEX 278
-#define T_WORD 279
-#define T_STRING 280
-#define T_UNEQUAL 281
-#define T_EOF 282
-#define T_EOL 283
-#define T_CLOSE_PAREN 284
-#define T_OPEN_PAREN 285
-#define T_ON 286
-#define T_OR 287
-#define T_AND 288
-#define T_EQUAL 289
-#define T_NOT 290
-
-
-
-
-#ifndef YYSTYPE
-#line 33 "zconf.y"
-typedef union {
-        int token;
-        char *string;
-        struct symbol *symbol;
-        struct expr *expr;
-        struct menu *menu;
-} yystype;
-/* Line 1281 of /usr/share/bison/yacc.c.  */
-#line 118 "zconf.tab.h"
-# define YYSTYPE yystype
-#endif
-
-extern YYSTYPE zconflval;
-
-
-#endif /* not BISON_ZCONF_TAB_H */
-
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
new file mode 100644
index 000000000..a28414de8
--- /dev/null
+++ b/scripts/kconfig/Makefile
@@ -0,0 +1,254 @@
+# ===========================================================================
+# Kernel configuration targets
+# These targets are used from top-level makefile
+
+PHONY += oldconfig xconfig gconfig menuconfig config silentoldconfig update-po-config
+
+xconfig: $(obj)/qconf
+        $< Config.in
+
+gconfig: $(obj)/gconf
+        $< Config.in
+
+menuconfig: $(obj)/mconf
+        $(Q)$(MAKE) $(build)=scripts/kconfig/lxdialog
+        $< Config.in
+
+config: $(obj)/conf
+        $< Config.in
+
+oldconfig: $(obj)/conf
+        $< -o Config.in
+
+silentoldconfig: $(obj)/conf
+        $< -s Config.in
+
+update-po-config: $(obj)/kxgettext
+        xgettext --default-domain=linux \
+          --add-comments --keyword=_ --keyword=N_ \
+          --files-from=scripts/kconfig/POTFILES.in \
+          --output scripts/kconfig/config.pot
+        $(Q)ln -fs Kconfig_i386 arch/um/Kconfig_arch
+        $(Q)for i in `ls arch/`; \
+        do \
+          scripts/kconfig/kxgettext arch/$$i/Kconfig \
+            | msguniq -o scripts/kconfig/linux_$${i}.pot; \
+        done
+        $(Q)msgcat scripts/kconfig/config.pot \
+          `find scripts/kconfig/ -type f -name linux_*.pot` \
+          --output scripts/kconfig/linux_raw.pot
+        $(Q)msguniq --sort-by-file scripts/kconfig/linux_raw.pot \
+            --output scripts/kconfig/linux.pot
+        $(Q)rm -f arch/um/Kconfig_arch
+        $(Q)rm -f scripts/kconfig/linux_*.pot scripts/kconfig/config.pot
+
+PHONY += randconfig allyesconfig allnoconfig allmodconfig defconfig
+
+randconfig: $(obj)/conf
+        $< -r Config.in
+
+allyesconfig: $(obj)/conf
+        $< -y Config.in
+
+allnoconfig: $(obj)/conf
+        $< -n Config.in
+
+allmodconfig: $(obj)/conf
+        $< -m Config.in
+
+defconfig: $(obj)/conf
+ifeq ($(KBUILD_DEFCONFIG),)
+        $< -d Config.in
+else
+        @echo *** Default configuration is based on '$(KBUILD_DEFCONFIG)'
+        $(Q)$< -D $(KBUILD_DEFCONFIG) Config.in
+endif
+
+%_defconfig: $(obj)/conf
+        $(Q)$< -D $@ Config.in
+
+# Help text used by make help
+help:
+        @echo  '  config          - Update current config utilising a line-oriented program'
+        @echo  '  menuconfig      - Update current config utilising a menu based program'
+        @echo  '  xconfig         - Update current config utilising a QT based front-end'
+        @echo  '  gconfig         - Update current config utilising a GTK based front-end'
+        @echo  '  oldconfig       - Update current config utilising a provided .config as base'
+        @echo  '  randconfig      - New config with random answer to all options'
+        @echo  '  defconfig       - New config with default answer to all options'
+        @echo  '  allmodconfig    - New config selecting modules when possible'
+        @echo  '  allyesconfig    - New config where all options are accepted with yes'
+        @echo  '  allnoconfig     - New config where all options are answered with no'
+
+# ===========================================================================
+# Shared Makefile for the various kconfig executables:
+# conf:   Used for defconfig, oldconfig and related targets
+# mconf:  Used for the mconfig target.
+#         Utilizes the lxdialog package
+# qconf:  Used for the xconfig target
+#         Based on QT which needs to be installed to compile it
+# gconf:  Used for the gconfig target
+#         Based on GTK which needs to be installed to compile it
+# object files used by all kconfig flavours
+
+hostprogs-y     := conf mconf qconf gconf kxgettext
+conf-objs       := conf.o  zconf.tab.o
+mconf-objs      := mconf.o zconf.tab.o
+kxgettext-objs  := kxgettext.o zconf.tab.o
+
+ifeq ($(MAKECMDGOALS),xconfig)
+        qconf-target := 1
+endif
+ifeq ($(MAKECMDGOALS),gconfig)
+        gconf-target := 1
+endif
+
+
+ifeq ($(qconf-target),1)
+qconf-cxxobjs   := qconf.o
+qconf-objs      := kconfig_load.o zconf.tab.o
+endif
+
+ifeq ($(gconf-target),1)
+gconf-objs      := gconf.o kconfig_load.o zconf.tab.o
+endif
+
+clean-files     := lkc_defs.h qconf.moc .tmp_qtcheck \
+                   .tmp_gtkcheck zconf.tab.c lex.zconf.c zconf.hash.c
+subdir- += lxdialog
+
+# Needed for systems without gettext
+KBUILD_HAVE_NLS := $(shell \
+     if echo "\#include <libintl.h>" | $(HOSTCC) $(HOSTCFLAGS) -E - > /dev/null 2>&1 ; \
+     then echo yes ; \
+     else echo no ; fi)
+ifeq ($(KBUILD_HAVE_NLS),no)
+HOSTCFLAGS      += -DKBUILD_NO_NLS
+endif
+
+# generated files seem to need this to find local include files
+HOSTCFLAGS_lex.zconf.o  := -I$(src)
+HOSTCFLAGS_zconf.tab.o  := -I$(src)
+
+HOSTLOADLIBES_qconf     = $(KC_QT_LIBS) -ldl
+HOSTCXXFLAGS_qconf.o    = $(KC_QT_CFLAGS) -D LKC_DIRECT_LINK
+
+HOSTLOADLIBES_gconf     = `pkg-config --libs gtk+-2.0 gmodule-2.0 libglade-2.0`
+HOSTCFLAGS_gconf.o      = `pkg-config --cflags gtk+-2.0 gmodule-2.0 libglade-2.0` \
+                          -D LKC_DIRECT_LINK
+
+$(obj)/qconf.o: $(obj)/.tmp_qtcheck
+
+ifeq ($(qconf-target),1)
+$(obj)/.tmp_qtcheck: $(src)/Makefile
+-include $(obj)/.tmp_qtcheck
+
+# QT needs some extra effort...
+$(obj)/.tmp_qtcheck:
+        @set -e; echo "  CHECK   qt"; dir=""; pkg=""; \
+        pkg-config --exists qt 2> /dev/null && pkg=qt; \
+        pkg-config --exists qt-mt 2> /dev/null && pkg=qt-mt; \
+        if [ -n "$$pkg" ]; then \
+          cflags="\$$(shell pkg-config $$pkg --cflags)"; \
+          libs="\$$(shell pkg-config $$pkg --libs)"; \
+          moc="\$$(shell pkg-config $$pkg --variable=prefix)/bin/moc"; \
+          dir="$$(pkg-config $$pkg --variable=prefix)"; \
+        else \
+          for d in $$QTDIR /usr/share/qt* /usr/lib/qt*; do \
+            if [ -f $$d/include/qconfig.h ]; then dir=$$d; break; fi; \
+          done; \
+          if [ -z "$$dir" ]; then \
+            echo "*"; \
+            echo "* Unable to find the QT installation. Please make sure that"; \
+            echo "* the QT development package is correctly installed and"; \
+            echo "* either install pkg-config or set the QTDIR environment"; \
+            echo "* variable to the correct location."; \
+            echo "*"; \
+            false; \
+          fi; \
+          libpath=$$dir/lib; lib=qt; osdir=""; \
+          $(HOSTCXX) -print-multi-os-directory > /dev/null 2>&1 && \
+            osdir=x$$($(HOSTCXX) -print-multi-os-directory); \
+          test -d $$libpath/$$osdir && libpath=$$libpath/$$osdir; \
+          test -f $$libpath/libqt-mt.so && lib=qt-mt; \
+          cflags="-I$$dir/include"; \
+          libs="-L$$libpath -Wl,-rpath,$$libpath -l$$lib"; \
+          moc="$$dir/bin/moc"; \
+        fi; \
+        if [ ! -x $$dir/bin/moc -a -x /usr/bin/moc ]; then \
+          echo "*"; \
+          echo "* Unable to find $$dir/bin/moc, using /usr/bin/moc instead."; \
+          echo "*"; \
+          moc="/usr/bin/moc"; \
+        fi; \
+        echo "KC_QT_CFLAGS=$$cflags" > $@; \
+        echo "KC_QT_LIBS=$$libs" >> $@; \
+        echo "KC_QT_MOC=$$moc" >> $@
+endif
+
+$(obj)/gconf.o: $(obj)/.tmp_gtkcheck
+
+ifeq ($(gconf-target),1)
+-include $(obj)/.tmp_gtkcheck
+
+# GTK needs some extra effort, too...
+$(obj)/.tmp_gtkcheck:
+        @if `pkg-config --exists gtk+-2.0 gmodule-2.0 libglade-2.0`; then               \
+                if `pkg-config --atleast-version=2.0.0 gtk+-2.0`; then                  \
+                        touch $@;                                                               \
+                else                                                                    \
+                        echo "*";                                                       \
+                        echo "* GTK+ is present but version >= 2.0.0 is required.";     \
+                        echo "*";                                                       \
+                        false;                                                          \
+                fi                                                                      \
+        else                                                                            \
+                echo "*";                                                               \
+                echo "* Unable to find the GTK+ installation. Please make sure that";   \
+                echo "* the GTK+ 2.0 development package is correctly installed...";    \
+                echo "* You need gtk+-2.0, glib-2.0 and libglade-2.0.";                 \
+                echo "*";                                                               \
+                false;                                                                  \
+        fi
+endif
+
+$(obj)/zconf.tab.o: $(obj)/lex.zconf.c $(obj)/zconf.hash.c
+
+$(obj)/kconfig_load.o: $(obj)/lkc_defs.h
+
+$(obj)/qconf.o: $(obj)/qconf.moc $(obj)/lkc_defs.h
+
+$(obj)/gconf.o: $(obj)/lkc_defs.h
+
+$(obj)/%.moc: $(src)/%.h
+        $(KC_QT_MOC) -i $< -o $@
+
+$(obj)/lkc_defs.h: $(src)/lkc_proto.h
+        sed < $< > $@ 's/P(\([^,]*\),.*/#define \1 (\*\1_p)/'
+
+
+###
+# The following requires flex/bison/gperf
+# By default we use the _shipped versions, uncomment the following line if
+# you are modifying the flex/bison src.
+# LKC_GENPARSER := 1
+
+ifdef LKC_GENPARSER
+
+$(obj)/zconf.tab.c: $(src)/zconf.y
+$(obj)/lex.zconf.c: $(src)/zconf.l
+$(obj)/zconf.hash.c: $(src)/zconf.gperf
+
+%.tab.c: %.y
+        bison -l -b $* -p $(notdir $*) $<
+        cp $@ $@_shipped
+
+lex.%.c: %.l
+        flex -L -P$(notdir $*) -o$@ $<
+        cp $@ $@_shipped
+
+%.hash.c: %.gperf
+        gperf < $< > $@
+        cp $@ $@_shipped
+
+endif
diff --git a/scripts/kconfig/POTFILES.in b/scripts/kconfig/POTFILES.in
new file mode 100644
index 000000000..cc94e46a7
--- /dev/null
+++ b/scripts/kconfig/POTFILES.in
@@ -0,0 +1,5 @@
+scripts/kconfig/mconf.c
+scripts/kconfig/conf.c
+scripts/kconfig/confdata.c
+scripts/kconfig/gconf.c
+scripts/kconfig/qconf.cc
diff --git a/scripts/config/conf.c b/scripts/kconfig/conf.c
index 2da5ff7a7..8012d1076 100644
--- a/scripts/config/conf.c
+++ b/scripts/kconfig/conf.c
@@ -1,4 +1,3 @@
-/* vi: set sw=4 ts=4: */
 /*
  * Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org>
  * Released under the terms of the GNU GPL v2.0.
@@ -6,6 +5,7 @@
 
 #include <ctype.h>
 #include <stdlib.h>
+#include <stdio.h>
 #include <string.h>
 #include <unistd.h>
 #include <time.h>
@@ -35,7 +35,7 @@ static int conf_cnt;
 static char line[128];
 static struct menu *rootEntry;
 
-static char nohelp_text[] = "Sorry, no help available for this option yet.\n";
+static char nohelp_text[] = N_("Sorry, no help available for this option yet.\n");
 
 static void strip(char *str)
 {
@@ -57,9 +57,9 @@ static void strip(char *str)
 static void check_stdin(void)
 {
         if (!valid_stdin && input_mode == ask_silent) {
-                printf("aborted!\n\n");
-                printf("Console input/output is redirected. ");
-                printf("Run 'make oldconfig' to update configuration.\n\n");
+                printf(_("aborted!\n\n"));
+                printf(_("Console input/output is redirected. "));
+                printf(_("Run 'make oldconfig' to update configuration.\n\n"));
                 exit(1);
         }
 }
@@ -83,6 +83,15 @@ static void conf_askvalue(struct symbol *sym, const char *def)
         }
 
         switch (input_mode) {
+        case set_no:
+        case set_mod:
+        case set_yes:
+        case set_random:
+                if (sym_has_value(sym)) {
+                        printf("%s\n", def);
+                        return;
+                }
+                break;
         case ask_new:
         case ask_silent:
                 if (sym_has_value(sym)) {
@@ -306,8 +315,7 @@ static int conf_choice(struct menu *menu)
                 printf("%*s%s\n", indent - 1, "", menu_get_prompt(menu));
                 def_sym = sym_get_choice_value(sym);
                 cnt = def = 0;
-                line[0] = '0';
-                line[1] = 0;
+                line[0] = 0;
                 for (child = menu->list; child; child = child->next) {
                         if (!menu_is_visible(child))
                                 continue;
@@ -468,15 +476,14 @@ static void check_conf(struct menu *menu)
                 return;
 
         sym = menu->sym;
-        if (sym) {
-                if (sym_is_changable(sym) && !sym_has_value(sym)) {
+        if (sym && !sym_has_value(sym)) {
+                if (sym_is_changable(sym) ||
+                    (sym_is_choice(sym) && sym_get_tristate_value(sym) == yes)) {
                         if (!conf_cnt++)
-                                printf("*\n* Restart config...\n*\n");
+                                printf(_("*\n* Restart config...\n*\n"));
                         rootEntry = menu_get_parent_menu(menu);
                         conf(rootEntry);
                 }
-                if (sym_is_choice(sym) && sym_get_tristate_value(sym) != mod)
-                        return;
         }
 
         for (child = menu->list; child; child = child->next)
@@ -505,7 +512,7 @@ int main(int ac, char **av)
                         input_mode = set_default;
                         defconfig_file = av[i++];
                         if (!defconfig_file) {
-                                printf("%s: No default config file specified\n",
+                                printf(_("%s: No default config file specified\n"),
                                         av[0]);
                                 exit(1);
                         }
@@ -525,13 +532,13 @@ int main(int ac, char **av)
                         break;
                 case 'h':
                 case '?':
-                        printf("%s [-o|-s] config\n", av[0]);
+                        fprintf(stderr, "See README for usage info\n");
                         exit(0);
                 }
         }
-        name = av[i];
+        name = av[i];
         if (!name) {
-                printf("%s: configuration file missing\n", av[0]);
+                printf(_("%s: Kconfig file missing\n"), av[0]);
         }
         conf_parse(name);
         //zconfdump(stdout);
@@ -548,18 +555,39 @@ int main(int ac, char **av)
                 break;
         case ask_silent:
                 if (stat(".config", &tmpstat)) {
-                        printf("***\n"
-                                "*** You have not yet configured BusyBox!\n"
+                        printf(_("***\n"
+                                "*** You have not yet configured your kernel!\n"
                                 "***\n"
                                 "*** Please run some configurator (e.g. \"make oldconfig\" or\n"
-                                "*** \"make menuconfig\" or \"make config\").\n"
-                                "***\n");
+                                "*** \"make menuconfig\" or \"make xconfig\").\n"
+                                "***\n"));
                         exit(1);
                 }
         case ask_all:
         case ask_new:
                 conf_read(NULL);
                 break;
+        case set_no:
+        case set_mod:
+        case set_yes:
+        case set_random:
+                name = getenv("KCONFIG_ALLCONFIG");
+                if (name && !stat(name, &tmpstat)) {
+                        conf_read_simple(name);
+                        break;
+                }
+                switch (input_mode) {
+                case set_no:     name = "allno.config"; break;
+                case set_mod:    name = "allmod.config"; break;
+                case set_yes:    name = "allyes.config"; break;
+                case set_random: name = "allrandom.config"; break;
+                default: break;
+                }
+                if (!stat(name, &tmpstat))
+                        conf_read_simple(name);
+                else if (!stat("all.config", &tmpstat))
+                        conf_read_simple("all.config");
+                break;
         default:
                 break;
         }
@@ -577,7 +605,7 @@ int main(int ac, char **av)
                 check_conf(&rootmenu);
         } while (conf_cnt);
         if (conf_write(NULL)) {
-                fprintf(stderr, "\n*** Error during writing of the BusyBox configuration.\n\n");
+                fprintf(stderr, _("\n*** Error during writing of the kernel configuration.\n\n"));
                 return 1;
         }
         return 0;
diff --git a/scripts/config/confdata.c b/scripts/kconfig/confdata.c
index db3fdcd56..301774f0c 100644
--- a/scripts/config/confdata.c
+++ b/scripts/kconfig/confdata.c
@@ -1,4 +1,3 @@
-/* vi: set sw=4 ts=4: */
 /*
  * Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org>
  * Released under the terms of the GNU GPL v2.0.
@@ -9,21 +8,42 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <time.h>
 #include <unistd.h>
 
 #define LKC_DIRECT_LINK
 #include "lkc.h"
 
+static void conf_warning(const char *fmt, ...)
+        __attribute__ ((format (printf, 1, 2)));
+
+static const char *conf_filename;
+static int conf_lineno, conf_warnings, conf_unsaved;
+
 const char conf_def_filename[] = ".config";
 
-const char conf_defname[] = "defconfig";
+const char conf_defname[] = "arch/$ARCH/defconfig";
 
 const char *conf_confnames[] = {
         ".config",
+        "/lib/modules/$UNAME_RELEASE/.config",
+        "/etc/kernel-config",
+        "/boot/config-$UNAME_RELEASE",
         conf_defname,
         NULL,
 };
 
+static void conf_warning(const char *fmt, ...)
+{
+        va_list ap;
+        va_start(ap, fmt);
+        fprintf(stderr, "%s:%d:warning: ", conf_filename, conf_lineno);
+        vfprintf(stderr, fmt, ap);
+        fprintf(stderr, "\n");
+        va_end(ap);
+        conf_warnings++;
+}
+
 static char *conf_expand_value(const char *in)
 {
         struct symbol *sym;
@@ -66,15 +86,12 @@ char *conf_get_default_confname(void)
         return name;
 }
 
-int conf_read(const char *name)
+int conf_read_simple(const char *name)
 {
         FILE *in = NULL;
         char line[1024];
         char *p, *p2;
-        int lineno = 0;
         struct symbol *sym;
-        struct property *prop;
-        struct expr *e;
         int i;
 
         if (name) {
@@ -85,25 +102,32 @@ int conf_read(const char *name)
                         name = conf_expand_value(name);
                         in = zconf_fopen(name);
                         if (in) {
-                                printf("#\n"
-                                       "# using defaults found in %s\n"
-                                       "#\n", name);
+                                printf(_("#\n"
+                                         "# using defaults found in %s\n"
+                                         "#\n"), name);
                                 break;
                         }
                 }
         }
-
         if (!in)
                 return 1;
 
+        conf_filename = name;
+        conf_lineno = 0;
+        conf_warnings = 0;
+        conf_unsaved = 0;
+
         for_all_symbols(i, sym) {
                 sym->flags |= SYMBOL_NEW | SYMBOL_CHANGED;
+                if (sym_is_choice(sym))
+                        sym->flags &= ~SYMBOL_NEW;
                 sym->flags &= ~SYMBOL_VALID;
                 switch (sym->type) {
                 case S_INT:
                 case S_HEX:
                 case S_STRING:
-                        free(sym->user.val);
+                        if (sym->user.val)
+                                free(sym->user.val);
                 default:
                         sym->user.val = NULL;
                         sym->user.tri = no;
@@ -111,21 +135,24 @@ int conf_read(const char *name)
         }
 
         while (fgets(line, sizeof(line), in)) {
-                lineno++;
+                conf_lineno++;
                 sym = NULL;
                 switch (line[0]) {
                 case '#':
-                        if (line[1]!=' ')
+                        if (memcmp(line + 2, "CONFIG_", 7))
                                 continue;
-                        p = strchr(line + 2, ' ');
+                        p = strchr(line + 9, ' ');
                         if (!p)
                                 continue;
                         *p++ = 0;
                         if (strncmp(p, "is not set", 10))
                                 continue;
-                        sym = sym_find(line + 2);
+                        sym = sym_find(line + 9);
                         if (!sym) {
-                                fprintf(stderr, "%s:%d: trying to assign nonexistent symbol %s\n", name, lineno, line + 2);
+                                conf_warning("trying to assign nonexistent symbol %s", line + 9);
+                                break;
+                        } else if (!(sym->flags & SYMBOL_NEW)) {
+                                conf_warning("trying to reassign symbol %s", sym->name);
                                 break;
                         }
                         switch (sym->type) {
@@ -138,18 +165,24 @@ int conf_read(const char *name)
                                 ;
                         }
                         break;
-
-                case 'A' ... 'Z':
-                        p = strchr(line, '=');
+                case 'C':
+                        if (memcmp(line, "CONFIG_", 7)) {
+                                conf_warning("unexpected data");
+                                continue;
+                        }
+                        p = strchr(line + 7, '=');
                         if (!p)
                                 continue;
                         *p++ = 0;
                         p2 = strchr(p, '\n');
                         if (p2)
                                 *p2 = 0;
-                        sym = sym_find(line);
+                        sym = sym_find(line + 7);
                         if (!sym) {
-                                fprintf(stderr, "%s:%d: trying to assign nonexistent symbol %s\n", name, lineno, line);
+                                conf_warning("trying to assign nonexistent symbol %s", line + 7);
+                                break;
+                        } else if (!(sym->flags & SYMBOL_NEW)) {
+                                conf_warning("trying to reassign symbol %s", sym->name);
                                 break;
                         }
                         switch (sym->type) {
@@ -170,6 +203,7 @@ int conf_read(const char *name)
                                         sym->flags &= ~SYMBOL_NEW;
                                         break;
                                 }
+                                conf_warning("symbol value '%s' invalid for %s", p, sym->name);
                                 break;
                         case S_STRING:
                                 if (*p++ != '"')
@@ -182,8 +216,8 @@ int conf_read(const char *name)
                                         memmove(p2, p2 + 1, strlen(p2));
                                 }
                                 if (!p2) {
-                                        fprintf(stderr, "%s:%d: invalid string found\n", name, lineno);
-                                        exit(1);
+                                        conf_warning("invalid string found");
+                                        continue;
                                 }
                         case S_INT:
                         case S_HEX:
@@ -191,8 +225,8 @@ int conf_read(const char *name)
                                         sym->user.val = strdup(p);
                                         sym->flags &= ~SYMBOL_NEW;
                                 } else {
-                                        fprintf(stderr, "%s:%d: symbol value '%s' invalid for %s\n", name, lineno, p, sym->name);
-                                        exit(1);
+                                        conf_warning("symbol value '%s' invalid for %s", p, sym->name);
+                                        continue;
                                 }
                                 break;
                         default:
@@ -202,6 +236,7 @@ int conf_read(const char *name)
                 case '\n':
                         break;
                 default:
+                        conf_warning("unexpected data");
                         continue;
                 }
                 if (sym && sym_is_choice_value(sym)) {
@@ -210,25 +245,63 @@ int conf_read(const char *name)
                         case no:
                                 break;
                         case mod:
-                                if (cs->user.tri == yes)
-                                        /* warn? */;
+                                if (cs->user.tri == yes) {
+                                        conf_warning("%s creates inconsistent choice state", sym->name);
+                                        cs->flags |= SYMBOL_NEW;
+                                }
                                 break;
                         case yes:
-                                if (cs->user.tri != no)
-                                        /* warn? */;
-                                cs->user.val = sym;
+                                if (cs->user.tri != no) {
+                                        conf_warning("%s creates inconsistent choice state", sym->name);
+                                        cs->flags |= SYMBOL_NEW;
+                                } else
+                                        cs->user.val = sym;
                                 break;
                         }
                         cs->user.tri = E_OR(cs->user.tri, sym->user.tri);
-                        cs->flags &= ~SYMBOL_NEW;
                 }
         }
         fclose(in);
 
         if (modules_sym)
                 sym_calc_value(modules_sym);
+        return 0;
+}
+
+int conf_read(const char *name)
+{
+        struct symbol *sym;
+        struct property *prop;
+        struct expr *e;
+        int i;
+
+        if (conf_read_simple(name))
+                return 1;
+
         for_all_symbols(i, sym) {
                 sym_calc_value(sym);
+                if (sym_is_choice(sym) || (sym->flags & SYMBOL_AUTO))
+                        goto sym_ok;
+                if (sym_has_value(sym) && (sym->flags & SYMBOL_WRITE)) {
+                        /* check that calculated value agrees with saved value */
+                        switch (sym->type) {
+                        case S_BOOLEAN:
+                        case S_TRISTATE:
+                                if (sym->user.tri != sym_get_tristate_value(sym))
+                                        break;
+                                if (!sym_is_choice(sym))
+                                        goto sym_ok;
+                        default:
+                                if (!strcmp(sym->curr.val, sym->user.val))
+                                        goto sym_ok;
+                                break;
+                        }
+                } else if (!sym_has_value(sym) && !(sym->flags & SYMBOL_WRITE))
+                        /* no previous value and not saved */
+                        goto sym_ok;
+                conf_unsaved++;
+                /* maybe print value in verbose mode... */
+        sym_ok:
                 if (sym_has_value(sym) && !sym_is_choice_value(sym)) {
                         if (sym->visible == no)
                                 sym->flags |= SYMBOL_NEW;
@@ -236,8 +309,10 @@ int conf_read(const char *name)
                         case S_STRING:
                         case S_INT:
                         case S_HEX:
-                                if (!sym_string_within_range(sym, sym->user.val))
+                                if (!sym_string_within_range(sym, sym->user.val)) {
                                         sym->flags |= SYMBOL_NEW;
+                                        sym->flags &= ~SYMBOL_VALID;
+                                }
                         default:
                                 break;
                         }
@@ -250,26 +325,11 @@ int conf_read(const char *name)
                                 sym->flags |= e->right.sym->flags & SYMBOL_NEW;
         }
 
-        sym_change_count = 1;
+        sym_change_count = conf_warnings || conf_unsaved;
 
         return 0;
 }
 
-struct menu *next_menu(struct menu *menu)
-{
-        if (menu->list) return menu->list;
-        do {
-                if (menu->next) {
-                        menu = menu->next;
-                        break;
-                }
-        } while ((menu = menu->parent));
-
-        return menu;
-}
-
-#define SYMBOL_FORCEWRITE (1<<31)
-
 int conf_write(const char *name)
 {
         FILE *out, *out_h;
@@ -279,10 +339,9 @@ int conf_write(const char *name)
         char dirname[128], tmpname[128], newname[128];
         int type, l;
         const char *str;
-
-        /* busybox`s code */
-        const char *opt_name;
-        int use_flg;
+        time_t now;
+        int use_timestamp = 1;
+        char *env;
 
         dirname[0] = 0;
         if (name && name[0]) {
@@ -315,38 +374,42 @@ int conf_write(const char *name)
                 out_h = fopen(".tmpconfig.h", "w");
                 if (!out_h)
                         return 1;
+                file_write_dep(NULL);
         }
-        fprintf(out, "#\n"
-                     "# Automatically generated make config: don't edit\n"
-                     "#\n");
-
-        /* busybox`s code */
+        sym = sym_lookup("KERNELVERSION", 0);
+        sym_calc_value(sym);
+        time(&now);
+        env = getenv("KCONFIG_NOTIMESTAMP");
+        if (env && *env)
+                use_timestamp = 0;
+
+        fprintf(out, _("#\n"
+                       "# Automatically generated make config: don't edit\n"
+                       "# Linux kernel version: %s\n"
+                       "%s%s"
+                       "#\n"),
+                     sym_get_string_value(sym),
+                     use_timestamp ? "# " : "",
+                     use_timestamp ? ctime(&now) : "");
         if (out_h) {
-                fprintf(out_h, "#ifndef BB_CONFIG_H\n#define BB_CONFIG_H\n");
+                char buf[sizeof("#define AUTOCONF_TIMESTAMP "
+                                "\"YYYY-MM-DD HH:MM:SS some_timezone\"\n")];
+                buf[0] = '\0';
+                if (use_timestamp)
+                        strftime(buf, sizeof(buf), "#define AUTOCONF_TIMESTAMP "
+                                "\"%Y-%m-%d %H:%M:%S %Z\"\n", localtime(&now));
                 fprintf(out_h, "/*\n"
-                             " * Automatically generated header file: don't edit\n"
-                             " */\n\n"
-                             "/* Version Number */\n"
-                             "#define BB_VER \"%s\"\n"
-                             "#define BB_BT \"%s\"\n",
-                             getenv("VERSION"),
-                             getenv("BUILDTIME"));
-                if (getenv("EXTRA_VERSION"))
-                        fprintf(out_h, "#define BB_EXTRA_VERSION \"%s\"\n",
-                                     getenv("EXTRA_VERSION"));
-                fprintf(out_h, "\n");
+                               " * Automatically generated C config: don't edit\n"
+                               " * Linux kernel version: %s\n"
+                               " */\n"
+                               "%s"
+                               "#define AUTOCONF_INCLUDED\n",
+                               sym_get_string_value(sym),
+                               buf);
         }
-        /* end busybox`s code */
-
         if (!sym_change_count)
                 sym_clear_all_valid();
 
-        /* Force write of all non-duplicate symbols. */
-
-        /* Write out everything by default. */
-        for(menu = rootmenu.list; menu; menu = next_menu(menu))
-                if (menu->sym) menu->sym->flags |= SYMBOL_FORCEWRITE;
-
         menu = rootmenu.list;
         while (menu) {
                 sym = menu->sym;
@@ -365,56 +428,52 @@ int conf_write(const char *name)
                                                " */\n", str);
                 } else if (!(sym->flags & SYMBOL_CHOICE)) {
                         sym_calc_value(sym);
-                        if (!(sym->flags & SYMBOL_FORCEWRITE))
+                        if (!(sym->flags & SYMBOL_WRITE))
                                 goto next;
-
-                        sym->flags &= ~SYMBOL_FORCEWRITE;
+                        sym->flags &= ~SYMBOL_WRITE;
                         type = sym->type;
                         if (type == S_TRISTATE) {
                                 sym_calc_value(modules_sym);
                                 if (modules_sym->curr.tri == no)
                                         type = S_BOOLEAN;
                         }
-
-                        /* busybox`s code */
-                        opt_name = strchr(sym->name, '_');
-                        if(opt_name == NULL)
-                                opt_name = sym->name;
-                        else
-                                opt_name++;
-                        use_flg = 1;
-                        /* end busybox`s code */
-
                         switch (type) {
                         case S_BOOLEAN:
                         case S_TRISTATE:
                                 switch (sym_get_tristate_value(sym)) {
                                 case no:
-                                        fprintf(out, "# %s is not set\n", sym->name);
-                                        if (out_h)
-                                                fprintf(out_h, "#undef %s\n", sym->name);
-                                        use_flg = 0;    /* busybox`s code */
+                                        fprintf(out, "# CONFIG_%s is not set\n", sym->name);
+                                        if (out_h) {
+                                                fprintf(out_h, "#undef CONFIG_%s\n", sym->name);
+                                                /* bbox */
+                                                fprintf(out_h, "#define ENABLE_%s 0\n", sym->name);
+                                                fprintf(out_h, "#define USE_%s(...)\n", sym->name);
+                                                fprintf(out_h, "#define SKIP_%s(...) __VA_ARGS__\n", sym->name);
+                                        }
                                         break;
                                 case mod:
-#if 0   /* busybox`s code */
-                                        fprintf(out, "%s=m\n", sym->name);
+                                        fprintf(out, "CONFIG_%s=m\n", sym->name);
                                         if (out_h)
-                                                fprintf(out_h, "#define %s_MODULE 1\n", sym->name);
-#endif  /* busybox`s code */
+                                                fprintf(out_h, "#define CONFIG_%s_MODULE 1\n", sym->name);
                                         break;
                                 case yes:
-                                        fprintf(out, "%s=y\n", sym->name);
-                                        if (out_h)
-                                                fprintf(out_h, "#define %s 1\n", sym->name);
+                                        fprintf(out, "CONFIG_%s=y\n", sym->name);
+                                        if (out_h) {
+                                                fprintf(out_h, "#define CONFIG_%s 1\n", sym->name);
+                                                /* bbox */
+                                                fprintf(out_h, "#define ENABLE_%s 1\n", sym->name);
+                                                fprintf(out_h, "#define USE_%s(...) __VA_ARGS__\n", sym->name);
+                                                fprintf(out_h, "#define SKIP_%s(...)\n", sym->name);
+                                        }
                                         break;
                                 }
                                 break;
                         case S_STRING:
                                 // fix me
                                 str = sym_get_string_value(sym);
-                                fprintf(out, "%s=\"", sym->name);
+                                fprintf(out, "CONFIG_%s=\"", sym->name);
                                 if (out_h)
-                                        fprintf(out_h, "#define %s \"", sym->name);
+                                        fprintf(out_h, "#define CONFIG_%s \"", sym->name);
                                 do {
                                         l = strcspn(str, "\"\\");
                                         if (l) {
@@ -431,43 +490,59 @@ int conf_write(const char *name)
                                         }
                                 } while (*str);
                                 fputs("\"\n", out);
-                                if (out_h)
+                                if (out_h) {
                                         fputs("\"\n", out_h);
+                                        /* bbox */
+                                        fprintf(out_h, "#define ENABLE_%s 1\n", sym->name);
+                                        fprintf(out_h, "#define USE_%s(...) __VA_ARGS__\n", sym->name);
+                                        fprintf(out_h, "#define SKIP_%s(...)\n", sym->name);
+                                }
                                 break;
                         case S_HEX:
                                 str = sym_get_string_value(sym);
                                 if (str[0] != '0' || (str[1] != 'x' && str[1] != 'X')) {
-                                        fprintf(out, "%s=%s\n", sym->name, *str ? str : "0");
-                                        if (out_h)
-                                                fprintf(out_h, "#define %s 0x%s\n", sym->name, str);
+                                        fprintf(out, "CONFIG_%s=%s\n", sym->name, str);
+                                        if (out_h) {
+                                                fprintf(out_h, "#define CONFIG_%s 0x%s\n", sym->name, str);
+                                                /* bbox */
+                                                fprintf(out_h, "#define ENABLE_%s 1\n", sym->name);
+                                                fprintf(out_h, "#define USE_%s(...) __VA_ARGS__\n", sym->name);
+                                                fprintf(out_h, "#define SKIP_%s(...)\n", sym->name);
+                                        }
                                         break;
                                 }
                         case S_INT:
                                 str = sym_get_string_value(sym);
-                                fprintf(out, "%s=%s\n", sym->name, *str ? str : "0");
-                                if (out_h)
-                                        fprintf(out_h, "#define %s %s\n", sym->name, str);
+                                fprintf(out, "CONFIG_%s=%s\n", sym->name, str);
+                                if (out_h) {
+                                        fprintf(out_h, "#define CONFIG_%s %s\n", sym->name, str);
+                                        /* bbox */
+                                        fprintf(out_h, "#define ENABLE_%s 1\n", sym->name);
+                                        fprintf(out_h, "#define USE_%s(...) __VA_ARGS__\n", sym->name);
+                                        fprintf(out_h, "#define SKIP_%s(...)\n", sym->name);
+                                }
                                 break;
                         }
-                        /* busybox`s code */
-                        if (out_h) {
-                                fprintf(out_h, "#define ENABLE_%s %d\n", opt_name, use_flg);
-                                fprintf(out_h, "#define USE_%s(...)%s\n", opt_name,
-                                        (use_flg ? "  __VA_ARGS__" : ""));
-                                fprintf(out_h, "#define SKIP_%s(...)%s\n\n", opt_name,
-                                        (use_flg ? "" : "  __VA_ARGS__"));
+                }
+
+        next:
+                if (menu->list) {
+                        menu = menu->list;
+                        continue;
+                }
+                if (menu->next)
+                        menu = menu->next;
+                else while ((menu = menu->parent)) {
+                        if (menu->next) {
+                                menu = menu->next;
+                                break;
                         }
-                        /* end busybox`s code */
                 }
-next:
-                menu = next_menu(menu);
         }
         fclose(out);
         if (out_h) {
-                fprintf(out_h, "#endif /* BB_CONFIG_H */\n");   /* busybox`s code */
                 fclose(out_h);
-                rename(".tmpconfig.h", "include/bb_config.h");  /* busybox`s config name */
-                file_write_dep(NULL);
+                rename(".tmpconfig.h", "include/autoconf.h");
         }
         if (!name || basename != conf_def_filename) {
                 if (!name)
diff --git a/scripts/config/expr.c b/scripts/kconfig/expr.c
index 125573e77..30e4f9d69 100644
--- a/scripts/config/expr.c
+++ b/scripts/kconfig/expr.c
@@ -1,4 +1,3 @@
-/* vi: set sw=4 ts=4: */
 /*
  * Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org>
  * Released under the terms of the GNU GPL v2.0.
@@ -825,7 +824,7 @@ bool expr_depends_symbol(struct expr *dep, struct symbol *sym)
         default:
                 ;
         }
-        return false;
+        return false;
 }
 
 struct expr *expr_extract_eq_and(struct expr **ep1, struct expr **ep2)
diff --git a/scripts/config/expr.h b/scripts/kconfig/expr.h
index de7332f64..1b36ef18c 100644
--- a/scripts/config/expr.h
+++ b/scripts/kconfig/expr.h
@@ -1,4 +1,3 @@
-/* vi: set sw=4 ts=4: */
 /*
  * Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org>
  * Released under the terms of the GNU GPL v2.0.
@@ -94,7 +93,6 @@ struct symbol {
 #define SYMBOL_NEW              0x0800
 #define SYMBOL_AUTO             0x1000
 #define SYMBOL_CHECKED          0x2000
-#define SYMBOL_CHECK_DONE       0x4000
 #define SYMBOL_WARNED           0x8000
 
 #define SYMBOL_MAXLENGTH        256
diff --git a/scripts/kconfig/gconf.c b/scripts/kconfig/gconf.c
new file mode 100644
index 000000000..665bd5300
--- /dev/null
+++ b/scripts/kconfig/gconf.c
@@ -0,0 +1,1645 @@
+/* Hey EMACS -*- linux-c -*- */
+/*
+ *
+ * Copyright (C) 2002-2003 Romain Lievin <roms@tilp.info>
+ * Released under the terms of the GNU GPL v2.0.
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
+#include "lkc.h"
+#include "images.c"
+
+#include <glade/glade.h>
+#include <gtk/gtk.h>
+#include <glib.h>
+#include <gdk/gdkkeysyms.h>
+
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+#include <time.h>
+#include <stdlib.h>
+
+//#define DEBUG
+
+enum {
+        SINGLE_VIEW, SPLIT_VIEW, FULL_VIEW
+};
+
+static gint view_mode = FULL_VIEW;
+static gboolean show_name = TRUE;
+static gboolean show_range = TRUE;
+static gboolean show_value = TRUE;
+static gboolean show_all = FALSE;
+static gboolean show_debug = FALSE;
+static gboolean resizeable = FALSE;
+
+static gboolean config_changed = FALSE;
+
+static char nohelp_text[] =
+    N_("Sorry, no help available for this option yet.\n");
+
+GtkWidget *main_wnd = NULL;
+GtkWidget *tree1_w = NULL;      // left  frame
+GtkWidget *tree2_w = NULL;      // right frame
+GtkWidget *text_w = NULL;
+GtkWidget *hpaned = NULL;
+GtkWidget *vpaned = NULL;
+GtkWidget *back_btn = NULL;
+
+GtkTextTag *tag1, *tag2;
+GdkColor color;
+
+GtkTreeStore *tree1, *tree2, *tree;
+GtkTreeModel *model1, *model2;
+static GtkTreeIter *parents[256];
+static gint indent;
+
+static struct menu *current; // current node for SINGLE view
+static struct menu *browsed; // browsed node for SPLIT view
+
+enum {
+        COL_OPTION, COL_NAME, COL_NO, COL_MOD, COL_YES, COL_VALUE,
+        COL_MENU, COL_COLOR, COL_EDIT, COL_PIXBUF,
+        COL_PIXVIS, COL_BTNVIS, COL_BTNACT, COL_BTNINC, COL_BTNRAD,
+        COL_NUMBER
+};
+
+static void display_list(void);
+static void display_tree(struct menu *menu);
+static void display_tree_part(void);
+static void update_tree(struct menu *src, GtkTreeIter * dst);
+static void set_node(GtkTreeIter * node, struct menu *menu, gchar ** row);
+static gchar **fill_row(struct menu *menu);
+
+
+/* Helping/Debugging Functions */
+
+
+const char *dbg_print_stype(int val)
+{
+        static char buf[256];
+
+        bzero(buf, 256);
+
+        if (val == S_UNKNOWN)
+                strcpy(buf, "unknown");
+        if (val == S_BOOLEAN)
+                strcpy(buf, "boolean");
+        if (val == S_TRISTATE)
+                strcpy(buf, "tristate");
+        if (val == S_INT)
+                strcpy(buf, "int");
+        if (val == S_HEX)
+                strcpy(buf, "hex");
+        if (val == S_STRING)
+                strcpy(buf, "string");
+        if (val == S_OTHER)
+                strcpy(buf, "other");
+
+#ifdef DEBUG
+        printf("%s", buf);
+#endif
+
+        return buf;
+}
+
+const char *dbg_print_flags(int val)
+{
+        static char buf[256];
+
+        bzero(buf, 256);
+
+        if (val & SYMBOL_YES)
+                strcat(buf, "yes/");
+        if (val & SYMBOL_MOD)
+                strcat(buf, "mod/");
+        if (val & SYMBOL_NO)
+                strcat(buf, "no/");
+        if (val & SYMBOL_CONST)
+                strcat(buf, "const/");
+        if (val & SYMBOL_CHECK)
+                strcat(buf, "check/");
+        if (val & SYMBOL_CHOICE)
+                strcat(buf, "choice/");
+        if (val & SYMBOL_CHOICEVAL)
+                strcat(buf, "choiceval/");
+        if (val & SYMBOL_PRINTED)
+                strcat(buf, "printed/");
+        if (val & SYMBOL_VALID)
+                strcat(buf, "valid/");
+        if (val & SYMBOL_OPTIONAL)
+                strcat(buf, "optional/");
+        if (val & SYMBOL_WRITE)
+                strcat(buf, "write/");
+        if (val & SYMBOL_CHANGED)
+                strcat(buf, "changed/");
+        if (val & SYMBOL_NEW)
+                strcat(buf, "new/");
+        if (val & SYMBOL_AUTO)
+                strcat(buf, "auto/");
+
+        buf[strlen(buf) - 1] = '\0';
+#ifdef DEBUG
+        printf("%s", buf);
+#endif
+
+        return buf;
+}
+
+const char *dbg_print_ptype(int val)
+{
+        static char buf[256];
+
+        bzero(buf, 256);
+
+        if (val == P_UNKNOWN)
+                strcpy(buf, "unknown");
+        if (val == P_PROMPT)
+                strcpy(buf, "prompt");
+        if (val == P_COMMENT)
+                strcpy(buf, "comment");
+        if (val == P_MENU)
+                strcpy(buf, "menu");
+        if (val == P_DEFAULT)
+                strcpy(buf, "default");
+        if (val == P_CHOICE)
+                strcpy(buf, "choice");
+
+#ifdef DEBUG
+        printf("%s", buf);
+#endif
+
+        return buf;
+}
+
+
+void replace_button_icon(GladeXML * xml, GdkDrawable * window,
+                         GtkStyle * style, gchar * btn_name, gchar ** xpm)
+{
+        GdkPixmap *pixmap;
+        GdkBitmap *mask;
+        GtkToolButton *button;
+        GtkWidget *image;
+
+        pixmap = gdk_pixmap_create_from_xpm_d(window, &mask,
+                                              &style->bg[GTK_STATE_NORMAL],
+                                              xpm);
+
+        button = GTK_TOOL_BUTTON(glade_xml_get_widget(xml, btn_name));
+        image = gtk_image_new_from_pixmap(pixmap, mask);
+        gtk_widget_show(image);
+        gtk_tool_button_set_icon_widget(button, image);
+}
+
+/* Main Window Initialization */
+void init_main_window(const gchar * glade_file)
+{
+        GladeXML *xml;
+        GtkWidget *widget;
+        GtkTextBuffer *txtbuf;
+        char title[256];
+        GtkStyle *style;
+
+        xml = glade_xml_new(glade_file, "window1", NULL);
+        if (!xml)
+                g_error(_("GUI loading failed !\n"));
+        glade_xml_signal_autoconnect(xml);
+
+        main_wnd = glade_xml_get_widget(xml, "window1");
+        hpaned = glade_xml_get_widget(xml, "hpaned1");
+        vpaned = glade_xml_get_widget(xml, "vpaned1");
+        tree1_w = glade_xml_get_widget(xml, "treeview1");
+        tree2_w = glade_xml_get_widget(xml, "treeview2");
+        text_w = glade_xml_get_widget(xml, "textview3");
+
+        back_btn = glade_xml_get_widget(xml, "button1");
+        gtk_widget_set_sensitive(back_btn, FALSE);
+
+        widget = glade_xml_get_widget(xml, "show_name1");
+        gtk_check_menu_item_set_active((GtkCheckMenuItem *) widget,
+                                       show_name);
+
+        widget = glade_xml_get_widget(xml, "show_range1");
+        gtk_check_menu_item_set_active((GtkCheckMenuItem *) widget,
+                                       show_range);
+
+        widget = glade_xml_get_widget(xml, "show_data1");
+        gtk_check_menu_item_set_active((GtkCheckMenuItem *) widget,
+                                       show_value);
+
+        style = gtk_widget_get_style(main_wnd);
+        widget = glade_xml_get_widget(xml, "toolbar1");
+
+#if 0   /* Use stock Gtk icons instead */
+        replace_button_icon(xml, main_wnd->window, style,
+                            "button1", (gchar **) xpm_back);
+        replace_button_icon(xml, main_wnd->window, style,
+                            "button2", (gchar **) xpm_load);
+        replace_button_icon(xml, main_wnd->window, style,
+                            "button3", (gchar **) xpm_save);
+#endif
+        replace_button_icon(xml, main_wnd->window, style,
+                            "button4", (gchar **) xpm_single_view);
+        replace_button_icon(xml, main_wnd->window, style,
+                            "button5", (gchar **) xpm_split_view);
+        replace_button_icon(xml, main_wnd->window, style,
+                            "button6", (gchar **) xpm_tree_view);
+
+#if 0
+        switch (view_mode) {
+        case SINGLE_VIEW:
+                widget = glade_xml_get_widget(xml, "button4");
+                g_signal_emit_by_name(widget, "clicked");
+                break;
+        case SPLIT_VIEW:
+                widget = glade_xml_get_widget(xml, "button5");
+                g_signal_emit_by_name(widget, "clicked");
+                break;
+        case FULL_VIEW:
+                widget = glade_xml_get_widget(xml, "button6");
+                g_signal_emit_by_name(widget, "clicked");
+                break;
+        }
+#endif
+        txtbuf = gtk_text_view_get_buffer(GTK_TEXT_VIEW(text_w));
+        tag1 = gtk_text_buffer_create_tag(txtbuf, "mytag1",
+                                          "foreground", "red",
+                                          "weight", PANGO_WEIGHT_BOLD,
+                                          NULL);
+        tag2 = gtk_text_buffer_create_tag(txtbuf, "mytag2",
+                                          /*"style", PANGO_STYLE_OBLIQUE, */
+                                          NULL);
+
+        sprintf(title, _("Linux Kernel v%s Configuration"),
+                getenv("KERNELVERSION"));
+        gtk_window_set_title(GTK_WINDOW(main_wnd), title);
+
+        gtk_widget_show(main_wnd);
+}
+
+void init_tree_model(void)
+{
+        gint i;
+
+        tree = tree2 = gtk_tree_store_new(COL_NUMBER,
+                                          G_TYPE_STRING, G_TYPE_STRING,
+                                          G_TYPE_STRING, G_TYPE_STRING,
+                                          G_TYPE_STRING, G_TYPE_STRING,
+                                          G_TYPE_POINTER, GDK_TYPE_COLOR,
+                                          G_TYPE_BOOLEAN, GDK_TYPE_PIXBUF,
+                                          G_TYPE_BOOLEAN, G_TYPE_BOOLEAN,
+                                          G_TYPE_BOOLEAN, G_TYPE_BOOLEAN,
+                                          G_TYPE_BOOLEAN);
+        model2 = GTK_TREE_MODEL(tree2);
+
+        for (parents[0] = NULL, i = 1; i < 256; i++)
+                parents[i] = (GtkTreeIter *) g_malloc(sizeof(GtkTreeIter));
+
+        tree1 = gtk_tree_store_new(COL_NUMBER,
+                                   G_TYPE_STRING, G_TYPE_STRING,
+                                   G_TYPE_STRING, G_TYPE_STRING,
+                                   G_TYPE_STRING, G_TYPE_STRING,
+                                   G_TYPE_POINTER, GDK_TYPE_COLOR,
+                                   G_TYPE_BOOLEAN, GDK_TYPE_PIXBUF,
+                                   G_TYPE_BOOLEAN, G_TYPE_BOOLEAN,
+                                   G_TYPE_BOOLEAN, G_TYPE_BOOLEAN,
+                                   G_TYPE_BOOLEAN);
+        model1 = GTK_TREE_MODEL(tree1);
+}
+
+void init_left_tree(void)
+{
+        GtkTreeView *view = GTK_TREE_VIEW(tree1_w);
+        GtkCellRenderer *renderer;
+        GtkTreeSelection *sel;
+        GtkTreeViewColumn *column;
+
+        gtk_tree_view_set_model(view, model1);
+        gtk_tree_view_set_headers_visible(view, TRUE);
+        gtk_tree_view_set_rules_hint(view, FALSE);
+
+        column = gtk_tree_view_column_new();
+        gtk_tree_view_append_column(view, column);
+        gtk_tree_view_column_set_title(column, _("Options"));
+
+        renderer = gtk_cell_renderer_toggle_new();
+        gtk_tree_view_column_pack_start(GTK_TREE_VIEW_COLUMN(column),
+                                        renderer, FALSE);
+        gtk_tree_view_column_set_attributes(GTK_TREE_VIEW_COLUMN(column),
+                                            renderer,
+                                            "active", COL_BTNACT,
+                                            "inconsistent", COL_BTNINC,
+                                            "visible", COL_BTNVIS,
+                                            "radio", COL_BTNRAD, NULL);
+        renderer = gtk_cell_renderer_text_new();
+        gtk_tree_view_column_pack_start(GTK_TREE_VIEW_COLUMN(column),
+                                        renderer, FALSE);
+        gtk_tree_view_column_set_attributes(GTK_TREE_VIEW_COLUMN(column),
+                                            renderer,
+                                            "text", COL_OPTION,
+                                            "foreground-gdk",
+                                            COL_COLOR, NULL);
+
+        sel = gtk_tree_view_get_selection(view);
+        gtk_tree_selection_set_mode(sel, GTK_SELECTION_SINGLE);
+        gtk_widget_realize(tree1_w);
+}
+
+static void renderer_edited(GtkCellRendererText * cell,
+                            const gchar * path_string,
+                            const gchar * new_text, gpointer user_data);
+static void renderer_toggled(GtkCellRendererToggle * cellrenderertoggle,
+                             gchar * arg1, gpointer user_data);
+
+void init_right_tree(void)
+{
+        GtkTreeView *view = GTK_TREE_VIEW(tree2_w);
+        GtkCellRenderer *renderer;
+        GtkTreeSelection *sel;
+        GtkTreeViewColumn *column;
+        gint i;
+
+        gtk_tree_view_set_model(view, model2);
+        gtk_tree_view_set_headers_visible(view, TRUE);
+        gtk_tree_view_set_rules_hint(view, FALSE);
+
+        column = gtk_tree_view_column_new();
+        gtk_tree_view_append_column(view, column);
+        gtk_tree_view_column_set_title(column, _("Options"));
+
+        renderer = gtk_cell_renderer_pixbuf_new();
+        gtk_tree_view_column_pack_start(GTK_TREE_VIEW_COLUMN(column),
+                                        renderer, FALSE);
+        gtk_tree_view_column_set_attributes(GTK_TREE_VIEW_COLUMN(column),
+                                            renderer,
+                                            "pixbuf", COL_PIXBUF,
+                                            "visible", COL_PIXVIS, NULL);
+        renderer = gtk_cell_renderer_toggle_new();
+        gtk_tree_view_column_pack_start(GTK_TREE_VIEW_COLUMN(column),
+                                        renderer, FALSE);
+        gtk_tree_view_column_set_attributes(GTK_TREE_VIEW_COLUMN(column),
+                                            renderer,
+                                            "active", COL_BTNACT,
+                                            "inconsistent", COL_BTNINC,
+                                            "visible", COL_BTNVIS,
+                                            "radio", COL_BTNRAD, NULL);
+        /*g_signal_connect(G_OBJECT(renderer), "toggled",
+           G_CALLBACK(renderer_toggled), NULL); */
+        renderer = gtk_cell_renderer_text_new();
+        gtk_tree_view_column_pack_start(GTK_TREE_VIEW_COLUMN(column),
+                                        renderer, FALSE);
+        gtk_tree_view_column_set_attributes(GTK_TREE_VIEW_COLUMN(column),
+                                            renderer,
+                                            "text", COL_OPTION,
+                                            "foreground-gdk",
+                                            COL_COLOR, NULL);
+
+        renderer = gtk_cell_renderer_text_new();
+        gtk_tree_view_insert_column_with_attributes(view, -1,
+                                                    _("Name"), renderer,
+                                                    "text", COL_NAME,
+                                                    "foreground-gdk",
+                                                    COL_COLOR, NULL);
+        renderer = gtk_cell_renderer_text_new();
+        gtk_tree_view_insert_column_with_attributes(view, -1,
+                                                    "N", renderer,
+                                                    "text", COL_NO,
+                                                    "foreground-gdk",
+                                                    COL_COLOR, NULL);
+        renderer = gtk_cell_renderer_text_new();
+        gtk_tree_view_insert_column_with_attributes(view, -1,
+                                                    "M", renderer,
+                                                    "text", COL_MOD,
+                                                    "foreground-gdk",
+                                                    COL_COLOR, NULL);
+        renderer = gtk_cell_renderer_text_new();
+        gtk_tree_view_insert_column_with_attributes(view, -1,
+                                                    "Y", renderer,
+                                                    "text", COL_YES,
+                                                    "foreground-gdk",
+                                                    COL_COLOR, NULL);
+        renderer = gtk_cell_renderer_text_new();
+        gtk_tree_view_insert_column_with_attributes(view, -1,
+                                                    _("Value"), renderer,
+                                                    "text", COL_VALUE,
+                                                    "editable",
+                                                    COL_EDIT,
+                                                    "foreground-gdk",
+                                                    COL_COLOR, NULL);
+        g_signal_connect(G_OBJECT(renderer), "edited",
+                         G_CALLBACK(renderer_edited), NULL);
+
+        column = gtk_tree_view_get_column(view, COL_NAME);
+        gtk_tree_view_column_set_visible(column, show_name);
+        column = gtk_tree_view_get_column(view, COL_NO);
+        gtk_tree_view_column_set_visible(column, show_range);
+        column = gtk_tree_view_get_column(view, COL_MOD);
+        gtk_tree_view_column_set_visible(column, show_range);
+        column = gtk_tree_view_get_column(view, COL_YES);
+        gtk_tree_view_column_set_visible(column, show_range);
+        column = gtk_tree_view_get_column(view, COL_VALUE);
+        gtk_tree_view_column_set_visible(column, show_value);
+
+        if (resizeable) {
+                for (i = 0; i < COL_VALUE; i++) {
+                        column = gtk_tree_view_get_column(view, i);
+                        gtk_tree_view_column_set_resizable(column, TRUE);
+                }
+        }
+
+        sel = gtk_tree_view_get_selection(view);
+        gtk_tree_selection_set_mode(sel, GTK_SELECTION_SINGLE);
+}
+
+
+/* Utility Functions */
+
+
+static void text_insert_help(struct menu *menu)
+{
+        GtkTextBuffer *buffer;
+        GtkTextIter start, end;
+        const char *prompt = menu_get_prompt(menu);
+        gchar *name;
+        const char *help = _(nohelp_text);
+
+        if (!menu->sym)
+                help = "";
+        else if (menu->sym->help)
+                help = _(menu->sym->help);
+
+        if (menu->sym && menu->sym->name)
+                name = g_strdup_printf(_(menu->sym->name));
+        else
+                name = g_strdup("");
+
+        buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(text_w));
+        gtk_text_buffer_get_bounds(buffer, &start, &end);
+        gtk_text_buffer_delete(buffer, &start, &end);
+        gtk_text_view_set_left_margin(GTK_TEXT_VIEW(text_w), 15);
+
+        gtk_text_buffer_get_end_iter(buffer, &end);
+        gtk_text_buffer_insert_with_tags(buffer, &end, prompt, -1, tag1,
+                                         NULL);
+        gtk_text_buffer_insert_at_cursor(buffer, " ", 1);
+        gtk_text_buffer_get_end_iter(buffer, &end);
+        gtk_text_buffer_insert_with_tags(buffer, &end, name, -1, tag1,
+                                         NULL);
+        gtk_text_buffer_insert_at_cursor(buffer, "\n\n", 2);
+        gtk_text_buffer_get_end_iter(buffer, &end);
+        gtk_text_buffer_insert_with_tags(buffer, &end, help, -1, tag2,
+                                         NULL);
+}
+
+
+static void text_insert_msg(const char *title, const char *message)
+{
+        GtkTextBuffer *buffer;
+        GtkTextIter start, end;
+        const char *msg = message;
+
+        buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(text_w));
+        gtk_text_buffer_get_bounds(buffer, &start, &end);
+        gtk_text_buffer_delete(buffer, &start, &end);
+        gtk_text_view_set_left_margin(GTK_TEXT_VIEW(text_w), 15);
+
+        gtk_text_buffer_get_end_iter(buffer, &end);
+        gtk_text_buffer_insert_with_tags(buffer, &end, title, -1, tag1,
+                                         NULL);
+        gtk_text_buffer_insert_at_cursor(buffer, "\n\n", 2);
+        gtk_text_buffer_get_end_iter(buffer, &end);
+        gtk_text_buffer_insert_with_tags(buffer, &end, msg, -1, tag2,
+                                         NULL);
+}
+
+
+/* Main Windows Callbacks */
+
+void on_save1_activate(GtkMenuItem * menuitem, gpointer user_data);
+gboolean on_window1_delete_event(GtkWidget * widget, GdkEvent * event,
+                                 gpointer user_data)
+{
+        GtkWidget *dialog, *label;
+        gint result;
+
+        if (config_changed == FALSE)
+                return FALSE;
+
+        dialog = gtk_dialog_new_with_buttons(_("Warning !"),
+                                             GTK_WINDOW(main_wnd),
+                                             (GtkDialogFlags)
+                                             (GTK_DIALOG_MODAL |
+                                              GTK_DIALOG_DESTROY_WITH_PARENT),
+                                             GTK_STOCK_OK,
+                                             GTK_RESPONSE_YES,
+                                             GTK_STOCK_NO,
+                                             GTK_RESPONSE_NO,
+                                             GTK_STOCK_CANCEL,
+                                             GTK_RESPONSE_CANCEL, NULL);
+        gtk_dialog_set_default_response(GTK_DIALOG(dialog),
+                                        GTK_RESPONSE_CANCEL);
+
+        label = gtk_label_new(_("\nSave configuration ?\n"));
+        gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), label);
+        gtk_widget_show(label);
+
+        result = gtk_dialog_run(GTK_DIALOG(dialog));
+        switch (result) {
+        case GTK_RESPONSE_YES:
+                on_save1_activate(NULL, NULL);
+                return FALSE;
+        case GTK_RESPONSE_NO:
+                return FALSE;
+        case GTK_RESPONSE_CANCEL:
+        case GTK_RESPONSE_DELETE_EVENT:
+        default:
+                gtk_widget_destroy(dialog);
+                return TRUE;
+        }
+
+        return FALSE;
+}
+
+
+void on_window1_destroy(GtkObject * object, gpointer user_data)
+{
+        gtk_main_quit();
+}
+
+
+void
+on_window1_size_request(GtkWidget * widget,
+                        GtkRequisition * requisition, gpointer user_data)
+{
+        static gint old_h;
+        gint w, h;
+
+        if (widget->window == NULL)
+                gtk_window_get_default_size(GTK_WINDOW(main_wnd), &w, &h);
+        else
+                gdk_window_get_size(widget->window, &w, &h);
+
+        if (h == old_h)
+                return;
+        old_h = h;
+
+        gtk_paned_set_position(GTK_PANED(vpaned), 2 * h / 3);
+}
+
+
+/* Menu & Toolbar Callbacks */
+
+
+static void
+load_filename(GtkFileSelection * file_selector, gpointer user_data)
+{
+        const gchar *fn;
+
+        fn = gtk_file_selection_get_filename(GTK_FILE_SELECTION
+                                             (user_data));
+
+        if (conf_read(fn))
+                text_insert_msg(_("Error"), _("Unable to load configuration !"));
+        else
+                display_tree(&rootmenu);
+}
+
+void on_load1_activate(GtkMenuItem * menuitem, gpointer user_data)
+{
+        GtkWidget *fs;
+
+        fs = gtk_file_selection_new(_("Load file..."));
+        g_signal_connect(GTK_OBJECT(GTK_FILE_SELECTION(fs)->ok_button),
+                         "clicked",
+                         G_CALLBACK(load_filename), (gpointer) fs);
+        g_signal_connect_swapped(GTK_OBJECT
+                                 (GTK_FILE_SELECTION(fs)->ok_button),
+                                 "clicked", G_CALLBACK(gtk_widget_destroy),
+                                 (gpointer) fs);
+        g_signal_connect_swapped(GTK_OBJECT
+                                 (GTK_FILE_SELECTION(fs)->cancel_button),
+                                 "clicked", G_CALLBACK(gtk_widget_destroy),
+                                 (gpointer) fs);
+        gtk_widget_show(fs);
+}
+
+
+void on_save1_activate(GtkMenuItem * menuitem, gpointer user_data)
+{
+        if (conf_write(NULL))
+                text_insert_msg(_("Error"), _("Unable to save configuration !"));
+
+        config_changed = FALSE;
+}
+
+
+static void
+store_filename(GtkFileSelection * file_selector, gpointer user_data)
+{
+        const gchar *fn;
+
+        fn = gtk_file_selection_get_filename(GTK_FILE_SELECTION
+                                             (user_data));
+
+        if (conf_write(fn))
+                text_insert_msg(_("Error"), _("Unable to save configuration !"));
+
+        gtk_widget_destroy(GTK_WIDGET(user_data));
+}
+
+void on_save_as1_activate(GtkMenuItem * menuitem, gpointer user_data)
+{
+        GtkWidget *fs;
+
+        fs = gtk_file_selection_new(_("Save file as..."));
+        g_signal_connect(GTK_OBJECT(GTK_FILE_SELECTION(fs)->ok_button),
+                         "clicked",
+                         G_CALLBACK(store_filename), (gpointer) fs);
+        g_signal_connect_swapped(GTK_OBJECT
+                                 (GTK_FILE_SELECTION(fs)->ok_button),
+                                 "clicked", G_CALLBACK(gtk_widget_destroy),
+                                 (gpointer) fs);
+        g_signal_connect_swapped(GTK_OBJECT
+                                 (GTK_FILE_SELECTION(fs)->cancel_button),
+                                 "clicked", G_CALLBACK(gtk_widget_destroy),
+                                 (gpointer) fs);
+        gtk_widget_show(fs);
+}
+
+
+void on_quit1_activate(GtkMenuItem * menuitem, gpointer user_data)
+{
+        if (!on_window1_delete_event(NULL, NULL, NULL))
+                gtk_widget_destroy(GTK_WIDGET(main_wnd));
+}
+
+
+void on_show_name1_activate(GtkMenuItem * menuitem, gpointer user_data)
+{
+        GtkTreeViewColumn *col;
+
+        show_name = GTK_CHECK_MENU_ITEM(menuitem)->active;
+        col = gtk_tree_view_get_column(GTK_TREE_VIEW(tree2_w), COL_NAME);
+        if (col)
+                gtk_tree_view_column_set_visible(col, show_name);
+}
+
+
+void on_show_range1_activate(GtkMenuItem * menuitem, gpointer user_data)
+{
+        GtkTreeViewColumn *col;
+
+        show_range = GTK_CHECK_MENU_ITEM(menuitem)->active;
+        col = gtk_tree_view_get_column(GTK_TREE_VIEW(tree2_w), COL_NO);
+        if (col)
+                gtk_tree_view_column_set_visible(col, show_range);
+        col = gtk_tree_view_get_column(GTK_TREE_VIEW(tree2_w), COL_MOD);
+        if (col)
+                gtk_tree_view_column_set_visible(col, show_range);
+        col = gtk_tree_view_get_column(GTK_TREE_VIEW(tree2_w), COL_YES);
+        if (col)
+                gtk_tree_view_column_set_visible(col, show_range);
+
+}
+
+
+void on_show_data1_activate(GtkMenuItem * menuitem, gpointer user_data)
+{
+        GtkTreeViewColumn *col;
+
+        show_value = GTK_CHECK_MENU_ITEM(menuitem)->active;
+        col = gtk_tree_view_get_column(GTK_TREE_VIEW(tree2_w), COL_VALUE);
+        if (col)
+                gtk_tree_view_column_set_visible(col, show_value);
+}
+
+
+void
+on_show_all_options1_activate(GtkMenuItem * menuitem, gpointer user_data)
+{
+        show_all = GTK_CHECK_MENU_ITEM(menuitem)->active;
+
+        gtk_tree_store_clear(tree2);
+        display_tree(&rootmenu);        // instead of update_tree to speed-up
+}
+
+
+void
+on_show_debug_info1_activate(GtkMenuItem * menuitem, gpointer user_data)
+{
+        show_debug = GTK_CHECK_MENU_ITEM(menuitem)->active;
+        update_tree(&rootmenu, NULL);
+}
+
+
+void on_introduction1_activate(GtkMenuItem * menuitem, gpointer user_data)
+{
+        GtkWidget *dialog;
+        const gchar *intro_text = _(
+            "Welcome to gkc, the GTK+ graphical kernel configuration tool\n"
+            "for Linux.\n"
+            "For each option, a blank box indicates the feature is disabled, a\n"
+            "check indicates it is enabled, and a dot indicates that it is to\n"
+            "be compiled as a module.  Clicking on the box will cycle through the three states.\n"
+            "\n"
+            "If you do not see an option (e.g., a device driver) that you\n"
+            "believe should be present, try turning on Show All Options\n"
+            "under the Options menu.\n"
+            "Although there is no cross reference yet to help you figure out\n"
+            "what other options must be enabled to support the option you\n"
+            "are interested in, you can still view the help of a grayed-out\n"
+            "option.\n"
+            "\n"
+            "Toggling Show Debug Info under the Options menu will show \n"
+            "the dependencies, which you can then match by examining other options.");
+
+        dialog = gtk_message_dialog_new(GTK_WINDOW(main_wnd),
+                                        GTK_DIALOG_DESTROY_WITH_PARENT,
+                                        GTK_MESSAGE_INFO,
+                                        GTK_BUTTONS_CLOSE, intro_text);
+        g_signal_connect_swapped(GTK_OBJECT(dialog), "response",
+                                 G_CALLBACK(gtk_widget_destroy),
+                                 GTK_OBJECT(dialog));
+        gtk_widget_show_all(dialog);
+}
+
+
+void on_about1_activate(GtkMenuItem * menuitem, gpointer user_data)
+{
+        GtkWidget *dialog;
+        const gchar *about_text =
+            _("gkc is copyright (c) 2002 Romain Lievin <roms@lpg.ticalc.org>.\n"
+              "Based on the source code from Roman Zippel.\n");
+
+        dialog = gtk_message_dialog_new(GTK_WINDOW(main_wnd),
+                                        GTK_DIALOG_DESTROY_WITH_PARENT,
+                                        GTK_MESSAGE_INFO,
+                                        GTK_BUTTONS_CLOSE, about_text);
+        g_signal_connect_swapped(GTK_OBJECT(dialog), "response",
+                                 G_CALLBACK(gtk_widget_destroy),
+                                 GTK_OBJECT(dialog));
+        gtk_widget_show_all(dialog);
+}
+
+
+void on_license1_activate(GtkMenuItem * menuitem, gpointer user_data)
+{
+        GtkWidget *dialog;
+        const gchar *license_text =
+            _("gkc is released under the terms of the GNU GPL v2.\n"
+              "For more information, please see the source code or\n"
+              "visit http://www.fsf.org/licenses/licenses.html\n");
+
+        dialog = gtk_message_dialog_new(GTK_WINDOW(main_wnd),
+                                        GTK_DIALOG_DESTROY_WITH_PARENT,
+                                        GTK_MESSAGE_INFO,
+                                        GTK_BUTTONS_CLOSE, license_text);
+        g_signal_connect_swapped(GTK_OBJECT(dialog), "response",
+                                 G_CALLBACK(gtk_widget_destroy),
+                                 GTK_OBJECT(dialog));
+        gtk_widget_show_all(dialog);
+}
+
+
+void on_back_clicked(GtkButton * button, gpointer user_data)
+{
+        enum prop_type ptype;
+
+        current = current->parent;
+        ptype = current->prompt ? current->prompt->type : P_UNKNOWN;
+        if (ptype != P_MENU)
+                current = current->parent;
+        display_tree_part();
+
+        if (current == &rootmenu)
+                gtk_widget_set_sensitive(back_btn, FALSE);
+}
+
+
+void on_load_clicked(GtkButton * button, gpointer user_data)
+{
+        on_load1_activate(NULL, user_data);
+}
+
+
+void on_save_clicked(GtkButton * button, gpointer user_data)
+{
+        on_save1_activate(NULL, user_data);
+}
+
+
+void on_single_clicked(GtkButton * button, gpointer user_data)
+{
+        view_mode = SINGLE_VIEW;
+        gtk_paned_set_position(GTK_PANED(hpaned), 0);
+        gtk_widget_hide(tree1_w);
+        current = &rootmenu;
+        display_tree_part();
+}
+
+
+void on_split_clicked(GtkButton * button, gpointer user_data)
+{
+        gint w, h;
+        view_mode = SPLIT_VIEW;
+        gtk_widget_show(tree1_w);
+        gtk_window_get_default_size(GTK_WINDOW(main_wnd), &w, &h);
+        gtk_paned_set_position(GTK_PANED(hpaned), w / 2);
+        if (tree2)
+                gtk_tree_store_clear(tree2);
+        display_list();
+
+        /* Disable back btn, like in full mode. */
+        gtk_widget_set_sensitive(back_btn, FALSE);
+}
+
+
+void on_full_clicked(GtkButton * button, gpointer user_data)
+{
+        view_mode = FULL_VIEW;
+        gtk_paned_set_position(GTK_PANED(hpaned), 0);
+        gtk_widget_hide(tree1_w);
+        if (tree2)
+                gtk_tree_store_clear(tree2);
+        display_tree(&rootmenu);
+        gtk_widget_set_sensitive(back_btn, FALSE);
+}
+
+
+void on_collapse_clicked(GtkButton * button, gpointer user_data)
+{
+        gtk_tree_view_collapse_all(GTK_TREE_VIEW(tree2_w));
+}
+
+
+void on_expand_clicked(GtkButton * button, gpointer user_data)
+{
+        gtk_tree_view_expand_all(GTK_TREE_VIEW(tree2_w));
+}
+
+
+/* CTree Callbacks */
+
+/* Change hex/int/string value in the cell */
+static void renderer_edited(GtkCellRendererText * cell,
+                            const gchar * path_string,
+                            const gchar * new_text, gpointer user_data)
+{
+        GtkTreePath *path = gtk_tree_path_new_from_string(path_string);
+        GtkTreeIter iter;
+        const char *old_def, *new_def;
+        struct menu *menu;
+        struct symbol *sym;
+
+        if (!gtk_tree_model_get_iter(model2, &iter, path))
+                return;
+
+        gtk_tree_model_get(model2, &iter, COL_MENU, &menu, -1);
+        sym = menu->sym;
+
+        gtk_tree_model_get(model2, &iter, COL_VALUE, &old_def, -1);
+        new_def = new_text;
+
+        sym_set_string_value(sym, new_def);
+
+        config_changed = TRUE;
+        update_tree(&rootmenu, NULL);
+
+        gtk_tree_path_free(path);
+}
+
+/* Change the value of a symbol and update the tree */
+static void change_sym_value(struct menu *menu, gint col)
+{
+        struct symbol *sym = menu->sym;
+        tristate oldval, newval;
+
+        if (!sym)
+                return;
+
+        if (col == COL_NO)
+                newval = no;
+        else if (col == COL_MOD)
+                newval = mod;
+        else if (col == COL_YES)
+                newval = yes;
+        else
+                return;
+
+        switch (sym_get_type(sym)) {
+        case S_BOOLEAN:
+        case S_TRISTATE:
+                oldval = sym_get_tristate_value(sym);
+                if (!sym_tristate_within_range(sym, newval))
+                        newval = yes;
+                sym_set_tristate_value(sym, newval);
+                config_changed = TRUE;
+                if (view_mode == FULL_VIEW)
+                        update_tree(&rootmenu, NULL);
+                else if (view_mode == SPLIT_VIEW) {
+                        update_tree(browsed, NULL);
+                        display_list();
+                }
+                else if (view_mode == SINGLE_VIEW)
+                        display_tree_part();    //fixme: keep exp/coll
+                break;
+        case S_INT:
+        case S_HEX:
+        case S_STRING:
+        default:
+                break;
+        }
+}
+
+static void toggle_sym_value(struct menu *menu)
+{
+        if (!menu->sym)
+                return;
+
+        sym_toggle_tristate_value(menu->sym);
+        if (view_mode == FULL_VIEW)
+                update_tree(&rootmenu, NULL);
+        else if (view_mode == SPLIT_VIEW) {
+                update_tree(browsed, NULL);
+                display_list();
+        }
+        else if (view_mode == SINGLE_VIEW)
+                display_tree_part();    //fixme: keep exp/coll
+}
+
+static void renderer_toggled(GtkCellRendererToggle * cell,
+                             gchar * path_string, gpointer user_data)
+{
+        GtkTreePath *path, *sel_path = NULL;
+        GtkTreeIter iter, sel_iter;
+        GtkTreeSelection *sel;
+        struct menu *menu;
+
+        path = gtk_tree_path_new_from_string(path_string);
+        if (!gtk_tree_model_get_iter(model2, &iter, path))
+                return;
+
+        sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(tree2_w));
+        if (gtk_tree_selection_get_selected(sel, NULL, &sel_iter))
+                sel_path = gtk_tree_model_get_path(model2, &sel_iter);
+        if (!sel_path)
+                goto out1;
+        if (gtk_tree_path_compare(path, sel_path))
+                goto out2;
+
+        gtk_tree_model_get(model2, &iter, COL_MENU, &menu, -1);
+        toggle_sym_value(menu);
+
+      out2:
+        gtk_tree_path_free(sel_path);
+      out1:
+        gtk_tree_path_free(path);
+}
+
+static gint column2index(GtkTreeViewColumn * column)
+{
+        gint i;
+
+        for (i = 0; i < COL_NUMBER; i++) {
+                GtkTreeViewColumn *col;
+
+                col = gtk_tree_view_get_column(GTK_TREE_VIEW(tree2_w), i);
+                if (col == column)
+                        return i;
+        }
+
+        return -1;
+}
+
+
+/* User click: update choice (full) or goes down (single) */
+gboolean
+on_treeview2_button_press_event(GtkWidget * widget,
+                                GdkEventButton * event, gpointer user_data)
+{
+        GtkTreeView *view = GTK_TREE_VIEW(widget);
+        GtkTreePath *path;
+        GtkTreeViewColumn *column;
+        GtkTreeIter iter;
+        struct menu *menu;
+        gint col;
+
+#if GTK_CHECK_VERSION(2,1,4) // bug in ctree with earlier version of GTK
+        gint tx = (gint) event->x;
+        gint ty = (gint) event->y;
+        gint cx, cy;
+
+        gtk_tree_view_get_path_at_pos(view, tx, ty, &path, &column, &cx,
+                                      &cy);
+#else
+        gtk_tree_view_get_cursor(view, &path, &column);
+#endif
+        if (path == NULL)
+                return FALSE;
+
+        if (!gtk_tree_model_get_iter(model2, &iter, path))
+                return FALSE;
+        gtk_tree_model_get(model2, &iter, COL_MENU, &menu, -1);
+
+        col = column2index(column);
+        if (event->type == GDK_2BUTTON_PRESS) {
+                enum prop_type ptype;
+                ptype = menu->prompt ? menu->prompt->type : P_UNKNOWN;
+
+                if (ptype == P_MENU && view_mode != FULL_VIEW && col == COL_OPTION) {
+                        // goes down into menu
+                        current = menu;
+                        display_tree_part();
+                        gtk_widget_set_sensitive(back_btn, TRUE);
+                } else if ((col == COL_OPTION)) {
+                        toggle_sym_value(menu);
+                        gtk_tree_view_expand_row(view, path, TRUE);
+                }
+        } else {
+                if (col == COL_VALUE) {
+                        toggle_sym_value(menu);
+                        gtk_tree_view_expand_row(view, path, TRUE);
+                } else if (col == COL_NO || col == COL_MOD
+                           || col == COL_YES) {
+                        change_sym_value(menu, col);
+                        gtk_tree_view_expand_row(view, path, TRUE);
+                }
+        }
+
+        return FALSE;
+}
+
+/* Key pressed: update choice */
+gboolean
+on_treeview2_key_press_event(GtkWidget * widget,
+                             GdkEventKey * event, gpointer user_data)
+{
+        GtkTreeView *view = GTK_TREE_VIEW(widget);
+        GtkTreePath *path;
+        GtkTreeViewColumn *column;
+        GtkTreeIter iter;
+        struct menu *menu;
+        gint col;
+
+        gtk_tree_view_get_cursor(view, &path, &column);
+        if (path == NULL)
+                return FALSE;
+
+        if (event->keyval == GDK_space) {
+                if (gtk_tree_view_row_expanded(view, path))
+                        gtk_tree_view_collapse_row(view, path);
+                else
+                        gtk_tree_view_expand_row(view, path, FALSE);
+                return TRUE;
+        }
+        if (event->keyval == GDK_KP_Enter) {
+        }
+        if (widget == tree1_w)
+                return FALSE;
+
+        gtk_tree_model_get_iter(model2, &iter, path);
+        gtk_tree_model_get(model2, &iter, COL_MENU, &menu, -1);
+
+        if (!strcasecmp(event->string, "n"))
+                col = COL_NO;
+        else if (!strcasecmp(event->string, "m"))
+                col = COL_MOD;
+        else if (!strcasecmp(event->string, "y"))
+                col = COL_YES;
+        else
+                col = -1;
+        change_sym_value(menu, col);
+
+        return FALSE;
+}
+
+
+/* Row selection changed: update help */
+void
+on_treeview2_cursor_changed(GtkTreeView * treeview, gpointer user_data)
+{
+        GtkTreeSelection *selection;
+        GtkTreeIter iter;
+        struct menu *menu;
+
+        selection = gtk_tree_view_get_selection(treeview);
+        if (gtk_tree_selection_get_selected(selection, &model2, &iter)) {
+                gtk_tree_model_get(model2, &iter, COL_MENU, &menu, -1);
+                text_insert_help(menu);
+        }
+}
+
+
+/* User click: display sub-tree in the right frame. */
+gboolean
+on_treeview1_button_press_event(GtkWidget * widget,
+                                GdkEventButton * event, gpointer user_data)
+{
+        GtkTreeView *view = GTK_TREE_VIEW(widget);
+        GtkTreePath *path;
+        GtkTreeViewColumn *column;
+        GtkTreeIter iter;
+        struct menu *menu;
+
+        gint tx = (gint) event->x;
+        gint ty = (gint) event->y;
+        gint cx, cy;
+
+        gtk_tree_view_get_path_at_pos(view, tx, ty, &path, &column, &cx,
+                                      &cy);
+        if (path == NULL)
+                return FALSE;
+
+        gtk_tree_model_get_iter(model1, &iter, path);
+        gtk_tree_model_get(model1, &iter, COL_MENU, &menu, -1);
+
+        if (event->type == GDK_2BUTTON_PRESS) {
+                toggle_sym_value(menu);
+                current = menu;
+                display_tree_part();
+        } else {
+                browsed = menu;
+                display_tree_part();
+        }
+
+        gtk_widget_realize(tree2_w);
+        gtk_tree_view_set_cursor(view, path, NULL, FALSE);
+        gtk_widget_grab_focus(tree2_w);
+
+        return FALSE;
+}
+
+
+/* Fill a row of strings */
+static gchar **fill_row(struct menu *menu)
+{
+        static gchar *row[COL_NUMBER];
+        struct symbol *sym = menu->sym;
+        const char *def;
+        int stype;
+        tristate val;
+        enum prop_type ptype;
+        int i;
+
+        for (i = COL_OPTION; i <= COL_COLOR; i++)
+                g_free(row[i]);
+        bzero(row, sizeof(row));
+
+        row[COL_OPTION] =
+            g_strdup_printf("%s %s", menu_get_prompt(menu),
+                            sym ? (sym->
+                                   flags & SYMBOL_NEW ? "(NEW)" : "") :
+                            "");
+
+        if (show_all && !menu_is_visible(menu))
+                row[COL_COLOR] = g_strdup("DarkGray");
+        else
+                row[COL_COLOR] = g_strdup("Black");
+
+        ptype = menu->prompt ? menu->prompt->type : P_UNKNOWN;
+        switch (ptype) {
+        case P_MENU:
+                row[COL_PIXBUF] = (gchar *) xpm_menu;
+                if (view_mode == SINGLE_VIEW)
+                        row[COL_PIXVIS] = GINT_TO_POINTER(TRUE);
+                row[COL_BTNVIS] = GINT_TO_POINTER(FALSE);
+                break;
+        case P_COMMENT:
+                row[COL_PIXBUF] = (gchar *) xpm_void;
+                row[COL_PIXVIS] = GINT_TO_POINTER(FALSE);
+                row[COL_BTNVIS] = GINT_TO_POINTER(FALSE);
+                break;
+        default:
+                row[COL_PIXBUF] = (gchar *) xpm_void;
+                row[COL_PIXVIS] = GINT_TO_POINTER(FALSE);
+                row[COL_BTNVIS] = GINT_TO_POINTER(TRUE);
+                break;
+        }
+
+        if (!sym)
+                return row;
+        row[COL_NAME] = g_strdup(sym->name);
+
+        sym_calc_value(sym);
+        sym->flags &= ~SYMBOL_CHANGED;
+
+        if (sym_is_choice(sym)) {       // parse childs for getting final value
+                struct menu *child;
+                struct symbol *def_sym = sym_get_choice_value(sym);
+                struct menu *def_menu = NULL;
+
+                row[COL_BTNVIS] = GINT_TO_POINTER(FALSE);
+
+                for (child = menu->list; child; child = child->next) {
+                        if (menu_is_visible(child)
+                            && child->sym == def_sym)
+                                def_menu = child;
+                }
+
+                if (def_menu)
+                        row[COL_VALUE] =
+                            g_strdup(menu_get_prompt(def_menu));
+        }
+        if (sym->flags & SYMBOL_CHOICEVAL)
+                row[COL_BTNRAD] = GINT_TO_POINTER(TRUE);
+
+        stype = sym_get_type(sym);
+        switch (stype) {
+        case S_BOOLEAN:
+                if (GPOINTER_TO_INT(row[COL_PIXVIS]) == FALSE)
+                        row[COL_BTNVIS] = GINT_TO_POINTER(TRUE);
+                if (sym_is_choice(sym))
+                        break;
+        case S_TRISTATE:
+                val = sym_get_tristate_value(sym);
+                switch (val) {
+                case no:
+                        row[COL_NO] = g_strdup("N");
+                        row[COL_VALUE] = g_strdup("N");
+                        row[COL_BTNACT] = GINT_TO_POINTER(FALSE);
+                        row[COL_BTNINC] = GINT_TO_POINTER(FALSE);
+                        break;
+                case mod:
+                        row[COL_MOD] = g_strdup("M");
+                        row[COL_VALUE] = g_strdup("M");
+                        row[COL_BTNINC] = GINT_TO_POINTER(TRUE);
+                        break;
+                case yes:
+                        row[COL_YES] = g_strdup("Y");
+                        row[COL_VALUE] = g_strdup("Y");
+                        row[COL_BTNACT] = GINT_TO_POINTER(TRUE);
+                        row[COL_BTNINC] = GINT_TO_POINTER(FALSE);
+                        break;
+                }
+
+                if (val != no && sym_tristate_within_range(sym, no))
+                        row[COL_NO] = g_strdup("_");
+                if (val != mod && sym_tristate_within_range(sym, mod))
+                        row[COL_MOD] = g_strdup("_");
+                if (val != yes && sym_tristate_within_range(sym, yes))
+                        row[COL_YES] = g_strdup("_");
+                break;
+        case S_INT:
+        case S_HEX:
+        case S_STRING:
+                def = sym_get_string_value(sym);
+                row[COL_VALUE] = g_strdup(def);
+                row[COL_EDIT] = GINT_TO_POINTER(TRUE);
+                row[COL_BTNVIS] = GINT_TO_POINTER(FALSE);
+                break;
+        }
+
+        return row;
+}
+
+
+/* Set the node content with a row of strings */
+static void set_node(GtkTreeIter * node, struct menu *menu, gchar ** row)
+{
+        GdkColor color;
+        gboolean success;
+        GdkPixbuf *pix;
+
+        pix = gdk_pixbuf_new_from_xpm_data((const char **)
+                                           row[COL_PIXBUF]);
+
+        gdk_color_parse(row[COL_COLOR], &color);
+        gdk_colormap_alloc_colors(gdk_colormap_get_system(), &color, 1,
+                                  FALSE, FALSE, &success);
+
+        gtk_tree_store_set(tree, node,
+                           COL_OPTION, row[COL_OPTION],
+                           COL_NAME, row[COL_NAME],
+                           COL_NO, row[COL_NO],
+                           COL_MOD, row[COL_MOD],
+                           COL_YES, row[COL_YES],
+                           COL_VALUE, row[COL_VALUE],
+                           COL_MENU, (gpointer) menu,
+                           COL_COLOR, &color,
+                           COL_EDIT, GPOINTER_TO_INT(row[COL_EDIT]),
+                           COL_PIXBUF, pix,
+                           COL_PIXVIS, GPOINTER_TO_INT(row[COL_PIXVIS]),
+                           COL_BTNVIS, GPOINTER_TO_INT(row[COL_BTNVIS]),
+                           COL_BTNACT, GPOINTER_TO_INT(row[COL_BTNACT]),
+                           COL_BTNINC, GPOINTER_TO_INT(row[COL_BTNINC]),
+                           COL_BTNRAD, GPOINTER_TO_INT(row[COL_BTNRAD]),
+                           -1);
+
+        g_object_unref(pix);
+}
+
+
+/* Add a node to the tree */
+static void place_node(struct menu *menu, char **row)
+{
+        GtkTreeIter *parent = parents[indent - 1];
+        GtkTreeIter *node = parents[indent];
+
+        gtk_tree_store_append(tree, node, parent);
+        set_node(node, menu, row);
+}
+
+
+/* Find a node in the GTK+ tree */
+static GtkTreeIter found;
+
+/*
+ * Find a menu in the GtkTree starting at parent.
+ */
+GtkTreeIter *gtktree_iter_find_node(GtkTreeIter * parent,
+                                    struct menu *tofind)
+{
+        GtkTreeIter iter;
+        GtkTreeIter *child = &iter;
+        gboolean valid;
+        GtkTreeIter *ret;
+
+        valid = gtk_tree_model_iter_children(model2, child, parent);
+        while (valid) {
+                struct menu *menu;
+
+                gtk_tree_model_get(model2, child, 6, &menu, -1);
+
+                if (menu == tofind) {
+                        memcpy(&found, child, sizeof(GtkTreeIter));
+                        return &found;
+                }
+
+                ret = gtktree_iter_find_node(child, tofind);
+                if (ret)
+                        return ret;
+
+                valid = gtk_tree_model_iter_next(model2, child);
+        }
+
+        return NULL;
+}
+
+
+/*
+ * Update the tree by adding/removing entries
+ * Does not change other nodes
+ */
+static void update_tree(struct menu *src, GtkTreeIter * dst)
+{
+        struct menu *child1;
+        GtkTreeIter iter, tmp;
+        GtkTreeIter *child2 = &iter;
+        gboolean valid;
+        GtkTreeIter *sibling;
+        struct symbol *sym;
+        struct property *prop;
+        struct menu *menu1, *menu2;
+
+        if (src == &rootmenu)
+                indent = 1;
+
+        valid = gtk_tree_model_iter_children(model2, child2, dst);
+        for (child1 = src->list; child1; child1 = child1->next) {
+
+                prop = child1->prompt;
+                sym = child1->sym;
+
+              reparse:
+                menu1 = child1;
+                if (valid)
+                        gtk_tree_model_get(model2, child2, COL_MENU,
+                                           &menu2, -1);
+                else
+                        menu2 = NULL;   // force adding of a first child
+
+#ifdef DEBUG
+                printf("%*c%s | %s\n", indent, ' ',
+                       menu1 ? menu_get_prompt(menu1) : "nil",
+                       menu2 ? menu_get_prompt(menu2) : "nil");
+#endif
+
+                if (!menu_is_visible(child1) && !show_all) {    // remove node
+                        if (gtktree_iter_find_node(dst, menu1) != NULL) {
+                                memcpy(&tmp, child2, sizeof(GtkTreeIter));
+                                valid = gtk_tree_model_iter_next(model2,
+                                                                 child2);
+                                gtk_tree_store_remove(tree2, &tmp);
+                                if (!valid)
+                                        return; // next parent
+                                else
+                                        goto reparse;   // next child
+                        } else
+                                continue;
+                }
+
+                if (menu1 != menu2) {
+                        if (gtktree_iter_find_node(dst, menu1) == NULL) {       // add node
+                                if (!valid && !menu2)
+                                        sibling = NULL;
+                                else
+                                        sibling = child2;
+                                gtk_tree_store_insert_before(tree2,
+                                                             child2,
+                                                             dst, sibling);
+                                set_node(child2, menu1, fill_row(menu1));
+                                if (menu2 == NULL)
+                                        valid = TRUE;
+                        } else {        // remove node
+                                memcpy(&tmp, child2, sizeof(GtkTreeIter));
+                                valid = gtk_tree_model_iter_next(model2,
+                                                                 child2);
+                                gtk_tree_store_remove(tree2, &tmp);
+                                if (!valid)
+                                        return; // next parent
+                                else
+                                        goto reparse;   // next child
+                        }
+                } else if (sym && (sym->flags & SYMBOL_CHANGED)) {
+                        set_node(child2, menu1, fill_row(menu1));
+                }
+
+                indent++;
+                update_tree(child1, child2);
+                indent--;
+
+                valid = gtk_tree_model_iter_next(model2, child2);
+        }
+}
+
+
+/* Display the whole tree (single/split/full view) */
+static void display_tree(struct menu *menu)
+{
+        struct symbol *sym;
+        struct property *prop;
+        struct menu *child;
+        enum prop_type ptype;
+
+        if (menu == &rootmenu) {
+                indent = 1;
+                current = &rootmenu;
+        }
+
+        for (child = menu->list; child; child = child->next) {
+                prop = child->prompt;
+                sym = child->sym;
+                ptype = prop ? prop->type : P_UNKNOWN;
+
+                if (sym)
+                        sym->flags &= ~SYMBOL_CHANGED;
+
+                if ((view_mode == SPLIT_VIEW)
+                    && !(child->flags & MENU_ROOT) && (tree == tree1))
+                        continue;
+
+                if ((view_mode == SPLIT_VIEW) && (child->flags & MENU_ROOT)
+                    && (tree == tree2))
+                        continue;
+
+                if (menu_is_visible(child) || show_all)
+                        place_node(child, fill_row(child));
+#ifdef DEBUG
+                printf("%*c%s: ", indent, ' ', menu_get_prompt(child));
+                printf("%s", child->flags & MENU_ROOT ? "rootmenu | " : "");
+                dbg_print_ptype(ptype);
+                printf(" | ");
+                if (sym) {
+                        dbg_print_stype(sym->type);
+                        printf(" | ");
+                        dbg_print_flags(sym->flags);
+                        printf("\n");
+                } else
+                        printf("\n");
+#endif
+                if ((view_mode != FULL_VIEW) && (ptype == P_MENU)
+                    && (tree == tree2))
+                        continue;
+/*
+                if (((menu != &rootmenu) && !(menu->flags & MENU_ROOT))
+                    || (view_mode == FULL_VIEW)
+                    || (view_mode == SPLIT_VIEW))*/
+                if (((view_mode == SINGLE_VIEW) && (menu->flags & MENU_ROOT))
+                    || (view_mode == FULL_VIEW)
+                    || (view_mode == SPLIT_VIEW)) {
+                        indent++;
+                        display_tree(child);
+                        indent--;
+                }
+        }
+}
+
+/* Display a part of the tree starting at current node (single/split view) */
+static void display_tree_part(void)
+{
+        if (tree2)
+                gtk_tree_store_clear(tree2);
+        if (view_mode == SINGLE_VIEW)
+                display_tree(current);
+        else if (view_mode == SPLIT_VIEW)
+                display_tree(browsed);
+        gtk_tree_view_expand_all(GTK_TREE_VIEW(tree2_w));
+}
+
+/* Display the list in the left frame (split view) */
+static void display_list(void)
+{
+        if (tree1)
+                gtk_tree_store_clear(tree1);
+
+        tree = tree1;
+        display_tree(&rootmenu);
+        gtk_tree_view_expand_all(GTK_TREE_VIEW(tree1_w));
+        tree = tree2;
+}
+
+void fixup_rootmenu(struct menu *menu)
+{
+        struct menu *child;
+        static int menu_cnt = 0;
+
+        menu->flags |= MENU_ROOT;
+        for (child = menu->list; child; child = child->next) {
+                if (child->prompt && child->prompt->type == P_MENU) {
+                        menu_cnt++;
+                        fixup_rootmenu(child);
+                        menu_cnt--;
+                } else if (!menu_cnt)
+                        fixup_rootmenu(child);
+        }
+}
+
+
+/* Main */
+int main(int ac, char *av[])
+{
+        const char *name;
+        char *env;
+        gchar *glade_file;
+
+#ifndef LKC_DIRECT_LINK
+        kconfig_load();
+#endif
+
+        bindtextdomain(PACKAGE, LOCALEDIR);
+        bind_textdomain_codeset(PACKAGE, "UTF-8");
+        textdomain(PACKAGE);
+
+        /* GTK stuffs */
+        gtk_set_locale();
+        gtk_init(&ac, &av);
+        glade_init();
+
+        //add_pixmap_directory (PACKAGE_DATA_DIR "/" PACKAGE "/pixmaps");
+        //add_pixmap_directory (PACKAGE_SOURCE_DIR "/pixmaps");
+
+        /* Determine GUI path */
+        env = getenv(SRCTREE);
+        if (env)
+                glade_file = g_strconcat(env, "/scripts/kconfig/gconf.glade", NULL);
+        else if (av[0][0] == '/')
+                glade_file = g_strconcat(av[0], ".glade", NULL);
+        else
+                glade_file = g_strconcat(g_get_current_dir(), "/", av[0], ".glade", NULL);
+
+        /* Load the interface and connect signals */
+        init_main_window(glade_file);
+        init_tree_model();
+        init_left_tree();
+        init_right_tree();
+
+        /* Conf stuffs */
+        if (ac > 1 && av[1][0] == '-') {
+                switch (av[1][1]) {
+                case 'a':
+                        //showAll = 1;
+                        break;
+                case 'h':
+                case '?':
+                        printf("%s <config>\n", av[0]);
+                        exit(0);
+                }
+                name = av[2];
+        } else
+                name = av[1];
+
+        conf_parse(name);
+        fixup_rootmenu(&rootmenu);
+        conf_read(NULL);
+
+        switch (view_mode) {
+        case SINGLE_VIEW:
+                display_tree_part();
+                break;
+        case SPLIT_VIEW:
+                display_list();
+                break;
+        case FULL_VIEW:
+                display_tree(&rootmenu);
+                break;
+        }
+
+        gtk_main();
+
+        return 0;
+}
diff --git a/scripts/kconfig/gconf.glade b/scripts/kconfig/gconf.glade
new file mode 100644
index 000000000..f8744ed64
--- /dev/null
+++ b/scripts/kconfig/gconf.glade
@@ -0,0 +1,648 @@
+<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
+<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
+
+<glade-interface>
+
+<widget class="GtkWindow" id="window1">
+  <property name="visible">True</property>
+  <property name="title" translatable="yes">Gtk Kernel Configurator</property>
+  <property name="type">GTK_WINDOW_TOPLEVEL</property>
+  <property name="window_position">GTK_WIN_POS_NONE</property>
+  <property name="modal">False</property>
+  <property name="default_width">640</property>
+  <property name="default_height">480</property>
+  <property name="resizable">True</property>
+  <property name="destroy_with_parent">False</property>
+  <property name="decorated">True</property>
+  <property name="skip_taskbar_hint">False</property>
+  <property name="skip_pager_hint">False</property>
+  <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
+  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+  <signal name="destroy" handler="on_window1_destroy" object="window1"/>
+  <signal name="size_request" handler="on_window1_size_request" object="vpaned1" last_modification_time="Fri, 11 Jan 2002 16:17:11 GMT"/>
+  <signal name="delete_event" handler="on_window1_delete_event" object="window1" last_modification_time="Sun, 09 Mar 2003 19:42:46 GMT"/>
+
+  <child>
+    <widget class="GtkVBox" id="vbox1">
+      <property name="visible">True</property>
+      <property name="homogeneous">False</property>
+      <property name="spacing">0</property>
+
+      <child>
+        <widget class="GtkMenuBar" id="menubar1">
+          <property name="visible">True</property>
+
+          <child>
+            <widget class="GtkMenuItem" id="file1">
+              <property name="visible">True</property>
+              <property name="label" translatable="yes">_File</property>
+              <property name="use_underline">True</property>
+
+              <child>
+                <widget class="GtkMenu" id="file1_menu">
+
+                  <child>
+                    <widget class="GtkImageMenuItem" id="load1">
+                      <property name="visible">True</property>
+                      <property name="tooltip" translatable="yes">Load a config file</property>
+                      <property name="label" translatable="yes">_Load</property>
+                      <property name="use_underline">True</property>
+                      <signal name="activate" handler="on_load1_activate"/>
+                      <accelerator key="L" modifiers="GDK_CONTROL_MASK" signal="activate"/>
+
+                      <child internal-child="image">
+                        <widget class="GtkImage" id="image39">
+                          <property name="visible">True</property>
+                          <property name="stock">gtk-open</property>
+                          <property name="icon_size">1</property>
+                          <property name="xalign">0.5</property>
+                          <property name="yalign">0.5</property>
+                          <property name="xpad">0</property>
+                          <property name="ypad">0</property>
+                        </widget>
+                      </child>
+                    </widget>
+                  </child>
+
+                  <child>
+                    <widget class="GtkImageMenuItem" id="save1">
+                      <property name="visible">True</property>
+                      <property name="tooltip" translatable="yes">Save the config in .config</property>
+                      <property name="label" translatable="yes">_Save</property>
+                      <property name="use_underline">True</property>
+                      <signal name="activate" handler="on_save1_activate"/>
+                      <accelerator key="S" modifiers="GDK_CONTROL_MASK" signal="activate"/>
+
+                      <child internal-child="image">
+                        <widget class="GtkImage" id="image40">
+                          <property name="visible">True</property>
+                          <property name="stock">gtk-save</property>
+                          <property name="icon_size">1</property>
+                          <property name="xalign">0.5</property>
+                          <property name="yalign">0.5</property>
+                          <property name="xpad">0</property>
+                          <property name="ypad">0</property>
+                        </widget>
+                      </child>
+                    </widget>
+                  </child>
+
+                  <child>
+                    <widget class="GtkImageMenuItem" id="save_as1">
+                      <property name="visible">True</property>
+                      <property name="tooltip" translatable="yes">Save the config in a file</property>
+                      <property name="label" translatable="yes">Save _as</property>
+                      <property name="use_underline">True</property>
+                      <signal name="activate" handler="on_save_as1_activate"/>
+
+                      <child internal-child="image">
+                        <widget class="GtkImage" id="image41">
+                          <property name="visible">True</property>
+                          <property name="stock">gtk-save-as</property>
+                          <property name="icon_size">1</property>
+                          <property name="xalign">0.5</property>
+                          <property name="yalign">0.5</property>
+                          <property name="xpad">0</property>
+                          <property name="ypad">0</property>
+                        </widget>
+                      </child>
+                    </widget>
+                  </child>
+
+                  <child>
+                    <widget class="GtkSeparatorMenuItem" id="separator1">
+                      <property name="visible">True</property>
+                    </widget>
+                  </child>
+
+                  <child>
+                    <widget class="GtkImageMenuItem" id="quit1">
+                      <property name="visible">True</property>
+                      <property name="label" translatable="yes">_Quit</property>
+                      <property name="use_underline">True</property>
+                      <signal name="activate" handler="on_quit1_activate"/>
+                      <accelerator key="Q" modifiers="GDK_CONTROL_MASK" signal="activate"/>
+
+                      <child internal-child="image">
+                        <widget class="GtkImage" id="image42">
+                          <property name="visible">True</property>
+                          <property name="stock">gtk-quit</property>
+                          <property name="icon_size">1</property>
+                          <property name="xalign">0.5</property>
+                          <property name="yalign">0.5</property>
+                          <property name="xpad">0</property>
+                          <property name="ypad">0</property>
+                        </widget>
+                      </child>
+                    </widget>
+                  </child>
+                </widget>
+              </child>
+            </widget>
+          </child>
+
+          <child>
+            <widget class="GtkMenuItem" id="options1">
+              <property name="visible">True</property>
+              <property name="label" translatable="yes">_Options</property>
+              <property name="use_underline">True</property>
+
+              <child>
+                <widget class="GtkMenu" id="options1_menu">
+
+                  <child>
+                    <widget class="GtkCheckMenuItem" id="show_name1">
+                      <property name="visible">True</property>
+                      <property name="tooltip" translatable="yes">Show name</property>
+                      <property name="label" translatable="yes">Show _name</property>
+                      <property name="use_underline">True</property>
+                      <property name="active">False</property>
+                      <signal name="activate" handler="on_show_name1_activate"/>
+                    </widget>
+                  </child>
+
+                  <child>
+                    <widget class="GtkCheckMenuItem" id="show_range1">
+                      <property name="visible">True</property>
+                      <property name="tooltip" translatable="yes">Show range (Y/M/N)</property>
+                      <property name="label" translatable="yes">Show _range</property>
+                      <property name="use_underline">True</property>
+                      <property name="active">False</property>
+                      <signal name="activate" handler="on_show_range1_activate"/>
+                    </widget>
+                  </child>
+
+                  <child>
+                    <widget class="GtkCheckMenuItem" id="show_data1">
+                      <property name="visible">True</property>
+                      <property name="tooltip" translatable="yes">Show value of the option</property>
+                      <property name="label" translatable="yes">Show _data</property>
+                      <property name="use_underline">True</property>
+                      <property name="active">False</property>
+                      <signal name="activate" handler="on_show_data1_activate"/>
+                    </widget>
+                  </child>
+
+                  <child>
+                    <widget class="GtkSeparatorMenuItem" id="separator2">
+                      <property name="visible">True</property>
+                    </widget>
+                  </child>
+
+                  <child>
+                    <widget class="GtkCheckMenuItem" id="show_all_options1">
+                      <property name="visible">True</property>
+                      <property name="tooltip" translatable="yes">Show all options</property>
+                      <property name="label" translatable="yes">Show all _options</property>
+                      <property name="use_underline">True</property>
+                      <property name="active">False</property>
+                      <signal name="activate" handler="on_show_all_options1_activate"/>
+                    </widget>
+                  </child>
+
+                  <child>
+                    <widget class="GtkCheckMenuItem" id="show_debug_info1">
+                      <property name="visible">True</property>
+                      <property name="tooltip" translatable="yes">Show masked options</property>
+                      <property name="label" translatable="yes">Show _debug info</property>
+                      <property name="use_underline">True</property>
+                      <property name="active">False</property>
+                      <signal name="activate" handler="on_show_debug_info1_activate"/>
+                    </widget>
+                  </child>
+                </widget>
+              </child>
+            </widget>
+          </child>
+
+          <child>
+            <widget class="GtkMenuItem" id="help1">
+              <property name="visible">True</property>
+              <property name="label" translatable="yes">_Help</property>
+              <property name="use_underline">True</property>
+
+              <child>
+                <widget class="GtkMenu" id="help1_menu">
+
+                  <child>
+                    <widget class="GtkImageMenuItem" id="introduction1">
+                      <property name="visible">True</property>
+                      <property name="label" translatable="yes">_Introduction</property>
+                      <property name="use_underline">True</property>
+                      <signal name="activate" handler="on_introduction1_activate" last_modification_time="Fri, 15 Nov 2002 20:26:30 GMT"/>
+                      <accelerator key="I" modifiers="GDK_CONTROL_MASK" signal="activate"/>
+
+                      <child internal-child="image">
+                        <widget class="GtkImage" id="image43">
+                          <property name="visible">True</property>
+                          <property name="stock">gtk-dialog-question</property>
+                          <property name="icon_size">1</property>
+                          <property name="xalign">0.5</property>
+                          <property name="yalign">0.5</property>
+                          <property name="xpad">0</property>
+                          <property name="ypad">0</property>
+                        </widget>
+                      </child>
+                    </widget>
+                  </child>
+
+                  <child>
+                    <widget class="GtkImageMenuItem" id="about1">
+                      <property name="visible">True</property>
+                      <property name="label" translatable="yes">_About</property>
+                      <property name="use_underline">True</property>
+                      <signal name="activate" handler="on_about1_activate" last_modification_time="Fri, 15 Nov 2002 20:26:30 GMT"/>
+                      <accelerator key="A" modifiers="GDK_CONTROL_MASK" signal="activate"/>
+
+                      <child internal-child="image">
+                        <widget class="GtkImage" id="image44">
+                          <property name="visible">True</property>
+                          <property name="stock">gtk-properties</property>
+                          <property name="icon_size">1</property>
+                          <property name="xalign">0.5</property>
+                          <property name="yalign">0.5</property>
+                          <property name="xpad">0</property>
+                          <property name="ypad">0</property>
+                        </widget>
+                      </child>
+                    </widget>
+                  </child>
+
+                  <child>
+                    <widget class="GtkImageMenuItem" id="license1">
+                      <property name="visible">True</property>
+                      <property name="label" translatable="yes">_License</property>
+                      <property name="use_underline">True</property>
+                      <signal name="activate" handler="on_license1_activate" last_modification_time="Fri, 15 Nov 2002 20:26:30 GMT"/>
+
+                      <child internal-child="image">
+                        <widget class="GtkImage" id="image45">
+                          <property name="visible">True</property>
+                          <property name="stock">gtk-justify-fill</property>
+                          <property name="icon_size">1</property>
+                          <property name="xalign">0.5</property>
+                          <property name="yalign">0.5</property>
+                          <property name="xpad">0</property>
+                          <property name="ypad">0</property>
+                        </widget>
+                      </child>
+                    </widget>
+                  </child>
+                </widget>
+              </child>
+            </widget>
+          </child>
+        </widget>
+        <packing>
+          <property name="padding">0</property>
+          <property name="expand">False</property>
+          <property name="fill">False</property>
+        </packing>
+      </child>
+
+      <child>
+        <widget class="GtkHandleBox" id="handlebox1">
+          <property name="visible">True</property>
+          <property name="shadow_type">GTK_SHADOW_OUT</property>
+          <property name="handle_position">GTK_POS_LEFT</property>
+          <property name="snap_edge">GTK_POS_TOP</property>
+
+          <child>
+            <widget class="GtkToolbar" id="toolbar1">
+              <property name="visible">True</property>
+              <property name="orientation">GTK_ORIENTATION_HORIZONTAL</property>
+              <property name="toolbar_style">GTK_TOOLBAR_BOTH</property>
+              <property name="tooltips">True</property>
+              <property name="show_arrow">True</property>
+
+              <child>
+                <widget class="GtkToolButton" id="button1">
+                  <property name="visible">True</property>
+                  <property name="tooltip" translatable="yes">Goes up of one level (single view)</property>
+                  <property name="label" translatable="yes">Back</property>
+                  <property name="use_underline">True</property>
+                  <property name="stock_id">gtk-undo</property>
+                  <property name="visible_horizontal">True</property>
+                  <property name="visible_vertical">True</property>
+                  <property name="is_important">False</property>
+                  <signal name="clicked" handler="on_back_clicked"/>
+                </widget>
+                <packing>
+                  <property name="expand">False</property>
+                  <property name="homogeneous">True</property>
+                </packing>
+              </child>
+
+              <child>
+                <widget class="GtkToolItem" id="toolitem1">
+                  <property name="visible">True</property>
+                  <property name="visible_horizontal">True</property>
+                  <property name="visible_vertical">True</property>
+                  <property name="is_important">False</property>
+
+                  <child>
+                    <widget class="GtkVSeparator" id="vseparator1">
+                      <property name="visible">True</property>
+                    </widget>
+                  </child>
+                </widget>
+                <packing>
+                  <property name="expand">False</property>
+                  <property name="homogeneous">False</property>
+                </packing>
+              </child>
+
+              <child>
+                <widget class="GtkToolButton" id="button2">
+                  <property name="visible">True</property>
+                  <property name="tooltip" translatable="yes">Load a config file</property>
+                  <property name="label" translatable="yes">Load</property>
+                  <property name="use_underline">True</property>
+                  <property name="stock_id">gtk-open</property>
+                  <property name="visible_horizontal">True</property>
+                  <property name="visible_vertical">True</property>
+                  <property name="is_important">False</property>
+                  <signal name="clicked" handler="on_load_clicked"/>
+                </widget>
+                <packing>
+                  <property name="expand">False</property>
+                  <property name="homogeneous">True</property>
+                </packing>
+              </child>
+
+              <child>
+                <widget class="GtkToolButton" id="button3">
+                  <property name="visible">True</property>
+                  <property name="tooltip" translatable="yes">Save a config file</property>
+                  <property name="label" translatable="yes">Save</property>
+                  <property name="use_underline">True</property>
+                  <property name="stock_id">gtk-save</property>
+                  <property name="visible_horizontal">True</property>
+                  <property name="visible_vertical">True</property>
+                  <property name="is_important">False</property>
+                  <signal name="clicked" handler="on_save_clicked"/>
+                </widget>
+                <packing>
+                  <property name="expand">False</property>
+                  <property name="homogeneous">True</property>
+                </packing>
+              </child>
+
+              <child>
+                <widget class="GtkToolItem" id="toolitem2">
+                  <property name="visible">True</property>
+                  <property name="visible_horizontal">True</property>
+                  <property name="visible_vertical">True</property>
+                  <property name="is_important">False</property>
+
+                  <child>
+                    <widget class="GtkVSeparator" id="vseparator2">
+                      <property name="visible">True</property>
+                    </widget>
+                  </child>
+                </widget>
+                <packing>
+                  <property name="expand">False</property>
+                  <property name="homogeneous">False</property>
+                </packing>
+              </child>
+
+              <child>
+                <widget class="GtkToolButton" id="button4">
+                  <property name="visible">True</property>
+                  <property name="tooltip" translatable="yes">Single view</property>
+                  <property name="label" translatable="yes">Single</property>
+                  <property name="use_underline">True</property>
+                  <property name="stock_id">gtk-missing-image</property>
+                  <property name="visible_horizontal">True</property>
+                  <property name="visible_vertical">True</property>
+                  <property name="is_important">False</property>
+                  <signal name="clicked" handler="on_single_clicked" last_modification_time="Sun, 12 Jan 2003 14:28:39 GMT"/>
+                </widget>
+                <packing>
+                  <property name="expand">False</property>
+                  <property name="homogeneous">True</property>
+                </packing>
+              </child>
+
+              <child>
+                <widget class="GtkToolButton" id="button5">
+                  <property name="visible">True</property>
+                  <property name="tooltip" translatable="yes">Split view</property>
+                  <property name="label" translatable="yes">Split</property>
+                  <property name="use_underline">True</property>
+                  <property name="stock_id">gtk-missing-image</property>
+                  <property name="visible_horizontal">True</property>
+                  <property name="visible_vertical">True</property>
+                  <property name="is_important">False</property>
+                  <signal name="clicked" handler="on_split_clicked" last_modification_time="Sun, 12 Jan 2003 14:28:45 GMT"/>
+                </widget>
+                <packing>
+                  <property name="expand">False</property>
+                  <property name="homogeneous">True</property>
+                </packing>
+              </child>
+
+              <child>
+                <widget class="GtkToolButton" id="button6">
+                  <property name="visible">True</property>
+                  <property name="tooltip" translatable="yes">Full view</property>
+                  <property name="label" translatable="yes">Full</property>
+                  <property name="use_underline">True</property>
+                  <property name="stock_id">gtk-missing-image</property>
+                  <property name="visible_horizontal">True</property>
+                  <property name="visible_vertical">True</property>
+                  <property name="is_important">False</property>
+                  <signal name="clicked" handler="on_full_clicked" last_modification_time="Sun, 12 Jan 2003 14:28:50 GMT"/>
+                </widget>
+                <packing>
+                  <property name="expand">False</property>
+                  <property name="homogeneous">True</property>
+                </packing>
+              </child>
+
+              <child>
+                <widget class="GtkToolItem" id="toolitem3">
+                  <property name="visible">True</property>
+                  <property name="visible_horizontal">True</property>
+                  <property name="visible_vertical">True</property>
+                  <property name="is_important">False</property>
+
+                  <child>
+                    <widget class="GtkVSeparator" id="vseparator3">
+                      <property name="visible">True</property>
+                    </widget>
+                  </child>
+                </widget>
+                <packing>
+                  <property name="expand">False</property>
+                  <property name="homogeneous">False</property>
+                </packing>
+              </child>
+
+              <child>
+                <widget class="GtkToolButton" id="button7">
+                  <property name="visible">True</property>
+                  <property name="tooltip" translatable="yes">Collapse the whole tree in the right frame</property>
+                  <property name="label" translatable="yes">Collapse</property>
+                  <property name="use_underline">True</property>
+                  <property name="stock_id">gtk-remove</property>
+                  <property name="visible_horizontal">True</property>
+                  <property name="visible_vertical">True</property>
+                  <property name="is_important">False</property>
+                  <signal name="clicked" handler="on_collapse_clicked"/>
+                </widget>
+                <packing>
+                  <property name="expand">False</property>
+                  <property name="homogeneous">True</property>
+                </packing>
+              </child>
+
+              <child>
+                <widget class="GtkToolButton" id="button8">
+                  <property name="visible">True</property>
+                  <property name="tooltip" translatable="yes">Expand the whole tree in the right frame</property>
+                  <property name="label" translatable="yes">Expand</property>
+                  <property name="use_underline">True</property>
+                  <property name="stock_id">gtk-add</property>
+                  <property name="visible_horizontal">True</property>
+                  <property name="visible_vertical">True</property>
+                  <property name="is_important">False</property>
+                  <signal name="clicked" handler="on_expand_clicked"/>
+                </widget>
+                <packing>
+                  <property name="expand">False</property>
+                  <property name="homogeneous">True</property>
+                </packing>
+              </child>
+            </widget>
+          </child>
+        </widget>
+        <packing>
+          <property name="padding">0</property>
+          <property name="expand">False</property>
+          <property name="fill">False</property>
+        </packing>
+      </child>
+
+      <child>
+        <widget class="GtkHPaned" id="hpaned1">
+          <property name="width_request">1</property>
+          <property name="visible">True</property>
+          <property name="can_focus">True</property>
+          <property name="position">0</property>
+
+          <child>
+            <widget class="GtkScrolledWindow" id="scrolledwindow1">
+              <property name="visible">True</property>
+              <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+              <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+              <property name="shadow_type">GTK_SHADOW_IN</property>
+              <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+
+              <child>
+                <widget class="GtkTreeView" id="treeview1">
+                  <property name="visible">True</property>
+                  <property name="can_focus">True</property>
+                  <property name="headers_visible">True</property>
+                  <property name="rules_hint">False</property>
+                  <property name="reorderable">False</property>
+                  <property name="enable_search">True</property>
+                  <signal name="cursor_changed" handler="on_treeview2_cursor_changed" last_modification_time="Sun, 12 Jan 2003 15:58:22 GMT"/>
+                  <signal name="button_press_event" handler="on_treeview1_button_press_event" last_modification_time="Sun, 12 Jan 2003 16:03:52 GMT"/>
+                  <signal name="key_press_event" handler="on_treeview2_key_press_event" last_modification_time="Sun, 12 Jan 2003 16:11:44 GMT"/>
+                </widget>
+              </child>
+            </widget>
+            <packing>
+              <property name="shrink">True</property>
+              <property name="resize">False</property>
+            </packing>
+          </child>
+
+          <child>
+            <widget class="GtkVPaned" id="vpaned1">
+              <property name="visible">True</property>
+              <property name="can_focus">True</property>
+              <property name="position">0</property>
+
+              <child>
+                <widget class="GtkScrolledWindow" id="scrolledwindow2">
+                  <property name="visible">True</property>
+                  <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                  <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                  <property name="shadow_type">GTK_SHADOW_IN</property>
+                  <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+
+                  <child>
+                    <widget class="GtkTreeView" id="treeview2">
+                      <property name="visible">True</property>
+                      <property name="can_focus">True</property>
+                      <property name="has_focus">True</property>
+                      <property name="headers_visible">True</property>
+                      <property name="rules_hint">False</property>
+                      <property name="reorderable">False</property>
+                      <property name="enable_search">True</property>
+                      <signal name="cursor_changed" handler="on_treeview2_cursor_changed" last_modification_time="Sun, 12 Jan 2003 15:57:55 GMT"/>
+                      <signal name="button_press_event" handler="on_treeview2_button_press_event" last_modification_time="Sun, 12 Jan 2003 15:57:58 GMT"/>
+                      <signal name="key_press_event" handler="on_treeview2_key_press_event" last_modification_time="Sun, 12 Jan 2003 15:58:01 GMT"/>
+                    </widget>
+                  </child>
+                </widget>
+                <packing>
+                  <property name="shrink">True</property>
+                  <property name="resize">False</property>
+                </packing>
+              </child>
+
+              <child>
+                <widget class="GtkScrolledWindow" id="scrolledwindow3">
+                  <property name="visible">True</property>
+                  <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
+                  <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                  <property name="shadow_type">GTK_SHADOW_IN</property>
+                  <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+
+                  <child>
+                    <widget class="GtkTextView" id="textview3">
+                      <property name="visible">True</property>
+                      <property name="can_focus">True</property>
+                      <property name="editable">False</property>
+                      <property name="overwrite">False</property>
+                      <property name="accepts_tab">True</property>
+                      <property name="justification">GTK_JUSTIFY_LEFT</property>
+                      <property name="wrap_mode">GTK_WRAP_WORD</property>
+                      <property name="cursor_visible">True</property>
+                      <property name="pixels_above_lines">0</property>
+                      <property name="pixels_below_lines">0</property>
+                      <property name="pixels_inside_wrap">0</property>
+                      <property name="left_margin">0</property>
+                      <property name="right_margin">0</property>
+                      <property name="indent">0</property>
+                      <property name="text" translatable="yes">Sorry, no help available for this option yet.</property>
+                    </widget>
+                  </child>
+                </widget>
+                <packing>
+                  <property name="shrink">True</property>
+                  <property name="resize">True</property>
+                </packing>
+              </child>
+            </widget>
+            <packing>
+              <property name="shrink">True</property>
+              <property name="resize">True</property>
+            </packing>
+          </child>
+        </widget>
+        <packing>
+          <property name="padding">0</property>
+          <property name="expand">True</property>
+          <property name="fill">True</property>
+        </packing>
+      </child>
+    </widget>
+  </child>
+</widget>
+
+</glade-interface>
diff --git a/scripts/kconfig/images.c b/scripts/kconfig/images.c
new file mode 100644
index 000000000..d4f84bd4a
--- /dev/null
+++ b/scripts/kconfig/images.c
@@ -0,0 +1,326 @@
+/*
+ * Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org>
+ * Released under the terms of the GNU GPL v2.0.
+ */
+
+static const char *xpm_load[] = {
+"22 22 5 1",
+". c None",
+"# c #000000",
+"c c #838100",
+"a c #ffff00",
+"b c #ffffff",
+"......................",
+"......................",
+"......................",
+"............####....#.",
+"...........#....##.##.",
+"..................###.",
+".................####.",
+".####...........#####.",
+"#abab##########.......",
+"#babababababab#.......",
+"#ababababababa#.......",
+"#babababababab#.......",
+"#ababab###############",
+"#babab##cccccccccccc##",
+"#abab##cccccccccccc##.",
+"#bab##cccccccccccc##..",
+"#ab##cccccccccccc##...",
+"#b##cccccccccccc##....",
+"###cccccccccccc##.....",
+"##cccccccccccc##......",
+"###############.......",
+"......................"};
+
+static const char *xpm_save[] = {
+"22 22 5 1",
+". c None",
+"# c #000000",
+"a c #838100",
+"b c #c5c2c5",
+"c c #cdb6d5",
+"......................",
+".####################.",
+".#aa#bbbbbbbbbbbb#bb#.",
+".#aa#bbbbbbbbbbbb#bb#.",
+".#aa#bbbbbbbbbcbb####.",
+".#aa#bbbccbbbbbbb#aa#.",
+".#aa#bbbccbbbbbbb#aa#.",
+".#aa#bbbbbbbbbbbb#aa#.",
+".#aa#bbbbbbbbbbbb#aa#.",
+".#aa#bbbbbbbbbbbb#aa#.",
+".#aa#bbbbbbbbbbbb#aa#.",
+".#aaa############aaa#.",
+".#aaaaaaaaaaaaaaaaaa#.",
+".#aaaaaaaaaaaaaaaaaa#.",
+".#aaa#############aa#.",
+".#aaa#########bbb#aa#.",
+".#aaa#########bbb#aa#.",
+".#aaa#########bbb#aa#.",
+".#aaa#########bbb#aa#.",
+".#aaa#########bbb#aa#.",
+"..##################..",
+"......................"};
+
+static const char *xpm_back[] = {
+"22 22 3 1",
+". c None",
+"# c #000083",
+"a c #838183",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"...........######a....",
+"..#......##########...",
+"..##...####......##a..",
+"..###.###.........##..",
+"..######..........##..",
+"..#####...........##..",
+"..######..........##..",
+"..#######.........##..",
+"..########.......##a..",
+"...............a###...",
+"...............###....",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................",
+"......................"};
+
+static const char *xpm_tree_view[] = {
+"22 22 2 1",
+". c None",
+"# c #000000",
+"......................",
+"......................",
+"......#...............",
+"......#...............",
+"......#...............",
+"......#...............",
+"......#...............",
+"......########........",
+"......#...............",
+"......#...............",
+"......#...............",
+"......#...............",
+"......#...............",
+"......########........",
+"......#...............",
+"......#...............",
+"......#...............",
+"......#...............",
+"......#...............",
+"......########........",
+"......................",
+"......................"};
+
+static const char *xpm_single_view[] = {
+"22 22 2 1",
+". c None",
+"# c #000000",
+"......................",
+"......................",
+"..........#...........",
+"..........#...........",
+"..........#...........",
+"..........#...........",
+"..........#...........",
+"..........#...........",
+"..........#...........",
+"..........#...........",
+"..........#...........",
+"..........#...........",
+"..........#...........",
+"..........#...........",
+"..........#...........",
+"..........#...........",
+"..........#...........",
+"..........#...........",
+"..........#...........",
+"..........#...........",
+"......................",
+"......................"};
+
+static const char *xpm_split_view[] = {
+"22 22 2 1",
+". c None",
+"# c #000000",
+"......................",
+"......................",
+"......#......#........",
+"......#......#........",
+"......#......#........",
+"......#......#........",
+"......#......#........",
+"......#......#........",
+"......#......#........",
+"......#......#........",
+"......#......#........",
+"......#......#........",
+"......#......#........",
+"......#......#........",
+"......#......#........",
+"......#......#........",
+"......#......#........",
+"......#......#........",
+"......#......#........",
+"......#......#........",
+"......................",
+"......................"};
+
+static const char *xpm_symbol_no[] = {
+"12 12 2 1",
+"  c white",
+". c black",
+"            ",
+" .......... ",
+" .        . ",
+" .        . ",
+" .        . ",
+" .        . ",
+" .        . ",
+" .        . ",
+" .        . ",
+" .        . ",
+" .......... ",
+"            "};
+
+static const char *xpm_symbol_mod[] = {
+"12 12 2 1",
+"  c white",
+". c black",
+"            ",
+" .......... ",
+" .        . ",
+" .        . ",
+" .   ..   . ",
+" .  ....  . ",
+" .  ....  . ",
+" .   ..   . ",
+" .        . ",
+" .        . ",
+" .......... ",
+"            "};
+
+static const char *xpm_symbol_yes[] = {
+"12 12 2 1",
+"  c white",
+". c black",
+"            ",
+" .......... ",
+" .        . ",
+" .        . ",
+" .      . . ",
+" .     .. . ",
+" . .  ..  . ",
+" . ....   . ",
+" .  ..    . ",
+" .        . ",
+" .......... ",
+"            "};
+
+static const char *xpm_choice_no[] = {
+"12 12 2 1",
+"  c white",
+". c black",
+"            ",
+"    ....    ",
+"  ..    ..  ",
+"  .      .  ",
+" .        . ",
+" .        . ",
+" .        . ",
+" .        . ",
+"  .      .  ",
+"  ..    ..  ",
+"    ....    ",
+"            "};
+
+static const char *xpm_choice_yes[] = {
+"12 12 2 1",
+"  c white",
+". c black",
+"            ",
+"    ....    ",
+"  ..    ..  ",
+"  .      .  ",
+" .   ..   . ",
+" .  ....  . ",
+" .  ....  . ",
+" .   ..   . ",
+"  .      .  ",
+"  ..    ..  ",
+"    ....    ",
+"            "};
+
+static const char *xpm_menu[] = {
+"12 12 2 1",
+"  c white",
+". c black",
+"            ",
+" .......... ",
+" .        . ",
+" . ..     . ",
+" . ....   . ",
+" . ...... . ",
+" . ...... . ",
+" . ....   . ",
+" . ..     . ",
+" .        . ",
+" .......... ",
+"            "};
+
+static const char *xpm_menu_inv[] = {
+"12 12 2 1",
+"  c white",
+". c black",
+"            ",
+" .......... ",
+" .......... ",
+" ..  ...... ",
+" ..    .... ",
+" ..      .. ",
+" ..      .. ",
+" ..    .... ",
+" ..  ...... ",
+" .......... ",
+" .......... ",
+"            "};
+
+static const char *xpm_menuback[] = {
+"12 12 2 1",
+"  c white",
+". c black",
+"            ",
+" .......... ",
+" .        . ",
+" .     .. . ",
+" .   .... . ",
+" . ...... . ",
+" . ...... . ",
+" .   .... . ",
+" .     .. . ",
+" .        . ",
+" .......... ",
+"            "};
+
+static const char *xpm_void[] = {
+"12 12 2 1",
+"  c white",
+". c black",
+"            ",
+"            ",
+"            ",
+"            ",
+"            ",
+"            ",
+"            ",
+"            ",
+"            ",
+"            ",
+"            ",
+"            "};
diff --git a/scripts/kconfig/kconfig_load.c b/scripts/kconfig/kconfig_load.c
new file mode 100644
index 000000000..dbdcaad82
--- /dev/null
+++ b/scripts/kconfig/kconfig_load.c
@@ -0,0 +1,35 @@
+#include <dlfcn.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "lkc.h"
+
+#define P(name,type,arg)        type (*name ## _p) arg
+#include "lkc_proto.h"
+#undef P
+
+void kconfig_load(void)
+{
+        void *handle;
+        char *error;
+
+        handle = dlopen("./libkconfig.so", RTLD_LAZY);
+        if (!handle) {
+                handle = dlopen("./scripts/kconfig/libkconfig.so", RTLD_LAZY);
+                if (!handle) {
+                        fprintf(stderr, "%s\n", dlerror());
+                        exit(1);
+                }
+        }
+
+#define P(name,type,arg)                        \
+{                                               \
+        name ## _p = dlsym(handle, #name);      \
+        if ((error = dlerror()))  {             \
+                fprintf(stderr, "%s\n", error); \
+                exit(1);                        \
+        }                                       \
+}
+#include "lkc_proto.h"
+#undef P
+}
diff --git a/scripts/kconfig/kxgettext.c b/scripts/kconfig/kxgettext.c
new file mode 100644
index 000000000..abee55ca6
--- /dev/null
+++ b/scripts/kconfig/kxgettext.c
@@ -0,0 +1,227 @@
+/*
+ * Arnaldo Carvalho de Melo <acme@conectiva.com.br>, 2005
+ *
+ * Released under the terms of the GNU GPL v2.0
+ */
+
+#include <stdlib.h>
+#include <string.h>
+
+#define LKC_DIRECT_LINK
+#include "lkc.h"
+
+static char *escape(const char* text, char *bf, int len)
+{
+        char *bfp = bf;
+        int multiline = strchr(text, '\n') != NULL;
+        int eol = 0;
+        int textlen = strlen(text);
+
+        if ((textlen > 0) && (text[textlen-1] == '\n'))
+                eol = 1;
+
+        *bfp++ = '"';
+        --len;
+
+        if (multiline) {
+                *bfp++ = '"';
+                *bfp++ = '\n';
+                *bfp++ = '"';
+                len -= 3;
+        }
+
+        while (*text != '\0' && len > 1) {
+                if (*text == '"')
+                        *bfp++ = '\\';
+                else if (*text == '\n') {
+                        *bfp++ = '\\';
+                        *bfp++ = 'n';
+                        *bfp++ = '"';
+                        *bfp++ = '\n';
+                        *bfp++ = '"';
+                        len -= 5;
+                        ++text;
+                        goto next;
+                }
+                *bfp++ = *text++;
+next:
+                --len;
+        }
+
+        if (multiline && eol)
+                bfp -= 3;
+
+        *bfp++ = '"';
+        *bfp = '\0';
+
+        return bf;
+}
+
+struct file_line {
+        struct file_line *next;
+        char*            file;
+        int              lineno;
+};
+
+static struct file_line *file_line__new(char *file, int lineno)
+{
+        struct file_line *self = malloc(sizeof(*self));
+
+        if (self == NULL)
+                goto out;
+
+        self->file   = file;
+        self->lineno = lineno;
+        self->next   = NULL;
+out:
+        return self;
+}
+
+struct message {
+        const char       *msg;
+        const char       *option;
+        struct message   *next;
+        struct file_line *files;
+};
+
+static struct message *message__list;
+
+static struct message *message__new(const char *msg, char *option, char *file, int lineno)
+{
+        struct message *self = malloc(sizeof(*self));
+
+        if (self == NULL)
+                goto out;
+
+        self->files = file_line__new(file, lineno);
+        if (self->files == NULL)
+                goto out_fail;
+
+        self->msg = strdup(msg);
+        if (self->msg == NULL)
+                goto out_fail_msg;
+
+        self->option = option;
+        self->next = NULL;
+out:
+        return self;
+out_fail_msg:
+        free(self->files);
+out_fail:
+        free(self);
+        self = NULL;
+        goto out;
+}
+
+static struct message *mesage__find(const char *msg)
+{
+        struct message *m = message__list;
+
+        while (m != NULL) {
+                if (strcmp(m->msg, msg) == 0)
+                        break;
+                m = m->next;
+        }
+
+        return m;
+}
+
+static int message__add_file_line(struct message *self, char *file, int lineno)
+{
+        int rc = -1;
+        struct file_line *fl = file_line__new(file, lineno);
+
+        if (fl == NULL)
+                goto out;
+
+        fl->next    = self->files;
+        self->files = fl;
+        rc = 0;
+out:
+        return rc;
+}
+
+static int message__add(const char *msg, char *option, char *file, int lineno)
+{
+        int rc = 0;
+        char bf[16384];
+        char *escaped = escape(msg, bf, sizeof(bf));
+        struct message *m = mesage__find(escaped);
+
+        if (m != NULL)
+                rc = message__add_file_line(m, file, lineno);
+        else {
+                m = message__new(escaped, option, file, lineno);
+
+                if (m != NULL) {
+                        m->next       = message__list;
+                        message__list = m;
+                } else
+                        rc = -1;
+        }
+        return rc;
+}
+
+void menu_build_message_list(struct menu *menu)
+{
+        struct menu *child;
+
+        message__add(menu_get_prompt(menu), NULL,
+                     menu->file == NULL ? "Root Menu" : menu->file->name,
+                     menu->lineno);
+
+        if (menu->sym != NULL && menu->sym->help != NULL)
+                message__add(menu->sym->help, menu->sym->name,
+                             menu->file == NULL ? "Root Menu" : menu->file->name,
+                             menu->lineno);
+
+        for (child = menu->list; child != NULL; child = child->next)
+                if (child->prompt != NULL)
+                        menu_build_message_list(child);
+}
+
+static void message__print_file_lineno(struct message *self)
+{
+        struct file_line *fl = self->files;
+
+        putchar('\n');
+        if (self->option != NULL)
+                printf("# %s:00000\n", self->option);
+
+        printf("#: %s:%d", fl->file, fl->lineno);
+        fl = fl->next;
+
+        while (fl != NULL) {
+                printf(", %s:%d", fl->file, fl->lineno);
+                fl = fl->next;
+        }
+
+        putchar('\n');
+}
+
+static void message__print_gettext_msgid_msgstr(struct message *self)
+{
+        message__print_file_lineno(self);
+
+        printf("msgid %s\n"
+               "msgstr \"\"\n", self->msg);
+}
+
+void menu__xgettext(void)
+{
+        struct message *m = message__list;
+
+        while (m != NULL) {
+                message__print_gettext_msgid_msgstr(m);
+                m = m->next;
+        }
+}
+
+int main(int ac, char **av)
+{
+        conf_parse(av[1]);
+
+        menu_build_message_list(menu_get_root_menu(NULL));
+        menu__xgettext();
+        return 0;
+}
diff --git a/scripts/kconfig/lex.zconf.c_shipped b/scripts/kconfig/lex.zconf.c_shipped
new file mode 100644
index 000000000..24e3c8cbb
--- /dev/null
+++ b/scripts/kconfig/lex.zconf.c_shipped
@@ -0,0 +1,2317 @@
+
+#line 3 "scripts/kconfig/lex.zconf.c"
+
+#define  YY_INT_ALIGNED short int
+
+/* A lexical scanner generated by flex */
+
+#define FLEX_SCANNER
+#define YY_FLEX_MAJOR_VERSION 2
+#define YY_FLEX_MINOR_VERSION 5
+#define YY_FLEX_SUBMINOR_VERSION 31
+#if YY_FLEX_SUBMINOR_VERSION > 0
+#define FLEX_BETA
+#endif
+
+/* First, we deal with  platform-specific or compiler-specific issues. */
+
+/* begin standard C headers. */
+#include <stdio.h>
+#include <string.h>
+#include <errno.h>
+#include <stdlib.h>
+
+/* end standard C headers. */
+
+/* flex integer type definitions */
+
+#ifndef FLEXINT_H
+#define FLEXINT_H
+
+/* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */
+
+#if defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L
+#include <inttypes.h>
+typedef int8_t flex_int8_t;
+typedef uint8_t flex_uint8_t;
+typedef int16_t flex_int16_t;
+typedef uint16_t flex_uint16_t;
+typedef int32_t flex_int32_t;
+typedef uint32_t flex_uint32_t;
+#else
+typedef signed char flex_int8_t;
+typedef short int flex_int16_t;
+typedef int flex_int32_t;
+typedef unsigned char flex_uint8_t; 
+typedef unsigned short int flex_uint16_t;
+typedef unsigned int flex_uint32_t;
+#endif /* ! C99 */
+
+/* Limits of integral types. */
+#ifndef INT8_MIN
+#define INT8_MIN               (-128)
+#endif
+#ifndef INT16_MIN
+#define INT16_MIN              (-32767-1)
+#endif
+#ifndef INT32_MIN
+#define INT32_MIN              (-2147483647-1)
+#endif
+#ifndef INT8_MAX
+#define INT8_MAX               (127)
+#endif
+#ifndef INT16_MAX
+#define INT16_MAX              (32767)
+#endif
+#ifndef INT32_MAX
+#define INT32_MAX              (2147483647)
+#endif
+#ifndef UINT8_MAX
+#define UINT8_MAX              (255U)
+#endif
+#ifndef UINT16_MAX
+#define UINT16_MAX             (65535U)
+#endif
+#ifndef UINT32_MAX
+#define UINT32_MAX             (4294967295U)
+#endif
+
+#endif /* ! FLEXINT_H */
+
+#ifdef __cplusplus
+
+/* The "const" storage-class-modifier is valid. */
+#define YY_USE_CONST
+
+#else   /* ! __cplusplus */
+
+#if __STDC__
+
+#define YY_USE_CONST
+
+#endif  /* __STDC__ */
+#endif  /* ! __cplusplus */
+
+#ifdef YY_USE_CONST
+#define yyconst const
+#else
+#define yyconst
+#endif
+
+/* Returned upon end-of-file. */
+#define YY_NULL 0
+
+/* Promotes a possibly negative, possibly signed char to an unsigned
+ * integer for use as an array index.  If the signed char is negative,
+ * we want to instead treat it as an 8-bit unsigned char, hence the
+ * double cast.
+ */
+#define YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c)
+
+/* Enter a start condition.  This macro really ought to take a parameter,
+ * but we do it the disgusting crufty way forced on us by the ()-less
+ * definition of BEGIN.
+ */
+#define BEGIN (yy_start) = 1 + 2 *
+
+/* Translate the current start state into a value that can be later handed
+ * to BEGIN to return to the state.  The YYSTATE alias is for lex
+ * compatibility.
+ */
+#define YY_START (((yy_start) - 1) / 2)
+#define YYSTATE YY_START
+
+/* Action number for EOF rule of a given start state. */
+#define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1)
+
+/* Special action meaning "start processing a new file". */
+#define YY_NEW_FILE zconfrestart(zconfin  )
+
+#define YY_END_OF_BUFFER_CHAR 0
+
+/* Size of default input buffer. */
+#ifndef YY_BUF_SIZE
+#define YY_BUF_SIZE 16384
+#endif
+
+#ifndef YY_TYPEDEF_YY_BUFFER_STATE
+#define YY_TYPEDEF_YY_BUFFER_STATE
+typedef struct yy_buffer_state *YY_BUFFER_STATE;
+#endif
+
+extern int zconfleng;
+
+extern FILE *zconfin, *zconfout;
+
+#define EOB_ACT_CONTINUE_SCAN 0
+#define EOB_ACT_END_OF_FILE 1
+#define EOB_ACT_LAST_MATCH 2
+
+    #define YY_LESS_LINENO(n)
+    
+/* Return all but the first "n" matched characters back to the input stream. */
+#define yyless(n) \
+        do \
+                { \
+                /* Undo effects of setting up zconftext. */ \
+        int yyless_macro_arg = (n); \
+        YY_LESS_LINENO(yyless_macro_arg);\
+                *yy_cp = (yy_hold_char); \
+                YY_RESTORE_YY_MORE_OFFSET \
+                (yy_c_buf_p) = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \
+                YY_DO_BEFORE_ACTION; /* set up zconftext again */ \
+                } \
+        while ( 0 )
+
+#define unput(c) yyunput( c, (yytext_ptr)  )
+
+/* The following is because we cannot portably get our hands on size_t
+ * (without autoconf's help, which isn't available because we want
+ * flex-generated scanners to compile on their own).
+ */
+
+#ifndef YY_TYPEDEF_YY_SIZE_T
+#define YY_TYPEDEF_YY_SIZE_T
+typedef unsigned int yy_size_t;
+#endif
+
+#ifndef YY_STRUCT_YY_BUFFER_STATE
+#define YY_STRUCT_YY_BUFFER_STATE
+struct yy_buffer_state
+        {
+        FILE *yy_input_file;
+
+        char *yy_ch_buf;                /* input buffer */
+        char *yy_buf_pos;               /* current position in input buffer */
+
+        /* Size of input buffer in bytes, not including room for EOB
+         * characters.
+         */
+        yy_size_t yy_buf_size;
+
+        /* Number of characters read into yy_ch_buf, not including EOB
+         * characters.
+         */
+        int yy_n_chars;
+
+        /* Whether we "own" the buffer - i.e., we know we created it,
+         * and can realloc() it to grow it, and should free() it to
+         * delete it.
+         */
+        int yy_is_our_buffer;
+
+        /* Whether this is an "interactive" input source; if so, and
+         * if we're using stdio for input, then we want to use getc()
+         * instead of fread(), to make sure we stop fetching input after
+         * each newline.
+         */
+        int yy_is_interactive;
+
+        /* Whether we're considered to be at the beginning of a line.
+         * If so, '^' rules will be active on the next match, otherwise
+         * not.
+         */
+        int yy_at_bol;
+
+    int yy_bs_lineno; /**< The line count. */
+    int yy_bs_column; /**< The column count. */
+    
+        /* Whether to try to fill the input buffer when we reach the
+         * end of it.
+         */
+        int yy_fill_buffer;
+
+        int yy_buffer_status;
+
+#define YY_BUFFER_NEW 0
+#define YY_BUFFER_NORMAL 1
+        /* When an EOF's been seen but there's still some text to process
+         * then we mark the buffer as YY_EOF_PENDING, to indicate that we
+         * shouldn't try reading from the input source any more.  We might
+         * still have a bunch of tokens to match, though, because of
+         * possible backing-up.
+         *
+         * When we actually see the EOF, we change the status to "new"
+         * (via zconfrestart()), so that the user can continue scanning by
+         * just pointing zconfin at a new input file.
+         */
+#define YY_BUFFER_EOF_PENDING 2
+
+        };
+#endif /* !YY_STRUCT_YY_BUFFER_STATE */
+
+/* Stack of input buffers. */
+static size_t yy_buffer_stack_top = 0; /**< index of top of stack. */
+static size_t yy_buffer_stack_max = 0; /**< capacity of stack. */
+static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */
+
+/* We provide macros for accessing buffer states in case in the
+ * future we want to put the buffer states in a more general
+ * "scanner state".
+ *
+ * Returns the top of the stack, or NULL.
+ */
+#define YY_CURRENT_BUFFER ( (yy_buffer_stack) \
+                          ? (yy_buffer_stack)[(yy_buffer_stack_top)] \
+                          : NULL)
+
+/* Same as previous macro, but useful when we know that the buffer stack is not
+ * NULL or when we need an lvalue. For internal use only.
+ */
+#define YY_CURRENT_BUFFER_LVALUE (yy_buffer_stack)[(yy_buffer_stack_top)]
+
+/* yy_hold_char holds the character lost when zconftext is formed. */
+static char yy_hold_char;
+static int yy_n_chars;          /* number of characters read into yy_ch_buf */
+int zconfleng;
+
+/* Points to current character in buffer. */
+static char *yy_c_buf_p = (char *) 0;
+static int yy_init = 1;         /* whether we need to initialize */
+static int yy_start = 0;        /* start state number */
+
+/* Flag which is used to allow zconfwrap()'s to do buffer switches
+ * instead of setting up a fresh zconfin.  A bit of a hack ...
+ */
+static int yy_did_buffer_switch_on_eof;
+
+void zconfrestart (FILE *input_file  );
+void zconf_switch_to_buffer (YY_BUFFER_STATE new_buffer  );
+YY_BUFFER_STATE zconf_create_buffer (FILE *file,int size  );
+void zconf_delete_buffer (YY_BUFFER_STATE b  );
+void zconf_flush_buffer (YY_BUFFER_STATE b  );
+void zconfpush_buffer_state (YY_BUFFER_STATE new_buffer  );
+void zconfpop_buffer_state (void );
+
+static void zconfensure_buffer_stack (void );
+static void zconf_load_buffer_state (void );
+static void zconf_init_buffer (YY_BUFFER_STATE b,FILE *file  );
+
+#define YY_FLUSH_BUFFER zconf_flush_buffer(YY_CURRENT_BUFFER )
+
+YY_BUFFER_STATE zconf_scan_buffer (char *base,yy_size_t size  );
+YY_BUFFER_STATE zconf_scan_string (yyconst char *yy_str  );
+YY_BUFFER_STATE zconf_scan_bytes (yyconst char *bytes,int len  );
+
+void *zconfalloc (yy_size_t  );
+void *zconfrealloc (void *,yy_size_t  );
+void zconffree (void *  );
+
+#define yy_new_buffer zconf_create_buffer
+
+#define yy_set_interactive(is_interactive) \
+        { \
+        if ( ! YY_CURRENT_BUFFER ){ \
+        zconfensure_buffer_stack (); \
+                YY_CURRENT_BUFFER_LVALUE =    \
+            zconf_create_buffer(zconfin,YY_BUF_SIZE ); \
+        } \
+        YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \
+        }
+
+#define yy_set_bol(at_bol) \
+        { \
+        if ( ! YY_CURRENT_BUFFER ){\
+        zconfensure_buffer_stack (); \
+                YY_CURRENT_BUFFER_LVALUE =    \
+            zconf_create_buffer(zconfin,YY_BUF_SIZE ); \
+        } \
+        YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \
+        }
+
+#define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol)
+
+/* Begin user sect3 */
+
+#define zconfwrap() 1
+#define YY_SKIP_YYWRAP
+
+typedef unsigned char YY_CHAR;
+
+FILE *zconfin = (FILE *) 0, *zconfout = (FILE *) 0;
+
+typedef int yy_state_type;
+
+extern int zconflineno;
+
+int zconflineno = 1;
+
+extern char *zconftext;
+#define yytext_ptr zconftext
+static yyconst flex_int16_t yy_nxt[][17] =
+    {
+    {
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0
+    },
+
+    {
+       11,   12,   13,   14,   12,   12,   15,   12,   12,   12,
+       12,   12,   12,   12,   12,   12,   12
+    },
+
+    {
+       11,   12,   13,   14,   12,   12,   15,   12,   12,   12,
+       12,   12,   12,   12,   12,   12,   12
+    },
+
+    {
+       11,   16,   16,   17,   16,   16,   16,   16,   16,   16,
+       16,   16,   16,   18,   16,   16,   16
+    },
+
+    {
+       11,   16,   16,   17,   16,   16,   16,   16,   16,   16,
+       16,   16,   16,   18,   16,   16,   16
+
+    },
+
+    {
+       11,   19,   20,   21,   19,   19,   19,   19,   19,   19,
+       19,   19,   19,   19,   19,   19,   19
+    },
+
+    {
+       11,   19,   20,   21,   19,   19,   19,   19,   19,   19,
+       19,   19,   19,   19,   19,   19,   19
+    },
+
+    {
+       11,   22,   22,   23,   22,   24,   22,   22,   24,   22,
+       22,   22,   22,   22,   22,   25,   22
+    },
+
+    {
+       11,   22,   22,   23,   22,   24,   22,   22,   24,   22,
+       22,   22,   22,   22,   22,   25,   22
+    },
+
+    {
+       11,   26,   26,   27,   28,   29,   30,   31,   29,   32,
+       33,   34,   35,   35,   36,   37,   38
+
+    },
+
+    {
+       11,   26,   26,   27,   28,   29,   30,   31,   29,   32,
+       33,   34,   35,   35,   36,   37,   38
+    },
+
+    {
+      -11,  -11,  -11,  -11,  -11,  -11,  -11,  -11,  -11,  -11,
+      -11,  -11,  -11,  -11,  -11,  -11,  -11
+    },
+
+    {
+       11,  -12,  -12,  -12,  -12,  -12,  -12,  -12,  -12,  -12,
+      -12,  -12,  -12,  -12,  -12,  -12,  -12
+    },
+
+    {
+       11,  -13,   39,   40,  -13,  -13,   41,  -13,  -13,  -13,
+      -13,  -13,  -13,  -13,  -13,  -13,  -13
+    },
+
+    {
+       11,  -14,  -14,  -14,  -14,  -14,  -14,  -14,  -14,  -14,
+      -14,  -14,  -14,  -14,  -14,  -14,  -14
+
+    },
+
+    {
+       11,   42,   42,   43,   42,   42,   42,   42,   42,   42,
+       42,   42,   42,   42,   42,   42,   42
+    },
+
+    {
+       11,  -16,  -16,  -16,  -16,  -16,  -16,  -16,  -16,  -16,
+      -16,  -16,  -16,  -16,  -16,  -16,  -16
+    },
+
+    {
+       11,  -17,  -17,  -17,  -17,  -17,  -17,  -17,  -17,  -17,
+      -17,  -17,  -17,  -17,  -17,  -17,  -17
+    },
+
+    {
+       11,  -18,  -18,  -18,  -18,  -18,  -18,  -18,  -18,  -18,
+      -18,  -18,  -18,   44,  -18,  -18,  -18
+    },
+
+    {
+       11,   45,   45,  -19,   45,   45,   45,   45,   45,   45,
+       45,   45,   45,   45,   45,   45,   45
+
+    },
+
+    {
+       11,  -20,   46,   47,  -20,  -20,  -20,  -20,  -20,  -20,
+      -20,  -20,  -20,  -20,  -20,  -20,  -20
+    },
+
+    {
+       11,   48,  -21,  -21,   48,   48,   48,   48,   48,   48,
+       48,   48,   48,   48,   48,   48,   48
+    },
+
+    {
+       11,   49,   49,   50,   49,  -22,   49,   49,  -22,   49,
+       49,   49,   49,   49,   49,  -22,   49
+    },
+
+    {
+       11,  -23,  -23,  -23,  -23,  -23,  -23,  -23,  -23,  -23,
+      -23,  -23,  -23,  -23,  -23,  -23,  -23
+    },
+
+    {
+       11,  -24,  -24,  -24,  -24,  -24,  -24,  -24,  -24,  -24,
+      -24,  -24,  -24,  -24,  -24,  -24,  -24
+
+    },
+
+    {
+       11,   51,   51,   52,   51,   51,   51,   51,   51,   51,
+       51,   51,   51,   51,   51,   51,   51
+    },
+
+    {
+       11,  -26,  -26,  -26,  -26,  -26,  -26,  -26,  -26,  -26,
+      -26,  -26,  -26,  -26,  -26,  -26,  -26
+    },
+
+    {
+       11,  -27,  -27,  -27,  -27,  -27,  -27,  -27,  -27,  -27,
+      -27,  -27,  -27,  -27,  -27,  -27,  -27
+    },
+
+    {
+       11,  -28,  -28,  -28,  -28,  -28,  -28,  -28,  -28,  -28,
+      -28,  -28,  -28,  -28,   53,  -28,  -28
+    },
+
+    {
+       11,  -29,  -29,  -29,  -29,  -29,  -29,  -29,  -29,  -29,
+      -29,  -29,  -29,  -29,  -29,  -29,  -29
+
+    },
+
+    {
+       11,   54,   54,  -30,   54,   54,   54,   54,   54,   54,
+       54,   54,   54,   54,   54,   54,   54
+    },
+
+    {
+       11,  -31,  -31,  -31,  -31,  -31,  -31,   55,  -31,  -31,
+      -31,  -31,  -31,  -31,  -31,  -31,  -31
+    },
+
+    {
+       11,  -32,  -32,  -32,  -32,  -32,  -32,  -32,  -32,  -32,
+      -32,  -32,  -32,  -32,  -32,  -32,  -32
+    },
+
+    {
+       11,  -33,  -33,  -33,  -33,  -33,  -33,  -33,  -33,  -33,
+      -33,  -33,  -33,  -33,  -33,  -33,  -33
+    },
+
+    {
+       11,  -34,  -34,  -34,  -34,  -34,  -34,  -34,  -34,  -34,
+      -34,   56,   57,   57,  -34,  -34,  -34
+
+    },
+
+    {
+       11,  -35,  -35,  -35,  -35,  -35,  -35,  -35,  -35,  -35,
+      -35,   57,   57,   57,  -35,  -35,  -35
+    },
+
+    {
+       11,  -36,  -36,  -36,  -36,  -36,  -36,  -36,  -36,  -36,
+      -36,  -36,  -36,  -36,  -36,  -36,  -36
+    },
+
+    {
+       11,  -37,  -37,   58,  -37,  -37,  -37,  -37,  -37,  -37,
+      -37,  -37,  -37,  -37,  -37,  -37,  -37
+    },
+
+    {
+       11,  -38,  -38,  -38,  -38,  -38,  -38,  -38,  -38,  -38,
+      -38,  -38,  -38,  -38,  -38,  -38,   59
+    },
+
+    {
+       11,  -39,   39,   40,  -39,  -39,   41,  -39,  -39,  -39,
+      -39,  -39,  -39,  -39,  -39,  -39,  -39
+
+    },
+
+    {
+       11,  -40,  -40,  -40,  -40,  -40,  -40,  -40,  -40,  -40,
+      -40,  -40,  -40,  -40,  -40,  -40,  -40
+    },
+
+    {
+       11,   42,   42,   43,   42,   42,   42,   42,   42,   42,
+       42,   42,   42,   42,   42,   42,   42
+    },
+
+    {
+       11,   42,   42,   43,   42,   42,   42,   42,   42,   42,
+       42,   42,   42,   42,   42,   42,   42
+    },
+
+    {
+       11,  -43,  -43,  -43,  -43,  -43,  -43,  -43,  -43,  -43,
+      -43,  -43,  -43,  -43,  -43,  -43,  -43
+    },
+
+    {
+       11,  -44,  -44,  -44,  -44,  -44,  -44,  -44,  -44,  -44,
+      -44,  -44,  -44,   44,  -44,  -44,  -44
+
+    },
+
+    {
+       11,   45,   45,  -45,   45,   45,   45,   45,   45,   45,
+       45,   45,   45,   45,   45,   45,   45
+    },
+
+    {
+       11,  -46,   46,   47,  -46,  -46,  -46,  -46,  -46,  -46,
+      -46,  -46,  -46,  -46,  -46,  -46,  -46
+    },
+
+    {
+       11,   48,  -47,  -47,   48,   48,   48,   48,   48,   48,
+       48,   48,   48,   48,   48,   48,   48
+    },
+
+    {
+       11,  -48,  -48,  -48,  -48,  -48,  -48,  -48,  -48,  -48,
+      -48,  -48,  -48,  -48,  -48,  -48,  -48
+    },
+
+    {
+       11,   49,   49,   50,   49,  -49,   49,   49,  -49,   49,
+       49,   49,   49,   49,   49,  -49,   49
+
+    },
+
+    {
+       11,  -50,  -50,  -50,  -50,  -50,  -50,  -50,  -50,  -50,
+      -50,  -50,  -50,  -50,  -50,  -50,  -50
+    },
+
+    {
+       11,  -51,  -51,   52,  -51,  -51,  -51,  -51,  -51,  -51,
+      -51,  -51,  -51,  -51,  -51,  -51,  -51
+    },
+
+    {
+       11,  -52,  -52,  -52,  -52,  -52,  -52,  -52,  -52,  -52,
+      -52,  -52,  -52,  -52,  -52,  -52,  -52
+    },
+
+    {
+       11,  -53,  -53,  -53,  -53,  -53,  -53,  -53,  -53,  -53,
+      -53,  -53,  -53,  -53,  -53,  -53,  -53
+    },
+
+    {
+       11,   54,   54,  -54,   54,   54,   54,   54,   54,   54,
+       54,   54,   54,   54,   54,   54,   54
+
+    },
+
+    {
+       11,  -55,  -55,  -55,  -55,  -55,  -55,  -55,  -55,  -55,
+      -55,  -55,  -55,  -55,  -55,  -55,  -55
+    },
+
+    {
+       11,  -56,  -56,  -56,  -56,  -56,  -56,  -56,  -56,  -56,
+      -56,   60,   57,   57,  -56,  -56,  -56
+    },
+
+    {
+       11,  -57,  -57,  -57,  -57,  -57,  -57,  -57,  -57,  -57,
+      -57,   57,   57,   57,  -57,  -57,  -57
+    },
+
+    {
+       11,  -58,  -58,  -58,  -58,  -58,  -58,  -58,  -58,  -58,
+      -58,  -58,  -58,  -58,  -58,  -58,  -58
+    },
+
+    {
+       11,  -59,  -59,  -59,  -59,  -59,  -59,  -59,  -59,  -59,
+      -59,  -59,  -59,  -59,  -59,  -59,  -59
+
+    },
+
+    {
+       11,  -60,  -60,  -60,  -60,  -60,  -60,  -60,  -60,  -60,
+      -60,   57,   57,   57,  -60,  -60,  -60
+    },
+
+    } ;
+
+static yy_state_type yy_get_previous_state (void );
+static yy_state_type yy_try_NUL_trans (yy_state_type current_state  );
+static int yy_get_next_buffer (void );
+static void yy_fatal_error (yyconst char msg[]  );
+
+/* Done after the current pattern has been matched and before the
+ * corresponding action - sets up zconftext.
+ */
+#define YY_DO_BEFORE_ACTION \
+        (yytext_ptr) = yy_bp; \
+        zconfleng = (size_t) (yy_cp - yy_bp); \
+        (yy_hold_char) = *yy_cp; \
+        *yy_cp = '\0'; \
+        (yy_c_buf_p) = yy_cp;
+
+#define YY_NUM_RULES 33
+#define YY_END_OF_BUFFER 34
+/* This struct is not used in this scanner,
+   but its presence is necessary. */
+struct yy_trans_info
+        {
+        flex_int32_t yy_verify;
+        flex_int32_t yy_nxt;
+        };
+static yyconst flex_int16_t yy_accept[61] =
+    {   0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+       34,    5,    4,    2,    3,    7,    8,    6,   32,   29,
+       31,   24,   28,   27,   26,   22,   17,   13,   16,   20,
+       22,   11,   12,   19,   19,   14,   22,   22,    4,    2,
+        3,    3,    1,    6,   32,   29,   31,   30,   24,   23,
+       26,   25,   15,   20,    9,   19,   19,   21,   10,   18
+    } ;
+
+static yyconst flex_int32_t yy_ec[256] =
+    {   0,
+        1,    1,    1,    1,    1,    1,    1,    1,    2,    3,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    2,    4,    5,    6,    1,    1,    7,    8,    9,
+       10,    1,    1,    1,   11,   12,   12,   13,   13,   13,
+       13,   13,   13,   13,   13,   13,   13,    1,    1,    1,
+       14,    1,    1,    1,   13,   13,   13,   13,   13,   13,
+       13,   13,   13,   13,   13,   13,   13,   13,   13,   13,
+       13,   13,   13,   13,   13,   13,   13,   13,   13,   13,
+        1,   15,    1,    1,   13,    1,   13,   13,   13,   13,
+
+       13,   13,   13,   13,   13,   13,   13,   13,   13,   13,
+       13,   13,   13,   13,   13,   13,   13,   13,   13,   13,
+       13,   13,    1,   16,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1
+    } ;
+
+extern int zconf_flex_debug;
+int zconf_flex_debug = 0;
+
+/* The intent behind this definition is that it'll catch
+ * any uses of REJECT which flex missed.
+ */
+#define REJECT reject_used_but_not_detected
+#define yymore() yymore_used_but_not_detected
+#define YY_MORE_ADJ 0
+#define YY_RESTORE_YY_MORE_OFFSET
+char *zconftext;
+
+/*
+ * Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org>
+ * Released under the terms of the GNU GPL v2.0.
+ */
+
+#include <limits.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#define LKC_DIRECT_LINK
+#include "lkc.h"
+
+#define START_STRSIZE   16
+
+static struct {
+        struct file *file;
+        int lineno;
+} current_pos;
+
+static char *text;
+static int text_size, text_asize;
+
+struct buffer {
+        struct buffer *parent;
+        YY_BUFFER_STATE state;
+};
+
+struct buffer *current_buf;
+
+static int last_ts, first_ts;
+
+static void zconf_endhelp(void);
+static void zconf_endfile(void);
+
+void new_string(void)
+{
+        text = malloc(START_STRSIZE);
+        text_asize = START_STRSIZE;
+        text_size = 0;
+        *text = 0;
+}
+
+void append_string(const char *str, int size)
+{
+        int new_size = text_size + size + 1;
+        if (new_size > text_asize) {
+                new_size += START_STRSIZE - 1;
+                new_size &= -START_STRSIZE;
+                text = realloc(text, new_size);
+                text_asize = new_size;
+        }
+        memcpy(text + text_size, str, size);
+        text_size += size;
+        text[text_size] = 0;
+}
+
+void alloc_string(const char *str, int size)
+{
+        text = malloc(size + 1);
+        memcpy(text, str, size);
+        text[size] = 0;
+}
+
+#define INITIAL 0
+#define COMMAND 1
+#define HELP 2
+#define STRING 3
+#define PARAM 4
+
+#ifndef YY_NO_UNISTD_H
+/* Special case for "unistd.h", since it is non-ANSI. We include it way
+ * down here because we want the user's section 1 to have been scanned first.
+ * The user has a chance to override it with an option.
+ */
+#include <unistd.h>
+#endif
+
+#ifndef YY_EXTRA_TYPE
+#define YY_EXTRA_TYPE void *
+#endif
+
+/* Macros after this point can all be overridden by user definitions in
+ * section 1.
+ */
+
+#ifndef YY_SKIP_YYWRAP
+#ifdef __cplusplus
+extern "C" int zconfwrap (void );
+#else
+extern int zconfwrap (void );
+#endif
+#endif
+
+    static void yyunput (int c,char *buf_ptr  );
+    
+#ifndef yytext_ptr
+static void yy_flex_strncpy (char *,yyconst char *,int );
+#endif
+
+#ifdef YY_NEED_STRLEN
+static int yy_flex_strlen (yyconst char * );
+#endif
+
+#ifndef YY_NO_INPUT
+
+#ifdef __cplusplus
+static int yyinput (void );
+#else
+static int input (void );
+#endif
+
+#endif
+
+/* Amount of stuff to slurp up with each read. */
+#ifndef YY_READ_BUF_SIZE
+#define YY_READ_BUF_SIZE 8192
+#endif
+
+/* Copy whatever the last rule matched to the standard output. */
+#ifndef ECHO
+/* This used to be an fputs(), but since the string might contain NUL's,
+ * we now use fwrite().
+ */
+#define ECHO (void) fwrite( zconftext, zconfleng, 1, zconfout )
+#endif
+
+/* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
+ * is returned in "result".
+ */
+#ifndef YY_INPUT
+#define YY_INPUT(buf,result,max_size) \
+        errno=0; \
+        while ( (result = read( fileno(zconfin), (char *) buf, max_size )) < 0 ) \
+        { \
+                if( errno != EINTR) \
+                { \
+                        YY_FATAL_ERROR( "input in flex scanner failed" ); \
+                        break; \
+                } \
+                errno=0; \
+                clearerr(zconfin); \
+        }\
+\
+
+#endif
+
+/* No semi-colon after return; correct usage is to write "yyterminate();" -
+ * we don't want an extra ';' after the "return" because that will cause
+ * some compilers to complain about unreachable statements.
+ */
+#ifndef yyterminate
+#define yyterminate() return YY_NULL
+#endif
+
+/* Number of entries by which start-condition stack grows. */
+#ifndef YY_START_STACK_INCR
+#define YY_START_STACK_INCR 25
+#endif
+
+/* Report a fatal error. */
+#ifndef YY_FATAL_ERROR
+#define YY_FATAL_ERROR(msg) yy_fatal_error( msg )
+#endif
+
+/* end tables serialization structures and prototypes */
+
+/* Default declaration of generated scanner - a define so the user can
+ * easily add parameters.
+ */
+#ifndef YY_DECL
+#define YY_DECL_IS_OURS 1
+
+extern int zconflex (void);
+
+#define YY_DECL int zconflex (void)
+#endif /* !YY_DECL */
+
+/* Code executed at the beginning of each rule, after zconftext and zconfleng
+ * have been set up.
+ */
+#ifndef YY_USER_ACTION
+#define YY_USER_ACTION
+#endif
+
+/* Code executed at the end of each rule. */
+#ifndef YY_BREAK
+#define YY_BREAK break;
+#endif
+
+#define YY_RULE_SETUP \
+        YY_USER_ACTION
+
+/** The main scanner function which does all the work.
+ */
+YY_DECL
+{
+        register yy_state_type yy_current_state;
+        register char *yy_cp, *yy_bp;
+        register int yy_act;
+    
+        int str = 0;
+        int ts, i;
+
+        if ( (yy_init) )
+                {
+                (yy_init) = 0;
+
+#ifdef YY_USER_INIT
+                YY_USER_INIT;
+#endif
+
+                if ( ! (yy_start) )
+                        (yy_start) = 1; /* first start state */
+
+                if ( ! zconfin )
+                        zconfin = stdin;
+
+                if ( ! zconfout )
+                        zconfout = stdout;
+
+                if ( ! YY_CURRENT_BUFFER ) {
+                        zconfensure_buffer_stack ();
+                        YY_CURRENT_BUFFER_LVALUE =
+                                zconf_create_buffer(zconfin,YY_BUF_SIZE );
+                }
+
+                zconf_load_buffer_state( );
+                }
+
+        while ( 1 )             /* loops until end-of-file is reached */
+                {
+                yy_cp = (yy_c_buf_p);
+
+                /* Support of zconftext. */
+                *yy_cp = (yy_hold_char);
+
+                /* yy_bp points to the position in yy_ch_buf of the start of
+                 * the current run.
+                 */
+                yy_bp = yy_cp;
+
+                yy_current_state = (yy_start);
+yy_match:
+                while ( (yy_current_state = yy_nxt[yy_current_state][ yy_ec[YY_SC_TO_UI(*yy_cp)]  ]) > 0 )
+                        ++yy_cp;
+
+                yy_current_state = -yy_current_state;
+
+yy_find_action:
+                yy_act = yy_accept[yy_current_state];
+
+                YY_DO_BEFORE_ACTION;
+
+do_action:      /* This label is used only to access EOF actions. */
+
+                switch ( yy_act )
+        { /* beginning of action switch */
+case 1:
+/* rule 1 can match eol */
+case 2:
+/* rule 2 can match eol */
+YY_RULE_SETUP
+{
+        current_file->lineno++;
+        return T_EOL;
+}
+        YY_BREAK
+case 3:
+YY_RULE_SETUP
+
+        YY_BREAK
+case 4:
+YY_RULE_SETUP
+{
+        BEGIN(COMMAND);
+}
+        YY_BREAK
+case 5:
+YY_RULE_SETUP
+{
+        unput(zconftext[0]);
+        BEGIN(COMMAND);
+}
+        YY_BREAK
+
+case 6:
+YY_RULE_SETUP
+{
+                struct kconf_id *id = kconf_id_lookup(zconftext, zconfleng);
+                BEGIN(PARAM);
+                current_pos.file = current_file;
+                current_pos.lineno = current_file->lineno;
+                if (id && id->flags & TF_COMMAND) {
+                        zconflval.id = id;
+                        return id->token;
+                }
+                alloc_string(zconftext, zconfleng);
+                zconflval.string = text;
+                return T_WORD;
+        }
+        YY_BREAK
+case 7:
+YY_RULE_SETUP
+
+        YY_BREAK
+case 8:
+/* rule 8 can match eol */
+YY_RULE_SETUP
+{
+                BEGIN(INITIAL);
+                current_file->lineno++;
+                return T_EOL;
+        }
+        YY_BREAK
+
+case 9:
+YY_RULE_SETUP
+return T_AND;
+        YY_BREAK
+case 10:
+YY_RULE_SETUP
+return T_OR;
+        YY_BREAK
+case 11:
+YY_RULE_SETUP
+return T_OPEN_PAREN;
+        YY_BREAK
+case 12:
+YY_RULE_SETUP
+return T_CLOSE_PAREN;
+        YY_BREAK
+case 13:
+YY_RULE_SETUP
+return T_NOT;
+        YY_BREAK
+case 14:
+YY_RULE_SETUP
+return T_EQUAL;
+        YY_BREAK
+case 15:
+YY_RULE_SETUP
+return T_UNEQUAL;
+        YY_BREAK
+case 16:
+YY_RULE_SETUP
+{
+                str = zconftext[0];
+                new_string();
+                BEGIN(STRING);
+        }
+        YY_BREAK
+case 17:
+/* rule 17 can match eol */
+YY_RULE_SETUP
+BEGIN(INITIAL); current_file->lineno++; return T_EOL;
+        YY_BREAK
+case 18:
+YY_RULE_SETUP
+/* ignore */
+        YY_BREAK
+case 19:
+YY_RULE_SETUP
+{
+                struct kconf_id *id = kconf_id_lookup(zconftext, zconfleng);
+                if (id && id->flags & TF_PARAM) {
+                        zconflval.id = id;
+                        return id->token;
+                }
+                alloc_string(zconftext, zconfleng);
+                zconflval.string = text;
+                return T_WORD;
+        }
+        YY_BREAK
+case 20:
+YY_RULE_SETUP
+/* comment */
+        YY_BREAK
+case 21:
+/* rule 21 can match eol */
+YY_RULE_SETUP
+current_file->lineno++;
+        YY_BREAK
+case 22:
+YY_RULE_SETUP
+
+        YY_BREAK
+case YY_STATE_EOF(PARAM):
+{
+                BEGIN(INITIAL);
+        }
+        YY_BREAK
+
+case 23:
+/* rule 23 can match eol */
+*yy_cp = (yy_hold_char); /* undo effects of setting up zconftext */
+(yy_c_buf_p) = yy_cp -= 1;
+YY_DO_BEFORE_ACTION; /* set up zconftext again */
+YY_RULE_SETUP
+{
+                append_string(zconftext, zconfleng);
+                zconflval.string = text;
+                return T_WORD_QUOTE;
+        }
+        YY_BREAK
+case 24:
+YY_RULE_SETUP
+{
+                append_string(zconftext, zconfleng);
+        }
+        YY_BREAK
+case 25:
+/* rule 25 can match eol */
+*yy_cp = (yy_hold_char); /* undo effects of setting up zconftext */
+(yy_c_buf_p) = yy_cp -= 1;
+YY_DO_BEFORE_ACTION; /* set up zconftext again */
+YY_RULE_SETUP
+{
+                append_string(zconftext + 1, zconfleng - 1);
+                zconflval.string = text;
+                return T_WORD_QUOTE;
+        }
+        YY_BREAK
+case 26:
+YY_RULE_SETUP
+{
+                append_string(zconftext + 1, zconfleng - 1);
+        }
+        YY_BREAK
+case 27:
+YY_RULE_SETUP
+{
+                if (str == zconftext[0]) {
+                        BEGIN(PARAM);
+                        zconflval.string = text;
+                        return T_WORD_QUOTE;
+                } else
+                        append_string(zconftext, 1);
+        }
+        YY_BREAK
+case 28:
+/* rule 28 can match eol */
+YY_RULE_SETUP
+{
+                printf("%s:%d:warning: multi-line strings not supported\n", zconf_curname(), zconf_lineno());
+                current_file->lineno++;
+                BEGIN(INITIAL);
+                return T_EOL;
+        }
+        YY_BREAK
+case YY_STATE_EOF(STRING):
+{
+                BEGIN(INITIAL);
+        }
+        YY_BREAK
+
+case 29:
+YY_RULE_SETUP
+{
+                ts = 0;
+                for (i = 0; i < zconfleng; i++) {
+                        if (zconftext[i] == '\t')
+                                ts = (ts & ~7) + 8;
+                        else
+                                ts++;
+                }
+                last_ts = ts;
+                if (first_ts) {
+                        if (ts < first_ts) {
+                                zconf_endhelp();
+                                return T_HELPTEXT;
+                        }
+                        ts -= first_ts;
+                        while (ts > 8) {
+                                append_string("        ", 8);
+                                ts -= 8;
+                        }
+                        append_string("        ", ts);
+                }
+        }
+        YY_BREAK
+case 30:
+/* rule 30 can match eol */
+*yy_cp = (yy_hold_char); /* undo effects of setting up zconftext */
+(yy_c_buf_p) = yy_cp -= 1;
+YY_DO_BEFORE_ACTION; /* set up zconftext again */
+YY_RULE_SETUP
+{
+                current_file->lineno++;
+                zconf_endhelp();
+                return T_HELPTEXT;
+        }
+        YY_BREAK
+case 31:
+/* rule 31 can match eol */
+YY_RULE_SETUP
+{
+                current_file->lineno++;
+                append_string("\n", 1);
+        }
+        YY_BREAK
+case 32:
+YY_RULE_SETUP
+{
+                append_string(zconftext, zconfleng);
+                if (!first_ts)
+                        first_ts = last_ts;
+        }
+        YY_BREAK
+case YY_STATE_EOF(HELP):
+{
+                zconf_endhelp();
+                return T_HELPTEXT;
+        }
+        YY_BREAK
+
+case YY_STATE_EOF(INITIAL):
+case YY_STATE_EOF(COMMAND):
+{
+        if (current_file) {
+                zconf_endfile();
+                return T_EOL;
+        }
+        fclose(zconfin);
+        yyterminate();
+}
+        YY_BREAK
+case 33:
+YY_RULE_SETUP
+YY_FATAL_ERROR( "flex scanner jammed" );
+        YY_BREAK
+
+        case YY_END_OF_BUFFER:
+                {
+                /* Amount of text matched not including the EOB char. */
+                int yy_amount_of_matched_text = (int) (yy_cp - (yytext_ptr)) - 1;
+
+                /* Undo the effects of YY_DO_BEFORE_ACTION. */
+                *yy_cp = (yy_hold_char);
+                YY_RESTORE_YY_MORE_OFFSET
+
+                if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_NEW )
+                        {
+                        /* We're scanning a new file or input source.  It's
+                         * possible that this happened because the user
+                         * just pointed zconfin at a new source and called
+                         * zconflex().  If so, then we have to assure
+                         * consistency between YY_CURRENT_BUFFER and our
+                         * globals.  Here is the right place to do so, because
+                         * this is the first action (other than possibly a
+                         * back-up) that will match for the new input source.
+                         */
+                        (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
+                        YY_CURRENT_BUFFER_LVALUE->yy_input_file = zconfin;
+                        YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL;
+                        }
+
+                /* Note that here we test for yy_c_buf_p "<=" to the position
+                 * of the first EOB in the buffer, since yy_c_buf_p will
+                 * already have been incremented past the NUL character
+                 * (since all states make transitions on EOB to the
+                 * end-of-buffer state).  Contrast this with the test
+                 * in input().
+                 */
+                if ( (yy_c_buf_p) <= &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] )
+                        { /* This was really a NUL. */
+                        yy_state_type yy_next_state;
+
+                        (yy_c_buf_p) = (yytext_ptr) + yy_amount_of_matched_text;
+
+                        yy_current_state = yy_get_previous_state(  );
+
+                        /* Okay, we're now positioned to make the NUL
+                         * transition.  We couldn't have
+                         * yy_get_previous_state() go ahead and do it
+                         * for us because it doesn't know how to deal
+                         * with the possibility of jamming (and we don't
+                         * want to build jamming into it because then it
+                         * will run more slowly).
+                         */
+
+                        yy_next_state = yy_try_NUL_trans( yy_current_state );
+
+                        yy_bp = (yytext_ptr) + YY_MORE_ADJ;
+
+                        if ( yy_next_state )
+                                {
+                                /* Consume the NUL. */
+                                yy_cp = ++(yy_c_buf_p);
+                                yy_current_state = yy_next_state;
+                                goto yy_match;
+                                }
+
+                        else
+                                {
+                                yy_cp = (yy_c_buf_p);
+                                goto yy_find_action;
+                                }
+                        }
+
+                else switch ( yy_get_next_buffer(  ) )
+                        {
+                        case EOB_ACT_END_OF_FILE:
+                                {
+                                (yy_did_buffer_switch_on_eof) = 0;
+
+                                if ( zconfwrap( ) )
+                                        {
+                                        /* Note: because we've taken care in
+                                         * yy_get_next_buffer() to have set up
+                                         * zconftext, we can now set up
+                                         * yy_c_buf_p so that if some total
+                                         * hoser (like flex itself) wants to
+                                         * call the scanner after we return the
+                                         * YY_NULL, it'll still work - another
+                                         * YY_NULL will get returned.
+                                         */
+                                        (yy_c_buf_p) = (yytext_ptr) + YY_MORE_ADJ;
+
+                                        yy_act = YY_STATE_EOF(YY_START);
+                                        goto do_action;
+                                        }
+
+                                else
+                                        {
+                                        if ( ! (yy_did_buffer_switch_on_eof) )
+                                                YY_NEW_FILE;
+                                        }
+                                break;
+                                }
+
+                        case EOB_ACT_CONTINUE_SCAN:
+                                (yy_c_buf_p) =
+                                        (yytext_ptr) + yy_amount_of_matched_text;
+
+                                yy_current_state = yy_get_previous_state(  );
+
+                                yy_cp = (yy_c_buf_p);
+                                yy_bp = (yytext_ptr) + YY_MORE_ADJ;
+                                goto yy_match;
+
+                        case EOB_ACT_LAST_MATCH:
+                                (yy_c_buf_p) =
+                                &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)];
+
+                                yy_current_state = yy_get_previous_state(  );
+
+                                yy_cp = (yy_c_buf_p);
+                                yy_bp = (yytext_ptr) + YY_MORE_ADJ;
+                                goto yy_find_action;
+                        }
+                break;
+                }
+
+        default:
+                YY_FATAL_ERROR(
+                        "fatal flex scanner internal error--no action found" );
+        } /* end of action switch */
+                } /* end of scanning one token */
+} /* end of zconflex */
+
+/* yy_get_next_buffer - try to read in a new buffer
+ *
+ * Returns a code representing an action:
+ *      EOB_ACT_LAST_MATCH -
+ *      EOB_ACT_CONTINUE_SCAN - continue scanning from current position
+ *      EOB_ACT_END_OF_FILE - end of file
+ */
+static int yy_get_next_buffer (void)
+{
+        register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
+        register char *source = (yytext_ptr);
+        register int number_to_move, i;
+        int ret_val;
+
+        if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] )
+                YY_FATAL_ERROR(
+                "fatal flex scanner internal error--end of buffer missed" );
+
+        if ( YY_CURRENT_BUFFER_LVALUE->yy_fill_buffer == 0 )
+                { /* Don't try to fill the buffer, so this is an EOF. */
+                if ( (yy_c_buf_p) - (yytext_ptr) - YY_MORE_ADJ == 1 )
+                        {
+                        /* We matched a single character, the EOB, so
+                         * treat this as a final EOF.
+                         */
+                        return EOB_ACT_END_OF_FILE;
+                        }
+
+                else
+                        {
+                        /* We matched some text prior to the EOB, first
+                         * process it.
+                         */
+                        return EOB_ACT_LAST_MATCH;
+                        }
+                }
+
+        /* Try to read more data. */
+
+        /* First move last chars to start of buffer. */
+        number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr)) - 1;
+
+        for ( i = 0; i < number_to_move; ++i )
+                *(dest++) = *(source++);
+
+        if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_EOF_PENDING )
+                /* don't do the read, it's not guaranteed to return an EOF,
+                 * just force an EOF
+                 */
+                YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars) = 0;
+
+        else
+                {
+                        size_t num_to_read =
+                        YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
+
+                while ( num_to_read <= 0 )
+                        { /* Not enough room in the buffer - grow it. */
+
+                        /* just a shorter name for the current buffer */
+                        YY_BUFFER_STATE b = YY_CURRENT_BUFFER;
+
+                        int yy_c_buf_p_offset =
+                                (int) ((yy_c_buf_p) - b->yy_ch_buf);
+
+                        if ( b->yy_is_our_buffer )
+                                {
+                                int new_size = b->yy_buf_size * 2;
+
+                                if ( new_size <= 0 )
+                                        b->yy_buf_size += b->yy_buf_size / 8;
+                                else
+                                        b->yy_buf_size *= 2;
+
+                                b->yy_ch_buf = (char *)
+                                        /* Include room in for 2 EOB chars. */
+                                        zconfrealloc((void *) b->yy_ch_buf,b->yy_buf_size + 2  );
+                                }
+                        else
+                                /* Can't grow it, we don't own it. */
+                                b->yy_ch_buf = 0;
+
+                        if ( ! b->yy_ch_buf )
+                                YY_FATAL_ERROR(
+                                "fatal error - scanner input buffer overflow" );
+
+                        (yy_c_buf_p) = &b->yy_ch_buf[yy_c_buf_p_offset];
+
+                        num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size -
+                                                number_to_move - 1;
+
+                        }
+
+                if ( num_to_read > YY_READ_BUF_SIZE )
+                        num_to_read = YY_READ_BUF_SIZE;
+
+                /* Read in more data. */
+                YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
+                        (yy_n_chars), num_to_read );
+
+                YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
+                }
+
+        if ( (yy_n_chars) == 0 )
+                {
+                if ( number_to_move == YY_MORE_ADJ )
+                        {
+                        ret_val = EOB_ACT_END_OF_FILE;
+                        zconfrestart(zconfin  );
+                        }
+
+                else
+                        {
+                        ret_val = EOB_ACT_LAST_MATCH;
+                        YY_CURRENT_BUFFER_LVALUE->yy_buffer_status =
+                                YY_BUFFER_EOF_PENDING;
+                        }
+                }
+
+        else
+                ret_val = EOB_ACT_CONTINUE_SCAN;
+
+        (yy_n_chars) += number_to_move;
+        YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] = YY_END_OF_BUFFER_CHAR;
+        YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] = YY_END_OF_BUFFER_CHAR;
+
+        (yytext_ptr) = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[0];
+
+        return ret_val;
+}
+
+/* yy_get_previous_state - get the state just before the EOB char was reached */
+
+    static yy_state_type yy_get_previous_state (void)
+{
+        register yy_state_type yy_current_state;
+        register char *yy_cp;
+    
+        yy_current_state = (yy_start);
+
+        for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp )
+                {
+                yy_current_state = yy_nxt[yy_current_state][(*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1)];
+                }
+
+        return yy_current_state;
+}
+
+/* yy_try_NUL_trans - try to make a transition on the NUL character
+ *
+ * synopsis
+ *      next_state = yy_try_NUL_trans( current_state );
+ */
+    static yy_state_type yy_try_NUL_trans  (yy_state_type yy_current_state )
+{
+        register int yy_is_jam;
+    
+        yy_current_state = yy_nxt[yy_current_state][1];
+        yy_is_jam = (yy_current_state <= 0);
+
+        return yy_is_jam ? 0 : yy_current_state;
+}
+
+    static void yyunput (int c, register char * yy_bp )
+{
+        register char *yy_cp;
+    
+    yy_cp = (yy_c_buf_p);
+
+        /* undo effects of setting up zconftext */
+        *yy_cp = (yy_hold_char);
+
+        if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
+                { /* need to shift things up to make room */
+                /* +2 for EOB chars. */
+                register int number_to_move = (yy_n_chars) + 2;
+                register char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[
+                                        YY_CURRENT_BUFFER_LVALUE->yy_buf_size + 2];
+                register char *source =
+                                &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move];
+
+                while ( source > YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
+                        *--dest = *--source;
+
+                yy_cp += (int) (dest - source);
+                yy_bp += (int) (dest - source);
+                YY_CURRENT_BUFFER_LVALUE->yy_n_chars =
+                        (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_buf_size;
+
+                if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
+                        YY_FATAL_ERROR( "flex scanner push-back overflow" );
+                }
+
+        *--yy_cp = (char) c;
+
+        (yytext_ptr) = yy_bp;
+        (yy_hold_char) = *yy_cp;
+        (yy_c_buf_p) = yy_cp;
+}
+
+#ifndef YY_NO_INPUT
+#ifdef __cplusplus
+    static int yyinput (void)
+#else
+    static int input  (void)
+#endif
+
+{
+        int c;
+    
+        *(yy_c_buf_p) = (yy_hold_char);
+
+        if ( *(yy_c_buf_p) == YY_END_OF_BUFFER_CHAR )
+                {
+                /* yy_c_buf_p now points to the character we want to return.
+                 * If this occurs *before* the EOB characters, then it's a
+                 * valid NUL; if not, then we've hit the end of the buffer.
+                 */
+                if ( (yy_c_buf_p) < &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] )
+                        /* This was really a NUL. */
+                        *(yy_c_buf_p) = '\0';
+
+                else
+                        { /* need more input */
+                        int offset = (yy_c_buf_p) - (yytext_ptr);
+                        ++(yy_c_buf_p);
+
+                        switch ( yy_get_next_buffer(  ) )
+                                {
+                                case EOB_ACT_LAST_MATCH:
+                                        /* This happens because yy_g_n_b()
+                                         * sees that we've accumulated a
+                                         * token and flags that we need to
+                                         * try matching the token before
+                                         * proceeding.  But for input(),
+                                         * there's no matching to consider.
+                                         * So convert the EOB_ACT_LAST_MATCH
+                                         * to EOB_ACT_END_OF_FILE.
+                                         */
+
+                                        /* Reset buffer status. */
+                                        zconfrestart(zconfin );
+
+                                        /*FALLTHROUGH*/
+
+                                case EOB_ACT_END_OF_FILE:
+                                        {
+                                        if ( zconfwrap( ) )
+                                                return EOF;
+
+                                        if ( ! (yy_did_buffer_switch_on_eof) )
+                                                YY_NEW_FILE;
+#ifdef __cplusplus
+                                        return yyinput();
+#else
+                                        return input();
+#endif
+                                        }
+
+                                case EOB_ACT_CONTINUE_SCAN:
+                                        (yy_c_buf_p) = (yytext_ptr) + offset;
+                                        break;
+                                }
+                        }
+                }
+
+        c = *(unsigned char *) (yy_c_buf_p);    /* cast for 8-bit char's */
+        *(yy_c_buf_p) = '\0';   /* preserve zconftext */
+        (yy_hold_char) = *++(yy_c_buf_p);
+
+        return c;
+}
+#endif  /* ifndef YY_NO_INPUT */
+
+/** Immediately switch to a different input stream.
+ * @param input_file A readable stream.
+ * 
+ * @note This function does not reset the start condition to @c INITIAL .
+ */
+    void zconfrestart  (FILE * input_file )
+{
+    
+        if ( ! YY_CURRENT_BUFFER ){
+        zconfensure_buffer_stack ();
+                YY_CURRENT_BUFFER_LVALUE =
+            zconf_create_buffer(zconfin,YY_BUF_SIZE );
+        }
+
+        zconf_init_buffer(YY_CURRENT_BUFFER,input_file );
+        zconf_load_buffer_state( );
+}
+
+/** Switch to a different input buffer.
+ * @param new_buffer The new input buffer.
+ * 
+ */
+    void zconf_switch_to_buffer  (YY_BUFFER_STATE  new_buffer )
+{
+    
+        /* TODO. We should be able to replace this entire function body
+         * with
+         *              zconfpop_buffer_state();
+         *              zconfpush_buffer_state(new_buffer);
+     */
+        zconfensure_buffer_stack ();
+        if ( YY_CURRENT_BUFFER == new_buffer )
+                return;
+
+        if ( YY_CURRENT_BUFFER )
+                {
+                /* Flush out information for old buffer. */
+                *(yy_c_buf_p) = (yy_hold_char);
+                YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
+                YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
+                }
+
+        YY_CURRENT_BUFFER_LVALUE = new_buffer;
+        zconf_load_buffer_state( );
+
+        /* We don't actually know whether we did this switch during
+         * EOF (zconfwrap()) processing, but the only time this flag
+         * is looked at is after zconfwrap() is called, so it's safe
+         * to go ahead and always set it.
+         */
+        (yy_did_buffer_switch_on_eof) = 1;
+}
+
+static void zconf_load_buffer_state  (void)
+{
+        (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
+        (yytext_ptr) = (yy_c_buf_p) = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos;
+        zconfin = YY_CURRENT_BUFFER_LVALUE->yy_input_file;
+        (yy_hold_char) = *(yy_c_buf_p);
+}
+
+/** Allocate and initialize an input buffer state.
+ * @param file A readable stream.
+ * @param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE.
+ * 
+ * @return the allocated buffer state.
+ */
+    YY_BUFFER_STATE zconf_create_buffer  (FILE * file, int  size )
+{
+        YY_BUFFER_STATE b;
+    
+        b = (YY_BUFFER_STATE) zconfalloc(sizeof( struct yy_buffer_state )  );
+        if ( ! b )
+                YY_FATAL_ERROR( "out of dynamic memory in zconf_create_buffer()" );
+
+        b->yy_buf_size = size;
+
+        /* yy_ch_buf has to be 2 characters longer than the size given because
+         * we need to put in 2 end-of-buffer characters.
+         */
+        b->yy_ch_buf = (char *) zconfalloc(b->yy_buf_size + 2  );
+        if ( ! b->yy_ch_buf )
+                YY_FATAL_ERROR( "out of dynamic memory in zconf_create_buffer()" );
+
+        b->yy_is_our_buffer = 1;
+
+        zconf_init_buffer(b,file );
+
+        return b;
+}
+
+/** Destroy the buffer.
+ * @param b a buffer created with zconf_create_buffer()
+ * 
+ */
+    void zconf_delete_buffer (YY_BUFFER_STATE  b )
+{
+    
+        if ( ! b )
+                return;
+
+        if ( b == YY_CURRENT_BUFFER ) /* Not sure if we should pop here. */
+                YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0;
+
+        if ( b->yy_is_our_buffer )
+                zconffree((void *) b->yy_ch_buf  );
+
+        zconffree((void *) b  );
+}
+
+/* Initializes or reinitializes a buffer.
+ * This function is sometimes called more than once on the same buffer,
+ * such as during a zconfrestart() or at EOF.
+ */
+    static void zconf_init_buffer  (YY_BUFFER_STATE  b, FILE * file )
+
+{
+        int oerrno = errno;
+    
+        zconf_flush_buffer(b );
+
+        b->yy_input_file = file;
+        b->yy_fill_buffer = 1;
+
+    /* If b is the current buffer, then zconf_init_buffer was _probably_
+     * called from zconfrestart() or through yy_get_next_buffer.
+     * In that case, we don't want to reset the lineno or column.
+     */
+    if (b != YY_CURRENT_BUFFER){
+        b->yy_bs_lineno = 1;
+        b->yy_bs_column = 0;
+    }
+
+        b->yy_is_interactive = 0;
+    
+        errno = oerrno;
+}
+
+/** Discard all buffered characters. On the next scan, YY_INPUT will be called.
+ * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER.
+ * 
+ */
+    void zconf_flush_buffer (YY_BUFFER_STATE  b )
+{
+        if ( ! b )
+                return;
+
+        b->yy_n_chars = 0;
+
+        /* We always need two end-of-buffer characters.  The first causes
+         * a transition to the end-of-buffer state.  The second causes
+         * a jam in that state.
+         */
+        b->yy_ch_buf[0] = YY_END_OF_BUFFER_CHAR;
+        b->yy_ch_buf[1] = YY_END_OF_BUFFER_CHAR;
+
+        b->yy_buf_pos = &b->yy_ch_buf[0];
+
+        b->yy_at_bol = 1;
+        b->yy_buffer_status = YY_BUFFER_NEW;
+
+        if ( b == YY_CURRENT_BUFFER )
+                zconf_load_buffer_state( );
+}
+
+/** Pushes the new state onto the stack. The new state becomes
+ *  the current state. This function will allocate the stack
+ *  if necessary.
+ *  @param new_buffer The new state.
+ *  
+ */
+void zconfpush_buffer_state (YY_BUFFER_STATE new_buffer )
+{
+        if (new_buffer == NULL)
+                return;
+
+        zconfensure_buffer_stack();
+
+        /* This block is copied from zconf_switch_to_buffer. */
+        if ( YY_CURRENT_BUFFER )
+                {
+                /* Flush out information for old buffer. */
+                *(yy_c_buf_p) = (yy_hold_char);
+                YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
+                YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
+                }
+
+        /* Only push if top exists. Otherwise, replace top. */
+        if (YY_CURRENT_BUFFER)
+                (yy_buffer_stack_top)++;
+        YY_CURRENT_BUFFER_LVALUE = new_buffer;
+
+        /* copied from zconf_switch_to_buffer. */
+        zconf_load_buffer_state( );
+        (yy_did_buffer_switch_on_eof) = 1;
+}
+
+/** Removes and deletes the top of the stack, if present.
+ *  The next element becomes the new top.
+ *  
+ */
+void zconfpop_buffer_state (void)
+{
+        if (!YY_CURRENT_BUFFER)
+                return;
+
+        zconf_delete_buffer(YY_CURRENT_BUFFER );
+        YY_CURRENT_BUFFER_LVALUE = NULL;
+        if ((yy_buffer_stack_top) > 0)
+                --(yy_buffer_stack_top);
+
+        if (YY_CURRENT_BUFFER) {
+                zconf_load_buffer_state( );
+                (yy_did_buffer_switch_on_eof) = 1;
+        }
+}
+
+/* Allocates the stack if it does not exist.
+ *  Guarantees space for at least one push.
+ */
+static void zconfensure_buffer_stack (void)
+{
+        int num_to_alloc;
+    
+        if (!(yy_buffer_stack)) {
+
+                /* First allocation is just for 2 elements, since we don't know if this
+                 * scanner will even need a stack. We use 2 instead of 1 to avoid an
+                 * immediate realloc on the next call.
+         */
+                num_to_alloc = 1;
+                (yy_buffer_stack) = (struct yy_buffer_state**)zconfalloc
+                                                                (num_to_alloc * sizeof(struct yy_buffer_state*)
+                                                                );
+                
+                memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*));
+                                
+                (yy_buffer_stack_max) = num_to_alloc;
+                (yy_buffer_stack_top) = 0;
+                return;
+        }
+
+        if ((yy_buffer_stack_top) >= ((yy_buffer_stack_max)) - 1){
+
+                /* Increase the buffer to prepare for a possible push. */
+                int grow_size = 8 /* arbitrary grow size */;
+
+                num_to_alloc = (yy_buffer_stack_max) + grow_size;
+                (yy_buffer_stack) = (struct yy_buffer_state**)zconfrealloc
+                                                                ((yy_buffer_stack),
+                                                                num_to_alloc * sizeof(struct yy_buffer_state*)
+                                                                );
+
+                /* zero only the new slots.*/
+                memset((yy_buffer_stack) + (yy_buffer_stack_max), 0, grow_size * sizeof(struct yy_buffer_state*));
+                (yy_buffer_stack_max) = num_to_alloc;
+        }
+}
+
+/** Setup the input buffer state to scan directly from a user-specified character buffer.
+ * @param base the character buffer
+ * @param size the size in bytes of the character buffer
+ * 
+ * @return the newly allocated buffer state object. 
+ */
+YY_BUFFER_STATE zconf_scan_buffer  (char * base, yy_size_t  size )
+{
+        YY_BUFFER_STATE b;
+    
+        if ( size < 2 ||
+             base[size-2] != YY_END_OF_BUFFER_CHAR ||
+             base[size-1] != YY_END_OF_BUFFER_CHAR )
+                /* They forgot to leave room for the EOB's. */
+                return 0;
+
+        b = (YY_BUFFER_STATE) zconfalloc(sizeof( struct yy_buffer_state )  );
+        if ( ! b )
+                YY_FATAL_ERROR( "out of dynamic memory in zconf_scan_buffer()" );
+
+        b->yy_buf_size = size - 2;      /* "- 2" to take care of EOB's */
+        b->yy_buf_pos = b->yy_ch_buf = base;
+        b->yy_is_our_buffer = 0;
+        b->yy_input_file = 0;
+        b->yy_n_chars = b->yy_buf_size;
+        b->yy_is_interactive = 0;
+        b->yy_at_bol = 1;
+        b->yy_fill_buffer = 0;
+        b->yy_buffer_status = YY_BUFFER_NEW;
+
+        zconf_switch_to_buffer(b  );
+
+        return b;
+}
+
+/** Setup the input buffer state to scan a string. The next call to zconflex() will
+ * scan from a @e copy of @a str.
+ * @param yy_str a NUL-terminated string to scan
+ * 
+ * @return the newly allocated buffer state object.
+ * @note If you want to scan bytes that may contain NUL values, then use
+ *       zconf_scan_bytes() instead.
+ */
+YY_BUFFER_STATE zconf_scan_string (yyconst char * yy_str )
+{
+    
+        return zconf_scan_bytes(yy_str,strlen(yy_str) );
+}
+
+/** Setup the input buffer state to scan the given bytes. The next call to zconflex() will
+ * scan from a @e copy of @a bytes.
+ * @param bytes the byte buffer to scan
+ * @param len the number of bytes in the buffer pointed to by @a bytes.
+ * 
+ * @return the newly allocated buffer state object.
+ */
+YY_BUFFER_STATE zconf_scan_bytes  (yyconst char * bytes, int  len )
+{
+        YY_BUFFER_STATE b;
+        char *buf;
+        yy_size_t n;
+        int i;
+    
+        /* Get memory for full buffer, including space for trailing EOB's. */
+        n = len + 2;
+        buf = (char *) zconfalloc(n  );
+        if ( ! buf )
+                YY_FATAL_ERROR( "out of dynamic memory in zconf_scan_bytes()" );
+
+        for ( i = 0; i < len; ++i )
+                buf[i] = bytes[i];
+
+        buf[len] = buf[len+1] = YY_END_OF_BUFFER_CHAR;
+
+        b = zconf_scan_buffer(buf,n );
+        if ( ! b )
+                YY_FATAL_ERROR( "bad buffer in zconf_scan_bytes()" );
+
+        /* It's okay to grow etc. this buffer, and we should throw it
+         * away when we're done.
+         */
+        b->yy_is_our_buffer = 1;
+
+        return b;
+}
+
+#ifndef YY_EXIT_FAILURE
+#define YY_EXIT_FAILURE 2
+#endif
+
+static void yy_fatal_error (yyconst char* msg )
+{
+        (void) fprintf( stderr, "%s\n", msg );
+        exit( YY_EXIT_FAILURE );
+}
+
+/* Redefine yyless() so it works in section 3 code. */
+
+#undef yyless
+#define yyless(n) \
+        do \
+                { \
+                /* Undo effects of setting up zconftext. */ \
+        int yyless_macro_arg = (n); \
+        YY_LESS_LINENO(yyless_macro_arg);\
+                zconftext[zconfleng] = (yy_hold_char); \
+                (yy_c_buf_p) = zconftext + yyless_macro_arg; \
+                (yy_hold_char) = *(yy_c_buf_p); \
+                *(yy_c_buf_p) = '\0'; \
+                zconfleng = yyless_macro_arg; \
+                } \
+        while ( 0 )
+
+/* Accessor  methods (get/set functions) to struct members. */
+
+/** Get the current line number.
+ * 
+ */
+int zconfget_lineno  (void)
+{
+        
+    return zconflineno;
+}
+
+/** Get the input stream.
+ * 
+ */
+FILE *zconfget_in  (void)
+{
+        return zconfin;
+}
+
+/** Get the output stream.
+ * 
+ */
+FILE *zconfget_out  (void)
+{
+        return zconfout;
+}
+
+/** Get the length of the current token.
+ * 
+ */
+int zconfget_leng  (void)
+{
+        return zconfleng;
+}
+
+/** Get the current token.
+ * 
+ */
+
+char *zconfget_text  (void)
+{
+        return zconftext;
+}
+
+/** Set the current line number.
+ * @param line_number
+ * 
+ */
+void zconfset_lineno (int  line_number )
+{
+    
+    zconflineno = line_number;
+}
+
+/** Set the input stream. This does not discard the current
+ * input buffer.
+ * @param in_str A readable stream.
+ * 
+ * @see zconf_switch_to_buffer
+ */
+void zconfset_in (FILE *  in_str )
+{
+        zconfin = in_str ;
+}
+
+void zconfset_out (FILE *  out_str )
+{
+        zconfout = out_str ;
+}
+
+int zconfget_debug  (void)
+{
+        return zconf_flex_debug;
+}
+
+void zconfset_debug (int  bdebug )
+{
+        zconf_flex_debug = bdebug ;
+}
+
+/* zconflex_destroy is for both reentrant and non-reentrant scanners. */
+int zconflex_destroy  (void)
+{
+    
+    /* Pop the buffer stack, destroying each element. */
+        while(YY_CURRENT_BUFFER){
+                zconf_delete_buffer(YY_CURRENT_BUFFER  );
+                YY_CURRENT_BUFFER_LVALUE = NULL;
+                zconfpop_buffer_state();
+        }
+
+        /* Destroy the stack itself. */
+        zconffree((yy_buffer_stack) );
+        (yy_buffer_stack) = NULL;
+
+    return 0;
+}
+
+/*
+ * Internal utility routines.
+ */
+
+#ifndef yytext_ptr
+static void yy_flex_strncpy (char* s1, yyconst char * s2, int n )
+{
+        register int i;
+        for ( i = 0; i < n; ++i )
+                s1[i] = s2[i];
+}
+#endif
+
+#ifdef YY_NEED_STRLEN
+static int yy_flex_strlen (yyconst char * s )
+{
+        register int n;
+        for ( n = 0; s[n]; ++n )
+                ;
+
+        return n;
+}
+#endif
+
+void *zconfalloc (yy_size_t  size )
+{
+        return (void *) malloc( size );
+}
+
+void *zconfrealloc  (void * ptr, yy_size_t  size )
+{
+        /* The cast to (char *) in the following accommodates both
+         * implementations that use char* generic pointers, and those
+         * that use void* generic pointers.  It works with the latter
+         * because both ANSI C and C++ allow castless assignment from
+         * any pointer type to void*, and deal with argument conversions
+         * as though doing an assignment.
+         */
+        return (void *) realloc( (char *) ptr, size );
+}
+
+void zconffree (void * ptr )
+{
+        free( (char *) ptr );   /* see zconfrealloc() for (char *) cast */
+}
+
+#define YYTABLES_NAME "yytables"
+
+#undef YY_NEW_FILE
+#undef YY_FLUSH_BUFFER
+#undef yy_set_bol
+#undef yy_new_buffer
+#undef yy_set_interactive
+#undef yytext_ptr
+#undef YY_DO_BEFORE_ACTION
+
+#ifdef YY_DECL_IS_OURS
+#undef YY_DECL_IS_OURS
+#undef YY_DECL
+#endif
+
+void zconf_starthelp(void)
+{
+        new_string();
+        last_ts = first_ts = 0;
+        BEGIN(HELP);
+}
+
+static void zconf_endhelp(void)
+{
+        zconflval.string = text;
+        BEGIN(INITIAL);
+}
+
+/*
+ * Try to open specified file with following names:
+ * ./name
+ * $(srctree)/name
+ * The latter is used when srctree is separate from objtree
+ * when compiling the kernel.
+ * Return NULL if file is not found.
+ */
+FILE *zconf_fopen(const char *name)
+{
+        char *env, fullname[PATH_MAX+1];
+        FILE *f;
+
+        f = fopen(name, "r");
+        if (!f && name[0] != '/') {
+                env = getenv(SRCTREE);
+                if (env) {
+                        sprintf(fullname, "%s/%s", env, name);
+                        f = fopen(fullname, "r");
+                }
+        }
+        return f;
+}
+
+void zconf_initscan(const char *name)
+{
+        zconfin = zconf_fopen(name);
+        if (!zconfin) {
+                printf("can't find file %s\n", name);
+                exit(1);
+        }
+
+        current_buf = malloc(sizeof(*current_buf));
+        memset(current_buf, 0, sizeof(*current_buf));
+
+        current_file = file_lookup(name);
+        current_file->lineno = 1;
+        current_file->flags = FILE_BUSY;
+}
+
+void zconf_nextfile(const char *name)
+{
+        struct file *file = file_lookup(name);
+        struct buffer *buf = malloc(sizeof(*buf));
+        memset(buf, 0, sizeof(*buf));
+
+        current_buf->state = YY_CURRENT_BUFFER;
+        zconfin = zconf_fopen(name);
+        if (!zconfin) {
+                printf("%s:%d: can't open file \"%s\"\n", zconf_curname(), zconf_lineno(), name);
+                exit(1);
+        }
+        zconf_switch_to_buffer(zconf_create_buffer(zconfin,YY_BUF_SIZE));
+        buf->parent = current_buf;
+        current_buf = buf;
+
+        if (file->flags & FILE_BUSY) {
+                printf("recursive scan (%s)?\n", name);
+                exit(1);
+        }
+        if (file->flags & FILE_SCANNED) {
+                printf("file %s already scanned?\n", name);
+                exit(1);
+        }
+        file->flags |= FILE_BUSY;
+        file->lineno = 1;
+        file->parent = current_file;
+        current_file = file;
+}
+
+static void zconf_endfile(void)
+{
+        struct buffer *parent;
+
+        current_file->flags |= FILE_SCANNED;
+        current_file->flags &= ~FILE_BUSY;
+        current_file = current_file->parent;
+
+        parent = current_buf->parent;
+        if (parent) {
+                fclose(zconfin);
+                zconf_delete_buffer(YY_CURRENT_BUFFER);
+                zconf_switch_to_buffer(parent->state);
+        }
+        free(current_buf);
+        current_buf = parent;
+}
+
+int zconf_lineno(void)
+{
+        return current_pos.lineno;
+}
+
+char *zconf_curname(void)
+{
+        return current_pos.file ? current_pos.file->name : "<none>";
+}
+
diff --git a/scripts/config/lkc.h b/scripts/kconfig/lkc.h
index 8c38f1f87..527f60c99 100644
--- a/scripts/config/lkc.h
+++ b/scripts/kconfig/lkc.h
@@ -1,4 +1,3 @@
-/* vi: set sw=4 ts=4: */
 /*
  * Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org>
  * Released under the terms of the GNU GPL v2.0.
@@ -9,6 +8,14 @@
 
 #include "expr.h"
 
+#ifndef KBUILD_NO_NLS
+# include <libintl.h>
+#else
+# define gettext(Msgid) ((const char *) (Msgid))
+# define textdomain(Domainname) ((const char *) (Domainname))
+# define bindtextdomain(Domainname, Dirname) ((const char *) (Dirname))
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -24,6 +31,23 @@ extern "C" {
 
 #define SRCTREE "srctree"
 
+#define PACKAGE "linux"
+#define LOCALEDIR "/usr/share/locale"
+
+#define _(text) gettext(text)
+#define N_(text) (text)
+
+
+#define TF_COMMAND      0x0001
+#define TF_PARAM        0x0002
+
+struct kconf_id {
+        int name;
+        int token;
+        unsigned int flags;
+        enum symbol_type stype;
+};
+
 int zconfparse(void);
 void zconfdump(FILE *out);
 
@@ -37,7 +61,6 @@ char *zconf_curname(void);
 
 /* confdata.c */
 extern const char conf_def_filename[];
-extern char conf_filename[];
 
 char *conf_get_default_confname(void);
 
@@ -46,13 +69,13 @@ void kconfig_load(void);
 
 /* menu.c */
 void menu_init(void);
-void menu_add_menu(void);
+struct menu *menu_add_menu(void);
 void menu_end_menu(void);
 void menu_add_entry(struct symbol *sym);
 void menu_end_entry(void);
 void menu_add_dep(struct expr *dep);
 struct property *menu_add_prop(enum prop_type type, char *prompt, struct expr *expr, struct expr *dep);
-void menu_add_prompt(enum prop_type type, char *prompt, struct expr *dep);
+struct property *menu_add_prompt(enum prop_type type, char *prompt, struct expr *dep);
 void menu_add_expr(enum prop_type type, struct expr *expr, struct expr *dep);
 void menu_add_symbol(enum prop_type type, struct symbol *sym, struct expr *dep);
 void menu_finalize(struct menu *parent);
diff --git a/scripts/config/lkc_proto.h b/scripts/kconfig/lkc_proto.h
index c416357df..b6a389c5f 100644
--- a/scripts/config/lkc_proto.h
+++ b/scripts/kconfig/lkc_proto.h
@@ -1,8 +1,8 @@
-/* vi: set sw=4 ts=4: */
 
 /* confdata.c */
 P(conf_parse,void,(const char *name));
 P(conf_read,int,(const char *name));
+P(conf_read_simple,int,(const char *name));
 P(conf_write,int,(const char *name));
 
 /* menu.c */
diff --git a/scripts/config/lxdialog/BIG.FAT.WARNING b/scripts/kconfig/lxdialog/BIG.FAT.WARNING
index 7cb5a7ec9..a8999d82b 100644
--- a/scripts/config/lxdialog/BIG.FAT.WARNING
+++ b/scripts/kconfig/lxdialog/BIG.FAT.WARNING
@@ -1,4 +1,4 @@
 This is NOT the official version of dialog.  This version has been
 significantly modified from the original.  It is for use by the Linux
-kernel configuration script.  Please do not bother Savio Lam with
+kernel configuration script.  Please do not bother Savio Lam with 
 questions about this program.
diff --git a/scripts/kconfig/lxdialog/Makefile b/scripts/kconfig/lxdialog/Makefile
new file mode 100644
index 000000000..a8b026326
--- /dev/null
+++ b/scripts/kconfig/lxdialog/Makefile
@@ -0,0 +1,21 @@
+# Makefile to build lxdialog package
+#
+
+check-lxdialog  := $(srctree)/$(src)/check-lxdialog.sh
+
+# Use reursively expanded variables so we do not call gcc unless
+# we really need to do so. (Do not call gcc as part of make mrproper)
+HOST_EXTRACFLAGS = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ccflags)
+HOST_LOADLIBES   = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ldflags $(HOSTCC))
+
+HOST_EXTRACFLAGS += -DLOCALE
+
+PHONY += dochecklxdialog
+$(obj)/dochecklxdialog:
+        $(Q)$(CONFIG_SHELL) $(check-lxdialog) -check $(HOSTCC) $(HOST_LOADLIBES)
+
+hostprogs-y     := lxdialog
+always          := $(hostprogs-y) dochecklxdialog
+
+lxdialog-objs := checklist.o menubox.o textbox.o yesno.o inputbox.o \
+                 util.o lxdialog.o msgbox.o
diff --git a/scripts/kconfig/lxdialog/check-lxdialog.sh b/scripts/kconfig/lxdialog/check-lxdialog.sh
new file mode 100644
index 000000000..120d624e6
--- /dev/null
+++ b/scripts/kconfig/lxdialog/check-lxdialog.sh
@@ -0,0 +1,84 @@
+#!/bin/sh
+# Check ncurses compatibility
+
+# What library to link
+ldflags()
+{
+        $cc -print-file-name=libncursesw.so | grep -q /
+        if [ $? -eq 0 ]; then
+                echo '-lncursesw'
+                exit
+        fi
+        $cc -print-file-name=libncurses.so | grep -q /
+        if [ $? -eq 0 ]; then
+                echo '-lncurses'
+                exit
+        fi
+        $cc -print-file-name=libcurses.so | grep -q /
+        if [ $? -eq 0 ]; then
+                echo '-lcurses'
+                exit
+        fi
+        exit 1
+}
+
+# Where is ncurses.h?
+ccflags()
+{
+        if [ -f /usr/include/ncurses/ncurses.h ]; then
+                echo '-I/usr/include/ncurses -DCURSES_LOC="<ncurses.h>"'
+        elif [ -f /usr/include/ncurses/curses.h ]; then
+                echo '-I/usr/include/ncurses -DCURSES_LOC="<ncurses/curses.h>"'
+        elif [ -f /usr/include/ncurses.h ]; then
+                echo '-DCURSES_LOC="<ncurses.h>"'
+        else
+                echo '-DCURSES_LOC="<curses.h>"'
+        fi
+}
+
+# Temp file, try to clean up after us
+tmp=.lxdialog.tmp
+trap "rm -f $tmp" 0 1 2 3 15
+
+# Check if we can link to ncurses
+check() {
+        echo "main() {}" | $cc -xc - -o $tmp 2> /dev/null
+        if [ $? != 0 ]; then
+                echo " *** Unable to find the ncurses libraries."          1>&2
+                echo " *** make menuconfig require the ncurses libraries"  1>&2
+                echo " *** "                                               1>&2
+                echo " *** Install ncurses (ncurses-devel) and try again"  1>&2
+                echo " *** "                                               1>&2
+                exit 1
+        fi
+}
+
+usage() {
+        printf "Usage: $0 [-check compiler options|-header|-library]\n"
+}
+
+if [ $# == 0 ]; then
+        usage
+        exit 1
+fi
+
+cc=""
+case "$1" in
+        "-check")
+                shift
+                cc="$@"
+                check
+                ;;
+        "-ccflags")
+                ccflags
+                ;;
+        "-ldflags")
+                shift
+                cc="$@"
+                ldflags
+                ;;
+        "*")
+                usage
+                exit 1
+                ;;
+esac
diff --git a/scripts/kconfig/lxdialog/checklist.c b/scripts/kconfig/lxdialog/checklist.c
new file mode 100644
index 000000000..be0200e9c
--- /dev/null
+++ b/scripts/kconfig/lxdialog/checklist.c
@@ -0,0 +1,333 @@
+/*
+ *  checklist.c -- implements the checklist box
+ *
+ *  ORIGINAL AUTHOR: Savio Lam (lam836@cs.cuhk.hk)
+ *     Stuart Herbert - S.Herbert@sheffield.ac.uk: radiolist extension
+ *     Alessandro Rubini - rubini@ipvvis.unipv.it: merged the two
+ *  MODIFIED FOR LINUX KERNEL CONFIG BY: William Roadcap (roadcap@cfw.com)
+ *
+ *  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 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, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "dialog.h"
+
+static int list_width, check_x, item_x;
+
+/*
+ * Print list item
+ */
+static void print_item(WINDOW * win, const char *item, int status, int choice,
+                       int selected)
+{
+        int i;
+
+        /* Clear 'residue' of last item */
+        wattrset(win, menubox_attr);
+        wmove(win, choice, 0);
+        for (i = 0; i < list_width; i++)
+                waddch(win, ' ');
+
+        wmove(win, choice, check_x);
+        wattrset(win, selected ? check_selected_attr : check_attr);
+        wprintw(win, "(%c)", status ? 'X' : ' ');
+
+        wattrset(win, selected ? tag_selected_attr : tag_attr);
+        mvwaddch(win, choice, item_x, item[0]);
+        wattrset(win, selected ? item_selected_attr : item_attr);
+        waddstr(win, (char *)item + 1);
+        if (selected) {
+                wmove(win, choice, check_x + 1);
+                wrefresh(win);
+        }
+}
+
+/*
+ * Print the scroll indicators.
+ */
+static void print_arrows(WINDOW * win, int choice, int item_no, int scroll,
+             int y, int x, int height)
+{
+        wmove(win, y, x);
+
+        if (scroll > 0) {
+                wattrset(win, uarrow_attr);
+                waddch(win, ACS_UARROW);
+                waddstr(win, "(-)");
+        } else {
+                wattrset(win, menubox_attr);
+                waddch(win, ACS_HLINE);
+                waddch(win, ACS_HLINE);
+                waddch(win, ACS_HLINE);
+                waddch(win, ACS_HLINE);
+        }
+
+        y = y + height + 1;
+        wmove(win, y, x);
+
+        if ((height < item_no) && (scroll + choice < item_no - 1)) {
+                wattrset(win, darrow_attr);
+                waddch(win, ACS_DARROW);
+                waddstr(win, "(+)");
+        } else {
+                wattrset(win, menubox_border_attr);
+                waddch(win, ACS_HLINE);
+                waddch(win, ACS_HLINE);
+                waddch(win, ACS_HLINE);
+                waddch(win, ACS_HLINE);
+        }
+}
+
+/*
+ *  Display the termination buttons
+ */
+static void print_buttons(WINDOW * dialog, int height, int width, int selected)
+{
+        int x = width / 2 - 11;
+        int y = height - 2;
+
+        print_button(dialog, "Select", y, x, selected == 0);
+        print_button(dialog, " Help ", y, x + 14, selected == 1);
+
+        wmove(dialog, y, x + 1 + 14 * selected);
+        wrefresh(dialog);
+}
+
+/*
+ * Display a dialog box with a list of options that can be turned on or off
+ * in the style of radiolist (only one option turned on at a time).
+ */
+int dialog_checklist(const char *title, const char *prompt, int height,
+                     int width, int list_height, int item_no,
+                     const char *const *items)
+{
+        int i, x, y, box_x, box_y;
+        int key = 0, button = 0, choice = 0, scroll = 0, max_choice, *status;
+        WINDOW *dialog, *list;
+
+        /* Allocate space for storing item on/off status */
+        if ((status = malloc(sizeof(int) * item_no)) == NULL) {
+                endwin();
+                fprintf(stderr,
+                        "\nCan't allocate memory in dialog_checklist().\n");
+                exit(-1);
+        }
+
+        /* Initializes status */
+        for (i = 0; i < item_no; i++) {
+                status[i] = !strcasecmp(items[i * 3 + 2], "on");
+                if ((!choice && status[i])
+                    || !strcasecmp(items[i * 3 + 2], "selected"))
+                        choice = i + 1;
+        }
+        if (choice)
+                choice--;
+
+        max_choice = MIN(list_height, item_no);
+
+        /* center dialog box on screen */
+        x = (COLS - width) / 2;
+        y = (LINES - height) / 2;
+
+        draw_shadow(stdscr, y, x, height, width);
+
+        dialog = newwin(height, width, y, x);
+        keypad(dialog, TRUE);
+
+        draw_box(dialog, 0, 0, height, width, dialog_attr, border_attr);
+        wattrset(dialog, border_attr);
+        mvwaddch(dialog, height - 3, 0, ACS_LTEE);
+        for (i = 0; i < width - 2; i++)
+                waddch(dialog, ACS_HLINE);
+        wattrset(dialog, dialog_attr);
+        waddch(dialog, ACS_RTEE);
+
+        print_title(dialog, title, width);
+
+        wattrset(dialog, dialog_attr);
+        print_autowrap(dialog, prompt, width - 2, 1, 3);
+
+        list_width = width - 6;
+        box_y = height - list_height - 5;
+        box_x = (width - list_width) / 2 - 1;
+
+        /* create new window for the list */
+        list = subwin(dialog, list_height, list_width, y + box_y + 1,
+                      x + box_x + 1);
+
+        keypad(list, TRUE);
+
+        /* draw a box around the list items */
+        draw_box(dialog, box_y, box_x, list_height + 2, list_width + 2,
+                 menubox_border_attr, menubox_attr);
+
+        /* Find length of longest item in order to center checklist */
+        check_x = 0;
+        for (i = 0; i < item_no; i++)
+                check_x = MAX(check_x, +strlen(items[i * 3 + 1]) + 4);
+
+        check_x = (list_width - check_x) / 2;
+        item_x = check_x + 4;
+
+        if (choice >= list_height) {
+                scroll = choice - list_height + 1;
+                choice -= scroll;
+        }
+
+        /* Print the list */
+        for (i = 0; i < max_choice; i++) {
+                print_item(list, items[(scroll + i) * 3 + 1],
+                           status[i + scroll], i, i == choice);
+        }
+
+        print_arrows(dialog, choice, item_no, scroll,
+                     box_y, box_x + check_x + 5, list_height);
+
+        print_buttons(dialog, height, width, 0);
+
+        wnoutrefresh(dialog);
+        wnoutrefresh(list);
+        doupdate();
+
+        while (key != ESC) {
+                key = wgetch(dialog);
+
+                for (i = 0; i < max_choice; i++)
+                        if (toupper(key) ==
+                            toupper(items[(scroll + i) * 3 + 1][0]))
+                                break;
+
+                if (i < max_choice || key == KEY_UP || key == KEY_DOWN ||
+                    key == '+' || key == '-') {
+                        if (key == KEY_UP || key == '-') {
+                                if (!choice) {
+                                        if (!scroll)
+                                                continue;
+                                        /* Scroll list down */
+                                        if (list_height > 1) {
+                                                /* De-highlight current first item */
+                                                print_item(list, items[scroll * 3 + 1],
+                                                           status[scroll], 0, FALSE);
+                                                scrollok(list, TRUE);
+                                                wscrl(list, -1);
+                                                scrollok(list, FALSE);
+                                        }
+                                        scroll--;
+                                        print_item(list, items[scroll * 3 + 1], status[scroll], 0, TRUE);
+                                        print_arrows(dialog, choice, item_no,
+                                                     scroll, box_y, box_x + check_x + 5, list_height);
+
+                                        wnoutrefresh(dialog);
+                                        wrefresh(list);
+
+                                        continue;       /* wait for another key press */
+                                } else
+                                        i = choice - 1;
+                        } else if (key == KEY_DOWN || key == '+') {
+                                if (choice == max_choice - 1) {
+                                        if (scroll + choice >= item_no - 1)
+                                                continue;
+                                        /* Scroll list up */
+                                        if (list_height > 1) {
+                                                /* De-highlight current last item before scrolling up */
+                                                print_item(list, items[(scroll + max_choice - 1) * 3 + 1],
+                                                           status[scroll + max_choice - 1],
+                                                           max_choice - 1, FALSE);
+                                                scrollok(list, TRUE);
+                                                wscrl(list, 1);
+                                                scrollok(list, FALSE);
+                                        }
+                                        scroll++;
+                                        print_item(list, items[(scroll + max_choice - 1) * 3 + 1],
+                                                   status[scroll + max_choice - 1], max_choice - 1, TRUE);
+
+                                        print_arrows(dialog, choice, item_no,
+                                                     scroll, box_y, box_x + check_x + 5, list_height);
+
+                                        wnoutrefresh(dialog);
+                                        wrefresh(list);
+
+                                        continue;       /* wait for another key press */
+                                } else
+                                        i = choice + 1;
+                        }
+                        if (i != choice) {
+                                /* De-highlight current item */
+                                print_item(list, items[(scroll + choice) * 3 + 1],
+                                           status[scroll + choice], choice, FALSE);
+                                /* Highlight new item */
+                                choice = i;
+                                print_item(list, items[(scroll + choice) * 3 + 1],
+                                           status[scroll + choice], choice, TRUE);
+                                wnoutrefresh(dialog);
+                                wrefresh(list);
+                        }
+                        continue;       /* wait for another key press */
+                }
+                switch (key) {
+                case 'H':
+                case 'h':
+                case '?':
+                        fprintf(stderr, "%s", items[(scroll + choice) * 3]);
+                        delwin(dialog);
+                        free(status);
+                        return 1;
+                case TAB:
+                case KEY_LEFT:
+                case KEY_RIGHT:
+                        button = ((key == KEY_LEFT ? --button : ++button) < 0)
+                            ? 1 : (button > 1 ? 0 : button);
+
+                        print_buttons(dialog, height, width, button);
+                        wrefresh(dialog);
+                        break;
+                case 'S':
+                case 's':
+                case ' ':
+                case '\n':
+                        if (!button) {
+                                if (!status[scroll + choice]) {
+                                        for (i = 0; i < item_no; i++)
+                                                status[i] = 0;
+                                        status[scroll + choice] = 1;
+                                        for (i = 0; i < max_choice; i++)
+                                                print_item(list, items[(scroll + i) * 3 + 1],
+                                                           status[scroll + i], i, i == choice);
+                                }
+                                wnoutrefresh(dialog);
+                                wrefresh(list);
+
+                                for (i = 0; i < item_no; i++)
+                                        if (status[i])
+                                                fprintf(stderr, "%s", items[i * 3]);
+                        } else
+                                fprintf(stderr, "%s", items[(scroll + choice) * 3]);
+                        delwin(dialog);
+                        free(status);
+                        return button;
+                case 'X':
+                case 'x':
+                        key = ESC;
+                case ESC:
+                        break;
+                }
+
+                /* Now, update everything... */
+                doupdate();
+        }
+
+        delwin(dialog);
+        free(status);
+        return -1;              /* ESC pressed */
+}
diff --git a/scripts/config/lxdialog/colors.h b/scripts/kconfig/lxdialog/colors.h
index 4a2d06421..db071df12 100644
--- a/scripts/config/lxdialog/colors.h
+++ b/scripts/kconfig/lxdialog/colors.h
@@ -1,4 +1,3 @@
-/* vi: set sw=4 ts=4: */
 /*
  *  colors.h -- color attribute definitions
  *
@@ -19,7 +18,6 @@
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-
 /*
  *   Default color definitions
  *
@@ -153,10 +151,4 @@
  * Global variables
  */
 
-typedef struct {
-    char name[COLOR_NAME_LEN];
-    int value;
-} color_names_st;
-
-extern color_names_st color_names[];
 extern int color_table[][3];
diff --git a/scripts/config/lxdialog/dialog.h b/scripts/kconfig/lxdialog/dialog.h
index 236a68dce..af3cf716e 100644
--- a/scripts/config/lxdialog/dialog.h
+++ b/scripts/kconfig/lxdialog/dialog.h
@@ -1,5 +1,3 @@
-/* vi: set sw=4 ts=4: */
-
 /*
  *  dialog.h -- common declarations for all dialog modules
  *
@@ -27,7 +25,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#ifdef CURSES_LOC
 #ifdef __sun__
 #define CURS_MACROS
 #endif
@@ -44,7 +41,7 @@
 #if defined(NCURSES_VERSION) && defined(_NEED_WRAP) && !defined(GCC_PRINTFLIKE)
 #define OLD_NCURSES 1
 #undef  wbkgdset
-#define wbkgdset(w,p) /*nothing*/
+#define wbkgdset(w,p)           /*nothing */
 #else
 #define OLD_NCURSES 0
 #endif
@@ -58,7 +55,6 @@
 #define MIN(x,y) (x < y ? x : y)
 #define MAX(x,y) (x > y ? x : y)
 
-
 #ifndef ACS_ULCORNER
 #define ACS_ULCORNER '+'
 #endif
@@ -130,53 +126,44 @@
  * Global variables
  */
 extern bool use_colors;
+extern bool use_shadow;
 
 extern chtype attributes[];
-#endif
 
 extern const char *backtitle;
 
-struct dialog_list_item {
-        char *name;
-        int namelen;
-        char *tag;
-        int selected; /* Set to 1 by dialog_*() function. */
-};
-
 /*
  * Function prototypes
  */
-
-void init_dialog (void);
-void end_dialog (void);
-void dialog_clear (void);
-#ifdef CURSES_LOC
-void attr_clear (WINDOW * win, int height, int width, chtype attr);
-void color_setup (void);
-void print_autowrap (WINDOW * win, const char *prompt, int width, int y, int x);
-void print_button (WINDOW * win, const char *label, int y, int x, int selected);
-void draw_box (WINDOW * win, int y, int x, int height, int width, chtype box,
-                chtype border);
-void draw_shadow (WINDOW * win, int y, int x, int height, int width);
-#endif
-
-int first_alpha (const char *string, const char *exempt);
-int dialog_yesno (const char *title, const char *prompt, int height, int width);
-int dialog_msgbox (const char *title, const char *prompt, int height,
-                int width, int pause);
-int dialog_textbox (const char *title, const char *file, int height, int width);
-int dialog_menu (const char *title, const char *prompt, int height, int width,
+extern void create_rc(const char *filename);
+extern int parse_rc(void);
+
+void init_dialog(void);
+void end_dialog(void);
+void attr_clear(WINDOW * win, int height, int width, chtype attr);
+void dialog_clear(void);
+void color_setup(void);
+void print_autowrap(WINDOW * win, const char *prompt, int width, int y, int x);
+void print_button(WINDOW * win, const char *label, int y, int x, int selected);
+void print_title(WINDOW *dialog, const char *title, int width);
+void draw_box(WINDOW * win, int y, int x, int height, int width, chtype box,
+              chtype border);
+void draw_shadow(WINDOW * win, int y, int x, int height, int width);
+
+int first_alpha(const char *string, const char *exempt);
+int dialog_yesno(const char *title, const char *prompt, int height, int width);
+int dialog_msgbox(const char *title, const char *prompt, int height,
+                  int width, int pause);
+int dialog_textbox(const char *title, const char *file, int height, int width);
+int dialog_menu(const char *title, const char *prompt, int height, int width,
                 int menu_height, const char *choice, int item_no,
-                struct dialog_list_item ** items);
-int dialog_checklist (const char *title, const char *prompt, int height,
-                int width, int list_height, int item_no,
-                struct dialog_list_item ** items, int flag);
+                const char *const *items);
+int dialog_checklist(const char *title, const char *prompt, int height,
+                     int width, int list_height, int item_no,
+                     const char *const *items);
 extern char dialog_input_result[];
-int dialog_inputbox (const char *title, const char *prompt, int height,
-                int width, const char *init);
-
-struct dialog_list_item *first_sel_item(int item_no,
-                struct dialog_list_item ** items);
+int dialog_inputbox(const char *title, const char *prompt, int height,
+                    int width, const char *init);
 
 /*
  * This is the base for fictitious keys, which activate
@@ -187,14 +174,4 @@ struct dialog_list_item *first_sel_item(int item_no,
  *   -- the lowercase are used to signal mouse-enter events (M_EVENT + 'o')
  *   -- uppercase chars are used to invoke the button (M_EVENT + 'O')
  */
-#ifdef CURSES_LOC
 #define M_EVENT (KEY_MAX+1)
-#endif
-
-
-/*
- * The `flag' parameter in checklist is used to select between
- * radiolist and checklist
- */
-#define FLAG_CHECK 1
-#define FLAG_RADIO 0
diff --git a/scripts/kconfig/lxdialog/inputbox.c b/scripts/kconfig/lxdialog/inputbox.c
new file mode 100644
index 000000000..779503726
--- /dev/null
+++ b/scripts/kconfig/lxdialog/inputbox.c
@@ -0,0 +1,224 @@
+/*
+ *  inputbox.c -- implements the input box
+ *
+ *  ORIGINAL AUTHOR: Savio Lam (lam836@cs.cuhk.hk)
+ *  MODIFIED FOR LINUX KERNEL CONFIG BY: William Roadcap (roadcap@cfw.com)
+ *
+ *  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 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, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "dialog.h"
+
+char dialog_input_result[MAX_LEN + 1];
+
+/*
+ *  Print the termination buttons
+ */
+static void print_buttons(WINDOW * dialog, int height, int width, int selected)
+{
+        int x = width / 2 - 11;
+        int y = height - 2;
+
+        print_button(dialog, "  Ok  ", y, x, selected == 0);
+        print_button(dialog, " Help ", y, x + 14, selected == 1);
+
+        wmove(dialog, y, x + 1 + 14 * selected);
+        wrefresh(dialog);
+}
+
+/*
+ * Display a dialog box for inputing a string
+ */
+int dialog_inputbox(const char *title, const char *prompt, int height, int width,
+                    const char *init)
+{
+        int i, x, y, box_y, box_x, box_width;
+        int input_x = 0, scroll = 0, key = 0, button = -1;
+        char *instr = dialog_input_result;
+        WINDOW *dialog;
+
+        /* center dialog box on screen */
+        x = (COLS - width) / 2;
+        y = (LINES - height) / 2;
+
+        draw_shadow(stdscr, y, x, height, width);
+
+        dialog = newwin(height, width, y, x);
+        keypad(dialog, TRUE);
+
+        draw_box(dialog, 0, 0, height, width, dialog_attr, border_attr);
+        wattrset(dialog, border_attr);
+        mvwaddch(dialog, height - 3, 0, ACS_LTEE);
+        for (i = 0; i < width - 2; i++)
+                waddch(dialog, ACS_HLINE);
+        wattrset(dialog, dialog_attr);
+        waddch(dialog, ACS_RTEE);
+
+        print_title(dialog, title, width);
+
+        wattrset(dialog, dialog_attr);
+        print_autowrap(dialog, prompt, width - 2, 1, 3);
+
+        /* Draw the input field box */
+        box_width = width - 6;
+        getyx(dialog, y, x);
+        box_y = y + 2;
+        box_x = (width - box_width) / 2;
+        draw_box(dialog, y + 1, box_x - 1, 3, box_width + 2, border_attr, dialog_attr);
+
+        print_buttons(dialog, height, width, 0);
+
+        /* Set up the initial value */
+        wmove(dialog, box_y, box_x);
+        wattrset(dialog, inputbox_attr);
+
+        if (!init)
+                instr[0] = '\0';
+        else
+                strcpy(instr, init);
+
+        input_x = strlen(instr);
+
+        if (input_x >= box_width) {
+                scroll = input_x - box_width + 1;
+                input_x = box_width - 1;
+                for (i = 0; i < box_width - 1; i++)
+                        waddch(dialog, instr[scroll + i]);
+        } else {
+                waddstr(dialog, instr);
+        }
+
+        wmove(dialog, box_y, box_x + input_x);
+
+        wrefresh(dialog);
+
+        while (key != ESC) {
+                key = wgetch(dialog);
+
+                if (button == -1) {     /* Input box selected */
+                        switch (key) {
+                        case TAB:
+                        case KEY_UP:
+                        case KEY_DOWN:
+                                break;
+                        case KEY_LEFT:
+                                continue;
+                        case KEY_RIGHT:
+                                continue;
+                        case KEY_BACKSPACE:
+                        case 127:
+                                if (input_x || scroll) {
+                                        wattrset(dialog, inputbox_attr);
+                                        if (!input_x) {
+                                                scroll = scroll < box_width - 1 ? 0 : scroll - (box_width - 1);
+                                                wmove(dialog, box_y, box_x);
+                                                for (i = 0; i < box_width; i++)
+                                                        waddch(dialog,
+                                                               instr[scroll + input_x + i] ?
+                                                               instr[scroll + input_x + i] : ' ');
+                                                input_x = strlen(instr) - scroll;
+                                        } else
+                                                input_x--;
+                                        instr[scroll + input_x] = '\0';
+                                        mvwaddch(dialog, box_y, input_x + box_x, ' ');
+                                        wmove(dialog, box_y, input_x + box_x);
+                                        wrefresh(dialog);
+                                }
+                                continue;
+                        default:
+                                if (key < 0x100 && isprint(key)) {
+                                        if (scroll + input_x < MAX_LEN) {
+                                                wattrset(dialog, inputbox_attr);
+                                                instr[scroll + input_x] = key;
+                                                instr[scroll + input_x + 1] = '\0';
+                                                if (input_x == box_width - 1) {
+                                                        scroll++;
+                                                        wmove(dialog, box_y, box_x);
+                                                        for (i = 0; i < box_width - 1; i++)
+                                                                waddch(dialog, instr [scroll + i]);
+                                                } else {
+                                                        wmove(dialog, box_y, input_x++ + box_x);
+                                                        waddch(dialog, key);
+                                                }
+                                                wrefresh(dialog);
+                                        } else
+                                                flash();        /* Alarm user about overflow */
+                                        continue;
+                                }
+                        }
+                }
+                switch (key) {
+                case 'O':
+                case 'o':
+                        delwin(dialog);
+                        return 0;
+                case 'H':
+                case 'h':
+                        delwin(dialog);
+                        return 1;
+                case KEY_UP:
+                case KEY_LEFT:
+                        switch (button) {
+                        case -1:
+                                button = 1;     /* Indicates "Cancel" button is selected */
+                                print_buttons(dialog, height, width, 1);
+                                break;
+                        case 0:
+                                button = -1;    /* Indicates input box is selected */
+                                print_buttons(dialog, height, width, 0);
+                                wmove(dialog, box_y, box_x + input_x);
+                                wrefresh(dialog);
+                                break;
+                        case 1:
+                                button = 0;     /* Indicates "OK" button is selected */
+                                print_buttons(dialog, height, width, 0);
+                                break;
+                        }
+                        break;
+                case TAB:
+                case KEY_DOWN:
+                case KEY_RIGHT:
+                        switch (button) {
+                        case -1:
+                                button = 0;     /* Indicates "OK" button is selected */
+                                print_buttons(dialog, height, width, 0);
+                                break;
+                        case 0:
+                                button = 1;     /* Indicates "Cancel" button is selected */
+                                print_buttons(dialog, height, width, 1);
+                                break;
+                        case 1:
+                                button = -1;    /* Indicates input box is selected */
+                                print_buttons(dialog, height, width, 0);
+                                wmove(dialog, box_y, box_x + input_x);
+                                wrefresh(dialog);
+                                break;
+                        }
+                        break;
+                case ' ':
+                case '\n':
+                        delwin(dialog);
+                        return (button == -1 ? 0 : button);
+                case 'X':
+                case 'x':
+                        key = ESC;
+                case ESC:
+                        break;
+                }
+        }
+
+        delwin(dialog);
+        return -1;              /* ESC pressed */
+}
diff --git a/scripts/kconfig/lxdialog/lxdialog.c b/scripts/kconfig/lxdialog/lxdialog.c
new file mode 100644
index 000000000..79f6c5fb5
--- /dev/null
+++ b/scripts/kconfig/lxdialog/lxdialog.c
@@ -0,0 +1,204 @@
+/*
+ *  dialog - Display simple dialog boxes from shell scripts
+ *
+ *  ORIGINAL AUTHOR: Savio Lam (lam836@cs.cuhk.hk)
+ *  MODIFIED FOR LINUX KERNEL CONFIG BY: William Roadcap (roadcap@cfw.com)
+ *
+ *  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 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, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "dialog.h"
+
+static void Usage(const char *name);
+
+typedef int (jumperFn) (const char *title, int argc, const char *const *argv);
+
+struct Mode {
+        char *name;
+        int argmin, argmax, argmod;
+        jumperFn *jumper;
+};
+
+jumperFn j_menu, j_radiolist, j_yesno, j_textbox, j_inputbox;
+jumperFn j_msgbox, j_infobox;
+
+static struct Mode modes[] = {
+        {"--menu", 9, 0, 3, j_menu},
+        {"--radiolist", 9, 0, 3, j_radiolist},
+        {"--yesno", 5, 5, 1, j_yesno},
+        {"--textbox", 5, 5, 1, j_textbox},
+        {"--inputbox", 5, 6, 1, j_inputbox},
+        {"--msgbox", 5, 5, 1, j_msgbox},
+        {"--infobox", 5, 5, 1, j_infobox},
+        {NULL, 0, 0, 0, NULL}
+};
+
+static struct Mode *modePtr;
+
+#ifdef LOCALE
+#include <locale.h>
+#endif
+
+int main(int argc, const char *const *argv)
+{
+        int offset = 0, opt_clear = 0, end_common_opts = 0, retval;
+        const char *title = NULL;
+
+#ifdef LOCALE
+        (void)setlocale(LC_ALL, "");
+#endif
+
+#ifdef TRACE
+        trace(TRACE_CALLS | TRACE_UPDATE);
+#endif
+        if (argc < 2) {
+                Usage(argv[0]);
+                exit(-1);
+        }
+
+        while (offset < argc - 1 && !end_common_opts) { /* Common options */
+                if (!strcmp(argv[offset + 1], "--title")) {
+                        if (argc - offset < 3 || title != NULL) {
+                                Usage(argv[0]);
+                                exit(-1);
+                        } else {
+                                title = argv[offset + 2];
+                                offset += 2;
+                        }
+                } else if (!strcmp(argv[offset + 1], "--backtitle")) {
+                        if (backtitle != NULL) {
+                                Usage(argv[0]);
+                                exit(-1);
+                        } else {
+                                backtitle = argv[offset + 2];
+                                offset += 2;
+                        }
+                } else if (!strcmp(argv[offset + 1], "--clear")) {
+                        if (opt_clear) {        /* Hey, "--clear" can't appear twice! */
+                                Usage(argv[0]);
+                                exit(-1);
+                        } else if (argc == 2) { /* we only want to clear the screen */
+                                init_dialog();
+                                refresh();      /* init_dialog() will clear the screen for us */
+                                end_dialog();
+                                return 0;
+                        } else {
+                                opt_clear = 1;
+                                offset++;
+                        }
+                } else          /* no more common options */
+                        end_common_opts = 1;
+        }
+
+        if (argc - 1 == offset) {       /* no more options */
+                Usage(argv[0]);
+                exit(-1);
+        }
+        /* use a table to look for the requested mode, to avoid code duplication */
+
+        for (modePtr = modes; modePtr->name; modePtr++) /* look for the mode */
+                if (!strcmp(argv[offset + 1], modePtr->name))
+                        break;
+
+        if (!modePtr->name)
+                Usage(argv[0]);
+        if (argc - offset < modePtr->argmin)
+                Usage(argv[0]);
+        if (modePtr->argmax && argc - offset > modePtr->argmax)
+                Usage(argv[0]);
+
+        init_dialog();
+        retval = (*(modePtr->jumper)) (title, argc - offset, argv + offset);
+
+        if (opt_clear) {        /* clear screen before exit */
+                attr_clear(stdscr, LINES, COLS, screen_attr);
+                refresh();
+        }
+        end_dialog();
+
+        exit(retval);
+}
+
+/*
+ * Print program usage
+ */
+static void Usage(const char *name)
+{
+        fprintf(stderr, "\
+\ndialog, by Savio Lam (lam836@cs.cuhk.hk).\
+\n  patched by Stuart Herbert (S.Herbert@shef.ac.uk)\
+\n  modified/gutted for use as a Linux kernel config tool by \
+\n  William Roadcap (roadcapw@cfw.com)\
+\n\
+\n* Display dialog boxes from shell scripts *\
+\n\
+\nUsage: %s --clear\
+\n       %s [--title <title>] [--backtitle <backtitle>] --clear <Box options>\
+\n\
+\nBox options:\
+\n\
+\n  --menu      <text> <height> <width> <menu height> <tag1> <item1>...\
+\n  --radiolist <text> <height> <width> <list height> <tag1> <item1> <status1>...\
+\n  --textbox   <file> <height> <width>\
+\n  --inputbox  <text> <height> <width> [<init>]\
+\n  --yesno     <text> <height> <width>\
+\n", name, name);
+        exit(-1);
+}
+
+/*
+ * These are the program jumpers
+ */
+
+int j_menu(const char *t, int ac, const char *const *av)
+{
+        return dialog_menu(t, av[2], atoi(av[3]), atoi(av[4]),
+                           atoi(av[5]), av[6], (ac - 6) / 2, av + 7);
+}
+
+int j_radiolist(const char *t, int ac, const char *const *av)
+{
+        return dialog_checklist(t, av[2], atoi(av[3]), atoi(av[4]),
+                                atoi(av[5]), (ac - 6) / 3, av + 6);
+}
+
+int j_textbox(const char *t, int ac, const char *const *av)
+{
+        return dialog_textbox(t, av[2], atoi(av[3]), atoi(av[4]));
+}
+
+int j_yesno(const char *t, int ac, const char *const *av)
+{
+        return dialog_yesno(t, av[2], atoi(av[3]), atoi(av[4]));
+}
+
+int j_inputbox(const char *t, int ac, const char *const *av)
+{
+        int ret = dialog_inputbox(t, av[2], atoi(av[3]), atoi(av[4]),
+                                  ac == 6 ? av[5] : (char *)NULL);
+        if (ret == 0)
+                fprintf(stderr, dialog_input_result);
+        return ret;
+}
+
+int j_msgbox(const char *t, int ac, const char *const *av)
+{
+        return dialog_msgbox(t, av[2], atoi(av[3]), atoi(av[4]), 1);
+}
+
+int j_infobox(const char *t, int ac, const char *const *av)
+{
+        return dialog_msgbox(t, av[2], atoi(av[3]), atoi(av[4]), 0);
+}
diff --git a/scripts/kconfig/lxdialog/menubox.c b/scripts/kconfig/lxdialog/menubox.c
new file mode 100644
index 000000000..bf8052f4f
--- /dev/null
+++ b/scripts/kconfig/lxdialog/menubox.c
@@ -0,0 +1,426 @@
+/*
+ *  menubox.c -- implements the menu box
+ *
+ *  ORIGINAL AUTHOR: Savio Lam (lam836@cs.cuhk.hk)
+ *  MODIFIED FOR LINUX KERNEL CONFIG BY: William Roadcap (roadcapw@cfw.com)
+ *
+ *  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 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, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+/*
+ *  Changes by Clifford Wolf (god@clifford.at)
+ *
+ *  [ 1998-06-13 ]
+ *
+ *    *)  A bugfix for the Page-Down problem
+ *
+ *    *)  Formerly when I used Page Down and Page Up, the cursor would be set 
+ *        to the first position in the menu box.  Now lxdialog is a bit
+ *        smarter and works more like other menu systems (just have a look at
+ *        it).
+ *
+ *    *)  Formerly if I selected something my scrolling would be broken because
+ *        lxdialog is re-invoked by the Menuconfig shell script, can't
+ *        remember the last scrolling position, and just sets it so that the
+ *        cursor is at the bottom of the box.  Now it writes the temporary file
+ *        lxdialog.scrltmp which contains this information. The file is
+ *        deleted by lxdialog if the user leaves a submenu or enters a new
+ *        one, but it would be nice if Menuconfig could make another "rm -f"
+ *        just to be sure.  Just try it out - you will recognise a difference!
+ *
+ *  [ 1998-06-14 ]
+ *
+ *    *)  Now lxdialog is crash-safe against broken "lxdialog.scrltmp" files
+ *        and menus change their size on the fly.
+ *
+ *    *)  If for some reason the last scrolling position is not saved by
+ *        lxdialog, it sets the scrolling so that the selected item is in the
+ *        middle of the menu box, not at the bottom.
+ *
+ * 02 January 1999, Michael Elizabeth Chastain (mec@shout.net)
+ * Reset 'scroll' to 0 if the value from lxdialog.scrltmp is bogus.
+ * This fixes a bug in Menuconfig where using ' ' to descend into menus
+ * would leave mis-synchronized lxdialog.scrltmp files lying around,
+ * fscanf would read in 'scroll', and eventually that value would get used.
+ */
+
+#include "dialog.h"
+
+static int menu_width, item_x;
+
+/*
+ * Print menu item
+ */
+static void do_print_item(WINDOW * win, const char *item, int choice,
+                          int selected, int hotkey)
+{
+        int j;
+        char *menu_item = malloc(menu_width + 1);
+
+        strncpy(menu_item, item, menu_width - item_x);
+        menu_item[menu_width] = 0;
+        j = first_alpha(menu_item, "YyNnMmHh");
+
+        /* Clear 'residue' of last item */
+        wattrset(win, menubox_attr);
+        wmove(win, choice, 0);
+#if OLD_NCURSES
+        {
+                int i;
+                for (i = 0; i < menu_width; i++)
+                        waddch(win, ' ');
+        }
+#else
+        wclrtoeol(win);
+#endif
+        wattrset(win, selected ? item_selected_attr : item_attr);
+        mvwaddstr(win, choice, item_x, menu_item);
+        if (hotkey) {
+                wattrset(win, selected ? tag_key_selected_attr : tag_key_attr);
+                mvwaddch(win, choice, item_x + j, menu_item[j]);
+        }
+        if (selected) {
+                wmove(win, choice, item_x + 1);
+        }
+        free(menu_item);
+        wrefresh(win);
+}
+
+#define print_item(index, choice, selected) \
+do {\
+        int hotkey = (items[(index) * 2][0] != ':'); \
+        do_print_item(menu, items[(index) * 2 + 1], choice, selected, hotkey); \
+} while (0)
+
+/*
+ * Print the scroll indicators.
+ */
+static void print_arrows(WINDOW * win, int item_no, int scroll, int y, int x,
+                         int height)
+{
+        int cur_y, cur_x;
+
+        getyx(win, cur_y, cur_x);
+
+        wmove(win, y, x);
+
+        if (scroll > 0) {
+                wattrset(win, uarrow_attr);
+                waddch(win, ACS_UARROW);
+                waddstr(win, "(-)");
+        } else {
+                wattrset(win, menubox_attr);
+                waddch(win, ACS_HLINE);
+                waddch(win, ACS_HLINE);
+                waddch(win, ACS_HLINE);
+                waddch(win, ACS_HLINE);
+        }
+
+        y = y + height + 1;
+        wmove(win, y, x);
+        wrefresh(win);
+
+        if ((height < item_no) && (scroll + height < item_no)) {
+                wattrset(win, darrow_attr);
+                waddch(win, ACS_DARROW);
+                waddstr(win, "(+)");
+        } else {
+                wattrset(win, menubox_border_attr);
+                waddch(win, ACS_HLINE);
+                waddch(win, ACS_HLINE);
+                waddch(win, ACS_HLINE);
+                waddch(win, ACS_HLINE);
+        }
+
+        wmove(win, cur_y, cur_x);
+        wrefresh(win);
+}
+
+/*
+ * Display the termination buttons.
+ */
+static void print_buttons(WINDOW * win, int height, int width, int selected)
+{
+        int x = width / 2 - 16;
+        int y = height - 2;
+
+        print_button(win, "Select", y, x, selected == 0);
+        print_button(win, " Exit ", y, x + 12, selected == 1);
+        print_button(win, " Help ", y, x + 24, selected == 2);
+
+        wmove(win, y, x + 1 + 12 * selected);
+        wrefresh(win);
+}
+
+/* scroll up n lines (n may be negative) */
+static void do_scroll(WINDOW *win, int *scroll, int n)
+{
+        /* Scroll menu up */
+        scrollok(win, TRUE);
+        wscrl(win, n);
+        scrollok(win, FALSE);
+        *scroll = *scroll + n;
+        wrefresh(win);
+}
+
+/*
+ * Display a menu for choosing among a number of options
+ */
+int dialog_menu(const char *title, const char *prompt, int height, int width,
+                int menu_height, const char *current, int item_no,
+                const char *const *items)
+{
+        int i, j, x, y, box_x, box_y;
+        int key = 0, button = 0, scroll = 0, choice = 0;
+        int first_item =  0, max_choice;
+        WINDOW *dialog, *menu;
+        FILE *f;
+
+        max_choice = MIN(menu_height, item_no);
+
+        /* center dialog box on screen */
+        x = (COLS - width) / 2;
+        y = (LINES - height) / 2;
+
+        draw_shadow(stdscr, y, x, height, width);
+
+        dialog = newwin(height, width, y, x);
+        keypad(dialog, TRUE);
+
+        draw_box(dialog, 0, 0, height, width, dialog_attr, border_attr);
+        wattrset(dialog, border_attr);
+        mvwaddch(dialog, height - 3, 0, ACS_LTEE);
+        for (i = 0; i < width - 2; i++)
+                waddch(dialog, ACS_HLINE);
+        wattrset(dialog, dialog_attr);
+        wbkgdset(dialog, dialog_attr & A_COLOR);
+        waddch(dialog, ACS_RTEE);
+
+        print_title(dialog, title, width);
+
+        wattrset(dialog, dialog_attr);
+        print_autowrap(dialog, prompt, width - 2, 1, 3);
+
+        menu_width = width - 6;
+        box_y = height - menu_height - 5;
+        box_x = (width - menu_width) / 2 - 1;
+
+        /* create new window for the menu */
+        menu = subwin(dialog, menu_height, menu_width,
+                      y + box_y + 1, x + box_x + 1);
+        keypad(menu, TRUE);
+
+        /* draw a box around the menu items */
+        draw_box(dialog, box_y, box_x, menu_height + 2, menu_width + 2,
+                 menubox_border_attr, menubox_attr);
+
+        item_x = (menu_width - 70) / 2;
+
+        /* Set choice to default item */
+        for (i = 0; i < item_no; i++)
+                if (strcmp(current, items[i * 2]) == 0)
+                        choice = i;
+
+        /* get the scroll info from the temp file */
+        if ((f = fopen("lxdialog.scrltmp", "r")) != NULL) {
+                if ((fscanf(f, "%d\n", &scroll) == 1) && (scroll <= choice) &&
+                    (scroll + max_choice > choice) && (scroll >= 0) &&
+                    (scroll + max_choice <= item_no)) {
+                        first_item = scroll;
+                        choice = choice - scroll;
+                        fclose(f);
+                } else {
+                        scroll = 0;
+                        remove("lxdialog.scrltmp");
+                        fclose(f);
+                        f = NULL;
+                }
+        }
+        if ((choice >= max_choice) || (f == NULL && choice >= max_choice / 2)) {
+                if (choice >= item_no - max_choice / 2)
+                        scroll = first_item = item_no - max_choice;
+                else
+                        scroll = first_item = choice - max_choice / 2;
+                choice = choice - scroll;
+        }
+
+        /* Print the menu */
+        for (i = 0; i < max_choice; i++) {
+                print_item(first_item + i, i, i == choice);
+        }
+
+        wnoutrefresh(menu);
+
+        print_arrows(dialog, item_no, scroll,
+                     box_y, box_x + item_x + 1, menu_height);
+
+        print_buttons(dialog, height, width, 0);
+        wmove(menu, choice, item_x + 1);
+        wrefresh(menu);
+
+        while (key != ESC) {
+                key = wgetch(menu);
+
+                if (key < 256 && isalpha(key))
+                        key = tolower(key);
+
+                if (strchr("ynmh", key))
+                        i = max_choice;
+                else {
+                        for (i = choice + 1; i < max_choice; i++) {
+                                j = first_alpha(items[(scroll + i) * 2 + 1], "YyNnMmHh");
+                                if (key == tolower(items[(scroll + i) * 2 + 1][j]))
+                                        break;
+                        }
+                        if (i == max_choice)
+                                for (i = 0; i < max_choice; i++) {
+                                        j = first_alpha(items [(scroll + i) * 2 + 1], "YyNnMmHh");
+                                        if (key == tolower(items[(scroll + i) * 2 + 1][j]))
+                                                break;
+                                }
+                }
+
+                if (i < max_choice ||
+                    key == KEY_UP || key == KEY_DOWN ||
+                    key == '-' || key == '+' ||
+                    key == KEY_PPAGE || key == KEY_NPAGE) {
+                        /* Remove highligt of current item */
+                        print_item(scroll + choice, choice, FALSE);
+
+                        if (key == KEY_UP || key == '-') {
+                                if (choice < 2 && scroll) {
+                                        /* Scroll menu down */
+                                        do_scroll(menu, &scroll, -1);
+
+                                        print_item(scroll, 0, FALSE);
+                                } else
+                                        choice = MAX(choice - 1, 0);
+
+                        } else if (key == KEY_DOWN || key == '+') {
+                                print_item(scroll+choice, choice, FALSE);
+
+                                if ((choice > max_choice - 3) &&
+                                    (scroll + max_choice < item_no)) {
+                                        /* Scroll menu up */
+                                        do_scroll(menu, &scroll, 1);
+
+                                        print_item(scroll+max_choice - 1,
+                                                   max_choice - 1, FALSE);
+                                } else
+                                        choice = MIN(choice + 1, max_choice - 1);
+
+                        } else if (key == KEY_PPAGE) {
+                                scrollok(menu, TRUE);
+                                for (i = 0; (i < max_choice); i++) {
+                                        if (scroll > 0) {
+                                                do_scroll(menu, &scroll, -1);
+                                                print_item(scroll, 0, FALSE);
+                                        } else {
+                                                if (choice > 0)
+                                                        choice--;
+                                        }
+                                }
+
+                        } else if (key == KEY_NPAGE) {
+                                for (i = 0; (i < max_choice); i++) {
+                                        if (scroll + max_choice < item_no) {
+                                                do_scroll(menu, &scroll, 1);
+                                                print_item(scroll+max_choice-1,
+                                                           max_choice - 1, FALSE);
+                                        } else {
+                                                if (choice + 1 < max_choice)
+                                                        choice++;
+                                        }
+                                }
+                        } else
+                                choice = i;
+
+                        print_item(scroll + choice, choice, TRUE);
+
+                        print_arrows(dialog, item_no, scroll,
+                                     box_y, box_x + item_x + 1, menu_height);
+
+                        wnoutrefresh(dialog);
+                        wrefresh(menu);
+
+                        continue;       /* wait for another key press */
+                }
+
+                switch (key) {
+                case KEY_LEFT:
+                case TAB:
+                case KEY_RIGHT:
+                        button = ((key == KEY_LEFT ? --button : ++button) < 0)
+                            ? 2 : (button > 2 ? 0 : button);
+
+                        print_buttons(dialog, height, width, button);
+                        wrefresh(menu);
+                        break;
+                case ' ':
+                case 's':
+                case 'y':
+                case 'n':
+                case 'm':
+                case '/':
+                        /* save scroll info */
+                        if ((f = fopen("lxdialog.scrltmp", "w")) != NULL) {
+                                fprintf(f, "%d\n", scroll);
+                                fclose(f);
+                        }
+                        delwin(dialog);
+                        fprintf(stderr, "%s\n", items[(scroll + choice) * 2]);
+                        switch (key) {
+                        case 's':
+                                return 3;
+                        case 'y':
+                                return 3;
+                        case 'n':
+                                return 4;
+                        case 'm':
+                                return 5;
+                        case ' ':
+                                return 6;
+                        case '/':
+                                return 7;
+                        }
+                        return 0;
+                case 'h':
+                case '?':
+                        button = 2;
+                case '\n':
+                        delwin(dialog);
+                        if (button == 2)
+                                fprintf(stderr, "%s \"%s\"\n",
+                                        items[(scroll + choice) * 2],
+                                        items[(scroll + choice) * 2 + 1] +
+                                        first_alpha(items [(scroll + choice) * 2 + 1], ""));
+                        else
+                                fprintf(stderr, "%s\n",
+                                        items[(scroll + choice) * 2]);
+
+                        remove("lxdialog.scrltmp");
+                        return button;
+                case 'e':
+                case 'x':
+                        key = ESC;
+                case ESC:
+                        break;
+                }
+        }
+
+        delwin(dialog);
+        remove("lxdialog.scrltmp");
+        return -1;              /* ESC pressed */
+}
diff --git a/scripts/kconfig/lxdialog/msgbox.c b/scripts/kconfig/lxdialog/msgbox.c
new file mode 100644
index 000000000..7323f5471
--- /dev/null
+++ b/scripts/kconfig/lxdialog/msgbox.c
@@ -0,0 +1,71 @@
+/*
+ *  msgbox.c -- implements the message box and info box
+ *
+ *  ORIGINAL AUTHOR: Savio Lam (lam836@cs.cuhk.hk)
+ *  MODIFIED FOR LINUX KERNEL CONFIG BY: William Roadcap (roadcapw@cfw.com)
+ *
+ *  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 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, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "dialog.h"
+
+/*
+ * Display a message box. Program will pause and display an "OK" button
+ * if the parameter 'pause' is non-zero.
+ */
+int dialog_msgbox(const char *title, const char *prompt, int height, int width,
+                  int pause)
+{
+        int i, x, y, key = 0;
+        WINDOW *dialog;
+
+        /* center dialog box on screen */
+        x = (COLS - width) / 2;
+        y = (LINES - height) / 2;
+
+        draw_shadow(stdscr, y, x, height, width);
+
+        dialog = newwin(height, width, y, x);
+        keypad(dialog, TRUE);
+
+        draw_box(dialog, 0, 0, height, width, dialog_attr, border_attr);
+
+        print_title(dialog, title, width);
+
+        wattrset(dialog, dialog_attr);
+        print_autowrap(dialog, prompt, width - 2, 1, 2);
+
+        if (pause) {
+                wattrset(dialog, border_attr);
+                mvwaddch(dialog, height - 3, 0, ACS_LTEE);
+                for (i = 0; i < width - 2; i++)
+                        waddch(dialog, ACS_HLINE);
+                wattrset(dialog, dialog_attr);
+                waddch(dialog, ACS_RTEE);
+
+                print_button(dialog, "  Ok  ", height - 2, width / 2 - 4, TRUE);
+
+                wrefresh(dialog);
+                while (key != ESC && key != '\n' && key != ' ' &&
+                       key != 'O' && key != 'o' && key != 'X' && key != 'x')
+                        key = wgetch(dialog);
+        } else {
+                key = '\n';
+                wrefresh(dialog);
+        }
+
+        delwin(dialog);
+        return key == ESC ? -1 : 0;
+}
diff --git a/scripts/kconfig/lxdialog/textbox.c b/scripts/kconfig/lxdialog/textbox.c
new file mode 100644
index 000000000..77848bb8e
--- /dev/null
+++ b/scripts/kconfig/lxdialog/textbox.c
@@ -0,0 +1,533 @@
+/*
+ *  textbox.c -- implements the text box
+ *
+ *  ORIGINAL AUTHOR: Savio Lam (lam836@cs.cuhk.hk)
+ *  MODIFIED FOR LINUX KERNEL CONFIG BY: William Roadcap (roadcap@cfw.com)
+ *
+ *  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 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, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "dialog.h"
+
+static void back_lines(int n);
+static void print_page(WINDOW * win, int height, int width);
+static void print_line(WINDOW * win, int row, int width);
+static char *get_line(void);
+static void print_position(WINDOW * win, int height, int width);
+
+static int hscroll, fd, file_size, bytes_read;
+static int begin_reached = 1, end_reached, page_length;
+static char *buf, *page;
+
+/*
+ * Display text from a file in a dialog box.
+ */
+int dialog_textbox(const char *title, const char *file, int height, int width)
+{
+        int i, x, y, cur_x, cur_y, fpos, key = 0;
+        int passed_end;
+        char search_term[MAX_LEN + 1];
+        WINDOW *dialog, *text;
+
+        search_term[0] = '\0';  /* no search term entered yet */
+
+        /* Open input file for reading */
+        if ((fd = open(file, O_RDONLY)) == -1) {
+                endwin();
+                fprintf(stderr, "\nCan't open input file in dialog_textbox().\n");
+                exit(-1);
+        }
+        /* Get file size. Actually, 'file_size' is the real file size - 1,
+           since it's only the last byte offset from the beginning */
+        if ((file_size = lseek(fd, 0, SEEK_END)) == -1) {
+                endwin();
+                fprintf(stderr, "\nError getting file size in dialog_textbox().\n");
+                exit(-1);
+        }
+        /* Restore file pointer to beginning of file after getting file size */
+        if (lseek(fd, 0, SEEK_SET) == -1) {
+                endwin();
+                fprintf(stderr, "\nError moving file pointer in dialog_textbox().\n");
+                exit(-1);
+        }
+        /* Allocate space for read buffer */
+        if ((buf = malloc(BUF_SIZE + 1)) == NULL) {
+                endwin();
+                fprintf(stderr, "\nCan't allocate memory in dialog_textbox().\n");
+                exit(-1);
+        }
+        if ((bytes_read = read(fd, buf, BUF_SIZE)) == -1) {
+                endwin();
+                fprintf(stderr, "\nError reading file in dialog_textbox().\n");
+                exit(-1);
+        }
+        buf[bytes_read] = '\0'; /* mark end of valid data */
+        page = buf;             /* page is pointer to start of page to be displayed */
+
+        /* center dialog box on screen */
+        x = (COLS - width) / 2;
+        y = (LINES - height) / 2;
+
+        draw_shadow(stdscr, y, x, height, width);
+
+        dialog = newwin(height, width, y, x);
+        keypad(dialog, TRUE);
+
+        /* Create window for text region, used for scrolling text */
+        text = subwin(dialog, height - 4, width - 2, y + 1, x + 1);
+        wattrset(text, dialog_attr);
+        wbkgdset(text, dialog_attr & A_COLOR);
+
+        keypad(text, TRUE);
+
+        /* register the new window, along with its borders */
+        draw_box(dialog, 0, 0, height, width, dialog_attr, border_attr);
+
+        wattrset(dialog, border_attr);
+        mvwaddch(dialog, height - 3, 0, ACS_LTEE);
+        for (i = 0; i < width - 2; i++)
+                waddch(dialog, ACS_HLINE);
+        wattrset(dialog, dialog_attr);
+        wbkgdset(dialog, dialog_attr & A_COLOR);
+        waddch(dialog, ACS_RTEE);
+
+        print_title(dialog, title, width);
+
+        print_button(dialog, " Exit ", height - 2, width / 2 - 4, TRUE);
+        wnoutrefresh(dialog);
+        getyx(dialog, cur_y, cur_x);    /* Save cursor position */
+
+        /* Print first page of text */
+        attr_clear(text, height - 4, width - 2, dialog_attr);
+        print_page(text, height - 4, width - 2);
+        print_position(dialog, height, width);
+        wmove(dialog, cur_y, cur_x);    /* Restore cursor position */
+        wrefresh(dialog);
+
+        while ((key != ESC) && (key != '\n')) {
+                key = wgetch(dialog);
+                switch (key) {
+                case 'E':       /* Exit */
+                case 'e':
+                case 'X':
+                case 'x':
+                        delwin(dialog);
+                        free(buf);
+                        close(fd);
+                        return 0;
+                case 'g':       /* First page */
+                case KEY_HOME:
+                        if (!begin_reached) {
+                                begin_reached = 1;
+                                /* First page not in buffer? */
+                                if ((fpos = lseek(fd, 0, SEEK_CUR)) == -1) {
+                                        endwin();
+                                        fprintf(stderr, "\nError moving file pointer in dialog_textbox().\n");
+                                        exit(-1);
+                                }
+                                if (fpos > bytes_read) {        /* Yes, we have to read it in */
+                                        if (lseek(fd, 0, SEEK_SET) == -1) {
+                                                endwin();
+                                                fprintf(stderr, "\nError moving file pointer in "
+                                                                "dialog_textbox().\n");
+                                                exit(-1);
+                                        }
+                                        if ((bytes_read =
+                                             read(fd, buf, BUF_SIZE)) == -1) {
+                                                endwin();
+                                                fprintf(stderr, "\nError reading file in dialog_textbox().\n");
+                                                exit(-1);
+                                        }
+                                        buf[bytes_read] = '\0';
+                                }
+                                page = buf;
+                                print_page(text, height - 4, width - 2);
+                                print_position(dialog, height, width);
+                                wmove(dialog, cur_y, cur_x);    /* Restore cursor position */
+                                wrefresh(dialog);
+                        }
+                        break;
+                case 'G':       /* Last page */
+                case KEY_END:
+
+                        end_reached = 1;
+                        /* Last page not in buffer? */
+                        if ((fpos = lseek(fd, 0, SEEK_CUR)) == -1) {
+                                endwin();
+                                fprintf(stderr, "\nError moving file pointer in dialog_textbox().\n");
+                                exit(-1);
+                        }
+                        if (fpos < file_size) { /* Yes, we have to read it in */
+                                if (lseek(fd, -BUF_SIZE, SEEK_END) == -1) {
+                                        endwin();
+                                        fprintf(stderr, "\nError moving file pointer in dialog_textbox().\n");
+                                        exit(-1);
+                                }
+                                if ((bytes_read =
+                                     read(fd, buf, BUF_SIZE)) == -1) {
+                                        endwin();
+                                        fprintf(stderr, "\nError reading file in dialog_textbox().\n");
+                                        exit(-1);
+                                }
+                                buf[bytes_read] = '\0';
+                        }
+                        page = buf + bytes_read;
+                        back_lines(height - 4);
+                        print_page(text, height - 4, width - 2);
+                        print_position(dialog, height, width);
+                        wmove(dialog, cur_y, cur_x);    /* Restore cursor position */
+                        wrefresh(dialog);
+                        break;
+                case 'K':       /* Previous line */
+                case 'k':
+                case KEY_UP:
+                        if (!begin_reached) {
+                                back_lines(page_length + 1);
+
+                                /* We don't call print_page() here but use scrolling to ensure
+                                   faster screen update. However, 'end_reached' and
+                                   'page_length' should still be updated, and 'page' should
+                                   point to start of next page. This is done by calling
+                                   get_line() in the following 'for' loop. */
+                                scrollok(text, TRUE);
+                                wscrl(text, -1);        /* Scroll text region down one line */
+                                scrollok(text, FALSE);
+                                page_length = 0;
+                                passed_end = 0;
+                                for (i = 0; i < height - 4; i++) {
+                                        if (!i) {
+                                                /* print first line of page */
+                                                print_line(text, 0, width - 2);
+                                                wnoutrefresh(text);
+                                        } else
+                                                /* Called to update 'end_reached' and 'page' */
+                                                get_line();
+                                        if (!passed_end)
+                                                page_length++;
+                                        if (end_reached && !passed_end)
+                                                passed_end = 1;
+                                }
+
+                                print_position(dialog, height, width);
+                                wmove(dialog, cur_y, cur_x);    /* Restore cursor position */
+                                wrefresh(dialog);
+                        }
+                        break;
+                case 'B':       /* Previous page */
+                case 'b':
+                case KEY_PPAGE:
+                        if (begin_reached)
+                                break;
+                        back_lines(page_length + height - 4);
+                        print_page(text, height - 4, width - 2);
+                        print_position(dialog, height, width);
+                        wmove(dialog, cur_y, cur_x);
+                        wrefresh(dialog);
+                        break;
+                case 'J':       /* Next line */
+                case 'j':
+                case KEY_DOWN:
+                        if (!end_reached) {
+                                begin_reached = 0;
+                                scrollok(text, TRUE);
+                                scroll(text);   /* Scroll text region up one line */
+                                scrollok(text, FALSE);
+                                print_line(text, height - 5, width - 2);
+                                wnoutrefresh(text);
+                                print_position(dialog, height, width);
+                                wmove(dialog, cur_y, cur_x);    /* Restore cursor position */
+                                wrefresh(dialog);
+                        }
+                        break;
+                case KEY_NPAGE: /* Next page */
+                case ' ':
+                        if (end_reached)
+                                break;
+
+                        begin_reached = 0;
+                        print_page(text, height - 4, width - 2);
+                        print_position(dialog, height, width);
+                        wmove(dialog, cur_y, cur_x);
+                        wrefresh(dialog);
+                        break;
+                case '0':       /* Beginning of line */
+                case 'H':       /* Scroll left */
+                case 'h':
+                case KEY_LEFT:
+                        if (hscroll <= 0)
+                                break;
+
+                        if (key == '0')
+                                hscroll = 0;
+                        else
+                                hscroll--;
+                        /* Reprint current page to scroll horizontally */
+                        back_lines(page_length);
+                        print_page(text, height - 4, width - 2);
+                        wmove(dialog, cur_y, cur_x);
+                        wrefresh(dialog);
+                        break;
+                case 'L':       /* Scroll right */
+                case 'l':
+                case KEY_RIGHT:
+                        if (hscroll >= MAX_LEN)
+                                break;
+                        hscroll++;
+                        /* Reprint current page to scroll horizontally */
+                        back_lines(page_length);
+                        print_page(text, height - 4, width - 2);
+                        wmove(dialog, cur_y, cur_x);
+                        wrefresh(dialog);
+                        break;
+                case ESC:
+                        break;
+                }
+        }
+
+        delwin(dialog);
+        free(buf);
+        close(fd);
+        return -1;              /* ESC pressed */
+}
+
+/*
+ * Go back 'n' lines in text file. Called by dialog_textbox().
+ * 'page' will be updated to point to the desired line in 'buf'.
+ */
+static void back_lines(int n)
+{
+        int i, fpos;
+
+        begin_reached = 0;
+        /* We have to distinguish between end_reached and !end_reached
+           since at end of file, the line is not ended by a '\n'.
+           The code inside 'if' basically does a '--page' to move one
+           character backward so as to skip '\n' of the previous line */
+        if (!end_reached) {
+                /* Either beginning of buffer or beginning of file reached? */
+                if (page == buf) {
+                        if ((fpos = lseek(fd, 0, SEEK_CUR)) == -1) {
+                                endwin();
+                                fprintf(stderr, "\nError moving file pointer in "
+                                                "back_lines().\n");
+                                exit(-1);
+                        }
+                        if (fpos > bytes_read) {        /* Not beginning of file yet */
+                                /* We've reached beginning of buffer, but not beginning of
+                                   file yet, so read previous part of file into buffer.
+                                   Note that we only move backward for BUF_SIZE/2 bytes,
+                                   but not BUF_SIZE bytes to avoid re-reading again in
+                                   print_page() later */
+                                /* Really possible to move backward BUF_SIZE/2 bytes? */
+                                if (fpos < BUF_SIZE / 2 + bytes_read) {
+                                        /* No, move less then */
+                                        if (lseek(fd, 0, SEEK_SET) == -1) {
+                                                endwin();
+                                                fprintf(stderr, "\nError moving file pointer in "
+                                                                "back_lines().\n");
+                                                exit(-1);
+                                        }
+                                        page = buf + fpos - bytes_read;
+                                } else {        /* Move backward BUF_SIZE/2 bytes */
+                                        if (lseek (fd, -(BUF_SIZE / 2 + bytes_read), SEEK_CUR) == -1) {
+                                                endwin();
+                                                fprintf(stderr, "\nError moving file pointer "
+                                                                "in back_lines().\n");
+                                                exit(-1);
+                                        }
+                                        page = buf + BUF_SIZE / 2;
+                                }
+                                if ((bytes_read =
+                                     read(fd, buf, BUF_SIZE)) == -1) {
+                                        endwin();
+                                        fprintf(stderr, "\nError reading file in back_lines().\n");
+                                        exit(-1);
+                                }
+                                buf[bytes_read] = '\0';
+                        } else {        /* Beginning of file reached */
+                                begin_reached = 1;
+                                return;
+                        }
+                }
+                if (*(--page) != '\n') {        /* '--page' here */
+                        /* Something's wrong... */
+                        endwin();
+                        fprintf(stderr, "\nInternal error in back_lines().\n");
+                        exit(-1);
+                }
+        }
+        /* Go back 'n' lines */
+        for (i = 0; i < n; i++)
+                do {
+                        if (page == buf) {
+                                if ((fpos = lseek(fd, 0, SEEK_CUR)) == -1) {
+                                        endwin();
+                                        fprintf(stderr, "\nError moving file pointer in back_lines().\n");
+                                        exit(-1);
+                                }
+                                if (fpos > bytes_read) {
+                                        /* Really possible to move backward BUF_SIZE/2 bytes? */
+                                        if (fpos < BUF_SIZE / 2 + bytes_read) {
+                                                /* No, move less then */
+                                                if (lseek(fd, 0, SEEK_SET) == -1) {
+                                                        endwin();
+                                                        fprintf(stderr, "\nError moving file pointer "
+                                                                        "in back_lines().\n");
+                                                        exit(-1);
+                                                }
+                                                page = buf + fpos - bytes_read;
+                                        } else {        /* Move backward BUF_SIZE/2 bytes */
+                                                if (lseek (fd, -(BUF_SIZE / 2 + bytes_read), SEEK_CUR) == -1) {
+                                                        endwin();
+                                                        fprintf(stderr, "\nError moving file pointer"
+                                                                        " in back_lines().\n");
+                                                        exit(-1);
+                                                }
+                                                page = buf + BUF_SIZE / 2;
+                                        }
+                                        if ((bytes_read =
+                                             read(fd, buf, BUF_SIZE)) == -1) {
+                                                endwin();
+                                                fprintf(stderr, "\nError reading file in "
+                                                                "back_lines().\n");
+                                                exit(-1);
+                                        }
+                                        buf[bytes_read] = '\0';
+                                } else {        /* Beginning of file reached */
+                                        begin_reached = 1;
+                                        return;
+                                }
+                        }
+                } while (*(--page) != '\n');
+        page++;
+}
+
+/*
+ * Print a new page of text. Called by dialog_textbox().
+ */
+static void print_page(WINDOW * win, int height, int width)
+{
+        int i, passed_end = 0;
+
+        page_length = 0;
+        for (i = 0; i < height; i++) {
+                print_line(win, i, width);
+                if (!passed_end)
+                        page_length++;
+                if (end_reached && !passed_end)
+                        passed_end = 1;
+        }
+        wnoutrefresh(win);
+}
+
+/*
+ * Print a new line of text. Called by dialog_textbox() and print_page().
+ */
+static void print_line(WINDOW * win, int row, int width)
+{
+        int y, x;
+        char *line;
+
+        line = get_line();
+        line += MIN(strlen(line), hscroll);     /* Scroll horizontally */
+        wmove(win, row, 0);     /* move cursor to correct line */
+        waddch(win, ' ');
+        waddnstr(win, line, MIN(strlen(line), width - 2));
+
+        getyx(win, y, x);
+        /* Clear 'residue' of previous line */
+#if OLD_NCURSES
+        {
+                int i;
+                for (i = 0; i < width - x; i++)
+                        waddch(win, ' ');
+        }
+#else
+        wclrtoeol(win);
+#endif
+}
+
+/*
+ * Return current line of text. Called by dialog_textbox() and print_line().
+ * 'page' should point to start of current line before calling, and will be
+ * updated to point to start of next line.
+ */
+static char *get_line(void)
+{
+        int i = 0, fpos;
+        static char line[MAX_LEN + 1];
+
+        end_reached = 0;
+        while (*page != '\n') {
+                if (*page == '\0') {
+                        /* Either end of file or end of buffer reached */
+                        if ((fpos = lseek(fd, 0, SEEK_CUR)) == -1) {
+                                endwin();
+                                fprintf(stderr, "\nError moving file pointer in "
+                                                "get_line().\n");
+                                exit(-1);
+                        }
+                        if (fpos < file_size) { /* Not end of file yet */
+                                /* We've reached end of buffer, but not end of file yet,
+                                   so read next part of file into buffer */
+                                if ((bytes_read =
+                                     read(fd, buf, BUF_SIZE)) == -1) {
+                                        endwin();
+                                        fprintf(stderr, "\nError reading file in get_line().\n");
+                                        exit(-1);
+                                }
+                                buf[bytes_read] = '\0';
+                                page = buf;
+                        } else {
+                                if (!end_reached)
+                                        end_reached = 1;
+                                break;
+                        }
+                } else if (i < MAX_LEN)
+                        line[i++] = *(page++);
+                else {
+                        /* Truncate lines longer than MAX_LEN characters */
+                        if (i == MAX_LEN)
+                                line[i++] = '\0';
+                        page++;
+                }
+        }
+        if (i <= MAX_LEN)
+                line[i] = '\0';
+        if (!end_reached)
+                page++;         /* move pass '\n' */
+
+        return line;
+}
+
+/*
+ * Print current position
+ */
+static void print_position(WINDOW * win, int height, int width)
+{
+        int fpos, percent;
+
+        if ((fpos = lseek(fd, 0, SEEK_CUR)) == -1) {
+                endwin();
+                fprintf(stderr, "\nError moving file pointer in print_position().\n");
+                exit(-1);
+        }
+        wattrset(win, position_indicator_attr);
+        wbkgdset(win, position_indicator_attr & A_COLOR);
+        percent = !file_size ?
+            100 : ((fpos - bytes_read + page - buf) * 100) / file_size;
+        wmove(win, height - 3, width - 9);
+        wprintw(win, "(%3d%%)", percent);
+}
diff --git a/scripts/kconfig/lxdialog/util.c b/scripts/kconfig/lxdialog/util.c
new file mode 100644
index 000000000..f82cebb9f
--- /dev/null
+++ b/scripts/kconfig/lxdialog/util.c
@@ -0,0 +1,362 @@
+/*
+ *  util.c
+ *
+ *  ORIGINAL AUTHOR: Savio Lam (lam836@cs.cuhk.hk)
+ *  MODIFIED FOR LINUX KERNEL CONFIG BY: William Roadcap (roadcap@cfw.com)
+ *
+ *  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 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, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "dialog.h"
+
+/* use colors by default? */
+bool use_colors = 1;
+
+const char *backtitle = NULL;
+
+/*
+ * Attribute values, default is for mono display
+ */
+chtype attributes[] = {
+        A_NORMAL,               /* screen_attr */
+        A_NORMAL,               /* shadow_attr */
+        A_NORMAL,               /* dialog_attr */
+        A_BOLD,                 /* title_attr */
+        A_NORMAL,               /* border_attr */
+        A_REVERSE,              /* button_active_attr */
+        A_DIM,                  /* button_inactive_attr */
+        A_REVERSE,              /* button_key_active_attr */
+        A_BOLD,                 /* button_key_inactive_attr */
+        A_REVERSE,              /* button_label_active_attr */
+        A_NORMAL,               /* button_label_inactive_attr */
+        A_NORMAL,               /* inputbox_attr */
+        A_NORMAL,               /* inputbox_border_attr */
+        A_NORMAL,               /* searchbox_attr */
+        A_BOLD,                 /* searchbox_title_attr */
+        A_NORMAL,               /* searchbox_border_attr */
+        A_BOLD,                 /* position_indicator_attr */
+        A_NORMAL,               /* menubox_attr */
+        A_NORMAL,               /* menubox_border_attr */
+        A_NORMAL,               /* item_attr */
+        A_REVERSE,              /* item_selected_attr */
+        A_BOLD,                 /* tag_attr */
+        A_REVERSE,              /* tag_selected_attr */
+        A_BOLD,                 /* tag_key_attr */
+        A_REVERSE,              /* tag_key_selected_attr */
+        A_BOLD,                 /* check_attr */
+        A_REVERSE,              /* check_selected_attr */
+        A_BOLD,                 /* uarrow_attr */
+        A_BOLD                  /* darrow_attr */
+};
+
+#include "colors.h"
+
+/*
+ * Table of color values
+ */
+int color_table[][3] = {
+        {SCREEN_FG, SCREEN_BG, SCREEN_HL},
+        {SHADOW_FG, SHADOW_BG, SHADOW_HL},
+        {DIALOG_FG, DIALOG_BG, DIALOG_HL},
+        {TITLE_FG, TITLE_BG, TITLE_HL},
+        {BORDER_FG, BORDER_BG, BORDER_HL},
+        {BUTTON_ACTIVE_FG, BUTTON_ACTIVE_BG, BUTTON_ACTIVE_HL},
+        {BUTTON_INACTIVE_FG, BUTTON_INACTIVE_BG, BUTTON_INACTIVE_HL},
+        {BUTTON_KEY_ACTIVE_FG, BUTTON_KEY_ACTIVE_BG, BUTTON_KEY_ACTIVE_HL},
+        {BUTTON_KEY_INACTIVE_FG, BUTTON_KEY_INACTIVE_BG,
+         BUTTON_KEY_INACTIVE_HL},
+        {BUTTON_LABEL_ACTIVE_FG, BUTTON_LABEL_ACTIVE_BG,
+         BUTTON_LABEL_ACTIVE_HL},
+        {BUTTON_LABEL_INACTIVE_FG, BUTTON_LABEL_INACTIVE_BG,
+         BUTTON_LABEL_INACTIVE_HL},
+        {INPUTBOX_FG, INPUTBOX_BG, INPUTBOX_HL},
+        {INPUTBOX_BORDER_FG, INPUTBOX_BORDER_BG, INPUTBOX_BORDER_HL},
+        {SEARCHBOX_FG, SEARCHBOX_BG, SEARCHBOX_HL},
+        {SEARCHBOX_TITLE_FG, SEARCHBOX_TITLE_BG, SEARCHBOX_TITLE_HL},
+        {SEARCHBOX_BORDER_FG, SEARCHBOX_BORDER_BG, SEARCHBOX_BORDER_HL},
+        {POSITION_INDICATOR_FG, POSITION_INDICATOR_BG, POSITION_INDICATOR_HL},
+        {MENUBOX_FG, MENUBOX_BG, MENUBOX_HL},
+        {MENUBOX_BORDER_FG, MENUBOX_BORDER_BG, MENUBOX_BORDER_HL},
+        {ITEM_FG, ITEM_BG, ITEM_HL},
+        {ITEM_SELECTED_FG, ITEM_SELECTED_BG, ITEM_SELECTED_HL},
+        {TAG_FG, TAG_BG, TAG_HL},
+        {TAG_SELECTED_FG, TAG_SELECTED_BG, TAG_SELECTED_HL},
+        {TAG_KEY_FG, TAG_KEY_BG, TAG_KEY_HL},
+        {TAG_KEY_SELECTED_FG, TAG_KEY_SELECTED_BG, TAG_KEY_SELECTED_HL},
+        {CHECK_FG, CHECK_BG, CHECK_HL},
+        {CHECK_SELECTED_FG, CHECK_SELECTED_BG, CHECK_SELECTED_HL},
+        {UARROW_FG, UARROW_BG, UARROW_HL},
+        {DARROW_FG, DARROW_BG, DARROW_HL},
+};                              /* color_table */
+
+/*
+ * Set window to attribute 'attr'
+ */
+void attr_clear(WINDOW * win, int height, int width, chtype attr)
+{
+        int i, j;
+
+        wattrset(win, attr);
+        for (i = 0; i < height; i++) {
+                wmove(win, i, 0);
+                for (j = 0; j < width; j++)
+                        waddch(win, ' ');
+        }
+        touchwin(win);
+}
+
+void dialog_clear(void)
+{
+        attr_clear(stdscr, LINES, COLS, screen_attr);
+        /* Display background title if it exists ... - SLH */
+        if (backtitle != NULL) {
+                int i;
+
+                wattrset(stdscr, screen_attr);
+                mvwaddstr(stdscr, 0, 1, (char *)backtitle);
+                wmove(stdscr, 1, 1);
+                for (i = 1; i < COLS - 1; i++)
+                        waddch(stdscr, ACS_HLINE);
+        }
+        wnoutrefresh(stdscr);
+}
+
+/*
+ * Do some initialization for dialog
+ */
+void init_dialog(void)
+{
+        initscr();              /* Init curses */
+        keypad(stdscr, TRUE);
+        cbreak();
+        noecho();
+
+        if (use_colors)         /* Set up colors */
+                color_setup();
+
+        dialog_clear();
+}
+
+/*
+ * Setup for color display
+ */
+void color_setup(void)
+{
+        int i;
+
+        if (has_colors()) {     /* Terminal supports color? */
+                start_color();
+
+                /* Initialize color pairs */
+                for (i = 0; i < ATTRIBUTE_COUNT; i++)
+                        init_pair(i + 1, color_table[i][0], color_table[i][1]);
+
+                /* Setup color attributes */
+                for (i = 0; i < ATTRIBUTE_COUNT; i++)
+                        attributes[i] = C_ATTR(color_table[i][2], i + 1);
+        }
+}
+
+/*
+ * End using dialog functions.
+ */
+void end_dialog(void)
+{
+        endwin();
+}
+
+/* Print the title of the dialog. Center the title and truncate
+ * tile if wider than dialog (- 2 chars).
+ **/
+void print_title(WINDOW *dialog, const char *title, int width)
+{
+        if (title) {
+                int tlen = MIN(width - 2, strlen(title));
+                wattrset(dialog, title_attr);
+                mvwaddch(dialog, 0, (width - tlen) / 2 - 1, ' ');
+                mvwaddnstr(dialog, 0, (width - tlen)/2, title, tlen);
+                waddch(dialog, ' ');
+        }
+}
+
+/*
+ * Print a string of text in a window, automatically wrap around to the
+ * next line if the string is too long to fit on one line. Newline
+ * characters '\n' are replaced by spaces.  We start on a new line
+ * if there is no room for at least 4 nonblanks following a double-space.
+ */
+void print_autowrap(WINDOW * win, const char *prompt, int width, int y, int x)
+{
+        int newl, cur_x, cur_y;
+        int i, prompt_len, room, wlen;
+        char tempstr[MAX_LEN + 1], *word, *sp, *sp2;
+
+        strcpy(tempstr, prompt);
+
+        prompt_len = strlen(tempstr);
+
+        /*
+         * Remove newlines
+         */
+        for (i = 0; i < prompt_len; i++) {
+                if (tempstr[i] == '\n')
+                        tempstr[i] = ' ';
+        }
+
+        if (prompt_len <= width - x * 2) {      /* If prompt is short */
+                wmove(win, y, (width - prompt_len) / 2);
+                waddstr(win, tempstr);
+        } else {
+                cur_x = x;
+                cur_y = y;
+                newl = 1;
+                word = tempstr;
+                while (word && *word) {
+                        sp = index(word, ' ');
+                        if (sp)
+                                *sp++ = 0;
+
+                        /* Wrap to next line if either the word does not fit,
+                           or it is the first word of a new sentence, and it is
+                           short, and the next word does not fit. */
+                        room = width - cur_x;
+                        wlen = strlen(word);
+                        if (wlen > room ||
+                            (newl && wlen < 4 && sp
+                             && wlen + 1 + strlen(sp) > room
+                             && (!(sp2 = index(sp, ' '))
+                                 || wlen + 1 + (sp2 - sp) > room))) {
+                                cur_y++;
+                                cur_x = x;
+                        }
+                        wmove(win, cur_y, cur_x);
+                        waddstr(win, word);
+                        getyx(win, cur_y, cur_x);
+                        cur_x++;
+                        if (sp && *sp == ' ') {
+                                cur_x++;        /* double space */
+                                while (*++sp == ' ') ;
+                                newl = 1;
+                        } else
+                                newl = 0;
+                        word = sp;
+                }
+        }
+}
+
+/*
+ * Print a button
+ */
+void print_button(WINDOW * win, const char *label, int y, int x, int selected)
+{
+        int i, temp;
+
+        wmove(win, y, x);
+        wattrset(win, selected ? button_active_attr : button_inactive_attr);
+        waddstr(win, "<");
+        temp = strspn(label, " ");
+        label += temp;
+        wattrset(win, selected ? button_label_active_attr
+                 : button_label_inactive_attr);
+        for (i = 0; i < temp; i++)
+                waddch(win, ' ');
+        wattrset(win, selected ? button_key_active_attr
+                 : button_key_inactive_attr);
+        waddch(win, label[0]);
+        wattrset(win, selected ? button_label_active_attr
+                 : button_label_inactive_attr);
+        waddstr(win, (char *)label + 1);
+        wattrset(win, selected ? button_active_attr : button_inactive_attr);
+        waddstr(win, ">");
+        wmove(win, y, x + temp + 1);
+}
+
+/*
+ * Draw a rectangular box with line drawing characters
+ */
+void
+draw_box(WINDOW * win, int y, int x, int height, int width,
+         chtype box, chtype border)
+{
+        int i, j;
+
+        wattrset(win, 0);
+        for (i = 0; i < height; i++) {
+                wmove(win, y + i, x);
+                for (j = 0; j < width; j++)
+                        if (!i && !j)
+                                waddch(win, border | ACS_ULCORNER);
+                        else if (i == height - 1 && !j)
+                                waddch(win, border | ACS_LLCORNER);
+                        else if (!i && j == width - 1)
+                                waddch(win, box | ACS_URCORNER);
+                        else if (i == height - 1 && j == width - 1)
+                                waddch(win, box | ACS_LRCORNER);
+                        else if (!i)
+                                waddch(win, border | ACS_HLINE);
+                        else if (i == height - 1)
+                                waddch(win, box | ACS_HLINE);
+                        else if (!j)
+                                waddch(win, border | ACS_VLINE);
+                        else if (j == width - 1)
+                                waddch(win, box | ACS_VLINE);
+                        else
+                                waddch(win, box | ' ');
+        }
+}
+
+/*
+ * Draw shadows along the right and bottom edge to give a more 3D look
+ * to the boxes
+ */
+void draw_shadow(WINDOW * win, int y, int x, int height, int width)
+{
+        int i;
+
+        if (has_colors()) {     /* Whether terminal supports color? */
+                wattrset(win, shadow_attr);
+                wmove(win, y + height, x + 2);
+                for (i = 0; i < width; i++)
+                        waddch(win, winch(win) & A_CHARTEXT);
+                for (i = y + 1; i < y + height + 1; i++) {
+                        wmove(win, i, x + width);
+                        waddch(win, winch(win) & A_CHARTEXT);
+                        waddch(win, winch(win) & A_CHARTEXT);
+                }
+                wnoutrefresh(win);
+        }
+}
+
+/*
+ *  Return the position of the first alphabetic character in a string.
+ */
+int first_alpha(const char *string, const char *exempt)
+{
+        int i, in_paren = 0, c;
+
+        for (i = 0; i < strlen(string); i++) {
+                c = tolower(string[i]);
+
+                if (strchr("<[(", c))
+                        ++in_paren;
+                if (strchr(">])", c) && in_paren > 0)
+                        --in_paren;
+
+                if ((!in_paren) && isalpha(c) && strchr(exempt, c) == 0)
+                        return i;
+        }
+
+        return 0;
+}
diff --git a/scripts/kconfig/lxdialog/yesno.c b/scripts/kconfig/lxdialog/yesno.c
new file mode 100644
index 000000000..cb2568aae
--- /dev/null
+++ b/scripts/kconfig/lxdialog/yesno.c
@@ -0,0 +1,102 @@
+/*
+ *  yesno.c -- implements the yes/no box
+ *
+ *  ORIGINAL AUTHOR: Savio Lam (lam836@cs.cuhk.hk)
+ *  MODIFIED FOR LINUX KERNEL CONFIG BY: William Roadcap (roadcap@cfw.com)
+ *
+ *  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 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, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "dialog.h"
+
+/*
+ * Display termination buttons
+ */
+static void print_buttons(WINDOW * dialog, int height, int width, int selected)
+{
+        int x = width / 2 - 10;
+        int y = height - 2;
+
+        print_button(dialog, " Yes ", y, x, selected == 0);
+        print_button(dialog, "  No  ", y, x + 13, selected == 1);
+
+        wmove(dialog, y, x + 1 + 13 * selected);
+        wrefresh(dialog);
+}
+
+/*
+ * Display a dialog box with two buttons - Yes and No
+ */
+int dialog_yesno(const char *title, const char *prompt, int height, int width)
+{
+        int i, x, y, key = 0, button = 0;
+        WINDOW *dialog;
+
+        /* center dialog box on screen */
+        x = (COLS - width) / 2;
+        y = (LINES - height) / 2;
+
+        draw_shadow(stdscr, y, x, height, width);
+
+        dialog = newwin(height, width, y, x);
+        keypad(dialog, TRUE);
+
+        draw_box(dialog, 0, 0, height, width, dialog_attr, border_attr);
+        wattrset(dialog, border_attr);
+        mvwaddch(dialog, height - 3, 0, ACS_LTEE);
+        for (i = 0; i < width - 2; i++)
+                waddch(dialog, ACS_HLINE);
+        wattrset(dialog, dialog_attr);
+        waddch(dialog, ACS_RTEE);
+
+        print_title(dialog, title, width);
+
+        wattrset(dialog, dialog_attr);
+        print_autowrap(dialog, prompt, width - 2, 1, 3);
+
+        print_buttons(dialog, height, width, 0);
+
+        while (key != ESC) {
+                key = wgetch(dialog);
+                switch (key) {
+                case 'Y':
+                case 'y':
+                        delwin(dialog);
+                        return 0;
+                case 'N':
+                case 'n':
+                        delwin(dialog);
+                        return 1;
+
+                case TAB:
+                case KEY_LEFT:
+                case KEY_RIGHT:
+                        button = ((key == KEY_LEFT ? --button : ++button) < 0) ? 1 : (button > 1 ? 0 : button);
+
+                        print_buttons(dialog, height, width, button);
+                        wrefresh(dialog);
+                        break;
+                case ' ':
+                case '\n':
+                        delwin(dialog);
+                        return button;
+                case ESC:
+                        break;
+                }
+        }
+
+        delwin(dialog);
+        return -1;              /* ESC pressed */
+}
diff --git a/scripts/config/mconf.c b/scripts/kconfig/mconf.c
index b8f27e69c..7f973195e 100644
--- a/scripts/config/mconf.c
+++ b/scripts/kconfig/mconf.c
@@ -1,4 +1,3 @@
-/* vi: set sw=4 ts=4: */
 /*
  * Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org>
  * Released under the terms of the GNU GPL v2.0.
@@ -6,8 +5,7 @@
  * Introduced single menu mode (show all sub-menus in one large tree).
  * 2002-11-06 Petr Baudis <pasky@ucw.cz>
  *
- * Directly use liblxdialog library routines.
- * 2002-11-14 Petr Baudis <pasky@ucw.cz>
+ * i18n, 2005, Arnaldo Carvalho de Melo <acme@conectiva.com.br>
  */
 
 #include <sys/ioctl.h>
@@ -22,28 +20,29 @@
 #include <string.h>
 #include <termios.h>
 #include <unistd.h>
-
-#include "lxdialog/dialog.h"
+#include <locale.h>
 
 #define LKC_DIRECT_LINK
 #include "lkc.h"
 
 static char menu_backtitle[128];
-static const char mconf_readme[] =
+static const char mconf_readme[] = N_(
 "Overview\n"
 "--------\n"
-"Some features may be built directly into BusyBox.  Some features\n"
+"Some kernel features may be built directly into the kernel.\n"
+"Some may be made into loadable runtime modules.  Some features\n"
 "may be completely removed altogether.  There are also certain\n"
-"parameters which are not really features, but must be\n"
+"kernel parameters which are not really features, but must be\n"
 "entered in as decimal or hexadecimal numbers or possibly text.\n"
 "\n"
-"Menu items beginning with [*] or [ ] represent features\n"
-"configured to be built in or removed respectively.\n"
+"Menu items beginning with [*], <M> or [ ] represent features\n"
+"configured to be built in, modularized or removed respectively.\n"
+"Pointed brackets <> represent module capable features.\n"
 "\n"
 "To change any of these features, highlight it with the cursor\n"
-"keys and press <Y> to build it in or <N> to removed it.\n"
-"You may also press the <Space Bar> to cycle\n"
-"through the available options (ie. Y->N->Y).\n"
+"keys and press <Y> to build it in, <M> to make it a module or\n"
+"<N> to removed it.  You may also press the <Space Bar> to cycle\n"
+"through the available options (ie. Y->N->M->Y).\n"
 "\n"
 "Some additional keyboard hints:\n"
 "\n"
@@ -116,7 +115,7 @@ static const char mconf_readme[] =
 "-----------------------------\n"
 "Menuconfig supports the use of alternate configuration files for\n"
 "those who, for various reasons, find it necessary to switch\n"
-"between different configurations.\n"
+"between different kernel configurations.\n"
 "\n"
 "At the end of the main menu you will find two options.  One is\n"
 "for saving the current configuration to a file of your choosing.\n"
@@ -149,7 +148,7 @@ static const char mconf_readme[] =
 "\n"
 "Optional personality available\n"
 "------------------------------\n"
-"If you prefer to have all of the options listed in a single\n"
+"If you prefer to have all of the kernel options listed in a single\n"
 "menu, rather than the default multimenu hierarchy, run the menuconfig\n"
 "with MENUCONFIG_MODE environment variable set to single_menu. Example:\n"
 "\n"
@@ -160,55 +159,55 @@ static const char mconf_readme[] =
 "\n"
 "Note that this mode can eventually be a little more CPU expensive\n"
 "(especially with a larger number of unrolled categories) than the\n"
-"default mode.\n",
-menu_instructions[] =
+"default mode.\n"),
+menu_instructions[] = N_(
         "Arrow keys navigate the menu.  "
         "<Enter> selects submenus --->.  "
         "Highlighted letters are hotkeys.  "
-        "Pressing <Y> selectes a feature, while <N> will exclude a feature.  "
+        "Pressing <Y> includes, <N> excludes, <M> modularizes features.  "
         "Press <Esc><Esc> to exit, <?> for Help, </> for Search.  "
-        "Legend: [*] feature is selected  [ ] feature is excluded",
-radiolist_instructions[] =
+        "Legend: [*] built-in  [ ] excluded  <M> module  < > module capable"),
+radiolist_instructions[] = N_(
         "Use the arrow keys to navigate this window or "
         "press the hotkey of the item you wish to select "
         "followed by the <SPACE BAR>. "
-        "Press <?> for additional information about this option.",
-inputbox_instructions_int[] =
+        "Press <?> for additional information about this option."),
+inputbox_instructions_int[] = N_(
         "Please enter a decimal value. "
         "Fractions will not be accepted.  "
-        "Use the <TAB> key to move from the input field to the buttons below it.",
-inputbox_instructions_hex[] =
+        "Use the <TAB> key to move from the input field to the buttons below it."),
+inputbox_instructions_hex[] = N_(
         "Please enter a hexadecimal value. "
-        "Use the <TAB> key to move from the input field to the buttons below it.",
-inputbox_instructions_string[] =
+        "Use the <TAB> key to move from the input field to the buttons below it."),
+inputbox_instructions_string[] = N_(
         "Please enter a string value. "
-        "Use the <TAB> key to move from the input field to the buttons below it.",
-setmod_text[] =
+        "Use the <TAB> key to move from the input field to the buttons below it."),
+setmod_text[] = N_(
         "This feature depends on another which has been configured as a module.\n"
-        "As a result, this feature will be built as a module.",
-nohelp_text[] =
-        "There is no help available for this option.\n",
-load_config_text[] =
+        "As a result, this feature will be built as a module."),
+nohelp_text[] = N_(
+        "There is no help available for this kernel option.\n"),
+load_config_text[] = N_(
         "Enter the name of the configuration file you wish to load.  "
         "Accept the name shown to restore the configuration you "
-        "last retrieved.  Leave blank to abort.",
-load_config_help[] =
+        "last retrieved.  Leave blank to abort."),
+load_config_help[] = N_(
         "\n"
-        "For various reasons, one may wish to keep several different BusyBox\n"
+        "For various reasons, one may wish to keep several different kernel\n"
         "configurations available on a single machine.\n"
         "\n"
         "If you have saved a previous configuration in a file other than the\n"
-        "BusyBox's default, entering the name of the file here will allow you\n"
+        "kernel's default, entering the name of the file here will allow you\n"
         "to modify that configuration.\n"
         "\n"
         "If you are uncertain, then you have probably never used alternate\n"
-        "configuration files.  You should therefor leave this blank to abort.\n",
-save_config_text[] =
+        "configuration files.  You should therefor leave this blank to abort.\n"),
+save_config_text[] = N_(
         "Enter a filename to which this configuration should be saved "
-        "as an alternate.  Leave blank to abort.",
-save_config_help[] =
+        "as an alternate.  Leave blank to abort."),
+save_config_help[] = N_(
         "\n"
-        "For various reasons, one may wish to keep different BusyBox\n"
+        "For various reasons, one may wish to keep different kernel\n"
         "configurations available on a single machine.\n"
         "\n"
         "Entering a file name here will allow you to later retrieve, modify\n"
@@ -216,10 +215,11 @@ save_config_help[] =
         "configuration options you have selected at that time.\n"
         "\n"
         "If you are uncertain what all this means then you should probably\n"
-        "leave this blank.\n",
-search_help[] =
+        "leave this blank.\n"),
+search_help[] = N_(
         "\n"
         "Search for CONFIG_ symbols and display their relations.\n"
+        "Regular expressions are allowed.\n"
         "Example: search for \"^FOO\"\n"
         "Result:\n"
         "-----------------------------------------------------------------\n"
@@ -254,19 +254,20 @@ search_help[] =
         "Examples: USB  => find all CONFIG_ symbols containing USB\n"
         "          ^USB => find all CONFIG_ symbols starting with USB\n"
         "          USB$ => find all CONFIG_ symbols ending with USB\n"
-        "\n";
+        "\n");
 
+static char buf[4096], *bufptr = buf;
+static char input_buf[4096];
 static char filename[PATH_MAX+1] = ".config";
+static char *args[1024], **argptr = args;
 static int indent;
 static struct termios ios_org;
 static int rows = 0, cols = 0;
 static struct menu *current_menu;
 static int child_count;
+static int do_resize;
 static int single_menu_mode;
 
-static struct dialog_list_item *items[16384]; /* FIXME: This ought to be dynamic. */
-static int item_no;
-
 static void conf(struct menu *menu);
 static void conf_choice(struct menu *menu);
 static void conf_string(struct menu *menu);
@@ -277,6 +278,11 @@ static void show_helptext(const char *title, const char *text);
 static void show_help(struct menu *menu);
 static void show_file(const char *filename, const char *title, int r, int c);
 
+static void cprint_init(void);
+static int cprint1(const char *fmt, ...);
+static void cprint_done(void);
+static int cprint(const char *fmt, ...);
+
 static void init_wsize(void)
 {
         struct winsize ws;
@@ -303,8 +309,8 @@ static void init_wsize(void)
         }
 
         if (rows < 19 || cols < 80) {
-                fprintf(stderr, "Your display is too small to run Menuconfig!\n");
-                fprintf(stderr, "It must be at least 19 lines by 80 columns.\n");
+                fprintf(stderr, N_("Your display is too small to run Menuconfig!\n"));
+                fprintf(stderr, N_("It must be at least 19 lines by 80 columns.\n"));
                 exit(1);
         }
 
@@ -312,65 +318,54 @@ static void init_wsize(void)
         cols -= 5;
 }
 
-static void cinit(void)
-{
-        item_no = 0;
-}
-
-static void cmake(void)
+static void cprint_init(void)
 {
-        items[item_no] = malloc(sizeof(struct dialog_list_item));
-        memset(items[item_no], 0, sizeof(struct dialog_list_item));
-        items[item_no]->tag = malloc(32); items[item_no]->tag[0] = 0;
-        items[item_no]->name = malloc(512); items[item_no]->name[0] = 0;
-        items[item_no]->namelen = 0;
-        item_no++;
+        bufptr = buf;
+        argptr = args;
+        memset(args, 0, sizeof(args));
+        indent = 0;
+        child_count = 0;
+        cprint("./scripts/kconfig/lxdialog/lxdialog");
+        cprint("--backtitle");
+        cprint(menu_backtitle);
 }
 
-static int cprint_name(const char *fmt, ...)
+static int cprint1(const char *fmt, ...)
 {
         va_list ap;
         int res;
 
-        if (!item_no)
-                cmake();
+        if (!*argptr)
+                *argptr = bufptr;
         va_start(ap, fmt);
-        res = vsnprintf(items[item_no - 1]->name + items[item_no - 1]->namelen,
-                        512 - items[item_no - 1]->namelen, fmt, ap);
-        if (res > 0)
-                items[item_no - 1]->namelen += res;
+        res = vsprintf(bufptr, fmt, ap);
         va_end(ap);
+        bufptr += res;
 
         return res;
 }
 
-static int cprint_tag(const char *fmt, ...)
+static void cprint_done(void)
+{
+        *bufptr++ = 0;
+        argptr++;
+}
+
+static int cprint(const char *fmt, ...)
 {
         va_list ap;
         int res;
 
-        if (!item_no)
-                cmake();
+        *argptr++ = bufptr;
         va_start(ap, fmt);
-        res = vsnprintf(items[item_no - 1]->tag, 32, fmt, ap);
+        res = vsprintf(bufptr, fmt, ap);
         va_end(ap);
+        bufptr += res;
+        *bufptr++ = 0;
 
         return res;
 }
 
-static void cdone(void)
-{
-        int i;
-
-        for (i = 0; i < item_no; i++) {
-                free(items[i]->tag);
-                free(items[i]->name);
-                free(items[i]);
-        }
-
-        item_no = 0;
-}
-
 static void get_prompt_str(struct gstr *r, struct property *prop)
 {
         int i, j;
@@ -408,7 +403,7 @@ static void get_symbol_str(struct gstr *r, struct symbol *sym)
         struct property *prop;
 
         str_printf(r, "Symbol: %s [=%s]\n", sym->name,
-                                       sym_get_string_value(sym));
+                                       sym_get_string_value(sym));
         for_all_prompts(sym, prop)
                 get_prompt_str(r, prop);
         hit = false;
@@ -443,28 +438,121 @@ static struct gstr get_relations_str(struct symbol **sym_arr)
         return res;
 }
 
+pid_t pid;
+
+static void winch_handler(int sig)
+{
+        if (!do_resize) {
+                kill(pid, SIGINT);
+                do_resize = 1;
+        }
+}
+
+static int exec_conf(void)
+{
+        int pipefd[2], stat, size;
+        struct sigaction sa;
+        sigset_t sset, osset;
+
+        sigemptyset(&sset);
+        sigaddset(&sset, SIGINT);
+        sigprocmask(SIG_BLOCK, &sset, &osset);
+
+        signal(SIGINT, SIG_DFL);
+
+        sa.sa_handler = winch_handler;
+        sigemptyset(&sa.sa_mask);
+        sa.sa_flags = SA_RESTART;
+        sigaction(SIGWINCH, &sa, NULL);
+
+        *argptr++ = NULL;
+
+        pipe(pipefd);
+        pid = fork();
+        if (pid == 0) {
+                sigprocmask(SIG_SETMASK, &osset, NULL);
+                dup2(pipefd[1], 2);
+                close(pipefd[0]);
+                close(pipefd[1]);
+                execv(args[0], args);
+                _exit(EXIT_FAILURE);
+        }
+
+        close(pipefd[1]);
+        bufptr = input_buf;
+        while (1) {
+                size = input_buf + sizeof(input_buf) - bufptr;
+                size = read(pipefd[0], bufptr, size);
+                if (size <= 0) {
+                        if (size < 0) {
+                                if (errno == EINTR || errno == EAGAIN)
+                                        continue;
+                                perror("read");
+                        }
+                        break;
+                }
+                bufptr += size;
+        }
+        *bufptr++ = 0;
+        close(pipefd[0]);
+        waitpid(pid, &stat, 0);
+
+        if (do_resize) {
+                init_wsize();
+                do_resize = 0;
+                sigprocmask(SIG_SETMASK, &osset, NULL);
+                return -1;
+        }
+        if (WIFSIGNALED(stat)) {
+                printf("\finterrupted(%d)\n", WTERMSIG(stat));
+                exit(1);
+        }
+#if 0
+        printf("\fexit state: %d\nexit data: '%s'\n", WEXITSTATUS(stat), input_buf);
+        sleep(1);
+#endif
+        sigpending(&sset);
+        if (sigismember(&sset, SIGINT)) {
+                printf("\finterrupted\n");
+                exit(1);
+        }
+        sigprocmask(SIG_SETMASK, &osset, NULL);
+
+        return WEXITSTATUS(stat);
+}
+
 static void search_conf(void)
 {
         struct symbol **sym_arr;
+        int stat;
         struct gstr res;
 
 again:
-        switch (dialog_inputbox("Search Configuration Parameter",
-                                "Enter Keyword", 10, 75,
-                                NULL)) {
+        cprint_init();
+        cprint("--title");
+        cprint(_("Search Configuration Parameter"));
+        cprint("--inputbox");
+        cprint(_("Enter CONFIG_ (sub)string to search for (omit CONFIG_)"));
+        cprint("10");
+        cprint("75");
+        cprint("");
+        stat = exec_conf();
+        if (stat < 0)
+                goto again;
+        switch (stat) {
         case 0:
                 break;
         case 1:
-                show_helptext("Search Configuration", search_help);
+                show_helptext(_("Search Configuration"), search_help);
                 goto again;
         default:
                 return;
         }
 
-        sym_arr = sym_re_search(dialog_input_result);
+        sym_arr = sym_re_search(input_buf);
         res = get_relations_str(sym_arr);
         free(sym_arr);
-        show_textbox("Search Results", str_get(&res), 0, 0);
+        show_textbox(_("Search Results"), str_get(&res), 0, 0);
         str_free(&res);
 }
 
@@ -488,26 +576,24 @@ static void build_conf(struct menu *menu)
                         switch (prop->type) {
                         case P_MENU:
                                 child_count++;
-                                cmake();
-                                cprint_tag("m%p", menu);
+                                cprint("m%p", menu);
 
                                 if (single_menu_mode) {
-                                        cprint_name("%s%*c%s",
+                                        cprint1("%s%*c%s",
                                                 menu->data ? "-->" : "++>",
                                                 indent + 1, ' ', prompt);
-                                } else {
-                                        cprint_name("   %*c%s  --->", indent + 1, ' ', prompt);
-                                }
+                                } else
+                                        cprint1("   %*c%s  --->", indent + 1, ' ', prompt);
 
+                                cprint_done();
                                 if (single_menu_mode && menu->data)
                                         goto conf_childs;
                                 return;
                         default:
                                 if (prompt) {
                                         child_count++;
-                                        cmake();
-                                        cprint_tag(":%p", menu);
-                                        cprint_name("---%*c%s", indent + 1, ' ', prompt);
+                                        cprint(":%p", menu);
+                                        cprint("---%*c%s", indent + 1, ' ', prompt);
                                 }
                         }
                 } else
@@ -515,7 +601,6 @@ static void build_conf(struct menu *menu)
                 goto conf_childs;
         }
 
-        cmake();
         type = sym_get_type(sym);
         if (sym_is_choice(sym)) {
                 struct symbol *def_sym = sym_get_choice_value(sym);
@@ -529,10 +614,10 @@ static void build_conf(struct menu *menu)
 
                 val = sym_get_tristate_value(sym);
                 if (sym_is_changable(sym)) {
-                        cprint_tag("t%p", menu);
+                        cprint("t%p", menu);
                         switch (type) {
                         case S_BOOLEAN:
-                                cprint_name("[%c]", val == no ? ' ' : '*');
+                                cprint1("[%c]", val == no ? ' ' : '*');
                                 break;
                         case S_TRISTATE:
                                 switch (val) {
@@ -540,78 +625,84 @@ static void build_conf(struct menu *menu)
                                 case mod: ch = 'M'; break;
                                 default:  ch = ' '; break;
                                 }
-                                cprint_name("<%c>", ch);
+                                cprint1("<%c>", ch);
                                 break;
                         }
                 } else {
-                        cprint_tag("%c%p", def_menu ? 't' : ':', menu);
-                        cprint_name("   ");
+                        cprint("%c%p", def_menu ? 't' : ':', menu);
+                        cprint1("   ");
                 }
 
-                cprint_name("%*c%s", indent + 1, ' ', menu_get_prompt(menu));
+                cprint1("%*c%s", indent + 1, ' ', menu_get_prompt(menu));
                 if (val == yes) {
                         if (def_menu) {
-                                cprint_name(" (%s)", menu_get_prompt(def_menu));
-                                cprint_name("  --->");
+                                cprint1(" (%s)", menu_get_prompt(def_menu));
+                                cprint1("  --->");
+                                cprint_done();
                                 if (def_menu->list) {
                                         indent += 2;
                                         build_conf(def_menu);
                                         indent -= 2;
                                 }
-                        }
+                        } else
+                                cprint_done();
                         return;
                 }
+                cprint_done();
         } else {
                 if (menu == current_menu) {
-                        cprint_tag(":%p", menu);
-                        cprint_name("---%*c%s", indent + 1, ' ', menu_get_prompt(menu));
+                        cprint(":%p", menu);
+                        cprint("---%*c%s", indent + 1, ' ', menu_get_prompt(menu));
                         goto conf_childs;
                 }
                 child_count++;
                 val = sym_get_tristate_value(sym);
                 if (sym_is_choice_value(sym) && val == yes) {
-                        cprint_tag(":%p", menu);
-                        cprint_name("   ");
+                        cprint(":%p", menu);
+                        cprint1("   ");
                 } else {
                         switch (type) {
                         case S_BOOLEAN:
-                                cprint_tag("t%p", menu);
+                                cprint("t%p", menu);
                                 if (sym_is_changable(sym))
-                                        cprint_name("[%c]", val == no ? ' ' : '*');
+                                        cprint1("[%c]", val == no ? ' ' : '*');
                                 else
-                                        cprint_name("---");
+                                        cprint1("---");
                                 break;
                         case S_TRISTATE:
-                                cprint_tag("t%p", menu);
+                                cprint("t%p", menu);
                                 switch (val) {
                                 case yes: ch = '*'; break;
                                 case mod: ch = 'M'; break;
                                 default:  ch = ' '; break;
                                 }
                                 if (sym_is_changable(sym))
-                                        cprint_name("<%c>", ch);
+                                        cprint1("<%c>", ch);
                                 else
-                                        cprint_name("---");
+                                        cprint1("---");
                                 break;
                         default:
-                                cprint_tag("s%p", menu);
-                                tmp = cprint_name("(%s)", sym_get_string_value(sym));
+                                cprint("s%p", menu);
+                                tmp = cprint1("(%s)", sym_get_string_value(sym));
                                 tmp = indent - tmp + 4;
                                 if (tmp < 0)
                                         tmp = 0;
-                                cprint_name("%*c%s%s", tmp, ' ', menu_get_prompt(menu),
+                                cprint1("%*c%s%s", tmp, ' ', menu_get_prompt(menu),
                                         (sym_has_value(sym) || !sym_is_changable(sym)) ?
                                         "" : " (NEW)");
+                                cprint_done();
                                 goto conf_childs;
                         }
                 }
-                cprint_name("%*c%s%s", indent + 1, ' ', menu_get_prompt(menu),
+                cprint1("%*c%s%s", indent + 1, ' ', menu_get_prompt(menu),
                         (sym_has_value(sym) || !sym_is_changable(sym)) ?
                         "" : " (NEW)");
                 if (menu->prompt->type == P_MENU) {
-                        cprint_name("  --->");
+                        cprint1("  --->");
+                        cprint_done();
                         return;
                 }
+                cprint_done();
         }
 
 conf_childs:
@@ -623,51 +714,57 @@ conf_childs:
 
 static void conf(struct menu *menu)
 {
-        struct dialog_list_item *active_item = NULL;
         struct menu *submenu;
         const char *prompt = menu_get_prompt(menu);
         struct symbol *sym;
         char active_entry[40];
-        int stat, type;
+        int stat, type, i;
 
         unlink("lxdialog.scrltmp");
         active_entry[0] = 0;
         while (1) {
-                indent = 0;
-                child_count = 0;
+                cprint_init();
+                cprint("--title");
+                cprint("%s", prompt ? prompt : _("Main Menu"));
+                cprint("--menu");
+                cprint(_(menu_instructions));
+                cprint("%d", rows);
+                cprint("%d", cols);
+                cprint("%d", rows - 10);
+                cprint("%s", active_entry);
                 current_menu = menu;
-                cdone(); cinit();
                 build_conf(menu);
                 if (!child_count)
                         break;
                 if (menu == &rootmenu) {
-                        cmake(); cprint_tag(":"); cprint_name("--- ");
-                        cmake(); cprint_tag("L"); cprint_name("Load an Alternate Configuration File");
-                        cmake(); cprint_tag("S"); cprint_name("Save Configuration to an Alternate File");
+                        cprint(":");
+                        cprint("--- ");
+                        cprint("L");
+                        cprint(_("    Load an Alternate Configuration File"));
+                        cprint("S");
+                        cprint(_("    Save Configuration to an Alternate File"));
                 }
-                dialog_clear();
-                stat = dialog_menu(prompt ? prompt : "Main Menu",
-                                menu_instructions, rows, cols, rows - 10,
-                                active_entry, item_no, items);
+                stat = exec_conf();
                 if (stat < 0)
-                        return;
+                        continue;
 
                 if (stat == 1 || stat == 255)
                         break;
 
-                active_item = first_sel_item(item_no, items);
-                if (!active_item)
-                        continue;
-                active_item->selected = 0;
-                strncpy(active_entry, active_item->tag, sizeof(active_entry));
-                active_entry[sizeof(active_entry)-1] = 0;
-                type = active_entry[0];
+                type = input_buf[0];
                 if (!type)
                         continue;
 
+                for (i = 0; input_buf[i] && !isspace(input_buf[i]); i++)
+                        ;
+                if (i >= sizeof(active_entry))
+                        i = sizeof(active_entry) - 1;
+                input_buf[i] = 0;
+                strcpy(active_entry, input_buf);
+
                 sym = NULL;
                 submenu = NULL;
-                if (sscanf(active_entry + 1, "%p", &submenu) == 1)
+                if (sscanf(input_buf + 1, "%p", &submenu) == 1)
                         sym = submenu->sym;
 
                 switch (stat) {
@@ -700,7 +797,7 @@ static void conf(struct menu *menu)
                         if (sym)
                                 show_help(submenu);
                         else
-                                show_helptext("README", mconf_readme);
+                                show_helptext("README", _(mconf_readme));
                         break;
                 case 3:
                         if (type == 't') {
@@ -755,8 +852,8 @@ static void show_help(struct menu *menu)
         if (sym->help)
         {
                 if (sym->name) {
-                        str_printf(&help, "%s:\n\n", sym->name);
-                        str_append(&help, sym->help);
+                        str_printf(&help, "CONFIG_%s:\n\n", sym->name);
+                        str_append(&help, _(sym->help));
                         str_append(&help, "\n");
                 }
         } else {
@@ -769,8 +866,17 @@ static void show_help(struct menu *menu)
 
 static void show_file(const char *filename, const char *title, int r, int c)
 {
-        while (dialog_textbox(title, filename, r ? r : rows, c ? c : cols) < 0)
-                ;
+        do {
+                cprint_init();
+                if (title) {
+                        cprint("--title");
+                        cprint("%s", title);
+                }
+                cprint("--textbox");
+                cprint("%s", filename);
+                cprint("%d", r ? r : rows);
+                cprint("%d", c ? c : cols);
+        } while (exec_conf() < 0);
 }
 
 static void conf_choice(struct menu *menu)
@@ -778,35 +884,42 @@ static void conf_choice(struct menu *menu)
         const char *prompt = menu_get_prompt(menu);
         struct menu *child;
         struct symbol *active;
+        int stat;
 
         active = sym_get_choice_value(menu->sym);
         while (1) {
+                cprint_init();
+                cprint("--title");
+                cprint("%s", prompt ? prompt : _("Main Menu"));
+                cprint("--radiolist");
+                cprint(_(radiolist_instructions));
+                cprint("15");
+                cprint("70");
+                cprint("6");
+
                 current_menu = menu;
-                cdone(); cinit();
                 for (child = menu->list; child; child = child->next) {
                         if (!menu_is_visible(child))
                                 continue;
-                        cmake();
-                        cprint_tag("%p", child);
-                        cprint_name("%s", menu_get_prompt(child));
+                        cprint("%p", child);
+                        cprint("%s", menu_get_prompt(child));
                         if (child->sym == sym_get_choice_value(menu->sym))
-                                items[item_no - 1]->selected = 1; /* ON */
+                                cprint("ON");
                         else if (child->sym == active)
-                                items[item_no - 1]->selected = 2; /* SELECTED */
+                                cprint("SELECTED");
                         else
-                                items[item_no - 1]->selected = 0; /* OFF */
+                                cprint("OFF");
                 }
 
-                switch (dialog_checklist(prompt ? prompt : "Main Menu",
-                                        radiolist_instructions, 15, 70, 6,
-                                        item_no, items, FLAG_RADIO)) {
+                stat = exec_conf();
+                switch (stat) {
                 case 0:
-                        if (sscanf(first_sel_item(item_no, items)->tag, "%p", &child) != 1)
+                        if (sscanf(input_buf, "%p", &child) != 1)
                                 break;
                         sym_set_tristate_value(child->sym, yes);
                         return;
                 case 1:
-                        if (sscanf(first_sel_item(item_no, items)->tag, "%p", &child) == 1) {
+                        if (sscanf(input_buf, "%p", &child) == 1) {
                                 show_help(child);
                                 active = child->sym;
                         } else
@@ -821,32 +934,35 @@ static void conf_choice(struct menu *menu)
 static void conf_string(struct menu *menu)
 {
         const char *prompt = menu_get_prompt(menu);
+        int stat;
 
         while (1) {
-                char *heading;
-
+                cprint_init();
+                cprint("--title");
+                cprint("%s", prompt ? prompt : _("Main Menu"));
+                cprint("--inputbox");
                 switch (sym_get_type(menu->sym)) {
                 case S_INT:
-                        heading = (char *) inputbox_instructions_int;
+                        cprint(_(inputbox_instructions_int));
                         break;
                 case S_HEX:
-                        heading = (char *) inputbox_instructions_hex;
+                        cprint(_(inputbox_instructions_hex));
                         break;
                 case S_STRING:
-                        heading = (char *) inputbox_instructions_string;
+                        cprint(_(inputbox_instructions_string));
                         break;
                 default:
-                        heading = "Internal mconf error!";
                         /* panic? */;
                 }
-
-                switch (dialog_inputbox(prompt ? prompt : "Main Menu",
-                                        heading, 10, 75,
-                                        sym_get_string_value(menu->sym))) {
+                cprint("10");
+                cprint("75");
+                cprint("%s", sym_get_string_value(menu->sym));
+                stat = exec_conf();
+                switch (stat) {
                 case 0:
-                        if (sym_set_string_value(menu->sym, dialog_input_result))
+                        if (sym_set_string_value(menu->sym, input_buf))
                                 return;
-                        show_textbox(NULL, "You have made an invalid entry.", 5, 43);
+                        show_textbox(NULL, _("You have made an invalid entry."), 5, 43);
                         break;
                 case 1:
                         show_help(menu);
@@ -859,18 +975,26 @@ static void conf_string(struct menu *menu)
 
 static void conf_load(void)
 {
+        int stat;
+
         while (1) {
-                switch (dialog_inputbox(NULL, load_config_text, 11, 55,
-                                        filename)) {
+                cprint_init();
+                cprint("--inputbox");
+                cprint(load_config_text);
+                cprint("11");
+                cprint("55");
+                cprint("%s", filename);
+                stat = exec_conf();
+                switch(stat) {
                 case 0:
-                        if (!dialog_input_result[0])
+                        if (!input_buf[0])
                                 return;
-                        if (!conf_read(dialog_input_result))
+                        if (!conf_read(input_buf))
                                 return;
-                        show_textbox(NULL, "File does not exist!", 5, 38);
+                        show_textbox(NULL, _("File does not exist!"), 5, 38);
                         break;
                 case 1:
-                        show_helptext("Load Alternate Configuration", load_config_help);
+                        show_helptext(_("Load Alternate Configuration"), load_config_help);
                         break;
                 case 255:
                         return;
@@ -880,18 +1004,26 @@ static void conf_load(void)
 
 static void conf_save(void)
 {
+        int stat;
+
         while (1) {
-                switch (dialog_inputbox(NULL, save_config_text, 11, 55,
-                                        filename)) {
+                cprint_init();
+                cprint("--inputbox");
+                cprint(save_config_text);
+                cprint("11");
+                cprint("55");
+                cprint("%s", filename);
+                stat = exec_conf();
+                switch(stat) {
                 case 0:
-                        if (!dialog_input_result[0])
+                        if (!input_buf[0])
                                 return;
-                        if (!conf_write(dialog_input_result))
+                        if (!conf_write(input_buf))
                                 return;
-                        show_textbox(NULL, "Can't create file!  Probably a nonexistent directory.", 5, 60);
+                        show_textbox(NULL, _("Can't create file!  Probably a nonexistent directory."), 5, 60);
                         break;
                 case 1:
-                        show_helptext("Save Alternate Configuration", save_config_help);
+                        show_helptext(_("Save Alternate Configuration"), save_config_help);
                         break;
                 case 255:
                         return;
@@ -903,30 +1035,7 @@ static void conf_cleanup(void)
 {
         tcsetattr(1, TCSAFLUSH, &ios_org);
         unlink(".help.tmp");
-}
-
-static void winch_handler(int sig)
-{
-        struct winsize ws;
-
-        if (ioctl(1, TIOCGWINSZ, &ws) == -1) {
-                rows = 24;
-                cols = 80;
-        } else {
-                rows = ws.ws_row;
-                cols = ws.ws_col;
-        }
-
-        if (rows < 19 || cols < 80) {
-                end_dialog();
-                fprintf(stderr, "Your display is too small to run Menuconfig!\n");
-                fprintf(stderr, "It must be at least 19 lines by 80 columns.\n");
-                exit(1);
-        }
-
-        rows -= 4;
-        cols -= 5;
-
+        unlink("lxdialog.scrltmp");
 }
 
 int main(int ac, char **av)
@@ -935,12 +1044,16 @@ int main(int ac, char **av)
         char *mode;
         int stat;
 
+        setlocale(LC_ALL, "");
+        bindtextdomain(PACKAGE, LOCALEDIR);
+        textdomain(PACKAGE);
+
         conf_parse(av[1]);
         conf_read(NULL);
 
-        sym = sym_lookup("VERSION", 0);
+        sym = sym_lookup("KERNELVERSION", 0);
         sym_calc_value(sym);
-        snprintf(menu_backtitle, 128, "BusyBox v%s Configuration",
+        sprintf(menu_backtitle, _("Linux Kernel v%s Configuration"),
                 sym_get_string_value(sym));
 
         mode = getenv("MENUCONFIG_MODE");
@@ -952,25 +1065,34 @@ int main(int ac, char **av)
         tcgetattr(1, &ios_org);
         atexit(conf_cleanup);
         init_wsize();
-        init_dialog();
-        signal(SIGWINCH, winch_handler);
         conf(&rootmenu);
-        end_dialog();
 
-        /* Restart dialog to act more like when lxdialog was still separate */
-        init_dialog();
         do {
-                stat = dialog_yesno(NULL,
-                                    "Do you wish to save your new BusyBox configuration?", 5, 60);
+                cprint_init();
+                cprint("--yesno");
+                cprint(_("Do you wish to save your new kernel configuration?"));
+                cprint("5");
+                cprint("60");
+                stat = exec_conf();
         } while (stat < 0);
-        end_dialog();
 
         if (stat == 0) {
-                conf_write(NULL);
-                printf("\n"
-                        "*** End of BusyBox configuration.\n");
-        } else
-                printf("\n\nYour BusyBox configuration changes were NOT saved.\n\n");
+                if (conf_write(NULL)) {
+                        fprintf(stderr, _("\n\n"
+                                "Error during writing of the kernel configuration.\n"
+                                "Your kernel configuration changes were NOT saved."
+                                "\n\n"));
+                        return 1;
+                }
+                printf(_("\n\n"
+                        "*** End of Linux kernel configuration.\n"
+                        "*** Execute 'make' to build the kernel or try 'make help'."
+                        "\n\n"));
+        } else {
+                fprintf(stderr, _("\n\n"
+                        "Your kernel configuration changes were NOT saved."
+                        "\n\n"));
+        }
 
         return 0;
 }
diff --git a/scripts/config/menu.c b/scripts/kconfig/menu.c
index 7e97e8330..0fce20cb7 100644
--- a/scripts/config/menu.c
+++ b/scripts/kconfig/menu.c
@@ -1,4 +1,3 @@
-/* vi: set sw=4 ts=4: */
 /*
  * Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org>
  * Released under the terms of the GNU GPL v2.0.
@@ -62,10 +61,11 @@ void menu_end_entry(void)
 {
 }
 
-void menu_add_menu(void)
+struct menu *menu_add_menu(void)
 {
-        current_menu = current_entry;
+        menu_end_entry();
         last_entry_ptr = &current_entry->list;
+        return current_menu = current_entry;
 }
 
 void menu_end_menu(void)
@@ -137,9 +137,9 @@ struct property *menu_add_prop(enum prop_type type, char *prompt, struct expr *e
         return prop;
 }
 
-void menu_add_prompt(enum prop_type type, char *prompt, struct expr *dep)
+struct property *menu_add_prompt(enum prop_type type, char *prompt, struct expr *dep)
 {
-        menu_add_prop(type, prompt, NULL, dep);
+        return menu_add_prop(type, prompt, NULL, dep);
 }
 
 void menu_add_expr(enum prop_type type, struct expr *expr, struct expr *dep)
@@ -152,6 +152,12 @@ void menu_add_symbol(enum prop_type type, struct symbol *sym, struct expr *dep)
         menu_add_prop(type, NULL, expr_alloc_symbol(sym), dep);
 }
 
+static int menu_range_valid_sym(struct symbol *sym, struct symbol *sym2)
+{
+        return sym2->type == S_INT || sym2->type == S_HEX ||
+               (sym2->type == S_UNKNOWN && sym_string_valid(sym, sym2->name));
+}
+
 void sym_check_prop(struct symbol *sym)
 {
         struct property *prop;
@@ -185,9 +191,9 @@ void sym_check_prop(struct symbol *sym)
                 case P_RANGE:
                         if (sym->type != S_INT && sym->type != S_HEX)
                                 prop_warn(prop, "range is only allowed "
-                                                "for int or hex symbols");
-                        if (!sym_string_valid(sym, prop->expr->left.sym->name) ||
-                            !sym_string_valid(sym, prop->expr->right.sym->name))
+                                                "for int or hex symbols");
+                        if (!menu_range_valid_sym(sym, prop->expr->left.sym) ||
+                            !menu_range_valid_sym(sym, prop->expr->right.sym))
                                 prop_warn(prop, "range is invalid");
                         break;
                 default:
@@ -366,9 +372,9 @@ bool menu_is_visible(struct menu *menu)
 const char *menu_get_prompt(struct menu *menu)
 {
         if (menu->prompt)
-                return menu->prompt->text;
+                return _(menu->prompt->text);
         else if (menu->sym)
-                return menu->sym->name;
+                return _(menu->sym->name);
         return NULL;
 }
 
diff --git a/scripts/kconfig/qconf.cc b/scripts/kconfig/qconf.cc
new file mode 100644
index 000000000..4590cd316
--- /dev/null
+++ b/scripts/kconfig/qconf.cc
@@ -0,0 +1,1426 @@
+/*
+ * Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org>
+ * Released under the terms of the GNU GPL v2.0.
+ */
+
+#include <qapplication.h>
+#include <qmainwindow.h>
+#include <qtoolbar.h>
+#include <qvbox.h>
+#include <qsplitter.h>
+#include <qlistview.h>
+#include <qtextview.h>
+#include <qlineedit.h>
+#include <qmenubar.h>
+#include <qmessagebox.h>
+#include <qaction.h>
+#include <qheader.h>
+#include <qfiledialog.h>
+#include <qregexp.h>
+
+#include <stdlib.h>
+
+#include "lkc.h"
+#include "qconf.h"
+
+#include "qconf.moc"
+#include "images.c"
+
+#ifdef _
+# undef _
+# define _ qgettext
+#endif
+
+static QApplication *configApp;
+
+static inline QString qgettext(const char* str)
+{
+  return QString::fromLocal8Bit(gettext(str));
+}
+
+static inline QString qgettext(const QString& str)
+{
+  return QString::fromLocal8Bit(gettext(str.latin1()));
+}
+
+ConfigSettings::ConfigSettings()
+        : showAll(false), showName(false), showRange(false), showData(false)
+{
+}
+
+#if QT_VERSION >= 300
+/**
+ * Reads the list column settings from the application settings.
+ */
+void ConfigSettings::readListSettings()
+{
+        showAll = readBoolEntry("/kconfig/qconf/showAll", false);
+        showName = readBoolEntry("/kconfig/qconf/showName", false);
+        showRange = readBoolEntry("/kconfig/qconf/showRange", false);
+        showData = readBoolEntry("/kconfig/qconf/showData", false);
+}
+
+/**
+ * Reads a list of integer values from the application settings.
+ */
+QValueList<int> ConfigSettings::readSizes(const QString& key, bool *ok)
+{
+        QValueList<int> result;
+        QStringList entryList = readListEntry(key, ok);
+        if (ok) {
+                QStringList::Iterator it;
+                for (it = entryList.begin(); it != entryList.end(); ++it)
+                        result.push_back((*it).toInt());
+        }
+
+        return result;
+}
+
+/**
+ * Writes a list of integer values to the application settings.
+ */
+bool ConfigSettings::writeSizes(const QString& key, const QValueList<int>& value)
+{
+        QStringList stringList;
+        QValueList<int>::ConstIterator it;
+
+        for (it = value.begin(); it != value.end(); ++it)
+                stringList.push_back(QString::number(*it));
+        return writeEntry(key, stringList);
+}
+#endif
+
+
+/*
+ * update all the children of a menu entry
+ *   removes/adds the entries from the parent widget as necessary
+ *
+ * parent: either the menu list widget or a menu entry widget
+ * menu: entry to be updated
+ */
+template <class P>
+void ConfigList::updateMenuList(P* parent, struct menu* menu)
+{
+        struct menu* child;
+        ConfigItem* item;
+        ConfigItem* last;
+        bool visible;
+        enum prop_type type;
+
+        if (!menu) {
+                while ((item = parent->firstChild()))
+                        delete item;
+                return;
+        }
+
+        last = parent->firstChild();
+        if (last && !last->goParent)
+                last = 0;
+        for (child = menu->list; child; child = child->next) {
+                item = last ? last->nextSibling() : parent->firstChild();
+                type = child->prompt ? child->prompt->type : P_UNKNOWN;
+
+                switch (mode) {
+                case menuMode:
+                        if (!(child->flags & MENU_ROOT))
+                                goto hide;
+                        break;
+                case symbolMode:
+                        if (child->flags & MENU_ROOT)
+                                goto hide;
+                        break;
+                default:
+                        break;
+                }
+
+                visible = menu_is_visible(child);
+                if (showAll || visible) {
+                        if (!item || item->menu != child)
+                                item = new ConfigItem(parent, last, child, visible);
+                        else
+                                item->testUpdateMenu(visible);
+
+                        if (mode == fullMode || mode == menuMode || type != P_MENU)
+                                updateMenuList(item, child);
+                        else
+                                updateMenuList(item, 0);
+                        last = item;
+                        continue;
+                }
+        hide:
+                if (item && item->menu == child) {
+                        last = parent->firstChild();
+                        if (last == item)
+                                last = 0;
+                        else while (last->nextSibling() != item)
+                                last = last->nextSibling();
+                        delete item;
+                }
+        }
+}
+
+#if QT_VERSION >= 300
+/*
+ * set the new data
+ * TODO check the value
+ */
+void ConfigItem::okRename(int col)
+{
+        Parent::okRename(col);
+        sym_set_string_value(menu->sym, text(dataColIdx).latin1());
+}
+#endif
+
+/*
+ * update the displayed of a menu entry
+ */
+void ConfigItem::updateMenu(void)
+{
+        ConfigList* list;
+        struct symbol* sym;
+        struct property *prop;
+        QString prompt;
+        int type;
+        tristate expr;
+
+        list = listView();
+        if (goParent) {
+                setPixmap(promptColIdx, list->menuBackPix);
+                prompt = "..";
+                goto set_prompt;
+        }
+
+        sym = menu->sym;
+        prop = menu->prompt;
+        prompt = QString::fromLocal8Bit(menu_get_prompt(menu));
+
+        if (prop) switch (prop->type) {
+        case P_MENU:
+                if (list->mode == singleMode || list->mode == symbolMode) {
+                        /* a menuconfig entry is displayed differently
+                         * depending whether it's at the view root or a child.
+                         */
+                        if (sym && list->rootEntry == menu)
+                                break;
+                        setPixmap(promptColIdx, list->menuPix);
+                } else {
+                        if (sym)
+                                break;
+                        setPixmap(promptColIdx, 0);
+                }
+                goto set_prompt;
+        case P_COMMENT:
+                setPixmap(promptColIdx, 0);
+                goto set_prompt;
+        default:
+                ;
+        }
+        if (!sym)
+                goto set_prompt;
+
+        setText(nameColIdx, QString::fromLocal8Bit(sym->name));
+
+        type = sym_get_type(sym);
+        switch (type) {
+        case S_BOOLEAN:
+        case S_TRISTATE:
+                char ch;
+
+                if (!sym_is_changable(sym) && !list->showAll) {
+                        setPixmap(promptColIdx, 0);
+                        setText(noColIdx, QString::null);
+                        setText(modColIdx, QString::null);
+                        setText(yesColIdx, QString::null);
+                        break;
+                }
+                expr = sym_get_tristate_value(sym);
+                switch (expr) {
+                case yes:
+                        if (sym_is_choice_value(sym) && type == S_BOOLEAN)
+                                setPixmap(promptColIdx, list->choiceYesPix);
+                        else
+                                setPixmap(promptColIdx, list->symbolYesPix);
+                        setText(yesColIdx, "Y");
+                        ch = 'Y';
+                        break;
+                case mod:
+                        setPixmap(promptColIdx, list->symbolModPix);
+                        setText(modColIdx, "M");
+                        ch = 'M';
+                        break;
+                default:
+                        if (sym_is_choice_value(sym) && type == S_BOOLEAN)
+                                setPixmap(promptColIdx, list->choiceNoPix);
+                        else
+                                setPixmap(promptColIdx, list->symbolNoPix);
+                        setText(noColIdx, "N");
+                        ch = 'N';
+                        break;
+                }
+                if (expr != no)
+                        setText(noColIdx, sym_tristate_within_range(sym, no) ? "_" : 0);
+                if (expr != mod)
+                        setText(modColIdx, sym_tristate_within_range(sym, mod) ? "_" : 0);
+                if (expr != yes)
+                        setText(yesColIdx, sym_tristate_within_range(sym, yes) ? "_" : 0);
+
+                setText(dataColIdx, QChar(ch));
+                break;
+        case S_INT:
+        case S_HEX:
+        case S_STRING:
+                const char* data;
+
+                data = sym_get_string_value(sym);
+
+#if QT_VERSION >= 300
+                int i = list->mapIdx(dataColIdx);
+                if (i >= 0)
+                        setRenameEnabled(i, TRUE);
+#endif
+                setText(dataColIdx, data);
+                if (type == S_STRING)
+                        prompt = QString("%1: %2").arg(prompt).arg(data);
+                else
+                        prompt = QString("(%2) %1").arg(prompt).arg(data);
+                break;
+        }
+        if (!sym_has_value(sym) && visible)
+                prompt += " (NEW)";
+set_prompt:
+        setText(promptColIdx, prompt);
+}
+
+void ConfigItem::testUpdateMenu(bool v)
+{
+        ConfigItem* i;
+
+        visible = v;
+        if (!menu)
+                return;
+
+        sym_calc_value(menu->sym);
+        if (menu->flags & MENU_CHANGED) {
+                /* the menu entry changed, so update all list items */
+                menu->flags &= ~MENU_CHANGED;
+                for (i = (ConfigItem*)menu->data; i; i = i->nextItem)
+                        i->updateMenu();
+        } else if (listView()->updateAll)
+                updateMenu();
+}
+
+void ConfigItem::paintCell(QPainter* p, const QColorGroup& cg, int column, int width, int align)
+{
+        ConfigList* list = listView();
+
+        if (visible) {
+                if (isSelected() && !list->hasFocus() && list->mode == menuMode)
+                        Parent::paintCell(p, list->inactivedColorGroup, column, width, align);
+                else
+                        Parent::paintCell(p, cg, column, width, align);
+        } else
+                Parent::paintCell(p, list->disabledColorGroup, column, width, align);
+}
+
+/*
+ * construct a menu entry
+ */
+void ConfigItem::init(void)
+{
+        if (menu) {
+                ConfigList* list = listView();
+                nextItem = (ConfigItem*)menu->data;
+                menu->data = this;
+
+                if (list->mode != fullMode)
+                        setOpen(TRUE);
+                sym_calc_value(menu->sym);
+        }
+        updateMenu();
+}
+
+/*
+ * destruct a menu entry
+ */
+ConfigItem::~ConfigItem(void)
+{
+        if (menu) {
+                ConfigItem** ip = (ConfigItem**)&menu->data;
+                for (; *ip; ip = &(*ip)->nextItem) {
+                        if (*ip == this) {
+                                *ip = nextItem;
+                                break;
+                        }
+                }
+        }
+}
+
+void ConfigLineEdit::show(ConfigItem* i)
+{
+        item = i;
+        if (sym_get_string_value(item->menu->sym))
+                setText(QString::fromLocal8Bit(sym_get_string_value(item->menu->sym)));
+        else
+                setText(QString::null);
+        Parent::show();
+        setFocus();
+}
+
+void ConfigLineEdit::keyPressEvent(QKeyEvent* e)
+{
+        switch (e->key()) {
+        case Key_Escape:
+                break;
+        case Key_Return:
+        case Key_Enter:
+                sym_set_string_value(item->menu->sym, text().latin1());
+                parent()->updateList(item);
+                break;
+        default:
+                Parent::keyPressEvent(e);
+                return;
+        }
+        e->accept();
+        parent()->list->setFocus();
+        hide();
+}
+
+ConfigList::ConfigList(ConfigView* p, ConfigMainWindow* cv, ConfigSettings* configSettings)
+        : Parent(p), cview(cv),
+          updateAll(false),
+          symbolYesPix(xpm_symbol_yes), symbolModPix(xpm_symbol_mod), symbolNoPix(xpm_symbol_no),
+          choiceYesPix(xpm_choice_yes), choiceNoPix(xpm_choice_no),
+          menuPix(xpm_menu), menuInvPix(xpm_menu_inv), menuBackPix(xpm_menuback), voidPix(xpm_void),
+          showAll(false), showName(false), showRange(false), showData(false),
+          rootEntry(0)
+{
+        int i;
+
+        setSorting(-1);
+        setRootIsDecorated(TRUE);
+        disabledColorGroup = palette().active();
+        disabledColorGroup.setColor(QColorGroup::Text, palette().disabled().text());
+        inactivedColorGroup = palette().active();
+        inactivedColorGroup.setColor(QColorGroup::Highlight, palette().disabled().highlight());
+
+        connect(this, SIGNAL(selectionChanged(void)),
+                SLOT(updateSelection(void)));
+
+        if (configSettings) {
+                showAll = configSettings->showAll;
+                showName = configSettings->showName;
+                showRange = configSettings->showRange;
+                showData = configSettings->showData;
+        }
+
+        for (i = 0; i < colNr; i++)
+                colMap[i] = colRevMap[i] = -1;
+        addColumn(promptColIdx, "Option");
+
+        reinit();
+}
+
+void ConfigList::reinit(void)
+{
+        removeColumn(dataColIdx);
+        removeColumn(yesColIdx);
+        removeColumn(modColIdx);
+        removeColumn(noColIdx);
+        removeColumn(nameColIdx);
+
+        if (showName)
+                addColumn(nameColIdx, "Name");
+        if (showRange) {
+                addColumn(noColIdx, "N");
+                addColumn(modColIdx, "M");
+                addColumn(yesColIdx, "Y");
+        }
+        if (showData)
+                addColumn(dataColIdx, "Value");
+
+        updateListAll();
+}
+
+void ConfigList::updateSelection(void)
+{
+        struct menu *menu;
+        enum prop_type type;
+
+        ConfigItem* item = (ConfigItem*)selectedItem();
+        if (!item)
+                return;
+
+        cview->setHelp(item);
+
+        menu = item->menu;
+        if (!menu)
+                return;
+        type = menu->prompt ? menu->prompt->type : P_UNKNOWN;
+        if (mode == menuMode && type == P_MENU)
+                emit menuSelected(menu);
+}
+
+void ConfigList::updateList(ConfigItem* item)
+{
+        ConfigItem* last = 0;
+
+        if (!rootEntry)
+                goto update;
+
+        if (rootEntry != &rootmenu && (mode == singleMode ||
+            (mode == symbolMode && rootEntry->parent != &rootmenu))) {
+                item = firstChild();
+                if (!item)
+                        item = new ConfigItem(this, 0, true);
+                last = item;
+        }
+        if ((mode == singleMode || (mode == symbolMode && !(rootEntry->flags & MENU_ROOT))) &&
+            rootEntry->sym && rootEntry->prompt) {
+                item = last ? last->nextSibling() : firstChild();
+                if (!item)
+                        item = new ConfigItem(this, last, rootEntry, true);
+                else
+                        item->testUpdateMenu(true);
+
+                updateMenuList(item, rootEntry);
+                triggerUpdate();
+                return;
+        }
+update:
+        updateMenuList(this, rootEntry);
+        triggerUpdate();
+}
+
+void ConfigList::setAllOpen(bool open)
+{
+        QListViewItemIterator it(this);
+
+        for (; it.current(); it++)
+                it.current()->setOpen(open);
+}
+
+void ConfigList::setValue(ConfigItem* item, tristate val)
+{
+        struct symbol* sym;
+        int type;
+        tristate oldval;
+
+        sym = item->menu ? item->menu->sym : 0;
+        if (!sym)
+                return;
+
+        type = sym_get_type(sym);
+        switch (type) {
+        case S_BOOLEAN:
+        case S_TRISTATE:
+                oldval = sym_get_tristate_value(sym);
+
+                if (!sym_set_tristate_value(sym, val))
+                        return;
+                if (oldval == no && item->menu->list)
+                        item->setOpen(TRUE);
+                parent()->updateList(item);
+                break;
+        }
+}
+
+void ConfigList::changeValue(ConfigItem* item)
+{
+        struct symbol* sym;
+        struct menu* menu;
+        int type, oldexpr, newexpr;
+
+        menu = item->menu;
+        if (!menu)
+                return;
+        sym = menu->sym;
+        if (!sym) {
+                if (item->menu->list)
+                        item->setOpen(!item->isOpen());
+                return;
+        }
+
+        type = sym_get_type(sym);
+        switch (type) {
+        case S_BOOLEAN:
+        case S_TRISTATE:
+                oldexpr = sym_get_tristate_value(sym);
+                newexpr = sym_toggle_tristate_value(sym);
+                if (item->menu->list) {
+                        if (oldexpr == newexpr)
+                                item->setOpen(!item->isOpen());
+                        else if (oldexpr == no)
+                                item->setOpen(TRUE);
+                }
+                if (oldexpr != newexpr)
+                        parent()->updateList(item);
+                break;
+        case S_INT:
+        case S_HEX:
+        case S_STRING:
+#if QT_VERSION >= 300
+                if (colMap[dataColIdx] >= 0)
+                        item->startRename(colMap[dataColIdx]);
+                else
+#endif
+                        parent()->lineEdit->show(item);
+                break;
+        }
+}
+
+void ConfigList::setRootMenu(struct menu *menu)
+{
+        enum prop_type type;
+
+        if (rootEntry == menu)
+                return;
+        type = menu && menu->prompt ? menu->prompt->type : P_UNKNOWN;
+        if (type != P_MENU)
+                return;
+        updateMenuList(this, 0);
+        rootEntry = menu;
+        updateListAll();
+        setSelected(currentItem(), hasFocus());
+}
+
+void ConfigList::setParentMenu(void)
+{
+        ConfigItem* item;
+        struct menu *oldroot;
+
+        oldroot = rootEntry;
+        if (rootEntry == &rootmenu)
+                return;
+        setRootMenu(menu_get_parent_menu(rootEntry->parent));
+
+        QListViewItemIterator it(this);
+        for (; (item = (ConfigItem*)it.current()); it++) {
+                if (item->menu == oldroot) {
+                        setCurrentItem(item);
+                        ensureItemVisible(item);
+                        break;
+                }
+        }
+}
+
+void ConfigList::keyPressEvent(QKeyEvent* ev)
+{
+        QListViewItem* i = currentItem();
+        ConfigItem* item;
+        struct menu *menu;
+        enum prop_type type;
+
+        if (ev->key() == Key_Escape && mode != fullMode) {
+                emit parentSelected();
+                ev->accept();
+                return;
+        }
+
+        if (!i) {
+                Parent::keyPressEvent(ev);
+                return;
+        }
+        item = (ConfigItem*)i;
+
+        switch (ev->key()) {
+        case Key_Return:
+        case Key_Enter:
+                if (item->goParent) {
+                        emit parentSelected();
+                        break;
+                }
+                menu = item->menu;
+                if (!menu)
+                        break;
+                type = menu->prompt ? menu->prompt->type : P_UNKNOWN;
+                if (type == P_MENU && rootEntry != menu &&
+                    mode != fullMode && mode != menuMode) {
+                        emit menuSelected(menu);
+                        break;
+                }
+        case Key_Space:
+                changeValue(item);
+                break;
+        case Key_N:
+                setValue(item, no);
+                break;
+        case Key_M:
+                setValue(item, mod);
+                break;
+        case Key_Y:
+                setValue(item, yes);
+                break;
+        default:
+                Parent::keyPressEvent(ev);
+                return;
+        }
+        ev->accept();
+}
+
+void ConfigList::contentsMousePressEvent(QMouseEvent* e)
+{
+        //QPoint p(contentsToViewport(e->pos()));
+        //printf("contentsMousePressEvent: %d,%d\n", p.x(), p.y());
+        Parent::contentsMousePressEvent(e);
+}
+
+void ConfigList::contentsMouseReleaseEvent(QMouseEvent* e)
+{
+        QPoint p(contentsToViewport(e->pos()));
+        ConfigItem* item = (ConfigItem*)itemAt(p);
+        struct menu *menu;
+        enum prop_type ptype;
+        const QPixmap* pm;
+        int idx, x;
+
+        if (!item)
+                goto skip;
+
+        menu = item->menu;
+        x = header()->offset() + p.x();
+        idx = colRevMap[header()->sectionAt(x)];
+        switch (idx) {
+        case promptColIdx:
+                pm = item->pixmap(promptColIdx);
+                if (pm) {
+                        int off = header()->sectionPos(0) + itemMargin() +
+                                treeStepSize() * (item->depth() + (rootIsDecorated() ? 1 : 0));
+                        if (x >= off && x < off + pm->width()) {
+                                if (item->goParent) {
+                                        emit parentSelected();
+                                        break;
+                                } else if (!menu)
+                                        break;
+                                ptype = menu->prompt ? menu->prompt->type : P_UNKNOWN;
+                                if (ptype == P_MENU && rootEntry != menu &&
+                                    mode != fullMode && mode != menuMode)
+                                        emit menuSelected(menu);
+                                else
+                                        changeValue(item);
+                        }
+                }
+                break;
+        case noColIdx:
+                setValue(item, no);
+                break;
+        case modColIdx:
+                setValue(item, mod);
+                break;
+        case yesColIdx:
+                setValue(item, yes);
+                break;
+        case dataColIdx:
+                changeValue(item);
+                break;
+        }
+
+skip:
+        //printf("contentsMouseReleaseEvent: %d,%d\n", p.x(), p.y());
+        Parent::contentsMouseReleaseEvent(e);
+}
+
+void ConfigList::contentsMouseMoveEvent(QMouseEvent* e)
+{
+        //QPoint p(contentsToViewport(e->pos()));
+        //printf("contentsMouseMoveEvent: %d,%d\n", p.x(), p.y());
+        Parent::contentsMouseMoveEvent(e);
+}
+
+void ConfigList::contentsMouseDoubleClickEvent(QMouseEvent* e)
+{
+        QPoint p(contentsToViewport(e->pos()));
+        ConfigItem* item = (ConfigItem*)itemAt(p);
+        struct menu *menu;
+        enum prop_type ptype;
+
+        if (!item)
+                goto skip;
+        if (item->goParent) {
+                emit parentSelected();
+                goto skip;
+        }
+        menu = item->menu;
+        if (!menu)
+                goto skip;
+        ptype = menu->prompt ? menu->prompt->type : P_UNKNOWN;
+        if (ptype == P_MENU && (mode == singleMode || mode == symbolMode))
+                emit menuSelected(menu);
+        else if (menu->sym)
+                changeValue(item);
+
+skip:
+        //printf("contentsMouseDoubleClickEvent: %d,%d\n", p.x(), p.y());
+        Parent::contentsMouseDoubleClickEvent(e);
+}
+
+void ConfigList::focusInEvent(QFocusEvent *e)
+{
+        Parent::focusInEvent(e);
+
+        QListViewItem* item = currentItem();
+        if (!item)
+                return;
+
+        setSelected(item, TRUE);
+        emit gotFocus();
+}
+
+ConfigView* ConfigView::viewList;
+
+ConfigView::ConfigView(QWidget* parent, ConfigMainWindow* cview,
+                       ConfigSettings *configSettings)
+        : Parent(parent)
+{
+        list = new ConfigList(this, cview, configSettings);
+        lineEdit = new ConfigLineEdit(this);
+        lineEdit->hide();
+
+        this->nextView = viewList;
+        viewList = this;
+}
+
+ConfigView::~ConfigView(void)
+{
+        ConfigView** vp;
+
+        for (vp = &viewList; *vp; vp = &(*vp)->nextView) {
+                if (*vp == this) {
+                        *vp = nextView;
+                        break;
+                }
+        }
+}
+
+void ConfigView::updateList(ConfigItem* item)
+{
+        ConfigView* v;
+
+        for (v = viewList; v; v = v->nextView)
+                v->list->updateList(item);
+}
+
+void ConfigView::updateListAll(void)
+{
+        ConfigView* v;
+
+        for (v = viewList; v; v = v->nextView)
+                v->list->updateListAll();
+}
+
+/*
+ * Construct the complete config widget
+ */
+ConfigMainWindow::ConfigMainWindow(void)
+{
+        QMenuBar* menu;
+        bool ok;
+        int x, y, width, height;
+
+        QWidget *d = configApp->desktop();
+
+        ConfigSettings* configSettings = new ConfigSettings();
+#if QT_VERSION >= 300
+        width = configSettings->readNumEntry("/kconfig/qconf/window width", d->width() - 64);
+        height = configSettings->readNumEntry("/kconfig/qconf/window height", d->height() - 64);
+        resize(width, height);
+        x = configSettings->readNumEntry("/kconfig/qconf/window x", 0, &ok);
+        if (ok)
+                y = configSettings->readNumEntry("/kconfig/qconf/window y", 0, &ok);
+        if (ok)
+                move(x, y);
+        showDebug = configSettings->readBoolEntry("/kconfig/qconf/showDebug", false);
+
+        // read list settings into configSettings, will be used later for ConfigList setup
+        configSettings->readListSettings();
+#else
+        width = d->width() - 64;
+        height = d->height() - 64;
+        resize(width, height);
+        showDebug = false;
+#endif
+
+        split1 = new QSplitter(this);
+        split1->setOrientation(QSplitter::Horizontal);
+        setCentralWidget(split1);
+
+        menuView = new ConfigView(split1, this, configSettings);
+        menuList = menuView->list;
+
+        split2 = new QSplitter(split1);
+        split2->setOrientation(QSplitter::Vertical);
+
+        // create config tree
+        configView = new ConfigView(split2, this, configSettings);
+        configList = configView->list;
+
+        helpText = new QTextView(split2);
+        helpText->setTextFormat(Qt::RichText);
+
+        setTabOrder(configList, helpText);
+        configList->setFocus();
+
+        menu = menuBar();
+        toolBar = new QToolBar("Tools", this);
+
+        backAction = new QAction("Back", QPixmap(xpm_back), "Back", 0, this);
+          connect(backAction, SIGNAL(activated()), SLOT(goBack()));
+          backAction->setEnabled(FALSE);
+        QAction *quitAction = new QAction("Quit", "&Quit", CTRL+Key_Q, this);
+          connect(quitAction, SIGNAL(activated()), SLOT(close()));
+        QAction *loadAction = new QAction("Load", QPixmap(xpm_load), "&Load", CTRL+Key_L, this);
+          connect(loadAction, SIGNAL(activated()), SLOT(loadConfig()));
+        QAction *saveAction = new QAction("Save", QPixmap(xpm_save), "&Save", CTRL+Key_S, this);
+          connect(saveAction, SIGNAL(activated()), SLOT(saveConfig()));
+        QAction *saveAsAction = new QAction("Save As...", "Save &As...", 0, this);
+          connect(saveAsAction, SIGNAL(activated()), SLOT(saveConfigAs()));
+        QAction *singleViewAction = new QAction("Single View", QPixmap(xpm_single_view), "Split View", 0, this);
+          connect(singleViewAction, SIGNAL(activated()), SLOT(showSingleView()));
+        QAction *splitViewAction = new QAction("Split View", QPixmap(xpm_split_view), "Split View", 0, this);
+          connect(splitViewAction, SIGNAL(activated()), SLOT(showSplitView()));
+        QAction *fullViewAction = new QAction("Full View", QPixmap(xpm_tree_view), "Full View", 0, this);
+          connect(fullViewAction, SIGNAL(activated()), SLOT(showFullView()));
+
+        QAction *showNameAction = new QAction(NULL, "Show Name", 0, this);
+          showNameAction->setToggleAction(TRUE);
+          showNameAction->setOn(configList->showName);
+          connect(showNameAction, SIGNAL(toggled(bool)), SLOT(setShowName(bool)));
+        QAction *showRangeAction = new QAction(NULL, "Show Range", 0, this);
+          showRangeAction->setToggleAction(TRUE);
+          showRangeAction->setOn(configList->showRange);
+          connect(showRangeAction, SIGNAL(toggled(bool)), SLOT(setShowRange(bool)));
+        QAction *showDataAction = new QAction(NULL, "Show Data", 0, this);
+          showDataAction->setToggleAction(TRUE);
+          showDataAction->setOn(configList->showData);
+          connect(showDataAction, SIGNAL(toggled(bool)), SLOT(setShowData(bool)));
+        QAction *showAllAction = new QAction(NULL, "Show All Options", 0, this);
+          showAllAction->setToggleAction(TRUE);
+          showAllAction->setOn(configList->showAll);
+          connect(showAllAction, SIGNAL(toggled(bool)), SLOT(setShowAll(bool)));
+        QAction *showDebugAction = new QAction(NULL, "Show Debug Info", 0, this);
+          showDebugAction->setToggleAction(TRUE);
+          showDebugAction->setOn(showDebug);
+          connect(showDebugAction, SIGNAL(toggled(bool)), SLOT(setShowDebug(bool)));
+
+        QAction *showIntroAction = new QAction(NULL, "Introduction", 0, this);
+          connect(showIntroAction, SIGNAL(activated()), SLOT(showIntro()));
+        QAction *showAboutAction = new QAction(NULL, "About", 0, this);
+          connect(showAboutAction, SIGNAL(activated()), SLOT(showAbout()));
+
+        // init tool bar
+        backAction->addTo(toolBar);
+        toolBar->addSeparator();
+        loadAction->addTo(toolBar);
+        saveAction->addTo(toolBar);
+        toolBar->addSeparator();
+        singleViewAction->addTo(toolBar);
+        splitViewAction->addTo(toolBar);
+        fullViewAction->addTo(toolBar);
+
+        // create config menu
+        QPopupMenu* config = new QPopupMenu(this);
+        menu->insertItem("&File", config);
+        loadAction->addTo(config);
+        saveAction->addTo(config);
+        saveAsAction->addTo(config);
+        config->insertSeparator();
+        quitAction->addTo(config);
+
+        // create options menu
+        QPopupMenu* optionMenu = new QPopupMenu(this);
+        menu->insertItem("&Option", optionMenu);
+        showNameAction->addTo(optionMenu);
+        showRangeAction->addTo(optionMenu);
+        showDataAction->addTo(optionMenu);
+        optionMenu->insertSeparator();
+        showAllAction->addTo(optionMenu);
+        showDebugAction->addTo(optionMenu);
+
+        // create help menu
+        QPopupMenu* helpMenu = new QPopupMenu(this);
+        menu->insertSeparator();
+        menu->insertItem("&Help", helpMenu);
+        showIntroAction->addTo(helpMenu);
+        showAboutAction->addTo(helpMenu);
+
+        connect(configList, SIGNAL(menuSelected(struct menu *)),
+                SLOT(changeMenu(struct menu *)));
+        connect(configList, SIGNAL(parentSelected()),
+                SLOT(goBack()));
+        connect(menuList, SIGNAL(menuSelected(struct menu *)),
+                SLOT(changeMenu(struct menu *)));
+
+        connect(configList, SIGNAL(gotFocus(void)),
+                SLOT(listFocusChanged(void)));
+        connect(menuList, SIGNAL(gotFocus(void)),
+                SLOT(listFocusChanged(void)));
+
+#if QT_VERSION >= 300
+        QString listMode = configSettings->readEntry("/kconfig/qconf/listMode", "symbol");
+        if (listMode == "single")
+                showSingleView();
+        else if (listMode == "full")
+                showFullView();
+        else /*if (listMode == "split")*/
+                showSplitView();
+
+        // UI setup done, restore splitter positions
+        QValueList<int> sizes = configSettings->readSizes("/kconfig/qconf/split1", &ok);
+        if (ok)
+                split1->setSizes(sizes);
+
+        sizes = configSettings->readSizes("/kconfig/qconf/split2", &ok);
+        if (ok)
+                split2->setSizes(sizes);
+#else
+        showSplitView();
+#endif
+        delete configSettings;
+}
+
+static QString print_filter(const QString &str)
+{
+        QRegExp re("[<>&\"\\n]");
+        QString res = str;
+        for (int i = 0; (i = res.find(re, i)) >= 0;) {
+                switch (res[i].latin1()) {
+                case '<':
+                        res.replace(i, 1, "&lt;");
+                        i += 4;
+                        break;
+                case '>':
+                        res.replace(i, 1, "&gt;");
+                        i += 4;
+                        break;
+                case '&':
+                        res.replace(i, 1, "&amp;");
+                        i += 5;
+                        break;
+                case '"':
+                        res.replace(i, 1, "&quot;");
+                        i += 6;
+                        break;
+                case '\n':
+                        res.replace(i, 1, "<br>");
+                        i += 4;
+                        break;
+                }
+        }
+        return res;
+}
+
+static void expr_print_help(void *data, const char *str)
+{
+        reinterpret_cast<QString*>(data)->append(print_filter(str));
+}
+
+/*
+ * display a new help entry as soon as a new menu entry is selected
+ */
+void ConfigMainWindow::setHelp(QListViewItem* item)
+{
+        struct symbol* sym;
+        struct menu* menu = 0;
+
+        configList->parent()->lineEdit->hide();
+        if (item)
+                menu = ((ConfigItem*)item)->menu;
+        if (!menu) {
+                helpText->setText(QString::null);
+                return;
+        }
+
+        QString head, debug, help;
+        menu = ((ConfigItem*)item)->menu;
+        sym = menu->sym;
+        if (sym) {
+                if (menu->prompt) {
+                        head += "<big><b>";
+                        head += print_filter(_(menu->prompt->text));
+                        head += "</b></big>";
+                        if (sym->name) {
+                                head += " (";
+                                head += print_filter(_(sym->name));
+                                head += ")";
+                        }
+                } else if (sym->name) {
+                        head += "<big><b>";
+                        head += print_filter(_(sym->name));
+                        head += "</b></big>";
+                }
+                head += "<br><br>";
+
+                if (showDebug) {
+                        debug += "type: ";
+                        debug += print_filter(sym_type_name(sym->type));
+                        if (sym_is_choice(sym))
+                                debug += " (choice)";
+                        debug += "<br>";
+                        if (sym->rev_dep.expr) {
+                                debug += "reverse dep: ";
+                                expr_print(sym->rev_dep.expr, expr_print_help, &debug, E_NONE);
+                                debug += "<br>";
+                        }
+                        for (struct property *prop = sym->prop; prop; prop = prop->next) {
+                                switch (prop->type) {
+                                case P_PROMPT:
+                                case P_MENU:
+                                        debug += "prompt: ";
+                                        debug += print_filter(_(prop->text));
+                                        debug += "<br>";
+                                        break;
+                                case P_DEFAULT:
+                                        debug += "default: ";
+                                        expr_print(prop->expr, expr_print_help, &debug, E_NONE);
+                                        debug += "<br>";
+                                        break;
+                                case P_CHOICE:
+                                        if (sym_is_choice(sym)) {
+                                                debug += "choice: ";
+                                                expr_print(prop->expr, expr_print_help, &debug, E_NONE);
+                                                debug += "<br>";
+                                        }
+                                        break;
+                                case P_SELECT:
+                                        debug += "select: ";
+                                        expr_print(prop->expr, expr_print_help, &debug, E_NONE);
+                                        debug += "<br>";
+                                        break;
+                                case P_RANGE:
+                                        debug += "range: ";
+                                        expr_print(prop->expr, expr_print_help, &debug, E_NONE);
+                                        debug += "<br>";
+                                        break;
+                                default:
+                                        debug += "unknown property: ";
+                                        debug += prop_get_type_name(prop->type);
+                                        debug += "<br>";
+                                }
+                                if (prop->visible.expr) {
+                                        debug += "&nbsp;&nbsp;&nbsp;&nbsp;dep: ";
+                                        expr_print(prop->visible.expr, expr_print_help, &debug, E_NONE);
+                                        debug += "<br>";
+                                }
+                        }
+                        debug += "<br>";
+                }
+
+                help = print_filter(_(sym->help));
+        } else if (menu->prompt) {
+                head += "<big><b>";
+                head += print_filter(_(menu->prompt->text));
+                head += "</b></big><br><br>";
+                if (showDebug) {
+                        if (menu->prompt->visible.expr) {
+                                debug += "&nbsp;&nbsp;dep: ";
+                                expr_print(menu->prompt->visible.expr, expr_print_help, &debug, E_NONE);
+                                debug += "<br><br>";
+                        }
+                }
+        }
+        if (showDebug)
+                debug += QString().sprintf("defined at %s:%d<br><br>", menu->file->name, menu->lineno);
+        helpText->setText(head + debug + help);
+}
+
+void ConfigMainWindow::loadConfig(void)
+{
+        QString s = QFileDialog::getOpenFileName(".config", NULL, this);
+        if (s.isNull())
+                return;
+        if (conf_read(QFile::encodeName(s)))
+                QMessageBox::information(this, "qconf", "Unable to load configuration!");
+        ConfigView::updateListAll();
+}
+
+void ConfigMainWindow::saveConfig(void)
+{
+        if (conf_write(NULL))
+                QMessageBox::information(this, "qconf", "Unable to save configuration!");
+}
+
+void ConfigMainWindow::saveConfigAs(void)
+{
+        QString s = QFileDialog::getSaveFileName(".config", NULL, this);
+        if (s.isNull())
+                return;
+        if (conf_write(QFile::encodeName(s)))
+                QMessageBox::information(this, "qconf", "Unable to save configuration!");
+}
+
+void ConfigMainWindow::changeMenu(struct menu *menu)
+{
+        configList->setRootMenu(menu);
+        backAction->setEnabled(TRUE);
+}
+
+void ConfigMainWindow::listFocusChanged(void)
+{
+        if (menuList->hasFocus()) {
+                if (menuList->mode == menuMode)
+                        configList->clearSelection();
+                setHelp(menuList->selectedItem());
+        } else if (configList->hasFocus()) {
+                setHelp(configList->selectedItem());
+        }
+}
+
+void ConfigMainWindow::goBack(void)
+{
+        ConfigItem* item;
+
+        configList->setParentMenu();
+        if (configList->rootEntry == &rootmenu)
+                backAction->setEnabled(FALSE);
+        item = (ConfigItem*)menuList->selectedItem();
+        while (item) {
+                if (item->menu == configList->rootEntry) {
+                        menuList->setSelected(item, TRUE);
+                        break;
+                }
+                item = (ConfigItem*)item->parent();
+        }
+}
+
+void ConfigMainWindow::showSingleView(void)
+{
+        menuView->hide();
+        menuList->setRootMenu(0);
+        configList->mode = singleMode;
+        if (configList->rootEntry == &rootmenu)
+                configList->updateListAll();
+        else
+                configList->setRootMenu(&rootmenu);
+        configList->setAllOpen(TRUE);
+        configList->setFocus();
+}
+
+void ConfigMainWindow::showSplitView(void)
+{
+        configList->mode = symbolMode;
+        if (configList->rootEntry == &rootmenu)
+                configList->updateListAll();
+        else
+                configList->setRootMenu(&rootmenu);
+        configList->setAllOpen(TRUE);
+        configApp->processEvents();
+        menuList->mode = menuMode;
+        menuList->setRootMenu(&rootmenu);
+        menuList->setAllOpen(TRUE);
+        menuView->show();
+        menuList->setFocus();
+}
+
+void ConfigMainWindow::showFullView(void)
+{
+        menuView->hide();
+        menuList->setRootMenu(0);
+        configList->mode = fullMode;
+        if (configList->rootEntry == &rootmenu)
+                configList->updateListAll();
+        else
+                configList->setRootMenu(&rootmenu);
+        configList->setAllOpen(FALSE);
+        configList->setFocus();
+}
+
+void ConfigMainWindow::setShowAll(bool b)
+{
+        if (configList->showAll == b)
+                return;
+        configList->showAll = b;
+        configList->updateListAll();
+        menuList->showAll = b;
+        menuList->updateListAll();
+}
+
+void ConfigMainWindow::setShowDebug(bool b)
+{
+        if (showDebug == b)
+                return;
+        showDebug = b;
+}
+
+void ConfigMainWindow::setShowName(bool b)
+{
+        if (configList->showName == b)
+                return;
+        configList->showName = b;
+        configList->reinit();
+        menuList->showName = b;
+        menuList->reinit();
+}
+
+void ConfigMainWindow::setShowRange(bool b)
+{
+        if (configList->showRange == b)
+                return;
+        configList->showRange = b;
+        configList->reinit();
+        menuList->showRange = b;
+        menuList->reinit();
+}
+
+void ConfigMainWindow::setShowData(bool b)
+{
+        if (configList->showData == b)
+                return;
+        configList->showData = b;
+        configList->reinit();
+        menuList->showData = b;
+        menuList->reinit();
+}
+
+/*
+ * ask for saving configuration before quitting
+ * TODO ask only when something changed
+ */
+void ConfigMainWindow::closeEvent(QCloseEvent* e)
+{
+        if (!sym_change_count) {
+                e->accept();
+                return;
+        }
+        QMessageBox mb("qconf", "Save configuration?", QMessageBox::Warning,
+                        QMessageBox::Yes | QMessageBox::Default, QMessageBox::No, QMessageBox::Cancel | QMessageBox::Escape);
+        mb.setButtonText(QMessageBox::Yes, "&Save Changes");
+        mb.setButtonText(QMessageBox::No, "&Discard Changes");
+        mb.setButtonText(QMessageBox::Cancel, "Cancel Exit");
+        switch (mb.exec()) {
+        case QMessageBox::Yes:
+                conf_write(NULL);
+        case QMessageBox::No:
+                e->accept();
+                break;
+        case QMessageBox::Cancel:
+                e->ignore();
+                break;
+        }
+}
+
+void ConfigMainWindow::showIntro(void)
+{
+        static char str[] = "Welcome to the qconf graphical kernel configuration tool for Linux.\n\n"
+                "For each option, a blank box indicates the feature is disabled, a check\n"
+                "indicates it is enabled, and a dot indicates that it is to be compiled\n"
+                "as a module.  Clicking on the box will cycle through the three states.\n\n"
+                "If you do not see an option (e.g., a device driver) that you believe\n"
+                "should be present, try turning on Show All Options under the Options menu.\n"
+                "Although there is no cross reference yet to help you figure out what other\n"
+                "options must be enabled to support the option you are interested in, you can\n"
+                "still view the help of a grayed-out option.\n\n"
+                "Toggling Show Debug Info under the Options menu will show the dependencies,\n"
+                "which you can then match by examining other options.\n\n";
+
+        QMessageBox::information(this, "qconf", str);
+}
+
+void ConfigMainWindow::showAbout(void)
+{
+        static char str[] = "qconf is Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org>.\n\n"
+                "Bug reports and feature request can also be entered at http://bugzilla.kernel.org/\n";
+
+        QMessageBox::information(this, "qconf", str);
+}
+
+void ConfigMainWindow::saveSettings(void)
+{
+#if QT_VERSION >= 300
+        ConfigSettings *configSettings = new ConfigSettings;
+        configSettings->writeEntry("/kconfig/qconf/window x", pos().x());
+        configSettings->writeEntry("/kconfig/qconf/window y", pos().y());
+        configSettings->writeEntry("/kconfig/qconf/window width", size().width());
+        configSettings->writeEntry("/kconfig/qconf/window height", size().height());
+        configSettings->writeEntry("/kconfig/qconf/showName", configList->showName);
+        configSettings->writeEntry("/kconfig/qconf/showRange", configList->showRange);
+        configSettings->writeEntry("/kconfig/qconf/showData", configList->showData);
+        configSettings->writeEntry("/kconfig/qconf/showAll", configList->showAll);
+        configSettings->writeEntry("/kconfig/qconf/showDebug", showDebug);
+
+        QString entry;
+        switch(configList->mode) {
+        case singleMode :
+                entry = "single";
+                break;
+
+        case symbolMode :
+                entry = "split";
+                break;
+
+        case fullMode :
+                entry = "full";
+                break;
+        }
+        configSettings->writeEntry("/kconfig/qconf/listMode", entry);
+
+        configSettings->writeSizes("/kconfig/qconf/split1", split1->sizes());
+        configSettings->writeSizes("/kconfig/qconf/split2", split2->sizes());
+
+        delete configSettings;
+#endif
+}
+
+void fixup_rootmenu(struct menu *menu)
+{
+        struct menu *child;
+        static int menu_cnt = 0;
+
+        menu->flags |= MENU_ROOT;
+        for (child = menu->list; child; child = child->next) {
+                if (child->prompt && child->prompt->type == P_MENU) {
+                        menu_cnt++;
+                        fixup_rootmenu(child);
+                        menu_cnt--;
+                } else if (!menu_cnt)
+                        fixup_rootmenu(child);
+        }
+}
+
+static const char *progname;
+
+static void usage(void)
+{
+        printf("%s <config>\n", progname);
+        exit(0);
+}
+
+int main(int ac, char** av)
+{
+        ConfigMainWindow* v;
+        const char *name;
+
+        bindtextdomain(PACKAGE, LOCALEDIR);
+        textdomain(PACKAGE);
+
+#ifndef LKC_DIRECT_LINK
+        kconfig_load();
+#endif
+
+        progname = av[0];
+        configApp = new QApplication(ac, av);
+        if (ac > 1 && av[1][0] == '-') {
+                switch (av[1][1]) {
+                case 'h':
+                case '?':
+                        usage();
+                }
+                name = av[2];
+        } else
+                name = av[1];
+        if (!name)
+                usage();
+
+        conf_parse(name);
+        fixup_rootmenu(&rootmenu);
+        conf_read(NULL);
+        //zconfdump(stdout);
+
+        v = new ConfigMainWindow();
+
+        //zconfdump(stdout);
+        v->show();
+        configApp->connect(configApp, SIGNAL(lastWindowClosed()), SLOT(quit()));
+        configApp->connect(configApp, SIGNAL(aboutToQuit()), v, SLOT(saveSettings()));
+        configApp->exec();
+
+        return 0;
+}
diff --git a/scripts/kconfig/qconf.h b/scripts/kconfig/qconf.h
new file mode 100644
index 000000000..e52f3e90b
--- /dev/null
+++ b/scripts/kconfig/qconf.h
@@ -0,0 +1,263 @@
+/*
+ * Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org>
+ * Released under the terms of the GNU GPL v2.0.
+ */
+
+#include <qlistview.h>
+#if QT_VERSION >= 300
+#include <qsettings.h>
+#else
+class QSettings { };
+#endif
+
+class ConfigList;
+class ConfigItem;
+class ConfigLineEdit;
+class ConfigMainWindow;
+
+
+class ConfigSettings : public QSettings {
+public:
+        ConfigSettings();
+
+#if QT_VERSION >= 300
+        void readListSettings();
+        QValueList<int> readSizes(const QString& key, bool *ok);
+        bool writeSizes(const QString& key, const QValueList<int>& value);
+#endif
+
+        bool showAll;
+        bool showName;
+        bool showRange;
+        bool showData;
+};
+
+class ConfigView : public QVBox {
+        Q_OBJECT
+        typedef class QVBox Parent;
+public:
+        ConfigView(QWidget* parent, ConfigMainWindow* cview, ConfigSettings* configSettings);
+        ~ConfigView(void);
+        static void updateList(ConfigItem* item);
+        static void updateListAll(void);
+
+public:
+        ConfigList* list;
+        ConfigLineEdit* lineEdit;
+
+        static ConfigView* viewList;
+        ConfigView* nextView;
+};
+
+enum colIdx {
+        promptColIdx, nameColIdx, noColIdx, modColIdx, yesColIdx, dataColIdx, colNr
+};
+enum listMode {
+        singleMode, menuMode, symbolMode, fullMode
+};
+
+class ConfigList : public QListView {
+        Q_OBJECT
+        typedef class QListView Parent;
+public:
+        ConfigList(ConfigView* p, ConfigMainWindow* cview, ConfigSettings *configSettings);
+        void reinit(void);
+        ConfigView* parent(void) const
+        {
+                return (ConfigView*)Parent::parent();
+        }
+
+protected:
+        ConfigMainWindow* cview;
+
+        void keyPressEvent(QKeyEvent *e);
+        void contentsMousePressEvent(QMouseEvent *e);
+        void contentsMouseReleaseEvent(QMouseEvent *e);
+        void contentsMouseMoveEvent(QMouseEvent *e);
+        void contentsMouseDoubleClickEvent(QMouseEvent *e);
+        void focusInEvent(QFocusEvent *e);
+public slots:
+        void setRootMenu(struct menu *menu);
+
+        void updateList(ConfigItem *item);
+        void setValue(ConfigItem* item, tristate val);
+        void changeValue(ConfigItem* item);
+        void updateSelection(void);
+signals:
+        void menuSelected(struct menu *menu);
+        void parentSelected(void);
+        void gotFocus(void);
+
+public:
+        void updateListAll(void)
+        {
+                updateAll = true;
+                updateList(NULL);
+                updateAll = false;
+        }
+        ConfigList* listView()
+        {
+                return this;
+        }
+        ConfigItem* firstChild() const
+        {
+                return (ConfigItem *)Parent::firstChild();
+        }
+        int mapIdx(colIdx idx)
+        {
+                return colMap[idx];
+        }
+        void addColumn(colIdx idx, const QString& label)
+        {
+                colMap[idx] = Parent::addColumn(label);
+                colRevMap[colMap[idx]] = idx;
+        }
+        void removeColumn(colIdx idx)
+        {
+                int col = colMap[idx];
+                if (col >= 0) {
+                        Parent::removeColumn(col);
+                        colRevMap[col] = colMap[idx] = -1;
+                }
+        }
+        void setAllOpen(bool open);
+        void setParentMenu(void);
+
+        template <class P>
+        void updateMenuList(P*, struct menu*);
+
+        bool updateAll;
+
+        QPixmap symbolYesPix, symbolModPix, symbolNoPix;
+        QPixmap choiceYesPix, choiceNoPix;
+        QPixmap menuPix, menuInvPix, menuBackPix, voidPix;
+
+        bool showAll, showName, showRange, showData;
+        enum listMode mode;
+        struct menu *rootEntry;
+        QColorGroup disabledColorGroup;
+        QColorGroup inactivedColorGroup;
+
+private:
+        int colMap[colNr];
+        int colRevMap[colNr];
+};
+
+class ConfigItem : public QListViewItem {
+        typedef class QListViewItem Parent;
+public:
+        ConfigItem(QListView *parent, ConfigItem *after, struct menu *m, bool v)
+        : Parent(parent, after), menu(m), visible(v), goParent(false)
+        {
+                init();
+        }
+        ConfigItem(ConfigItem *parent, ConfigItem *after, struct menu *m, bool v)
+        : Parent(parent, after), menu(m), visible(v), goParent(false)
+        {
+                init();
+        }
+        ConfigItem(QListView *parent, ConfigItem *after, bool v)
+        : Parent(parent, after), menu(0), visible(v), goParent(true)
+        {
+                init();
+        }
+        ~ConfigItem(void);
+        void init(void);
+#if QT_VERSION >= 300
+        void okRename(int col);
+#endif
+        void updateMenu(void);
+        void testUpdateMenu(bool v);
+        ConfigList* listView() const
+        {
+                return (ConfigList*)Parent::listView();
+        }
+        ConfigItem* firstChild() const
+        {
+                return (ConfigItem *)Parent::firstChild();
+        }
+        ConfigItem* nextSibling() const
+        {
+                return (ConfigItem *)Parent::nextSibling();
+        }
+        void setText(colIdx idx, const QString& text)
+        {
+                Parent::setText(listView()->mapIdx(idx), text);
+        }
+        QString text(colIdx idx) const
+        {
+                return Parent::text(listView()->mapIdx(idx));
+        }
+        void setPixmap(colIdx idx, const QPixmap& pm)
+        {
+                Parent::setPixmap(listView()->mapIdx(idx), pm);
+        }
+        const QPixmap* pixmap(colIdx idx) const
+        {
+                return Parent::pixmap(listView()->mapIdx(idx));
+        }
+        void paintCell(QPainter* p, const QColorGroup& cg, int column, int width, int align);
+
+        ConfigItem* nextItem;
+        struct menu *menu;
+        bool visible;
+        bool goParent;
+};
+
+class ConfigLineEdit : public QLineEdit {
+        Q_OBJECT
+        typedef class QLineEdit Parent;
+public:
+        ConfigLineEdit(ConfigView* parent)
+        : Parent(parent)
+        { }
+        ConfigView* parent(void) const
+        {
+                return (ConfigView*)Parent::parent();
+        }
+        void show(ConfigItem *i);
+        void keyPressEvent(QKeyEvent *e);
+
+public:
+        ConfigItem *item;
+};
+
+class ConfigMainWindow : public QMainWindow {
+        Q_OBJECT
+public:
+        ConfigMainWindow(void);
+public slots:
+        void setHelp(QListViewItem* item);
+        void changeMenu(struct menu *);
+        void listFocusChanged(void);
+        void goBack(void);
+        void loadConfig(void);
+        void saveConfig(void);
+        void saveConfigAs(void);
+        void showSingleView(void);
+        void showSplitView(void);
+        void showFullView(void);
+        void setShowAll(bool);
+        void setShowDebug(bool);
+        void setShowRange(bool);
+        void setShowName(bool);
+        void setShowData(bool);
+        void showIntro(void);
+        void showAbout(void);
+        void saveSettings(void);
+
+protected:
+        void closeEvent(QCloseEvent *e);
+
+        ConfigView *menuView;
+        ConfigList *menuList;
+        ConfigView *configView;
+        ConfigList *configList;
+        QTextView *helpText;
+        QToolBar *toolBar;
+        QAction *backAction;
+        QSplitter* split1;
+        QSplitter* split2;
+
+        bool showDebug;
+};
diff --git a/scripts/config/symbol.c b/scripts/kconfig/symbol.c
index aeea4cc9f..3d7877afc 100644
--- a/scripts/config/symbol.c
+++ b/scripts/kconfig/symbol.c
@@ -1,4 +1,3 @@
-/* vi: set sw=4 ts=4: */
 /*
  * Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org>
  * Released under the terms of the GNU GPL v2.0.
@@ -45,6 +44,7 @@ void sym_add_default(struct symbol *sym, const char *def)
 void sym_init(void)
 {
         struct symbol *sym;
+        struct utsname uts;
         char *p;
         static bool inited = false;
 
@@ -52,20 +52,26 @@ void sym_init(void)
                 return;
         inited = true;
 
-        sym = sym_lookup("VERSION", 0);
+        uname(&uts);
+
+        sym = sym_lookup("ARCH", 0);
         sym->type = S_STRING;
         sym->flags |= SYMBOL_AUTO;
-        p = getenv("VERSION");
+        p = getenv("ARCH");
         if (p)
                 sym_add_default(sym, p);
 
-        sym = sym_lookup("TARGET_ARCH", 0);
+        sym = sym_lookup("KERNELVERSION", 0);
         sym->type = S_STRING;
         sym->flags |= SYMBOL_AUTO;
-        p = getenv("TARGET_ARCH");
+        p = getenv("KERNELVERSION");
         if (p)
                 sym_add_default(sym, p);
 
+        sym = sym_lookup("UNAME_RELEASE", 0);
+        sym->type = S_STRING;
+        sym->flags |= SYMBOL_AUTO;
+        sym_add_default(sym, uts.release);
 }
 
 enum symbol_type sym_get_type(struct symbol *sym)
@@ -135,6 +141,55 @@ struct property *sym_get_range_prop(struct symbol *sym)
         return NULL;
 }
 
+static int sym_get_range_val(struct symbol *sym, int base)
+{
+        sym_calc_value(sym);
+        switch (sym->type) {
+        case S_INT:
+                base = 10;
+                break;
+        case S_HEX:
+                base = 16;
+                break;
+        default:
+                break;
+        }
+        return strtol(sym->curr.val, NULL, base);
+}
+
+static void sym_validate_range(struct symbol *sym)
+{
+        struct property *prop;
+        int base, val, val2;
+        char str[64];
+
+        switch (sym->type) {
+        case S_INT:
+                base = 10;
+                break;
+        case S_HEX:
+                base = 16;
+                break;
+        default:
+                return;
+        }
+        prop = sym_get_range_prop(sym);
+        if (!prop)
+                return;
+        val = strtol(sym->curr.val, NULL, base);
+        val2 = sym_get_range_val(prop->expr->left.sym, base);
+        if (val >= val2) {
+                val2 = sym_get_range_val(prop->expr->right.sym, base);
+                if (val <= val2)
+                        return;
+        }
+        if (sym->type == S_INT)
+                sprintf(str, "%d", val2);
+        else
+                sprintf(str, "0x%x", val2);
+        sym->curr.val = strdup(str);
+}
+
 static void sym_calc_visibility(struct symbol *sym)
 {
         struct property *prop;
@@ -295,6 +350,7 @@ void sym_calc_value(struct symbol *sym)
         sym->curr = newval;
         if (sym_is_choice(sym) && newval.tri == yes)
                 sym->curr.val = sym_calc_choice(sym);
+        sym_validate_range(sym);
 
         if (memcmp(&oldval, &sym->curr, sizeof(oldval)))
                 sym_set_changed(sym);
@@ -374,11 +430,22 @@ bool sym_set_tristate_value(struct symbol *sym, tristate val)
                 sym->flags &= ~SYMBOL_NEW;
                 sym_set_changed(sym);
         }
+        /*
+         * setting a choice value also resets the new flag of the choice
+         * symbol and all other choice values.
+         */
         if (sym_is_choice_value(sym) && val == yes) {
                 struct symbol *cs = prop_get_symbol(sym_get_choice_prop(sym));
+                struct property *prop;
+                struct expr *e;
 
                 cs->user.val = sym;
                 cs->flags &= ~SYMBOL_NEW;
+                prop = sym_get_choice_prop(cs);
+                for (e = prop->expr; e; e = e->left.expr) {
+                        if (e->right.sym->visible != no)
+                                e->right.sym->flags &= ~SYMBOL_NEW;
+                }
         }
 
         sym->user.tri = val;
@@ -472,8 +539,8 @@ bool sym_string_within_range(struct symbol *sym, const char *str)
                 if (!prop)
                         return true;
                 val = strtol(str, NULL, 10);
-                return val >= strtol(prop->expr->left.sym->name, NULL, 10) &&
-                       val <= strtol(prop->expr->right.sym->name, NULL, 10);
+                return val >= sym_get_range_val(prop->expr->left.sym, 10) &&
+                       val <= sym_get_range_val(prop->expr->right.sym, 10);
         case S_HEX:
                 if (!sym_string_valid(sym, str))
                         return false;
@@ -481,8 +548,8 @@ bool sym_string_within_range(struct symbol *sym, const char *str)
                 if (!prop)
                         return true;
                 val = strtol(str, NULL, 16);
-                return val >= strtol(prop->expr->left.sym->name, NULL, 16) &&
-                       val <= strtol(prop->expr->right.sym->name, NULL, 16);
+                return val >= sym_get_range_val(prop->expr->left.sym, 16) &&
+                       val <= sym_get_range_val(prop->expr->right.sym, 16);
         case S_BOOLEAN:
         case S_TRISTATE:
                 switch (str[0]) {
@@ -725,12 +792,12 @@ struct symbol *sym_check_deps(struct symbol *sym)
         struct symbol *sym2;
         struct property *prop;
 
-        if (sym->flags & SYMBOL_CHECK_DONE)
-                return NULL;
         if (sym->flags & SYMBOL_CHECK) {
                 printf("Warning! Found recursive dependency: %s", sym->name);
                 return sym;
         }
+        if (sym->flags & SYMBOL_CHECKED)
+                return NULL;
 
         sym->flags |= (SYMBOL_CHECK | SYMBOL_CHECKED);
         sym2 = sym_check_expr_deps(sym->rev_dep.expr);
@@ -750,8 +817,13 @@ struct symbol *sym_check_deps(struct symbol *sym)
                         goto out;
         }
 out:
-        if (sym2)
+        if (sym2) {
                 printf(" %s", sym->name);
+                if (sym2 == sym) {
+                        printf("\n");
+                        sym2 = NULL;
+                }
+        }
         sym->flags &= ~SYMBOL_CHECK;
         return sym2;
 }
diff --git a/scripts/config/util.c b/scripts/kconfig/util.c
index dbf23edef..aea8d56ce 100644
--- a/scripts/config/util.c
+++ b/scripts/kconfig/util.c
@@ -1,4 +1,3 @@
-/* vi: set sw=4 ts=4: */
 /*
  * Copyright (C) 2002-2005 Roman Zippel <zippel@linux-m68k.org>
  * Copyright (C) 2002-2005 Sam Ravnborg <sam@ravnborg.org>
@@ -34,8 +33,8 @@ int file_write_dep(const char *name)
         FILE *out;
 
         if (!name)
-                name = ".config.cmd";
-        out = fopen(".config.tmp", "w");
+                name = ".kconfig.d";
+        out = fopen("..config.tmp", "w");
         if (!out)
                 return 1;
         fprintf(out, "deps_config := \\\n");
@@ -45,9 +44,9 @@ int file_write_dep(const char *name)
                 else
                         fprintf(out, "\t%s\n", file->name);
         }
-        fprintf(out, "\n.config include/config.h: $(deps_config)\n\n$(deps_config):\n");
+        fprintf(out, "\n.config include/autoconf.h: $(deps_config)\n\n$(deps_config):\n");
         fclose(out);
-        rename(".config.tmp", name);
+        rename("..config.tmp", name);
         return 0;
 }
 
@@ -102,7 +101,7 @@ void str_printf(struct gstr *gs, const char *fmt, ...)
         va_end(ap);
 }
 
-/* Retreive value of growable string */
+/* Retrieve value of growable string */
 const char *str_get(struct gstr *gs)
 {
         return gs->s;
diff --git a/scripts/kconfig/zconf.gperf b/scripts/kconfig/zconf.gperf
new file mode 100644
index 000000000..b03220600
--- /dev/null
+++ b/scripts/kconfig/zconf.gperf
@@ -0,0 +1,43 @@
+%language=ANSI-C
+%define hash-function-name kconf_id_hash
+%define lookup-function-name kconf_id_lookup
+%define string-pool-name kconf_id_strings
+%compare-strncmp
+%enum
+%pic
+%struct-type
+
+struct kconf_id;
+
+%%
+mainmenu,       T_MAINMENU,     TF_COMMAND
+menu,           T_MENU,         TF_COMMAND
+endmenu,        T_ENDMENU,      TF_COMMAND
+source,         T_SOURCE,       TF_COMMAND
+choice,         T_CHOICE,       TF_COMMAND
+endchoice,      T_ENDCHOICE,    TF_COMMAND
+comment,        T_COMMENT,      TF_COMMAND
+config,         T_CONFIG,       TF_COMMAND
+menuconfig,     T_MENUCONFIG,   TF_COMMAND
+help,           T_HELP,         TF_COMMAND
+if,             T_IF,           TF_COMMAND|TF_PARAM
+endif,          T_ENDIF,        TF_COMMAND
+depends,        T_DEPENDS,      TF_COMMAND
+requires,       T_REQUIRES,     TF_COMMAND
+optional,       T_OPTIONAL,     TF_COMMAND
+default,        T_DEFAULT,      TF_COMMAND, S_UNKNOWN
+prompt,         T_PROMPT,       TF_COMMAND
+tristate,       T_TYPE,         TF_COMMAND, S_TRISTATE
+def_tristate,   T_DEFAULT,      TF_COMMAND, S_TRISTATE
+bool,           T_TYPE,         TF_COMMAND, S_BOOLEAN
+boolean,        T_TYPE,         TF_COMMAND, S_BOOLEAN
+def_bool,       T_DEFAULT,      TF_COMMAND, S_BOOLEAN
+def_boolean,    T_DEFAULT,      TF_COMMAND, S_BOOLEAN
+int,            T_TYPE,         TF_COMMAND, S_INT
+hex,            T_TYPE,         TF_COMMAND, S_HEX
+string,         T_TYPE,         TF_COMMAND, S_STRING
+select,         T_SELECT,       TF_COMMAND
+enable,         T_SELECT,       TF_COMMAND
+range,          T_RANGE,        TF_COMMAND
+on,             T_ON,           TF_PARAM
+%%
diff --git a/scripts/kconfig/zconf.hash.c_shipped b/scripts/kconfig/zconf.hash.c_shipped
new file mode 100644
index 000000000..345f0fc07
--- /dev/null
+++ b/scripts/kconfig/zconf.hash.c_shipped
@@ -0,0 +1,231 @@
+/* ANSI-C code produced by gperf version 3.0.1 */
+/* Command-line: gperf  */
+/* Computed positions: -k'1,3' */
+
+#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
+      && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
+      && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
+      && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
+      && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
+      && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
+      && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
+      && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
+      && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
+      && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
+      && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
+      && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
+      && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
+      && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
+      && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \
+      && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
+      && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
+      && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
+      && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
+      && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
+      && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
+      && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
+      && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
+/* The character set is not based on ISO-646.  */
+#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
+#endif
+
+struct kconf_id;
+/* maximum key range = 45, duplicates = 0 */
+
+#ifdef __GNUC__
+__inline
+#else
+#ifdef __cplusplus
+inline
+#endif
+#endif
+static unsigned int
+kconf_id_hash (register const char *str, register unsigned int len)
+{
+  static unsigned char asso_values[] =
+    {
+      47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
+      47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
+      47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
+      47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
+      47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
+      47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
+      47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
+      47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
+      47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
+      47, 47, 47, 47, 47, 47, 47, 25, 10, 15,
+       0,  0,  5, 47,  0,  0, 47, 47,  0, 10,
+       0, 20, 20, 20,  5,  0,  0, 20, 47, 47,
+      20, 47, 47, 47, 47, 47, 47, 47, 47, 47,
+      47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
+      47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
+      47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
+      47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
+      47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
+      47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
+      47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
+      47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
+      47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
+      47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
+      47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
+      47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
+      47, 47, 47, 47, 47, 47
+    };
+  register int hval = len;
+
+  switch (hval)
+    {
+      default:
+        hval += asso_values[(unsigned char)str[2]];
+      /*FALLTHROUGH*/
+      case 2:
+      case 1:
+        hval += asso_values[(unsigned char)str[0]];
+        break;
+    }
+  return hval;
+}
+
+struct kconf_id_strings_t
+  {
+    char kconf_id_strings_str2[sizeof("if")];
+    char kconf_id_strings_str3[sizeof("int")];
+    char kconf_id_strings_str4[sizeof("help")];
+    char kconf_id_strings_str5[sizeof("endif")];
+    char kconf_id_strings_str6[sizeof("select")];
+    char kconf_id_strings_str7[sizeof("endmenu")];
+    char kconf_id_strings_str8[sizeof("tristate")];
+    char kconf_id_strings_str9[sizeof("endchoice")];
+    char kconf_id_strings_str10[sizeof("range")];
+    char kconf_id_strings_str11[sizeof("string")];
+    char kconf_id_strings_str12[sizeof("default")];
+    char kconf_id_strings_str13[sizeof("def_bool")];
+    char kconf_id_strings_str14[sizeof("menu")];
+    char kconf_id_strings_str16[sizeof("def_boolean")];
+    char kconf_id_strings_str17[sizeof("def_tristate")];
+    char kconf_id_strings_str18[sizeof("mainmenu")];
+    char kconf_id_strings_str20[sizeof("menuconfig")];
+    char kconf_id_strings_str21[sizeof("config")];
+    char kconf_id_strings_str22[sizeof("on")];
+    char kconf_id_strings_str23[sizeof("hex")];
+    char kconf_id_strings_str26[sizeof("source")];
+    char kconf_id_strings_str27[sizeof("depends")];
+    char kconf_id_strings_str28[sizeof("optional")];
+    char kconf_id_strings_str31[sizeof("enable")];
+    char kconf_id_strings_str32[sizeof("comment")];
+    char kconf_id_strings_str33[sizeof("requires")];
+    char kconf_id_strings_str34[sizeof("bool")];
+    char kconf_id_strings_str37[sizeof("boolean")];
+    char kconf_id_strings_str41[sizeof("choice")];
+    char kconf_id_strings_str46[sizeof("prompt")];
+  };
+static struct kconf_id_strings_t kconf_id_strings_contents =
+  {
+    "if",
+    "int",
+    "help",
+    "endif",
+    "select",
+    "endmenu",
+    "tristate",
+    "endchoice",
+    "range",
+    "string",
+    "default",
+    "def_bool",
+    "menu",
+    "def_boolean",
+    "def_tristate",
+    "mainmenu",
+    "menuconfig",
+    "config",
+    "on",
+    "hex",
+    "source",
+    "depends",
+    "optional",
+    "enable",
+    "comment",
+    "requires",
+    "bool",
+    "boolean",
+    "choice",
+    "prompt"
+  };
+#define kconf_id_strings ((const char *) &kconf_id_strings_contents)
+#ifdef __GNUC__
+__inline
+#endif
+struct kconf_id *
+kconf_id_lookup (register const char *str, register unsigned int len)
+{
+  enum
+    {
+      TOTAL_KEYWORDS = 30,
+      MIN_WORD_LENGTH = 2,
+      MAX_WORD_LENGTH = 12,
+      MIN_HASH_VALUE = 2,
+      MAX_HASH_VALUE = 46
+    };
+
+  static struct kconf_id wordlist[] =
+    {
+      {-1}, {-1},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str2,             T_IF,           TF_COMMAND|TF_PARAM},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str3,             T_TYPE,         TF_COMMAND, S_INT},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str4,             T_HELP,         TF_COMMAND},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str5,             T_ENDIF,        TF_COMMAND},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str6,             T_SELECT,       TF_COMMAND},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str7,     T_ENDMENU,      TF_COMMAND},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str8,     T_TYPE,         TF_COMMAND, S_TRISTATE},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str9,     T_ENDCHOICE,    TF_COMMAND},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str10,            T_RANGE,        TF_COMMAND},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str11,            T_TYPE,         TF_COMMAND, S_STRING},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str12,    T_DEFAULT,      TF_COMMAND, S_UNKNOWN},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str13,    T_DEFAULT,      TF_COMMAND, S_BOOLEAN},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str14,            T_MENU,         TF_COMMAND},
+      {-1},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str16,    T_DEFAULT,      TF_COMMAND, S_BOOLEAN},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str17,    T_DEFAULT,      TF_COMMAND, S_TRISTATE},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str18,    T_MAINMENU,     TF_COMMAND},
+      {-1},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str20,    T_MENUCONFIG,   TF_COMMAND},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str21,            T_CONFIG,       TF_COMMAND},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str22,            T_ON,           TF_PARAM},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str23,            T_TYPE,         TF_COMMAND, S_HEX},
+      {-1}, {-1},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str26,            T_SOURCE,       TF_COMMAND},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str27,    T_DEPENDS,      TF_COMMAND},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str28,    T_OPTIONAL,     TF_COMMAND},
+      {-1}, {-1},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str31,            T_SELECT,       TF_COMMAND},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str32,    T_COMMENT,      TF_COMMAND},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str33,    T_REQUIRES,     TF_COMMAND},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str34,            T_TYPE,         TF_COMMAND, S_BOOLEAN},
+      {-1}, {-1},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str37,    T_TYPE,         TF_COMMAND, S_BOOLEAN},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str41,            T_CHOICE,       TF_COMMAND},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str46,            T_PROMPT,       TF_COMMAND}
+    };
+
+  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
+    {
+      register int key = kconf_id_hash (str, len);
+
+      if (key <= MAX_HASH_VALUE && key >= 0)
+        {
+          register int o = wordlist[key].name;
+          if (o >= 0)
+            {
+              register const char *s = o + kconf_id_strings;
+
+              if (*str == *s && !strncmp (str + 1, s + 1, len - 1) && s[len] == '\0')
+                return &wordlist[key];
+            }
+        }
+    }
+  return 0;
+}
+
diff --git a/scripts/config/zconf.l b/scripts/kconfig/zconf.l
index 55517b287..cfa46077c 100644
--- a/scripts/config/zconf.l
+++ b/scripts/kconfig/zconf.l
@@ -18,8 +18,12 @@
 
 #define START_STRSIZE   16
 
-char *text;
-static char *text_ptr;
+static struct {
+        struct file *file;
+        int lineno;
+} current_pos;
+
+static char *text;
 static int text_size, text_asize;
 
 struct buffer {
@@ -32,29 +36,28 @@ struct buffer *current_buf;
 static int last_ts, first_ts;
 
 static void zconf_endhelp(void);
-static struct buffer *zconf_endfile(void);
+static void zconf_endfile(void);
 
 void new_string(void)
 {
         text = malloc(START_STRSIZE);
         text_asize = START_STRSIZE;
-        text_ptr = text;
         text_size = 0;
-        *text_ptr = 0;
+        *text = 0;
 }
 
 void append_string(const char *str, int size)
 {
         int new_size = text_size + size + 1;
         if (new_size > text_asize) {
+                new_size += START_STRSIZE - 1;
+                new_size &= -START_STRSIZE;
                 text = realloc(text, new_size);
                 text_asize = new_size;
-                text_ptr = text + text_size;
         }
-        memcpy(text_ptr, str, size);
-        text_ptr += size;
+        memcpy(text + text_size, str, size);
         text_size += size;
-        *text_ptr = 0;
+        text[text_size] = 0;
 }
 
 void alloc_string(const char *str, int size)
@@ -72,10 +75,13 @@ n	[A-Za-z0-9_]
         int str = 0;
         int ts, i;
 
-[ \t]*#.*\n     current_file->lineno++;
+[ \t]*#.*\n     |
+[ \t]*\n        {
+        current_file->lineno++;
+        return T_EOL;
+}
 [ \t]*#.*
 
-[ \t]*\n        current_file->lineno++; return T_EOL;
 
 [ \t]+  {
         BEGIN(COMMAND);
@@ -88,42 +94,25 @@ n	[A-Za-z0-9_]
 
 
 <COMMAND>{
-        "mainmenu"              BEGIN(PARAM); return T_MAINMENU;
-        "menu"                  BEGIN(PARAM); return T_MENU;
-        "endmenu"               BEGIN(PARAM); return T_ENDMENU;
-        "source"                BEGIN(PARAM); return T_SOURCE;
-        "choice"                BEGIN(PARAM); return T_CHOICE;
-        "endchoice"             BEGIN(PARAM); return T_ENDCHOICE;
-        "comment"               BEGIN(PARAM); return T_COMMENT;
-        "config"                BEGIN(PARAM); return T_CONFIG;
-        "menuconfig"            BEGIN(PARAM); return T_MENUCONFIG;
-        "help"                  BEGIN(PARAM); return T_HELP;
-        "if"                    BEGIN(PARAM); return T_IF;
-        "endif"                 BEGIN(PARAM); return T_ENDIF;
-        "depends"               BEGIN(PARAM); return T_DEPENDS;
-        "requires"              BEGIN(PARAM); return T_REQUIRES;
-        "optional"              BEGIN(PARAM); return T_OPTIONAL;
-        "default"               BEGIN(PARAM); return T_DEFAULT;
-        "prompt"                BEGIN(PARAM); return T_PROMPT;
-        "tristate"              BEGIN(PARAM); return T_TRISTATE;
-        "def_tristate"          BEGIN(PARAM); return T_DEF_TRISTATE;
-        "bool"                  BEGIN(PARAM); return T_BOOLEAN;
-        "boolean"               BEGIN(PARAM); return T_BOOLEAN;
-        "def_bool"              BEGIN(PARAM); return T_DEF_BOOLEAN;
-        "def_boolean"           BEGIN(PARAM); return T_DEF_BOOLEAN;
-        "int"                   BEGIN(PARAM); return T_INT;
-        "hex"                   BEGIN(PARAM); return T_HEX;
-        "string"                BEGIN(PARAM); return T_STRING;
-        "select"                BEGIN(PARAM); return T_SELECT;
-        "enable"                BEGIN(PARAM); return T_SELECT;
-        "range"                 BEGIN(PARAM); return T_RANGE;
         {n}+    {
+                struct kconf_id *id = kconf_id_lookup(yytext, yyleng);
+                BEGIN(PARAM);
+                current_pos.file = current_file;
+                current_pos.lineno = current_file->lineno;
+                if (id && id->flags & TF_COMMAND) {
+                        zconflval.id = id;
+                        return id->token;
+                }
                 alloc_string(yytext, yyleng);
                 zconflval.string = text;
                 return T_WORD;
         }
         .
-        \n      current_file->lineno++; BEGIN(INITIAL);
+        \n      {
+                BEGIN(INITIAL);
+                current_file->lineno++;
+                return T_EOL;
+        }
 }
 
 <PARAM>{
@@ -134,8 +123,6 @@ n	[A-Za-z0-9_]
         "!"     return T_NOT;
         "="     return T_EQUAL;
         "!="    return T_UNEQUAL;
-        "if"    return T_IF;
-        "on"    return T_ON;
         \"|\'   {
                 str = yytext[0];
                 new_string();
@@ -144,6 +131,11 @@ n	[A-Za-z0-9_]
         \n      BEGIN(INITIAL); current_file->lineno++; return T_EOL;
         ---     /* ignore */
         ({n}|[-/.])+    {
+                struct kconf_id *id = kconf_id_lookup(yytext, yyleng);
+                if (id && id->flags & TF_PARAM) {
+                        zconflval.id = id;
+                        return id->token;
+                }
                 alloc_string(yytext, yyleng);
                 zconflval.string = text;
                 return T_WORD;
@@ -236,9 +228,9 @@ n	[A-Za-z0-9_]
 }
 
 <<EOF>> {
-        if (current_buf) {
+        if (current_file) {
                 zconf_endfile();
-                return T_EOF;
+                return T_EOL;
         }
         fclose(yyin);
         yyterminate();
@@ -329,7 +321,7 @@ void zconf_nextfile(const char *name)
         current_file = file;
 }
 
-static struct buffer *zconf_endfile(void)
+static void zconf_endfile(void)
 {
         struct buffer *parent;
 
@@ -345,22 +337,14 @@ static struct buffer *zconf_endfile(void)
         }
         free(current_buf);
         current_buf = parent;
-
-        return parent;
 }
 
 int zconf_lineno(void)
 {
-        if (current_buf)
-                return current_file->lineno - 1;
-        else
-                return 0;
+        return current_pos.lineno;
 }
 
 char *zconf_curname(void)
 {
-        if (current_buf)
-                return current_file->name;
-        else
-                return "<none>";
+        return current_pos.file ? current_pos.file->name : "<none>";
 }
diff --git a/scripts/config/zconf.tab.c_shipped b/scripts/kconfig/zconf.tab.c_shipped
index 0bf511e30..ea7755da8 100644
--- a/scripts/config/zconf.tab.c_shipped
+++ b/scripts/kconfig/zconf.tab.c_shipped
@@ -1,7 +1,7 @@
-/* A Bison parser, made by GNU Bison 1.875a.  */
+/* A Bison parser, made by GNU Bison 2.0.  */
 
 /* Skeleton parser for Yacc-like parsing with Bison,
-   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
 
    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
@@ -45,8 +45,7 @@
 /* Using locations.  */
 #define YYLSP_NEEDED 0
 
-/* If NAME_PREFIX is specified substitute the variables and functions
-   names.  */
+/* Substitute the variable and function names.  */
 #define yyparse zconfparse
 #define yylex   zconflex
 #define yyerror zconferror
@@ -79,28 +78,21 @@
      T_REQUIRES = 272,
      T_OPTIONAL = 273,
      T_PROMPT = 274,
-     T_DEFAULT = 275,
-     T_TRISTATE = 276,
-     T_DEF_TRISTATE = 277,
-     T_BOOLEAN = 278,
-     T_DEF_BOOLEAN = 279,
-     T_STRING = 280,
-     T_INT = 281,
-     T_HEX = 282,
-     T_WORD = 283,
-     T_WORD_QUOTE = 284,
-     T_UNEQUAL = 285,
-     T_EOF = 286,
-     T_EOL = 287,
-     T_CLOSE_PAREN = 288,
-     T_OPEN_PAREN = 289,
-     T_ON = 290,
-     T_SELECT = 291,
-     T_RANGE = 292,
-     T_OR = 293,
-     T_AND = 294,
-     T_EQUAL = 295,
-     T_NOT = 296
+     T_TYPE = 275,
+     T_DEFAULT = 276,
+     T_SELECT = 277,
+     T_RANGE = 278,
+     T_ON = 279,
+     T_WORD = 280,
+     T_WORD_QUOTE = 281,
+     T_UNEQUAL = 282,
+     T_CLOSE_PAREN = 283,
+     T_OPEN_PAREN = 284,
+     T_EOL = 285,
+     T_OR = 286,
+     T_AND = 287,
+     T_EQUAL = 288,
+     T_NOT = 289
    };
 #endif
 #define T_MAINMENU 258
@@ -120,28 +112,21 @@
 #define T_REQUIRES 272
 #define T_OPTIONAL 273
 #define T_PROMPT 274
-#define T_DEFAULT 275
-#define T_TRISTATE 276
-#define T_DEF_TRISTATE 277
-#define T_BOOLEAN 278
-#define T_DEF_BOOLEAN 279
-#define T_STRING 280
-#define T_INT 281
-#define T_HEX 282
-#define T_WORD 283
-#define T_WORD_QUOTE 284
-#define T_UNEQUAL 285
-#define T_EOF 286
-#define T_EOL 287
-#define T_CLOSE_PAREN 288
-#define T_OPEN_PAREN 289
-#define T_ON 290
-#define T_SELECT 291
-#define T_RANGE 292
-#define T_OR 293
-#define T_AND 294
-#define T_EQUAL 295
-#define T_NOT 296
+#define T_TYPE 275
+#define T_DEFAULT 276
+#define T_SELECT 277
+#define T_RANGE 278
+#define T_ON 279
+#define T_WORD 280
+#define T_WORD_QUOTE 281
+#define T_UNEQUAL 282
+#define T_CLOSE_PAREN 283
+#define T_OPEN_PAREN 284
+#define T_EOL 285
+#define T_OR 286
+#define T_AND 287
+#define T_EQUAL 288
+#define T_NOT 289
 
 
 
@@ -161,6 +146,11 @@
 #include <string.h>
 #include <stdbool.h>
 
+#define LKC_DIRECT_LINK
+#include "lkc.h"
+
+#include "zconf.hash.c"
+
 #define printd(mask, fmt...) if (cdebug & (mask)) printf(fmt)
 
 #define PRINTD          0x0001
@@ -170,14 +160,18 @@ int cdebug = PRINTD;
 
 extern int zconflex(void);
 static void zconfprint(const char *err, ...);
+static void zconf_error(const char *err, ...);
 static void zconferror(const char *err);
-static bool zconf_endtoken(int token, int starttoken, int endtoken);
+static bool zconf_endtoken(struct kconf_id *id, int starttoken, int endtoken);
 
 struct symbol *symbol_hash[257];
 
 static struct menu *current_menu, *current_entry;
 
+#define YYDEBUG 0
+#if YYDEBUG
 #define YYERROR_VERBOSE
+#endif
 
 
 /* Enabling traces.  */
@@ -196,13 +190,14 @@ static struct menu *current_menu, *current_entry;
 #if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
 
 typedef union YYSTYPE {
-        int token;
         char *string;
+        struct file *file;
         struct symbol *symbol;
         struct expr *expr;
         struct menu *menu;
+        struct kconf_id *id;
 } YYSTYPE;
-/* Line 191 of yacc.c.  */
+/* Line 190 of yacc.c.  */
 
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
@@ -214,27 +209,26 @@ typedef union YYSTYPE {
 /* Copy the second part of user declarations.  */
 
 
-#define LKC_DIRECT_LINK
-#include "lkc.h"
-
-
-/* Line 214 of yacc.c.  */
+/* Line 213 of yacc.c.  */
 
 
 #if ! defined (yyoverflow) || YYERROR_VERBOSE
 
+# ifndef YYFREE
+#  define YYFREE free
+# endif
+# ifndef YYMALLOC
+#  define YYMALLOC malloc
+# endif
+
 /* The parser invokes alloca or malloc; define the necessary symbols.  */
 
-# if YYSTACK_USE_ALLOCA
-#  define YYSTACK_ALLOC alloca
-# else
-#  ifndef YYSTACK_USE_ALLOCA
-#   if defined (alloca) || (defined (_ALLOCA_H) && defined (__GNUC__))
-#    define YYSTACK_ALLOC alloca
+# ifdef YYSTACK_USE_ALLOCA
+#  if YYSTACK_USE_ALLOCA
+#   ifdef __GNUC__
+#    define YYSTACK_ALLOC __builtin_alloca
 #   else
-#    ifdef __GNUC__
-#     define YYSTACK_ALLOC __builtin_alloca
-#    endif
+#    define YYSTACK_ALLOC alloca
 #   endif
 #  endif
 # endif
@@ -247,20 +241,20 @@ typedef union YYSTYPE {
 #   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
 #   define YYSIZE_T size_t
 #  endif
-#  define YYSTACK_ALLOC malloc
-#  define YYSTACK_FREE free
+#  define YYSTACK_ALLOC YYMALLOC
+#  define YYSTACK_FREE YYFREE
 # endif
 #endif /* ! defined (yyoverflow) || YYERROR_VERBOSE */
 
 
 #if (! defined (yyoverflow) \
      && (! defined (__cplusplus) \
-         || (YYSTYPE_IS_TRIVIAL)))
+         || (defined (YYSTYPE_IS_TRIVIAL) && YYSTYPE_IS_TRIVIAL)))
 
 /* A type that is properly aligned for any stack member.  */
 union yyalloc
 {
-  short yyss;
+  short int yyss;
   YYSTYPE yyvs;
   };
 
@@ -270,13 +264,13 @@ union yyalloc
 /* The size of an array large to enough to hold all stacks, each with
    N elements.  */
 # define YYSTACK_BYTES(N) \
-     ((N) * (sizeof (short) + sizeof (YYSTYPE))                         \
+     ((N) * (sizeof (short int) + sizeof (YYSTYPE))                     \
       + YYSTACK_GAP_MAXIMUM)
 
 /* Copy COUNT objects from FROM to TO.  The source and destination do
    not overlap.  */
 # ifndef YYCOPY
-#  if 1 < __GNUC__
+#  if defined (__GNUC__) && 1 < __GNUC__
 #   define YYCOPY(To, From, Count) \
       __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
 #  else
@@ -312,28 +306,28 @@ union yyalloc
 #if defined (__STDC__) || defined (__cplusplus)
    typedef signed char yysigned_char;
 #else
-   typedef short yysigned_char;
+   typedef short int yysigned_char;
 #endif
 
 /* YYFINAL -- State number of the termination state. */
-#define YYFINAL  2
+#define YYFINAL  3
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   201
+#define YYLAST   264
 
 /* YYNTOKENS -- Number of terminals. */
-#define YYNTOKENS  42
+#define YYNTOKENS  35
 /* YYNNTS -- Number of nonterminals. */
-#define YYNNTS  41
+#define YYNNTS  42
 /* YYNRULES -- Number of rules. */
 #define YYNRULES  104
 /* YYNRULES -- Number of states. */
-#define YYNSTATES  182
+#define YYNSTATES  175
 
 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
 #define YYUNDEFTOK  2
-#define YYMAXUTOK   296
+#define YYMAXUTOK   289
 
-#define YYTRANSLATE(YYX)                                                \
+#define YYTRANSLATE(YYX)                                                \
   ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
 
 /* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX.  */
@@ -367,79 +361,78 @@ static const unsigned char yytranslate[] =
        2,     2,     2,     2,     2,     2,     1,     2,     3,     4,
        5,     6,     7,     8,     9,    10,    11,    12,    13,    14,
       15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
-      25,    26,    27,    28,    29,    30,    31,    32,    33,    34,
-      35,    36,    37,    38,    39,    40,    41
+      25,    26,    27,    28,    29,    30,    31,    32,    33,    34
 };
 
 #if YYDEBUG
 /* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
    YYRHS.  */
-static const unsigned short yyprhs[] =
+static const unsigned short int yyprhs[] =
 {
-       0,     0,     3,     4,     7,     9,    11,    13,    17,    19,
-      21,    23,    26,    28,    30,    32,    34,    36,    38,    42,
-      45,    49,    52,    53,    56,    59,    62,    65,    69,    74,
-      78,    83,    87,    91,    95,   100,   105,   110,   116,   119,
-     122,   124,   128,   131,   132,   135,   138,   141,   144,   149,
-     153,   157,   160,   165,   166,   169,   173,   175,   179,   182,
-     183,   186,   189,   192,   196,   199,   201,   205,   208,   209,
-     212,   215,   218,   222,   226,   228,   232,   235,   238,   241,
-     242,   245,   248,   253,   257,   261,   262,   265,   267,   269,
-     272,   275,   278,   280,   282,   283,   286,   288,   292,   296,
-     300,   303,   307,   311,   313
+       0,     0,     3,     5,     6,     9,    12,    15,    20,    23,
+      28,    33,    37,    39,    41,    43,    45,    47,    49,    51,
+      53,    55,    57,    59,    61,    63,    67,    70,    74,    77,
+      81,    84,    85,    88,    91,    94,    97,   100,   104,   109,
+     114,   119,   125,   128,   131,   133,   137,   138,   141,   144,
+     147,   150,   153,   158,   162,   165,   170,   171,   174,   178,
+     180,   184,   185,   188,   191,   194,   198,   201,   203,   207,
+     208,   211,   214,   217,   221,   225,   228,   231,   234,   235,
+     238,   241,   244,   249,   253,   257,   258,   261,   263,   265,
+     268,   271,   274,   276,   279,   280,   283,   285,   289,   293,
+     297,   300,   304,   308,   310
 };
 
 /* YYRHS -- A `-1'-separated list of the rules' RHS. */
 static const yysigned_char yyrhs[] =
 {
-      43,     0,    -1,    -1,    43,    44,    -1,    45,    -1,    55,
-      -1,    66,    -1,     3,    77,    79,    -1,     5,    -1,    15,
-      -1,     8,    -1,     1,    79,    -1,    61,    -1,    71,    -1,
-      47,    -1,    49,    -1,    69,    -1,    79,    -1,    10,    28,
-      32,    -1,    46,    50,    -1,    11,    28,    32,    -1,    48,
-      50,    -1,    -1,    50,    51,    -1,    50,    75,    -1,    50,
-      73,    -1,    50,    32,    -1,    21,    76,    32,    -1,    22,
-      81,    80,    32,    -1,    23,    76,    32,    -1,    24,    81,
-      80,    32,    -1,    26,    76,    32,    -1,    27,    76,    32,
-      -1,    25,    76,    32,    -1,    19,    77,    80,    32,    -1,
-      20,    81,    80,    32,    -1,    36,    28,    80,    32,    -1,
-      37,    82,    82,    80,    32,    -1,     7,    32,    -1,    52,
-      56,    -1,    78,    -1,    53,    58,    54,    -1,    53,    58,
-      -1,    -1,    56,    57,    -1,    56,    75,    -1,    56,    73,
-      -1,    56,    32,    -1,    19,    77,    80,    32,    -1,    21,
-      76,    32,    -1,    23,    76,    32,    -1,    18,    32,    -1,
-      20,    28,    80,    32,    -1,    -1,    58,    45,    -1,    14,
-      81,    32,    -1,    78,    -1,    59,    62,    60,    -1,    59,
-      62,    -1,    -1,    62,    45,    -1,    62,    66,    -1,    62,
-      55,    -1,     4,    77,    32,    -1,    63,    74,    -1,    78,
-      -1,    64,    67,    65,    -1,    64,    67,    -1,    -1,    67,
-      45,    -1,    67,    66,    -1,    67,    55,    -1,    67,     1,
-      32,    -1,     6,    77,    32,    -1,    68,    -1,     9,    77,
-      32,    -1,    70,    74,    -1,    12,    32,    -1,    72,    13,
-      -1,    -1,    74,    75,    -1,    74,    32,    -1,    16,    35,
-      81,    32,    -1,    16,    81,    32,    -1,    17,    81,    32,
-      -1,    -1,    77,    80,    -1,    28,    -1,    29,    -1,     5,
-      79,    -1,     8,    79,    -1,    15,    79,    -1,    32,    -1,
-      31,    -1,    -1,    14,    81,    -1,    82,    -1,    82,    40,
-      82,    -1,    82,    30,    82,    -1,    34,    81,    33,    -1,
-      41,    81,    -1,    81,    38,    81,    -1,    81,    39,    81,
-      -1,    28,    -1,    29,    -1
+      36,     0,    -1,    37,    -1,    -1,    37,    39,    -1,    37,
+      50,    -1,    37,    61,    -1,    37,     3,    71,    73,    -1,
+      37,    72,    -1,    37,    25,     1,    30,    -1,    37,    38,
+       1,    30,    -1,    37,     1,    30,    -1,    16,    -1,    19,
+      -1,    20,    -1,    22,    -1,    18,    -1,    23,    -1,    21,
+      -1,    30,    -1,    56,    -1,    65,    -1,    42,    -1,    44,
+      -1,    63,    -1,    25,     1,    30,    -1,     1,    30,    -1,
+      10,    25,    30,    -1,    41,    45,    -1,    11,    25,    30,
+      -1,    43,    45,    -1,    -1,    45,    46,    -1,    45,    69,
+      -1,    45,    67,    -1,    45,    40,    -1,    45,    30,    -1,
+      20,    70,    30,    -1,    19,    71,    74,    30,    -1,    21,
+      75,    74,    30,    -1,    22,    25,    74,    30,    -1,    23,
+      76,    76,    74,    30,    -1,     7,    30,    -1,    47,    51,
+      -1,    72,    -1,    48,    53,    49,    -1,    -1,    51,    52,
+      -1,    51,    69,    -1,    51,    67,    -1,    51,    30,    -1,
+      51,    40,    -1,    19,    71,    74,    30,    -1,    20,    70,
+      30,    -1,    18,    30,    -1,    21,    25,    74,    30,    -1,
+      -1,    53,    39,    -1,    14,    75,    73,    -1,    72,    -1,
+      54,    57,    55,    -1,    -1,    57,    39,    -1,    57,    61,
+      -1,    57,    50,    -1,     4,    71,    30,    -1,    58,    68,
+      -1,    72,    -1,    59,    62,    60,    -1,    -1,    62,    39,
+      -1,    62,    61,    -1,    62,    50,    -1,     6,    71,    30,
+      -1,     9,    71,    30,    -1,    64,    68,    -1,    12,    30,
+      -1,    66,    13,    -1,    -1,    68,    69,    -1,    68,    30,
+      -1,    68,    40,    -1,    16,    24,    75,    30,    -1,    16,
+      75,    30,    -1,    17,    75,    30,    -1,    -1,    71,    74,
+      -1,    25,    -1,    26,    -1,     5,    30,    -1,     8,    30,
+      -1,    15,    30,    -1,    30,    -1,    73,    30,    -1,    -1,
+      14,    75,    -1,    76,    -1,    76,    33,    76,    -1,    76,
+      27,    76,    -1,    29,    75,    28,    -1,    34,    75,    -1,
+      75,    31,    75,    -1,    75,    32,    75,    -1,    25,    -1,
+      26,    -1
 };
 
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
-static const unsigned short yyrline[] =
+static const unsigned short int yyrline[] =
 {
-       0,    94,    94,    95,    98,    99,   100,   101,   102,   103,
-     104,   105,   109,   110,   111,   112,   113,   114,   120,   128,
-     134,   142,   152,   154,   155,   156,   157,   160,   166,   173,
-     179,   186,   192,   198,   204,   210,   216,   222,   230,   239,
-     245,   254,   255,   261,   263,   264,   265,   266,   269,   275,
-     281,   287,   293,   299,   301,   306,   315,   324,   325,   331,
-     333,   334,   335,   340,   347,   353,   362,   363,   369,   371,
-     372,   373,   374,   377,   383,   390,   397,   404,   410,   417,
-     418,   419,   422,   427,   432,   440,   442,   447,   448,   451,
-     452,   453,   457,   457,   459,   460,   463,   464,   465,   466,
-     467,   468,   469,   472,   473
+       0,   103,   103,   105,   107,   108,   109,   110,   111,   112,
+     113,   117,   121,   121,   121,   121,   121,   121,   121,   125,
+     126,   127,   128,   129,   130,   134,   135,   141,   149,   155,
+     163,   173,   175,   176,   177,   178,   179,   182,   190,   196,
+     206,   212,   220,   229,   234,   242,   245,   247,   248,   249,
+     250,   251,   254,   260,   271,   277,   287,   289,   294,   302,
+     310,   313,   315,   316,   317,   322,   329,   334,   342,   345,
+     347,   348,   349,   352,   360,   367,   374,   380,   387,   389,
+     390,   391,   394,   399,   404,   412,   414,   419,   420,   423,
+     424,   425,   429,   430,   433,   434,   437,   438,   439,   440,
+     441,   442,   443,   446,   447
 };
 #endif
 
@@ -451,64 +444,62 @@ static const char *const yytname[] =
   "$end", "error", "$undefined", "T_MAINMENU", "T_MENU", "T_ENDMENU",
   "T_SOURCE", "T_CHOICE", "T_ENDCHOICE", "T_COMMENT", "T_CONFIG",
   "T_MENUCONFIG", "T_HELP", "T_HELPTEXT", "T_IF", "T_ENDIF", "T_DEPENDS",
-  "T_REQUIRES", "T_OPTIONAL", "T_PROMPT", "T_DEFAULT", "T_TRISTATE",
-  "T_DEF_TRISTATE", "T_BOOLEAN", "T_DEF_BOOLEAN", "T_STRING", "T_INT",
-  "T_HEX", "T_WORD", "T_WORD_QUOTE", "T_UNEQUAL", "T_EOF", "T_EOL",
-  "T_CLOSE_PAREN", "T_OPEN_PAREN", "T_ON", "T_SELECT", "T_RANGE", "T_OR",
-  "T_AND", "T_EQUAL", "T_NOT", "$accept", "input", "block",
-  "common_block", "config_entry_start", "config_stmt",
+  "T_REQUIRES", "T_OPTIONAL", "T_PROMPT", "T_TYPE", "T_DEFAULT",
+  "T_SELECT", "T_RANGE", "T_ON", "T_WORD", "T_WORD_QUOTE", "T_UNEQUAL",
+  "T_CLOSE_PAREN", "T_OPEN_PAREN", "T_EOL", "T_OR", "T_AND", "T_EQUAL",
+  "T_NOT", "$accept", "input", "stmt_list", "option_name", "common_stmt",
+  "option_error", "config_entry_start", "config_stmt",
   "menuconfig_entry_start", "menuconfig_stmt", "config_option_list",
   "config_option", "choice", "choice_entry", "choice_end", "choice_stmt",
-  "choice_option_list", "choice_option", "choice_block", "if", "if_end",
-  "if_stmt", "if_block", "menu", "menu_entry", "menu_end", "menu_stmt",
-  "menu_block", "source", "source_stmt", "comment", "comment_stmt",
+  "choice_option_list", "choice_option", "choice_block", "if_entry",
+  "if_end", "if_stmt", "if_block", "menu", "menu_entry", "menu_end",
+  "menu_stmt", "menu_block", "source_stmt", "comment", "comment_stmt",
   "help_start", "help", "depends_list", "depends", "prompt_stmt_opt",
-  "prompt", "end", "nl_or_eof", "if_expr", "expr", "symbol", 0
+  "prompt", "end", "nl", "if_expr", "expr", "symbol", 0
 };
 #endif
 
 # ifdef YYPRINT
 /* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
    token YYLEX-NUM.  */
-static const unsigned short yytoknum[] =
+static const unsigned short int yytoknum[] =
 {
        0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
      265,   266,   267,   268,   269,   270,   271,   272,   273,   274,
      275,   276,   277,   278,   279,   280,   281,   282,   283,   284,
-     285,   286,   287,   288,   289,   290,   291,   292,   293,   294,
-     295,   296
+     285,   286,   287,   288,   289
 };
 # endif
 
 /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
 static const unsigned char yyr1[] =
 {
-       0,    42,    43,    43,    44,    44,    44,    44,    44,    44,
-      44,    44,    45,    45,    45,    45,    45,    45,    46,    47,
-      48,    49,    50,    50,    50,    50,    50,    51,    51,    51,
-      51,    51,    51,    51,    51,    51,    51,    51,    52,    53,
-      54,    55,    55,    56,    56,    56,    56,    56,    57,    57,
-      57,    57,    57,    58,    58,    59,    60,    61,    61,    62,
-      62,    62,    62,    63,    64,    65,    66,    66,    67,    67,
-      67,    67,    67,    68,    69,    70,    71,    72,    73,    74,
-      74,    74,    75,    75,    75,    76,    76,    77,    77,    78,
-      78,    78,    79,    79,    80,    80,    81,    81,    81,    81,
-      81,    81,    81,    82,    82
+       0,    35,    36,    37,    37,    37,    37,    37,    37,    37,
+      37,    37,    38,    38,    38,    38,    38,    38,    38,    39,
+      39,    39,    39,    39,    39,    40,    40,    41,    42,    43,
+      44,    45,    45,    45,    45,    45,    45,    46,    46,    46,
+      46,    46,    47,    48,    49,    50,    51,    51,    51,    51,
+      51,    51,    52,    52,    52,    52,    53,    53,    54,    55,
+      56,    57,    57,    57,    57,    58,    59,    60,    61,    62,
+      62,    62,    62,    63,    64,    65,    66,    67,    68,    68,
+      68,    68,    69,    69,    69,    70,    70,    71,    71,    72,
+      72,    72,    73,    73,    74,    74,    75,    75,    75,    75,
+      75,    75,    75,    76,    76
 };
 
 /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
 static const unsigned char yyr2[] =
 {
-       0,     2,     0,     2,     1,     1,     1,     3,     1,     1,
-       1,     2,     1,     1,     1,     1,     1,     1,     3,     2,
-       3,     2,     0,     2,     2,     2,     2,     3,     4,     3,
-       4,     3,     3,     3,     4,     4,     4,     5,     2,     2,
-       1,     3,     2,     0,     2,     2,     2,     2,     4,     3,
-       3,     2,     4,     0,     2,     3,     1,     3,     2,     0,
-       2,     2,     2,     3,     2,     1,     3,     2,     0,     2,
-       2,     2,     3,     3,     1,     3,     2,     2,     2,     0,
+       0,     2,     1,     0,     2,     2,     2,     4,     2,     4,
+       4,     3,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     3,     2,     3,     2,     3,
+       2,     0,     2,     2,     2,     2,     2,     3,     4,     4,
+       4,     5,     2,     2,     1,     3,     0,     2,     2,     2,
+       2,     2,     4,     3,     2,     4,     0,     2,     3,     1,
+       3,     0,     2,     2,     2,     3,     2,     1,     3,     0,
+       2,     2,     2,     3,     3,     2,     2,     2,     0,     2,
        2,     2,     4,     3,     3,     0,     2,     1,     1,     2,
-       2,     2,     1,     1,     0,     2,     1,     3,     3,     3,
+       2,     2,     1,     2,     0,     2,     1,     3,     3,     3,
        2,     3,     3,     1,     1
 };
 
@@ -517,151 +508,160 @@ static const unsigned char yyr2[] =
    means the default is an error.  */
 static const unsigned char yydefact[] =
 {
-       2,     0,     1,     0,     0,     0,     8,     0,     0,    10,
-       0,     0,     0,     0,     9,    93,    92,     3,     4,    22,
-      14,    22,    15,    43,    53,     5,    59,    12,    79,    68,
-       6,    74,    16,    79,    13,    17,    11,    87,    88,     0,
-       0,     0,    38,     0,     0,     0,   103,   104,     0,     0,
-       0,    96,    19,    21,    39,    42,    58,    64,     0,    76,
-       7,    63,    73,    75,    18,    20,     0,   100,    55,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,    85,     0,
-      85,     0,    85,    85,    85,    26,     0,     0,    23,     0,
-      25,    24,     0,     0,     0,    85,    85,    47,    44,    46,
-      45,     0,     0,     0,    54,    41,    40,    60,    62,    57,
-      61,    56,    81,    80,     0,    69,    71,    66,    70,    65,
-      99,   101,   102,    98,    97,    77,     0,     0,     0,    94,
-      94,     0,    94,    94,     0,    94,     0,     0,     0,    94,
-       0,    78,    51,    94,    94,     0,     0,    89,    90,    91,
-      72,     0,    83,    84,     0,     0,     0,    27,    86,     0,
-      29,     0,    33,    31,    32,     0,    94,     0,     0,    49,
-      50,    82,    95,    34,    35,    28,    30,    36,     0,    48,
-      52,    37
+       3,     0,     0,     1,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,    12,    16,    13,    14,
+      18,    15,    17,     0,    19,     0,     4,    31,    22,    31,
+      23,    46,    56,     5,    61,    20,    78,    69,     6,    24,
+      78,    21,     8,    11,    87,    88,     0,     0,    89,     0,
+      42,    90,     0,     0,     0,   103,   104,     0,     0,     0,
+      96,    91,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,    92,     7,    65,    73,    74,    27,    29,     0,
+     100,     0,     0,    58,     0,     0,     9,    10,     0,     0,
+       0,     0,     0,    85,     0,     0,     0,     0,    36,    35,
+      32,     0,    34,    33,     0,     0,    85,     0,    50,    51,
+      47,    49,    48,    57,    45,    44,    62,    64,    60,    63,
+      59,    80,    81,    79,    70,    72,    68,    71,    67,    93,
+      99,   101,   102,    98,    97,    26,    76,     0,     0,     0,
+      94,     0,    94,    94,    94,     0,     0,    77,    54,    94,
+       0,    94,     0,    83,    84,     0,     0,    37,    86,     0,
+       0,    94,    25,     0,    53,     0,    82,    95,    38,    39,
+      40,     0,    52,    55,    41
 };
 
 /* YYDEFGOTO[NTERM-NUM]. */
-static const short yydefgoto[] =
+static const short int yydefgoto[] =
 {
-      -1,     1,    17,    18,    19,    20,    21,    22,    52,    88,
-      23,    24,   105,    25,    54,    98,    55,    26,   109,    27,
-      56,    28,    29,   117,    30,    58,    31,    32,    33,    34,
-      89,    90,    57,    91,   131,   132,   106,    35,   155,    50,
-      51
+      -1,     1,     2,    25,    26,    99,    27,    28,    29,    30,
+      64,   100,    31,    32,   114,    33,    66,   110,    67,    34,
+     118,    35,    68,    36,    37,   126,    38,    70,    39,    40,
+      41,   101,   102,    69,   103,   141,   142,    42,    73,   156,
+      59,    60
 };
 
 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
    STATE-NUM.  */
-#define YYPACT_NINF -99
-static const short yypact[] =
+#define YYPACT_NINF -78
+static const short int yypact[] =
 {
-     -99,    48,   -99,    38,    46,    46,   -99,    46,   -29,   -99,
-      46,   -17,    -3,   -11,   -99,   -99,   -99,   -99,   -99,   -99,
-     -99,   -99,   -99,   -99,   -99,   -99,   -99,   -99,   -99,   -99,
-     -99,   -99,   -99,   -99,   -99,   -99,   -99,   -99,   -99,    38,
-      12,    15,   -99,    18,    51,    62,   -99,   -99,   -11,   -11,
-       4,   -24,   138,   138,   160,   121,   110,    -4,    81,    -4,
-     -99,   -99,   -99,   -99,   -99,   -99,   -19,   -99,   -99,   -11,
-     -11,    70,    70,    73,    32,   -11,    46,   -11,    46,   -11,
-      46,   -11,    46,    46,    46,   -99,    36,    70,   -99,    95,
-     -99,   -99,    96,    46,   106,    46,    46,   -99,   -99,   -99,
-     -99,    38,    38,    38,   -99,   -99,   -99,   -99,   -99,   -99,
-     -99,   -99,   -99,   -99,   112,   -99,   -99,   -99,   -99,   -99,
-     -99,   117,   -99,   -99,   -99,   -99,   -11,    33,    65,   131,
-       1,   119,   131,     1,   136,     1,   153,   154,   155,   131,
-      70,   -99,   -99,   131,   131,   156,   157,   -99,   -99,   -99,
-     -99,   101,   -99,   -99,   -11,   158,   159,   -99,   -99,   161,
-     -99,   162,   -99,   -99,   -99,   163,   131,   164,   165,   -99,
-     -99,   -99,    99,   -99,   -99,   -99,   -99,   -99,   166,   -99,
-     -99,   -99
+     -78,     2,   159,   -78,   -21,     0,     0,   -12,     0,     1,
+       4,     0,    27,    38,    60,    58,   -78,   -78,   -78,   -78,
+     -78,   -78,   -78,   100,   -78,   104,   -78,   -78,   -78,   -78,
+     -78,   -78,   -78,   -78,   -78,   -78,   -78,   -78,   -78,   -78,
+     -78,   -78,   -78,   -78,   -78,   -78,    86,   113,   -78,   114,
+     -78,   -78,   125,   127,   128,   -78,   -78,    60,    60,   210,
+      65,   -78,   141,   142,    39,   103,   182,   200,     6,    66,
+       6,   131,   -78,   146,   -78,   -78,   -78,   -78,   -78,   196,
+     -78,    60,    60,   146,    40,    40,   -78,   -78,   155,   156,
+      -2,    60,     0,     0,    60,   105,    40,   194,   -78,   -78,
+     -78,   206,   -78,   -78,   183,     0,     0,   195,   -78,   -78,
+     -78,   -78,   -78,   -78,   -78,   -78,   -78,   -78,   -78,   -78,
+     -78,   -78,   -78,   -78,   -78,   -78,   -78,   -78,   -78,   -78,
+     -78,   197,   -78,   -78,   -78,   -78,   -78,    60,   213,   216,
+     212,   203,   212,   190,   212,    40,   208,   -78,   -78,   212,
+     222,   212,   219,   -78,   -78,    60,   223,   -78,   -78,   224,
+     225,   212,   -78,   226,   -78,   227,   -78,    47,   -78,   -78,
+     -78,   228,   -78,   -78,   -78
 };
 
 /* YYPGOTO[NTERM-NUM].  */
-static const short yypgoto[] =
+static const short int yypgoto[] =
 {
-     -99,   -99,   -99,   111,   -99,   -99,   -99,   -99,   178,   -99,
-     -99,   -99,   -99,    91,   -99,   -99,   -99,   -99,   -99,   -99,
-     -99,   -99,   -99,   -99,   115,   -99,   -99,   -99,   -99,   -99,
-     -99,   146,   168,    89,    27,     0,   126,    -1,   -98,   -48,
-     -63
+     -78,   -78,   -78,   -78,   164,   -36,   -78,   -78,   -78,   -78,
+     230,   -78,   -78,   -78,   -78,    29,   -78,   -78,   -78,   -78,
+     -78,   -78,   -78,   -78,   -78,   -78,    59,   -78,   -78,   -78,
+     -78,   -78,   198,   220,    24,   157,    -5,   169,   202,    74,
+     -53,   -77
 };
 
 /* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
    positive, shift that token.  If negative, reduce the rule which
    number is the opposite.  If zero, do what YYDEFACT says.
    If YYTABLE_NINF, syntax error.  */
-#define YYTABLE_NINF -68
-static const short yytable[] =
+#define YYTABLE_NINF -76
+static const short int yytable[] =
 {
-      66,    67,    36,    42,    39,    40,    71,    41,   123,   124,
-      43,    44,    74,    75,   120,   154,    72,    46,    47,    69,
-      70,   121,   122,    48,   140,    45,   127,   128,   112,   130,
-      49,   133,   156,   135,   158,   159,    68,   161,    60,    69,
-      70,   165,    69,    70,    61,   167,   168,    62,     2,     3,
-      63,     4,     5,     6,     7,     8,     9,    10,    11,    12,
-      46,    47,    13,    14,   139,   152,    48,   126,   178,    15,
-      16,    69,    70,    49,    37,    38,   129,   166,   151,    15,
-      16,   -67,   114,    64,   -67,     5,   101,     7,     8,   102,
-      10,    11,    12,   143,    65,    13,   103,   153,    46,    47,
-     147,   148,   149,    69,    70,   125,   172,   134,   141,   136,
-     137,   138,    15,    16,     5,   101,     7,     8,   102,    10,
-      11,    12,   145,   146,    13,   103,   101,     7,   142,   102,
-      10,    11,    12,   171,   144,    13,   103,    69,    70,    69,
-      70,    15,    16,   100,   150,   154,   113,   108,   113,   116,
-      73,   157,    15,    16,    74,    75,    70,    76,    77,    78,
-      79,    80,    81,    82,    83,    84,   104,   107,   160,   115,
-      85,   110,    73,   118,    86,    87,    74,    75,    92,    93,
-      94,    95,   111,    96,   119,   162,   163,   164,   169,   170,
-     173,   174,    97,   175,   176,   177,   179,   180,   181,    53,
-      99,    59
+      46,    47,     3,    49,    79,    80,    52,   133,   134,    43,
+       6,     7,     8,     9,    10,    11,    12,    13,    48,   145,
+      14,    15,   137,    55,    56,    44,    45,    57,   131,   132,
+     109,    50,    58,   122,    51,   122,    24,   138,   139,   -28,
+      88,   143,   -28,   -28,   -28,   -28,   -28,   -28,   -28,   -28,
+     -28,    89,    53,   -28,   -28,    90,    91,   -28,    92,    93,
+      94,    95,    96,    54,    97,    55,    56,    88,   161,    98,
+     -66,   -66,   -66,   -66,   -66,   -66,   -66,   -66,    81,    82,
+     -66,   -66,    90,    91,   152,    55,    56,   140,    61,    57,
+     112,    97,    84,   123,    58,   123,   121,   117,    85,   125,
+     149,    62,   167,   -30,    88,    63,   -30,   -30,   -30,   -30,
+     -30,   -30,   -30,   -30,   -30,    89,    72,   -30,   -30,    90,
+      91,   -30,    92,    93,    94,    95,    96,   119,    97,   127,
+     144,   -75,    88,    98,   -75,   -75,   -75,   -75,   -75,   -75,
+     -75,   -75,   -75,    74,    75,   -75,   -75,    90,    91,   -75,
+     -75,   -75,   -75,   -75,   -75,    76,    97,    77,    78,    -2,
+       4,   121,     5,     6,     7,     8,     9,    10,    11,    12,
+      13,    86,    87,    14,    15,    16,   129,    17,    18,    19,
+      20,    21,    22,    88,    23,   135,   136,   -43,   -43,    24,
+     -43,   -43,   -43,   -43,    89,   146,   -43,   -43,    90,    91,
+     104,   105,   106,   107,   155,     7,     8,    97,    10,    11,
+      12,    13,   108,   148,    14,    15,   158,   159,   160,   147,
+     151,    81,    82,   163,   130,   165,   155,    81,    82,    82,
+      24,   113,   116,   157,   124,   171,   115,   120,   162,   128,
+      72,    81,    82,   153,    81,    82,   154,    81,    82,   166,
+      81,    82,   164,   168,   169,   170,   172,   173,   174,    65,
+      71,    83,     0,   150,   111
 };
 
-static const unsigned char yycheck[] =
+static const short int yycheck[] =
 {
-      48,    49,     3,    32,     4,     5,    30,     7,    71,    72,
-      10,    28,    16,    17,    33,    14,    40,    28,    29,    38,
-      39,    69,    70,    34,    87,    28,    74,    75,    32,    77,
-      41,    79,   130,    81,   132,   133,    32,   135,    39,    38,
-      39,   139,    38,    39,    32,   143,   144,    32,     0,     1,
-      32,     3,     4,     5,     6,     7,     8,     9,    10,    11,
-      28,    29,    14,    15,    28,    32,    34,    35,   166,    31,
-      32,    38,    39,    41,    28,    29,    76,   140,   126,    31,
-      32,     0,     1,    32,     3,     4,     5,     6,     7,     8,
-       9,    10,    11,    93,    32,    14,    15,    32,    28,    29,
-     101,   102,   103,    38,    39,    32,   154,    80,    13,    82,
-      83,    84,    31,    32,     4,     5,     6,     7,     8,     9,
-      10,    11,    95,    96,    14,    15,     5,     6,    32,     8,
-       9,    10,    11,    32,    28,    14,    15,    38,    39,    38,
-      39,    31,    32,    54,    32,    14,    57,    56,    59,    58,
-      12,    32,    31,    32,    16,    17,    39,    19,    20,    21,
-      22,    23,    24,    25,    26,    27,    55,    56,    32,    58,
-      32,    56,    12,    58,    36,    37,    16,    17,    18,    19,
-      20,    21,    56,    23,    58,    32,    32,    32,    32,    32,
-      32,    32,    32,    32,    32,    32,    32,    32,    32,    21,
-      54,    33
+       5,     6,     0,     8,    57,    58,    11,    84,    85,    30,
+       4,     5,     6,     7,     8,     9,    10,    11,    30,    96,
+      14,    15,    24,    25,    26,    25,    26,    29,    81,    82,
+      66,    30,    34,    69,    30,    71,    30,    90,    91,     0,
+       1,    94,     3,     4,     5,     6,     7,     8,     9,    10,
+      11,    12,    25,    14,    15,    16,    17,    18,    19,    20,
+      21,    22,    23,    25,    25,    25,    26,     1,   145,    30,
+       4,     5,     6,     7,     8,     9,    10,    11,    31,    32,
+      14,    15,    16,    17,   137,    25,    26,    92,    30,    29,
+      66,    25,    27,    69,    34,    71,    30,    68,    33,    70,
+     105,     1,   155,     0,     1,     1,     3,     4,     5,     6,
+       7,     8,     9,    10,    11,    12,    30,    14,    15,    16,
+      17,    18,    19,    20,    21,    22,    23,    68,    25,    70,
+      25,     0,     1,    30,     3,     4,     5,     6,     7,     8,
+       9,    10,    11,    30,    30,    14,    15,    16,    17,    18,
+      19,    20,    21,    22,    23,    30,    25,    30,    30,     0,
+       1,    30,     3,     4,     5,     6,     7,     8,     9,    10,
+      11,    30,    30,    14,    15,    16,    30,    18,    19,    20,
+      21,    22,    23,     1,    25,    30,    30,     5,     6,    30,
+       8,     9,    10,    11,    12,     1,    14,    15,    16,    17,
+      18,    19,    20,    21,    14,     5,     6,    25,     8,     9,
+      10,    11,    30,    30,    14,    15,   142,   143,   144,    13,
+      25,    31,    32,   149,    28,   151,    14,    31,    32,    32,
+      30,    67,    68,    30,    70,   161,    67,    68,    30,    70,
+      30,    31,    32,    30,    31,    32,    30,    31,    32,    30,
+      31,    32,    30,    30,    30,    30,    30,    30,    30,    29,
+      40,    59,    -1,   106,    66
 };
 
 /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
    symbol of state STATE-NUM.  */
 static const unsigned char yystos[] =
 {
-       0,    43,     0,     1,     3,     4,     5,     6,     7,     8,
-       9,    10,    11,    14,    15,    31,    32,    44,    45,    46,
-      47,    48,    49,    52,    53,    55,    59,    61,    63,    64,
-      66,    68,    69,    70,    71,    79,    79,    28,    29,    77,
-      77,    77,    32,    77,    28,    28,    28,    29,    34,    41,
-      81,    82,    50,    50,    56,    58,    62,    74,    67,    74,
-      79,    32,    32,    32,    32,    32,    81,    81,    32,    38,
-      39,    30,    40,    12,    16,    17,    19,    20,    21,    22,
-      23,    24,    25,    26,    27,    32,    36,    37,    51,    72,
-      73,    75,    18,    19,    20,    21,    23,    32,    57,    73,
-      75,     5,     8,    15,    45,    54,    78,    45,    55,    60,
-      66,    78,    32,    75,     1,    45,    55,    65,    66,    78,
-      33,    81,    81,    82,    82,    32,    35,    81,    81,    77,
-      81,    76,    77,    81,    76,    81,    76,    76,    76,    28,
-      82,    13,    32,    77,    28,    76,    76,    79,    79,    79,
-      32,    81,    32,    32,    14,    80,    80,    32,    80,    80,
-      32,    80,    32,    32,    32,    80,    82,    80,    80,    32,
-      32,    32,    81,    32,    32,    32,    32,    32,    80,    32,
-      32,    32
+       0,    36,    37,     0,     1,     3,     4,     5,     6,     7,
+       8,     9,    10,    11,    14,    15,    16,    18,    19,    20,
+      21,    22,    23,    25,    30,    38,    39,    41,    42,    43,
+      44,    47,    48,    50,    54,    56,    58,    59,    61,    63,
+      64,    65,    72,    30,    25,    26,    71,    71,    30,    71,
+      30,    30,    71,    25,    25,    25,    26,    29,    34,    75,
+      76,    30,     1,     1,    45,    45,    51,    53,    57,    68,
+      62,    68,    30,    73,    30,    30,    30,    30,    30,    75,
+      75,    31,    32,    73,    27,    33,    30,    30,     1,    12,
+      16,    17,    19,    20,    21,    22,    23,    25,    30,    40,
+      46,    66,    67,    69,    18,    19,    20,    21,    30,    40,
+      52,    67,    69,    39,    49,    72,    39,    50,    55,    61,
+      72,    30,    40,    69,    39,    50,    60,    61,    72,    30,
+      28,    75,    75,    76,    76,    30,    30,    24,    75,    75,
+      71,    70,    71,    75,    25,    76,     1,    13,    30,    71,
+      70,    25,    75,    30,    30,    14,    74,    30,    74,    74,
+      74,    76,    30,    74,    30,    74,    30,    75,    30,    30,
+      30,    74,    30,    30,    30
 };
 
 #if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__)
@@ -687,7 +687,7 @@ static const unsigned char yystos[] =
 
 #define YYACCEPT        goto yyacceptlab
 #define YYABORT         goto yyabortlab
-#define YYERROR         goto yyerrlab1
+#define YYERROR         goto yyerrorlab
 
 
 /* Like YYERROR except do call yyerror.  This remains here temporarily
@@ -709,26 +709,59 @@ do								\
       goto yybackup;                                            \
     }                                                           \
   else                                                          \
-    {                                                           \
+    {                                                           \
       yyerror ("syntax error: cannot back up");\
       YYERROR;                                                  \
     }                                                           \
 while (0)
 
+
 #define YYTERROR        1
 #define YYERRCODE       256
 
-/* YYLLOC_DEFAULT -- Compute the default location (before the actions
-   are run).  */
 
+/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].
+   If N is 0, then set CURRENT to the empty location which ends
+   the previous symbol: RHS[0] (always defined).  */
+
+#define YYRHSLOC(Rhs, K) ((Rhs)[K])
 #ifndef YYLLOC_DEFAULT
-# define YYLLOC_DEFAULT(Current, Rhs, N)         \
-  Current.first_line   = Rhs[1].first_line;      \
-  Current.first_column = Rhs[1].first_column;    \
-  Current.last_line    = Rhs[N].last_line;       \
-  Current.last_column  = Rhs[N].last_column;
+# define YYLLOC_DEFAULT(Current, Rhs, N)                                \
+    do                                                                  \
+      if (N)                                                            \
+        {                                                               \
+          (Current).first_line   = YYRHSLOC (Rhs, 1).first_line;        \
+          (Current).first_column = YYRHSLOC (Rhs, 1).first_column;      \
+          (Current).last_line    = YYRHSLOC (Rhs, N).last_line;         \
+          (Current).last_column  = YYRHSLOC (Rhs, N).last_column;       \
+        }                                                               \
+      else                                                              \
+        {                                                               \
+          (Current).first_line   = (Current).last_line   =              \
+            YYRHSLOC (Rhs, 0).last_line;                                \
+          (Current).first_column = (Current).last_column =              \
+            YYRHSLOC (Rhs, 0).last_column;                              \
+        }                                                               \
+    while (0)
 #endif
 
+
+/* YY_LOCATION_PRINT -- Print the location on the stream.
+   This macro was not mandated originally: define only if we know
+   we won't break user code: when these are the locations we know.  */
+
+#ifndef YY_LOCATION_PRINT
+# if YYLTYPE_IS_TRIVIAL
+#  define YY_LOCATION_PRINT(File, Loc)                  \
+     fprintf (File, "%d.%d-%d.%d",                      \
+              (Loc).first_line, (Loc).first_column,     \
+              (Loc).last_line,  (Loc).last_column)
+# else
+#  define YY_LOCATION_PRINT(File, Loc) ((void) 0)
+# endif
+#endif
+
+
 /* YYLEX -- calling `yylex' with the right arguments.  */
 
 #ifdef YYLEX_PARAM
@@ -751,36 +784,30 @@ do {						\
     YYFPRINTF Args;                             \
 } while (0)
 
-# define YYDSYMPRINT(Args)                      \
-do {                                            \
-  if (yydebug)                                  \
-    yysymprint Args;                            \
-} while (0)
-
-# define YYDSYMPRINTF(Title, Token, Value, Location)            \
+# define YY_SYMBOL_PRINT(Title, Type, Value, Location)          \
 do {                                                            \
   if (yydebug)                                                  \
     {                                                           \
       YYFPRINTF (stderr, "%s ", Title);                         \
-      yysymprint (stderr,                                       \
-                  Token, Value);        \
+      yysymprint (stderr,                                       \
+                  Type, Value); \
       YYFPRINTF (stderr, "\n");                                 \
     }                                                           \
 } while (0)
 
 /*------------------------------------------------------------------.
 | yy_stack_print -- Print the state stack from its BOTTOM up to its |
-| TOP (cinluded).                                                   |
+| TOP (included).                                                   |
 `------------------------------------------------------------------*/
 
 #if defined (__STDC__) || defined (__cplusplus)
 static void
-yy_stack_print (short *bottom, short *top)
+yy_stack_print (short int *bottom, short int *top)
 #else
 static void
 yy_stack_print (bottom, top)
-    short *bottom;
-    short *top;
+    short int *bottom;
+    short int *top;
 #endif
 {
   YYFPRINTF (stderr, "Stack now");
@@ -810,9 +837,9 @@ yy_reduce_print (yyrule)
 #endif
 {
   int yyi;
-  unsigned int yylineno = yyrline[yyrule];
+  unsigned int yylno = yyrline[yyrule];
   YYFPRINTF (stderr, "Reducing stack by rule %d (line %u), ",
-             yyrule - 1, yylineno);
+             yyrule - 1, yylno);
   /* Print the symbols being reduced, and their result.  */
   for (yyi = yyprhs[yyrule]; 0 <= yyrhs[yyi]; yyi++)
     YYFPRINTF (stderr, "%s ", yytname [yyrhs[yyi]]);
@@ -830,8 +857,7 @@ do {					\
 int yydebug;
 #else /* !YYDEBUG */
 # define YYDPRINTF(Args)
-# define YYDSYMPRINT(Args)
-# define YYDSYMPRINTF(Title, Token, Value, Location)
+# define YY_SYMBOL_PRINT(Title, Type, Value, Location)
 # define YY_STACK_PRINT(Bottom, Top)
 # define YY_REDUCE_PRINT(Rule)
 #endif /* !YYDEBUG */
@@ -849,10 +875,6 @@ int yydebug;
    SIZE_MAX < YYSTACK_BYTES (YYMAXDEPTH)
    evaluated with infinite-precision integer arithmetic.  */
 
-#if YYMAXDEPTH == 0
-# undef YYMAXDEPTH
-#endif
-
 #ifndef YYMAXDEPTH
 # define YYMAXDEPTH 10000
 #endif
@@ -934,15 +956,15 @@ yysymprint (yyoutput, yytype, yyvaluep)
   (void) yyvaluep;
 
   if (yytype < YYNTOKENS)
-    {
-      YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
-# ifdef YYPRINT
-      YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
-# endif
-    }
+    YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
   else
     YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
 
+
+# ifdef YYPRINT
+  if (yytype < YYNTOKENS)
+    YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
+# endif
   switch (yytype)
     {
       default:
@@ -958,10 +980,11 @@ yysymprint (yyoutput, yytype, yyvaluep)
 
 #if defined (__STDC__) || defined (__cplusplus)
 static void
-yydestruct (int yytype, YYSTYPE *yyvaluep)
+yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep)
 #else
 static void
-yydestruct (yytype, yyvaluep)
+yydestruct (yymsg, yytype, yyvaluep)
+    const char *yymsg;
     int yytype;
     YYSTYPE *yyvaluep;
 #endif
@@ -969,8 +992,42 @@ yydestruct (yytype, yyvaluep)
   /* Pacify ``unused variable'' warnings.  */
   (void) yyvaluep;
 
+  if (!yymsg)
+    yymsg = "Deleting";
+  YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
+
   switch (yytype)
     {
+      case 48: /* choice_entry */
+
+        {
+        fprintf(stderr, "%s:%d: missing end statement for this entry\n",
+                (yyvaluep->menu)->file->name, (yyvaluep->menu)->lineno);
+        if (current_menu == (yyvaluep->menu))
+                menu_end_menu();
+};
+
+        break;
+      case 54: /* if_entry */
+
+        {
+        fprintf(stderr, "%s:%d: missing end statement for this entry\n",
+                (yyvaluep->menu)->file->name, (yyvaluep->menu)->lineno);
+        if (current_menu == (yyvaluep->menu))
+                menu_end_menu();
+};
+
+        break;
+      case 59: /* menu_entry */
+
+        {
+        fprintf(stderr, "%s:%d: missing end statement for this entry\n",
+                (yyvaluep->menu)->file->name, (yyvaluep->menu)->lineno);
+        if (current_menu == (yyvaluep->menu))
+                menu_end_menu();
+};
+
+        break;
 
       default:
         break;
@@ -996,10 +1053,10 @@ int yyparse ();
 
 
 
-/* The lookahead symbol.  */
+/* The look-ahead symbol.  */
 int yychar;
 
-/* The semantic value of the lookahead symbol.  */
+/* The semantic value of the look-ahead symbol.  */
 YYSTYPE yylval;
 
 /* Number of syntax errors so far.  */
@@ -1029,13 +1086,13 @@ yyparse ()
 #endif
 #endif
 {
-
+  
   register int yystate;
   register int yyn;
   int yyresult;
   /* Number of tokens to shift before error messages enabled.  */
   int yyerrstatus;
-  /* Lookahead token as an internal (translated) token number.  */
+  /* Look-ahead token as an internal (translated) token number.  */
   int yytoken = 0;
 
   /* Three stacks and their tools:
@@ -1047,9 +1104,9 @@ yyparse ()
      to reallocate them elsewhere.  */
 
   /* The state stack.  */
-  short yyssa[YYINITDEPTH];
-  short *yyss = yyssa;
-  register short *yyssp;
+  short int yyssa[YYINITDEPTH];
+  short int *yyss = yyssa;
+  register short int *yyssp;
 
   /* The semantic value stack.  */
   YYSTYPE yyvsa[YYINITDEPTH];
@@ -1086,6 +1143,9 @@ yyparse ()
   yyssp = yyss;
   yyvsp = yyvs;
 
+
+  yyvsp[0] = yylval;
+
   goto yysetstate;
 
 /*------------------------------------------------------------.
@@ -1111,7 +1171,7 @@ yyparse ()
            these so that the &'s don't force the real ones into
            memory.  */
         YYSTYPE *yyvs1 = yyvs;
-        short *yyss1 = yyss;
+        short int *yyss1 = yyss;
 
 
         /* Each stack pointer address is followed by the size of the
@@ -1139,7 +1199,7 @@ yyparse ()
         yystacksize = YYMAXDEPTH;
 
       {
-        short *yyss1 = yyss;
+        short int *yyss1 = yyss;
         union yyalloc *yyptr =
           (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
         if (! yyptr)
@@ -1175,18 +1235,18 @@ yyparse ()
 yybackup:
 
 /* Do appropriate processing given the current state.  */
-/* Read a lookahead token if we need one and don't already have one.  */
+/* Read a look-ahead token if we need one and don't already have one.  */
 /* yyresume: */
 
-  /* First try to decide what to do without reference to lookahead token.  */
+  /* First try to decide what to do without reference to look-ahead token.  */
 
   yyn = yypact[yystate];
   if (yyn == YYPACT_NINF)
     goto yydefault;
 
-  /* Not known => get a lookahead token if don't already have one.  */
+  /* Not known => get a look-ahead token if don't already have one.  */
 
-  /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol.  */
+  /* YYCHAR is either YYEMPTY or YYEOF or a valid look-ahead symbol.  */
   if (yychar == YYEMPTY)
     {
       YYDPRINTF ((stderr, "Reading a token: "));
@@ -1201,7 +1261,7 @@ yybackup:
   else
     {
       yytoken = YYTRANSLATE (yychar);
-      YYDSYMPRINTF ("Next token is", yytoken, &yylval, &yylloc);
+      YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc);
     }
 
   /* If the proper action on seeing token YYTOKEN is to reduce or to
@@ -1221,8 +1281,8 @@ yybackup:
   if (yyn == YYFINAL)
     YYACCEPT;
 
-  /* Shift the lookahead token.  */
-  YYDPRINTF ((stderr, "Shifting token %s, ", yytname[yytoken]));
+  /* Shift the look-ahead token.  */
+  YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
 
   /* Discard the token being shifted unless it is eof.  */
   if (yychar != YYEOF)
@@ -1273,155 +1333,123 @@ yyreduce:
     {
         case 8:
 
-    { zconfprint("unexpected 'endmenu' statement"); ;}
+    { zconf_error("unexpected end statement"); ;}
     break;
 
   case 9:
 
-    { zconfprint("unexpected 'endif' statement"); ;}
+    { zconf_error("unknown statement \"%s\"", (yyvsp[-2].string)); ;}
     break;
 
   case 10:
 
-    { zconfprint("unexpected 'endchoice' statement"); ;}
+    {
+        zconf_error("unexpected option \"%s\"", kconf_id_strings + (yyvsp[-2].id)->name);
+;}
     break;
 
   case 11:
 
-    { zconfprint("syntax error"); yyerrok; ;}
+    { zconf_error("invalid statement"); ;}
     break;
 
-  case 18:
+  case 25:
 
-    {
-        struct symbol *sym = sym_lookup(yyvsp[-1].string, 0);
-        sym->flags |= SYMBOL_OPTIONAL;
-        menu_add_entry(sym);
-        printd(DEBUG_PARSE, "%s:%d:config %s\n", zconf_curname(), zconf_lineno(), yyvsp[-1].string);
-;}
+    { zconf_error("unknown option \"%s\"", (yyvsp[-2].string)); ;}
     break;
 
-  case 19:
+  case 26:
 
-    {
-        menu_end_entry();
-        printd(DEBUG_PARSE, "%s:%d:endconfig\n", zconf_curname(), zconf_lineno());
-;}
+    { zconf_error("invalid option"); ;}
     break;
 
-  case 20:
+  case 27:
 
     {
-        struct symbol *sym = sym_lookup(yyvsp[-1].string, 0);
+        struct symbol *sym = sym_lookup((yyvsp[-1].string), 0);
         sym->flags |= SYMBOL_OPTIONAL;
         menu_add_entry(sym);
-        printd(DEBUG_PARSE, "%s:%d:menuconfig %s\n", zconf_curname(), zconf_lineno(), yyvsp[-1].string);
+        printd(DEBUG_PARSE, "%s:%d:config %s\n", zconf_curname(), zconf_lineno(), (yyvsp[-1].string));
 ;}
     break;
 
-  case 21:
+  case 28:
 
     {
-        if (current_entry->prompt)
-                current_entry->prompt->type = P_MENU;
-        else
-                zconfprint("warning: menuconfig statement without prompt");
         menu_end_entry();
         printd(DEBUG_PARSE, "%s:%d:endconfig\n", zconf_curname(), zconf_lineno());
 ;}
     break;
 
-  case 27:
-
-    {
-        menu_set_type(S_TRISTATE);
-        printd(DEBUG_PARSE, "%s:%d:tristate\n", zconf_curname(), zconf_lineno());
-;}
-    break;
-
-  case 28:
-
-    {
-        menu_add_expr(P_DEFAULT, yyvsp[-2].expr, yyvsp[-1].expr);
-        menu_set_type(S_TRISTATE);
-        printd(DEBUG_PARSE, "%s:%d:def_boolean\n", zconf_curname(), zconf_lineno());
-;}
-    break;
-
   case 29:
 
     {
-        menu_set_type(S_BOOLEAN);
-        printd(DEBUG_PARSE, "%s:%d:boolean\n", zconf_curname(), zconf_lineno());
+        struct symbol *sym = sym_lookup((yyvsp[-1].string), 0);
+        sym->flags |= SYMBOL_OPTIONAL;
+        menu_add_entry(sym);
+        printd(DEBUG_PARSE, "%s:%d:menuconfig %s\n", zconf_curname(), zconf_lineno(), (yyvsp[-1].string));
 ;}
     break;
 
   case 30:
 
     {
-        menu_add_expr(P_DEFAULT, yyvsp[-2].expr, yyvsp[-1].expr);
-        menu_set_type(S_BOOLEAN);
-        printd(DEBUG_PARSE, "%s:%d:def_boolean\n", zconf_curname(), zconf_lineno());
-;}
-    break;
-
-  case 31:
-
-    {
-        menu_set_type(S_INT);
-        printd(DEBUG_PARSE, "%s:%d:int\n", zconf_curname(), zconf_lineno());
-;}
-    break;
-
-  case 32:
-
-    {
-        menu_set_type(S_HEX);
-        printd(DEBUG_PARSE, "%s:%d:hex\n", zconf_curname(), zconf_lineno());
+        if (current_entry->prompt)
+                current_entry->prompt->type = P_MENU;
+        else
+                zconfprint("warning: menuconfig statement without prompt");
+        menu_end_entry();
+        printd(DEBUG_PARSE, "%s:%d:endconfig\n", zconf_curname(), zconf_lineno());
 ;}
     break;
 
-  case 33:
+  case 37:
 
     {
-        menu_set_type(S_STRING);
-        printd(DEBUG_PARSE, "%s:%d:string\n", zconf_curname(), zconf_lineno());
+        menu_set_type((yyvsp[-2].id)->stype);
+        printd(DEBUG_PARSE, "%s:%d:type(%u)\n",
+                zconf_curname(), zconf_lineno(),
+                (yyvsp[-2].id)->stype);
 ;}
     break;
 
-  case 34:
+  case 38:
 
     {
-        menu_add_prompt(P_PROMPT, yyvsp[-2].string, yyvsp[-1].expr);
+        menu_add_prompt(P_PROMPT, (yyvsp[-2].string), (yyvsp[-1].expr));
         printd(DEBUG_PARSE, "%s:%d:prompt\n", zconf_curname(), zconf_lineno());
 ;}
     break;
 
-  case 35:
+  case 39:
 
     {
-        menu_add_expr(P_DEFAULT, yyvsp[-2].expr, yyvsp[-1].expr);
-        printd(DEBUG_PARSE, "%s:%d:default\n", zconf_curname(), zconf_lineno());
+        menu_add_expr(P_DEFAULT, (yyvsp[-2].expr), (yyvsp[-1].expr));
+        if ((yyvsp[-3].id)->stype != S_UNKNOWN)
+                menu_set_type((yyvsp[-3].id)->stype);
+        printd(DEBUG_PARSE, "%s:%d:default(%u)\n",
+                zconf_curname(), zconf_lineno(),
+                (yyvsp[-3].id)->stype);
 ;}
     break;
 
-  case 36:
+  case 40:
 
     {
-        menu_add_symbol(P_SELECT, sym_lookup(yyvsp[-2].string, 0), yyvsp[-1].expr);
+        menu_add_symbol(P_SELECT, sym_lookup((yyvsp[-2].string), 0), (yyvsp[-1].expr));
         printd(DEBUG_PARSE, "%s:%d:select\n", zconf_curname(), zconf_lineno());
 ;}
     break;
 
-  case 37:
+  case 41:
 
     {
-        menu_add_expr(P_RANGE, expr_alloc_comp(E_RANGE,yyvsp[-3].symbol, yyvsp[-2].symbol), yyvsp[-1].expr);
+        menu_add_expr(P_RANGE, expr_alloc_comp(E_RANGE,(yyvsp[-3].symbol), (yyvsp[-2].symbol)), (yyvsp[-1].expr));
         printd(DEBUG_PARSE, "%s:%d:range\n", zconf_curname(), zconf_lineno());
 ;}
     break;
 
-  case 38:
+  case 42:
 
     {
         struct symbol *sym = sym_lookup(NULL, 0);
@@ -1432,57 +1460,45 @@ yyreduce:
 ;}
     break;
 
-  case 39:
+  case 43:
 
     {
-        menu_end_entry();
-        menu_add_menu();
+        (yyval.menu) = menu_add_menu();
 ;}
     break;
 
-  case 40:
+  case 44:
 
     {
-        if (zconf_endtoken(yyvsp[0].token, T_CHOICE, T_ENDCHOICE)) {
+        if (zconf_endtoken((yyvsp[0].id), T_CHOICE, T_ENDCHOICE)) {
                 menu_end_menu();
                 printd(DEBUG_PARSE, "%s:%d:endchoice\n", zconf_curname(), zconf_lineno());
         }
 ;}
     break;
 
-  case 42:
-
-    {
-        printf("%s:%d: missing 'endchoice' for this 'choice' statement\n", current_menu->file->name, current_menu->lineno);
-        zconfnerrs++;
-;}
-    break;
-
-  case 48:
+  case 52:
 
     {
-        menu_add_prompt(P_PROMPT, yyvsp[-2].string, yyvsp[-1].expr);
+        menu_add_prompt(P_PROMPT, (yyvsp[-2].string), (yyvsp[-1].expr));
         printd(DEBUG_PARSE, "%s:%d:prompt\n", zconf_curname(), zconf_lineno());
 ;}
     break;
 
-  case 49:
+  case 53:
 
     {
-        menu_set_type(S_TRISTATE);
-        printd(DEBUG_PARSE, "%s:%d:tristate\n", zconf_curname(), zconf_lineno());
+        if ((yyvsp[-2].id)->stype == S_BOOLEAN || (yyvsp[-2].id)->stype == S_TRISTATE) {
+                menu_set_type((yyvsp[-2].id)->stype);
+                printd(DEBUG_PARSE, "%s:%d:type(%u)\n",
+                        zconf_curname(), zconf_lineno(),
+                        (yyvsp[-2].id)->stype);
+        } else
+                YYERROR;
 ;}
     break;
 
-  case 50:
-
-    {
-        menu_set_type(S_BOOLEAN);
-        printd(DEBUG_PARSE, "%s:%d:boolean\n", zconf_curname(), zconf_lineno());
-;}
-    break;
-
-  case 51:
+  case 54:
 
     {
         current_entry->sym->flags |= SYMBOL_OPTIONAL;
@@ -1490,115 +1506,89 @@ yyreduce:
 ;}
     break;
 
-  case 52:
+  case 55:
 
     {
-        menu_add_symbol(P_DEFAULT, sym_lookup(yyvsp[-2].string, 0), yyvsp[-1].expr);
-        printd(DEBUG_PARSE, "%s:%d:default\n", zconf_curname(), zconf_lineno());
+        if ((yyvsp[-3].id)->stype == S_UNKNOWN) {
+                menu_add_symbol(P_DEFAULT, sym_lookup((yyvsp[-2].string), 0), (yyvsp[-1].expr));
+                printd(DEBUG_PARSE, "%s:%d:default\n",
+                        zconf_curname(), zconf_lineno());
+        } else
+                YYERROR;
 ;}
     break;
 
-  case 55:
+  case 58:
 
     {
         printd(DEBUG_PARSE, "%s:%d:if\n", zconf_curname(), zconf_lineno());
         menu_add_entry(NULL);
-        menu_add_dep(yyvsp[-1].expr);
-        menu_end_entry();
-        menu_add_menu();
+        menu_add_dep((yyvsp[-1].expr));
+        (yyval.menu) = menu_add_menu();
 ;}
     break;
 
-  case 56:
+  case 59:
 
     {
-        if (zconf_endtoken(yyvsp[0].token, T_IF, T_ENDIF)) {
+        if (zconf_endtoken((yyvsp[0].id), T_IF, T_ENDIF)) {
                 menu_end_menu();
                 printd(DEBUG_PARSE, "%s:%d:endif\n", zconf_curname(), zconf_lineno());
         }
 ;}
     break;
 
-  case 58:
-
-    {
-        printf("%s:%d: missing 'endif' for this 'if' statement\n", current_menu->file->name, current_menu->lineno);
-        zconfnerrs++;
-;}
-    break;
-
-  case 63:
+  case 65:
 
     {
         menu_add_entry(NULL);
-        menu_add_prop(P_MENU, yyvsp[-1].string, NULL, NULL);
+        menu_add_prompt(P_MENU, (yyvsp[-1].string), NULL);
         printd(DEBUG_PARSE, "%s:%d:menu\n", zconf_curname(), zconf_lineno());
 ;}
     break;
 
-  case 64:
+  case 66:
 
     {
-        menu_end_entry();
-        menu_add_menu();
+        (yyval.menu) = menu_add_menu();
 ;}
     break;
 
-  case 65:
+  case 67:
 
     {
-        if (zconf_endtoken(yyvsp[0].token, T_MENU, T_ENDMENU)) {
+        if (zconf_endtoken((yyvsp[0].id), T_MENU, T_ENDMENU)) {
                 menu_end_menu();
                 printd(DEBUG_PARSE, "%s:%d:endmenu\n", zconf_curname(), zconf_lineno());
         }
 ;}
     break;
 
-  case 67:
-
-    {
-        printf("%s:%d: missing 'endmenu' for this 'menu' statement\n", current_menu->file->name, current_menu->lineno);
-        zconfnerrs++;
-;}
-    break;
-
-  case 72:
-
-    { zconfprint("invalid menu option"); yyerrok; ;}
-    break;
-
   case 73:
 
     {
-        yyval.string = yyvsp[-1].string;
-        printd(DEBUG_PARSE, "%s:%d:source %s\n", zconf_curname(), zconf_lineno(), yyvsp[-1].string);
+        printd(DEBUG_PARSE, "%s:%d:source %s\n", zconf_curname(), zconf_lineno(), (yyvsp[-1].string));
+        zconf_nextfile((yyvsp[-1].string));
 ;}
     break;
 
   case 74:
 
     {
-        zconf_nextfile(yyvsp[0].string);
-;}
-    break;
-
-  case 75:
-
-    {
         menu_add_entry(NULL);
-        menu_add_prop(P_COMMENT, yyvsp[-1].string, NULL, NULL);
+        menu_add_prompt(P_COMMENT, (yyvsp[-1].string), NULL);
         printd(DEBUG_PARSE, "%s:%d:comment\n", zconf_curname(), zconf_lineno());
 ;}
     break;
 
-  case 76:
+  case 75:
 
     {
         menu_end_entry();
 ;}
     break;
 
-  case 77:
+  case 76:
 
     {
         printd(DEBUG_PARSE, "%s:%d:help\n", zconf_curname(), zconf_lineno());
@@ -1606,17 +1596,17 @@ yyreduce:
 ;}
     break;
 
-  case 78:
+  case 77:
 
     {
-        current_entry->sym->help = yyvsp[0].string;
+        current_entry->sym->help = (yyvsp[0].string);
 ;}
     break;
 
   case 82:
 
     {
-        menu_add_dep(yyvsp[-1].expr);
+        menu_add_dep((yyvsp[-1].expr));
         printd(DEBUG_PARSE, "%s:%d:depends on\n", zconf_curname(), zconf_lineno());
 ;}
     break;
@@ -1624,7 +1614,7 @@ yyreduce:
   case 83:
 
     {
-        menu_add_dep(yyvsp[-1].expr);
+        menu_add_dep((yyvsp[-1].expr));
         printd(DEBUG_PARSE, "%s:%d:depends\n", zconf_curname(), zconf_lineno());
 ;}
     break;
@@ -1632,7 +1622,7 @@ yyreduce:
   case 84:
 
     {
-        menu_add_dep(yyvsp[-1].expr);
+        menu_add_dep((yyvsp[-1].expr));
         printd(DEBUG_PARSE, "%s:%d:requires\n", zconf_curname(), zconf_lineno());
 ;}
     break;
@@ -1640,84 +1630,84 @@ yyreduce:
   case 86:
 
     {
-        menu_add_prop(P_PROMPT, yyvsp[-1].string, NULL, yyvsp[0].expr);
+        menu_add_prompt(P_PROMPT, (yyvsp[-1].string), (yyvsp[0].expr));
 ;}
     break;
 
   case 89:
 
-    { yyval.token = T_ENDMENU; ;}
+    { (yyval.id) = (yyvsp[-1].id); ;}
     break;
 
   case 90:
 
-    { yyval.token = T_ENDCHOICE; ;}
+    { (yyval.id) = (yyvsp[-1].id); ;}
     break;
 
   case 91:
 
-    { yyval.token = T_ENDIF; ;}
+    { (yyval.id) = (yyvsp[-1].id); ;}
     break;
 
   case 94:
 
-    { yyval.expr = NULL; ;}
+    { (yyval.expr) = NULL; ;}
     break;
 
   case 95:
 
-    { yyval.expr = yyvsp[0].expr; ;}
+    { (yyval.expr) = (yyvsp[0].expr); ;}
     break;
 
   case 96:
 
-    { yyval.expr = expr_alloc_symbol(yyvsp[0].symbol); ;}
+    { (yyval.expr) = expr_alloc_symbol((yyvsp[0].symbol)); ;}
     break;
 
   case 97:
 
-    { yyval.expr = expr_alloc_comp(E_EQUAL, yyvsp[-2].symbol, yyvsp[0].symbol); ;}
+    { (yyval.expr) = expr_alloc_comp(E_EQUAL, (yyvsp[-2].symbol), (yyvsp[0].symbol)); ;}
     break;
 
   case 98:
 
-    { yyval.expr = expr_alloc_comp(E_UNEQUAL, yyvsp[-2].symbol, yyvsp[0].symbol); ;}
+    { (yyval.expr) = expr_alloc_comp(E_UNEQUAL, (yyvsp[-2].symbol), (yyvsp[0].symbol)); ;}
     break;
 
   case 99:
 
-    { yyval.expr = yyvsp[-1].expr; ;}
+    { (yyval.expr) = (yyvsp[-1].expr); ;}
     break;
 
   case 100:
 
-    { yyval.expr = expr_alloc_one(E_NOT, yyvsp[0].expr); ;}
+    { (yyval.expr) = expr_alloc_one(E_NOT, (yyvsp[0].expr)); ;}
     break;
 
   case 101:
 
-    { yyval.expr = expr_alloc_two(E_OR, yyvsp[-2].expr, yyvsp[0].expr); ;}
+    { (yyval.expr) = expr_alloc_two(E_OR, (yyvsp[-2].expr), (yyvsp[0].expr)); ;}
     break;
 
   case 102:
 
-    { yyval.expr = expr_alloc_two(E_AND, yyvsp[-2].expr, yyvsp[0].expr); ;}
+    { (yyval.expr) = expr_alloc_two(E_AND, (yyvsp[-2].expr), (yyvsp[0].expr)); ;}
     break;
 
   case 103:
 
-    { yyval.symbol = sym_lookup(yyvsp[0].string, 0); free(yyvsp[0].string); ;}
+    { (yyval.symbol) = sym_lookup((yyvsp[0].string), 0); free((yyvsp[0].string)); ;}
     break;
 
   case 104:
 
-    { yyval.symbol = sym_lookup(yyvsp[0].string, 1); free(yyvsp[0].string); ;}
+    { (yyval.symbol) = sym_lookup((yyvsp[0].string), 1); free((yyvsp[0].string)); ;}
     break;
 
 
     }
 
-/* Line 999 of yacc.c.  */
+/* Line 1037 of yacc.c.  */
 
 
   yyvsp -= yylen;
@@ -1759,18 +1749,33 @@ yyerrlab:
         {
           YYSIZE_T yysize = 0;
           int yytype = YYTRANSLATE (yychar);
+          const char* yyprefix;
           char *yymsg;
-          int yyx, yycount;
+          int yyx;
 
-          yycount = 0;
           /* Start YYX at -YYN if negative to avoid negative indexes in
              YYCHECK.  */
-          for (yyx = yyn < 0 ? -yyn : 0;
-               yyx < (int) (sizeof (yytname) / sizeof (char *)); yyx++)
+          int yyxbegin = yyn < 0 ? -yyn : 0;
+
+          /* Stay within bounds of both yycheck and yytname.  */
+          int yychecklim = YYLAST - yyn;
+          int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
+          int yycount = 0;
+
+          yyprefix = ", expecting ";
+          for (yyx = yyxbegin; yyx < yyxend; ++yyx)
             if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
-              yysize += yystrlen (yytname[yyx]) + 15, yycount++;
-          yysize += yystrlen ("syntax error, unexpected ") + 1;
-          yysize += yystrlen (yytname[yytype]);
+              {
+                yysize += yystrlen (yyprefix) + yystrlen (yytname [yyx]);
+                yycount += 1;
+                if (yycount == 5)
+                  {
+                    yysize = 0;
+                    break;
+                  }
+              }
+          yysize += (sizeof ("syntax error, unexpected ")
+                     + yystrlen (yytname[yytype]));
           yymsg = (char *) YYSTACK_ALLOC (yysize);
           if (yymsg != 0)
             {
@@ -1779,16 +1784,13 @@ yyerrlab:
 
               if (yycount < 5)
                 {
-                  yycount = 0;
-                  for (yyx = yyn < 0 ? -yyn : 0;
-                       yyx < (int) (sizeof (yytname) / sizeof (char *));
-                       yyx++)
+                  yyprefix = ", expecting ";
+                  for (yyx = yyxbegin; yyx < yyxend; ++yyx)
                     if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
                       {
-                        const char *yyq = ! yycount ? ", expecting " : " or ";
-                        yyp = yystpcpy (yyp, yyq);
+                        yyp = yystpcpy (yyp, yyprefix);
                         yyp = yystpcpy (yyp, yytname[yyx]);
-                        yycount++;
+                        yyprefix = " or ";
                       }
                 }
               yyerror (yymsg);
@@ -1806,38 +1808,57 @@ yyerrlab:
 
   if (yyerrstatus == 3)
     {
-      /* If just tried and failed to reuse lookahead token after an
+      /* If just tried and failed to reuse look-ahead token after an
          error, discard it.  */
 
-      /* Return failure if at end of input.  */
-      if (yychar == YYEOF)
+      if (yychar <= YYEOF)
         {
-          /* Pop the error token.  */
-          YYPOPSTACK;
-          /* Pop the rest of the stack.  */
-          while (yyss < yyssp)
-            {
-              YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp);
-              yydestruct (yystos[*yyssp], yyvsp);
-              YYPOPSTACK;
-            }
-          YYABORT;
+          /* If at end of input, pop the error token,
+             then the rest of the stack, then return failure.  */
+          if (yychar == YYEOF)
+             for (;;)
+               {
+
+                 YYPOPSTACK;
+                 if (yyssp == yyss)
+                   YYABORT;
+                 yydestruct ("Error: popping",
+                             yystos[*yyssp], yyvsp);
+               }
         }
-
-      YYDSYMPRINTF ("Error: discarding", yytoken, &yylval, &yylloc);
-      yydestruct (yytoken, &yylval);
-      yychar = YYEMPTY;
-
+      else
+        {
+          yydestruct ("Error: discarding", yytoken, &yylval);
+          yychar = YYEMPTY;
+        }
     }
 
-  /* Else will try to reuse lookahead token after shifting the error
+  /* Else will try to reuse look-ahead token after shifting the error
      token.  */
   goto yyerrlab1;
 
 
-/*----------------------------------------------------.
-| yyerrlab1 -- error raised explicitly by an action.  |
-`----------------------------------------------------*/
+/*---------------------------------------------------.
+| yyerrorlab -- error raised explicitly by YYERROR.  |
+`---------------------------------------------------*/
+yyerrorlab:
+
+#ifdef __GNUC__
+  /* Pacify GCC when the user code never invokes YYERROR and the label
+     yyerrorlab therefore never appears in user code.  */
+  if (0)
+     goto yyerrorlab;
+#endif
+
+yyvsp -= yylen;
+  yyssp -= yylen;
+  yystate = *yyssp;
+  goto yyerrlab1;
+
+
+/*-------------------------------------------------------------.
+| yyerrlab1 -- common code for both syntax error and YYERROR.  |
+`-------------------------------------------------------------*/
 yyerrlab1:
   yyerrstatus = 3;      /* Each real token shifted decrements this.  */
 
@@ -1859,22 +1880,22 @@ yyerrlab1:
       if (yyssp == yyss)
         YYABORT;
 
-      YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp);
-      yydestruct (yystos[yystate], yyvsp);
-      yyvsp--;
-      yystate = *--yyssp;
 
+      yydestruct ("Error: popping", yystos[yystate], yyvsp);
+      YYPOPSTACK;
+      yystate = *yyssp;
       YY_STACK_PRINT (yyss, yyssp);
     }
 
   if (yyn == YYFINAL)
     YYACCEPT;
 
-  YYDPRINTF ((stderr, "Shifting error token, "));
-
   *++yyvsp = yylval;
 
 
+  /* Shift the error token. */
+  YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp);
+
   yystate = yyn;
   goto yynewstate;
 
@@ -1890,6 +1911,9 @@ yyacceptlab:
 | yyabortlab -- YYABORT comes here.  |
 `-----------------------------------*/
 yyabortlab:
+  yydestruct ("Error: discarding lookahead",
+              yytoken, &yylval);
+  yychar = YYEMPTY;
   yyresult = 1;
   goto yyreturn;
 
@@ -1925,18 +1949,18 @@ void conf_parse(const char *name)
         sym_init();
         menu_init();
         modules_sym = sym_lookup("MODULES", 0);
-        rootmenu.prompt = menu_add_prop(P_MENU, "BusyBox Configuration", NULL, NULL);
+        rootmenu.prompt = menu_add_prompt(P_MENU, "Linux Kernel Configuration", NULL);
 
-        //zconfdebug = 1;
+#if YYDEBUG
+        if (getenv("ZCONF_DEBUG"))
+                zconfdebug = 1;
+#endif
         zconfparse();
         if (zconfnerrs)
                 exit(1);
         menu_finalize(&rootmenu);
         for_all_symbols(i, sym) {
-                if (!(sym->flags & SYMBOL_CHECKED) && sym_check_deps(sym))
-                        printf("\n");
-                else
-                        sym->flags |= SYMBOL_CHECK_DONE;
+                sym_check_deps(sym);
         }
 
         sym_change_count = 1;
@@ -1951,20 +1975,25 @@ const char *zconf_tokenname(int token)
         case T_ENDCHOICE:       return "endchoice";
         case T_IF:              return "if";
         case T_ENDIF:           return "endif";
+        case T_DEPENDS:         return "depends";
         }
         return "<token>";
 }
 
-static bool zconf_endtoken(int token, int starttoken, int endtoken)
+static bool zconf_endtoken(struct kconf_id *id, int starttoken, int endtoken)
 {
-        if (token != endtoken) {
-                zconfprint("unexpected '%s' within %s block", zconf_tokenname(token), zconf_tokenname(starttoken));
+        if (id->token != endtoken) {
+                zconf_error("unexpected '%s' within %s block",
+                        kconf_id_strings + id->name, zconf_tokenname(starttoken));
                 zconfnerrs++;
                 return false;
         }
         if (current_menu->file != current_file) {
-                zconfprint("'%s' in different file than '%s'", zconf_tokenname(token), zconf_tokenname(starttoken));
-                zconfprint("location of the '%s'", zconf_tokenname(starttoken));
+                zconf_error("'%s' in different file than '%s'",
+                        kconf_id_strings + id->name, zconf_tokenname(starttoken));
+                fprintf(stderr, "%s:%d: location of the '%s'\n",
+                        current_menu->file->name, current_menu->lineno,
+                        zconf_tokenname(starttoken));
                 zconfnerrs++;
                 return false;
         }
@@ -1975,7 +2004,19 @@ static void zconfprint(const char *err, ...)
 {
         va_list ap;
 
-        fprintf(stderr, "%s:%d: ", zconf_curname(), zconf_lineno() + 1);
+        fprintf(stderr, "%s:%d: ", zconf_curname(), zconf_lineno());
+        va_start(ap, err);
+        vfprintf(stderr, err, ap);
+        va_end(ap);
+        fprintf(stderr, "\n");
+}
+
+static void zconf_error(const char *err, ...)
+{
+        va_list ap;
+
+        zconfnerrs++;
+        fprintf(stderr, "%s:%d: ", zconf_curname(), zconf_lineno());
         va_start(ap, err);
         vfprintf(stderr, err, ap);
         va_end(ap);
@@ -1984,7 +2025,9 @@ static void zconfprint(const char *err, ...)
 
 static void zconferror(const char *err)
 {
+#if YYDEBUG
         fprintf(stderr, "%s:%d: %s\n", zconf_curname(), zconf_lineno() + 1, err);
+#endif
 }
 
 void print_quoted_string(FILE *out, const char *str)
diff --git a/scripts/config/zconf.y b/scripts/kconfig/zconf.y
index 5ebaf0a78..1f61fba6a 100644
--- a/scripts/config/zconf.y
+++ b/scripts/kconfig/zconf.y
@@ -11,6 +11,11 @@
 #include <string.h>
 #include <stdbool.h>
 
+#define LKC_DIRECT_LINK
+#include "lkc.h"
+
+#include "zconf.hash.c"
+
 #define printd(mask, fmt...) if (cdebug & (mask)) printf(fmt)
 
 #define PRINTD          0x0001
@@ -20,61 +25,59 @@ int cdebug = PRINTD;
 
 extern int zconflex(void);
 static void zconfprint(const char *err, ...);
+static void zconf_error(const char *err, ...);
 static void zconferror(const char *err);
-static bool zconf_endtoken(int token, int starttoken, int endtoken);
+static bool zconf_endtoken(struct kconf_id *id, int starttoken, int endtoken);
 
 struct symbol *symbol_hash[257];
 
 static struct menu *current_menu, *current_entry;
 
+#define YYDEBUG 0
+#if YYDEBUG
 #define YYERROR_VERBOSE
+#endif
 %}
-%expect 40
+%expect 26
 
 %union
 {
-        int token;
         char *string;
+        struct file *file;
         struct symbol *symbol;
         struct expr *expr;
         struct menu *menu;
+        struct kconf_id *id;
 }
 
-%token T_MAINMENU
-%token T_MENU
-%token T_ENDMENU
-%token T_SOURCE
-%token T_CHOICE
-%token T_ENDCHOICE
-%token T_COMMENT
-%token T_CONFIG
-%token T_MENUCONFIG
-%token T_HELP
+%token <id>T_MAINMENU
+%token <id>T_MENU
+%token <id>T_ENDMENU
+%token <id>T_SOURCE
+%token <id>T_CHOICE
+%token <id>T_ENDCHOICE
+%token <id>T_COMMENT
+%token <id>T_CONFIG
+%token <id>T_MENUCONFIG
+%token <id>T_HELP
 %token <string> T_HELPTEXT
-%token T_IF
-%token T_ENDIF
-%token T_DEPENDS
-%token T_REQUIRES
-%token T_OPTIONAL
-%token T_PROMPT
-%token T_DEFAULT
-%token T_TRISTATE
-%token T_DEF_TRISTATE
-%token T_BOOLEAN
-%token T_DEF_BOOLEAN
-%token T_STRING
-%token T_INT
-%token T_HEX
+%token <id>T_IF
+%token <id>T_ENDIF
+%token <id>T_DEPENDS
+%token <id>T_REQUIRES
+%token <id>T_OPTIONAL
+%token <id>T_PROMPT
+%token <id>T_TYPE
+%token <id>T_DEFAULT
+%token <id>T_SELECT
+%token <id>T_RANGE
+%token <id>T_ON
 %token <string> T_WORD
 %token <string> T_WORD_QUOTE
 %token T_UNEQUAL
-%token T_EOF
-%token T_EOL
 %token T_CLOSE_PAREN
 %token T_OPEN_PAREN
-%token T_ON
-%token T_SELECT
-%token T_RANGE
+%token T_EOL
 
 %left T_OR
 %left T_AND
@@ -82,38 +85,54 @@ static struct menu *current_menu, *current_entry;
 %nonassoc T_NOT
 
 %type <string> prompt
-%type <string> source
 %type <symbol> symbol
 %type <expr> expr
 %type <expr> if_expr
-%type <token> end
+%type <id> end
+%type <id> option_name
+%type <menu> if_entry menu_entry choice_entry
+
+%destructor {
+        fprintf(stderr, "%s:%d: missing end statement for this entry\n",
+                $$->file->name, $$->lineno);
+        if (current_menu == $$)
+                menu_end_menu();
+} if_entry menu_entry choice_entry
 
-%{
-#define LKC_DIRECT_LINK
-#include "lkc.h"
-%}
 %%
-input:    /* empty */
-        | input block
+input: stmt_list;
+
+stmt_list:
+          /* empty */
+        | stmt_list common_stmt
+        | stmt_list choice_stmt
+        | stmt_list menu_stmt
+        | stmt_list T_MAINMENU prompt nl
+        | stmt_list end                 { zconf_error("unexpected end statement"); }
+        | stmt_list T_WORD error T_EOL  { zconf_error("unknown statement \"%s\"", $2); }
+        | stmt_list option_name error T_EOL
+{
+        zconf_error("unexpected option \"%s\"", kconf_id_strings + $2->name);
+}
+        | stmt_list error T_EOL         { zconf_error("invalid statement"); }
 ;
 
-block:    common_block
-        | choice_stmt
-        | menu_stmt
-        | T_MAINMENU prompt nl_or_eof
-        | T_ENDMENU             { zconfprint("unexpected 'endmenu' statement"); }
-        | T_ENDIF               { zconfprint("unexpected 'endif' statement"); }
-        | T_ENDCHOICE           { zconfprint("unexpected 'endchoice' statement"); }
-        | error nl_or_eof       { zconfprint("syntax error"); yyerrok; }
+option_name:
+        T_DEPENDS | T_PROMPT | T_TYPE | T_SELECT | T_OPTIONAL | T_RANGE | T_DEFAULT
 ;
 
-common_block:
-          if_stmt
+common_stmt:
+          T_EOL
+        | if_stmt
         | comment_stmt
         | config_stmt
         | menuconfig_stmt
         | source_stmt
-        | nl_or_eof
+;
+
+option_error:
+          T_WORD error T_EOL            { zconf_error("unknown option \"%s\"", $1); }
+        | error T_EOL                   { zconf_error("invalid option"); }
 ;
 
 
@@ -156,51 +175,16 @@ config_option_list:
         | config_option_list config_option
         | config_option_list depends
         | config_option_list help
+        | config_option_list option_error
         | config_option_list T_EOL
 ;
 
-config_option: T_TRISTATE prompt_stmt_opt T_EOL
+config_option: T_TYPE prompt_stmt_opt T_EOL
 {
-        menu_set_type(S_TRISTATE);
-        printd(DEBUG_PARSE, "%s:%d:tristate\n", zconf_curname(), zconf_lineno());
-};
-
-config_option: T_DEF_TRISTATE expr if_expr T_EOL
-{
-        menu_add_expr(P_DEFAULT, $2, $3);
-        menu_set_type(S_TRISTATE);
-        printd(DEBUG_PARSE, "%s:%d:def_boolean\n", zconf_curname(), zconf_lineno());
-};
-
-config_option: T_BOOLEAN prompt_stmt_opt T_EOL
-{
-        menu_set_type(S_BOOLEAN);
-        printd(DEBUG_PARSE, "%s:%d:boolean\n", zconf_curname(), zconf_lineno());
-};
-
-config_option: T_DEF_BOOLEAN expr if_expr T_EOL
-{
-        menu_add_expr(P_DEFAULT, $2, $3);
-        menu_set_type(S_BOOLEAN);
-        printd(DEBUG_PARSE, "%s:%d:def_boolean\n", zconf_curname(), zconf_lineno());
-};
-
-config_option: T_INT prompt_stmt_opt T_EOL
-{
-        menu_set_type(S_INT);
-        printd(DEBUG_PARSE, "%s:%d:int\n", zconf_curname(), zconf_lineno());
-};
-
-config_option: T_HEX prompt_stmt_opt T_EOL
-{
-        menu_set_type(S_HEX);
-        printd(DEBUG_PARSE, "%s:%d:hex\n", zconf_curname(), zconf_lineno());
-};
-
-config_option: T_STRING prompt_stmt_opt T_EOL
-{
-        menu_set_type(S_STRING);
-        printd(DEBUG_PARSE, "%s:%d:string\n", zconf_curname(), zconf_lineno());
+        menu_set_type($1->stype);
+        printd(DEBUG_PARSE, "%s:%d:type(%u)\n",
+                zconf_curname(), zconf_lineno(),
+                $1->stype);
 };
 
 config_option: T_PROMPT prompt if_expr T_EOL
@@ -212,7 +196,11 @@ config_option: T_PROMPT prompt if_expr T_EOL
 config_option: T_DEFAULT expr if_expr T_EOL
 {
         menu_add_expr(P_DEFAULT, $2, $3);
-        printd(DEBUG_PARSE, "%s:%d:default\n", zconf_curname(), zconf_lineno());
+        if ($1->stype != S_UNKNOWN)
+                menu_set_type($1->stype);
+        printd(DEBUG_PARSE, "%s:%d:default(%u)\n",
+                zconf_curname(), zconf_lineno(),
+                $1->stype);
 };
 
 config_option: T_SELECT T_WORD if_expr T_EOL
@@ -240,8 +228,7 @@ choice: T_CHOICE T_EOL
 
 choice_entry: choice choice_option_list
 {
-        menu_end_entry();
-        menu_add_menu();
+        $$ = menu_add_menu();
 };
 
 choice_end: end
@@ -252,13 +239,8 @@ choice_end: end
         }
 };
 
-choice_stmt:
-          choice_entry choice_block choice_end
-        | choice_entry choice_block
-{
-        printf("%s:%d: missing 'endchoice' for this 'choice' statement\n", current_menu->file->name, current_menu->lineno);
-        zconfnerrs++;
-};
+choice_stmt: choice_entry choice_block choice_end
+;
 
 choice_option_list:
           /* empty */
@@ -266,6 +248,7 @@ choice_option_list:
         | choice_option_list depends
         | choice_option_list help
         | choice_option_list T_EOL
+        | choice_option_list option_error
 ;
 
 choice_option: T_PROMPT prompt if_expr T_EOL
@@ -274,16 +257,15 @@ choice_option: T_PROMPT prompt if_expr T_EOL
         printd(DEBUG_PARSE, "%s:%d:prompt\n", zconf_curname(), zconf_lineno());
 };
 
-choice_option: T_TRISTATE prompt_stmt_opt T_EOL
-{
-        menu_set_type(S_TRISTATE);
-        printd(DEBUG_PARSE, "%s:%d:tristate\n", zconf_curname(), zconf_lineno());
-};
-
-choice_option: T_BOOLEAN prompt_stmt_opt T_EOL
+choice_option: T_TYPE prompt_stmt_opt T_EOL
 {
-        menu_set_type(S_BOOLEAN);
-        printd(DEBUG_PARSE, "%s:%d:boolean\n", zconf_curname(), zconf_lineno());
+        if ($1->stype == S_BOOLEAN || $1->stype == S_TRISTATE) {
+                menu_set_type($1->stype);
+                printd(DEBUG_PARSE, "%s:%d:type(%u)\n",
+                        zconf_curname(), zconf_lineno(),
+                        $1->stype);
+        } else
+                YYERROR;
 };
 
 choice_option: T_OPTIONAL T_EOL
@@ -294,24 +276,27 @@ choice_option: T_OPTIONAL T_EOL
 
 choice_option: T_DEFAULT T_WORD if_expr T_EOL
 {
-        menu_add_symbol(P_DEFAULT, sym_lookup($2, 0), $3);
-        printd(DEBUG_PARSE, "%s:%d:default\n", zconf_curname(), zconf_lineno());
+        if ($1->stype == S_UNKNOWN) {
+                menu_add_symbol(P_DEFAULT, sym_lookup($2, 0), $3);
+                printd(DEBUG_PARSE, "%s:%d:default\n",
+                        zconf_curname(), zconf_lineno());
+        } else
+                YYERROR;
 };
 
 choice_block:
           /* empty */
-        | choice_block common_block
+        | choice_block common_stmt
 ;
 
 /* if entry */
 
-if: T_IF expr T_EOL
+if_entry: T_IF expr nl
 {
         printd(DEBUG_PARSE, "%s:%d:if\n", zconf_curname(), zconf_lineno());
         menu_add_entry(NULL);
         menu_add_dep($2);
-        menu_end_entry();
-        menu_add_menu();
+        $$ = menu_add_menu();
 };
 
 if_end: end
@@ -322,17 +307,12 @@ if_end: end
         }
 };
 
-if_stmt:
-          if if_block if_end
-        | if if_block
-{
-        printf("%s:%d: missing 'endif' for this 'if' statement\n", current_menu->file->name, current_menu->lineno);
-        zconfnerrs++;
-};
+if_stmt: if_entry if_block if_end
+;
 
 if_block:
           /* empty */
-        | if_block common_block
+        | if_block common_stmt
         | if_block menu_stmt
         | if_block choice_stmt
 ;
@@ -342,14 +322,13 @@ if_block:
 menu: T_MENU prompt T_EOL
 {
         menu_add_entry(NULL);
-        menu_add_prop(P_MENU, $2, NULL, NULL);
+        menu_add_prompt(P_MENU, $2, NULL);
         printd(DEBUG_PARSE, "%s:%d:menu\n", zconf_curname(), zconf_lineno());
 };
 
 menu_entry: menu depends_list
 {
-        menu_end_entry();
-        menu_add_menu();
+        $$ = menu_add_menu();
 };
 
 menu_end: end
@@ -360,31 +339,20 @@ menu_end: end
         }
 };
 
-menu_stmt:
-          menu_entry menu_block menu_end
-        | menu_entry menu_block
-{
-        printf("%s:%d: missing 'endmenu' for this 'menu' statement\n", current_menu->file->name, current_menu->lineno);
-        zconfnerrs++;
-};
+menu_stmt: menu_entry menu_block menu_end
+;
 
 menu_block:
           /* empty */
-        | menu_block common_block
+        | menu_block common_stmt
         | menu_block menu_stmt
         | menu_block choice_stmt
-        | menu_block error T_EOL                { zconfprint("invalid menu option"); yyerrok; }
 ;
 
-source: T_SOURCE prompt T_EOL
+source_stmt: T_SOURCE prompt T_EOL
 {
-        $$ = $2;
         printd(DEBUG_PARSE, "%s:%d:source %s\n", zconf_curname(), zconf_lineno(), $2);
-};
-
-source_stmt: source
-{
-        zconf_nextfile($1);
+        zconf_nextfile($2);
 };
 
 /* comment entry */
@@ -392,7 +360,7 @@ source_stmt: source
 comment: T_COMMENT prompt T_EOL
 {
         menu_add_entry(NULL);
-        menu_add_prop(P_COMMENT, $2, NULL, NULL);
+        menu_add_prompt(P_COMMENT, $2, NULL);
         printd(DEBUG_PARSE, "%s:%d:comment\n", zconf_curname(), zconf_lineno());
 };
 
@@ -416,9 +384,11 @@ help: help_start T_HELPTEXT
 
 /* depends option */
 
-depends_list:     /* empty */
-                | depends_list depends
-                | depends_list T_EOL
+depends_list:
+          /* empty */
+        | depends_list depends
+        | depends_list T_EOL
+        | depends_list option_error
 ;
 
 depends: T_DEPENDS T_ON expr T_EOL
@@ -443,20 +413,22 @@ prompt_stmt_opt:
           /* empty */
         | prompt if_expr
 {
-        menu_add_prop(P_PROMPT, $1, NULL, $2);
+        menu_add_prompt(P_PROMPT, $1, $2);
 };
 
 prompt:   T_WORD
         | T_WORD_QUOTE
 ;
 
-end:      T_ENDMENU nl_or_eof   { $$ = T_ENDMENU; }
-        | T_ENDCHOICE nl_or_eof { $$ = T_ENDCHOICE; }
-        | T_ENDIF nl_or_eof     { $$ = T_ENDIF; }
+end:      T_ENDMENU T_EOL       { $$ = $1; }
+        | T_ENDCHOICE T_EOL     { $$ = $1; }
+        | T_ENDIF T_EOL         { $$ = $1; }
 ;
 
-nl_or_eof:
-        T_EOL | T_EOF;
+nl:
+          T_EOL
+        | nl T_EOL
+;
 
 if_expr:  /* empty */                   { $$ = NULL; }
         | T_IF expr                     { $$ = $2; }
@@ -487,18 +459,18 @@ void conf_parse(const char *name)
         sym_init();
         menu_init();
         modules_sym = sym_lookup("MODULES", 0);
-        rootmenu.prompt = menu_add_prop(P_MENU, "BusyBox Configuration", NULL, NULL);
+        rootmenu.prompt = menu_add_prompt(P_MENU, "Linux Kernel Configuration", NULL);
 
-        //zconfdebug = 1;
+#if YYDEBUG
+        if (getenv("ZCONF_DEBUG"))
+                zconfdebug = 1;
+#endif
         zconfparse();
         if (zconfnerrs)
                 exit(1);
         menu_finalize(&rootmenu);
         for_all_symbols(i, sym) {
-                if (!(sym->flags & SYMBOL_CHECKED) && sym_check_deps(sym))
-                        printf("\n");
-                else
-                        sym->flags |= SYMBOL_CHECK_DONE;
+                sym_check_deps(sym);
         }
 
         sym_change_count = 1;
@@ -513,20 +485,25 @@ const char *zconf_tokenname(int token)
         case T_ENDCHOICE:       return "endchoice";
         case T_IF:              return "if";
         case T_ENDIF:           return "endif";
+        case T_DEPENDS:         return "depends";
         }
         return "<token>";
 }
 
-static bool zconf_endtoken(int token, int starttoken, int endtoken)
+static bool zconf_endtoken(struct kconf_id *id, int starttoken, int endtoken)
 {
-        if (token != endtoken) {
-                zconfprint("unexpected '%s' within %s block", zconf_tokenname(token), zconf_tokenname(starttoken));
+        if (id->token != endtoken) {
+                zconf_error("unexpected '%s' within %s block",
+                        kconf_id_strings + id->name, zconf_tokenname(starttoken));
                 zconfnerrs++;
                 return false;
         }
         if (current_menu->file != current_file) {
-                zconfprint("'%s' in different file than '%s'", zconf_tokenname(token), zconf_tokenname(starttoken));
-                zconfprint("location of the '%s'", zconf_tokenname(starttoken));
+                zconf_error("'%s' in different file than '%s'",
+                        kconf_id_strings + id->name, zconf_tokenname(starttoken));
+                fprintf(stderr, "%s:%d: location of the '%s'\n",
+                        current_menu->file->name, current_menu->lineno,
+                        zconf_tokenname(starttoken));
                 zconfnerrs++;
                 return false;
         }
@@ -537,7 +514,19 @@ static void zconfprint(const char *err, ...)
 {
         va_list ap;
 
-        fprintf(stderr, "%s:%d: ", zconf_curname(), zconf_lineno() + 1);
+        fprintf(stderr, "%s:%d: ", zconf_curname(), zconf_lineno());
+        va_start(ap, err);
+        vfprintf(stderr, err, ap);
+        va_end(ap);
+        fprintf(stderr, "\n");
+}
+
+static void zconf_error(const char *err, ...)
+{
+        va_list ap;
+
+        zconfnerrs++;
+        fprintf(stderr, "%s:%d: ", zconf_curname(), zconf_lineno());
         va_start(ap, err);
         vfprintf(stderr, err, ap);
         va_end(ap);
@@ -546,7 +535,9 @@ static void zconfprint(const char *err, ...)
 
 static void zconferror(const char *err)
 {
+#if YYDEBUG
         fprintf(stderr, "%s:%d: %s\n", zconf_curname(), zconf_lineno() + 1, err);
+#endif
 }
 
 void print_quoted_string(FILE *out, const char *str)
diff --git a/scripts/config/mkconfigs b/scripts/mkconfigs
index fda9de72f..fda9de72f 100755
--- a/scripts/config/mkconfigs
+++ b/scripts/mkconfigs
diff --git a/scripts/trylink b/scripts/trylink
new file mode 100755
index 000000000..dfe282db5
--- /dev/null
+++ b/scripts/trylink
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+debug=false
+
+function try {
+    added="$1"
+    shift
+    $debug && echo "Trying: $* $added"
+    "$@" $added >/dev/null 2>&1 \
+    && exit 0
+}
+
+try "" "$@"
+try "-lm" "$@"
+try "-lcrypt" "$@"
+try "-Wl,--start-group -lcrypt -lm -Wl,--end-group" "$@"
+# It failed. Rerun & let people see the error messages
+"$@" $added
diff --git a/scripts/usage.c b/scripts/usage.c
index 373642cd6..adb290e4d 100644
--- a/scripts/usage.c
+++ b/scripts/usage.c
@@ -1,11 +1,13 @@
 /* vi: set sw=4 ts=4: */
 #include <unistd.h>
-#include "busybox.h"
+
+#include "../include/autoconf.h"
+#include "../include/busybox.h"
 
 static const char usage_messages[] =
 #define MAKE_USAGE
-#include "usage.h"
-#include "applets.h"
+#include "../include/usage.h"
+#include "../include/applets.h"
 ;
 
 int main(void)
diff --git a/scripts/usage_compressed b/scripts/usage_compressed
index 8e2228af2..ab164aa12 100644..100755
--- a/scripts/usage_compressed
+++ b/scripts/usage_compressed
@@ -1,13 +1,19 @@
 #!/bin/sh
 
-loc="$1"
+target="$1"
+loc="$2"
 
+test "$target" || exit 1
 test "$loc" || loc=.
 test -x "$loc/usage" || exit 1
+test "$SED" || SED=sed
+
+sz=`"$loc/usage" | wc -c` || exit 1
+
+exec >"$target"
 
 echo 'static const char packed_usage[] = '
-"$loc"/usage | bzip2 -1 | od -v -t x1 \
-| $SED -e 's/^[^ ]*//' -e 's/ \(..\)/\\x\1/g' -e 's/^\(.*\)$/"\1"/' || exit 1
+"$loc/usage" | bzip2 -1 | od -v -t x1 \
+| $SED -e 's/^[^ ]*//' -e 's/ \(..\)/\\x\1/g' -e 's/^\(.*\)$/"\1"/'
 echo ';'
-sz=`"$loc"/usage | wc -c` || exit 1
 echo '#define SIZEOF_usage_messages' `expr 0 + $sz`