9 files changed, 63 insertions, 39 deletions

diff --git a/scripts/kconfig/.gitignore b/scripts/kconfig/.gitignore
index b49584c932cc..6a36a76e6606 100644
--- a/scripts/kconfig/.gitignore
+++ b/scripts/kconfig/.gitignore
@@ -8,6 +8,9 @@ lex.*.c
 zconf.hash.c
 *.moc
 lkc_defs.h
+gconf.glade.h
+*.pot
+*.mo
 
 #
 # configuration programs
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
index fa8c2dd9c983..5ddf8becd7a2 100644
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@ -83,7 +83,7 @@ help:
         @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  '  silentoldconfig - Same as oldconfig, but quietly'
+        @echo  '  silentoldconfig - Same as oldconfig, but quietly, additionally update deps'
         @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'
@@ -104,7 +104,7 @@ HOST_EXTRACFLAGS += -DLOCALE
 # ===========================================================================
 # Shared Makefile for the various kconfig executables:
 # conf:   Used for defconfig, oldconfig and related targets
-# mconf:  Used for the mconfig target.
+# mconf:  Used for the menuconfig target
 #         Utilizes the lxdialog package
 # qconf:  Used for the xconfig target
 #         Based on QT which needs to be installed to compile it
diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c
index d190092c3b6e..3baaaecd6b13 100644
--- a/scripts/kconfig/conf.c
+++ b/scripts/kconfig/conf.c
@@ -498,14 +498,15 @@ int main(int ac, char **av)
         conf_parse(name);
         //zconfdump(stdout);
         if (sync_kconfig) {
-                if (stat(".config", &tmpstat)) {
+                name = conf_get_configname();
+                if (stat(name, &tmpstat)) {
                         fprintf(stderr, _("***\n"
                                 "*** You have not yet configured your kernel!\n"
-                                "*** (missing kernel .config file)\n"
+                                "*** (missing kernel config file \"%s\")\n"
                                 "***\n"
                                 "*** Please run some configurator (e.g. \"make oldconfig\" or\n"
                                 "*** \"make menuconfig\" or \"make xconfig\").\n"
-                                "***\n"));
+                                "***\n"), name);
                         exit(1);
                 }
         }
diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c
index 273d73888f9d..a04da3459f0f 100644
--- a/scripts/kconfig/confdata.c
+++ b/scripts/kconfig/confdata.c
@@ -41,6 +41,13 @@ const char *conf_get_configname(void)
         return name ? name : ".config";
 }
 
