X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Fconfigure.ac;h=7067d266aa2da68b9630d5b426232394807562eb;hb=6c13bbe177b7cf5b87f3670b29a461361d5d8ae3;hp=8725aa6e12f81017b23f5034cf653807db9b564a;hpb=a9322a30ba7eb9817f262c738f8ebf1dc9fdd9de;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/configure.ac b/gdb/configure.ac index 8725aa6e12..7067d266aa 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,10 +26,9 @@ 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(..) @@ -92,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') ;; @@ -132,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 ;; @@ -171,6 +161,9 @@ do . ${srcdir}/configure.tgt + AS_IF([test -z "${gdb_target_obs}"], + [AC_MSG_ERROR([configuration ${targ} is unsupported.])]) + # Target-specific object files for i in ${gdb_target_obs}; do case " $TARGET_OBS " in @@ -240,7 +233,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) ;; @@ -261,7 +254,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) ;; @@ -280,7 +273,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) ;; @@ -290,7 +283,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) ;; @@ -311,7 +304,7 @@ 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 ;; @@ -331,9 +324,17 @@ if test x"$enable_libunwind" = xyes; then 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) ;; @@ -425,11 +426,13 @@ 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)]) +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. @@ -447,32 +450,42 @@ AC_SEARCH_LIBS(dlgetmodinfo, [dl xpdl]) # broken on alpha-osf. case $host_os in - alpha*-*-osf* ) - if "$enable_tui" = "yes"; then + osf* ) + if test x"$enable_tui" = xyes; then AC_MSG_ERROR([Building GDB with TUI mode is not supported on this host]) fi - if "$enable_tui" = "auto"; then + 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 - # 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]) - - if test "$ac_cv_search_waddstr" != no; 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)" @@ -506,7 +519,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 @@ -525,6 +538,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)' @@ -561,26 +589,67 @@ else fi dnl Utility to simplify finding libpython. +dnl $1 = pythonX.Y +dnl $2 = the shell variable to assign the result to +dnl If libpython is found we store $version here. +dnl $3 = additional flags to add to CPPFLAGS +dnl $4 = additional flags to add to LIBS + AC_DEFUN([AC_TRY_LIBPYTHON], [ version=$1 define([have_libpython_var],$2) - define([VERSION],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) - [HAVE_LIB]VERSION=no + new_CPPFLAGS=$3 + new_LIBS=$4 AC_MSG_CHECKING([for ${version}]) + save_CPPFLAGS=$CPPFLAGS save_LIBS=$LIBS - LIBS="$LIBS -l${version}" + CPPFLAGS="$CPPFLAGS $new_CPPFLAGS" + LIBS="$LIBS $new_LIBS" + found_usable_python=no 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]) + [have_libpython_var=${version} + found_usable_python=yes], + [CPPFLAGS=$save_CPPFLAGS + LIBS=$save_LIBS]) + AC_MSG_RESULT([${found_usable_python}]) ]) +dnl There are several different values for --with-python: +dnl +dnl no - Don't include python support. +dnl yes - Include python support, error if it's missing. +dnl If we find python in $PATH, use it to fetch configure options, +dnl otherwise assume the compiler can find it with no help from us. +dnl Python 2.6, 2.5, and then 2.4 are tried in turn. +dnl auto - Same as "yes", but if python is missing from the system, +dnl fall back to "no". +dnl /path/to/python/exec-prefix - +dnl Use the python located in this directory. +dnl If /path/to/python/exec-prefix/bin/python exists, use it to find +dnl the compilation parameters. Otherwise use +dnl -I/path/to/python/exec-prefix/include, +dnl -L/path/to/python/exec-prefix/lib. +dnl Python 2.6, 2.5, and then 2.4 are tried in turn. +dnl NOTE: This case is historical. It is what was done for 7.0/7.1 +dnl but is deprecated. +dnl /path/to/python/executable - +dnl Run python-config.py with this version of python to fetch the +dnl compilation parameters. +dnl NOTE: This needn't be the real python executable. +dnl In a cross-compilation scenario (build != host), this could be +dnl a shell script that provides what python-config.py provides for +dnl --ldflags, --includes, --exec-prefix. +dnl python-executable - +dnl Find python-executable in $PATH, and then handle the same as +dnl /path/to/python/executable. +dnl +dnl If a python program is specified, it is used to run python-config.py and +dnl is passed --ldflags, --includes, --exec-prefix. + AC_ARG_WITH(python, - AS_HELP_STRING([--with-python], [include python support (auto/yes/no/)]), + AS_HELP_STRING([--with-python@<:@=PYTHON@:>@], [include python support (auto/yes/no/)]), [], [with_python=auto]) AC_MSG_CHECKING([whether to use python]) AC_MSG_RESULT([$with_python]) @@ -590,44 +659,150 @@ if test "${with_python}" = no; then 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" + if test -d ${with_python}; then + # Assume the python binary is ${with_python}/bin/python. + python_prog="${with_python}/bin/python" + python_prefix= + if test ! -x "${python_prog}"; then + # Fall back to gdb 7.0/7.1 behaviour. + python_prog=missing + python_prefix=${with_python} + fi + elif test -x "${with_python}"; then + # While we can't run python compiled for $host (unless host == build), + # the user could write a script that provides the needed information, + # so we support that. + python_prog=${with_python} + python_prefix= + else + AC_ERROR(invalid value for --with-python) + fi ;; - *) + */*) + # Disallow --with-python=foo/bar. AC_ERROR(invalid value for --with-python) ;; + *) + # The user has either specified auto, yes, or the name of the python + # program assumed to be in $PATH. + python_prefix= + case "${with_python}" in + yes | auto) + if test ${build} = ${host}; then + AC_PATH_PROG(python_prog_path, python, missing) + if test "${python_prog_path}" = missing; then + python_prog=missing + else + python_prog=${python_prog_path} + fi + else + # Not much we can do except assume the cross-compiler will find the + # right files. + python_prog=missing + fi + ;; + *) + # While we can't run python compiled for $host (unless host == build), + # the user could write a script that provides the needed information, + # so we support that. + python_prog="${with_python}" + AC_PATH_PROG(python_prog_path, ${python_prog}, missing) + if test "${python_prog_path}" = missing; then + AC_ERROR(unable to find python program ${python_prog}) + fi + ;; + esac 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.]) + if test "${python_prog}" != missing; then + # We have a python program to use, but it may be too old. + # Don't flag an error for --with-python=auto (the default). + have_python_config=yes + python_includes=`${python_prog} ${srcdir}/python/python-config.py --includes` + if test $? != 0; then + have_python_config=failed + if test "${with_python}" != auto; then + AC_ERROR(failure running python-config --includes) + fi 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.]) + python_libs=`${python_prog} ${srcdir}/python/python-config.py --ldflags` + if test $? != 0; then + have_python_config=failed + if test "${with_python}" != auto; then + AC_ERROR(failure running python-config --ldflags) + fi + fi + python_prefix=`${python_prog} ${srcdir}/python/python-config.py --exec-prefix` + if test $? != 0; then + have_python_config=failed + if test "${with_python}" != auto; then + AC_ERROR(failure running python-config --exec-prefix) + fi + fi + else + # Fall back to gdb 7.0/7.1 behaviour. + if test -z ${python_prefix}; then + python_includes= + python_libs= + else + python_includes="-I${python_prefix}/include" + python_libs="-L${python_prefix}/lib" fi + have_python_config=no 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.]) + + # Having "/pythonX.Y" in the include path is awkward. + # All those python headers get bubbled up to the top inviting lots + # of random collisions. GDB originally didn't use python-config to + # find the compilation parameters and includes "pythonX.Y/" in the + # path of the, umm, include file. So strip away this part of the + # output of python-config --includes. + python_includes=`echo "${python_includes} " \ + | sed -e 's,/python[[0-9]]*[[.]][[0-9]]* , ,g'` + + # If we have python-config, only try the configuration it provides. + # Otherwise fallback on the old way of trying different versions of + # python in turn. + + have_libpython=no + if test "${have_python_config}" = yes; then + python_version=`echo " ${python_libs} " \ + | sed -e 's,^.* -l\(python[[0-9]]*[[.]][[0-9]]*\) .*$,\1,'` + case "${python_version}" in + python*) + AC_TRY_LIBPYTHON(${python_version}, have_libpython, + ${python_includes}, ${python_libs}) + ;; + *) + AC_MSG_ERROR([unable to determine python version from ${python_libs}]) + ;; + esac + elif test "${have_python_config}" != failed; then + if test "${have_libpython}" = no; then + AC_TRY_LIBPYTHON(python2.6, have_libpython, + ${python_includes}, "${python_libs} -lpython2.6") + fi + if test ${have_libpython} = no; then + AC_TRY_LIBPYTHON(python2.5, have_libpython, + ${python_includes}, "${python_libs} -lpython2.5") fi + if test ${have_libpython} = no; then + AC_TRY_LIBPYTHON(python2.4, have_libpython, + ${python_includes}, "${python_libs} -lpython2.4") + fi + fi + if test "${have_libpython}" = python2.7; then + AC_DEFINE(HAVE_LIBPYTHON2_7, 1, [Define if Python 2.7 is being used.]) + elif test "${have_libpython}" = python2.6; then + AC_DEFINE(HAVE_LIBPYTHON2_6, 1, [Define if Python 2.6 is being used.]) + elif test "${have_libpython}" = python2.5; then + AC_DEFINE(HAVE_LIBPYTHON2_5, 1, [Define if Python 2.5 is being used.]) + elif test "${have_libpython}" = python2.4; then + AC_DEFINE(HAVE_LIBPYTHON2_4, 1, [Define if Python 2.4 is being used.]) fi - if test ${have_libpython} = no; then + + if test "${have_libpython}" = no; then case "${with_python}" in yes) AC_MSG_ERROR([python is missing or unusable]) @@ -639,12 +814,16 @@ else AC_MSG_ERROR([no usable python found at ${with_python}]) ;; esac - CPPFLAGS=$save_CPPFLAGS - LIBS=$save_LIBS + else + if test -n "${python_prefix}"; then + AC_DEFINE_UNQUOTED(WITH_PYTHON_PATH, "${python_prefix}", + [Define if --with-python provides a path, either directly or via python-config.py --exec-prefix.]) + GDB_AC_DEFINE_RELOCATABLE(PYTHON_PATH, python, ${python_prefix}) + fi fi fi -if test "${have_libpython}" = yes; then +if test "${have_libpython}" != no; 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)" @@ -673,9 +852,10 @@ if test "${have_libpython}" = yes; then 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 python-value.o" - CONFIG_SRCS="$CONFIG_SRCS python/python.c python/python-value.c" + # included. + CONFIG_OBS="$CONFIG_OBS python.o py-value.o py-prettyprint.o py-auto-load.o" + CONFIG_SRCS="$CONFIG_SRCS python/python.c python/py-value.c \ + python/py-prettyprint.c python/py-auto-load.c" fi AC_SUBST(PYTHON_CFLAGS) @@ -696,7 +876,7 @@ AC_CHECK_HEADERS([nlist.h machine/reg.h poll.h sys/poll.h proc_service.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]) + sgtty.h unistd.h elf_hp.h ctype.h time.h locale.h]) AC_CHECK_HEADERS(link.h, [], [], [#if HAVE_SYS_TYPES_H # include @@ -740,6 +920,7 @@ AC_CHECK_HEADERS(term.h, [], [], AC_CHECK_DECLS([free, malloc, realloc, strerror, strstr, getopt, snprintf, vsnprintf]) +AM_LC_MESSAGES # ----------------------- # # Checks for structures. # @@ -773,9 +954,11 @@ AC_FUNC_ALLOCA AC_FUNC_MMAP AC_FUNC_VFORK AC_CHECK_FUNCS([canonicalize_file_name realpath getrusage getuid \ - getgid poll pread64 sbrk setpgid setpgrp setsid \ + getgid pipe poll pread64 resize_term sbrk setpgid setpgrp setsid \ sigaction sigprocmask sigsetmask socketpair syscall \ - ttrace wborder]) + ttrace wborder wresize setlocale iconvlist libiconvlist btowc \ + setrlimit getrlimit posix_madvise]) +AM_LANGINFO_CODESET # Check the return and argument types of ptrace. No canned test for # this, so roll our own. @@ -898,9 +1081,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 @@ -1274,6 +1455,47 @@ aix*) ;; esac +AC_MSG_CHECKING(for the dynamic export flag) +dynamic_list=false +if test "${gdb_native}" = yes; then + # The dynamically loaded libthread_db needs access to symbols in the gdb + # executable. Older GNU ld supports --export-dynamic but --dynamic-list + # may not be supported there. + old_LDFLAGS="$LDFLAGS" + # Older GNU ld supports --export-dynamic but --dynamic-list it does not. + RDYNAMIC="-Wl,--dynamic-list=${srcdir}/proc-service.list" + LDFLAGS="$LDFLAGS $RDYNAMIC" + if test "${have_libpython}" = no; then + AC_TRY_LINK([], [], [dynamic_list=true]) + else + # Workaround http://bugs.python.org/issue4434 where static + # libpythonX.Y.a would get its symbols required for + # pythonX.Y/lib-dynload/*.so modules hidden by -Wl,--dynamic-list. + # Problem does not happen for the recommended libpythonX.Y.so linkage. + old_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $PYTHON_CFLAGS" + AC_RUN_IFELSE( + AC_LANG_PROGRAM( + [#include "]${have_libpython}[/Python.h"], + [int err; + Py_Initialize (); + err = PyRun_SimpleString ("import itertools\n"); + Py_Finalize (); + return err == 0 ? 0 : 1;]), + [dynamic_list=true], [], [true]) + CFLAGS="$old_CFLAGS" + fi + LDFLAGS="$old_LDFLAGS" +fi +if $dynamic_list; then + found="-Wl,--dynamic-list" + RDYNAMIC='-Wl,--dynamic-list=$(srcdir)/proc-service.list' +else + found="-rdynamic" + RDYNAMIC="-rdynamic" +fi +AC_SUBST(RDYNAMIC) +AC_MSG_RESULT($found) dnl For certain native configurations, we need to check whether thread dnl support can be built in or not. @@ -1312,19 +1534,7 @@ if test ${build} = ${host} -a ${host} = ${target} ; then 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 + CONFIG_LDFLAGS="${CONFIG_LDFLAGS} $RDYNAMIC" # Sun randomly tweaked the prototypes in # at one point. AC_MSG_CHECKING(if is old) @@ -1452,8 +1662,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' ;; @@ -1477,19 +1688,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" ;; @@ -1513,7 +1728,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. @@ -1522,7 +1738,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";; @@ -1536,7 +1752,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";; @@ -1667,7 +1883,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 @@ -1699,62 +1920,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) @@ -1774,7 +1990,7 @@ AC_PATH_X # 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 @@ -1854,7 +2070,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) ;; @@ -1882,9 +2098,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}" @@ -1893,7 +2107,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) @@ -1901,37 +2115,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