From ab485f6ef4a12681dfad046be802ab86eb19c0fe Mon Sep 17 00:00:00 2001
From: Simon McVittie <[EMAIL REDACTED]>
Date: Thu, 5 May 2022 17:57:33 +0100
Subject: [PATCH] autogen.sh: Drastically simplify autoconf detection
Autoconf 2.59 is very old, so just use ordinary autoconf, with an
environment variable override to be nice to people with a non-standard
version.
Now that we're running under `set -e`, the script will exit with an
error if automake fails, so we don't need any `|| exit 1` here.
Signed-off-by: Simon McVittie <smcv@collabora.com>
---
autogen.sh | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/autogen.sh b/autogen.sh
index 64417764..66e4e8e6 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -5,16 +5,8 @@ set -e
echo "Generating build information using autoconf"
echo "This may take a while ..."
-# Regenerate configuration files
cat acinclude/* >aclocal.m4
-found=false
-for autoconf in autoconf autoconf259 autoconf-2.59
-do if which $autoconf >/dev/null 2>&1; then $autoconf && found=true; break; fi
-done
-if test x$found = xfalse; then
- echo "Couldn't find autoconf, aborting"
- exit 1
-fi
+"${AUTOCONF:-autoconf}"
# Run configure for this platform
echo "Now you are ready to run ./configure"