2002-11-11 Elena Zannoni <ezannoni@redhat.com>

[deliverable/binutils-gdb.git] / gdb / configure.in

diff --git a/gdb/configure.in b/gdb/configure.in
index 8bbcb18d8dad9bca76249db2cc78e130b23f1a09..4c2e06363a5a87a4dbe8abad3db10ef1258e23d0 100644 (file)
--- a/gdb/configure.in
+++ b/gdb/configure.in
@@ -1,5 +1,5 @@
 dnl Autoconf configure script for GDB, the GNU debugger.
 dnl Autoconf configure script for GDB, the GNU debugger.

-dnl Copyright 1995, 1996, 1997, 1998, 1999, 2000, 2001
+dnl Copyright 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002

 dnl Free Software Foundation, Inc.
 dnl
 dnl This file is part of GDB.
 dnl Free Software Foundation, Inc.
 dnl
 dnl This file is part of GDB.


@@ -33,10 +33,11 @@ AM_PROG_CC_STDC
 AC_CONFIG_AUX_DIR(`cd $srcdir;pwd`/..)
 AC_CANONICAL_SYSTEM
 
 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.
+dnl Set up for gettext.  PACKAGE is used when we call bindtextdomain.

 ALL_LINGUAS=
 CY_GNU_GETTEXT
 ALL_LINGUAS=
 CY_GNU_GETTEXT

+AC_DEFINE(PACKAGE, "gdb", [Name of this package. ])
+

 
 dnl List of object files added by configure.
 
 
 dnl List of object files added by configure.
 


@@ -51,6 +52,7 @@ CONFIG_CLEAN=
 CONFIG_INSTALL=
 CONFIG_UNINSTALL=
 
 CONFIG_INSTALL=
 CONFIG_UNINSTALL=
 

+SUBDIRS="doc testsuite nlm"

 configdirs="doc testsuite"
 
 AC_ARG_ENABLE(multi-ice,
 configdirs="doc testsuite"
 
 AC_ARG_ENABLE(multi-ice,


@@ -118,22 +120,53 @@ case $host_os in solaris2.7 | solaris2.8) case "$GCC" in yes)
     AC_DEFINE(_MSE_INT_H)
 esac; esac
 
     AC_DEFINE(_MSE_INT_H)
 esac; esac
 

-AC_CHECK_HEADERS(ctype.h endian.h nlist.h link.h thread_db.h proc_service.h \
+AC_CHECK_HEADERS(ctype.h nlist.h link.h thread_db.h proc_service.h \

        memory.h objlist.h ptrace.h sgtty.h stddef.h stdlib.h \
        memory.h objlist.h ptrace.h sgtty.h stddef.h stdlib.h \

-       string.h sys/procfs.h sys/ptrace.h sys/reg.h stdint.h \
+       string.h sys/procfs.h sys/proc.h sys/ptrace.h sys/reg.h stdint.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/file.h sys/ioctl.h sys/user.h sys/fault.h sys/syscall.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/file.h sys/ioctl.h sys/user.h sys/fault.h sys/syscall.h \

-       dirent.h sys/ndir.h sys/dir.h ndir.h \
+       dirent.h sys/ndir.h sys/dir.h ndir.h sys/filio.h \

        curses.h ncurses.h \
        poll.h sys/poll.h)
 AC_HEADER_STAT
 
 AC_C_CONST
        curses.h ncurses.h \
        poll.h sys/poll.h)
 AC_HEADER_STAT
 
 AC_C_CONST

+AC_C_INLINE

 
 

-AC_CHECK_FUNCS(setpgid sbrk sigaction isascii bzero bcopy btowc poll sigprocmask)
-AC_FUNC_VFORK
+AC_CHECK_FUNCS(bcopy btowc bzero canonicalize_file_name isascii poll \
+       realpath sbrk setpgid setpgrp sigaction sigprocmask sigsetmask )

 AC_FUNC_ALLOCA
 AC_FUNC_ALLOCA

