X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=db-mysql%2Fmysql-loader.lisp;h=d93b783b88049bd7d26bbf278bea586f2f4166a6;hp=f62296d9d14de106814352feeae135101b5c5f39;hb=8a8ee2d7d791b7a3efaed06420802a925d16fca3;hpb=1970aa3bbd470e64591b6a3ee713392d289a87fe diff --git a/db-mysql/mysql-loader.lisp b/db-mysql/mysql-loader.lisp index f62296d..d93b783 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.7 2003/03/27 01:13:33 kevin Exp $ +;;;; $Id$ ;;;; ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; @@ -16,40 +16,38 @@ ;;;; (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) - -;;;; Modified by Kevin Rosenberg -;;;; - probe potential directories to find library -;;;; - Changed from CMUCL functions to UFFI to -;;;; -- prevent library from being loaded multiple times -;;;; -- support Allegro CL and Lispworks +(in-package #:mysql) (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/" "/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*)) + #+64bit "/usr/lib64/" "/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/dll32/" + "/mysql/lib/opt/") + :drive-letters '("C"))) (defvar *mysql-library-candidate-names* '("libmysqlclient" "libmysql")) (defparameter *mysql-library-candidate-directories* `(,(pathname-directory *load-pathname*) - "/opt/mysql/lib/mysql/" "/usr/local/lib/" "/usr/lib/" "/usr/local/lib/mysql/" "/usr/lib/mysql/" "/mysql/lib/opt/" "/sw/lib/mysql/")) + "/opt/mysql/lib/mysql/" "/usr/local/lib/" + #+64bit "/usr/lib64/" + "/usr/lib/" "/usr/local/lib/mysql/" "/usr/lib/mysql/" "/mysql/lib/opt/" "/sw/lib/mysql/")) (defvar *mysql-library-candidate-drive-letters* '("C" "D" "E")) @@ -61,10 +59,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-sys: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-sys:database-type-load-foreign ((database-type (eql :mysql))) (let ((mysql-path (uffi:find-foreign-library *mysql-library-candidate-names* *mysql-library-candidate-directories* @@ -72,20 +70,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) - (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-sys:database-type-load-foreign :mysql)