-(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-path*
+ (uffi:find-foreign-library
+ '("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")))