14 files changed, 962 insertions, 444 deletions

diff --git a/.cvsignore b/.cvsignore
index 37551e1..1b66749 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,16 +1,16 @@
+*.tar.bz2
+*.tar.gz
 ABOUT-NLS
 INSTALL
 Makefile
 Makefile.in
 aclocal.m4
 autom4te.cache
-*.tar.bz2
-*.tar.gz
 config
 config.h
 config.h.in
 config.log
 config.status
 configure
 m4
 stamp-h1
diff --git a/ChangeLog b/ChangeLog
index 8f4980b..0fda28b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,12 +1,20 @@
+2007-05-18  Sergey Poznyakoff  <gray@gnu.org.ua>
+
+        * bootstrap.conf: New file
+        * build-aux/bootstrap: Replaced from the gnulib CVS
+        * configure.ac: Update
+        * po/Makevars: Remove automatically generated file
+        * src/main.c: Remove #include <strndup.h>
+
 2006-09-11  Sergey Poznyakoff  <gray@gnu.org.ua>
 
         * src/main.c (doc): Reformat argp docstring in accordance with the
         new argp guidelines.  Remove unneeded translators comment.
         (main): Set program_name.
 
 2006-09-10  Sergey Poznyakoff  <gray@gnu.org.ua>
 
         * configure.ac: Remove definition of
         HAVE_DECL_PROGRAM_INVOCATION_NAME and
         PROGRAM_INVOCATION_NAME_DECLARED.
         Temporarly add AM_MKINSTALLDIRS
diff --git a/README-alpha b/README-alpha
index 68806c1..6548cf6 100644
--- a/README-alpha
+++ b/README-alpha
@@ -29,34 +29,39 @@ CVS_RSH=ssh \
 
 Make sure SSHv2 is used.
 
 This will give you read-only access.  If you think you need write access,
 contact the mailing list.
 
 The CVS repository is also available via HTTP from
 
     http://savannah.gnu.org/cgi-bin/viewcvs/cflow/cflow/
     
 * Building
 
-In order to build this you will first need to have right versions of
-autotools. At the time of this writing these are:
-
-  Package   Version (>=)
-  ========  ============
-  automake  1.8.5
-  autoconf  2.59
-
-To prepare the package for building run build-aux/bootstrap. For
-example:
+If you have taken the sources from CVS you will need the following
+packages to build cflow.  I don't make any extra effort to accommodate
+older versions of these packages, so please make sure that you have the
+latest stable version.
+
+- Automake <http://www.gnu.org/software/automake/>
+- Autoconf <http://www.gnu.org/software/autoconf/>
+- 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/>
+
+To prepare the package for building run `build-aux/bootstrap' utility.
+For example: 
 
  $ cd cflow
  $ build-aux/bootstrap
 
 If you have already checked out gnulib sources, use --gnulib-srcdir
 to specify their location, this will spare you time and bandwidth:
 
  $ cd cflow
  $ build-aux/bootstrap --gnulib-srcdir=$HOME/gnu/gnulib
  
 * Debugging
 
diff --git a/bootstrap.conf b/bootstrap.conf
new file mode 100644
index 0000000..9e200ac
--- /dev/null
+++ b/bootstrap.conf
@@ -0,0 +1,62 @@
+# Bootstrap configuration.
+# Copyright (C) 2006 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 2, 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, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
+
+# We don't need these modules, even though gnulib-tool mistakenly
+# includes them because of gettext dependencies.
+avoided_gnulib_modules='
+        --avoid=lock
+'
+
+# gnulib modules used by this package.
+gnulib_modules="$avoided_gnulib_modules
+`grep '^[^#]' build-aux/gnulib.modules`
+"
+# Additional xgettext options to use.  Use "\\\newline" to break lines.
+XGETTEXT_OPTIONS=$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\\\
+ --flag=asnprintf:3:c-format --flag=vasnprintf:3:c-format\\\
+ --flag=argp_error:2:c-format\\\
+ --flag=__argp_error:2:c-format\\\
+ --flag=argp_failure:4:c-format\\\
+ --flag=__argp_failure:4:c-format\\\
+ --flag=argp_fmtstream_printf:2:c-format\\\
+ --flag=__argp_fmtstream_printf:2:c-format\\\
+'
+
+# Gettext supplies these files, but we don't need them since
+# we don't have an intl subdirectory.
+excluded_files='
+    m4/glibc2.m4
+    m4/intdiv0.m4
+    m4/lcmessage.m4
+    m4/lock.m4
+    m4/printf-posix.m4
+    m4/size_max.m4
+    m4/uintmax_t.m4
+    m4/ulonglong.m4
+    m4/visibility.m4
+    m4/xsize.m4
+'
+
+# Read local configuration file
+if [ -r .bootstrap ]; then
+  echo "$0: Reading configuration file .bootstrap"
+  eval set -- "`sed 's/#.*$//;/^$/d' .bootstrap | tr '\n' ' '` $*"
+fi
diff --git a/build-aux/.cvsignore b/build-aux/.cvsignore
index c23a7d2..8d1fd5b 100644
--- a/build-aux/.cvsignore
+++ b/build-aux/.cvsignore
@@ -1,9 +1,10 @@
+config.guess
+config.rpath
+config.sub
 depcomp
 install-sh
-missing
-config.rpath
+link-warning.h
 mdate-sh
-texinfo.tex
-config.guess
-config.sub
+missing
 mkinstalldirs
+texinfo.tex
diff --git a/build-aux/bootstrap b/build-aux/bootstrap
index d025457..c028967 100755
--- a/build-aux/bootstrap
+++ b/build-aux/bootstrap
@@ -1,282 +1,553 @@
 #! /bin/sh
 
-# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
+# Bootstrap this package from checked-out sources.
+
+# 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 2, 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, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.