X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;ds=sidebyside;f=interfaces%2Fclsql-uffi%2Fclsql-uffi-loader.cl;h=f2b4c086f54aadeb59eef4b9e4ac981596fd5c2a;hb=c55220b69832eb965241cb4211e22823bf658807;hp=0c81521e8f555a26837a61173255f0e984ab2947;hpb=72ec381271fe5f7839d356d26e0716625e3246e9;p=clsql.git

diff --git a/interfaces/clsql-uffi/clsql-uffi-loader.cl b/interfaces/clsql-uffi/clsql-uffi-loader.cl
index 0c81521..f2b4c08 100644
--- a/interfaces/clsql-uffi/clsql-uffi-loader.cl
+++ b/interfaces/clsql-uffi/clsql-uffi-loader.cl
@@ -7,7 +7,7 @@
 ;;;; Programmers:   Kevin M. Rosenberg
 ;;;; Date Started:  Mar 2002
 ;;;;
-;;;; $Id: clsql-uffi-loader.cl,v 1.3 2002/05/14 15:54:37 kevin Exp $
+;;;; $Id: clsql-uffi-loader.cl,v 1.7 2002/05/14 16:07:56 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -20,10 +20,11 @@
 (in-package :clsql-uffi)
 
 (defvar *clsql-uffi-library-filename* 
-    (translate-logical-pathname 
-     #+(or linux unix) "CL-LIBRARY:clsql;interfaces;clsql-uffi;clsql-uffi.so"
-     #+(or mswindows win32) "CL-LIBRARY:clsql;interfaces;clsql-uffi;clsql-uffi.dll"
-     ))
+  (uffi:find-foreign-library
+   "clsql-uffi"
+   `(,(translate-logical-pathname 
+       "CL-LIBRARY:clsql;interfaces;clsql-uffi;clsql-uffi.so")
+     "/usr/share/common-lisp/source/clsql/interfaces/clsql-uffi/")))
 
 (defvar *clsql-uffi-supporting-libraries* '("c")
   "Used only by CMU. List of library flags needed to be passed to ld to
@@ -39,7 +40,8 @@ set to the right path before compiling or loading the system.")
 				 :supporting-libraries 
 				 *clsql-uffi-supporting-libraries*)
       (setq *uffi-library-loaded* t)
-    (warn "Unable to load helper library ~A" *clsql-uffi-library-filename*)))
+    (warn "Unable to load helper library ~A (~S)" *clsql-uffi-library-filename*
+	  (logical-pathname-translations "CL-LIBRARY"))))
 
 (load-uffi-foreign-library)