r9199: fold clsql-base and clsql-base-sys into clsql-base

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

diff --git a/db-postgresql/postgresql-loader.lisp b/db-postgresql/postgresql-loader.lisp
index 5a0f03932e44ee636080a35e7f7fc27b1a33dce6..420c97a56ce5dedfcd2fcd0e182fe4af069320dc 100644 (file)
--- a/db-postgresql/postgresql-loader.lisp
+++ b/db-postgresql/postgresql-loader.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: postgresql-loader.lisp,v 1.1 2002/09/30 10:19:23 kevin Exp $
+;;;; $Id$
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -16,8 +16,7 @@
 ;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL.
 ;;;; *************************************************************************
 
-(declaim (optimize (debug 3) (speed 3) (safety 1) (compilation-speed 0)))
-(in-package :postgresql)
+(in-package #:postgresql)
 
 
 (defvar *postgresql-supporting-libraries* '("crypt" "c")
@@ -28,19 +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-sys:database-type-library-loaded ((database-type
+(defmethod clsql-base:database-type-library-loaded ((database-type
                                                    (eql :postgresql)))
   *postgresql-library-loaded*)
                                      
-(defmethod clsql-base-sys:database-type-load-foreign ((database-type
+(defmethod clsql-base:database-type-load-foreign ((database-type
                                                  (eql :postgresql)))
   (let ((libpath (uffi:find-foreign-library 
                  "libpq"
                  '("/opt/postgresql/lib/" "/usr/local/lib/" 
                    "/usr/lib/" "/postgresql/lib/"
                    "/usr/local/pgsql/lib/" "/usr/lib/pgsql/"
-                   "/opt/pgsql/lib/pgsql")
-                 :drive-letters '("C" "D" "E"))))
+                   "/opt/pgsql/lib/pgsql" "/sw/lib/pgsql/")
+                 :drive-letters '("C" "D" "E")
+                 #+(or macosx darwin ccl-5.0) :types
+                 #+(or macosx darwin ccl-5.0) '("so")
+                 )))
     (if        (uffi:load-foreign-library libpath
                                   :module "postgresql"
                                   :supporting-libraries 
@@ -48,5 +50,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-sys:database-type-load-foreign :postgresql)
+(clsql-base:database-type-load-foreign :postgresql)