From 38e3189d0a70a0582e624440c8f6bcea8caad567 Mon Sep 17 00:00:00 2001
From: Pavel Roskin <proski@gnu.org>
Date: Wed, 30 Oct 2002 02:37:48 +0000
Subject: [PATCH] * lib/mc.ext.in: Rename TROFFASCII to MAN_FLAGS. *
 configure.in: Likewise.  Add "-c" (disable ANSI color) to MAN_FLAGS if
 supported.

---
 ChangeLog     |  4 ++++
 configure.in  | 56 +++++++++++++++++++++++++++------------------------
 lib/mc.ext.in | 24 +++++++++++-----------
 src/TODO      |  2 --
 4 files changed, 46 insertions(+), 40 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ce93effa6..d02853e36 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2002-10-29  Pavel Roskin  <proski@gnu.org>
 
+	* lib/mc.ext.in: Rename TROFFASCII to MAN_FLAGS.
+	* configure.in: Likewise.  Add "-c" (disable ANSI color) to
+	MAN_FLAGS if supported.
+
 	* acinclude.m4 (MC_WITH_SLANG): Reject S-Lang with UTF-8
 	support, unless external S-Lang was explicitly requested.
 
diff --git a/configure.in b/configure.in
index 1e6239a61..4145b64de 100644
--- a/configure.in
+++ b/configure.in
@@ -281,15 +281,19 @@ linux*)
 esac
 
 dnl
-dnl Check for the -mandoc package
+dnl Check nroff and the options it supports
 dnl
 AC_CHECK_PROG(HAVE_nroff, nroff, true, false)
+
+dnl Default values
+MANDOC=-man
+MAN_FLAGS=
+
 if $HAVE_nroff; then
     AC_MSG_CHECKING([for manual formatting macros])
     AC_CACHE_VAL(ac_cv_mandoc, [
     nroff -mandoc < /dev/null > /dev/null 2>&1
-    if test $? = 0
-    then
+    if test $? = 0; then
 	ac_cv_mandoc=-mandoc
     else
 	ac_cv_mandoc=-man
@@ -297,39 +301,39 @@ if $HAVE_nroff; then
     ])
     MANDOC=$ac_cv_mandoc
     AC_MSG_RESULT([$MANDOC])
-else
-    MANDOC=-man
-fi
-AC_SUBST(MANDOC)
 
-dnl
-dnl Check if nroff accepts -Tlatin1 or -Tascii
-dnl
-if $HAVE_nroff; then
+    AC_MSG_CHECKING([for option to disable ANSI color in manuals])
+    AC_CACHE_VAL(ac_cv_man_nocolor, [
+    nroff -c < /dev/null > /dev/null 2>&1
+    if test $? = 0; then
+	ac_cv_man_nocolor=-c
+    else
+	ac_cv_man_nocolor=
+    fi
+    ])
+    MAN_FLAGS=$ac_cv_man_nocolor
+    AC_MSG_RESULT([${MAN_NOCOLOR-none}])
+
     AC_MSG_CHECKING([if nroff accepts -Tlatin1 or -Tascii])
     AC_CACHE_VAL(ac_cv_nroff_tascii, [
+    ac_cv_nroff_tascii=
     nroff -Tlatin1 < /dev/null > /dev/null 2>&1 /dev/null
-    if test $? = 0
-    then
-	ac_cv_nroff_tascii=" -Tlatin1"
+    if test $? = 0; then
+	ac_cv_nroff_tascii=-Tlatin1
     else
         nroff -Tascii < /dev/null > /dev/null 2>&1 /dev/null
-        if test $? = 0
-        then
-	    ac_cv_nroff_tascii=" -Tascii"
-        else
-    	    ac_cv_nroff_tascii=""
+        if test $? = 0; then
+	    ac_cv_nroff_tascii=-Tascii
 	fi
     fi
     ])
-    if test "x$ac_cv_nroff_tascii" = x; then
-	AC_MSG_RESULT([no])
-    else
-	AC_MSG_RESULT([yes,$ac_cv_nroff_tascii])
-    fi
+    AC_MSG_RESULT([${ac_cv_nroff_tascii-no}])
+    MAN_FLAGS="$MAN_FLAGS $ac_cv_nroff_tascii"
 fi
