r10232: 26 Dec 2004 Kevin Rosenberg <kevin@rosenberg.net>

        * 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 90b7e64f7d1a96d932bfead65ac9c1ad88f44aea..e630206582ae900d025e7a8b7754d811e20911fb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,8 @@
 26 Dec 2004 Kevin Rosenberg <kevin@rosenberg.net>
         * 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 <kevin@rosenberg.net>
        * 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 f3b556e29c8d3fecad115db97fa0eef1063571ce..b5d6b9f499134722c0c76b7cbe3a50e2f74111dd 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
-   '(#+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"))