+AC_FUNC_VFORK
+dnl AC_FUNC_SETPGRP does not work when cross compiling
+dnl Instead, assume we will have a prototype for setpgrp if cross compiling.
+if test "$cross_compiling" = no; then
+  AC_FUNC_SETPGRP
+else
+  AC_CACHE_CHECK([whether setpgrp takes no argument], ac_cv_func_setpgrp_void,
+    [AC_TRY_COMPILE([
+#include <unistd.h>
+], [
+  if (setpgrp(1,1) == -1)
+    exit (0);
+  else
+    exit (1);
+], ac_cv_func_setpgrp_void=no, ac_cv_func_setpgrp_void=yes)])
+if test $ac_cv_func_setpgrp_void = yes; then
+  AC_DEFINE(SETPGRP_VOID, 1)
+fi
+fi
+
+# Check if sigsetjmp is available.  Using AC_CHECK_FUNCS won't do
+# since sigsetjmp might only be defined as a macro.
+AC_CACHE_CHECK([for sigsetjmp], gdb_cv_func_sigsetjmp,
+[AC_TRY_COMPILE([
+#include <setjmp.h>
+], [sigjmp_buf env; while (! sigsetjmp (env, 1)) siglongjmp (env, 1);],
+gdb_cv_func_sigsetjmp=yes, gdb_cv_func_sigsetjmp=no)])
+if test $gdb_cv_func_sigsetjmp = yes; then
+  AC_DEFINE(HAVE_SIGSETJMP, 1, [Define if sigsetjmp is available. ])
+fi

 
 # See if <machine/reg.h> supports the %fs and %gs i386 segment registers.
 # Older i386 BSD's don't have the r_fs and r_gs members of `struct reg'.
 
 # See if <machine/reg.h> supports the %fs and %gs i386 segment registers.
 # Older i386 BSD's don't have the r_fs and r_gs members of `struct reg'.


@@ -187,6 +220,19 @@ if test $gdb_cv_have_pt_getdbregs = yes; then
   AC_DEFINE(HAVE_PT_GETDBREGS)
 fi
 
   AC_DEFINE(HAVE_PT_GETDBREGS)
 fi
 

+# See if <sys/ptrace.h> provides the PT_GETXMMREGS request.
+AC_MSG_CHECKING(for PT_GETXMMREGS)
+AC_CACHE_VAL(gdb_cv_have_pt_getxmmregs,
+[AC_TRY_COMPILE([#include <sys/types.h>
+#include <sys/ptrace.h>],
+               [PT_GETXMMREGS;],
+               [gdb_cv_have_pt_getxmmregs=yes],
+               [gdb_cv_have_pt_getxmmregs=no])])
+AC_MSG_RESULT($gdb_cv_have_pt_getxmmregs)
+if test $gdb_cv_have_pt_getxmmregs = yes; then
+  AC_DEFINE(HAVE_PT_GETXMMREGS)
+fi
+

 
 AC_CHECK_LIB(socket, socketpair)
 AC_CHECK_FUNCS(socketpair)
 
 AC_CHECK_LIB(socket, socketpair)
 AC_CHECK_FUNCS(socketpair)


@@ -198,7 +244,7 @@ BFD_NEED_DECLARATION(free)
 BFD_NEED_DECLARATION(strerror)
 BFD_NEED_DECLARATION(strdup)
 BFD_NEED_DECLARATION(strstr)
 BFD_NEED_DECLARATION(strerror)
 BFD_NEED_DECLARATION(strdup)
 BFD_NEED_DECLARATION(strstr)

-
+BFD_NEED_DECLARATION(canonicalize_file_name)

 
 # The following save_state_t checkery is only necessary for HPUX 
 # versions earlier than 10.20.  When those fade from memory, this 
 
 # The following save_state_t checkery is only necessary for HPUX 
 # versions earlier than 10.20.  When those fade from memory, this 


@@ -233,7 +279,7 @@ if test "${target}" = "${host}"; then
   ia64-*-aix*)
       AC_DEFINE(NEW_PROC_API)
       ;;
   ia64-*-aix*)
       AC_DEFINE(NEW_PROC_API)
       ;;

-  *-*-unixware* | *-*-sysv4.2* | *-*-sysv5*)
+  *-*-unixware* | *-*-sysv4.2* | *-*-sysv5* | *-*-interix* )

       AC_DEFINE(NEW_PROC_API)
       ;;
   *-*-solaris2.[[678]])
       AC_DEFINE(NEW_PROC_API)
       ;;
   *-*-solaris2.[[678]])


