From aa2498e46f1b4d6b1e13bde4e56b1aaa8d0d848e Mon Sep 17 00:00:00 2001 From: "Todd C. Miller" Date: Thu, 24 Jul 2025 10:37:01 -0600 Subject: [PATCH] Fix check for which man page type to use with nroff Fixes a bug where configure would use *.man instead of *.mdoc on systems without mandoc. Bug #1077. --- configure | 4 ++-- configure.ac | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure b/configure index 3e33087e6..7762ab88d 100755 --- a/configure +++ b/configure @@ -17775,7 +17775,7 @@ then : else case e in #( e) case "$ac_cv_path_NROFFPROG" in - *mandoc|*nroff) + *mandoc|nroff) # Prefer mdoc format for mandoc (or when no formatter is present). sudo_cv_var_mantype="mdoc" ;; @@ -17786,7 +17786,7 @@ else case e in #( echo ".Nd sudo" >> conftest echo ".Sh DESCRIPTION" >> conftest echo "sudo" >> conftest - if $ac_cv_path_NROFF -mdoc conftest >/dev/null 2>&1; then + if $ac_cv_path_NROFFPROG -mdoc conftest >/dev/null 2>&1; then sudo_cv_var_mantype="mdoc" fi rm -f conftest diff --git a/configure.ac b/configure.ac index bc4298148..db72498cc 100644 --- a/configure.ac +++ b/configure.ac @@ -1742,7 +1742,7 @@ AC_CACHE_CHECK([which macro set to use for manual pages], [sudo_cv_var_mantype], [ case "$ac_cv_path_NROFFPROG" in - *mandoc|*nroff) + *mandoc|nroff) # Prefer mdoc format for mandoc (or when no formatter is present). sudo_cv_var_mantype="mdoc" ;; @@ -1753,7 +1753,7 @@ AC_CACHE_CHECK([which macro set to use for manual pages], echo ".Nd sudo" >> conftest echo ".Sh DESCRIPTION" >> conftest echo "sudo" >> conftest - if $ac_cv_path_NROFF -mdoc conftest >/dev/null 2>&1; then + if $ac_cv_path_NROFFPROG -mdoc conftest >/dev/null 2>&1; then sudo_cv_var_mantype="mdoc" fi rm -f conftest