r9325: * db-*/*-loader.lisp: Load 64-bit libraries on 64-bit platorms

diff --git a/ChangeLog b/ChangeLog
index 4a29be946ca151eb8803d78ceaa2c5a155d44b49..8a0800530f8d355708ad70edbfd9898bb21703d6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 11 May 2004 Kevin Rosenberg (kevin@rosenberg.net)
        * db-mysql/mysql-api.lisp: Fix int vs. long slots in foreign
        structures found by testing with AllegroCL 7.0b AMD64.
+       * db-*/*-loader.lisp: Load 64-bit libraries on 64-bit platorms
        * sql/objects.lisp: Initial caching support for SELECT
        * tests/test-oodml.lisp: Avoid using cache when testing select.
        * sql/kmr-mop.lisp: Explicitly check slot order and

diff --git a/db-odbc/odbc-loader.lisp b/db-odbc/odbc-loader.lisp
index 45bb6ffd908e3cb8ca08109244607ae63a6616d4..94206d8aa8342f1e270aef896a83cae0b6c1e891 100644 (file)
--- a/db-odbc/odbc-loader.lisp
+++ b/db-odbc/odbc-loader.lisp
@@ -22,6 +22,7 @@
   (uffi:find-foreign-library
    '("odbc32" "libodbc" "libiodbc")
    `(,(make-pathname :directory (pathname-directory *load-truename*))
+     #+64bit "/usr/lib64/"
       "/usr/lib/"
       "/sw/lib/"
       "/usr/local/lib/"

diff --git a/db-postgresql/postgresql-loader.lisp b/db-postgresql/postgresql-loader.lisp
index 420c97a56ce5dedfcd2fcd0e182fe4af069320dc..169588f742e02fabb4d4992a66a051e8296aa3f3 100644 (file)
--- a/db-postgresql/postgresql-loader.lisp
+++ b/db-postgresql/postgresql-loader.lisp
@@ -36,6 +36,7 @@ set to the right path before compiling or loading the system.")
   (let ((libpath (uffi:find-foreign-library 
                  "libpq"
                  '("/opt/postgresql/lib/" "/usr/local/lib/" 
+                   #+64bit "/usr/lib64/"
                    "/usr/lib/" "/postgresql/lib/"
                    "/usr/local/pgsql/lib/" "/usr/lib/pgsql/"
                    "/opt/pgsql/lib/pgsql" "/sw/lib/pgsql/")

diff --git a/db-sqlite/sqlite-loader.lisp b/db-sqlite/sqlite-loader.lisp
index 1cfcf21ffb675b52a20324907d5cb8be3bac6ff4..71e33854da3dc5aa0d664241dbf710a9805a2084 100644 (file)
--- a/db-sqlite/sqlite-loader.lisp
+++ b/db-sqlite/sqlite-loader.lisp
@@ -37,7 +37,8 @@ set to the right path before compiling or loading the system.")
   #-clisp
   (let ((libpath (uffi:find-foreign-library
                  "libsqlite"
-                 '("/usr/lib/" "/usr/local/lib/")
+                 '(#+64bit "/usr/lib64/"
+                   "/usr/lib/" "/usr/local/lib/")
                  :drive-letters '("C" "D" "E"))))
     (if (uffi:load-foreign-library libpath
                                   :module "sqlite"

diff --git a/tests/test-init.lisp b/tests/test-init.lisp
index ed949879c440b32c3a5ffd5116845f929d994fb6..9cf50ff6b2508d47dc58e1942f8d522c835d5cd7 100644 (file)
--- a/tests/test-init.lisp
+++ b/tests/test-init.lisp
@@ -16,7 +16,7 @@
 
 (in-package #:clsql-tests)
 
-(defvar *report-stream* nil "Stream to send text report.")
+(defvar *report-stream* *standard-output* "Stream to send text report.")
 (defvar *sexp-report-stream* nil "Stream to send sexp report.")
 (defvar *rt-connection*)
 (defvar *rt-fddl*)