r7061: initial property settings

[clsql.git] / db-mysql / mysql-loader.lisp

diff --git a/db-mysql/mysql-loader.lisp b/db-mysql/mysql-loader.lisp
index c256d7018714432d6bad086d3361f76b769c6feb..1dc903daf1963e51aca9172fee33264531174ff4 100644 (file)
--- a/db-mysql/mysql-loader.lisp
+++ b/db-mysql/mysql-loader.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmers:   Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: mysql-loader.lisp,v 1.6 2002/12/09 10:34:16 kevin Exp $
+;;;; $Id$
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -32,17 +32,18 @@
      "/usr/lib/clsql/"
      "/sw/lib/clsql/"
      "/home/kevin/debian/src/clsql/db-mysql/")
-   :drive-letters '("C" "D" "E")))
+   :drive-letters '("C")))
 
 (defparameter *libz-library-path* 
   (uffi:find-foreign-library
-   "libz"
+   '("libz" "zlib")
    `(,(make-pathname :directory (pathname-directory *load-truename*))
       "/usr/lib/"
       "/sw/lib/"
       "/usr/local/lib/"
-      "/home/kevin/debian/src/clsql/db-mysql/")
-   :drive-letters '("C" "D" "E")))
+      "/home/kevin/debian/src/clsql/db-mysql/"
+      "/mysql/lib/opt/")
+   :drive-letters '("C")))
   
 (defvar *mysql-library-candidate-names*
     '("libmysqlclient" "libmysql"))
@@ -72,19 +73,16 @@ set to the right path before compiling or loading the system.")
                                    *mysql-library-candidate-drive-letters*)))
     (unless (probe-file mysql-path)
       (error "Can't find mysql client library to load"))
-    (if        (and
-        (uffi:load-foreign-library *libz-library-path*) 
-        (uffi:load-foreign-library mysql-path
-                                   :module "mysql" 
-                                   :supporting-libraries 
-                                   *mysql-supporting-libraries*)
-        (uffi:load-foreign-library *clsql-mysql-library-path* 
-                                   :module "clsql-mysql" 
-                                   :supporting-libraries 
-                                   (append *mysql-supporting-libraries*)))
-       (setq *mysql-library-loaded* t)
-      (error "Unable to load MySQL client library ~A or CLSQL-MySQL library ~A"
-           mysql-path *clsql-mysql-library-filename*))))
+    (uffi:load-foreign-library *libz-library-path*) 
+    (uffi:load-foreign-library mysql-path
+                              :module "mysql" 
+                              :supporting-libraries 
+                              *mysql-supporting-libraries*)
+    (uffi:load-foreign-library *clsql-mysql-library-path* 
+                              :module "clsql-mysql" 
+                              :supporting-libraries 
+                              (append *mysql-supporting-libraries*)))
+  (setq *mysql-library-loaded* t))
 
 
 (clsql-base-sys:database-type-load-foreign :mysql)