X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fconfigure.ac;h=6db1a189e9fd9d3336b50407df526c9b61293985;hb=de732108dddc7254366a437fae458ecac7d45b84;hp=32635dadac9c17ef07ffe4c5939c632a3834a4a1;hpb=194134a18464520633126b957d3062a45e73ee46;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/configure.ac b/gdb/configure.ac index 32635dadac..6db1a189e9 100644 --- a/gdb/configure.ac +++ b/gdb/configure.ac @@ -1,5 +1,6 @@ dnl Autoconf configure script for GDB, the GNU debugger. -dnl Copyright 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 +dnl Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +dnl 2005, 2006 dnl Free Software Foundation, Inc. dnl dnl This file is part of GDB. @@ -16,7 +17,8 @@ dnl GNU General Public License for more details. dnl dnl You should have received a copy of the GNU General Public License dnl along with this program; if not, write to the Free Software -dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, +dnl Boston, MA 02110-1301, USA. dnl Process this file with autoconf to produce a configure script. @@ -46,49 +48,13 @@ CONFIG_CLEAN= CONFIG_INSTALL= CONFIG_UNINSTALL= -dnl Set up for gettext. PACKAGE is used when we call bindtextdomain. - -CY_GNU_GETTEXT +dnl Set up for gettext. +ZW_GNU_GETTEXT_SISTER_DIR localedir='${datadir}/locale' AC_SUBST(localedir) -if test "x$POSUB" != x; then - - dnl Lifted from GCC's config/gettext.m4. - AC_MSG_CHECKING(for catalogs to be installed) - # Look for .po and .gmo files in the source directory. - CATALOGS= AC_SUBST(CATALOGS) - XLINGUAS= - for cat in $srcdir/po/*.gmo $srcdir/po/*.po; do - # If there aren't any .gmo files the shell will give us the - # literal string "../path/to/srcdir/po/*.gmo" which has to be - # weeded out. - case "$cat" in *\**) - continue;; - esac - # The quadruple backslash is collapsed to a double backslash - # by the backticks, then collapsed again by the double quotes, - # leaving us with one backslash in the sed expression (right - # before the dot that mustn't act as a wildcard). - cat=`echo $cat | sed -e "s!$srcdir/!!" -e "s!\\\\.po!.gmo!"` - lang=`echo $cat | sed -e 's!po/!!' -e "s!\\\\.gmo!!"` - # The user is allowed to set LINGUAS to a list of languages to - # install catalogs for. If it's empty that means "all of them." - if test "x$LINGUAS" = x; then - CATALOGS="$CATALOGS $cat" - XLINGUAS="$XLINGUAS $lang" - else - case "$LINGUAS" in *$lang*) - CATALOGS="$CATALOGS $cat" - XLINGUAS="$XLINGUAS $lang" - ;; - esac - fi - done - LINGUAS="$XLINGUAS" - AC_MSG_RESULT($LINGUAS) - +if test x"$USE_NLS" = xyes; then CONFIG_ALL="$CONFIG_ALL all-po" CONFIG_CLEAN="$CONFIG_CLEAN clean-po" CONFIG_INSTALL="$CONFIG_INSTALL install-po" @@ -109,8 +75,34 @@ AC_DEFINE_DIR(DEBUGDIR, debugdir, [Global directory for separate debug files. ]) #AC_DEFINE_UNQUOTED(DEBUGDIR, "$debugdir"), +if test "x$exec_prefix" = xNONE || test "x$exec_prefix" = 'x${prefix}'; then + if test "x$prefix" = xNONE; then + test_prefix=/usr/local + else + test_prefix=$prefix + fi +else + test_prefix=$exec_prefix +fi +case ${debugdir} in +"${test_prefix}"|"${test_prefix}/"*|\ +'${exec_prefix}'|'${exec_prefix}/'*) + AC_DEFINE(DEBUGDIR_RELOCATABLE, 1, [Define if the debug directory should be relocated when GDB is moved.]) + ;; +esac + AC_CONFIG_SUBDIRS(doc testsuite) +# Provide defaults for some variables set by the per-host and per-target +# configuration. +gdb_host_obs=posix-hdep.o + +if test "${target}" = "${host}"; then + gdb_native=yes +else + gdb_native=no +fi + . $srcdir/configure.host . $srcdir/configure.tgt @@ -224,7 +216,7 @@ esac],[ if test x"$enable_libunwind" = xyes; then AC_CHECK_HEADERS(libunwind.h) AC_CHECK_HEADERS(libunwind-ia64.h) - AC_DEFINE(HAVE_LIBUNWIND, 1) + AC_DEFINE(HAVE_LIBUNWIND, 1, [Define if libunwind library is being used.]) CONFIG_OBS="$CONFIG_OBS libunwind-frame.o" CONFIG_DEPS="$CONFIG_DEPS libunwind-frame.o" CONFIG_SRCS="$CONFIG_SRCS libunwind-frame.c" @@ -332,6 +324,10 @@ case $host_os in go32* | *djgpp*) ac_cv_search_tgetent="none required" ;; + *mingw32*) + ac_cv_search_tgetent="none required" + CONFIG_OBS="$CONFIG_OBS win32-termcap.o" + ;; esac # These are the libraries checked by Readline. @@ -341,6 +337,17 @@ if test "$ac_cv_search_tgetent" = no; then AC_MSG_ERROR([no termcap library found]) fi +AC_LIB_HAVE_LINKFLAGS([expat], [], [#include "expat.h"], + [XML_Parser p = XML_ParserCreate (0);]) +if test "$HAVE_LIBEXPAT" != yes; then + AC_MSG_WARN([expat is missing or unusable; some features may be disabled.]) +else + save_LIBS=$LIBS + LIBS="$LIBS $LIBEXPAT" + AC_CHECK_FUNCS(XML_StopParser) + LIBS=$save_LIBS +fi + # ------------------------- # # Checks for header files. # # ------------------------- # @@ -360,6 +367,7 @@ AC_CHECK_HEADERS(link.h, [], [], AC_CHECK_HEADERS(machine/reg.h) AC_CHECK_HEADERS(poll.h sys/poll.h) AC_CHECK_HEADERS(proc_service.h thread_db.h gnu/libc-version.h) +AC_CHECK_HEADERS(signal.h) AC_CHECK_HEADERS(stddef.h) AC_CHECK_HEADERS(stdlib.h) AC_CHECK_HEADERS(stdint.h) @@ -369,6 +377,7 @@ AC_CHECK_HEADERS(sys/file.h) AC_CHECK_HEADERS(sys/filio.h) AC_CHECK_HEADERS(sys/ioctl.h) AC_CHECK_HEADERS(sys/param.h) +AC_CHECK_HEADERS(sys/resource.h) AC_CHECK_HEADERS(sys/proc.h, [], [], [#if HAVE_SYS_PARAM_H # include @@ -396,8 +405,8 @@ case $host_os in solaris2.[[789]]) if test "$GCC" = yes; then AC_DEFINE(_MSE_INT_H, 1, - [[Define to 1 to avoid a clash between and on - Solaris 2.[789] when using GCC. ]]) + [Define to 1 to avoid a clash between and on + Solaris 2.[789] when using GCC. ]) fi ;; esac AC_CHECK_HEADERS(curses.h cursesX.h ncurses.h ncurses/ncurses.h) @@ -412,6 +421,9 @@ AC_CHECK_HEADERS(term.h, [], [], # unconditionally, so what's the point in checking these? AC_CHECK_HEADERS(ctype.h time.h) +# Create a header we can use portably to get the standard integer types. +GCC_HEADER_STDINT(gdb_stdint.h) + # ------------------------- # # Checks for declarations. # # ------------------------- # @@ -432,6 +444,11 @@ AC_CHECK_MEMBERS([struct stat.st_blksize]) # ------------------ # AC_TYPE_SIGNAL +AC_CHECK_TYPES(socklen_t, [], [], +[#include +#include +]) +AC_CHECK_TYPES(uintptr_t, [], [], [#include ]) # ------------------------------------- # # Checks for compiler characteristics. # @@ -448,6 +465,7 @@ AC_FUNC_ALLOCA AC_FUNC_MMAP AC_FUNC_VFORK AC_CHECK_FUNCS(canonicalize_file_name realpath) +AC_CHECK_FUNCS(getrusage) AC_CHECK_FUNCS(getuid getgid) AC_CHECK_FUNCS(poll) AC_CHECK_FUNCS(pread64) @@ -623,7 +641,8 @@ AC_CACHE_VAL(gdb_cv_have_ptrace_getregs, [gdb_cv_have_ptrace_getregs=no])]) AC_MSG_RESULT($gdb_cv_have_ptrace_getregs) if test $gdb_cv_have_ptrace_getregs = yes; then - AC_DEFINE(HAVE_PTRACE_GETREGS) + AC_DEFINE(HAVE_PTRACE_GETREGS, 1, + [Define if sys/ptrace.h defines the PTRACE_GETREGS request.]) fi # See if provides the PTRACE_GETFPXREGS request. @@ -635,7 +654,8 @@ AC_CACHE_VAL(gdb_cv_have_ptrace_getfpxregs, [gdb_cv_have_ptrace_getfpxregs=no])]) AC_MSG_RESULT($gdb_cv_have_ptrace_getfpxregs) if test $gdb_cv_have_ptrace_getfpxregs = yes; then - AC_DEFINE(HAVE_PTRACE_GETFPXREGS) + AC_DEFINE(HAVE_PTRACE_GETFPXREGS, 1, + [Define if sys/ptrace.h defines the PTRACE_GETFPXREGS request.]) fi # See if provides the PT_GETDBREGS request. @@ -648,7 +668,8 @@ AC_CACHE_VAL(gdb_cv_have_pt_getdbregs, [gdb_cv_have_pt_getdbregs=no])]) AC_MSG_RESULT($gdb_cv_have_pt_getdbregs) if test $gdb_cv_have_pt_getdbregs = yes; then - AC_DEFINE(HAVE_PT_GETDBREGS) + AC_DEFINE(HAVE_PT_GETDBREGS, 1, + [Define if sys/ptrace.h defines the PT_GETDBREGS request.]) fi # See if provides the PT_GETXMMREGS request. @@ -661,19 +682,8 @@ AC_CACHE_VAL(gdb_cv_have_pt_getxmmregs, [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 - -# See if stdint.h provides the uintptr_t type. -# Autoconf 2.5X has an improved AC_CHECK_TYPE which will simplify this. -AC_CACHE_CHECK([for uintptr_t in stdint.h], gdb_cv_have_uintptr_t, - [AC_TRY_COMPILE( - [#include ], - [uintptr_t foo = 0;], - gdb_cv_have_uintptr_t=yes, - gdb_cv_have_uintptr_t=no)]) -if test $gdb_cv_have_uintptr_t = yes; then - AC_DEFINE(HAVE_UINTPTR_T, 1, [Define if provides the uintptr_t type.]) + AC_DEFINE(HAVE_PT_GETXMMREGS, 1, + [Define if sys/ptrace.h defines the PT_GETXMMREGS request.]) fi # If we are configured native on GNU/Linux, work around problems with @@ -683,18 +693,26 @@ fi if test "${target}" = "${host}"; then case "${host}" in i[[3456]]86-*-linux*) - AC_DEFINE(START_INFERIOR_TRAPS_EXPECTED,2) - AC_DEFINE(sys_quotactl) + AC_DEFINE(START_INFERIOR_TRAPS_EXPECTED, 2, + [Define on a GNU/Linux system to work around problems in sys/procfs.h.]) + AC_DEFINE(sys_quotactl, 1, + [Define on a GNU/Linux system to work around problems in sys/procfs.h.]) ;; *-*-unixware* | *-*-sysv4.2* | *-*-sysv5* | *-*-interix* ) - AC_DEFINE(NEW_PROC_API) + AC_DEFINE(NEW_PROC_API, 1, + [Define if you want to use new multi-fd /proc interface + (replaces HAVE_MULTIPLE_PROC_FDS as well as other macros).]) ;; *-*-solaris2.[[6789]] | *-*-solaris2.1[[0-9]]) - AC_DEFINE(NEW_PROC_API) + AC_DEFINE(NEW_PROC_API, 1, + [Define if you want to use new multi-fd /proc interface + (replaces HAVE_MULTIPLE_PROC_FDS as well as other macros).]) ;; mips-sgi-irix5*) # Work around needing _KMEMUSER problem on IRIX 5. - AC_DEFINE([_KMEMUSER], 1) + AC_DEFINE([_KMEMUSER], 1, + [Define to 1 so gets a definition of anon_hdl. Works + around a problem on IRIX 5.]) ;; esac fi @@ -738,7 +756,8 @@ if test "$ac_cv_header_sys_procfs_h" = yes; then gdb_cv_prfpregset_t_broken=yes)]) AC_MSG_RESULT($gdb_cv_prfpregset_t_broken) if test $gdb_cv_prfpregset_t_broken = yes; then - AC_DEFINE(PRFPREGSET_T_BROKEN) + AC_DEFINE(PRFPREGSET_T_BROKEN, 1, + [Define if the prfpregset_t type is broken.]) fi fi @@ -756,7 +775,8 @@ if test "$ac_cv_header_sys_procfs_h" = yes; then 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) + AC_DEFINE(HAVE_PROCFS_PIOCSET, 1, + [Define if ioctl argument PIOCSET is available.]) fi fi @@ -774,7 +794,10 @@ if test ${host} = ${target} ; then gdb_cv_have_struct_link_map_with_l_members=no)]) AC_MSG_RESULT($gdb_cv_have_struct_link_map_with_l_members) if test $gdb_cv_have_struct_link_map_with_l_members = yes; then - AC_DEFINE(HAVE_STRUCT_LINK_MAP_WITH_L_MEMBERS) + AC_DEFINE(HAVE_STRUCT_LINK_MAP_WITH_L_MEMBERS,1, + [Define if exists and defines struct link_map which has + members with an ``l_'' prefix. (For Solaris, SVR4, and + SVR4-like systems.)]) fi dnl Check for struct link_map with lm_ members which are indicative @@ -789,7 +812,9 @@ if test ${host} = ${target} ; then gdb_cv_have_struct_link_map_with_lm_members=no)]) AC_MSG_RESULT($gdb_cv_have_struct_link_map_with_lm_members) if test $gdb_cv_have_struct_link_map_with_lm_members = yes; then - AC_DEFINE(HAVE_STRUCT_LINK_MAP_WITH_LM_MEMBERS) + AC_DEFINE(HAVE_STRUCT_LINK_MAP_WITH_LM_MEMBERS, 1, + [Define if exists and defines struct link_map which has + members with an ``lm_'' prefix. (For SunOS.)]) fi dnl Check for struct so_map with som_ members which are found on @@ -807,7 +832,9 @@ if test ${host} = ${target} ; then gdb_cv_have_struct_so_map_with_som_members=no)]) AC_MSG_RESULT($gdb_cv_have_struct_so_map_with_som_members) if test $gdb_cv_have_struct_so_map_with_som_members = yes; then - AC_DEFINE(HAVE_STRUCT_SO_MAP_WITH_SOM_MEMBERS) + AC_DEFINE(HAVE_STRUCT_SO_MAP_WITH_SOM_MEMBERS, 1, + [Define if exists and defines a struct so_map which has + members with an ``som_'' prefix. (Found on older *BSD systems.)]) fi dnl Check for struct link_map32 type, which allows a 64-bit Solaris @@ -821,8 +848,10 @@ if test ${host} = ${target} ; then gdb_cv_have_struct_link_map32=no)]) 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) + AC_DEFINE(HAVE_STRUCT_LINK_MAP32, 1, + [Define if has struct link_map32]) + AC_DEFINE(_SYSCALL32, 1, + [Define if has link_map32 (solaris sparc-64 target)]) fi fi @@ -941,7 +970,8 @@ if test ${build} = ${host} -a ${host} = ${target} ; then 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) + AC_DEFINE(HAVE_HPUX_THREAD_SUPPORT, 1, + [Define if you have HPUX threads]) CONFIG_OBS="${CONFIG_OBS} hpux-thread.o" CONFIG_SRCS="${CONFIG_SRCS} hpux-thread.c" else @@ -959,7 +989,8 @@ if test ${build} = ${host} -a ${host} = ${target} ; then 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) + AC_DEFINE(HAVE_THREAD_DB_LIB, 1, + [Define if using Solaris thread debugging.]) CONFIG_OBS="${CONFIG_OBS} sol-thread.o" CONFIG_SRCS="${CONFIG_SRCS} sol-thread.c" AC_CHECK_LIB(dl, dlopen) @@ -989,7 +1020,9 @@ if test ${build} = ${host} -a ${host} = ${target} ; then ]) 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) + AC_DEFINE(PROC_SERVICE_IS_OLD, 1, + [Define if on solaris uses int instead of + size_t, and assorted other type changes.]) fi else AC_MSG_RESULT(no) @@ -1015,7 +1048,8 @@ if test ${build} = ${host} -a ${host} = ${target} ; then AC_SUBST(CONFIG_LDFLAGS) fi -dnl See if we have a thread_db header file that has TD_NOTALLOC. +dnl See if we have a thread_db header file that has TD_NOTALLOC and +dnl other error codes. if test "x$ac_cv_header_thread_db_h" = "xyes"; then AC_CACHE_CHECK([whether has TD_NOTALLOC], gdb_cv_thread_db_h_has_td_notalloc, @@ -1026,11 +1060,37 @@ if test "x$ac_cv_header_thread_db_h" = "xyes"; then gdb_cv_thread_db_h_has_td_notalloc=no ) ) + AC_CACHE_CHECK([whether has TD_VERSION], + gdb_cv_thread_db_h_has_td_version, + AC_TRY_COMPILE( + [#include ], + [int i = TD_VERSION;], + gdb_cv_thread_db_h_has_td_version=yes, + gdb_cv_thread_db_h_has_td_version=no + ) + ) + AC_CACHE_CHECK([whether has TD_NOTLS], + gdb_cv_thread_db_h_has_td_notls, + AC_TRY_COMPILE( + [#include ], + [int i = TD_NOTLS;], + gdb_cv_thread_db_h_has_td_notls=yes, + gdb_cv_thread_db_h_has_td_notls=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 has the TD_NOTALLOC error code.]) fi +if test "x$gdb_cv_thread_db_h_has_td_version" = "xyes"; then + AC_DEFINE(THREAD_DB_HAS_TD_VERSION, 1, + [Define if has the TD_VERSION error code.]) +fi +if test "x$gdb_cv_thread_db_h_has_td_notls" = "xyes"; then + AC_DEFINE(THREAD_DB_HAS_TD_NOTLS, 1, + [Define if has the TD_NOTLS error code.]) +fi dnl See if we have a sys/syscall header file that has __NR_tkill. if test "x$ac_cv_header_sys_syscall_h" = "xyes"; then @@ -1046,8 +1106,7 @@ if test "x$ac_cv_header_sys_syscall_h" = "xyes"; then fi dnl See if we can issue tkill syscall. if test "x$gdb_cv_sys_syscall_h_has_tkill" = "xyes" && test "x$ac_cv_func_syscall" = "xyes"; then - AC_DEFINE(HAVE_TKILL_SYSCALL, 1, - [Define if we can use the tkill syscall.]) + AC_DEFINE(HAVE_TKILL_SYSCALL, 1, [Define if you support the tkill syscall.]) fi dnl Handle optional features that can be enabled. @@ -1062,7 +1121,7 @@ AC_ARG_WITH(sysroot, TARGET_SYSTEM_ROOT_DEFINE='-DTARGET_SYSTEM_ROOT=\"$(TARGET_SYSTEM_ROOT)\"' - if test "x$exec_prefix" = xNONE; then + if test "x$exec_prefix" = xNONE || test "x$exec_prefix" = 'x${prefix}'; then if test "x$prefix" = xNONE; then test_prefix=/usr/local else @@ -1085,32 +1144,33 @@ AC_ARG_WITH(sysroot, AC_SUBST(TARGET_SYSTEM_ROOT) AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE) -# NOTE: Don't add -Wall or -Wunused, they both include -# -Wunused-parameter which reports bogus warnings. -# NOTE: If you add to this list, remember to update -# gdb/doc/gdbint.texinfo. -build_warnings="-Wimplicit -Wreturn-type -Wcomment -Wtrigraphs \ --Wformat -Wparentheses -Wpointer-arith -Wformat-nonliteral \ --Wunused-label -Wunused-function" - -# GCC supports -Wuninitialized only with -O or -On, n != 0. -if test x${CFLAGS+set} = xset; then - case "${CFLAGS}" in - *"-O0"* ) ;; - *"-O"* ) - build_warnings="${build_warnings} -Wuninitialized" - ;; - esac -else - build_warnings="${build_warnings} -Wuninitialized" +AC_ARG_ENABLE(werror, + [ --enable-werror treat compile warnings as errors], + [case "${enableval}" in + yes | y) ERROR_ON_WARNING="yes" ;; + no | n) ERROR_ON_WARNING="no" ;; + *) AC_MSG_ERROR(bad value ${enableval} for --enable-werror) ;; + esac]) + +# Enable -Werror by default when using gcc +if test "${GCC}" = yes -a -z "${ERROR_ON_WARNING}" ; then + ERROR_ON_WARNING=yes +fi + +WERROR_CFLAGS="" +if test "${ERROR_ON_WARNING}" = yes ; then + WERROR_CFLAGS="-Werror" fi -# Up for debate: -Wswitch -Wcomment -trigraphs -Wtrigraphs -# -Wunused-function -Wunused-variable -Wunused-value -# -Wchar-subscripts -Wtraditional -Wshadow -Wcast-qual -# -Wcast-align -Wwrite-strings -Wconversion -Wstrict-prototypes -# -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -# -Woverloaded-virtual -Winline -Werror" +# The entries after -Wno-pointer-sign are disabled warnings which may +# be enabled in the future, which can not currently be used to build +# GDB. +# NOTE: If you change this list, remember to update +# gdb/doc/gdbint.texinfo. +build_warnings="-Wall -Wdeclaration-after-statement -Wpointer-arith \ +-Wformat-nonliteral -Wno-pointer-sign \ +-Wno-unused -Wno-switch -Wno-char-subscripts" + AC_ARG_ENABLE(build-warnings, [ --enable-build-warnings Enable build-time compiler warnings if gcc is used], [case "${enableval}" in @@ -1140,7 +1200,6 @@ if test x"$silent" != x"yes" && test x"$build_warnings" != x""; then echo "Setting GDB specific compiler warning flags = $build_warnings" 6>&1 fi])dnl WARN_CFLAGS="" -WERROR_CFLAGS="" if test "x${build_warnings}" != x -a "x$GCC" = xyes then AC_MSG_CHECKING(compiler warning flags) @@ -1156,7 +1215,7 @@ then CFLAGS="$saved_CFLAGS" esac done - AC_MSG_RESULT(${WARN_CFLAGS}${WERROR_CFLAGS}) + AC_MSG_RESULT(${WARN_CFLAGS} ${WERROR_CFLAGS}) fi AC_SUBST(WARN_CFLAGS) AC_SUBST(WERROR_CFLAGS) @@ -1174,7 +1233,7 @@ SER_HARDWIRE="ser-base.o ser-unix.o ser-pipe.o ser-tcp.o" case ${host} in *go32* ) SER_HARDWIRE=ser-go32.o ;; *djgpp* ) SER_HARDWIRE=ser-go32.o ;; - *mingw32*) SER_HARDWIRE="ser-base.o ser-tcp.o" ;; + *mingw32*) SER_HARDWIRE="ser-base.o ser-tcp.o ser-mingw.o" ;; esac AC_SUBST(SER_HARDWIRE) @@ -1201,6 +1260,9 @@ case ${host} in esac AC_SUBST(WIN32LIBS) +# Add any host-specific objects to GDB. +CONFIG_OBS="${CONFIG_OBS} ${gdb_host_obs}" + LIBGUI="../libgui/src/libgui.a" GUI_CFLAGS_X="-I${srcdir}/../libgui/src" AC_SUBST(LIBGUI) @@ -1369,7 +1431,7 @@ if test "${ignore_sim}" = "true"; then else IGNORE_SIM="" IGNORE_SIM_OBS="" - AC_DEFINE(WITH_SIM) + AC_DEFINE(WITH_SIM, 1, [Define if the simulator is being linked in.]) fi AC_SUBST(IGNORE_SIM) AC_SUBST(IGNORE_SIM_OBS) @@ -1398,7 +1460,7 @@ fi AC_SUBST(target_subdir) frags= -if test "${target}" = "${host}"; then +if test "${gdb_native}" = "yes"; then 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 native target ${host}") @@ -1424,10 +1486,10 @@ s/XM_FILE[ ]*=[ ]*\([^ ]*\)/\1/p ' ${host_makefile_frag}` targetfile=`sed -n ' -s/DEPRECATED_TM_FILE[ ]*=[ ]*\([^ ]*\)/\1/p +s/^[ ]*DEPRECATED_TM_FILE[ ]*=[ ]*\([^ ]*\)/\1/p ' ${target_makefile_frag}` -if test "${target}" = "${host}"; then +if test "${gdb_native}" = "yes"; then # We pick this up from the host configuration file (.mh) because we # do not have a native configuration Makefile fragment. nativefile=`sed -n ' @@ -1453,8 +1515,8 @@ if test "x$enable_multi_ice" = xyes; then AC_CONFIG_SUBDIRS(multi-ice) fi -# We only build gdbserver automatically if host and target are the same. -if test "x$target" = "x$host"; then +# We only build gdbserver automatically in a native configuration. +if test "$gdb_native" = "yes"; then AC_MSG_CHECKING(whether gdbserver is supported on this host) if test "x$build_gdbserver" = xyes; then AC_MSG_RESULT(yes) @@ -1464,17 +1526,6 @@ if test "x$target" = "x$host"; then fi fi -# We build rdi-share on ARM-based targets, as instructed by configure.tgt. -if test "x$build_rdi_share" = xyes; then - AC_CONFIG_SUBDIRS(rdi-share) -fi - -# We configure the nlm subdirectory on netware targets, as instructed -# by configure.tgt. -if test "x$build_nlm" = xyes; then - AC_CONFIG_SUBDIRS(nlm) -fi - # If hostfile (XM_FILE) and/or targetfile (DEPRECATED_TM_FILE) and/or # nativefile (NAT_FILE) is not set in config/*/*.m[ht] files, we link # to an empty version. @@ -1492,7 +1543,7 @@ if test "${hostfile}" != ""; then esac files="${files} ${GDB_XM_FILE}" links="${links} xm.h" - AC_DEFINE_UNQUOTED(GDB_XM_FILE, "${GDB_XM_FILE}") + AC_DEFINE_UNQUOTED(GDB_XM_FILE, "${GDB_XM_FILE}", [hostfile]) fi AC_SUBST(xm_h) @@ -1506,7 +1557,7 @@ if test "${targetfile}" != ""; then esac files="${files} ${GDB_TM_FILE}" links="${links} tm.h" - AC_DEFINE_UNQUOTED(GDB_TM_FILE, "${GDB_TM_FILE}") + AC_DEFINE_UNQUOTED(GDB_TM_FILE, "${GDB_TM_FILE}", [targetfile]) fi AC_SUBST(tm_h) @@ -1520,7 +1571,7 @@ if test "${nativefile}" != ""; then esac files="${files} ${GDB_NM_FILE}" links="${links} nm.h" - AC_DEFINE_UNQUOTED(GDB_NM_FILE, "${GDB_NM_FILE}") + AC_DEFINE_UNQUOTED(GDB_NM_FILE, "${GDB_NM_FILE}", [nativefile]) fi AC_SUBST(nm_h)