* config/i386/{i386sol2.mh, i386v4.mh, ncr3000.mh},

  config/m68k/m68kv4.mh, config/mips/{irix4.mh, irix5.mh,
  mipsv4.mh}, config/sparc/sun4so2.mh (INSTALL): Removed, figured
  out by autoconf.
* config/apollo68v.mh (RANLIB): Removed, figured out by autoconf.

* Makefile.in, configure.in: Converted to use autoconf
* aclocal.m4: New file, local autoconf macro definitions.
* configure: New file, generated with autoconf 2.3.

10 files changed, 2664 insertions, 154 deletions

diff --git a/gdb/.Sanitize b/gdb/.Sanitize
index 0177730..ebccc4b 100644
--- a/gdb/.Sanitize
+++ b/gdb/.Sanitize
@@ -68,6 +68,7 @@ README
 TODO
 a29k-tdep.c
 a68v-nat.c
+aclocal.m4
 alpha-nat.c
 alpha-tdep.c
 altos-xdep.c
@@ -101,6 +102,7 @@ command.h
 complaints.c
 complaints.h
 config
+configure
 configure.in
 convex-tdep.c
 convex-xdep.c
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index d7baf59..26dffde 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,15 @@
+Mon May 15 17:11:38 1995  J.T. Conklin  <jtc@rtl.cygnus.com>
+
+	* config/i386/{i386sol2.mh, i386v4.mh, ncr3000.mh},
+	  config/m68k/m68kv4.mh, config/mips/{irix4.mh, irix5.mh,
+	  mipsv4.mh}, config/sparc/sun4so2.mh (INSTALL): Removed, figured
+	  out by autoconf.
+	* config/apollo68v.mh (RANLIB): Removed, figured out by autoconf.
+
+	* Makefile.in, configure.in: Converted to use autoconf
+	* aclocal.m4: New file, local autoconf macro definitions.
+	* configure: New file, generated with autoconf 2.3.
+
 Mon May 15 14:46:41 1995  Stan Shebs  <shebs@andros.cygnus.com>
 
 	* remote.c (remote_kill): Add prototype.
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 93470f2..6ca5bac 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -17,10 +17,12 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-prefix = /usr/local
+prefix = @prefix@
+exec_prefix = @exec_prefix@
 
-program_transform_name =
-exec_prefix = $(prefix)
+host_alias = @host_alias@
+target_alias = @target_alias@
+program_transform_name = @program_transform_name@
 bindir = $(exec_prefix)/bin
 libdir = $(exec_prefix)/lib
 tooldir = $(libdir)/$(target_alias)
@@ -42,13 +44,13 @@ docdir = $(datadir)/doc
 
 SHELL = /bin/sh
 
-INSTALL = `cd $(srcdir)/..;pwd`/install.sh -c
-INSTALL_PROGRAM = $(INSTALL)
-INSTALL_DATA = $(INSTALL)
+INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_DATA = @INSTALL_DATA@
 
 AR = ar
 AR_FLAGS = qv
-RANLIB = ranlib
+RANLIB = @RANLIB@
 
 # Flags that describe where you can find the termcap library.
 # This can be overridden in the host Makefile fragment file.
@@ -59,11 +61,11 @@ TERMCAP = -ltermcap
 # -traditional flag.  Otherwise the ioctl calls in inflow.c
 # will be incorrectly compiled.  The "fixincludes" script in the gcc
 # distribution will fix your include files up.
-#CC=gcc -traditional
+CC=@CC@
 
-# Directory containing source files.  Don't clean up the spacing,
-# this exact string is matched for by the "configure" script.
-srcdir = .
+# Directory containing source files.
+srcdir = @srcdir@
+VPATH = @srcdir@
 
 # If you use bison instead of yacc, it needs to include the "-y" argument.
 #BISON=bison -y
@@ -121,30 +123,25 @@ OPCODES = ../opcodes/libopcodes.a
 OP_INCLUDE = $(INCLUDE_DIR)/opcode
 OPCODES_CFLAGS = -I$(OP_INCLUDE)
 
+#start-sanitize-gdbtk
 # Where is the TCL library?  Typically in ../tcl.
-TCL_DIR = ../tcl
-TCL = -L$(TCL_DIR) -ltcl
-TCL_SRC = $(srcdir)/$(TCL_DIR)
-TCL_CFLAGS = -I$(TCL_SRC)
+TCL = @TCLLIB@
+TCL_CFLAGS = @TCLHDIR@
 
 # Where is the TK library?  Typically in ../tk.
-TK_DIR = ../tk
-TK = -L$(TK_DIR) -ltk
-TK_SRC = $(srcdir)/$(TK_DIR)
-TK_CFLAGS = -I$(TK_SRC)
-
-# A "-I" switch that can be used when compiling to make all of the
-# X11 include files accessible (the configure script will try to
-# set this value, and will cause it to be an empty string if the
-# include files are accessible via /usr/include).
-X11_INCLUDES =
-X11_CFLAGS = $(X11_INCLUDES)
-
-# Linker switch(es) to use to link with the X11 library archive (the
-# configure script will try to set this value automatically, but you
-# can override it).
-X11_LIB_SWITCHES =
-X11_LIBS = -lX11
+TK = @TKLIB@
+TK_CFLAGS = @TKHDIR@
+
+X11 = @X_LIBS@ @X_PRE_LIBS@ -lX11 @X_EXTRA_LIBS@
+X11_CFLAGS = @X_CFLAGS@
+
+ENABLE_GDBTK= @ENABLE_GDBTK@
+#end-sanitize-gdbtk
+
+ENABLE_CFLAGS= @ENABLE_CFLAGS@
+ENABLE_CLIBS= @ENABLE_CLIBS@
+ENABLE_OBS= @ENABLE_OBS@
+
 
 # All the includes used for CFLAGS and for lint.
 # -I. for config files.
@@ -154,7 +151,8 @@ X11_LIBS = -lX11
 # It is also possible that you will need to add -I/usr/include/sys if
 # your system doesn't have fcntl.h in /usr/include (which is where it
 # should be according to Posix).
-GDB_CFLAGS = -I. -I$(srcdir) -I$(srcdir)/config
+DEFS = @DEFS@
+GDB_CFLAGS = -I. -I$(srcdir) -I$(srcdir)/config $(DEFS)
 
 # M{H,T}_CFLAGS, if defined, have host- and target-dependent CFLAGS
 # from the config directory.
@@ -229,12 +227,13 @@ SER_HARDWIRE=ser-unix.o
 
 # The `remote' debugging target is supported for most architectures,
 # but not all (e.g. 960)
-REMOTE_O = remote.o dcache.o remote-utils.o
+REMOTE_OBS = remote.o dcache.o remote-utils.o
 
 ANNOTATE_OBS = annotate.o
 
 # Host and target-dependent makefile fragments come in here.
-####
+@host_makefile_frag@
+@target_makefile_frag@
 # End of host and target-dependent makefile fragments
 
 FLAGS_TO_PASS = \
@@ -349,7 +348,7 @@ SFILES = blockframe.c breakpoint.c buildsym.c c-exp.y c-lang.c \
 	gdbtypes.c infcmd.c inflow.c infrun.c language.c \
 	m2-exp.y m2-lang.c m2-typeprint.c m2-valprint.c main.c maint.c \
 	mem-break.c minsyms.c mipsread.c nlmread.c objfiles.c parse.c \
-	printcmd.c remote.c source.c stabsread.c stack.c symfile.c symmisc.c \
+	printcmd.c remote.c remote-nrom.c source.c stabsread.c stack.c symfile.c symmisc.c \
 	symtab.c target.c thread.c top.c \
 	typeprint.c utils.c valarith.c valops.c \
 	valprint.c values.c serial.c ser-unix.c mdebugread.c os9kread.c
@@ -445,8 +444,8 @@ TARDIRS = doc gdbserver sparclite
 # variables analogous to SER_HARDWIRE which get defaulted in this
 # Makefile.in
 
-DEPFILES = $(TDEPFILES) $(XDEPFILES) $(SER_HARDWIRE) $(NATDEPFILES) $(REMOTE_O) \
-	   $(ENABLE_DEPFILES)
+DEPFILES = $(TDEPFILES) $(XDEPFILES) $(SER_HARDWIRE) $(NATDEPFILES) $(REMOTE_OBS) \
+	   $(ENABLE_OBS)
 
 SOURCES = $(SFILES) $(ALLDEPFILES) $(YYFILES)
 # Don't include YYFILES (*.tab.c) because we already include *.y in SFILES,
@@ -551,6 +550,11 @@ uninstall: force
 		  true ; \
 		fi ; \
 		rm -f $(bindir)/$$transformed_name $(man1dir)/$$transformed_name.1
+	# start-sanitize-gdbtk
+	if [ x"$(ENABLE_GDBTK)" != x ] ; then \
+		rm -f $(libdir)/gdbtk.tcl ; \
+	fi
+	# end-sanitize-gdbtk
 	@$(MAKE) DO=uninstall "DODIRS=$(SUBDIRS)" $(FLAGS_TO_PASS) subdir_do 
 
 # We do this by grepping through sources.  If that turns out to be too slow,
@@ -750,7 +754,7 @@ subdir_do: force
 		else true ; fi ; \
 	done
 
-Makefile: Makefile.in $(host_makefile_frag) $(target_makefile_frag)
+Makefile: Makefile.in @host_makefile_frag_path@ @target_makefile_frag_path@
 	$(SHELL) config.status
 
 force:
@@ -1383,6 +1387,9 @@ remote-utils.o: remote-utils.c $(defs_h) $(gdbcmd_h) $(gdbcore_h) \
 remote.o: remote.c $(bfd_h) $(wait_h) $(defs_h) $(gdbcmd_h) \
 	$(inferior_h) $(remote_utils_h) symfile.h terminal.h
 
+remote-nrom.o: remote-nrom.c $(bfd_h) $(wait_h) $(defs_h) $(gdbcmd_h) \
+	$(inferior_h) $(remote_utils_h) symfile.h terminal.h
+
 rom68k-rom.o: rom68k-rom.c monitor.h $(bfd_h) $(wait_h) $(defs_h) $(gdbcmd_h) \
 	$(inferior_h) target.h serial.h terminal.h
 
