X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=db-odbc%2Fodbc-loader.lisp;h=16f1ec1a304da72eccd921700764ac2c7654ebfe;hp=63e39d87d673dbe0c8ff4268dc162e3f8f8fa96e;hb=d2d49ab13c98bc7a1819a0fd3968268a5567bdc3;hpb=d107be8f0cad113b96b6cfe443cc4d7c08126db4

diff --git a/db-odbc/odbc-loader.lisp b/db-odbc/odbc-loader.lisp
index 63e39d8..16f1ec1 100644
--- a/db-odbc/odbc-loader.lisp
+++ b/db-odbc/odbc-loader.lisp
@@ -7,8 +7,6 @@
 ;;;; Programmers:   Kevin M. Rosenberg
 ;;;; Date Started:  April 2004
 ;;;;
-;;;; $Id: odbc-loader.lisp 8270 2003-11-25 06:37:14Z kevin $
-;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2004 by Kevin M. Rosenberg
 ;;;;
 ;;;; CLSQL users are granted the rights to distribute and use this software
@@ -18,18 +16,9 @@
 
 (in-package #:odbc)
 
-(defparameter *odbc-library-path* 
-  (uffi:find-foreign-library
-   '("odbc32" "libodbc" "libiodbc")
-   `(,(make-pathname :directory (pathname-directory *load-truename*))
-      "/usr/lib/"
-      "/sw/lib/"
-      "/usr/local/lib/"
-      "/home/kevin/debian/src/clsql/db-odbc/"
-      "/windows/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,
@@ -38,15 +27,15 @@ set to the right path before compiling or loading the system.")
 (defvar *odbc-library-loaded* nil
   "T if foreign library was able to be loaded successfully")
 
-(defmethod clsql-base-sys:database-type-library-loaded ((database-type (eql :odbc)))
+(defmethod clsql-sys:database-type-library-loaded ((database-type (eql :odbc)))
   *odbc-library-loaded*)
-				      
-(defmethod clsql-base-sys:database-type-load-foreign ((database-type (eql :odbc)))
-  (uffi:load-foreign-library *odbc-library-path*
-			     :module "odbc") 
+
+(defmethod clsql-sys:database-type-load-foreign ((database-type (eql :odbc)))
+  (clsql-uffi:find-and-load-foreign-library *odbc-library-filenames*
+                                            :module "odbc")
   (setq *odbc-library-loaded* t))
 
-(clsql-base-sys:database-type-load-foreign :odbc)
+(clsql-sys:database-type-load-foreign :odbc)