r2053: update library search

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

diff --git a/interfaces/mysql/mysql-loader.cl b/interfaces/mysql/mysql-loader.cl
index 35dfb101c15a029a796ab33ed3a25ffb01316984..3c505cb9ab878696b7cb38a099e5b3c3d46629e8 100644 (file)
--- 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.10 2002/05/14 16:15:24 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
@@ -87,11 +88,8 @@ set to the right path before compiling or loading the system.")
                                    (append *mysql-supporting-libraries*)))
        (setq *mysql-library-loaded* t)
       (warn "Unable to load MySQL client library ~A or CLSQL-MySQL library ~A"
-           mysql-path clsql-mysql-library-filename))))
+           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*))
+