From: Markus Armbruster <armbru@pond.sub.org>
Date: Wed, 24 May 2006 19:56:13 +0000 (+0000)
Subject: Autoconfigure NROFF.  Traditional nroff now works in addition to
X-Git-Tag: v4.3.4~2
X-Git-Url: http://git.pond.sub.org/?p=empserver;a=commitdiff_plain;h=8a81c5b404fff0b6f11af9d28b9c0310e2b3342e

Autoconfigure NROFF.  Traditional nroff now works in addition to
groff.
---

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 6a8aaadd9..fb41ce143 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -67,8 +67,7 @@ AWK := @AWK@
 INSTALL := @INSTALL@
 INSTALL_DATA := @INSTALL_DATA@
 INSTALL_PROGRAM := @INSTALL_PROGRAM@
-# TODO autoconf NROFF
-NROFF := groff -Tascii -P-c -U
+NROFF := @NROFF@
 RANLIB := @RANLIB@
 
 prefix := @prefix@
diff --git a/README b/README
index 44208080f..27e70b20a 100644
--- a/README
+++ b/README
@@ -25,8 +25,8 @@ To build the server and set up a game, follow the steps below.
 
 (2) Building a server
 
-    Requirements: GNU make and GNU troff (`groff'), ANSI C, a curses
-    library, Perl, Bourne Shell and the common utilities.
+    Requirements: GNU make and, ANSI C, a curses library, Perl, nroff
+    or GNU troff (`groff'), Bourne Shell and the common utilities.
 
     See file `INSTALL' for detailed compilation and installation
     instructions.  Quick guide for the impatient: run configure; make;
@@ -71,8 +71,6 @@ To build the server and set up a game, follow the steps below.
 
       To change the deity password, use `change re <password>'.
 
-      FIXME auth
-
     * Create countries with `exec newcap_script'.
 
     Your game is now up!
diff --git a/configure.ac b/configure.ac
index 19f29c095..7c422ad9d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -54,6 +54,9 @@ AM_PROG_CC_C_O
 # Private automake macro, tsk, tsk, tsk...
 _AM_DEPENDENCIES(CC)
 
+AC_ARG_VAR(NROFF, [nroff command])
+AC_CHECK_PROG(NROFF, groff, [groff -Tascii -P-c -U], nroff)
+
 # not really a check for a program, but close enough
 if test -d $srcdir/CVS; then cvs_controlled=yes; else cvs_controlled=no; fi
 AC_SUBST(cvs_controlled,$cvs_controlled)