From: Sergei Trofimovich Date: Sun, 17 Mar 2019 22:48:02 +0000 (+0000) Subject: gdb/configure.ac: add --enable-source-highlight X-Git-Tag: gdb-8.3-release~30 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4ae3a64b95432b580f98d457a2346003877f48d1;p=thirdparty%2Fbinutils-gdb.git gdb/configure.ac: add --enable-source-highlight Allow disabling source-highlight dependency autodetection even it exists in the system. More details on problem of automatic dependencies: https://wiki.gentoo.org/wiki/Project:Quality_Assurance/Automagic_dependencies Noticed by Jeroen Roovers in https://bugs.gentoo.org/680238 * configure.ac: add --enable-source-highlight switch. * configure: Regenerate. * top.c (print_gdb_version): plumb --enable-source-highlight status to "show configuration". gdb/ChangeLog 2019-04-19 Sergei Trofimovich * configure.ac: add --enable-source-highlight switch. * configure: Regenerate. * top.c (print_gdb_version): plumb --enable-source-highlight status to "show configuration". --- diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 328cf29f266..e59f067f8dd 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2019-04-19 Sergei Trofimovich + + * configure.ac: add --enable-source-highlight switch. + * configure: Regenerate. + * top.c (print_gdb_version): plumb --enable-source-highlight + status to "show configuration". + 2019-04-19 Ilya Yu. Malakhov PR symtab/24423: diff --git a/gdb/configure b/gdb/configure index 9c99213a168..854837c50a3 100755 --- a/gdb/configure +++ b/gdb/configure @@ -879,6 +879,7 @@ with_mpfr with_libmpfr_prefix with_python with_guile +enable_source_highlight enable_libmcheck with_intel_pt with_libipt_prefix @@ -1554,6 +1555,8 @@ Optional Features: --enable-profiling enable profiling of GDB --enable-codesign=CERT sign gdb with 'codesign -s CERT' --disable-rpath do not hardcode runtime library paths + --enable-source-highlight + enable source-highlight for source listings --enable-libmcheck Try linking with -lmcheck if available --enable-werror treat compile warnings as errors --enable-build-warnings enable build-time compiler warnings if gcc is used @@ -11477,13 +11480,30 @@ fi SRCHIGH_LIBS= SRCHIGH_CFLAGS= -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for source highlight" >&5 -$as_echo_n "checking for source highlight... " >&6; } -if test "${pkg_config_prog_path}" = "missing"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no - pkg-config not found" >&5 -$as_echo "no - pkg-config not found" >&6; } + +# Check whether --enable-source-highlight was given. +if test "${enable_source_highlight+set}" = set; then : + enableval=$enable_source_highlight; case "${enableval}" in + yes) enable_source_highlight=yes ;; + no) enable_source_highlight=no ;; + *) as_fn_error $? "bad value ${enableval} for source-highlight option" "$LINENO" 5 ;; +esac else - if ${pkg_config_prog_path} --exists source-highlight; then + enable_source_highlight=auto +fi + + +if test "${enable_source_highlight}" != "no"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the source-highlight library" >&5 +$as_echo_n "checking for the source-highlight library... " >&6; } + if test "${pkg_config_prog_path}" = "missing"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no - pkg-config not found" >&5 +$as_echo "no - pkg-config not found" >&6; } + if test "${enable_source_highlight}" = "yes"; then + as_fn_error $? "pkg-config was not found in your system" "$LINENO" 5 + fi + else + 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` @@ -11491,10 +11511,14 @@ $as_echo "#define HAVE_SOURCE_HIGHLIGHT 1" >>confdefs.h { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - else + else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - fi + if test "${enable_source_highlight}" = "yes"; then + as_fn_error $? "source-highlight was not found in your system" "$LINENO" 5 + fi + fi + fi fi diff --git a/gdb/configure.ac b/gdb/configure.ac index f63507ff74e..1527585839d 100644 --- a/gdb/configure.ac +++ b/gdb/configure.ac @@ -1232,19 +1232,38 @@ AM_CONDITIONAL(HAVE_GUILE, test "${have_libguile}" != no) SRCHIGH_LIBS= SRCHIGH_CFLAGS= -AC_MSG_CHECKING([for the source-highlight library]) -if test "${pkg_config_prog_path}" = "missing"; then - AC_MSG_RESULT([no - pkg-config not found]) -else - if ${pkg_config_prog_path} --exists source-highlight; then + +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 + 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 + else AC_MSG_RESULT([no]) - fi + 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) diff --git a/gdb/top.c b/gdb/top.c index 22e6f7e29ab..acc67202b64 100644 --- a/gdb/top.c +++ b/gdb/top.c @@ -1449,6 +1449,15 @@ This GDB was configured as follows:\n\ --without-guile\n\ ")); #endif +#if HAVE_SOURCE_HIGHLIGHT + fprintf_filtered (stream, _("\ + --enable-source-highlight\n\ +")); +#else + fprintf_filtered (stream, _("\ + --disable-source-highlight\n\ +")); +#endif #ifdef RELOC_SRCDIR fprintf_filtered (stream, _("\ --with-relocated-sources=%s\n\