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

diff --git a/interfaces/clsql-uffi/clsql-uffi-loader.cl b/interfaces/clsql-uffi/clsql-uffi-loader.cl
index ea886ef..0c81521 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.1 2002/03/27 08:09:25 kevin Exp $
+;;;; $Id: clsql-uffi-loader.cl,v 1.3 2002/05/14 15:54:37 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -21,8 +21,8 @@
 
 (defvar *clsql-uffi-library-filename* 
     (translate-logical-pathname 
-     #+(or linux unix) "CLSQL:interfaces;clsql-uffi;clsql-uffi.so"
-     #+(or mswindows win32) "CLSQL:interfaces;clsql-uffi;clsql-uffi.dll"
+     #+(or linux unix) "CL-LIBRARY:clsql;interfaces;clsql-uffi;clsql-uffi.so"
+     #+(or mswindows win32) "CL-LIBRARY:clsql;interfaces;clsql-uffi;clsql-uffi.dll"
      ))
 
 (defvar *clsql-uffi-supporting-libraries* '("c")
@@ -34,11 +34,12 @@ set to the right path before compiling or loading the system.")
   "T if foreign library was able to be loaded successfully")
 
 (defun load-uffi-foreign-library ()
-  (when (uffi:load-foreign-library *clsql-uffi-library-filename* 
-				  :module "clsql-uffi" 
-				  :supporting-libraries 
-				  *clsql-uffi-supporting-libraries*)
-    (setq *uffi-library-loaded* t)))
+  (if (uffi:load-foreign-library *clsql-uffi-library-filename* 
+				 :module "clsql-uffi" 
+				 :supporting-libraries 
+				 *clsql-uffi-supporting-libraries*)
+      (setq *uffi-library-loaded* t)
+    (warn "Unable to load helper library ~A" *clsql-uffi-library-filename*)))
 
 (load-uffi-foreign-library)