[PATCH] Tweak autoregen.py to handle sub/sub/dir AC_CONFIG_MACRO_DIRS

[PATCH] Tweak autoregen.py to handle sub/sub/dir AC_CONFIG_MACRO_DIRS

[Mark Wielaard]

This is really a hack just for binutils-gdb/gprofng/libcollector.
Make sure that the order of includes is done as --enable-maintainer-mode.

Also add more symlinks for aclocal-1.15 and automake-1.15.
---
 builder/containers/Containerfile-autotools | 2 ++
 builder/containers/autoregen.py            | 8 +++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/builder/containers/Containerfile-autotools b/builder/containers/Containerfile-autotools
index 1099986..00401ad 100644
--- a/builder/containers/Containerfile-autotools
+++ b/builder/containers/Containerfile-autotools
@@ -30,10 +30,12 @@ RUN wget https://ftp.gnu.org/gnu/autoconf/autoconf-2.69.tar.gz && \
 # Make sure we also have unversioned binaries so the system versions
 # aren't used
 RUN cd /usr/local/bin && \
+    ln -s aclocal-1.15 aclocal && \
     ln -s aclocal-1.15.1 aclocal && \
     ln -s autoconf-2.69 autoconf && \
     ln -s autoheader-2.69 autoheader && \
     ln -s autom4te-2.69 autom4te && \
+    ln -s automake-1.15 automake && \
     ln -s automake-1.15.1 automake && \
     ln -s autoreconf-2.69 autoreconf && \
     ln -s autoscan-2.69 autoscan && \
diff --git a/builder/containers/autoregen.py b/builder/containers/autoregen.py
index bd200be..bfb8f3d 100755
--- a/builder/containers/autoregen.py
+++ b/builder/containers/autoregen.py
@@ -29,9 +29,15 @@ for folder in sorted(config_folders):
     if any(True for line in configure_lines if line.startswith('AC_CONFIG_MACRO_DIRS')):
         # aclocal does not support the -f short option for force
         include_arg = ''
+        include_arg2 = ''
         if (folder / '..' / 'config').is_dir():
             include_arg = '-I../config'
-        subprocess.check_output(f'{ENV} {ACLOCAL_BIN} --force {include_arg}', shell=True, encoding='utf8')
+        # this is really a hack just for binutils-gdb/gprofng/libcollector
+        # make sure that the order of includes is done as --enable-maintainer-mode
+        if (folder / '..' / '..' / 'config').is_dir():
+            include_arg = '-I../..'
+            include_arg2 = '-I../../config'
+        subprocess.check_output(f'{ENV} {ACLOCAL_BIN} --force {include_arg} {include_arg2}', shell=True, encoding='utf8')
     if ((folder / 'config.in').is_file()
         or any(True for line in configure_lines if line.startswith('AC_CONFIG_HEADERS'))):
         subprocess.check_output(f'{ENV} {AUTOHEADER_BIN} -f', shell=True, encoding='utf8')
-- 
2.39.3