;;;; Author: Kevin M. Rosenberg
;;;; Created: Feb 2002
;;;;
-;;;; $Id$
-;;;;
-;;;; This file, part of CLSQL, is Copyright (c) 2002-2004 by Kevin M. Rosenberg
+;;;; This file, part of CLSQL, is Copyright (c) 2002-2010 by Kevin M. Rosenberg
;;;;
;;;; CLSQL users are granted the rights to distribute and use this software
;;;; as governed by the terms of the Lisp Lesser GNU Public License
(in-package #:mysql)
-(defparameter *clsql-mysql-library-path*
- (uffi:find-foreign-library
- "mysql"
- `(,clsql-mysql-system::*library-file-dir*
- "/usr/lib/clsql/"
- "/sw/lib/clsql/")
- :drive-letters '("C")))
+;; searches clsql_mysql64 to accomodate both 32-bit and 64-bit libraries on same system
+(defparameter *clsql-mysql-library-candidate-names*
+ `(,@(when (> most-positive-fixnum (expt 2 32)) (list "clsql_mysql64"))
+ "clsql_mysql"))
(defvar *mysql-library-candidate-names*
- '("libmysqlclient" "libmysql"))
-
-(defparameter *mysql-library-candidate-directories*
- `(,(pathname-directory *load-pathname*)
- "/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"))
+ '("libmysqlclient" "libmysql"))
(defvar *mysql-supporting-libraries* '("c")
"Used only by CMU. List of library flags needed to be passed to ld to
(defmethod clsql-sys:database-type-library-loaded ((database-type (eql :mysql)))
*mysql-library-loaded*)
-
+
(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*
- :drive-letters
- *mysql-library-candidate-drive-letters*)))
- (unless (probe-file mysql-path)
- (error "Can't find mysql client library to load"))
- (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))
+ (unless *mysql-library-loaded*
+ (clsql:push-library-path clsql-mysql-system::*library-file-dir*)
+ (clsql-uffi:find-and-load-foreign-library *mysql-library-candidate-names*
+ :module "mysql"
+ :supporting-libraries *mysql-supporting-libraries*)
-(clsql-sys:database-type-load-foreign :mysql)
+ (clsql-uffi:find-and-load-foreign-library *clsql-mysql-library-candidate-names*
+ :module "clsql-mysql"
+ :supporting-libraries *mysql-supporting-libraries*)
+ (setq *mysql-library-loaded* t)))
+(clsql-sys:database-type-load-foreign :mysql)