--- a/Smalltalk.st Fri Feb 26 15:38:10 2010 +0100
+++ b/Smalltalk.st Fri Feb 26 15:38:52 2010 +0100
@@ -5606,20 +5606,25 @@
baseName exists ifTrue:[
"/ load local file first...
handle := ObjectFileLoader loadObjectFile:baseName.
- handle notNil ifTrue:[^ true].
- ].
-
- packagePath := self getPackageDirectoryForPackage:packageID.
- packagePath isNil ifTrue:[^ false].
- packagePath := packagePath asFilename.
- libraryFilename := packagePath / baseName.
- libraryFilename exists ifFalse:[
- "in windows (with Borland compiler, DLLs in development environment are under objbc"
- libraryFilename := packagePath / 'objbc' / baseName.
- ].
- libraryFilename exists ifFalse:[^ false].
-
- ^ (ObjectFileLoader loadObjectFile:libraryFilename pathName) notNil
+ ].
+ handle isNil ifTrue:[
+ packagePath := self getPackageDirectoryForPackage:packageID.
+ packagePath isNil ifTrue:[^ false].
+ packagePath := packagePath asFilename.
+ libraryFilename := packagePath / baseName.
+ libraryFilename exists ifFalse:[
+ "in windows (with Borland compiler, DLLs in development environment are under objbc"
+ libraryFilename := packagePath / 'objbc' / baseName.
+ ].
+ libraryFilename exists ifTrue:[
+ handle := ObjectFileLoader loadObjectFile:libraryFilename pathName.
+ ].
+ ].
+
+"/ handle notNil ifTrue:[
+"/ Transcript showCR:(' Smalltalk: loaded %1.' bindWith:libraryFilename pathName).
+"/ ].
+ ^ handle notNil
"
Smalltalk fileInClassLibrary:'libtable'
@@ -7419,9 +7424,9 @@
!Smalltalk class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic/Smalltalk.st,v 1.922 2010-02-05 12:59:18 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic/Smalltalk.st,v 1.923 2010-02-26 14:38:52 cg Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libbasic/Smalltalk.st,v 1.922 2010-02-05 12:59:18 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic/Smalltalk.st,v 1.923 2010-02-26 14:38:52 cg Exp $'
! !