Skip to content

Commit 4ea0843

Browse files
committed
Autogen: Add support for automake 1.18
autogen.sh manually checks acceptable versions of automake. Automake uses 1.18 on Arch so updating autogen version list to reflect that.
1 parent c1779af commit 4ea0843

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

autogen.sh

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
# tools and you shouldn't use this script. Just call ./configure
1010
# directly.
1111

12-
ACLOCAL=${ACLOCAL-aclocal-1.17}
12+
ACLOCAL=${ACLOCAL-aclocal-1.18}
1313
AUTOCONF=${AUTOCONF-autoconf}
1414
AUTOHEADER=${AUTOHEADER-autoheader}
15-
AUTOMAKE=${AUTOMAKE-automake-1.17}
15+
AUTOMAKE=${AUTOMAKE-automake-1.18}
1616
LIBTOOLIZE=${LIBTOOLIZE-libtoolize}
1717
PYTHON=${PYTHON-python}
1818

@@ -128,6 +128,9 @@ printf "checking for automake >= $AUTOMAKE_REQUIRED_VERSION ... "
128128
if ($AUTOMAKE --version) < /dev/null > /dev/null 2>&1; then
129129
AUTOMAKE=$AUTOMAKE
130130
ACLOCAL=$ACLOCAL
131+
elif (automake-1.18 --version) < /dev/null > /dev/null 2>&1; then
132+
AUTOMAKE=automake-1.18
133+
ACLOCAL=aclocal-1.18
131134
elif (automake-1.17 --version) < /dev/null > /dev/null 2>&1; then
132135
AUTOMAKE=automake-1.17
133136
ACLOCAL=aclocal-1.17

0 commit comments

Comments
 (0)