--- a/host.rc	Fri Nov 21 16:09:48 2003 +0100
+++ b/host.rc	Thu Dec 18 11:46:05 2003 +0100
@@ -130,72 +130,64 @@
 "/ can be rechanged in a h_xxx file.
 "/
 
-Compiler stcCompilation:#default.
-Compiler stcCompilationOptions:'+optinline +inlineNew'.
+Smalltalk wasStartedFromImage ifFalse:[
+    Compiler stcCompilation:#default.
+    Compiler stcCompilationOptions:'+optinline +inlineNew'.
 
-"/
-"/ setup for gcc (which is OK for most systems);
-"/ Notice that this setup may be changed by an OS-specific h_xxx file
-"/
-conf := Smalltalk configuration.
-(conf includesString:'gcc') ifTrue:[
-    Compiler ccPath:'gcc'
-] ifFalse:[
-    Compiler ccPath:'cc'
-].
-Compiler ccCompilationOptions:'-O'.
+    "/
+    "/ setup for gcc (which is OK for most systems);
+    "/ Notice that this setup may be changed by an OS-specific h_xxx file
+    "/
+    conf := Smalltalk configuration.
+    (conf includesString:'gcc') ifTrue:[
+	Compiler ccPath:'gcc'
+    ] ifFalse:[
+	Compiler ccPath:'cc'
+    ].
+    Compiler ccCompilationOptions:'-O'.
 
-includes := ''.
-('../../include' asFilename exists) ifTrue:[
-    "/ running in a development environment ...
-    includes := includes , '-I../../include '.
-].
-incDir := Smalltalk getSystemFileName:'include'.
-incDir notNil ifTrue:[
-    includes := includes , '-I' , incDir asFilename pathName , ' '
-] ifFalse:[
-    "/ running in a shared environment ...
-    ('/usr/local/lib/smalltalk/include' asFilename exists) ifTrue:[
-	includes := includes , '-I/usr/local/lib/smalltalk/include '.
+    includes := ''.
+    ('../../include' asFilename exists) ifTrue:[
+	"/ running in a development environment ...
+	includes := includes , '-I../../include '.
+    ].
+    incDir := Smalltalk getSystemFileName:'include'.
+    incDir notNil ifTrue:[
+	includes := includes , '-I' , incDir asFilename pathName , ' '
     ] ifFalse:[
-	('/opt/smalltalk/include' asFilename exists) ifTrue:[
-	    includes := includes , '-I/opt/smalltalk/include '.
+	"/ running in a shared environment ...
+	('/usr/local/lib/smalltalk/include' asFilename exists) ifTrue:[
+	    includes := includes , '-I/usr/local/lib/smalltalk/include '.
 	] ifFalse:[
-	    "/ if this is a production program, dont care for a warning
-	    (Smalltalk isStandAloneApp or:[Smalltalk isHeadless]) 
-	    ifFalse:[
-		'private.rc [warning]: no >>include<< directory found along your path.' infoPrintCR.
-		'private.rc [warning]: this will affect stc-compilation from within the browser.' infoPrintCR.
+	    ('/opt/smalltalk/include' asFilename exists) ifTrue:[
+		includes := includes , '-I/opt/smalltalk/include '.
+	    ] ifFalse:[
+		"/ if this is a production program, dont care for a warning
+		(Smalltalk isStandAloneApp or:[Smalltalk isHeadless]) 
+		ifFalse:[
+		    'private.rc [warning]: no >>include<< directory found along your path.' infoPrintCR.
+		    'private.rc [warning]: this will affect stc-compilation from within the browser.' infoPrintCR.
+		]
 	    ]
+	].
+    ].
+
+    Compiler stcCompilationIncludes:includes.
+
+    "/
+    "/ for myself: preset flags, so that we can accept GLXWorkstation code
+    "/ You probably will never do this.
+    "/
+    (Display notNil and:[Display supportsGLDrawing]) ifTrue:[
+	sysType = 'irix' ifTrue:[
+	    Compiler stcCompilationDefines:'-DGLX'.
+	] ifFalse:[
+	    Compiler stcCompilationIncludes:'-I../../include -I../../support/VGL/vogl/src'.
+	    Compiler stcCompilationDefines:'-DVGL'.
 	]
     ].
 ].
 
-Compiler stcCompilationIncludes:includes.
-
-
-"/
-"/ for myself: preset flags, so that we can accept GLXWorkstation code
-"/ You probably will never do this.
-"/
-(Display notNil and:[Display supportsGLDrawing]) ifTrue:[
-    sysType = 'irix' ifTrue:[
-	Compiler stcCompilationDefines:'-DGLX'.
-    ] ifFalse:[
-	Compiler stcCompilationIncludes:'-I../../include -I../../support/VGL/vogl/src'.
-	Compiler stcCompilationDefines:'-DVGL'.
-    ]
-].
-
-"/ specify additional link libraries.
-"/ Disabled; thats the default anyway ....
-"/
-"/    OperatingSystem getOSType = 'linux' ifTrue:[
-"/        ObjectFileLoader searchedLibraries:#('/usr/lib/libc.a')
-"/    ]
-
-
-
 "/
 "/ try systemType-specific setup
 "/ h_<osType>.rc