diff --git a/gdb/aclocal.m4 b/gdb/aclocal.m4
new file mode 100644
index 0000000..19ba7ed
--- /dev/null
+++ b/gdb/aclocal.m4
@@ -0,0 +1,147 @@
+AC_DEFUN(CYGNUS_PATH_TK, [
+#
+# Ok, lets find the tk source trees so we can use the headers
+# If the directory (presumably symlink) named "tk" exists, use that one
+# in preference to any others.  Same logic is used when choosing library
+# and again with Tcl.
+#
+AC_CHECKING(for Tk source directory)
+TKHDIR=""
+for i in `ls -d ${srcdir}/../tk* 2>/dev/null` ${srcdir}/../tk ; do
+  if test -f $i/tk.h ; then
+    TKHDIR="-I$i"
+  fi
+done
+# if we can't find it, see if one is installed
+if test x"$TKHDIR" = x ; then
+  installed=0
+  if test -f $prefix/include/tk.h; then
+    installed=1 TKHDIR="-I$prefix/include"
+  else
+  AC_HEADER_CHECK(tk.h, installed=1)
+  fi
+  if test $installed -eq 0 ; then
+    TKHDIR="# no Tk directory found"
+    AC_MSG_WARN(Can't find Tk directory)
+  fi
+fi
+if test x"$TKHDIR" != x ; then
+  AC_MSG_RESULT(Setting TKHDIR to be $i)
+fi
+
+#
+# Ok, lets find the tk library
+# First, look for one uninstalled.  
+#
+TKLIB=""
+AC_CHECKING(for Tk library)
+for i in `ls -d ../tk* 2>/dev/null` ../tk ; do
+  if test -f "$i/Makefile" ; then
+    TKLIB=$i/libtk.a
+  fi
+done    
+# If not found, look for installed version
+if test x"$TKLIB" = x ; then
+dnl This doesn't work because of unresolved symbols.
+dnl  AC_HAVE_LIBRARY(libtk.a, installed=1, installed=0)
+  if test -f $prefix/lib/libtk.a; then
+    installed=1
+  else
+    installed=0
+  fi
+  if test $installed -eq 1 ; then
+    TKLIB="-ltk"
+  fi
+fi
+
+# If still not found, assume Tk simply hasn't been built yet
+if test x"$TKLIB" = x ; then
+  for i in `ls -d ../tk* 2>/dev/null` ../tk ; do
+    if test -f "$i/tk.h" ; then
+      TKLIB=$i/libtk.a
+  fi
+  done    
+fi
+
+if test x"$TKLIB" = x ; then
+    TKLIB="# no Tk library found"
+    AC_MSG_WARN(Can't find Tk library)
+else
+    AC_MSG_RESULT(setting TKLIB to be $TKLIB)
+    no_tk=
+fi
+
+AC_SUBST(TKHDIR)
+AC_SUBST(TKLIB)
+])
+
+
+AC_DEFUN(CYGNUS_PATH_TCL, [
+#
+# Ok, lets find the tcl source trees so we can use the headers
+#
+# Warning: transition of version 9 to 10 will break this algorithm
+# because 10 sorts before 9.
+#
+AC_CHECKING(for Tcl source directory)
+TCLHDIR=""
+for i in `ls -d ${srcdir}/../tcl* 2>/dev/null` ${srcdir}/../tcl ; do
+  if test -f $i/tclInt.h ; then
+    TCLHDIR="-I$i"
+  fi
+done
+# if we can't find it, see if one is installed
+if test x"$TCLHDIR" = x ; then
+  installed=0
+  if test -f $prefix/include/tclInt.h; then
+    installed=1 TCLHDIR="-I$prefix/include"
+  else
+  AC_HEADER_CHECK(tclInt.h, installed=1)
+  fi
+  if test $installed -eq 0 ; then
+    TCLHDIR="# no Tcl directory found"
+    AC_MSG_WARN(Can't find Tcl directory)
+  fi
+else
+  AC_MSG_RESULT(setting TCLHDIR to be $i)
+fi
+
+#
+# Ok, lets find the tcl library
+# First, look for the latest uninstalled
+#
+TCLLIB=""
+AC_CHECKING(for Tcl library)
+for i in `ls -d ../tcl* 2>/dev/null` ../tcl ; do
+  if test -f "$i/Makefile" ; then
+    TCLLIB=$i/libtcl.a
+  fi
+done    
+# If not found, look for installed version
+if test x"$TCLLIB" = x ; then
+dnl Don't use this, since we can't use it for libtk.a.
+dnl  AC_HAVE_LIBRARY(libtcl.a, installed=1, installed=0)
+  if test -f $prefix/lib/libtcl.a; then installed=1; else installed=0; fi
+  if test $installed -eq 1 ; then
+    TCLLIB="-ltcl"
+  fi
+fi
+# If still not found, assume Tcl simply hasn't been built yet
+if test x"$TCLLIB" = x ; then
+  for i in `ls -d ../tcl* 2>/dev/null` ../tcl ; do
+    if test -f "$i/tcl.h" ; then
+      TCLLIB=$i/libtcl.a
+  fi
+  done    
+fi
+
+if test x"$TCLLIB" = x ; then
+    TCLLIB="# no Tcl library found"
+    AC_MSG_WARN(Can't find Tcl library)
+else
+    AC_MSG_RESULT(setting TCLLIB to be $TCLLIB)
+fi
+
+AC_SUBST(TCLHDIR)
+AC_SUBST(TCLLIB)
+])
\ No newline at end of file
diff --git a/gdb/config/m68k/m68kv4.mh b/gdb/config/m68k/m68kv4.mh
index b005906..9253f4d 100644
--- a/gdb/config/m68k/m68kv4.mh
+++ b/gdb/config/m68k/m68kv4.mh
@@ -10,6 +10,3 @@ NATDEPFILES= corelow.o core-svr4.o solib.o procfs.o fork-child.o
 # old termcap descriptions are incomplete.  So ensure that we use the
 # new terminfo interface and latest terminal descriptions.
 TERMCAP=-ltermlib
-
-# SVR4 puts the BSD compatible install in /usr/ucb.
-INSTALL = /usr/ucb/install -c
diff --git a/gdb/config/mips/irix4.mh b/gdb/config/mips/irix4.mh
index 301b00a..01d5674 100644
--- a/gdb/config/mips/irix4.mh
+++ b/gdb/config/mips/irix4.mh
@@ -5,6 +5,5 @@ NAT_FILE= nm-irix4.h
 NATDEPFILES= fork-child.o procfs.o irix4-nat.o corelow.o
 MUNCH_DEFINE=-B
 XM_CLIBS=-lbsd -lsun
-INSTALL = cp
 # use cc in K&R mode, bump up some static compiler tables.
 CC = cc -cckr -Wf,-XNg1500 -Wf,-XNk1000 -Wf,-XNh1100
diff --git a/gdb/config/mips/mipsv4.mh b/gdb/config/mips/mipsv4.mh
index ec6c64d..c01bfcb 100644
--- a/gdb/config/mips/mipsv4.mh
+++ b/gdb/config/mips/mipsv4.mh
@@ -2,4 +2,3 @@
 XM_FILE= xm-mipsv4.h
 NAT_FILE= nm-sysv4.h
 NATDEPFILES= fork-child.o procfs.o mipsv4-nat.o corelow.o core-svr4.o solib.o
-INSTALL = cp
diff --git a/gdb/config/sparc/sun4sol2.mh b/gdb/config/sparc/sun4sol2.mh
index 60e3673..847d2a1 100644
--- a/gdb/config/sparc/sun4sol2.mh
+++ b/gdb/config/sparc/sun4sol2.mh
@@ -12,10 +12,6 @@ NATDEPFILES= corelow.o core-sol2.o solib.o procfs.o fork-child.o
 # new terminfo interface and latest terminal descriptions.
 TERMCAP=-ltermlib
 
-# Solaris-2 makes `install' optional in the Berkeley compatability pkg.
-# cp will do fine.
-INSTALL = cp
-
 # If you are compiling with Sun's compiler, add the -xs option to CC
 # (e.g. `make CC="cc -xs"').
 # Sun's compilers require the -xs option to produce debug information
diff --git a/gdb/configure b/gdb/configure
new file mode 100755
index 0000000..bc44923
--- /dev/null
+++ b/gdb/configure
@@ -0,0 +1,2318 @@
+#! /bin/sh
+
+# Guess values for system-dependent variables and create Makefiles.
+# Generated automatically using autoconf version 2.3 
+# Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc.
+#
+# This configure script is free software; the Free Software Foundation
+# gives unlimited permission to copy, distribute and modify it.
+
+# Defaults:
+ac_help=
+ac_default_prefix=/usr/local
+# Any additions from configure.in:
+ac_help="$ac_help
+  --enable-netrom "
+ac_help="$ac_help
+  --enable-gdbtk "
+ac_help="$ac_help
+  --with-x                use the X Window System"
+
+# Initialize some variables set by options.
+# The variables have the same names as the options, with
+# dashes changed to underlines.
+build=NONE
+cache_file=./config.cache
+exec_prefix=NONE
+host=NONE
+no_create=
+nonopt=NONE
+no_recursion=
+prefix=NONE
+program_prefix=NONE
+program_suffix=NONE
+program_transform_name=s,x,x,
+silent=
+site=
+srcdir=
+target=NONE
+verbose=
+x_includes=NONE
+x_libraries=NONE
+
+# Initialize some other variables.
+subdirs=
+
+ac_prev=
+for ac_option
+do
+
+  # If the previous option needs an argument, assign it.
+  if test -n "$ac_prev"; then
+    eval "$ac_prev=\$ac_option"
+    ac_prev=
+    continue
+  fi
+
+  case "$ac_option" in
+  -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
+  *) ac_optarg= ;;
+  esac
+
+  # Accept the important Cygnus configure options, so we can diagnose typos.
+
+  case "$ac_option" in
+
+  -build | --build | --buil | --bui | --bu | --b)
+    ac_prev=build ;;
+  -build=* | --build=* | --buil=* | --bui=* | --bu=* | --b=*)
+    build="$ac_optarg" ;;
+
+  -cache-file | --cache-file | --cache-fil | --cache-fi \
+  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
+    ac_prev=cache_file ;;
+  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
+  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
+    cache_file="$ac_optarg" ;;
+
+  -disable-* | --disable-*)
+    ac_feature=`echo $ac_option|sed -e 's/-*disable-//'`
+    # Reject names that are not valid shell variable names.
+    if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then
+      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
+    fi
+    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
+    eval "enable_${ac_feature}=no" ;;
+
+  -enable-* | --enable-*)
+    ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'`
+    # Reject names that are not valid shell variable names.
+    if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then
+      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
+    fi
+    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
+    case "$ac_option" in
+      *=*) ;;
+      *) ac_optarg=yes ;;
+    esac
+    eval "enable_${ac_feature}='$ac_optarg'" ;;
+
+  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
+  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
+  | --exec | --exe | --ex)
+    ac_prev=exec_prefix ;;
+  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
+  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
+  | --exec=* | --exe=* | --ex=*)
+    exec_prefix="$ac_optarg" ;;
+
+  -gas | --gas | --ga | --g)
+    # Obsolete; use --with-gas.
+    with_gas=yes ;;
+
+  -help | --help | --hel | --he)
+    # Omit some internal or obsolete options to make the list less imposing.
+    # This message is too long to be a string in the A/UX 3.1 sh.
+    cat << EOF
+Usage: configure [options] [host]
+Options: [defaults in brackets after descriptions]
+Configuration:
+  --cache-file=FILE       cache test results in FILE
+  --help                  print this message
+  --no-create             do not create output files
+  --quiet, --silent       do not print \`checking...' messages
+  --version               print the version of autoconf that created configure
+Directory and file names:
+  --prefix=PREFIX         install architecture-independent files in PREFIX
+                          [$ac_default_prefix]
+  --exec-prefix=PREFIX    install architecture-dependent files in PREFIX
+                          [same as prefix]
+  --srcdir=DIR            find the sources in DIR [configure dir or ..]
+  --program-prefix=PREFIX prepend PREFIX to installed program names
+  --program-suffix=SUFFIX append SUFFIX to installed program names
+  --program-transform-name=PROGRAM run sed PROGRAM on installed program names
+Host type:
+  --build=BUILD           configure for building on BUILD [BUILD=HOST]
+  --host=HOST             configure for HOST [guessed]
+  --target=TARGET         configure for TARGET [TARGET=HOST]
+Features and packages:
+  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
+  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
+  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --x-includes=DIR        X include files are in DIR
+  --x-libraries=DIR       X library files are in DIR
+--enable and --with options recognized:$ac_help
+EOF
+    exit 0 ;;
+
+  -host | --host | --hos | --ho)
+    ac_prev=host ;;
+  -host=* | --host=* | --hos=* | --ho=*)
+    host="$ac_optarg" ;;
+
+  -nfp | --nfp | --nf)
+    # Obsolete; use --without-fp.
+    with_fp=no ;;
+
+  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
+  | --no-cr | --no-c)
+    no_create=yes ;;
+
+  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
+  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
+    no_recursion=yes ;;
+
+  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
+    ac_prev=prefix ;;
+  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
+    prefix="$ac_optarg" ;;
+
+  -program-prefix | --program-prefix | --program-prefi | --program-pref \
+  | --program-pre | --program-pr | --program-p)
+    ac_prev=program_prefix ;;
+  -program-prefix=* | --program-prefix=* | --program-prefi=* \
+  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
+    program_prefix="$ac_optarg" ;;
+
+  -program-suffix | --program-suffix | --program-suffi | --program-suff \
+  | --program-suf | --program-su | --program-s)
+    ac_prev=program_suffix ;;
+  -program-suffix=* | --program-suffix=* | --program-suffi=* \
+  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
+    program_suffix="$ac_optarg" ;;
+
+  -program-transform-name | --program-transform-name \
+  | --program-transform-nam | --program-transform-na \
+  | --program-transform-n | --program-transform- \
+  | --program-transform | --program-transfor \
+  | --program-transfo | --program-transf \
+  | --program-trans | --program-tran \
+  | --progr-tra | --program-tr | --program-t)
+    ac_prev=program_transform_name ;;
+  -program-transform-name=* | --program-transform-name=* \
+  | --program-transform-nam=* | --program-transform-na=* \
+  | --program-transform-n=* | --program-transform-=* \
+  | --program-transform=* | --program-transfor=* \
+  | --program-transfo=* | --program-transf=* \
+  | --program-trans=* | --program-tran=* \
+  | --progr-tra=* | --program-tr=* | --program-t=*)
+    program_transform_name="$ac_optarg" ;;
+
+  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+  | -silent | --silent | --silen | --sile | --sil)
+    silent=yes ;;
+
+  -site | --site | --sit)
+    ac_prev=site ;;
+  -site=* | --site=* | --sit=*)
+    site="$ac_optarg" ;;
+
+  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
+    ac_prev=srcdir ;;
+  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
+    srcdir="$ac_optarg" ;;
+
+  -target | --target | --targe | --targ | --tar | --ta | --t)
+    ac_prev=target ;;
+  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
+    target="$ac_optarg" ;;
+
+  -v | -verbose | --verbose | --verbos | --verbo | --verb)
+    verbose=yes ;;
+
+  -version | --version | --versio | --versi | --vers)
+    echo "configure generated by autoconf version 2.3"
+    exit 0 ;;
+
+  -with-* | --with-*)
+    ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'`
+    # Reject names that are not valid shell variable names.
+    if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then
+      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
+    fi
+    ac_package=`echo $ac_package| sed 's/-/_/g'`
+    case "$ac_option" in
+      *=*) ;;
+      *) ac_optarg=yes ;;
+    esac
+    eval "with_${ac_package}='$ac_optarg'" ;;
+
+  -without-* | --without-*)
+    ac_package=`echo $ac_option|sed -e 's/-*without-//'`
+    # Reject names that are not valid shell variable names.
+    if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then
+      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
+    fi
+    ac_package=`echo $ac_package| sed 's/-/_/g'`
+    eval "with_${ac_package}=no" ;;
+
+  --x)
+    # Obsolete; use --with-x.
+    with_x=yes ;;
+
+  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
+  | --x-incl | --x-inc | --x-in | --x-i)
+    ac_prev=x_includes ;;
+  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
+  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
+    x_includes="$ac_optarg" ;;
+
+  -x-libraries | --x-libraries | --x-librarie | --x-librari \
+  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
+    ac_prev=x_libraries ;;
+  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
+  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
+    x_libraries="$ac_optarg" ;;
+
+  -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
+    ;;
+
+  *) 
+    if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
+      echo "configure: warning: $ac_option: invalid host type" 1>&2
+    fi
+    if test "x$nonopt" != xNONE; then
+      { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
+    fi
+    nonopt="$ac_option"
+    ;;
+
+  esac
+done
+
+if test -n "$ac_prev"; then
+  { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; }
+fi
+
+trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
+
+# File descriptor usage:
+# 0 standard input
+# 1 file creation
+# 2 errors and warnings
+# 3 some systems may open it to /dev/tty
+# 4 used on the Kubota Titan
+# 6 checking for... messages and results
+# 5 compiler messages saved in config.log
+if test "$silent" = yes; then
+  exec 6>/dev/null
+else
+  exec 6>&1
+fi
+exec 5>./config.log
+
+echo "\
+This file contains any messages produced by compilers while
+running configure, to aid debugging if configure makes a mistake.
+" 1>&5
+
+# Strip out --no-create and --no-recursion so they do not pile up.
+# Also quote any args containing shell metacharacters.
+ac_configure_args=
+for ac_arg
+do
+  case "$ac_arg" in
+  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
+  | --no-cr | --no-c) ;;
+  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
+  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
+  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*)
+  ac_configure_args="$ac_configure_args '$ac_arg'" ;;
+  *) ac_configure_args="$ac_configure_args $ac_arg" ;;
+  esac
+done
+
+# NLS nuisances.
+# Only set LANG and LC_ALL to C if already set.
+# These must not be set unconditionally because not all systems understand
+# e.g. LANG=C (notably SCO).
+if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
+if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
+
+# confdefs.h avoids OS command line length limits that DEFS can exceed.
+rm -rf conftest* confdefs.h
+# AIX cpp loses on an empty file, so make sure it contains at least a newline.
+echo > confdefs.h
+
+# A filename unique to this package, relative to the directory that
+# configure is in, which we can look for to find out if srcdir is correct.
+ac_unique_file=main.c
+
+# Find the source files, if location was not specified.
+if test -z "$srcdir"; then
+  ac_srcdir_defaulted=yes
+  # Try the directory containing this script, then its parent.
+  ac_prog=$0
+  ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'`
+  test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
+  srcdir=$ac_confdir
+  if test ! -r $srcdir/$ac_unique_file; then
+    srcdir=..
+  fi
+else
+  ac_srcdir_defaulted=no
+fi
+if test ! -r $srcdir/$ac_unique_file; then
+  if test "$ac_srcdir_defaulted" = yes; then
+    { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; }
+  else
+    { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; }
+  fi
+fi
+srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
+
+# Prefer explicitly selected file to automatically selected ones.
+if test -z "$CONFIG_SITE"; then
+  if test "x$prefix" != xNONE; then
+    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
+  else
+    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+  fi
+fi
+for ac_site_file in $CONFIG_SITE; do
+  if test -r "$ac_site_file"; then
+    echo "loading site script $ac_site_file"
+    . "$ac_site_file"
+  fi
+done
+
+if test -r "$cache_file"; then
+  echo "loading cache $cache_file"
+  . $cache_file
+else
+  echo "creating cache $cache_file"
+  > $cache_file
+fi
+
+ac_ext=c
+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5 2>&5'
+ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5 2>&5'
+
+if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
+  # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
+  if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
+    ac_n= ac_c='
+' ac_t='	'
+  else
+    ac_n=-n ac_c= ac_t=
+  fi
+else
+  ac_n= ac_c='\c' ac_t=
+fi
+
+
+
+CC=${CC-cc}
+# Extract the first word of "gcc", so it can be a program name with args.
+set dummy gcc; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+  for ac_dir in $PATH; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_CC="gcc"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+  test -z "$ac_cv_prog_CC" && ac_cv_prog_CC="cc"
+fi
+fi
+CC="$ac_cv_prog_CC"
+if test -n "$CC"; then
+  echo "$ac_t""$CC" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+
+echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
+if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.c <<EOF
+#ifdef __GNUC__
+  yes;
+#endif
+EOF
+if ${CC-cc} -E conftest.c 2>&5 | egrep yes >/dev/null 2>&1; then
+  ac_cv_prog_gcc=yes
+else
+  ac_cv_prog_gcc=no
+fi
+fi
+echo "$ac_t""$ac_cv_prog_gcc" 1>&6
+if test $ac_cv_prog_gcc = yes; then
+  GCC=yes
+  if test "${CFLAGS+set}" != set; then
+    echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
+if eval "test \"`echo '$''{'ac_cv_prog_gcc_g'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  echo 'void f(){}' > conftest.c
+if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
+  ac_cv_prog_gcc_g=yes
+else
+  ac_cv_prog_gcc_g=no
+fi
+rm -f conftest*
+
+fi
+    echo "$ac_t""$ac_cv_prog_gcc_g" 1>&6
+    if test $ac_cv_prog_gcc_g = yes; then
+      CFLAGS="-g -O"
+    else
+      CFLAGS="-O"
+    fi
+  fi
+else
+  GCC=
+  test "${CFLAGS+set}" = set || CFLAGS="-g"
+fi
+
+echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
+# On Suns, sometimes $CPP names a directory.
+if test -n "$CPP" && test -d "$CPP"; then
+  CPP=
+fi
+if test -z "$CPP"; then
+if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+    # This must be in double quotes, not single quotes, because CPP may get
+  # substituted into the Makefile and "${CC-cc}" will confuse make.
+  CPP="${CC-cc} -E"
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp.
+  cat > conftest.$ac_ext <<EOF
+#line 498 "configure"
+#include "confdefs.h"
+#include <assert.h>
+Syntax Error
+EOF
+eval "$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+ac_err=`grep -v '^ *+' conftest.out`
+if test -z "$ac_err"; then
+  :
+else
+  echo "$ac_err" >&5
+  rm -rf conftest*
+  CPP="${CC-cc} -E -traditional-cpp"
+  cat > conftest.$ac_ext <<EOF
+#line 512 "configure"
+#include "confdefs.h"
+#include <assert.h>
+Syntax Error
+EOF
+eval "$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+ac_err=`grep -v '^ *+' conftest.out`
+if test -z "$ac_err"; then
+  :
+else
+  echo "$ac_err" >&5
+  rm -rf conftest*
+  CPP=/lib/cpp
+fi
+rm -f conftest*
+fi
+rm -f conftest*
+  ac_cv_prog_CPP="$CPP"
+fi
+fi
+CPP="$ac_cv_prog_CPP"
+echo "$ac_t""$CPP" 1>&6
+
+echo $ac_n "checking for AIX""... $ac_c" 1>&6
+cat > conftest.$ac_ext <<EOF
+#line 537 "configure"
+#include "confdefs.h"
+#ifdef _AIX
+  yes
+#endif
+
+EOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  egrep "yes" >/dev/null 2>&1; then
+  rm -rf conftest*
+  echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF
+#define _ALL_SOURCE 1
+EOF
+
+else
+  rm -rf conftest*
+  echo "$ac_t""no" 1>&6
+fi
+rm -f conftest*
+
+
+ac_safe=`echo "minix/config.h" | tr './\055' '___'`
+echo $ac_n "checking for minix/config.h""... $ac_c" 1>&6
+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 564 "configure"
+#include "confdefs.h"
+#include <minix/config.h>
+EOF
+eval "$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+ac_err=`grep -v '^ *+' conftest.out`
+if test -z "$ac_err"; then
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=yes"
+else
+  echo "$ac_err" >&5
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=no"
+fi
+rm -f conftest*
+fi
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  MINIX=yes
+else
+  echo "$ac_t""no" 1>&6
+MINIX=
+fi
+
+if test "$MINIX" = yes; then
+  cat >> confdefs.h <<\EOF
+#define _POSIX_SOURCE 1
+EOF
+
+  cat >> confdefs.h <<\EOF
+#define _POSIX_1_SOURCE 2
+EOF
+
+  cat >> confdefs.h <<\EOF
+#define _MINIX 1
+EOF
+
+fi
+
+echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6
+if test -d /etc/conf/kconfig.d &&
+  grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1
+then
+  echo "$ac_t""yes" 1>&6
+  ISC=yes # If later tests want to check for ISC.
+  cat >> confdefs.h <<\EOF
+#define _POSIX_SOURCE 1
+EOF
+
+  if test "$GCC" = yes; then
+    CC="$CC -posix"
+  else
+    CC="$CC -Xp"
+  fi
+else
+  echo "$ac_t""no" 1>&6
+  ISC=
+fi
+
+
+ac_aux_dir=
+for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
+  if test -f $ac_dir/install-sh; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install-sh -c"
+    break
+  elif test -f $ac_dir/install.sh; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install.sh -c"
+    break
+  fi
+done
+if test -z "$ac_aux_dir"; then
+  { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; }
+fi
+ac_config_guess=$ac_aux_dir/config.guess
+ac_config_sub=$ac_aux_dir/config.sub
+ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
+
+# Find a good install program.  We prefer a C program (faster),
+# so one script is as good as another.  But avoid the broken or
+# incompatible versions:
+# SysV /etc/install, /usr/sbin/install
+# SunOS /usr/etc/install
+# IRIX /sbin/install
+# AIX /bin/install
+# AFS /usr/afsws/bin/install, which mishandles nonexistent args
+# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+# ./install, which can be erroneously created by make from ./install.sh.
+echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
+if test -z "$INSTALL"; then
+if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+    IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+  for ac_dir in $PATH; do
+    # Account for people who put trailing slashes in PATH elements.
+    case "$ac_dir/" in
+    /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
+    *)
+      # OSF1 and SCO ODT 3.0 have their own names for install.
+      for ac_prog in ginstall installbsd scoinst install; do
+        if test -f $ac_dir/$ac_prog; then
+	  if test $ac_prog = install &&
+            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
+	    # AIX install.  It has an incompatible calling convention.
+	    # OSF/1 installbsd also uses dspmsg, but is usable.
+	    :
+	  else
+	    ac_cv_path_install="$ac_dir/$ac_prog -c"
+	    break 2
+	  fi
+	fi
+      done
+      ;;
+    esac
+  done
+  IFS="$ac_save_ifs"
+  # As a last resort, use the slow shell script.
+  test -z "$ac_cv_path_install" && ac_cv_path_install="$ac_install_sh"
+fi
+  INSTALL="$ac_cv_path_install"
+fi
+echo "$ac_t""$INSTALL" 1>&6
+
+# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+# It thinks the first close brace ends the variable substitution.
+test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
+
+test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+
+# Extract the first word of "ranlib", so it can be a program name with args.
+set dummy ranlib; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test -n "$RANLIB"; then
+  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
+else
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+  for ac_dir in $PATH; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_RANLIB="ranlib"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+  test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
+fi
+fi
+RANLIB="$ac_cv_prog_RANLIB"
+if test -n "$RANLIB"; then
+  echo "$ac_t""$RANLIB" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+
+ac_aux_dir=
+for ac_dir in `cd $srcdir;pwd`/.. $srcdir/`cd $srcdir;pwd`/..; do
+  if test -f $ac_dir/install-sh; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install-sh -c"
+    break
+  elif test -f $ac_dir/install.sh; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install.sh -c"
+    break
+  fi
+done
+if test -z "$ac_aux_dir"; then
+  { echo "configure: error: can not find install-sh or install.sh in `cd $srcdir;pwd`/.. $srcdir/`cd $srcdir;pwd`/.." 1>&2; exit 1; }
+fi
+ac_config_guess=$ac_aux_dir/config.guess
+ac_config_sub=$ac_aux_dir/config.sub
+ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
+
+
+# Do some error checking and defaulting for the host and target type.
+# The inputs are:
+#    configure --host=HOST --target=TARGET --build=BUILD NONOPT
+#
+# The rules are:
+# 1. You are not allowed to specify --host, --target, and nonopt at the
+#    same time. 
+# 2. Host defaults to nonopt.
+# 3. If nonopt is not specified, then host defaults to the current host,
+#    as determined by config.guess.
+# 4. Target and build default to nonopt.
+# 5. If nonopt is not specified, then target and build default to host.
+
+# The aliases save the names the user supplied, while $host etc.
+# will get canonicalized.
+case $host---$target---$nonopt in
+NONE---*---* | *---NONE---* | *---*---NONE) ;;
+*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
+esac
+
+
+# Make sure we can run config.sub.
+if $ac_config_sub sun4 >/dev/null 2>&1; then :
+else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
+fi
+
+echo $ac_n "checking host system type""... $ac_c" 1>&6
+
+host_alias=$host
+case "$host_alias" in
+NONE)
+  case $nonopt in
+  NONE)
+    if host_alias=`$ac_config_guess`; then :
+    else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
+    fi ;;
+  *) host_alias=$nonopt ;;
+  esac ;;
+esac
+
+host=`$ac_config_sub $host_alias`
+host_cpu=`echo $host | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\1/'`
+host_vendor=`echo $host | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\2/'`
+host_os=`echo $host | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\3/'`
+echo "$ac_t""$host" 1>&6
+
+echo $ac_n "checking target system type""... $ac_c" 1>&6
+
+target_alias=$target
+case "$target_alias" in
+NONE)
+  case $nonopt in
+  NONE) target_alias=$host_alias ;;
+  *) target_alias=$nonopt ;;
+  esac ;;
+esac
+
+target=`$ac_config_sub $target_alias`
+target_cpu=`echo $target | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\1/'`
+target_vendor=`echo $target | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\2/'`
+target_os=`echo $target | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\3/'`
+echo "$ac_t""$target" 1>&6
+
+echo $ac_n "checking build system type""... $ac_c" 1>&6
+
+build_alias=$build
+case "$build_alias" in
+NONE)
+  case $nonopt in
+  NONE) build_alias=$host_alias ;;
+  *) build_alias=$nonopt ;;
+  esac ;;
+esac
+
+build=`$ac_config_sub $build_alias`
+build_cpu=`echo $build | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\1/'`
+build_vendor=`echo $build | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\2/'`
+build_os=`echo $build | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\3/'`
+echo "$ac_t""$build" 1>&6
+
+test "$host_alias" != "$target_alias" &&
+  test "$program_prefix$program_suffix$program_transform_name" = \
+    NONENONEs,x,x, &&
+  program_prefix=${target_alias}-
+
+if test "$program_transform_name" = s,x,x,; then
+  program_transform_name=
+else
+  # Double any \ or $.
+  echo 's,\\,\\\\,g; s,\$,$$,g' > conftestsed
+  program_transform_name="`echo $program_transform_name|sed -f conftestsed`"
+  rm -f conftestsed
+fi
+test "$program_prefix" != NONE &&
+  program_transform_name="s,^,${program_prefix},; $program_transform_name"
+# Use a double $ so make ignores it.
+test "$program_suffix" != NONE &&
+  program_transform_name="s,\$\$,${program_suffix},; $program_transform_name"
+
+# sed with no file args requires a program.
+test "$program_transform_name" = "" && program_transform_name="s,x,x,"
+
+
+
+ENABLE_CFLAGS=
+ENABLE_CLIBS=
+ENABLE_OBS=
+
+# Check whether --enable-netrom or --disable-netrom was given.
+enableval="$enable_netrom"
+if test -n "$enableval"; then
+  case "${enableval}" in
+yes)	enable_netrom=yes ;;
+no)	enable_netrom=no ;;
+*)	{ echo "configure: error: bad value ${enableval} given for netrom option" 1>&2; exit 1; } ;;
+esac
+fi
+
+
+if test "${enable_netrom}" = "yes"; then
+	ENABLE_OBS="${ENABLE_OBS} remote-nrom.o" 
+fi
+
+# start-sanitize-gdbtk
+ENABLE_GDBTK=
+
+# Check whether --enable-gdbtk or --disable-gdbtk was given.
+enableval="$enable_gdbtk"
+if test -n "$enableval"; then
+  case "${enableval}" in
+yes)	enable_gdbtk=yes ;;
+no)	enable_gdbtk=no  ;;
+*)	{ echo "configure: error: bad value ${enableval} given for gdbtk option" 1>&2; exit 1; } ;;
+esac
+fi
+
+
+if test "${enable_gdbtk}" = "yes"; then
+	# If we find X, set shell vars x_includes and x_libraries to the
+# paths, otherwise set no_x=yes.
+# Uses ac_ vars as temps to allow command line to override cache and checks.
+# --without-x overrides everything else, but does not touch the cache.
+echo $ac_n "checking for X""... $ac_c" 1>&6
+
+# Check whether --with-x or --without-x was given.
+withval="$with_x"
+if test -n "$withval"; then
+  :
+fi
+
+if test "x$with_x" = xno; then
+  no_x=yes
+else
+  if test "x$x_includes" != xNONE && test "x$x_libraries" != xNONE; then
+    no_x=
+  else
+if eval "test \"`echo '$''{'ac_cv_path_x'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  # One or both of the vars are not set, and there is no cached value.
+no_x=yes
+rm -fr conftestdir
+if mkdir conftestdir; then
+  cd conftestdir
+  # Make sure to not put "make" in the Imakefile rules, since we grep it out.
+  cat > Imakefile <<'EOF'
+acfindx:
+	@echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"'
+EOF
+  if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then
+    no_x=
+    # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+    eval `make acfindx 2>/dev/null | grep -v make`
+    # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
+    if test ! -f $ac_im_usrlibdir/libX11.a && test -f $ac_im_libdir/libX11.a
+    then
+      ac_im_usrlibdir=$ac_im_libdir
+    fi
+    # Screen out bogus values from the imake configuration.
+    case "$ac_im_incroot" in
+	/usr/include) ;;
+	*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes="$ac_im_incroot" ;;
+    esac
+    case "$ac_im_usrlibdir" in
+	/usr/lib | /lib) ;;
+	*) test -d "$ac_im_usrlibdir" && ac_x_libraries="$ac_im_usrlibdir" ;;
+    esac
+  fi
+  cd ..
+  rm -fr conftestdir
+fi
+
+if test "$no_x" = yes; then
+test -z "$x_direct_test_library" && x_direct_test_library=Xt
+test -z "$x_direct_test_function" && x_direct_test_function=XtMalloc
+test -z "$x_direct_test_include" && x_direct_test_include=X11/Intrinsic.h
+cat > conftest.$ac_ext <<EOF
+#line 941 "configure"
+#include "confdefs.h"
+#include <$x_direct_test_include>
+EOF
+eval "$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+ac_err=`grep -v '^ *+' conftest.out`
+if test -z "$ac_err"; then
+  rm -rf conftest*
+  no_x= ac_x_includes=
+else
+  echo "$ac_err" >&5
+  rm -rf conftest*
+    for ac_dir in               \
+    /usr/X11R6/include        \
+    /usr/X11R5/include        \
+    /usr/X11R4/include        \
+                              \
+    /usr/include/X11R6        \
+    /usr/include/X11R5        \
+    /usr/include/X11R4        \
+                              \
+    /usr/local/X11R6/include  \
+    /usr/local/X11R5/include  \
+    /usr/local/X11R4/include  \
+                              \
+    /usr/local/include/X11R6  \
+    /usr/local/include/X11R5  \
+    /usr/local/include/X11R4  \
+                              \
+    /usr/X11/include          \
+    /usr/include/X11          \
+    /usr/local/X11/include    \
+    /usr/local/include/X11    \
+                              \
+    /usr/X386/include         \
+    /usr/x386/include         \
+    /usr/XFree86/include/X11  \
+                              \
+    /usr/include              \
+    /usr/local/include        \
+    /usr/unsupported/include  \
+    /usr/athena/include       \
+    /usr/local/x11r5/include  \
+    /usr/lpp/Xamples/include  \
+                              \
+    /usr/openwin/include      \
+    /usr/openwin/share/include \
+    ; \
+  do
+    if test -r "$ac_dir/$x_direct_test_include"; then
+      no_x= ac_x_includes=$ac_dir
+      break
+    fi
+  done
+fi
+rm -f conftest*
+
+# Check for the libraries.
+# See if we find them without any special options.
+# Don't add to $LIBS permanently.
+ac_save_LIBS="$LIBS"
+LIBS="-l$x_direct_test_library $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 1004 "configure"
+#include "confdefs.h"
+
+int main() { return 0; }
+int t() {
+${x_direct_test_function}()
+; return 0; }
+EOF
+if eval $ac_link; then
+  rm -rf conftest*
+  LIBS="$ac_save_LIBS" no_x= ac_x_libraries=
+else
+  rm -rf conftest*
+  LIBS="$ac_save_LIBS"
+# First see if replacing the include by lib works.
+for ac_dir in `echo "$ac_x_includes" | sed s/include/lib/` \
+    /usr/X11R6/lib        \
+    /usr/X11R5/lib        \
+    /usr/X11R4/lib        \
+                          \
+    /usr/lib/X11R6        \
+    /usr/lib/X11R5        \
+    /usr/lib/X11R4        \
+                          \
+    /usr/local/X11R6/lib  \
+    /usr/local/X11R5/lib  \
+    /usr/local/X11R4/lib  \
+                          \
+    /usr/local/lib/X11R6  \
+    /usr/local/lib/X11R5  \
+    /usr/local/lib/X11R4  \
+                          \
+    /usr/X11/lib          \
+    /usr/lib/X11          \
+    /usr/local/X11/lib    \
+    /usr/local/lib/X11    \
+                          \
+    /usr/X386/lib         \
+    /usr/x386/lib         \
+    /usr/XFree86/lib/X11  \
+                          \
+    /usr/lib              \
+    /usr/local/lib        \
+    /usr/unsupported/lib  \
+    /usr/athena/lib       \
+    /usr/local/x11r5/lib  \
+    /usr/lpp/Xamples/lib  \
+                          \
+    /usr/openwin/lib      \
+    /usr/openwin/share/lib \
+    ; \
+do
+  for ac_extension in a so sl; do
+    if test -r $ac_dir/lib${x_direct_test_library}.$ac_extension; then
+      no_x= ac_x_libraries=$ac_dir
+      break 2
+    fi
+  done
+done
+fi
+rm -f conftest*
+
+fi
+if test "$no_x" = yes; then
+  ac_cv_path_x="no_x=yes"
+else
+  ac_cv_path_x="no_x= ac_x_includes=$ac_x_includes ac_x_libraries=$ac_x_libraries"
+fi
+fi
+  fi
+  eval "$ac_cv_path_x"
+fi # $with_x != no
+
+if test "$no_x" = yes; then
+  echo "$ac_t""no" 1>&6
+else
+  test "x$x_includes" = xNONE && x_includes=$ac_x_includes
+  test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries
+  ac_cv_path_x="no_x= ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
+  echo "$ac_t""libraries $x_libraries, headers $x_includes" 1>&6
+fi
+
+	if test "$no_x" = yes; then 
+  # Not all programs may use this symbol, but it does not hurt to define it.
+  X_CFLAGS="$X_CFLAGS -DX_DISPLAY_MISSING"
+else
+  if test -n "$x_includes"; then
+    X_CFLAGS="$X_CFLAGS -I$x_includes"
+  fi
+
+  # It would be nice to have a more robust check for the -R ld option than
+  # just checking for Solaris.
+  # It would also be nice to do this for all -L options, not just this one.
+  if test -n "$x_libraries"; then
+    X_LIBS="$X_LIBS -L$x_libraries"
+    if test "`(uname) 2>/dev/null`" = SunOS &&
+      uname -r | grep '^5' >/dev/null; then
+      X_LIBS="$X_LIBS -R$x_libraries"
+    fi
+  fi
+
+  # Check for libraries that X11R6 Xt/Xaw programs need.
+
+  ac_save_LDFLAGS="$LDFLAGS"
+  LDFLAGS="$LDFLAGS -L$x_libraries"
+  # SM needs ICE to (dynamically) link under SunOS 4.x (so we have to
+  # check for ICE first), but we must link in the order -lSM -lICE or
+  # we get undefined symbols.  So assume we have SM if we have ICE.
+  # These have to be linked with before -lX11, unlike the other
+  # libraries we check for below, so use a different variable.
+  #  --interran@uluru.Stanford.EDU, kb@cs.umb.edu.
+  echo $ac_n "checking for -lICE""... $ac_c" 1>&6
+if eval "test \"`echo '$''{'ac_cv_lib_ICE'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-lICE  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 1122 "configure"
+#include "confdefs.h"
+
+int main() { return 0; }
+int t() {
+IceConnectionNumber()
+; return 0; }
+EOF
+if eval $ac_link; then
+  rm -rf conftest*
+  eval "ac_cv_lib_ICE=yes"
+else
+  rm -rf conftest*
+  eval "ac_cv_lib_ICE=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'ICE`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+  LDFLAGS="$ac_save_LDFLAGS"
+
+  # Check for system-dependent libraries X programs must link with.
+
+  if test "$ISC" = yes; then
+    X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl_s -linet"
+  else
+    # Martyn.Johnson@cl.cam.ac.uk says this is needed for Ultrix, if the X
+    # libraries were built with DECnet support.  And karl@cs.umb.edu says
+    # the Alpha needs dnet_stub (dnet does not exist).
+    echo $ac_n "checking for -ldnet""... $ac_c" 1>&6
+if eval "test \"`echo '$''{'ac_cv_lib_dnet'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-ldnet  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 1165 "configure"
+#include "confdefs.h"
+
+int main() { return 0; }
+int t() {
+dnet_ntoa()
+; return 0; }
+EOF
+if eval $ac_link; then
+  rm -rf conftest*
+  eval "ac_cv_lib_dnet=yes"
+else
+  rm -rf conftest*
+  eval "ac_cv_lib_dnet=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'dnet`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+    if test $ac_cv_lib_dnet = no; then
+      echo $ac_n "checking for -ldnet_stub""... $ac_c" 1>&6
+if eval "test \"`echo '$''{'ac_cv_lib_dnet_stub'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-ldnet_stub  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 1199 "configure"
+#include "confdefs.h"
+
+int main() { return 0; }
+int t() {
+dnet_ntoa()
+; return 0; }
+EOF
+if eval $ac_link; then
+  rm -rf conftest*
+  eval "ac_cv_lib_dnet_stub=yes"
+else
+  rm -rf conftest*
+  eval "ac_cv_lib_dnet_stub=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'dnet_stub`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+    fi
+
+    # msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT,
+    # to get the SysV transport functions.
+    # Not sure which flavor of 386 UNIX this is, but it seems harmless to
+    # check for it.
+    echo $ac_n "checking for -lnsl""... $ac_c" 1>&6
+if eval "test \"`echo '$''{'ac_cv_lib_nsl'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-lnsl  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 1238 "configure"
+#include "confdefs.h"
+
+int main() { return 0; }
+int t() {
+t_accept()
+; return 0; }
+EOF
+if eval $ac_link; then
+  rm -rf conftest*
+  eval "ac_cv_lib_nsl=yes"
+else
+  rm -rf conftest*
+  eval "ac_cv_lib_nsl=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'nsl`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+
+    # lieder@skyler.mavd.honeywell.com says without -lsocket,
+    # socket/setsockopt and other routines are undefined under SCO ODT 2.0.
+    # But -lsocket is broken on IRIX, according to simon@lia.di.epfl.ch.
+    if test "`(uname) 2>/dev/null`" != IRIX; then
+      echo $ac_n "checking for -lsocket""... $ac_c" 1>&6
+if eval "test \"`echo '$''{'ac_cv_lib_socket'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-lsocket  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 1276 "configure"
+#include "confdefs.h"
+
+int main() { return 0; }
+int t() {
+socket()
+; return 0; }
+EOF
+if eval $ac_link; then
+  rm -rf conftest*
+  eval "ac_cv_lib_socket=yes"
+else
+  rm -rf conftest*
+  eval "ac_cv_lib_socket=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'socket`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  X_EXTRA_LIBS="$X_EXTRA_LIBS -lsocket"
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+    fi
+  fi
+fi
+
+
+	
+#
+# Ok, lets find the tk source trees so we can use the headers
+# If the directory (presumably symlink) named "tk" exists, use that one
+# in preference to any others.  Same logic is used when choosing library
+# and again with Tcl.
+#
+echo "checking for Tk source directory" 1>&6
+TKHDIR=""
+for i in `ls -d ${srcdir}/../tk* 2>/dev/null` ${srcdir}/../tk ; do
+  if test -f $i/tk.h ; then
+    TKHDIR="-I$i"
+  fi
+done
+# if we can't find it, see if one is installed
+if test x"$TKHDIR" = x ; then
+  installed=0
+  if test -f $prefix/include/tk.h; then
+    installed=1 TKHDIR="-I$prefix/include"
+  else
+  ac_safe=`echo "tk.h" | tr './\055' '___'`
+echo $ac_n "checking for tk.h""... $ac_c" 1>&6
+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 1333 "configure"
+#include "confdefs.h"
+#include <tk.h>
+EOF
+eval "$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+ac_err=`grep -v '^ *+' conftest.out`
+if test -z "$ac_err"; then
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=yes"
+else
+  echo "$ac_err" >&5
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=no"
+fi
+rm -f conftest*
+fi
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  installed=1
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+  fi
+  if test $installed -eq 0 ; then
+    TKHDIR="# no Tk directory found"
+    echo "configure: warning: Can't find Tk directory" 1>&2
+  fi
+fi
+if test x"$TKHDIR" != x ; then
+  echo "$ac_t""Setting TKHDIR to be $i" 1>&6
+fi
+
+#
+# Ok, lets find the tk library
+# First, look for one uninstalled.  
+#
+TKLIB=""
+echo "checking for Tk library" 1>&6
+for i in `ls -d ../tk* 2>/dev/null` ../tk ; do
+  if test -f "$i/Makefile" ; then
+    TKLIB=$i/libtk.a
+  fi
+done    
+# If not found, look for installed version
+if test x"$TKLIB" = x ; then
+  if test -f $prefix/lib/libtk.a; then
+    installed=1
+  else
+    installed=0
+  fi
+  if test $installed -eq 1 ; then
+    TKLIB="-ltk"
+  fi
+fi
+
+# If still not found, assume Tk simply hasn't been built yet
+if test x"$TKLIB" = x ; then
+  for i in `ls -d ../tk* 2>/dev/null` ../tk ; do
+    if test -f "$i/tk.h" ; then
+      TKLIB=$i/libtk.a
+  fi
+  done    
+fi
+
+if test x"$TKLIB" = x ; then
+    TKLIB="# no Tk library found"
+    echo "configure: warning: Can't find Tk library" 1>&2
+else
+    echo "$ac_t""setting TKLIB to be $TKLIB" 1>&6
+    no_tk=
+fi
+
+
+
+
+	
+#
+# Ok, lets find the tcl source trees so we can use the headers
+#
+# Warning: transition of version 9 to 10 will break this algorithm
+# because 10 sorts before 9.
+#
+echo "checking for Tcl source directory" 1>&6
+TCLHDIR=""
+for i in `ls -d ${srcdir}/../tcl* 2>/dev/null` ${srcdir}/../tcl ; do
+  if test -f $i/tclInt.h ; then
+    TCLHDIR="-I$i"
+  fi
+done
+# if we can't find it, see if one is installed
+if test x"$TCLHDIR" = x ; then
+  installed=0
+  if test -f $prefix/include/tclInt.h; then
+    installed=1 TCLHDIR="-I$prefix/include"
+  else
+  ac_safe=`echo "tclInt.h" | tr './\055' '___'`
+echo $ac_n "checking for tclInt.h""... $ac_c" 1>&6
+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 1435 "configure"
+#include "confdefs.h"
+#include <tclInt.h>
+EOF
+eval "$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+ac_err=`grep -v '^ *+' conftest.out`
+if test -z "$ac_err"; then
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=yes"
+else
+  echo "$ac_err" >&5
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=no"
+fi
+rm -f conftest*
+fi
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  installed=1
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+  fi
+  if test $installed -eq 0 ; then
+    TCLHDIR="# no Tcl directory found"
+    echo "configure: warning: Can't find Tcl directory" 1>&2
+  fi
+else
+  echo "$ac_t""setting TCLHDIR to be $i" 1>&6
+fi
+
+#
+# Ok, lets find the tcl library
+# First, look for the latest uninstalled
+#
+TCLLIB=""
+echo "checking for Tcl library" 1>&6
+for i in `ls -d ../tcl* 2>/dev/null` ../tcl ; do
+  if test -f "$i/Makefile" ; then
+    TCLLIB=$i/libtcl.a
+  fi
+done    
+# If not found, look for installed version
+if test x"$TCLLIB" = x ; then
+  if test -f $prefix/lib/libtcl.a; then installed=1; else installed=0; fi
+  if test $installed -eq 1 ; then
+    TCLLIB="-ltcl"
+  fi
+fi
+# If still not found, assume Tcl simply hasn't been built yet
+if test x"$TCLLIB" = x ; then
+  for i in `ls -d ../tcl* 2>/dev/null` ../tcl ; do
+    if test -f "$i/tcl.h" ; then
+      TCLLIB=$i/libtcl.a
+  fi
+  done    
+fi
+
+if test x"$TCLLIB" = x ; then
+    TCLLIB="# no Tcl library found"
+    echo "configure: warning: Can't find Tcl library" 1>&2
+else
+    echo "$ac_t""setting TCLLIB to be $TCLLIB" 1>&6
+fi
+
+
+
+
+
+	ENABLE_GDBTK=1
+	ENABLE_CLIBS="${ENABLE_CLIBS} $(TCL) $(TK) $(X11) -lm"
+	ENABLE_OBS="${ENABLE_OBS} gdbtk.o"
+fi
+
+# end-sanitize-gdbtk
+
+
+
+
+
+
+configdirs="doc testsuite"
+
+
+# Map host cpu into the config cpu subdirectory name.
+# The default is $host_cpu.
+
+case "${host_cpu}" in
+
+c[12])			gdb_host_cpu=convex ;;
+hppa*)			gdb_host_cpu=pa ;;
+i[345]86)		gdb_host_cpu=i386 ;;
+m68*)			gdb_host_cpu=m68k ;;
+m88*)			gdb_host_cpu=m88k ;;
+np1)			gdb_host_cpu=gould ;;
+pyramid)		gdb_host_cpu=pyr ;;
+powerpc*)		gdb_host_cpu=powerpc ;;
+*)			gdb_host_cpu=$host_cpu ;;
+
+esac
+
+# map host info into gdb names.
+
+case "${host}" in
+
+a29k-*-*)		gdb_host=ultra3 ;;
+
+alpha-*-osf1*)		gdb_host=alpha-osf1 ;;
+alpha-*-osf[23456789]*)	gdb_host=alpha-osf2 ;;
+
+arm-*-*)		gdb_host=arm ;;
+
+c[12]-*-*)		gdb_host=convex ;;
+
+hppa*-*-bsd*)		gdb_host=hppabsd ;;
+hppa*-*-hiux*)		gdb_host=hppahpux ;;
+hppa*-*-hpux*)		gdb_host=hppahpux ;;
+hppa*-*-osf*)		gdb_host=hppaosf ;;
+
+i[345]86-ncr-*)		gdb_host=ncr3000 ;;
+i[345]86-sequent-bsd*)	gdb_host=symmetry ;;  # dynix
+i[345]86-sequent-sysv4*) gdb_host=ptx4 ;;
+i[345]86-sequent-sysv*)	gdb_host=ptx ;;
+i[345]86-*-aix*)	gdb_host=i386aix ;;
+i[345]86-*-bsd*)	gdb_host=i386bsd ;;
+i[345]86-*-freebsd*)	gdb_host=fbsd ;;
+i[345]86-*-netbsd*)	gdb_host=nbsd ;;
+i[345]86-*-go32*)	gdb_host=go32 ;;
+i[345]86-*-linux*)	gdb_host=linux ;;
+i[345]86-*-lynxos*)	gdb_host=i386lynx ;;
+i[345]86-*-mach3*)	gdb_host=i386m3 ;;
+i[345]86-*-mach*)	gdb_host=i386mach ;;
+i[345]86-*-osf1mk*)	gdb_host=osf1mk ;;
+i[345]86-*-sco3.2v4*)	gdb_host=i386sco4 ;;
+i[345]86-*-sco*)	gdb_host=i386sco ;;
+i[345]86-*-solaris*)	gdb_host=i386sol2 ;;
+i[345]86-*-sunos*)	gdb_host=sun386 ;;
+i[345]86-*-sysv3.2*)	gdb_host=i386v32 ;;
+i[345]86-*-sysv32*)	gdb_host=i386v32 ;;
+i[345]86-*-sysv4*)	gdb_host=i386v4 ;;
+i[345]86-*-unixware)	gdb_host=i386v4 ;;
+i[345]86-*-sysv*)	gdb_host=i386v ;;
+i[345]86-*-isc*)	gdb_host=i386v32 ;;
+i[345]86-*-os9k)	gdb_host=i386os9k ;;
+
+m680[01]0-sun-sunos3*)	gdb_host=sun2os3 ;;
+m680[01]0-sun-sunos4*)	gdb_host=sun2os4 ;;
+m68030-sony-*)		gdb_host=news1000 ;;
+
+m68*-altos-*)		gdb_host=altos ;;
+m68*-apollo*-sysv*)	gdb_host=apollo68v ;;
+m68*-apollo*-bsd*)	gdb_host=apollo68b ;;
+m68*-att-*)		gdb_host=3b1 ;;
+m68*-bull*-sysv*)	gdb_host=dpx2 ;;
+m68*-hp-bsd*)		gdb_host=hp300bsd ;;
+m68*-hp-hpux*)		gdb_host=hp300hpux ;;
+m68*-isi-*)		gdb_host=isi ;;
+m68*-*-lynxos*)		gdb_host=m68klynx ;;
+m68*-*-sysv4*)		gdb_host=m68kv4 ;;
+m68*-motorola-*)	gdb_host=delta68 ;;
+m68*-sony-*)		gdb_host=news ;;
+m68*-sun-sunos3*)	gdb_host=sun3os3 ;;
+m68*-sun-sunos4*)	gdb_host=sun3os4 ;;
+m68*-sun-*)		gdb_host=sun3os4 ;;
+
+m88*-harris-cxux*)	gdb_host=cxux ;;
+m88*-motorola-sysv4*)	gdb_host=delta88v4 ;;
+m88*-motorola-sysv*)	gdb_host=delta88 ;;
+m88*-*-mach3*)		gdb_host=mach3 ;;
+m88*-*-*)		gdb_host=m88k ;;
+
+mips-dec-mach3*)	gdb_host=mach3 ;;
+mips-dec-*)		gdb_host=decstation ;;
+mips-little-*)		gdb_host=littlemips ;;
+mips-sgi-irix3*)	gdb_host=irix3 ;;
+mips-sgi-irix4*)	gdb_host=irix4 ;;
+mips-sgi-irix5*)	gdb_host=irix5 ;;
+mips-sony-*)		gdb_host=news-mips ;;
+mips-*-mach3*)		gdb_host=mach3 ;;
+mips-*-sysv4*)		gdb_host=mipsv4 ;;
+mips-*-sysv*)		gdb_host=riscos ;;
+mips-*-riscos*)		gdb_host=riscos ;;
+
+none-*-*)		gdb_host=none ;;
+
+np1-*-*)		gdb_host=np1 ;;
+
+ns32k-*-mach3*)		gdb_host=mach3 ;;
+ns32k-*-netbsd*)	gdb_host=nbsd ;;
+ns32k-umax-*)		gdb_host=umax ;;
+ns32k-utek-sysv*)	gdb_host=merlin ;;
+
+pn-*-*)			gdb_host=pn ;;
+
+pyramid-*-*)		gdb_host=pyramid ;;
+
+romp-*-*)		gdb_host=rtbsd ;;
+
+rs6000-*-lynxos*)	gdb_host=rs6000lynx ;;
+rs6000-*-*)		gdb_host=rs6000 ;;
+
+sparc-*-lynxos*)	gdb_host=sparclynx ;;
+sparc-*-netbsd*)	gdb_host=nbsd ;;
+sparc-*-solaris2*)	gdb_host=sun4sol2 ;;
+sparc-*-sunos4*)	gdb_host=sun4os4 ;;
+sparc-*-sunos5*)	gdb_host=sun4sol2 ;;
+sparc-*-*)		gdb_host=sun4os4 ;;
+
+tahoe-*-*)		gdb_host=tahoe ;;
+
+vax-*-bsd*)		gdb_host=vaxbsd ;;
+vax-*-ultrix2*)		gdb_host=vaxult2 ;;
+vax-*-ultrix*)		gdb_host=vaxult ;;
+
+w65-*-*)		gdb_host=w65 ;;
+
+esac
+
+
+# Map target cpu into the config cpu subdirectory name.
+# The default is $target_cpu.
+
+case "${target_cpu}" in
+
+alpha)			gdb_target_cpu=alpha ;;
+c[12])			gdb_target_cpu=convex ;;
+hppa*)			gdb_target_cpu=pa ;;
+i[345]86)		gdb_target_cpu=i386 ;;
+m68*)			gdb_target_cpu=m68k ;;
+m88*)			gdb_target_cpu=m88k ;;
+mips*)			gdb_target_cpu=mips ;;
+np1)			gdb_target_cpu=gould ;;
+powerpc*)		gdb_target_cpu=powerpc ;;
+pn)			gdb_target_cpu=gould ;;
+pyramid)		gdb_target_cpu=pyr ;;
+sparclite*)		gdb_target_cpu=sparc
+		configdirs="${configdirs} sparclite" ;;
+sparc*)			gdb_target_cpu=sparc ;;
+*)			gdb_target_cpu=$target_cpu ;;
+
+esac
+
+# map target info into gdb names.
+
+case "${target}" in
+
+a29k-*-aout*)		gdb_target=a29k ;;
+a29k-*-coff*)		gdb_target=a29k ;;
+a29k-*-elf*)		gdb_target=a29k ;;
+a29k-*-ebmon*)		gdb_target=a29k ;;
+a29k-*-kern*)		gdb_target=a29k-kern ;;
+a29k-*-none*)		gdb_target=a29k ;;
+a29k-*-sym1*)		gdb_target=ultra3 ;;
+a29k-*-udi*)		gdb_target=a29k-udi ;;
+a29k-*-vxworks*)        gdb_target=vx29k ;;
+
+alpha-*-osf*)		gdb_target=alpha-osf1 ;;
+
+# start-sanitize-arc
+arc-*-*)		gdb_target=arc ;;
+# end-sanitize-arc
+
+arm-*-*)		gdb_target=arm ;;
+
+c1-*-*)			gdb_target=convex ;;
+c2-*-*)			gdb_target=convex ;;
+
+h8300-*-*)		gdb_target=h8300hms ;;
+h8500-*-*)		gdb_target=h8500hms ;;
+
+sh-*-*)			gdb_target=sh ;;
+
+# start-sanitize-r16
+r16-*-*)		gdb_target=r16 ;;
+# end-sanitize-r16
+
+hppa*-*-bsd*)		gdb_target=hppabsd ;;
+hppa*-*-pro*)		gdb_target=hppapro ;;
+hppa*-*-hpux*)		gdb_target=hppahpux ;;
+hppa*-*-hiux*)		gdb_target=hppahpux ;;
+hppa*-*-osf*)		gdb_target=hppaosf ;;
+
+i[345]86-sequent-bsd*)	gdb_target=symmetry ;;
+i[345]86-sequent-sysv4*) gdb_target=ptx4 ;;
+i[345]86-sequent-sysv*)	gdb_target=ptx ;;
+i[345]86-ncr-*)		gdb_target=ncr3000 ;;
+i[345]86-*-aout*)	gdb_target=i386aout ;;
+i[345]86-*-coff*)	gdb_target=i386v ;;
+i[345]86-*-elf*)	gdb_target=i386v ;;
+i[345]86-*-aix*)	gdb_target=i386aix ;;
+i[345]86-*-bsd*)	gdb_target=i386bsd ;;
+i[345]86-*-freebsd*)	gdb_target=fbsd ;;
+i[345]86-*-netbsd*)	gdb_target=nbsd ;;
+i[345]86-*-os9k)	gdb_target=i386os9k ;;
+i[345]86-*-go32*)	gdb_target=i386aout ;;
+i[345]86-*-lynxos*)	gdb_target=i386lynx
+		configdirs="${configdirs} gdbserver" ;;
+i[345]86-*-solaris*)	gdb_target=i386sol2 ;;
+i[345]86-*-sunos*)	gdb_target=sun386 ;;
+i[345]86-*-sysv4*)	gdb_target=i386v4 ;;
+i[345]86-*-sco*)	gdb_target=i386v ;;
+i[345]86-*-sysv*)	gdb_target=i386v ;;
+i[345]86-*-linux*)	gdb_target=linux ;;
+i[345]86-*-isc*)	gdb_target=i386v ;;
+i[345]86-*-mach3*)	gdb_target=i386m3 ;;
+i[345]86-*-mach*)	gdb_target=i386mach ;;
+i[345]86-*-netware*)	gdb_target=i386nw
+		configdirs="${configdirs} nlm" ;;
+i[345]86-*-osf1mk*)	gdb_target=i386mk ;;
+
+i960-*-bout*)		gdb_target=vxworks960 ;;
+i960-*-coff*)		gdb_target=nindy960 ;;
+i960-*-elf*)		gdb_target=nindy960 ;;
+
+i960-*-nindy*)		gdb_target=nindy960 ;;
+i960-*-vxworks*)	gdb_target=vxworks960 ;;
+
+m68000-*-sunos3*)	gdb_target=sun2os3 ;;
+m68000-*-sunos4*)	gdb_target=sun2os4 ;;
+
+m68*-apollo*-bsd*)	gdb_target=apollo68b ;;
+m68*-bull-sysv*)	gdb_target=dpx2 ;;
+m68*-hp-bsd*)		gdb_target=hp300bsd ;;
+m68*-hp-hpux*)		gdb_target=hp300hpux ;;
+m68*-altos-*)		gdb_target=altos ;;
+m68*-att-*)		gdb_target=3b1 ;;
+m68*-cisco*-*)		gdb_target=cisco ;;
+m68*-ericsson-*)	gdb_target=es1800 ;;
+m68*-isi-*)		gdb_target=isi ;;
+m68*-motorola-*)	gdb_target=delta68 ;;
+m68*-netx-*)		gdb_target=vxworks68 ;;
+m68*-sony-*)		gdb_target=news ;;
+m68*-tandem-*)		gdb_target=st2000 ;;
+m68*-rom68k-*)          gdb_target=monitor ;;
+m68*-*bug-*)            gdb_target=monitor ;;
+m68*-monitor-*)         gdb_target=monitor ;;
+m68*-est-*)		gdb_target=est ;;
+m68*-*-aout*)		gdb_target=monitor ;;
+m68*-*-coff*)		gdb_target=monitor ;;
+m68*-*-elf*)		gdb_target=monitor ;;
+m68*-*-lynxos*)		gdb_target=m68klynx
+		configdirs="${configdirs} gdbserver" ;;
+m68*-*-os68k*)		gdb_target=os68k ;;
+m68*-*-sunos3*)		gdb_target=sun3os3 ;;
+m68*-*-sunos4*)		gdb_target=sun3os4 ;;
+m68*-*-sysv4*)		gdb_target=m68kv4 ;;
+m68*-*-vxworks*)	gdb_target=vxworks68 ;;
+
+m88*-harris-cxux*)	gdb_target=cxux ;;
+m88*-motorola-sysv4*)	gdb_target=delta88v4 ;;
+m88*-*-mach3*)		gdb_target=mach3 ;;
+m88*-motorola-*)	gdb_target=delta88 ;;
+m88*-*-*)		gdb_target=m88k ;;
+
+mips64*-big-*)		gdb_target=bigmips64 ;;
+mips*-big-*)		gdb_target=bigmips ;;
+mips*-dec-mach3*)	gdb_target=mach3 ;;
+mips*-dec-*)		gdb_target=decstation ;;
+mips64*el-*-ecoff*)	gdb_target=idtl64 ;;
+mips64*-idt-ecoff*)	gdb_target=idt64 ;;
+mips64*el-*-elf*)	gdb_target=idtl64 ;;
+mips64*-*-elf*)		gdb_target=idt64 ;;
+mips*el-*-ecoff*)	gdb_target=idtl ;;
+mips*-*-ecoff*)		gdb_target=idt ;;
+mips*el-*-elf*)		gdb_target=idtl ;;
+mips*-*-elf*)		gdb_target=idt ;;
+mips*-little-*)		gdb_target=littlemips ;;
+mips*-sgi-irix5*)	gdb_target=irix5 ;;
+mips*-sgi-*)		gdb_target=irix3 ;;
+mips*-sony-*)		gdb_target=bigmips ;;
+mips*-*-mach3*)		gdb_target=mach3 ;;
+mips*-*-sysv4*)		gdb_target=mipsv4 ;;
+mips*-*-sysv*)		gdb_target=bigmips ;;
+mips*-*-riscos*)	gdb_target=bigmips ;;
+
+none-*-*)		gdb_target=none ;;
+
+np1-*-*)		gdb_target=np1 ;;
+
+ns32k-*-mach3*)		gdb_target=mach3 ;;
+ns32k-*-netbsd*)	gdb_target=nbsd ;;
+ns32k-utek-sysv*)	gdb_target=merlin ;;
+ns32k-utek-*)		gdb_target=umax ;;
+
+pn-*-*)			gdb_target=pn ;;
+powerpc-*-netware*)	gdb_target=ppc-nw
+			configdirs="${configdirs} nlm" ;;
+
+powerpc-*-eabi*)	gdb_target=ppc-eabi
+			configdirs="${configdirs}" ;;
+
+powerpcle-*-eabi*)	gdb_target=ppcle-eabi
+			configdirs="${configdirs}" ;;
+
+pyramid-*-*)		gdb_target=pyramid ;;
+
+rs6000-*-lynxos*)	gdb_target=rs6000lynx ;;
+rs6000-*-*)		gdb_target=rs6000 ;;
+
+sparc-*-aout*)		gdb_target=sparc-em ;;
+sparc-*-coff*)		gdb_target=sparc-em ;;
+sparc-*-elf*)		gdb_target=sparc-em ;;
+sparc-*-lynxos*)	gdb_target=sparclynx
+		configdirs="${configdirs} gdbserver" ;;
+sparc-*-netbsd*)	gdb_target=nbsd ;;
+sparc-*-solaris2*)	gdb_target=sun4sol2 ;;
+sparc-*-sunos4*)	gdb_target=sun4os4 ;;
+sparc-*-sunos5*)	gdb_target=sun4sol2 ;;
+sparc-*-vxworks*)	gdb_target=vxsparc ;;
+sparc-*-*)		gdb_target=sun4os4 ;;
+sparclite*-*-*)		gdb_target=sparclite ;;
+sparc64-*-*)		gdb_target=sp64 ;;
+
+tahoe-*-*)		gdb_target=tahoe ;;
+
+vax-*-*)		gdb_target=vax ;;
+
+w65-*-*)		gdb_target=w65 ;;
+
+z8k-*-sim*)		gdb_target=z8ksim ;;
+z8k-*-coff*)		gdb_target=z8ksim ;;
+
+esac
+
+
+
+host_makefile_frag=${srcdir}/config/${gdb_host_cpu}/${gdb_host}.mh
+if test ! -f ${host_makefile_frag}; then
+{ echo "configure: error: "*** Gdb does not support host ${host}"" 1>&2; exit 1; }
+fi
+
+target_makefile_frag=${srcdir}/config/${gdb_target_cpu}/${gdb_target}.mt
+if test ! -f ${target_makefile_frag}; then
+{ echo "configure: error: "*** Gdb does not support target ${target}"" 1>&2; exit 1; }
+fi
+
+host_makefile_frag_path=$host_makefile_frag
+target_makefile_frag_path=$target_makefile_frag
+
+
+
+
+
+
+#  We really shouldn't depend on there being a space after XM_FILE= ...
+hostfile=`awk '$1 == "XM_FILE=" { print $2 }' ${host_makefile_frag}`
+
+#  We really shouldn't depend on there being a space after TM_FILE= ...
+targetfile=`awk '$1 == "TM_FILE=" { print $2 }' ${target_makefile_frag}`
+
+# these really aren't orthogonal true/false values of the same condition,
+# but shells are slow enough that I like to reuse the test conditions
+# whenever possible
+if test "${target}" = "${host}"; then
+nativefile=`awk '$1 == "NAT_FILE=" { print $2 }' ${host_makefile_frag}`
+else
+# GDBserver is only useful in a "native" enviroment
+configdirs=`echo $configdirs | sed 's/gdbserver//'`
+fi
+
+
+# If hostfile (XM_FILE) and/or targetfile (TM_FILE) and/or nativefile
+# (NAT_FILE) is not set in config/*/*.m[ht] files, we don't make the
+# corresponding links.  But we have to remove the xm.h files and tm.h
+# files anyway, e.g. when switching from "configure host" to
+# "configure none".
+
+files=
+links=
+rm -f xm.h
+if test "${hostfile}" != ""; then
+files="${files} config/${gdb_host_cpu}/${hostfile}"
+links="${links} xm.h"
+fi
+rm -f tm.h
+if test "${targetfile}" != ""; then
+files="${files} config/${gdb_target_cpu}/${targetfile}"
+links="${links} tm.h"
+fi
+rm -f nm.h
+if test "${nativefile}" != ""; then
+files="${files} config/${gdb_host_cpu}/${nativefile}"
+links="${links} nm.h"
+else
+# A cross-only configuration.
+files="${files} config/nm-empty.h"
+links="${links} nm.h"
+fi
+# start-sanitize-gdbtk
+
+# Make it possible to use the GUI without doing a full install
+if test "${enable_gdbtk}" = "yes" -a ! -f gdbtk.tcl ; then
+files="${files} gdbtk.tcl"
+links="${links} gdbtk.tcl"
+fi
+# end-sanitize-gdbtk
+
+
+
+subdirs="$configdirs"
+
+trap '' 1 2 15
+cat > confcache <<\EOF
+# This file is a shell script that caches the results of configure
+# tests run on this system so they can be shared between configure
+# scripts and configure runs.  It is not useful on other systems.
+# If it contains results you don't want to keep, you may remove or edit it.
+#
+# By default, configure uses ./config.cache as the cache file,
+# creating it if it does not exist already.  You can give configure
+# the --cache-file=FILE option to use a different cache file; that is
+# what configure does when it calls configure scripts in
+# subdirectories, so they share the cache.
+# Giving --cache-file=/dev/null disables caching, for debugging configure.
+# config.status only pays attention to the cache file if you give it the
+# --recheck option to rerun configure.
+#
+EOF
+# Ultrix sh set writes to stderr and can't be redirected directly,
+# and sets the high bit in the cache file unless we assign to the vars.
+(set) 2>&1 |
+  sed -n "s/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=\${\1='\2'}/p" \
+  >> confcache
+if cmp -s $cache_file confcache; then
+  :
+else
+  if test -w $cache_file; then
+    echo "updating cache $cache_file"
+    cat confcache > $cache_file
+  else
+    echo "not updating unwritable cache $cache_file"
+  fi
+fi
+rm -f confcache
+
+trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
+
+test "x$prefix" = xNONE && prefix=$ac_default_prefix
+# Let make expand exec_prefix.
+test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+
+# Any assignment to VPATH causes Sun make to only execute
+# the first set of double-colon rules, so remove it if not needed.
+# If there is a colon in the path, we need to keep it.
+if test "x$srcdir" = x.; then
+  ac_vpsub='/^[ 	]*VPATH[ 	]*=[^:]*$/d'
+fi
+
+trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
+
+# Transform confdefs.h into DEFS.
+# Protect against shell expansion while executing Makefile rules.
+# Protect against Makefile macro expansion.
+cat > conftest.defs <<\EOF
+s%#define \([A-Za-z_][A-Za-z0-9_]*\) \(.*\)%-D\1=\2%g
+s%[ 	`~#$^&*(){}\\|;'"<>?]%\\&%g
+s%\[%\\&%g
+s%\]%\\&%g
+s%\$%$$%g
+EOF
+DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '`
+rm -f conftest.defs
+
+
+# Without the "./", some shells look in PATH for config.status.
+: ${CONFIG_STATUS=./config.status}
+
+echo creating $CONFIG_STATUS
+rm -f $CONFIG_STATUS
+cat > $CONFIG_STATUS <<EOF
+#! /bin/sh
+# Generated automatically by configure.
+# Run this file to recreate the current configuration.
+# This directory was configured as follows,
+# on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+#
+# $0 $ac_configure_args
+#
+# Compiler output produced by configure, useful for debugging
+# configure, is in ./config.log if it exists.
+
+ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]"
+for ac_option
+do
+  case "\$ac_option" in
+  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
+    echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
+    exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
+  -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
+    echo "$CONFIG_STATUS generated by autoconf version 2.3"
+    exit 0 ;;
+  -help | --help | --hel | --he | --h)
+    echo "\$ac_cs_usage"; exit 0 ;;
+  *) echo "\$ac_cs_usage"; exit 1 ;;
+  esac
+done
+
+ac_given_srcdir=$srcdir
+ac_given_INSTALL="$INSTALL"
+
+trap 'rm -fr `echo "Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+
+# Protect against being on the right side of a sed subst in config.status. 
+sed 's/%@/@@/; s/@%/@@/; s/%g$/@g/; /@g$/s/[\\\\&%]/\\\\&/g; 
+ s/@@/%@/; s/@@/@%/; s/@g$/%g/' > conftest.subs <<\CEOF
+$ac_vpsub
+$extrasub
+s%@CFLAGS@%$CFLAGS%g
+s%@CPPFLAGS@%$CPPFLAGS%g
+s%@CXXFLAGS@%$CXXFLAGS%g
+s%@DEFS@%$DEFS%g
+s%@LDFLAGS@%$LDFLAGS%g
+s%@LIBS@%$LIBS%g
+s%@exec_prefix@%$exec_prefix%g
+s%@prefix@%$prefix%g
+s%@program_transform_name@%$program_transform_name%g
+s%@CC@%$CC%g
+s%@CPP@%$CPP%g
+s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
+s%@INSTALL_DATA@%$INSTALL_DATA%g
+s%@RANLIB@%$RANLIB%g
+s%@host@%$host%g
+s%@host_alias@%$host_alias%g
+s%@host_cpu@%$host_cpu%g
+s%@host_vendor@%$host_vendor%g
+s%@host_os@%$host_os%g
+s%@target@%$target%g
+s%@target_alias@%$target_alias%g
+s%@target_cpu@%$target_cpu%g
+s%@target_vendor@%$target_vendor%g
+s%@target_os@%$target_os%g
+s%@build@%$build%g
+s%@build_alias@%$build_alias%g
+s%@build_cpu@%$build_cpu%g
+s%@build_vendor@%$build_vendor%g
+s%@build_os@%$build_os%g
+s%@X_CFLAGS@%$X_CFLAGS%g
+s%@X_PRE_LIBS@%$X_PRE_LIBS%g
+s%@X_LIBS@%$X_LIBS%g
+s%@X_EXTRA_LIBS@%$X_EXTRA_LIBS%g
+s%@TKHDIR@%$TKHDIR%g
+s%@TKLIB@%$TKLIB%g
+s%@TCLHDIR@%$TCLHDIR%g
+s%@TCLLIB@%$TCLLIB%g
+s%@ENABLE_GDBTK@%$ENABLE_GDBTK%g
+s%@ENABLE_CFLAGS@%$ENABLE_CFLAGS%g
+s%@ENABLE_CLIBS@%$ENABLE_CLIBS%g
+s%@ENABLE_OBS@%$ENABLE_OBS%g
+s%@host_makefile_frag_path@%$host_makefile_frag_path%g
+s%@target_makefile_frag_path@%$target_makefile_frag_path%g
+/@host_makefile_frag@/r $host_makefile_frag
+s%@host_makefile_frag@%%g
+/@target_makefile_frag@/r $target_makefile_frag
+s%@target_makefile_frag@%%g
+s%@subdirs@%$subdirs%g
+
+CEOF
+EOF
+cat >> $CONFIG_STATUS <<EOF
+
+CONFIG_FILES=\${CONFIG_FILES-"Makefile"}
+EOF
+cat >> $CONFIG_STATUS <<\EOF
+for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
+  # Support "outfile[:infile]", defaulting infile="outfile.in".
+  case "$ac_file" in
+  *:*) ac_file_in=`echo "$ac_file"|sed 's%.*:%%'`
+       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
+  *) ac_file_in="${ac_file}.in" ;;
+  esac
+
+  # Adjust relative srcdir, etc. for subdirectories.
+
+  # Remove last slash and all that follows it.  Not all systems have dirname.
+  ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
+  if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
+    # The file is in a subdirectory.
+    test ! -d "$ac_dir" && mkdir "$ac_dir"
+    ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`"
+    # A "../" for each directory in $ac_dir_suffix.
+    ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'`
+  else
+    ac_dir_suffix= ac_dots=
+  fi
+
+  case "$ac_given_srcdir" in
+  .)  srcdir=.
+      if test -z "$ac_dots"; then top_srcdir=.
+      else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;;
+  /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;;
+  *) # Relative path.
+    srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
+    top_srcdir="$ac_dots$ac_given_srcdir" ;;
+  esac
+
+  case "$ac_given_INSTALL" in
+  [/$]*) INSTALL="$ac_given_INSTALL" ;;
+  *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
+  esac
+  echo creating "$ac_file"
+  rm -f "$ac_file"
+  configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
+  case "$ac_file" in
+  *Makefile*) ac_comsub="1i\\
+# $configure_input" ;;
+  *) ac_comsub= ;;
+  esac
+  sed -e "$ac_comsub
+s%@configure_input@%$configure_input%g
+s%@srcdir@%$srcdir%g
+s%@top_srcdir@%$top_srcdir%g
+s%@INSTALL@%$INSTALL%g
+" -f conftest.subs $ac_given_srcdir/$ac_file_in > $ac_file
+fi; done
+rm -f conftest.subs
+
+EOF
+
+cat >> $CONFIG_STATUS <<EOF
+ac_sources="$files"
+ac_dests="$links"
+EOF
+
+cat >> $CONFIG_STATUS <<\EOF
+srcdir=$ac_given_srcdir
+while test -n "$ac_sources"; do
+  set $ac_dests; ac_dest=$1; shift; ac_dests=$*
+  set $ac_sources; ac_source=$1; shift; ac_sources=$*
+
+  echo "linking $srcdir/$ac_source to $ac_dest"
+
+  if test ! -r $srcdir/$ac_source; then
+    { echo "configure: error: $srcdir/$ac_source: File not found" 1>&2; exit 1; }
+  fi
+  rm -f $ac_dest
+
+  # Make relative symlinks.
+  # Remove last slash and all that follows it.  Not all systems have dirname.
+  ac_dest_dir=`echo $ac_dest|sed 's%/[^/][^/]*$%%'`
+  if test "$ac_dest_dir" != "$ac_dest" && test "$ac_dest_dir" != .; then
+    # The dest file is in a subdirectory.
+    test ! -d "$ac_dest_dir" && mkdir "$ac_dest_dir"
+    ac_dest_dir_suffix="/`echo $ac_dest_dir|sed 's%^\./%%'`"
+    # A "../" for each directory in $ac_dest_dir_suffix.
+    ac_dots=`echo $ac_dest_dir_suffix|sed 's%/[^/]*%../%g'`
+  else
+    ac_dest_dir_suffix= ac_dots=
+  fi
+
+  case "$srcdir" in
+  [/$]*) ac_rel_source="$srcdir/$ac_source" ;;
+  *) ac_rel_source="$ac_dots$srcdir/$ac_source" ;;
+  esac
+
+  # Make a symlink if possible; otherwise try a hard link.
+  if ln -s $ac_rel_source $ac_dest 2>/dev/null ||
+    ln $srcdir/$ac_source $ac_dest; then :
+  else
+    { echo "configure: error: can not link $ac_dest to $srcdir/$ac_source" 1>&2; exit 1; }
+  fi
+done
+
+
+if test "${nativefile}" = ""; then
+sed -e '/^NATDEPFILES= /s//# NATDEPFILES= /' \
+	< Makefile > Makefile.tem
+mv -f Makefile.tem Makefile
+fi
+
+sed -e '/^TM_FILE[ 	]*=/s,^TM_FILE[ 	]*=[ 	]*,&config/'"${gdb_target_cpu}"'/,
+/^XM_FILE[ 	]*=/s,^XM_FILE[ 	]*=[ 	]*,&config/'"${gdb_host_cpu}"'/,
+/^NAT_FILE[ 	]*=/s,^NAT_FILE[ 	]*=[ 	]*,&config/'"${gdb_host_cpu}"'/,' <Makefile >Makefile.tmp
+mv -f Makefile.tmp Makefile
+
+case ${srcdir} in
+.)
+;;
+*)
+grep "source ${srcdir}/.gdbinit" .gdbinit >/dev/null 2>/dev/null || \
+echo "source ${srcdir}/.gdbinit" >> .gdbinit
+esac
+
+exit 0
+EOF
+chmod +x $CONFIG_STATUS
+rm -fr confdefs* $ac_clean_files
+test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
+
+if test "$no_recursion" != yes; then
+
+  # Remove --cache-file and --srcdir arguments so they do not pile up.
+  ac_sub_configure_args=
+  ac_prev=
+  for ac_arg in $ac_configure_args; do
+    if test -n "$ac_prev"; then
+      ac_prev=
+      continue
+    fi
+    case "$ac_arg" in
+    -cache-file | --cache-file | --cache-fil | --cache-fi \
+    | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
+      ac_prev=cache_file ;;
+    -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
+    | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
+      ;;
+    -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
+      ac_prev=srcdir ;;
+    -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
+      ;;
+    *) ac_sub_configure_args="$ac_sub_configure_args $ac_arg" ;;
+    esac
+  done
+
+  for ac_config_dir in $configdirs; do
+
+    # Do not complain, so a configure script can configure whichever
+    # parts of a large source tree are present.
+    if test ! -d $srcdir/$ac_config_dir; then
+      continue
+    fi
+
+    echo configuring in $ac_config_dir
+
+    case "$srcdir" in
+    .) ;;
+    *)
+      if test -d ./$ac_config_dir || mkdir ./$ac_config_dir; then :;
+      else
+        { echo "configure: error: can not create `pwd`/$ac_config_dir" 1>&2; exit 1; }
+      fi
+      ;;
+    esac
+
+    ac_popdir=`pwd`
+    cd $ac_config_dir
+
+    case "$srcdir" in
+    .) # No --srcdir option.  We are building in place.
+      ac_sub_srcdir=$srcdir ;;
+    /*) # Absolute path.
+      ac_sub_srcdir=$srcdir/$ac_config_dir ;;
+    *) # Relative path.
+      ac_sub_srcdir=../$srcdir/$ac_config_dir ;;
+    esac
+
+    # Check for guested configure; otherwise get Cygnus style configure.
+    if test -f $ac_sub_srcdir/configure; then
+      ac_sub_configure=$ac_sub_srcdir/configure
+    elif test -f $ac_sub_srcdir/configure.in; then
+      ac_sub_configure=$ac_configure
+    else
+      echo "configure: warning: no configuration information is in $ac_config_dir" 1>&2
+      ac_sub_configure=
+    fi
+
+    # The recursion is here.
+    if test -n "$ac_sub_configure"; then
+
+      # Make the cache file name correct relative to the subdirectory.
+      # A "../" for each directory in /$ac_config_dir.
+      ac_dots=`echo $ac_config_dir|sed -e 's%^\./%%' -e 's%[^/]$%&/%' -e 's%[^/]*/%../%g'`
+      case "$cache_file" in
+      /*) ac_sub_cache_file=$cache_file ;;
+      *) # Relative path.
+        ac_sub_cache_file="$ac_dots$cache_file" ;;
+      esac
+  case "$ac_given_INSTALL" in
+        [/$]*) INSTALL="$ac_given_INSTALL" ;;
+        *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
+        esac
+
+      echo "running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir"
+      # The eval makes quoting arguments work.
+      if eval ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir
+      then :
+      else
+        { echo "configure: error: $ac_sub_configure failed for $ac_config_dir" 1>&2; exit 1; }
+      fi
+    fi
+
+    cd $ac_popdir
+  done
+fi
+
diff --git a/gdb/configure.in b/gdb/configure.in
index bb9d332..fe4fac1 100644
--- a/gdb/configure.in
+++ b/gdb/configure.in
@@ -1,14 +1,72 @@
-# This file is a shell script fragment that supplies the information
-# necessary to tailor a template configure script into the configure
-# script approriate for this directory.  For more information, check
-# any existing configure script.
+dnl Process this file with autoconf to produce a configure script.
+AC_PREREQ(2.3)dnl
+AC_INIT(main.c)
+
+CC=${CC-cc}
+AC_PROG_CC
+AC_AIX
+AC_MINIX
+AC_ISC_POSIX
+
+AC_PROG_INSTALL
+AC_PROG_RANLIB
+
+AC_CONFIG_AUX_DIR(`cd $srcdir;pwd`/..)
+AC_CANONICAL_SYSTEM
+AC_ARG_PROGRAM
+
+
+dnl Handle optional features that can be enabled.
+ENABLE_CFLAGS=
+ENABLE_CLIBS=
+ENABLE_OBS=
+
+AC_ARG_ENABLE(netrom,
+[  --enable-netrom ],
+[case "${enableval}" in
+yes)	enable_netrom=yes ;;
+no)	enable_netrom=no ;;
+*)	AC_MSG_ERROR(bad value ${enableval} given for netrom option) ;;
+esac])
+
+if test "${enable_netrom}" = "yes"; then
+	ENABLE_OBS="${ENABLE_OBS} remote-nrom.o" 
+fi
+
+# start-sanitize-gdbtk
+ENABLE_GDBTK=
+
+AC_ARG_ENABLE(gdbtk,
+[  --enable-gdbtk ],
+[case "${enableval}" in
+yes)	enable_gdbtk=yes ;;
+no)	enable_gdbtk=no  ;;
+*)	AC_MSG_ERROR(bad value ${enableval} given for gdbtk option) ;;
+esac])
+
+if test "${enable_gdbtk}" = "yes"; then
+	AC_PATH_X
+	AC_PATH_XTRA
+
+	CYGNUS_PATH_TK
+	CYGNUS_PATH_TCL
+
+	ENABLE_GDBTK=1
+	ENABLE_CLIBS="${ENABLE_CLIBS} $(TCL) $(TK) $(X11) -lm"
+	ENABLE_OBS="${ENABLE_OBS} gdbtk.o"
+fi
+AC_SUBST(ENABLE_GDBTK)
+# end-sanitize-gdbtk
+
+AC_SUBST(ENABLE_CFLAGS)
+AC_SUBST(ENABLE_CLIBS)
+AC_SUBST(ENABLE_OBS)
 
-srcname="GDB"
-srctrigger=main.c
 
 configdirs="doc testsuite"
 
-# per-host:
+dnl
+changequote(,)dnl
 
 # Map host cpu into the config cpu subdirectory name.
 # The default is $host_cpu.
@@ -145,16 +203,6 @@ w65-*-*)		gdb_host=w65 ;;
 esac
 
 
-if [ ! -f ${srcdir}/config/${gdb_host_cpu}/${gdb_host}.mh ]; then
-	echo '***' "Gdb does not support host ${host}" 1>&2
-	exit 1
-fi
-
-#  We really shouldn't depend on there being a space after XM_FILE= ...
-hostfile=`awk '$1 == "XM_FILE=" { print $2 }' <${srcdir}/config/${gdb_host_cpu}/${gdb_host}.mh`
-
-# per-target:
-
 # Map target cpu into the config cpu subdirectory name.
 # The default is $target_cpu.
 
@@ -172,7 +220,7 @@ powerpc*)		gdb_target_cpu=powerpc ;;
 pn)			gdb_target_cpu=gould ;;
 pyramid)		gdb_target_cpu=pyr ;;
 sparclite*)		gdb_target_cpu=sparc
-			configdirs="${configdirs} sparclite" ;;
+		configdirs="${configdirs} sparclite" ;;
 sparc*)			gdb_target_cpu=sparc ;;
 *)			gdb_target_cpu=$target_cpu ;;
 
@@ -232,7 +280,7 @@ i[345]86-*-netbsd*)	gdb_target=nbsd ;;
 i[345]86-*-os9k)	gdb_target=i386os9k ;;
 i[345]86-*-go32*)	gdb_target=i386aout ;;
 i[345]86-*-lynxos*)	gdb_target=i386lynx
-			configdirs="${configdirs} gdbserver" ;;
+		configdirs="${configdirs} gdbserver" ;;
 i[345]86-*-solaris*)	gdb_target=i386sol2 ;;
 i[345]86-*-sunos*)	gdb_target=sun386 ;;
 i[345]86-*-sysv4*)	gdb_target=i386v4 ;;
@@ -243,7 +291,7 @@ i[345]86-*-isc*)	gdb_target=i386v ;;
 i[345]86-*-mach3*)	gdb_target=i386m3 ;;
 i[345]86-*-mach*)	gdb_target=i386mach ;;
 i[345]86-*-netware*)	gdb_target=i386nw
-			configdirs="${configdirs} nlm" ;;
+		configdirs="${configdirs} nlm" ;;
 i[345]86-*-osf1mk*)	gdb_target=i386mk ;;
 
 i960-*-bout*)		gdb_target=vxworks960 ;;
@@ -277,7 +325,7 @@ m68*-*-aout*)		gdb_target=monitor ;;
 m68*-*-coff*)		gdb_target=monitor ;;
 m68*-*-elf*)		gdb_target=monitor ;;
 m68*-*-lynxos*)		gdb_target=m68klynx
-			configdirs="${configdirs} gdbserver" ;;
+		configdirs="${configdirs} gdbserver" ;;
 m68*-*-os68k*)		gdb_target=os68k ;;
 m68*-*-sunos3*)		gdb_target=sun3os3 ;;
 m68*-*-sunos4*)		gdb_target=sun3os4 ;;
@@ -339,7 +387,7 @@ sparc-*-aout*)		gdb_target=sparc-em ;;
 sparc-*-coff*)		gdb_target=sparc-em ;;
 sparc-*-elf*)		gdb_target=sparc-em ;;
 sparc-*-lynxos*)	gdb_target=sparclynx
-			configdirs="${configdirs} gdbserver" ;;
+		configdirs="${configdirs} gdbserver" ;;
 sparc-*-netbsd*)	gdb_target=nbsd ;;
 sparc-*-solaris2*)	gdb_target=sun4sol2 ;;
 sparc-*-sunos4*)	gdb_target=sun4os4 ;;
@@ -360,33 +408,48 @@ z8k-*-coff*)		gdb_target=z8ksim ;;
 
 esac
 
-if [ ! -f ${srcdir}/config/${gdb_target_cpu}/${gdb_target}.mt ]; then
-	echo '***' "Gdb does not support target ${target}" 1>&2
-	exit 1
+dnl
+changequote([,])dnl
+
+
+host_makefile_frag=${srcdir}/config/${gdb_host_cpu}/${gdb_host}.mh
+if test ! -f ${host_makefile_frag}; then
+AC_MSG_ERROR("*** Gdb does not support host ${host}")
 fi
 
-if [ -z "${removing}" ] ; then
-	cat ${srcdir}/config/${gdb_host_cpu}/${gdb_host}.mh ${srcdir}/config/${gdb_target_cpu}/${gdb_target}.mt | awk '$1 == "#msg" {
-		print substr($0,6)}'
+target_makefile_frag=${srcdir}/config/${gdb_target_cpu}/${gdb_target}.mt
+if test ! -f ${target_makefile_frag}; then
+AC_MSG_ERROR("*** Gdb does not support target ${target}")
 fi
 
-#  We really shouldn't depend on there being a space after TM_FILE= ...
-targetfile=`awk '$1 == "TM_FILE=" { print $2 }' <${srcdir}/config/${gdb_target_cpu}/${gdb_target}.mt`
+dnl We have to assign the same value to other variables because autoconf
+dnl doesn't provide a mechanism to substitute a replacement keyword with
+dnl arbitrary data or pathnames.
+dnl
+host_makefile_frag_path=$host_makefile_frag
+target_makefile_frag_path=$target_makefile_frag
+AC_SUBST(host_makefile_frag_path)
+AC_SUBST(target_makefile_frag_path)
+AC_SUBST_FILE(host_makefile_frag)
+AC_SUBST_FILE(target_makefile_frag)
+
+
+#  We really shouldn't depend on there being a space after XM_FILE= ...
+hostfile=`awk '$1 == "XM_FILE=" { print $2 }' ${host_makefile_frag}`
 
+#  We really shouldn't depend on there being a space after TM_FILE= ...
+targetfile=`awk '$1 == "TM_FILE=" { print $2 }' ${target_makefile_frag}`
 
 # these really aren't orthogonal true/false values of the same condition,
 # but shells are slow enough that I like to reuse the test conditions
 # whenever possible
-#
-if [ "${target}" = "${host}" ] ; then
-	nativefile=`awk '$1 == "NAT_FILE=" { print $2 }' <${srcdir}/config/${gdb_host_cpu}/${gdb_host}.mh`
+if test "${target}" = "${host}"; then
+nativefile=`awk '$1 == "NAT_FILE=" { print $2 }' ${host_makefile_frag}`
 else
-	# GDBserver is only useful in a "native" enviroment
-	configdirs=`echo $configdirs | sed 's/gdbserver//'`
+# GDBserver is only useful in a "native" enviroment
+configdirs=`echo $configdirs | sed 's/gdbserver//'`
 fi
 
-host_makefile_frag=config/${gdb_host_cpu}/${gdb_host}.mh
-target_makefile_frag=config/${gdb_target_cpu}/${gdb_target}.mt
 
 # If hostfile (XM_FILE) and/or targetfile (TM_FILE) and/or nativefile
 # (NAT_FILE) is not set in config/*/*.m[ht] files, we don't make the
