r10287: more 64-bit loader improvments

diff --git a/db-mysql/Makefile b/db-mysql/Makefile
index 14721ce34bb43242754443b310c1948ffff95b96..70a2d1822213c279b06fca625c07af4f5302c5fd 100644 (file)
--- a/db-mysql/Makefile
+++ b/db-mysql/Makefile
@@ -26,7 +26,7 @@ shared_lib=$(base).so
 all: $(shared_lib)
 
 $(shared_lib): $(source) Makefile
-       CFLAGS="-I /usr/include/mysql -I /usr/local/include/mysql -I /sw/include/mysql -I /opt/local/include/mysql" LDFLAGS="-L/usr/local/lib/mysql -L/usr/lib/mysql -L/sw/lib -L/opt/local/lib/mysql -lmysqlclient" BASE=$(base) OBJECT=$(object) SOURCE=$(source) SHARED_LIB=$(shared_lib) sh make.sh
+       CFLAGS="-I /usr/local/include/mysql -I /usr/include/mysql -I /sw/include/mysql -I /opt/local/include/mysql" LDFLAGS="-L/usr/local/lib64/mysql -L/usr/lib/mysql -L/sw/lib -L/opt/local/lib/mysql -lmysqlclient" BASE=$(base) OBJECT=$(object) SOURCE=$(source) SHARED_LIB=$(shared_lib) sh make.sh
        rm $(object)
 
 .PHONY: distclean

diff --git a/db-mysql/mysql-loader.lisp b/db-mysql/mysql-loader.lisp
index b5d6b9f499134722c0c76b7cbe3a50e2f74111dd..ffcc576c8287805f54d8b1f14bd7aabaa0b75c52 100644 (file)
--- a/db-mysql/mysql-loader.lisp
+++ b/db-mysql/mysql-loader.lisp
@@ -31,11 +31,8 @@
 
 (defparameter *mysql-library-candidate-directories*
     `(,(pathname-directory *load-pathname*)
-      "/opt/mysql/lib/mysql/" "/usr/local/lib/"
       #+(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/"
-
+      "/opt/mysql/lib/mysql/" "/usr/local/lib/"
       "/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 53069884df2519222fe042bdb930744132574c44..8b9efb7207601f7c490d0898d73e7dba28125945 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
-   '(#+64bit "uffi64" "uffi")
+   '(#+(or 64bit x86-64) "uffi64" "uffi")
    `(,clsql-uffi-system::*library-file-dir*
      "/usr/lib/clsql/")
    :drive-letters '("C")))