Look Ma' what I found on my harddisk ...

 o New faster syscalls for 2.1.x, too
 o Upgrade to 2.1.89.

Don't try to run this.  It's flaky as hell.  But feel free to debug ...

1 files changed, 14 insertions, 29 deletions

diff --git a/scripts/tkgen.c b/scripts/tkgen.c
index 15f8f7bfd..dcf025e2e 100644
--- a/scripts/tkgen.c
+++ b/scripts/tkgen.c
@@ -50,6 +50,17 @@
  * Avery Pennarun - Reduced flicker when creating windows, even with "update
  *                  idletasks" hack.
  *
+ * 1997 12 08
+ * Michael Chastain - Remove sound driver special cases.
+ *
+ * 1997 11 15
+ * Michael Chastain - For choice buttons, write values for all options,
+ *                    not just the single chosen one.  This is compatible
+ *                    with 'make config' and 'make oldconfig', and is
+ *                    needed so smart-config dependencies work if the
+ *                    user switches from one configuration method to
+ *                    another.
+ *
  * TO DO:
  *   - clean up - there are useless ifdef's everywhere.
  *   - better comments throughout - C code generating tcl is really cryptic.
@@ -492,9 +503,6 @@ void generate_if_for_outfile(struct kconfig * item,
       printf("} then { write_string $cfg $autocfg %s $%s $notmod }\n",
              item->optionname, item->optionname);
       break;
-    case tok_make:
-      printf("} then { do_make {%s} }\n",item->value);
-      break;
     case tok_choose:
     case tok_choice:
       fprintf(stderr,"Fixme\n");
@@ -677,7 +685,7 @@ void dump_tk_script(struct kconfig *scfg)
   int menu_maxlines = 0;
   struct kconfig * cfg;
   struct kconfig * cfg1 = NULL;
-  char * menulabel;
+  char * menulabel = "tkgen error";
 
   /*
    * Start by assigning menu numbers, and submenu numbers.
@@ -893,25 +901,6 @@ void dump_tk_script(struct kconfig *scfg)
    */
   end_proc(menu_num);
 
-#ifdef ERIC_DONT_DEF
-  /*
-   * Generate the code for configuring the sound driver.  Right now this
-   * cannot be done from the X script, but we insert the menu anyways.
-   */
-  start_proc("Configure sound driver", ++menu_num, TRUE);
-#if 0
-  printf("\tdo_make -C drivers/sound config\n");
-  printf("\techo check_sound_config %d\n",menu_num);
-#endif
-  printf("\tlabel $w.config.f.m0 -bitmap error\n");
-  printf("\tmessage $w.config.f.m1 -width 400 -aspect 300 -text \"The sound drivers cannot as of yet be configured via the X-based interface\" -relief raised\n");
-  printf("\tpack $w.config.f.m0 $w.config.f.m1 -side top -pady 10 -expand on\n");
-  /*
-   * Close out the last menu.
-   */
-  end_proc(menu_num);
-#endif
-
   /*
    * The top level menu also needs an update function.  When we exit a
    * submenu, we may need to disable one or more of the submenus on
@@ -1018,7 +1007,6 @@ void dump_tk_script(struct kconfig *scfg)
 	      printf("\tglobal %s\n", cfg->optionname);
 	    }
 	  /* fall through */
-	case tok_make:
 	case tok_comment:
 	  if (cfg->cond != NULL ) 
 	    generate_if_for_outfile(cfg, cfg->cond);
@@ -1054,9 +1042,10 @@ void dump_tk_script(struct kconfig *scfg)
 		      cfg1 != NULL && cfg1->tok == tok_choice;
 		      cfg1 = cfg1->next)
 		    {
-		      printf("\tif { $%s == \"%s\" } then { write_tristate $cfg $autocfg %s 1 $notmod }\n",
+		      printf("\tif { $%s == \"%s\" } then { write_tristate $cfg $autocfg %s 1 $notmod } else { write_tristate $cfg $autocfg %s 0 $notmod }\n",
 			     cfg->optionname,
 			     cfg1->label,
+			     cfg1->optionname,
 			     cfg1->optionname);
 		    }
 		}
@@ -1078,10 +1067,6 @@ void dump_tk_script(struct kconfig *scfg)
 			 cfg->optionname,
 			 cfg->optionname);
 	        }
-	      else if (cfg->tok == tok_make )
-	        {
-	          printf("\tdo_make {%s}\n",cfg->value);
-	        }
 	      else
 		{
 		  printf("\twrite_tristate $cfg $autocfg %s $%s $notmod\n",