uffi/tests Makefile,1.20,1.21 foreign-loader.lisp,1.6,1.7

Update of /pubcvs/uffi/tests
In directory boa.b9.com:/tmp/cvs-serv4090

Modified Files:
	Makefile foreign-loader.lisp 
Log Message:


Index: foreign-loader.lisp
===================================================================
RCS file: /pubcvs/uffi/tests/foreign-loader.lisp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** foreign-loader.lisp	26 Aug 2003 17:27:01 -0000	1.6
--- foreign-loader.lisp	27 Aug 2003 19:58:25 -0000	1.7
***************
*** 20,31 ****
  
  (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" (list (pathname-directory *load-pathname*)))
  	 :module "zlib" 
  	 :supporting-libraries '("c"))
--- 20,30 ----
  
  (unless (uffi:load-foreign-library
  	 (uffi:find-foreign-library
+ 	  #-(or macosx darwin)
  	  "libz"
! 	  #+(or macosx darwin)
! 	  "z"
! 	  (list (pathname-directory *load-pathname*)
! 		"/usr/local/lib/" "/usr/lib/" "/zlib/"))
  	 :module "zlib" 
  	 :supporting-libraries '("c"))
***************
*** 33,40 ****
    
  (unless (uffi:load-foreign-library 
! 	 (uffi:find-foreign-library "uffi-c-test-lib" 
! 				    (list
! 				     (pathname-directory *load-truename*)
! 				     "/usr/lib/uffi/"))
  	 :supporting-libraries '("c")
  	 :module "uffi_tests")
--- 32,39 ----
    
  (unless (uffi:load-foreign-library 
! 	 (uffi:find-foreign-library
! 	  "uffi-c-test-lib" 
! 	  (list (pathname-directory *load-truename*)
! 		"/usr/lib/uffi/"))
  	 :supporting-libraries '("c")
  	 :module "uffi_tests")

Index: Makefile
===================================================================
RCS file: /pubcvs/uffi/tests/Makefile,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** Makefile	29 Apr 2003 14:08:02 -0000	1.20
--- Makefile	27 Aug 2003 19:58:25 -0000	1.21
***************
*** 37,40 ****
--- 37,44 ----
  
  mac:
+ 	gcc -bundle -c $(source) -o $(object).dylib
+ 	ld -bundle /usr/lib/bundle1.o -flat_namespace -undefined suppress /usr/lib/libz.dylib -o z.dylib
+ 
+ mac-old:
  	cc -dynamic -c $(source) -o $(object)
  	ld -bundle /usr/lib/bundle1.o -flat_namespace -undefined suppress -o $(base).dylib $(object)