projects
/
clsql.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r10291: Automated commit for Debian build of clsql upstream-version-3.1.6
[clsql.git]
/
db-mysql
/
mysql-loader.lisp
diff --git
a/db-mysql/mysql-loader.lisp
b/db-mysql/mysql-loader.lisp
index bd972f48d73f6909c174d20f9acbddc88234d058..ffcc576c8287805f54d8b1f14bd7aabaa0b75c52 100644
(file)
--- a/
db-mysql/mysql-loader.lisp
+++ b/
db-mysql/mysql-loader.lisp
@@
-20,7
+20,7
@@
(defparameter *clsql-mysql-library-path*
(uffi:find-foreign-library
(defparameter *clsql-mysql-library-path*
(uffi:find-foreign-library
- "mysql"
+ '(#+(or 64bit x86-64) "mysql64" "mysql")
`(,clsql-mysql-system::*library-file-dir*
"/usr/lib/clsql/"
"/sw/lib/clsql/")
`(,clsql-mysql-system::*library-file-dir*
"/usr/lib/clsql/"
"/sw/lib/clsql/")
@@
-31,9
+31,9
@@
(defparameter *mysql-library-candidate-directories*
`(,(pathname-directory *load-pathname*)
(defparameter *mysql-library-candidate-directories*
`(,(pathname-directory *load-pathname*)
+ #+(or 64bit x86-64) "/usr/lib64/" #+(or 64bit x86-64) "/usr/local/lib64/mysql/"
"/opt/mysql/lib/mysql/" "/usr/local/lib/"
"/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/"))
+ "/usr/lib/" "/usr/local/lib/mysql/" "/usr/lib/mysql/" "/mysql/lib/opt/" "/sw/lib/mysql/" "/opt/local/lib/mysql/"))
(defvar *mysql-library-candidate-drive-letters* '("C" "D" "E"))
(defvar *mysql-library-candidate-drive-letters* '("C" "D" "E"))