r2033: move initialize code for better .system compilation

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

diff --git a/interfaces/postgresql/postgresql-loader.cl b/interfaces/postgresql/postgresql-loader.cl
index 4db5fd426a63054a5e2b6f77075a191380d2fb3c..30cff4f813112d4a548a57a12d9f43ea1091a7e7 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.1 2002/03/23 14:04:53 kevin Exp $
+;;;; $Id: postgresql-loader.cl,v 1.7 2002/05/13 22:05:21 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -19,30 +19,36 @@
 (declaim (optimize (debug 3) (speed 3) (safety 1) (compilation-speed 0)))
 (in-package :postgresql)
 
-(defvar *postgresql-library-filename* 
-    (cond
-     ((probe-file "/opt/postgresql/lib/libpq.so")
-      "/opt/postgresql/lib/libpq.so")
-     ((probe-file "/usr/local/lib/libpq.so")
-      "/usr/local/lib/libpq.so")
-     ((probe-file "/usr/lib/libpq.so")
-      "/usr/lib/libpq.so")
-     #+(or win32 mswindows) 
-     ((probe-file "c:/postgresql/lib/libpq.dll")
-      "c:/postgresql/lib/libpq.dll")
-     (t
-      (warn "Can't find PostgresQL client library to load.")))
-  "Location where the PostgresSQL client library is to be found.")
 
 (defvar *postgresql-supporting-libraries* '("crypt" "c")
   "Used only by CMU. List of library flags needed to be passed to ld to
 load the PostgresSQL client library succesfully.  If this differs at your site,
 set to the right path before compiling or loading the system.")
 
-(defmethod database-type-load-foreign ((database-type (eql :postgresql)))
-  (uffi:load-foreign-library *postgresql-library-filename* 
-                            :module "postgresql"
-                            :supporting-libraries 
-                            *postgresql-supporting-libraries*))
+(defvar *postgresql-library-loaded* nil
+  "T if foreign library was able to be loaded successfully")
 
-(database-type-load-foreign :postgresql)
+(defmethod clsql-sys:database-type-library-loaded ((database-type
+                                                   (eql :postgresql)))
+  *postgresql-library-loaded*)
+                                     
+(defmethod clsql-sys:database-type-load-foreign ((database-type
+                                                 (eql :postgresql)))
+  (when
+      (uffi:load-foreign-library 
+       (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"))
+       
+       :module "postgresql"
+       :supporting-libraries 
+       *postgresql-supporting-libraries*)
+    (setq *postgresql-library-loaded* t)))
+
+(clsql-sys:database-type-load-foreign :postgresql)
+(when (clsql-sys:database-type-library-loaded :postgresql)
+  (clsql-sys:initialize-database-type :database-type :postgresql)
+  (pushnew :postgresql cl:*features*))