clsql/db-mysql mysql-loader.lisp,1.4,1.5

Update of /pubcvs/clsql/db-mysql
In directory boa.b9.com:/tmp/cvs-serv27621/db-mysql

Modified Files:
	mysql-loader.lisp 
Log Message:
load library fixes


Index: mysql-loader.lisp
===================================================================
RCS file: /pubcvs/clsql/db-mysql/mysql-loader.lisp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** mysql-loader.lisp	18 Oct 2002 01:16:26 -0000	1.4
--- mysql-loader.lisp	23 Nov 2002 18:00:26 -0000	1.5
***************
*** 31,61 ****
     `(,(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.")
- 
  (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"))
--- 31,43 ----
     `(,(make-pathname :directory (pathname-directory *load-truename*))
       "/usr/lib/clsql/"
+      "/sw/lib/clsql/"
       "/home/kevin/debian/src/clsql/db-mysql/")
!    :drive-letters '("C" "D" "E")))
    
  (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/" "/sw/lib/mysql/"))
  
  (defvar *mysql-library-candidate-drive-letters* '("C" "D" "E"))
***************
*** 85,89 ****
      (unless (probe-file zlib-path)
        (error "Can't find zlib client library to load"))
!     
      (uffi:load-foreign-library zlib-path) 
      (if	(and
--- 67,71 ----
      (unless (probe-file zlib-path)
        (error "Can't find zlib client library to load"))
! 
      (uffi:load-foreign-library zlib-path) 
      (if	(and