X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=db-mysql%2Fmysql-loader.lisp;h=b102fcbdade60dc945193ece7b7ca4551d1310fe;hp=79608087b5ab7e6b881dd7786922b0e5d1c65540;hb=18e34efea688a6758b6e997401fbc3f241da98f3;hpb=2d19cbacba4b7c4b65799b267e819c9af4a8d2b4

diff --git a/db-mysql/mysql-loader.lisp b/db-mysql/mysql-loader.lisp
index 7960808..b102fcb 100644
--- a/db-mysql/mysql-loader.lisp
+++ b/db-mysql/mysql-loader.lisp
@@ -2,63 +2,32 @@
 ;;;; *************************************************************************
 ;;;; FILE IDENTIFICATION
 ;;;;
-;;;; Name:          mysql-loader.sql
-;;;; Purpose:       MySQL library loader using UFFI
-;;;; Programmers:   Kevin M. Rosenberg
-;;;; Date Started:  Feb 2002
+;;;; Name:     mysql-loader.sql
+;;;; Purpose:  MySQL library loader using UFFI
+;;;; Author:   Kevin M. Rosenberg
+;;;; Created:  Feb 2002
 ;;;;
-;;;; $Id: mysql-loader.lisp,v 1.4 2002/10/18 01:16:26 kevin Exp $
+;;;; $Id$
 ;;;;
-;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
+;;;; This file, part of CLSQL, is Copyright (c) 2002-2004 by Kevin M. Rosenberg
 ;;;;
 ;;;; CLSQL users are granted the rights to distribute and use this software
 ;;;; as governed by the terms of the Lisp Lesser GNU Public License
 ;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL.
 ;;;; *************************************************************************
 
-(declaim (optimize (debug 3) (speed 3) (safety 1) (compilation-speed 0)))
-(in-package :mysql)
+(in-package #:mysql)
 
-;;;; Modified by Kevin Rosenberg 
-;;;;  - probe potential directories to find library
-;;;;  - Changed from CMUCL functions to UFFI to
-;;;;      -- prevent library from being loaded multiple times
-;;;;      -- support Allegro CL and Lispworks
-
-(defvar *clsql-mysql-library-filename* 
-  (uffi:find-foreign-library
-   "clsql-mysql"
-   `(,(make-pathname :directory (pathname-directory *load-truename*))
-     "/usr/lib/clsql/"
-     "/home/kevin/debian/src/clsql/db-mysql/")
-   :drive-letters '("C" "D" "E" "F" "G")))
-  
-(defvar *mysql-library-filename*
-    (cond
-     ((probe-file "/opt/mysql/lib/mysql/libmysqlclient.so")
-      "/opt/mysql/lib/mysql/libmysqlclient.so")
-     ((probe-file "/usr/local/lib/libmysqlclient.so")
-      "/usr/local/lib/libmysqlclient.so")
-     ((probe-file "/usr/local/lib/mysql/libmysqlclient.so")
-      "/usr/local/lib/mysql/libmysqlclient.so")
-     ((probe-file "/usr/lib/libmysqlclient.so")
-      "/usr/lib/libmysqlclient.so")
-     ((probe-file "/usr/lib/mysql/libmysqlclient.so")
-      "/usr/lib/mysql/libmysqlclient.so")
-     #+(or win32 mswindows) 
-     ((probe-file "c:/mysql/lib/opt/libmysql.dll")
-      "c:/mysql/lib/opt/libmysql.dll")
-     (t
-      (error "Can't find MySQL client library to load.")))
-  "Location where the MySQL client library is to be found.")
+(defparameter *clsql-mysql-library-candidate-names* 
+  (list #+(or 64bit x86-64) "clsql_mysql64"
+        #+(or 64bit x86-64) (make-pathname :name "clsql_mysql64"
+                                           :directory (pathname-directory *load-truename*))
+        "clsql_mysql"
+        (make-pathname :name "clsql_mysql"
+                       :directory (pathname-directory *load-truename*))))
 
 (defvar *mysql-library-candidate-names*
-    '("libmysqlclient" "libmysql"))
-
-(defvar *mysql-library-candidate-directories*
-    '("/opt/mysql/lib/mysql/" "/usr/local/lib/" "/usr/lib/" "/usr/local/lib/mysql/" "/usr/lib/mysql/" "/mysql/lib/opt/"))
-
-(defvar *mysql-library-candidate-drive-letters* '("C" "D" "E"))
+  '("libmysqlclient" "libmysql"))
 
 (defvar *mysql-supporting-libraries* '("c")
   "Used only by CMU. List of library flags needed to be passed to ld to
@@ -68,37 +37,18 @@ set to the right path before compiling or loading the system.")
 (defvar *mysql-library-loaded* nil
   "T if foreign library was able to be loaded successfully")
 
-(defmethod clsql-base-sys:database-type-library-loaded ((database-type (eql :mysql)))
+(defmethod clsql-sys:database-type-library-loaded ((database-type (eql :mysql)))
   *mysql-library-loaded*)
 				      
-(defmethod clsql-base-sys:database-type-load-foreign ((database-type (eql :mysql)))
-  (let ((mysql-path
-	 (uffi:find-foreign-library *mysql-library-candidate-names*
-				    *mysql-library-candidate-directories*
-				    :drive-letters
-				    *mysql-library-candidate-drive-letters*))
-	(zlib-path
-	 (uffi:find-foreign-library '("libz" "zlib")
-				    '("/usr/lib/" "/usr/local/lib/" "/lib/"))))
-    (unless (probe-file mysql-path)
-      (error "Can't find mysql client library to load"))
-    (unless (probe-file zlib-path)
-      (error "Can't find zlib client library to load"))
-    
-    (uffi:load-foreign-library zlib-path) 
-    (if	(and
-	 (uffi:load-foreign-library mysql-path
-				    :module "mysql" 
-				    :supporting-libraries 
-				    *mysql-supporting-libraries*)
-	 (uffi:load-foreign-library *clsql-mysql-library-filename* 
-				    :module "clsql-mysql" 
-				    :supporting-libraries 
-				    (append *mysql-supporting-libraries*)))
-	(setq *mysql-library-loaded* t)
-      (error "Unable to load MySQL client library ~A or CLSQL-MySQL library ~A"
-	    mysql-path *clsql-mysql-library-filename*))))
+(defmethod clsql-sys:database-type-load-foreign ((database-type (eql :mysql)))
+  (clsql-uffi:find-and-load-foreign-library *mysql-library-candidate-names*
+                                            :module "mysql" 
+                                            :supporting-libraries *mysql-supporting-libraries*)
+  (clsql-uffi:find-and-load-foreign-library *clsql-mysql-library-candidate-names*
+                                            :module "clsql-mysql" 
+                                            :supporting-libraries *mysql-supporting-libraries*)
+  (setq *mysql-library-loaded* t))
 
 
-(clsql-base-sys:database-type-load-foreign :mysql)
+(clsql-sys:database-type-load-foreign :mysql)