r2279: *** empty log message ***

[uffi.git] / src / libraries.cl

diff --git a/src/libraries.cl b/src/libraries.cl
index e5bb757ba1029780c30b08995d544341678f19b9..29320469a59c7a56352c2c58fcf04d9bdb2c46e9 100644 (file)
--- a/src/libraries.cl
+++ b/src/libraries.cl
@@ -1,4 +1,4 @@
-;;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 -*-
+;;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10; Package: UFFI -*-
 ;;;; *************************************************************************
 ;;;; FILE IDENTIFICATION
 ;;;;
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: libraries.cl,v 1.11 2002/04/01 20:40:36 kevin Exp $
+;;;; $Id: libraries.cl,v 1.14 2002/04/06 19:53:08 kevin Exp $
 ;;;;
 ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -83,12 +83,16 @@ library type if type is not specified."
             (find filename *loaded-libraries* :test #'string-equal))
        t ;; return T, but don't reload library
       (progn
-       #+cmu (alien:load-foreign filename 
+       #+cmu
+       (let ((type (pathname-type (parse-namestring filename))))
+         (if (equal type "so")
+             (sys::load-object-file filename)
+             (alien:load-foreign filename 
                                  :libraries
                                  (convert-supporting-libraries-to-string
-                                  supporting-libraries))
+                                  supporting-libraries))))
+       
        #+lispworks (fli:register-module module 
-                                        :connection-style :automatic 
                                         :real-name filename)
        #+allegro (load filename)