From: Kevin M. Rosenberg Date: Mon, 27 Dec 2004 06:06:37 +0000 (+0000) Subject: r10232: 26 Dec 2004 Kevin Rosenberg X-Git-Tag: v3.8.6~195 X-Git-Url: http://git.kpe.io/?p=clsql.git;a=commitdiff_plain;h=c0f15eada06c0c53437a5b3acc72ab1cd3c72df1 r10232: 26 Dec 2004 Kevin Rosenberg * doc/ref-fdml.lisp: Fix variable tag name to varname [noted by Eduardo Munoz] * db-mysql/mysql-loader.lisp: Handle library paths for 64-bit systems --- diff --git a/ChangeLog b/ChangeLog index 90b7e64..e630206 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,8 @@ 26 Dec 2004 Kevin Rosenberg * doc/ref-fdml.lisp: Fix variable tag name to varname [noted by Eduardo Munoz] - + * db-mysql/mysql-loader.lisp: Handle library paths for 64-bit systems + 06 Dec 2004 Kevin Rosenberg * Version 3.1.2 * sql/ooddl.lisp: Accept patch from Klaus Harbo for diff --git a/db-mysql/mysql-loader.lisp b/db-mysql/mysql-loader.lisp index f3b556e..b5d6b9f 100644 --- 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 - '(#+64bit "mysql64" "mysql") + '(#+(or 64bit x86-64) "mysql64" "mysql") `(,clsql-mysql-system::*library-file-dir* "/usr/lib/clsql/" "/sw/lib/clsql/") @@ -32,7 +32,10 @@ (defparameter *mysql-library-candidate-directories* `(,(pathname-directory *load-pathname*) "/opt/mysql/lib/mysql/" "/usr/local/lib/" - #+64bit "/usr/lib64/" #+64bit "/usr/local/lib64/mysql/" + #+(or 64bit x86-64) "/usr/lib64/" #+(or 64bit x86-64) "/usr/local/lib64/mysql/" + #+(or 64bit x86-64) "/usr/local/lib64/" + #+(or 64bit x86-64) "/usr/local/lib64/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"))