summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--m4/groff.m415
2 files changed, 13 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index e4cff6974..c40a81351 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
2022-06-01 G. Branden Robinson <g.branden.robinson@gmail.com>
+ * m4/groff.m4 (GROFF_X11, GROFF_UCHARDET): Drop redundant
+ messages (which are easily overlooked amid the torrent of
+ "checking" output anyway). Discovery failures of X11 and the
+ unchardet library are already parts of the configuration report
+ at or near the end of output.
+
+2022-06-01 G. Branden Robinson <g.branden.robinson@gmail.com>
+
* m4/groff.m4 (GROFF_PNMTOPS_NOSETPAGE): Partially revert change
from 21 May and document why in a comment.
diff --git a/m4/groff.m4 b/m4/groff.m4
index 002f0a470..561a17219 100644
--- a/m4/groff.m4
+++ b/m4/groff.m4
@@ -1536,13 +1536,11 @@ AC_DEFUN([GROFF_X11],
LIBS=$OLDLIBS
fi
- if test "$groff_no_x" = yes; then
- AC_MSG_NOTICE([gxditview and xtotroff won't be built])
- else
- XDEVDIRS="font/devX75 font/devX75-12 font/devX100 font/devX100-12"
- XPROGDIRS="src/devices/xditview src/utils/xtotroff"
- XLIBDIRS="src/libs/libxutil"
- fi
+ if ! test "$groff_no_x" = yes; then
+ XDEVDIRS="font/devX75 font/devX75-12 font/devX100 font/devX100-12"
+ XPROGDIRS="src/devices/xditview src/utils/xtotroff"
+ XLIBDIRS="src/libs/libxutil"
+ fi
AC_SUBST([XDEVDIRS])
AC_SUBST([XPROGDIRS])
@@ -1704,9 +1702,6 @@ file encoding [=auto|no|yes]]))
if test "$with_uchardet" = yes
then
AC_MSG_FAILURE([could not find uchardet library])
- else
- AC_MSG_WARN([uchardet library not found; preconv will be \
-less functional])
fi
groff_have_uchardet=no])],
[groff_have_uchardet=no])