]> git.ipfire.org Git - thirdparty/binutils-gdb.git/blobdiff - gdb/configure.in
import gdb-1999-12-06 snapshot
[thirdparty/binutils-gdb.git] / gdb / configure.in
index f3438499df30d26bf8dfac65df207098f8a663db..3dae4a3070c6b5973106fd658a525c2e4f2208b3 100644 (file)
@@ -1,5 +1,5 @@
 dnl Autoconf configure script for GDB, the GNU debugger.
-dnl Copyright 1995, 1996 Free Software Foundation, Inc.
+dnl Copyright 1995, 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
 dnl
 dnl This file is part of GDB.
 dnl 
@@ -19,28 +19,44 @@ dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 dnl Process this file with autoconf to produce a configure script.
 
-AC_PREREQ(2.5)dnl
+AC_PREREQ(2.13)dnl
 AC_INIT(main.c)
 AC_CONFIG_HEADER(config.h:config.in)
 
 AC_PROG_CC
 AC_AIX
-AC_MINIX
 AC_ISC_POSIX
-
-DLLTOOL=${DLLTOOL-dlltool}
-AC_SUBST(DLLTOOL)
+AM_PROG_CC_STDC
 
 AC_CONFIG_AUX_DIR(`cd $srcdir;pwd`/..)
 AC_CANONICAL_SYSTEM
 
+dnl gdb doesn't use gettext, but bfd does.  We call this to ensure we
+dnl link with the correct libraries.
+ALL_LINGUAS=
+CY_GNU_GETTEXT
+
 dnl List of object files added by configure.
 
 CONFIG_OBS=
 CONFIG_DEPS=
+CONFIG_SRCS=
 
 configdirs="doc testsuite"
 
+AC_ARG_ENABLE(multi-ice,
+[  --enable-multi-ice            Build the multi-ice-gdb-server],
+[case "${enableval}" in
+    yes ) enable_multi_ice="yes" ;;
+    no)  enable_multi_ice="no" ;;
+    *) AC_MSG_ERROR(Bad value for --enable-multi-ice: ${enableval}) ;;
+  esac
+])
+
+if test "${enable_multi_ice}" = "yes"; then
+  configdirs="${configdirs} multi-ice"
+fi
+
 dnl
 changequote(,)dnl
 
@@ -51,55 +67,146 @@ changequote(,)dnl
 dnl
 changequote([,])dnl
 
+AC_PROG_AWK
 AC_PROG_INSTALL
 AC_CHECK_TOOL(AR, ar)
 AC_CHECK_TOOL(RANLIB, ranlib, :)
 AC_PROG_YACC
-AC_PROG_AWK
 
 AC_ARG_PROGRAM
 
 AC_TYPE_SIGNAL
 
 AC_HEADER_STDC
-AC_CHECK_HEADERS(limits.h memory.h string.h strings.h unistd.h termios.h termio.h sgtty.h stddef.h stdlib.h sys/procfs.h link.h endian.h objlist.h)
+
+AC_CHECK_HEADERS(ctype.h curses.h endian.h link.h \
+       memory.h objlist.h ptrace.h sgtty.h stddef.h stdlib.h \
+       string.h sys/procfs.h sys/ptrace.h sys/reg.h \
+       term.h termio.h termios.h unistd.h wait.h sys/wait.h \
+       wchar.h wctype.h asm/debugreg.h sys/debugreg.h sys/select.h \
+       time.h sys/ioctl.h)
 AC_HEADER_STAT
 
 AC_C_CONST
 
