X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=db-oracle%2Foracle-loader.lisp;h=f1493d3a1a585fb0d8c2d103d92a590f5d13b4c0;hp=9a970d36fa28e8f172bbee86e6221e23e02f8ae5;hb=ed507b70a9d910372d1378cf0a7754fc88171183;hpb=e3924d6e872f06dce33c923b15c5d30baa31460c

diff --git a/db-oracle/oracle-loader.lisp b/db-oracle/oracle-loader.lisp
index 9a970d3..f1493d3 100644
--- a/db-oracle/oracle-loader.lisp
+++ b/db-oracle/oracle-loader.lisp
@@ -5,8 +5,6 @@
 ;;;; Name:          oracle-loader.lisp
 ;;;; Purpose:       Foreign library loader for CLSQL Oracle interface
 ;;;;
-;;;; $Id$
-;;;;
 ;;;; This file is part of CLSQL.
 ;;;;
 ;;;; CLSQL users are granted the rights to distribute and use this software
@@ -23,13 +21,7 @@
   "Pathname of ORACLE_HOME as set in user environment.")
 
 (defparameter *oracle-client-library-filenames*
-  (list* "libclntsh" "oci"
-         (when *oracle-home*
-           (loop for dir-name in '("lib" "bin")
-                 nconc (loop for lib-name in '("libclntsh" "oci")
-                             collect (make-pathname :defaults lib-name
-                                                    :directory (append (pathname-directory *oracle-home*)
-                                                                       (list dir-name))))))))
+  (list "libclntsh" "oci"))
 
 (defvar *oracle-supporting-libraries* '("c")
   "Used only by CMU. List of library flags needed to be passed to ld to
@@ -43,6 +35,14 @@ set to the right path before compiling or loading the system.")
   *oracle-library-loaded*)
 
 (defmethod clsql-sys:database-type-load-foreign ((database-type (eql :oracle)))
+  (when *oracle-home*
+    (dolist (dir-name '("lib" "bin"))
+      (dolist (lib-name '("libclntsh" "oci"))
+        (clsql:push-library-path
+         (make-pathname :name lib-name
+                        :directory (append (pathname-directory *oracle-home*)
+                                           (list dir-name)))))))
+
   (clsql-uffi:find-and-load-foreign-library *oracle-client-library-filenames*
                                             :module "clsql-oracle"
                                             :supporting-libraries *oracle-supporting-libraries*)