@@ -397,89 +460,59 @@ target_makefile_frag=config/${gdb_target_cpu}/${gdb_target}.mt
 files=
 links=
 rm -f xm.h
-if [ "${hostfile}" != "" ]; then
-	files="${files} config/${gdb_host_cpu}/${hostfile}"
-	links="${links} xm.h"
+if test "${hostfile}" != ""; then
+files="${files} config/${gdb_host_cpu}/${hostfile}"
+links="${links} xm.h"
 fi
 rm -f tm.h
-if [ "${targetfile}" != "" ]; then
-	files="${files} config/${gdb_target_cpu}/${targetfile}"
-	links="${links} tm.h"
+if test "${targetfile}" != ""; then
+files="${files} config/${gdb_target_cpu}/${targetfile}"
+links="${links} tm.h"
 fi
 rm -f nm.h
-if [ "${nativefile}" != "" ]; then
-	files="${files} config/${gdb_host_cpu}/${nativefile}"
-	links="${links} nm.h"
+if test "${nativefile}" != ""; then
+files="${files} config/${gdb_host_cpu}/${nativefile}"
+links="${links} nm.h"
 else
-	# A cross-only configuration.
-	files="${files} config/nm-empty.h"
-	links="${links} nm.h"
+# A cross-only configuration.
+files="${files} config/nm-empty.h"
+links="${links} nm.h"
 fi
