* Makefile.in: Add libgui directory.

	(GDB_TK): Add all-libgui.
	* configure.in: Add libgui directory.
	* configure: Add all-libgui to GDB_TK.

5 files changed, 22 insertions, 8 deletions

diff --git a/.Sanitize b/.Sanitize
index ad4adad..8653a4e 100644
--- a/.Sanitize
+++ b/.Sanitize
@@ -50,9 +50,11 @@ keep_these_too="${keep_these_too} .cvsignore CYGNUS autoconf
 	apache bash 
 	bfd binutils bison byacc cvs deja-gnu dejagnu diff dosrel dvips
 	emacs emacs19 examples expect fileutils findutils flex
-	gas gawk gcc gdb gdbm gdbtest glob gperf gprof grep grez groff guile gzip
+	gas gawk gcc gdb gdbm gdbtest glob gperf gprof grep grez groff
+	guile gzip
 	include inet install-sh ispell
-	ld less libg++ libgcc libgloss libiberty libide libio librx libstdc++
+	ld less libg++ libgcc libgloss libiberty libgui libide libio
+	librx libstdc++
 	m4 make mkinstalldirs mmalloc move-if-change newlib ncurses opcodes
 	pagas patch perl prms
 	rcs readline sed send-pr shellutils sim tar textutils time
diff --git a/ChangeLog b/ChangeLog
index 25b39cd..97f6399 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Tue Dec 16 17:36:05 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* Makefile.in: Add libgui directory.
+	(GDB_TK): Add all-libgui.
+	* configure.in: Add libgui directory.
+	* configure: Add all-libgui to GDB_TK.
+
 Mon Dec 15 16:12:28 1997  Nick Clifton  <nickc@cygnus.com>
 
 	* config-ml.in (multidirs): Add m32r to multilib list.
diff --git a/Makefile.in b/Makefile.in
index a257417..c1302f0 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -513,6 +513,7 @@ ALL_MODULES = \
 	all-jstools \
 	$(end-sanitize-ide) \
 	all-ld \
+	all-libgui \
 	all-libiberty \
 	all-libide \
 	all-m4 \
@@ -587,6 +588,7 @@ CROSS_CHECK_MODULES = \
 	check-jstools \
 	$(end-sanitize-ide) \
 	check-ld \
+	check-libgui \
 	check-libiberty \
 	check-libide \
 	check-m4 \
@@ -662,6 +664,7 @@ INSTALL_MODULES = \
 	install-jstools \
 	$(end-sanitize-ide) \
 	install-ld \
+	install-libgui \
 	install-libiberty \
 	install-libide \
 	install-m4 \
@@ -820,6 +823,7 @@ CLEAN_MODULES = \
 	clean-jstools \
 	$(end-sanitize-ide) \
 	clean-ld \
+	clean-libgui \
 	clean-libiberty \
 	clean-libide \
 	clean-m4 \
@@ -1462,7 +1466,7 @@ all-gawk:
 ALL_GCC = all-gcc
 all-gcc: all-bison all-byacc all-binutils all-gas all-ld
 all-bootstrap: all-libiberty all-bison all-byacc all-binutils all-gas all-ld
-GDB_TK = all-tk all-tcl all-itcl all-tix all-libide
+GDB_TK = all-tk all-tcl all-itcl all-tix all-libgui all-libide
 all-gdb: all-libiberty all-opcodes all-bfd all-mmalloc all-readline all-bison all-byacc all-sim $(gdbnlmrequirements) $(GDB_TK)
 all-gnuserv:
 configure-target-gperf: $(ALL_GCC)
@@ -1482,7 +1486,7 @@ all-inet: all-tcl all-send-pr all-perl
 all-ispell: all-emacs19
 all-itcl: all-tcl all-tk
 # start-sanitize-ide
-all-jstools: all-tcl all-tk all-tix all-libide
+all-jstools: all-tcl all-tk all-tix all-libgui all-libide
 # end-sanitize-ide
 all-ld: all-libiberty all-bfd all-opcodes all-bison all-byacc all-flex
 configure-target-libg++: $(ALL_GCC) configure-target-librx
@@ -1492,6 +1496,7 @@ all-target-libgloss: configure-target-libgloss configure-target-newlib
 configure-target-libio: $(ALL_GCC)
 all-target-libio: configure-target-libio all-gas all-ld all-gcc all-target-libiberty all-target-newlib
 check-target-libio: all-target-libstdc++
+all-libgui: all-tcl all-tk all-itcl
 all-libiberty:
 # start-sanitize-ide
 all-libide: all-ilu
@@ -1528,7 +1533,7 @@ all-tgas: all-libiberty all-bfd all-opcodes
 all-time:
 all-tix: all-tcl all-tk
 # start-sanitize-ide
-all-vmake: all-tcl all-tk all-itcl all-tix all-libide
+all-vmake: all-tcl all-tk all-itcl all-tix all-libgui all-libide
 # end-sanitize-ide
 all-wdiff:
 all-target-winsup: all-target-newlib all-target-libiberty all-target-librx all-target-libio configure-target-winsup 
diff --git a/configure b/configure
index 93c6488..1cd031d 100755
--- a/configure
+++ b/configure
@@ -988,7 +988,7 @@ esac
 # FIXME: This should be in configure.in, not configure
 # Determine whether gdb needs tk/tcl or not.
 if [ "$enable_gdbtk" != "no" ]; then
-	GDB_TK="all-tcl all-tk all-itcl all-tix"
+	GDB_TK="all-tcl all-tk all-itcl all-tix all-libgui all-libide"
 else
 	GDB_TK=""
 fi
diff --git a/configure.in b/configure.in
index a839616..9621f3d 100644
--- a/configure.in
+++ b/configure.in
@@ -41,7 +41,7 @@
 
 # these libraries are used by various programs built for the host environment
 #
-host_libs="mmalloc libiberty opcodes bfd readline gash db tcl tk tclX itcl tix libide"
+host_libs="mmalloc libiberty opcodes bfd readline gash db tcl tk tclX itcl tix libgui libide"
 
 if [ "${enable_gdbgui}" = "yes" ] ; then
 	host_libs="${host_libs} libgui"
@@ -232,7 +232,7 @@ case ${with_x} in
   yes | "")  # the default value for this tree is that X11 is available
 	;;
   no)
-	skipdirs="${skipdirs} libide tk gash"
+	skipdirs="${skipdirs} tk libgui libide gash"
 # start-sanitize-ide
 	skipdirs="${skipdirs} vmake jstools"
 # end-sanitize-ide