From: Kevin M. Rosenberg <kevin@rosenberg.net>
Date: Tue, 14 May 2002 16:51:06 +0000 (+0000)
Subject: r2046: Debian build
X-Git-Tag: v3.8.6~1064
X-Git-Url: http://git.kpe.io/?p=clsql.git;a=commitdiff_plain;h=058946c5c54f1d2225b49ac607edd8f5397902a8

r2046: Debian build
---

diff --git a/interfaces/clsql-uffi/clsql-uffi-loader.cl b/interfaces/clsql-uffi/clsql-uffi-loader.cl
index 519956c..0aa0fc9 100644
--- a/interfaces/clsql-uffi/clsql-uffi-loader.cl
+++ b/interfaces/clsql-uffi/clsql-uffi-loader.cl
@@ -7,7 +7,7 @@
 ;;;; Programmers:   Kevin M. Rosenberg
 ;;;; Date Started:  Mar 2002
 ;;;;
-;;;; $Id: clsql-uffi-loader.cl,v 1.9 2002/05/14 16:27:42 kevin Exp $
+;;;; $Id: clsql-uffi-loader.cl,v 1.10 2002/05/14 16:51:06 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -40,8 +40,7 @@ set to the right path before compiling or loading the system.")
 				 :supporting-libraries 
 				 *clsql-uffi-supporting-libraries*)
       (setq *uffi-library-loaded* t)
-    (warn "Unable to load helper library ~A (~S)" *clsql-uffi-library-filename*
-	  (logical-pathname-translations "CL-LIBRARY"))))
+    (warn "Unable to load helper library ~A" *clsql-uffi-library-filename*)))
 
 (load-uffi-foreign-library)
 
diff --git a/interfaces/postgresql/postgresql-loader.cl b/interfaces/postgresql/postgresql-loader.cl
index 2a420f6..bf13ca0 100644
--- 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.8 2002/05/14 16:29:53 kevin Exp $
+;;;; $Id: postgresql-loader.cl,v 1.9 2002/05/14 16:51:06 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -34,19 +34,19 @@ set to the right path before compiling or loading the system.")
 				      
 (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)))
+  (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"))))
+    (if	(uffi:load-foreign-library libpath
+				   :module "postgresql"
+				   :supporting-libraries 
+				   *postgresql-supporting-libraries*)
+	(setq *postgresql-library-loaded* t)
+      (warn "Can't load PostgreSQL client library ~A" libpath))))
 
 (clsql-sys:database-type-load-foreign :postgresql)