r2045: Debian build

diff --git a/clsql-mysql.system b/clsql-mysql.system
index ec953c8b51518d7cb3f602a4684d103b3ef64603..dacf165ec868c841b39e38921864324f4dfb1f33 100644 (file)
--- a/clsql-mysql.system
+++ b/clsql-mysql.system
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg\r
 ;;;; Date Started:  Feb 2002\r
 ;;;;\r
-;;;; $Id: clsql-mysql.system,v 1.12 2002/05/14 16:23:37 kevin Exp $\r
+;;;; $Id: clsql-mysql.system,v 1.13 2002/05/14 16:25:29 kevin Exp $\r
 ;;;;\r
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg\r
 ;;;;\r
@@ -22,10 +22,6 @@
 \r
 ;;; System definition\r
 \r
-(mk:load-system :uffi)\r
-(mk:load-system :clsql-base)\r
-(mk:load-system :clsql-uffi)\r
-\r
 (mk:defsystem :clsql-mysql\r
     :source-pathname "CL-LIBRARY:clsql;interfaces;mysql;"\r
     :source-extension "cl"\r

diff --git a/interfaces/clsql-uffi/clsql-uffi-loader.cl b/interfaces/clsql-uffi/clsql-uffi-loader.cl
index 3313aef77d4cef5ee084eaf778c1980d96d0aec2..519956c1cda379d5486df15c2b80b01b4ebd57ef 100644 (file)
--- 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.8 2002/05/14 16:10:55 kevin Exp $
+;;;; $Id: clsql-uffi-loader.cl,v 1.9 2002/05/14 16:27:42 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -23,8 +23,8 @@
   (uffi:find-foreign-library
    "clsql-uffi"
    `(,(translate-logical-pathname 
-       "CL-LIBRARY:clsql;interfaces;clsql-mysql;")
-     "/usr/share/common-lisp/source/clsql/interfaces/clsql-mysql/")))
+       "CL-LIBRARY:clsql;interfaces;clsql-uffi;")
+     "/usr/share/common-lisp/source/clsql/interfaces/clsql-uffi/")))
 
 (defvar *clsql-uffi-supporting-libraries* '("c")
   "Used only by CMU. List of library flags needed to be passed to ld to

diff --git a/interfaces/mysql/mysql-loader.cl b/interfaces/mysql/mysql-loader.cl
index a0afeb5e91db00df9d074426488a75c9ce45e308..13e504376afbdb9d17f7ef6198c8e0579ed50a8c 100644 (file)
--- a/interfaces/mysql/mysql-loader.cl
+++ b/interfaces/mysql/mysql-loader.cl
@@ -7,7 +7,7 @@
 ;;;; Programmers:   Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: mysql-loader.cl,v 1.12 2002/05/14 16:19:11 kevin Exp $
+;;;; $Id: mysql-loader.cl,v 1.13 2002/05/14 16:29:53 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -91,7 +91,4 @@ set to the right path before compiling or loading the system.")
 
 
 (clsql-sys:database-type-load-foreign :mysql)
-(when (clsql-sys:database-type-library-loaded :mysql)
-  (clsql-sys:initialize-database-type :database-type :mysql)
-  (setq clsql:*default-database-type* :mysql)
-  (pushnew :mysql cl:*features*))
+

diff --git a/interfaces/mysql/mysql-sql.cl b/interfaces/mysql/mysql-sql.cl
index 264c71b51fff17fed48baa4221db803fe031c946..ca8225b33660f5dd1cb436367c235bff4ba02da7 100644 (file)
--- a/interfaces/mysql/mysql-sql.cl
+++ b/interfaces/mysql/mysql-sql.cl
@@ -8,7 +8,7 @@
 ;;;;                Original code by Pierre R. Mai 
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: mysql-sql.cl,v 1.19 2002/04/27 20:58:11 kevin Exp $
+;;;; $Id: mysql-sql.cl,v 1.20 2002/05/14 16:29:53 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;; and Copyright (c) 1999-2001 by Pierre R. Mai
@@ -256,3 +256,7 @@
       list)))
 
 
+(when (clsql-sys:database-type-library-loaded :mysql)
+  (clsql-sys:initialize-database-type :database-type :mysql)
+  (setq clsql:*default-database-type* :mysql)
+  (pushnew :mysql cl:*features*))

diff --git a/interfaces/postgresql/postgresql-loader.cl b/interfaces/postgresql/postgresql-loader.cl
index 30cff4f813112d4a548a57a12d9f43ea1091a7e7..2a420f6ad93ed66cb97f1e547396004af279a87d 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.7 2002/05/13 22:05:21 kevin Exp $
+;;;; $Id: postgresql-loader.cl,v 1.8 2002/05/14 16:29:53 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -49,6 +49,4 @@ set to the right path before compiling or loading the system.")
     (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*))
+

diff --git a/interfaces/postgresql/postgresql-sql.cl b/interfaces/postgresql/postgresql-sql.cl
index 7e9d6e89a4051d5bedf0f8ea86ba4443707d2c9b..41b43bf7673245c5adbc3c40c39a599a411f2b6e 100644 (file)
--- a/interfaces/postgresql/postgresql-sql.cl
+++ b/interfaces/postgresql/postgresql-sql.cl
@@ -8,7 +8,7 @@
 ;;;;                Original code by Pierre R. Mai 
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: postgresql-sql.cl,v 1.16 2002/05/10 08:05:48 marc.battyani Exp $
+;;;; $Id: postgresql-sql.cl,v 1.17 2002/05/14 16:29:53 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;; and Copyright (c) 1999-2001 by Pierre R. Mai
@@ -331,3 +331,7 @@
 
 (defmethod database-delete-large-object (object-id (database postgresql-database))
   (lo-unlink (database-conn-ptr database) object-id))
+
+(when (clsql-sys:database-type-library-loaded :postgresql)
+  (clsql-sys:initialize-database-type :database-type :postgresql)
+  (pushnew :postgresql cl:*features*))