-
 # start-sanitize-gdbtk
-# Make it possible to use the GUI without doing a full install
-if [ "${enable_gdbtk}" = "yes" -a ! -f gdbtk.tcl ] ; then
-	files="${files} gdbtk.tcl"
-	links="${links} gdbtk.tcl"
-fi
-# end-sanitize-gdbtk
-
-# post-target:
 
-case ${srcdir} in
-  .)
-    ;;
-  *)
-    grep "source ${srcdir}/.gdbinit" .gdbinit >/dev/null 2>/dev/null || \
-      echo "source ${srcdir}/.gdbinit" >> .gdbinit
-esac
-
-if [ "${nativefile}" = "" ] ; then
-	sed -e '/^NATDEPFILES= /s//# NATDEPFILES= /' \
-		< Makefile > Makefile.tem
-	mv -f Makefile.tem Makefile
-fi
-
-# start-sanitize-gdbtk
-if [ "${enable_gdbtk}" = "yes" ] ; then
-	if [ x"${other_options}" != x"" ]; then
-		for opt in $other_options; do
-			case "$opt" in
-				-x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
-				| --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-					X11_INCLUDES=`echo "$opt" | sed 's/[-_a-zA-Z0-9]*=//'`
-					sed -e "s;^\\(X11_INCLUDES[	]*=\\).*\$;\\1 -I${X11_INCLUDES};" \
-						< Makefile > Makefile.tem
-					mv -f Makefile.tem Makefile;;
-
-				-x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
-				| --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-					X11_LIB_SWITCHES=`echo "$opt" | sed 's/[-_a-zA-Z0-9]*=//'`
-					sed -e "s;^\\(X11_LIB_SWITCHES[ 	]*=\\).*\$;\\1 -L${X11_LIB_SWITCHES};" \
-						< Makefile > Makefile.tem
-					mv -f Makefile.tem Makefile;;
-			esac
-		done
-	fi
-	sed -e '/# End of host and/i\
-\
-ENABLE_GDBTK = 1\
-ENABLE_DEPFILES = gdbtk.o\
-ENABLE_CLIBS = $(TCL) $(TK) $(X11_LIB_SWITCHES) $(X11_LIBS) -lm
-' < Makefile > Makefile.tem
-	mv -f Makefile.tem Makefile
+# Make it possible to use the GUI without doing a full install
+if test "${enable_gdbtk}" = "yes" -a ! -f gdbtk.tcl ; then
+files="${files} gdbtk.tcl"
+links="${links} gdbtk.tcl"
 fi
 # end-sanitize-gdbtk
 
