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

diff --git a/db-mysql/mysql-loader.lisp b/db-mysql/mysql-loader.lisp
index 355f2b7..7960808 100644
--- a/db-mysql/mysql-loader.lisp
+++ b/db-mysql/mysql-loader.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmers:   Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: mysql-loader.lisp,v 1.2 2002/10/17 17:01:18 kevin Exp $
+;;;; $Id: mysql-loader.lisp,v 1.4 2002/10/18 01:16:26 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -29,7 +29,7 @@
   (uffi:find-foreign-library
    "clsql-mysql"
    `(,(make-pathname :directory (pathname-directory *load-truename*))
-     "/opt/lisp/clsql/db-mysql/"
+     "/usr/lib/clsql/"
      "/home/kevin/debian/src/clsql/db-mysql/")
    :drive-letters '("C" "D" "E" "F" "G")))
   
@@ -39,20 +39,24 @@
       "/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
-      (warn "Can't find MySQL client library to load.")))
+      (error "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/"))
+    '("/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"))
 
@@ -72,11 +76,16 @@ set to the right path before compiling or loading the system.")
 	 (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/")))
+				    *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" 
@@ -87,7 +96,7 @@ set to the right path before compiling or loading the system.")
 				    :supporting-libraries 
 				    (append *mysql-supporting-libraries*)))
 	(setq *mysql-library-loaded* t)
-      (warn "Unable to load MySQL client library ~A or CLSQL-MySQL library ~A"
+      (error "Unable to load MySQL client library ~A or CLSQL-MySQL library ~A"
 	    mysql-path *clsql-mysql-library-filename*))))