-AC_CHECK_FUNCS(setpgid sbrk select poll sigaction)
+AC_CHECK_FUNCS(setpgid sbrk sigaction isascii bzero bcopy btowc poll sigprocmask)
+AC_FUNC_ALLOCA
+
+dnl See if ptrace.h provides the PTRACE_GETXFPREGS request.
+dnl PTRACE_GETXFPREGS is a Cygnus invention, since we wrote our own
+dnl Linux kernel patch for SSE support.  That patch may or may not
+dnl actually make it into the official distribution.  If you find that
+dnl years have gone by since this configure test was added, and Linux
+dnl isn't using PTRACE_GETXFPREGS, that means that our patch didn't
+dnl make it, and you can delete this code.
+AC_MSG_CHECKING(for PTRACE_GETXFPREGS)
+AC_CACHE_VAL(gdb_cv_have_ptrace_getxfpregs,
+[AC_TRY_COMPILE([#include <sys/ptrace.h>],
+               [PTRACE_GETXFPREGS;],
+               [gdb_cv_have_ptrace_getxfpregs=yes],
+               [gdb_cv_have_ptrace_getxfpregs=no])])
+AC_MSG_RESULT($gdb_cv_have_ptrace_getxfpregs)
+if test $gdb_cv_have_ptrace_getxfpregs = yes; then
+  AC_DEFINE(HAVE_PTRACE_GETXFPREGS)
+fi
+
+AC_CHECK_LIB(socket, socketpair)
+AC_CHECK_FUNCS(socketpair)
+
+
+BFD_NEED_DECLARATION(malloc)
+BFD_NEED_DECLARATION(realloc)
+BFD_NEED_DECLARATION(free)
+BFD_NEED_DECLARATION(strerror)
+BFD_NEED_DECLARATION(strdup)
+BFD_NEED_DECLARATION(strstr)
+
+
+# The following save_state_t checkery is only necessary for HPUX 
+# versions earlier than 10.20.  When those fade from memory, this 
+# could be expunged. --jsm 1999-03-22
+
+AC_MSG_CHECKING(for HPUX save_state structure)
+AC_EGREP_HEADER(save_state_t, machine/save_state.h, 
+                gdb_cv_hpux_savestate=yes, gdb_cv_hpux_savestate=no)
+AC_EGREP_HEADER(ss_wide, machine/save_state.h, gdb_cv_hpux_sswide=yes,
+                gdb_cv_hpux_sswide=no)
+if test $gdb_cv_hpux_savestate = yes
+then
+  AC_DEFINE(HAVE_STRUCT_SAVE_STATE_T, 1)
+fi
+if test $gdb_cv_hpux_sswide = yes
+then
+  AC_DEFINE(HAVE_STRUCT_MEMBER_SS_WIDE, 1)
+fi
+AC_MSG_RESULT($gdb_cv_hpux_sswide)
+
+
+# If we are configured native on GNU/Linux, work around problems with
+# sys/procfs.h
+# Also detect which type of /proc is in use, such as for Unixware.
 
-# If we are configured native on Linux, work around problems with sys/procfs.h
 if test "${target}" = "${host}"; then
+  gdb_cv_hostos_is_solaris=no
   case "${host}" in
-  i[3456]86-*-linux*)
-       AC_DEFINE(START_INFERIOR_TRAPS_EXPECTED,"2")
+  i[[3456]]86-*-linux*)
+       AC_DEFINE(START_INFERIOR_TRAPS_EXPECTED,2)
        AC_DEFINE(sys_quotactl)
        ;;
+  *-*-solaris*)
+       gdb_cv_hostos_is_solaris=yes ;;
   esac
+  AC_MSG_CHECKING(for directory proc entries)
+# The [gdb_host != sun4sol2] hack is because Solaris does provide the
+# multiple procfs files as of Solaris 2.6, but GDB can't use it right now.
+  if test "$ac_cv_header_sys_procfs_h" = yes -a \
+          "$gdb_cv_hostos_is_solaris" = no \
+  -a -d /proc/$$ \
+  -a -f /proc/$$/ctl \
+  -a -f /proc/$$/as \
+  -a -f /proc/$$/map \
+  -a -f /proc/$$/status; then
+    AC_MSG_RESULT(yes)
+    AC_DEFINE(HAVE_MULTIPLE_PROC_FDS)
+  else
+    AC_MSG_RESULT(no)
+  fi
 fi
 
