X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=db-mysql%2Fmysql-loader.lisp;h=db664e7ba667c96263f4bf0bdd8132458b79c9e8;hb=2961f4f122593e9d4875e88e6af159de28c8dd47;hp=f61223a503e7a94c0e8879f8895eac553f53cb4d;hpb=02e4933f6db6ce5b91a90b6b236acb9eb960de70;p=clsql.git diff --git a/db-mysql/mysql-loader.lisp b/db-mysql/mysql-loader.lisp index f61223a..db664e7 100644 --- a/db-mysql/mysql-loader.lisp +++ b/db-mysql/mysql-loader.lisp @@ -26,19 +26,6 @@ "/sw/lib/clsql/") :drive-letters '("C"))) -(defparameter *libz-library-path* - (uffi:find-foreign-library - '("libz" "zlibwapi" "zlib") - `(,(make-pathname :directory (pathname-directory *load-truename*)) - #+64bit "/usr/lib64/" - "/usr/lib/" - "/sw/lib/" - "/usr/local/lib/" - "/bin/" - "/mysql/lib/dll32/" - "/mysql/lib/opt/") - :drive-letters '("C"))) - (defvar *mysql-library-candidate-names* '("libmysqlclient" "libmysql")) @@ -46,7 +33,7 @@ `(,(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/")) + "/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")) @@ -69,7 +56,6 @@ 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")) - (uffi:load-foreign-library *libz-library-path*) (uffi:load-foreign-library mysql-path :module "mysql" :supporting-libraries