From 14b3671b40e1cc64f7217381431f2b81b448bec8 Mon Sep 17 00:00:00 2001 From: Caleb Maclennan Date: Sun, 8 Dec 2024 23:24:47 +0300 Subject: [PATCH] refactor(build): Wrap tooling checks so duplicates don't need to be rerun --- build-aux/que_docker_boilerplate.m4 | 2 +- build-aux/que_font.m4 | 2 +- build-aux/que_git_version.m4 | 4 ++-- build-aux/que_rust_boilerplate.m4 | 4 ++-- build-aux/que_transform_package_name.m4 | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build-aux/que_docker_boilerplate.m4 b/build-aux/que_docker_boilerplate.m4 index 066bf3e13..e3e282b2e 100644 --- a/build-aux/que_docker_boilerplate.m4 +++ b/build-aux/que_docker_boilerplate.m4 @@ -3,7 +3,7 @@ AC_DEFUN_ONCE([QUE_DOCKER_BOILERPLATE], [ QUE_TRANSFORM_PACKAGE_NAME AC_MSG_NOTICE([checking for tools used by automake to build Docker projects]) - AC_PROG_INSTALL + AC_REQUIRE([AC_PROG_INSTALL]) AM_COND_IF([DEVELOPER_MODE], [ QUE_PROGVAR([docker]) ]) diff --git a/build-aux/que_font.m4 b/build-aux/que_font.m4 index 9599b3940..fd524d98f 100644 --- a/build-aux/que_font.m4 +++ b/build-aux/que_font.m4 @@ -1,5 +1,5 @@ AC_DEFUN([QUE_FONT], [ - AC_PROG_GREP + AC_REQUIRE([AC_PROG_GREP]) if test -z "$FCMATCH"; then AC_PATH_PROG(FCMATCH, fc-match) if test -z "$FCMATCH"; then diff --git a/build-aux/que_git_version.m4 b/build-aux/que_git_version.m4 index f91ca11b2..792067773 100644 --- a/build-aux/que_git_version.m4 +++ b/build-aux/que_git_version.m4 @@ -9,8 +9,8 @@ AC_DEFUN_ONCE([QUE_GIT_VERSION], [ AM_CONDITIONAL([SOURCE_IS_ARCHIVE], [test ! -d .git -a ! -f .tarball-version]) - AC_PROG_AWK - AC_PROG_GREP + AC_REQUIRE([AC_PROG_AWK]) + AC_REQUIRE([AC_PROG_GREP]) QUE_TRANSFORM_PACKAGE_NAME diff --git a/build-aux/que_rust_boilerplate.m4 b/build-aux/que_rust_boilerplate.m4 index 050afbf4e..1bfdb60f3 100644 --- a/build-aux/que_rust_boilerplate.m4 +++ b/build-aux/que_rust_boilerplate.m4 @@ -10,8 +10,8 @@ AC_DEFUN_ONCE([QUE_RUST_BOILERPLATE], [ AM_CONDITIONAL([DEBUG_RELEASE], [test "x$debug_release" = "xyes"]) AC_MSG_NOTICE([checking for tools used by automake to build Rust projects]) - AC_PROG_INSTALL - AC_PROG_SED + AC_REQUIRE([AC_PROG_INSTALL]) + AC_REQUIRE([AC_PROG_SED]) QUE_PROGVAR([cargo]) QUE_PROGVAR([jq]) QUE_PROGVAR([rustc]) diff --git a/build-aux/que_transform_package_name.m4 b/build-aux/que_transform_package_name.m4 index ee1e89726..477245b42 100644 --- a/build-aux/que_transform_package_name.m4 +++ b/build-aux/que_transform_package_name.m4 @@ -5,7 +5,7 @@ AC_DEFUN_ONCE([QUE_TRANSFORM_PACKAGE_NAME], [ - AC_PROG_SED + AC_REQUIRE([AC_PROG_SED]) TRANSFORMED_PACKAGE_NAME="$(printf "$PACKAGE_NAME" | $SED -e "$(printf "$program_transform_name" | $SED -e 's/\$\$/\$/')")" AC_SUBST([TRANSFORMED_PACKAGE_NAME])