projects
/
clsql.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r9552: Automated commit for Debian build of clsql upstream-version-2.11.5
[clsql.git]
/
db-mysql
/
mysql-loader.lisp
diff --git
a/db-mysql/mysql-loader.lisp
b/db-mysql/mysql-loader.lisp
index 957c39e48e7123105a067436e3c0180635b94b35..93437e6a41ec899993f54baac95350aa5fa40967 100644
(file)
--- a/
db-mysql/mysql-loader.lisp
+++ b/
db-mysql/mysql-loader.lisp
@@
-18,12
+18,6
@@
(in-package #:mysql)
(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
-
(defparameter *clsql-mysql-library-path*
(uffi:find-foreign-library
"mysql"
(defparameter *clsql-mysql-library-path*
(uffi:find-foreign-library
"mysql"
@@
-35,12
+29,14
@@
(defparameter *libz-library-path*
(uffi:find-foreign-library
(defparameter *libz-library-path*
(uffi:find-foreign-library
- '("libz" "zlib")
+ '("libz" "zlib
wapi" "zlib
")
`(,(make-pathname :directory (pathname-directory *load-truename*))
`(,(make-pathname :directory (pathname-directory *load-truename*))
+ #+64bit "/usr/lib64/"
"/usr/lib/"
"/sw/lib/"
"/usr/local/lib/"
"/home/kevin/debian/src/clsql/db-mysql/"
"/usr/lib/"
"/sw/lib/"
"/usr/local/lib/"
"/home/kevin/debian/src/clsql/db-mysql/"
+ "/bin/"
"/mysql/lib/dll32/"
"/mysql/lib/opt/")
:drive-letters '("C")))
"/mysql/lib/dll32/"
"/mysql/lib/opt/")
:drive-letters '("C")))
@@
-50,7
+46,9
@@
(defparameter *mysql-library-candidate-directories*
`(,(pathname-directory *load-pathname*)
(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"))
(defvar *mysql-library-candidate-drive-letters* '("C" "D" "E"))
@@
-62,10
+60,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")
(defvar *mysql-library-loaded* nil
"T if foreign library was able to be loaded successfully")
-(defmethod clsql-
base
:database-type-library-loaded ((database-type (eql :mysql)))
+(defmethod clsql-
sys
:database-type-library-loaded ((database-type (eql :mysql)))
*mysql-library-loaded*)
*mysql-library-loaded*)
-(defmethod clsql-
base
: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*
(let ((mysql-path
(uffi:find-foreign-library *mysql-library-candidate-names*
*mysql-library-candidate-directories*
@@
-85,5
+83,5
@@
set to the right path before compiling or loading the system.")
(setq *mysql-library-loaded* t))
(setq *mysql-library-loaded* t))
-(clsql-
base
:database-type-load-foreign :mysql)
+(clsql-
sys
:database-type-load-foreign :mysql)