X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fconfigure.ac;h=8da6867a6a18812e85cfc3e3e0394081abe3f8ac;hb=e38df1d074456c912b31d672bde73afcea5b5c92;hp=3a5521823e8a9b602e7ef8f6e14eaae2e87b4cc2;hpb=5062cc192edb3e057e7f0c8c22d7b806077df307;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/configure.ac b/gdb/configure.ac index 3a5521823e..8da6867a6a 100644 --- a/gdb/configure.ac +++ b/gdb/configure.ac @@ -1,6 +1,6 @@ dnl Autoconf configure script for GDB, the GNU debugger. dnl Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -dnl 2005, 2006, 2007, 2008 +dnl 2005, 2006, 2007, 2008, 2009, 2010 dnl Free Software Foundation, Inc. dnl dnl This file is part of GDB. @@ -26,15 +26,29 @@ AC_CONFIG_HEADER(config.h:config.in) AM_MAINTAINER_MODE AC_PROG_CC -AC_GNU_SOURCE -AC_AIX -AC_ISC_POSIX +AC_USE_SYSTEM_EXTENSIONS gl_EARLY +ACX_LARGEFILE AM_PROG_CC_STDC AC_CONFIG_AUX_DIR(..) AC_CANONICAL_SYSTEM +# Dependency checking. +ZW_CREATE_DEPDIR +ZW_PROG_COMPILER_DEPENDENCIES([CC]) + +# Check for the 'make' the user wants to use. +AC_CHECK_PROGS(MAKE, make) +MAKE_IS_GNU= +case "`$MAKE --version 2>&1 | sed 1q`" in + *GNU*) + MAKE_IS_GNU=yes + ;; +esac +AM_CONDITIONAL(GMAKE, test "$MAKE_IS_GNU" = yes) +AC_PROG_MAKE_SET + dnl List of object files and targets accumulated by configure. CONFIG_OBS= @@ -77,37 +91,28 @@ AC_SUBST(PACKAGE) # generate its Makefile.in. AM_INIT_AUTOMAKE(gdb, UNUSED-VERSION, [no-define]) -debugdir=${libdir}/debug - -AC_ARG_WITH(separate-debug-dir, -[ --with-separate-debug-dir=path Look for global separate debug info in this path [LIBDIR/debug]], -[debugdir="${withval}"]) - -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 +GDB_AC_WITH_DIR(DEBUGDIR, separate-debug-dir, + [look for global separate debug info in this path @<:@LIBDIR/debug@:>@], + [${libdir}/debug]) + +# GDB's datadir relocation + +GDB_AC_WITH_DIR(GDB_DATADIR, gdb-datadir, + [look for global separate data files in this path @<:@DATADIR/gdb@:>@], + [${datadir}/gdb]) + +AC_ARG_WITH(relocated-sources, +AS_HELP_STRING([--with-relocated-sources=PATH], [automatically relocate this path for source files]), +[reloc_srcdir="${withval}" + AC_DEFINE_DIR(RELOC_SRCDIR, reloc_srcdir, + [Relocated directory for source files. ]) +]) AC_CONFIG_SUBDIRS(doc testsuite) # Check whether to support alternative target configurations AC_ARG_ENABLE(targets, -[ --enable-targets alternative target configurations], +AS_HELP_STRING([--enable-targets=TARGETS], [alternative target configurations]), [case "${enableval}" in yes | "") AC_ERROR(enable-targets option must specify target names or 'all') ;; @@ -117,7 +122,7 @@ esac]) # Check whether to enable 64-bit support on 32-bit hosts AC_ARG_ENABLE(64-bit-bfd, -[ --enable-64-bit-bfd 64-bit support (on hosts with narrower word sizes)], +AS_HELP_STRING([--enable-64-bit-bfd], [64-bit support (on hosts with narrower word sizes)]), [case "${enableval}" in yes) want64=true ;; no) want64=false ;; @@ -225,7 +230,7 @@ fi # Enable CLI. AC_ARG_ENABLE(gdbcli, -[ --disable-gdbcli disable command-line interface (CLI)], +AS_HELP_STRING([--disable-gdbcli], [disable command-line interface (CLI)]), [case $enableval in yes) ;; @@ -246,7 +251,7 @@ fi # Enable MI. AC_ARG_ENABLE(gdbmi, -[ --disable-gdbmi disable machine-interface (MI)], +AS_HELP_STRING([--disable-gdbmi], [disable machine-interface (MI)]), [case $enableval in yes | no) ;; @@ -265,7 +270,7 @@ fi # Enable TUI. AC_ARG_ENABLE(tui, -[ --enable-tui enable full-screen terminal user interface (TUI)], +AS_HELP_STRING([--enable-tui], [enable full-screen terminal user interface (TUI)]), [case $enableval in yes | no | auto) ;; @@ -275,7 +280,7 @@ AC_ARG_ENABLE(tui, # Enable gdbtk. AC_ARG_ENABLE(gdbtk, -[ --enable-gdbtk enable gdbtk graphical user interface (GUI)], +AS_HELP_STRING([--enable-gdbtk], [enable gdbtk graphical user interface (GUI)]), [case $enableval in yes | no) ;; @@ -296,31 +301,37 @@ esac # Libunwind support. AC_ARG_WITH(libunwind, -[ --with-libunwind Use libunwind frame unwinding support], +AS_HELP_STRING([--with-libunwind], [use libunwind frame unwinding support]), [case "${withval}" in yes) enable_libunwind=yes ;; no) enable_libunwind=no ;; *) AC_MSG_ERROR(bad value ${withval} for GDB with-libunwind option) ;; esac],[ - AC_CHECK_HEADERS(libunwind.h) - AC_CHECK_HEADERS(libunwind-ia64.h) + AC_CHECK_HEADERS(libunwind.h libunwind-ia64.h) if test x"$ac_cv_header_libunwind_h" = xyes -a x"$ac_cv_header_libunwind_ia64_h" = xyes; then enable_libunwind=yes; fi ]) if test x"$enable_libunwind" = xyes; then - AC_CHECK_HEADERS(libunwind.h) - AC_CHECK_HEADERS(libunwind-ia64.h) + AC_CHECK_HEADERS(libunwind.h libunwind-ia64.h) 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" fi +opt_curses=no +AC_ARG_WITH(curses, AS_HELP_STRING([--with-curses], [use the curses library instead of the termcap library]), opt_curses=$withval) + +prefer_curses=no +if test "$opt_curses" = "yes"; then + prefer_curses=yes +fi + # Profiling support. AC_ARG_ENABLE(profiling, -[ --enable-profiling enable profiling of GDB], +AS_HELP_STRING([--enable-profiling], [enable profiling of GDB]), [case $enableval in yes | no) ;; @@ -412,22 +423,84 @@ AC_SEARCH_LIBS(gethostbyname, nsl) AC_SEARCH_LIBS(socketpair, socket) # Link in zlib if we can. This allows us to read compressed debug sections. -AC_SEARCH_LIBS(zlibVersion, z, [AC_CHECK_HEADERS(zlib.h)]) - -# For the TUI, we need enhanced curses functionality. -# -# FIXME: kettenis/20040905: We prefer ncurses over the vendor-supplied -# curses library because the latter might not provide all the -# functionality we need. However, this leads to problems on systems -# where the linker searches /usr/local/lib, but the compiler doesn't -# search /usr/local/include, if ncurses is installed in /usr/local. A -# default installation of ncurses on alpha*-dec-osf* will lead to such -# a situation. -AC_SEARCH_LIBS(waddstr, [ncurses cursesX curses]) +AM_ZLIB # On HP/UX we may need libxpdl for dlgetmodinfo (used by solib-pa64.c). AC_SEARCH_LIBS(dlgetmodinfo, [dl xpdl]) +AM_ICONV + +# On alpha-osf, it appears that libtermcap and libcurses are not compatible. +# There is a very specific comment in /usr/include/curses.h explaining that +# termcap routines built into libcurses must not be used. +# +# The symptoms we observed so far is GDB unexpectedly changing +# the terminal settings when tgetent is called - this is particularly +# visible as the output is missing carriage returns, and so rapidly +# becomes very hard to read. +# +# The readline configure script has already decided that libtermcap +# was enough for its purposes, and so decided to build readline using +# libtermcap. Since the TUI mode requires curses, building GDB with +# TUI enabled results in both libraries to be used at the same time, +# which is not allowed. This basically means that GDB with TUI is +# broken on alpha-osf. + +case $host_os in + osf* ) + if test x"$enable_tui" = xyes; then + AC_MSG_ERROR([Building GDB with TUI mode is not supported on this host]) + fi + if test x"$enable_tui" = xauto; then + enable_tui=no + fi + ;; +esac + +# For the TUI, we need enhanced curses functionality. +if test x"$enable_tui" != xno; then + prefer_curses=yes +fi + +curses_found=no +if test x"$prefer_curses" = xyes; then + # FIXME: kettenis/20040905: We prefer ncurses over the vendor-supplied + # curses library because the latter might not provide all the + # functionality we need. However, this leads to problems on systems + # where the linker searches /usr/local/lib, but the compiler doesn't + # search /usr/local/include, if ncurses is installed in /usr/local. A + # default installation of ncurses on alpha*-dec-osf* will lead to such + # a situation. + AC_SEARCH_LIBS(waddstr, [ncurses cursesX curses]) + + if test "$ac_cv_search_waddstr" != no; then + curses_found=yes + fi +fi + +# Check whether we should enable the TUI, but only do so if we really +# can. +if test x"$enable_tui" != xno; then + if test -d $srcdir/tui; then + if test "$curses_found" != no; then + CONFIG_OBS="$CONFIG_OBS \$(SUBDIR_TUI_OBS)" + CONFIG_DEPS="$CONFIG_DEPS \$(SUBDIR_TUI_DEPS)" + CONFIG_SRCS="$CONFIG_SRCS \$(SUBDIR_TUI_SRCS)" + ENABLE_CFLAGS="$ENABLE_CFLAGS \$(SUBDIR_TUI_CFLAGS)" + CONFIG_ALL="${CONFIG_ALL} all-tui" + CONFIG_CLEAN="${CONFIG_CLEAN} clean-tui" + CONFIG_INSTALL="${CONFIG_INSTALL} install-tui" + CONFIG_UNINSTALL="${CONFIG_UNINSTALL} uninstall-tui" + else + if test x"$enable_tui" = xyes; then + AC_MSG_ERROR([no enhanced curses library found; disable TUI]) + else + AC_MSG_WARN([no enhanced curses library found; disabling TUI]) + fi + fi + fi +fi + # Since GDB uses Readline, we need termcap functionality. In many # cases this will be provided by the curses library, but some systems # have a seperate termcap library, or no curses library at all. @@ -443,7 +516,7 @@ case $host_os in ;; *mingw32*) ac_cv_search_tgetent="none required" - CONFIG_OBS="$CONFIG_OBS win32-termcap.o" + CONFIG_OBS="$CONFIG_OBS windows-termcap.o" ;; esac @@ -462,6 +535,21 @@ if test "$with_system_readline" = yes; then READLINE=-lreadline READLINE_DEPS= READLINE_CFLAGS= + + # readline-6.0 started to use the name `_rl_echoing_p'. + # `$(READLINE_DIR)/' of bundled readline would not resolve in configure. + + AC_MSG_CHECKING([for readline_echoing_p]) + save_LIBS=$LIBS + LIBS="$LIBS $READLINE" + AC_LINK_IFELSE(AC_LANG_PROGRAM(,[[extern int readline_echoing_p; + return readline_echoing_p;]]), + [READLINE_ECHOING_P=yes], + [READLINE_ECHOING_P=no + AC_DEFINE([readline_echoing_p], [_rl_echoing_p], + [readline-6.0 started to use different name.])]) + LIBS="$save_LIBS" + AC_MSG_RESULT([$READLINE_ECHOING_P]) else READLINE='$(READLINE_DIR)/libreadline.a' READLINE_DEPS='$(READLINE)' @@ -497,6 +585,125 @@ else fi fi +dnl Utility to simplify finding libpython. +AC_DEFUN([AC_TRY_LIBPYTHON], +[ + version=$1 + define([have_libpython_var],$2) + define([VERSION],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], + [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) + [HAVE_LIB]VERSION=no + AC_MSG_CHECKING([for ${version}]) + save_LIBS=$LIBS + LIBS="$LIBS -l${version}" + AC_LINK_IFELSE(AC_LANG_PROGRAM([[#include "${version}/Python.h"]], + [[Py_Initialize ();]]), + [[HAVE_LIB]VERSION=yes + have_libpython_var=yes], + [LIBS=$save_LIBS]) + AC_MSG_RESULT([$[HAVE_LIB]VERSION]) +]) + +AC_ARG_WITH(python, + AS_HELP_STRING([--with-python], [include python support (auto/yes/no/)]), + [], [with_python=auto]) +AC_MSG_CHECKING([whether to use python]) +AC_MSG_RESULT([$with_python]) + +if test "${with_python}" = no; then + AC_MSG_WARN([python support disabled; some features may be unavailable.]) + have_libpython=no +else + case "${with_python}" in + yes | auto) + # Leave as empty, use defaults. + python_includes= + python_libs= + ;; + /*) + python_includes="-I${with_python}/include" + python_libs="-L${with_python}/lib" + ;; + *) + AC_ERROR(invalid value for --with-python) + ;; + esac + + save_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS ${python_includes}" + save_LIBS=$LIBS + LIBS="$LIBS ${python_libs}" + have_libpython=no + if test "${have_libpython}" = no; then + AC_TRY_LIBPYTHON(python2.6, have_libpython) + if test "${HAVE_LIBPYTHON2_6}" = yes; then + AC_DEFINE(HAVE_LIBPYTHON2_6, 1, [Define if Python 2.6 is being used.]) + fi + fi + if test ${have_libpython} = no; then + AC_TRY_LIBPYTHON(python2.5, have_libpython) + if test "${HAVE_LIBPYTHON2_5}" = yes; then + AC_DEFINE(HAVE_LIBPYTHON2_5, 1, [Define if Python 2.5 is being used.]) + fi + fi + if test ${have_libpython} = no; then + AC_TRY_LIBPYTHON(python2.4, have_libpython) + if test "${HAVE_LIBPYTHON2_4}" = yes; then + AC_DEFINE(HAVE_LIBPYTHON2_4, 1, [Define if Python 2.4 is being used.]) + fi + fi + if test ${have_libpython} = no; then + case "${with_python}" in + yes) + AC_MSG_ERROR([python is missing or unusable]) + ;; + auto) + AC_MSG_WARN([python is missing or unusable; some features may be unavailable.]) + ;; + *) + AC_MSG_ERROR([no usable python found at ${with_python}]) + ;; + esac + CPPFLAGS=$save_CPPFLAGS + LIBS=$save_LIBS + fi +fi + +if test "${have_libpython}" = yes; then + AC_DEFINE(HAVE_PYTHON, 1, [Define if Python interpreter is being linked in.]) + CONFIG_OBS="$CONFIG_OBS \$(SUBDIR_PYTHON_OBS)" + CONFIG_DEPS="$CONFIG_DEPS \$(SUBDIR_PYTHON_DEPS)" + CONFIG_SRCS="$CONFIG_SRCS \$(SUBDIR_PYTHON_SRCS)" + ENABLE_CFLAGS="$ENABLE_CFLAGS \$(SUBDIR_PYTHON_CFLAGS)" + + # Flags needed to compile Python code (taken from python-config --cflags). + # We cannot call python-config directly because it will output whatever was + # used when compiling the Python interpreter itself, including flags which + # would make the python-related objects be compiled differently from the + # rest of GDB (e.g., -O2 and -fPIC). + if test "${GCC}" = yes; then + tentative_python_cflags="-fno-strict-aliasing -DNDEBUG -fwrapv" + fi + + if test "x${tentative_python_cflags}" != x; then + AC_MSG_CHECKING(compiler flags for python code) + for flag in ${tentative_python_cflags}; do + # Check that the compiler accepts it + saved_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $flag" + AC_TRY_COMPILE([],[],PYTHON_CFLAGS="${PYTHON_CFLAGS} $flag",) + CFLAGS="$saved_CFLAGS" + done + AC_MSG_RESULT(${PYTHON_CFLAGS}) + fi +else + # Even if Python support is not compiled in, we need to have these files + # included in order to recognize the GDB command "python". + CONFIG_OBS="$CONFIG_OBS python.o py-value.o py-prettyprint.o" + CONFIG_SRCS="$CONFIG_SRCS python/python.c python/py-value.c python/py-prettyprint.c" +fi +AC_SUBST(PYTHON_CFLAGS) + # ------------------------- # # Checks for header files. # # ------------------------- # @@ -504,7 +711,17 @@ fi AC_HEADER_DIRENT AC_HEADER_STAT AC_HEADER_STDC -AC_CHECK_HEADERS(nlist.h) +# elf_hp.h is for HP/UX 64-bit shared library support. +# FIXME: kettenis/20030102: In most cases we include these (ctype.h, time.h) +# unconditionally, so what's the point in checking these? +AC_CHECK_HEADERS([nlist.h machine/reg.h poll.h sys/poll.h proc_service.h \ + thread_db.h gnu/libc-version.h signal.h stddef.h \ + stdlib.h string.h memory.h strings.h sys/fault.h \ + sys/file.h sys/filio.h sys/ioctl.h sys/param.h \ + sys/resource.h sys/procfs.h sys/ptrace.h ptrace.h \ + sys/reg.h sys/debugreg.h sys/select.h sys/syscall.h \ + sys/types.h sys/wait.h wait.h termios.h termio.h \ + sgtty.h unistd.h elf_hp.h ctype.h time.h locale.h]) AC_CHECK_HEADERS(link.h, [], [], [#if HAVE_SYS_TYPES_H # include @@ -513,38 +730,16 @@ AC_CHECK_HEADERS(link.h, [], [], # include #endif ]) -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(string.h memory.h strings.h) -AC_CHECK_HEADERS(sys/fault.h) -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 #endif ]) -AC_CHECK_HEADERS(sys/procfs.h) -AC_CHECK_HEADERS(sys/ptrace.h ptrace.h) -AC_CHECK_HEADERS(sys/reg.h sys/debugreg.h) -AC_CHECK_HEADERS(sys/select.h) -AC_CHECK_HEADERS(sys/syscall.h) -AC_CHECK_HEADERS(sys/types.h) AC_CHECK_HEADERS(sys/user.h, [], [], [#if HAVE_SYS_PARAM_H # include #endif ]) -AC_CHECK_HEADERS(sys/wait.h wait.h) -AC_CHECK_HEADERS(termios.h termio.h sgtty.h) -AC_CHECK_HEADERS(unistd.h) # On Solaris 2.[789], we need to define _MSE_INT_H to avoid a clash # between and that would cause AC_CHECK_HEADERS to @@ -557,35 +752,26 @@ case $host_os in Solaris 2.[789] when using GCC. ]) fi ;; esac -AC_CHECK_HEADERS(curses.h cursesX.h ncurses.h ncurses/ncurses.h) -AC_CHECK_HEADERS(ncurses/term.h) +AC_CHECK_HEADERS(curses.h cursesX.h ncurses.h ncurses/ncurses.h ncurses/term.h) AC_CHECK_HEADERS(term.h, [], [], [#if HAVE_CURSES_H # include #endif ]) -# Check for HP/UX 64-bit shared library support -AC_CHECK_HEADERS(elf_hp.h) - -# FIXME: kettenis/20030102: In most cases we include these -# unconditionally, so what's the point in checking these? -AC_CHECK_HEADERS(ctype.h time.h) - # ------------------------- # # Checks for declarations. # # ------------------------- # -AC_CHECK_DECLS([free, malloc, realloc]) -AC_CHECK_DECLS([strerror, strstr]) -AC_CHECK_DECLS([getopt, snprintf, vsnprintf]) +AC_CHECK_DECLS([free, malloc, realloc, strerror, strstr, getopt, + snprintf, vsnprintf]) +AM_LC_MESSAGES # ----------------------- # # Checks for structures. # # ----------------------- # -AC_CHECK_MEMBERS([struct stat.st_blocks]) -AC_CHECK_MEMBERS([struct stat.st_blksize]) +AC_CHECK_MEMBERS([struct stat.st_blocks, struct stat.st_blksize]) # ------------------ # # Checks for types. # @@ -612,18 +798,12 @@ AC_C_BIGENDIAN 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) -AC_CHECK_FUNCS(sbrk) -AC_CHECK_FUNCS(setpgid setpgrp setsid) -AC_CHECK_FUNCS(sigaction sigprocmask sigsetmask) -AC_CHECK_FUNCS(socketpair) -AC_CHECK_FUNCS(syscall) -AC_CHECK_FUNCS(ttrace) -AC_CHECK_FUNCS(wborder) +AC_CHECK_FUNCS([canonicalize_file_name realpath getrusage getuid \ + getgid pipe poll pread64 sbrk setpgid setpgrp setsid \ + sigaction sigprocmask sigsetmask socketpair syscall \ + ttrace wborder setlocale iconvlist libiconvlist btowc \ + setrlimit getrlimit]) +AM_LANGINFO_CODESET # Check the return and argument types of ptrace. No canned test for # this, so roll our own. @@ -746,9 +926,7 @@ if test $gdb_cv_have_gnu_regex = yes; then fi AC_ARG_WITH(included-regex, - [ --without-included-regex don't use included regex; this is the default - on systems with version 2 of the GNU C library - (use with caution on other system)], + AS_HELP_STRING([--without-included-regex], [don't use included regex; this is the default on systems with version 2 of the GNU C library (use with caution on other system)]), gdb_with_regex=$withval, gdb_with_regex=$gdb_use_included_regex) if test "$gdb_with_regex" = yes; then @@ -1300,8 +1478,9 @@ fi dnl Handle optional features that can be enabled. +target_sysroot_reloc=0 AC_ARG_WITH(sysroot, -[ --with-sysroot[=DIR] Search for usr/lib et al within DIR.], +AS_HELP_STRING([--with-sysroot@<:@=DIR@:>@], [search for usr/lib et al within DIR]), [ case ${with_sysroot} in yes) TARGET_SYSTEM_ROOT='${exec_prefix}/${target_alias}/sys-root' ;; @@ -1325,19 +1504,23 @@ AC_ARG_WITH(sysroot, "${test_exec_prefix}"|"${test_exec_prefix}/"*|\ '${prefix}'|'${prefix}/'*|\ '${exec_prefix}'|'${exec_prefix}/'*) - t="$TARGET_SYSTEM_ROOT_DEFINE -DTARGET_SYSTEM_ROOT_RELOCATABLE" - TARGET_SYSTEM_ROOT_DEFINE="$t" + target_sysroot_reloc=1 ;; esac ], [ TARGET_SYSTEM_ROOT= TARGET_SYSTEM_ROOT_DEFINE='-DTARGET_SYSTEM_ROOT=\"\"' ]) +TARGET_SYSTEM_ROOT_DEFINE="$TARGET_SYSTEM_ROOT_DEFINE -DTARGET_SYSTEM_ROOT_RELOCATABLE=$target_sysroot_reloc" AC_SUBST(TARGET_SYSTEM_ROOT) AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE) +GDB_AC_WITH_DIR(SYSTEM_GDBINIT, system-gdbinit, + [automatically load a system-wide gdbinit file], + []) + AC_ARG_ENABLE(werror, - [ --enable-werror treat compile warnings as errors], + AS_HELP_STRING([--enable-werror], [treat compile warnings as errors]), [case "${enableval}" in yes | y) ERROR_ON_WARNING="yes" ;; no | n) ERROR_ON_WARNING="no" ;; @@ -1361,7 +1544,8 @@ fi # gdb/doc/gdbint.texinfo. build_warnings="-Wall -Wdeclaration-after-statement -Wpointer-arith \ -Wformat-nonliteral -Wno-pointer-sign \ --Wno-unused -Wno-switch -Wno-char-subscripts" +-Wno-unused -Wunused-value -Wunused-function \ +-Wno-switch -Wno-char-subscripts" # Enable -Wno-format by default when using gcc on mingw since many # GCC versions complain about %I64. @@ -1370,7 +1554,7 @@ case "${host}" in esac AC_ARG_ENABLE(build-warnings, -[ --enable-build-warnings Enable build-time compiler warnings if gcc is used], +AS_HELP_STRING([--enable-build-warnings], [enable build-time compiler warnings if gcc is used]), [case "${enableval}" in yes) ;; no) build_warnings="-w";; @@ -1384,7 +1568,7 @@ if test x"$silent" != x"yes" && test x"$build_warnings" != x""; then echo "Setting compiler warning flags = $build_warnings" 6>&1 fi])dnl AC_ARG_ENABLE(gdb-build-warnings, -[ --enable-gdb-build-warnings Enable GDB specific build-time compiler warnings if gcc is used], +AS_HELP_STRING([--enable-gdb-build-warnings], [enable GDB specific build-time compiler warnings if gcc is used]), [case "${enableval}" in yes) ;; no) build_warnings="-w";; @@ -1515,7 +1699,12 @@ if test "${enable_gdbtk}" = "yes"; then cd $here SC_PATH_TCLCONFIG - if test -z "${no_tcl}"; then + + # If $no_tk is nonempty, then we can't do Tk, and there is no + # point to doing Tcl. + SC_PATH_TKCONFIG + + if test -z "${no_tcl}" -a -z "${no_tk}"; then SC_LOAD_TCLCONFIG # Check for in-tree tcl @@ -1547,62 +1736,57 @@ if test "${enable_gdbtk}" = "yes"; then AC_SUBST(TCL_LIBRARY) AC_SUBST(TCL_DEPS) - # 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 - SC_PATH_TKCONFIG - SC_LOAD_TKCONFIG - - # Check for in-tree Tk - intree="no" - if test "${TK_SRC_DIR}" = "${topdir}/tk"; then - intree="yes" - fi - - # Find Tk private headers - if test x"${intree}" = xno; then - CY_AC_TK_PRIVATE_HEADERS - TK_INCLUDE="${TK_INCLUDE_SPEC} ${TK_PRIVATE_INCLUDE}" - TK_LIBRARY=${TK_LIB_SPEC} - TK_DEPS="" - else - TK_INCLUDE="-I${TK_SRC_DIR}/generic" - TK_LIBRARY="${TK_BUILD_LIB_SPEC}" - TK_DEPS="../tk/${configdir}/${TK_LIB_FILE}" - fi - AC_SUBST(TK_INCLUDE) - AC_SUBST(TK_LIBRARY) - AC_SUBST(TK_DEPS) - AC_SUBST(TK_XINCLUDES) - - ENABLE_CFLAGS="${ENABLE_CFLAGS} \$(SUBDIR_GDBTK_CFLAGS)" - - # Include some libraries that Tcl and Tk want. - TCL_LIBS='$(LIBGUI) $(TK) $(TCL) $(X11_LDFLAGS) $(X11_LIBS)' - # 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. Note that this isn't put into LIBS. If it - # were in LIBS then any link tests after this point would - # try to include things like `$(LIBGUI)', which wouldn't work. - GDBTKLIBS="${TCL_LIBS} ${TK_LIBS}" - - CONFIG_OBS="${CONFIG_OBS} \$(SUBDIR_GDBTK_OBS)" - CONFIG_DEPS="${CONFIG_DEPS} \$(SUBDIR_GDBTK_DEPS)" - CONFIG_SRCS="${CONFIG_SRCS} \$(SUBDIR_GDBTK_SRCS)" - CONFIG_ALL="${CONFIG_ALL} all-gdbtk" - CONFIG_CLEAN="${CONFIG_CLEAN} clean-gdbtk" - CONFIG_INSTALL="${CONFIG_INSTALL} install-gdbtk" - CONFIG_UNINSTALL="${CONFIG_UNINSTALL} uninstall-gdbtk" - - if test x$gdb_cv_os_cygwin = xyes; then - WIN32LIBS="${WIN32LIBS} -lshell32 -lgdi32 -lcomdlg32 -ladvapi32" - WIN32LDAPP="-Wl,--subsystem,console" - CONFIG_OBS="${CONFIG_OBS} gdbres.o" - fi + SC_LOAD_TKCONFIG + + # Check for in-tree Tk + intree="no" + if test "${TK_SRC_DIR}" = "${topdir}/tk"; then + intree="yes" + fi + + # Find Tk private headers + if test x"${intree}" = xno; then + CY_AC_TK_PRIVATE_HEADERS + TK_INCLUDE="${TK_INCLUDE_SPEC} ${TK_PRIVATE_INCLUDE}" + TK_LIBRARY=${TK_LIB_SPEC} + TK_DEPS="" + else + TK_INCLUDE="-I${TK_SRC_DIR}/generic" + TK_LIBRARY="${TK_BUILD_LIB_SPEC}" + TK_DEPS="../tk/${configdir}/${TK_LIB_FILE}" + fi + AC_SUBST(TK_INCLUDE) + AC_SUBST(TK_LIBRARY) + AC_SUBST(TK_DEPS) + AC_SUBST(TK_XINCLUDES) + + ENABLE_CFLAGS="${ENABLE_CFLAGS} \$(SUBDIR_GDBTK_CFLAGS)" + + # Include some libraries that Tcl and Tk want. + TCL_LIBS='$(LIBGUI) $(TK) $(TCL) $(X11_LDFLAGS) $(X11_LIBS)' + # 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. Note that this isn't put into LIBS. If it + # were in LIBS then any link tests after this point would + # try to include things like `$(LIBGUI)', which wouldn't work. + GDBTKLIBS="${TCL_LIBS} ${TK_LIBS}" + + CONFIG_OBS="${CONFIG_OBS} \$(SUBDIR_GDBTK_OBS)" + CONFIG_DEPS="${CONFIG_DEPS} \$(SUBDIR_GDBTK_DEPS)" + CONFIG_SRCS="${CONFIG_SRCS} \$(SUBDIR_GDBTK_SRCS)" + CONFIG_ALL="${CONFIG_ALL} all-gdbtk" + CONFIG_CLEAN="${CONFIG_CLEAN} clean-gdbtk" + CONFIG_INSTALL="${CONFIG_INSTALL} install-gdbtk" + CONFIG_UNINSTALL="${CONFIG_UNINSTALL} uninstall-gdbtk" + + if test x$gdb_cv_os_cygwin = xyes; then + WIN32LIBS="${WIN32LIBS} -lshell32 -lgdi32 -lcomdlg32 -ladvapi32" + WIN32LDAPP="-Wl,--subsystem,console" + CONFIG_OBS="${CONFIG_OBS} gdbres.o" fi - fi - AC_CONFIG_SUBDIRS(gdbtk) + AC_CONFIG_SUBDIRS(gdbtk) + fi fi AC_SUBST(X_CFLAGS) @@ -1614,29 +1798,6 @@ AC_SUBST(GDBTK_SRC_DIR) AC_PATH_X -# Check whether we should enable the TUI, but only do so if we really -# can. -if test x"$enable_tui" != xno; then - if test -d $srcdir/tui; then - if test "$ac_cv_search_waddstr" != no; then - CONFIG_OBS="$CONFIG_OBS \$(SUBDIR_TUI_OBS)" - CONFIG_DEPS="$CONFIG_DEPS \$(SUBDIR_TUI_DEPS)" - CONFIG_SRCS="$CONFIG_SRCS \$(SUBDIR_TUI_SRCS)" - ENABLE_CFLAGS="$ENABLE_CFLAGS \$(SUBDIR_TUI_CFLAGS)" - CONFIG_ALL="${CONFIG_ALL} all-tui" - CONFIG_CLEAN="${CONFIG_CLEAN} clean-tui" - CONFIG_INSTALL="${CONFIG_INSTALL} install-tui" - CONFIG_UNINSTALL="${CONFIG_UNINSTALL} uninstall-tui" - else - if test x"$enable_tui" = xyes; then - AC_MSG_ERROR([no enhanced curses library found; disable TUI]) - else - AC_MSG_WARN([no enhanced curses library found; disabling TUI]) - fi - fi - fi -fi - # Unlike the sim directory, whether a simulator is linked is controlled by # presence of a gdb_sim definition in the target configure.tgt entry. # This code just checks for a few cases where we'd like to ignore those @@ -1645,7 +1806,7 @@ fi # not part of the source tree. # AC_ARG_ENABLE(sim, -[ --enable-sim Link gdb with simulator], +AS_HELP_STRING([--enable-sim], [link gdb with simulator]), [echo "enable_sim = $enable_sim"; echo "enableval = ${enableval}"; case "${enableval}" in @@ -1725,7 +1886,7 @@ fi # Enable multi-ice-gdb-server. AC_ARG_ENABLE(multi-ice, -[ --enable-multi-ice build the multi-ice-gdb-server], +AS_HELP_STRING([--enable-multi-ice], [build the multi-ice-gdb-server]), [case $enableval in yes | no) ;; @@ -1753,9 +1914,7 @@ files= links= rm -f nm.h -nm_h="" if test "${nativefile}" != ""; then - nm_h=nm.h case "${nativefile}" in nm-*.h ) GDB_NM_FILE="config/${gdb_host_cpu}/${nativefile}" ;; * ) GDB_NM_FILE="${nativefile}" @@ -1764,7 +1923,7 @@ if test "${nativefile}" != ""; then links="${links} nm.h" AC_DEFINE_UNQUOTED(GDB_NM_FILE, "${GDB_NM_FILE}", [nativefile]) fi -AC_SUBST(nm_h) +AC_SUBST(GDB_NM_FILE) AC_LINK_FILES($files, $links) @@ -1772,37 +1931,16 @@ 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", +dnl At the moment, we just assume it's UTF-8. +AC_DEFINE(GDB_DEFAULT_HOST_CHARSET, "UTF-8", [Define to be a string naming the default host character set.]) -AM_ICONV - AC_OUTPUT(Makefile .gdbinit:gdbinit.in gnulib/Makefile, [ -dnl Autoconf doesn't provide a mechanism for modifying definitions -dnl provided by makefile fragments. -dnl - -changequote(,)dnl -sed -e '/^NAT_FILE[ ]*=/s,^NAT_FILE[ ]*=[ ]*,&config/'"${gdb_host_cpu}"'/,' Makefile.tmp -mv -f Makefile.tmp Makefile -changequote([,])dnl - - case x$CONFIG_HEADERS in xconfig.h:config.in) echo > stamp-h ;; esac -], -[ -gdb_host_cpu=$gdb_host_cpu -nativefile=$nativefile ]) exit 0