[PATCH 5/8] autoregen.py: add non-suffixed version of the tools

[Simon Marchi <simon.marchi@efficios.com>]

My setup is that I have the appropriate versions of the autotools in
/opt/autostuff/bin.  They are not suffixed with their versions.  To
allow me to run the script locally, add non-suffixed names at the end of
the possible names lists.
---
 builder/containers/autoregen.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/builder/containers/autoregen.py b/builder/containers/autoregen.py
index e63436111246..6560077a406b 100755
--- a/builder/containers/autoregen.py
+++ b/builder/containers/autoregen.py
@@ -8,10 +8,10 @@ from pathlib import Path
 
 # On Gentoo, vanilla unpatched autotools are packaged separately.
 # We place the vanilla names first as we want to prefer those if both exist.
-AUTOCONF_NAMES = ["autoconf-vanilla-2.69", "autoconf-2.69"]
-AUTOMAKE_NAMES = ["automake-vanilla-1.15", "automake-1.15.1"]
-ACLOCAL_NAMES = ["aclocal-vanilla-1.15", "aclocal-1.15.1"]
-AUTOHEADER_NAMES = ["autoheader-vanilla-2.69", "autoheader-2.69"]
+AUTOCONF_NAMES = ["autoconf-vanilla-2.69", "autoconf-2.69", "autoconf"]
+AUTOMAKE_NAMES = ["automake-vanilla-1.15", "automake-1.15.1", "automake"]
+ACLOCAL_NAMES = ["aclocal-vanilla-1.15", "aclocal-1.15.1", "aclocal"]
+AUTOHEADER_NAMES = ["autoheader-vanilla-2.69", "autoheader-2.69", "autoheader"]
 
 # Pick the first for each list that exists on this system.
 AUTOCONF_BIN = next(name for name in AUTOCONF_NAMES if shutil.which(name))
@@ -23,8 +23,8 @@ AUTOHEADER_BIN = next(name for name in AUTOHEADER_NAMES if shutil.which(name))
 # It's harmless to set it on other systems though.
 ENV = " ".join(
     (
-        f'WANT_AUTOCONF={AUTOCONF_BIN.split("-", 1)[1]}',
-        f'WANT_AUTOMAKE={AUTOMAKE_BIN.split("-", 1)[1]}',
+        f'WANT_AUTOCONF={AUTOCONF_BIN.split("-", 1)[1] if "-" in AUTOCONF_BIN else ""}',
+        f'WANT_AUTOMAKE={AUTOMAKE_BIN.split("-", 1)[1] if "-" in AUTOMAKE_BIN else ""}',
         f"AUTOCONF={AUTOCONF_BIN}",
         f"ACLOCAL={ACLOCAL_BIN}",
         f"AUTOMAKE={AUTOMAKE_BIN}",
-- 
2.44.0