@@ -264,7 +310,7 @@ if test "$ac_cv_header_sys_procfs_h" = yes; then
   dnl For Linux/i386, glibc 2.1.3 was released with a bogus
   dnl prfpregset_t type (it's a typedef for the pointer to a struct
   dnl instead of the struct itself).  We detect this here, and work
   dnl For Linux/i386, glibc 2.1.3 was released with a bogus
   dnl prfpregset_t type (it's a typedef for the pointer to a struct
   dnl instead of the struct itself).  We detect this here, and work

-  dnl around it in lin-thread.c.
+  dnl around it in gdb_proc_service.h.

 
   if test $bfd_cv_have_sys_procfs_type_prfpregset_t = yes; then
     AC_MSG_CHECKING(whether prfpregset_t type is broken)
 
   if test $bfd_cv_have_sys_procfs_type_prfpregset_t = yes; then
     AC_MSG_CHECKING(whether prfpregset_t type is broken)


@@ -341,6 +387,9 @@ if test ${host} = ${target} ; then
   AC_MSG_CHECKING(for member som_addr in struct so_map)
   AC_CACHE_VAL(gdb_cv_have_struct_so_map_with_som_members,
     [AC_TRY_COMPILE([#include <sys/types.h>
   AC_MSG_CHECKING(for member som_addr in struct so_map)
   AC_CACHE_VAL(gdb_cv_have_struct_so_map_with_som_members,
     [AC_TRY_COMPILE([#include <sys/types.h>

+#ifdef HAVE_NLIST_H
+#include <nlist.h>
+#endif

 #include <link.h>],
                     [struct so_map lm; (void) lm.som_addr;],
                     gdb_cv_have_struct_so_map_with_som_members=yes,
 #include <link.h>],
                     [struct so_map lm; (void) lm.som_addr;],
                     gdb_cv_have_struct_so_map_with_som_members=yes,


@@ -362,6 +411,7 @@ if test ${host} = ${target} ; then
   AC_MSG_RESULT($gdb_cv_have_struct_link_map32)
   if test $gdb_cv_have_struct_link_map32 = yes; then
     AC_DEFINE(HAVE_STRUCT_LINK_MAP32)
   AC_MSG_RESULT($gdb_cv_have_struct_link_map32)
   if test $gdb_cv_have_struct_link_map32 = yes; then
     AC_DEFINE(HAVE_STRUCT_LINK_MAP32)

+    AC_DEFINE(_SYSCALL32)

   fi
 fi
 
   fi
 fi
 


@@ -465,6 +515,23 @@ AC_MSG_RESULT($gdb_cv_scanf_has_long_double)
 
 AC_FUNC_MMAP
 
 
 AC_FUNC_MMAP
 

+case ${host_os} in
+aix*)
+  AC_CACHE_CHECK([for -bbigtoc option], [gdb_cv_bigtoc], [
+    SAVE_LDFLAGS=$LDFLAGS
+
+    case $GCC in
+    yes) gdb_cv_bigtoc=-Wl,-bbigtoc ;;
+    *) gdb_cv_bigtoc=-bbigtoc ;;
+    esac
+
+    LDFLAGS=$LDFLAGS\ $gdb_cv_bigtoc
+    AC_TRY_LINK([], [int i;], [], [gdb_cv_bigtoc=])
+  ])
+  CONFIG_LDFLAGS="${CONFIG_LDFLAGS} ${gdb_cv_bigtoc}"
+  ;;
+esac
+

 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.
 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.


@@ -533,6 +600,23 @@ if test ${build} = ${host} -a ${host} = ${target} ; then
    AC_SUBST(CONFIG_LDFLAGS)
 fi
 
    AC_SUBST(CONFIG_LDFLAGS)
 fi
 

+dnl See if we have a thread_db header file that has TD_NOTALLOC.
+if test "x$ac_cv_header_thread_db_h" = "xyes"; then
+   AC_CACHE_CHECK([whether <thread_db.h> has TD_NOTALLOC],
+                  gdb_cv_thread_db_h_has_td_notalloc,
+     AC_TRY_COMPILE(
+       [#include <thread_db.h>],
+       [int i = TD_NOTALLOC;],
+       gdb_cv_thread_db_h_has_td_notalloc=yes,
+       gdb_cv_thread_db_h_has_td_notalloc=no
+     )
+   )
+fi
+if test "x$gdb_cv_thread_db_h_has_td_notalloc" = "xyes"; then
+  AC_DEFINE(THREAD_DB_HAS_TD_NOTALLOC, 1,
+            [Define if <thread_db.h> has the TD_NOTALLOC error code.])
+fi
+

 dnl The CLI cannot be disabled yet, but may be in the future  
 
 dnl Handle CLI sub-directory configury.
 dnl The CLI cannot be disabled yet, but may be in the future  
 
 dnl Handle CLI sub-directory configury.


@@ -580,7 +664,8 @@ AC_ARG_ENABLE(gdbmi,
       AC_MSG_ERROR(Bad value for --enable-gdbmi: ${enableval})
     ;;
   esac
       AC_MSG_ERROR(Bad value for --enable-gdbmi: ${enableval})
     ;;
   esac

-])
+],
+[enable_gdbmi=yes])

 case ${enable_gdbmi} in
   "yes" )
     if test -d "${srcdir}/mi" ; then
 case ${enable_gdbmi} in
   "yes" )
     if test -d "${srcdir}/mi" ; then


@@ -712,11 +797,10 @@ then
        case $w in
        -Werr*) WERROR_CFLAGS=-Werror ;;
        *) # Check that GCC accepts it
        case $w in
        -Werr*) WERROR_CFLAGS=-Werror ;;
        *) # Check that GCC accepts it

