X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=db-odbc%2Fodbc-loader.lisp;h=5d587190d25fe0809bc731cf0daeb6088153e6b2;hp=07c77b0f968aa6026184dad8c6e7180080dd632d;hb=e567409d9fff3f7231c2a0bb69b345e19de2b246;hpb=c4a03276a7324c22d11fec72742158e23f1e76e6

diff --git a/db-odbc/odbc-loader.lisp b/db-odbc/odbc-loader.lisp
index 07c77b0..5d58719 100644
--- a/db-odbc/odbc-loader.lisp
+++ b/db-odbc/odbc-loader.lisp
@@ -18,20 +18,9 @@
 
 (in-package #:odbc)
 
-(defparameter *odbc-library-path* 
-  (uffi:find-foreign-library
-   '("odbc32" "libodbc" "libiodbc")
-   `(,(make-pathname :directory (pathname-directory *load-truename*))
-     #+64bit "/usr/lib64/"
-     "/usr/lib/"
-     "/sw/lib/"
-     "/usr/local/lib/"
-     "/home/kevin/debian/src/clsql/db-odbc/"
-     "/windows/system32/"
-     "/winnt/system32/"
-     "/odbc/lib/opt/")
-   :drive-letters '("C")))
-  
+(defparameter *odbc-library-filenames*
+  '("odbc32" "libodbc" "libiodbc"))
+
 (defvar *odbc-supporting-libraries* '("c")
   "Used only by CMU. List of library flags needed to be passed to ld to
 load the Odbc client library succesfully.  If this differs at your site,
@@ -42,10 +31,10 @@ set to the right path before compiling or loading the system.")
 
 (defmethod clsql-sys:database-type-library-loaded ((database-type (eql :odbc)))
   *odbc-library-loaded*)
-				      
+
 (defmethod clsql-sys:database-type-load-foreign ((database-type (eql :odbc)))
-  (uffi:load-foreign-library *odbc-library-path*
-			     :module "odbc") 
+  (clsql-uffi:find-and-load-foreign-library *odbc-library-filenames*
+                                            :module "odbc")
   (setq *odbc-library-loaded* t))
 
 (clsql-sys:database-type-load-foreign :odbc)