-AC_MSG_CHECKING([for gregset_t type])
-AC_CACHE_VAL(gdb_cv_have_gregset_t,
-[AC_TRY_LINK([#include <sys/procfs.h>],[gregset_t *gregsetp = 0],
-gdb_cv_have_gregset_t=yes, gdb_cv_have_gregset_t=no)])
-AC_MSG_RESULT($gdb_cv_have_gregset_t)
-if test $gdb_cv_have_gregset_t = yes; then
-  AC_DEFINE(HAVE_GREGSET_T)
-fi
-
-AC_MSG_CHECKING([for fpregset_t type])
-AC_CACHE_VAL(gdb_cv_have_fpregset_t,
-[AC_TRY_LINK([#include <sys/procfs.h>],[fpregset_t *fpregsetp = 0],
-gdb_cv_have_fpregset_t=yes, gdb_cv_have_fpregset_t=no)])
-AC_MSG_RESULT($gdb_cv_have_fpregset_t)
-if test $gdb_cv_have_fpregset_t = yes; then
-  AC_DEFINE(HAVE_FPREGSET_T)
+if test "$ac_cv_header_sys_procfs_h" = yes; then
+  BFD_HAVE_SYS_PROCFS_TYPE(pstatus_t)
+  BFD_HAVE_SYS_PROCFS_TYPE(prrun_t)
+  BFD_HAVE_SYS_PROCFS_TYPE(gregset_t)
+  BFD_HAVE_SYS_PROCFS_TYPE(fpregset_t)
+
+  dnl Check for PIOCSET ioctl entry 
+
+  AC_MSG_CHECKING(for PIOCSET ioctl entry in sys/procfs.h)
+  AC_CACHE_VAL(gdb_cv_have_procfs_piocset,
+  [AC_TRY_COMPILE([#include <unistd.h>
+#include <sys/types.h>
+#include <sys/procfs.h>
+], [
+    int dummy;;
+    dummy = ioctl(0, PIOCSET, &dummy);
+  ],
+  gdb_cv_have_procfs_piocset=yes, gdb_cv_have_procfs_piocset=no)])
+  AC_MSG_RESULT($gdb_cv_have_procfs_piocset)
+  if test $gdb_cv_have_procfs_piocset = yes; then
+    AC_DEFINE(HAVE_PROCFS_PIOCSET)
+  fi
 fi
 
 dnl See if host has libm.  This is usually needed by simulators.
 AC_CHECK_LIB(m, main)
 
+dnl Solaris puts wctype in /usr/lib/libw.a before Solaris 2.6.
+dnl
+dnl A bug in GNU ld 2.9.1 causes a problem if we link in -lw 
+dnl under Solaris 2.6 because it is some funky empty library.
+dnl So only link in libw if we have to.
+AC_CHECK_LIB(c, wctype,: ,AC_CHECK_LIB(w, wctype))
+
 dnl See if compiler supports "long long" type.
 
 AC_MSG_CHECKING(for long long support in compiler)
@@ -190,10 +297,6 @@ AC_MSG_RESULT($gdb_cv_scanf_has_long_double)
 
 AC_FUNC_MMAP
 
-BFD_NEED_DECLARATION(malloc)
-BFD_NEED_DECLARATION(realloc)
-BFD_NEED_DECLARATION(free)
-
 dnl See if thread_db library is around for Solaris thread debugging.  Note that
 dnl we must explicitly test for version 1 of the library because version 0
 dnl (present on Solaris 2.4 or earlier) doesn't have the same API.
@@ -202,44 +305,96 @@ dnl Note that we only want this if we are both native (host == target), and
 dnl not doing a canadian cross build (build == host).
 
 if test ${build} = ${host} -a ${host} = ${target} ; then
-       case ${host_os} in
-       hpux*)
-               AC_MSG_CHECKING(for HPUX/OSF thread support)
-               if test -f /usr/include/dce/cma_config.h ; then
-                       if test "$GCC" = "yes" ; then
-                               AC_MSG_RESULT(yes)
-                               AC_DEFINE(HAVE_HPUX_THREAD_SUPPORT)
-                               CONFIG_OBS="${CONFIG_OJS} hpux-thread.o"
-                       else
-                               AC_MSG_RESULT(no (suppressed because you are not using GCC))
-                       fi
-               else
-                       AC_MSG_RESULT(no)
-               fi
-               ;;
-       solaris*)
-               AC_MSG_CHECKING(for Solaris thread debugging library)
-               if test -f /usr/lib/libthread_db.so.1 ; then
-                       AC_MSG_RESULT(yes)
-                       AC_DEFINE(HAVE_THREAD_DB_LIB)
-                       CONFIG_OBS="${CONFIG_OBS} sol-thread.o"
-                       AC_CHECK_LIB(dl, dlopen)
-                       if test "$GCC" = "yes" ; then
-                               CONFIG_LDFLAGS="${CONFIG_LDFLAGS} -Xlinker -export-dynamic"
-                       fi
-               else
-                       AC_MSG_RESULT(no)
-               fi
-               ;;
-       esac
-       AC_SUBST(CONFIG_LDFLAGS)
+   case ${host_os} in
+   hpux*)
+      AC_MSG_CHECKING(for HPUX/OSF thread support)
+      if test -f /usr/include/dce/cma_config.h ; then
+         if test "$GCC" = "yes" ; then
+            AC_MSG_RESULT(yes)
+            AC_DEFINE(HAVE_HPUX_THREAD_SUPPORT)
+            CONFIG_OBS="${CONFIG_OJS} hpux-thread.o"
+            CONFIG_SRCS="${CONFIG_SRCS} hpux-thread.c"
+         else
+            AC_MSG_RESULT(no (suppressed because you are not using GCC))
+         fi
+      else
+         AC_MSG_RESULT(no)
+      fi
+      ;;
+   solaris*)
+      AC_MSG_CHECKING(for Solaris thread debugging library)
+      if test -f /usr/lib/libthread_db.so.1 ; then
+         AC_MSG_RESULT(yes)
+         AC_DEFINE(HAVE_THREAD_DB_LIB)
+         CONFIG_OBS="${CONFIG_OBS} sol-thread.o"
+         CONFIG_SRCS="${CONFIG_SRCS} sol-thread.c"
+         AC_CHECK_LIB(dl, dlopen)
+         if test "$GCC" = "yes" ; then
+            # The GNU linker requires the -export-dynamic option to make
+            # all symbols visible in the dynamic symbol table.
+            hold_ldflags=$LDFLAGS
+            AC_MSG_CHECKING(for the ld -export-dynamic flag)
+            LDFLAGS="${LDFLAGS} -Wl,-export-dynamic"
+            AC_TRY_LINK(, [int i;], found=yes, found=no)
+            LDFLAGS=$hold_ldflags
+            AC_MSG_RESULT($found)
+            if test $found = yes; then
+               CONFIG_LDFLAGS="${CONFIG_LDFLAGS} -Wl,-export-dynamic"
+            fi
+         fi
+        # Sun randomly tweaked the prototypes in <proc_service.h>
+        # at one point.
+        AC_MSG_CHECKING(if <proc_service.h> is old)
+        AC_CACHE_VAL(gdb_cv_proc_service_is_old,[
+           AC_TRY_COMPILE([
+               #include <proc_service.h>
+               ps_err_e ps_pdwrite
+                   (struct ps_prochandle*, psaddr_t, const void*, size_t);
+           ],, gdb_cv_proc_service_is_old=no,
+               gdb_cv_proc_service_is_old=yes)
+        ])
+        AC_MSG_RESULT($gdb_cv_proc_service_is_old)
+        if test $gdb_cv_proc_service_is_old = yes; then
+           AC_DEFINE(PROC_SERVICE_IS_OLD)
+        fi
+      else
+         AC_MSG_RESULT(no)
+      fi
+      ;;
+   esac
+   AC_SUBST(CONFIG_LDFLAGS)
 fi
 
 dnl Handle optional features that can be enabled.
 ENABLE_CFLAGS=
 
