From 50fbe9764935bdccbc5639c16dccf3546a3721bb Mon Sep 17 00:00:00 2001
From: "David D. Zuhn" <zoo@cygnus>
Date: Wed, 10 Mar 1993 11:15:28 +0000
Subject: [PATCH] tclX support

---
 ChangeLog    |  7 +++++++
 Makefile.in  | 25 ++++++++++++++++++++++++-
 configure.in |  4 ++--
 3 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 654fd8780b..bb5f172799 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Wed Mar 10 03:11:56 1993  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
+
+	* Makefile.in: a couple of 'else true' for decstation,
+	support for TclX
+
+	* configure.in: configure tclX too; don't remove Tk on RS/6000 anymore
+
 Tue Mar  9 16:06:12 1993  K. Richard Pixley  (rich@cygnus.com)
 
 	* Makefile.in (setup-dirs): change invocation of make to $(MAKE).
diff --git a/Makefile.in b/Makefile.in
index 62d477c6b6..580de8939c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -337,7 +337,7 @@ dvi: do-dvi
 install-info: install-info-dirs do-install-info dir.info
 	if [ -f dir.info ] ; then \
 	  $(INSTALL_DATA) dir.info $(infodir)/dir.info ; \
-	fi
+	else true ; fi
 
 do-install-info: install-info-dirs
 
@@ -1256,6 +1256,28 @@ install-tk: force
 		true ; \
 	fi
 
+### tclX
+all-tclX: all-tcl all-tk
+	@if [ -f ./tclX/Makefile ] ; then \
+		rootme=`pwd` ; export rootme ; \
+		srcroot=`cd $(srcdir); pwd`; export srcroot ; \
+		(cd ./tclX; \
+		$(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) all) ; \
+	else \
+		true ; \
+	fi
+
+install-tclX: force
+	@if [ -f ./tclX/Makefile ] ; then \
+		rootme=`pwd` ; export rootme ; \
+		srcroot=`cd $(srcdir); pwd`; export srcroot ; \
+		(cd ./tclX; \
+		$(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) install) ; \
+	else \
+		true ; \
+	fi
+
+
 ### expect
 all-expect: all-tcl
 	@if [ -f ./expect/Makefile ] ; then \
@@ -1517,6 +1539,7 @@ dir.info: do-install-info
 	if [ -f $(srcdir)/texinfo/gen-info-dir ] ; then \
 	  $(srcdir)/texinfo/gen-info-dir $(infodir) $(srcdir)/texinfo/dir.info-template > dir.info.new ; \
 	  mv -f dir.info.new dir.info ; \
+	else true ; \
 	fi
 
 dist:
diff --git a/configure.in b/configure.in
index 7c0b0acc36..4b567fef8e 100644
--- a/configure.in
+++ b/configure.in
@@ -24,7 +24,7 @@
 
 # these libraries are used by various programs built for the host environment
 #
-host_libs="mmalloc libiberty opcodes bfd readline glob tcl tk"
+host_libs="mmalloc libiberty opcodes bfd readline glob tcl tk tclX"
 
 # these tools are built for the host environment
 #
@@ -157,7 +157,7 @@ case "${target}" in
     configdirs=`echo ${configdirs} | sed -e 's/gas//'`
     ;;
   rs6000-*-*)
-    configdirs=`echo ${configdirs} | sed -e 's/ld//;s/binutils//;s/gas//;s/tk//'`
+    configdirs=`echo ${configdirs} | sed -e 's/ld//;s/binutils//;s/gas//'`
     ;;
   hppa*-*-*)
     configdirs=`echo ${configdirs} | sed -e 's/ld//;s/binutils//;s/gas//'`