From patchwork Wed Mar 13 21:50:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergei Trofimovich X-Patchwork-Id: 31848 Received: (qmail 38610 invoked by alias); 13 Mar 2019 21:50:39 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 38600 invoked by uid 89); 13 Mar 2019 21:50:39 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-26.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, SPF_HELO_PASS, SPF_PASS autolearn=ham version=3.3.1 spammy=sk:source-, sk:enable_, HContent-Transfer-Encoding:8bit X-HELO: smtp.gentoo.org Received: from smtp.gentoo.org (HELO smtp.gentoo.org) (140.211.166.183) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 13 Mar 2019 21:50:29 +0000 Received: from sf.home (trofi-1-pt.tunnel.tserv1.lon2.ipv6.he.net [IPv6:2001:470:1f1c:a0f::2]) (using TLSv1 with cipher ECDHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) (Authenticated sender: slyfox) by smtp.gentoo.org (Postfix) with ESMTPSA id 37BCD335D06; Wed, 13 Mar 2019 21:50:27 +0000 (UTC) Received: by sf.home (Postfix, from userid 1000) id 504802378D1CA; Wed, 13 Mar 2019 21:50:23 +0000 (GMT) From: Sergei Trofimovich To: gdb-patches@sourceware.org Cc: Sergei Trofimovich Subject: [PATCH] gdb/configure.ac: add --enable-source-highlight Date: Wed, 13 Mar 2019 21:50:20 +0000 Message-Id: <20190313215020.11959-1-slyfox@gentoo.org> MIME-Version: 1.0 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 gd/ChangeLog Sergei Trofimovich * configure.ac: add --enable-source-highlight switch. * configure: Regenerate. --- gdb/ChangeLog | 5 +++++ gdb/configure | 38 +++++++++++++++++++++++++++++++------- gdb/configure.ac | 33 ++++++++++++++++++++++++++------- 3 files changed, 62 insertions(+), 14 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 24de651bf9..35b66f02a6 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2019-03-13 Sergei Trofimovich + + * configure.ac: add --enable-source-highlight switch. + * configure: Regenerate. + 2019-03-13 Tom Tromey * i386-gnu-nat.c (i386_gnu_nat_target::fetch_registers) diff --git a/gdb/configure b/gdb/configure index f2d271e23a..15a96afcca 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 @@ -11393,13 +11396,30 @@ fi SRCHIGH_LIBS= SRCHIGH_CFLAGS= -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the source-highlight library" >&5 + +# 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 + 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 + 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; } -else - if ${pkg_config_prog_path} --exists source-highlight; then + 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` @@ -11407,10 +11427,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 8ddd0fda61..1318c8d008 100644 --- a/gdb/configure.ac +++ b/gdb/configure.ac @@ -1220,19 +1220,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)