[COMMITTED] autoregen.py: Remove special cases for libgm2

[COMMITTED] autoregen.py: Remove special cases for libgm2

[Mark Wielaard]

gcc commit 67e66c973ce3 ("modula2: Regenerate libgm2 Makefile.ins using
correct include order") made it so libgm2 autotool files (including in
the directories under it) can now be simply be regenerated with
autoreconf -f.
---
 builder/containers/autoregen.py | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/builder/containers/autoregen.py b/builder/containers/autoregen.py
index 0d9318603647..7ac17c1b9dd8 100755
--- a/builder/containers/autoregen.py
+++ b/builder/containers/autoregen.py
@@ -56,10 +56,6 @@ MANUAL_CONF_DIRS = [
     ".",
     # autoreconf does not update aclocal.m4
     "fixincludes",
-    # Hack: ACLOCAL_AMFLAGS = -I .. -I ../config in Makefile.in but we
-    # apply -I../config -I.. otherwise we do not match the current
-    # contents
-    "libgm2",
     ]
 
 # Run the shell command CMD.
@@ -84,7 +80,7 @@ def regenerate_with_autogen():
 
 def regenerate_manually():
     configure_lines = open("configure.ac").read().splitlines()
-    if folder.stem == "fixincludes" or folder.stem == "libgm2" or any(
+    if folder.stem == "fixincludes" or any(
             True for line in configure_lines if line.startswith("AC_CONFIG_MACRO_DIR")
     ):
         include_arg = ""
@@ -96,10 +92,6 @@ def regenerate_manually():
             include_arg = "-I.."
             include_arg2 = "-I../config"
 
-        if folder.stem == "libgm2":
-            include_arg = "-I../config"
-            include_arg2 = "-I.."
-
         # aclocal does not support the -f short option for force
         run_shell(f"{ACLOCAL_BIN} --force {include_arg} {include_arg2}")
 
@@ -108,13 +100,6 @@ def regenerate_manually():
     ):
         run_shell(f"{AUTOHEADER_BIN} -f")
 
-    # The few lines below do not regenerate the exact same content as
-    # currently in the repo. Disable them for now.
-    # if (folder / "gm2-libs").is_dir():
-    #     run_shell(f"{AUTOCONF_BIN} -f gm2-libs/config-host.in > gm2-libs/config-host")
-    #     run_shell(f"{AUTOHEADER_BIN} gm2-libs/config-host.in")
-
-
     # apparently automake is somehow unstable -> skip it for gotools
     if any(
         True for line in configure_lines if line.startswith("AM_INIT_AUTOMAKE")
-- 
2.39.3