From a05e963690010d1d527056476c53dc5b6e262b14 Mon Sep 17 00:00:00 2001
From: "Todd C. Miller" <Todd.Miller@courtesan.com>
Date: Thu, 19 May 2011 18:00:31 -0400
Subject: [PATCH] Add checks for nroff -c and -Tascii flags

---
 configure    | 37 ++++++++++++++++++++++++++++++++++++-
 configure.in | 25 ++++++++++++++++++++++++-
 2 files changed, 60 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index df363a442..ad7bea04d 100755
--- a/configure
+++ b/configure
@@ -12932,7 +12932,42 @@ fi
   test -n "$NROFFPROG" && break
 done
 
-if test -z "$NROFFPROG"; then
+if test -n "$NROFFPROG"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $NROFFPROG supports the -c option" >&5
+$as_echo_n "checking whether $NROFFPROG supports the -c option... " >&6; }
+if test "${sudo_cv_var_nroff_opt_c+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+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
+    { $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 test "${sudo_cv_var_nroff_opt_Tascii+set}" = set; 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
+    if test "$sudo_cv_var_nroff_opt_Tascii" = "yes"; then
+	NROFFPROG="$NROFFPROG -Tascii"
+    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; }
+else
     MANTYPE="cat"
     mansrcdir='$(srcdir)'
 fi
diff --git a/configure.in b/configure.in
index b62325a7a..82f69e8a5 100644
--- a/configure.in
+++ b/configure.in
@@ -1413,7 +1413,30 @@ dnl
 AC_CHECK_PROG(UNAMEPROG, [uname], [uname])
 AC_CHECK_PROG(TRPROG, [tr], [tr])
 AC_CHECK_PROGS(NROFFPROG, [nroff mandoc])
-if test -z "$NROFFPROG"; then
+if test -n "$NROFFPROG"; then
+    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
+    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
     MANTYPE="cat"
     mansrcdir='$(srcdir)'
 fi
-- 
2.40.0