#
# admin/merge-gnulib
-# Copyright 2012-2015 Free Software Foundation, Inc.
+# Copyright 2012-2016 Free Software Foundation, Inc.
# This file is part of GNU Emacs.
crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512
dtoastr dtotimespec dup2 environ execinfo faccessat
fcntl fcntl-h fdatasync fdopendir filemode fstatat fsync
- getloadavg getopt-gnu gettime gettimeofday
- intprops largefile lstat
+ getloadavg getopt-gnu gettime gettimeofday gitlog-to-changelog
+ ignore-value intprops largefile lstat
manywarnings memrchr mkostemp mktime
- pipe2 pselect pthread_sigmask putenv qacl readlink readlinkat
- sig2str socklen stat-time stdalign stddef stdio
+ pipe2 pselect pthread_sigmask putenv qcopy-acl readlink readlinkat
+ sig2str socklen stat-time std-gnu11 stdalign stddef stdio
stpcpy strftime strtoimax strtoumax symlink sys_stat
- sys_time time time_r timer-time timespec-add timespec-sub
+ sys_time time time_r time_rz timegm timer-time timespec-add timespec-sub
unsetenv update-copyright utimens
vla warnings
'
GNULIB_TOOL_FLAGS='
--avoid=close --avoid=dup
- --avoid=fchdir --avoid=fstat
+ --avoid=fchdir --avoid=flexmember --avoid=fstat
--avoid=malloc-posix --avoid=msvc-inval --avoid=msvc-nothrow
--avoid=open --avoid=openat-die --avoid=opendir
--avoid=raise
- --avoid=save-cwd --avoid=select --avoid=sigprocmask
+ --avoid=save-cwd --avoid=select --avoid=setenv --avoid=sigprocmask
--avoid=stdarg --avoid=stdbool
- --avoid=threadlib
+ --avoid=threadlib --avoid=unsetenv
--conditional-dependencies --import --no-changelog --no-vc-files
--makefile-name=gnulib.mk
'
esac
case $src in
-*)
- echo >&2 "$0: usage: $0 [GNULIB_SRCDIR [SRCDIR]]
+ printf '%s\n' >&2 "$0: usage: $0 [GNULIB_SRCDIR [SRCDIR]]
SRCDIR is the Emacs source directory (default: working directory).
GNULIB_SRCDIR is the Gnulib source directory (default: SRCDIR/../gnulib)."
esac
test -x "$src"autogen.sh || {
- echo >&2 "$0: '${src:-.}' is not an Emacs source directory."
+ printf '%s\n' >&2 "$0: '${src:-.}' is not an Emacs source directory."
exit 1
}
exit
test -x "$gnulib_srcdir"/gnulib-tool || {
- echo >&2 "$0: '$gnulib_srcdir' is not a Gnulib source directory."
+ printf '%s\n' >&2 "$0: '$gnulib_srcdir' is not a Gnulib source directory."
exit 1
}