+AC_ARG_ENABLE(tui,
+[  --enable-tui            Enable full-screen terminal user interface],
+[
+  case "${enable_tui}" in
+    yes | no) ;;
+    "")  enable_tui=yes ;;
+    *)
+      AC_MSG_ERROR(Bad value for --enable-tui: ${enableval})
+    ;;
+  esac
+])
+case ${enable_tui} in
+  "yes" )
+    AC_DEFINE(TUI)
+    BUILD_TUI=all-tui
+    TUI_LIBRARY=tui/libtui.a
+  ;;
+  * )
+    BUILD_TUI=
+    TUI_LIBRARY=
+  ;;
+esac
+AC_SUBST(BUILD_TUI)
+AC_SUBST(TUI_LIBRARY)
+
 AC_ARG_ENABLE(netrom,
-[  --enable-netrom ],
+[  --enable-netrom         Enable NetROM support],
 [case "${enableval}" in
 yes)   enable_netrom=yes ;;
 no)    enable_netrom=no ;;
@@ -248,145 +403,150 @@ esac])
 
 if test "${enable_netrom}" = "yes"; then
        CONFIG_OBS="${CONFIG_OBS} remote-nrom.o" 
+        CONFIG_SRCS="${CONFIG_SRCS} remote-nrom.c"
 fi
 
