r10262: add missing package name to mysql::flags

[clsql.git] / db-mysql / mysql-loader.lisp

diff --git a/db-mysql/mysql-loader.lisp b/db-mysql/mysql-loader.lisp
index f61223a503e7a94c0e8879f8895eac553f53cb4d..b5d6b9f499134722c0c76b7cbe3a50e2f74111dd 100644 (file)
--- a/db-mysql/mysql-loader.lisp
+++ b/db-mysql/mysql-loader.lisp
@@ -20,33 +20,23 @@
 
 (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/")
    :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"))
 
 (defparameter *mysql-library-candidate-directories*
     `(,(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/"))
+      #+(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"))
 
@@ -69,7 +59,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