* src/engine.c (check_on_host): Wait for an answer to QUIT.

Fix courtesy of Nacho Gonzalez Lopez.
* src/bi_sa.m4: Revert the changes inadvertently pushed on
2007-10-21.
* doc/Makefile.am: Use texi2html to produce HTML version of the
manual.
* doc/gendocs_template: Likewise
* doc/gendocs.sh: Remove. Changes incorporated into the Texinfo
repository.
* doc/gendocs_template: Use conditionals, introduced in the
Texinfo CVS.


git-svn-id: file:///svnroot/mailfromd/trunk@1526 7a8a7f39-df28-0410-adc6-e0d955640f24

7 files changed, 82 insertions, 494 deletions

diff --git a/ChangeLog b/ChangeLog
index 39c25464..24ee13f0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2007-11-11  Sergey Poznyakoff  <gray@gnu.org.ua>
+
+        * src/engine.c (check_on_host): Wait for an answer to QUIT.
+        Fix courtesy of Nacho Gonzalez Lopez.
+        * src/bi_sa.m4: Revert the changes inadvertently pushed on
+        2007-10-21.
+        * doc/Makefile.am: Use texi2html to produce HTML version of the
+        manual.
+        * doc/gendocs_template: Likewise
+        * doc/gendocs.sh: Remove. Changes incorporated into the Texinfo
+        repository.
+        * doc/gendocs_template: Use conditionals, introduced in the 
+        Texinfo CVS.
+
 2007-10-29  Sergey Poznyakoff  <gray@gnu.org.ua>
 
         * src/dnsbase.c (domain_name_cmp): Allow for trailing dot after
diff --git a/THANKS b/THANKS
index af3cb58c..d5d03e90 100644
--- a/THANKS
+++ b/THANKS
@@ -2,9 +2,20 @@ Mailfromd THANKS file.
 
 Many people further contributed to mailfromd by reporting problems,
 suggesting various improvements or submitting actual code. Here is a list
-of these people. Help us keep it complete and exempt of errors.
+of these people in alphabetical order. Help us keep it complete and exempt 
+of errors.
 
+Alan Dobkin             <MailFromD@omnicomp.org>
+Brent Spencer           <bspencer@XsiteDesigns.com>
 Jan Rafaj               <jr-mailfromd@cedric.unob.cz>
+Jeff Ballard            <ballard@engr.wisc.edu>
+Nacho González López    <nacho@es.gnu.org>
 Peter Markeloff         <magic@farlep.net>
 Sergey Afonin           <a_s_y@sama.ru>
-Zeus Panchenko          <zeus@dn.farlep.net>
\ No newline at end of file
+Zeus Panchenko          <zeus@dn.farlep.net>
+
+
+;;;; Local Variables:
+;;;; mode: Fundamental
+;;;; coding: utf-8
+;;;; End:
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 77ac5efe..2ac69c35 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -127,7 +127,7 @@ final: untabify master-menu
 
 MAKEINFOFLAGS=-D$(RENDITION)
 
-GENDOCS=${top_srcdir}/doc/gendocs.sh 
+GENDOCS=gendocs.sh 
 
 TEXI2DVI=texi2dvi -t '@set $(RENDITION)' -E
 
@@ -137,5 +137,5 @@ manual:
         TEXINPUTS=$(srcdir):$(top_srcdir)/build-aux:$(TEXINPUTS) \
          MAKEINFO="$(MAKEINFO) $(MAKEINFOFLAGS)" \
          TEXI2DVI="$(TEXI2DVI) -t @finalout" \
-         $(GENDOCS) $(PACKAGE) '$(PACKAGE_NAME) manual'
+         $(GENDOCS) --texi2html $(PACKAGE) '$(PACKAGE_NAME) manual'
 
