From 21768abf94b069c2dd5cba66c1dc0e521e3aad95 Mon Sep 17 00:00:00 2001
From: layer <layer>
Date: Wed, 28 Apr 1993 17:19:31 +0000
Subject: [PATCH] Fri Apr 23 13:51:00 1993  Kevin Layer  (layer@sole)

	* Makefile: parameterize the include of Makefile.sun4 (as
	Makefile.$(HOST).

	* Makefile.svr4: add INSTALLED_CLIMOBJS=

	* instclimol.lisp: svr4ify

	* instclimxm.lisp: svr4ify

	* test/test-driver.lisp: si::*clos-preload-packages* hack

	* tk/load-ol.lisp: don't load climol.so unless needed

	* tk/load-xm.lisp: don't load climxm.so unless needed

	* tk/make-classes.lisp: remove debugging code
---
 Makefile                     |  7 +++----
 Makefile.svr4                |  2 ++
 instclimol.lisp              | 16 ++++++++--------
 instclimxm.lisp              | 16 ++++++++--------
 test/test-driver.lisp        |  9 ++++-----
 tk/load-ol.lisp              |  5 +++--
 tk/load-xm.lisp              |  5 +++--
 tk/make-classes.lisp         |  2 +-
 utils/excl-verification.lisp |  4 ++--
 9 files changed, 34 insertions(+), 32 deletions(-)

diff --git a/Makefile b/Makefile
index 7cb1d56c..8d1efd71 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,5 @@
 # $fiHeader: Makefile,v 1.74 93/02/10 10:04:04 cer Exp $
-#
-#  Makefile.sun4 for CLIM 2.0
-#
 
-include Makefile.sun4
+HOST = sun4
+
+include Makefile.$(HOST)
diff --git a/Makefile.svr4 b/Makefile.svr4
index 762a87a7..93e9a598 100644
--- a/Makefile.svr4
+++ b/Makefile.svr4
@@ -9,6 +9,8 @@ XLIB-CLIM-OBJS = xlib/pkg.fasl
 MOTIF_OBJS= climxm.so
 OPENLOOK_OBJS= climol.so
 CLIMOBJS= climxm.so climol.so
+INSTALLED_CLIMOBJS= $(CLIMOBJS) xlibsupport.o xtsupport.o olsupport.o \
+		MyDrawingA.o
 
 MOTIFLIB=/usr/lib/libXm$(DEBUGLIB).a
 MOTIFLIB_d=/usr/lib/libXm.a
diff --git a/instclimol.lisp b/instclimol.lisp
index dbc542a5..a9ce5920 100644
--- a/instclimol.lisp
+++ b/instclimol.lisp
@@ -1,6 +1,6 @@
 ;; -*- mode: common-lisp; package: system -*-
 ;;
-;;				-[Thu Feb 27 12:39:07 1992 by layer]-
+;;				-[Fri Apr 16 11:55:09 1993 by layer]-
 ;; 
 ;; copyright (c) 1991 Franz Inc, Berkeley, CA  All rights reserved.
 ;;
@@ -23,17 +23,17 @@
 ;; $fiHeader: instclimol.lisp,v 1.4 92/08/18 17:54:20 cer Exp Locker: cer $
 
 ;;
-;; Load CLIM
+;; Load the OpenLook version of CLIM
 ;;
 
 (in-package :system)
 
+#-svr4
+(progn
+  (defvar sys::*libx11-pathname* "/x11/R4/sun4-lib/libX11.a")
+  (defvar sys::*libxt-pathname* "/x11/R4/sun4-lib/libXt.a"))
 
-(defvar sys::*libx11-pathname* "/x11/R4/sun4-lib/libX11.a")
-(defvar sys::*libxt-pathname* "/x11/R4/sun4-lib/libXt.a")
+(load-application (require :climol) :devel system::*devel*)
 
-(load-application (require :climol)
-		  :devel system::*devel*)
-
-(format t "~&; Finished loading CLIM~%")
+(format t "~&; Finished loading CLIM OL~%")
 (force-output)
diff --git a/instclimxm.lisp b/instclimxm.lisp
index ea40b782..cf11b470 100644
--- a/instclimxm.lisp
+++ b/instclimxm.lisp
@@ -1,6 +1,6 @@
 ;; -*- mode: common-lisp; package: system -*-
 ;;
-;;				-[Thu Feb 27 12:39:07 1992 by layer]-
+;;				-[Fri Apr 16 11:55:04 1993 by layer]-
 ;; 
 ;; copyright (c) 1991 Franz Inc, Berkeley, CA  All rights reserved.
 ;;
@@ -23,17 +23,17 @@
 ;; $fiHeader: instclimxm.lisp,v 1.5 92/08/21 16:34:15 cer Exp $
 
 ;;
-;; Load CLIM
+;; Load the Motif version of CLIM
 ;;
 
 (in-package :system)
 
+#-svr4
+(progn
+  (defvar sys::*libx11-pathname* "/x11/R4/sun4-lib/libX11.a")
+  (defvar sys::*libxt-pathname* "/x11/R4/sun4-lib/libXt.a"))
 
-(defvar sys::*libx11-pathname* "/x11/R4/sun4-lib/libX11.a")
-(defvar sys::*libxt-pathname* "/x11/R4/sun4-lib/libXt.a")
+(load-application (require :climxm) :devel system::*devel*)
 
-(load-application (require :climxm) 
-		  :devel system::*devel*)
-
-(format t "~&; Finished loading CLIM~%")
+(format t "~&; Finished loading CLIM XM~%")
 (force-output)
diff --git a/test/test-driver.lisp b/test/test-driver.lisp
index 80925f71..70e29ac5 100644
--- a/test/test-driver.lisp
+++ b/test/test-driver.lisp
@@ -585,12 +585,11 @@
 ;;; This should be at the end:
 ;;; make the training selective.
 
-(locally 
-  (declare (special si::*clos-preload-packages*))
- (setq si::*clos-preload-packages* 
-   (mapcar #'find-package '(:clim :clim-utils :clim-internals :silica :tk :xm-silica))))
+(locally (declare (special si::*clos-preload-packages*))
+  (setq si::*clos-preload-packages* 
+    (mapcar #'find-package
+	    '(:clim :clim-utils :clim-internals :silica :tk :xm-silica))))
 
 ;; This stops warnings happening asynchronously and causing confusion.
 
 (setq excl:*global-gc-behavior* nil)
-
diff --git a/tk/load-ol.lisp b/tk/load-ol.lisp
index 4f5b1089..1cdeb539 100644
--- a/tk/load-ol.lisp
+++ b/tk/load-ol.lisp
@@ -1,6 +1,6 @@
 ;; -*- mode: common-lisp; package: user -*-
 ;;
-;;				-[Thu Apr 15 17:05:49 1993 by layer]-
+;;				-[Fri Apr 16 17:38:18 1993 by layer]-
 ;; 
 ;; copyright (c) 1985, 1986 Franz Inc, Alameda, CA  All rights reserved.
 ;; copyright (c) 1986-1991 Franz Inc, Berkeley, CA  All rights reserved.
@@ -28,7 +28,8 @@
 (require :climg)
 
 #+svr4
-(load "climol.so")
+(unless (ff:get-entry-point (ff:convert-to-lang "ol_appl_add_item"))
+  (load "climol.so"))
 
 #-svr4
 (progn
diff --git a/tk/load-xm.lisp b/tk/load-xm.lisp
index 3e661d1d..ef8efde5 100644
--- a/tk/load-xm.lisp
+++ b/tk/load-xm.lisp
@@ -1,6 +1,6 @@
 ;; -*- mode: common-lisp; package: user -*-
 ;;
-;;				-[Thu Apr 15 17:05:21 1993 by layer]-
+;;				-[Fri Apr 16 17:38:25 1993 by layer]-
 ;; 
 ;; copyright (c) 1985, 1986 Franz Inc, Alameda, CA  All rights reserved.
 ;; copyright (c) 1986-1991 Franz Inc, Berkeley, CA  All rights reserved.
@@ -28,7 +28,8 @@
 (require :climg)
 
 #+svr4
-(load "climxm.so")
+(unless (ff:get-entry-point (ff:convert-to-lang "XmCreateMyDrawingArea"))
+  (load "climxm.so"))
 
 #-svr4
 (progn
diff --git a/tk/make-classes.lisp b/tk/make-classes.lisp
index ef289887..6ad18a7f 100644
--- a/tk/make-classes.lisp
+++ b/tk/make-classes.lisp
@@ -1,6 +1,6 @@
 ;; -*- mode: common-lisp; package: tk -*-
 ;;
-;;				-[Fri Apr 16 08:55:32 1993 by layer]-
+;;				-[Tue Apr 27 16:10:42 1993 by layer]-
 ;; 
 ;; copyright (c) 1985, 1986 Franz Inc, Alameda, CA  All rights reserved.
 ;; copyright (c) 1986-1991 Franz Inc, Berkeley, CA  All rights reserved.
diff --git a/utils/excl-verification.lisp b/utils/excl-verification.lisp
index 1a86491b..1752430c 100644
--- a/utils/excl-verification.lisp
+++ b/utils/excl-verification.lisp
@@ -1,6 +1,6 @@
 ;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Package: SYS; Base: 10; Lowercase: Yes -*-
 ;;
-;;				-[]-
+;;				-[Tue Apr 27 18:31:42 1993 by layer]-
 ;; 
 ;; copyright (c) 1985, 1986 Franz Inc, Alameda, CA  All rights reserved.
 ;; copyright (c) 1986-1992 Franz Inc, Berkeley, CA  All rights reserved.
@@ -59,7 +59,7 @@ You do not have patches ~{~S ~}"
 	   dont-have)))
 
 (defvar *clim-version* 
-    '("CLIM 2.0.beta.0"
+    '("CLIM 2.0.beta2.0"
       "$fiHeader: excl-verification.lisp,v 1.14 92/07/01 15:45:31 cer Exp Locker: cer $"))
 
 (si::rcsnote (first *clim-version*) (second *clim-version*))
-- 
GitLab