-if [ "${enable_netrom}" = "yes" ] ; then
-	sed -e '/# End of host and/i\
-\
-NETROM_OBS = remote-nrom.o\
-' < Makefile > Makefile.tem
-	mv -f Makefile.tem Makefile
+AC_LINK_FILES($files, $links)
+
+AC_CONFIG_SUBDIRS($configdirs)
+AC_OUTPUT(Makefile, 
+[
+dnl Autoconf doesn't provide a mechanism for modifying definitions 
+dnl provided by makefile fragments.
+dnl
+if test "${nativefile}" = ""; then
+sed -e '/^NATDEPFILES= /s//# NATDEPFILES= /' \
+	< Makefile > Makefile.tem
+mv -f Makefile.tem Makefile
 fi
 
+changequote(,)dnl
 sed -e '/^TM_FILE[ 	]*=/s,^TM_FILE[ 	]*=[ 	]*,&config/'"${gdb_target_cpu}"'/,
 /^XM_FILE[ 	]*=/s,^XM_FILE[ 	]*=[ 	]*,&config/'"${gdb_host_cpu}"'/,
 /^NAT_FILE[ 	]*=/s,^NAT_FILE[ 	]*=[ 	]*,&config/'"${gdb_host_cpu}"'/,' <Makefile >Makefile.tmp
 mv -f Makefile.tmp Makefile
+changequote([,])dnl
+
+case ${srcdir} in
+.)
+;;
+*)
+grep "source ${srcdir}/.gdbinit" .gdbinit >/dev/null 2>/dev/null || \
+echo "source ${srcdir}/.gdbinit" >> .gdbinit
+esac
+])