X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=interfaces%2Fmysql%2Fmysql-loader.cl;h=3c505cb9ab878696b7cb38a099e5b3c3d46629e8;hb=7faa1ee1482c0478c9d2802c3de7bf229d55b1b8;hp=408beba1d3f89b755499c3259f51dc417666d84d;hpb=da7a9d71f5424ad017be7fd1c4ca17aaffa91b2a;p=clsql.git

diff --git a/interfaces/mysql/mysql-loader.cl b/interfaces/mysql/mysql-loader.cl
index 408beba..3c505cb 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.9 2002/05/14 16:10:55 kevin Exp $
+;;;; $Id: mysql-loader.cl,v 1.14 2002/05/15 18:05:51 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -28,9 +28,10 @@
 (defvar *clsql-mysql-library-filename* 
   (uffi:find-foreign-library
    "clsql-mysql"
-   `(,(translate-logical-pathname 
-       "CL-LIBRARY:clsql;interfaces;clsql-uffi;")
-     "/usr/share/common-lisp/source/clsql/interfaces/clsql-uffi/")))
+   `(,(directory-namestring
+       ((translate-logical-pathname 
+	 "CL-LIBRARY:clsql;interfaces;mysql;"))
+     "/usr/share/common-lisp/source/clsql/interfaces/mysql/")))
 
 (defvar *mysql-library-filename*
     (cond
@@ -76,8 +77,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 
@@ -86,11 +86,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)
-(when (clsql-sys:database-type-library-loaded :mysql)
-  (clsql-sys:initialize-database-type :database-type :mysql)
-  (setq clsql:*default-database-type* :mysql)
-  (pushnew :mysql cl:*features*))
+