[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.11.0-174-g909d45e35

[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  909d45e35c4d189a0424744a9ecf65227811b019 (commit)
       via  6e92cd0642ce19ce36cfd8bfe3faf5afc696f37e (commit)
      from  229c4c6a71ce6540917cbc10629d8f51c98c7e7b (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 909d45e35c4d189a0424744a9ecf65227811b019
Author: R. Diez <rdi...@ya...>
Date:   Thu May 13 13:43:09 2021 +0200

    configure.ac: use a separate folder for Autoconf-generated files
    
    Autoconf generates several files in root folder of the project.
    Keep the root folder cleaner by specifying subfolder 'build-aux'.
    Align .gitignore accordingly.
    
    Signed-off-by: R. Diez <rdi...@ya...>
    Change-Id: Ied87faba495d9eeb8f98e78c2e2b7e7e596febfb
    Reviewed-on: http://openocd.zylin.com/6236
    Tested-by: jenkins
    Reviewed-by: Antonio Borneo <bor...@gm...>

diff --git a/.gitignore b/.gitignore
index f1021b263..e25d1ba96 100644
--- a/.gitignore
+++ b/.gitignore
@@ -53,27 +53,23 @@ doc/openocd.toc
 doc/openocd.tp
 doc/openocd.vr
 doc/version.texi
-texinfo.tex
 src/openocd
 src/openocd.exe
 
 # configure/autotools output
+/build-aux/
 aclocal.m4
 autom4te.cache
-compile
-config.*
+config.h
+config.log
+config.status
 configure
-depcomp
 doxygen
 doxygen.log
 Doxyfile
-install-sh
 libtool
-ltmain.sh
 Makefile
 !contrib/loaders/**/Makefile
-mdate-sh
-missing
 stamp-h1
 stamp-vti
 INSTALL
diff --git a/configure.ac b/configure.ac
index 139598e15..2a455fa55 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ AC_PREREQ([2.69])
 AC_INIT([openocd], [0.11.0+dev],
   [OpenOCD Mailing List <ope...@li...>])
 AC_CONFIG_SRCDIR([src/openocd.c])
-AC_CONFIG_AUX_DIR([.])
+AC_CONFIG_AUX_DIR([build-aux])
 
 m4_include([config_subdir.m4])dnl
 

commit 6e92cd0642ce19ce36cfd8bfe3faf5afc696f37e
Author: R. Diez <rdi...@ya...>
Date:   Thu May 13 14:47:44 2021 +0200

    Remove compatibility macros m4_ifblank and m4_ifnblank
    
    They are at least since Autoconf 2.67 present,
    and we are requiring version 2.69.
    
    Change-Id: I41b33d4ebe02198f03cdddcc4a3c1beedd993d78
    Signed-off-by: R. Diez <rdi...@ya...>
    Reviewed-on: http://openocd.zylin.com/6239
    Tested-by: jenkins
    Reviewed-by: Antonio Borneo <bor...@gm...>

diff --git a/config_subdir.m4 b/config_subdir.m4
index 1c7909853..45a1c6c4f 100644
--- a/config_subdir.m4
+++ b/config_subdir.m4
@@ -1,17 +1,3 @@
-dnl
-dnl If needed, define the m4_ifblank and m4_ifnblank macros from autoconf 2.64
-dnl This allows us to run with earlier Autoconfs as well.
-ifdef([m4_ifblank],[],[
-m4_define([m4_ifblank],
-[m4_if(m4_translit([[$1]],  [ ][	][
-]), [], [$2], [$3])])])
-dnl
-ifdef([m4_ifnblank],[],[
-m4_define([m4_ifnblank],
-[m4_if(m4_translit([[$1]],  [ ][	][
-]), [], [$3], [$2])])])
-dnl
-
 dnl AC_CONFIG_SUBDIRS does not allow configure options to be passed
 dnl to subdirs, this function allows that by creating a configure.gnu
 dnl script that prepends configure options and then calls the real

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

Summary of changes:
 .gitignore       | 12 ++++--------
 config_subdir.m4 | 14 --------------
 configure.ac     |  2 +-
 3 files changed, 5 insertions(+), 23 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository