r9574: Remove loading of unnecessary zlib library

diff --git a/ChangeLog b/ChangeLog
index 4f5efd5f73d89441d7ecbf155e4f4bf061c5fd30..ca87d0381db43262fb658ecf4ff89e8edd0cd3e8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+10 Jun 2004 Kevin Rosenberg <kevin@rosenberg.net>
+       * db-mysql/mysql-loader.lisp: Remove load of unnecessary zlib library
+       

 9 Jun 2004 Kevin Rosenberg <kevin@rosenberg.net>
        * Version 2.11.7 released
        * uffi/clsql-uffi-loader.lisp: Apply patch from Edi Weitz
 9 Jun 2004 Kevin Rosenberg <kevin@rosenberg.net>
        * Version 2.11.7 released
        * uffi/clsql-uffi-loader.lisp: Apply patch from Edi Weitz

diff --git a/db-mysql/mysql-loader.lisp b/db-mysql/mysql-loader.lisp
index f61223a503e7a94c0e8879f8895eac553f53cb4d..bd972f48d73f6909c174d20f9acbddc88234d058 100644 (file)
--- a/db-mysql/mysql-loader.lisp
+++ b/db-mysql/mysql-loader.lisp
@@ -26,19 +26,6 @@
      "/sw/lib/clsql/")
    :drive-letters '("C")))
 
      "/sw/lib/clsql/")
    :drive-letters '("C")))
 

-(defparameter *libz-library-path* 
-  (uffi:find-foreign-library
-   '("libz" "zlibwapi" "zlib")
-   `(,(make-pathname :directory (pathname-directory *load-truename*))
-     #+64bit "/usr/lib64/"
-     "/usr/lib/"
-     "/sw/lib/"
-     "/usr/local/lib/"
-     "/bin/"
-     "/mysql/lib/dll32/"
-     "/mysql/lib/opt/")
-   :drive-letters '("C")))
-  

 (defvar *mysql-library-candidate-names*
     '("libmysqlclient" "libmysql"))
 
 (defvar *mysql-library-candidate-names*
     '("libmysqlclient" "libmysql"))
 


@@ -69,7 +56,6 @@ set to the right path before compiling or loading the system.")
                                    *mysql-library-candidate-drive-letters*)))
     (unless (probe-file mysql-path)
       (error "Can't find mysql client library to load"))
                                    *mysql-library-candidate-drive-letters*)))
     (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 
     (uffi:load-foreign-library mysql-path
                               :module "mysql" 
                               :supporting-libraries