-           if $CC $w 2>&1 | grep 'unrecognized option' > /dev/null; then
-               :
-           else
-               WARN_CFLAGS="${WARN_CFLAGS} $w"
-           fi
+           saved_CFLAGS="$CFLAGS"
+           CFLAGS="$CFLAGS $w"
+           AC_TRY_COMPILE([],[],WARN_CFLAGS="${WARN_CFLAGS} $w",)
+           CFLAGS="$saved_CFLAGS"

        esac
     done
     AC_MSG_RESULT(${WARN_CFLAGS}${WERROR_CFLAGS})
        esac
     done
     AC_MSG_RESULT(${WARN_CFLAGS}${WERROR_CFLAGS})


@@ -908,11 +992,31 @@ configdir="unix"
 GDBTKLIBS=
 if test "${enable_gdbtk}" = "yes"; then
 
 GDBTKLIBS=
 if test "${enable_gdbtk}" = "yes"; then
 

+    # Gdbtk must have an absolute path to srcdir in order to run
+    # properly when not installed.
+    here=`pwd`
+    cd ${srcdir}
+    GDBTK_SRC_DIR=`pwd`
+    cd $here
+

     CY_AC_PATH_TCLCONFIG
     if test -z "${no_tcl}"; then
        CY_AC_LOAD_TCLCONFIG
        CY_AC_PATH_TKCONFIG
 
     CY_AC_PATH_TCLCONFIG
     if test -z "${no_tcl}"; then
        CY_AC_LOAD_TCLCONFIG
        CY_AC_PATH_TKCONFIG
 

+       # now look for Tcl library stuff
+
+       case "${host}" in
+       *-*-cygwin*)
+           tcldir=../tcl/win/
+           ;;
+       *)
+           tcldir=../tcl/unix/
+           ;;
+       esac
+
+       TCL_DEPS="${tcldir}${TCL_LIB_FILE}"
+

        # 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
        # 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


@@ -923,23 +1027,28 @@ if test "${enable_gdbtk}" = "yes"; then
           CY_AC_PATH_ITKH
           CY_AC_PATH_TIXH
 
           CY_AC_PATH_ITKH
           CY_AC_PATH_TIXH
 

+
+          # now look for Tk library stuff
+
+          case "${host}" in
+          *-*-cygwin*)
+              tkdir=../tk/win/
+              ;;
+          *)
+              tkdir=../tk/unix/
+              ;;
+          esac
+
+          TK_DEPS="${tkdir}${TK_LIB_FILE}"
+

           # now look for Itcl library stuff
 
           CY_AC_PATH_ITCLCONFIG
            if test -z "${no_itcl}"; then
           # now look for Itcl library stuff
 
           CY_AC_PATH_ITCLCONFIG
            if test -z "${no_itcl}"; then

