[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.12.0-rc3-4-gf71b5f5a3

[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  f71b5f5a37fde4b22cd8eb379c2bc8454c636145 (commit)
      from  d92ebb5ab43f6c6a900c6beb0bc426573058c359 (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 f71b5f5a37fde4b22cd8eb379c2bc8454c636145
Author: Antonio Borneo <bor...@gm...>
Date:   Sat Jan 14 15:18:02 2023 +0100

    configure.ac: fix check for jimtcl submodule
    
    The file configure.ac checks if jimtcl submodule is present by
    looking for the file jimtcl/configure.ac .
    But jimtcl has switched to its own build system in 2011 and thus
    dropped configure.ac . This cause a build issue on OpenOCD that
    was incorrectly fixed by adding a dummy configure.ac in jimtcl.
    
    Fix OpenOCD configure.ac to look for the correct file
    jimtcl/configure .
    After this fix, another fix would be proposed to jimtcl to drop
    its useless dummy file configure.ac .
    
    Change-Id: I705f72d83e374c8dd700baaa0c0bbe041f153605
    Signed-off-by: Antonio Borneo <bor...@gm...>
    Reported-by: Paul Fertser <fer...@gm...>
    Reviewed-on: https://review.openocd.org/c/openocd/+/7437
    Tested-by: jenkins
    Reviewed-by: Paul Fertser <fer...@gm...>

diff --git a/configure.ac b/configure.ac
index bcacfb240..a8535213d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -574,7 +574,7 @@ 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 -f "$srcdir/jimtcl/configure"], [
     AS_IF([test "x$use_internal_jimtcl_maintainer" = "xyes"], [
       jimtcl_config_options="--disable-install-jim --with-ext=json --maintainer"
     ], [

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

Summary of changes:
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
Main OpenOCD repository