[Spice-commits] configure.ac meson_options.txt subprojects/spice-common

[GitLab Mirror]

 configure.ac             |    2 +-
 meson_options.txt        |    9 +++++----
 subprojects/spice-common |    2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

New commits:
commit 13de28fc276c947a679e266368e201317575117a
Author: Frediano Ziglio <fziglio at redhat.com>
Date:   Tue Nov 26 15:08:38 2019 +0000

    Update spice-common submodule
    
    This brings in the following changes:
    
    Fabrice Fontaine (2):
          configure.ac: add --enable-tests
          meson: add tests option
    
    Frediano Ziglio (4):
          codegen: Add 'chunk' to the output attributes
          codegen: Check validity of array members
          codegen: Document "chunk" attribute
          codegen: Ignore path generating include guards
    
    Kevin Pouget (3):
          agent-interface: introduce the core of the Agent Interface
          agent-interface: add configuration functions
          build: Introduce the agent-interface as an alternative instrumentation library
    
    Updated files are due to agent-interface updates.
    
    Signed-off-by: Frediano Ziglio <fziglio at redhat.com>
    Acked-by: Kevin Pouget <kpouget at redhat.com>

diff --git a/configure.ac b/configure.ac
index 49c009d4..9b679513 100644
--- a/configure.ac
+++ b/configure.ac
@@ -148,7 +148,7 @@ AX_VALGRIND_CHECK
 
 SPICE_CHECK_LZ4
 SPICE_CHECK_SASL
-SPICE_CHECK_RECORDER
+SPICE_CHECK_INSTRUMENTATION
 AM_CONDITIONAL(HAVE_SASL, test "x$have_sasl" = "xyes")
 
 dnl =========================================================================
diff --git a/meson_options.txt b/meson_options.txt
index a05e1eec..f8a1e95e 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -46,7 +46,8 @@ option('manual',
     value : true,
     description : 'Build SPICE manual')
 
-option('recorder',
-    type : 'boolean',
-    value : false,
-    description: 'Enable recorder instrumentation')
+option('instrumentation',
+    type : 'combo',
+    value : 'no',
+    choices : ['recorder', 'agent', 'no'],
+    description: 'Enable instrumentation')
diff --git a/subprojects/spice-common b/subprojects/spice-common
index 62b44b30..785ac8de 160000
--- a/subprojects/spice-common
+++ b/subprojects/spice-common
@@ -1 +1 @@
-Subproject commit 62b44b3073d337c92123e0fff9c5f6683bfdb4ff
+Subproject commit 785ac8de4f86847d229d138ac5fc4898074d9cf4