diff --git a/doc/gendocs.sh b/doc/gendocs.sh
deleted file mode 100755
index fc5beeb6..00000000
--- a/doc/gendocs.sh
+++ /dev/null
@@ -1,310 +0,0 @@
-#!/bin/sh
-# gendocs.sh -- generate a GNU manual in many formats.  This script is
-#   mentioned in maintain.texi.  See the help message below for usage details.
-
-scriptversion=2007-10-23.16.gray
-
-# Copyright (C) 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License,
-# or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-# 
-# Original author: Mohit Agarwal.
-# Send bug reports and any other correspondence to bug-texinfo@gnu.org.
-
-prog=`basename "$0"`
-srcdir=`pwd`
-
-scripturl="http://svn.gnu.org.ua/viewvc/mailfromd/trunk/doc/gendocs.sh"
-templateurl="http://svn.gnu.org.ua/viewvc/mailfromd/trunk/doc/gendocs_template"
-
-: ${SETLANG="env LANG= LC_MESSAGES= LC_ALL= LANGUAGE="}
-: ${MAKEINFO="makeinfo"}
-: ${TEXI2DVI="texi2dvi -t @finalout"}
-: ${DVIPS="dvips"}
-: ${DOCBOOK2HTML="docbook2html"}
-: ${DOCBOOK2PDF="docbook2pdf"}
-: ${DOCBOOK2PS="docbook2ps"}
-: ${DOCBOOK2TXT="docbook2txt"}
-: ${GENDOCS_TEMPLATE_DIR="."}
-: ${TEXI2HTML="texi2html"}
-unset CDPATH
-
-version="gendocs.sh $scriptversion
-
-Copyright (C) 2007 Free Software Foundation, Inc.
-There is NO warranty.  You may redistribute this software
-under the terms of the GNU General Public License.
-For more information about these matters, see the files named COPYING."
-
-usage="Usage: $prog [OPTION]... PACKAGE MANUAL-TITLE
-
-Generate various output formats from PACKAGE.texinfo (or .texi or .txi) source.
-See the GNU Maintainers document for a more extensive discussion:
-  http://www.gnu.org/prep/maintain_toc.html
-
-Options:
-  -o OUTDIR   write files into OUTDIR, instead of manual/.
-  --docbook   convert to DocBook too (xml, txt, html, pdf and ps).
-  --html ARG  pass indicated ARG to makeinfo for HTML targets.
-  --help      display this help and exit successfully.
-  --version   display version information and exit successfully.
-
-Simple example: $prog emacs \"GNU Emacs Manual\"
-
-Typical sequence:
-  cd YOURPACKAGESOURCE/doc
-  wget \"$scripturl\"
-  wget \"$templateurl\"
-  $prog YOURMANUAL \"GNU YOURMANUAL - One-line description\"
-
-Output will be in a new subdirectory \"manual\" (by default, use -o OUTDIR
-to override).  Move all the new files into your web CVS tree, as
-explained in the Web Pages node of maintain.texi.
-
-MANUAL-TITLE is included as part of the HTML <title> of the overall
-manual/index.html file.  It should include the name of the package being
-documented.  manual/index.html is created by substitution from the file
-$GENDOCS_TEMPLATE_DIR/gendocs_template.  (Feel free to modify the
-generic template for your own purposes.)
-
-If you have several manuals, you'll need to run this script several
-times with different YOURMANUAL values, specifying a different output
-directory with -o each time.  Then write (by hand) an overall index.html
-with links to them all.
-
-If a manual's texinfo sources are spread across several directories,
-first copy or symlink all Texinfo sources into a single directory.
-(Part of the script's work is to make a tar.gz of the sources.)
-
-You can set the environment variables MAKEINFO, TEXI2DVI, and DVIPS to
-control the programs that get executed, and GENDOCS_TEMPLATE_DIR to
-control where the gendocs_template file is looked for.  (With --docbook,
-the environment variables DOCBOOK2HTML, DOCBOOK2PDF, DOCBOOK2PS, and
-DOCBOOK2TXT are also respected.) 
-
-By default, makeinfo is run in the default (English) locale, since
-that's the language of most Texinfo manuals.  If you happen to have a
-non-English manual and non-English web site, check the SETLANG setting
-in the source.
-
-Email bug reports or enhancement requests to bug-texinfo@gnu.org.
-"
-
-calcsize()
-{
-  size=`ls -ksl $1 | awk '{print $1}'`
-  echo $size
-}
-
-outdir=manual
-html=
-PACKAGE=
-MANUAL_TITLE=
-
-while test $# -gt 0; do
-  case $1 in
-    --help) echo "$usage"; exit 0;;
-    --version) echo "$version"; exit 0;;
-    -o) shift; outdir=$1;;
-    --docbook) docbook=yes;;
-    --html) shift; html=$1;;
-    -*)
-      echo "$0: Unknown or ambiguous option \`$1'." >&2
-      echo "$0: Try \`--help' for more information." >&2
-      exit 1;;
-    *)
-      if test -z "$PACKAGE"; then
-        PACKAGE=$1
-      elif test -z "$MANUAL_TITLE"; then
-        MANUAL_TITLE=$1
-      else
-        echo "$0: extra non-option argument \`$1'." >&2
-        exit 1
-      fi;;
-  esac
-  shift
-done
-
-if test -s "$srcdir/$PACKAGE.texinfo"; then
-  srcfile=$srcdir/$PACKAGE.texinfo
-elif test -s "$srcdir/$PACKAGE.texi"; then
-  srcfile=$srcdir/$PACKAGE.texi
-elif test -s "$srcdir/$PACKAGE.txi"; then
-  srcfile=$srcdir/$PACKAGE.txi
-else
-  echo "$0: cannot find .texinfo or .texi or .txi for $PACKAGE in $srcdir." >&2
-  exit 1
-fi