r10015: 21 Sep 2004 Kevin Rosenberg <kevin@rosenberg.net>

[clsql.git] / db-oracle / oracle-loader.lisp

diff --git a/db-oracle/oracle-loader.lisp b/db-oracle/oracle-loader.lisp
index 6d91e8dc1847faeb1ec10ea88d9ad01b3cd32250..72414029fb862ad234a02ae811f732220d4b66d0 100644 (file)
--- a/db-oracle/oracle-loader.lisp
+++ b/db-oracle/oracle-loader.lisp
@@ -16,21 +16,29 @@
 
 (in-package #:clsql-oracle)
 
-(defparameter *oracle-lib-path*
+(defparameter *oracle-home*
   (let ((oracle-home (getenv "ORACLE_HOME")))
     (when oracle-home
-      (make-pathname :directory 
-                    (append 
-                     (pathname-directory
-                      (parse-namestring (concatenate 'string oracle-home "/")))
-                       (list "lib"))))))
+      (parse-namestring (concatenate 'string oracle-home "/"))))
+  "Pathname of ORACLE_HOME as set in user environment.")
 
 (defparameter *oracle-client-library-path* 
     (uffi:find-foreign-library
-     "libclntsh"
-     `(,@(when *load-truename* (list (make-pathname :directory (pathname-directory *load-truename*))))
-       ,@(when *oracle-lib-path* (list *oracle-lib-path*))
-       "/usr/lib/oracle/10.1.0.2/client/lib/")
+     '("libclntsh" "oci")
+     `(,@(when *load-truename*
+          (list (make-pathname
+                 :directory (pathname-directory *load-truename*))))
+        ,@(when *oracle-home*
+            (list
+             (make-pathname :defaults *oracle-home*
+                            :directory 
+                            (append (pathname-directory *oracle-home*)
+                                    (list "lib")))
+             (make-pathname :defaults *oracle-home*
+                            :directory 
+                            (append (pathname-directory *oracle-home*)
+                                    (list "bin")))))
+        "/usr/lib/oracle/10.1.0.2/client/lib/")
      :drive-letters '("C")))
 
 (defvar *oracle-supporting-libraries* '("c")