-# start-sanitize-gdbtk
-ENABLE_IDE=
-AC_ARG_ENABLE(ide, [  --enable-ide            Enable IDE support])
-if test "$enable_ide" = yes; then
-   enable_ide=yes
-   ENABLE_IDE=1
-else
-   enable_ide=no
+AC_ARG_ENABLE(build-warnings,
+[  --enable-build-warnings Enable build-time compiler warnings if gcc is used],
+[build_warnings="-Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations"
+case "${enableval}" in
+  yes) ;;
+  no)  build_warnings="-w";;
+  ,*)   t=`echo "${enableval}" | sed -e "s/,/ /g"`
+        build_warnings="${build_warnings} ${t}";;
+  *,)   t=`echo "${enableval}" | sed -e "s/,/ /g"`
+        build_warnings="${t} ${build_warnings}";;
+  *)    build_warnings=`echo "${enableval}" | sed -e "s/,/ /g"`;;
+esac
+if test x"$silent" != x"yes" && test x"$build_warnings" != x""; then
+  echo "Setting warning flags = $build_warnings" 6>&1
 fi
-AC_SUBST(ENABLE_IDE)
-
-ENABLE_GDBTK=
-
-AC_ARG_ENABLE(gdbtk,
-[  --enable-gdbtk ],
-[case "${enableval}" in
-    yes)
-       case "$host" in
-       *go32*)
-           AC_MSG_WARN([GDB does not support GDBtk on host ${host}.  GDBtk will be disabled.])
-           enable_gdbtk=no ;;
-       *windows*)
-           AC_MSG_WARN([GDB does not support GDBtk on host ${host}.  GDBtk will be disabled.])
-           enable_gdbtk=no ;;
-       *)
-           enable_gdbtk=yes ;;
-       esac ;;
-    no)
-       enable_gdbtk=no  ;;
-    *)
-       AC_MSG_ERROR(bad value ${enableval} given for gdbtk option) ;;
-esac],
-[
-# Default is on for everything but go32 and cygwin32
-case "$host" in
-    *go32* | *windows*)
-       ;;
-    *)
-       enable_gdbtk=yes ;;
+WARN_CFLAGS=""
+WERROR_CFLAGS=""
+if test "x${build_warnings}" != x -a "x$GCC" = xyes
+then
+  # Separate out the -Werror flag as some files just cannot be
+  # compiled with it enabled.
+  for w in ${build_warnings}; do
+    case $w in
+    -Werr*) WERROR_CFLAGS=-Werror ;;
+    *) WARN_CFLAGS="${WARN_CFLAGS} $w"
     esac
