r2195: *** empty log message ***

[clsql.git] / interfaces / clsql-uffi / clsql-uffi-loader.cl

diff --git a/interfaces/clsql-uffi/clsql-uffi-loader.cl b/interfaces/clsql-uffi/clsql-uffi-loader.cl
index b9dfcb2ad00f1081bf91e1291a6ef0883321dbfa..ccff8e4c41f625fe735273eb90bbfdf865fee462 100644 (file)
--- 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.4 2002/05/14 15:58:45 kevin Exp $
+;;;; $Id: clsql-uffi-loader.cl,v 1.14 2002/07/08 17:37:18 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -20,10 +20,13 @@
 (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"
+   `(,(directory-namestring
+       (translate-logical-pathname 
+       "CL-LIBRARY:clsql;interfaces;clsql-uffi;"))
+     "/usr/lib/cl-sql/")
+   :drive-letters '("C" "D" "E" "F" "G")))
 
 (defvar *clsql-uffi-supporting-libraries* '("c")
   "Used only by CMU. List of library flags needed to be passed to ld to
@@ -39,8 +42,7 @@ 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 (~S)" *clsql-uffi-library-filename*
-         (logical-pathname-translations "CL-LIBRARY"))))
+    (warn "Unable to load helper library ~A" *clsql-uffi-library-filename*)))
 
 (load-uffi-foreign-library)