projects
/
clsql.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r10465: Automated commit for Debian build of clsql upstream-version-3.1.11
[clsql.git]
/
db-postgresql
/
postgresql-loader.lisp
diff --git
a/db-postgresql/postgresql-loader.lisp
b/db-postgresql/postgresql-loader.lisp
index 420c97a56ce5dedfcd2fcd0e182fe4af069320dc..ffaf53f2b7bd87bf1c955ffdeb9cc41b87697f31 100644
(file)
--- a/
db-postgresql/postgresql-loader.lisp
+++ b/
db-postgresql/postgresql-loader.lisp
@@
-27,21
+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")
(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*)
(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/"
(eql :postgresql)))
(let ((libpath (uffi:find-foreign-library
"libpq"
'("/opt/postgresql/lib/" "/usr/local/lib/"
+ #+(or 64bit x86-64) "/usr/lib64/"
"/usr/lib/" "/postgresql/lib/"
"/usr/local/pgsql/lib/" "/usr/lib/pgsql/"
"/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
: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"
)))
(if (uffi:load-foreign-library libpath
:module "postgresql"
@@
-50,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))))
(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)