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 +1,3 @@ +*.tar.bz2 +*.tar.gz ABOUT-NLS @@ -6,4 +8,2 @@ aclocal.m4 autom4te.cache -*.tar.bz2 -*.tar.gz config @@ -1 +1,9 @@ +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> diff --git a/README-alpha b/README-alpha index 68806c1..6548cf6 100644 --- a/README-alpha +++ b/README-alpha @@ -40,12 +40,17 @@ The CVS repository is also available via HTTP from -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: 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 @@ -2,3 +2,5 @@ -# 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. @@ -16,12 +18,12 @@ # 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. -# Written by Paul Eggert and Sergey Poznyakoff. +# Written by Paul Eggert. -# URL of our text domain page in Translation Project -TP_URL="http://www.iro.umontreal.ca/translation/maint/cflow/" +nl=' +' -# Ensure file names are sorted consistently across platforms; -# e.g., m4/ulonglong_gl.m4 should follow m4/ulonglong.m4. +# Ensure file names are sorted consistently across platforms. +# Also, ensure diagnostics are in English, e.g., "wget --help" below. LC_ALL=C @@ -29,65 +31,103 @@ export LC_ALL -usage() { - cat <<EOF - usage: $0 [--gnulib-srcdir=DIR][--cvs-auth=AUTH-METHOD][--cvs-user=USERNAME][--no-po] - Options are: - --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 dowloading - them again. - --cvs-auth=METHOD Set the CVS access method used for downloading - gnulib files. METHOD is one of the keywords - accepted by cvs -d option (see info cvs - repository). - --cvs-user=USERNAME Set the CVS username to be used when accessing - the gnulib repository. - -The following two options are reserved for future use: - - --no-po Do not download po files. - --update-po[=LANG] Update po file(s) and exit. - -If the file \`.bootstrap' exists in the current working directory, its -contents is read, comments and empty lines removed, shell variables expanded -and the result is prepended to the command line options. - -Running without arguments will suffice in most cases. It is equivalent -to - - ./bootstrap --cvs-auth=ext --cvs-user=anoncvs - -EOF -} +# Temporary directory names. +bt='._bootmp' +bt_regex=`echo "$bt"| sed 's/\./[.]/g'` +bt2=${bt}2 -update_po() { - if [ $# = 1 ]; then - case $1 in - *.po) POFILE=$1;; - *) POFILE=${1}.po;; - esac - echo "$0: getting translation for $1..." - (cd po; - wget -r --cache=off -O $POFILE $TP_URL/$POFILE || exit - LANG=`expr $POFILE : '\(.*\)\.po'` - if ! grep -q $LANG LINGUAS; then - mv LINGUAS LINGUAS.$$ - (echo $LANG; cat LINGUAS.$$) | sort > LINGUAS - fi) - else - echo "$0: getting translations into po..." - (cd po && - rm -f dummy `ls | sed -n '/\.gmo$/p; /\.po/p'` && - wget -nv -nd -r -l 1 -A .po -C off $TP_URL && - rm -f index.html index.html.[0-9]* - ls *.po | sed 's/\.po$//' >LINGUAS - ) || exit - fi +usage() { + echo >&2 "\ +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. + --cvs-user=USERNAME Set the username to use when checking out + sources from the gnulib repository. + +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 configuration file -if [ -r .bootstrap ]; then - echo "$0: Reading configuration file .bootstrap" - eval set -- "`sed 's/#.*$//;/^$/d' .bootstrap | tr '\n' ' '` $*" -fi +# Configuration. + +# List of gnulib modules needed. +gnulib_modules= + +# Any gnulib files needed that are not in modules. +gnulib_files= + +# Translation Project URL, for the registry of all projects +# and for the translation-team master directory. +TP_URL='http://www.iro.umontreal.ca/translation/registry.cgi?domain=' +TP_PO_URL='http://www.iro.umontreal.ca/translation/teams/PO/' + +extract_package_name=' + /^AC_INIT(/{ + /.*,.*,.*,/{ + s/// + s/[][]//g + p + q + } + s/AC_INIT(\[*// + s/]*,.*// + s/^GNU // + y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ + s/[^A-Za-z0-9_]/-/g + p + } +' +package=`sed -n "$extract_package_name" configure.ac` || exit +gnulib_name=lib$package + +build_aux=build-aux +# 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 +" +# 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\\\ +' + +# 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 + +# Override the default configuration, if necessary. +test -r bootstrap.conf && . ./bootstrap.conf + +# Translate configuration into internal form. @@ -95,3 +135,2 @@ fi -DOWNLOAD_PO=no for option @@ -104,12 +143,10 @@ do GNULIB_SRCDIR=`expr "$option" : '--gnulib-srcdir=\(.*\)'`;; - --cvs-auth=*) - CVS_AUTH=`expr "$option" : '--cvs-auth=\(.*\)'`;; --cvs-user=*) CVS_USER=`expr "$option" : '--cvs-user=\(.*\)'`;; - --no-po) - DOWNLOAD_PO=no;; - --update-po=*) - DOWNLOAD_PO=`expr "$option" : '--update-po=\(.*\)'`;; - --update-po) - DOWNLOAD_PO=only;; + --skip-po) + SKIP_PO=t;; + --force) + checkout_only_file=;; + --copy) + copy=true;; *) @@ -120,53 +157,221 @@ done -case $DOWNLOAD_PO in -only) update_po - exit 0 - ;; -no|yes) ;; -*) update_po $DOWNLOAD_PO - exit 0 +if test -n "$checkout_only_file" && test ! -r "$checkout_only_file"; then + echo "$0: Bootstrapping from a non-checked-out distribution is risky." >&2 + exit 1 +fi + +# If $STR is not already on a line by itself in $FILE, insert it, +# sorting the new contents of the file and replacing $FILE with the result. +insert_sorted_if_absent() { + file=$1 + str=$2 + echo "$str" | sort -u - $file | cmp -s - $file \ + || echo "$str" | sort -u - $file -o $file \ + || exit 1 +} + +# Die if there is no AC_CONFIG_AUX_DIR($build_aux) line in configure.ac. +found_aux_dir=no +grep '^[ ]*AC_CONFIG_AUX_DIR(\['"$build_aux"'\])' configure.ac \ + >/dev/null && found_aux_dir=yes +grep '^[ ]*AC_CONFIG_AUX_DIR('"$build_aux"')' configure.ac \ + >/dev/null && found_aux_dir=yes +if test $found_aux_dir = no; then + echo "$0: expected line not found in configure.ac. Add the following:" >&2 + echo " AC_CONFIG_AUX_DIR([$build_aux])" >&2. +fi + +# If $build_aux doesn't exist, create it now, otherwise some bits +# below will malfunction. If creating it, also mark it as ignored. +if test ! -d $build_aux; then + mkdir $build_aux + for ig in .cvsignore .gitignore; do + test -f $ig && insert_sorted_if_absent $ig $build_aux + done +fi + +echo "$0: Bootstrapping from checked-out $package sources..." + +cleanup_gnulib() { + status=$? + rm -fr gnulib + exit $status +} + +# Get gnulib files. + +case ${GNULIB_SRCDIR--} in +-) + if [ ! -d gnulib ]; then + echo "$0: getting gnulib files..." + + case ${CVS_AUTH-pserver} in + pserver) + CVS_PREFIX=':pserver:anonymous@';; + ssh) + CVS_PREFIX="$CVS_USER${CVS_USER+@}";; + *) + echo "$0: $CVS_AUTH: Unknown CVS access method" >&2 + exit 1;; + esac + + case $CVS_RSH in + '') CVS_RSH=ssh; export CVS_RSH;; + esac + + trap cleanup_gnulib 1 2 13 15 + + cvs -z3 -q -d ${CVS_PREFIX}cvs.savannah.gnu.org:/cvsroot/gnulib co gnulib || + cleanup_gnulib + + trap - 1 2 13 15 + fi + GNULIB_SRCDIR=gnulib esac -echo "$0: Bootstrapping CVS cflow..." +gnulib_tool=$GNULIB_SRCDIR/gnulib-tool +<$gnulib_tool || exit + +# Get translations. + +get_translations() { + subdir=$1 + domain=$2 + + case $WGET_COMMAND in + '') + echo "$0: wget not available; skipping translations";; + ?*) + echo "$0: getting translations into $subdir for $domain..." && + + (cd $subdir && rm -f dummy `ls | sed -n '/\.gmo$/p; /\.po/p'`) && + $WGET_COMMAND -O "$subdir/$domain.html" "$TP_URL$domain" && + + sed -n 's|.*"http://[^"]*/translation/teams/PO/\([^/"]*\)/'"$domain"'-\([^/"]*\)\.[^."]*\.po".*|\1.\2|p' <"$subdir/$domain.html" | + sort -k 1,1 -k 2,2n -k2,2 -k3,3n -k3,3 -k4,4n -k4,4 -k5,5n -k5.5 | + awk -F. ' + { if (lang && $1 != lang) print lang, ver } + { lang = $1; ver = substr($0, index($0, ".") + 1) } + END { if (lang) print lang, ver } + ' | awk -v domain="$domain" -v subdir="$subdir" ' + { + lang = $1 + ver = $2 + urlfmt = "" + printf "{ $WGET_COMMAND -O %s/%s.po '\'"$TP_PO_URL"'/%s/%s-%s.%s.po'\'' &&\n", subdir, lang, lang, domain, ver, lang + printf " msgfmt -c -o /dev/null %s/%s.po || {\n", subdir, lang + printf " echo >&2 '\'"$0"': omitting translation for %s'\''\n", lang + printf " rm -f %s/%s.po; }; } &&\n", subdir, lang + } + END { print ":" } + ' | WGET_COMMAND="$WGET_COMMAND" sh;; + esac && + ls "$subdir"/*.po 2>/dev/null | + sed 's|.*/||; s|\.po$||' >"$subdir/LINGUAS" && + rm -f "$subdir/$domain.html" +} -build_cvs_prefix() { - CVS_PREFIX=:${1}: - if [ "${2}" != - ]; then - CVS_PREFIX=${CVS_PREFIX}${2}@ +case $SKIP_PO in +'') + case `wget --help` in + *'--no-cache'*) + WGET_COMMAND='wget -nv --no-cache';; + *'--cache=on/off'*) + WGET_COMMAND='wget -nv --cache=off';; + *'--non-verbose'*) + WGET_COMMAND='wget -nv';; + *) + WGET_COMMAND='';; + esac + + if test -d po; then + get_translations po $package || exit fi - if [ "$1" = "ext" ]; then - if [ -z "${CVS_RSH}" ]; then - CVS_RSH=ssh - export CVS_RSH + + if test -d runtime-po; then + get_translations runtime-po $package-runtime || exit + fi;; +esac + +symlink_to_gnulib() +{ + src=$GNULIB_SRCDIR/$1 + dst=${2-$1} + + test -f "$src" && { + if $copy; then + { + test ! -h "$dst" || { + echo "$0: rm -f $dst" && + rm -f "$dst" + } + } && + test -f "$dst" && + cmp -s "$src" "$dst" || { + echo "$0: cp -fp $src $dst" && + cp -fp "$src" "$dst" + } + else + test -h "$dst" && + src_ls=`ls -diL "$src" 2>/dev/null` && set $src_ls && src_i=$1 && + dst_ls=`ls -diL "$dst" 2>/dev/null` && set $dst_ls && dst_i=$1 && + test "$src_i" = "$dst_i" || { + dot_dots= + case $src in + /*) ;; + *) + case /$dst/ in + *//* | */../* | */./* | /*/*/*/*/*/) + echo >&2 "$0: invalid symlink calculation: $src -> $dst" + exit 1;; + /*/*/*/*/) dot_dots=../../../;; + /*/*/*/) dot_dots=../../;; + /*/*/) dot_dots=../;; + esac;; + esac + + echo "$0: ln -fs $dot_dots$src $dst" && + ln -fs "$dot_dots$src" "$dst" + } fi - fi + } } -# checkout package -checkout() { - if [ ! -d $1 ]; then - echo "$0: getting $1 files..." - - trap exit 1 2 13 15 - trap 'rm -fr $1; exit 1' 0 - - case "${CVS_AUTH--}" in - -) build_cvs_prefix ext anoncvs - ;; - pserver) build_cvs_prefix $CVS_AUTH ${CVS_USER:-anoncvs} - ;; - gserver|server) - build_cvs_prefix $CVS_AUTH ${CVS_USER--} - ;; - ext) build_cvs_prefix $CVS_AUTH ${CVS_USER--} - ;; - *) echo "$0: Unknown CVS access method" >&2 - exit 1;; +cp_mark_as_generated() +{ + cp_src=$1 + cp_dst=$2 + + if cmp -s "$cp_src" "$GNULIB_SRCDIR/$cp_dst"; then + symlink_to_gnulib "$cp_dst" + else + case $cp_dst in + *.[ch]) c1='/* '; c2=' */';; + *.texi) c1='@c '; c2= ;; + *.m4|*/Make*|Make*) c1='# ' ; c2= ;; + *) c1= ; c2= ;; esac - if [ "${CVS_AUTH--}" = "pserver" ]; then - cvs -d ${CVS_PREFIX}subversions.gnu.org:/cvsroot/$1 login || exit - fi - cvs -q -d ${CVS_PREFIX}subversions.gnu.org:/cvsroot/$1 co $1 || exit - trap 0 + if test -z "$c1"; then + cmp -s "$cp_src" "$cp_dst" || { + echo "$0: cp -f $cp_src $cp_dst" && + rm -f "$cp_dst" && + sed "s!$bt_regex/!!g" "$cp_src" > "$cp_dst" + } + else + # Copy the file first to get proper permissions if it + # doesn't already exist. Then overwrite the copy. + cp "$cp_src" "$cp_dst-t" && + ( + echo "$c1-*- buffer-read-only: t -*- vi: set ro:$c2" && + echo "${c1}DO NOT EDIT! GENERATED AUTOMATICALLY!$c2" && + sed "s!$bt_regex/!!g" "$cp_src" + ) > $cp_dst-t && + if cmp -s "$cp_dst-t" "$cp_dst"; then + rm -f "$cp_dst-t" + else + echo "$0: cp $cp_src $cp_dst # with edits" && + mv -f "$cp_dst-t" "$cp_dst" + fi + fi fi @@ -174,19 +379,67 @@ checkout() { -# Prepare temporary module list -cat /dev/null > modlist.tmp -trap 'rm -f modlist.tmp' 0 1 2 13 15 - -get_modules() { - sed '/^[ ]*#/d;/^[ ]*$/d' $* >> modlist.tmp +version_controlled_file() { + dir=$1 + file=$2 + found=no + if test -d CVS; then + grep -F "/$file/" $dir/CVS/Entries 2>/dev/null | + grep '^/[^/]*/[0-9]' > /dev/null && found=yes + elif test -d .git; then + git-rm -n "$dir/$file" > /dev/null 2>&1 && found=yes + else + echo "$0: no version control for $dir/$file?" >&2 + fi + test $found = yes } -# copy_files srcdir dstdir -copy_files() { - for file in `cat $1/DISTFILES` - do - case $file in - "#*") continue;; - esac - echo "$0: Copying file $1/$file" - cp -p $1/$file $2/`expr $file : '.*/\(.*\)'` +slurp() { + for dir in . `(cd $1 && find * -type d -print)`; do + copied= + sep= + for file in `ls $1/$dir`; do + test -d $1/$dir/$file && continue + for excluded_file in $excluded_files; do + test "$dir/$file" = "$excluded_file" && continue 2 + done + if test $file = Makefile.am; then + copied=$copied${sep}gnulib.mk; sep=$nl + remove_intl='/^[^#].*\/intl/s/^/#/;'"s!$bt_regex/!!g" + sed "$remove_intl" $1/$dir/$file | cmp -s - $dir/gnulib.mk || { + echo "$0: Copying $1/$dir/$file to $dir/gnulib.mk ..." && + rm -f $dir/gnulib.mk && + sed "$remove_intl" $1/$dir/$file >$dir/gnulib.mk + } + elif { test "${2+set}" = set && test -r $2/$dir/$file; } || + version_controlled_file $dir $file; then + echo "$0: $dir/$file overrides $1/$dir/$file" + else + copied=$copied$sep$file; sep=$nl + if test $file = gettext.m4; then + echo "$0: patching m4/gettext.m4 to remove need for intl/* ..." + rm -f $dir/$file + sed ' + /^AC_DEFUN(\[AM_INTL_SUBDIR],/,/^]/c\ + AC_DEFUN([AM_INTL_SUBDIR], [ + /^AC_DEFUN(\[gt_INTL_SUBDIR_CORE],/,/^]/c\ + AC_DEFUN([gt_INTL_SUBDIR_CORE], []) + $a\ + AC_DEFUN([gl_LOCK_EARLY], []) + ' $1/$dir/$file >$dir/$file + else + cp_mark_as_generated $1/$dir/$file $dir/$file + fi + fi || exit + done + + for dot_ig in .cvsignore .gitignore; do + ig=$dir/$dot_ig + if test -n "$copied" && test -f $ig; then + insert_sorted_if_absent $ig "$copied" + # If an ignored file name ends with _.h, then also add + # the name with just ".h". Many gnulib headers are generated, + # e.g., stdint_.h -> stdint.h, dirent_.h ->..., etc. + f=`echo "$copied"|sed 's/_\.h$/.h/'` + insert_sorted_if_absent $ig "$f" + fi + done done @@ -194,89 +447,107 @@ copy_files() { -# Get gnulib files. -case ${GNULIB_SRCDIR--} in --) checkout gnulib - GNULIB_SRCDIR=gnulib -esac +# Create boot temporary directories to import from gnulib and gettext. +rm -fr $bt $bt2 && +mkdir $bt $bt2 || exit + +# Import from gnulib. + +gnulib_tool_options="\ + --import\ + --no-changelog\ + --aux-dir $bt/$build_aux\ + --doc-base $bt/doc\ + --lib $gnulib_name\ + --m4-base $bt/m4/\ + --source-base $bt/lib/\ + --tests-base $bt/tests\ + --local-dir gl\ +$gnulib_tool_option_extras\ +" +echo "$0: $gnulib_tool $gnulib_tool_options --import ..." +$gnulib_tool $gnulib_tool_options --import $gnulib_modules && +slurp $bt || exit + +for file in $gnulib_files; do + symlink_to_gnulib $file || exit +done -<$GNULIB_SRCDIR/gnulib-tool || exit -get_modules build-aux/gnulib.modules +# Import from gettext. +with_gettext=yes +grep '^[ ]*AM_GNU_GETTEXT_VERSION(' configure.ac >/dev/null || \ + with_gettext=no -gnulib_modules=`sort -u modlist.tmp` -previous_gnulib_modules= -while [ "$gnulib_modules" != "$previous_gnulib_modules" ]; do - previous_gnulib_modules=$gnulib_modules - gnulib_modules=` - (echo "$gnulib_modules" - for gnulib_module in $gnulib_modules; do - $GNULIB_SRCDIR/gnulib-tool --extract-dependencies $gnulib_module - done) | sort -u - ` -done +if test $with_gettext = yes; then + echo "$0: (cd $bt2; autopoint) ..." + cp configure.ac $bt2 && + (cd $bt2 && autopoint && rm configure.ac) && + slurp $bt2 $bt || exit -gnulib_files=` - (for gnulib_module in $gnulib_modules; do - $GNULIB_SRCDIR/gnulib-tool --extract-filelist $gnulib_module - done) | sort -u -` + rm -fr $bt $bt2 || exit +fi -gnulib_dirs=`echo "$gnulib_files" | sed 's,/[^/]*$,,' | sort -u` -mkdir -p $gnulib_dirs || exit -for file in build-aux/*.m4; do - dest=m4/`basename $file` +# Reconfigure, getting other files. - rm -f $dest && - echo "$0: Copying file $file" && - cp -p $file $dest || exit +for command in \ + libtool \ + 'aclocal --force -I m4' \ + 'autoconf --force' \ + 'autoheader --force' \ + 'automake --add-missing --copy --force-missing'; +do + if test "$command" = libtool; then + grep '^[ ]*AM_PROG_LIBTOOL\>' configure.ac >/dev/null || + continue + command='libtoolize -c -f' + fi + echo "$0: $command ..." + $command || exit done -for gnulib_file in $gnulib_files; do - case $gnulib_file in - config/*) dest=`echo $gnulib_file | sed 's,config/,build-aux/,'`;; - # These will be overwritten by autopoint, which still uses - # old jm_.* macro names, so we have to keep both copies. - m4/gettext.m4 | m4/glibc21.m4 | m4/inttypes_h.m4 | m4/lib-ld.m4 | \ - m4/lib-prefix.m4 | m4/po.m4 | m4/stdint_h.m4 | m4/uintmax_t.m4 | \ - m4/ulonglong.m4 | m4/longlong.m4) - dest=`expr $gnulib_file : '\(.*\).m4'`_gl.m4;; - *) dest=$gnulib_file;; + +# Get some extra files from gnulib, overriding existing files. + +for file in $gnulib_extra_files; do + case $file in + */INSTALL) dst=INSTALL;; + *) dst=$file;; esac - rm -f $dest && - echo "$0: Copying file $GNULIB_SRCDIR/$gnulib_file" && - cp -p $GNULIB_SRCDIR/$gnulib_file $dest || exit + symlink_to_gnulib $file $dst || exit done -echo "$0: Creating m4/gnulib.m4" -(echo "# This file is generated automatically. Please, do not edit." - echo "#" - echo "AC_DEFUN([cflow_GNULIB],[" - for gnulib_module in $gnulib_modules; do - echo "# $gnulib_module" - $GNULIB_SRCDIR/gnulib-tool --extract-autoconf-snippet $gnulib_module - done | sed '/AM_GNU_GETTEXT/d' - echo "])") > ./m4/gnulib.m4 - -echo "$0: Creating lib/Makefile.am" -(echo "# -*- buffer-read-only: t -*- vi: set ro:" - echo "# This file is generated automatically from lib/Makefile.tmpl. Do not edit!" - cat lib/Makefile.tmpl - - for gnulib_module in $gnulib_modules; do - echo "# $gnulib_module" - $GNULIB_SRCDIR/gnulib-tool --extract-automake-snippet $gnulib_module - done | sed 's/lib_SOURCES/libcflow_a_SOURCES/g' ) > lib/Makefile.am - -# Get translations. -if test "$DOWNLOAD_PO" = "yes"; then - update_po +if test $with_gettext = yes; then + # Create gettext configuration. + echo "$0: Creating po/Makevars from po/Makevars.template ..." + rm -f po/Makevars + sed ' + /^EXTRA_LOCALE_CATEGORIES *=/s/=.*/= '"$EXTRA_LOCALE_CATEGORIES"'/ + /^MSGID_BUGS_ADDRESS *=/s/=.*/= bug-'"$package"'@gnu.org/ + /^XGETTEXT_OPTIONS *=/{ + s/$/ \\/ + a\ + '"$XGETTEXT_OPTIONS"' $${end_of_xgettext_options+} + } + ' po/Makevars.template >po/Makevars + + if test -d runtime-po; then + # Similarly for runtime-po/Makevars, but not quite the same. + rm -f runtime-po/Makevars + sed ' + /^DOMAIN *=.*/s/=.*/= '"$package"'-runtime/ + /^subdir *=.*/s/=.*/= runtime-po/ + /^MSGID_BUGS_ADDRESS *=/s/=.*/= bug-'"$package"'@gnu.org/ + /^XGETTEXT_OPTIONS *=/{ + s/$/ \\/ + a\ + '"$XGETTEXT_OPTIONS_RUNTIME"' $${end_of_xgettext_options+} + } + ' <po/Makevars.template >runtime-po/Makevars + + # Copy identical files from po to runtime-po. + (cd po && cp -p Makefile.in.in *-quot *.header *.sed *.sin ../runtime-po) + fi fi -# Reconfigure, getting other files. - -echo "$0: autoreconf --verbose --install --force ..." -autoreconf --verbose --install --force || exit 1 - - echo "$0: done. Now you can run './configure'." diff --git a/configure.ac b/configure.ac index 2326343..765f65c 100644 --- a/configure.ac +++ b/configure.ac @@ -26,3 +26,3 @@ AM_INIT_AUTOMAKE AC_CONFIG_HEADER([config.h]) -gl_USE_SYSTEM_EXTENSIONS +gl_EARLY @@ -41,3 +41,3 @@ AC_CHECK_FUNCS([memmove memset strdup strerror strtol setlocale]) -cflow_GNULIB +gl_INIT MU_DEBUG_MODE @@ -59,5 +59,4 @@ AC_SUBST(lisp_LISP) # Gettext. -AM_MKINSTALLDIRS -AM_GNU_GETTEXT([external], [need-ngettext]) -AM_GNU_GETTEXT_VERSION(0.14.1) +AM_GNU_GETTEXT([external], [need-formatstring-macros]) +AM_GNU_GETTEXT_VERSION(0.16) diff --git a/lib/.cvsignore b/lib/.cvsignore index 1a97f7b..410c714 100644 --- a/lib/.cvsignore +++ b/lib/.cvsignore @@ -1 +1,2 @@ +*.[ch] .deps @@ -4,2 +5,81 @@ Makefile.am Makefile.in -*.[ch] +alloca.c +alloca.h +alloca_.h +argp-ba.c +argp-eexst.c +argp-fmtstream.c +argp-fmtstream.h +argp-fs-xinl.c +argp-help.c +argp-namefrob.h +argp-parse.c +argp-pin.c +argp-pv.c +argp-pvh.c +argp-xinl.c +argp.h +asnprintf.c +basename.c +dirname.c +dirname.h +dummy.c +error.c +error.h +exitfail.c +exitfail.h +getopt.c +getopt.h +getopt1.c +getopt_.h +getopt_int.h +gettext.h +gnulib.mk +hash.c +hash.h +lstat.c +lstat.h +malloc.c +mempcpy.c +obstack.c +obstack.h +printf-args.c +printf-args.h +printf-parse.c +printf-parse.h +size_max.h +sleep.c +snprintf.c +stdbool.h +stdbool_.h +stdint.h +stdint_.h +stdio.h +stdio_.h +stdlib.h +stdlib_.h +strcasecmp.c +strchrnul.c +string.h +string_.h +stripslash.c +strncasecmp.c +strndup.c +strnlen.c +sys_stat.h +sys_stat_.h +sysexits.h +sysexits_.h +unistd.h +unistd_.h +vasnprintf.c +vasnprintf.h +vsnprintf.c +wchar.h +wchar_.h +xalloc-die.c +xalloc.h +xmalloc.c +xsize.h +xstrndup.c +xstrndup.h diff --git a/po/.cvsignore b/po/.cvsignore index 0055994..e34e97e 100644 --- a/po/.cvsignore +++ b/po/.cvsignore @@ -1 +1,3 @@ +*.gmo +*.mo Makefile @@ -6,4 +8,4 @@ POTFILES Rules-quot -cflow.pot boldquot.sed +cflow.pot en@boldquot.header @@ -13,6 +15,4 @@ mailutils.pot quot.sed -remove-potcdate.sin remove-potcdate.sed +remove-potcdate.sin stamp-po -*.mo -*.gmo diff --git a/po/Makevars b/po/Makevars deleted file mode 100644 index 15fe7fb..0000000 --- a/po/Makevars +++ /dev/null @@ -1,16 +0,0 @@ -# -# Makefile variables for PO directory. -# Copyright (C) 2005 Free Software Foundation, Inc. -# - -DOMAIN = $(PACKAGE) - -subdir = po -top_builddir = .. - -XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ -COPYRIGHT_HOLDER = Sergey Poznyakoff -MSGID_BUGS_ADDRESS = bug-cflow@gnu.org -EXTRA_LOCALE_CATEGORIES = - -# EOF @@ -7,3 +7,3 @@ msgstr "" "Report-Msgid-Bugs-To: bug-cflow@gnu.org\n" -"POT-Creation-Date: 2005-10-07 10:22+0300\n" +"POT-Creation-Date: 2006-09-10 15:17+0300\n" "PO-Revision-Date: 2005-11-01 00:27+0200\n" |