Brad Bishop | 37a0e4d | 2017-12-04 01:01:44 -0500 | [diff] [blame] | 1 | From 93fc4744fedf6fc593ee656968da97f7b1862ada Mon Sep 17 00:00:00 2001 |
| 2 | From: Ross Burton <ross.burton@intel.com> |
| 3 | Date: Tue, 4 Oct 2016 16:37:53 +0100 |
| 4 | Subject: [PATCH 4/6] systemtap: rationalise dependencies |
| 5 | |
Patrick Williams | c0f7c04 | 2017-02-23 20:41:17 -0600 | [diff] [blame] | 6 | Add an option to explicitly disable the monitor (and therefore the dependency on |
| 7 | json-c and ncurses). |
| 8 | |
| 9 | Upstream-Status: Pending |
| 10 | Signed-off-by: Ross Burton <ross.burton@intel.com> |
| 11 | |
Brad Bishop | 37a0e4d | 2017-12-04 01:01:44 -0500 | [diff] [blame] | 12 | --- |
| 13 | configure.ac | 5 ++++- |
| 14 | 1 file changed, 4 insertions(+), 1 deletion(-) |
| 15 | |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 16 | Index: git/configure.ac |
| 17 | =================================================================== |
| 18 | --- git.orig/configure.ac |
| 19 | +++ git/configure.ac |
| 20 | @@ -766,13 +766,16 @@ dnl We want either (or both) python prob |
Brad Bishop | 37a0e4d | 2017-12-04 01:01:44 -0500 | [diff] [blame] | 21 | AM_CONDITIONAL([HAVE_PYTHON_PROBES], |
| 22 | [test "x$have_python2_support" = "xyes" -o "x$have_python3_support" = "xyes"]) |
| 23 | |
Patrick Williams | c0f7c04 | 2017-02-23 20:41:17 -0600 | [diff] [blame] | 24 | +AC_ARG_ENABLE([monitor], AS_HELP_STRING([--disable-monitor],[Disable monitor])) |
| 25 | +if test "$enable_monitor" != "no"; then |
| 26 | dnl Check for presence of json-c and ncurses for use in monitor mode |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 27 | PKG_CHECK_MODULES([jsonc], [json-c >= 0.11], [have_jsonc=yes], [have_jsonc=no]) |
Patrick Williams | c0f7c04 | 2017-02-23 20:41:17 -0600 | [diff] [blame] | 28 | PKG_CHECK_MODULES([ncurses], [ncurses], [have_ncurses=yes], [have_ncurses=no]) |
| 29 | -AM_CONDITIONAL([HAVE_MONITOR_LIBS], [test "${have_jsonc}" == "yes" -a "${have_ncurses}" == "yes"]) |
| 30 | if test "${have_jsonc}" == "yes" -a "${have_ncurses}" == yes; then |
| 31 | AC_DEFINE([HAVE_MONITOR_LIBS],[1],[Define to 1 if json-c and ncurses libraries are installed]) |
| 32 | fi |
| 33 | +fi |
| 34 | +AM_CONDITIONAL([HAVE_MONITOR_LIBS], [test "${have_jsonc}" == "yes" -a "${have_ncurses}" == "yes" -a "$enable_monitor" != "no"]) |
Brad Bishop | 37a0e4d | 2017-12-04 01:01:44 -0500 | [diff] [blame] | 35 | |
Patrick Williams | c0f7c04 | 2017-02-23 20:41:17 -0600 | [diff] [blame] | 36 | AC_CACHE_CHECK([for assembler .section "?" flags support], stap_cv_sectionq, [ |
| 37 | old_CFLAGS="$CFLAGS" |