-])
+  done
+fi],[build_warnings=""])dnl
+
+AC_SUBST(WARN_CFLAGS)
+AC_SUBST(WERROR_CFLAGS)
+
+MMALLOC_CFLAGS=
+MMALLOC=
+AC_SUBST(MMALLOC_CFLAGS)
+AC_SUBST(MMALLOC)
+
+AC_ARG_WITH(mmalloc,
+[  --with-mmalloc          Use memory mapped malloc package],
+[case "${withval}" in
+  yes)  want_mmalloc=true ;;
+  no)   want_mmalloc=false;;
+  *)    AC_MSG_ERROR(bad value ${withval} for GDB with-mmalloc option) ;;
+esac],[want_mmalloc=false])dnl
+
+if test x$want_mmalloc = xtrue; then
+   AC_DEFINE(USE_MMALLOC)
+   AC_DEFINE(MMCHECK_FORCE)
+   MMALLOC_CFLAGS="-I$srcdir/../mmalloc"
+   MMALLOC='../mmalloc/libmmalloc.a'
+fi
 
-# In the cygwin32 environment, we need some additional flags.
-AC_CACHE_CHECK([for cygwin32], gdb_cv_os_cygwin32,
+
+# In the Cygwin environment, we need some additional flags.
+AC_CACHE_CHECK([for cygwin], gdb_cv_os_cygwin,
 [AC_EGREP_CPP(lose, [
-#ifdef __CYGWIN32__
+#if defined (__CYGWIN__) || defined (__CYGWIN32__)
 lose
-#endif],[gdb_cv_os_cygwin32=yes],[gdb_cv_os_cygwin32=no])])
+#endif],[gdb_cv_os_cygwin=yes],[gdb_cv_os_cygwin=no])])
 
+DLLTOOL=${DLLTOOL-dlltool}
+WINDRES=${WINDRES-windres}
+AC_SUBST(DLLTOOL)
+AC_SUBST(WINDRES)
+
+dnl Figure out which term library to use.
+if test x$gdb_host = xgo32; then
+  TERM_LIB=
+else
+if test x$gdb_cv_os_cygwin = xyes; then
+  TERM_LIB='`if test -r ../libtermcap/libtermcap.a; then echo ../libtermcap/libtermcap.a; else echo -ltermcap; fi`'
+else
+  TERM_LIB=
+  AC_CHECK_LIB(ncurses, tgetent, TERM_LIB=-lncurses,
+    AC_CHECK_LIB(Hcurses, tgetent, TERM_LIB=-lHcurses,
+      AC_CHECK_LIB(termlib, tgetent, TERM_LIB=-ltermlib,
+        AC_CHECK_LIB(termcap, tgetent, TERM_LIB=-ltermcap,
+         AC_CHECK_LIB(curses, tgetent, TERM_LIB=-lcurses,
+           AC_CHECK_LIB(terminfo, tgetent, TERM_LIB=-lterminfo))))))
+
+  if test "x$TERM_LIB" = x
+  then
+    AC_MSG_ERROR(Could not find a term library, e.g. termcap or termlib!)
+  fi
+fi
+fi
+AC_SUBST(TERM_LIB)
+
+# libreadline needs libuser32.a in a cygwin environment
 WIN32LIBS=
-WIN32LDAPP=
+if test x$gdb_cv_os_cygwin = xyes; then
+    WIN32LIBS="-luser32"
+fi
 AC_SUBST(WIN32LIBS)
-AC_SUBST(WIN32LDAPP)
 
-if test x$gdb_cv_os_cygwin32 = xyes; then
-    if test x$enable_ide = xyes; then
-       WIN32LIBS="-ladvapi32"
-    fi
-fi
 
-configdir="unix"
-
-if test "${enable_gdbtk}" = "yes"; then
-
-    CY_AC_PATH_TCLCONFIG
-    if test -z "${no_tcl}"; then
-       CY_AC_LOAD_TCLCONFIG
-       CY_AC_PATH_TKCONFIG
-
-       # If $no_tk is nonempty, then we can't do Tk, and there is no
-       # point to doing Tcl.
-       if test -z "${no_tk}"; then
-          CY_AC_LOAD_TKCONFIG
-          CY_AC_PATH_TCLH
-          CY_AC_PATH_TKH
-          CY_AC_PATH_ITCLH
-          CY_AC_PATH_TIX
-
-          # now look for tix library stuff
-          TIXVERSION=4.1.8.0
-          . ${ac_cv_c_tclconfig}/tclConfig.sh
-          case "${host}" in
-          *-*-cygwin32*)
-               tixdir=../tix/win/tcl8.0
-               ;;
-          *)
-               tixdir=../tix/unix/tk8.0
-               ;;
-          esac 
-          if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
-               TIXLIB="-L${tixdir} -ltix${TIXVERSION}"
-               TIX_DEPS="${tixdir}/libtix${TIXVERSION}.a"
-          else
-               TIXLIB="-L${tixdir} -ltix`echo ${TIXVERSION} | tr -d .`"
-               TIX_DEPS="${tixdir}/libtix`echo ${TIXVERSION} | tr -d .`.a"
-          fi
-
-          ENABLE_GDBTK=1
-
-          # Include some libraries that Tcl and Tk want.
-          if test "${enable_ide}" = "yes"; then        
-             TCL_LIBS='$(LIBIDE) $(IDE) $(ITCL) $(TIX) $(TK) $(TCL) $(X11_LDFLAGS) $(X11_LIBS)'
-             CONFIG_DEPS='$(LIBIDE) $(IDE_DEPS) $(ITCL_DEPS) $(TIX_DEPS) $(TK_DEPS) $(TCL_DEPS)'
-          else
-             TCL_LIBS='$(LIBIDE) $(ITCL) $(TIX) $(TK) $(TCL) $(X11_LDFLAGS) $(X11_LIBS)'
-             CONFIG_DEPS='$(LIBIDE) $(ITCL_DEPS) $(TIX_DEPS) $(TK_DEPS) $(TCL_DEPS)'
-          fi
-          # Yes, the ordering seems wrong here.  But it isn't.
-          # TK_LIBS is the list of libraries that need to be linked
-          # after Tcl/Tk.
-          LIBS="${LIBS} ${TCL_LIBS} ${TK_LIBS}"
-          CONFIG_OBS="${CONFIG_OBS} gdbtk.o"
-
-          if test x$gdb_cv_os_cygwin32 = xyes; then
-             WIN32LIBS="${WIN32LIBS} -lshell32 -lgdi32 -lcomdlg32 -ladvapi32 -luser32"
-             WIN32LDAPP="-Wl,--subsystem,windows"
-          fi
-       fi
-    fi
+AC_PATH_X
+
+# Unlike the sim directory, whether a simulator is linked is controlled by 
+# presence of a SIM= and a SIM_OBS= definition in the target '.mt' file.  
+# This code just checks for a few cases where we'd like to ignore those
+# definitions, even when they're present in the '.mt' file.  These cases
+# are when --disable-sim is specified, or if the simulator directory is
+# not part of the soruce tree.
+#
+AC_ARG_ENABLE(sim,
+[  --enable-sim            Link gdb with simulator],
+[echo "enable_sim = $enable_sim";
+ echo "enableval = ${enableval}";
+ case "${enableval}" in
+  yes) ignore_sim=false ;;
+  no)  ignore_sim=true ;;
+  *)   ignore_sim=false ;;
+ esac],
+[ignore_sim=false])
+
+if test ! -d "${srcdir}/../sim"; then
+  ignore_sim=true
 fi
 
