From 5d4b43d4ea54df2d9c0ab69d90781517cf98ae62 Mon Sep 17 00:00:00 2001 From: Denis 'GNUtoo' Carikli Date: Fri, 27 Sep 2024 02:12:30 +0200 Subject: [PATCH] website: configure.ac: always check for cat. In the Makefile we have the following: pages/footer.include: pages/footer.include.tmpl pages/footer-git-commit.include cat \ [...] This rule is valid reguardless of the '--without-guix' configure option, so we need to also check if cat is present when using guix to build the website. Signed-off-by: Denis 'GNUtoo' Carikli --- website/configure.ac | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/website/configure.ac b/website/configure.ac index 788dc5f..054e59d 100644 --- a/website/configure.ac +++ b/website/configure.ac @@ -86,6 +86,10 @@ AC_CHECK_PROG([FOUND_AWK], [awk], [awk]) AS_IF([test x"$FOUND_AWK" = x""], [AC_MSG_ERROR([awk was not found in PATH ($PATH)])]) +AC_CHECK_PROG([FOUND_CAT], [cat], [cat]) +AS_IF([test x"$FOUND_CAT" = x""], + [AC_MSG_ERROR([cat was not found in PATH ($PATH)])]) + AC_CHECK_PROG([FOUND_PRINTF], [printf], [printf]) AS_IF([test x"$FOUND_PRINTF" = x""], [AC_MSG_ERROR([printf was not found in PATH ($PATH)])]) @@ -112,12 +116,7 @@ AS_IF([test x"$guix" = x"yes"], [AC_MSG_ERROR( [guix was not found in PATH ($PATH)])])], - [AC_CHECK_PROG([FOUND_CAT], [cat], [cat]) - AS_IF([test x"$FOUND_CAT" = x""], - [AC_MSG_ERROR( - [cat was not found in PATH ($PATH)])]) - - AC_CHECK_PROG([FOUND_CP], [cp], [cp]) + [AC_CHECK_PROG([FOUND_CP], [cp], [cp]) AS_IF([test x"$FOUND_CP" = x""], [AC_MSG_ERROR( [cp was not found in PATH ($PATH)])])