summaryrefslogtreecommitdiff
path: root/m4
diff options
context:
space:
mode:
authorG. Branden Robinson <g.branden.robinson@gmail.com>2022-06-01 13:04:20 -0500
committerG. Branden Robinson <g.branden.robinson@gmail.com>2022-06-02 21:26:03 -0500
commit7258df3c8e8dfe041cc3b25f48fd34c8ccf11237 (patch)
treedc385af10865ab8a8810c28390699a03c786052d /m4
parentb6f7f3947342210db25286e9387d922a2487d736 (diff)
downloadgroff-git-7258df3c8e8dfe041cc3b25f48fd34c8ccf11237.tar.gz
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.
Diffstat (limited to 'm4')
-rw-r--r--m4/groff.m420
1 files changed, 10 insertions, 10 deletions
diff --git a/m4/groff.m4 b/m4/groff.m4
index 32d7f3de0..002f0a470 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])
])