Rewrite the bootstrap suite.

* README-alpha: Rewritten.
* bootstrap.conf: Rewritten.
* bootstrap: Slightly modified version from gnulib.
* gnulib.modules, README-hacking: New files.
* doc/mailfromd.texi: Minor fix.

2 files changed, 597 insertions, 216 deletions

diff --git a/bootstrap b/bootstrap
index 51d94b2..0fa016d 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,96 +1,86 @@
 #! /bin/sh
-############################
-## Configuration
-############################
-
-GNULIB_DATE=2007-05-12
-GNU_SOURCE_BASE=gnu
-
-MODLIST="argp\
- fprintftime\
- getline\
- gettext\
- malloc\
- memrchr\
- mkdtemp\
- obstack\
- realloc\
- regex\
- save-cwd\
- snprintf\
- strtok_r\
- vasprintf"
-
-MODAVOID="xalloc-die openat-die"
 
-# Other locale categories that need message catalogs.
-EXTRA_LOCALE_CATEGORIES=
+# Bootstrap this package from checked-out sources.
 
-NLS_MARKERS="\
- MF_THROW:2\
- MF_ASSERT:3\
- parse_error:1\
- parse_error_locus:2\
- mu_error:1\
- gacopyz_io_log:3\
- gacopyz_logmsg:2\
- gacopyz_log:3"
+# Copyright (C) 2003-2008 Free Software Foundation, Inc.
 
-# Additional xgettext options to use.  Use "\\\newline" to break lines.
-XGETTEXT_OPTIONS='\\\
- --flag=_:1:pass-c-format\\\
- --flag=N_:1:pass-c-format\\\
- --flag=error:3:c-format --flag=error_at_line:5:c-format\\\
+# 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/>.
+
+# Written by Paul Eggert.
+
+nl='
 '
 
-COPYRIGHT_HOLDER="Sergey Poznyakoff"
+# Ensure file names are sorted consistently across platforms.
+LC_ALL=C
+export LC_ALL
 
-# Translation Project URL, for the registry of all projects
-# and for the translation-team master directory.
-# (for future use)
-tp_url() {
-        echo "http://translationproject.org/domain/$1.html"
-}
+local_gl_dir=gl
 
-############################
-## Implementation
-############################
+# Temporary directory names.
+bt='._bootmp'
+bt_regex=`echo "$bt"| sed 's/\./[.]/g'`
+bt2=${bt}2
 
 usage() {
   echo >&2 "\
-Usage: $0 [OPTION]...  GNULIB_DIR
+Usage: $0 [OPTION]...
 Bootstrap this package from the checked-out sources.
 
+Options:
+ --gnulib-srcdir=DIRNAME  Specify the local directory where gnulib
+                          sources reside.  Use this if you already
+                          have gnulib sources on your machine, and
+                          do not want to waste your bandwidth downloading
+                          them again.
  --copy                   Copy files instead of creating symbolic links.
  --force                  Attempt to bootstrap even if the sources seem
                           not to have been checked out.
  --skip-po                Do not download po files.
- --update-po[=LANG]       Update po file(s) and exit.
-
-The only argument specifes the file name of the directory were gnulib
-sources are located.  You will have to check out them beforehand, \`bootstrap'
-won't do this for you.
 
-Local defaults can be provided by placing the file \`.bootstrap' in the
-current working directory.  The file is read, comments and empty lines are
-removed, shell variables expanded and the result is prepended to the command
-line options. 
+If the file bootstrap.conf exists in the current working directory, its
+contents are read as shell variables to configure the bootstrap.
 
 Running without arguments will suffice in most cases.
 "
 }
 
-# Read local configuration file
-if [ -r .bootstrap ]; then
-  echo "$0: Reading configuration file .bootstrap"
-  eval set -- "`sed 's/#.*$//;/^$/d' .bootstrap | tr '\n' ' '` $*"
-fi
+# Configuration.
+
+# Name of the Makefile.am
+gnulib_mk=gnulib.mk
+
+# List of gnulib modules needed.
+gnulib_modules=
+
+# Any gnulib files needed that are not in modules.
+gnulib_files=
+
+# The command to download all .po files for a specified domain into
+# a specified directory.  Fill in the first %s is the domain name, and
+# the second with the destination directory.  Use rsync's -L and -r
+# options because the latest/%s directory and the .po files within are
+# all symlinks.
+po_download_command_format=\
+"rsync -Lrtvz 'translationproject.org::tp/latest/%s/' '%s'"
 
 extract_package_name='
   /^AC_INIT(/{
-     /.*,.*,.*,/{
+     /.*,.*,.*, */{
        s///
        s/[][]//g
+       s/)$//
        p
        q
      }
@@ -103,23 +93,70 @@ extract_package_name='
   }
 '
 package=`sed -n "$extract_package_name" configure.ac` || exit
+gnulib_name=lib$package
+
+build_aux=build-aux
+source_base=lib
+m4_base=m4
+doc_base=doc
+tests_base=tests
+
+# Extra files from gnulib, which override files from other sources.
+gnulib_extra_files="
+        $build_aux/install-sh
+        $build_aux/missing
+        $build_aux/mdate-sh
+        $build_aux/texinfo.tex
+        $build_aux/depcomp
+        $build_aux/config.guess
+        $build_aux/config.sub
+        doc/INSTALL
+"
 
-extract_bug_address='
-  /^AC-INIT-BUG-ADDRESS/{
-     s/[][]//g
-     s/.*=//p
-  }
+# Additional gnulib-tool options to use.  Use "\newline" to break lines.
+gnulib_tool_option_extras=
+
+# Other locale categories that need message catalogs.
+EXTRA_LOCALE_CATEGORIES=
+
+# Additional xgettext options to use.  Use "\\\newline" to break lines.
+XGETTEXT_OPTIONS='\\\
+ --flag=_:1:pass-c-format\\\
+ --flag=N_:1:pass-c-format\\\
+ --flag=error:3:c-format --flag=error_at_line:5:c-format\\\
 '
-bug_address=`m4 -D'AC_INIT=AC-INIT-BUG-ADDRESS=$3' configure.ac | sed -n "$extract_bug_address"`
-if test -z "$bug_address"; then
-  bug_address="bug-${package}@gnu.org.ua"
-fi
+
+# Package bug report address for gettext files
+MSGID_BUGS_ADDRESS=bug-$package@gnu.org
+
+# Files we don't want to import.
+excluded_files=
+
+# File that should exist in the top directory of a checked out hierarchy,
+# but not in a distribution tarball.
+checkout_only_file=README-hacking
 
 # Whether to use copies instead of symlinks.
 copy=false
 
-GNULIB_OPTION=
-DOWNLOAD_PO=
+# Set this to '.cvsignore .gitignore' in bootstrap.conf if you want
+# those files to be generated in directories like lib/, m4/, and po/.
+# Or set it to 'auto' to make this script select which to use based
+# on which version control system (if any) is used in the source directory.
+vc_ignore=auto
+
+# Override the default configuration, if necessary.
+test -r bootstrap.conf && . ./bootstrap.conf
+
+if test "$vc_ignore" = auto; then
+  vc_ignore=
+  test -d .git && vc_ignore=.gitignore
+  test -d CVS && vc_ignore="$vc_ignore .cvsignore"
+fi
+
+# Translate configuration into internal form.
+
+# Parse options.
 
 for option
 do
@@ -127,186 +164,462 @@ do
   --help)
     usage
     exit;;
-  --skip-po | --no-po) # --no-po is for compatibility with 'tar' tradition.
-    DOWNLOAD_PO=skip;;
+  --gnulib-srcdir=*)
+    GNULIB_SRCDIR=`expr "$option" : '--gnulib-srcdir=\(.*\)'`;;