aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Poznyakoff <gray@gnu.org.ua>2007-05-18 12:20:51 +0000
committerSergey Poznyakoff <gray@gnu.org.ua>2007-05-18 12:20:51 +0000
commitadd560e4e3c55b2481ab7c691be055f3095667a4 (patch)
tree0fda9abc2b39abde651470d705567f747808e45b
parent0891f1ede52fc72aaa77a8c0cc29951f8552b6d1 (diff)
downloadcflow-add560e4e3c55b2481ab7c691be055f3095667a4.tar.gz
cflow-add560e4e3c55b2481ab7c691be055f3095667a4.tar.bz2
Update for the recent gnulib
-rw-r--r--.cvsignore4
-rw-r--r--ChangeLog8
-rw-r--r--README-alpha25
-rw-r--r--bootstrap.conf62
-rw-r--r--build-aux/.cvsignore11
-rwxr-xr-xbuild-aux/bootstrap683
-rw-r--r--configure.ac9
-rw-r--r--lib/.cvsignore82
-rw-r--r--po/.cvsignore8
-rw-r--r--po/Makevars16
-rw-r--r--po/da.po193
-rw-r--r--po/pl.po150
-rw-r--r--po/uk.po143
-rw-r--r--src/main.c12
14 files changed, 962 insertions, 444 deletions
diff --git a/.cvsignore b/.cvsignore
index 37551e1..1b66749 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,11 +1,11 @@
1*.tar.bz2
2*.tar.gz
1ABOUT-NLS 3ABOUT-NLS
2INSTALL 4INSTALL
3Makefile 5Makefile
4Makefile.in 6Makefile.in
5aclocal.m4 7aclocal.m4
6autom4te.cache 8autom4te.cache
7*.tar.bz2
8*.tar.gz
9config 9config
10config.h 10config.h
11config.h.in 11config.h.in
diff --git a/ChangeLog b/ChangeLog
index 8f4980b..0fda28b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
12007-05-18 Sergey Poznyakoff <gray@gnu.org.ua>
2
3 * bootstrap.conf: New file
4 * build-aux/bootstrap: Replaced from the gnulib CVS
5 * configure.ac: Update
6 * po/Makevars: Remove automatically generated file
7 * src/main.c: Remove #include <strndup.h>
8
12006-09-11 Sergey Poznyakoff <gray@gnu.org.ua> 92006-09-11 Sergey Poznyakoff <gray@gnu.org.ua>
2 10
3 * src/main.c (doc): Reformat argp docstring in accordance with the 11 * src/main.c (doc): Reformat argp docstring in accordance with the
diff --git a/README-alpha b/README-alpha
index 68806c1..6548cf6 100644
--- a/README-alpha
+++ b/README-alpha
@@ -38,16 +38,21 @@ The CVS repository is also available via HTTP from
38 38
39* Building 39* Building
40 40
41In order to build this you will first need to have right versions of 41If you have taken the sources from CVS you will need the following
42autotools. At the time of this writing these are: 42packages to build cflow. I don't make any extra effort to accommodate
43 43older versions of these packages, so please make sure that you have the
44 Package Version (>=) 44latest stable version.
45 ======== ============ 45
46 automake 1.8.5 46- Automake <http://www.gnu.org/software/automake/>
47 autoconf 2.59 47- Autoconf <http://www.gnu.org/software/autoconf/>
48 48- Gettext <http://www.gnu.org/software/gettext/>
49To prepare the package for building run build-aux/bootstrap. For 49- Gnulib <http://www.gnu.org/software/gnulib/>
50example: 50- M4 <http://www.gnu.org/software/m4/>
51- Texinfo <http://www.gnu.org/software/texinfo>
52- Wget <http://www.gnu.org/software/wget/>
53
54To prepare the package for building run `build-aux/bootstrap' utility.
55For example:
51 56
52 $ cd cflow 57 $ cd cflow
53 $ build-aux/bootstrap 58 $ build-aux/bootstrap
diff --git a/bootstrap.conf b/bootstrap.conf
new file mode 100644
index 0000000..9e200ac
--- /dev/null
+++ b/bootstrap.conf
@@ -0,0 +1,62 @@
1# Bootstrap configuration.
2# Copyright (C) 2006 Free Software Foundation, Inc.
3#
4# This program is free software; you can redistribute it and/or modify
5# it under the terms of the GNU General Public License as published by
6# the Free Software Foundation; either version 2, or (at your option)
7# any later version.
8#
9# This program is distributed in the hope that it will be useful,
10# but WITHOUT ANY WARRANTY; without even the implied warranty of
11# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12# GNU General Public License for more details.
13#
14# You should have received a copy of the GNU General Public License
15# along with this program; if not, write to the Free Software
16# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
17# 02110-1301, USA.
18
19# We don't need these modules, even though gnulib-tool mistakenly
20# includes them because of gettext dependencies.
21avoided_gnulib_modules='
22 --avoid=lock
23'
24
25# gnulib modules used by this package.
26gnulib_modules="$avoided_gnulib_modules
27`grep '^[^#]' build-aux/gnulib.modules`
28"
29# Additional xgettext options to use. Use "\\\newline" to break lines.
30XGETTEXT_OPTIONS=$XGETTEXT_OPTIONS'\\\
31 --flag=_:1:pass-c-format\\\
32 --flag=N_:1:pass-c-format\\\
33 --flag=error:3:c-format --flag=error_at_line:5:c-format\\\
34 --flag=asnprintf:3:c-format --flag=vasnprintf:3:c-format\\\
35 --flag=argp_error:2:c-format\\\
36 --flag=__argp_error:2:c-format\\\
37 --flag=argp_failure:4:c-format\\\
38 --flag=__argp_failure:4:c-format\\\
39 --flag=argp_fmtstream_printf:2:c-format\\\
40 --flag=__argp_fmtstream_printf:2:c-format\\\
41'
42
43# Gettext supplies these files, but we don't need them since
44# we don't have an intl subdirectory.
45excluded_files='
46 m4/glibc2.m4
47 m4/intdiv0.m4
48 m4/lcmessage.m4
49 m4/lock.m4
50 m4/printf-posix.m4
51 m4/size_max.m4
52 m4/uintmax_t.m4
53 m4/ulonglong.m4
54 m4/visibility.m4
55 m4/xsize.m4
56'
57
58# Read local configuration file
59if [ -r .bootstrap ]; then
60 echo "$0: Reading configuration file .bootstrap"
61 eval set -- "`sed 's/#.*$//;/^$/d' .bootstrap | tr '\n' ' '` $*"
62fi
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 @@
1config.guess
2config.rpath
3config.sub
1depcomp 4depcomp
2install-sh 5install-sh
3missing 6link-warning.h
4config.rpath
5mdate-sh 7mdate-sh
6texinfo.tex 8missing
7config.guess
8config.sub
9mkinstalldirs 9mkinstalldirs
10texinfo.tex
diff --git a/build-aux/bootstrap b/build-aux/bootstrap
index d025457..c028967 100755
--- a/build-aux/bootstrap
+++ b/build-aux/bootstrap
@@ -1,6 +1,8 @@
1#! /bin/sh 1#! /bin/sh
2 2
3# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. 3# Bootstrap this package from checked-out sources.
4
5# Copyright (C) 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
4 6
5# This program is free software; you can redistribute it and/or modify 7# This program is free software; you can redistribute it and/or modify
6# it under the terms of the GNU General Public License as published by 8# it under the terms of the GNU General Public License as published by
@@ -14,86 +16,123 @@
14 16
15# You should have received a copy of the GNU General Public License 17# You should have received a copy of the GNU General Public License
16# along with this program; if not, write to the Free Software 18# along with this program; if not, write to the Free Software
17# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 19# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
18# 02111-1307, USA. 20# 02110-1301, USA.
19 21
20# Written by Paul Eggert and Sergey Poznyakoff. 22# Written by Paul Eggert.
21 23
22# URL of our text domain page in Translation Project 24nl='
23TP_URL="http://www.iro.umontreal.ca/translation/maint/cflow/" 25'
24 26
25# Ensure file names are sorted consistently across platforms; 27# Ensure file names are sorted consistently across platforms.
26# e.g., m4/ulonglong_gl.m4 should follow m4/ulonglong.m4. 28# Also, ensure diagnostics are in English, e.g., "wget --help" below.
27LC_ALL=C 29LC_ALL=C
28export LC_ALL 30export LC_ALL
29 31
30usage() { 32# Temporary directory names.
31 cat <<EOF 33bt='._bootmp'
32 usage: $0 [--gnulib-srcdir=DIR][--cvs-auth=AUTH-METHOD][--cvs-user=USERNAME][--no-po] 34bt_regex=`echo "$bt"| sed 's/\./[.]/g'`
33 Options are: 35bt2=${bt}2
34 --gnulib-srcdir=DIRNAME Specify the local directory where gnulib
35 sources reside. Use this if you already
36 have gnulib sources on your machine, and
37 do not want to waste your bandwidth dowloading
38 them again.
39 --cvs-auth=METHOD Set the CVS access method used for downloading
40 gnulib files. METHOD is one of the keywords
41 accepted by cvs -d option (see info cvs
42 repository).
43 --cvs-user=USERNAME Set the CVS username to be used when accessing
44 the gnulib repository.
45
46The following two options are reserved for future use:
47
48 --no-po Do not download po files.
49 --update-po[=LANG] Update po file(s) and exit.
50
51If the file \`.bootstrap' exists in the current working directory, its
52contents is read, comments and empty lines removed, shell variables expanded
53and the result is prepended to the command line options.
54
55Running without arguments will suffice in most cases. It is equivalent
56to
57
58 ./bootstrap --cvs-auth=ext --cvs-user=anoncvs
59