gbranden pushed a commit to branch master
in repository groff.
commit 7258df3c8e8dfe041cc3b25f48fd34c8ccf11237
Author: G. Branden Robinson <[email protected]>
AuthorDate: Wed Jun 1 13:04:20 2022 -0500
m4/groff.m4: Partially revert change from 21 May.
* m4/groff.m4 (GROFF_PNMTOPS_NOSETPAGE): Partially revert change from 21
May and document why in a comment.
We require 'pnmtops' both for grohtml operation and generation of
doc/gnu.eps from repository/snapshot archive builds.
---
ChangeLog | 5 +++++
m4/groff.m4 | 20 ++++++++++----------
2 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 01a05a02..e4cff697 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2022-06-01 G. Branden Robinson <[email protected]>
+
+ * m4/groff.m4 (GROFF_PNMTOPS_NOSETPAGE): Partially revert change
+ from 21 May and document why in a comment.
+
2022-06-01 G. Branden Robinson <[email protected]>
* tmac/troffrc: Skip loading of "papersize.tmac" if not in troff
diff --git a/m4/groff.m4 b/m4/groff.m4
index 32d7f3de..002f0a47 100644
--- a/m4/groff.m4
+++ b/m4/groff.m4
@@ -381,20 +381,20 @@ AC_DEFUN([GROFF_PNMTOOLS_CAN_BE_QUIET], [
# Check whether pnmtops can handle the -nosetpage option.
+#
+# We require this both for grohtml operation and generation of
+# doc/gnu.eps from repository/snapshot archive builds.
AC_DEFUN([GROFF_PNMTOPS_NOSETPAGE], [
pnmtops_nosetpage="pnmtops $pnmtools_quiet"
- AC_REQUIRE([GROFF_CHECK_GROHTML_PROGRAMS])
- if test "$make_htmldoc" = yes
+ AC_REQUIRE([GROFF_PNMTOOLS_CAN_BE_QUIET])
+ AC_MSG_CHECKING([whether pnmtops accepts the '-nosetpage' option])
+ if echo P2 2 2 255 0 1 2 0 | pnmtops -nosetpage > /dev/null 2>&1
then
- AC_MSG_CHECKING([whether pnmtops accepts the '-nosetpage' option])
- if echo P2 2 2 255 0 1 2 0 | pnmtops -nosetpage > /dev/null 2>&1
- then
- AC_MSG_RESULT([yes])
- pnmtops_nosetpage="pnmtops $pnmtools_quiet -nosetpage"
- else
- AC_MSG_RESULT([no])
- fi
+ AC_MSG_RESULT([yes])
+ pnmtops_nosetpage="pnmtops $pnmtools_quiet -nosetpage"
+ else
+ AC_MSG_RESULT([no])
fi
AC_SUBST([pnmtops_nosetpage])
])
_______________________________________________
Groff-commit mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/groff-commit
