r5559: Automatic commit for debian_version_1_3_4-1

[uffi.git] / src / libraries.lisp

diff --git a/src/libraries.lisp b/src/libraries.lisp
index 65f9f5707fac06d697c194aa0829de6db9d59d01..094433548d3d14532bd13dba8bdfcd9609c477d7 100644 (file)
--- a/src/libraries.lisp
+++ b/src/libraries.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: libraries.lisp,v 1.8 2003/06/26 18:02:08 kevin Exp $
+;;;; $Id: libraries.lisp,v 1.10 2003/08/14 19:35:05 kevin Exp $
 ;;;;
 ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -72,7 +72,7 @@ library type if type is not specified."
 
 (defun load-foreign-library (filename &key module supporting-libraries
                                           force-load)
-  #+(or allegro lispworks mcl) (declare (ignore module supporting-libraries))
+  #+(or allegro mcl) (declare (ignore module supporting-libraries))
   #+(or cmu scl sbcl) (declare (ignore module))
   
   (when (and filename (probe-file filename))
@@ -98,12 +98,13 @@ library type if type is not specified."
                              (convert-supporting-libraries-to-string
                               supporting-libraries)))
        #+sbcl
-       (if (string-equal type "so")
-           (sb-alien::load-1-foreign filename)
-           (sb-alien:load-foreign filename 
-                                  :libraries
-                                  (convert-supporting-libraries-to-string
-                                   supporting-libraries)))
+       (let ((type (pathname-type (parse-namestring filename))))
+         (if (string-equal type "so")
+             (sb-alien::load-1-foreign filename)
+             (sb-alien:load-foreign filename 
+                                    :libraries
+                                    (convert-supporting-libraries-to-string
+                                     supporting-libraries))))
        #+lispworks (fli:register-module module :real-name filename)
        #+allegro (load filename)
        #+openmcl (ccl:open-shared-library filename)