From 2a6f4151663ba1ca8df098a7daa773b37107127d Mon Sep 17 00:00:00 2001 From: Hans Ulrich Niedermann Date: Wed, 7 Feb 2024 16:14:52 +0100 Subject: [PATCH] Have autoreconf deal with initializing GNU build system Let the autoreconf tool handle the sequencing of tool calls. The autoreconf tool has been dealing with calling tools like aclocal, libtoolize, etc. quite well for about the last 20 years. This keeps the "bootstrap" script around to keep the old way of calling bootstrap working, i.e. maintain compatibility with the existing workflows. --- src/bootstrap | 8 +++----- src/configure.ac | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/bootstrap b/src/bootstrap index 207dc4c2..02163035 100755 --- a/src/bootstrap +++ b/src/bootstrap @@ -1,5 +1,6 @@ #! /bin/sh +: ${AUTORECONF="autoreconf${AC_VER}"} : ${AUTOHEADER="autoheader${AC_VER}"} : ${AUTOCONF="autoconf${AC_VER}"} : ${ACLOCAL="aclocal${AM_VER}"} @@ -17,9 +18,6 @@ rm -rf autom4te.cache # probe for that LIBTOOLIZE=libtoolize glibtoolize --version > /dev/null 2>&1 && LIBTOOLIZE=glibtoolize -${LIBTOOLIZE} +export LIBTOOLIZE -${ACLOCAL} -${AUTOHEADER} -${AUTOCONF} -${AUTOMAKE} -a -c +${AUTORECONF} -i diff --git a/src/configure.ac b/src/configure.ac index 9734c312..deab8b5c 100644 --- a/src/configure.ac +++ b/src/configure.ac @@ -20,7 +20,7 @@ # $Id$ # -# Process this file with autoconf to produce a configure script. +# Process this file with autoreconf to produce a configure script. AC_PREREQ(2.60) AC_INIT([avrdude],