r1579: *** empty log message ***

[uffi.git] / src / libraries.cl

diff --git a/src/libraries.cl b/src/libraries.cl
index b9bc2a53759983d323c425b0e1ad756526e4c50f..8943587db1197e6d4d55907529a672a4f9818383 100644 (file)
--- a/src/libraries.cl
+++ b/src/libraries.cl
@@ -7,24 +7,13 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; Copyright (c) 2002 Kevin M. Rosenberg
+;;;; $Id: libraries.cl,v 1.4 2002/03/16 22:54:06 kevin Exp $
 ;;;;
-;;;; $Id: libraries.cl,v 1.2 2002/03/10 20:01:55 kevin Exp $
+;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
-;;;; This file is part of the UFFI. 
-;;;;
-;;;; UFFI is free software; you can redistribute it and/or modify
-;;;; it under the terms of the GNU General Public License (version 2) as
-;;;; published by the Free Software Foundation.
-;;;;
-;;;; UFFI is distributed in the hope that it will be useful,
-;;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;;;; GNU General Public License for more details.
-;;;;
-;;;; You should have received a copy of the GNU General Public License
-;;;; along with UFFI; if not, write to the Free Software
-;;;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+;;;; UFFI users are granted the rights to distribute and use this software
+;;;; as governed by the terms of the Lisp Lesser GNU Public License
+;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL.
 ;;;; *************************************************************************
 
 (declaim (optimize (debug 3) (speed 3) (safety 1) (compilation-speed 0)))
@@ -39,6 +28,9 @@
   #+cmu (declare (ignore module))
   
   (when (and filename (probe-file filename))
+    (if (pathnamep filename)    ;; ensure filename is a string to check if
+       (setq filename (namestring filename)))  ; already loaded
+
     (if (find filename *loaded-libraries* :test #'string-equal)
        t ;; return T, but don't reload library
       (progn
@@ -51,7 +43,8 @@
                                         :real-name filename)
        #+allegro (load filename)
        
-       (push filename *loaded-libraries*))))
+       (push filename *loaded-libraries*)
+       t)))
   )
 
 (defun convert-supporting-libraries-to-string (libs)