Update

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

3 files changed, 19 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 4210dc21..65abd1f0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,13 +2,14 @@
 
 	* po/pl.po, po/uk.po: Move to
 	http://svn.gnu.org.ua/sources/mailfromd/trunk/po. Mailfromd is now
 	officially registered at TP.
 	* po/LINGUAS: Remove. The file is generated automatically
 	* bootstrap: Get translations from the TP.
-
+	* README-alpha: Update
+	
 2007-05-16  Sergey Poznyakoff  <gray@gnu.org.ua>
 
 	* src/snarf.m4, src/init.m4, src/Makefile.am: Save namespace from
 	pollution: Use m4_ prefixed keywords.
 	* src/main.c: Add missing NLS markers
 
diff --git a/README-alpha b/README-alpha
index 4cb0c1fc..824e66a1 100644
--- a/README-alpha
+++ b/README-alpha
@@ -17,12 +17,13 @@ latest stable version.
 - Bison <http://www.gnu.org/software/bison/>
 - Flex <http://flex.sourceforge.net/>
 - Gettext <http://www.gnu.org/software/gettext/>
 - Gnulib <http://www.gnu.org/software/gnulib/>
 - M4 <http://www.gnu.org/software/m4/>
 - Texinfo <http://www.gnu.org/software/texinfo>
+- Wget <http://www.gnu.org/software/wget/>
 
 * Checking Out the Sources
 
 The following instructions apply if you wish to obtain sources from
 the SVN repository:
 
@@ -47,15 +48,16 @@ once.  Packaged alpha versions do not need bootstrapping.
 
    cd mailfromd
 
 2. Populate the source tree with the necessary files from Gnulib.
 and create the configuration framework.  Run:
 
-   sh ./bootstrap
+   ./bootstrap GNULIB-DIR
 
-(make sure gnulib-tool is in your path).
+where GNULIB-DIR is the directory containing the gnulib source tree.
+For more information about `bootstrap', run `bootstrap --help'.
 
 3. Configure and build the package as described in the documentation. See
 
    http://mailfromd.software.gnu.org.ua/manual/html_node/Building
 
 * Copyright information:
diff --git a/bootstrap b/bootstrap
index db25c532..80c79877 100755
--- a/bootstrap
+++ b/bootstrap
@@ -61,12 +61,16 @@ Bootstrap this package from the checked-out sources.
  --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. 
 
 Running without arguments will suffice in most cases.
@@ -149,12 +153,21 @@ if [ -n "$GNULIB_DIR" ]; then
     else
       echo "$0: No $GNULIB_DIR/ChangeLog file found">&2  
     fi
   else
     echo "$0: specified gnulib location is not a directory">&2
   fi      
+else
+  echo "$0: warning: gnulib source directory not specified">&2
+  echo "$0: warning: looking for gnulib-tool in PATH...">&2
+fi
+
+gnulib-tool --version >/dev/null 2>&1 
+if [ $? -ne 0 ]; then
+  echo "$0: Cannot run gnulib-tool.  Try \`$0 --help' for more info.">&2
+  exit 1
 fi
 
 echo "$0: Bootstrapping $package"
 
 echo "$0: Running autopoint"
 autopoint -f || exit 1