gbranden pushed a commit to branch master
in repository groff.

commit 96b8274a900d91a53c3bf570d82234be6506204a
Author: G. Branden Robinson <[email protected]>
AuthorDate: Wed Oct 14 08:06:03 2026 -0500

    m4/groff.m4: Fix Savannah #68775.
    
    * m4/groff.m4 (GROFF_G): Fix logic botch; we were treating the total
      absence of an installed `troff` from the build environment as
      equivalent to a groff-incompatible one being present.  That was
      incorrect.  Do not apply a command prefix when no troff is present.
    
    Fixes <https://savannah.gnu.org/bugs/?68775>.  Thanks to Alexis
    Hildebrandt for the report.  Problem introduced by me in commit
    142b8d93fc, 8 October.
---
 ChangeLog   | 12 ++++++++++++
 m4/groff.m4 | 16 ++++++++++------
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9ad781f8d..ea01a699d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2026-10-14  G. Branden Robinson <[email protected]>
+
+       * m4/groff.m4 (GROFF_G): Fix logic botch; we were treating the
+       total absence of an installed `troff` from the build
+       environment as equivalent to a groff-incompatible one being
+       present.  That was incorrect.  Do not apply a command prefix
+       when no troff is present.
+
+       Fixes <https://savannah.gnu.org/bugs/?68775>.  Thanks to Alexis
+       Hildebrandt for the report.  Problem introduced by me in commit
+       142b8d93fc, 8 October.
+
 2026-10-13  G. Branden Robinson <[email protected]>
 
        * src/utils/afmtodit/afmtodit.tables: Regenerate using Unicode
diff --git a/m4/groff.m4 b/m4/groff.m4
index e4b952c97..e16ff3dea 100644
--- a/m4/groff.m4
+++ b/m4/groff.m4
@@ -1064,15 +1064,19 @@ AC_DEFUN([GROFF_TMAC],
 # alongside the system's is desired.
 AC_DEFUN([GROFF_G], [
   g=
-  AC_MSG_CHECKING([for an installed groff-incompatible troff])
-  if test "`(echo .tm '|n(.g' | tr '|' '\\\\' | troff -z -i 2>&1) \
-    2>/dev/null`" = 1
+  AC_MSG_CHECKING([whether a groff-incompatible troff is installed])
+  if test -n "`command -v troff`" \
+    && test "`(echo .tm '|n(.g' | tr '|' '\\\\' | troff -z -i 2>&1) \
+      2>/dev/null`" != 1
   then
-    AC_MSG_RESULT([no])
-  else
-    AC_MSG_RESULT([yes])
     g=g
   fi
+  if test "$g" = "g"
+  then
+    AC_MSG_RESULT([yes])
+  else
+    AC_MSG_RESULT([no])
+  fi
   AC_SUBST([g])
 ])
 

_______________________________________________
groff-commit mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/groff-commit

Reply via email to