--- a/Launcher.st	Sat Apr 25 21:01:23 1998 +0200
+++ b/Launcher.st	Sat Apr 25 22:36:01 1998 +0200
@@ -3216,7 +3216,7 @@
      warnSTXBox warnUnderscoreBox warnOldStyleBox warnCommonMistakes warnCommonMistakesBox
      warnCompatibility warnCompatibilityBox warnDollarBox
      stcCompilation compilationList stcCompilationOptions stcIncludes stcDefines stcOptions
-     stcLibraries stcLibraryPath cc ccOptions historyLines fullHistoryUpdate catchRedefs keepSourceOptions keepSource  
+     stcLibraries stcLibraryPath cc stc ccOptions historyLines fullHistoryUpdate catchRedefs keepSourceOptions keepSource  
      constantFoldingOptions constantFolding justInTimeCompilation 
      warnEnabler check component oldIndent t supportsJustInTimeCompilation y
      y2 fullDebugSupport yMax
@@ -3274,6 +3274,7 @@
     stcOptions := Compiler stcCompilationOptions asValue.
     ccOptions := Compiler ccCompilationOptions asValue.
     cc := Compiler ccPath asValue.
+    stc := Compiler stcPath asValue.
 
     ObjectFileLoader notNil ifTrue:[
         (t := ObjectFileLoader searchedLibraries) notNil ifTrue:[
@@ -3364,6 +3365,26 @@
             stcCompilation selectionIndex:( stcCompilationOptions indexOf:(Compiler stcCompilation) ifAbsent:2).
 
             component := box 
+                            addLabelledInputField:(resources string:'stc command:')
+                            adjust:#right
+                            on:stc 
+                            tabable:true
+                            separateAtX:0.3.
+            component immediateAccept:true; acceptOnLeave:false; cursorMovementWhenUpdating:#beginOfLine.
+            component preferredExtent:(100 @ component preferredExtent y).
+            canLoadBinaries ifFalse:[component disable].
+
+            component := box 
+                            addLabelledInputField:(resources string:'stc options:')
+                            adjust:#right
+                            on:stcOptions 
+                            tabable:true
+                            separateAtX:0.3.
+            component immediateAccept:true; acceptOnLeave:false; cursorMovementWhenUpdating:#beginOfLine.
+            component preferredExtent:(250 @ component preferredExtent y).
+            canLoadBinaries ifFalse:[component disable].
+
+            component := box 
                             addLabelledInputField:(resources string:'include directories:')
                             adjust:#right
                             on:stcIncludes 
@@ -3387,16 +3408,6 @@
 
 "/        box addVerticalSpace.
 
-            component := box 
-                            addLabelledInputField:(resources string:'stc options:')
-                            adjust:#right
-                            on:stcOptions 
-                            tabable:true
-                            separateAtX:0.3.
-            component immediateAccept:true; acceptOnLeave:false; cursorMovementWhenUpdating:#beginOfLine.
-            component preferredExtent:(250 @ component preferredExtent y).
-            canLoadBinaries ifFalse:[component disable].
-
 "/        box addVerticalSpace.
 
             component := box 
@@ -3406,7 +3417,7 @@
                             tabable:true
                             separateAtX:0.3.
             component immediateAccept:true; acceptOnLeave:false; cursorMovementWhenUpdating:#beginOfLine.
-            component preferredExtent:(250 @ component preferredExtent y).
+            component preferredExtent:(150 @ component preferredExtent y).
             canLoadBinaries ifFalse:[component disable].
 
             component := box 
@@ -3559,6 +3570,9 @@
             Compiler stcCompilationOptions:stcOptions value.
             Compiler ccCompilationOptions:ccOptions value.
             Compiler ccPath:cc value.
+            stc value ~= Compiler stcPath ifTrue:[
+                Compiler stcPath:stc value
+            ]
         ].
         Compiler foldConstants:(constantFoldingOptions at:constantFolding selectionIndex).
 
@@ -5416,5 +5430,5 @@
 !Launcher class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Launcher.st,v 1.332 1998-04-25 17:56:56 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Launcher.st,v 1.333 1998-04-25 20:36:01 cg Exp $'
 ! !