-AC_SUBST(ENABLE_GDBTK)
-AC_SUBST(X_CFLAGS)
-AC_SUBST(X_LDFLAGS)
-AC_SUBST(X_LIBS)
-AC_SUBST(TIXLIB)
-AC_SUBST(TIX_DEPS)
-# end-sanitize-gdbtk
+if test "${ignore_sim}" = "true"; then
+    IGNORE_SIM="SIM="
+    IGNORE_SIM_OBS="SIM_OBS="
+else
+    IGNORE_SIM=""
+    IGNORE_SIM_OBS=""
+    AC_DEFINE(WITH_SIM)
+fi
+AC_SUBST(IGNORE_SIM)
+AC_SUBST(IGNORE_SIM_OBS)
 
 AC_SUBST(ENABLE_CFLAGS)
 
 AC_SUBST(CONFIG_OBS)
 AC_SUBST(CONFIG_DEPS)
+AC_SUBST(CONFIG_SRCS)
 
 # Begin stuff to support --enable-shared
 AC_ARG_ENABLE(shared,
-[  --enable-shared         use shared libraries],
+[  --enable-shared         Use shared libraries],
 [case "${enableval}" in
   yes) shared=true ;;
   no)  shared=false ;;
@@ -491,6 +651,13 @@ s/NAT_FILE[        ]*=[    ]*\([^  ]*\)/\1/p
 fi
 changequote([,])
 
