chore(build): Use new AX macro as submitted upstream

build-aux/ax_require_prog.m4

@@ -0,0 +1,49 @@
+# ===========================================================================
+#     https://www.gnu.org/software/autoconf-archive/ax_require_prog.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_REQUIRE_PROG([EXECUTABLE], [VARIABLE])
+#
+# DESCRIPTION
+#
+#   Locates an installed binary program that is a prerequisite to continue.
+#   Uses AX_WITH_PROG under the hood, but follows up the check with an error
+#   if no executable could be located.
+#
+#   Example usage:
+#
+#     AX_REQUIRE_PROG(git-warp-time)
+#
+#   Note: If the second argument is not provided, a default value of
+#   VARIABLE is automatically derived from the executable name by upper
+#   casing it and substituting any dashes or periods with underscores. In
+#   the example above the resulting precious variable would be
+#   GIT_WARP_TIME.
+#
+# LICENSE
+#
+#   Copyright (c) 2021 Caleb Maclennan <[email protected]>
+#
+#   Copying and distribution of this file, with or without modification, are
+#   permitted in any medium without royalty provided the copyright notice
+#   and this notice are preserved. This file is offered as-is, without any
+#   warranty.
+
+#serial 1
+
+AC_DEFUN([AX_REQUIRE_PROG], [
+    AC_PREREQ([2.61])
+
+    pushdef([EXECUTABLE],$1)
+    pushdef([VARIABLE],m4_default($2,m4_toupper(m4_translit($1,-.,__))))
+
+    AX_WITH_PROG(VARIABLE,EXECUTABLE)
+    AS_IF([test "x$with_$1" != xno && test -z "$VARIABLE"], [
+        AC_MSG_ERROR([EXECUTABLE is required])
+    ])
+
+    popdef([VARIABLE])
+    popdef([EXECUTABLE])
+])

build-aux/que_dist_checksums.m4

@@ -9,8 +9,8 @@ EXTRA_DIST += build-aux/que_dist_checksums.am
 
         AM_COND_IF([DEVELOPER_MODE], [
 
-                QUE_PROGVAR([sha256sum])
-                QUE_PROGVAR([tee])
+                AX_REQUIRE_PROG(sha256sum)
+                AX_REQUIRE_PROG(tee)
 
                 AX_ADD_AM_MACRO([dnl
 $(cat build-aux/que_dist_checksums.am)

build-aux/que_docker_boilerplate.m4

@@ -5,7 +5,7 @@ AC_DEFUN_ONCE([QUE_DOCKER_BOILERPLATE], [
         AC_MSG_NOTICE([checking for tools used by automake to build Docker projects])
         AC_PROG_INSTALL
         AM_COND_IF([DEVELOPER_MODE], [
-                QUE_PROGVAR([docker])
+                AX_REQUIRE_PROG(docker)
         ])
 
         AC_REQUIRE([AX_AM_MACROS])

build-aux/que_git_version.m4

@@ -14,7 +14,7 @@ AC_DEFUN_ONCE([QUE_GIT_VERSION], [
 
         QUE_TRANSFORM_PACKAGE_NAME
 
-        AM_COND_IF([SOURCE_IS_DIST], [], [QUE_PROGVAR([cmp])])
+        AM_COND_IF([SOURCE_IS_DIST], [], [AX_REQUIRE_PROG(cmp)])
 
         AC_REQUIRE([AX_AM_MACROS])
         AX_ADD_AM_MACRO([dnl

build-aux/que_rust_boilerplate.m4

@@ -12,14 +12,14 @@ AC_DEFUN_ONCE([QUE_RUST_BOILERPLATE], [
         AC_MSG_NOTICE([checking for tools used by automake to build Rust projects])
         AC_PROG_INSTALL
         AC_PROG_SED
-        QUE_PROGVAR([cargo])
-        QUE_PROGVAR([jq])
-        QUE_PROGVAR([rustc])
-        QUE_PROGVAR([cmp])
-        QUE_PROGVAR([xargs])
+        AX_REQUIRE_PROG(cargo)
+        AX_REQUIRE_PROG(jq)
+        AX_REQUIRE_PROG(rustc)
+        AX_REQUIRE_PROG(cmp)
+        AX_REQUIRE_PROG(xargs)
         AM_COND_IF([DEVELOPER_MODE], [
-                QUE_PROGVAR([git])
-                QUE_PROGVAR([rustfmt])
+                AX_REQUIRE_PROG(git)
+                AX_REQUIRE_PROG(rustfmt)
         ])
 
         AC_MSG_CHECKING([whether to build Rust code with debugging information])

configure.ac

@@ -15,12 +15,12 @@ QUE_DIST_CHECKSUMS
 AC_PROG_AWK
 AC_PROG_GREP
 AC_PROG_SED
-QUE_PROGVAR([cmp])
-QUE_PROGVAR([find])
-QUE_PROGVAR([jq])
-QUE_PROGVAR([sort])
-QUE_PROGVAR([xargs])
-QUE_PROGVAR([yarn])
+AX_REQUIRE_PROG(cmp)
+AX_REQUIRE_PROG(find)
+AX_REQUIRE_PROG(jq)
+AX_REQUIRE_PROG(sort)
+AX_REQUIRE_PROG(xargs)
+AX_REQUIRE_PROG(yarn)
 
 QUE_RUST_BOILERPLATE
 QUE_DOCKER_BOILERPLATE
@@ -40,52 +40,52 @@ AM_COND_IF([DEPENDENCY_CHECKS], [
     AC_PROG_EGREP
     AC_PROG_INSTALL
     AC_PROG_MKDIR_P
-    QUE_PROGVAR([bc])
-    QUE_PROGVAR([curl])
-    QUE_PROGVAR([cut])
-    QUE_PROGVAR([date])
-    QUE_PROGVAR([decasify])
-    QUE_PROGVAR([deepl])
-    QUE_PROGVAR([diff])
-    QUE_PROGVAR([entr])
-    QUE_PROGVAR([epubcheck])
-    QUE_PROGVAR([fcconflist], [fc-conflist])
-    QUE_PROGVAR([flock])
-    QUE_PROGVAR([git])
-    QUE_PROGVAR([gitwarptime], [git-warp-time])
-    QUE_PROGVAR([gs])
-    QUE_PROGVAR([hostnamebin], [hostname])
-    QUE_PROGVAR([inkscape])
-    QUE_PROGVAR([kindlegen])
-    QUE_PROGVAR([luarocks])
-    QUE_PROGVAR([m4])
-    QUE_PROGVAR([magick])
-    QUE_PROGVAR([mdbook])
-    QUE_PROGVAR([node])
-    QUE_PROGVAR([pandoc])
-    QUE_PROGVAR([parallel])
-    QUE_PROGVAR([pcregrep])
-    QUE_PROGVAR([pdfbook2])
-    QUE_PROGVAR([pdfinfo])
-    QUE_PROGVAR([pdfjam])
-    QUE_PROGVAR([pdftk])
-    QUE_PROGVAR([pgrep])
-    QUE_PROGVAR([podofobox])
-    QUE_PROGVAR([povray])
-    QUE_PROGVAR([rg])
-    QUE_PROGVAR([sassc])
-    QUE_PROGVAR([sile])
-    QUE_PROGVAR([sponge])
-    QUE_PROGVAR([sqlite3])
-    QUE_PROGVAR([stat])
-    QUE_PROGVAR([truncate])
-    QUE_PROGVAR([wc])
-    QUE_PROGVAR([xcf2png])
-    QUE_PROGVAR([xvfbrun], [xvfb-run])
-    QUE_PROGVAR([yq])
-    QUE_PROGVAR([zint])
-    QUE_PROGVAR([zola])
-    QUE_PROGVAR([zsh])
+    AX_REQUIRE_PROG(bc)
+    AX_REQUIRE_PROG(curl)
+    AX_REQUIRE_PROG(cut)
+    AX_REQUIRE_PROG(date)
+    AX_REQUIRE_PROG(decasify)
+    AX_REQUIRE_PROG(deepl)
+    AX_REQUIRE_PROG(diff)
+    AX_REQUIRE_PROG(entr)
+    AX_REQUIRE_PROG(epubcheck)
+    AX_REQUIRE_PROG(fc-conflist)
+    AX_REQUIRE_PROG(flock)
+    AX_REQUIRE_PROG(git)
+    AX_REQUIRE_PROG(git-warp-time)
+    AX_REQUIRE_PROG(gs)
+    AX_REQUIRE_PROG(hostname, HOSTNAMEBIN)
+    AX_REQUIRE_PROG(inkscape)
+    AX_REQUIRE_PROG(kindlegen)
+    AX_REQUIRE_PROG(luarocks)
+    AX_REQUIRE_PROG(m4)
+    AX_REQUIRE_PROG(magick)
+    AX_REQUIRE_PROG(mdbook)
+    AX_REQUIRE_PROG(node)
+    AX_REQUIRE_PROG(pandoc)
+    AX_REQUIRE_PROG(parallel)
+    AX_REQUIRE_PROG(pcregrep)
+    AX_REQUIRE_PROG(pdfbook2)
+    AX_REQUIRE_PROG(pdfinfo)
+    AX_REQUIRE_PROG(pdfjam)
+    AX_REQUIRE_PROG(pdftk)
+    AX_REQUIRE_PROG(pgrep)
+    AX_REQUIRE_PROG(podofobox)
+    AX_REQUIRE_PROG(povray)
+    AX_REQUIRE_PROG(rg)
+    AX_REQUIRE_PROG(sassc)
+    AX_REQUIRE_PROG(sile)
+    AX_REQUIRE_PROG(sponge)
+    AX_REQUIRE_PROG(sqlite3)
+    AX_REQUIRE_PROG(stat)
+    AX_REQUIRE_PROG(truncate)
+    AX_REQUIRE_PROG(wc)
+    AX_REQUIRE_PROG(xcf2png)
+    AX_REQUIRE_PROG(xvfb-run)
+    AX_REQUIRE_PROG(yq)
+    AX_REQUIRE_PROG(zint)
+    AX_REQUIRE_PROG(zola)
+    AX_REQUIRE_PROG(zsh)
 
     AC_MSG_CHECKING(whether pandoc has SILE Writer)
     AS_IF([$PANDOC --list-output-formats | $GREP -qx sile],[
@@ -126,14 +126,14 @@ AM_COND_IF([DEPENDENCY_CHECKS], [
 ])
 
 AM_COND_IF([DEVELOPER_TOOLS], [
-    QUE_PROGVAR([cargosetversion], [cargo-set-version])
-    QUE_PROGVAR([checkmake])
-    QUE_PROGVAR([luacheck])
-    QUE_PROGVAR([ruff])
-    QUE_PROGVAR([stylua])
-    QUE_PROGVAR([taplo])
-    QUE_PROGVAR([tr])
-    QUE_PROGVAR([typos])
+    AX_REQUIRE_PROG(cargo-set-version)
+    AX_REQUIRE_PROG(checkmake)
+    AX_REQUIRE_PROG(luacheck)
+    AX_REQUIRE_PROG(ruff)
+    AX_REQUIRE_PROG(stylua)
+    AX_REQUIRE_PROG(taplo)
+    AX_REQUIRE_PROG(tr)
+    AX_REQUIRE_PROG(typos)
 ])
 
 # Avoid the need for `--datarootdir=$(cd ..; pwd)` to run directly from

rules/casile.mk.in

@@ -56,11 +56,11 @@ DIFF ?= @DIFF@
 EGREP ?= @EGREP@
 ENTR ?= @ENTR@
 EPUBCHECK ?= @EPUBCHECK@
-FCCONFLIST ?= @FCCONFLIST@
+FC_CONFLIST ?= @FC_CONFLIST@
 FIND ?= @FIND@
 FLOCK ?= @FLOCK@
 GIT ?= @GIT@
-GITWARPTIME ?= @GITWARPTIME@
+GIT_WARP_TIME ?= @GIT_WARP_TIME@
 GREP ?= @GREP@
 GS ?= @GS@
 HOSTNAMEBIN ?= @HOSTNAMEBIN@
@@ -99,7 +99,7 @@ TRUNCATE ?= @TRUNCATE@
 WC ?= @WC@
 XARGS ?= @XARGS@
 XCF2PNG ?= @XCF2PNG@
-XVFBRUN ?= @XVFBRUN@
+XVFB_RUN ?= @XVFB_RUN@
 YQ ?= @YQ@
 ZINT ?= @ZINT@
 ZOLA ?= @ZOLA@

rules/functions.mk

@@ -93,7 +93,7 @@ endef
 
 define time_warp ?=
 	cd $1
-	$(GITWARPTIME)
+	$(GIT_WARP_TIME)
 endef
 
 define versioninfo ?=

rules/rules.mk

@@ -504,7 +504,7 @@ $(BUILDDIR)/casile.lua: | $(BUILDDIR)
 		return { _name = "casile", type = "casile" }
 	EOF
 
-$(FCCONFIG): FCDEFAULT ?= $(shell $(_ENV) env -u FONTCONFIG_FILE $(FCCONFLIST) | $(AWK) -F'[ :]' '/Default configuration file/ { print $$2 }')
+$(FCCONFIG): FCDEFAULT ?= $(shell $(_ENV) env -u FONTCONFIG_FILE $(FC_CONFLIST) | $(AWK) -F'[ :]' '/Default configuration file/ { print $$2 }')
 $(FCCONFIG): | $(BUILDDIR)
 	cat <<- EOF > $@
 		<?xml version="1.0"?>
@@ -914,7 +914,7 @@ $(BUILDDIR)/%-$(_binding).svg: $(CASILEDIR)/binding.svg $$(basename $$@)-printco
 	$(sourcegeometry)
 	env HOME=$(BUILDDIR) \
 		$(and $(CASILE_SINGLEXVFBJOB),$(FLOCK) $(BUILDDIR)/lock-xvfb) \
-		$(XVFBRUN) -d $(INKSCAPE) $< \
+		$(XVFB_RUN) -d $(INKSCAPE) $< \
 		--batch-process \
 		--export-dpi=$${hidpi} \
 		--export-area-page \