-             CY_AC_LOAD_ITCLCONFIG
-            case "${host}" in
-            *-*-cygwin*)
-               itcldir=../itcl/itcl/win/
-               ;;
-            *)
-               itcldir=../itcl/itcl/unix/
-               ;;
-            esac
- 
+             CY_AC_LOAD_ITCLCONFIG 

 
             ITCLLIB="${ITCL_BUILD_LIB_SPEC}"
 
             ITCLLIB="${ITCL_BUILD_LIB_SPEC}"

-            ITCL_DEPS="${itcldir}${ITCL_LIB_FILE}"
+            ITCL_DEPS="${ITCL_LIB_FULL_PATH}"

            fi
 
           
            fi
 
           


@@ -948,17 +1057,8 @@ if test "${enable_gdbtk}" = "yes"; then
            if test -z "${no_itcl}"; then
              CY_AC_LOAD_ITKCONFIG
 
            if test -z "${no_itcl}"; then
              CY_AC_LOAD_ITKCONFIG
 

-            case "${host}" in
-              *-*-cygwin*)
-                itkdir=../itcl/itk/win/
-                ;;
-              *)
-                itkdir=../itcl/itk/unix/
-                ;;
-              esac 
-

             ITKLIB="${ITK_BUILD_LIB_SPEC}"
             ITKLIB="${ITK_BUILD_LIB_SPEC}"

-            ITK_DEPS="${itkdir}${ITK_LIB_FILE}"
+            ITK_DEPS="${ITK_LIB_FULL_PATH}"

            fi
 
           # now look for Tix library stuff
            fi
 
           # now look for Tix library stuff


@@ -1005,11 +1105,16 @@ if test "${enable_gdbtk}" = "yes"; then
           fi
        fi
     fi
           fi
        fi
     fi

+
+    SUBDIRS="${SUBDIRS} gdbtk"
+    configdirs="${configdirs} gdbtk"

 fi
 
 AC_SUBST(X_CFLAGS)
 AC_SUBST(X_LDFLAGS)
 AC_SUBST(X_LIBS)
 fi
 
 AC_SUBST(X_CFLAGS)
 AC_SUBST(X_LDFLAGS)
 AC_SUBST(X_LIBS)

+AC_SUBST(TCL_DEPS)
+AC_SUBST(TK_DEPS)

 AC_SUBST(ITCLLIB)
 AC_SUBST(ITCL_DEPS)
 AC_SUBST(ITKLIB)
 AC_SUBST(ITCLLIB)
 AC_SUBST(ITCL_DEPS)
 AC_SUBST(ITKLIB)


@@ -1018,6 +1123,7 @@ AC_SUBST(TIXLIB)
 AC_SUBST(TIX_DEPS)
 AC_SUBST(GDBTKLIBS)
 AC_SUBST(GDBTK_CFLAGS)
 AC_SUBST(TIX_DEPS)
 AC_SUBST(GDBTKLIBS)
 AC_SUBST(GDBTK_CFLAGS)

+AC_SUBST(GDBTK_SRC_DIR)

 
 AC_PATH_X
 
 
 AC_PATH_X
 


@@ -1138,7 +1244,14 @@ AC_SUBST(target_subdir)
 frags=
 host_makefile_frag=${srcdir}/config/${gdb_host_cpu}/${gdb_host}.mh
 if test ! -f ${host_makefile_frag}; then
 frags=
 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}")
+    # When building a native debuger the .mh file containing things
+    # like NATDEPFILES is needed.  Cross debuggers don't need .mh
+    # since it no longer contains anything useful.
+    if test "${target}" = "${host}"; then
+       AC_MSG_ERROR("*** Gdb does not support native target ${host}")
+    else
+       host_makefile_frag=/dev/null
+    fi

 fi
 frags="$frags $host_makefile_frag"
 
 fi
 frags="$frags $host_makefile_frag"
 


@@ -1165,16 +1278,12 @@ GDB_MULTI_ARCH=`sed -n '
 s/GDB_MULTI_ARCH[      ]*=[    ]*\([^  ]*\)[   ]*/\1/p
 ' ${target_makefile_frag}`
 
 s/GDB_MULTI_ARCH[      ]*=[    ]*\([^  ]*\)[   ]*/\1/p
 ' ${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
 if test "${target}" = "${host}"; then

