r10310: 29 Jan 2005 Kevin Rosenberg <kevin@rosenberg.net>

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

diff --git a/db-postgresql/postgresql-loader.lisp b/db-postgresql/postgresql-loader.lisp
index 169588f742e02fabb4d4992a66a051e8296aa3f3..ffaf53f2b7bd87bf1c955ffdeb9cc41b87697f31 100644 (file)
--- a/db-postgresql/postgresql-loader.lisp
+++ b/db-postgresql/postgresql-loader.lisp
@@ -27,22 +27,22 @@ 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 clsql-base:database-type-library-loaded ((database-type
+(defmethod clsql-sys:database-type-library-loaded ((database-type
                                                    (eql :postgresql)))
   *postgresql-library-loaded*)
                                      
-(defmethod clsql-base:database-type-load-foreign ((database-type
+(defmethod clsql-sys:database-type-load-foreign ((database-type
                                                  (eql :postgresql)))
   (let ((libpath (uffi:find-foreign-library 
                  "libpq"
                  '("/opt/postgresql/lib/" "/usr/local/lib/" 
-                   #+64bit "/usr/lib64/"
+                   #+(or 64bit x86-64) "/usr/lib64/"
                    "/usr/lib/" "/postgresql/lib/"
                    "/usr/local/pgsql/lib/" "/usr/lib/pgsql/"
-                   "/opt/pgsql/lib/pgsql" "/sw/lib/pgsql/")
+                   "/opt/pgsql/lib/pgsql" "/sw/lib/pgsql/" "/sw/lib/")
                  :drive-letters '("C" "D" "E")
                  #+(or macosx darwin ccl-5.0) :types
-                 #+(or macosx darwin ccl-5.0) '("so")
+                 #+(or macosx darwin ccl-5.0) '("so" "dylib")
                  )))
     (if        (uffi:load-foreign-library libpath
                                   :module "postgresql"
@@ -51,5 +51,5 @@ set to the right path before compiling or loading the system.")
        (setq *postgresql-library-loaded* t)
       (warn "Can't load PostgreSQL client library ~A" libpath))))
 
-(clsql-base:database-type-load-foreign :postgresql)
+(clsql-sys:database-type-load-foreign :postgresql)