diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2007-05-18 12:20:51 +0000 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2007-05-18 12:20:51 +0000 |
commit | add560e4e3c55b2481ab7c691be055f3095667a4 (patch) | |
tree | 0fda9abc2b39abde651470d705567f747808e45b | |
parent | 0891f1ede52fc72aaa77a8c0cc29951f8552b6d1 (diff) | |
download | cflow-add560e4e3c55b2481ab7c691be055f3095667a4.tar.gz cflow-add560e4e3c55b2481ab7c691be055f3095667a4.tar.bz2 |
Update for the recent gnulib
-rw-r--r-- | .cvsignore | 4 | ||||
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | README-alpha | 25 | ||||
-rw-r--r-- | bootstrap.conf | 62 | ||||
-rw-r--r-- | build-aux/.cvsignore | 11 | ||||
-rwxr-xr-x | build-aux/bootstrap | 683 | ||||
-rw-r--r-- | configure.ac | 9 | ||||
-rw-r--r-- | lib/.cvsignore | 82 | ||||
-rw-r--r-- | po/.cvsignore | 8 | ||||
-rw-r--r-- | po/Makevars | 16 | ||||
-rw-r--r-- | po/da.po | 193 | ||||
-rw-r--r-- | po/pl.po | 150 | ||||
-rw-r--r-- | po/uk.po | 143 | ||||
-rw-r--r-- | src/main.c | 12 |
14 files changed, 962 insertions, 444 deletions
@@ -1,11 +1,11 @@ | |||
1 | *.tar.bz2 | ||
2 | *.tar.gz | ||
1 | ABOUT-NLS | 3 | ABOUT-NLS |
2 | INSTALL | 4 | INSTALL |
3 | Makefile | 5 | Makefile |
4 | Makefile.in | 6 | Makefile.in |
5 | aclocal.m4 | 7 | aclocal.m4 |
6 | autom4te.cache | 8 | autom4te.cache |
7 | *.tar.bz2 | ||
8 | *.tar.gz | ||
9 | config | 9 | config |
10 | config.h | 10 | config.h |
11 | config.h.in | 11 | config.h.in |
@@ -1,3 +1,11 @@ | |||
1 | 2007-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 | |||
1 | 2006-09-11 Sergey Poznyakoff <gray@gnu.org.ua> | 9 | 2006-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 | ||
41 | In order to build this you will first need to have right versions of | 41 | If you have taken the sources from CVS you will need the following |
42 | autotools. At the time of this writing these are: | 42 | packages to build cflow. I don't make any extra effort to accommodate |
43 | 43 | older versions of these packages, so please make sure that you have the | |
44 | Package Version (>=) | 44 | latest 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/> | |
49 | To prepare the package for building run build-aux/bootstrap. For | 49 | - Gnulib <http://www.gnu.org/software/gnulib/> |
50 | example: | 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 | |||
54 | To prepare the package for building run `build-aux/bootstrap' utility. | ||
55 | For 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. | ||
21 | avoided_gnulib_modules=' | ||
22 | --avoid=lock | ||
23 | ' | ||
24 | |||
25 | # gnulib modules used by this package. | ||
26 | gnulib_modules="$avoided_gnulib_modules | ||
27 | `grep '^[^#]' build-aux/gnulib.modules` | ||
28 | " | ||
29 | # Additional xgettext options to use. Use "\\\newline" to break lines. | ||
30 | XGETTEXT_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. | ||
45 | excluded_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 | ||
59 | if [ -r .bootstrap ]; then | ||
60 | echo "$0: Reading configuration file .bootstrap" | ||
61 | eval set -- "`sed 's/#.*$//;/^$/d' .bootstrap | tr '\n' ' '` $*" | ||
62 | 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 @@ | |||
1 | config.guess | ||
2 | config.rpath | ||
3 | config.sub | ||
1 | depcomp | 4 | depcomp |
2 | install-sh | 5 | install-sh |
3 | missing | 6 | link-warning.h |
4 | config.rpath | ||
5 | mdate-sh | 7 | mdate-sh |
6 | texinfo.tex | 8 | missing |
7 | config.guess | ||
8 | config.sub | ||
9 | mkinstalldirs | 9 | mkinstalldirs |
10 | 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,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 | 24 | nl=' |
23 | TP_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. |
27 | LC_ALL=C | 29 | LC_ALL=C |
28 | export LC_ALL | 30 | export LC_ALL |
29 | 31 | ||
30 | usage() { | 32 | # Temporary directory names. |
31 | cat <<EOF | 33 | bt='._bootmp' |
32 | usage: $0 [--gnulib-srcdir=DIR][--cvs-auth=AUTH-METHOD][--cvs-user=USERNAME][--no-po] | 34 | bt_regex=`echo "$bt"| sed 's/\./[.]/g'` |
33 | Options are: | 35 | bt2=${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 | |||
46 | The 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 | |||
51 | If the file \`.bootstrap' exists in the current working directory, its | ||
52 | contents is read, comments and empty lines removed, shell variables expanded | ||
53 | and the result is prepended to the command line options. | ||
54 | |||
55 | Running without arguments will suffice in most cases. It is equivalent | ||
56 | to | ||
57 | |||
58 | ./bootstrap --cvs-auth=ext --cvs-user=anoncvs | ||
59 | |||