X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=interfaces%2Fmysql%2Fmysql-loader.cl;h=45f796c675192e0b717d460d10d0d117ff5949d4;hb=12061f45454ea5fc2cef4213ccecd99d88fd1b46;hp=0ff1ad28c7d23c02ba6a464966d363f0007d1217;hpb=0fe44ce81f47c779d9695c9211668b4780bf4216;p=clsql.git

diff --git a/interfaces/mysql/mysql-loader.cl b/interfaces/mysql/mysql-loader.cl
index 0ff1ad2..45f796c 100644
--- a/interfaces/mysql/mysql-loader.cl
+++ b/interfaces/mysql/mysql-loader.cl
@@ -7,7 +7,7 @@
 ;;;; Programmers:   Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: mysql-loader.cl,v 1.6 2002/04/23 18:28:02 kevin Exp $
+;;;; $Id: mysql-loader.cl,v 1.16 2002/05/17 17:09:55 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -26,10 +26,13 @@
 ;;;;      -- support Allegro CL and Lispworks
 
 (defvar *clsql-mysql-library-filename* 
-    (translate-logical-pathname 
-     #+(or linux unix) "CLSQL:interfaces;mysql;clsql-mysql.so"
-     #+(or mswindows win32) "CLSQL:interfaces;mysql;clsql-mysql.dll"
-     ))
+  (uffi:find-foreign-library
+   "clsql-mysql"
+   `(,(directory-namestring
+       ((translate-logical-pathname 
+	 "CL-LIBRARY:clsql;interfaces;mysql;"))
+     "/usr/share/common-lisp/source/clsql/interfaces/mysql/"))
+   :drive-letters '("C" "D" "E" "F" "G")))
 
 (defvar *mysql-library-filename*
     (cond
@@ -75,8 +78,7 @@ set to the right path before compiling or loading the system.")
     (uffi:load-foreign-library 
      (uffi:find-foreign-library '("libz" "zlib")
 				'("/usr/lib/" "/usr/local/" "/lib/")))
-    (when
-	(and
+    (if	(and
 	 (uffi:load-foreign-library mysql-path
 				    :module "mysql" 
 				    :supporting-libraries 
@@ -85,9 +87,10 @@ set to the right path before compiling or loading the system.")
 				    :module "clsql-mysql" 
 				    :supporting-libraries 
 				    (append *mysql-supporting-libraries*)))
-      (setq *mysql-library-loaded* t))))
+	(setq *mysql-library-loaded* t)
+      (warn "Unable to load MySQL client library ~A or CLSQL-MySQL library ~A"
+	    mysql-path *clsql-mysql-library-filename*))))
 
 
 (clsql-sys:database-type-load-foreign :mysql)
 
-