diff --git a/.Sanitize b/.Sanitize
index f99815bc06..e1afd2c4c1 100644
--- a/.Sanitize
+++ b/.Sanitize
@@ -105,6 +105,15 @@ else
 	keep_these_too="${keep_these_too} ${inet_files}"
 fi
 
+ide_files="itcl libide vmake"
+
+if (echo $* | grep keep\-ide > /dev/null); then
+	lose_these_too="${lose_these_too} ${ide_files}"
+	test -n "$verbose" && echo Keeping ${ide_files}
+else
+	keep_these_too="${keep_these_too} ${ide_files}"
+fi
+
 
 # This top-level directory is special.  We often check out only subsets
 # of this directory, and complaining about directories or files we didn't
@@ -404,6 +413,33 @@ else
 	done
 fi
 
+if ( echo $* | grep keep\-ide > /dev/null ) ; then
+	for i in * ; do
+		if test ! -d $i && (grep sanitize-ide $i > /dev/null) ; then
+			if [ -n "${verbose}" ] ; then
+				echo Keeping ide stuff in $i
+			fi
+		fi
+	done
+else
+	for i in * ; do
+		if test ! -d $i && (grep sanitize-ide $i > /dev/null) ; then
+			if [ -n "${verbose}" ] ; then
+				echo Removing traces of \"ide\" from $i...
+			fi
+			cp $i new
+			sed '/start\-sanitize\-ide/,/end-\sanitize\-ide/d' < $i > new
+			if [ -n "${safe}" -a ! -f .Recover/$i ] ; then
+				if [ -n "${verbose}" ] ; then
+					echo Caching $i in .Recover...
+				fi
+				mv $i .Recover
+			fi
+			mv new $i
+		fi
+	done
+fi
+
 # Do this check LAST!
 for i in * ; do
 	if test ! -d $i && (grep sanitize $i > /dev/null) ; then
diff --git a/ChangeLog b/ChangeLog
index 97eb00f3b5..802259cd7b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+start-sanitize-ide
+Fri Apr 18 18:10:44 1997  Tom Tromey  <tromey@cygnus.com>
+
+	* configure.in (host_libs): Added libide.
+	Skip libide, vmake if no X.  Also skip these everywhere that sn is
+	skipped.
+
+	* Makefile.in (ALL_MODULES): Added all-vmake, all-libide.
+	(CROSS_CHECK_MODULES): Added check-vmake, check-libide.
+	(INSTALL_MODULES): Added install-vmake, install-libide.
+	(CLEAN_MODULES): Added clean-vmake, clean-libide.
+	(all-vmake, all-libide): New targets.
+
+end-sanitize-ide
 Thu Apr 17 13:57:06 1997  Per Fogelstrom  <pefo@openbsd.org>
 
 	* config.guess: Fixes for MIPS OpenBSD systems.
diff --git a/Makefile.in b/Makefile.in
index e638b41799..900b37d28a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -453,6 +453,9 @@ ALL_MODULES = \
 	all-itcl \
 	all-ld \
 	all-libiberty \
+	$(start-sanitize-ide) \
+	all-libide \
+	$(end-sanitize-ide) \
 	all-m4 \
 	all-make \
 	all-mmalloc \
@@ -476,6 +479,9 @@ ALL_MODULES = \
 	all-tgas \
 	all-time \
 	all-uudecode \
+	$(start-sanitize-ide) \
+	all-vmake \
+	$(end-sanitize-ide) \
 	all-wdiff 
 
 # This is a list of the check targets for all of the modules which are
@@ -514,6 +520,9 @@ CROSS_CHECK_MODULES = \
 	check-itcl \
 	check-ld \
 	check-libiberty \
+	$(start-sanitize-ide) \
+	check-libide \
+	$(end-sanitize-ide) \
 	check-m4 \
 	check-make \
 	check-mmcheckoc \
@@ -536,6 +545,9 @@ CROSS_CHECK_MODULES = \
 	check-tgas \
 	check-time \
 	check-uudecode \
+	$(start-sanitize-ide) \
+	check-vmake \
+	$(end-sanitize-ide) \
 	check-wdiff
 
 CHECK_MODULES=$(NATIVE_CHECK_MODULES) $(CROSS_CHECK_MODULES)
@@ -572,6 +584,9 @@ INSTALL_MODULES = \
 	install-itcl \
 	install-ld \
 	install-libiberty \
+	$(start-sanitize-ide) \
+	install-libide \
+	$(end-sanitize-ide) \
 	install-m4 \
 	install-make \
 	install-mmalloc \
@@ -594,6 +609,9 @@ INSTALL_MODULES = \
 	install-tgas \
 	install-time \
 	install-uudecode \
+	$(start-sanitize-ide) \
+	install-vmake \
+	$(end-sanitize-ide) \
 	install-wdiff
 
 # This is a list of the targets for all of the modules which are compiled
@@ -708,6 +726,9 @@ CLEAN_MODULES = \
 	clean-itcl \
 	clean-ld \
 	clean-libiberty \
+	$(start-sanitize-ide) \
+	clean-libide \
+	$(end-sanitize-ide) \
 	clean-m4 \
 	clean-make \
 	clean-mmalloc \
@@ -731,6 +752,9 @@ CLEAN_MODULES = \
 	clean-tgas \
 	clean-time \
 	clean-uudecode \
+	$(start-sanitize-ide) \
+	clean-vmake \
+	$(end-sanitize-ide) \
 	clean-wdiff
 
 # All of the target modules that can be cleaned
@@ -1336,6 +1360,9 @@ 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
 all-libiberty:
