提交 76d87a59 编写于 作者: E Eric Blake

maint: update to latest gnulib

* .gnulib: Update to latest.
* bootstrap.conf (gnulib_modules): Add new termios module.
(gnulib_tool_option_extras): Make libtool usage explicit.
* src/util/util.c (includes): Gnulib now guarantees termios.h.
* bootstrap: Resync from gnulib.
上级 0f9c2460
.gnulib @ 833bff3a
Subproject commit 7ba06c8ff37d8725cb824c64b94be41b9294ffb7 Subproject commit 833bff3a531e4730779f8c7be1d9f7c471e6f221
#! /bin/sh #! /bin/sh
# Print a version string. # Print a version string.
scriptversion=2010-05-17.18; # UTC scriptversion=2010-07-06.10; # UTC
# Bootstrap this package from checked-out sources. # Bootstrap this package from checked-out sources.
...@@ -90,7 +90,8 @@ bootstrap_epilogue() { :; } ...@@ -90,7 +90,8 @@ bootstrap_epilogue() { :; }
# options because the latest/%s directory and the .po files within are # options because the latest/%s directory and the .po files within are
# all symlinks. # all symlinks.
po_download_command_format=\ po_download_command_format=\
"rsync -Lrtvz 'translationproject.org::tp/latest/%s/' '%s'" "rsync --delete --exclude '*.s1' -Lrtvz \
'translationproject.org::tp/latest/%s/' '%s'"
extract_package_name=' extract_package_name='
/^AC_INIT(/{ /^AC_INIT(/{
...@@ -475,15 +476,17 @@ download_po_files() { ...@@ -475,15 +476,17 @@ download_po_files() {
eval "$cmd" eval "$cmd"
} }
# Download .po files to $po_dir/.reference and copy only the new # Mirror .po files to $po_dir/.reference and copy only the new
# or modified ones into $po_dir. Also update $po_dir/LINGUAS. # or modified ones into $po_dir. Also update $po_dir/LINGUAS.
# Note po files that exist locally only are left in $po_dir but will
# not be included in LINGUAS and hence will not be distributed.
update_po_files() { update_po_files() {
# Directory containing primary .po files. # Directory containing primary .po files.
# Overwrite them only when we're sure a .po file is new. # Overwrite them only when we're sure a .po file is new.
po_dir=$1 po_dir=$1
domain=$2 domain=$2
# Download *.po files into this dir. # Mirror *.po files into this dir.
# Usually contains *.s1 checksum files. # Usually contains *.s1 checksum files.
ref_po_dir="$po_dir/.reference" ref_po_dir="$po_dir/.reference"
......
...@@ -65,6 +65,7 @@ strsep ...@@ -65,6 +65,7 @@ strsep
strtok_r strtok_r
sys_stat sys_stat
sys_wait sys_wait
termios
time_r time_r
timegm timegm
uname uname
...@@ -132,6 +133,7 @@ gnulib_mk=Makefile.am ...@@ -132,6 +133,7 @@ gnulib_mk=Makefile.am
gnulib_tool_option_extras="\ gnulib_tool_option_extras="\
--lgpl=2\ --lgpl=2\
--with-tests\ --with-tests\
--libtool\
" "
# Convince bootstrap to use multiple m4 directories. # Convince bootstrap to use multiple m4 directories.
......
...@@ -43,9 +43,7 @@ ...@@ -43,9 +43,7 @@
#endif #endif
#include <string.h> #include <string.h>
#include <signal.h> #include <signal.h>
#if HAVE_TERMIOS_H #include <termios.h>
# include <termios.h>
#endif
#include "c-ctype.h" #include "c-ctype.h"
#ifdef HAVE_PATHS_H #ifdef HAVE_PATHS_H
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册