--- a/Launcher.st	Tue Aug 19 01:58:39 1997 +0200
+++ b/Launcher.st	Tue Aug 19 19:29:42 1997 +0200
@@ -1096,8 +1096,9 @@
      constantFoldingOptions constantFolding justInTimeCompilation 
      warnEnabler check component oldIndent t supportsJustInTimeCompilation y
      y2 fullDebugSupport yMax
-     compileLazy loadBinaries|
-
+     compileLazy loadBinaries canLoadBinaries|
+
+    canLoadBinaries := ObjectFileLoader notNil and:[ObjectFileLoader canLoadObjectFiles].
     loadBinaries := Smalltalk loadBinaries asValue.
     compileLazy := Autoload compileLazy asValue.
 
@@ -1192,8 +1193,7 @@
 
     box addCheckBox:(resources string:'lazy compilation when autoloading') on:compileLazy.
     check := box addCheckBox:(resources string:'if present, load binary objects when autoloading') on:loadBinaries.
-    (ObjectFileLoader isNil 
-    or:[ObjectFileLoader canLoadObjectFiles not]) ifTrue:[
+    canLoadBinaries ifFalse:[
         loadBinaries value:false.
         check disable
     ].
@@ -1217,6 +1217,7 @@
                         separateAtX:0.3.
         component immediateAccept:true; acceptOnLeave:false; cursorMovementWhenUpdating:#beginOfLine.
         component preferredExtent:(250 @ component preferredExtent y).
+        canLoadBinaries ifFalse:[component disable].
 
 "/        box addVerticalSpace.
 
@@ -1228,6 +1229,7 @@
                         separateAtX:0.3.
         component immediateAccept:true; acceptOnLeave:false; cursorMovementWhenUpdating:#beginOfLine.
         component preferredExtent:(250 @ component preferredExtent y).
+        canLoadBinaries ifFalse:[component disable].
 
 "/        box addVerticalSpace.
 
@@ -1239,6 +1241,7 @@
                         separateAtX:0.3.
         component immediateAccept:true; acceptOnLeave:false; cursorMovementWhenUpdating:#beginOfLine.
         component preferredExtent:(250 @ component preferredExtent y).
+        canLoadBinaries ifFalse:[component disable].
 
 "/        box addVerticalSpace.
 
@@ -1250,6 +1253,7 @@
                         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:'cc options:')
@@ -1259,6 +1263,7 @@
                         separateAtX:0.3.
         component immediateAccept:true; acceptOnLeave:false; cursorMovementWhenUpdating:#beginOfLine.
         component preferredExtent:(250 @ component preferredExtent y).
+        canLoadBinaries ifFalse:[component disable].
 
         stcLibraries notNil ifTrue:[
 "/            box addVerticalSpace.
@@ -1271,6 +1276,7 @@
                             separateAtX:0.3.
             component immediateAccept:true; acceptOnLeave:false; cursorMovementWhenUpdating:#beginOfLine.
             component preferredExtent:(250 @ component preferredExtent y).
+            canLoadBinaries ifFalse:[component disable].
         ].
 
         stcLibraryPath notNil ifTrue:[
@@ -1284,6 +1290,7 @@
                             separateAtX:0.3.
             component immediateAccept:true; acceptOnLeave:false; cursorMovementWhenUpdating:#beginOfLine.
             component preferredExtent:(250 @ component preferredExtent y).
+            canLoadBinaries ifFalse:[component disable].
         ].
 
 "/        box addVerticalSpace.
@@ -1413,7 +1420,7 @@
 
     "Modified: 10.9.1995 / 19:19:18 / claus"
     "Modified: 9.9.1996 / 22:42:47 / stefan"
-    "Modified: 19.8.1997 / 01:57:10 / cg"
+    "Modified: 18.8.1997 / 23:13:39 / cg"
 !
 
 displaySettings
@@ -4787,5 +4794,5 @@
 !Launcher class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Launcher.st,v 1.288 1997-08-18 23:58:39 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Launcher.st,v 1.289 1997-08-19 17:29:42 cg Exp $'
 ! !