r1713: *** empty log message ***

[clsql.git] / interfaces / postgresql / postgresql-loader.cl

diff --git a/interfaces/postgresql/postgresql-loader.cl b/interfaces/postgresql/postgresql-loader.cl
index a2b7988c7bb1513f02850a933c7689bf0b314210..e57470e6322a64f0661671563da6c3857428eaac 100644 (file)
--- a/interfaces/postgresql/postgresql-loader.cl
+++ b/interfaces/postgresql/postgresql-loader.cl
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: postgresql-loader.cl,v 1.2 2002/03/24 04:01:26 kevin Exp $
+;;;; $Id: postgresql-loader.cl,v 1.4 2002/04/01 05:27:55 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -42,15 +42,21 @@ set to the right path before compiling or loading the system.")
 (defvar *postgresql-library-loaded* nil
   "T if foreign library was able to be loaded successfully")
 
-(defmethod database-type-library-loaded ((database-type (eql :postgresql)))
+(defmethod clsql-sys:database-type-library-loaded ((database-type
+                                                   (eql :postgresql)))
   *postgresql-library-loaded*)
                                      
-(defmethod database-type-load-foreign ((database-type (eql :postgresql)))
+(defmethod clsql-sys:database-type-load-foreign ((database-type
+                                                 (eql :postgresql)))
   (when
-      (uffi:load-foreign-library *postgresql-library-filename* 
-                                :module "postgresql"
-                                :supporting-libraries 
-                                *postgresql-supporting-libraries*)
+      (uffi:load-foreign-library 
+       (uffi:find-foreign-library 
+       "libpq"
+       '("/opt/postgresql/lib/" "/usr/local/lib" "usr/lib/" 
+         "/postgresql/lib/"))
+       :module "postgresql"
+       :supporting-libraries 
+       *postgresql-supporting-libraries*)
     (setq *postgresql-library-loaded* t)))
 
-(database-type-load-foreign :postgresql)
+(clsql-sys:database-type-load-foreign :postgresql)