-TROFFASCII="$ac_cv_nroff_tascii"
-AC_SUBST(TROFFASCII)
+
+AC_SUBST(MANDOC)
+AC_SUBST(MAN_FLAGS)
+
 
 dnl
 dnl Check for - option to file
diff --git a/lib/mc.ext.in b/lib/mc.ext.in
index b51514608..ae4210bfe 100644
--- a/lib/mc.ext.in
+++ b/lib/mc.ext.in
@@ -149,8 +149,8 @@ regex/\.(so|so\.[0-9\.]*)$
 	View=%view{ascii} file %f && nm %f
 
 regex/(([^0-9]|^[^\.]*)\.([1-9][A-Za-z]*|n)|\.man)$
-	Open=nroff @TROFFASCII@ @MANDOC@ %f | %var{PAGER:more}
-	View=%view{ascii,nroff} nroff @TROFFASCII@ @MANDOC@ %f
+	Open=nroff @MAN_FLAGS@ @MANDOC@ %f | %var{PAGER:more}
+	View=%view{ascii,nroff} nroff @MAN_FLAGS@ @MANDOC@ %f
 
 # Troff with me macros.
 # Exception - "read.me" is not a nroff file.
@@ -159,26 +159,26 @@ shell/read.me
 	View=
 
 shell/.me
-	Open=nroff @TROFFASCII@ -me %f | %var{PAGER:more}
-	View=%view{ascii,nroff} nroff @TROFFASCII@ -me %f
+	Open=nroff @MAN_FLAGS@ -me %f | %var{PAGER:more}
+	View=%view{ascii,nroff} nroff @MAN_FLAGS@ -me %f
 
 # Troff with ms macros.
 shell/.ms
-	Open=nroff @TROFFASCII@ -ms %f | %var{PAGER:more}
-	View=%view{ascii,nroff} nroff @TROFFASCII@ -ms %f
+	Open=nroff @MAN_FLAGS@ -ms %f | %var{PAGER:more}
+	View=%view{ascii,nroff} nroff @MAN_FLAGS@ -ms %f
 
 # Manual page - compressed
 regex/([^0-9]|^[^\.]*)\.([1-9][a-z]?|n)\.g?[Zz]$
-	Open=gzip -dc %f | nroff @TROFFASCII@ @MANDOC@ | %var{PAGER:more}
-	View=%view{ascii,nroff} gzip -dc %f | nroff @TROFFASCII@ @MANDOC@
+	Open=gzip -dc %f | nroff @MAN_FLAGS@ @MANDOC@ | %var{PAGER:more}
+	View=%view{ascii,nroff} gzip -dc %f | nroff @MAN_FLAGS@ @MANDOC@
 
 regex/([^0-9]|^[^\.]*)\.([1-9][a-z]?|n)\.bz$
-	Open=bzip -dc %f | nroff @TROFFASCII@ @MANDOC@ | %var{PAGER:more}
-	View=%view{ascii,nroff} bzip -dc %f | nroff @TROFFASCII@ @MANDOC@
+	Open=bzip -dc %f | nroff @MAN_FLAGS@ @MANDOC@ | %var{PAGER:more}
+	View=%view{ascii,nroff} bzip -dc %f | nroff @MAN_FLAGS@ @MANDOC@
 
 regex/([^0-9]|^[^\.]*)\.([1-9][a-z]?|n)\.bz2$
-	Open=bzip2 -dc %f | nroff @TROFFASCII@ @MANDOC@ | %var{PAGER:more}
-	View=%view{ascii,nroff} bzip2 -dc %f | nroff @TROFFASCII@ @MANDOC@
+	Open=bzip2 -dc %f | nroff @MAN_FLAGS@ @MANDOC@ | %var{PAGER:more}
+	View=%view{ascii,nroff} bzip2 -dc %f | nroff @MAN_FLAGS@ @MANDOC@
 
 
 ### Images ###
diff --git a/src/TODO b/src/TODO
index cee5ab193..e3e2cd2be 100644
--- a/src/TODO
+++ b/src/TODO
@@ -1,8 +1,6 @@
 Before 4.6.0-pre2
 =================
 
-Test for groff and for -P-c option to groff to disable ANSI colors.
-
 Use paranoid quoting in subshell_name_quote() only when absolutely
 necessary - it's slow, especially in UTF-8 locales.