X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=db-db2%2Fdb2-loader.lisp;h=5e5251be5f18d60223fb1f7315177913acd424e0;hp=70be07828ee9cbc0a35c55b8a0f47efcaa85aaee;hb=906d7a71b35ee1cd6d281623694bc90ced22c339;hpb=2f1b6b521b5c68e249428209a7da57f75e55da47

diff --git a/db-db2/db2-loader.lisp b/db-db2/db2-loader.lisp
index 70be078..5e5251b 100644
--- a/db-db2/db2-loader.lisp
+++ b/db-db2/db2-loader.lisp
@@ -5,8 +5,6 @@
 ;;;; Name:          db2-loader.lisp
 ;;;; Purpose:       Foreign library loader for CLSQL Db2 interface
 ;;;;
-;;;; $Id$
-;;;;
 ;;;; This file is part of CLSQL.
 ;;;;
 ;;;; CLSQL users are granted the rights to distribute and use this software
@@ -19,20 +17,17 @@
 (defparameter *db2-lib-path*
   (let ((db2-home (getenv "DB2_HOME")))
     (when db2-home
-      (make-pathname :directory 
-		     (append 
-		      (pathname-directory
-		       (parse-namestring (concatenate 'string db2-home "/")))
-			(list "lib"))))))
-
-(defparameter *db2-client-library-path* 
-    (uffi:find-foreign-library
-     "libdb2"
-     `(,@(when *load-truename* (list (make-pathname :directory (pathname-directory *load-truename*))))
-       ,@(when *db2-lib-path* (list *db2-lib-path*))
-       #+64bit "/opt/IBM/db2/V8.1/lib64/"
-       "/opt/IBM/db2/V8.1/lib/")
-     :drive-letters '("C")))
+      (make-pathname :directory
+                     (append
+                      (pathname-directory
+                       (parse-namestring (concatenate 'string db2-home "/")))
+                      (list "lib"))))))
+
+(defparameter *db2-library-filenames*
+  (if *db2-lib-path*
+    (list (merge-pathnames "libdb2" *db2-lib-path*)
+          "libdb2")
+    "libdb2"))
 
 (defvar *db2-supporting-libraries* '("c")
   "Used only by CMU. List of library flags needed to be passed to ld to
@@ -46,14 +41,11 @@ set to the right path before compiling or loading the system.")
   *db2-library-loaded*)
 
 (defmethod clsql-sys:database-type-load-foreign ((database-type (eql :db2)))
-  (if (pathnamep *db2-client-library-path*) 
-      (progn
-	(uffi:load-foreign-library *db2-client-library-path*
-				   :module "clsql-db2"
-				   :supporting-libraries 
-				   *db2-supporting-libraries*)
-	(setq *db2-library-loaded* t))
-      (warn "Unable to load db2 client library.")))
+  (clsql-uffi:find-and-load-foreign-library *db2-library-filenames*
+                                            :module "clsql-db2"
+                                            :supporting-libraries
+                                            *db2-supporting-libraries*)
+  (setq *db2-library-loaded* t))
 
 (clsql-sys:database-type-load-foreign :db2)