X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fconfigure.ac;h=97cd6eeeb7c8b3182617fcd7a37e928e51756a1f;hb=7349ff92c20df6a9f4ea3e53383d99622960d74d;hp=447663712edc5112069c4afecd5ff490adeb0887;hpb=da2f07f1aa5f8bdeb957df2c520f1d46e6f21bd5;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/configure.ac b/gdb/configure.ac index 447663712e..97cd6eeeb7 100644 --- a/gdb/configure.ac +++ b/gdb/configure.ac @@ -1,7 +1,5 @@ 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, 2009 -dnl Free Software Foundation, Inc. +dnl Copyright (C) 1995-2012 Free Software Foundation, Inc. dnl dnl This file is part of GDB. dnl @@ -27,12 +25,12 @@ AM_MAINTAINER_MODE AC_PROG_CC AC_USE_SYSTEM_EXTENSIONS -gl_EARLY ACX_LARGEFILE AM_PROG_CC_STDC AC_CONFIG_AUX_DIR(..) AC_CANONICAL_SYSTEM +AC_ARG_PROGRAM # Dependency checking. ZW_CREATE_DEPDIR @@ -49,6 +47,12 @@ esac AM_CONDITIONAL(GMAKE, test "$MAKE_IS_GNU" = yes) AC_PROG_MAKE_SET +# Configure gnulib. We need to build gnulib under some other +# directory not "gnulib", to avoid the problem of both GDB and +# GDBserver wanting to build it in the same directory, when building +# in the source dir. +ACX_CONFIGURE_DIR(["gnulib"], ["build-gnulib"]) + dnl List of object files and targets accumulated by configure. CONFIG_OBS= @@ -74,12 +78,12 @@ if test x"$USE_NLS" = xyes; then CONFIG_UNINSTALL="$CONFIG_UNINSTALL uninstall-po" fi -gl_INIT +GNULIB=build-gnulib/import # For Makefile dependencies. GNULIB_STDINT_H= if test x"$STDINT_H" != x; then - GNULIB_STDINT_H=gnulib/$STDINT_H + GNULIB_STDINT_H=$GNULIB/$STDINT_H fi AC_SUBST(GNULIB_STDINT_H) @@ -87,14 +91,38 @@ PACKAGE=gdb AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of this package. ]) AC_SUBST(PACKAGE) -# GDB does not use automake, but gnulib does. This line lets us -# generate its Makefile.in. -AM_INIT_AUTOMAKE(gdb, UNUSED-VERSION, [no-define]) +# We never need to detect it in this sub-configure. +# But preserve it for config.status --recheck. +AC_ARG_VAR(MAKEINFO, + [Parent configure detects if it is of sufficient version.]) +AC_ARG_VAR(MAKEINFOFLAGS, + [Parameters for MAKEINFO.]) + +MAKEINFO_EXTRA_FLAGS="" +AC_CACHE_CHECK([whether $MAKEINFO supports @click], gdb_cv_have_makeinfo_click, + [echo '@clicksequence{a @click{} b}' >conftest.texinfo + if eval "$MAKEINFO conftest.texinfo >&5 2>&5"; then + gdb_cv_have_makeinfo_click=yes + else + gdb_cv_have_makeinfo_click=no + fi]) +if test x"$gdb_cv_have_makeinfo_click" = xyes; then + MAKEINFO_EXTRA_FLAGS="$MAKEINFO_EXTRA_FLAGS -DHAVE_MAKEINFO_CLICK" +fi +AC_SUBST(MAKEINFO_EXTRA_FLAGS) GDB_AC_WITH_DIR(DEBUGDIR, separate-debug-dir, [look for global separate debug info in this path @<:@LIBDIR/debug@:>@], [${libdir}/debug]) +# We can't pass paths as command line arguments. +# Mingw32 tries to be clever and will convert the paths for us. +# For example -DBINDIR="/usr/local/bin" passed on the command line may get +# converted to -DBINDIR="E:/msys/mingw32/msys/1.0/local/bin". +# This breaks GDB's relocatable path conversions since paths passed in +# config.h would not get so translated, the path prefixes no longer match. +AC_DEFINE_DIR(BINDIR, bindir, [Directory of programs.]) + # GDB's datadir relocation GDB_AC_WITH_DIR(GDB_DATADIR, gdb-datadir, @@ -108,7 +136,32 @@ AS_HELP_STRING([--with-relocated-sources=PATH], [automatically relocate this pat [Relocated directory for source files. ]) ]) -AC_CONFIG_SUBDIRS(doc testsuite) +AC_MSG_CHECKING([for default auto-load directory]) +AC_ARG_WITH(auto-load-dir, +AS_HELP_STRING([--with-auto-load-dir=PATH], + [directories from which to load auto-loaded scripts, use '$ddir' for -data-directory @<:@$ddir/auto-load@:>@]),, + [with_auto_load_dir='$ddir/auto-load']) +escape_dir=`echo $with_auto_load_dir | sed 's/[[$]]ddir\>/\\\\\\\\\\\\&/g'` +AC_DEFINE_DIR(AUTO_LOAD_DIR, escape_dir, + [Directories from which to load auto-loaded scripts.]) +AC_MSG_RESULT([$with_auto_load_dir]) + +AC_MSG_CHECKING([for default auto-load safe-path]) +AC_ARG_WITH(auto-load-safe-path, +AS_HELP_STRING([--with-auto-load-safe-path=PATH], + [directories safe to hold auto-loaded files, use $ddir for --with-gdb-datadir path @<:@--with-auto-load-dir@:>@]) +AS_HELP_STRING([--without-auto-load-safe-path], + [do not restrict auto-loaded files locations]), + [if test "$with_auto_load_safe_path" = "no"; then + with_auto_load_safe_path="/" + fi], +[with_auto_load_safe_path="$with_auto_load_dir"]) +escape_dir=`echo $with_auto_load_safe_path | sed 's/[[$]]ddir\>/\\\\\\\\\\\\&/g'` +AC_DEFINE_DIR(AUTO_LOAD_SAFE_PATH, escape_dir, + [Directories safe to hold auto-loaded files.]) +AC_MSG_RESULT([$with_auto_load_safe_path]) + +AC_CONFIG_SUBDIRS(testsuite) # Check whether to support alternative target configurations AC_ARG_ENABLE(targets, @@ -161,6 +214,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 @@ -299,26 +355,44 @@ case $host_os in enable_gdbtk=no ;; esac -# Libunwind support. -AC_ARG_WITH(libunwind, -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 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; +# Libunwind support for ia64. + +AC_ARG_WITH(libunwind-ia64, +AS_HELP_STRING([--with-libunwind-ia64], + [use libunwind frame unwinding for ia64 targets]),, + [with_libunwind_ia64=auto]) + +# Backward compatibility option. +if test "${with_libunwind+set}" = set; then + if test x"$with_libunwind_ia64" != xauto; then + AC_MSG_ERROR( + [option --with-libunwind is deprecated, use --with-libunwind-ia64]) fi -]) - -if test x"$enable_libunwind" = xyes; then - 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" + AC_MSG_WARN([option --with-libunwind is deprecated, use --with-libunwind-ia64]) + with_libunwind_ia64="$with_libunwind" +fi + +case "$with_libunwind_ia64" in + yes | no) + ;; + auto) + AC_CHECK_HEADERS(libunwind-ia64.h) + with_libunwind_ia64=$ac_cv_header_libunwind_ia64_h + ;; + *) + AC_MSG_ERROR( + [bad value $with_libunwind_ia64 for GDB --with-libunwind-ia64 option]) + ;; +esac + +if test x"$with_libunwind_ia64" = xyes; then + AC_CHECK_HEADERS(libunwind-ia64.h) + if test x"$ac_cv_header_libunwind_ia64_h" != xyes; then + AC_MSG_ERROR([GDB option --with-libunwind-ia64 requires libunwind-ia64.h]) + fi + CONFIG_OBS="$CONFIG_OBS ia64-libunwind-tdep.o" + CONFIG_DEPS="$CONFIG_DEPS ia64-libunwind-tdep.o" + CONFIG_SRCS="$CONFIG_SRCS ia64-libunwind-tdep.c" fi opt_curses=no @@ -423,13 +497,36 @@ 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 +# GDB may fork/exec the iconv program to get the list of supported character +# sets. Allow the user to specify where to find it. +# There are several factors affecting the choice of option name: +# - There is already --with-libiconv-prefix but we can't use it, it specifies +# the build-time location of libiconv files. +# - The program we need to find is iconv, which comes with glibc. The user +# doesn't necessarily have libiconv installed. Therefore naming this +# --with-libiconv-foo feels wrong. +# - We want the path to be relocatable, but GDB_AC_DEFINE_RELOCATABLE is +# defined to work on directories not files (though it really doesn't know +# the difference). +# - Calling this --with-iconv-prefix is perceived to cause too much confusion +# with --with-libiconv-prefix. +# Putting these together is why the option name is --with-iconv-bin. + +AC_ARG_WITH(iconv-bin, +AS_HELP_STRING([--with-iconv-bin=PATH], [specify where to find the iconv program]), +[iconv_bin="${withval}" + AC_DEFINE_UNQUOTED([ICONV_BIN], ["${iconv_bin}"], + [Path of directory of iconv program.]) + GDB_AC_DEFINE_RELOCATABLE(ICONV_BIN, iconv, ${iconv_bin}) +]) + # 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,11 +544,11 @@ AM_ICONV # 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 ;; @@ -487,10 +584,6 @@ if test x"$enable_tui" != xno; then 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]) @@ -535,29 +628,45 @@ 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]) + READLINE_TEXI_INCFLAG= else READLINE='$(READLINE_DIR)/libreadline.a' READLINE_DEPS='$(READLINE)' READLINE_CFLAGS='-I$(READLINE_SRC)/..' + READLINE_TEXI_INCFLAG='-I $(READLINE_DIR)' fi AC_SUBST(READLINE) AC_SUBST(READLINE_DEPS) AC_SUBST(READLINE_CFLAGS) +AC_SUBST(READLINE_TEXI_INCFLAG) + +# Generate jit-reader.h + +# This is typedeffed to GDB_CORE_ADDR in jit-reader.h +TARGET_PTR= + +AC_CHECK_SIZEOF(unsigned long long) +AC_CHECK_SIZEOF(unsigned long) +AC_CHECK_SIZEOF(unsigned __int128) + +if test "x${ac_cv_sizeof_unsigned_long}" = "x8"; then + TARGET_PTR="unsigned long" +elif test "x${ac_cv_sizeof_unsigned_long_long}" = "x8"; then + TARGET_PTR="unsigned long long" +elif test "x${ac_cv_sizeof_unsigned___int128}" = "x16"; then + TARGET_PTR="unsigned __int128" +else + TARGET_PTR="unsigned long" +fi + +AC_SUBST(TARGET_PTR) +AC_CONFIG_FILES([jit-reader.h:jit-reader.in]) + +AC_SEARCH_LIBS(dlopen, dl) + +GDB_AC_WITH_DIR([JIT_READER_DIR], [jit-reader-dir], + [directory to load the JIT readers from], + [${libdir}/gdb]) AC_ARG_WITH(expat, AS_HELP_STRING([--with-expat], [include expat support (auto/yes/no)]), @@ -586,26 +695,69 @@ 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}" - AC_LINK_IFELSE(AC_LANG_PROGRAM([[#include "${version}/Python.h"]], + CPPFLAGS="$CPPFLAGS $new_CPPFLAGS" + LIBS="$LIBS $new_LIBS" + found_usable_python=no + AC_LINK_IFELSE(AC_LANG_PROGRAM([[#include "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 + PYTHON_CPPFLAGS=$new_CPPFLAGS + PYTHON_LIBS=$new_LIBS]) + 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.7, 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.7, 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]) @@ -615,44 +767,166 @@ 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 python does not exit ${with_python}/bin, then try in + # ${with_python}. On Windows/MinGW, this is where the Python + # executable is. + if test ! -x "${python_prog}"; then + python_prog="${with_python}/python" + python_prefix= + fi + 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 + # We do not have a python executable we can use to determine where + # to find the Python headers and libs. We cannot guess the include + # path from the python_prefix either, because that include path + # depends on the Python version. So, there is nothing much we can + # do except assume that the compiler will be able to find those files. + python_includes= + python_libs= + 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.]) + + # 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 + # Determine the Python version by extracting "-lpython" + # part of the python_libs. is usually X.Y with X and Y + # being decimal numbers, but can also be XY (seen on Windows). + # + # The extraction is performed using sed with a regular expression. + # Initially, the regexp used was using the '?' quantifier to make + # the dot in the version number optional. Unfortunately, this + # does not work with non-GNU versions of sed because, because of + # what looks like a limitation (the '?' quantifier does not work + # with back-references). We work around this limitation by using + # the '*' quantifier instead. It means that, in theory, we might + # match unexpected version strings such as "-lpython2..7", but + # this seems unlikely in practice. And even if that happens, + # an error will be triggered later on, when checking that version + # number. + 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.7, have_libpython, + ${python_includes}, "${python_libs} -lpython2.7") + fi + 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} = no; then + if test "${have_libpython}" = python2.7 -o "${have_libpython}" = python27; then + AC_DEFINE(HAVE_LIBPYTHON2_7, 1, [Define if Python 2.7 is being used.]) + elif test "${have_libpython}" = python2.6 -o "${have_libpython}" = python26; then + AC_DEFINE(HAVE_LIBPYTHON2_6, 1, [Define if Python 2.6 is being used.]) + elif test "${have_libpython}" = python2.5 -o "${have_libpython}" = python25; then + AC_DEFINE(HAVE_LIBPYTHON2_5, 1, [Define if Python 2.5 is being used.]) + elif test "${have_libpython}" = python2.4 -o "${have_libpython}" = python24; then + AC_DEFINE(HAVE_LIBPYTHON2_4, 1, [Define if Python 2.4 is being used.]) + fi + + if test "${have_libpython}" = no; then case "${with_python}" in yes) AC_MSG_ERROR([python is missing or unusable]) @@ -664,16 +938,21 @@ 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)" CONFIG_SRCS="$CONFIG_SRCS \$(SUBDIR_PYTHON_SRCS)" + CONFIG_INSTALL="$CONFIG_INSTALL install-python" ENABLE_CFLAGS="$ENABLE_CFLAGS \$(SUBDIR_PYTHON_CFLAGS)" # Flags needed to compile Python code (taken from python-config --cflags). @@ -696,13 +975,31 @@ if test "${have_libpython}" = yes; then done AC_MSG_RESULT(${PYTHON_CFLAGS}) fi + + # On IRIX, type siginfo is not defined. Instead, sys/siginfo.h provides: + # #if _SGIAPI + # #define siginfo __siginfo + # #endif + # The problem is that including Python causes some XOPEN macros to be + # unilaterally defined, and that in turn causes _SGIAPI to evaluate + # to false. So, we work around this issue by defining siginfo ourself + # though the command-line. + case "$gdb_host" in + irix*) if test "${GCC}" = yes; then + CPPFLAGS="$CPPFLAGS -Dsiginfo=__siginfo" + fi + ;; + esac 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" + # 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) +AC_SUBST(PYTHON_CPPFLAGS) +AC_SUBST(PYTHON_LIBS) # ------------------------- # # Checks for header files. # @@ -721,7 +1018,8 @@ 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 locale.h]) + sgtty.h unistd.h elf_hp.h ctype.h time.h locale.h \ + dlfcn.h sys/socket.h sys/un.h]) AC_CHECK_HEADERS(link.h, [], [], [#if HAVE_SYS_TYPES_H # include @@ -798,10 +1096,12 @@ AC_C_BIGENDIAN AC_FUNC_ALLOCA AC_FUNC_MMAP AC_FUNC_VFORK -AC_CHECK_FUNCS([canonicalize_file_name realpath getrusage getuid \ - getgid pipe poll pread64 sbrk setpgid setpgrp setsid \ +AC_CHECK_FUNCS([canonicalize_file_name realpath getrusage getuid getgid \ + pipe poll pread pread64 pwrite readlink resize_term \ + sbrk setpgid setpgrp setsid \ sigaction sigprocmask sigsetmask socketpair syscall \ - ttrace wborder setlocale iconvlist libiconvlist btowc]) + ttrace wborder wresize setlocale iconvlist libiconvlist btowc \ + setrlimit getrlimit posix_madvise waitpid lstat]) AM_LANGINFO_CODESET # Check the return and argument types of ptrace. No canned test for @@ -1299,6 +1599,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. @@ -1308,22 +1649,6 @@ dnl and not doing a canadian cross build (build == host). if test ${build} = ${host} -a ${host} = ${target} ; then case ${host_os} in - hpux*) - AC_MSG_CHECKING(for HPUX/OSF thread support) - if test -f /usr/include/dce/cma_config.h ; then - if test "$GCC" = "yes" ; then - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_HPUX_THREAD_SUPPORT, 1, - [Define if you have HPUX threads]) - CONFIG_OBS="${CONFIG_OBS} hpux-thread.o" - CONFIG_SRCS="${CONFIG_SRCS} hpux-thread.c" - else - AC_MSG_RESULT(no (suppressed because you are not using GCC)) - fi - else - AC_MSG_RESULT(no) - fi - ;; solaris*) # See if thread_db library is around for Solaris thread debugging. # Note that we must explicitly test for version 1 of the library @@ -1337,19 +1662,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) @@ -1384,7 +1697,12 @@ if test ${build} = ${host} -a ${host} = ${target} ; then if test $gdb_cv_have_aix_thread_debug = yes; then CONFIG_SRCS="${CONFIG_SRCS} aix-thread.c" CONFIG_OBS="${CONFIG_OBS} aix-thread.o" - CONFIG_LDFLAGS="${CONFIG_LDFLAGS} -lpthdebug" + LIBS="$LIBS -lpthdebug" + + # Older versions of AIX do not provide the declaration for + # the getthrds function (it appears that it was introduced + # with AIX 6.x). + AC_CHECK_DECLS(getthrds, [], [], [[#include ]]) fi ;; esac @@ -1477,42 +1795,20 @@ fi dnl Handle optional features that can be enabled. -target_sysroot_reloc=0 +# Support for --with-sysroot is a copy of GDB_AC_WITH_DIR, +# except that the argument to --with-sysroot is optional. +# --with-sysroot (or --with-sysroot=yes) sets the default sysroot path. +if test "x$with_sysroot" = xyes; then + with_sysroot="${exec_prefix}/${target_alias}/sys-root" +fi AC_ARG_WITH(sysroot, -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' ;; - *) TARGET_SYSTEM_ROOT=$with_sysroot ;; - esac - - TARGET_SYSTEM_ROOT_DEFINE='-DTARGET_SYSTEM_ROOT=\"$(TARGET_SYSTEM_ROOT)\"' - - if test "x$prefix" = xNONE; then - test_prefix=/usr/local - else - test_prefix=$prefix - fi - if test "x$exec_prefix" = xNONE || test "x$exec_prefix" = 'x${prefix}'; then - test_exec_prefix=$test_prefix - else - test_exec_prefix=$exec_prefix - fi - case ${TARGET_SYSTEM_ROOT} in - "${test_prefix}"|"${test_prefix}/"*|\ - "${test_exec_prefix}"|"${test_exec_prefix}/"*|\ - '${prefix}'|'${prefix}/'*|\ - '${exec_prefix}'|'${exec_prefix}/'*) - 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" + AS_HELP_STRING([--with-sysroot@<:@=DIR@:>@], + [search for usr/lib et al within DIR]), + [TARGET_SYSTEM_ROOT=$withval], [TARGET_SYSTEM_ROOT=]) +AC_DEFINE_DIR(TARGET_SYSTEM_ROOT, TARGET_SYSTEM_ROOT, + [search for usr/lib et al within DIR]) AC_SUBST(TARGET_SYSTEM_ROOT) -AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE) +GDB_AC_DEFINE_RELOCATABLE(TARGET_SYSTEM_ROOT, sysroot, ${ac_define_dir}) GDB_AC_WITH_DIR(SYSTEM_GDBINIT, system-gdbinit, [automatically load a system-wide gdbinit file], @@ -1543,7 +1839,8 @@ fi # gdb/doc/gdbint.texinfo. build_warnings="-Wall -Wdeclaration-after-statement -Wpointer-arith \ -Wformat-nonliteral -Wno-pointer-sign \ --Wno-unused -Wunused-value -Wno-switch -Wno-char-subscripts" +-Wno-unused -Wunused-value -Wunused-function \ +-Wno-switch -Wno-char-subscripts -Wmissing-prototypes" # Enable -Wno-format by default when using gcc on mingw since many # GCC versions complain about %I64. @@ -1644,9 +1941,16 @@ AC_SUBST(WIN32LIBS) OLD_CFLAGS=$CFLAGS OLD_LDFLAGS=$LDFLAGS OLD_LIBS=$LIBS -CFLAGS="$CFLAGS -I${srcdir}/../include -I../bfd -I${srcdir}/../bfd" -LDFLAGS="$LDFLAGS -L../bfd -L../libiberty" +# Put the old CFLAGS/LDFLAGS last, in case the user's (C|LD)FLAGS +# points somewhere with bfd, with -I/foo/lib and -L/foo/lib. We +# always want our bfd. +CFLAGS="-I${srcdir}/../include -I../bfd -I${srcdir}/../bfd $CFLAGS" +LDFLAGS="-L../bfd -L../libiberty $LDFLAGS" intl=`echo $LIBINTL | sed 's,${top_builddir}/,,g'` +# -ldl is provided by bfd/Makfile.am (LIBDL) . +if test "$plugins" = "yes"; then + LIBS="-ldl $LIBS" +fi LIBS="-lbfd -liberty $intl $LIBS" AC_CACHE_CHECK([for ELF support in BFD], gdb_cv_var_elf, [AC_TRY_LINK( @@ -1657,9 +1961,13 @@ AC_CACHE_CHECK([for ELF support in BFD], gdb_cv_var_elf, [bfd *abfd = NULL; bfd_get_elf_phdr_upper_bound (abfd); ], gdb_cv_var_elf=yes, gdb_cv_var_elf=no)]) if test $gdb_cv_var_elf = yes; then - CONFIG_OBS="$CONFIG_OBS elfread.o" + CONFIG_OBS="$CONFIG_OBS elfread.o stap-probe.o" AC_DEFINE(HAVE_ELF, 1, [Define if ELF support should be included.]) + # -ldl is provided by bfd/Makfile.am (LIBDL) . + if test "$plugins" = "yes"; then + OLD_LIBS="-ldl $OLD_LIBS" + fi fi CFLAGS=$OLD_CFLAGS LDFLAGS=$OLD_LDFLAGS @@ -1894,17 +2202,33 @@ if test "x$enable_multi_ice" = xyes; then AC_CONFIG_SUBDIRS(multi-ice) fi -# We only build gdbserver automatically in a native configuration. -if test "$gdb_native" = "yes"; then +AC_ARG_ENABLE(gdbserver, +AS_HELP_STRING([--enable-gdbserver], + [automatically build gdbserver (yes/no/auto, default is auto)]), +[case "${enableval}" in + yes| no|auto) ;; + *) AC_MSG_ERROR(bad value ${enableval} for --enable-gdbserver option) ;; +esac],[enable_gdbserver=auto]) + +# We only build gdbserver automatically in a native configuration, and +# only if the user did not explicitly disable its build. +if test "$gdb_native" = "yes" -a "$enable_gdbserver" != "no"; then AC_MSG_CHECKING(whether gdbserver is supported on this host) if test "x$build_gdbserver" = xyes; then AC_MSG_RESULT(yes) AC_CONFIG_SUBDIRS(gdbserver) + gdbserver_build_enabled=yes else AC_MSG_RESULT(no) fi fi +# If the user explicitly request the gdbserver to be built, verify that +# we were in fact able to enable it. +if test "$enable_gdbserver" = "yes" -a "$gdbserver_build_enabled" != "yes"; then + AC_MSG_ERROR(Automatic gdbserver build is not supported for this configuration) +fi + # If nativefile (NAT_FILE) is not set in config/*/*.m[ht] files, we link # to an empty version. @@ -1933,7 +2257,7 @@ 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.]) -AC_OUTPUT(Makefile .gdbinit:gdbinit.in gnulib/Makefile, +AC_OUTPUT(Makefile gdb-gdb.gdb doc/Makefile data-directory/Makefile, [ case x$CONFIG_HEADERS in xconfig.h:config.in)