X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=db-oracle%2Foracle-loader.lisp;h=9a970d36fa28e8f172bbee86e6221e23e02f8ae5;hb=26cfa48009c72652e0ba8ce9aed8c53216e9a3d3;hp=0af49ccd5b5e37d9a5b030b955b542f5634f4d0e;hpb=62547c6f6925d82c6fbc46801700b9256cf2c253;p=clsql.git

diff --git a/db-oracle/oracle-loader.lisp b/db-oracle/oracle-loader.lisp
index 0af49cc..9a970d3 100644
--- a/db-oracle/oracle-loader.lisp
+++ b/db-oracle/oracle-loader.lisp
@@ -16,17 +16,20 @@
 
 (in-package #:clsql-oracle)
 
-(defparameter *clsql-oracle-library-path* 
-  (uffi:find-foreign-library
-   "oracle"
-   `(,(make-pathname :directory (pathname-directory *load-truename*))
-     "/9i/lib/"
-     "/usr/lib/clsql/"
-     "/sw/lib/clsql/"
-     "/home/kevin/debian/src/clsql/db-oracle/")
-   :drive-letters '("C")))
-
-(defvar *oracle-library-candidate-drive-letters* '("C" "D" "E"))
+(defparameter *oracle-home*
+  (let ((oracle-home (getenv "ORACLE_HOME")))
+    (when oracle-home
+      (parse-namestring (concatenate 'string oracle-home "/"))))
+  "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))))))))
 
 (defvar *oracle-supporting-libraries* '("c")
   "Used only by CMU. List of library flags needed to be passed to ld to
@@ -38,14 +41,13 @@ set to the right path before compiling or loading the system.")
 
 (defmethod clsql-sys:database-type-library-loaded ((database-type (eql :oracle)))
   *oracle-library-loaded*)
-				      
+
 (defmethod clsql-sys:database-type-load-foreign ((database-type (eql :oracle)))
-  (uffi:load-foreign-library *clsql-oracle-library-path* 
-			     :module "clsql-oracle" 
-			     :supporting-libraries *oracle-supporting-libraries*)
+  (clsql-uffi:find-and-load-foreign-library *oracle-client-library-filenames*
+                                            :module "clsql-oracle"
+                                            :supporting-libraries *oracle-supporting-libraries*)
   (setq *oracle-library-loaded* t))
 
-
 (clsql-sys:database-type-load-foreign :oracle)