+SUBDIRS="doc testsuite nlm"
+if test "${enable_multi_ice}" = "yes"; then
+  SUBDIRS="${SUBDIRS} multi-ice"
+fi
+
+AC_SUBST(SUBDIRS)
+
 # 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
@@ -518,27 +685,14 @@ else
 files="${files} config/nm-empty.h"
 links="${links} nm.h"
 fi
-# start-sanitize-gdbtk
-AC_PROG_LN_S
-# Make it possible to use the GUI without doing a full install
-if test "${enable_gdbtk}" = "yes" -a ! -d gdbtcl ; then
-  if test "$LN_S" = "ln -s" -a ! -f gdbtcl ; then
-  echo linking $srcdir/gdbtcl to gdbtcl
-  $LN_S $srcdir/gdbtcl gdbtcl
-  else
-  echo Warning: Unable to link $srcdir/gdbtcl to gdbtcl.  You will need to do a
-  echo "         " make install before you are able to run the GUI.
-  fi
-fi
-# end-sanitize-gdbtk
 
 AC_LINK_FILES($files, $links)
 
 dnl Check for exe extension set on certain hosts (e.g. Win32)
-AM_EXEEXT
+AC_EXEEXT
 
 AC_CONFIG_SUBDIRS($configdirs)
-AC_OUTPUT(Makefile .gdbinit:gdbinit.in,
+AC_OUTPUT(Makefile tui/Makefile .gdbinit:gdbinit.in,
 [
 dnl Autoconf doesn't provide a mechanism for modifying definitions 
 dnl provided by makefile fragments.
@@ -556,6 +710,7 @@ sed -e '/^TM_FILE[  ]*=/s,^TM_FILE[         ]*=[    ]*,&config/'"${gdb_target_cpu}"'/,
 mv -f Makefile.tmp Makefile
 changequote([,])dnl
 
+
 case x$CONFIG_HEADERS in
 xconfig.h:config.in)
 echo > stamp-h ;;
@@ -568,4 +723,3 @@ nativefile=$nativefile
 ])
 
 exit 0
-