Always use mandoc to format cat pages and remove now-extraneous
nroff configure tests.
This commit is contained in:
184
configure
vendored
184
configure
vendored
@@ -620,6 +620,7 @@ FLEX
|
|||||||
YFLAGS
|
YFLAGS
|
||||||
YACC
|
YACC
|
||||||
NROFFPROG
|
NROFFPROG
|
||||||
|
MANDOCPROG
|
||||||
TRPROG
|
TRPROG
|
||||||
UNAMEPROG
|
UNAMEPROG
|
||||||
OTOOL64
|
OTOOL64
|
||||||
@@ -13650,20 +13651,22 @@ NOEXECDIR="`echo $with_noexec|sed -e 's:^${\([^}]*\)}:$(\1):' -e 's:^\(.*\)/[^/]
|
|||||||
set dummy uname; ac_word=$2
|
set dummy uname; ac_word=$2
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
||||||
$as_echo_n "checking for $ac_word... " >&6; }
|
$as_echo_n "checking for $ac_word... " >&6; }
|
||||||
if ${ac_cv_prog_UNAMEPROG+:} false; then :
|
if ${ac_cv_path_UNAMEPROG+:} false; then :
|
||||||
$as_echo_n "(cached) " >&6
|
$as_echo_n "(cached) " >&6
|
||||||
else
|
else
|
||||||
if test -n "$UNAMEPROG"; then
|
case $UNAMEPROG in
|
||||||
ac_cv_prog_UNAMEPROG="$UNAMEPROG" # Let the user override the test.
|
[\\/]* | ?:[\\/]*)
|
||||||
else
|
ac_cv_path_UNAMEPROG="$UNAMEPROG" # Let the user override the test with a path.
|
||||||
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
;;
|
||||||
|
*)
|
||||||
|
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||||||
for as_dir in $PATH
|
for as_dir in $PATH
|
||||||
do
|
do
|
||||||
IFS=$as_save_IFS
|
IFS=$as_save_IFS
|
||||||
test -z "$as_dir" && as_dir=.
|
test -z "$as_dir" && as_dir=.
|
||||||
for ac_exec_ext in '' $ac_executable_extensions; do
|
for ac_exec_ext in '' $ac_executable_extensions; do
|
||||||
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
||||||
ac_cv_prog_UNAMEPROG="uname"
|
ac_cv_path_UNAMEPROG="$as_dir/$ac_word$ac_exec_ext"
|
||||||
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||||||
break 2
|
break 2
|
||||||
fi
|
fi
|
||||||
@@ -13671,9 +13674,11 @@ done
|
|||||||
done
|
done
|
||||||
IFS=$as_save_IFS
|
IFS=$as_save_IFS
|
||||||
|
|
||||||
|
test -z "$ac_cv_path_UNAMEPROG" && ac_cv_path_UNAMEPROG="uname"
|
||||||
|
;;
|
||||||
|
esac
|
||||||
fi
|
fi
|
||||||
fi
|
UNAMEPROG=$ac_cv_path_UNAMEPROG
|
||||||
UNAMEPROG=$ac_cv_prog_UNAMEPROG
|
|
||||||
if test -n "$UNAMEPROG"; then
|
if test -n "$UNAMEPROG"; then
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $UNAMEPROG" >&5
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $UNAMEPROG" >&5
|
||||||
$as_echo "$UNAMEPROG" >&6; }
|
$as_echo "$UNAMEPROG" >&6; }
|
||||||
@@ -13687,20 +13692,22 @@ fi
|
|||||||
set dummy tr; ac_word=$2
|
set dummy tr; ac_word=$2
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
||||||
$as_echo_n "checking for $ac_word... " >&6; }
|
$as_echo_n "checking for $ac_word... " >&6; }
|
||||||
if ${ac_cv_prog_TRPROG+:} false; then :
|
if ${ac_cv_path_TRPROG+:} false; then :
|
||||||
$as_echo_n "(cached) " >&6
|
$as_echo_n "(cached) " >&6
|
||||||
else
|
else
|
||||||
if test -n "$TRPROG"; then
|
case $TRPROG in
|
||||||
ac_cv_prog_TRPROG="$TRPROG" # Let the user override the test.
|
[\\/]* | ?:[\\/]*)
|
||||||
else
|
ac_cv_path_TRPROG="$TRPROG" # Let the user override the test with a path.
|
||||||
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
;;
|
||||||
|
*)
|
||||||
|
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||||||
for as_dir in $PATH
|
for as_dir in $PATH
|
||||||
do
|
do
|
||||||
IFS=$as_save_IFS
|
IFS=$as_save_IFS
|
||||||
test -z "$as_dir" && as_dir=.
|
test -z "$as_dir" && as_dir=.
|
||||||
for ac_exec_ext in '' $ac_executable_extensions; do
|
for ac_exec_ext in '' $ac_executable_extensions; do
|
||||||
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
||||||
ac_cv_prog_TRPROG="tr"
|
ac_cv_path_TRPROG="$as_dir/$ac_word$ac_exec_ext"
|
||||||
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||||||
break 2
|
break 2
|
||||||
fi
|
fi
|
||||||
@@ -13708,9 +13715,11 @@ done
|
|||||||
done
|
done
|
||||||
IFS=$as_save_IFS
|
IFS=$as_save_IFS
|
||||||
|
|
||||||
|
test -z "$ac_cv_path_TRPROG" && ac_cv_path_TRPROG="tr"
|
||||||
|
;;
|
||||||
|
esac
|
||||||
fi
|
fi
|
||||||
fi
|
TRPROG=$ac_cv_path_TRPROG
|
||||||
TRPROG=$ac_cv_prog_TRPROG
|
|
||||||
if test -n "$TRPROG"; then
|
if test -n "$TRPROG"; then
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $TRPROG" >&5
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $TRPROG" >&5
|
||||||
$as_echo "$TRPROG" >&6; }
|
$as_echo "$TRPROG" >&6; }
|
||||||
@@ -13720,26 +13729,26 @@ $as_echo "no" >&6; }
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
for ac_prog in mandoc nroff
|
# Extract the first word of "mandoc", so it can be a program name with args.
|
||||||
do
|
set dummy mandoc; ac_word=$2
|
||||||
# Extract the first word of "$ac_prog", so it can be a program name with args.
|
|
||||||
set dummy $ac_prog; ac_word=$2
|
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
||||||
$as_echo_n "checking for $ac_word... " >&6; }
|
$as_echo_n "checking for $ac_word... " >&6; }
|
||||||
if ${ac_cv_prog_NROFFPROG+:} false; then :
|
if ${ac_cv_path_MANDOCPROG+:} false; then :
|
||||||
$as_echo_n "(cached) " >&6
|
$as_echo_n "(cached) " >&6
|
||||||
else
|
else
|
||||||
if test -n "$NROFFPROG"; then
|
case $MANDOCPROG in
|
||||||
ac_cv_prog_NROFFPROG="$NROFFPROG" # Let the user override the test.
|
[\\/]* | ?:[\\/]*)
|
||||||
else
|
ac_cv_path_MANDOCPROG="$MANDOCPROG" # Let the user override the test with a path.
|
||||||
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
;;
|
||||||
|
*)
|
||||||
|
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||||||
for as_dir in $PATH
|
for as_dir in $PATH
|
||||||
do
|
do
|
||||||
IFS=$as_save_IFS
|
IFS=$as_save_IFS
|
||||||
test -z "$as_dir" && as_dir=.
|
test -z "$as_dir" && as_dir=.
|
||||||
for ac_exec_ext in '' $ac_executable_extensions; do
|
for ac_exec_ext in '' $ac_executable_extensions; do
|
||||||
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
||||||
ac_cv_prog_NROFFPROG="$ac_prog"
|
ac_cv_path_MANDOCPROG="$as_dir/$ac_word$ac_exec_ext"
|
||||||
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||||||
break 2
|
break 2
|
||||||
fi
|
fi
|
||||||
@@ -13747,9 +13756,54 @@ done
|
|||||||
done
|
done
|
||||||
IFS=$as_save_IFS
|
IFS=$as_save_IFS
|
||||||
|
|
||||||
|
test -z "$ac_cv_path_MANDOCPROG" && ac_cv_path_MANDOCPROG="mandoc"
|
||||||
|
;;
|
||||||
|
esac
|
||||||
fi
|
fi
|
||||||
|
MANDOCPROG=$ac_cv_path_MANDOCPROG
|
||||||
|
if test -n "$MANDOCPROG"; then
|
||||||
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANDOCPROG" >&5
|
||||||
|
$as_echo "$MANDOCPROG" >&6; }
|
||||||
|
else
|
||||||
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||||
|
$as_echo "no" >&6; }
|
||||||
fi
|
fi
|
||||||
NROFFPROG=$ac_cv_prog_NROFFPROG
|
|
||||||
|
|
||||||
|
if test "$MANDOCPROG" != "mandoc"; then
|
||||||
|
: ${MANTYPE='mdoc'}
|
||||||
|
else
|
||||||
|
# Extract the first word of "nroff", so it can be a program name with args.
|
||||||
|
set dummy nroff; ac_word=$2
|
||||||
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
||||||
|
$as_echo_n "checking for $ac_word... " >&6; }
|
||||||
|
if ${ac_cv_path_NROFFPROG+:} false; then :
|
||||||
|
$as_echo_n "(cached) " >&6
|
||||||
|
else
|
||||||
|
case $NROFFPROG in
|
||||||
|
[\\/]* | ?:[\\/]*)
|
||||||
|
ac_cv_path_NROFFPROG="$NROFFPROG" # Let the user override the test with a path.
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||||||
|
for as_dir in $PATH
|
||||||
|
do
|
||||||
|
IFS=$as_save_IFS
|
||||||
|
test -z "$as_dir" && as_dir=.
|
||||||
|
for ac_exec_ext in '' $ac_executable_extensions; do
|
||||||
|
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
||||||
|
ac_cv_path_NROFFPROG="$as_dir/$ac_word$ac_exec_ext"
|
||||||
|
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||||||
|
break 2
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
done
|
||||||
|
IFS=$as_save_IFS
|
||||||
|
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
fi
|
||||||
|
NROFFPROG=$ac_cv_path_NROFFPROG
|
||||||
if test -n "$NROFFPROG"; then
|
if test -n "$NROFFPROG"; then
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $NROFFPROG" >&5
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $NROFFPROG" >&5
|
||||||
$as_echo "$NROFFPROG" >&6; }
|
$as_echo "$NROFFPROG" >&6; }
|
||||||
@@ -13759,71 +13813,35 @@ $as_echo "no" >&6; }
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
test -n "$NROFFPROG" && break
|
if test -n "$NROFFPROG"; then
|
||||||
done
|
test -n "$MANTYPE" && sudo_cv_var_mantype="$MANTYPE"
|
||||||
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which macro set to use for manual pages" >&5
|
||||||
if test -n "$NROFFPROG"; then
|
|
||||||
test -n "$MANTYPE" && sudo_cv_var_mantype="$MANTYPE"
|
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which macro set to use for manual pages" >&5
|
|
||||||
$as_echo_n "checking which macro set to use for manual pages... " >&6; }
|
$as_echo_n "checking which macro set to use for manual pages... " >&6; }
|
||||||
if ${sudo_cv_var_mantype+:} false; then :
|
if ${sudo_cv_var_mantype+:} false; then :
|
||||||
$as_echo_n "(cached) " >&6
|
$as_echo_n "(cached) " >&6
|
||||||
else
|
else
|
||||||
sudo_cv_var_mantype="man"
|
|
||||||
if test "$NROFFPROG" != "no"; then
|
sudo_cv_var_mantype="man"
|
||||||
echo ".Sh NAME" > conftest
|
echo ".Sh NAME" > conftest
|
||||||
echo ".Nm sudo" >> conftest
|
echo ".Nm sudo" >> conftest
|
||||||
echo ".Nd sudo" >> conftest
|
echo ".Nd sudo" >> conftest
|
||||||
echo ".Sh DESCRIPTION" >> conftest
|
echo ".Sh DESCRIPTION" >> conftest
|
||||||
echo "sudo" >> conftest
|
echo "sudo" >> conftest
|
||||||
if $NROFFPROG -mdoc conftest >/dev/null 2>&1; then
|
if $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
|
||||||
fi
|
|
||||||
|
|
||||||
fi
|
fi
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sudo_cv_var_mantype" >&5
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sudo_cv_var_mantype" >&5
|
||||||
$as_echo "$sudo_cv_var_mantype" >&6; }
|
$as_echo "$sudo_cv_var_mantype" >&6; }
|
||||||
MANTYPE="$sudo_cv_var_mantype"
|
MANTYPE="$sudo_cv_var_mantype"
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $NROFFPROG supports the -c option" >&5
|
else
|
||||||
$as_echo_n "checking whether $NROFFPROG supports the -c option... " >&6; }
|
MANTYPE=cat
|
||||||
if ${sudo_cv_var_nroff_opt_c+:} false; then :
|
MANDIRTYPE=cat
|
||||||
$as_echo_n "(cached) " >&6
|
mansrcdir='$(srcdir)'
|
||||||
else
|
|
||||||
if $NROFFPROG -c </dev/null >/dev/null 2>&1; then
|
|
||||||
sudo_cv_var_nroff_opt_c=yes
|
|
||||||
else
|
|
||||||
sudo_cv_var_nroff_opt_c=no
|
|
||||||
fi
|
|
||||||
|
|
||||||
fi
|
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sudo_cv_var_nroff_opt_c" >&5
|
|
||||||
$as_echo "$sudo_cv_var_nroff_opt_c" >&6; }
|
|
||||||
if test "$sudo_cv_var_nroff_opt_c" = "yes"; then
|
|
||||||
NROFFPROG="$NROFFPROG -c"
|
|
||||||
fi
|
fi
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $NROFFPROG supports the -Tascii option" >&5
|
|
||||||
$as_echo_n "checking whether $NROFFPROG supports the -Tascii option... " >&6; }
|
|
||||||
if ${sudo_cv_var_nroff_opt_Tascii+:} false; then :
|
|
||||||
$as_echo_n "(cached) " >&6
|
|
||||||
else
|
|
||||||
if $NROFFPROG -Tascii </dev/null >/dev/null 2>&1; then
|
|
||||||
sudo_cv_var_nroff_opt_Tascii=yes
|
|
||||||
else
|
|
||||||
sudo_cv_var_nroff_opt_Tascii=no
|
|
||||||
fi
|
|
||||||
|
|
||||||
fi
|
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sudo_cv_var_nroff_opt_Tascii" >&5
|
|
||||||
$as_echo "$sudo_cv_var_nroff_opt_Tascii" >&6; }
|
|
||||||
if test "$sudo_cv_var_nroff_opt_Tascii" = "yes"; then
|
|
||||||
NROFFPROG="$NROFFPROG -Tascii"
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
MANTYPE=cat
|
|
||||||
MANDIRTYPE=cat
|
|
||||||
mansrcdir='$(srcdir)'
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test -n "$sudo_cv_prev_host"; then
|
if test -n "$sudo_cv_prev_host"; then
|
||||||
|
78
configure.in
78
configure.in
@@ -1468,56 +1468,36 @@ NOEXECDIR="`echo $with_noexec|sed -e 's:^${\([[^}]]*\)}:$(\1):' -e 's:^\(.*\)/[[
|
|||||||
dnl
|
dnl
|
||||||
dnl Find programs we use
|
dnl Find programs we use
|
||||||
dnl
|
dnl
|
||||||
AC_CHECK_PROG(UNAMEPROG, [uname], [uname])
|
AC_PATH_PROG(UNAMEPROG, [uname], [uname])
|
||||||
AC_CHECK_PROG(TRPROG, [tr], [tr])
|
AC_PATH_PROG(TRPROG, [tr], [tr])
|
||||||
AC_CHECK_PROGS(NROFFPROG, [mandoc nroff])
|
AC_PATH_PROG(MANDOCPROG, [mandoc], [mandoc])
|
||||||
if test -n "$NROFFPROG"; then
|
if test "$MANDOCPROG" != "mandoc"; then
|
||||||
test -n "$MANTYPE" && sudo_cv_var_mantype="$MANTYPE"
|
: ${MANTYPE='mdoc'}
|
||||||
AC_CACHE_CHECK([which macro set to use for manual pages],
|
|
||||||
[sudo_cv_var_mantype],
|
|
||||||
[sudo_cv_var_mantype="man"
|
|
||||||
if test "$NROFFPROG" != "no"; then
|
|
||||||
echo ".Sh NAME" > conftest
|
|
||||||
echo ".Nm sudo" >> conftest
|
|
||||||
echo ".Nd sudo" >> conftest
|
|
||||||
echo ".Sh DESCRIPTION" >> conftest
|
|
||||||
echo "sudo" >> conftest
|
|
||||||
if $NROFFPROG -mdoc conftest >/dev/null 2>&1; then
|
|
||||||
sudo_cv_var_mantype="mdoc"
|
|
||||||
fi
|
|
||||||
rm -f conftest
|
|
||||||
fi]
|
|
||||||
)
|
|
||||||
MANTYPE="$sudo_cv_var_mantype"
|
|
||||||
AC_CACHE_CHECK([whether $NROFFPROG supports the -c option],
|
|
||||||
[sudo_cv_var_nroff_opt_c],
|
|
||||||
[if $NROFFPROG -c </dev/null >/dev/null 2>&1; then
|
|
||||||
sudo_cv_var_nroff_opt_c=yes
|
|
||||||
else
|
|
||||||
sudo_cv_var_nroff_opt_c=no
|
|
||||||
fi]
|
|
||||||
)
|
|
||||||
if test "$sudo_cv_var_nroff_opt_c" = "yes"; then
|
|
||||||
NROFFPROG="$NROFFPROG -c"
|
|
||||||
fi
|
|
||||||
dnl
|
|
||||||
dnl This test will fail for mandoc but it is the default anyway...
|
|
||||||
dnl
|
|
||||||
AC_CACHE_CHECK([whether $NROFFPROG supports the -Tascii option],
|
|
||||||
[sudo_cv_var_nroff_opt_Tascii],
|
|
||||||
[if $NROFFPROG -Tascii </dev/null >/dev/null 2>&1; then
|
|
||||||
sudo_cv_var_nroff_opt_Tascii=yes
|
|
||||||
else
|
|
||||||
sudo_cv_var_nroff_opt_Tascii=no
|
|
||||||
fi]
|
|
||||||
)
|
|
||||||
if test "$sudo_cv_var_nroff_opt_Tascii" = "yes"; then
|
|
||||||
NROFFPROG="$NROFFPROG -Tascii"
|
|
||||||
fi
|
|
||||||
else
|
else
|
||||||
MANTYPE=cat
|
AC_PATH_PROG(NROFFPROG, [nroff])
|
||||||
MANDIRTYPE=cat
|
if test -n "$NROFFPROG"; then
|
||||||
mansrcdir='$(srcdir)'
|
test -n "$MANTYPE" && sudo_cv_var_mantype="$MANTYPE"
|
||||||
|
AC_CACHE_CHECK([which macro set to use for manual pages],
|
||||||
|
[sudo_cv_var_mantype],
|
||||||
|
[
|
||||||
|
sudo_cv_var_mantype="man"
|
||||||
|
echo ".Sh NAME" > conftest
|
||||||
|
echo ".Nm sudo" >> conftest
|
||||||
|
echo ".Nd sudo" >> conftest
|
||||||
|
echo ".Sh DESCRIPTION" >> conftest
|
||||||
|
echo "sudo" >> conftest
|
||||||
|
if $NROFFPROG -mdoc conftest >/dev/null 2>&1; then
|
||||||
|
sudo_cv_var_mantype="mdoc"
|
||||||
|
fi
|
||||||
|
rm -f conftest
|
||||||
|
]
|
||||||
|
)
|
||||||
|
MANTYPE="$sudo_cv_var_mantype"
|
||||||
|
else
|
||||||
|
MANTYPE=cat
|
||||||
|
MANDIRTYPE=cat
|
||||||
|
mansrcdir='$(srcdir)'
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
dnl
|
dnl
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
#
|
#
|
||||||
# Copyright (c) 2012 Todd C. Miller <Todd.Miller@courtesan.com>
|
# Copyright (c) 2010-2012 Todd C. Miller <Todd.Miller@courtesan.com>
|
||||||
#
|
#
|
||||||
# Permission to use, copy, modify, and distribute this software for any
|
# Permission to use, copy, modify, and distribute this software for any
|
||||||
# purpose with or without fee is hereby granted, provided that the above
|
# purpose with or without fee is hereby granted, provided that the above
|
||||||
@@ -27,10 +27,10 @@ cross_compiling = @CROSS_COMPILING@
|
|||||||
|
|
||||||
# Tools to use
|
# Tools to use
|
||||||
SED = @SED@
|
SED = @SED@
|
||||||
NROFF = @NROFFPROG@
|
MANDOC = @MANDOCPROG@
|
||||||
MANDOC = mandoc
|
|
||||||
MANCOMPRESS = @MANCOMPRESS@
|
MANCOMPRESS = @MANCOMPRESS@
|
||||||
MANCOMPRESSEXT = @MANCOMPRESSEXT@
|
MANCOMPRESSEXT = @MANCOMPRESSEXT@
|
||||||
|
TR = @TRPROG@
|
||||||
|
|
||||||
# Our install program supports extra flags...
|
# Our install program supports extra flags...
|
||||||
INSTALL = $(SHELL) $(top_srcdir)/install-sh -c
|
INSTALL = $(SHELL) $(top_srcdir)/install-sh -c
|
||||||
@@ -103,8 +103,8 @@ varsub: $(top_srcdir)/configure.in
|
|||||||
$(srcdir)/sudo.man.in: $(srcdir)/sudo.mdoc.in
|
$(srcdir)/sudo.man.in: $(srcdir)/sudo.mdoc.in
|
||||||
@if [ -n "$(DEVEL)" ]; then \
|
@if [ -n "$(DEVEL)" ]; then \
|
||||||
echo "Generating $@"; \
|
echo "Generating $@"; \
|
||||||
mansectsu=`echo @MANSECTSU@|tr A-Z a-z`; \
|
mansectsu=`echo @MANSECTSU@|$(TR) A-Z a-z`; \
|
||||||
mansectform=`echo @MANSECTFORM@|tr A-Z a-z`; \
|
mansectform=`echo @MANSECTFORM@|$(TR) A-Z a-z`; \
|
||||||
printf '.\\" DO NOT EDIT THIS FILE, IT IS NOT THE MASTER!\n' > $@; \
|
printf '.\\" DO NOT EDIT THIS FILE, IT IS NOT THE MASTER!\n' > $@; \
|
||||||
printf '.\\" IT IS GENERATED AUTOMATICALLY FROM sudo.mdoc.in\n' >> $@; \
|
printf '.\\" IT IS GENERATED AUTOMATICALLY FROM sudo.mdoc.in\n' >> $@; \
|
||||||
$(SED) -n -e '/^.Dd/q' -e '/^\.\\/p' $(srcdir)/sudo.mdoc.in >> $@; \
|
$(SED) -n -e '/^.Dd/q' -e '/^\.\\/p' $(srcdir)/sudo.mdoc.in >> $@; \
|
||||||
@@ -126,14 +126,14 @@ sudo.mdoc: $(srcdir)/sudo.mdoc.in sudo.mdoc.sed
|
|||||||
$(srcdir)/sudo.cat: varsub $(srcdir)/sudo.mdoc.in
|
$(srcdir)/sudo.cat: varsub $(srcdir)/sudo.mdoc.in
|
||||||
@if [ -n "$(DEVEL)" ]; then \
|
@if [ -n "$(DEVEL)" ]; then \
|
||||||
echo "Generating $@"; \
|
echo "Generating $@"; \
|
||||||
$(SED) -f varsub $(srcdir)/sudo.mdoc.in | $(NROFF) -mdoc | $(SED) -e 's/ OpenBSD \([^ ].* \)/ \1 /' -e 's/(5)/(4)/g' -e 's/(8)/(1m)/g' > $@; \
|
$(SED) -f varsub $(srcdir)/sudo.mdoc.in | $(MANDOC) -mdoc | $(SED) -e 's/ OpenBSD \([^ ].* \)/ \1 /' -e 's/(5)/(4)/g' -e 's/(8)/(1m)/g' > $@; \
|
||||||
fi
|
fi
|
||||||
|
|
||||||
$(srcdir)/visudo.man.in: $(srcdir)/visudo.mdoc.in
|
$(srcdir)/visudo.man.in: $(srcdir)/visudo.mdoc.in
|
||||||
@if [ -n "$(DEVEL)" ]; then \
|
@if [ -n "$(DEVEL)" ]; then \
|
||||||
echo "Generating $@"; \
|
echo "Generating $@"; \
|
||||||
mansectsu=`echo @MANSECTSU@|tr A-Z a-z`; \
|
mansectsu=`echo @MANSECTSU@|$(TR) A-Z a-z`; \
|
||||||
mansectform=`echo @MANSECTFORM@|tr A-Z a-z`; \
|
mansectform=`echo @MANSECTFORM@|$(TR) A-Z a-z`; \
|
||||||
printf '.\\" DO NOT EDIT THIS FILE, IT IS NOT THE MASTER!\n' > $@; \
|
printf '.\\" DO NOT EDIT THIS FILE, IT IS NOT THE MASTER!\n' > $@; \
|
||||||
printf '.\\" IT IS GENERATED AUTOMATICALLY FROM visudo.mdoc.in\n' >> $@; \
|
printf '.\\" IT IS GENERATED AUTOMATICALLY FROM visudo.mdoc.in\n' >> $@; \
|
||||||
$(SED) -n -e '/^.Dd/q' -e '/^\.\\/p' $(srcdir)/visudo.mdoc.in >> $@; \
|
$(SED) -n -e '/^.Dd/q' -e '/^\.\\/p' $(srcdir)/visudo.mdoc.in >> $@; \
|
||||||
@@ -152,14 +152,14 @@ visudo.mdoc: $(srcdir)/visudo.mdoc.in
|
|||||||
$(srcdir)/visudo.cat: varsub $(srcdir)/visudo.mdoc.in
|
$(srcdir)/visudo.cat: varsub $(srcdir)/visudo.mdoc.in
|
||||||
@if [ -n "$(DEVEL)" ]; then \
|
@if [ -n "$(DEVEL)" ]; then \
|
||||||
echo "Generating $@"; \
|
echo "Generating $@"; \
|
||||||
$(SED) -f varsub $(srcdir)/visudo.mdoc.in | $(NROFF) -mdoc | $(SED) -e 's/ OpenBSD \([^ ].* \)/ \1 /' -e 's/(5)/(4)/g' -e 's/(8)/(1m)/g' > $@; \
|
$(SED) -f varsub $(srcdir)/visudo.mdoc.in | $(MANDOC) -mdoc | $(SED) -e 's/ OpenBSD \([^ ].* \)/ \1 /' -e 's/(5)/(4)/g' -e 's/(8)/(1m)/g' > $@; \
|
||||||
fi
|
fi
|
||||||
|
|
||||||
$(srcdir)/sudoers.man.in: $(srcdir)/sudoers.mdoc.in
|
$(srcdir)/sudoers.man.in: $(srcdir)/sudoers.mdoc.in
|
||||||
@if [ -n "$(DEVEL)" ]; then \
|
@if [ -n "$(DEVEL)" ]; then \
|
||||||
echo "Generating $@"; \
|
echo "Generating $@"; \
|
||||||
mansectsu=`echo @MANSECTSU@|tr A-Z a-z`; \
|
mansectsu=`echo @MANSECTSU@|$(TR) A-Z a-z`; \
|
||||||
mansectform=`echo @MANSECTFORM@|tr A-Z a-z`; \
|
mansectform=`echo @MANSECTFORM@|$(TR) A-Z a-z`; \
|
||||||
printf '.\\" DO NOT EDIT THIS FILE, IT IS NOT THE MASTER!\n' > $@; \
|
printf '.\\" DO NOT EDIT THIS FILE, IT IS NOT THE MASTER!\n' > $@; \
|
||||||
printf '.\\" IT IS GENERATED AUTOMATICALLY FROM sudoers.mdoc.in\n' >> $@; \
|
printf '.\\" IT IS GENERATED AUTOMATICALLY FROM sudoers.mdoc.in\n' >> $@; \
|
||||||
$(SED) -n -e '/^.Dd/q' -e '/^\.\\/p' $(srcdir)/sudoers.mdoc.in >> $@; \
|
$(SED) -n -e '/^.Dd/q' -e '/^\.\\/p' $(srcdir)/sudoers.mdoc.in >> $@; \
|
||||||
@@ -181,14 +181,14 @@ sudoers.mdoc: $(srcdir)/sudoers.mdoc.in sudoers.mdoc.sed
|
|||||||
$(srcdir)/sudoers.cat: varsub $(srcdir)/sudoers.mdoc.in
|
$(srcdir)/sudoers.cat: varsub $(srcdir)/sudoers.mdoc.in
|
||||||
@if [ -n "$(DEVEL)" ]; then \
|
@if [ -n "$(DEVEL)" ]; then \
|
||||||
echo "Generating $@"; \
|
echo "Generating $@"; \
|
||||||
$(SED) -f varsub $(srcdir)/sudoers.mdoc.in | $(NROFF) -mdoc | $(SED) -e 's/ OpenBSD \([^ ].* \)/ \1 /' -e 's/(5)/(4)/g' -e 's/(8)/(1m)/g' > $@; \
|
$(SED) -f varsub $(srcdir)/sudoers.mdoc.in | $(MANDOC) -mdoc | $(SED) -e 's/ OpenBSD \([^ ].* \)/ \1 /' -e 's/(5)/(4)/g' -e 's/(8)/(1m)/g' > $@; \
|
||||||
fi
|
fi
|
||||||
|
|
||||||
$(srcdir)/sudoers.ldap.man.in: $(srcdir)/sudoers.ldap.mdoc.in
|
$(srcdir)/sudoers.ldap.man.in: $(srcdir)/sudoers.ldap.mdoc.in
|
||||||
@if [ -n "$(DEVEL)" ]; then \
|
@if [ -n "$(DEVEL)" ]; then \
|
||||||
echo "Generating $@"; \
|
echo "Generating $@"; \
|
||||||
mansectsu=`echo @MANSECTSU@|tr A-Z a-z`; \
|
mansectsu=`echo @MANSECTSU@|$(TR) A-Z a-z`; \
|
||||||
mansectform=`echo @MANSECTFORM@|tr A-Z a-z`; \
|
mansectform=`echo @MANSECTFORM@|$(TR) A-Z a-z`; \
|
||||||
printf '.\\" DO NOT EDIT THIS FILE, IT IS NOT THE MASTER!\n' > $@; \
|
printf '.\\" DO NOT EDIT THIS FILE, IT IS NOT THE MASTER!\n' > $@; \
|
||||||
printf '.\\" IT IS GENERATED AUTOMATICALLY FROM sudoers.ldap.mdoc.in\n' >> $@; \
|
printf '.\\" IT IS GENERATED AUTOMATICALLY FROM sudoers.ldap.mdoc.in\n' >> $@; \
|
||||||
$(SED) -n -e '/^.Dd/q' -e '/^\.\\/p' $(srcdir)/sudoers.ldap.mdoc.in >> $@; \
|
$(SED) -n -e '/^.Dd/q' -e '/^\.\\/p' $(srcdir)/sudoers.ldap.mdoc.in >> $@; \
|
||||||
@@ -207,14 +207,14 @@ sudoers.ldap.mdoc: $(srcdir)/sudoers.ldap.mdoc.in
|
|||||||
$(srcdir)/sudoers.ldap.cat: varsub $(srcdir)/sudoers.ldap.mdoc.in
|
$(srcdir)/sudoers.ldap.cat: varsub $(srcdir)/sudoers.ldap.mdoc.in
|
||||||
@if [ -n "$(DEVEL)" ]; then \
|
@if [ -n "$(DEVEL)" ]; then \
|
||||||
echo "Generating $@"; \
|
echo "Generating $@"; \
|
||||||
$(SED) -f varsub $(srcdir)/sudoers.ldap.mdoc.in | $(NROFF) -mdoc | $(SED) -e 's/ OpenBSD \([^ ].* \)/ \1 /' -e 's/(5)/(4)/g' -e 's/(8)/(1m)/g' > $@; \
|
$(SED) -f varsub $(srcdir)/sudoers.ldap.mdoc.in | $(MANDOC) -mdoc | $(SED) -e 's/ OpenBSD \([^ ].* \)/ \1 /' -e 's/(5)/(4)/g' -e 's/(8)/(1m)/g' > $@; \
|
||||||
fi
|
fi
|
||||||
|
|
||||||
$(srcdir)/sudoreplay.man.in: $(srcdir)/sudoreplay.mdoc.in
|
$(srcdir)/sudoreplay.man.in: $(srcdir)/sudoreplay.mdoc.in
|
||||||
@if [ -n "$(DEVEL)" ]; then \
|
@if [ -n "$(DEVEL)" ]; then \
|
||||||
echo "Generating $@"; \
|
echo "Generating $@"; \
|
||||||
mansectsu=`echo @MANSECTSU@|tr A-Z a-z`; \
|
mansectsu=`echo @MANSECTSU@|$(TR) A-Z a-z`; \
|
||||||
mansectform=`echo @MANSECTFORM@|tr A-Z a-z`; \
|
mansectform=`echo @MANSECTFORM@|$(TR) A-Z a-z`; \
|
||||||
printf '.\\" DO NOT EDIT THIS FILE, IT IS NOT THE MASTER!\n' > $@; \
|
printf '.\\" DO NOT EDIT THIS FILE, IT IS NOT THE MASTER!\n' > $@; \
|
||||||
printf '.\\" IT IS GENERATED AUTOMATICALLY FROM sudoreplay.mdoc.in\n' >> $@; \
|
printf '.\\" IT IS GENERATED AUTOMATICALLY FROM sudoreplay.mdoc.in\n' >> $@; \
|
||||||
$(SED) -n -e '/^.Dd/q' -e '/^\.\\/p' $(srcdir)/sudoreplay.mdoc.in >> $@; \
|
$(SED) -n -e '/^.Dd/q' -e '/^\.\\/p' $(srcdir)/sudoreplay.mdoc.in >> $@; \
|
||||||
@@ -233,14 +233,14 @@ sudoreplay.mdoc: $(srcdir)/sudoreplay.mdoc.in
|
|||||||
$(srcdir)/sudoreplay.cat: varsub $(srcdir)/sudoreplay.mdoc.in
|
$(srcdir)/sudoreplay.cat: varsub $(srcdir)/sudoreplay.mdoc.in
|
||||||
@if [ -n "$(DEVEL)" ]; then \
|
@if [ -n "$(DEVEL)" ]; then \
|
||||||
echo "Generating $@"; \
|
echo "Generating $@"; \
|
||||||
$(SED) -f varsub $(srcdir)/sudoreplay.mdoc.in | $(NROFF) -mdoc | $(SED) -e 's/ OpenBSD \([^ ].* \)/ \1 /' -e 's/(5)/(4)/g' -e 's/(8)/(1m)/g' > $@; \
|
$(SED) -f varsub $(srcdir)/sudoreplay.mdoc.in | $(MANDOC) -mdoc | $(SED) -e 's/ OpenBSD \([^ ].* \)/ \1 /' -e 's/(5)/(4)/g' -e 's/(8)/(1m)/g' > $@; \
|
||||||
fi
|
fi
|
||||||
|
|
||||||
$(srcdir)/sudo_plugin.man.in: $(srcdir)/sudo_plugin.mdoc.in
|
$(srcdir)/sudo_plugin.man.in: $(srcdir)/sudo_plugin.mdoc.in
|
||||||
@if [ -n "$(DEVEL)" ]; then \
|
@if [ -n "$(DEVEL)" ]; then \
|
||||||
echo "Generating $@"; \
|
echo "Generating $@"; \
|
||||||
mansectsu=`echo @MANSECTSU@|tr A-Z a-z`; \
|
mansectsu=`echo @MANSECTSU@|$(TR) A-Z a-z`; \
|
||||||
mansectform=`echo @MANSECTFORM@|tr A-Z a-z`; \
|
mansectform=`echo @MANSECTFORM@|$(TR) A-Z a-z`; \
|
||||||
printf '.\\" DO NOT EDIT THIS FILE, IT IS NOT THE MASTER!\n' > $@; \
|
printf '.\\" DO NOT EDIT THIS FILE, IT IS NOT THE MASTER!\n' > $@; \
|
||||||
printf '.\\" IT IS GENERATED AUTOMATICALLY FROM sudo_plugin.mdoc.in\n' >> $@; \
|
printf '.\\" IT IS GENERATED AUTOMATICALLY FROM sudo_plugin.mdoc.in\n' >> $@; \
|
||||||
$(SED) -n -e '/^.Dd/q' -e '/^\.\\/p' $(srcdir)/sudo_plugin.mdoc.in >> $@; \
|
$(SED) -n -e '/^.Dd/q' -e '/^\.\\/p' $(srcdir)/sudo_plugin.mdoc.in >> $@; \
|
||||||
@@ -259,7 +259,7 @@ sudo_plugin.mdoc: $(srcdir)/sudo_plugin.mdoc.in
|
|||||||
$(srcdir)/sudo_plugin.cat: varsub $(srcdir)/sudo_plugin.mdoc.in
|
$(srcdir)/sudo_plugin.cat: varsub $(srcdir)/sudo_plugin.mdoc.in
|
||||||
@if [ -n "$(DEVEL)" ]; then \
|
@if [ -n "$(DEVEL)" ]; then \
|
||||||
echo "Generating $@"; \
|
echo "Generating $@"; \
|
||||||
$(SED) -f varsub $(srcdir)/sudo_plugin.mdoc.in | $(NROFF) -mdoc | $(SED) -e 's/ OpenBSD \([^ ].* \)/ \1 /' -e 's/(5)/(4)/g' -e 's/(8)/(1m)/g' > $@; \
|
$(SED) -f varsub $(srcdir)/sudo_plugin.mdoc.in | $(MANDOC) -mdoc | $(SED) -e 's/ OpenBSD \([^ ].* \)/ \1 /' -e 's/(5)/(4)/g' -e 's/(8)/(1m)/g' > $@; \
|
||||||
fi
|
fi
|
||||||
|
|
||||||
pre-install:
|
pre-install:
|
||||||
|
Reference in New Issue
Block a user