+# We pick this up from the host configuration file (.mh) because we
+# do not have a native configuration Makefile fragment.

 nativefile=`sed -n '
 s/NAT_FILE[    ]*=[    ]*\([^  ]*\)/\1/p
 ' ${host_makefile_frag}`
 nativefile=`sed -n '
 s/NAT_FILE[    ]*=[    ]*\([^  ]*\)/\1/p
 ' ${host_makefile_frag}`

-# else
-# GDBserver is only useful in a "native" environment
-# configdirs=`echo $configdirs | sed 's/gdbserver//'`

 fi
 changequote([,])
 
 fi
 changequote([,])
 


@@ -1205,12 +1314,22 @@ case "${GDB_MULTI_ARCH}" in
     *)  AC_MSG_ERROR("GDB: Unknown GDB_MULTI_ARCH value ${GDB_MULTI_ARCH}");;
 esac
 
     *)  AC_MSG_ERROR("GDB: Unknown GDB_MULTI_ARCH value ${GDB_MULTI_ARCH}");;
 esac
 

-
-SUBDIRS="doc testsuite nlm"

 if test "${enable_multi_ice}" = "yes"; then
   SUBDIRS="${SUBDIRS} multi-ice"
 fi
 
 if test "${enable_multi_ice}" = "yes"; then
   SUBDIRS="${SUBDIRS} multi-ice"
 fi
 

+# ``gdbserver'' can only be built in a native configuration.
+if test x"${target}" = x"${host}"; then
+    AC_MSG_CHECKING(whether gdbserver is supported on this host)
+    if test x"${build_gdbserver}" = xyes ; then
+       configdirs="${configdirs} gdbserver"
+       SUBDIRS="${SUBDIRS} gdbserver"
+       AC_MSG_RESULT(yes)
+    else
+       AC_MSG_RESULT(no)
+    fi
+fi
+

 AC_SUBST(SUBDIRS)
 
 # If hostfile (XM_FILE) and/or targetfile (TM_FILE) and/or nativefile
 AC_SUBST(SUBDIRS)
 
 # If hostfile (XM_FILE) and/or targetfile (TM_FILE) and/or nativefile


@@ -1260,6 +1379,18 @@ AC_LINK_FILES($files, $links)
 dnl Check for exe extension set on certain hosts (e.g. Win32)
 AC_EXEEXT
 
 dnl Check for exe extension set on certain hosts (e.g. Win32)
 AC_EXEEXT
 

+dnl  Detect the character set used by this host.
+
+dnl  At the moment, we just assume it's ISO-8859-1 (which is a
+dnl  superset of ASCII containing the characters needed for French,
+dnl  German, Spanish, Italian, and possibly others), but if were
+dnl  *were* to support any host character sets other than ISO-8859-1,
+dnl  here's where we'd detect it.
+AC_DEFINE(GDB_DEFAULT_HOST_CHARSET, "ISO-8859-1",
+          [Define to be a string naming the default host character set.])
+
+AM_ICONV
+

 AC_CONFIG_SUBDIRS($configdirs)
 AC_OUTPUT(Makefile .gdbinit:gdbinit.in,
 [
 AC_CONFIG_SUBDIRS($configdirs)
 AC_OUTPUT(Makefile .gdbinit:gdbinit.in,
 [


@@ -1267,8 +1398,11 @@ dnl Autoconf doesn't provide a mechanism for modifying definitions
 dnl provided by makefile fragments.
 dnl
 if test "${nativefile}" = ""; then
 dnl provided by makefile fragments.
 dnl
 if test "${nativefile}" = ""; then

-sed -e '/^NATDEPFILES[[        ]]*=[[  ]]*/s//# NATDEPFILES=/' \
-       < Makefile > Makefile.tem
+        < Makefile \
+        sed -e '/^NATDEPFILES[[        ]]*=.*\\$/,/[[^\\]]$/s/^/# /' \
+            -e '/^NATDEPFILES[[        ]]*=/s/^/# /' \
+        | sed -e '/^\(NATDEPFILES[[    ]]*[[+]]=[[     ]]*\)/s//# \1/' \
+       > Makefile.tem

 mv -f Makefile.tem Makefile
 fi
 
 mv -f Makefile.tem Makefile
 fi