X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fconfigure.ac;h=6ba7c5cfa4f1d287255235e2929206df52efe7ef;hb=27e4fac77ea57b288ac1e08d936d9a8fdc01a1ee;hp=8bc87483f28dc067b01c2752aea7f0383a6f4bab;hpb=2578ecb1b583408c7a75716edbd203995da373c7;p=deliverable%2Fbinutils-gdb.git
diff --git a/gdb/configure.ac b/gdb/configure.ac
index 8bc87483f2..6ba7c5cfa4 100644
--- a/gdb/configure.ac
+++ b/gdb/configure.ac
@@ -1,5 +1,5 @@
dnl Autoconf configure script for GDB, the GNU debugger.
-dnl Copyright (C) 1995-2018 Free Software Foundation, Inc.
+dnl Copyright (C) 1995-2019 Free Software Foundation, Inc.
dnl
dnl This file is part of GDB.
dnl
@@ -19,7 +19,7 @@ dnl along with this program. If not, see .
dnl Process this file with autoconf to produce a configure script.
AC_INIT(main.c)
-AC_CONFIG_HEADER(config.h:config.in)
+AC_CONFIG_HEADERS(config.h:config.in, [echo > stamp-h])
AM_MAINTAINER_MODE
# Set the 'development' global.
@@ -45,19 +45,6 @@ AX_CXX_COMPILE_STDCXX(11, , mandatory)
ZW_CREATE_DEPDIR
ZW_PROG_COMPILER_DEPENDENCIES([CC])
-gnulib_extra_configure_args=
-# If large-file support is disabled, make sure gnulib does the same.
-if test "$enable_largefile" = no; then
-gnulib_extra_configure_args="$gnulib_extra_configure_args --disable-largefile"
-fi
-
-# 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"],
- ["$gnulib_extra_configure_args"])
-
dnl List of object files and targets accumulated by configure.
CONFIG_OBS=
@@ -83,15 +70,6 @@ if test x"$USE_NLS" = xyes; then
CONFIG_UNINSTALL="$CONFIG_UNINSTALL uninstall-po"
fi
-GNULIB=build-gnulib/import
-
-# For Makefile dependencies.
-GNULIB_STDINT_H=
-if test x"$STDINT_H" != x; then
- GNULIB_STDINT_H=$GNULIB/$STDINT_H
-fi
-AC_SUBST(GNULIB_STDINT_H)
-
PACKAGE=gdb
AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of this package. ])
AC_SUBST(PACKAGE)
@@ -199,10 +177,6 @@ fi
. $srcdir/configure.host
-# Add in the common host objects.
-. $srcdir/common/common.host
-gdb_host_obs="$gdb_host_obs $common_host_obs"
-
# Accumulate some settings from configure.tgt over all enabled targets
TARGET_OBS=
@@ -603,6 +577,20 @@ AC_ARG_WITH([system-readline],
[use installed readline library])])
if test "$with_system_readline" = yes; then
+ AC_CACHE_CHECK([whether system readline is new enough],
+ [gdb_cv_readline_ok],
+ [AC_TRY_COMPILE(
+ [#include
+#include ],
+ [#if RL_VERSION_MAJOR < 7
+# error "readline version 7 required"
+#endif],
+ gdb_cv_readline_ok=yes,
+ gdb_cv_readline_ok=no)])
+ if test "$gdb_cv_readline_ok" != yes; then
+ AC_MSG_ERROR([system readline is not new enough])
+ fi
+
READLINE=-lreadline
READLINE_DEPS=
READLINE_CFLAGS=
@@ -699,19 +687,17 @@ fi
# --------------------- #
dnl Utility to simplify finding libpython.
-dnl $1 = pythonX.Y
-dnl $2 = the shell variable to assign the result to
+dnl $1 = 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
+dnl $2 = additional flags to add to CPPFLAGS
+dnl $3 = additional flags to add to LIBS
AC_DEFUN([AC_TRY_LIBPYTHON],
[
- version=$1
- define([have_libpython_var],$2)
- new_CPPFLAGS=$3
- new_LIBS=$4
- AC_MSG_CHECKING([for ${version}])
+ define([have_libpython_var],$1)
+ new_CPPFLAGS=$2
+ new_LIBS=$3
+ AC_MSG_CHECKING([for python])
save_CPPFLAGS=$CPPFLAGS
save_LIBS=$LIBS
CPPFLAGS="$CPPFLAGS $new_CPPFLAGS"
@@ -719,7 +705,7 @@ AC_DEFUN([AC_TRY_LIBPYTHON],
found_usable_python=no
AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include "Python.h"]],
[[Py_Initialize ();]])],
- [have_libpython_var=${version}
+ [have_libpython_var=yes
found_usable_python=yes
PYTHON_CPPFLAGS=$new_CPPFLAGS
PYTHON_LIBS=$new_LIBS])
@@ -734,7 +720,7 @@ 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 Python 2.7 and 2.6 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 -
@@ -743,7 +729,7 @@ 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 Python 2.7 and 2.6 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 -
@@ -876,58 +862,17 @@ else
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
+ AC_TRY_LIBPYTHON(have_libpython,
+ ${python_includes}, ${python_libs})
elif test "${have_python_config}" != failed; then
if test "${have_libpython}" = no; then
- AC_TRY_LIBPYTHON(python2.7, have_libpython,
+ AC_TRY_LIBPYTHON(have_libpython,
${python_includes}, "-lpython2.7 ${python_libs}")
fi
if test "${have_libpython}" = no; then
- AC_TRY_LIBPYTHON(python2.6, have_libpython,
+ AC_TRY_LIBPYTHON(have_libpython,
${python_includes}, "-lpython2.6 ${python_libs}")
fi
- if test ${have_libpython} = no; then
- AC_TRY_LIBPYTHON(python2.5, have_libpython,
- ${python_includes}, "-lpython2.5 ${python_libs}")
- fi
- if test ${have_libpython} = no; then
- AC_TRY_LIBPYTHON(python2.4, have_libpython,
- ${python_includes}, "-lpython2.4 ${python_libs}")
- fi
- fi
- 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
@@ -999,23 +944,6 @@ if test "${have_libpython}" != no; then
fi
;;
esac
-
- # Note that "python -m threading" cannot be used to check for
- # threading support due to a bug in Python 2.7.3
- # (http://bugs.python.org/issue15567).
- AC_MSG_CHECKING(whether python supports threads)
- saved_CPPFLAGS="${CPPFLAGS}"
- CPPFLAGS="${PYTHON_CPPFLAGS}"
- # Note that the test is reversed so that python_has_threads=yes on
- # unexpected failures.
- AC_PREPROC_IFELSE([AC_LANG_SOURCE([[
-#include
-#ifdef WITH_THREAD
-# error
-#endif
- ]])], [python_has_threads=no], [python_has_threads=yes])
- AC_MSG_RESULT(${python_has_threads})
- CPPFLAGS="${saved_CPPFLAGS}"
else
# Even if Python support is not compiled in, we need to have this file
# included so that the "python" command, et.al., still exists.
@@ -1226,27 +1154,55 @@ AC_SUBST(GUILE_CPPFLAGS)
AC_SUBST(GUILE_LIBS)
AM_CONDITIONAL(HAVE_GUILE, test "${have_libguile}" != no)
-# --------------------- #
-# Check for libmcheck. #
-# --------------------- #
-
-# Enable -lmcheck by default (it provides cheap-enough memory mangling),
-# but turn it off if Python is enabled with threads, since -lmcheck is
-# not thread safe (http://sourceware.org/bugzilla/show_bug.cgi?id=9939),
-# and for releases.
-if test \( "${have_libpython}" = "no" -o "${python_has_threads}" = "no" \) \
- && $development; then
- libmcheck_default=yes
-else
- libmcheck_default=no
-fi
-GDB_AC_LIBMCHECK(${libmcheck_default})
+# ---------------------------- #
+# Check for source highlight. #
+# ---------------------------- #
+
+SRCHIGH_LIBS=
+SRCHIGH_CFLAGS=
+
+AC_ARG_ENABLE(source-highlight,
+ AS_HELP_STRING([--enable-source-highlight],
+ [enable source-highlight for source listings]),
+ [case "${enableval}" in
+ yes) enable_source_highlight=yes ;;
+ no) enable_source_highlight=no ;;
+ *) AC_MSG_ERROR(bad value ${enableval} for source-highlight option) ;;
+esac],
+[enable_source_highlight=auto])
+
+if test "${enable_source_highlight}" != "no"; then
+ AC_MSG_CHECKING([for the source-highlight library])
+ if test "${pkg_config_prog_path}" = "missing"; then
+ AC_MSG_RESULT([no - pkg-config not found])
+ if test "${enable_source_highlight}" = "yes"; then
+ AC_MSG_ERROR([pkg-config was not found in your system])
+ fi
+ else
+ case "$LDFLAGS" in
+ *static-libstdc*)
+ AC_MSG_ERROR([source highlight is incompatible with -static-libstdc++; dnl
+either use --disable-source-highlight or dnl
+--without-static-standard-libraries])
+ ;;
+ esac
-if test "$ENABLE_LIBMCHECK" = "yes" \
- -a "${have_libpython}" != "no" \
- -a "${python_has_threads}" = "yes" ; then
- AC_MSG_WARN(--enable-libmcheck may lead to spurious crashes if threads are used in python)
+ if ${pkg_config_prog_path} --exists source-highlight; then
+ SRCHIGH_CFLAGS=`${pkg_config_prog_path} --cflags source-highlight`
+ SRCHIGH_LIBS=`${pkg_config_prog_path} --libs source-highlight`
+ AC_DEFINE([HAVE_SOURCE_HIGHLIGHT], 1,
+ [Define to 1 if the source-highlight library is available])
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_RESULT([no])
+ if test "${enable_source_highlight}" = "yes"; then
+ AC_MSG_ERROR([source-highlight was not found in your system])
+ fi
+ fi
+ fi
fi
+AC_SUBST(SRCHIGH_LIBS)
+AC_SUBST(SRCHIGH_CFLAGS)
AC_ARG_WITH(intel_pt,
AS_HELP_STRING([--with-intel-pt], [include Intel Processor Trace support (auto/yes/no)]),
@@ -1300,8 +1256,7 @@ AC_CHECK_HEADERS([nlist.h machine/reg.h poll.h sys/poll.h proc_service.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 \
- termios.h elf_hp.h \
- dlfcn.h])
+ termios.h elf_hp.h])
AC_CHECK_HEADERS(sys/user.h, [], [],
[#if HAVE_SYS_PARAM_H
# include
@@ -1356,10 +1311,10 @@ AC_FUNC_VFORK
AC_CHECK_FUNCS([getauxval getrusage getuid getgid \
pipe poll pread pread64 pwrite resize_term \
sbrk getpgid setpgid setpgrp setsid \
- sigaction sigprocmask sigsetmask socketpair \
+ sigaction sigsetmask socketpair \
ttrace wborder wresize setlocale iconvlist libiconvlist btowc \
setrlimit getrlimit posix_madvise waitpid \
- ptrace64 sigaltstack setns])
+ ptrace64 sigaltstack setns use_default_colors])
AM_LANGINFO_CODESET
GDB_AC_COMMON
@@ -1836,6 +1791,9 @@ 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],
[])
+GDB_AC_WITH_DIR(SYSTEM_GDBINIT_DIR, system-gdbinit-dir,
+ [automatically load system-wide gdbinit files from this directory],
+ [])
AM_GDB_WARNINGS
AM_GDB_UBSAN
@@ -2210,23 +2168,43 @@ else
fi
fi
-# If nativefile (NAT_FILE) is not set in configure.nat, we link to an
-# empty version.
+# Check for xxhash
+AC_ARG_WITH(xxhash,
+ AC_HELP_STRING([--with-xxhash], [use libxxhash for hashing (faster) (auto/yes/no)]),
+ [], [with_xxhash=auto])
-files=
-links=
+if test "x$with_xxhash" != "xno"; then
+ AC_LIB_HAVE_LINKFLAGS([xxhash], [],
+ [#include ],
+ [XXH32("foo", 3, 0);
+ ])
+ if test "$HAVE_LIBXXHASH" != yes; then
+ if test "$with_xxhash" = yes; then
+ AC_MSG_ERROR([xxhash is missing or unusable])
+ fi
+ fi
+ if test "x$with_xxhash" = "xauto"; then
+ with_xxhash="$HAVE_LIBXXHASH"
+ fi
+fi
+AC_MSG_CHECKING([whether to use xxhash])
+AC_MSG_RESULT([$with_xxhash])
+
+NM_H=
rm -f nm.h
if test "${nativefile}" != ""; then
case "${nativefile}" in
nm-*.h ) GDB_NM_FILE="config/${gdb_host_cpu}/${nativefile}" ;;
* ) GDB_NM_FILE="${nativefile}"
esac
- files="${files} ${GDB_NM_FILE}"
- links="${links} nm.h"
+ AC_CONFIG_LINKS([nm.h:$GDB_NM_FILE], [echo > stamp-nmh],
+ [GDB_NM_FILE=$GDB_NM_FILE])
AC_DEFINE_UNQUOTED(GDB_NM_FILE, "${GDB_NM_FILE}", [nativefile])
+ NM_H=nm.h
fi
AC_SUBST(GDB_NM_FILE)
+AC_SUBST(NM_H)
dnl Add dependency for xsltproc if building with maintainer-mode enabled.
AC_PATH_PROGS(XSLTPROC, xsltproc, missing)
@@ -2237,8 +2215,6 @@ if test "x$USE_MAINTAINER_MODE" = xyes; then
fi
AC_SUBST(XSLTPROC)
-AC_LINK_FILES($files, $links)
-
dnl Check for exe extension set on certain hosts (e.g. Win32)
AC_EXEEXT
@@ -2248,19 +2224,13 @@ AC_DEFINE(GDB_DEFAULT_HOST_CHARSET, "UTF-8",
[Define to be a string naming the default host character set.])
GDB_AC_SELFTEST([
- CONFIG_OBS="$CONFIG_OBS \$(SUBDIR_UNITTESTS_OBS) common/selftest.o selftest-arch.o"
- CONFIG_SRCS="$CONFIG_SRCS \$(SUBDIR_UNITTESTS_SRCS) common/selftest.c selftest-arch.c"
+ CONFIG_OBS="$CONFIG_OBS \$(SUBDIR_UNITTESTS_OBS) gdbsupport/selftest.o selftest-arch.o"
+ CONFIG_SRCS="$CONFIG_SRCS \$(SUBDIR_UNITTESTS_SRCS) gdbsupport/selftest.c selftest-arch.c"
])
GDB_AC_TRANSFORM([gdb], [GDB_TRANSFORM_NAME])
GDB_AC_TRANSFORM([gcore], [GCORE_TRANSFORM_NAME])
AC_CONFIG_FILES([gcore], [chmod +x gcore])
-AC_CONFIG_FILES([Makefile gdb-gdb.gdb gdb-gdb.py doc/Makefile data-directory/Makefile],
-[
-case x$CONFIG_HEADERS in
-xconfig.h:config.in)
-echo > stamp-h ;;
-esac
-])
+AC_CONFIG_FILES([Makefile gdb-gdb.gdb gdb-gdb.py doc/Makefile data-directory/Makefile])
AC_OUTPUT