From 915e7b8c4bd03d8db6fe03a594da81215b0845a1 Mon Sep 17 00:00:00 2001
From: duane <duane>
Date: Thu, 17 Oct 1996 13:48:39 +0000
Subject: [PATCH] see 4.3.2.pre-alpha.114 changelog entry for Thu Oct 17
 06:43:30 1996

---
 ChangeLog.n       | 11 +++++++++++
 Makefile.cobjs    | 12 ++++++++++++
 Makefile.generic  |  2 +-
 Makefile.hpprism  | 10 +++++++---
 tk/resources.lisp |  8 ++++++--
 5 files changed, 37 insertions(+), 6 deletions(-)

diff --git a/ChangeLog.n b/ChangeLog.n
index 453891ae..66d753b2 100644
--- a/ChangeLog.n
+++ b/ChangeLog.n
@@ -1,3 +1,14 @@
+*******************************************************************************
+4.3.2.pre-alpha.114
+
+Thu Oct 17 06:43:30 1996  Duane Rettig  <duane@beta>
+
+	* Makefile.cobjs:
+	* Makefile.generic:
+	* Makefile.cobjs: Add shared-lib support for HP
+
+	* tk/resources.lisp: Work around SGI Motif bug (per smh spr15174)
+
 *******************************************************************************
 Tue Jul 23 14:29:37 PDT 1996 Colin Meldrum (colin@vapor)
 
diff --git a/Makefile.cobjs b/Makefile.cobjs
index e7dd1d9f..ed1b4d6c 100644
--- a/Makefile.cobjs
+++ b/Makefile.cobjs
@@ -58,12 +58,24 @@ climxm.so: xlibsupport.o xtsupport.o xmsupport.o
 		xlibsupport.o xtsupport.o xmsupport.o \
 		$(IMPORTS) $(TKLIB) $(XTLIB) $(XLIB) $(MOTIFXTRAS))
 
+climxm.sl: xlibsupport.o xtsupport.o xmsupport.o
+	(eval '$(SET_LIBRARY_PATH)' ; \
+	$(MAKE_SHARED) $(SHAREFLAGS) -o climxm.sl \
+		xlibsupport.o xtsupport.o xmsupport.o \
+		$(IMPORTS) $(TKLIB) $(XTLIB) $(XLIB) $(MOTIFXTRAS))
+
 climol.so: xlibsupport.o xtsupport.o olsupport.o
 	(eval '$(SET_LIBRARY_PATH)' ; \
 	$(MAKE_SHARED) $(SHAREFLAGS) -o climol.so \
 		xlibsupport.o xtsupport.o olsupport.o \
 		$(IMPORTS) $(TKLIB) $(XTLIB) $(XLIB))
 
+climol.sl: xlibsupport.o xtsupport.o olsupport.o
+	(eval '$(SET_LIBRARY_PATH)' ; \
+	$(MAKE_SHARED) $(SHAREFLAGS) -o climol.sl \
+		xlibsupport.o xtsupport.o olsupport.o \
+		$(IMPORTS) $(TKLIB) $(XTLIB) $(XLIB))
+
 # mainxm.o contains foreign code from the libraries X11,Xt and Xm
 # required by Motif version of CLIM statically linked
 
diff --git a/Makefile.generic b/Makefile.generic
index 7fa70cef..6417b332 100644
--- a/Makefile.generic
+++ b/Makefile.generic
@@ -198,7 +198,7 @@ cleanobjs:
 
 clean:
 	find . -name '*.fasl' -print | xargs rm -f
-	rm -f *.o *.so *.a slim slim.ol \
+	rm -f *.o *.so *.sl *.a slim slim.ol \
 	  	stub-motif.c stub-olit.c stub-xt.c stub-x.c stub-wnn.c
 	rm -f *.z *.Z *.gz *.ilt *.out
 
diff --git a/Makefile.hpprism b/Makefile.hpprism
index 644eb35f..fd5a3f3d 100644
--- a/Makefile.hpprism
+++ b/Makefile.hpprism
@@ -14,10 +14,14 @@ CFLAGS= -O -D_NO_PROTO -DSTRINGS_ALIGNED -DNO_REGEX -DNO_ISDIR \
 STD_DEFINES = -DSYSV
 AR = ar clq
 
-TKLIB=/usr/lib/Motif1.2/libXm.a
-XTLIB=/usr/lib/X11R5/libXt.a
-XLIB=/usr/lib/X11R5/libX11.a
+TKLIB=-lXm
+XTLIB=-lXt
+XLIB=-lX11
 
 XINCLUDES= -I/usr/include/Motif1.2 -I/usr/include/X11R5
 
+PICFLAGS = +z
+SHAREFLAGS = -b
+MAKE_SHARED = ld
+
 include Makefile.generic
diff --git a/tk/resources.lisp b/tk/resources.lisp
index e3c3e191..67974fec 100644
--- a/tk/resources.lisp
+++ b/tk/resources.lisp
@@ -392,7 +392,11 @@
     (int nil)
     (short nil)
     (function nil)
-    (top-item-position nil)
+    ;; SGI has a bug or oddity in it Motif.  The top-item-position
+    ;; resource on a XmList returns a null type.  It is an integer
+    ;; doesn't need any conversion, so this papers over the issue.
+    ;; spr15174
+    (|| nil)
     (t t)))
 
 (defmethod resource-type-set-conversion-p (type)
@@ -415,7 +419,7 @@
     (short nil)
     (int nil)
     (function nil)
-    (top-item-position nil)
+    (|| nil)			; spr15174 see above
     (t t)))
 
 (defmethod resource-type-get-memref-type (type)
-- 
GitLab