From 839b3e4b9627ecf5d3b0d8d2910a95d7f9010dc5 Mon Sep 17 00:00:00 2001
From: "Kevin M. Rosenberg" <kevin@rosenberg.net>
Date: Wed, 3 Apr 2002 17:58:23 +0000
Subject: [PATCH] r1735: *** empty log message ***

---
 ChangeLog         |  8 ++++++++
 VERSION           |  2 +-
 examples/Makefile |  8 +++-----
 src/libraries.cl  | 13 ++++++++-----
 tests/Makefile    |  8 +++-----
 5 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c46ec07..a6dd8aa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2002-04-02 Kevin Rosenberg (kevin@rosenberg.net)
+	* src/libraries.cl:
+	Added test for .so libraries on CMUCL and use sys::load-object-file instead
+	of alien:load-library-file
+
+	* examples/Makefile:
+	Updated defaults so library is created correctly on Linux, FreeBSD, and Solaris
+
 2002-04-02 Kevin Rosenberg (kevin@rosenberg.net)
 	* examples/compress.cl:
 	Fixed missing '/'
diff --git a/VERSION b/VERSION
index e9da681..4412bb4 100644
--- a/VERSION
+++ b/VERSION
@@ -1,4 +1,4 @@
-0.3.4
+0.3.5
 
 
 
diff --git a/examples/Makefile b/examples/Makefile
index 9aefd1f..353a9aa 100644
--- a/examples/Makefile
+++ b/examples/Makefile
@@ -5,7 +5,7 @@
 #  Programer:    Kevin M. Rosenberg
 #  Date Started: Mar 2002
 #
-#  CVS Id:   $Id: Makefile,v 1.11 2002/04/03 17:43:31 kevin Exp $
+#  CVS Id:   $Id: Makefile,v 1.12 2002/04/03 17:52:53 kevin Exp $
 #
 # This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
 #
@@ -18,14 +18,12 @@
 CC=gcc
 SHARED_CC_OPT=-fPIC -DPIC
 
-#SHARED_LD_OPT=-r -Bdynamic # For FreeBSD and Solaris (CMUCL)
-SHARED_LD_OPT=-shared -Bdynamic  # For Linux (ALL) and FreeBSD (ACL)
+SHARED_LD_OPT=-shared  # For Linux (ALL) and FreeBSD (ACL)
 
 # For MacOSX (ACL)
 #SHARED_CC_OPT=-dynamic
 #SHARED_LD_OPT=-bundle /usr/lib/bundle1.o -undefined suppress # -o foo.dylib foo.o
 
-
 # Use these for Sun's C compiler and Solaris (ACL)
 #CC=cc
 #SHARED_CC_OPT=-KPIC
@@ -43,7 +41,7 @@ all: $(shared_lib)
 
 $(shared_lib): $(source) Makefile
 	$(CC) ${SHARED_CC_OPT} -c $(source) -o $(object)
-	ld ${SHARED_LD_OPT} $(object) -o $(shared_lib)
+	gcc ${SHARED_LD_OPT} $(object) -o $(shared_lib)
 	rm $(object)
 
 clean:
diff --git a/src/libraries.cl b/src/libraries.cl
index 05ca125..e180b27 100644
--- a/src/libraries.cl
+++ b/src/libraries.cl
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: libraries.cl,v 1.12 2002/04/03 17:43:31 kevin Exp $
+;;;; $Id: libraries.cl,v 1.13 2002/04/03 17:50:13 kevin Exp $
 ;;;;
 ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -83,12 +83,15 @@ library type if type is not specified."
 	     (find filename *loaded-libraries* :test #'string-equal))
 	t ;; return T, but don't reload library
       (progn
-	#+(and ignore cmu) (alien:load-foreign filename 
+	#+cmu
+	(let ((type (pathname-type (parse-namestring filename))))
+	  (if (equal type "so")
+	      (sys::load-object-file filename)
+	      (alien:load-foreign filename 
 				  :libraries
 				  (convert-supporting-libraries-to-string
-				   supporting-libraries))
-	#+cmu (sys::load-object-file filename) 
-
+				   supporting-libraries))))
+	
 	#+lispworks (fli:register-module module 
 					 :connection-style :automatic 
 					 :real-name filename)
diff --git a/tests/Makefile b/tests/Makefile
index 9aefd1f..353a9aa 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -5,7 +5,7 @@
 #  Programer:    Kevin M. Rosenberg
 #  Date Started: Mar 2002
 #
-#  CVS Id:   $Id: Makefile,v 1.11 2002/04/03 17:43:31 kevin Exp $
+#  CVS Id:   $Id: Makefile,v 1.12 2002/04/03 17:52:53 kevin Exp $
 #
 # This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
 #
@@ -18,14 +18,12 @@
 CC=gcc
 SHARED_CC_OPT=-fPIC -DPIC
 
-#SHARED_LD_OPT=-r -Bdynamic # For FreeBSD and Solaris (CMUCL)
-SHARED_LD_OPT=-shared -Bdynamic  # For Linux (ALL) and FreeBSD (ACL)
+SHARED_LD_OPT=-shared  # For Linux (ALL) and FreeBSD (ACL)
 
 # For MacOSX (ACL)
 #SHARED_CC_OPT=-dynamic
 #SHARED_LD_OPT=-bundle /usr/lib/bundle1.o -undefined suppress # -o foo.dylib foo.o
 
-
 # Use these for Sun's C compiler and Solaris (ACL)
 #CC=cc
 #SHARED_CC_OPT=-KPIC
@@ -43,7 +41,7 @@ all: $(shared_lib)
 
 $(shared_lib): $(source) Makefile
 	$(CC) ${SHARED_CC_OPT} -c $(source) -o $(object)
-	ld ${SHARED_LD_OPT} $(object) -o $(shared_lib)
+	gcc ${SHARED_LD_OPT} $(object) -o $(shared_lib)
 	rm $(object)
 
 clean:
-- 
2.34.1