From ff911d548f5cd4da5e406db14ad85a8d1d509648 Mon Sep 17 00:00:00 2001
From: "Kevin M. Rosenberg" <kevin@rosenberg.net>
Date: Fri, 2 May 2003 02:50:12 +0000
Subject: [PATCH] r4731: Automatic commit for debian_version_1_2_13-1

---
 tests/compress.lisp        | 20 +++-----------------
 tests/uffi-c-test-lib.lisp |  8 +-------
 uffi-tests.asd             |  7 ++++---
 3 files changed, 8 insertions(+), 27 deletions(-)

diff --git a/tests/compress.lisp b/tests/compress.lisp
index c418408..3a68774 100644
--- a/tests/compress.lisp
+++ b/tests/compress.lisp
@@ -2,12 +2,12 @@
 ;;;; *************************************************************************
 ;;;; FILE IDENTIFICATION
 ;;;;
-;;;; Name:          compress.cl
+;;;; Name:          compress.lisp
 ;;;; Purpose:       UFFI Example file for zlib compression
-;;;; Programmer:    Kevin M. Rosenberg
+;;;; Author:        Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: compress.lisp,v 1.10 2003/05/02 02:40:52 kevin Exp $
+;;;; $Id: compress.lisp,v 1.11 2003/05/02 02:50:12 kevin Exp $
 ;;;;
 ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -18,20 +18,6 @@
 
 (in-package :uffi-tests)
 
-(eval-when (:compile-toplevel :load-toplevel :execute)
-(unless (uffi:load-foreign-library
-	 #-(or macosx darwin)
-	 (uffi:find-foreign-library
-	  "libz"
-	  '("/usr/local/lib/" "/usr/lib/" "/zlib/")
-	  :types '("so" "a"))
-	 #+(or macosx darwin)
-	 (uffi:find-foreign-library "z"
-				    `(,(pathname-directory *load-pathname*)))
-	 :module "zlib" 
-	 :supporting-libraries '("c"))
-  (warn "Unable to load zlib")))
-  
 (uffi:def-function ("compress" c-compress)
     ((dest (* :unsigned-char))
      (destlen (* :long))
diff --git a/tests/uffi-c-test-lib.lisp b/tests/uffi-c-test-lib.lisp
index 20f4ccb..eb07ef6 100644
--- a/tests/uffi-c-test-lib.lisp
+++ b/tests/uffi-c-test-lib.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Mar 2002
 ;;;;
-;;;; $Id: uffi-c-test-lib.lisp,v 1.1 2003/04/29 14:08:02 kevin Exp $
+;;;; $Id: uffi-c-test-lib.lisp,v 1.2 2003/05/02 02:50:12 kevin Exp $
 ;;;;
 ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -18,12 +18,6 @@
 
 (in-package :uffi-tests)
 
-(unless (uffi:load-foreign-library 
-	 (uffi:find-foreign-library "uffi-c-test-lib" 
-				    (list *load-truename*
-					  "/usr/lib/"))
-	 :supporting-libraries '("c"))
-  (warn "Unable to load uffi-c-test-lib library"))
 
 (uffi:def-function ("cs_to_upper" cs-to-upper)
   ((input (* :unsigned-char)))
diff --git a/uffi-tests.asd b/uffi-tests.asd
index 91af3a5..c0b8491 100644
--- a/uffi-tests.asd
+++ b/uffi-tests.asd
@@ -7,7 +7,7 @@
 ;;;; Author:        Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2003
 ;;;;
-;;;; $Id: uffi-tests.asd,v 1.6 2003/04/30 14:06:14 kevin Exp $
+;;;; $Id: uffi-tests.asd,v 1.7 2003/05/02 02:50:12 kevin Exp $
 ;;;; *************************************************************************
 
 (defpackage #:uffi-tests-system
@@ -23,13 +23,14 @@
 	       (:file "package" :depends-on ("rt"))
 	       (:file "strtol" :depends-on ("package"))
 	       (:file "atoifl" :depends-on ("package"))
-	       (:file "compress" :depends-on ("package"))
 	       (:file "getenv" :depends-on ("package"))
 	       (:file "gethostname" :depends-on ("package"))
 	       (:file "union" :depends-on ("package"))
 	       (:file "arrays" :depends-on ("package"))
 	       (:file "time" :depends-on ("package"))
-	       (:file "uffi-c-test-lib" :depends-on ("package"))
+	       (:file "foreign-loader" :depends-on ("package"))
+	       (:file "compress" :depends-on ("foreign-loader"))
+	       (:file "uffi-c-test-lib" :depends-on ("foreign-loader"))
 	       ))))
 
 (defmethod perform ((o test-op) (c (eql (find-system :uffi-tests))))
-- 
2.34.1