r10816: Automated commit for Debian build of clsql upstream-version-3.4.0

[clsql.git] / uffi / clsql-uffi-loader.lisp

diff --git a/uffi/clsql-uffi-loader.lisp b/uffi/clsql-uffi-loader.lisp
index 05eee3f926be908134b02641d4c8e2b378b3b4b2..1655ed27cc29ebd5f6baf8d3f4e46f8ce7fd7311 100644 (file)
--- a/uffi/clsql-uffi-loader.lisp
+++ b/uffi/clsql-uffi-loader.lisp
@@ -19,7 +19,13 @@
 (in-package #:clsql-uffi)
 
 (defun find-and-load-foreign-library (filenames &key module supporting-libraries (errorp t))
-  (setq filenames (if (listp filenames) filenames (list filenames)))
+  (setq filenames (if (listp filenames) filenames (list filenames))
+        filenames
+          (append
+           (loop for search-path in clsql:*foreign-library-search-paths*
+                 nconc (loop for filename in filenames
+                             collect (merge-pathnames filename search-path)))
+           filenames))
   (or (loop for type in (uffi:foreign-library-types)
             for suffix = (make-pathname :type type)
             thereis (loop for filename in filenames
@@ -31,16 +37,17 @@
                                       (warn "~A" c)
                                       nil))))
       (when errorp
-        (error "Couldn't load foreign librar~@P ~{~S~^, ~}."
-               (length filenames) filenames))))
+       (error "Couldn't load foreign librar~@P ~{~S~^, ~}. (searched ~S)"
+               (length filenames) filenames
+              'clsql:*foreign-library-search-paths*))))
 
 (defvar *clsql-uffi-library-filenames*
-    (list #+(or 64bit x86-64) (make-pathname :name "uffi64"
+    (list #+(or 64bit x86-64) "clsql_uffi64"
+          #+(or 64bit x86-64) (make-pathname :name "clsql_uffi64"
                                              :directory clsql-uffi-system::*library-file-dir*)
-          #+(or 64bit x86-64) "uffi64"
-          (make-pathname :name "uffi"
-                         :directory clsql-uffi-system::*library-file-dir*)
-          "uffi"))
+          "clsql_uffi"
+          (make-pathname :name "clsql_uffi"
+                         :directory clsql-uffi-system::*library-file-dir*)))
 
 (defvar *clsql-uffi-supporting-libraries* '("c")
   "Used only by CMU. List of library flags needed to be passed to ld to
@@ -52,8 +59,8 @@ set to the right path before compiling or loading the system.")
 
 (defun load-uffi-foreign-library ()
   (find-and-load-foreign-library *clsql-uffi-library-filenames*
-                                 :module "clsql-uffi" 
-                                 :supporting-libraries 
+                                 :module "clsql-uffi"
+                                 :supporting-libraries
                                  *clsql-uffi-supporting-libraries*)
   (setq *uffi-library-loaded* t))