mir/sudo
2
0
Fork 0
mirror of https://github.com/sudo-project/sudo.git synced 2025-08-22 01:49:11 +00:00
Code Issues Releases Wiki Activity

Fix check for which man page type to use with nroff

Browse Source 
Fixes a bug where configure would use *.man instead of *.mdoc on
systems without mandoc.  Bug #1077.
This commit is contained in:
Todd C. Miller 2025-07-24 10:37:01 -06:00
parent f73162df35
commit aa2498e46f
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure vendored
View File

@ -17775,7 +17775,7 @@ then :
else case e in #( else case e in #(
e) e)
case "$ac_cv_path_NROFFPROG" in case "$ac_cv_path_NROFFPROG" in
*mandoc|*nroff) *mandoc|nroff)
# Prefer mdoc format for mandoc (or when no formatter is present). # Prefer mdoc format for mandoc (or when no formatter is present).
sudo_cv_var_mantype="mdoc" sudo_cv_var_mantype="mdoc"
;; ;;
@ -17786,7 +17786,7 @@ else case e in #(
echo ".Nd sudo" >> conftest echo ".Nd sudo" >> conftest
echo ".Sh DESCRIPTION" >> conftest echo ".Sh DESCRIPTION" >> conftest
echo "sudo" >> 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" sudo_cv_var_mantype="mdoc"
fi fi
rm -f conftest rm -f conftest

4
configure.ac
View File

@ -1742,7 +1742,7 @@ AC_CACHE_CHECK([which macro set to use for manual pages],
[sudo_cv_var_mantype], [sudo_cv_var_mantype],
[ [
case "$ac_cv_path_NROFFPROG" in case "$ac_cv_path_NROFFPROG" in
*mandoc|*nroff) *mandoc|nroff)
# Prefer mdoc format for mandoc (or when no formatter is present). # Prefer mdoc format for mandoc (or when no formatter is present).
sudo_cv_var_mantype="mdoc" 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 ".Nd sudo" >> conftest
echo ".Sh DESCRIPTION" >> conftest echo ".Sh DESCRIPTION" >> conftest
echo "sudo" >> 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" sudo_cv_var_mantype="mdoc"
fi fi
rm -f conftest rm -f conftest