gbranden pushed a commit to branch branden-2023-07-05
in repository groff.
commit a5759458a579b4d5a7df47f9f7d19bfad14680d9
Author: G. Branden Robinson <[email protected]>
AuthorDate: Mon Mar 13 22:23:02 2023 -0500
[build]: Clarify GROFF_TMAC Autoconf test output.
* configure.ac: Correct characterization of the list of macro packages
reported. It is not the list of macro packages receiving a "g"
prefix, but the list of macro packages reciving a wrapper macro file
in groff's macro directory, each of which sources the corresponding
system (likely AT&T-descended troff) macro package. Fixes wording I
introduced in commit 4d30dd7424, 31 May.
* m4/groff.m4 (GROFF_TMAC): Clarify first "checking" message: we are
looking for a file name prefix on existing system macro packages (like
"tmac."). This has nothing to do with the prefix applied to groff
commands, or the "g" prefixed to groff implementations of the man, mm,
and ms packages. Tighten wording of second "checking" message.
Consistently say "(none)" instead of "none" or "none found".
---
ChangeLog | 21 +++++++++++++++++++++
configure.ac | 2 +-
m4/groff.m4 | 8 ++++----
3 files changed, 26 insertions(+), 5 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 4a2e2f94a..8bf2ef0d4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,24 @@
+2023-03-13 G. Branden Robinson <[email protected]>
+
+ [build]: Clarify output of `GROFF_TMAC` Autoconf test.
+
+ * configure.ac: Correct characterization of the list of macro
+ packages reported. It is not the list of macro packages
+ receiving a "g" prefix, but the list of macro packages reciving
+ a wrapper macro file in groff's macro directory, each of which
+ sources the corresponding system (likely AT&T-descended troff)
+ macro package. Fixes wording I introduced in commit 4d30dd7424,
+ 31 May.
+ * m4/groff.m4 (GROFF_TMAC): Clarify first "checking" message:
+ we are looking for a file name prefix on existing system macro
+ packages (like "tmac."). This has nothing to do with the prefix
+ applied to groff commands, or the "g" prefixed to groff
+ implementations of the man, mm, and ms packages. Tighten
+ wording of second "checking" message. Consistently say "(none)"
+ instead of "none" or "none found".
+
+ Fixes <https://savannah.gnu.org/bugs/?63900>.
+
2023-03-11 G. Branden Robinson <[email protected]>
* doc/doc.am (install-txt): Look for "groff.txt" in the source
diff --git a/configure.ac b/configure.ac
index 4b1e92fb1..6baeaaf53 100644
--- a/configure.ac
+++ b/configure.ac
@@ -222,7 +222,7 @@ then
if test -n "$tmac_wrap"
then
echo "\
- prefix used for macro packages : $tmac_wrap"
+ wrappers used for macro packages : $tmac_wrap"
fi
fi
echo "\
diff --git a/m4/groff.m4 b/m4/groff.m4
index c514b6a1a..fb1157e06 100644
--- a/m4/groff.m4
+++ b/m4/groff.m4
@@ -1118,7 +1118,7 @@ fopen(0, 0);
AC_DEFUN([GROFF_TMAC],
- [AC_MSG_CHECKING([for prefix of system macro packages])
+ [AC_MSG_CHECKING([file name prefix of system macro packages])
sys_tmac_prefix=
sys_tmac_file_prefix=
for d in /usr/share/lib/tmac /usr/lib/tmac
@@ -1138,13 +1138,13 @@ AC_DEFUN([GROFF_TMAC],
done
done
done
- sys_tmac_prefix_result=none
+ sys_tmac_prefix_result='(none)'
test -z "$sys_tmac_prefix" \
|| sys_tmac_prefix_result="$sys_tmac_prefix"
AC_MSG_RESULT([$sys_tmac_prefix_result])
AC_SUBST([sys_tmac_prefix])
- AC_MSG_CHECKING([which system macro packages should be made available])
+ AC_MSG_CHECKING([for system macro packages to make available])
tmac_wrap=
if test "$sys_tmac_file_prefix" = tmac.
then
@@ -1192,7 +1192,7 @@ AC_DEFUN([GROFF_TMAC],
done
rm -f conftest.sol
fi
- tmac_wrap_result="none found"
+ tmac_wrap_result='(none)'
test -z "$tmac_wrap" || tmac_wrap_result="$tmac_wrap"
AC_MSG_RESULT([$tmac_wrap_result])
AC_SUBST([tmac_wrap])
_______________________________________________
Groff-commit mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/groff-commit
