X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=db-mysql%2Fmysql-loader.lisp;h=6424e7ab56ffa5c80af2bf8951da34decc70bfcf;hb=a1e81c491c0c15cc50d84b755344d07dc74e09c8;hp=957c39e48e7123105a067436e3c0180635b94b35;hpb=7a01154e40dd4516ece2ebe2267a11dec1f9a18f;p=clsql.git diff --git a/db-mysql/mysql-loader.lisp b/db-mysql/mysql-loader.lisp index 957c39e..6424e7a 100644 --- a/db-mysql/mysql-loader.lisp +++ b/db-mysql/mysql-loader.lisp @@ -18,12 +18,6 @@ (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" @@ -37,6 +31,7 @@ (uffi:find-foreign-library '("libz" "zlib") `(,(make-pathname :directory (pathname-directory *load-truename*)) + #+64bit "/usr/lib64/" "/usr/lib/" "/sw/lib/" "/usr/local/lib/" @@ -50,7 +45,9 @@ (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"))