+const char *conf_get_autoconfig_name(void)
+{
+        char *name = getenv("KCONFIG_AUTOCONFIG");
+
+        return name ? name : "include/config/auto.conf";
+}
+
 static char *conf_expand_value(const char *in)
 {
         struct symbol *sym;
@@ -555,15 +562,14 @@ int conf_write(const char *name)
 
 int conf_split_config(void)
 {
-        char *name, path[128];
+        const char *name;
+        char path[128];
         char *s, *d, c;
         struct symbol *sym;
         struct stat sb;
         int res, i, fd;
 
-        name = getenv("KCONFIG_AUTOCONFIG");
-        if (!name)
-                name = "include/config/auto.conf";
+        name = conf_get_autoconfig_name();
         conf_read_simple(name, S_DEF_AUTO);
 
         if (chdir("include/config"))
@@ -670,7 +676,7 @@ int conf_write_autoconf(void)
 {
         struct symbol *sym;
         const char *str;
-        char *name;
+        const char *name;
         FILE *out, *out_h;
         time_t now;
         int i, l;
@@ -773,9 +779,7 @@ int conf_write_autoconf(void)
                 name = "include/linux/autoconf.h";
         if (rename(".tmpconfig.h", name))
                 return 1;
-        name = getenv("KCONFIG_AUTOCONFIG");
-        if (!name)
-                name = "include/config/auto.conf";
+        name = conf_get_autoconfig_name();
         /*
          * This must be the last step, kbuild has a dependency on auto.conf
          * and this marks the successful completion of the previous steps.
diff --git a/scripts/kconfig/lkc.h b/scripts/kconfig/lkc.h
index 4a9af6f7886b..f379b0bf8c9e 100644
--- a/scripts/kconfig/lkc.h
+++ b/scripts/kconfig/lkc.h
@@ -74,6 +74,7 @@ char *zconf_curname(void);
 
 /* confdata.c */
 const char *conf_get_configname(void);
+const char *conf_get_autoconfig_name(void);
 char *conf_get_default_confname(void);
 void sym_set_change_count(int count);
 void sym_add_change_count(int count);
diff --git a/scripts/kconfig/lxdialog/checklist.c b/scripts/kconfig/lxdialog/checklist.c
index b2a878c936d6..bcc6f19c3a35 100644
--- a/scripts/kconfig/lxdialog/checklist.c
+++ b/scripts/kconfig/lxdialog/checklist.c
@@ -41,7 +41,8 @@ static void print_item(WINDOW * win, int choice, int selected)
         wmove(win, choice, check_x);
         wattrset(win, selected ? dlg.check_selected.atr
                  : dlg.check.atr);
-        wprintw(win, "(%c)", item_is_tag('X') ? 'X' : ' ');
+        if (!item_is_tag(':'))
+                wprintw(win, "(%c)", item_is_tag('X') ? 'X' : ' ');
 
         wattrset(win, selected ? dlg.tag_selected.atr : dlg.tag.atr);
         mvwaddch(win, choice, item_x, item_str()[0]);
diff --git a/scripts/kconfig/mconf.c b/scripts/kconfig/mconf.c
index 6841e95c0989..3bcacb4bfd3a 100644
--- a/scripts/kconfig/mconf.c
+++ b/scripts/kconfig/mconf.c
@@ -732,7 +732,12 @@ static void conf_choice(struct menu *menu)
                 for (child = menu->list; child; child = child->next) {
                         if (!menu_is_visible(child))
                                 continue;
-                        item_make("%s", _(menu_get_prompt(child)));
+                        if (child->sym)
+                                item_make("%s", _(menu_get_prompt(child)));
+                        else {
+                                item_make("*** %s ***", _(menu_get_prompt(child)));
+                                item_set_tag(':');
+                        }
                         item_set_data(child);
                         if (child->sym == active)
                                 item_set_selected(1);
@@ -748,6 +753,9 @@ static void conf_choice(struct menu *menu)
                 case 0:
                         if (selected) {
                                 child = item_data();
+                                if (!child->sym)
+                                        break;
+
                                 sym_set_tristate_value(child->sym, yes);
                         }
                         return;
diff --git a/scripts/kconfig/qconf.cc b/scripts/kconfig/qconf.cc
index 5d0fd38b089b..ce7d508c7520 100644
--- a/scripts/kconfig/qconf.cc
+++ b/scripts/kconfig/qconf.cc
@@ -5,6 +5,7 @@
 
 #include <qapplication.h>
 #include <qmainwindow.h>
+#include <qdesktopwidget.h>
 #include <qtoolbar.h>
 #include <qlayout.h>
 #include <qvbox.h>
@@ -297,10 +298,10 @@ void ConfigLineEdit::show(ConfigItem* i)
 void ConfigLineEdit::keyPressEvent(QKeyEvent* e)
 {
         switch (e->key()) {
-        case Key_Escape:
+        case Qt::Key_Escape:
                 break;
-        case Key_Return:
-        case Key_Enter:
+        case Qt::Key_Return:
+        case Qt::Key_Enter:
                 sym_set_string_value(item->menu->sym, text().latin1());
                 parent()->updateList(item);
                 break;
@@ -639,7 +640,7 @@ void ConfigList::keyPressEvent(QKeyEvent* ev)
         struct menu *menu;
         enum prop_type type;
 
-        if (ev->key() == Key_Escape && mode != fullMode && mode != listMode) {
+        if (ev->key() == Qt::Key_Escape && mode != fullMode && mode != listMode) {
                 emit parentSelected();
                 ev->accept();
                 return;
@@ -652,8 +653,8 @@ void ConfigList::keyPressEvent(QKeyEvent* ev)
         item = (ConfigItem*)i;
 
         switch (ev->key()) {
-        case Key_Return:
-        case Key_Enter:
+        case Qt::Key_Return:
+        case Qt::Key_Enter:
                 if (item->goParent) {
                         emit parentSelected();
                         break;
@@ -667,16 +668,16 @@ void ConfigList::keyPressEvent(QKeyEvent* ev)
                         emit menuSelected(menu);
                         break;
                 }
-        case Key_Space:
+        case Qt::Key_Space:
                 changeValue(item);
                 break;
-        case Key_N:
+        case Qt::Key_N:
                 setValue(item, no);
                 break;
-        case Key_M:
+        case Qt::Key_M:
                 setValue(item, mod);
                 break;
-        case Key_Y:
+        case Qt::Key_Y:
                 setValue(item, yes);
                 break;
         default:
@@ -920,7 +921,7 @@ void ConfigView::updateListAll(void)
 }
 
 ConfigInfoView::ConfigInfoView(QWidget* parent, const char *name)
-        : Parent(parent, name), menu(0), sym(0)
+        : Parent(parent, name), sym(0), menu(0)
 {
         if (name) {
                 configSettings->beginGroup(name);
@@ -1199,7 +1200,7 @@ ConfigSearchWindow::ConfigSearchWindow(ConfigMainWindow* parent, const char *nam
         layout1->addLayout(layout2);
 
         split = new QSplitter(this);
-        split->setOrientation(QSplitter::Vertical);
+        split->setOrientation(Qt::Vertical);
         list = new ConfigView(split, name);
         list->list->mode = listMode;
         info = new ConfigInfoView(split, name);
@@ -1275,7 +1276,7 @@ ConfigMainWindow::ConfigMainWindow(void)
         int x, y, width, height;
         char title[256];
 
-        QWidget *d = configApp->desktop();
+        QDesktopWidget *d = configApp->desktop();
         snprintf(title, sizeof(title), _("Linux Kernel v%s Configuration"),
                 getenv("KERNELVERSION"));
         setCaption(title);
@@ -1290,14 +1291,14 @@ ConfigMainWindow::ConfigMainWindow(void)
                 move(x, y);
 
         split1 = new QSplitter(this);
-        split1->setOrientation(QSplitter::Horizontal);
+        split1->setOrientation(Qt::Horizontal);
         setCentralWidget(split1);
 
         menuView = new ConfigView(split1, "menu");
         menuList = menuView->list;
 
         split2 = new QSplitter(split1);
-        split2->setOrientation(QSplitter::Vertical);
+        split2->setOrientation(Qt::Vertical);
 
         // create config tree
         configView = new ConfigView(split2, "config");
@@ -1315,18 +1316,18 @@ ConfigMainWindow::ConfigMainWindow(void)
         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);
+        QAction *quitAction = new QAction("Quit", _("&Quit"), Qt::CTRL + Qt::Key_Q, this);
           connect(quitAction, SIGNAL(activated()), SLOT(close()));
-        QAction *loadAction = new QAction("Load", QPixmap(xpm_load), _("&Load"), CTRL+Key_L, this);
+        QAction *loadAction = new QAction("Load", QPixmap(xpm_load), _("&Load"), Qt::CTRL + Qt::Key_L, this);
           connect(loadAction, SIGNAL(activated()), SLOT(loadConfig()));
-        saveAction = new QAction("Save", QPixmap(xpm_save), _("&Save"), CTRL+Key_S, this);
+        saveAction = new QAction("Save", QPixmap(xpm_save), _("&Save"), Qt::CTRL + Qt::Key_S, this);
           connect(saveAction, SIGNAL(activated()), SLOT(saveConfig()));
         conf_set_changed_callback(conf_changed);
         // Set saveAction's initial state
         conf_changed();
         QAction *saveAsAction = new QAction("Save As...", _("Save &As..."), 0, this);
           connect(saveAsAction, SIGNAL(activated()), SLOT(saveConfigAs()));
-        QAction *searchAction = new QAction("Find", _("&Find"), CTRL+Key_F, this);
+        QAction *searchAction = new QAction("Find", _("&Find"), Qt::CTRL + Qt::Key_F, this);
           connect(searchAction, SIGNAL(activated()), SLOT(searchConfig()));
         QAction *singleViewAction = new QAction("Single View", QPixmap(xpm_single_view), _("Single View"), 0, this);
           connect(singleViewAction, SIGNAL(activated()), SLOT(showSingleView()));
@@ -1447,7 +1448,7 @@ ConfigMainWindow::ConfigMainWindow(void)
 
 void ConfigMainWindow::loadConfig(void)
 {
-        QString s = QFileDialog::getOpenFileName(".config", NULL, this);
+        QString s = QFileDialog::getOpenFileName(conf_get_configname(), NULL, this);
         if (s.isNull())
                 return;
         if (conf_read(QFile::encodeName(s)))
@@ -1463,7 +1464,7 @@ void ConfigMainWindow::saveConfig(void)
 
 void ConfigMainWindow::saveConfigAs(void)
 {
-        QString s = QFileDialog::getSaveFileName(".config", NULL, this);
+        QString s = QFileDialog::getSaveFileName(conf_get_configname(), NULL, this);
         if (s.isNull())
                 return;
         if (conf_write(QFile::encodeName(s)))
@@ -1524,6 +1525,8 @@ void ConfigMainWindow::setMenuLink(struct menu *menu)
         case fullMode:
                 list = configList;
                 break;
+        default:
+                break;
         }
 
         if (list) {
@@ -1673,6 +1676,9 @@ void ConfigMainWindow::saveSettings(void)
         case fullMode :
                 entry = "full";
                 break;
+
+        default:
+                break;
         }
         configSettings->writeEntry("/listMode", entry);
 
diff --git a/scripts/kconfig/util.c b/scripts/kconfig/util.c
index 3cc9f9369036..b6b2a46af14c 100644
--- a/scripts/kconfig/util.c
+++ b/scripts/kconfig/util.c
@@ -46,8 +46,8 @@ int file_write_dep(const char *name)
                 else
                         fprintf(out, "\t%s\n", file->name);
         }
-        fprintf(out, "\ninclude/config/auto.conf: \\\n"
-                     "\t$(deps_config)\n\n");
+        fprintf(out, "\n%s: \\\n"
+                     "\t$(deps_config)\n\n", conf_get_autoconfig_name());
 
         expr_list_for_each_sym(sym_env_list, e, sym) {
                 struct property *prop;
@@ -61,7 +61,7 @@ int file_write_dep(const char *name)
                 if (!value)
                         value = "";
                 fprintf(out, "ifneq \"$(%s)\" \"%s\"\n", env_sym->name, value);
-                fprintf(out, "include/config/auto.conf: FORCE\n");
+                fprintf(out, "%s: FORCE\n", conf_get_autoconfig_name());
                 fprintf(out, "endif\n");
         }