--- a/AbstractSettingsApplication.st	Tue Aug 29 16:00:02 2006 +0200
+++ b/AbstractSettingsApplication.st	Tue Aug 29 17:28:46 2006 +0200
@@ -8683,6 +8683,8 @@
 !AbstractSettingsApplication::STCCompilerSettingsAppl methodsFor:'actions'!
 
 basicReadSettings
+    |t|
+
     self canLoadBinaries 
         value:(ObjectFileLoader notNil and:[ObjectFileLoader canLoadObjectFiles]).
 
@@ -8694,19 +8696,15 @@
     self stc value:ParserFlags stcPath.
     self makeCommand value:ParserFlags makeCommand.
 
-    ObjectFileLoader notNil ifTrue:[
-        |t|
-
-        self linkCommand value:ParserFlags linkCommand.
-        self linkArgs value:ParserFlags linkArgs.
-        self linkSharedArgs value:ObjectFileLoader linkSharedArgs.
-
-        (t := ParserFlags searchedLibraries) notNil ifTrue:[
-            self stcLibraries value:(String fromStringCollection:t separatedBy:' ')
-        ].
-        (t := ParserFlags libPath) notNil ifTrue:[
-            self stcLibraryPath value:t
-        ]
+    self linkCommand value:ParserFlags linkCommand.
+    self linkArgs value:ParserFlags linkArgs.
+    self linkSharedArgs value:ParserFlags linkSharedArgs.
+
+    (t := ParserFlags searchedLibraries) notNil ifTrue:[
+        self stcLibraries value:(String fromStringCollection:t separatedBy:' ')
+    ].
+    (t := ParserFlags libPath) notNil ifTrue:[
+        self stcLibraryPath value:t
     ].
 
     self stcCompilationSelection value:(self class stcCompilationOptions 
@@ -8731,14 +8729,12 @@
     ].
     ParserFlags linkCommand:self linkCommand value.
     ParserFlags linkArgs:self linkArgs value.
-    ObjectFileLoader linkSharedArgs:self linkSharedArgs value.
-    ObjectFileLoader notNil ifTrue:[
-        self stcLibraries value notNil ifTrue:[
-            ParserFlags searchedLibraries:(self stcLibraries value asCollectionOfWords).
-        ].
-        stcLibraryPath notNil ifTrue:[
-            ParserFlags libPath:(self stcLibraryPath value).
-        ]
+    ParserFlags linkSharedArgs:self linkSharedArgs value.
+    self stcLibraries value notNil ifTrue:[
+        ParserFlags searchedLibraries:(self stcLibraries value asCollectionOfWords).
+    ].
+    stcLibraryPath notNil ifTrue:[
+        ParserFlags libPath:(self stcLibraryPath value).
     ].
 
     "Modified: / 09-08-2006 / 19:33:10 / fm"
@@ -8895,8 +8891,6 @@
 hasUnsavedChanges
     | searchedLibs |
 
-    searchedLibs := ObjectFileLoader searchedLibraries.
-
     ((ParserFlags stcCompilation ? #default) ~= (self class stcCompilationOptions at:self stcCompilationSelection value)) ifTrue:[^ true].
     ((ObjectFileLoader notNil and:[ObjectFileLoader canLoadObjectFiles]) ~= self canLoadBinaries value ) ifTrue:[^ true].
     ((ParserFlags stcCompilationIncludes) ~= self stcIncludes value) ifTrue:[^ true].
@@ -8908,13 +8902,12 @@
     ((ParserFlags makeCommand) ~= self makeCommand value) ifTrue:[^ true].
     ((ParserFlags linkCommand) ~= self linkCommand value) ifTrue:[^ true].
     ((ParserFlags linkArgs) ~= self linkArgs value) ifTrue:[^ true].
-    ((ObjectFileLoader linkSharedArgs) ~= self linkSharedArgs value) ifTrue:[^ true].
+    ((ParserFlags linkSharedArgs) ~= self linkSharedArgs value) ifTrue:[^ true].
      (ParserFlags libPath ~= self stcLibraryPath value) ifTrue:[^ true]. 
 
-    ObjectFileLoader notNil ifTrue:[
-        searchedLibs notNil ifTrue:[
-            (String fromStringCollection:searchedLibs separatedBy:' ') ~= self stcLibraries value ifTrue:[^ true].
-        ].
+    searchedLibs := ParserFlags searchedLibraries.
+    searchedLibs notNil ifTrue:[
+        (String fromStringCollection:searchedLibs separatedBy:' ') ~= self stcLibraries value ifTrue:[^ true].
     ].
     ^ false.
 
@@ -13062,5 +13055,5 @@
 !AbstractSettingsApplication class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/AbstractSettingsApplication.st,v 1.244 2006-08-26 13:34:36 cg Exp $'
-! !
+    ^ '$Header: /cvs/stx/stx/libtool/AbstractSettingsApplication.st,v 1.245 2006-08-29 15:28:46 cg Exp $'
+! !