r10115: improvments for loading on 64-bit systems

diff --git a/db-mysql/mysql-loader.lisp b/db-mysql/mysql-loader.lisp
index db664e7ba667c96263f4bf0bdd8132458b79c9e8..f3b556e29c8d3fecad115db97fa0eef1063571ce 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
-   "mysql"
+   '(#+64bit "mysql64" "mysql")
    `(,clsql-mysql-system::*library-file-dir*
      "/usr/lib/clsql/"
      "/sw/lib/clsql/")
@@ -32,7 +32,7 @@
 (defparameter *mysql-library-candidate-directories*
     `(,(pathname-directory *load-pathname*)
       "/opt/mysql/lib/mysql/" "/usr/local/lib/"
-      #+64bit "/usr/lib64/"
+      #+64bit "/usr/lib64/" #+64bit "/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"))

diff --git a/uffi/clsql-uffi-loader.lisp b/uffi/clsql-uffi-loader.lisp
index 10ac4451dde91a28d11cd9ba8d16c4c15595708d..53069884df2519222fe042bdb930744132574c44 100644 (file)
--- a/uffi/clsql-uffi-loader.lisp
+++ b/uffi/clsql-uffi-loader.lisp
@@ -20,7 +20,7 @@
 
 (defvar *clsql-uffi-library-filename* 
   (uffi:find-foreign-library
-   "uffi"
+   '(#+64bit "uffi64" "uffi")
    `(,clsql-uffi-system::*library-file-dir*
      "/usr/lib/clsql/")
    :drive-letters '("C")))