r2385: *** empty log message ***

[uffi.git] / src / mcl / libraries.cl

diff --git a/src/mcl/libraries.cl b/src/mcl/libraries.cl
index 170acecdb60a665572de921225b4a7cd61a84a0a..ba0107f3a0fed3621897a60c426d0aea2ae184af 100644 (file)
--- a/src/mcl/libraries.cl
+++ b/src/mcl/libraries.cl
@@ -4,12 +4,13 @@
 ;;;;
 ;;;; Name:          libraries.cl
 ;;;; Purpose:       UFFI source to load foreign libraries
-;;;; Programmer:    Kevin M. Rosenberg
+;;;; Programmers:   Kevin M. Rosenberg and John DeSoi
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: libraries.cl,v 1.2 2002/04/05 04:10:38 desoi Exp $
+;;;; $Id: libraries.cl,v 1.7 2002/08/23 15:28:11 kevin Exp $
 ;;;;
 ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
+;;;; and John DeSoi
 ;;;;
 ;;;; UFFI users are granted the rights to distribute and use this software
 ;;;; as governed by the terms of the Lisp Lesser GNU Public License
@@ -29,8 +30,51 @@
      (when (ccl:add-to-shared-library-search-path ,filename t) 
        (pushnew ,filename *loaded-libraries*))))
 
-(defun convert-supporting-libraries-to-string (libs)
-  (let (lib-load-list)
-    (dolist (lib libs)
-      (push (format nil "-l~A" lib) lib-load-list))
-    (nreverse lib-load-list)))
+;; Copied directly from main source without MCL specializations
+(defun find-foreign-library (names directories &key types drive-letters)  
+  "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 types
+    (setq types (default-foreign-library-type)))
+  (unless (listp types)
+    (setq types (list types)))
+  (unless (listp names)
+    (setq names (list names)))
+  (unless (listp directories)
+    (setq directories (list directories)))
+  #+(or win32 mswindows)
+  (unless (listp drive-letters)
+    (setq drive-letters (list drive-letters)))
+  #-(or win32 mswindows)
+  (setq drive-letters '(nil))
+  (dolist (drive-letter drive-letters)
+    (dolist (name names)
+      (dolist (dir directories)
+       (dolist (type types)
+         (let ((path (make-pathname 
+                      #+lispworks :host
+                      #+lispworks (when drive-letter drive-letter)
+                      #-lispworks :device
+                      #-lispworks (when drive-letter drive-letter)
+                      :name name 
+                      :type type
+                      :directory 
+                      (etypecase dir
+                        (pathname
+                         (pathname-directory dir))
+                        (list
+                         dir)
+                        (string
+                         (pathname-directory 
+                          (parse-namestring dir)))))))
+           (when (probe-file path)
+             (return-from find-foreign-library path)))))))
+   nil)
+
+
+;; Copied directly from main source without MCL specializations
+(defun default-foreign-library-type ()
+  "Returns string naming default library type for platform"
+  #+(or win32 mswindows) "dll"
+  #-(or win32 mswindows) "so")
\ No newline at end of file