[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.11.0-693-g0a36acbf6

[OpenOCD-Gerrit <ope...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".

The branch, master has been updated
       via  0a36acbf6ac67cf6e95077aa25a001e2638f2798 (commit)
      from  ce5027ab019ac7f96d05ec5f8f533144b3bcafdf (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 0a36acbf6ac67cf6e95077aa25a001e2638f2798
Author: Erhan Kurubas <erh...@es...>
Date:   Tue Apr 5 17:19:24 2022 +0300

    configure: build jimtcl with json extension
    
    Signed-off-by: Erhan Kurubas <erh...@es...>
    Change-Id: I5845c240e50ee832c082df3f26fabbd4b14d6edd
    Reviewed-on: https://review.openocd.org/c/openocd/+/6890
    Tested-by: jenkins
    Reviewed-by: Antonio Borneo <bor...@gm...>

diff --git a/configure.ac b/configure.ac
index 95b2d50ae..7eada3a32 100644
--- a/configure.ac
+++ b/configure.ac
@@ -570,9 +570,9 @@ AS_IF([test "x$enable_buspirate" != "xno"], [
 AS_IF([test "x$use_internal_jimtcl" = "xyes"], [
   AS_IF([test -f "$srcdir/jimtcl/configure.ac"], [
     AS_IF([test "x$use_internal_jimtcl_maintainer" = "xyes"], [
-      jimtcl_config_options="--disable-install-jim --maintainer"
+      jimtcl_config_options="--disable-install-jim --with-ext=json --maintainer"
     ], [
-      jimtcl_config_options="--disable-install-jim"
+      jimtcl_config_options="--disable-install-jim --with-ext=json"
     ])
     AX_CONFIG_SUBDIR_OPTION([jimtcl], [$jimtcl_config_options])
   ], [

-----------------------------------------------------------------------

Summary of changes:
 configure.ac | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository