gbranden pushed a commit to branch master
in repository groff.
commit ab2f501008b05f27347f1ecf1966467a5324f507
Author: G. Branden Robinson <[email protected]>
AuthorDate: Fri Mar 28 03:52:49 2025 -0500
m4/groff.m4: Fix missing macro dependency.
* m4/groff.m4 (GROFF_PROG_SH_IS_POSIX_8_CONFORMING): Add `AC_REQUIRE` on
`GROFF_PROG_TEST_SUPPORTS_EF_OPTION`, because we need the shell
variable `test_ef_works` to be populated. Also fix latent syntax
error.
* configure.ac: Drop `GROFF_PROG_TEST_SUPPORTS_EF_OPTION`, now
depended-upon inside "groff.m4".
Continues commit 4555d9be39, 22 December.
---
ChangeLog | 9 +++++++++
configure.ac | 1 -
m4/groff.m4 | 7 ++++---
3 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 243c1cc78..1949813cf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2025-03-28 G. Branden Robinson <[email protected]>
+
+ * m4/groff.m4 (GROFF_PROG_SH_IS_POSIX_8_CONFORMING): Add
+ `AC_REQUIRE` on `GROFF_PROG_TEST_SUPPORTS_EF_OPTION`, because we
+ need the shell variable `test_ef_works` to be populated. Also
+ fix latent m4 syntax error.
+ * configure.ac: Drop `GROFF_PROG_TEST_SUPPORTS_EF_OPTION`, now
+ depended-upon inside "groff.m4".
+
2025-03-28 G. Branden Robinson <[email protected]>
* gnulib: Update stable/2025-01 branch to commit 3fbc2c7bb3, 3
diff --git a/configure.ac b/configure.ac
index be0360fd9..fd777eb59 100644
--- a/configure.ac
+++ b/configure.ac
@@ -161,7 +161,6 @@ GROFF_PNMTOOLS_CAN_BE_QUIET
GROFF_PNMTOPS_NOSETPAGE
GROFF_MAKE_DEFINES_RM
GROFF_DIFF_D
-GROFF_PROG_TEST_SUPPORTS_EF_OPTION
GROFF_PROG_SH_IS_POSIX_8_CONFORMING
GROFF_GHOSTSCRIPT_VERSION_CHECK
gl_GLIBC21
diff --git a/m4/groff.m4 b/m4/groff.m4
index 142820737..e62385c89 100644
--- a/m4/groff.m4
+++ b/m4/groff.m4
@@ -1,5 +1,5 @@
# Autoconf macros for groff.
-# Copyright (C) 1989-2024 Free Software Foundation, Inc.
+# Copyright (C) 1989-2025 Free Software Foundation, Inc.
#
# This file is part of groff.
#
@@ -1813,13 +1813,14 @@ AC_DEFUN([GROFF_PROG_TEST_SUPPORTS_EF_OPTION],
# (or earlier) shell features, if we happen to rely upon them. Solaris
# 10 /bin/sh is notoriously incapable.
-AC_DEFUN([GROFF_PROG_SH_IS_POSIX_8_CONFORMING],
+AC_DEFUN([GROFF_PROG_SH_IS_POSIX_8_CONFORMING], [
+ AC_REQUIRE([GROFF_PROG_TEST_SUPPORTS_EF_OPTION])
POSIX_SHELL_PROG=/bin/sh
if test "$test_ef_works" = no
then
# Use Bash if it is available; otherwise programs must complain at
# runtime if the environment is non-conforming to POSIX.
- [AC_PATH_PROGS([POSIX_SHELL_PROG], [bash], [no])
+ AC_PATH_PROGS([POSIX_SHELL_PROG], [bash], [no])
fi
AC_SUBST([POSIX_SHELL_PROG])
])
_______________________________________________
groff-commit mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/groff-commit