+# start-sanitize-ide
+all-libide: all-tcl all-tk all-itcl
+# end-sanitize-ide
 configure-target-librx: $(ALL_GCC) configure-target-newlib
 all-target-librx: configure-target-librx
 configure-target-libstdc++: $(ALL_GCC)
@@ -1365,6 +1392,9 @@ all-texinfo: all-libiberty
 all-textutils:
 all-tgas: all-libiberty all-bfd all-opcodes
 all-time:
+# start-sanitize-ide
+all-vmake: all-tcl all-tk all-itcl 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 
 configure-target-winsup: configure-target-newlib
diff --git a/configure.in b/configure.in
index 4d56ae4058..e9b1276baa 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"
+host_libs="mmalloc libiberty opcodes bfd readline gash db tcl tk tclX itcl libide"
 
 if [ "${enable_gdbgui}" = "yes" ] ; then
 	host_libs="${host_libs} libgui"
@@ -227,7 +227,7 @@ case ${with_x} in
   yes | "")  # the default value for this tree is that X11 is available
 	;;
   no)
-	skipdirs="${skipdirs} tk gash"
+	skipdirs="${skipdirs} tk gash libide vmake"
 	;;
   *)
     	echo "*** bad value \"${with_x}\" for -with-x flag; ignored" 1>&2
@@ -371,13 +371,13 @@ noconfigdirs=""
 
 case "${host}" in
   i[3456]86-*-vsta)
-    noconfigdirs="tcl expect dejagnu make texinfo bison patch flex byacc send-pr gprof uudecode dejagnu diff guile perl apache inet itcl db sn"
+    noconfigdirs="tcl expect dejagnu make texinfo bison patch flex byacc send-pr gprof uudecode dejagnu diff guile perl apache inet itcl db sn libide vmake"
     ;;
   i[3456]86-*-go32)
-    noconfigdirs="tcl tk expect dejagnu make texinfo bison patch flex byacc send-pr gprof uudecode dejagnu diff guile perl apache inet itcl db sn"
+    noconfigdirs="tcl tk expect dejagnu make texinfo bison patch flex byacc send-pr gprof uudecode dejagnu diff guile perl apache inet itcl db sn libide vmake"
 	;;
   *-*-cygwin32)
-     noconfigdirs="expect dejagnu cvs autoconf bison send-pr gprof rcs guile perl texinfo apache inet itcl db sn"
+     noconfigdirs="expect dejagnu cvs autoconf bison send-pr gprof rcs guile perl texinfo apache inet itcl db sn libide vmake"
     ;;
   *-*-windows*)
 # This is only used to build WinGDB...
@@ -385,7 +385,7 @@ case "${host}" in
      target_configdirs=
     ;;
   ppc*-*-pe)
-     noconfigdirs="patch diff make tk tcl expect dejagnu cvs autoconf texinfo bison send-pr gprof rcs guile perl apache inet itcl db sn"
+     noconfigdirs="patch diff make tk tcl expect dejagnu cvs autoconf texinfo bison send-pr gprof rcs guile perl apache inet itcl db sn libidea vmake"
     ;;
 esac
 
@@ -429,7 +429,7 @@ case "${target}" in
     ;;
 # start-sanitize-d30v
   d30v-*-*)
-    noconfigdirs="$noconfigdirs tcl tk expect gcc gdb newlib target-librx target-libg++ target-libstdc++ target-libio target-libgloss itcl db sn target-libiberty target-newlib target-examples"
+    noconfigdirs="$noconfigdirs tcl tk expect gcc gdb newlib target-librx target-libg++ target-libstdc++ target-libio target-libgloss itcl db sn target-libiberty target-newlib target-examples libide vmake"
     ;;
 # end-sanitize-d30v
   h8300*-*-* | \
@@ -457,7 +457,7 @@ case "${target}" in
     ;;
   *-*-cygwin32)
     target_configdirs="$target_configdirs target-winsup"
-    noconfigdirs="$noconfigdirs expect target-libgloss itcl db sn"
+    noconfigdirs="$noconfigdirs expect target-libgloss itcl db sn libide vmake"
     # always build newlib.
     skipdirs=`echo " ${skipdirs} " | sed -e 's/ target-newlib / /'`
 
@@ -507,13 +507,13 @@ case "${target}" in
     ;;
   powerpc*-*-winnt* | powerpc*-*-pe* | ppc*-*-pe)
     target_configdirs="$target_configdirs target-winsup"
-    noconfigdirs="$noconfigdirs gdb tcl tk make expect target-libgloss itcl db sn"
+    noconfigdirs="$noconfigdirs gdb tcl tk make expect target-libgloss itcl db sn libide vmake"
     # always build newlib.
     skipdirs=`echo " ${skipdirs} " | sed -e 's/ target-newlib / /'`
     ;;
     # This is temporary until we can link against shared libraries
   powerpcle-*-solaris*)
-    noconfigdirs="$noconfigdirs gdb sim make tcl tk expect itcl db sn"
+    noconfigdirs="$noconfigdirs gdb sim make tcl tk expect itcl db sn libide vmake"
     ;;
   rs6000-*-lynxos*)
     # The CVS server code doesn't work on the RS/6000
@@ -610,7 +610,7 @@ esac
 # If we are building a Canadian Cross, discard tools that can not be built
 # using a cross compiler.  FIXME: These tools should be fixed.
 if [ "${build}" != "${host}" ]; then
-  noconfigdirs="$noconfigdirs expect dejagnu itcl db sn"
+  noconfigdirs="$noconfigdirs expect dejagnu itcl db sn libide vmake"
 fi
 
 # Make sure we don't let GNU ld be added if we didn't want it.