X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;ds=sidebyside;f=db-mysql%2Fmysql-loader.lisp;h=1dc903daf1963e51aca9172fee33264531174ff4;hb=bada52b7a8fd2cc484dee33cccd64ca09a52ec3d;hp=03fc24d281ef946a80cd1b89090bcac10e1a2ebc;hpb=5ec859ec0f280b3dcec8320dce98bf325cb16c0e;p=clsql.git

diff --git a/db-mysql/mysql-loader.lisp b/db-mysql/mysql-loader.lisp
index 03fc24d..1dc903d 100644
--- 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.8 2003/05/17 06:03:03 kevin Exp $
+;;;; $Id$
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -36,13 +36,14 @@
 
 (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-path*))))
+    (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)