X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=db-mysql%2Fmysql-loader.lisp;h=957c39e48e7123105a067436e3c0180635b94b35;hp=be2455bdbf363658a0d34b39f7b59cd910aeab08;hb=9bbed78051e80e6ab76ae47834136035602bbbf1;hpb=8bb477abca1f19d8d26cb72c62fcaa3c1410ac7d

diff --git a/db-mysql/mysql-loader.lisp b/db-mysql/mysql-loader.lisp
index be2455b..957c39e 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.9 2003/05/17 06:11:16 kevin Exp $
+;;;; $Id$
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -16,8 +16,7 @@
 ;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL.
 ;;;; *************************************************************************
 
-(declaim (optimize (debug 3) (speed 3) (safety 1) (compilation-speed 0)))
-(in-package :mysql)
+(in-package #:mysql)
 
 ;;;; Modified by Kevin Rosenberg 
 ;;;;  - probe potential directories to find library
@@ -27,7 +26,7 @@
 
 (defparameter *clsql-mysql-library-path* 
   (uffi:find-foreign-library
-   "clsql-mysql"
+   "mysql"
    `(,(make-pathname :directory (pathname-directory *load-truename*))
      "/usr/lib/clsql/"
      "/sw/lib/clsql/"
@@ -36,12 +35,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/")
+       "/home/kevin/debian/src/clsql/db-mysql/"
+       "/mysql/lib/dll32/"
+       "/mysql/lib/opt/")
    :drive-letters '("C")))
   
 (defvar *mysql-library-candidate-names*
@@ -61,10 +62,10 @@ set to the right path before compiling or loading the system.")
 (defvar *mysql-library-loaded* nil
   "T if foreign library was able to be loaded successfully")
 
-(defmethod clsql-base-sys:database-type-library-loaded ((database-type (eql :mysql)))
+(defmethod clsql-base:database-type-library-loaded ((database-type (eql :mysql)))
   *mysql-library-loaded*)
 				      
-(defmethod clsql-base-sys:database-type-load-foreign ((database-type (eql :mysql)))
+(defmethod clsql-base:database-type-load-foreign ((database-type (eql :mysql)))
   (let ((mysql-path
 	 (uffi:find-foreign-library *mysql-library-candidate-names*
 				    *mysql-library-candidate-directories*
@@ -72,21 +73,17 @@ 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)
-	#+ignore ;; return value not set
-      (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)
+(clsql-base:database-type-load-foreign :mysql)