clsql/db-mysql mysql-loader.lisp,1.9,1.10

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

Modified Files:
	mysql-loader.lisp 
Log Message:


Index: mysql-loader.lisp
===================================================================
RCS file: /pubcvs/clsql/db-mysql/mysql-loader.lisp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** mysql-loader.lisp	17 May 2003 06:11:16 -0000	1.9
--- mysql-loader.lisp	17 May 2003 07:02:00 -0000	1.10
***************
*** 37,46 ****
  (defparameter *libz-library-path* 
    (uffi:find-foreign-library
!    "libz"
     `(,(make-pathname :directory (pathname-directory *load-truename*))
        "/usr/lib/"
        "/sw/lib/"
        "/usr/local/lib/"
!       "/home/kevin/debian/src/clsql/db-mysql/")
     :drive-letters '("C")))
    
--- 37,47 ----
  (defparameter *libz-library-path* 
    (uffi:find-foreign-library
!    '("libz" "zlib")
     `(,(make-pathname :directory (pathname-directory *load-truename*))
        "/usr/lib/"
        "/sw/lib/"
        "/usr/local/lib/"
!       "/home/kevin/debian/src/clsql/db-mysql/"
!       "/mysql/lib/opt/")
     :drive-letters '("C")))
    
***************
*** 73,90 ****
      (unless (probe-file mysql-path)
        (error "Can't find mysql client library to load"))
!     (if	(and
! 	 (uffi:load-foreign-library *libz-library-path*) 
! 	 (uffi:load-foreign-library mysql-path
! 				    :module "mysql" 
! 				    :supporting-libraries 
! 				    *mysql-supporting-libraries*)
! 	 (uffi:load-foreign-library *clsql-mysql-library-path* 
! 				    :module "clsql-mysql" 
! 				    :supporting-libraries 
! 				    (append *mysql-supporting-libraries*)))
! 	(setq *mysql-library-loaded* t)
! 	#+ignore ;; return value not set
!       (error "Unable to load MySQL client library ~A or CLSQL-MySQL library ~A"
! 	    mysql-path *clsql-mysql-library-path*))))
  
  
--- 74,87 ----
      (unless (probe-file mysql-path)
        (error "Can't find mysql client library to load"))
!     (uffi:load-foreign-library *libz-library-path*) 
!     (uffi:load-foreign-library mysql-path
! 			       :module "mysql" 
! 			       :supporting-libraries 
! 			       *mysql-supporting-libraries*)
!     (uffi:load-foreign-library *clsql-mysql-library-path* 
! 			       :module "clsql-mysql" 
! 			       :supporting-libraries 
! 			       (append *mysql-supporting-libraries*)))
!   (setq *mysql-library-loaded* t))