X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Flibraries.cl;h=f88a20720be8a86e4c620b62e9adf5eaf418590d;hb=8d16d732a80b76c913f4b62b9fe043af39e5bce2;hp=21867d1d70d18054cef968c3c0930966e4738d18;hpb=192193db6e4fbda90a840474d4aa2e8762597927;p=uffi.git

diff --git a/src/libraries.cl b/src/libraries.cl
index 21867d1..f88a207 100644
--- 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.7 2002/04/01 00:52:07 kevin Exp $
 ;;;;
-;;;; $Id: libraries.cl,v 1.1 2002/03/09 19:55:33 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)))
@@ -33,24 +22,52 @@
 (defvar *loaded-libraries* nil
   "List of foreign libraries loaded. Used to prevent reloading a library")
 
-(defun load-foreign-library (filename module supporting-libraries)
+(defun default-foreign-library-type ()
+  "Returns string naming default library type for platform"
+  #+(or win32 mswindows) "dll"
+  #+freebsd "a"
+  #+linux "so")
+
+(defun find-foreign-library (name &key directories type)  
+  "Looks for a foreign library. directories can be a single
+string or a list of strings of candidate directories. Use default
+library type if type is not specified."
+  (unless type
+    (setq type (default-foreign-library-type)))
+  (unless (listp directories)
+    (setq directories (list directories)))
+  (dolist (dir directories)
+    (let ((path (make-pathname :name :type type :directory directory)))
+      (when (probe-file path)
+	(return path))))
+  nil)
+
+
+(defun load-foreign-library (filename &key module supporting-libraries
+					   force-load)
   #+allegro (declare (ignore module supporting-libraries))
   #+lispworks  (declare (ignore supporting-libraries))
   #+cmu (declare (ignore module))
   
   (when (and filename (probe-file filename))
-    (if (find filename *loaded-libraries* :test #'string-equal)
+    (if (pathnamep filename)    ;; ensure filename is a string to check if
+	(setq filename (namestring filename)))  ; already loaded
+
+    (if (and (not force-load)
+	     (find filename *loaded-libraries* :test #'string-equal))
 	t ;; return T, but don't reload library
       (progn
 	#+cmu (alien:load-foreign filename 
 				  :libraries
 				  (convert-supporting-libraries-to-string
 				   supporting-libraries))
-	#+lispworks (fli:register-module module :connection-style :automatic 
+	#+lispworks (fli:register-module module 
+					 :connection-style :automatic 
 					 :real-name filename)
 	#+allegro (load filename)
 	
-	(push filename *loaded-libraries*))))
+	(push filename *loaded-libraries*)
+	t)))
   )
 
 (defun convert-supporting-libraries-to-string (libs)