X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=interfaces%2Fmysql%2Fmysql-loader.cl;h=85ccff222842d2abcc540009986ac5cabdd0ffdc;hb=6f1d57f65eae54947f40b751c0e588a6ca7f4254;hp=df0bd643915574b513f550d30a7fc40e3802475c;hpb=8213ff48f5362c3d4792444c929f50bd128bd044;p=clsql.git

diff --git a/interfaces/mysql/mysql-loader.cl b/interfaces/mysql/mysql-loader.cl
index df0bd64..85ccff2 100644
--- a/interfaces/mysql/mysql-loader.cl
+++ b/interfaces/mysql/mysql-loader.cl
@@ -7,7 +7,7 @@
 ;;;; Programmers:   Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: mysql-loader.cl,v 1.1 2002/03/23 14:04:52 kevin Exp $
+;;;; $Id: mysql-loader.cl,v 1.11 2002/05/14 16:16:54 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -26,12 +26,13 @@
 ;;;;      -- support Allegro CL and Lispworks
 
 (defvar *clsql-mysql-library-filename* 
-    (translate-logical-pathname 
-     #+(or linux unix) "CLSQL:interfaces;mysql;clsql-mysql.so"
-     #+(or mswindows win32) "CLSQL:interfaces;mysql;clsql-mysql.dll"
-     ))
+  (uffi:find-foreign-library
+   "clsql-mysql"
+   `(,(translate-logical-pathname 
+       "CL-LIBRARY:clsql;interfaces;clsql-uffi;")
+     "/usr/share/common-lisp/source/clsql/interfaces/clsql-uffi/")))
 
-(defvar *mysql-library-filename* 
+(defvar *mysql-library-filename*
     (cond
      ((probe-file "/opt/mysql/lib/mysql/libmysqlclient.so")
       "/opt/mysql/lib/mysql/libmysqlclient.so")
@@ -46,24 +47,51 @@
       (warn "Can't find MySQL client library to load.")))
   "Location where the MySQL client library is to be found.")
 
+(defvar *mysql-library-candidate-names*
+    '("libmysqlclient" "libmysql"))
+
+(defvar *mysql-library-candidate-directories*
+    '("/opt/mysql/lib/mysql/" "/usr/local/lib/" "/usr/lib/" "/mysql/lib/opt/"))
+
+(defvar *mysql-library-candidate-drive-letters* '("C" "D" "E"))
+
 (defvar *mysql-supporting-libraries* '("c")
   "Used only by CMU. List of library flags needed to be passed to ld to
 load the MySQL client library succesfully.  If this differs at your site,
 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 database-type-load-foreign ((database-type (eql :mysql)))
-  (uffi:load-foreign-library *mysql-library-filename* 
-			     :module "mysql" 
-                             :supporting-libraries 
-			     *mysql-supporting-libraries*)
-  (uffi:load-foreign-library *clsql-mysql-library-filename* 
-			     :module "clsql-mysql" 
-                             :supporting-libraries 
-			     (append *mysql-supporting-libraries*)))
-
-
-(database-type-load-foreign :mysql)
+(defmethod clsql-sys:database-type-library-loaded ((database-type (eql :mysql)))
+  *mysql-library-loaded*)
+				      
+(defmethod clsql-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 required to load mysql on CMUCL Solaris
+    (uffi:load-foreign-library 
+     (uffi:find-foreign-library '("libz" "zlib")
+				'("/usr/lib/" "/usr/local/" "/lib/")))
+    (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)
+      (warn "Unable to load MySQL client library ~A or CLSQL-MySQL library ~A"
+	    mysql-path *clsql-mysql-library-filename*))))
 
 
+(clsql-sys:database-type-load-foreign :mysql)
+(when (clsql-sys:database-type-library-loaded :mysql)
+  (clsql-sys:initialize-database-type :database-type :mysql)
+  (setq clsql:*default-database-type* :mysql)
+  (pushnew :mysql cl:*features*))