From c8472096c46e0561675fa9ffc33b671de8691c06 Mon Sep 17 00:00:00 2001 From: Alexey Pavlov Date: Mon, 2 Jul 2018 13:50:04 +0300 Subject: [PATCH] libpipeline: Update to 1.5.0 --- libpipeline/PKGBUILD | 20 +- libpipeline/libpipeline-1.4.1-msys2.patch | 52 +- .../libpipeline-1.4.1-update-gnulib.patch | 37536 ---------------- libpipeline/libpipeline-1.5.0-gnulib.patch | 14667 ++++++ 4 files changed, 14689 insertions(+), 37586 deletions(-) delete mode 100644 libpipeline/libpipeline-1.4.1-update-gnulib.patch create mode 100644 libpipeline/libpipeline-1.5.0-gnulib.patch diff --git a/libpipeline/PKGBUILD b/libpipeline/PKGBUILD index 92435b70..df6b3bdc 100644 --- a/libpipeline/PKGBUILD +++ b/libpipeline/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Alexey Pavlov pkgname=('libpipeline' 'libpipeline-devel') -pkgver=1.4.1 +pkgver=1.5.0 pkgrel=1 pkgdesc="a C library for manipulating pipelines of subprocesses in a flexible and convenient way" url="http://libpipeline.nongnu.org/" @@ -11,25 +11,23 @@ license=('BSD') makedepends=('openssl-devel' 'zlib-devel') options=('!libtool') source=(https://download.savannah.gnu.org/releases/libpipeline/libpipeline-$pkgver.tar.gz{,.sig} - libpipeline-1.4.1-update-gnulib.patch + libpipeline-1.5.0-gnulib.patch libpipeline-1.4.1-msys2.patch) -sha256sums=('da46d7b20163aadb9db2faae483f734e9096a7550c84b94029abeab62dd1b9ee' +sha256sums=('0d72e12e4f2afff67fd7b9df0a24d7ba42b5a7c9211ac5b3dcccc5cd8b286f2b' 'SKIP' - '28f1d5b45822f4f7067650243f89fc6e25aa76d16212fa8997b794b91840750e' - 'c3fb29cd682b1d977aa896a9ee13e2bcd263754db7c625bd670dc9305747cec8') + '0559526eecb02415f210c6c0d2b0a5b5694ffe8637b74840684433f8cdb1bd37' + 'ca3d2b15f0da4b593ca4a6b25b7555a96f3a565d75edf11b93cd97ca1b831265') prepare() { - cd "$pkgname-$pkgver" - patch -p1 -i ${srcdir}/libpipeline-1.4.1-update-gnulib.patch + cd "${pkgname}-${pkgver}" + patch -p1 -i ${srcdir}/libpipeline-1.5.0-gnulib.patch patch -p1 -i ${srcdir}/libpipeline-1.4.1-msys2.patch - # cp -rf build-aux/snippet ${srcdir}/ autoreconf -fi - # cp -rf ${srcdir}/snippet build-aux/ } build() { - cd "$pkgname-$pkgver" + cd "${pkgname}-${pkgver}" ./configure --build=${CHOST} --prefix=/usr make @@ -37,7 +35,7 @@ build() { } check() { - cd "$pkgname-$pkgver" + cd "${pkgname}-${pkgver}" make check } diff --git a/libpipeline/libpipeline-1.4.1-msys2.patch b/libpipeline/libpipeline-1.4.1-msys2.patch index 69b0c154..53ab2d04 100644 --- a/libpipeline/libpipeline-1.4.1-msys2.patch +++ b/libpipeline/libpipeline-1.4.1-msys2.patch @@ -1,3 +1,16 @@ +diff -durN libpipeline-1.4.1.orig/build-aux/config.guess libpipeline-1.4.1/build-aux/config.guess +--- libpipeline-1.4.1.orig/build-aux/config.guess 2017-05-17 10:35:06.968750000 +0800 ++++ libpipeline-1.4.1/build-aux/config.guess 2017-05-17 10:58:47.937500000 +0800 +@@ -891,6 +891,9 @@ + amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) + echo x86_64-unknown-cygwin + exit ;; ++ amd64:MSYS*:*:* | x86_64:MSYS*:*:*) ++ echo x86_64-unknown-msys ++ exit ;; + p*:CYGWIN*:*) + echo powerpcle-unknown-cygwin + exit ;; diff -durN libpipeline-1.4.1.orig/build-aux/config.rpath libpipeline-1.4.1/build-aux/config.rpath --- libpipeline-1.4.1.orig/build-aux/config.rpath 2017-05-17 10:35:06.968750000 +0800 +++ libpipeline-1.4.1/build-aux/config.rpath 2017-05-17 10:58:47.937500000 +0800 @@ -46,45 +59,6 @@ diff -durN libpipeline-1.4.1.orig/build-aux/config.rpath libpipeline-1.4.1/build shrext=.dll library_names_spec='$libname.dll.a $libname.lib' ;; -diff -durN libpipeline-1.4.1.orig/configure libpipeline-1.4.1/configure ---- libpipeline-1.4.1.orig/configure 2017-05-17 10:38:38.515625000 +0800 -+++ libpipeline-1.4.1/configure 2017-05-17 11:02:49.593750000 +0800 -@@ -15073,7 +15073,7 @@ - else - case "$host_os" in - osf*) gl_use_threads=no ;; -- cygwin*) -+ cygwin* | msys*) - case `uname -r` in - 1.[0-5].*) gl_use_threads=no ;; - *) gl_use_threads=yes ;; -@@ -16185,7 +16185,7 @@ - # special semantics and is distinct from /, please report it to - # . - case $host in -- *-cygwin | i370-ibm-openedition) -+ *-cygwin | *-msys | i370-ibm-openedition) - gl_cv_double_slash_root=yes ;; - *) - # Be optimistic and assume that / and // are the same when we -@@ -19252,7 +19252,7 @@ - case "$host_os" in - # Guess yes on platforms where we know the result. - *-gnu* | freebsd* | netbsd* | openbsd* \ -- | hpux* | solaris* | cygwin* | mingw*) -+ | hpux* | solaris* | cygwin* | msys* | mingw*) - ac_cv_func_malloc_0_nonnull=yes ;; - # If we don't know, assume the worst. - *) ac_cv_func_malloc_0_nonnull=no ;; -@@ -22890,7 +22890,7 @@ - # special semantics and is distinct from /, please report it to - # . - case $host in -- *-cygwin | i370-ibm-openedition) -+ *-cygwin | *-msys | i370-ibm-openedition) - gl_cv_double_slash_root=yes ;; - *) - # Be optimistic and assume that / and // are the same when we diff -durN libpipeline-1.4.1.orig/gnulib/m4/double-slash-root.m4 libpipeline-1.4.1/gnulib/m4/double-slash-root.m4 --- libpipeline-1.4.1.orig/gnulib/m4/double-slash-root.m4 2017-05-17 10:35:41.640625000 +0800 +++ libpipeline-1.4.1/gnulib/m4/double-slash-root.m4 2017-05-17 11:04:32.203125000 +0800 diff --git a/libpipeline/libpipeline-1.4.1-update-gnulib.patch b/libpipeline/libpipeline-1.4.1-update-gnulib.patch deleted file mode 100644 index 3884c965..00000000 --- a/libpipeline/libpipeline-1.4.1-update-gnulib.patch +++ /dev/null @@ -1,37536 +0,0 @@ -diff -durN libpipeline-1.4.1.orig/aclocal.m4 libpipeline-1.4.1/aclocal.m4 ---- libpipeline-1.4.1.orig/aclocal.m4 2015-08-17 17:14:21.000000000 +0800 -+++ libpipeline-1.4.1/aclocal.m4 2017-05-17 10:38:33.703125000 +0800 -@@ -180,7 +180,6 @@ - fi[]dnl - ])# PKG_CHECK_MODULES - -- - # PKG_INSTALLDIR(DIRECTORY) - # ------------------------- - # Substitutes the variable pkgconfigdir as the location where a module -@@ -235,19 +234,93 @@ - AS_VAR_IF([$1], [""], [$5], [$4])dnl - ])# PKG_CHECK_VAR - -+# PKG_WITH_MODULES(VARIABLE-PREFIX, MODULES, -+# [ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND], -+# [DESCRIPTION], [DEFAULT]) -+# -+# Prepare a "--with-" configure option using the lowercase [VARIABLE-PREFIX] -+# name, merging the behaviour of AC_ARG_WITH and PKG_CHECK_MODULES in a single -+# macro -+# -+# -------------------------------------------------------------- -+AC_DEFUN([PKG_WITH_MODULES], -+[ -+m4_pushdef([with_arg], m4_tolower([$1])) -+ -+m4_pushdef([description], -+ [m4_default([$5], [build with ]with_arg[ support])]) -+ -+m4_pushdef([def_arg], [m4_default([$6], [auto])]) -+m4_pushdef([def_action_if_found], [AS_TR_SH([with_]with_arg)=yes]) -+m4_pushdef([def_action_if_not_found], [AS_TR_SH([with_]with_arg)=no]) -+ -+m4_case(def_arg, -+ [yes],[m4_pushdef([with_without], [--without-]with_arg)], -+ [m4_pushdef([with_without],[--with-]with_arg)]) -+ -+AC_ARG_WITH(with_arg, -+ AS_HELP_STRING(with_without, description[ @<:@default=]def_arg[@:>@]),, -+ [AS_TR_SH([with_]with_arg)=def_arg]) -+ -+AS_CASE([$AS_TR_SH([with_]with_arg)], -+ [yes],[PKG_CHECK_MODULES([$1],[$2],$3,$4)], -+ [auto],[PKG_CHECK_MODULES([$1],[$2], -+ [m4_n([def_action_if_found]) $3], -+ [m4_n([def_action_if_not_found]) $4])]) -+ -+m4_popdef([with_arg]) -+m4_popdef([description]) -+m4_popdef([def_arg]) -+ -+]) dnl PKG_WITH_MODULES -+ -+# PKG_HAVE_WITH_MODULES(VARIABLE-PREFIX, MODULES, -+# [DESCRIPTION], [DEFAULT]) -+# -+# Convenience macro to trigger AM_CONDITIONAL after -+# PKG_WITH_MODULES check. -+# -+# HAVE_[VARIABLE-PREFIX] is exported as make variable. -+# -+# -------------------------------------------------------------- -+AC_DEFUN([PKG_HAVE_WITH_MODULES], -+[ -+PKG_WITH_MODULES([$1],[$2],,,[$3],[$4]) -+ -+AM_CONDITIONAL([HAVE_][$1], -+ [test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"]) -+]) -+ -+# PKG_HAVE_DEFINE_WITH_MODULES(VARIABLE-PREFIX, MODULES, -+# [DESCRIPTION], [DEFAULT]) -+# -+# Convenience macro to run AM_CONDITIONAL and AC_DEFINE after -+# PKG_WITH_MODULES check. -+# -+# HAVE_[VARIABLE-PREFIX] is exported as make and preprocessor variable. -+# -+# -------------------------------------------------------------- -+AC_DEFUN([PKG_HAVE_DEFINE_WITH_MODULES], -+[ -+PKG_HAVE_WITH_MODULES([$1],[$2],[$3],[$4]) -+ -+AS_IF([test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"], -+ [AC_DEFINE([HAVE_][$1], 1, [Enable ]m4_tolower([$1])[ support])]) -+]) -+ - # po.m4 serial 24 (gettext-0.19) --dnl Copyright (C) 1995-2014 Free Software Foundation, Inc. -+dnl Copyright (C) 1995-2014, 2016 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. - dnl --dnl This file can can be used in projects which are not available under -+dnl This file can be used in projects which are not available under - dnl the GNU General Public License or the GNU Library General Public - dnl License but which still want to provide support for the GNU gettext - dnl functionality. - dnl Please note that the actual code of the GNU gettext library is covered - dnl by the GNU Library General Public License, and the rest of the GNU --dnl gettext package package is covered by the GNU General Public License. -+dnl gettext package is covered by the GNU General Public License. - dnl They are *not* in the public domain. - - dnl Authors: -@@ -1931,6 +2004,7 @@ - m4_include([gnulib/m4/fcntl-o.m4]) - m4_include([gnulib/m4/fcntl_h.m4]) - m4_include([gnulib/m4/float_h.m4]) -+m4_include([gnulib/m4/getprogname.m4]) - m4_include([gnulib/m4/gettimeofday.m4]) - m4_include([gnulib/m4/gnulib-common.m4]) - m4_include([gnulib/m4/gnulib-comp.m4]) -@@ -1943,6 +2017,8 @@ - m4_include([gnulib/m4/lib-link.m4]) - m4_include([gnulib/m4/lib-prefix.m4]) - m4_include([gnulib/m4/libtool.m4]) -+m4_include([gnulib/m4/limits-h.m4]) -+m4_include([gnulib/m4/localtime-buffer.m4]) - m4_include([gnulib/m4/lock.m4]) - m4_include([gnulib/m4/longlong.m4]) - m4_include([gnulib/m4/lstat.m4]) -@@ -1962,6 +2038,7 @@ - m4_include([gnulib/m4/onceonly.m4]) - m4_include([gnulib/m4/pathmax.m4]) - m4_include([gnulib/m4/printf.m4]) -+m4_include([gnulib/m4/pthread_rwlock_rdlock.m4]) - m4_include([gnulib/m4/raise.m4]) - m4_include([gnulib/m4/read.m4]) - m4_include([gnulib/m4/safe-read.m4]) -diff -durN libpipeline-1.4.1.orig/build-aux/ar-lib libpipeline-1.4.1/build-aux/ar-lib ---- libpipeline-1.4.1.orig/build-aux/ar-lib 2015-08-17 17:14:23.000000000 +0800 -+++ libpipeline-1.4.1/build-aux/ar-lib 2017-05-17 10:38:51.359375000 +0800 -@@ -53,7 +53,7 @@ - MINGW*) - file_conv=mingw - ;; -- CYGWIN*) -+ CYGWIN*|MSYS*) - file_conv=cygwin - ;; - *) -@@ -65,7 +65,7 @@ - mingw) - file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` - ;; -- cygwin) -+ cygwin|msys) - file=`cygpath -m "$file" || echo "$file"` - ;; - wine) -diff -durN libpipeline-1.4.1.orig/build-aux/compile libpipeline-1.4.1/build-aux/compile ---- libpipeline-1.4.1.orig/build-aux/compile 2015-08-17 17:14:23.000000000 +0800 -+++ libpipeline-1.4.1/build-aux/compile 2017-05-17 10:38:51.390625000 +0800 -@@ -53,7 +53,7 @@ - MINGW*) - file_conv=mingw - ;; -- CYGWIN*) -+ CYGWIN*|MSYS*) - file_conv=cygwin - ;; - *) -@@ -67,7 +67,7 @@ - mingw/*) - file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` - ;; -- cygwin/*) -+ cygwin/*|msys/*) - file=`cygpath -m "$file" || echo "$file"` - ;; - wine/*) -diff -durN libpipeline-1.4.1.orig/build-aux/config.guess libpipeline-1.4.1/build-aux/config.guess ---- libpipeline-1.4.1.orig/build-aux/config.guess 2015-08-17 17:14:23.000000000 +0800 -+++ libpipeline-1.4.1/build-aux/config.guess 2017-05-17 10:38:51.437500000 +0800 -@@ -2,7 +2,7 @@ - # Attempt to guess a canonical system name. - # Copyright 1992-2014 Free Software Foundation, Inc. - --timestamp='2014-03-23' -+timestamp='2014-11-04' - - # This file is free software; you can redistribute it and/or modify it - # under the terms of the GNU General Public License as published by -@@ -24,12 +24,12 @@ - # program. This Exception is an additional permission under section 7 - # of the GNU General Public License, version 3 ("GPLv3"). - # --# Originally written by Per Bothner. -+# Originally written by Per Bothner; maintained since 2000 by Ben Elliston. - # - # You can get the latest version of this script from: - # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD - # --# Please send patches with a ChangeLog entry to config-patches@gnu.org. -+# Please send patches to . - - - me=`echo "$0" | sed -e 's,.*/,,'` -@@ -579,8 +579,9 @@ - else - IBM_ARCH=powerpc - fi -- if [ -x /usr/bin/oslevel ] ; then -- IBM_REV=`/usr/bin/oslevel` -+ if [ -x /usr/bin/lslpp ] ; then -+ IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc | -+ awk -F: '{ print $3 }' | sed s/[0-9]*$/0/` - else - IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} - fi -@@ -866,6 +867,9 @@ - amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) - echo x86_64-unknown-cygwin - exit ;; -+ amd64:MSYS*:*:* | x86_64:MSYS*:*:*) -+ echo x86_64-unknown-msys -+ exit ;; - p*:CYGWIN*:*) - echo powerpcle-unknown-cygwin - exit ;; -diff -durN libpipeline-1.4.1.orig/build-aux/config.rpath libpipeline-1.4.1/build-aux/config.rpath ---- libpipeline-1.4.1.orig/build-aux/config.rpath 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/build-aux/config.rpath 2017-05-17 10:35:06.968750000 +0800 -@@ -2,7 +2,7 @@ - # Output a system dependent set of variables, describing how to set the - # run time search path of shared libraries in an executable. - # --# Copyright 1996-2014 Free Software Foundation, Inc. -+# Copyright 1996-2017 Free Software Foundation, Inc. - # Taken from GNU libtool, 2001 - # Originally by Gordon Matzigkeit , 1996 - # -@@ -367,11 +367,7 @@ - dgux*) - hardcode_libdir_flag_spec='-L$libdir' - ;; -- freebsd2.2*) -- hardcode_libdir_flag_spec='-R$libdir' -- hardcode_direct=yes -- ;; -- freebsd2*) -+ freebsd2.[01]*) - hardcode_direct=yes - hardcode_minus_L=yes - ;; -@@ -548,13 +544,11 @@ - dgux*) - library_names_spec='$libname$shrext' - ;; -+ freebsd[23].*) -+ library_names_spec='$libname$shrext$versuffix' -+ ;; - freebsd* | dragonfly*) -- case "$host_os" in -- freebsd[123]*) -- library_names_spec='$libname$shrext$versuffix' ;; -- *) -- library_names_spec='$libname$shrext' ;; -- esac -+ library_names_spec='$libname$shrext' - ;; - gnu*) - library_names_spec='$libname$shrext' -diff -durN libpipeline-1.4.1.orig/build-aux/config.sub libpipeline-1.4.1/build-aux/config.sub ---- libpipeline-1.4.1.orig/build-aux/config.sub 2015-08-17 17:14:23.000000000 +0800 -+++ libpipeline-1.4.1/build-aux/config.sub 2017-05-17 10:38:51.484375000 +0800 -@@ -2,7 +2,7 @@ - # Configuration validation subroutine script. - # Copyright 1992-2014 Free Software Foundation, Inc. - --timestamp='2014-09-11' -+timestamp='2014-12-03' - - # This file is free software; you can redistribute it and/or modify it - # under the terms of the GNU General Public License as published by -@@ -25,7 +25,7 @@ - # of the GNU General Public License, version 3 ("GPLv3"). - - --# Please send patches with a ChangeLog entry to config-patches@gnu.org. -+# Please send patches to . - # - # Configuration subroutine to validate and canonicalize a configuration type. - # Supply the specified configuration type as an argument. -@@ -313,6 +313,7 @@ - | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ - | ubicom32 \ - | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ -+ | visium \ - | we32k \ - | x86 | xc16x | xstormy16 | xtensa \ - | z8k | z80) -@@ -327,6 +328,9 @@ - c6x) - basic_machine=tic6x-unknown - ;; -+ leon|leon[3-9]) -+ basic_machine=sparc-$basic_machine -+ ;; - m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip) - basic_machine=$basic_machine-unknown - os=-none -@@ -437,6 +441,7 @@ - | ubicom32-* \ - | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ - | vax-* \ -+ | visium-* \ - | we32k-* \ - | x86-* | x86_64-* | xc16x-* | xps100-* \ - | xstormy16-* | xtensa*-* \ -@@ -774,6 +779,9 @@ - basic_machine=m68k-isi - os=-sysv - ;; -+ leon-*|leon[3-9]-*) -+ basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'` -+ ;; - m68knommu) - basic_machine=m68k-unknown - os=-linux -diff -durN libpipeline-1.4.1.orig/build-aux/gitlog-to-changelog libpipeline-1.4.1/build-aux/gitlog-to-changelog ---- libpipeline-1.4.1.orig/build-aux/gitlog-to-changelog 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/build-aux/gitlog-to-changelog 2017-05-17 10:35:07.281250000 +0800 -@@ -1,15 +1,15 @@ --eval '(exit $?0)' && eval 'exec perl -wS "$0" ${1+"$@"}' -+eval '(exit $?0)' && eval 'exec perl -wS "$0" "$@"' - & eval 'exec perl -wS "$0" $argv:q' - if 0; - # Convert git log output to ChangeLog format. - --my $VERSION = '2012-07-29 06:11'; # UTC -+my $VERSION = '2016-03-22 21:49'; # UTC - # The definition above must lie within the first 8 lines in order - # for the Emacs time-stamp write hook (at end) to update it. - # If you change this file with Emacs, please let the write hook - # do its job. Otherwise, update this string manually. - --# Copyright (C) 2008-2014 Free Software Foundation, Inc. -+# Copyright (C) 2008-2017 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 -@@ -72,6 +72,9 @@ - directory can be derived. - --since=DATE convert only the logs since DATE; - the default is to convert all log entries. -+ --until=DATE convert only the logs older than DATE. -+ --ignore-matching=PAT ignore commit messages whose first lines match PAT. -+ --ignore-line=PAT ignore lines of commit messages that match PAT. - --format=FMT set format string for commit subject and body; - see 'man git-log' for the list of format metacharacters; - the default is '%s%n%b%n' -@@ -220,10 +223,13 @@ - - { - my $since_date; -+ my $until_date; - my $format_string = '%s%n%b%n'; - my $amend_file; - my $append_dot = 0; - my $cluster = 1; -+ my $ignore_matching; -+ my $ignore_line; - my $strip_tab = 0; - my $strip_cherry_pick = 0; - my $srcdir; -@@ -232,10 +238,13 @@ - help => sub { usage 0 }, - version => sub { print "$ME version $VERSION\n"; exit }, - 'since=s' => \$since_date, -+ 'until=s' => \$until_date, - 'format=s' => \$format_string, - 'amend=s' => \$amend_file, - 'append-dot' => \$append_dot, - 'cluster!' => \$cluster, -+ 'ignore-matching=s' => \$ignore_matching, -+ 'ignore-line=s' => \$ignore_line, - 'strip-tab' => \$strip_tab, - 'strip-cherry-pick' => \$strip_cherry_pick, - 'srcdir=s' => \$srcdir, -@@ -243,6 +252,8 @@ - - defined $since_date - and unshift @ARGV, "--since=$since_date"; -+ defined $until_date -+ and unshift @ARGV, "--until=$until_date"; - - # This is a hash that maps an SHA1 to perl code (i.e., s/old/new/) - # that makes a correction in the log or attribution of that commit. -@@ -259,6 +270,7 @@ - my $prev_multi_paragraph; - my $prev_date_line = ''; - my @prev_coauthors = (); -+ my @skipshas = (); - while (1) - { - defined (my $in = ) -@@ -279,6 +291,19 @@ - $sha =~ /^[0-9a-fA-F]{40}$/ - or die "$ME:$.: invalid SHA1: $sha\n"; - -+ my $skipflag = 0; -+ if (@skipshas) -+ { -+ foreach(@skipshas) -+ { -+ if ($sha =~ /^$_/) -+ { -+ $skipflag = $_; -+ last; -+ } -+ } -+ } -+ - # If this commit's log requires any transformation, do it now. - my $code = $amend_code->{$sha}; - if (defined $code) -@@ -306,7 +331,7 @@ - $rest =~ s/^\s*\(cherry picked from commit [\da-f]+\)\n//m; - } - -- my @line = split "\n", $rest; -+ my @line = split /[ \t]*\n/, $rest; - my $author_line = shift @line; - defined $author_line - or die "$ME:$.: unexpected EOF\n"; -@@ -316,17 +341,18 @@ - - # Format 'Copyright-paperwork-exempt: Yes' as a standard ChangeLog - # `(tiny change)' annotation. -- my $tiny = (grep (/^Copyright-paperwork-exempt:\s+[Yy]es$/, @line) -+ my $tiny = (grep (/^(?:Copyright-paperwork-exempt|Tiny-change):\s+[Yy]es$/, @line) - ? ' (tiny change)' : ''); - - my $date_line = sprintf "%s %s$tiny\n", -- strftime ("%F", localtime ($1)), $2; -+ strftime ("%Y-%m-%d", localtime ($1)), $2; - - my @coauthors = grep /^Co-authored-by:.*$/, @line; - # Omit meta-data lines we've already interpreted. - @line = grep !/^(?:Signed-off-by:[ ].*>$ - |Co-authored-by:[ ] - |Copyright-paperwork-exempt:[ ] -+ |Tiny-change:[ ] - )/x, @line; - - # Remove leading and trailing blank lines. -@@ -336,68 +362,109 @@ - while ($line[$#line] =~ /^\s*$/) { pop @line; } - } - -- # Record whether there are two or more paragraphs. -- my $multi_paragraph = grep /^\s*$/, @line; -+ # Handle Emacs gitmerge.el "skipped" commits. -+ # Yes, this should be controlled by an option. So sue me. -+ if ( grep /^(; )?Merge from /, @line ) -+ { -+ my $found = 0; -+ foreach (@line) -+ { -+ if (grep /^The following commit.*skipped:$/, $_) -+ { -+ $found = 1; -+ ## Reset at each merge to reduce chance of false matches. -+ @skipshas = (); -+ next; -+ } -+ if ($found && $_ =~ /^([0-9a-fA-F]{7,}) [^ ]/) -+ { -+ push ( @skipshas, $1 ); -+ } -+ } -+ } - -- # Format 'Co-authored-by: A U Thor ' lines in -- # standard multi-author ChangeLog format. -- for (@coauthors) -+ # Ignore commits that match the --ignore-matching pattern, if specified. -+ if (defined $ignore_matching && @line && $line[0] =~ /$ignore_matching/) - { -- s/^Co-authored-by:\s*/\t /; -- s/\s*/ -- or warn "$ME: warning: missing email address for " -- . substr ($_, 5) . "\n"; -+ $skipflag = 1; - } -- -- # If clustering of commit messages has been disabled, if this header -- # would be different from the previous date/name/email/coauthors header, -- # or if this or the previous entry consists of two or more paragraphs, -- # then print the header. -- if ( ! $cluster -- || $date_line ne $prev_date_line -- || "@coauthors" ne "@prev_coauthors" -- || $multi_paragraph -- || $prev_multi_paragraph) -+ elsif ($skipflag) - { -- $prev_date_line eq '' -- or print "\n"; -- print $date_line; -- @coauthors -- and print join ("\n", @coauthors), "\n"; -+ ## Perhaps only warn if a pattern matches more than once? -+ warn "$ME: warning: skipping $sha due to $skipflag\n"; - } -- $prev_date_line = $date_line; -- @prev_coauthors = @coauthors; -- $prev_multi_paragraph = $multi_paragraph; - -- # If there were any lines -- if (@line == 0) -- { -- warn "$ME: warning: empty commit message:\n $date_line\n"; -- } -- else -+ if (! $skipflag) - { -- if ($append_dot) -+ if (defined $ignore_line && @line) - { -- # If the first line of the message has enough room, then -- if (length $line[0] < 72) -+ @line = grep ! /$ignore_line/, @line; -+ while ($line[$#line] =~ /^\s*$/) { pop @line; } -+ } -+ -+ # Record whether there are two or more paragraphs. -+ my $multi_paragraph = grep /^\s*$/, @line; -+ -+ # Format 'Co-authored-by: A U Thor ' lines in -+ # standard multi-author ChangeLog format. -+ for (@coauthors) -+ { -+ s/^Co-authored-by:\s*/\t /; -+ s/\s*/ -+ or warn "$ME: warning: missing email address for " -+ . substr ($_, 5) . "\n"; -+ } -+ -+ # If clustering of commit messages has been disabled, if this header -+ # would be different from the previous date/name/etc. header, -+ # or if this or the previous entry consists of two or more paragraphs, -+ # then print the header. -+ if ( ! $cluster -+ || $date_line ne $prev_date_line -+ || "@coauthors" ne "@prev_coauthors" -+ || $multi_paragraph -+ || $prev_multi_paragraph) -+ { -+ $prev_date_line eq '' -+ or print "\n"; -+ print $date_line; -+ @coauthors -+ and print join ("\n", @coauthors), "\n"; -+ } -+ $prev_date_line = $date_line; -+ @prev_coauthors = @coauthors; -+ $prev_multi_paragraph = $multi_paragraph; -+ -+ # If there were any lines -+ if (@line == 0) -+ { -+ warn "$ME: warning: empty commit message:\n $date_line\n"; -+ } -+ else -+ { -+ if ($append_dot) - { -- # append a dot if there is no other punctuation or blank -- # at the end. -- $line[0] =~ /[[:punct:]\s]$/ -- or $line[0] .= '.'; -+ # If the first line of the message has enough room, then -+ if (length $line[0] < 72) -+ { -+ # append a dot if there is no other punctuation or blank -+ # at the end. -+ $line[0] =~ /[[:punct:]\s]$/ -+ or $line[0] .= '.'; -+ } - } -- } - -- # Remove one additional leading TAB from each line. -- $strip_tab -- and map { s/^\t// } @line; -+ # Remove one additional leading TAB from each line. -+ $strip_tab -+ and map { s/^\t// } @line; - -- # Prefix each non-empty line with a TAB. -- @line = map { length $_ ? "\t$_" : '' } @line; -+ # Prefix each non-empty line with a TAB. -+ @line = map { length $_ ? "\t$_" : '' } @line; - -- print "\n", join ("\n", @line), "\n"; -+ print "\n", join ("\n", @line), "\n"; -+ } - } - - defined ($in = ) -@@ -427,6 +494,6 @@ - # eval: (add-hook 'write-file-hooks 'time-stamp) - # time-stamp-start: "my $VERSION = '" - # time-stamp-format: "%:y-%02m-%02d %02H:%02M" --# time-stamp-time-zone: "UTC" -+# time-stamp-time-zone: "UTC0" - # time-stamp-end: "'; # UTC" - # End: -diff -durN libpipeline-1.4.1.orig/build-aux/gnupload libpipeline-1.4.1/build-aux/gnupload ---- libpipeline-1.4.1.orig/build-aux/gnupload 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/build-aux/gnupload 2017-05-17 10:35:07.765625000 +0800 -@@ -1,9 +1,9 @@ - #!/bin/sh - # Sign files and upload them. - --scriptversion=2013-03-19.17; # UTC -+scriptversion=2016-01-11.22; # UTC - --# Copyright (C) 2004-2014 Free Software Foundation, Inc. -+# Copyright (C) 2004-2017 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 -@@ -435,6 +435,6 @@ - # eval: (add-hook 'write-file-hooks 'time-stamp) - # time-stamp-start: "scriptversion=" - # time-stamp-format: "%:y-%02m-%02d.%02H" --# time-stamp-time-zone: "UTC" -+# time-stamp-time-zone: "UTC0" - # time-stamp-end: "; # UTC" - # End: -diff -durN libpipeline-1.4.1.orig/build-aux/install-sh libpipeline-1.4.1/build-aux/install-sh ---- libpipeline-1.4.1.orig/build-aux/install-sh 2015-08-17 17:14:23.000000000 +0800 -+++ libpipeline-1.4.1/build-aux/install-sh 2017-05-17 10:38:51.531250000 +0800 -@@ -1,7 +1,7 @@ - #!/bin/sh - # install - install a program, script, or datafile - --scriptversion=2014-09-12.12; # UTC -+scriptversion=2013-12-25.23; # UTC - - # This originates from X11R5 (mit/util/scripts/install.sh), which was - # later released in X11R6 (xc/config/util/install.sh) with the -@@ -324,41 +324,34 @@ - # is incompatible with FreeBSD 'install' when (umask & 300) != 0. - ;; - *) -- # $RANDOM is not portable (e.g. dash); use it when possible to -- # lower collision chance - tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ -- trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null; exit $ret' 0 -+ trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 - -- # As "mkdir -p" follows symlinks and we work in /tmp possibly; so -- # create the $tmpdir first (and fail if unsuccessful) to make sure -- # that nobody tries to guess the $tmpdir name. - if (umask $mkdir_umask && -- $mkdirprog $mkdir_mode "$tmpdir" && -- exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1 -+ exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 - then - if test -z "$dir_arg" || { - # Check for POSIX incompatibilities with -m. - # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or - # other-writable bit of parent directory when it shouldn't. - # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. -- test_tmpdir="$tmpdir/a" -- ls_ld_tmpdir=`ls -ld "$test_tmpdir"` -+ ls_ld_tmpdir=`ls -ld "$tmpdir"` - case $ls_ld_tmpdir in - d????-?r-*) different_mode=700;; - d????-?--*) different_mode=755;; - *) false;; - esac && -- $mkdirprog -m$different_mode -p -- "$test_tmpdir" && { -- ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"` -+ $mkdirprog -m$different_mode -p -- "$tmpdir" && { -+ ls_ld_tmpdir_1=`ls -ld "$tmpdir"` - test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" - } - } - then posix_mkdir=: - fi -- rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" -+ rmdir "$tmpdir/d" "$tmpdir" - else - # Remove any dirs left behind by ancient mkdir implementations. -- rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null -+ rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null - fi - trap '' 0;; - esac;; -diff -durN libpipeline-1.4.1.orig/build-aux/ltmain.sh libpipeline-1.4.1/build-aux/ltmain.sh ---- libpipeline-1.4.1.orig/build-aux/ltmain.sh 2015-08-17 17:14:16.000000000 +0800 -+++ libpipeline-1.4.1/build-aux/ltmain.sh 2017-05-17 10:38:00.109375000 +0800 -@@ -1,9 +1,12 @@ -+#! /bin/sh -+## DO NOT EDIT - This file generated from ./build-aux/ltmain.in -+## by inline-source v2014-01-03.01 - --# libtool (GNU libtool) 2.4.2 -+# libtool (GNU libtool) 2.4.6 -+# Provide generalized library-building support services. - # Written by Gordon Matzigkeit , 1996 - --# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, --# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. -+# Copyright (C) 1996-2015 Free Software Foundation, Inc. - # This is free software; see the source for copying conditions. There is NO - # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -@@ -23,881 +26,2112 @@ - # General Public License for more details. - # - # You should have received a copy of the GNU General Public License --# along with GNU Libtool; see the file COPYING. If not, a copy --# can be downloaded from http://www.gnu.org/licenses/gpl.html, --# or obtained by writing to the Free Software Foundation, Inc., --# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+# along with this program. If not, see . - --# Usage: $progname [OPTION]... [MODE-ARG]... --# --# Provide generalized library-building support services. --# --# --config show all configuration variables --# --debug enable verbose shell tracing --# -n, --dry-run display commands without modifying any files --# --features display basic configuration information and exit --# --mode=MODE use operation mode MODE --# --preserve-dup-deps don't remove duplicate dependency libraries --# --quiet, --silent don't print informational messages --# --no-quiet, --no-silent --# print informational messages (default) --# --no-warn don't display warning messages --# --tag=TAG use configuration variables from tag TAG --# -v, --verbose print more informational messages than default --# --no-verbose don't print the extra informational messages --# --version print version information --# -h, --help, --help-all print short, long, or detailed help message --# --# MODE must be one of the following: --# --# clean remove files from the build directory --# compile compile a source file into a libtool object --# execute automatically set library path, then run a program --# finish complete the installation of libtool libraries --# install install libraries or executables --# link create a library or an executable --# uninstall remove libraries from an installed directory --# --# MODE-ARGS vary depending on the MODE. When passed as first option, --# `--mode=MODE' may be abbreviated as `MODE' or a unique abbreviation of that. --# Try `$progname --help --mode=MODE' for a more detailed description of MODE. --# --# When reporting a bug, please describe a test case to reproduce it and --# include the following information: --# --# host-triplet: $host --# shell: $SHELL --# compiler: $LTCC --# compiler flags: $LTCFLAGS --# linker: $LD (gnu? $with_gnu_ld) --# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1.11 --# automake: $automake_version --# autoconf: $autoconf_version --# --# Report bugs to . --# GNU libtool home page: . --# General help using GNU software: . - - PROGRAM=libtool - PACKAGE=libtool --VERSION="2.4.2 Debian-2.4.2-1.11" --TIMESTAMP="" --package_revision=1.3337 -+VERSION=2.4.6 -+package_revision=2.4.6 - --# Be Bourne compatible --if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then -+ -+## ------ ## -+## Usage. ## -+## ------ ## -+ -+# Run './libtool --help' for help with using this script from the -+# command line. -+ -+ -+## ------------------------------- ## -+## User overridable command paths. ## -+## ------------------------------- ## -+ -+# After configure completes, it has a better idea of some of the -+# shell tools we need than the defaults used by the functions shared -+# with bootstrap, so set those here where they can still be over- -+# ridden by the user, but otherwise take precedence. -+ -+: ${AUTOCONF="autoconf"} -+: ${AUTOMAKE="automake"} -+ -+ -+## -------------------------- ## -+## Source external libraries. ## -+## -------------------------- ## -+ -+# Much of our low-level functionality needs to be sourced from external -+# libraries, which are installed to $pkgauxdir. -+ -+# Set a version string for this script. -+scriptversion=2015-01-20.17; # UTC -+ -+# General shell script boiler plate, and helper functions. -+# Written by Gary V. Vaughan, 2004 -+ -+# Copyright (C) 2004-2015 Free Software Foundation, Inc. -+# This is free software; see the source for copying conditions. There is NO -+# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -+ -+# 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 3 of the License, or -+# (at your option) any later version. -+ -+# As a special exception to the GNU General Public License, if you distribute -+# this file as part of a program or library that is built using GNU Libtool, -+# you may include this file under the same distribution terms that you use -+# for the rest of that program. -+ -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNES 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, see . -+ -+# Please report bugs or propose patches to gary@gnu.org. -+ -+ -+## ------ ## -+## Usage. ## -+## ------ ## -+ -+# Evaluate this file near the top of your script to gain access to -+# the functions and variables defined here: -+# -+# . `echo "$0" | ${SED-sed} 's|[^/]*$||'`/build-aux/funclib.sh -+# -+# If you need to override any of the default environment variable -+# settings, do that before evaluating this file. -+ -+ -+## -------------------- ## -+## Shell normalisation. ## -+## -------------------- ## -+ -+# Some shells need a little help to be as Bourne compatible as possible. -+# Before doing anything else, make sure all that help has been provided! -+ -+DUALCASE=1; export DUALCASE # for MKS sh -+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : - emulate sh - NULLCMD=: -- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which -+ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST - else -- case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac -+ case `(set -o) 2>/dev/null` in *posix*) set -o posix ;; esac - fi --BIN_SH=xpg4; export BIN_SH # for Tru64 --DUALCASE=1; export DUALCASE # for MKS sh - --# A function that is used when there is no print builtin or printf. --func_fallback_echo () --{ -- eval 'cat <<_LTECHO_EOF --$1 --_LTECHO_EOF' --} -- --# NLS nuisances: We save the old values to restore during execute mode. --lt_user_locale= --lt_safe_locale= --for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES -+# NLS nuisances: We save the old values in case they are required later. -+_G_user_locale= -+_G_safe_locale= -+for _G_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES - do -- eval "if test \"\${$lt_var+set}\" = set; then -- save_$lt_var=\$$lt_var -- $lt_var=C -- export $lt_var -- lt_user_locale=\"$lt_var=\\\$save_\$lt_var; \$lt_user_locale\" -- lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\" -+ eval "if test set = \"\${$_G_var+set}\"; then -+ save_$_G_var=\$$_G_var -+ $_G_var=C -+ export $_G_var -+ _G_user_locale=\"$_G_var=\\\$save_\$_G_var; \$_G_user_locale\" -+ _G_safe_locale=\"$_G_var=C; \$_G_safe_locale\" - fi" - done --LC_ALL=C --LANGUAGE=C --export LANGUAGE LC_ALL - --$lt_unset CDPATH -+# CDPATH. -+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH - -+# Make sure IFS has a sensible default -+sp=' ' -+nl=' -+' -+IFS="$sp $nl" - --# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh --# is ksh but when the shell is invoked as "sh" and the current value of --# the _XPG environment variable is not equal to 1 (one), the special --# positional parameter $0, within a function call, is the name of the --# function. --progpath="$0" -+# There are apparently some retarded systems that use ';' as a PATH separator! -+if test "${PATH_SEPARATOR+set}" != set; then -+ PATH_SEPARATOR=: -+ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { -+ (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || -+ PATH_SEPARATOR=';' -+ } -+fi -+ -+ -+ -+## ------------------------- ## -+## Locate command utilities. ## -+## ------------------------- ## - - -+# func_executable_p FILE -+# ---------------------- -+# Check that FILE is an executable regular file. -+func_executable_p () -+{ -+ test -f "$1" && test -x "$1" -+} -+ -+ -+# func_path_progs PROGS_LIST CHECK_FUNC [PATH] -+# -------------------------------------------- -+# Search for either a program that responds to --version with output -+# containing "GNU", or else returned by CHECK_FUNC otherwise, by -+# trying all the directories in PATH with each of the elements of -+# PROGS_LIST. -+# -+# CHECK_FUNC should accept the path to a candidate program, and -+# set $func_check_prog_result if it truncates its output less than -+# $_G_path_prog_max characters. -+func_path_progs () -+{ -+ _G_progs_list=$1 -+ _G_check_func=$2 -+ _G_PATH=${3-"$PATH"} -+ -+ _G_path_prog_max=0 -+ _G_path_prog_found=false -+ _G_save_IFS=$IFS; IFS=${PATH_SEPARATOR-:} -+ for _G_dir in $_G_PATH; do -+ IFS=$_G_save_IFS -+ test -z "$_G_dir" && _G_dir=. -+ for _G_prog_name in $_G_progs_list; do -+ for _exeext in '' .EXE; do -+ _G_path_prog=$_G_dir/$_G_prog_name$_exeext -+ func_executable_p "$_G_path_prog" || continue -+ case `"$_G_path_prog" --version 2>&1` in -+ *GNU*) func_path_progs_result=$_G_path_prog _G_path_prog_found=: ;; -+ *) $_G_check_func $_G_path_prog -+ func_path_progs_result=$func_check_prog_result -+ ;; -+ esac -+ $_G_path_prog_found && break 3 -+ done -+ done -+ done -+ IFS=$_G_save_IFS -+ test -z "$func_path_progs_result" && { -+ echo "no acceptable sed could be found in \$PATH" >&2 -+ exit 1 -+ } -+} -+ -+ -+# We want to be able to use the functions in this file before configure -+# has figured out where the best binaries are kept, which means we have -+# to search for them ourselves - except when the results are already set -+# where we skip the searches. -+ -+# Unless the user overrides by setting SED, search the path for either GNU -+# sed, or the sed that truncates its output the least. -+test -z "$SED" && { -+ _G_sed_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ -+ for _G_i in 1 2 3 4 5 6 7; do -+ _G_sed_script=$_G_sed_script$nl$_G_sed_script -+ done -+ echo "$_G_sed_script" 2>/dev/null | sed 99q >conftest.sed -+ _G_sed_script= -+ -+ func_check_prog_sed () -+ { -+ _G_path_prog=$1 -+ -+ _G_count=0 -+ printf 0123456789 >conftest.in -+ while : -+ do -+ cat conftest.in conftest.in >conftest.tmp -+ mv conftest.tmp conftest.in -+ cp conftest.in conftest.nl -+ echo '' >> conftest.nl -+ "$_G_path_prog" -f conftest.sed conftest.out 2>/dev/null || break -+ diff conftest.out conftest.nl >/dev/null 2>&1 || break -+ _G_count=`expr $_G_count + 1` -+ if test "$_G_count" -gt "$_G_path_prog_max"; then -+ # Best one so far, save it but keep looking for a better one -+ func_check_prog_result=$_G_path_prog -+ _G_path_prog_max=$_G_count -+ fi -+ # 10*(2^10) chars as input seems more than enough -+ test 10 -lt "$_G_count" && break -+ done -+ rm -f conftest.in conftest.tmp conftest.nl conftest.out -+ } -+ -+ func_path_progs "sed gsed" func_check_prog_sed $PATH:/usr/xpg4/bin -+ rm -f conftest.sed -+ SED=$func_path_progs_result -+} -+ -+ -+# Unless the user overrides by setting GREP, search the path for either GNU -+# grep, or the grep that truncates its output the least. -+test -z "$GREP" && { -+ func_check_prog_grep () -+ { -+ _G_path_prog=$1 -+ -+ _G_count=0 -+ _G_path_prog_max=0 -+ printf 0123456789 >conftest.in -+ while : -+ do -+ cat conftest.in conftest.in >conftest.tmp -+ mv conftest.tmp conftest.in -+ cp conftest.in conftest.nl -+ echo 'GREP' >> conftest.nl -+ "$_G_path_prog" -e 'GREP$' -e '-(cannot match)-' conftest.out 2>/dev/null || break -+ diff conftest.out conftest.nl >/dev/null 2>&1 || break -+ _G_count=`expr $_G_count + 1` -+ if test "$_G_count" -gt "$_G_path_prog_max"; then -+ # Best one so far, save it but keep looking for a better one -+ func_check_prog_result=$_G_path_prog -+ _G_path_prog_max=$_G_count -+ fi -+ # 10*(2^10) chars as input seems more than enough -+ test 10 -lt "$_G_count" && break -+ done -+ rm -f conftest.in conftest.tmp conftest.nl conftest.out -+ } -+ -+ func_path_progs "grep ggrep" func_check_prog_grep $PATH:/usr/xpg4/bin -+ GREP=$func_path_progs_result -+} -+ -+ -+## ------------------------------- ## -+## User overridable command paths. ## -+## ------------------------------- ## -+ -+# All uppercase variable names are used for environment variables. These -+# variables can be overridden by the user before calling a script that -+# uses them if a suitable command of that name is not already available -+# in the command search PATH. - - : ${CP="cp -f"} --test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'} -+: ${ECHO="printf %s\n"} -+: ${EGREP="$GREP -E"} -+: ${FGREP="$GREP -F"} -+: ${LN_S="ln -s"} - : ${MAKE="make"} - : ${MKDIR="mkdir"} - : ${MV="mv -f"} - : ${RM="rm -f"} - : ${SHELL="${CONFIG_SHELL-/bin/sh}"} --: ${Xsed="$SED -e 1s/^X//"} - --# Global variables: --EXIT_SUCCESS=0 --EXIT_FAILURE=1 --EXIT_MISMATCH=63 # $? = 63 is used to indicate version mismatch to missing. --EXIT_SKIP=77 # $? = 77 is used to indicate a skipped test to automake. - --exit_status=$EXIT_SUCCESS -- --# Make sure IFS has a sensible default --lt_nl=' --' --IFS=" $lt_nl" -- --dirname="s,/[^/]*$,," --basename="s,^.*/,," -- --# func_dirname file append nondir_replacement --# Compute the dirname of FILE. If nonempty, add APPEND to the result, --# otherwise set result to NONDIR_REPLACEMENT. --func_dirname () --{ -- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` -- if test "X$func_dirname_result" = "X${1}"; then -- func_dirname_result="${3}" -- else -- func_dirname_result="$func_dirname_result${2}" -- fi --} # func_dirname may be replaced by extended shell implementation -+## -------------------- ## -+## Useful sed snippets. ## -+## -------------------- ## - -+sed_dirname='s|/[^/]*$||' -+sed_basename='s|^.*/||' - --# func_basename file --func_basename () --{ -- func_basename_result=`$ECHO "${1}" | $SED "$basename"` --} # func_basename may be replaced by extended shell implementation -+# Sed substitution that helps us do robust quoting. It backslashifies -+# metacharacters that are still active within double-quoted strings. -+sed_quote_subst='s|\([`"$\\]\)|\\\1|g' - -+# Same as above, but do not quote variable references. -+sed_double_quote_subst='s/\(["`\\]\)/\\\1/g' - --# func_dirname_and_basename file append nondir_replacement --# perform func_basename and func_dirname in a single function --# call: --# dirname: Compute the dirname of FILE. If nonempty, --# add APPEND to the result, otherwise set result --# to NONDIR_REPLACEMENT. --# value returned in "$func_dirname_result" --# basename: Compute filename of FILE. --# value retuned in "$func_basename_result" --# Implementation must be kept synchronized with func_dirname --# and func_basename. For efficiency, we do not delegate to --# those functions but instead duplicate the functionality here. --func_dirname_and_basename () --{ -- # Extract subdirectory from the argument. -- func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"` -- if test "X$func_dirname_result" = "X${1}"; then -- func_dirname_result="${3}" -- else -- func_dirname_result="$func_dirname_result${2}" -- fi -- func_basename_result=`$ECHO "${1}" | $SED -e "$basename"` --} # func_dirname_and_basename may be replaced by extended shell implementation -+# Sed substitution that turns a string into a regex matching for the -+# string literally. -+sed_make_literal_regex='s|[].[^$\\*\/]|\\&|g' - -+# Sed substitution that converts a w32 file name or path -+# that contains forward slashes, into one that contains -+# (escaped) backslashes. A very naive implementation. -+sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' - --# func_stripname prefix suffix name --# strip PREFIX and SUFFIX off of NAME. --# PREFIX and SUFFIX must not contain globbing or regex special --# characters, hashes, percent signs, but SUFFIX may contain a leading --# dot (in which case that matches only a dot). --# func_strip_suffix prefix name --func_stripname () --{ -- case ${2} in -- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; -- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; -- esac --} # func_stripname may be replaced by extended shell implementation -+# Re-'\' parameter expansions in output of sed_double_quote_subst that -+# were '\'-ed in input to the same. If an odd number of '\' preceded a -+# '$' in input to sed_double_quote_subst, that '$' was protected from -+# expansion. Since each input '\' is now two '\'s, look for any number -+# of runs of four '\'s followed by two '\'s and then a '$'. '\' that '$'. -+_G_bs='\\' -+_G_bs2='\\\\' -+_G_bs4='\\\\\\\\' -+_G_dollar='\$' -+sed_double_backslash="\ -+ s/$_G_bs4/&\\ -+/g -+ s/^$_G_bs2$_G_dollar/$_G_bs&/ -+ s/\\([^$_G_bs]\\)$_G_bs2$_G_dollar/\\1$_G_bs2$_G_bs$_G_dollar/g -+ s/\n//g" - - --# These SED scripts presuppose an absolute path with a trailing slash. --pathcar='s,^/\([^/]*\).*$,\1,' --pathcdr='s,^/[^/]*,,' --removedotparts=':dotsl -- s@/\./@/@g -- t dotsl -- s,/\.$,/,' --collapseslashes='s@/\{1,\}@/@g' --finalslash='s,/*$,/,' -+## ----------------- ## -+## Global variables. ## -+## ----------------- ## - --# func_normal_abspath PATH --# Remove doubled-up and trailing slashes, "." path components, --# and cancel out any ".." path components in PATH after making --# it an absolute path. --# value returned in "$func_normal_abspath_result" --func_normal_abspath () --{ -- # Start from root dir and reassemble the path. -- func_normal_abspath_result= -- func_normal_abspath_tpath=$1 -- func_normal_abspath_altnamespace= -- case $func_normal_abspath_tpath in -- "") -- # Empty path, that just means $cwd. -- func_stripname '' '/' "`pwd`" -- func_normal_abspath_result=$func_stripname_result -- return -- ;; -- # The next three entries are used to spot a run of precisely -- # two leading slashes without using negated character classes; -- # we take advantage of case's first-match behaviour. -- ///*) -- # Unusual form of absolute path, do nothing. -- ;; -- //*) -- # Not necessarily an ordinary path; POSIX reserves leading '//' -- # and for example Cygwin uses it to access remote file shares -- # over CIFS/SMB, so we conserve a leading double slash if found. -- func_normal_abspath_altnamespace=/ -- ;; -- /*) -- # Absolute path, do nothing. -- ;; -- *) -- # Relative path, prepend $cwd. -- func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath -- ;; -- esac -- # Cancel out all the simple stuff to save iterations. We also want -- # the path to end with a slash for ease of parsing, so make sure -- # there is one (and only one) here. -- func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ -- -e "$removedotparts" -e "$collapseslashes" -e "$finalslash"` -- while :; do -- # Processed it all yet? -- if test "$func_normal_abspath_tpath" = / ; then -- # If we ascended to the root using ".." the result may be empty now. -- if test -z "$func_normal_abspath_result" ; then -- func_normal_abspath_result=/ -- fi -- break -- fi -- func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \ -- -e "$pathcar"` -- func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ -- -e "$pathcdr"` -- # Figure out what to do with it -- case $func_normal_abspath_tcomponent in -- "") -- # Trailing empty path component, ignore it. -- ;; -- ..) -- # Parent dir; strip last assembled component from result. -- func_dirname "$func_normal_abspath_result" -- func_normal_abspath_result=$func_dirname_result -- ;; -- *) -- # Actual path component, append it. -- func_normal_abspath_result=$func_normal_abspath_result/$func_normal_abspath_tcomponent -- ;; -- esac -- done -- # Restore leading double-slash if one was found on entry. -- func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result --} -+# Except for the global variables explicitly listed below, the following -+# functions in the '^func_' namespace, and the '^require_' namespace -+# variables initialised in the 'Resource management' section, sourcing -+# this file will not pollute your global namespace with anything -+# else. There's no portable way to scope variables in Bourne shell -+# though, so actually running these functions will sometimes place -+# results into a variable named after the function, and often use -+# temporary variables in the '^_G_' namespace. If you are careful to -+# avoid using those namespaces casually in your sourcing script, things -+# should continue to work as you expect. And, of course, you can freely -+# overwrite any of the functions or variables defined here before -+# calling anything to customize them. - --# func_relative_path SRCDIR DSTDIR --# generates a relative path from SRCDIR to DSTDIR, with a trailing --# slash if non-empty, suitable for immediately appending a filename --# without needing to append a separator. --# value returned in "$func_relative_path_result" --func_relative_path () --{ -- func_relative_path_result= -- func_normal_abspath "$1" -- func_relative_path_tlibdir=$func_normal_abspath_result -- func_normal_abspath "$2" -- func_relative_path_tbindir=$func_normal_abspath_result -+EXIT_SUCCESS=0 -+EXIT_FAILURE=1 -+EXIT_MISMATCH=63 # $? = 63 is used to indicate version mismatch to missing. -+EXIT_SKIP=77 # $? = 77 is used to indicate a skipped test to automake. - -- # Ascend the tree starting from libdir -- while :; do -- # check if we have found a prefix of bindir -- case $func_relative_path_tbindir in -- $func_relative_path_tlibdir) -- # found an exact match -- func_relative_path_tcancelled= -- break -- ;; -- $func_relative_path_tlibdir*) -- # found a matching prefix -- func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir" -- func_relative_path_tcancelled=$func_stripname_result -- if test -z "$func_relative_path_result"; then -- func_relative_path_result=. -- fi -- break -- ;; -- *) -- func_dirname $func_relative_path_tlibdir -- func_relative_path_tlibdir=${func_dirname_result} -- if test "x$func_relative_path_tlibdir" = x ; then -- # Have to descend all the way to the root! -- func_relative_path_result=../$func_relative_path_result -- func_relative_path_tcancelled=$func_relative_path_tbindir -- break -- fi -- func_relative_path_result=../$func_relative_path_result -- ;; -- esac -- done -+# Allow overriding, eg assuming that you follow the convention of -+# putting '$debug_cmd' at the start of all your functions, you can get -+# bash to show function call trace with: -+# -+# debug_cmd='eval echo "${FUNCNAME[0]} $*" >&2' bash your-script-name -+debug_cmd=${debug_cmd-":"} -+exit_cmd=: - -- # Now calculate path; take care to avoid doubling-up slashes. -- func_stripname '' '/' "$func_relative_path_result" -- func_relative_path_result=$func_stripname_result -- func_stripname '/' '/' "$func_relative_path_tcancelled" -- if test "x$func_stripname_result" != x ; then -- func_relative_path_result=${func_relative_path_result}/${func_stripname_result} -- fi -+# By convention, finish your script with: -+# -+# exit $exit_status -+# -+# so that you can set exit_status to non-zero if you want to indicate -+# something went wrong during execution without actually bailing out at -+# the point of failure. -+exit_status=$EXIT_SUCCESS - -- # Normalisation. If bindir is libdir, return empty string, -- # else relative path ending with a slash; either way, target -- # file name can be directly appended. -- if test ! -z "$func_relative_path_result"; then -- func_stripname './' '' "$func_relative_path_result/" -- func_relative_path_result=$func_stripname_result -- fi --} -+# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh -+# is ksh but when the shell is invoked as "sh" and the current value of -+# the _XPG environment variable is not equal to 1 (one), the special -+# positional parameter $0, within a function call, is the name of the -+# function. -+progpath=$0 - --# The name of this program: --func_dirname_and_basename "$progpath" --progname=$func_basename_result -+# The name of this program. -+progname=`$ECHO "$progpath" |$SED "$sed_basename"` - --# Make sure we have an absolute path for reexecution: -+# Make sure we have an absolute progpath for reexecution: - case $progpath in - [\\/]*|[A-Za-z]:\\*) ;; - *[\\/]*) -- progdir=$func_dirname_result -+ progdir=`$ECHO "$progpath" |$SED "$sed_dirname"` - progdir=`cd "$progdir" && pwd` -- progpath="$progdir/$progname" -+ progpath=$progdir/$progname - ;; - *) -- save_IFS="$IFS" -+ _G_IFS=$IFS - IFS=${PATH_SEPARATOR-:} - for progdir in $PATH; do -- IFS="$save_IFS" -+ IFS=$_G_IFS - test -x "$progdir/$progname" && break - done -- IFS="$save_IFS" -+ IFS=$_G_IFS - test -n "$progdir" || progdir=`pwd` -- progpath="$progdir/$progname" -+ progpath=$progdir/$progname - ;; - esac - --# Sed substitution that helps us do robust quoting. It backslashifies --# metacharacters that are still active within double-quoted strings. --Xsed="${SED}"' -e 1s/^X//' --sed_quote_subst='s/\([`"$\\]\)/\\\1/g' - --# Same as above, but do not quote variable references. --double_quote_subst='s/\(["`\\]\)/\\\1/g' -- --# Sed substitution that turns a string into a regex matching for the --# string literally. --sed_make_literal_regex='s,[].[^$\\*\/],\\&,g' -- --# Sed substitution that converts a w32 file name or path --# which contains forward slashes, into one that contains --# (escaped) backslashes. A very naive implementation. --lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' -+## ----------------- ## -+## Standard options. ## -+## ----------------- ## - --# Re-`\' parameter expansions in output of double_quote_subst that were --# `\'-ed in input to the same. If an odd number of `\' preceded a '$' --# in input to double_quote_subst, that '$' was protected from expansion. --# Since each input `\' is now two `\'s, look for any number of runs of --# four `\'s followed by two `\'s and then a '$'. `\' that '$'. --bs='\\' --bs2='\\\\' --bs4='\\\\\\\\' --dollar='\$' --sed_double_backslash="\ -- s/$bs4/&\\ --/g -- s/^$bs2$dollar/$bs&/ -- s/\\([^$bs]\\)$bs2$dollar/\\1$bs2$bs$dollar/g -- s/\n//g" -+# The following options affect the operation of the functions defined -+# below, and should be set appropriately depending on run-time para- -+# meters passed on the command line. - --# Standard options: - opt_dry_run=false --opt_help=false - opt_quiet=false - opt_verbose=false --opt_warning=: - --# func_echo arg... --# Echo program name prefixed message, along with the current mode --# name if it has been set yet. --func_echo () -+# Categories 'all' and 'none' are always available. Append any others -+# you will pass as the first argument to func_warning from your own -+# code. -+warning_categories= -+ -+# By default, display warnings according to 'opt_warning_types'. Set -+# 'warning_func' to ':' to elide all warnings, or func_fatal_error to -+# treat the next displayed warning as a fatal error. -+warning_func=func_warn_and_continue -+ -+# Set to 'all' to display all warnings, 'none' to suppress all -+# warnings, or a space delimited list of some subset of -+# 'warning_categories' to display only the listed warnings. -+opt_warning_types=all -+ -+ -+## -------------------- ## -+## Resource management. ## -+## -------------------- ## -+ -+# This section contains definitions for functions that each ensure a -+# particular resource (a file, or a non-empty configuration variable for -+# example) is available, and if appropriate to extract default values -+# from pertinent package files. Call them using their associated -+# 'require_*' variable to ensure that they are executed, at most, once. -+# -+# It's entirely deliberate that calling these functions can set -+# variables that don't obey the namespace limitations obeyed by the rest -+# of this file, in order that that they be as useful as possible to -+# callers. -+ -+ -+# require_term_colors -+# ------------------- -+# Allow display of bold text on terminals that support it. -+require_term_colors=func_require_term_colors -+func_require_term_colors () - { -- $ECHO "$progname: ${opt_mode+$opt_mode: }$*" -+ $debug_cmd -+ -+ test -t 1 && { -+ # COLORTERM and USE_ANSI_COLORS environment variables take -+ # precedence, because most terminfo databases neglect to describe -+ # whether color sequences are supported. -+ test -n "${COLORTERM+set}" && : ${USE_ANSI_COLORS="1"} -+ -+ if test 1 = "$USE_ANSI_COLORS"; then -+ # Standard ANSI escape sequences -+ tc_reset='' -+ tc_bold=''; tc_standout='' -+ tc_red=''; tc_green='' -+ tc_blue=''; tc_cyan='' -+ else -+ # Otherwise trust the terminfo database after all. -+ test -n "`tput sgr0 2>/dev/null`" && { -+ tc_reset=`tput sgr0` -+ test -n "`tput bold 2>/dev/null`" && tc_bold=`tput bold` -+ tc_standout=$tc_bold -+ test -n "`tput smso 2>/dev/null`" && tc_standout=`tput smso` -+ test -n "`tput setaf 1 2>/dev/null`" && tc_red=`tput setaf 1` -+ test -n "`tput setaf 2 2>/dev/null`" && tc_green=`tput setaf 2` -+ test -n "`tput setaf 4 2>/dev/null`" && tc_blue=`tput setaf 4` -+ test -n "`tput setaf 5 2>/dev/null`" && tc_cyan=`tput setaf 5` -+ } -+ fi -+ } -+ -+ require_term_colors=: - } - --# func_verbose arg... --# Echo program name prefixed message in verbose mode only. --func_verbose () -+ -+## ----------------- ## -+## Function library. ## -+## ----------------- ## -+ -+# This section contains a variety of useful functions to call in your -+# scripts. Take note of the portable wrappers for features provided by -+# some modern shells, which will fall back to slower equivalents on -+# less featureful shells. -+ -+ -+# func_append VAR VALUE -+# --------------------- -+# Append VALUE onto the existing contents of VAR. -+ -+ # We should try to minimise forks, especially on Windows where they are -+ # unreasonably slow, so skip the feature probes when bash or zsh are -+ # being used: -+ if test set = "${BASH_VERSION+set}${ZSH_VERSION+set}"; then -+ : ${_G_HAVE_ARITH_OP="yes"} -+ : ${_G_HAVE_XSI_OPS="yes"} -+ # The += operator was introduced in bash 3.1 -+ case $BASH_VERSION in -+ [12].* | 3.0 | 3.0*) ;; -+ *) -+ : ${_G_HAVE_PLUSEQ_OP="yes"} -+ ;; -+ esac -+ fi -+ -+ # _G_HAVE_PLUSEQ_OP -+ # Can be empty, in which case the shell is probed, "yes" if += is -+ # useable or anything else if it does not work. -+ test -z "$_G_HAVE_PLUSEQ_OP" \ -+ && (eval 'x=a; x+=" b"; test "a b" = "$x"') 2>/dev/null \ -+ && _G_HAVE_PLUSEQ_OP=yes -+ -+if test yes = "$_G_HAVE_PLUSEQ_OP" -+then -+ # This is an XSI compatible shell, allowing a faster implementation... -+ eval 'func_append () -+ { -+ $debug_cmd -+ -+ eval "$1+=\$2" -+ }' -+else -+ # ...otherwise fall back to using expr, which is often a shell builtin. -+ func_append () -+ { -+ $debug_cmd -+ -+ eval "$1=\$$1\$2" -+ } -+fi -+ -+ -+# func_append_quoted VAR VALUE -+# ---------------------------- -+# Quote VALUE and append to the end of shell variable VAR, separated -+# by a space. -+if test yes = "$_G_HAVE_PLUSEQ_OP"; then -+ eval 'func_append_quoted () -+ { -+ $debug_cmd -+ -+ func_quote_for_eval "$2" -+ eval "$1+=\\ \$func_quote_for_eval_result" -+ }' -+else -+ func_append_quoted () -+ { -+ $debug_cmd -+ -+ func_quote_for_eval "$2" -+ eval "$1=\$$1\\ \$func_quote_for_eval_result" -+ } -+fi -+ -+ -+# func_append_uniq VAR VALUE -+# -------------------------- -+# Append unique VALUE onto the existing contents of VAR, assuming -+# entries are delimited by the first character of VALUE. For example: -+# -+# func_append_uniq options " --another-option option-argument" -+# -+# will only append to $options if " --another-option option-argument " -+# is not already present somewhere in $options already (note spaces at -+# each end implied by leading space in second argument). -+func_append_uniq () - { -- $opt_verbose && func_echo ${1+"$@"} -+ $debug_cmd - -- # A bug in bash halts the script if the last line of a function -- # fails when set -e is in force, so we need another command to -- # work around that: -- : -+ eval _G_current_value='`$ECHO $'$1'`' -+ _G_delim=`expr "$2" : '\(.\)'` -+ -+ case $_G_delim$_G_current_value$_G_delim in -+ *"$2$_G_delim"*) ;; -+ *) func_append "$@" ;; -+ esac - } - --# func_echo_all arg... -+ -+# func_arith TERM... -+# ------------------ -+# Set func_arith_result to the result of evaluating TERMs. -+ test -z "$_G_HAVE_ARITH_OP" \ -+ && (eval 'test 2 = $(( 1 + 1 ))') 2>/dev/null \ -+ && _G_HAVE_ARITH_OP=yes -+ -+if test yes = "$_G_HAVE_ARITH_OP"; then -+ eval 'func_arith () -+ { -+ $debug_cmd -+ -+ func_arith_result=$(( $* )) -+ }' -+else -+ func_arith () -+ { -+ $debug_cmd -+ -+ func_arith_result=`expr "$@"` -+ } -+fi -+ -+ -+# func_basename FILE -+# ------------------ -+# Set func_basename_result to FILE with everything up to and including -+# the last / stripped. -+if test yes = "$_G_HAVE_XSI_OPS"; then -+ # If this shell supports suffix pattern removal, then use it to avoid -+ # forking. Hide the definitions single quotes in case the shell chokes -+ # on unsupported syntax... -+ _b='func_basename_result=${1##*/}' -+ _d='case $1 in -+ */*) func_dirname_result=${1%/*}$2 ;; -+ * ) func_dirname_result=$3 ;; -+ esac' -+ -+else -+ # ...otherwise fall back to using sed. -+ _b='func_basename_result=`$ECHO "$1" |$SED "$sed_basename"`' -+ _d='func_dirname_result=`$ECHO "$1" |$SED "$sed_dirname"` -+ if test "X$func_dirname_result" = "X$1"; then -+ func_dirname_result=$3 -+ else -+ func_append func_dirname_result "$2" -+ fi' -+fi -+ -+eval 'func_basename () -+{ -+ $debug_cmd -+ -+ '"$_b"' -+}' -+ -+ -+# func_dirname FILE APPEND NONDIR_REPLACEMENT -+# ------------------------------------------- -+# Compute the dirname of FILE. If nonempty, add APPEND to the result, -+# otherwise set result to NONDIR_REPLACEMENT. -+eval 'func_dirname () -+{ -+ $debug_cmd -+ -+ '"$_d"' -+}' -+ -+ -+# func_dirname_and_basename FILE APPEND NONDIR_REPLACEMENT -+# -------------------------------------------------------- -+# Perform func_basename and func_dirname in a single function -+# call: -+# dirname: Compute the dirname of FILE. If nonempty, -+# add APPEND to the result, otherwise set result -+# to NONDIR_REPLACEMENT. -+# value returned in "$func_dirname_result" -+# basename: Compute filename of FILE. -+# value retuned in "$func_basename_result" -+# For efficiency, we do not delegate to the functions above but instead -+# duplicate the functionality here. -+eval 'func_dirname_and_basename () -+{ -+ $debug_cmd -+ -+ '"$_b"' -+ '"$_d"' -+}' -+ -+ -+# func_echo ARG... -+# ---------------- -+# Echo program name prefixed message. -+func_echo () -+{ -+ $debug_cmd -+ -+ _G_message=$* -+ -+ func_echo_IFS=$IFS -+ IFS=$nl -+ for _G_line in $_G_message; do -+ IFS=$func_echo_IFS -+ $ECHO "$progname: $_G_line" -+ done -+ IFS=$func_echo_IFS -+} -+ -+ -+# func_echo_all ARG... -+# -------------------- - # Invoke $ECHO with all args, space-separated. - func_echo_all () - { - $ECHO "$*" - } - --# func_error arg... --# Echo program name prefixed message to standard error. --func_error () -+ -+# func_echo_infix_1 INFIX ARG... -+# ------------------------------ -+# Echo program name, followed by INFIX on the first line, with any -+# additional lines not showing INFIX. -+func_echo_infix_1 () - { -- $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2 -+ $debug_cmd -+ -+ $require_term_colors -+ -+ _G_infix=$1; shift -+ _G_indent=$_G_infix -+ _G_prefix="$progname: $_G_infix: " -+ _G_message=$* -+ -+ # Strip color escape sequences before counting printable length -+ for _G_tc in "$tc_reset" "$tc_bold" "$tc_standout" "$tc_red" "$tc_green" "$tc_blue" "$tc_cyan" -+ do -+ test -n "$_G_tc" && { -+ _G_esc_tc=`$ECHO "$_G_tc" | $SED "$sed_make_literal_regex"` -+ _G_indent=`$ECHO "$_G_indent" | $SED "s|$_G_esc_tc||g"` -+ } -+ done -+ _G_indent="$progname: "`echo "$_G_indent" | $SED 's|.| |g'`" " ## exclude from sc_prohibit_nested_quotes -+ -+ func_echo_infix_1_IFS=$IFS -+ IFS=$nl -+ for _G_line in $_G_message; do -+ IFS=$func_echo_infix_1_IFS -+ $ECHO "$_G_prefix$tc_bold$_G_line$tc_reset" >&2 -+ _G_prefix=$_G_indent -+ done -+ IFS=$func_echo_infix_1_IFS - } - --# func_warning arg... --# Echo program name prefixed warning message to standard error. --func_warning () -+ -+# func_error ARG... -+# ----------------- -+# Echo program name prefixed message to standard error. -+func_error () - { -- $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2 -+ $debug_cmd - -- # bash bug again: -- : -+ $require_term_colors -+ -+ func_echo_infix_1 " $tc_standout${tc_red}error$tc_reset" "$*" >&2 - } - --# func_fatal_error arg... -+ -+# func_fatal_error ARG... -+# ----------------------- - # Echo program name prefixed message to standard error, and exit. - func_fatal_error () - { -- func_error ${1+"$@"} -- exit $EXIT_FAILURE --} -+ $debug_cmd - --# func_fatal_help arg... --# Echo program name prefixed message to standard error, followed by --# a help hint, and exit. --func_fatal_help () --{ -- func_error ${1+"$@"} -- func_fatal_error "$help" -+ func_error "$*" -+ exit $EXIT_FAILURE - } --help="Try \`$progname --help' for more information." ## default - - --# func_grep expression filename -+# func_grep EXPRESSION FILENAME -+# ----------------------------- - # Check whether EXPRESSION matches any line of FILENAME, without output. - func_grep () - { -+ $debug_cmd -+ - $GREP "$1" "$2" >/dev/null 2>&1 - } - - --# func_mkdir_p directory-path -+# func_len STRING -+# --------------- -+# Set func_len_result to the length of STRING. STRING may not -+# start with a hyphen. -+ test -z "$_G_HAVE_XSI_OPS" \ -+ && (eval 'x=a/b/c; -+ test 5aa/bb/cc = "${#x}${x%%/*}${x%/*}${x#*/}${x##*/}"') 2>/dev/null \ -+ && _G_HAVE_XSI_OPS=yes -+ -+if test yes = "$_G_HAVE_XSI_OPS"; then -+ eval 'func_len () -+ { -+ $debug_cmd -+ -+ func_len_result=${#1} -+ }' -+else -+ func_len () -+ { -+ $debug_cmd -+ -+ func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` -+ } -+fi -+ -+ -+# func_mkdir_p DIRECTORY-PATH -+# --------------------------- - # Make sure the entire path to DIRECTORY-PATH is available. - func_mkdir_p () - { -- my_directory_path="$1" -- my_dir_list= -+ $debug_cmd - -- if test -n "$my_directory_path" && test "$opt_dry_run" != ":"; then -+ _G_directory_path=$1 -+ _G_dir_list= - -- # Protect directory names starting with `-' -- case $my_directory_path in -- -*) my_directory_path="./$my_directory_path" ;; -+ if test -n "$_G_directory_path" && test : != "$opt_dry_run"; then -+ -+ # Protect directory names starting with '-' -+ case $_G_directory_path in -+ -*) _G_directory_path=./$_G_directory_path ;; - esac - - # While some portion of DIR does not yet exist... -- while test ! -d "$my_directory_path"; do -+ while test ! -d "$_G_directory_path"; do - # ...make a list in topmost first order. Use a colon delimited - # list incase some portion of path contains whitespace. -- my_dir_list="$my_directory_path:$my_dir_list" -+ _G_dir_list=$_G_directory_path:$_G_dir_list - - # If the last portion added has no slash in it, the list is done -- case $my_directory_path in */*) ;; *) break ;; esac -+ case $_G_directory_path in */*) ;; *) break ;; esac - - # ...otherwise throw away the child directory and loop -- my_directory_path=`$ECHO "$my_directory_path" | $SED -e "$dirname"` -+ _G_directory_path=`$ECHO "$_G_directory_path" | $SED -e "$sed_dirname"` - done -- my_dir_list=`$ECHO "$my_dir_list" | $SED 's,:*$,,'` -+ _G_dir_list=`$ECHO "$_G_dir_list" | $SED 's|:*$||'` - -- save_mkdir_p_IFS="$IFS"; IFS=':' -- for my_dir in $my_dir_list; do -- IFS="$save_mkdir_p_IFS" -- # mkdir can fail with a `File exist' error if two processes -+ func_mkdir_p_IFS=$IFS; IFS=: -+ for _G_dir in $_G_dir_list; do -+ IFS=$func_mkdir_p_IFS -+ # mkdir can fail with a 'File exist' error if two processes - # try to create one of the directories concurrently. Don't - # stop in that case! -- $MKDIR "$my_dir" 2>/dev/null || : -+ $MKDIR "$_G_dir" 2>/dev/null || : - done -- IFS="$save_mkdir_p_IFS" -+ IFS=$func_mkdir_p_IFS - - # Bail out if we (or some other process) failed to create a directory. -- test -d "$my_directory_path" || \ -- func_fatal_error "Failed to create \`$1'" -+ test -d "$_G_directory_path" || \ -+ func_fatal_error "Failed to create '$1'" - fi - } - - --# func_mktempdir [string] -+# func_mktempdir [BASENAME] -+# ------------------------- - # Make a temporary directory that won't clash with other running - # libtool processes, and avoids race conditions if possible. If --# given, STRING is the basename for that directory. -+# given, BASENAME is the basename for that directory. - func_mktempdir () - { -- my_template="${TMPDIR-/tmp}/${1-$progname}" -+ $debug_cmd - -- if test "$opt_dry_run" = ":"; then -+ _G_template=${TMPDIR-/tmp}/${1-$progname} -+ -+ if test : = "$opt_dry_run"; then - # Return a directory name, but don't create it in dry-run mode -- my_tmpdir="${my_template}-$$" -+ _G_tmpdir=$_G_template-$$ - else - - # If mktemp works, use that first and foremost -- my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null` -+ _G_tmpdir=`mktemp -d "$_G_template-XXXXXXXX" 2>/dev/null` - -- if test ! -d "$my_tmpdir"; then -+ if test ! -d "$_G_tmpdir"; then - # Failing that, at least try and use $RANDOM to avoid a race -- my_tmpdir="${my_template}-${RANDOM-0}$$" -+ _G_tmpdir=$_G_template-${RANDOM-0}$$ - -- save_mktempdir_umask=`umask` -+ func_mktempdir_umask=`umask` - umask 0077 -- $MKDIR "$my_tmpdir" -- umask $save_mktempdir_umask -+ $MKDIR "$_G_tmpdir" -+ umask $func_mktempdir_umask - fi - - # If we're not in dry-run mode, bomb out on failure -- test -d "$my_tmpdir" || \ -- func_fatal_error "cannot create temporary directory \`$my_tmpdir'" -+ test -d "$_G_tmpdir" || \ -+ func_fatal_error "cannot create temporary directory '$_G_tmpdir'" - fi - -- $ECHO "$my_tmpdir" -+ $ECHO "$_G_tmpdir" - } - - --# func_quote_for_eval arg --# Aesthetically quote ARG to be evaled later. --# This function returns two values: FUNC_QUOTE_FOR_EVAL_RESULT --# is double-quoted, suitable for a subsequent eval, whereas --# FUNC_QUOTE_FOR_EVAL_UNQUOTED_RESULT has merely all characters --# which are still active within double quotes backslashified. --func_quote_for_eval () -+# func_normal_abspath PATH -+# ------------------------ -+# Remove doubled-up and trailing slashes, "." path components, -+# and cancel out any ".." path components in PATH after making -+# it an absolute path. -+func_normal_abspath () - { -- case $1 in -- *[\\\`\"\$]*) -- func_quote_for_eval_unquoted_result=`$ECHO "$1" | $SED "$sed_quote_subst"` ;; -- *) -- func_quote_for_eval_unquoted_result="$1" ;; -- esac -+ $debug_cmd - -- case $func_quote_for_eval_unquoted_result in -- # Double-quote args containing shell metacharacters to delay -- # word splitting, command substitution and and variable -- # expansion for a subsequent eval. -- # Many Bourne shells cannot handle close brackets correctly -- # in scan sets, so we specify it separately. -- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") -- func_quote_for_eval_result="\"$func_quote_for_eval_unquoted_result\"" -+ # These SED scripts presuppose an absolute path with a trailing slash. -+ _G_pathcar='s|^/\([^/]*\).*$|\1|' -+ _G_pathcdr='s|^/[^/]*||' -+ _G_removedotparts=':dotsl -+ s|/\./|/|g -+ t dotsl -+ s|/\.$|/|' -+ _G_collapseslashes='s|/\{1,\}|/|g' -+ _G_finalslash='s|/*$|/|' -+ -+ # Start from root dir and reassemble the path. -+ func_normal_abspath_result= -+ func_normal_abspath_tpath=$1 -+ func_normal_abspath_altnamespace= -+ case $func_normal_abspath_tpath in -+ "") -+ # Empty path, that just means $cwd. -+ func_stripname '' '/' "`pwd`" -+ func_normal_abspath_result=$func_stripname_result -+ return -+ ;; -+ # The next three entries are used to spot a run of precisely -+ # two leading slashes without using negated character classes; -+ # we take advantage of case's first-match behaviour. -+ ///*) -+ # Unusual form of absolute path, do nothing. -+ ;; -+ //*) -+ # Not necessarily an ordinary path; POSIX reserves leading '//' -+ # and for example Cygwin uses it to access remote file shares -+ # over CIFS/SMB, so we conserve a leading double slash if found. -+ func_normal_abspath_altnamespace=/ -+ ;; -+ /*) -+ # Absolute path, do nothing. - ;; - *) -- func_quote_for_eval_result="$func_quote_for_eval_unquoted_result" -+ # Relative path, prepend $cwd. -+ func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath -+ ;; - esac -+ -+ # Cancel out all the simple stuff to save iterations. We also want -+ # the path to end with a slash for ease of parsing, so make sure -+ # there is one (and only one) here. -+ func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ -+ -e "$_G_removedotparts" -e "$_G_collapseslashes" -e "$_G_finalslash"` -+ while :; do -+ # Processed it all yet? -+ if test / = "$func_normal_abspath_tpath"; then -+ # If we ascended to the root using ".." the result may be empty now. -+ if test -z "$func_normal_abspath_result"; then -+ func_normal_abspath_result=/ -+ fi -+ break -+ fi -+ func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \ -+ -e "$_G_pathcar"` -+ func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ -+ -e "$_G_pathcdr"` -+ # Figure out what to do with it -+ case $func_normal_abspath_tcomponent in -+ "") -+ # Trailing empty path component, ignore it. -+ ;; -+ ..) -+ # Parent dir; strip last assembled component from result. -+ func_dirname "$func_normal_abspath_result" -+ func_normal_abspath_result=$func_dirname_result -+ ;; -+ *) -+ # Actual path component, append it. -+ func_append func_normal_abspath_result "/$func_normal_abspath_tcomponent" -+ ;; -+ esac -+ done -+ # Restore leading double-slash if one was found on entry. -+ func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result - } - - --# func_quote_for_expand arg -+# func_notquiet ARG... -+# -------------------- -+# Echo program name prefixed message only when not in quiet mode. -+func_notquiet () -+{ -+ $debug_cmd -+ -+ $opt_quiet || func_echo ${1+"$@"} -+ -+ # A bug in bash halts the script if the last line of a function -+ # fails when set -e is in force, so we need another command to -+ # work around that: -+ : -+} -+ -+ -+# func_relative_path SRCDIR DSTDIR -+# -------------------------------- -+# Set func_relative_path_result to the relative path from SRCDIR to DSTDIR. -+func_relative_path () -+{ -+ $debug_cmd -+ -+ func_relative_path_result= -+ func_normal_abspath "$1" -+ func_relative_path_tlibdir=$func_normal_abspath_result -+ func_normal_abspath "$2" -+ func_relative_path_tbindir=$func_normal_abspath_result -+ -+ # Ascend the tree starting from libdir -+ while :; do -+ # check if we have found a prefix of bindir -+ case $func_relative_path_tbindir in -+ $func_relative_path_tlibdir) -+ # found an exact match -+ func_relative_path_tcancelled= -+ break -+ ;; -+ $func_relative_path_tlibdir*) -+ # found a matching prefix -+ func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir" -+ func_relative_path_tcancelled=$func_stripname_result -+ if test -z "$func_relative_path_result"; then -+ func_relative_path_result=. -+ fi -+ break -+ ;; -+ *) -+ func_dirname $func_relative_path_tlibdir -+ func_relative_path_tlibdir=$func_dirname_result -+ if test -z "$func_relative_path_tlibdir"; then -+ # Have to descend all the way to the root! -+ func_relative_path_result=../$func_relative_path_result -+ func_relative_path_tcancelled=$func_relative_path_tbindir -+ break -+ fi -+ func_relative_path_result=../$func_relative_path_result -+ ;; -+ esac -+ done -+ -+ # Now calculate path; take care to avoid doubling-up slashes. -+ func_stripname '' '/' "$func_relative_path_result" -+ func_relative_path_result=$func_stripname_result -+ func_stripname '/' '/' "$func_relative_path_tcancelled" -+ if test -n "$func_stripname_result"; then -+ func_append func_relative_path_result "/$func_stripname_result" -+ fi -+ -+ # Normalisation. If bindir is libdir, return '.' else relative path. -+ if test -n "$func_relative_path_result"; then -+ func_stripname './' '' "$func_relative_path_result" -+ func_relative_path_result=$func_stripname_result -+ fi -+ -+ test -n "$func_relative_path_result" || func_relative_path_result=. -+ -+ : -+} -+ -+ -+# func_quote_for_eval ARG... -+# -------------------------- -+# Aesthetically quote ARGs to be evaled later. -+# This function returns two values: -+# i) func_quote_for_eval_result -+# double-quoted, suitable for a subsequent eval -+# ii) func_quote_for_eval_unquoted_result -+# has all characters that are still active within double -+# quotes backslashified. -+func_quote_for_eval () -+{ -+ $debug_cmd -+ -+ func_quote_for_eval_unquoted_result= -+ func_quote_for_eval_result= -+ while test 0 -lt $#; do -+ case $1 in -+ *[\\\`\"\$]*) -+ _G_unquoted_arg=`printf '%s\n' "$1" |$SED "$sed_quote_subst"` ;; -+ *) -+ _G_unquoted_arg=$1 ;; -+ esac -+ if test -n "$func_quote_for_eval_unquoted_result"; then -+ func_append func_quote_for_eval_unquoted_result " $_G_unquoted_arg" -+ else -+ func_append func_quote_for_eval_unquoted_result "$_G_unquoted_arg" -+ fi -+ -+ case $_G_unquoted_arg in -+ # Double-quote args containing shell metacharacters to delay -+ # word splitting, command substitution and variable expansion -+ # for a subsequent eval. -+ # Many Bourne shells cannot handle close brackets correctly -+ # in scan sets, so we specify it separately. -+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") -+ _G_quoted_arg=\"$_G_unquoted_arg\" -+ ;; -+ *) -+ _G_quoted_arg=$_G_unquoted_arg -+ ;; -+ esac -+ -+ if test -n "$func_quote_for_eval_result"; then -+ func_append func_quote_for_eval_result " $_G_quoted_arg" -+ else -+ func_append func_quote_for_eval_result "$_G_quoted_arg" -+ fi -+ shift -+ done -+} -+ -+ -+# func_quote_for_expand ARG -+# ------------------------- - # Aesthetically quote ARG to be evaled later; same as above, - # but do not quote variable references. - func_quote_for_expand () - { -+ $debug_cmd -+ - case $1 in - *[\\\`\"]*) -- my_arg=`$ECHO "$1" | $SED \ -- -e "$double_quote_subst" -e "$sed_double_backslash"` ;; -+ _G_arg=`$ECHO "$1" | $SED \ -+ -e "$sed_double_quote_subst" -e "$sed_double_backslash"` ;; - *) -- my_arg="$1" ;; -+ _G_arg=$1 ;; - esac - -- case $my_arg in -+ case $_G_arg in - # Double-quote args containing shell metacharacters to delay - # word splitting and command substitution for a subsequent eval. - # Many Bourne shells cannot handle close brackets correctly - # in scan sets, so we specify it separately. - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") -- my_arg="\"$my_arg\"" -+ _G_arg=\"$_G_arg\" - ;; - esac - -- func_quote_for_expand_result="$my_arg" -+ func_quote_for_expand_result=$_G_arg - } - - --# func_show_eval cmd [fail_exp] --# Unless opt_silent is true, then output CMD. Then, if opt_dryrun is -+# func_stripname PREFIX SUFFIX NAME -+# --------------------------------- -+# strip PREFIX and SUFFIX from NAME, and store in func_stripname_result. -+# PREFIX and SUFFIX must not contain globbing or regex special -+# characters, hashes, percent signs, but SUFFIX may contain a leading -+# dot (in which case that matches only a dot). -+if test yes = "$_G_HAVE_XSI_OPS"; then -+ eval 'func_stripname () -+ { -+ $debug_cmd -+ -+ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are -+ # positional parameters, so assign one to ordinary variable first. -+ func_stripname_result=$3 -+ func_stripname_result=${func_stripname_result#"$1"} -+ func_stripname_result=${func_stripname_result%"$2"} -+ }' -+else -+ func_stripname () -+ { -+ $debug_cmd -+ -+ case $2 in -+ .*) func_stripname_result=`$ECHO "$3" | $SED -e "s%^$1%%" -e "s%\\\\$2\$%%"`;; -+ *) func_stripname_result=`$ECHO "$3" | $SED -e "s%^$1%%" -e "s%$2\$%%"`;; -+ esac -+ } -+fi -+ -+ -+# func_show_eval CMD [FAIL_EXP] -+# ----------------------------- -+# Unless opt_quiet is true, then output CMD. Then, if opt_dryrun is - # not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP - # is given, then evaluate it. - func_show_eval () - { -- my_cmd="$1" -- my_fail_exp="${2-:}" -+ $debug_cmd - -- ${opt_silent-false} || { -- func_quote_for_expand "$my_cmd" -- eval "func_echo $func_quote_for_expand_result" -- } -+ _G_cmd=$1 -+ _G_fail_exp=${2-':'} - -- if ${opt_dry_run-false}; then :; else -- eval "$my_cmd" -- my_status=$? -- if test "$my_status" -eq 0; then :; else -- eval "(exit $my_status); $my_fail_exp" -+ func_quote_for_expand "$_G_cmd" -+ eval "func_notquiet $func_quote_for_expand_result" -+ -+ $opt_dry_run || { -+ eval "$_G_cmd" -+ _G_status=$? -+ if test 0 -ne "$_G_status"; then -+ eval "(exit $_G_status); $_G_fail_exp" - fi -- fi -+ } - } - - --# func_show_eval_locale cmd [fail_exp] --# Unless opt_silent is true, then output CMD. Then, if opt_dryrun is -+# func_show_eval_locale CMD [FAIL_EXP] -+# ------------------------------------ -+# Unless opt_quiet is true, then output CMD. Then, if opt_dryrun is - # not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP - # is given, then evaluate it. Use the saved locale for evaluation. - func_show_eval_locale () - { -- my_cmd="$1" -- my_fail_exp="${2-:}" -+ $debug_cmd - -- ${opt_silent-false} || { -- func_quote_for_expand "$my_cmd" -+ _G_cmd=$1 -+ _G_fail_exp=${2-':'} -+ -+ $opt_quiet || { -+ func_quote_for_expand "$_G_cmd" - eval "func_echo $func_quote_for_expand_result" - } - -- if ${opt_dry_run-false}; then :; else -- eval "$lt_user_locale -- $my_cmd" -- my_status=$? -- eval "$lt_safe_locale" -- if test "$my_status" -eq 0; then :; else -- eval "(exit $my_status); $my_fail_exp" -+ $opt_dry_run || { -+ eval "$_G_user_locale -+ $_G_cmd" -+ _G_status=$? -+ eval "$_G_safe_locale" -+ if test 0 -ne "$_G_status"; then -+ eval "(exit $_G_status); $_G_fail_exp" - fi -- fi -+ } - } - -+ - # func_tr_sh -+# ---------- - # Turn $1 into a string suitable for a shell variable name. - # Result is stored in $func_tr_sh_result. All characters - # not in the set a-zA-Z0-9_ are replaced with '_'. Further, - # if $1 begins with a digit, a '_' is prepended as well. - func_tr_sh () - { -- case $1 in -- [0-9]* | *[!a-zA-Z0-9_]*) -- func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'` -- ;; -- * ) -- func_tr_sh_result=$1 -- ;; -- esac -+ $debug_cmd -+ -+ case $1 in -+ [0-9]* | *[!a-zA-Z0-9_]*) -+ func_tr_sh_result=`$ECHO "$1" | $SED -e 's/^\([0-9]\)/_\1/' -e 's/[^a-zA-Z0-9_]/_/g'` -+ ;; -+ * ) -+ func_tr_sh_result=$1 -+ ;; -+ esac - } - - --# func_version --# Echo version message to standard output and exit. --func_version () -+# func_verbose ARG... -+# ------------------- -+# Echo program name prefixed message in verbose mode only. -+func_verbose () - { -- $opt_debug -+ $debug_cmd - -- $SED -n '/(C)/!b go -- :more -- /\./!{ -- N -- s/\n# / / -- b more -- } -- :go -- /^# '$PROGRAM' (GNU /,/# warranty; / { -- s/^# // -- s/^# *$// -- s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/ -- p -- }' < "$progpath" -- exit $? -+ $opt_verbose && func_echo "$*" -+ -+ : - } - --# func_usage --# Echo short help message to standard output and exit. --func_usage () -+ -+# func_warn_and_continue ARG... -+# ----------------------------- -+# Echo program name prefixed warning message to standard error. -+func_warn_and_continue () - { -- $opt_debug -+ $debug_cmd - -- $SED -n '/^# Usage:/,/^# *.*--help/ { -- s/^# // -- s/^# *$// -- s/\$progname/'$progname'/ -- p -- }' < "$progpath" -- echo -- $ECHO "run \`$progname --help | more' for full usage" -- exit $? -+ $require_term_colors -+ -+ func_echo_infix_1 "${tc_red}warning$tc_reset" "$*" >&2 - } - --# func_help [NOEXIT] --# Echo long help message to standard output and exit, --# unless 'noexit' is passed as argument. -+ -+# func_warning CATEGORY ARG... -+# ---------------------------- -+# Echo program name prefixed warning message to standard error. Warning -+# messages can be filtered according to CATEGORY, where this function -+# elides messages where CATEGORY is not listed in the global variable -+# 'opt_warning_types'. -+func_warning () -+{ -+ $debug_cmd -+ -+ # CATEGORY must be in the warning_categories list! -+ case " $warning_categories " in -+ *" $1 "*) ;; -+ *) func_internal_error "invalid warning category '$1'" ;; -+ esac -+ -+ _G_category=$1 -+ shift -+ -+ case " $opt_warning_types " in -+ *" $_G_category "*) $warning_func ${1+"$@"} ;; -+ esac -+} -+ -+ -+# func_sort_ver VER1 VER2 -+# ----------------------- -+# 'sort -V' is not generally available. -+# Note this deviates from the version comparison in automake -+# in that it treats 1.5 < 1.5.0, and treats 1.4.4a < 1.4-p3a -+# but this should suffice as we won't be specifying old -+# version formats or redundant trailing .0 in bootstrap.conf. -+# If we did want full compatibility then we should probably -+# use m4_version_compare from autoconf. -+func_sort_ver () -+{ -+ $debug_cmd -+ -+ printf '%s\n%s\n' "$1" "$2" \ -+ | sort -t. -k 1,1n -k 2,2n -k 3,3n -k 4,4n -k 5,5n -k 6,6n -k 7,7n -k 8,8n -k 9,9n -+} -+ -+# func_lt_ver PREV CURR -+# --------------------- -+# Return true if PREV and CURR are in the correct order according to -+# func_sort_ver, otherwise false. Use it like this: -+# -+# func_lt_ver "$prev_ver" "$proposed_ver" || func_fatal_error "..." -+func_lt_ver () -+{ -+ $debug_cmd -+ -+ test "x$1" = x`func_sort_ver "$1" "$2" | $SED 1q` -+} -+ -+ -+# Local variables: -+# mode: shell-script -+# sh-indentation: 2 -+# eval: (add-hook 'before-save-hook 'time-stamp) -+# time-stamp-pattern: "10/scriptversion=%:y-%02m-%02d.%02H; # UTC" -+# time-stamp-time-zone: "UTC" -+# End: -+#! /bin/sh -+ -+# Set a version string for this script. -+scriptversion=2014-01-07.03; # UTC -+ -+# A portable, pluggable option parser for Bourne shell. -+# Written by Gary V. Vaughan, 2010 -+ -+# Copyright (C) 2010-2015 Free Software Foundation, Inc. -+# This is free software; see the source for copying conditions. There is NO -+# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -+ -+# 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 3 of the License, 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, see . -+ -+# Please report bugs or propose patches to gary@gnu.org. -+ -+ -+## ------ ## -+## Usage. ## -+## ------ ## -+ -+# This file is a library for parsing options in your shell scripts along -+# with assorted other useful supporting features that you can make use -+# of too. -+# -+# For the simplest scripts you might need only: -+# -+# #!/bin/sh -+# . relative/path/to/funclib.sh -+# . relative/path/to/options-parser -+# scriptversion=1.0 -+# func_options ${1+"$@"} -+# eval set dummy "$func_options_result"; shift -+# ...rest of your script... -+# -+# In order for the '--version' option to work, you will need to have a -+# suitably formatted comment like the one at the top of this file -+# starting with '# Written by ' and ending with '# warranty; '. -+# -+# For '-h' and '--help' to work, you will also need a one line -+# description of your script's purpose in a comment directly above the -+# '# Written by ' line, like the one at the top of this file. -+# -+# The default options also support '--debug', which will turn on shell -+# execution tracing (see the comment above debug_cmd below for another -+# use), and '--verbose' and the func_verbose function to allow your script -+# to display verbose messages only when your user has specified -+# '--verbose'. -+# -+# After sourcing this file, you can plug processing for additional -+# options by amending the variables from the 'Configuration' section -+# below, and following the instructions in the 'Option parsing' -+# section further down. -+ -+## -------------- ## -+## Configuration. ## -+## -------------- ## -+ -+# You should override these variables in your script after sourcing this -+# file so that they reflect the customisations you have added to the -+# option parser. -+ -+# The usage line for option parsing errors and the start of '-h' and -+# '--help' output messages. You can embed shell variables for delayed -+# expansion at the time the message is displayed, but you will need to -+# quote other shell meta-characters carefully to prevent them being -+# expanded when the contents are evaled. -+usage='$progpath [OPTION]...' -+ -+# Short help message in response to '-h' and '--help'. Add to this or -+# override it after sourcing this library to reflect the full set of -+# options your script accepts. -+usage_message="\ -+ --debug enable verbose shell tracing -+ -W, --warnings=CATEGORY -+ report the warnings falling in CATEGORY [all] -+ -v, --verbose verbosely report processing -+ --version print version information and exit -+ -h, --help print short or long help message and exit -+" -+ -+# Additional text appended to 'usage_message' in response to '--help'. -+long_help_message=" -+Warning categories include: -+ 'all' show all warnings -+ 'none' turn off all the warnings -+ 'error' warnings are treated as fatal errors" -+ -+# Help message printed before fatal option parsing errors. -+fatal_help="Try '\$progname --help' for more information." -+ -+ -+ -+## ------------------------- ## -+## Hook function management. ## -+## ------------------------- ## -+ -+# This section contains functions for adding, removing, and running hooks -+# to the main code. A hook is just a named list of of function, that can -+# be run in order later on. -+ -+# func_hookable FUNC_NAME -+# ----------------------- -+# Declare that FUNC_NAME will run hooks added with -+# 'func_add_hook FUNC_NAME ...'. -+func_hookable () -+{ -+ $debug_cmd -+ -+ func_append hookable_fns " $1" -+} -+ -+ -+# func_add_hook FUNC_NAME HOOK_FUNC -+# --------------------------------- -+# Request that FUNC_NAME call HOOK_FUNC before it returns. FUNC_NAME must -+# first have been declared "hookable" by a call to 'func_hookable'. -+func_add_hook () -+{ -+ $debug_cmd -+ -+ case " $hookable_fns " in -+ *" $1 "*) ;; -+ *) func_fatal_error "'$1' does not accept hook functions." ;; -+ esac -+ -+ eval func_append ${1}_hooks '" $2"' -+} -+ -+ -+# func_remove_hook FUNC_NAME HOOK_FUNC -+# ------------------------------------ -+# Remove HOOK_FUNC from the list of functions called by FUNC_NAME. -+func_remove_hook () -+{ -+ $debug_cmd -+ -+ eval ${1}_hooks='`$ECHO "\$'$1'_hooks" |$SED "s| '$2'||"`' -+} -+ -+ -+# func_run_hooks FUNC_NAME [ARG]... -+# --------------------------------- -+# Run all hook functions registered to FUNC_NAME. -+# It is assumed that the list of hook functions contains nothing more -+# than a whitespace-delimited list of legal shell function names, and -+# no effort is wasted trying to catch shell meta-characters or preserve -+# whitespace. -+func_run_hooks () -+{ -+ $debug_cmd -+ -+ case " $hookable_fns " in -+ *" $1 "*) ;; -+ *) func_fatal_error "'$1' does not support hook funcions.n" ;; -+ esac -+ -+ eval _G_hook_fns=\$$1_hooks; shift -+ -+ for _G_hook in $_G_hook_fns; do -+ eval $_G_hook '"$@"' -+ -+ # store returned options list back into positional -+ # parameters for next 'cmd' execution. -+ eval _G_hook_result=\$${_G_hook}_result -+ eval set dummy "$_G_hook_result"; shift -+ done -+ -+ func_quote_for_eval ${1+"$@"} -+ func_run_hooks_result=$func_quote_for_eval_result -+} -+ -+ -+ -+## --------------- ## -+## Option parsing. ## -+## --------------- ## -+ -+# In order to add your own option parsing hooks, you must accept the -+# full positional parameter list in your hook function, remove any -+# options that you action, and then pass back the remaining unprocessed -+# options in '_result', escaped suitably for -+# 'eval'. Like this: -+# -+# my_options_prep () -+# { -+# $debug_cmd -+# -+# # Extend the existing usage message. -+# usage_message=$usage_message' -+# -s, --silent don'\''t print informational messages -+# ' -+# -+# func_quote_for_eval ${1+"$@"} -+# my_options_prep_result=$func_quote_for_eval_result -+# } -+# func_add_hook func_options_prep my_options_prep -+# -+# -+# my_silent_option () -+# { -+# $debug_cmd -+# -+# # Note that for efficiency, we parse as many options as we can -+# # recognise in a loop before passing the remainder back to the -+# # caller on the first unrecognised argument we encounter. -+# while test $# -gt 0; do -+# opt=$1; shift -+# case $opt in -+# --silent|-s) opt_silent=: ;; -+# # Separate non-argument short options: -+# -s*) func_split_short_opt "$_G_opt" -+# set dummy "$func_split_short_opt_name" \ -+# "-$func_split_short_opt_arg" ${1+"$@"} -+# shift -+# ;; -+# *) set dummy "$_G_opt" "$*"; shift; break ;; -+# esac -+# done -+# -+# func_quote_for_eval ${1+"$@"} -+# my_silent_option_result=$func_quote_for_eval_result -+# } -+# func_add_hook func_parse_options my_silent_option -+# -+# -+# my_option_validation () -+# { -+# $debug_cmd -+# -+# $opt_silent && $opt_verbose && func_fatal_help "\ -+# '--silent' and '--verbose' options are mutually exclusive." -+# -+# func_quote_for_eval ${1+"$@"} -+# my_option_validation_result=$func_quote_for_eval_result -+# } -+# func_add_hook func_validate_options my_option_validation -+# -+# You'll alse need to manually amend $usage_message to reflect the extra -+# options you parse. It's preferable to append if you can, so that -+# multiple option parsing hooks can be added safely. -+ -+ -+# func_options [ARG]... -+# --------------------- -+# All the functions called inside func_options are hookable. See the -+# individual implementations for details. -+func_hookable func_options -+func_options () -+{ -+ $debug_cmd -+ -+ func_options_prep ${1+"$@"} -+ eval func_parse_options \ -+ ${func_options_prep_result+"$func_options_prep_result"} -+ eval func_validate_options \ -+ ${func_parse_options_result+"$func_parse_options_result"} -+ -+ eval func_run_hooks func_options \ -+ ${func_validate_options_result+"$func_validate_options_result"} -+ -+ # save modified positional parameters for caller -+ func_options_result=$func_run_hooks_result -+} -+ -+ -+# func_options_prep [ARG]... -+# -------------------------- -+# All initialisations required before starting the option parse loop. -+# Note that when calling hook functions, we pass through the list of -+# positional parameters. If a hook function modifies that list, and -+# needs to propogate that back to rest of this script, then the complete -+# modified list must be put in 'func_run_hooks_result' before -+# returning. -+func_hookable func_options_prep -+func_options_prep () -+{ -+ $debug_cmd -+ -+ # Option defaults: -+ opt_verbose=false -+ opt_warning_types= -+ -+ func_run_hooks func_options_prep ${1+"$@"} -+ -+ # save modified positional parameters for caller -+ func_options_prep_result=$func_run_hooks_result -+} -+ -+ -+# func_parse_options [ARG]... -+# --------------------------- -+# The main option parsing loop. -+func_hookable func_parse_options -+func_parse_options () -+{ -+ $debug_cmd -+ -+ func_parse_options_result= -+ -+ # this just eases exit handling -+ while test $# -gt 0; do -+ # Defer to hook functions for initial option parsing, so they -+ # get priority in the event of reusing an option name. -+ func_run_hooks func_parse_options ${1+"$@"} -+ -+ # Adjust func_parse_options positional parameters to match -+ eval set dummy "$func_run_hooks_result"; shift -+ -+ # Break out of the loop if we already parsed every option. -+ test $# -gt 0 || break -+ -+ _G_opt=$1 -+ shift -+ case $_G_opt in -+ --debug|-x) debug_cmd='set -x' -+ func_echo "enabling shell trace mode" -+ $debug_cmd -+ ;; -+ -+ --no-warnings|--no-warning|--no-warn) -+ set dummy --warnings none ${1+"$@"} -+ shift -+ ;; -+ -+ --warnings|--warning|-W) -+ test $# = 0 && func_missing_arg $_G_opt && break -+ case " $warning_categories $1" in -+ *" $1 "*) -+ # trailing space prevents matching last $1 above -+ func_append_uniq opt_warning_types " $1" -+ ;; -+ *all) -+ opt_warning_types=$warning_categories -+ ;; -+ *none) -+ opt_warning_types=none -+ warning_func=: -+ ;; -+ *error) -+ opt_warning_types=$warning_categories -+ warning_func=func_fatal_error -+ ;; -+ *) -+ func_fatal_error \ -+ "unsupported warning category: '$1'" -+ ;; -+ esac -+ shift -+ ;; -+ -+ --verbose|-v) opt_verbose=: ;; -+ --version) func_version ;; -+ -\?|-h) func_usage ;; -+ --help) func_help ;; -+ -+ # Separate optargs to long options (plugins may need this): -+ --*=*) func_split_equals "$_G_opt" -+ set dummy "$func_split_equals_lhs" \ -+ "$func_split_equals_rhs" ${1+"$@"} -+ shift -+ ;; -+ -+ # Separate optargs to short options: -+ -W*) -+ func_split_short_opt "$_G_opt" -+ set dummy "$func_split_short_opt_name" \ -+ "$func_split_short_opt_arg" ${1+"$@"} -+ shift -+ ;; -+ -+ # Separate non-argument short options: -+ -\?*|-h*|-v*|-x*) -+ func_split_short_opt "$_G_opt" -+ set dummy "$func_split_short_opt_name" \ -+ "-$func_split_short_opt_arg" ${1+"$@"} -+ shift -+ ;; -+ -+ --) break ;; -+ -*) func_fatal_help "unrecognised option: '$_G_opt'" ;; -+ *) set dummy "$_G_opt" ${1+"$@"}; shift; break ;; -+ esac -+ done -+ -+ # save modified positional parameters for caller -+ func_quote_for_eval ${1+"$@"} -+ func_parse_options_result=$func_quote_for_eval_result -+} -+ -+ -+# func_validate_options [ARG]... -+# ------------------------------ -+# Perform any sanity checks on option settings and/or unconsumed -+# arguments. -+func_hookable func_validate_options -+func_validate_options () -+{ -+ $debug_cmd -+ -+ # Display all warnings if -W was not given. -+ test -n "$opt_warning_types" || opt_warning_types=" $warning_categories" -+ -+ func_run_hooks func_validate_options ${1+"$@"} -+ -+ # Bail if the options were screwed! -+ $exit_cmd $EXIT_FAILURE -+ -+ # save modified positional parameters for caller -+ func_validate_options_result=$func_run_hooks_result -+} -+ -+ -+ -+## ----------------- ## -+## Helper functions. ## -+## ----------------- ## -+ -+# This section contains the helper functions used by the rest of the -+# hookable option parser framework in ascii-betical order. -+ -+ -+# func_fatal_help ARG... -+# ---------------------- -+# Echo program name prefixed message to standard error, followed by -+# a help hint, and exit. -+func_fatal_help () -+{ -+ $debug_cmd -+ -+ eval \$ECHO \""Usage: $usage"\" -+ eval \$ECHO \""$fatal_help"\" -+ func_error ${1+"$@"} -+ exit $EXIT_FAILURE -+} -+ -+ -+# func_help -+# --------- -+# Echo long help message to standard output and exit. - func_help () - { -- $opt_debug -+ $debug_cmd - -- $SED -n '/^# Usage:/,/# Report bugs to/ { -- :print -- s/^# // -- s/^# *$// -- s*\$progname*'$progname'* -- s*\$host*'"$host"'* -- s*\$SHELL*'"$SHELL"'* -- s*\$LTCC*'"$LTCC"'* -- s*\$LTCFLAGS*'"$LTCFLAGS"'* -- s*\$LD*'"$LD"'* -- s/\$with_gnu_ld/'"$with_gnu_ld"'/ -- s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/ -- s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/ -- p -- d -- } -- /^# .* home page:/b print -- /^# General help using/b print -- ' < "$progpath" -- ret=$? -- if test -z "$1"; then -- exit $ret -- fi -+ func_usage_message -+ $ECHO "$long_help_message" -+ exit 0 - } - --# func_missing_arg argname -+ -+# func_missing_arg ARGNAME -+# ------------------------ - # Echo program name prefixed message to standard error and set global - # exit_cmd. - func_missing_arg () - { -- $opt_debug -+ $debug_cmd - -- func_error "missing argument for $1." -+ func_error "Missing argument for '$1'." - exit_cmd=exit - } - - --# func_split_short_opt shortopt -+# func_split_equals STRING -+# ------------------------ -+# Set func_split_equals_lhs and func_split_equals_rhs shell variables after -+# splitting STRING at the '=' sign. -+test -z "$_G_HAVE_XSI_OPS" \ -+ && (eval 'x=a/b/c; -+ test 5aa/bb/cc = "${#x}${x%%/*}${x%/*}${x#*/}${x##*/}"') 2>/dev/null \ -+ && _G_HAVE_XSI_OPS=yes -+ -+if test yes = "$_G_HAVE_XSI_OPS" -+then -+ # This is an XSI compatible shell, allowing a faster implementation... -+ eval 'func_split_equals () -+ { -+ $debug_cmd -+ -+ func_split_equals_lhs=${1%%=*} -+ func_split_equals_rhs=${1#*=} -+ test "x$func_split_equals_lhs" = "x$1" \ -+ && func_split_equals_rhs= -+ }' -+else -+ # ...otherwise fall back to using expr, which is often a shell builtin. -+ func_split_equals () -+ { -+ $debug_cmd -+ -+ func_split_equals_lhs=`expr "x$1" : 'x\([^=]*\)'` -+ func_split_equals_rhs= -+ test "x$func_split_equals_lhs" = "x$1" \ -+ || func_split_equals_rhs=`expr "x$1" : 'x[^=]*=\(.*\)$'` -+ } -+fi #func_split_equals -+ -+ -+# func_split_short_opt SHORTOPT -+# ----------------------------- - # Set func_split_short_opt_name and func_split_short_opt_arg shell - # variables after splitting SHORTOPT after the 2nd character. --func_split_short_opt () -+if test yes = "$_G_HAVE_XSI_OPS" -+then -+ # This is an XSI compatible shell, allowing a faster implementation... -+ eval 'func_split_short_opt () -+ { -+ $debug_cmd -+ -+ func_split_short_opt_arg=${1#??} -+ func_split_short_opt_name=${1%"$func_split_short_opt_arg"} -+ }' -+else -+ # ...otherwise fall back to using expr, which is often a shell builtin. -+ func_split_short_opt () -+ { -+ $debug_cmd -+ -+ func_split_short_opt_name=`expr "x$1" : 'x-\(.\)'` -+ func_split_short_opt_arg=`expr "x$1" : 'x-.\(.*\)$'` -+ } -+fi #func_split_short_opt -+ -+ -+# func_usage -+# ---------- -+# Echo short help message to standard output and exit. -+func_usage () - { -- my_sed_short_opt='1s/^\(..\).*$/\1/;q' -- my_sed_short_rest='1s/^..\(.*\)$/\1/;q' -+ $debug_cmd - -- func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"` -- func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"` --} # func_split_short_opt may be replaced by extended shell implementation -+ func_usage_message -+ $ECHO "Run '$progname --help |${PAGER-more}' for full usage" -+ exit 0 -+} - - --# func_split_long_opt longopt --# Set func_split_long_opt_name and func_split_long_opt_arg shell --# variables after splitting LONGOPT at the `=' sign. --func_split_long_opt () -+# func_usage_message -+# ------------------ -+# Echo short help message to standard output. -+func_usage_message () - { -- my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q' -- my_sed_long_arg='1s/^--[^=]*=//' -+ $debug_cmd - -- func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"` -- func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"` --} # func_split_long_opt may be replaced by extended shell implementation -+ eval \$ECHO \""Usage: $usage"\" -+ echo -+ $SED -n 's|^# || -+ /^Written by/{ -+ x;p;x -+ } -+ h -+ /^Written by/q' < "$progpath" -+ echo -+ eval \$ECHO \""$usage_message"\" -+} - --exit_cmd=: - -+# func_version -+# ------------ -+# Echo version message to standard output and exit. -+func_version () -+{ -+ $debug_cmd - -+ printf '%s\n' "$progname $scriptversion" -+ $SED -n ' -+ /(C)/!b go -+ :more -+ /\./!{ -+ N -+ s|\n# | | -+ b more -+ } -+ :go -+ /^# Written by /,/# warranty; / { -+ s|^# || -+ s|^# *$|| -+ s|\((C)\)[ 0-9,-]*[ ,-]\([1-9][0-9]* \)|\1 \2| -+ p -+ } -+ /^# Written by / { -+ s|^# || -+ p -+ } -+ /^warranty; /q' < "$progpath" - -+ exit $? -+} - - --magic="%%%MAGIC variable%%%" --magic_exe="%%%MAGIC EXE variable%%%" -+# Local variables: -+# mode: shell-script -+# sh-indentation: 2 -+# eval: (add-hook 'before-save-hook 'time-stamp) -+# time-stamp-pattern: "10/scriptversion=%:y-%02m-%02d.%02H; # UTC" -+# time-stamp-time-zone: "UTC" -+# End: - --# Global variables. --nonopt= --preserve_args= --lo2o="s/\\.lo\$/.${objext}/" --o2lo="s/\\.${objext}\$/.lo/" --extracted_archives= --extracted_serial=0 -+# Set a version string. -+scriptversion='(GNU libtool) 2.4.6' - --# If this variable is set in any of the actions, the command in it --# will be execed at the end. This prevents here-documents from being --# left over by shells. --exec_cmd= - --# func_append var value --# Append VALUE to the end of shell variable VAR. --func_append () -+# func_echo ARG... -+# ---------------- -+# Libtool also displays the current mode in messages, so override -+# funclib.sh func_echo with this custom definition. -+func_echo () - { -- eval "${1}=\$${1}\${2}" --} # func_append may be replaced by extended shell implementation -+ $debug_cmd - --# func_append_quoted var value --# Quote VALUE and append to the end of shell variable VAR, separated --# by a space. --func_append_quoted () --{ -- func_quote_for_eval "${2}" -- eval "${1}=\$${1}\\ \$func_quote_for_eval_result" --} # func_append_quoted may be replaced by extended shell implementation -+ _G_message=$* - -+ func_echo_IFS=$IFS -+ IFS=$nl -+ for _G_line in $_G_message; do -+ IFS=$func_echo_IFS -+ $ECHO "$progname${opt_mode+: $opt_mode}: $_G_line" -+ done -+ IFS=$func_echo_IFS -+} - --# func_arith arithmetic-term... --func_arith () -+ -+# func_warning ARG... -+# ------------------- -+# Libtool warnings are not categorized, so override funclib.sh -+# func_warning with this simpler definition. -+func_warning () - { -- func_arith_result=`expr "${@}"` --} # func_arith may be replaced by extended shell implementation -+ $debug_cmd - -+ $warning_func ${1+"$@"} -+} - --# func_len string --# STRING may not start with a hyphen. --func_len () --{ -- func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len` --} # func_len may be replaced by extended shell implementation - -+## ---------------- ## -+## Options parsing. ## -+## ---------------- ## - --# func_lo2o object --func_lo2o () --{ -- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` --} # func_lo2o may be replaced by extended shell implementation -+# Hook in the functions to make sure our own options are parsed during -+# the option parsing loop. - -+usage='$progpath [OPTION]... [MODE-ARG]...' - --# func_xform libobj-or-source --func_xform () -+# Short help message in response to '-h'. -+usage_message="Options: -+ --config show all configuration variables -+ --debug enable verbose shell tracing -+ -n, --dry-run display commands without modifying any files -+ --features display basic configuration information and exit -+ --mode=MODE use operation mode MODE -+ --no-warnings equivalent to '-Wnone' -+ --preserve-dup-deps don't remove duplicate dependency libraries -+ --quiet, --silent don't print informational messages -+ --tag=TAG use configuration variables from tag TAG -+ -v, --verbose print more informational messages than default -+ --version print version information -+ -W, --warnings=CATEGORY report the warnings falling in CATEGORY [all] -+ -h, --help, --help-all print short, long, or detailed help message -+" -+ -+# Additional text appended to 'usage_message' in response to '--help'. -+func_help () - { -- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` --} # func_xform may be replaced by extended shell implementation -+ $debug_cmd -+ -+ func_usage_message -+ $ECHO "$long_help_message - -+MODE must be one of the following: - --# func_fatal_configuration arg... -+ clean remove files from the build directory -+ compile compile a source file into a libtool object -+ execute automatically set library path, then run a program -+ finish complete the installation of libtool libraries -+ install install libraries or executables -+ link create a library or an executable -+ uninstall remove libraries from an installed directory -+ -+MODE-ARGS vary depending on the MODE. When passed as first option, -+'--mode=MODE' may be abbreviated as 'MODE' or a unique abbreviation of that. -+Try '$progname --help --mode=MODE' for a more detailed description of MODE. -+ -+When reporting a bug, please describe a test case to reproduce it and -+include the following information: -+ -+ host-triplet: $host -+ shell: $SHELL -+ compiler: $LTCC -+ compiler flags: $LTCFLAGS -+ linker: $LD (gnu? $with_gnu_ld) -+ version: $progname (GNU libtool) 2.4.6 -+ automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q` -+ autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q` -+ -+Report bugs to . -+GNU libtool home page: . -+General help using GNU software: ." -+ exit 0 -+} -+ -+ -+# func_lo2o OBJECT-NAME -+# --------------------- -+# Transform OBJECT-NAME from a '.lo' suffix to the platform specific -+# object suffix. -+ -+lo2o=s/\\.lo\$/.$objext/ -+o2lo=s/\\.$objext\$/.lo/ -+ -+if test yes = "$_G_HAVE_XSI_OPS"; then -+ eval 'func_lo2o () -+ { -+ case $1 in -+ *.lo) func_lo2o_result=${1%.lo}.$objext ;; -+ * ) func_lo2o_result=$1 ;; -+ esac -+ }' -+ -+ # func_xform LIBOBJ-OR-SOURCE -+ # --------------------------- -+ # Transform LIBOBJ-OR-SOURCE from a '.o' or '.c' (or otherwise) -+ # suffix to a '.lo' libtool-object suffix. -+ eval 'func_xform () -+ { -+ func_xform_result=${1%.*}.lo -+ }' -+else -+ # ...otherwise fall back to using sed. -+ func_lo2o () -+ { -+ func_lo2o_result=`$ECHO "$1" | $SED "$lo2o"` -+ } -+ -+ func_xform () -+ { -+ func_xform_result=`$ECHO "$1" | $SED 's|\.[^.]*$|.lo|'` -+ } -+fi -+ -+ -+# func_fatal_configuration ARG... -+# ------------------------------- - # Echo program name prefixed message to standard error, followed by - # a configuration failure hint, and exit. - func_fatal_configuration () - { -- func_error ${1+"$@"} -- func_error "See the $PACKAGE documentation for more information." -- func_fatal_error "Fatal configuration error." -+ func__fatal_error ${1+"$@"} \ -+ "See the $PACKAGE documentation for more information." \ -+ "Fatal configuration error." - } - - - # func_config -+# ----------- - # Display the configuration for all the tags in this script. - func_config () - { -@@ -915,17 +2149,19 @@ - exit $? - } - -+ - # func_features -+# ------------- - # Display the features supported by this script. - func_features () - { - echo "host: $host" -- if test "$build_libtool_libs" = yes; then -+ if test yes = "$build_libtool_libs"; then - echo "enable shared libraries" - else - echo "disable shared libraries" - fi -- if test "$build_old_libs" = yes; then -+ if test yes = "$build_old_libs"; then - echo "enable static libraries" - else - echo "disable static libraries" -@@ -934,289 +2170,297 @@ - exit $? - } - --# func_enable_tag tagname -+ -+# func_enable_tag TAGNAME -+# ----------------------- - # Verify that TAGNAME is valid, and either flag an error and exit, or - # enable the TAGNAME tag. We also add TAGNAME to the global $taglist - # variable here. - func_enable_tag () - { -- # Global variable: -- tagname="$1" -+ # Global variable: -+ tagname=$1 - -- re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$" -- re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$" -- sed_extractcf="/$re_begincf/,/$re_endcf/p" -+ re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$" -+ re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$" -+ sed_extractcf=/$re_begincf/,/$re_endcf/p - -- # Validate tagname. -- case $tagname in -- *[!-_A-Za-z0-9,/]*) -- func_fatal_error "invalid tag name: $tagname" -- ;; -- esac -+ # Validate tagname. -+ case $tagname in -+ *[!-_A-Za-z0-9,/]*) -+ func_fatal_error "invalid tag name: $tagname" -+ ;; -+ esac - -- # Don't test for the "default" C tag, as we know it's -- # there but not specially marked. -- case $tagname in -- CC) ;; -+ # Don't test for the "default" C tag, as we know it's -+ # there but not specially marked. -+ case $tagname in -+ CC) ;; - *) -- if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then -- taglist="$taglist $tagname" -+ if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then -+ taglist="$taglist $tagname" - -- # Evaluate the configuration. Be careful to quote the path -- # and the sed script, to avoid splitting on whitespace, but -- # also don't use non-portable quotes within backquotes within -- # quotes we have to do it in 2 steps: -- extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"` -- eval "$extractedcf" -- else -- func_error "ignoring unknown tag $tagname" -- fi -- ;; -- esac -+ # Evaluate the configuration. Be careful to quote the path -+ # and the sed script, to avoid splitting on whitespace, but -+ # also don't use non-portable quotes within backquotes within -+ # quotes we have to do it in 2 steps: -+ extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"` -+ eval "$extractedcf" -+ else -+ func_error "ignoring unknown tag $tagname" -+ fi -+ ;; -+ esac - } - -+ - # func_check_version_match -+# ------------------------ - # Ensure that we are using m4 macros, and libtool script from the same - # release of libtool. - func_check_version_match () - { -- if test "$package_revision" != "$macro_revision"; then -- if test "$VERSION" != "$macro_version"; then -- if test -z "$macro_version"; then -- cat >&2 <<_LT_EOF -+ if test "$package_revision" != "$macro_revision"; then -+ if test "$VERSION" != "$macro_version"; then -+ if test -z "$macro_version"; then -+ cat >&2 <<_LT_EOF - $progname: Version mismatch error. This is $PACKAGE $VERSION, but the - $progname: definition of this LT_INIT comes from an older release. - $progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION - $progname: and run autoconf again. - _LT_EOF -- else -- cat >&2 <<_LT_EOF -+ else -+ cat >&2 <<_LT_EOF - $progname: Version mismatch error. This is $PACKAGE $VERSION, but the - $progname: definition of this LT_INIT comes from $PACKAGE $macro_version. - $progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION - $progname: and run autoconf again. - _LT_EOF -- fi -- else -- cat >&2 <<_LT_EOF -+ fi -+ else -+ cat >&2 <<_LT_EOF - $progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision, - $progname: but the definition of this LT_INIT comes from revision $macro_revision. - $progname: You should recreate aclocal.m4 with macros from revision $package_revision - $progname: of $PACKAGE $VERSION and run autoconf again. - _LT_EOF -- fi -+ fi - -- exit $EXIT_MISMATCH -- fi -+ exit $EXIT_MISMATCH -+ fi - } - - --# Shorthand for --mode=foo, only valid as the first argument --case $1 in --clean|clea|cle|cl) -- shift; set dummy --mode clean ${1+"$@"}; shift -- ;; --compile|compil|compi|comp|com|co|c) -- shift; set dummy --mode compile ${1+"$@"}; shift -- ;; --execute|execut|execu|exec|exe|ex|e) -- shift; set dummy --mode execute ${1+"$@"}; shift -- ;; --finish|finis|fini|fin|fi|f) -- shift; set dummy --mode finish ${1+"$@"}; shift -- ;; --install|instal|insta|inst|ins|in|i) -- shift; set dummy --mode install ${1+"$@"}; shift -- ;; --link|lin|li|l) -- shift; set dummy --mode link ${1+"$@"}; shift -- ;; --uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) -- shift; set dummy --mode uninstall ${1+"$@"}; shift -- ;; --esac -+# libtool_options_prep [ARG]... -+# ----------------------------- -+# Preparation for options parsed by libtool. -+libtool_options_prep () -+{ -+ $debug_mode - -+ # Option defaults: -+ opt_config=false -+ opt_dlopen= -+ opt_dry_run=false -+ opt_help=false -+ opt_mode= -+ opt_preserve_dup_deps=false -+ opt_quiet=false - -+ nonopt= -+ preserve_args= - --# Option defaults: --opt_debug=: --opt_dry_run=false --opt_config=false --opt_preserve_dup_deps=false --opt_features=false --opt_finish=false --opt_help=false --opt_help_all=false --opt_silent=: --opt_warning=: --opt_verbose=: --opt_silent=false --opt_verbose=false -+ # Shorthand for --mode=foo, only valid as the first argument -+ case $1 in -+ clean|clea|cle|cl) -+ shift; set dummy --mode clean ${1+"$@"}; shift -+ ;; -+ compile|compil|compi|comp|com|co|c) -+ shift; set dummy --mode compile ${1+"$@"}; shift -+ ;; -+ execute|execut|execu|exec|exe|ex|e) -+ shift; set dummy --mode execute ${1+"$@"}; shift -+ ;; -+ finish|finis|fini|fin|fi|f) -+ shift; set dummy --mode finish ${1+"$@"}; shift -+ ;; -+ install|instal|insta|inst|ins|in|i) -+ shift; set dummy --mode install ${1+"$@"}; shift -+ ;; -+ link|lin|li|l) -+ shift; set dummy --mode link ${1+"$@"}; shift -+ ;; -+ uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) -+ shift; set dummy --mode uninstall ${1+"$@"}; shift -+ ;; -+ esac - -+ # Pass back the list of options. -+ func_quote_for_eval ${1+"$@"} -+ libtool_options_prep_result=$func_quote_for_eval_result -+} -+func_add_hook func_options_prep libtool_options_prep - --# Parse options once, thoroughly. This comes as soon as possible in the --# script to make things like `--version' happen as quickly as we can. -+ -+# libtool_parse_options [ARG]... -+# --------------------------------- -+# Provide handling for libtool specific options. -+libtool_parse_options () - { -- # this just eases exit handling -- while test $# -gt 0; do -- opt="$1" -- shift -- case $opt in -- --debug|-x) opt_debug='set -x' -- func_echo "enabling shell trace mode" -- $opt_debug -- ;; -- --dry-run|--dryrun|-n) -- opt_dry_run=: -- ;; -- --config) -- opt_config=: --func_config -- ;; -- --dlopen|-dlopen) -- optarg="$1" -- opt_dlopen="${opt_dlopen+$opt_dlopen --}$optarg" -- shift -- ;; -- --preserve-dup-deps) -- opt_preserve_dup_deps=: -- ;; -- --features) -- opt_features=: --func_features -- ;; -- --finish) -- opt_finish=: --set dummy --mode finish ${1+"$@"}; shift -- ;; -- --help) -- opt_help=: -- ;; -- --help-all) -- opt_help_all=: --opt_help=': help-all' -- ;; -- --mode) -- test $# = 0 && func_missing_arg $opt && break -- optarg="$1" -- opt_mode="$optarg" --case $optarg in -- # Valid mode arguments: -- clean|compile|execute|finish|install|link|relink|uninstall) ;; -+ $debug_cmd - -- # Catch anything else as an error -- *) func_error "invalid argument for $opt" -- exit_cmd=exit -- break -- ;; --esac -- shift -- ;; -- --no-silent|--no-quiet) -- opt_silent=false --func_append preserve_args " $opt" -- ;; -- --no-warning|--no-warn) -- opt_warning=false --func_append preserve_args " $opt" -- ;; -- --no-verbose) -- opt_verbose=false --func_append preserve_args " $opt" -- ;; -- --silent|--quiet) -- opt_silent=: --func_append preserve_args " $opt" -- opt_verbose=false -- ;; -- --verbose|-v) -- opt_verbose=: --func_append preserve_args " $opt" --opt_silent=false -- ;; -- --tag) -- test $# = 0 && func_missing_arg $opt && break -- optarg="$1" -- opt_tag="$optarg" --func_append preserve_args " $opt $optarg" --func_enable_tag "$optarg" -- shift -- ;; -+ # Perform our own loop to consume as many options as possible in -+ # each iteration. -+ while test $# -gt 0; do -+ _G_opt=$1 -+ shift -+ case $_G_opt in -+ --dry-run|--dryrun|-n) -+ opt_dry_run=: -+ ;; - -- -\?|-h) func_usage ;; -- --help) func_help ;; -- --version) func_version ;; -+ --config) func_config ;; - -- # Separate optargs to long options: -- --*=*) -- func_split_long_opt "$opt" -- set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"} -- shift -- ;; -+ --dlopen|-dlopen) -+ opt_dlopen="${opt_dlopen+$opt_dlopen -+}$1" -+ shift -+ ;; - -- # Separate non-argument short options: -- -\?*|-h*|-n*|-v*) -- func_split_short_opt "$opt" -- set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"} -- shift -- ;; -+ --preserve-dup-deps) -+ opt_preserve_dup_deps=: ;; - -- --) break ;; -- -*) func_fatal_help "unrecognized option \`$opt'" ;; -- *) set dummy "$opt" ${1+"$@"}; shift; break ;; -- esac -- done -+ --features) func_features ;; - -- # Validate options: -+ --finish) set dummy --mode finish ${1+"$@"}; shift ;; - -- # save first non-option argument -- if test "$#" -gt 0; then -- nonopt="$opt" -- shift -- fi -+ --help) opt_help=: ;; - -- # preserve --debug -- test "$opt_debug" = : || func_append preserve_args " --debug" -+ --help-all) opt_help=': help-all' ;; - -- case $host in -- *cygwin* | *mingw* | *pw32* | *cegcc*) -- # don't eliminate duplications in $postdeps and $predeps -- opt_duplicate_compiler_generated_deps=: -- ;; -- *) -- opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps -- ;; -- esac -+ --mode) test $# = 0 && func_missing_arg $_G_opt && break -+ opt_mode=$1 -+ case $1 in -+ # Valid mode arguments: -+ clean|compile|execute|finish|install|link|relink|uninstall) ;; - -- $opt_help || { -- # Sanity checks first: -- func_check_version_match -+ # Catch anything else as an error -+ *) func_error "invalid argument for $_G_opt" -+ exit_cmd=exit -+ break -+ ;; -+ esac -+ shift -+ ;; - -- if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then -- func_fatal_configuration "not configured to build any kind of library" -- fi -+ --no-silent|--no-quiet) -+ opt_quiet=false -+ func_append preserve_args " $_G_opt" -+ ;; - -- # Darwin sucks -- eval std_shrext=\"$shrext_cmds\" -+ --no-warnings|--no-warning|--no-warn) -+ opt_warning=false -+ func_append preserve_args " $_G_opt" -+ ;; - -- # Only execute mode is allowed to have -dlopen flags. -- if test -n "$opt_dlopen" && test "$opt_mode" != execute; then -- func_error "unrecognized option \`-dlopen'" -- $ECHO "$help" 1>&2 -- exit $EXIT_FAILURE -+ --no-verbose) -+ opt_verbose=false -+ func_append preserve_args " $_G_opt" -+ ;; -+ -+ --silent|--quiet) -+ opt_quiet=: -+ opt_verbose=false -+ func_append preserve_args " $_G_opt" -+ ;; -+ -+ --tag) test $# = 0 && func_missing_arg $_G_opt && break -+ opt_tag=$1 -+ func_append preserve_args " $_G_opt $1" -+ func_enable_tag "$1" -+ shift -+ ;; -+ -+ --verbose|-v) opt_quiet=false -+ opt_verbose=: -+ func_append preserve_args " $_G_opt" -+ ;; -+ -+ # An option not handled by this hook function: -+ *) set dummy "$_G_opt" ${1+"$@"}; shift; break ;; -+ esac -+ done -+ -+ -+ # save modified positional parameters for caller -+ func_quote_for_eval ${1+"$@"} -+ libtool_parse_options_result=$func_quote_for_eval_result -+} -+func_add_hook func_parse_options libtool_parse_options -+ -+ -+ -+# libtool_validate_options [ARG]... -+# --------------------------------- -+# Perform any sanity checks on option settings and/or unconsumed -+# arguments. -+libtool_validate_options () -+{ -+ # save first non-option argument -+ if test 0 -lt $#; then -+ nonopt=$1 -+ shift - fi - -- # Change the help message to a mode-specific one. -- generic_help="$help" -- help="Try \`$progname --help --mode=$opt_mode' for more information." -- } -+ # preserve --debug -+ test : = "$debug_cmd" || func_append preserve_args " --debug" -+ -+ case $host in -+ # Solaris2 added to fix http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16452 -+ # see also: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59788 -+ *cygwin* | *msys* | *mingw* | *pw32* | *cegcc* | *solaris2* | *os2*) -+ # don't eliminate duplications in $postdeps and $predeps -+ opt_duplicate_compiler_generated_deps=: -+ ;; -+ *) -+ opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps -+ ;; -+ esac - -+ $opt_help || { -+ # Sanity checks first: -+ func_check_version_match - -- # Bail if the options were screwed -- $exit_cmd $EXIT_FAILURE -+ test yes != "$build_libtool_libs" \ -+ && test yes != "$build_old_libs" \ -+ && func_fatal_configuration "not configured to build any kind of library" -+ -+ # Darwin sucks -+ eval std_shrext=\"$shrext_cmds\" -+ -+ # Only execute mode is allowed to have -dlopen flags. -+ if test -n "$opt_dlopen" && test execute != "$opt_mode"; then -+ func_error "unrecognized option '-dlopen'" -+ $ECHO "$help" 1>&2 -+ exit $EXIT_FAILURE -+ fi -+ -+ # Change the help message to a mode-specific one. -+ generic_help=$help -+ help="Try '$progname --help --mode=$opt_mode' for more information." -+ } -+ -+ # Pass back the unparsed argument list -+ func_quote_for_eval ${1+"$@"} -+ libtool_validate_options_result=$func_quote_for_eval_result - } -+func_add_hook func_validate_options libtool_validate_options -+ - -+# Process options as early as possible so that --help and --version -+# can return quickly. -+func_options ${1+"$@"} -+eval set dummy "$func_options_result"; shift - - - -@@ -1224,24 +2468,52 @@ - ## Main. ## - ## ----------- ## - -+magic='%%%MAGIC variable%%%' -+magic_exe='%%%MAGIC EXE variable%%%' -+ -+# Global variables. -+extracted_archives= -+extracted_serial=0 -+ -+# If this variable is set in any of the actions, the command in it -+# will be execed at the end. This prevents here-documents from being -+# left over by shells. -+exec_cmd= -+ -+ -+# A function that is used when there is no print builtin or printf. -+func_fallback_echo () -+{ -+ eval 'cat <<_LTECHO_EOF -+$1 -+_LTECHO_EOF' -+} -+ -+# func_generated_by_libtool -+# True iff stdin has been generated by Libtool. This function is only -+# a basic sanity check; it will hardly flush out determined imposters. -+func_generated_by_libtool_p () -+{ -+ $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1 -+} -+ - # func_lalib_p file --# True iff FILE is a libtool `.la' library or `.lo' object file. -+# True iff FILE is a libtool '.la' library or '.lo' object file. - # This function is only a basic sanity check; it will hardly flush out - # determined imposters. - func_lalib_p () - { - test -f "$1" && -- $SED -e 4q "$1" 2>/dev/null \ -- | $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1 -+ $SED -e 4q "$1" 2>/dev/null | func_generated_by_libtool_p - } - - # func_lalib_unsafe_p file --# True iff FILE is a libtool `.la' library or `.lo' object file. -+# True iff FILE is a libtool '.la' library or '.lo' object file. - # This function implements the same check as func_lalib_p without - # resorting to external programs. To this end, it redirects stdin and - # closes it afterwards, without saving the original file descriptor. - # As a safety measure, use it only where a negative result would be --# fatal anyway. Works if `file' does not exist. -+# fatal anyway. Works if 'file' does not exist. - func_lalib_unsafe_p () - { - lalib_p=no -@@ -1249,13 +2521,13 @@ - for lalib_p_l in 1 2 3 4 - do - read lalib_p_line -- case "$lalib_p_line" in -+ case $lalib_p_line in - \#\ Generated\ by\ *$PACKAGE* ) lalib_p=yes; break;; - esac - done - exec 0<&5 5<&- - fi -- test "$lalib_p" = yes -+ test yes = "$lalib_p" - } - - # func_ltwrapper_script_p file -@@ -1264,7 +2536,8 @@ - # determined imposters. - func_ltwrapper_script_p () - { -- func_lalib_p "$1" -+ test -f "$1" && -+ $lt_truncate_bin < "$1" 2>/dev/null | func_generated_by_libtool_p - } - - # func_ltwrapper_executable_p file -@@ -1289,7 +2562,7 @@ - { - func_dirname_and_basename "$1" "" "." - func_stripname '' '.exe' "$func_basename_result" -- func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper" -+ func_ltwrapper_scriptname_result=$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper - } - - # func_ltwrapper_p file -@@ -1308,11 +2581,13 @@ - # FAIL_CMD may read-access the current command in variable CMD! - func_execute_cmds () - { -- $opt_debug -+ $debug_cmd -+ - save_ifs=$IFS; IFS='~' - for cmd in $1; do -- IFS=$save_ifs -+ IFS=$sp$nl - eval cmd=\"$cmd\" -+ IFS=$save_ifs - func_show_eval "$cmd" "${2-:}" - done - IFS=$save_ifs -@@ -1324,10 +2599,11 @@ - # Note that it is not necessary on cygwin/mingw to append a dot to - # FILE even if both FILE and FILE.exe exist: automatic-append-.exe - # behavior happens only for exec(3), not for open(2)! Also, sourcing --# `FILE.' does not work on cygwin managed mounts. -+# 'FILE.' does not work on cygwin managed mounts. - func_source () - { -- $opt_debug -+ $debug_cmd -+ - case $1 in - */* | *\\*) . "$1" ;; - *) . "./$1" ;; -@@ -1354,10 +2630,10 @@ - # store the result into func_replace_sysroot_result. - func_replace_sysroot () - { -- case "$lt_sysroot:$1" in -+ case $lt_sysroot:$1 in - ?*:"$lt_sysroot"*) - func_stripname "$lt_sysroot" '' "$1" -- func_replace_sysroot_result="=$func_stripname_result" -+ func_replace_sysroot_result='='$func_stripname_result - ;; - *) - # Including no sysroot. -@@ -1374,7 +2650,8 @@ - # arg is usually of the form 'gcc ...' - func_infer_tag () - { -- $opt_debug -+ $debug_cmd -+ - if test -n "$available_tags" && test -z "$tagname"; then - CC_quoted= - for arg in $CC; do -@@ -1393,7 +2670,7 @@ - for z in $available_tags; do - if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then - # Evaluate the configuration. -- eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`" -+ eval "`$SED -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`" - CC_quoted= - for arg in $CC; do - # Double-quote args containing other shell metacharacters. -@@ -1418,7 +2695,7 @@ - # line option must be used. - if test -z "$tagname"; then - func_echo "unable to infer tagged configuration" -- func_fatal_error "specify a tag with \`--tag'" -+ func_fatal_error "specify a tag with '--tag'" - # else - # func_verbose "using $tagname tagged configuration" - fi -@@ -1434,15 +2711,15 @@ - # but don't create it if we're doing a dry run. - func_write_libtool_object () - { -- write_libobj=${1} -- if test "$build_libtool_libs" = yes; then -- write_lobj=\'${2}\' -+ write_libobj=$1 -+ if test yes = "$build_libtool_libs"; then -+ write_lobj=\'$2\' - else - write_lobj=none - fi - -- if test "$build_old_libs" = yes; then -- write_oldobj=\'${3}\' -+ if test yes = "$build_old_libs"; then -+ write_oldobj=\'$3\' - else - write_oldobj=none - fi -@@ -1450,7 +2727,7 @@ - $opt_dry_run || { - cat >${write_libobj}T </dev/null` -- if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then -+ if test "$?" -eq 0 && test -n "$func_convert_core_file_wine_to_w32_tmp"; then - func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" | -- $SED -e "$lt_sed_naive_backslashify"` -+ $SED -e "$sed_naive_backslashify"` - else - func_convert_core_file_wine_to_w32_result= - fi -@@ -1514,18 +2792,19 @@ - # are convertible, then the result may be empty. - func_convert_core_path_wine_to_w32 () - { -- $opt_debug -+ $debug_cmd -+ - # unfortunately, winepath doesn't convert paths, only file names -- func_convert_core_path_wine_to_w32_result="" -+ func_convert_core_path_wine_to_w32_result= - if test -n "$1"; then - oldIFS=$IFS - IFS=: - for func_convert_core_path_wine_to_w32_f in $1; do - IFS=$oldIFS - func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f" -- if test -n "$func_convert_core_file_wine_to_w32_result" ; then -+ if test -n "$func_convert_core_file_wine_to_w32_result"; then - if test -z "$func_convert_core_path_wine_to_w32_result"; then -- func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result" -+ func_convert_core_path_wine_to_w32_result=$func_convert_core_file_wine_to_w32_result - else - func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result" - fi -@@ -1554,7 +2833,8 @@ - # environment variable; do not put it in $PATH. - func_cygpath () - { -- $opt_debug -+ $debug_cmd -+ - if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then - func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null` - if test "$?" -ne 0; then -@@ -1563,7 +2843,7 @@ - fi - else - func_cygpath_result= -- func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'" -+ func_error "LT_CYGPATH is empty or specifies non-existent file: '$LT_CYGPATH'" - fi - } - #end: func_cygpath -@@ -1574,10 +2854,11 @@ - # result in func_convert_core_msys_to_w32_result. - func_convert_core_msys_to_w32 () - { -- $opt_debug -+ $debug_cmd -+ - # awkward: cmd appends spaces to result - func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null | -- $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` -+ $SED -e 's/[ ]*$//' -e "$sed_naive_backslashify"` - } - #end: func_convert_core_msys_to_w32 - -@@ -1588,13 +2869,14 @@ - # func_to_host_file_result to ARG1). - func_convert_file_check () - { -- $opt_debug -- if test -z "$2" && test -n "$1" ; then -+ $debug_cmd -+ -+ if test -z "$2" && test -n "$1"; then - func_error "Could not determine host file name corresponding to" -- func_error " \`$1'" -+ func_error " '$1'" - func_error "Continuing, but uninstalled executables may not work." - # Fallback: -- func_to_host_file_result="$1" -+ func_to_host_file_result=$1 - fi - } - # end func_convert_file_check -@@ -1606,10 +2888,11 @@ - # func_to_host_file_result to a simplistic fallback value (see below). - func_convert_path_check () - { -- $opt_debug -+ $debug_cmd -+ - if test -z "$4" && test -n "$3"; then - func_error "Could not determine the host path corresponding to" -- func_error " \`$3'" -+ func_error " '$3'" - func_error "Continuing, but uninstalled executables may not work." - # Fallback. This is a deliberately simplistic "conversion" and - # should not be "improved". See libtool.info. -@@ -1618,7 +2901,7 @@ - func_to_host_path_result=`echo "$3" | - $SED -e "$lt_replace_pathsep_chars"` - else -- func_to_host_path_result="$3" -+ func_to_host_path_result=$3 - fi - fi - } -@@ -1630,9 +2913,10 @@ - # and appending REPL if ORIG matches BACKPAT. - func_convert_path_front_back_pathsep () - { -- $opt_debug -+ $debug_cmd -+ - case $4 in -- $1 ) func_to_host_path_result="$3$func_to_host_path_result" -+ $1 ) func_to_host_path_result=$3$func_to_host_path_result - ;; - esac - case $4 in -@@ -1646,7 +2930,7 @@ - ################################################## - # $build to $host FILE NAME CONVERSION FUNCTIONS # - ################################################## --# invoked via `$to_host_file_cmd ARG' -+# invoked via '$to_host_file_cmd ARG' - # - # In each case, ARG is the path to be converted from $build to $host format. - # Result will be available in $func_to_host_file_result. -@@ -1657,7 +2941,8 @@ - # in func_to_host_file_result. - func_to_host_file () - { -- $opt_debug -+ $debug_cmd -+ - $to_host_file_cmd "$1" - } - # end func_to_host_file -@@ -1669,7 +2954,8 @@ - # in (the comma separated) LAZY, no conversion takes place. - func_to_tool_file () - { -- $opt_debug -+ $debug_cmd -+ - case ,$2, in - *,"$to_tool_file_cmd",*) - func_to_tool_file_result=$1 -@@ -1687,7 +2973,7 @@ - # Copy ARG to func_to_host_file_result. - func_convert_file_noop () - { -- func_to_host_file_result="$1" -+ func_to_host_file_result=$1 - } - # end func_convert_file_noop - -@@ -1698,11 +2984,12 @@ - # func_to_host_file_result. - func_convert_file_msys_to_w32 () - { -- $opt_debug -- func_to_host_file_result="$1" -+ $debug_cmd -+ -+ func_to_host_file_result=$1 - if test -n "$1"; then - func_convert_core_msys_to_w32 "$1" -- func_to_host_file_result="$func_convert_core_msys_to_w32_result" -+ func_to_host_file_result=$func_convert_core_msys_to_w32_result - fi - func_convert_file_check "$1" "$func_to_host_file_result" - } -@@ -1714,8 +3001,9 @@ - # func_to_host_file_result. - func_convert_file_cygwin_to_w32 () - { -- $opt_debug -- func_to_host_file_result="$1" -+ $debug_cmd -+ -+ func_to_host_file_result=$1 - if test -n "$1"; then - # because $build is cygwin, we call "the" cygpath in $PATH; no need to use - # LT_CYGPATH in this case. -@@ -1731,11 +3019,12 @@ - # and a working winepath. Returns result in func_to_host_file_result. - func_convert_file_nix_to_w32 () - { -- $opt_debug -- func_to_host_file_result="$1" -+ $debug_cmd -+ -+ func_to_host_file_result=$1 - if test -n "$1"; then - func_convert_core_file_wine_to_w32 "$1" -- func_to_host_file_result="$func_convert_core_file_wine_to_w32_result" -+ func_to_host_file_result=$func_convert_core_file_wine_to_w32_result - fi - func_convert_file_check "$1" "$func_to_host_file_result" - } -@@ -1747,12 +3036,13 @@ - # Returns result in func_to_host_file_result. - func_convert_file_msys_to_cygwin () - { -- $opt_debug -- func_to_host_file_result="$1" -+ $debug_cmd -+ -+ func_to_host_file_result=$1 - if test -n "$1"; then - func_convert_core_msys_to_w32 "$1" - func_cygpath -u "$func_convert_core_msys_to_w32_result" -- func_to_host_file_result="$func_cygpath_result" -+ func_to_host_file_result=$func_cygpath_result - fi - func_convert_file_check "$1" "$func_to_host_file_result" - } -@@ -1765,13 +3055,14 @@ - # in func_to_host_file_result. - func_convert_file_nix_to_cygwin () - { -- $opt_debug -- func_to_host_file_result="$1" -+ $debug_cmd -+ -+ func_to_host_file_result=$1 - if test -n "$1"; then - # convert from *nix to w32, then use cygpath to convert from w32 to cygwin. - func_convert_core_file_wine_to_w32 "$1" - func_cygpath -u "$func_convert_core_file_wine_to_w32_result" -- func_to_host_file_result="$func_cygpath_result" -+ func_to_host_file_result=$func_cygpath_result - fi - func_convert_file_check "$1" "$func_to_host_file_result" - } -@@ -1781,7 +3072,7 @@ - ############################################# - # $build to $host PATH CONVERSION FUNCTIONS # - ############################################# --# invoked via `$to_host_path_cmd ARG' -+# invoked via '$to_host_path_cmd ARG' - # - # In each case, ARG is the path to be converted from $build to $host format. - # The result will be available in $func_to_host_path_result. -@@ -1805,10 +3096,11 @@ - to_host_path_cmd= - func_init_to_host_path_cmd () - { -- $opt_debug -+ $debug_cmd -+ - if test -z "$to_host_path_cmd"; then - func_stripname 'func_convert_file_' '' "$to_host_file_cmd" -- to_host_path_cmd="func_convert_path_${func_stripname_result}" -+ to_host_path_cmd=func_convert_path_$func_stripname_result - fi - } - -@@ -1818,7 +3110,8 @@ - # in func_to_host_path_result. - func_to_host_path () - { -- $opt_debug -+ $debug_cmd -+ - func_init_to_host_path_cmd - $to_host_path_cmd "$1" - } -@@ -1829,7 +3122,7 @@ - # Copy ARG to func_to_host_path_result. - func_convert_path_noop () - { -- func_to_host_path_result="$1" -+ func_to_host_path_result=$1 - } - # end func_convert_path_noop - -@@ -1840,8 +3133,9 @@ - # func_to_host_path_result. - func_convert_path_msys_to_w32 () - { -- $opt_debug -- func_to_host_path_result="$1" -+ $debug_cmd -+ -+ func_to_host_path_result=$1 - if test -n "$1"; then - # Remove leading and trailing path separator characters from ARG. MSYS - # behavior is inconsistent here; cygpath turns them into '.;' and ';.'; -@@ -1849,7 +3143,7 @@ - func_stripname : : "$1" - func_to_host_path_tmp1=$func_stripname_result - func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" -- func_to_host_path_result="$func_convert_core_msys_to_w32_result" -+ func_to_host_path_result=$func_convert_core_msys_to_w32_result - func_convert_path_check : ";" \ - "$func_to_host_path_tmp1" "$func_to_host_path_result" - func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" -@@ -1863,8 +3157,9 @@ - # func_to_host_file_result. - func_convert_path_cygwin_to_w32 () - { -- $opt_debug -- func_to_host_path_result="$1" -+ $debug_cmd -+ -+ func_to_host_path_result=$1 - if test -n "$1"; then - # See func_convert_path_msys_to_w32: - func_stripname : : "$1" -@@ -1883,14 +3178,15 @@ - # a working winepath. Returns result in func_to_host_file_result. - func_convert_path_nix_to_w32 () - { -- $opt_debug -- func_to_host_path_result="$1" -+ $debug_cmd -+ -+ func_to_host_path_result=$1 - if test -n "$1"; then - # See func_convert_path_msys_to_w32: - func_stripname : : "$1" - func_to_host_path_tmp1=$func_stripname_result - func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" -- func_to_host_path_result="$func_convert_core_path_wine_to_w32_result" -+ func_to_host_path_result=$func_convert_core_path_wine_to_w32_result - func_convert_path_check : ";" \ - "$func_to_host_path_tmp1" "$func_to_host_path_result" - func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" -@@ -1904,15 +3200,16 @@ - # Returns result in func_to_host_file_result. - func_convert_path_msys_to_cygwin () - { -- $opt_debug -- func_to_host_path_result="$1" -+ $debug_cmd -+ -+ func_to_host_path_result=$1 - if test -n "$1"; then - # See func_convert_path_msys_to_w32: - func_stripname : : "$1" - func_to_host_path_tmp1=$func_stripname_result - func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" - func_cygpath -u -p "$func_convert_core_msys_to_w32_result" -- func_to_host_path_result="$func_cygpath_result" -+ func_to_host_path_result=$func_cygpath_result - func_convert_path_check : : \ - "$func_to_host_path_tmp1" "$func_to_host_path_result" - func_convert_path_front_back_pathsep ":*" "*:" : "$1" -@@ -1927,8 +3224,9 @@ - # func_to_host_file_result. - func_convert_path_nix_to_cygwin () - { -- $opt_debug -- func_to_host_path_result="$1" -+ $debug_cmd -+ -+ func_to_host_path_result=$1 - if test -n "$1"; then - # Remove leading and trailing path separator characters from - # ARG. msys behavior is inconsistent here, cygpath turns them -@@ -1937,7 +3235,7 @@ - func_to_host_path_tmp1=$func_stripname_result - func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" - func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result" -- func_to_host_path_result="$func_cygpath_result" -+ func_to_host_path_result=$func_cygpath_result - func_convert_path_check : : \ - "$func_to_host_path_tmp1" "$func_to_host_path_result" - func_convert_path_front_back_pathsep ":*" "*:" : "$1" -@@ -1946,13 +3244,31 @@ - # end func_convert_path_nix_to_cygwin - - -+# func_dll_def_p FILE -+# True iff FILE is a Windows DLL '.def' file. -+# Keep in sync with _LT_DLL_DEF_P in libtool.m4 -+func_dll_def_p () -+{ -+ $debug_cmd -+ -+ func_dll_def_p_tmp=`$SED -n \ -+ -e 's/^[ ]*//' \ -+ -e '/^\(;.*\)*$/d' \ -+ -e 's/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p' \ -+ -e q \ -+ "$1"` -+ test DEF = "$func_dll_def_p_tmp" -+} -+ -+ - # func_mode_compile arg... - func_mode_compile () - { -- $opt_debug -+ $debug_cmd -+ - # Get the compilation command and the source file. - base_compile= -- srcfile="$nonopt" # always keep a non-empty value in "srcfile" -+ srcfile=$nonopt # always keep a non-empty value in "srcfile" - suppress_opt=yes - suppress_output= - arg_mode=normal -@@ -1965,12 +3281,12 @@ - case $arg_mode in - arg ) - # do not "continue". Instead, add this to base_compile -- lastarg="$arg" -+ lastarg=$arg - arg_mode=normal - ;; - - target ) -- libobj="$arg" -+ libobj=$arg - arg_mode=normal - continue - ;; -@@ -1980,7 +3296,7 @@ - case $arg in - -o) - test -n "$libobj" && \ -- func_fatal_error "you cannot specify \`-o' more than once" -+ func_fatal_error "you cannot specify '-o' more than once" - arg_mode=target - continue - ;; -@@ -2009,12 +3325,12 @@ - func_stripname '-Wc,' '' "$arg" - args=$func_stripname_result - lastarg= -- save_ifs="$IFS"; IFS=',' -+ save_ifs=$IFS; IFS=, - for arg in $args; do -- IFS="$save_ifs" -+ IFS=$save_ifs - func_append_quoted lastarg "$arg" - done -- IFS="$save_ifs" -+ IFS=$save_ifs - func_stripname ' ' '' "$lastarg" - lastarg=$func_stripname_result - -@@ -2027,8 +3343,8 @@ - # Accept the current argument as the source file. - # The previous "srcfile" becomes the current argument. - # -- lastarg="$srcfile" -- srcfile="$arg" -+ lastarg=$srcfile -+ srcfile=$arg - ;; - esac # case $arg - ;; -@@ -2043,13 +3359,13 @@ - func_fatal_error "you must specify an argument for -Xcompile" - ;; - target) -- func_fatal_error "you must specify a target with \`-o'" -+ func_fatal_error "you must specify a target with '-o'" - ;; - *) - # Get the name of the library object. - test -z "$libobj" && { - func_basename "$srcfile" -- libobj="$func_basename_result" -+ libobj=$func_basename_result - } - ;; - esac -@@ -2069,7 +3385,7 @@ - case $libobj in - *.lo) func_lo2o "$libobj"; obj=$func_lo2o_result ;; - *) -- func_fatal_error "cannot determine name of library object from \`$libobj'" -+ func_fatal_error "cannot determine name of library object from '$libobj'" - ;; - esac - -@@ -2078,8 +3394,8 @@ - for arg in $later; do - case $arg in - -shared) -- test "$build_libtool_libs" != yes && \ -- func_fatal_configuration "can not build a shared library" -+ test yes = "$build_libtool_libs" \ -+ || func_fatal_configuration "cannot build a shared library" - build_old_libs=no - continue - ;; -@@ -2105,17 +3421,17 @@ - func_quote_for_eval "$libobj" - test "X$libobj" != "X$func_quote_for_eval_result" \ - && $ECHO "X$libobj" | $GREP '[]~#^*{};<>?"'"'"' &()|`$[]' \ -- && func_warning "libobj name \`$libobj' may not contain shell special characters." -+ && func_warning "libobj name '$libobj' may not contain shell special characters." - func_dirname_and_basename "$obj" "/" "" -- objname="$func_basename_result" -- xdir="$func_dirname_result" -- lobj=${xdir}$objdir/$objname -+ objname=$func_basename_result -+ xdir=$func_dirname_result -+ lobj=$xdir$objdir/$objname - - test -z "$base_compile" && \ - func_fatal_help "you must specify a compilation command" - - # Delete any leftover library objects. -- if test "$build_old_libs" = yes; then -+ if test yes = "$build_old_libs"; then - removelist="$obj $lobj $libobj ${libobj}T" - else - removelist="$lobj $libobj ${libobj}T" -@@ -2123,20 +3439,20 @@ - - # On Cygwin there's no "real" PIC flag so we must build both object types - case $host_os in -- cygwin* | mingw* | pw32* | os2* | cegcc*) -+ cygwin* | msys* | mingw* | pw32* | os2* | cegcc*) - pic_mode=default - ;; - esac -- if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then -+ if test no = "$pic_mode" && test pass_all != "$deplibs_check_method"; then - # non-PIC code in shared libraries is not supported - pic_mode=default - fi - - # Calculate the filename of the output object if compiler does - # not support -o with -c -- if test "$compiler_c_o" = no; then -- output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.${objext} -- lockfile="$output_obj.lock" -+ if test no = "$compiler_c_o"; then -+ output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.$objext -+ lockfile=$output_obj.lock - else - output_obj= - need_locks=no -@@ -2145,12 +3461,12 @@ - - # Lock this critical section if it is needed - # We use this script file to make the link, it avoids creating a new file -- if test "$need_locks" = yes; then -+ if test yes = "$need_locks"; then - until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do - func_echo "Waiting for $lockfile to be removed" - sleep 2 - done -- elif test "$need_locks" = warn; then -+ elif test warn = "$need_locks"; then - if test -f "$lockfile"; then - $ECHO "\ - *** ERROR, $lockfile exists and contains: -@@ -2158,7 +3474,7 @@ - - This indicates that another process is trying to use the same - temporary object file, and libtool could not work around it because --your compiler does not support \`-c' and \`-o' together. If you -+your compiler does not support '-c' and '-o' together. If you - repeat this compilation, it may succeed, by chance, but you had better - avoid parallel builds (make -j) in this platform, or get a better - compiler." -@@ -2180,11 +3496,11 @@ - qsrcfile=$func_quote_for_eval_result - - # Only build a PIC object if we are building libtool libraries. -- if test "$build_libtool_libs" = yes; then -+ if test yes = "$build_libtool_libs"; then - # Without this assignment, base_compile gets emptied. - fbsd_hideous_sh_bug=$base_compile - -- if test "$pic_mode" != no; then -+ if test no != "$pic_mode"; then - command="$base_compile $qsrcfile $pic_flag" - else - # Don't build PIC code -@@ -2201,7 +3517,7 @@ - func_show_eval_locale "$command" \ - 'test -n "$output_obj" && $RM $removelist; exit $EXIT_FAILURE' - -- if test "$need_locks" = warn && -+ if test warn = "$need_locks" && - test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then - $ECHO "\ - *** ERROR, $lockfile contains: -@@ -2212,7 +3528,7 @@ - - This indicates that another process is trying to use the same - temporary object file, and libtool could not work around it because --your compiler does not support \`-c' and \`-o' together. If you -+your compiler does not support '-c' and '-o' together. If you - repeat this compilation, it may succeed, by chance, but you had better - avoid parallel builds (make -j) in this platform, or get a better - compiler." -@@ -2228,20 +3544,20 @@ - fi - - # Allow error messages only from the first compilation. -- if test "$suppress_opt" = yes; then -+ if test yes = "$suppress_opt"; then - suppress_output=' >/dev/null 2>&1' - fi - fi - - # Only build a position-dependent object if we build old libraries. -- if test "$build_old_libs" = yes; then -- if test "$pic_mode" != yes; then -+ if test yes = "$build_old_libs"; then -+ if test yes != "$pic_mode"; then - # Don't build PIC code - command="$base_compile $qsrcfile$pie_flag" - else - command="$base_compile $qsrcfile $pic_flag" - fi -- if test "$compiler_c_o" = yes; then -+ if test yes = "$compiler_c_o"; then - func_append command " -o $obj" - fi - -@@ -2250,7 +3566,7 @@ - func_show_eval_locale "$command" \ - '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' - -- if test "$need_locks" = warn && -+ if test warn = "$need_locks" && - test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then - $ECHO "\ - *** ERROR, $lockfile contains: -@@ -2261,7 +3577,7 @@ - - This indicates that another process is trying to use the same - temporary object file, and libtool could not work around it because --your compiler does not support \`-c' and \`-o' together. If you -+your compiler does not support '-c' and '-o' together. If you - repeat this compilation, it may succeed, by chance, but you had better - avoid parallel builds (make -j) in this platform, or get a better - compiler." -@@ -2281,7 +3597,7 @@ - func_write_libtool_object "$libobj" "$objdir/$objname" "$objname" - - # Unlock the critical section if it was locked -- if test "$need_locks" != no; then -+ if test no != "$need_locks"; then - removelist=$lockfile - $RM "$lockfile" - fi -@@ -2291,7 +3607,7 @@ - } - - $opt_help || { -- test "$opt_mode" = compile && func_mode_compile ${1+"$@"} -+ test compile = "$opt_mode" && func_mode_compile ${1+"$@"} - } - - func_mode_help () -@@ -2311,7 +3627,7 @@ - Remove files from the build directory. - - RM is the name of the program to use to delete files associated with each FILE --(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed -+(typically '/bin/rm'). RM-OPTIONS are options (such as '-f') to be passed - to RM. - - If FILE is a libtool library, object or program, all the files associated -@@ -2330,16 +3646,16 @@ - -no-suppress do not suppress compiler output for multiple passes - -prefer-pic try to build PIC objects only - -prefer-non-pic try to build non-PIC objects only -- -shared do not build a \`.o' file suitable for static linking -- -static only build a \`.o' file suitable for static linking -+ -shared do not build a '.o' file suitable for static linking -+ -static only build a '.o' file suitable for static linking - -Wc,FLAG pass FLAG directly to the compiler - --COMPILE-COMMAND is a command to be used in creating a \`standard' object file -+COMPILE-COMMAND is a command to be used in creating a 'standard' object file - from the given SOURCEFILE. - - The output file name is determined by removing the directory component from --SOURCEFILE, then substituting the C source code suffix \`.c' with the --library object suffix, \`.lo'." -+SOURCEFILE, then substituting the C source code suffix '.c' with the -+library object suffix, '.lo'." - ;; - - execute) -@@ -2352,7 +3668,7 @@ - - -dlopen FILE add the directory containing FILE to the library path - --This mode sets the library path environment variable according to \`-dlopen' -+This mode sets the library path environment variable according to '-dlopen' - flags. - - If any of the ARGS are libtool executable wrappers, then they are translated -@@ -2371,7 +3687,7 @@ - Each LIBDIR is a directory that contains libtool libraries. - - The commands that this mode executes may require superuser privileges. Use --the \`--dry-run' option if you just want to see what would be executed." -+the '--dry-run' option if you just want to see what would be executed." - ;; - - install) -@@ -2381,7 +3697,7 @@ - Install executables or libraries. - - INSTALL-COMMAND is the installation command. The first component should be --either the \`install' or \`cp' program. -+either the 'install' or 'cp' program. - - The following components of INSTALL-COMMAND are treated specially: - -@@ -2407,7 +3723,7 @@ - -avoid-version do not add a version suffix if possible - -bindir BINDIR specify path to binaries directory (for systems where - libraries must be found in the PATH setting at runtime) -- -dlopen FILE \`-dlpreopen' FILE if it cannot be dlopened at runtime -+ -dlopen FILE '-dlpreopen' FILE if it cannot be dlopened at runtime - -dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols - -export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3) - -export-symbols SYMFILE -@@ -2421,7 +3737,8 @@ - -no-install link a not-installable executable - -no-undefined declare that a library does not refer to external symbols - -o OUTPUT-FILE create OUTPUT-FILE from the specified objects -- -objectlist FILE Use a list of object files found in FILE to specify objects -+ -objectlist FILE use a list of object files found in FILE to specify objects -+ -os2dllname NAME force a short DLL name on OS/2 (no effect on other OSes) - -precious-files-regex REGEX - don't remove output files matching REGEX - -release RELEASE specify package release information -@@ -2441,20 +3758,20 @@ - -Xlinker FLAG pass linker-specific FLAG directly to the linker - -XCClinker FLAG pass link-specific FLAG to the compiler driver (CC) - --All other options (arguments beginning with \`-') are ignored. -+All other options (arguments beginning with '-') are ignored. - --Every other argument is treated as a filename. Files ending in \`.la' are -+Every other argument is treated as a filename. Files ending in '.la' are - treated as uninstalled libtool libraries, other files are standard or library - object files. - --If the OUTPUT-FILE ends in \`.la', then a libtool library is created, --only library objects (\`.lo' files) may be specified, and \`-rpath' is -+If the OUTPUT-FILE ends in '.la', then a libtool library is created, -+only library objects ('.lo' files) may be specified, and '-rpath' is - required, except when creating a convenience library. - --If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created --using \`ar' and \`ranlib', or on Windows using \`lib'. -+If OUTPUT-FILE ends in '.a' or '.lib', then a standard library is created -+using 'ar' and 'ranlib', or on Windows using 'lib'. - --If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file -+If OUTPUT-FILE ends in '.lo' or '.$objext', then a reloadable object file - is created, otherwise an executable program is created." - ;; - -@@ -2465,7 +3782,7 @@ - Remove libraries from an installation directory. - - RM is the name of the program to use to delete files associated with each FILE --(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed -+(typically '/bin/rm'). RM-OPTIONS are options (such as '-f') to be passed - to RM. - - If FILE is a libtool library, all the files associated with it are deleted. -@@ -2473,17 +3790,17 @@ - ;; - - *) -- func_fatal_help "invalid operation mode \`$opt_mode'" -+ func_fatal_help "invalid operation mode '$opt_mode'" - ;; - esac - - echo -- $ECHO "Try \`$progname --help' for more information about other modes." -+ $ECHO "Try '$progname --help' for more information about other modes." - } - - # Now that we've collected a possible --mode arg, show help if necessary - if $opt_help; then -- if test "$opt_help" = :; then -+ if test : = "$opt_help"; then - func_mode_help - else - { -@@ -2491,7 +3808,7 @@ - for opt_mode in compile link execute install finish uninstall clean; do - func_mode_help - done -- } | sed -n '1p; 2,$s/^Usage:/ or: /p' -+ } | $SED -n '1p; 2,$s/^Usage:/ or: /p' - { - func_help noexit - for opt_mode in compile link execute install finish uninstall clean; do -@@ -2499,7 +3816,7 @@ - func_mode_help - done - } | -- sed '1d -+ $SED '1d - /^When reporting/,/^Report/{ - H - d -@@ -2516,16 +3833,17 @@ - # func_mode_execute arg... - func_mode_execute () - { -- $opt_debug -+ $debug_cmd -+ - # The first argument is the command name. -- cmd="$nonopt" -+ cmd=$nonopt - test -z "$cmd" && \ - func_fatal_help "you must specify a COMMAND" - - # Handle -dlopen flags immediately. - for file in $opt_dlopen; do - test -f "$file" \ -- || func_fatal_help "\`$file' is not a file" -+ || func_fatal_help "'$file' is not a file" - - dir= - case $file in -@@ -2535,7 +3853,7 @@ - - # Check to see that this really is a libtool archive. - func_lalib_unsafe_p "$file" \ -- || func_fatal_help "\`$lib' is not a valid libtool archive" -+ || func_fatal_help "'$lib' is not a valid libtool archive" - - # Read the libtool library. - dlname= -@@ -2546,18 +3864,18 @@ - if test -z "$dlname"; then - # Warn if it was a shared library. - test -n "$library_names" && \ -- func_warning "\`$file' was not linked with \`-export-dynamic'" -+ func_warning "'$file' was not linked with '-export-dynamic'" - continue - fi - - func_dirname "$file" "" "." -- dir="$func_dirname_result" -+ dir=$func_dirname_result - - if test -f "$dir/$objdir/$dlname"; then - func_append dir "/$objdir" - else - if test ! -f "$dir/$dlname"; then -- func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" -+ func_fatal_error "cannot find '$dlname' in '$dir' or '$dir/$objdir'" - fi - fi - ;; -@@ -2565,18 +3883,18 @@ - *.lo) - # Just add the directory containing the .lo file. - func_dirname "$file" "" "." -- dir="$func_dirname_result" -+ dir=$func_dirname_result - ;; - - *) -- func_warning "\`-dlopen' is ignored for non-libtool libraries and objects" -+ func_warning "'-dlopen' is ignored for non-libtool libraries and objects" - continue - ;; - esac - - # Get the absolute pathname. - absdir=`cd "$dir" && pwd` -- test -n "$absdir" && dir="$absdir" -+ test -n "$absdir" && dir=$absdir - - # Now add the directory to shlibpath_var. - if eval "test -z \"\$$shlibpath_var\""; then -@@ -2588,7 +3906,7 @@ - - # This variable tells wrapper scripts just to set shlibpath_var - # rather than running their programs. -- libtool_execute_magic="$magic" -+ libtool_execute_magic=$magic - - # Check if any of the arguments is a wrapper script. - args= -@@ -2601,12 +3919,12 @@ - if func_ltwrapper_script_p "$file"; then - func_source "$file" - # Transform arg to wrapped name. -- file="$progdir/$program" -+ file=$progdir/$program - elif func_ltwrapper_executable_p "$file"; then - func_ltwrapper_scriptname "$file" - func_source "$func_ltwrapper_scriptname_result" - # Transform arg to wrapped name. -- file="$progdir/$program" -+ file=$progdir/$program - fi - ;; - esac -@@ -2614,7 +3932,15 @@ - func_append_quoted args "$file" - done - -- if test "X$opt_dry_run" = Xfalse; then -+ if $opt_dry_run; then -+ # Display what would be done. -+ if test -n "$shlibpath_var"; then -+ eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\"" -+ echo "export $shlibpath_var" -+ fi -+ $ECHO "$cmd$args" -+ exit $EXIT_SUCCESS -+ else - if test -n "$shlibpath_var"; then - # Export the shlibpath_var. - eval "export $shlibpath_var" -@@ -2631,25 +3957,18 @@ - done - - # Now prepare to actually exec the command. -- exec_cmd="\$cmd$args" -- else -- # Display what would be done. -- if test -n "$shlibpath_var"; then -- eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\"" -- echo "export $shlibpath_var" -- fi -- $ECHO "$cmd$args" -- exit $EXIT_SUCCESS -+ exec_cmd=\$cmd$args - fi - } - --test "$opt_mode" = execute && func_mode_execute ${1+"$@"} -+test execute = "$opt_mode" && func_mode_execute ${1+"$@"} - - - # func_mode_finish arg... - func_mode_finish () - { -- $opt_debug -+ $debug_cmd -+ - libs= - libdirs= - admincmds= -@@ -2663,11 +3982,11 @@ - if func_lalib_unsafe_p "$opt"; then - func_append libs " $opt" - else -- func_warning "\`$opt' is not a valid libtool archive" -+ func_warning "'$opt' is not a valid libtool archive" - fi - - else -- func_fatal_error "invalid argument \`$opt'" -+ func_fatal_error "invalid argument '$opt'" - fi - done - -@@ -2682,12 +4001,12 @@ - # Remove sysroot references - if $opt_dry_run; then - for lib in $libs; do -- echo "removing references to $lt_sysroot and \`=' prefixes from $lib" -+ echo "removing references to $lt_sysroot and '=' prefixes from $lib" - done - else - tmpdir=`func_mktempdir` - for lib in $libs; do -- sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \ -+ $SED -e "$sysroot_cmd s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \ - > $tmpdir/tmp-la - mv -f $tmpdir/tmp-la $lib - done -@@ -2712,7 +4031,7 @@ - fi - - # Exit here if they wanted silent mode. -- $opt_silent && exit $EXIT_SUCCESS -+ $opt_quiet && exit $EXIT_SUCCESS - - if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then - echo "----------------------------------------------------------------------" -@@ -2723,27 +4042,27 @@ - echo - echo "If you ever happen to want to link against installed libraries" - echo "in a given directory, LIBDIR, you must either use libtool, and" -- echo "specify the full pathname of the library, or use the \`-LLIBDIR'" -+ echo "specify the full pathname of the library, or use the '-LLIBDIR'" - echo "flag during linking and do at least one of the following:" - if test -n "$shlibpath_var"; then -- echo " - add LIBDIR to the \`$shlibpath_var' environment variable" -+ echo " - add LIBDIR to the '$shlibpath_var' environment variable" - echo " during execution" - fi - if test -n "$runpath_var"; then -- echo " - add LIBDIR to the \`$runpath_var' environment variable" -+ echo " - add LIBDIR to the '$runpath_var' environment variable" - echo " during linking" - fi - if test -n "$hardcode_libdir_flag_spec"; then - libdir=LIBDIR - eval flag=\"$hardcode_libdir_flag_spec\" - -- $ECHO " - use the \`$flag' linker flag" -+ $ECHO " - use the '$flag' linker flag" - fi - if test -n "$admincmds"; then - $ECHO " - have your system administrator run these commands:$admincmds" - fi - if test -f /etc/ld.so.conf; then -- echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" -+ echo " - have your system administrator add LIBDIR to '/etc/ld.so.conf'" - fi - echo - -@@ -2762,18 +4081,20 @@ - exit $EXIT_SUCCESS - } - --test "$opt_mode" = finish && func_mode_finish ${1+"$@"} -+test finish = "$opt_mode" && func_mode_finish ${1+"$@"} - - - # func_mode_install arg... - func_mode_install () - { -- $opt_debug -+ $debug_cmd -+ - # There may be an optional sh(1) argument at the beginning of - # install_prog (especially on Windows NT). -- if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh || -+ if test "$SHELL" = "$nonopt" || test /bin/sh = "$nonopt" || - # Allow the use of GNU shtool's install command. -- case $nonopt in *shtool*) :;; *) false;; esac; then -+ case $nonopt in *shtool*) :;; *) false;; esac -+ then - # Aesthetically quote it. - func_quote_for_eval "$nonopt" - install_prog="$func_quote_for_eval_result " -@@ -2800,7 +4121,7 @@ - opts= - prev= - install_type= -- isdir=no -+ isdir=false - stripme= - no_mode=: - for arg -@@ -2813,7 +4134,7 @@ - fi - - case $arg in -- -d) isdir=yes ;; -+ -d) isdir=: ;; - -f) - if $install_cp; then :; else - prev=$arg -@@ -2831,7 +4152,7 @@ - *) - # If the previous option needed an argument, then skip it. - if test -n "$prev"; then -- if test "x$prev" = x-m && test -n "$install_override_mode"; then -+ if test X-m = "X$prev" && test -n "$install_override_mode"; then - arg2=$install_override_mode - no_mode=false - fi -@@ -2856,7 +4177,7 @@ - func_fatal_help "you must specify an install program" - - test -n "$prev" && \ -- func_fatal_help "the \`$prev' option requires an argument" -+ func_fatal_help "the '$prev' option requires an argument" - - if test -n "$install_override_mode" && $no_mode; then - if $install_cp; then :; else -@@ -2878,19 +4199,19 @@ - dest=$func_stripname_result - - # Check to see that the destination is a directory. -- test -d "$dest" && isdir=yes -- if test "$isdir" = yes; then -- destdir="$dest" -+ test -d "$dest" && isdir=: -+ if $isdir; then -+ destdir=$dest - destname= - else - func_dirname_and_basename "$dest" "" "." -- destdir="$func_dirname_result" -- destname="$func_basename_result" -+ destdir=$func_dirname_result -+ destname=$func_basename_result - - # Not a directory, so check to see that there is only one file specified. - set dummy $files; shift - test "$#" -gt 1 && \ -- func_fatal_help "\`$dest' is not a directory" -+ func_fatal_help "'$dest' is not a directory" - fi - case $destdir in - [\\/]* | [A-Za-z]:[\\/]*) ;; -@@ -2899,7 +4220,7 @@ - case $file in - *.lo) ;; - *) -- func_fatal_help "\`$destdir' must be an absolute directory name" -+ func_fatal_help "'$destdir' must be an absolute directory name" - ;; - esac - done -@@ -2908,7 +4229,7 @@ - - # This variable tells wrapper scripts just to set variables rather - # than running their programs. -- libtool_install_magic="$magic" -+ libtool_install_magic=$magic - - staticlibs= - future_libdirs= -@@ -2928,7 +4249,7 @@ - - # Check to see that this really is a libtool archive. - func_lalib_unsafe_p "$file" \ -- || func_fatal_help "\`$file' is not a valid libtool archive" -+ || func_fatal_help "'$file' is not a valid libtool archive" - - library_names= - old_library= -@@ -2950,7 +4271,7 @@ - fi - - func_dirname "$file" "/" "" -- dir="$func_dirname_result" -+ dir=$func_dirname_result - func_append dir "$objdir" - - if test -n "$relink_command"; then -@@ -2964,7 +4285,7 @@ - # are installed into $libdir/../bin (currently, that works fine) - # but it's something to keep an eye on. - test "$inst_prefix_dir" = "$destdir" && \ -- func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir" -+ func_fatal_error "error: cannot install '$file' to a directory not ending in $libdir" - - if test -n "$inst_prefix_dir"; then - # Stick the inst_prefix_dir data into the link command. -@@ -2973,29 +4294,36 @@ - relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"` - fi - -- func_warning "relinking \`$file'" -+ func_warning "relinking '$file'" - func_show_eval "$relink_command" \ -- 'func_fatal_error "error: relink \`$file'\'' with the above command before installing it"' -+ 'func_fatal_error "error: relink '\''$file'\'' with the above command before installing it"' - fi - - # See the names of the shared library. - set dummy $library_names; shift - if test -n "$1"; then -- realname="$1" -+ realname=$1 - shift - -- srcname="$realname" -- test -n "$relink_command" && srcname="$realname"T -+ srcname=$realname -+ test -n "$relink_command" && srcname=${realname}T - - # Install the shared library and build the symlinks. - func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \ - 'exit $?' -- tstripme="$stripme" -+ tstripme=$stripme - case $host_os in -- cygwin* | mingw* | pw32* | cegcc*) -+ cygwin* | msys* | mingw* | pw32* | cegcc*) - case $realname in - *.dll.a) -- tstripme="" -+ tstripme= -+ ;; -+ esac -+ ;; -+ os2*) -+ case $realname in -+ *_dll.a) -+ tstripme= - ;; - esac - ;; -@@ -3006,7 +4334,7 @@ - - if test "$#" -gt 0; then - # Delete the old symlinks, and create new ones. -- # Try `ln -sf' first, because the `ln' binary might depend on -+ # Try 'ln -sf' first, because the 'ln' binary might depend on - # the symlink we replace! Solaris /bin/ln does not understand -f, - # so we also need to try rm && ln -s. - for linkname -@@ -3017,14 +4345,14 @@ - fi - - # Do each command in the postinstall commands. -- lib="$destdir/$realname" -+ lib=$destdir/$realname - func_execute_cmds "$postinstall_cmds" 'exit $?' - fi - - # Install the pseudo-library for information purposes. - func_basename "$file" -- name="$func_basename_result" -- instname="$dir/$name"i -+ name=$func_basename_result -+ instname=$dir/${name}i - func_show_eval "$install_prog $instname $destdir/$name" 'exit $?' - - # Maybe install the static library, too. -@@ -3036,11 +4364,11 @@ - - # Figure out destination file name, if it wasn't already specified. - if test -n "$destname"; then -- destfile="$destdir/$destname" -+ destfile=$destdir/$destname - else - func_basename "$file" -- destfile="$func_basename_result" -- destfile="$destdir/$destfile" -+ destfile=$func_basename_result -+ destfile=$destdir/$destfile - fi - - # Deduce the name of the destination old-style object file. -@@ -3050,11 +4378,11 @@ - staticdest=$func_lo2o_result - ;; - *.$objext) -- staticdest="$destfile" -+ staticdest=$destfile - destfile= - ;; - *) -- func_fatal_help "cannot copy a libtool object to \`$destfile'" -+ func_fatal_help "cannot copy a libtool object to '$destfile'" - ;; - esac - -@@ -3063,7 +4391,7 @@ - func_show_eval "$install_prog $file $destfile" 'exit $?' - - # Install the old object if enabled. -- if test "$build_old_libs" = yes; then -+ if test yes = "$build_old_libs"; then - # Deduce the name of the old-style object file. - func_lo2o "$file" - staticobj=$func_lo2o_result -@@ -3075,30 +4403,30 @@ - *) - # Figure out destination file name, if it wasn't already specified. - if test -n "$destname"; then -- destfile="$destdir/$destname" -+ destfile=$destdir/$destname - else - func_basename "$file" -- destfile="$func_basename_result" -- destfile="$destdir/$destfile" -+ destfile=$func_basename_result -+ destfile=$destdir/$destfile - fi - - # If the file is missing, and there is a .exe on the end, strip it - # because it is most likely a libtool script we actually want to - # install -- stripped_ext="" -+ stripped_ext= - case $file in - *.exe) - if test ! -f "$file"; then - func_stripname '' '.exe' "$file" - file=$func_stripname_result -- stripped_ext=".exe" -+ stripped_ext=.exe - fi - ;; - esac - - # Do a test to see if this is really a libtool program. - case $host in -- *cygwin* | *mingw*) -+ *cygwin* | *msys* | *mingw*) - if func_ltwrapper_executable_p "$file"; then - func_ltwrapper_scriptname "$file" - wrapper=$func_ltwrapper_scriptname_result -@@ -3119,19 +4447,19 @@ - - # Check the variables that should have been set. - test -z "$generated_by_libtool_version" && \ -- func_fatal_error "invalid libtool wrapper script \`$wrapper'" -+ func_fatal_error "invalid libtool wrapper script '$wrapper'" - -- finalize=yes -+ finalize=: - for lib in $notinst_deplibs; do - # Check to see that each library is installed. - libdir= - if test -f "$lib"; then - func_source "$lib" - fi -- libfile="$libdir/"`$ECHO "$lib" | $SED 's%^.*/%%g'` ### testsuite: skip nested quoting test -+ libfile=$libdir/`$ECHO "$lib" | $SED 's%^.*/%%g'` - if test -n "$libdir" && test ! -f "$libfile"; then -- func_warning "\`$lib' has not been installed in \`$libdir'" -- finalize=no -+ func_warning "'$lib' has not been installed in '$libdir'" -+ finalize=false - fi - done - -@@ -3139,29 +4467,29 @@ - func_source "$wrapper" - - outputname= -- if test "$fast_install" = no && test -n "$relink_command"; then -+ if test no = "$fast_install" && test -n "$relink_command"; then - $opt_dry_run || { -- if test "$finalize" = yes; then -+ if $finalize; then - tmpdir=`func_mktempdir` - func_basename "$file$stripped_ext" -- file="$func_basename_result" -- outputname="$tmpdir/$file" -+ file=$func_basename_result -+ outputname=$tmpdir/$file - # Replace the output file specification. - relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'` - -- $opt_silent || { -+ $opt_quiet || { - func_quote_for_expand "$relink_command" - eval "func_echo $func_quote_for_expand_result" - } - if eval "$relink_command"; then : - else -- func_error "error: relink \`$file' with the above command before installing it" -+ func_error "error: relink '$file' with the above command before installing it" - $opt_dry_run || ${RM}r "$tmpdir" - continue - fi -- file="$outputname" -+ file=$outputname - else -- func_warning "cannot relink \`$file'" -+ func_warning "cannot relink '$file'" - fi - } - else -@@ -3173,7 +4501,7 @@ - # remove .exe since cygwin /usr/bin/install will append another - # one anyway - case $install_prog,$host in -- */usr/bin/install*,*cygwin*) -+ */usr/bin/install*,*cygwin* | */usr/bin/install*,*msys*) - case $file:$destfile in - *.exe:*.exe) - # this is ok -@@ -3198,10 +4526,10 @@ - - for file in $staticlibs; do - func_basename "$file" -- name="$func_basename_result" -+ name=$func_basename_result - - # Set up the ranlib parameters. -- oldlib="$destdir/$name" -+ oldlib=$destdir/$name - func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 - tool_oldlib=$func_to_tool_file_result - -@@ -3216,18 +4544,18 @@ - done - - test -n "$future_libdirs" && \ -- func_warning "remember to run \`$progname --finish$future_libdirs'" -+ func_warning "remember to run '$progname --finish$future_libdirs'" - - if test -n "$current_libdirs"; then - # Maybe just do a dry run. - $opt_dry_run && current_libdirs=" -n$current_libdirs" -- exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs' -+ exec_cmd='$SHELL "$progpath" $preserve_args --finish$current_libdirs' - else - exit $EXIT_SUCCESS - fi - } - --test "$opt_mode" = install && func_mode_install ${1+"$@"} -+test install = "$opt_mode" && func_mode_install ${1+"$@"} - - - # func_generate_dlsyms outputname originator pic_p -@@ -3235,16 +4563,17 @@ - # a dlpreopen symbol table. - func_generate_dlsyms () - { -- $opt_debug -- my_outputname="$1" -- my_originator="$2" -- my_pic_p="${3-no}" -- my_prefix=`$ECHO "$my_originator" | sed 's%[^a-zA-Z0-9]%_%g'` -+ $debug_cmd -+ -+ my_outputname=$1 -+ my_originator=$2 -+ my_pic_p=${3-false} -+ my_prefix=`$ECHO "$my_originator" | $SED 's%[^a-zA-Z0-9]%_%g'` - my_dlsyms= - -- if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then -+ if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then - if test -n "$NM" && test -n "$global_symbol_pipe"; then -- my_dlsyms="${my_outputname}S.c" -+ my_dlsyms=${my_outputname}S.c - else - func_error "not configured to extract global symbols from dlpreopened files" - fi -@@ -3255,7 +4584,7 @@ - "") ;; - *.c) - # Discover the nlist of each of the dlfiles. -- nlist="$output_objdir/${my_outputname}.nm" -+ nlist=$output_objdir/$my_outputname.nm - - func_show_eval "$RM $nlist ${nlist}S ${nlist}T" - -@@ -3263,34 +4592,36 @@ - func_verbose "creating $output_objdir/$my_dlsyms" - - $opt_dry_run || $ECHO > "$output_objdir/$my_dlsyms" "\ --/* $my_dlsyms - symbol resolution table for \`$my_outputname' dlsym emulation. */ --/* Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION */ -+/* $my_dlsyms - symbol resolution table for '$my_outputname' dlsym emulation. */ -+/* Generated by $PROGRAM (GNU $PACKAGE) $VERSION */ - - #ifdef __cplusplus - extern \"C\" { - #endif - --#if defined(__GNUC__) && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4)) -+#if defined __GNUC__ && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4)) - #pragma GCC diagnostic ignored \"-Wstrict-prototypes\" - #endif - - /* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ --#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) --/* DATA imports from DLLs on WIN32 con't be const, because runtime -+#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE -+/* DATA imports from DLLs on WIN32 can't be const, because runtime - relocations are performed -- see ld's documentation on pseudo-relocs. */ - # define LT_DLSYM_CONST --#elif defined(__osf__) -+#elif defined __osf__ - /* This system does not cope well with relocations in const data. */ - # define LT_DLSYM_CONST - #else - # define LT_DLSYM_CONST const - #endif - -+#define STREQ(s1, s2) (strcmp ((s1), (s2)) == 0) -+ - /* External symbol declarations for the compiler. */\ - " - -- if test "$dlself" = yes; then -- func_verbose "generating symbol list for \`$output'" -+ if test yes = "$dlself"; then -+ func_verbose "generating symbol list for '$output'" - - $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist" - -@@ -3298,7 +4629,7 @@ - progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP` - for progfile in $progfiles; do - func_to_tool_file "$progfile" func_convert_file_msys_to_w32 -- func_verbose "extracting global C symbols from \`$func_to_tool_file_result'" -+ func_verbose "extracting global C symbols from '$func_to_tool_file_result'" - $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'" - done - -@@ -3318,12 +4649,12 @@ - - # Prepare the list of exported symbols - if test -z "$export_symbols"; then -- export_symbols="$output_objdir/$outputname.exp" -+ export_symbols=$output_objdir/$outputname.exp - $opt_dry_run || { - $RM $export_symbols -- eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' -+ eval "$SED -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' - case $host in -- *cygwin* | *mingw* | *cegcc* ) -+ *cygwin* | *msys* | *mingw* | *cegcc* ) - eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' - eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"' - ;; -@@ -3331,11 +4662,11 @@ - } - else - $opt_dry_run || { -- eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' -+ eval "$SED -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' - eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' - eval '$MV "$nlist"T "$nlist"' - case $host in -- *cygwin* | *mingw* | *cegcc* ) -+ *cygwin* | *msys* | *mingw* | *cegcc* ) - eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' - eval 'cat "$nlist" >> "$output_objdir/$outputname.def"' - ;; -@@ -3345,22 +4676,22 @@ - fi - - for dlprefile in $dlprefiles; do -- func_verbose "extracting global C symbols from \`$dlprefile'" -+ func_verbose "extracting global C symbols from '$dlprefile'" - func_basename "$dlprefile" -- name="$func_basename_result" -+ name=$func_basename_result - case $host in -- *cygwin* | *mingw* | *cegcc* ) -+ *cygwin* | *msys* | *mingw* | *cegcc* ) - # if an import library, we need to obtain dlname - if func_win32_import_lib_p "$dlprefile"; then - func_tr_sh "$dlprefile" - eval "curr_lafile=\$libfile_$func_tr_sh_result" -- dlprefile_dlbasename="" -+ dlprefile_dlbasename= - if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then - # Use subshell, to avoid clobbering current variable values - dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"` -- if test -n "$dlprefile_dlname" ; then -+ if test -n "$dlprefile_dlname"; then - func_basename "$dlprefile_dlname" -- dlprefile_dlbasename="$func_basename_result" -+ dlprefile_dlbasename=$func_basename_result - else - # no lafile. user explicitly requested -dlpreopen . - $sharedlib_from_linklib_cmd "$dlprefile" -@@ -3368,7 +4699,7 @@ - fi - fi - $opt_dry_run || { -- if test -n "$dlprefile_dlbasename" ; then -+ if test -n "$dlprefile_dlbasename"; then - eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"' - else - func_warning "Could not compute DLL name from $name" -@@ -3424,6 +4755,11 @@ - echo '/* NONE */' >> "$output_objdir/$my_dlsyms" - fi - -+ func_show_eval '$RM "${nlist}I"' -+ if test -n "$global_symbol_to_import"; then -+ eval "$global_symbol_to_import"' < "$nlist"S > "$nlist"I' -+ fi -+ - echo >> "$output_objdir/$my_dlsyms" "\ - - /* The mapping between symbol names and symbols. */ -@@ -3432,11 +4768,30 @@ - void *address; - } lt_dlsymlist; - extern LT_DLSYM_CONST lt_dlsymlist --lt_${my_prefix}_LTX_preloaded_symbols[]; -+lt_${my_prefix}_LTX_preloaded_symbols[];\ -+" -+ -+ if test -s "$nlist"I; then -+ echo >> "$output_objdir/$my_dlsyms" "\ -+static void lt_syminit(void) -+{ -+ LT_DLSYM_CONST lt_dlsymlist *symbol = lt_${my_prefix}_LTX_preloaded_symbols; -+ for (; symbol->name; ++symbol) -+ {" -+ $SED 's/.*/ if (STREQ (symbol->name, \"&\")) symbol->address = (void *) \&&;/' < "$nlist"I >> "$output_objdir/$my_dlsyms" -+ echo >> "$output_objdir/$my_dlsyms" "\ -+ } -+}" -+ fi -+ echo >> "$output_objdir/$my_dlsyms" "\ - LT_DLSYM_CONST lt_dlsymlist - lt_${my_prefix}_LTX_preloaded_symbols[] = --{\ -- { \"$my_originator\", (void *) 0 }," -+{ {\"$my_originator\", (void *) 0}," -+ -+ if test -s "$nlist"I; then -+ echo >> "$output_objdir/$my_dlsyms" "\ -+ {\"@INIT@\", (void *) <_syminit}," -+ fi - - case $need_lib_prefix in - no) -@@ -3478,9 +4833,7 @@ - *-*-hpux*) - pic_flag_for_symtable=" $pic_flag" ;; - *) -- if test "X$my_pic_p" != Xno; then -- pic_flag_for_symtable=" $pic_flag" -- fi -+ $my_pic_p && pic_flag_for_symtable=" $pic_flag" - ;; - esac - ;; -@@ -3497,12 +4850,12 @@ - func_show_eval '(cd $output_objdir && $LTCC$symtab_cflags -c$no_builtin_flag$pic_flag_for_symtable "$my_dlsyms")' 'exit $?' - - # Clean up the generated files. -- func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T"' -+ func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T" "${nlist}I"' - - # Transform the symbol file into the correct name. -- symfileobj="$output_objdir/${my_outputname}S.$objext" -+ symfileobj=$output_objdir/${my_outputname}S.$objext - case $host in -- *cygwin* | *mingw* | *cegcc* ) -+ *cygwin* | *msys* | *mingw* | *cegcc* ) - if test -f "$output_objdir/$my_outputname.def"; then - compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` - finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` -@@ -3518,7 +4871,7 @@ - esac - ;; - *) -- func_fatal_error "unknown suffix for \`$my_dlsyms'" -+ func_fatal_error "unknown suffix for '$my_dlsyms'" - ;; - esac - else -@@ -3532,6 +4885,32 @@ - fi - } - -+# func_cygming_gnu_implib_p ARG -+# This predicate returns with zero status (TRUE) if -+# ARG is a GNU/binutils-style import library. Returns -+# with nonzero status (FALSE) otherwise. -+func_cygming_gnu_implib_p () -+{ -+ $debug_cmd -+ -+ func_to_tool_file "$1" func_convert_file_msys_to_w32 -+ func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'` -+ test -n "$func_cygming_gnu_implib_tmp" -+} -+ -+# func_cygming_ms_implib_p ARG -+# This predicate returns with zero status (TRUE) if -+# ARG is an MS-style import library. Returns -+# with nonzero status (FALSE) otherwise. -+func_cygming_ms_implib_p () -+{ -+ $debug_cmd -+ -+ func_to_tool_file "$1" func_convert_file_msys_to_w32 -+ func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'` -+ test -n "$func_cygming_ms_implib_tmp" -+} -+ - # func_win32_libid arg - # return the library type of file 'arg' - # -@@ -3541,8 +4920,9 @@ - # Despite the name, also deal with 64 bit binaries. - func_win32_libid () - { -- $opt_debug -- win32_libid_type="unknown" -+ $debug_cmd -+ -+ win32_libid_type=unknown - win32_fileres=`file -L $1 2>/dev/null` - case $win32_fileres in - *ar\ archive\ import\ library*) # definitely import -@@ -3552,16 +4932,29 @@ - # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD. - if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | - $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then -- func_to_tool_file "$1" func_convert_file_msys_to_w32 -- win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" | -- $SED -n -e ' -+ case $nm_interface in -+ "MS dumpbin") -+ if func_cygming_ms_implib_p "$1" || -+ func_cygming_gnu_implib_p "$1" -+ then -+ win32_nmres=import -+ else -+ win32_nmres= -+ fi -+ ;; -+ *) -+ func_to_tool_file "$1" func_convert_file_msys_to_w32 -+ win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" | -+ $SED -n -e ' - 1,100{ - / I /{ -- s,.*,import, -+ s|.*|import| - p - q - } - }'` -+ ;; -+ esac - case $win32_nmres in - import*) win32_libid_type="x86 archive import";; - *) win32_libid_type="x86 archive static";; -@@ -3593,7 +4986,8 @@ - # $sharedlib_from_linklib_result - func_cygming_dll_for_implib () - { -- $opt_debug -+ $debug_cmd -+ - sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"` - } - -@@ -3610,7 +5004,8 @@ - # specified import library. - func_cygming_dll_for_implib_fallback_core () - { -- $opt_debug -+ $debug_cmd -+ - match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"` - $OBJDUMP -s --section "$1" "$2" 2>/dev/null | - $SED '/^Contents of section '"$match_literal"':/{ -@@ -3646,8 +5041,8 @@ - /./p' | - # we now have a list, one entry per line, of the stringified - # contents of the appropriate section of all members of the -- # archive which possess that section. Heuristic: eliminate -- # all those which have a first or second character that is -+ # archive that possess that section. Heuristic: eliminate -+ # all those that have a first or second character that is - # a '.' (that is, objdump's representation of an unprintable - # character.) This should work for all archives with less than - # 0x302f exports -- but will fail for DLLs whose name actually -@@ -3658,30 +5053,6 @@ - $SED -e '/^\./d;/^.\./d;q' - } - --# func_cygming_gnu_implib_p ARG --# This predicate returns with zero status (TRUE) if --# ARG is a GNU/binutils-style import library. Returns --# with nonzero status (FALSE) otherwise. --func_cygming_gnu_implib_p () --{ -- $opt_debug -- func_to_tool_file "$1" func_convert_file_msys_to_w32 -- func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'` -- test -n "$func_cygming_gnu_implib_tmp" --} -- --# func_cygming_ms_implib_p ARG --# This predicate returns with zero status (TRUE) if --# ARG is an MS-style import library. Returns --# with nonzero status (FALSE) otherwise. --func_cygming_ms_implib_p () --{ -- $opt_debug -- func_to_tool_file "$1" func_convert_file_msys_to_w32 -- func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'` -- test -n "$func_cygming_ms_implib_tmp" --} -- - # func_cygming_dll_for_implib_fallback ARG - # Platform-specific function to extract the - # name of the DLL associated with the specified -@@ -3695,16 +5066,17 @@ - # $sharedlib_from_linklib_result - func_cygming_dll_for_implib_fallback () - { -- $opt_debug -- if func_cygming_gnu_implib_p "$1" ; then -+ $debug_cmd -+ -+ if func_cygming_gnu_implib_p "$1"; then - # binutils import library - sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"` -- elif func_cygming_ms_implib_p "$1" ; then -+ elif func_cygming_ms_implib_p "$1"; then - # ms-generated import library - sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"` - else - # unknown -- sharedlib_from_linklib_result="" -+ sharedlib_from_linklib_result= - fi - } - -@@ -3712,10 +5084,11 @@ - # func_extract_an_archive dir oldlib - func_extract_an_archive () - { -- $opt_debug -- f_ex_an_ar_dir="$1"; shift -- f_ex_an_ar_oldlib="$1" -- if test "$lock_old_archive_extraction" = yes; then -+ $debug_cmd -+ -+ f_ex_an_ar_dir=$1; shift -+ f_ex_an_ar_oldlib=$1 -+ if test yes = "$lock_old_archive_extraction"; then - lockfile=$f_ex_an_ar_oldlib.lock - until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do - func_echo "Waiting for $lockfile to be removed" -@@ -3724,7 +5097,7 @@ - fi - func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" \ - 'stat=$?; rm -f "$lockfile"; exit $stat' -- if test "$lock_old_archive_extraction" = yes; then -+ if test yes = "$lock_old_archive_extraction"; then - $opt_dry_run || rm -f "$lockfile" - fi - if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then -@@ -3738,22 +5111,23 @@ - # func_extract_archives gentop oldlib ... - func_extract_archives () - { -- $opt_debug -- my_gentop="$1"; shift -+ $debug_cmd -+ -+ my_gentop=$1; shift - my_oldlibs=${1+"$@"} -- my_oldobjs="" -- my_xlib="" -- my_xabs="" -- my_xdir="" -+ my_oldobjs= -+ my_xlib= -+ my_xabs= -+ my_xdir= - - for my_xlib in $my_oldlibs; do - # Extract the objects. - case $my_xlib in -- [\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;; -+ [\\/]* | [A-Za-z]:[\\/]*) my_xabs=$my_xlib ;; - *) my_xabs=`pwd`"/$my_xlib" ;; - esac - func_basename "$my_xlib" -- my_xlib="$func_basename_result" -+ my_xlib=$func_basename_result - my_xlib_u=$my_xlib - while :; do - case " $extracted_archives " in -@@ -3765,7 +5139,7 @@ - esac - done - extracted_archives="$extracted_archives $my_xlib_u" -- my_xdir="$my_gentop/$my_xlib_u" -+ my_xdir=$my_gentop/$my_xlib_u - - func_mkdir_p "$my_xdir" - -@@ -3778,22 +5152,23 @@ - cd $my_xdir || exit $? - darwin_archive=$my_xabs - darwin_curdir=`pwd` -- darwin_base_archive=`basename "$darwin_archive"` -+ func_basename "$darwin_archive" -+ darwin_base_archive=$func_basename_result - darwin_arches=`$LIPO -info "$darwin_archive" 2>/dev/null | $GREP Architectures 2>/dev/null || true` - if test -n "$darwin_arches"; then - darwin_arches=`$ECHO "$darwin_arches" | $SED -e 's/.*are://'` - darwin_arch= - func_verbose "$darwin_base_archive has multiple architectures $darwin_arches" -- for darwin_arch in $darwin_arches ; do -- func_mkdir_p "unfat-$$/${darwin_base_archive}-${darwin_arch}" -- $LIPO -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}" -- cd "unfat-$$/${darwin_base_archive}-${darwin_arch}" -- func_extract_an_archive "`pwd`" "${darwin_base_archive}" -+ for darwin_arch in $darwin_arches; do -+ func_mkdir_p "unfat-$$/$darwin_base_archive-$darwin_arch" -+ $LIPO -thin $darwin_arch -output "unfat-$$/$darwin_base_archive-$darwin_arch/$darwin_base_archive" "$darwin_archive" -+ cd "unfat-$$/$darwin_base_archive-$darwin_arch" -+ func_extract_an_archive "`pwd`" "$darwin_base_archive" - cd "$darwin_curdir" -- $RM "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" -+ $RM "unfat-$$/$darwin_base_archive-$darwin_arch/$darwin_base_archive" - done # $darwin_arches - ## Okay now we've a bunch of thin objects, gotta fatten them up :) -- darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$basename" | sort -u` -+ darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$sed_basename" | sort -u` - darwin_file= - darwin_files= - for darwin_file in $darwin_filelist; do -@@ -3815,7 +5190,7 @@ - my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP` - done - -- func_extract_archives_result="$my_oldobjs" -+ func_extract_archives_result=$my_oldobjs - } - - -@@ -3830,7 +5205,7 @@ - # - # ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR - # variable will take. If 'yes', then the emitted script --# will assume that the directory in which it is stored is -+# will assume that the directory where it is stored is - # the $objdir directory. This is a cygwin/mingw-specific - # behavior. - func_emit_wrapper () -@@ -3841,7 +5216,7 @@ - #! $SHELL - - # $output - temporary wrapper script for $objdir/$outputname --# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION -+# Generated by $PROGRAM (GNU $PACKAGE) $VERSION - # - # The $output program cannot be directly executed until all the libtool - # libraries that it depends on are installed. -@@ -3898,9 +5273,9 @@ - - # Very basic option parsing. These options are (a) specific to - # the libtool wrapper, (b) are identical between the wrapper --# /script/ and the wrapper /executable/ which is used only on -+# /script/ and the wrapper /executable/ that is used only on - # windows platforms, and (c) all begin with the string "--lt-" --# (application programs are unlikely to have options which match -+# (application programs are unlikely to have options that match - # this pattern). - # - # There are only two supported options: --lt-debug and -@@ -3933,7 +5308,7 @@ - - # Print the debug banner immediately: - if test -n \"\$lt_option_debug\"; then -- echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2 -+ echo \"$outputname:$output:\$LINENO: libtool wrapper (GNU $PACKAGE) $VERSION\" 1>&2 - fi - } - -@@ -3944,7 +5319,7 @@ - lt_dump_args_N=1; - for lt_arg - do -- \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\" -+ \$ECHO \"$outputname:$output:\$LINENO: newargv[\$lt_dump_args_N]: \$lt_arg\" - lt_dump_args_N=\`expr \$lt_dump_args_N + 1\` - done - } -@@ -3958,7 +5333,7 @@ - *-*-mingw | *-*-os2* | *-cegcc*) - $ECHO "\ - if test -n \"\$lt_option_debug\"; then -- \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2 -+ \$ECHO \"$outputname:$output:\$LINENO: newargv[0]: \$progdir\\\\\$program\" 1>&2 - func_lt_dump_args \${1+\"\$@\"} 1>&2 - fi - exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} -@@ -3968,7 +5343,7 @@ - *) - $ECHO "\ - if test -n \"\$lt_option_debug\"; then -- \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2 -+ \$ECHO \"$outputname:$output:\$LINENO: newargv[0]: \$progdir/\$program\" 1>&2 - func_lt_dump_args \${1+\"\$@\"} 1>&2 - fi - exec \"\$progdir/\$program\" \${1+\"\$@\"} -@@ -4043,13 +5418,13 @@ - test -n \"\$absdir\" && thisdir=\"\$absdir\" - " - -- if test "$fast_install" = yes; then -+ if test yes = "$fast_install"; then - $ECHO "\ - program=lt-'$outputname'$exeext - progdir=\"\$thisdir/$objdir\" - - if test ! -f \"\$progdir/\$program\" || -- { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\ -+ { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | $SED 1q\`; \\ - test \"X\$file\" != \"X\$progdir/\$program\"; }; then - - file=\"\$\$-\$program\" -@@ -4066,7 +5441,7 @@ - if test -n \"\$relink_command\"; then - if relink_command_output=\`eval \$relink_command 2>&1\`; then : - else -- $ECHO \"\$relink_command_output\" >&2 -+ \$ECHO \"\$relink_command_output\" >&2 - $RM \"\$progdir/\$file\" - exit 1 - fi -@@ -4101,7 +5476,7 @@ - fi - - # Export our shlibpath_var if we have one. -- if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then -+ if test yes = "$shlibpath_overrides_runpath" && test -n "$shlibpath_var" && test -n "$temp_rpath"; then - $ECHO "\ - # Add our own library path to $shlibpath_var - $shlibpath_var=\"$temp_rpath\$$shlibpath_var\" -@@ -4121,7 +5496,7 @@ - fi - else - # The program doesn't exist. -- \$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2 -+ \$ECHO \"\$0: error: '\$progdir/\$program' does not exist\" 1>&2 - \$ECHO \"This script is just a wrapper for \$program.\" 1>&2 - \$ECHO \"See the $PACKAGE documentation for more information.\" 1>&2 - exit 1 -@@ -4140,7 +5515,7 @@ - cat < - # include - # ifdef __CYGWIN__ -+# include - # include - # endif - #endif -@@ -4175,47 +5551,45 @@ - #include - #include - -+#define STREQ(s1, s2) (strcmp ((s1), (s2)) == 0) -+ - /* declarations of non-ANSI functions */ --#if defined(__MINGW32__) -+#if defined __MINGW32__ - # ifdef __STRICT_ANSI__ - int _putenv (const char *); - # endif --#elif defined(__CYGWIN__) -+#elif defined __CYGWIN__ - # ifdef __STRICT_ANSI__ - char *realpath (const char *, char *); - int putenv (char *); - int setenv (const char *, const char *, int); - # endif --/* #elif defined (other platforms) ... */ -+/* #elif defined other_platform || defined ... */ - #endif - - /* portability defines, excluding path handling macros */ --#if defined(_MSC_VER) -+#if defined _MSC_VER - # define setmode _setmode - # define stat _stat - # define chmod _chmod - # define getcwd _getcwd - # define putenv _putenv - # define S_IXUSR _S_IEXEC --# ifndef _INTPTR_T_DEFINED --# define _INTPTR_T_DEFINED --# define intptr_t int --# endif --#elif defined(__MINGW32__) -+#elif defined __MINGW32__ - # define setmode _setmode - # define stat _stat - # define chmod _chmod - # define getcwd _getcwd - # define putenv _putenv --#elif defined(__CYGWIN__) -+#elif defined __CYGWIN__ - # define HAVE_SETENV - # define FOPEN_WB "wb" --/* #elif defined (other platforms) ... */ -+/* #elif defined other platforms ... */ - #endif - --#if defined(PATH_MAX) -+#if defined PATH_MAX - # define LT_PATHMAX PATH_MAX --#elif defined(MAXPATHLEN) -+#elif defined MAXPATHLEN - # define LT_PATHMAX MAXPATHLEN - #else - # define LT_PATHMAX 1024 -@@ -4234,8 +5608,8 @@ - # define PATH_SEPARATOR ':' - #endif - --#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \ -- defined (__OS2__) -+#if defined _WIN32 || defined __MSDOS__ || defined __DJGPP__ || \ -+ defined __OS2__ - # define HAVE_DOS_BASED_FILE_SYSTEM - # define FOPEN_WB "wb" - # ifndef DIR_SEPARATOR_2 -@@ -4268,10 +5642,10 @@ - - #define XMALLOC(type, num) ((type *) xmalloc ((num) * sizeof(type))) - #define XFREE(stale) do { \ -- if (stale) { free ((void *) stale); stale = 0; } \ -+ if (stale) { free (stale); stale = 0; } \ - } while (0) - --#if defined(LT_DEBUGWRAPPER) -+#if defined LT_DEBUGWRAPPER - static int lt_debug = 1; - #else - static int lt_debug = 0; -@@ -4300,11 +5674,16 @@ - EOF - - cat < 0) && IS_PATH_SEPARATOR (new_value[len-1])) -+ size_t len = strlen (new_value); -+ while ((len > 0) && IS_PATH_SEPARATOR (new_value[len-1])) - { -- new_value[len-1] = '\0'; -+ new_value[--len] = '\0'; - } - lt_setenv (name, new_value); - XFREE (new_value); -@@ -5082,27 +6461,47 @@ - # True if ARG is an import lib, as indicated by $file_magic_cmd - func_win32_import_lib_p () - { -- $opt_debug -+ $debug_cmd -+ - case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in - *import*) : ;; - *) false ;; - esac - } - -+# func_suncc_cstd_abi -+# !!ONLY CALL THIS FOR SUN CC AFTER $compile_command IS FULLY EXPANDED!! -+# Several compiler flags select an ABI that is incompatible with the -+# Cstd library. Avoid specifying it if any are in CXXFLAGS. -+func_suncc_cstd_abi () -+{ -+ $debug_cmd -+ -+ case " $compile_command " in -+ *" -compat=g "*|*\ -std=c++[0-9][0-9]\ *|*" -library=stdcxx4 "*|*" -library=stlport4 "*) -+ suncc_use_cstd_abi=no -+ ;; -+ *) -+ suncc_use_cstd_abi=yes -+ ;; -+ esac -+} -+ - # func_mode_link arg... - func_mode_link () - { -- $opt_debug -+ $debug_cmd -+ - case $host in -- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) -+ *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) - # It is impossible to link a dll without this setting, and - # we shouldn't force the makefile maintainer to figure out -- # which system we are compiling for in order to pass an extra -+ # what system we are compiling for in order to pass an extra - # flag for every libtool invocation. - # allow_undefined=no - - # FIXME: Unfortunately, there are problems with the above when trying -- # to make a dll which has undefined symbols, in which case not -+ # to make a dll that has undefined symbols, in which case not - # even a static library is built. For now, we need to specify - # -no-undefined on the libtool link line when we can be certain - # that all symbols are satisfied, otherwise we get a static library. -@@ -5146,10 +6545,11 @@ - module=no - no_install=no - objs= -+ os2dllname= - non_pic_objects= - precious_files_regex= - prefer_static_libs=no -- preload=no -+ preload=false - prev= - prevarg= - release= -@@ -5161,7 +6561,7 @@ - vinfo= - vinfo_number=no - weak_libs= -- single_module="${wl}-single_module" -+ single_module=$wl-single_module - func_infer_tag $base_compile - - # We need to know -static, to get the right output filenames. -@@ -5169,15 +6569,15 @@ - do - case $arg in - -shared) -- test "$build_libtool_libs" != yes && \ -- func_fatal_configuration "can not build a shared library" -+ test yes != "$build_libtool_libs" \ -+ && func_fatal_configuration "cannot build a shared library" - build_old_libs=no - break - ;; - -all-static | -static | -static-libtool-libs) - case $arg in - -all-static) -- if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then -+ if test yes = "$build_libtool_libs" && test -z "$link_static_flag"; then - func_warning "complete static linking is impossible in this configuration" - fi - if test -n "$link_static_flag"; then -@@ -5210,7 +6610,7 @@ - - # Go through the arguments, transforming them on the way. - while test "$#" -gt 0; do -- arg="$1" -+ arg=$1 - shift - func_quote_for_eval "$arg" - qarg=$func_quote_for_eval_unquoted_result -@@ -5227,21 +6627,21 @@ - - case $prev in - bindir) -- bindir="$arg" -+ bindir=$arg - prev= - continue - ;; - dlfiles|dlprefiles) -- if test "$preload" = no; then -+ $preload || { - # Add the symbol object into the linking commands. - func_append compile_command " @SYMFILE@" - func_append finalize_command " @SYMFILE@" -- preload=yes -- fi -+ preload=: -+ } - case $arg in - *.la | *.lo) ;; # We handle these cases below. - force) -- if test "$dlself" = no; then -+ if test no = "$dlself"; then - dlself=needless - export_dynamic=yes - fi -@@ -5249,9 +6649,9 @@ - continue - ;; - self) -- if test "$prev" = dlprefiles; then -+ if test dlprefiles = "$prev"; then - dlself=yes -- elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then -+ elif test dlfiles = "$prev" && test yes != "$dlopen_self"; then - dlself=yes - else - dlself=needless -@@ -5261,7 +6661,7 @@ - continue - ;; - *) -- if test "$prev" = dlfiles; then -+ if test dlfiles = "$prev"; then - func_append dlfiles " $arg" - else - func_append dlprefiles " $arg" -@@ -5272,14 +6672,14 @@ - esac - ;; - expsyms) -- export_symbols="$arg" -+ export_symbols=$arg - test -f "$arg" \ -- || func_fatal_error "symbol file \`$arg' does not exist" -+ || func_fatal_error "symbol file '$arg' does not exist" - prev= - continue - ;; - expsyms_regex) -- export_symbols_regex="$arg" -+ export_symbols_regex=$arg - prev= - continue - ;; -@@ -5297,7 +6697,13 @@ - continue - ;; - inst_prefix) -- inst_prefix_dir="$arg" -+ inst_prefix_dir=$arg -+ prev= -+ continue -+ ;; -+ mllvm) -+ # Clang does not use LLVM to link, so we can simply discard any -+ # '-mllvm $arg' options when doing the link step. - prev= - continue - ;; -@@ -5321,21 +6727,21 @@ - - if test -z "$pic_object" || - test -z "$non_pic_object" || -- test "$pic_object" = none && -- test "$non_pic_object" = none; then -- func_fatal_error "cannot find name of object for \`$arg'" -+ test none = "$pic_object" && -+ test none = "$non_pic_object"; then -+ func_fatal_error "cannot find name of object for '$arg'" - fi - - # Extract subdirectory from the argument. - func_dirname "$arg" "/" "" -- xdir="$func_dirname_result" -+ xdir=$func_dirname_result - -- if test "$pic_object" != none; then -+ if test none != "$pic_object"; then - # Prepend the subdirectory the object is found in. -- pic_object="$xdir$pic_object" -+ pic_object=$xdir$pic_object - -- if test "$prev" = dlfiles; then -- if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then -+ if test dlfiles = "$prev"; then -+ if test yes = "$build_libtool_libs" && test yes = "$dlopen_support"; then - func_append dlfiles " $pic_object" - prev= - continue -@@ -5346,7 +6752,7 @@ - fi - - # CHECK ME: I think I busted this. -Ossama -- if test "$prev" = dlprefiles; then -+ if test dlprefiles = "$prev"; then - # Preload the old-style object. - func_append dlprefiles " $pic_object" - prev= -@@ -5354,23 +6760,23 @@ - - # A PIC object. - func_append libobjs " $pic_object" -- arg="$pic_object" -+ arg=$pic_object - fi - - # Non-PIC object. -- if test "$non_pic_object" != none; then -+ if test none != "$non_pic_object"; then - # Prepend the subdirectory the object is found in. -- non_pic_object="$xdir$non_pic_object" -+ non_pic_object=$xdir$non_pic_object - - # A standard non-PIC object - func_append non_pic_objects " $non_pic_object" -- if test -z "$pic_object" || test "$pic_object" = none ; then -- arg="$non_pic_object" -+ if test -z "$pic_object" || test none = "$pic_object"; then -+ arg=$non_pic_object - fi - else - # If the PIC object exists, use it instead. - # $xdir was prepended to $pic_object above. -- non_pic_object="$pic_object" -+ non_pic_object=$pic_object - func_append non_pic_objects " $non_pic_object" - fi - else -@@ -5378,7 +6784,7 @@ - if $opt_dry_run; then - # Extract subdirectory from the argument. - func_dirname "$arg" "/" "" -- xdir="$func_dirname_result" -+ xdir=$func_dirname_result - - func_lo2o "$arg" - pic_object=$xdir$objdir/$func_lo2o_result -@@ -5386,24 +6792,29 @@ - func_append libobjs " $pic_object" - func_append non_pic_objects " $non_pic_object" - else -- func_fatal_error "\`$arg' is not a valid libtool object" -+ func_fatal_error "'$arg' is not a valid libtool object" - fi - fi - done - else -- func_fatal_error "link input file \`$arg' does not exist" -+ func_fatal_error "link input file '$arg' does not exist" - fi - arg=$save_arg - prev= - continue - ;; -+ os2dllname) -+ os2dllname=$arg -+ prev= -+ continue -+ ;; - precious_regex) -- precious_files_regex="$arg" -+ precious_files_regex=$arg - prev= - continue - ;; - release) -- release="-$arg" -+ release=-$arg - prev= - continue - ;; -@@ -5415,7 +6826,7 @@ - func_fatal_error "only absolute run-paths are allowed" - ;; - esac -- if test "$prev" = rpath; then -+ if test rpath = "$prev"; then - case "$rpath " in - *" $arg "*) ;; - *) func_append rpath " $arg" ;; -@@ -5430,7 +6841,7 @@ - continue - ;; - shrext) -- shrext_cmds="$arg" -+ shrext_cmds=$arg - prev= - continue - ;; -@@ -5470,7 +6881,7 @@ - esac - fi # test -n "$prev" - -- prevarg="$arg" -+ prevarg=$arg - - case $arg in - -all-static) -@@ -5484,7 +6895,7 @@ - - -allow-undefined) - # FIXME: remove this flag sometime in the future. -- func_fatal_error "\`-allow-undefined' must not be used because it is the default" -+ func_fatal_error "'-allow-undefined' must not be used because it is the default" - ;; - - -avoid-version) -@@ -5516,7 +6927,7 @@ - if test -n "$export_symbols" || test -n "$export_symbols_regex"; then - func_fatal_error "more than one -exported-symbols argument is not allowed" - fi -- if test "X$arg" = "X-export-symbols"; then -+ if test X-export-symbols = "X$arg"; then - prev=expsyms - else - prev=expsyms_regex -@@ -5550,9 +6961,9 @@ - func_stripname "-L" '' "$arg" - if test -z "$func_stripname_result"; then - if test "$#" -gt 0; then -- func_fatal_error "require no space between \`-L' and \`$1'" -+ func_fatal_error "require no space between '-L' and '$1'" - else -- func_fatal_error "need path for \`-L' option" -+ func_fatal_error "need path for '-L' option" - fi - fi - func_resolve_sysroot "$func_stripname_result" -@@ -5563,8 +6974,8 @@ - *) - absdir=`cd "$dir" && pwd` - test -z "$absdir" && \ -- func_fatal_error "cannot determine absolute directory name of \`$dir'" -- dir="$absdir" -+ func_fatal_error "cannot determine absolute directory name of '$dir'" -+ dir=$absdir - ;; - esac - case "$deplibs " in -@@ -5581,7 +6992,7 @@ - ;; - esac - case $host in -- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) -+ *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) - testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'` - case :$dllsearchpath: in - *":$dir:"*) ;; -@@ -5599,19 +7010,19 @@ - ;; - - -l*) -- if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then -+ if test X-lc = "X$arg" || test X-lm = "X$arg"; then - case $host in -- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*) -+ *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*) - # These systems don't actually have a C or math library (as such) - continue - ;; - *-*-os2*) - # These systems don't actually have a C library (as such) -- test "X$arg" = "X-lc" && continue -+ test X-lc = "X$arg" && continue - ;; -- *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) -+ *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*) - # Do not include libc due to us having libc/libc_r. -- test "X$arg" = "X-lc" && continue -+ test X-lc = "X$arg" && continue - ;; - *-*-rhapsody* | *-*-darwin1.[012]) - # Rhapsody C and math libraries are in the System framework -@@ -5620,16 +7031,16 @@ - ;; - *-*-sco3.2v5* | *-*-sco5v6*) - # Causes problems with __ctype -- test "X$arg" = "X-lc" && continue -+ test X-lc = "X$arg" && continue - ;; - *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) - # Compiler inserts libc in the correct place for threads to work -- test "X$arg" = "X-lc" && continue -+ test X-lc = "X$arg" && continue - ;; - esac -- elif test "X$arg" = "X-lc_r"; then -+ elif test X-lc_r = "X$arg"; then - case $host in -- *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) -+ *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*) - # Do not include libc_r directly, use -pthread flag. - continue - ;; -@@ -5639,6 +7050,11 @@ - continue - ;; - -+ -mllvm) -+ prev=mllvm -+ continue -+ ;; -+ - -module) - module=yes - continue -@@ -5668,7 +7084,7 @@ - ;; - - -multi_module) -- single_module="${wl}-multi_module" -+ single_module=$wl-multi_module - continue - ;; - -@@ -5679,11 +7095,11 @@ - - -no-install) - case $host in -- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*) -+ *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*) - # The PATH hackery in wrapper scripts is required on Windows - # and Darwin in order for the loader to find any dlls it needs. -- func_warning "\`-no-install' is ignored for $host" -- func_warning "assuming \`-no-fast-install' instead" -+ func_warning "'-no-install' is ignored for $host" -+ func_warning "assuming '-no-fast-install' instead" - fast_install=no - ;; - *) no_install=yes ;; -@@ -5701,6 +7117,11 @@ - continue - ;; - -+ -os2dllname) -+ prev=os2dllname -+ continue -+ ;; -+ - -o) prev=output ;; - - -precious-files-regex) -@@ -5788,14 +7209,14 @@ - func_stripname '-Wc,' '' "$arg" - args=$func_stripname_result - arg= -- save_ifs="$IFS"; IFS=',' -+ save_ifs=$IFS; IFS=, - for flag in $args; do -- IFS="$save_ifs" -+ IFS=$save_ifs - func_quote_for_eval "$flag" - func_append arg " $func_quote_for_eval_result" - func_append compiler_flags " $func_quote_for_eval_result" - done -- IFS="$save_ifs" -+ IFS=$save_ifs - func_stripname ' ' '' "$arg" - arg=$func_stripname_result - ;; -@@ -5804,15 +7225,15 @@ - func_stripname '-Wl,' '' "$arg" - args=$func_stripname_result - arg= -- save_ifs="$IFS"; IFS=',' -+ save_ifs=$IFS; IFS=, - for flag in $args; do -- IFS="$save_ifs" -+ IFS=$save_ifs - func_quote_for_eval "$flag" - func_append arg " $wl$func_quote_for_eval_result" - func_append compiler_flags " $wl$func_quote_for_eval_result" - func_append linker_flags " $func_quote_for_eval_result" - done -- IFS="$save_ifs" -+ IFS=$save_ifs - func_stripname ' ' '' "$arg" - arg=$func_stripname_result - ;; -@@ -5835,7 +7256,7 @@ - # -msg_* for osf cc - -msg_*) - func_quote_for_eval "$arg" -- arg="$func_quote_for_eval_result" -+ arg=$func_quote_for_eval_result - ;; - - # Flags to be passed through unchanged, with rationale: -@@ -5847,25 +7268,46 @@ - # -m*, -t[45]*, -txscale* architecture-specific flags for GCC - # -F/path path to uninstalled frameworks, gcc on darwin - # -p, -pg, --coverage, -fprofile-* profiling flags for GCC -+ # -fstack-protector* stack protector flags for GCC - # @file GCC response files - # -tp=* Portland pgcc target processor selection - # --sysroot=* for sysroot support -- # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization -+ # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization -+ # -stdlib=* select c++ std lib with clang - -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ - -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ -- -O*|-flto*|-fwhopr*|-fuse-linker-plugin) -+ -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*) - func_quote_for_eval "$arg" -- arg="$func_quote_for_eval_result" -+ arg=$func_quote_for_eval_result - func_append compile_command " $arg" - func_append finalize_command " $arg" - func_append compiler_flags " $arg" - continue - ;; - -+ -Z*) -+ if test os2 = "`expr $host : '.*\(os2\)'`"; then -+ # OS/2 uses -Zxxx to specify OS/2-specific options -+ compiler_flags="$compiler_flags $arg" -+ func_append compile_command " $arg" -+ func_append finalize_command " $arg" -+ case $arg in -+ -Zlinker | -Zstack) -+ prev=xcompiler -+ ;; -+ esac -+ continue -+ else -+ # Otherwise treat like 'Some other compiler flag' below -+ func_quote_for_eval "$arg" -+ arg=$func_quote_for_eval_result -+ fi -+ ;; -+ - # Some other compiler flag. - -* | +*) - func_quote_for_eval "$arg" -- arg="$func_quote_for_eval_result" -+ arg=$func_quote_for_eval_result - ;; - - *.$objext) -@@ -5886,21 +7328,21 @@ - - if test -z "$pic_object" || - test -z "$non_pic_object" || -- test "$pic_object" = none && -- test "$non_pic_object" = none; then -- func_fatal_error "cannot find name of object for \`$arg'" -+ test none = "$pic_object" && -+ test none = "$non_pic_object"; then -+ func_fatal_error "cannot find name of object for '$arg'" - fi - - # Extract subdirectory from the argument. - func_dirname "$arg" "/" "" -- xdir="$func_dirname_result" -+ xdir=$func_dirname_result - -- if test "$pic_object" != none; then -+ test none = "$pic_object" || { - # Prepend the subdirectory the object is found in. -- pic_object="$xdir$pic_object" -+ pic_object=$xdir$pic_object - -- if test "$prev" = dlfiles; then -- if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then -+ if test dlfiles = "$prev"; then -+ if test yes = "$build_libtool_libs" && test yes = "$dlopen_support"; then - func_append dlfiles " $pic_object" - prev= - continue -@@ -5911,7 +7353,7 @@ - fi - - # CHECK ME: I think I busted this. -Ossama -- if test "$prev" = dlprefiles; then -+ if test dlprefiles = "$prev"; then - # Preload the old-style object. - func_append dlprefiles " $pic_object" - prev= -@@ -5919,23 +7361,23 @@ - - # A PIC object. - func_append libobjs " $pic_object" -- arg="$pic_object" -- fi -+ arg=$pic_object -+ } - - # Non-PIC object. -- if test "$non_pic_object" != none; then -+ if test none != "$non_pic_object"; then - # Prepend the subdirectory the object is found in. -- non_pic_object="$xdir$non_pic_object" -+ non_pic_object=$xdir$non_pic_object - - # A standard non-PIC object - func_append non_pic_objects " $non_pic_object" -- if test -z "$pic_object" || test "$pic_object" = none ; then -- arg="$non_pic_object" -+ if test -z "$pic_object" || test none = "$pic_object"; then -+ arg=$non_pic_object - fi - else - # If the PIC object exists, use it instead. - # $xdir was prepended to $pic_object above. -- non_pic_object="$pic_object" -+ non_pic_object=$pic_object - func_append non_pic_objects " $non_pic_object" - fi - else -@@ -5943,7 +7385,7 @@ - if $opt_dry_run; then - # Extract subdirectory from the argument. - func_dirname "$arg" "/" "" -- xdir="$func_dirname_result" -+ xdir=$func_dirname_result - - func_lo2o "$arg" - pic_object=$xdir$objdir/$func_lo2o_result -@@ -5951,7 +7393,7 @@ - func_append libobjs " $pic_object" - func_append non_pic_objects " $non_pic_object" - else -- func_fatal_error "\`$arg' is not a valid libtool object" -+ func_fatal_error "'$arg' is not a valid libtool object" - fi - fi - ;; -@@ -5967,11 +7409,11 @@ - # A libtool-controlled library. - - func_resolve_sysroot "$arg" -- if test "$prev" = dlfiles; then -+ if test dlfiles = "$prev"; then - # This library was specified with -dlopen. - func_append dlfiles " $func_resolve_sysroot_result" - prev= -- elif test "$prev" = dlprefiles; then -+ elif test dlprefiles = "$prev"; then - # The library was specified with -dlpreopen. - func_append dlprefiles " $func_resolve_sysroot_result" - prev= -@@ -5986,7 +7428,7 @@ - # Unknown arguments in both finalize_command and compile_command need - # to be aesthetically quoted because they are evaled later. - func_quote_for_eval "$arg" -- arg="$func_quote_for_eval_result" -+ arg=$func_quote_for_eval_result - ;; - esac # arg - -@@ -5998,9 +7440,9 @@ - done # argument parsing loop - - test -n "$prev" && \ -- func_fatal_help "the \`$prevarg' option requires an argument" -+ func_fatal_help "the '$prevarg' option requires an argument" - -- if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then -+ if test yes = "$export_dynamic" && test -n "$export_dynamic_flag_spec"; then - eval arg=\"$export_dynamic_flag_spec\" - func_append compile_command " $arg" - func_append finalize_command " $arg" -@@ -6009,20 +7451,23 @@ - oldlibs= - # calculate the name of the file, without its directory - func_basename "$output" -- outputname="$func_basename_result" -- libobjs_save="$libobjs" -+ outputname=$func_basename_result -+ libobjs_save=$libobjs - - if test -n "$shlibpath_var"; then - # get the directories listed in $shlibpath_var -- eval shlib_search_path=\`\$ECHO \"\${$shlibpath_var}\" \| \$SED \'s/:/ /g\'\` -+ eval shlib_search_path=\`\$ECHO \"\$$shlibpath_var\" \| \$SED \'s/:/ /g\'\` - else - shlib_search_path= - fi - eval sys_lib_search_path=\"$sys_lib_search_path_spec\" - eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\" - -+ # Definition is injected by LT_CONFIG during libtool generation. -+ func_munge_path_list sys_lib_dlsearch_path "$LT_SYS_LIBRARY_PATH" -+ - func_dirname "$output" "/" "" -- output_objdir="$func_dirname_result$objdir" -+ output_objdir=$func_dirname_result$objdir - func_to_tool_file "$output_objdir/" - tool_output_objdir=$func_to_tool_file_result - # Create the object directory. -@@ -6045,7 +7490,7 @@ - # Find all interdependent deplibs by searching for libraries - # that are linked more than once (e.g. -la -lb -la) - for deplib in $deplibs; do -- if $opt_preserve_dup_deps ; then -+ if $opt_preserve_dup_deps; then - case "$libs " in - *" $deplib "*) func_append specialdeplibs " $deplib" ;; - esac -@@ -6053,7 +7498,7 @@ - func_append libs " $deplib" - done - -- if test "$linkmode" = lib; then -+ if test lib = "$linkmode"; then - libs="$predeps $libs $compiler_lib_search_path $postdeps" - - # Compute libraries that are listed more than once in $predeps -@@ -6085,7 +7530,7 @@ - case $file in - *.la) ;; - *) -- func_fatal_help "libraries can \`-dlopen' only libtool libraries: $file" -+ func_fatal_help "libraries can '-dlopen' only libtool libraries: $file" - ;; - esac - done -@@ -6093,7 +7538,7 @@ - prog) - compile_deplibs= - finalize_deplibs= -- alldeplibs=no -+ alldeplibs=false - newdlfiles= - newdlprefiles= - passes="conv scan dlopen dlpreopen link" -@@ -6105,32 +7550,29 @@ - for pass in $passes; do - # The preopen pass in lib mode reverses $deplibs; put it back here - # so that -L comes before libs that need it for instance... -- if test "$linkmode,$pass" = "lib,link"; then -+ if test lib,link = "$linkmode,$pass"; then - ## FIXME: Find the place where the list is rebuilt in the wrong - ## order, and fix it there properly - tmp_deplibs= - for deplib in $deplibs; do - tmp_deplibs="$deplib $tmp_deplibs" - done -- deplibs="$tmp_deplibs" -+ deplibs=$tmp_deplibs - fi - -- if test "$linkmode,$pass" = "lib,link" || -- test "$linkmode,$pass" = "prog,scan"; then -- libs="$deplibs" -+ if test lib,link = "$linkmode,$pass" || -+ test prog,scan = "$linkmode,$pass"; then -+ libs=$deplibs - deplibs= - fi -- if test "$linkmode" = prog; then -+ if test prog = "$linkmode"; then - case $pass in -- dlopen) libs="$dlfiles" ;; -- dlpreopen) libs="$dlprefiles" ;; -- link) -- libs="$deplibs %DEPLIBS%" -- test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs" -- ;; -+ dlopen) libs=$dlfiles ;; -+ dlpreopen) libs=$dlprefiles ;; -+ link) libs="$deplibs %DEPLIBS% $dependency_libs" ;; - esac - fi -- if test "$linkmode,$pass" = "lib,dlpreopen"; then -+ if test lib,dlpreopen = "$linkmode,$pass"; then - # Collect and forward deplibs of preopened libtool libs - for lib in $dlprefiles; do - # Ignore non-libtool-libs -@@ -6151,26 +7593,26 @@ - esac - done - done -- libs="$dlprefiles" -+ libs=$dlprefiles - fi -- if test "$pass" = dlopen; then -+ if test dlopen = "$pass"; then - # Collect dlpreopened libraries -- save_deplibs="$deplibs" -+ save_deplibs=$deplibs - deplibs= - fi - - for deplib in $libs; do - lib= -- found=no -+ found=false - case $deplib in - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ - |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) -- if test "$linkmode,$pass" = "prog,link"; then -+ if test prog,link = "$linkmode,$pass"; then - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else - func_append compiler_flags " $deplib" -- if test "$linkmode" = lib ; then -+ if test lib = "$linkmode"; then - case "$new_inherited_linker_flags " in - *" $deplib "*) ;; - * ) func_append new_inherited_linker_flags " $deplib" ;; -@@ -6180,13 +7622,13 @@ - continue - ;; - -l*) -- if test "$linkmode" != lib && test "$linkmode" != prog; then -- func_warning "\`-l' is ignored for archives/objects" -+ if test lib != "$linkmode" && test prog != "$linkmode"; then -+ func_warning "'-l' is ignored for archives/objects" - continue - fi - func_stripname '-l' '' "$deplib" - name=$func_stripname_result -- if test "$linkmode" = lib; then -+ if test lib = "$linkmode"; then - searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path" - else - searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path" -@@ -6194,31 +7636,22 @@ - for searchdir in $searchdirs; do - for search_ext in .la $std_shrext .so .a; do - # Search the libtool library -- lib="$searchdir/lib${name}${search_ext}" -+ lib=$searchdir/lib$name$search_ext - if test -f "$lib"; then -- if test "$search_ext" = ".la"; then -- found=yes -+ if test .la = "$search_ext"; then -+ found=: - else -- found=no -+ found=false - fi - break 2 - fi - done - done -- if test "$found" != yes; then -- # deplib doesn't seem to be a libtool library -- if test "$linkmode,$pass" = "prog,link"; then -- compile_deplibs="$deplib $compile_deplibs" -- finalize_deplibs="$deplib $finalize_deplibs" -- else -- deplibs="$deplib $deplibs" -- test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" -- fi -- continue -- else # deplib is a libtool library -+ if $found; then -+ # deplib is a libtool library - # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib, - # We need to do some special things here, and not later. -- if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then -+ if test yes = "$allow_libtool_libs_with_static_runtimes"; then - case " $predeps $postdeps " in - *" $deplib "*) - if func_lalib_p "$lib"; then -@@ -6226,19 +7659,19 @@ - old_library= - func_source "$lib" - for l in $old_library $library_names; do -- ll="$l" -+ ll=$l - done -- if test "X$ll" = "X$old_library" ; then # only static version available -- found=no -+ if test "X$ll" = "X$old_library"; then # only static version available -+ found=false - func_dirname "$lib" "" "." -- ladir="$func_dirname_result" -+ ladir=$func_dirname_result - lib=$ladir/$old_library -- if test "$linkmode,$pass" = "prog,link"; then -+ if test prog,link = "$linkmode,$pass"; then - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else - deplibs="$deplib $deplibs" -- test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" -+ test lib = "$linkmode" && newdependency_libs="$deplib $newdependency_libs" - fi - continue - fi -@@ -6247,15 +7680,25 @@ - *) ;; - esac - fi -+ else -+ # deplib doesn't seem to be a libtool library -+ if test prog,link = "$linkmode,$pass"; then -+ compile_deplibs="$deplib $compile_deplibs" -+ finalize_deplibs="$deplib $finalize_deplibs" -+ else -+ deplibs="$deplib $deplibs" -+ test lib = "$linkmode" && newdependency_libs="$deplib $newdependency_libs" -+ fi -+ continue - fi - ;; # -l - *.ltframework) -- if test "$linkmode,$pass" = "prog,link"; then -+ if test prog,link = "$linkmode,$pass"; then - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else - deplibs="$deplib $deplibs" -- if test "$linkmode" = lib ; then -+ if test lib = "$linkmode"; then - case "$new_inherited_linker_flags " in - *" $deplib "*) ;; - * ) func_append new_inherited_linker_flags " $deplib" ;; -@@ -6268,18 +7711,18 @@ - case $linkmode in - lib) - deplibs="$deplib $deplibs" -- test "$pass" = conv && continue -+ test conv = "$pass" && continue - newdependency_libs="$deplib $newdependency_libs" - func_stripname '-L' '' "$deplib" - func_resolve_sysroot "$func_stripname_result" - func_append newlib_search_path " $func_resolve_sysroot_result" - ;; - prog) -- if test "$pass" = conv; then -+ if test conv = "$pass"; then - deplibs="$deplib $deplibs" - continue - fi -- if test "$pass" = scan; then -+ if test scan = "$pass"; then - deplibs="$deplib $deplibs" - else - compile_deplibs="$deplib $compile_deplibs" -@@ -6290,13 +7733,13 @@ - func_append newlib_search_path " $func_resolve_sysroot_result" - ;; - *) -- func_warning "\`-L' is ignored for archives/objects" -+ func_warning "'-L' is ignored for archives/objects" - ;; - esac # linkmode - continue - ;; # -L - -R*) -- if test "$pass" = link; then -+ if test link = "$pass"; then - func_stripname '-R' '' "$deplib" - func_resolve_sysroot "$func_stripname_result" - dir=$func_resolve_sysroot_result -@@ -6314,7 +7757,7 @@ - lib=$func_resolve_sysroot_result - ;; - *.$libext) -- if test "$pass" = conv; then -+ if test conv = "$pass"; then - deplibs="$deplib $deplibs" - continue - fi -@@ -6325,21 +7768,26 @@ - case " $dlpreconveniencelibs " in - *" $deplib "*) ;; - *) -- valid_a_lib=no -+ valid_a_lib=false - case $deplibs_check_method in - match_pattern*) - set dummy $deplibs_check_method; shift - match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"` - if eval "\$ECHO \"$deplib\"" 2>/dev/null | $SED 10q \ - | $EGREP "$match_pattern_regex" > /dev/null; then -- valid_a_lib=yes -+ valid_a_lib=: - fi - ;; - pass_all) -- valid_a_lib=yes -+ valid_a_lib=: - ;; - esac -- if test "$valid_a_lib" != yes; then -+ if $valid_a_lib; then -+ echo -+ $ECHO "*** Warning: Linking the shared library $output against the" -+ $ECHO "*** static library $deplib is not portable!" -+ deplibs="$deplib $deplibs" -+ else - echo - $ECHO "*** Warning: Trying to link with static lib archive $deplib." - echo "*** I have the capability to make that library automatically link in when" -@@ -6347,18 +7795,13 @@ - echo "*** shared version of the library, which you do not appear to have" - echo "*** because the file extensions .$libext of this argument makes me believe" - echo "*** that it is just a static archive that I should not use here." -- else -- echo -- $ECHO "*** Warning: Linking the shared library $output against the" -- $ECHO "*** static library $deplib is not portable!" -- deplibs="$deplib $deplibs" - fi - ;; - esac - continue - ;; - prog) -- if test "$pass" != link; then -+ if test link != "$pass"; then - deplibs="$deplib $deplibs" - else - compile_deplibs="$deplib $compile_deplibs" -@@ -6369,10 +7812,10 @@ - esac # linkmode - ;; # *.$libext - *.lo | *.$objext) -- if test "$pass" = conv; then -+ if test conv = "$pass"; then - deplibs="$deplib $deplibs" -- elif test "$linkmode" = prog; then -- if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then -+ elif test prog = "$linkmode"; then -+ if test dlpreopen = "$pass" || test yes != "$dlopen_support" || test no = "$build_libtool_libs"; then - # If there is no dlopen support or we're linking statically, - # we need to preload. - func_append newdlprefiles " $deplib" -@@ -6385,22 +7828,20 @@ - continue - ;; - %DEPLIBS%) -- alldeplibs=yes -+ alldeplibs=: - continue - ;; - esac # case $deplib - -- if test "$found" = yes || test -f "$lib"; then : -- else -- func_fatal_error "cannot find the library \`$lib' or unhandled argument \`$deplib'" -- fi -+ $found || test -f "$lib" \ -+ || func_fatal_error "cannot find the library '$lib' or unhandled argument '$deplib'" - - # Check to see that this really is a libtool archive. - func_lalib_unsafe_p "$lib" \ -- || func_fatal_error "\`$lib' is not a valid libtool archive" -+ || func_fatal_error "'$lib' is not a valid libtool archive" - - func_dirname "$lib" "" "." -- ladir="$func_dirname_result" -+ ladir=$func_dirname_result - - dlname= - dlopen= -@@ -6430,36 +7871,36 @@ - done - fi - dependency_libs=`$ECHO " $dependency_libs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` -- if test "$linkmode,$pass" = "lib,link" || -- test "$linkmode,$pass" = "prog,scan" || -- { test "$linkmode" != prog && test "$linkmode" != lib; }; then -+ if test lib,link = "$linkmode,$pass" || -+ test prog,scan = "$linkmode,$pass" || -+ { test prog != "$linkmode" && test lib != "$linkmode"; }; then - test -n "$dlopen" && func_append dlfiles " $dlopen" - test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen" - fi - -- if test "$pass" = conv; then -+ if test conv = "$pass"; then - # Only check for convenience libraries - deplibs="$lib $deplibs" - if test -z "$libdir"; then - if test -z "$old_library"; then -- func_fatal_error "cannot find name of link library for \`$lib'" -+ func_fatal_error "cannot find name of link library for '$lib'" - fi - # It is a libtool convenience library, so add in its objects. - func_append convenience " $ladir/$objdir/$old_library" - func_append old_convenience " $ladir/$objdir/$old_library" -- tmp_libs= -- for deplib in $dependency_libs; do -- deplibs="$deplib $deplibs" -- if $opt_preserve_dup_deps ; then -- case "$tmp_libs " in -- *" $deplib "*) func_append specialdeplibs " $deplib" ;; -- esac -- fi -- func_append tmp_libs " $deplib" -- done -- elif test "$linkmode" != prog && test "$linkmode" != lib; then -- func_fatal_error "\`$lib' is not a convenience library" -+ elif test prog != "$linkmode" && test lib != "$linkmode"; then -+ func_fatal_error "'$lib' is not a convenience library" - fi -+ tmp_libs= -+ for deplib in $dependency_libs; do -+ deplibs="$deplib $deplibs" -+ if $opt_preserve_dup_deps; then -+ case "$tmp_libs " in -+ *" $deplib "*) func_append specialdeplibs " $deplib" ;; -+ esac -+ fi -+ func_append tmp_libs " $deplib" -+ done - continue - fi # $pass = conv - -@@ -6467,26 +7908,26 @@ - # Get the name of the library we link against. - linklib= - if test -n "$old_library" && -- { test "$prefer_static_libs" = yes || -- test "$prefer_static_libs,$installed" = "built,no"; }; then -+ { test yes = "$prefer_static_libs" || -+ test built,no = "$prefer_static_libs,$installed"; }; then - linklib=$old_library - else - for l in $old_library $library_names; do -- linklib="$l" -+ linklib=$l - done - fi - if test -z "$linklib"; then -- func_fatal_error "cannot find name of link library for \`$lib'" -+ func_fatal_error "cannot find name of link library for '$lib'" - fi - - # This library was specified with -dlopen. -- if test "$pass" = dlopen; then -- if test -z "$libdir"; then -- func_fatal_error "cannot -dlopen a convenience library: \`$lib'" -- fi -+ if test dlopen = "$pass"; then -+ test -z "$libdir" \ -+ && func_fatal_error "cannot -dlopen a convenience library: '$lib'" - if test -z "$dlname" || -- test "$dlopen_support" != yes || -- test "$build_libtool_libs" = no; then -+ test yes != "$dlopen_support" || -+ test no = "$build_libtool_libs" -+ then - # If there is no dlname, no dlopen support or we're linking - # statically, we need to preload. We also need to preload any - # dependent libraries so libltdl's deplib preloader doesn't -@@ -6500,40 +7941,40 @@ - - # We need an absolute path. - case $ladir in -- [\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;; -+ [\\/]* | [A-Za-z]:[\\/]*) abs_ladir=$ladir ;; - *) - abs_ladir=`cd "$ladir" && pwd` - if test -z "$abs_ladir"; then -- func_warning "cannot determine absolute directory name of \`$ladir'" -+ func_warning "cannot determine absolute directory name of '$ladir'" - func_warning "passing it literally to the linker, although it might fail" -- abs_ladir="$ladir" -+ abs_ladir=$ladir - fi - ;; - esac - func_basename "$lib" -- laname="$func_basename_result" -+ laname=$func_basename_result - - # Find the relevant object directory and library name. -- if test "X$installed" = Xyes; then -+ if test yes = "$installed"; then - if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then -- func_warning "library \`$lib' was moved." -- dir="$ladir" -- absdir="$abs_ladir" -- libdir="$abs_ladir" -+ func_warning "library '$lib' was moved." -+ dir=$ladir -+ absdir=$abs_ladir -+ libdir=$abs_ladir - else -- dir="$lt_sysroot$libdir" -- absdir="$lt_sysroot$libdir" -+ dir=$lt_sysroot$libdir -+ absdir=$lt_sysroot$libdir - fi -- test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes -+ test yes = "$hardcode_automatic" && avoidtemprpath=yes - else - if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then -- dir="$ladir" -- absdir="$abs_ladir" -+ dir=$ladir -+ absdir=$abs_ladir - # Remove this search path later - func_append notinst_path " $abs_ladir" - else -- dir="$ladir/$objdir" -- absdir="$abs_ladir/$objdir" -+ dir=$ladir/$objdir -+ absdir=$abs_ladir/$objdir - # Remove this search path later - func_append notinst_path " $abs_ladir" - fi -@@ -6542,13 +7983,13 @@ - name=$func_stripname_result - - # This library was specified with -dlpreopen. -- if test "$pass" = dlpreopen; then -- if test -z "$libdir" && test "$linkmode" = prog; then -- func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'" -+ if test dlpreopen = "$pass"; then -+ if test -z "$libdir" && test prog = "$linkmode"; then -+ func_fatal_error "only libraries may -dlpreopen a convenience library: '$lib'" - fi -- case "$host" in -+ case $host in - # special handling for platforms with PE-DLLs. -- *cygwin* | *mingw* | *cegcc* ) -+ *cygwin* | *msys* | *mingw* | *cegcc* ) - # Linker will automatically link against shared library if both - # static and shared are present. Therefore, ensure we extract - # symbols from the import library if a shared library is present -@@ -6590,9 +8031,9 @@ - - if test -z "$libdir"; then - # Link the convenience library -- if test "$linkmode" = lib; then -+ if test lib = "$linkmode"; then - deplibs="$dir/$old_library $deplibs" -- elif test "$linkmode,$pass" = "prog,link"; then -+ elif test prog,link = "$linkmode,$pass"; then - compile_deplibs="$dir/$old_library $compile_deplibs" - finalize_deplibs="$dir/$old_library $finalize_deplibs" - else -@@ -6602,14 +8043,14 @@ - fi - - -- if test "$linkmode" = prog && test "$pass" != link; then -+ if test prog = "$linkmode" && test link != "$pass"; then - func_append newlib_search_path " $ladir" - deplibs="$lib $deplibs" - -- linkalldeplibs=no -- if test "$link_all_deplibs" != no || test -z "$library_names" || -- test "$build_libtool_libs" = no; then -- linkalldeplibs=yes -+ linkalldeplibs=false -+ if test no != "$link_all_deplibs" || test -z "$library_names" || -+ test no = "$build_libtool_libs"; then -+ linkalldeplibs=: - fi - - tmp_libs= -@@ -6621,14 +8062,14 @@ - ;; - esac - # Need to link against all dependency_libs? -- if test "$linkalldeplibs" = yes; then -+ if $linkalldeplibs; then - deplibs="$deplib $deplibs" - else - # Need to hardcode shared library paths - # or/and link against static libraries - newdependency_libs="$deplib $newdependency_libs" - fi -- if $opt_preserve_dup_deps ; then -+ if $opt_preserve_dup_deps; then - case "$tmp_libs " in - *" $deplib "*) func_append specialdeplibs " $deplib" ;; - esac -@@ -6638,15 +8079,15 @@ - continue - fi # $linkmode = prog... - -- if test "$linkmode,$pass" = "prog,link"; then -+ if test prog,link = "$linkmode,$pass"; then - if test -n "$library_names" && -- { { test "$prefer_static_libs" = no || -- test "$prefer_static_libs,$installed" = "built,yes"; } || -+ { { test no = "$prefer_static_libs" || -+ test built,yes = "$prefer_static_libs,$installed"; } || - test -z "$old_library"; }; then - # We need to hardcode the library path -- if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then -+ if test -n "$shlibpath_var" && test -z "$avoidtemprpath"; then - # Make sure the rpath contains only unique directories. -- case "$temp_rpath:" in -+ case $temp_rpath: in - *"$absdir:"*) ;; - *) func_append temp_rpath "$absdir:" ;; - esac -@@ -6675,9 +8116,9 @@ - esac - fi # $linkmode,$pass = prog,link... - -- if test "$alldeplibs" = yes && -- { test "$deplibs_check_method" = pass_all || -- { test "$build_libtool_libs" = yes && -+ if $alldeplibs && -+ { test pass_all = "$deplibs_check_method" || -+ { test yes = "$build_libtool_libs" && - test -n "$library_names"; }; }; then - # We only need to search for static libraries - continue -@@ -6686,19 +8127,19 @@ - - link_static=no # Whether the deplib will be linked statically - use_static_libs=$prefer_static_libs -- if test "$use_static_libs" = built && test "$installed" = yes; then -+ if test built = "$use_static_libs" && test yes = "$installed"; then - use_static_libs=no - fi - if test -n "$library_names" && -- { test "$use_static_libs" = no || test -z "$old_library"; }; then -+ { test no = "$use_static_libs" || test -z "$old_library"; }; then - case $host in -- *cygwin* | *mingw* | *cegcc*) -+ *cygwin* | *msys* | *mingw* | *cegcc* | *os2*) - # No point in relinking DLLs because paths are not encoded - func_append notinst_deplibs " $lib" - need_relink=no - ;; - *) -- if test "$installed" = no; then -+ if test no = "$installed"; then - func_append notinst_deplibs " $lib" - need_relink=yes - fi -@@ -6708,24 +8149,24 @@ - - # Warn about portability, can't link against -module's on some - # systems (darwin). Don't bleat about dlopened modules though! -- dlopenmodule="" -+ dlopenmodule= - for dlpremoduletest in $dlprefiles; do - if test "X$dlpremoduletest" = "X$lib"; then -- dlopenmodule="$dlpremoduletest" -+ dlopenmodule=$dlpremoduletest - break - fi - done -- if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then -+ if test -z "$dlopenmodule" && test yes = "$shouldnotlink" && test link = "$pass"; then - echo -- if test "$linkmode" = prog; then -+ if test prog = "$linkmode"; then - $ECHO "*** Warning: Linking the executable $output against the loadable module" - else - $ECHO "*** Warning: Linking the shared library $output against the loadable module" - fi - $ECHO "*** $linklib is not portable!" - fi -- if test "$linkmode" = lib && -- test "$hardcode_into_libs" = yes; then -+ if test lib = "$linkmode" && -+ test yes = "$hardcode_into_libs"; then - # Hardcode the library path. - # Skip directories that are in the system default run-time - # search path. -@@ -6753,43 +8194,43 @@ - # figure out the soname - set dummy $library_names - shift -- realname="$1" -+ realname=$1 - shift - libname=`eval "\\$ECHO \"$libname_spec\""` - # use dlname if we got it. it's perfectly good, no? - if test -n "$dlname"; then -- soname="$dlname" -+ soname=$dlname - elif test -n "$soname_spec"; then - # bleh windows - case $host in -- *cygwin* | mingw* | *cegcc*) -+ *cygwin* | *msys* | mingw* | *cegcc* | *os2*) - func_arith $current - $age - major=$func_arith_result -- versuffix="-$major" -+ versuffix=-$major - ;; - esac - eval soname=\"$soname_spec\" - else -- soname="$realname" -+ soname=$realname - fi - - # Make a new name for the extract_expsyms_cmds to use -- soroot="$soname" -+ soroot=$soname - func_basename "$soroot" -- soname="$func_basename_result" -+ soname=$func_basename_result - func_stripname 'lib' '.dll' "$soname" - newlib=libimp-$func_stripname_result.a - - # If the library has no export list, then create one now - if test -f "$output_objdir/$soname-def"; then : - else -- func_verbose "extracting exported symbol list from \`$soname'" -+ func_verbose "extracting exported symbol list from '$soname'" - func_execute_cmds "$extract_expsyms_cmds" 'exit $?' - fi - - # Create $newlib - if test -f "$output_objdir/$newlib"; then :; else -- func_verbose "generating import library for \`$soname'" -+ func_verbose "generating import library for '$soname'" - func_execute_cmds "$old_archive_from_expsyms_cmds" 'exit $?' - fi - # make sure the library variables are pointing to the new library -@@ -6797,58 +8238,58 @@ - linklib=$newlib - fi # test -n "$old_archive_from_expsyms_cmds" - -- if test "$linkmode" = prog || test "$opt_mode" != relink; then -+ if test prog = "$linkmode" || test relink != "$opt_mode"; then - add_shlibpath= - add_dir= - add= - lib_linked=yes - case $hardcode_action in - immediate | unsupported) -- if test "$hardcode_direct" = no; then -- add="$dir/$linklib" -+ if test no = "$hardcode_direct"; then -+ add=$dir/$linklib - case $host in -- *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;; -- *-*-sysv4*uw2*) add_dir="-L$dir" ;; -+ *-*-sco3.2v5.0.[024]*) add_dir=-L$dir ;; -+ *-*-sysv4*uw2*) add_dir=-L$dir ;; - *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \ -- *-*-unixware7*) add_dir="-L$dir" ;; -+ *-*-unixware7*) add_dir=-L$dir ;; - *-*-darwin* ) -- # if the lib is a (non-dlopened) module then we can not -+ # if the lib is a (non-dlopened) module then we cannot - # link against it, someone is ignoring the earlier warnings - if /usr/bin/file -L $add 2> /dev/null | -- $GREP ": [^:]* bundle" >/dev/null ; then -+ $GREP ": [^:]* bundle" >/dev/null; then - if test "X$dlopenmodule" != "X$lib"; then - $ECHO "*** Warning: lib $linklib is a module, not a shared library" -- if test -z "$old_library" ; then -+ if test -z "$old_library"; then - echo - echo "*** And there doesn't seem to be a static archive available" - echo "*** The link will probably fail, sorry" - else -- add="$dir/$old_library" -+ add=$dir/$old_library - fi - elif test -n "$old_library"; then -- add="$dir/$old_library" -+ add=$dir/$old_library - fi - fi - esac -- elif test "$hardcode_minus_L" = no; then -+ elif test no = "$hardcode_minus_L"; then - case $host in -- *-*-sunos*) add_shlibpath="$dir" ;; -+ *-*-sunos*) add_shlibpath=$dir ;; - esac -- add_dir="-L$dir" -- add="-l$name" -- elif test "$hardcode_shlibpath_var" = no; then -- add_shlibpath="$dir" -- add="-l$name" -+ add_dir=-L$dir -+ add=-l$name -+ elif test no = "$hardcode_shlibpath_var"; then -+ add_shlibpath=$dir -+ add=-l$name - else - lib_linked=no - fi - ;; - relink) -- if test "$hardcode_direct" = yes && -- test "$hardcode_direct_absolute" = no; then -- add="$dir/$linklib" -- elif test "$hardcode_minus_L" = yes; then -- add_dir="-L$absdir" -+ if test yes = "$hardcode_direct" && -+ test no = "$hardcode_direct_absolute"; then -+ add=$dir/$linklib -+ elif test yes = "$hardcode_minus_L"; then -+ add_dir=-L$absdir - # Try looking first in the location we're being installed to. - if test -n "$inst_prefix_dir"; then - case $libdir in -@@ -6857,10 +8298,10 @@ - ;; - esac - fi -- add="-l$name" -- elif test "$hardcode_shlibpath_var" = yes; then -- add_shlibpath="$dir" -- add="-l$name" -+ add=-l$name -+ elif test yes = "$hardcode_shlibpath_var"; then -+ add_shlibpath=$dir -+ add=-l$name - else - lib_linked=no - fi -@@ -6868,7 +8309,7 @@ - *) lib_linked=no ;; - esac - -- if test "$lib_linked" != yes; then -+ if test yes != "$lib_linked"; then - func_fatal_configuration "unsupported hardcode properties" - fi - -@@ -6878,15 +8319,15 @@ - *) func_append compile_shlibpath "$add_shlibpath:" ;; - esac - fi -- if test "$linkmode" = prog; then -+ if test prog = "$linkmode"; then - test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs" - test -n "$add" && compile_deplibs="$add $compile_deplibs" - else - test -n "$add_dir" && deplibs="$add_dir $deplibs" - test -n "$add" && deplibs="$add $deplibs" -- if test "$hardcode_direct" != yes && -- test "$hardcode_minus_L" != yes && -- test "$hardcode_shlibpath_var" = yes; then -+ if test yes != "$hardcode_direct" && -+ test yes != "$hardcode_minus_L" && -+ test yes = "$hardcode_shlibpath_var"; then - case :$finalize_shlibpath: in - *":$libdir:"*) ;; - *) func_append finalize_shlibpath "$libdir:" ;; -@@ -6895,33 +8336,33 @@ - fi - fi - -- if test "$linkmode" = prog || test "$opt_mode" = relink; then -+ if test prog = "$linkmode" || test relink = "$opt_mode"; then - add_shlibpath= - add_dir= - add= - # Finalize command for both is simple: just hardcode it. -- if test "$hardcode_direct" = yes && -- test "$hardcode_direct_absolute" = no; then -- add="$libdir/$linklib" -- elif test "$hardcode_minus_L" = yes; then -- add_dir="-L$libdir" -- add="-l$name" -- elif test "$hardcode_shlibpath_var" = yes; then -+ if test yes = "$hardcode_direct" && -+ test no = "$hardcode_direct_absolute"; then -+ add=$libdir/$linklib -+ elif test yes = "$hardcode_minus_L"; then -+ add_dir=-L$libdir -+ add=-l$name -+ elif test yes = "$hardcode_shlibpath_var"; then - case :$finalize_shlibpath: in - *":$libdir:"*) ;; - *) func_append finalize_shlibpath "$libdir:" ;; - esac -- add="-l$name" -- elif test "$hardcode_automatic" = yes; then -+ add=-l$name -+ elif test yes = "$hardcode_automatic"; then - if test -n "$inst_prefix_dir" && -- test -f "$inst_prefix_dir$libdir/$linklib" ; then -- add="$inst_prefix_dir$libdir/$linklib" -+ test -f "$inst_prefix_dir$libdir/$linklib"; then -+ add=$inst_prefix_dir$libdir/$linklib - else -- add="$libdir/$linklib" -+ add=$libdir/$linklib - fi - else - # We cannot seem to hardcode it, guess we'll fake it. -- add_dir="-L$libdir" -+ add_dir=-L$libdir - # Try looking first in the location we're being installed to. - if test -n "$inst_prefix_dir"; then - case $libdir in -@@ -6930,10 +8371,10 @@ - ;; - esac - fi -- add="-l$name" -+ add=-l$name - fi - -- if test "$linkmode" = prog; then -+ if test prog = "$linkmode"; then - test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs" - test -n "$add" && finalize_deplibs="$add $finalize_deplibs" - else -@@ -6941,43 +8382,43 @@ - test -n "$add" && deplibs="$add $deplibs" - fi - fi -- elif test "$linkmode" = prog; then -+ elif test prog = "$linkmode"; then - # Here we assume that one of hardcode_direct or hardcode_minus_L - # is not unsupported. This is valid on all known static and - # shared platforms. -- if test "$hardcode_direct" != unsupported; then -- test -n "$old_library" && linklib="$old_library" -+ if test unsupported != "$hardcode_direct"; then -+ test -n "$old_library" && linklib=$old_library - compile_deplibs="$dir/$linklib $compile_deplibs" - finalize_deplibs="$dir/$linklib $finalize_deplibs" - else - compile_deplibs="-l$name -L$dir $compile_deplibs" - finalize_deplibs="-l$name -L$dir $finalize_deplibs" - fi -- elif test "$build_libtool_libs" = yes; then -+ elif test yes = "$build_libtool_libs"; then - # Not a shared library -- if test "$deplibs_check_method" != pass_all; then -+ if test pass_all != "$deplibs_check_method"; then - # We're trying link a shared library against a static one - # but the system doesn't support it. - - # Just print a warning and add the library to dependency_libs so - # that the program can be linked against the static library. - echo -- $ECHO "*** Warning: This system can not link to static lib archive $lib." -+ $ECHO "*** Warning: This system cannot link to static lib archive $lib." - echo "*** I have the capability to make that library automatically link in when" - echo "*** you link to this library. But I can only do this if you have a" - echo "*** shared version of the library, which you do not appear to have." -- if test "$module" = yes; then -+ if test yes = "$module"; then - echo "*** But as you try to build a module library, libtool will still create " - echo "*** a static module, that should work as long as the dlopening application" - echo "*** is linked with the -dlopen flag to resolve symbols at runtime." - if test -z "$global_symbol_pipe"; then - echo - echo "*** However, this would only work if libtool was able to extract symbol" -- echo "*** lists from a program, using \`nm' or equivalent, but libtool could" -+ echo "*** lists from a program, using 'nm' or equivalent, but libtool could" - echo "*** not find such a program. So, this module is probably useless." -- echo "*** \`nm' from GNU binutils and a full rebuild may help." -+ echo "*** 'nm' from GNU binutils and a full rebuild may help." - fi -- if test "$build_old_libs" = no; then -+ if test no = "$build_old_libs"; then - build_libtool_libs=module - build_old_libs=yes - else -@@ -6990,11 +8431,11 @@ - fi - fi # link shared/static library? - -- if test "$linkmode" = lib; then -+ if test lib = "$linkmode"; then - if test -n "$dependency_libs" && -- { test "$hardcode_into_libs" != yes || -- test "$build_old_libs" = yes || -- test "$link_static" = yes; }; then -+ { test yes != "$hardcode_into_libs" || -+ test yes = "$build_old_libs" || -+ test yes = "$link_static"; }; then - # Extract -R from dependency_libs - temp_deplibs= - for libdir in $dependency_libs; do -@@ -7008,12 +8449,12 @@ - *) func_append temp_deplibs " $libdir";; - esac - done -- dependency_libs="$temp_deplibs" -+ dependency_libs=$temp_deplibs - fi - - func_append newlib_search_path " $absdir" - # Link against this library -- test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs" -+ test no = "$link_static" && newdependency_libs="$abs_ladir/$laname $newdependency_libs" - # ... and its dependency_libs - tmp_libs= - for deplib in $dependency_libs; do -@@ -7023,7 +8464,7 @@ - func_resolve_sysroot "$func_stripname_result";; - *) func_resolve_sysroot "$deplib" ;; - esac -- if $opt_preserve_dup_deps ; then -+ if $opt_preserve_dup_deps; then - case "$tmp_libs " in - *" $func_resolve_sysroot_result "*) - func_append specialdeplibs " $func_resolve_sysroot_result" ;; -@@ -7032,12 +8473,12 @@ - func_append tmp_libs " $func_resolve_sysroot_result" - done - -- if test "$link_all_deplibs" != no; then -+ if test no != "$link_all_deplibs"; then - # Add the search paths of all dependency libraries - for deplib in $dependency_libs; do - path= - case $deplib in -- -L*) path="$deplib" ;; -+ -L*) path=$deplib ;; - *.la) - func_resolve_sysroot "$deplib" - deplib=$func_resolve_sysroot_result -@@ -7045,12 +8486,12 @@ - dir=$func_dirname_result - # We need an absolute path. - case $dir in -- [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;; -+ [\\/]* | [A-Za-z]:[\\/]*) absdir=$dir ;; - *) - absdir=`cd "$dir" && pwd` - if test -z "$absdir"; then -- func_warning "cannot determine absolute directory name of \`$dir'" -- absdir="$dir" -+ func_warning "cannot determine absolute directory name of '$dir'" -+ absdir=$dir - fi - ;; - esac -@@ -7058,35 +8499,35 @@ - case $host in - *-*-darwin*) - depdepl= -- eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` -- if test -n "$deplibrary_names" ; then -- for tmp in $deplibrary_names ; do -+ eval deplibrary_names=`$SED -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` -+ if test -n "$deplibrary_names"; then -+ for tmp in $deplibrary_names; do - depdepl=$tmp - done -- if test -f "$absdir/$objdir/$depdepl" ; then -- depdepl="$absdir/$objdir/$depdepl" -- darwin_install_name=`${OTOOL} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` -+ if test -f "$absdir/$objdir/$depdepl"; then -+ depdepl=$absdir/$objdir/$depdepl -+ darwin_install_name=`$OTOOL -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` - if test -z "$darwin_install_name"; then -- darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` -+ darwin_install_name=`$OTOOL64 -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` - fi -- func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}" -- func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}" -+ func_append compiler_flags " $wl-dylib_file $wl$darwin_install_name:$depdepl" -+ func_append linker_flags " -dylib_file $darwin_install_name:$depdepl" - path= - fi - fi - ;; - *) -- path="-L$absdir/$objdir" -+ path=-L$absdir/$objdir - ;; - esac - else -- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` -+ eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` - test -z "$libdir" && \ -- func_fatal_error "\`$deplib' is not a valid libtool archive" -+ func_fatal_error "'$deplib' is not a valid libtool archive" - test "$absdir" != "$libdir" && \ -- func_warning "\`$deplib' seems to be moved" -+ func_warning "'$deplib' seems to be moved" - -- path="-L$absdir" -+ path=-L$absdir - fi - ;; - esac -@@ -7098,23 +8539,23 @@ - fi # link_all_deplibs != no - fi # linkmode = lib - done # for deplib in $libs -- if test "$pass" = link; then -- if test "$linkmode" = "prog"; then -+ if test link = "$pass"; then -+ if test prog = "$linkmode"; then - compile_deplibs="$new_inherited_linker_flags $compile_deplibs" - finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs" - else - compiler_flags="$compiler_flags "`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` - fi - fi -- dependency_libs="$newdependency_libs" -- if test "$pass" = dlpreopen; then -+ dependency_libs=$newdependency_libs -+ if test dlpreopen = "$pass"; then - # Link the dlpreopened libraries before other libraries - for deplib in $save_deplibs; do - deplibs="$deplib $deplibs" - done - fi -- if test "$pass" != dlopen; then -- if test "$pass" != conv; then -+ if test dlopen != "$pass"; then -+ test conv = "$pass" || { - # Make sure lib_search_path contains only unique directories. - lib_search_path= - for dir in $newlib_search_path; do -@@ -7124,12 +8565,12 @@ - esac - done - newlib_search_path= -- fi -+ } - -- if test "$linkmode,$pass" != "prog,link"; then -- vars="deplibs" -- else -+ if test prog,link = "$linkmode,$pass"; then - vars="compile_deplibs finalize_deplibs" -+ else -+ vars=deplibs - fi - for var in $vars dependency_libs; do - # Add libraries to $var in reverse order -@@ -7187,62 +8628,93 @@ - eval $var=\"$tmp_libs\" - done # for var - fi -+ -+ # Add Sun CC postdeps if required: -+ test CXX = "$tagname" && { -+ case $host_os in -+ linux*) -+ case `$CC -V 2>&1 | sed 5q` in -+ *Sun\ C*) # Sun C++ 5.9 -+ func_suncc_cstd_abi -+ -+ if test no != "$suncc_use_cstd_abi"; then -+ func_append postdeps ' -library=Cstd -library=Crun' -+ fi -+ ;; -+ esac -+ ;; -+ -+ solaris*) -+ func_cc_basename "$CC" -+ case $func_cc_basename_result in -+ CC* | sunCC*) -+ func_suncc_cstd_abi -+ -+ if test no != "$suncc_use_cstd_abi"; then -+ func_append postdeps ' -library=Cstd -library=Crun' -+ fi -+ ;; -+ esac -+ ;; -+ esac -+ } -+ - # Last step: remove runtime libs from dependency_libs - # (they stay in deplibs) - tmp_libs= -- for i in $dependency_libs ; do -+ for i in $dependency_libs; do - case " $predeps $postdeps $compiler_lib_search_path " in - *" $i "*) -- i="" -+ i= - ;; - esac -- if test -n "$i" ; then -+ if test -n "$i"; then - func_append tmp_libs " $i" - fi - done - dependency_libs=$tmp_libs - done # for pass -- if test "$linkmode" = prog; then -- dlfiles="$newdlfiles" -+ if test prog = "$linkmode"; then -+ dlfiles=$newdlfiles - fi -- if test "$linkmode" = prog || test "$linkmode" = lib; then -- dlprefiles="$newdlprefiles" -+ if test prog = "$linkmode" || test lib = "$linkmode"; then -+ dlprefiles=$newdlprefiles - fi - - case $linkmode in - oldlib) -- if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then -- func_warning "\`-dlopen' is ignored for archives" -+ if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then -+ func_warning "'-dlopen' is ignored for archives" - fi - - case " $deplibs" in - *\ -l* | *\ -L*) -- func_warning "\`-l' and \`-L' are ignored for archives" ;; -+ func_warning "'-l' and '-L' are ignored for archives" ;; - esac - - test -n "$rpath" && \ -- func_warning "\`-rpath' is ignored for archives" -+ func_warning "'-rpath' is ignored for archives" - - test -n "$xrpath" && \ -- func_warning "\`-R' is ignored for archives" -+ func_warning "'-R' is ignored for archives" - - test -n "$vinfo" && \ -- func_warning "\`-version-info/-version-number' is ignored for archives" -+ func_warning "'-version-info/-version-number' is ignored for archives" - - test -n "$release" && \ -- func_warning "\`-release' is ignored for archives" -+ func_warning "'-release' is ignored for archives" - - test -n "$export_symbols$export_symbols_regex" && \ -- func_warning "\`-export-symbols' is ignored for archives" -+ func_warning "'-export-symbols' is ignored for archives" - - # Now set the variables for building old libraries. - build_libtool_libs=no -- oldlibs="$output" -+ oldlibs=$output - func_append objs "$old_deplibs" - ;; - - lib) -- # Make sure we only generate libraries of the form `libNAME.la'. -+ # Make sure we only generate libraries of the form 'libNAME.la'. - case $outputname in - lib*) - func_stripname 'lib' '.la' "$outputname" -@@ -7251,10 +8723,10 @@ - eval libname=\"$libname_spec\" - ;; - *) -- test "$module" = no && \ -- func_fatal_help "libtool library \`$output' must begin with \`lib'" -+ test no = "$module" \ -+ && func_fatal_help "libtool library '$output' must begin with 'lib'" - -- if test "$need_lib_prefix" != no; then -+ if test no != "$need_lib_prefix"; then - # Add the "lib" prefix for modules if required - func_stripname '' '.la' "$outputname" - name=$func_stripname_result -@@ -7268,8 +8740,8 @@ - esac - - if test -n "$objs"; then -- if test "$deplibs_check_method" != pass_all; then -- func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs" -+ if test pass_all != "$deplibs_check_method"; then -+ func_fatal_error "cannot build libtool library '$output' from non-libtool objects on this host:$objs" - else - echo - $ECHO "*** Warning: Linking the shared library $output against the non-libtool" -@@ -7278,21 +8750,21 @@ - fi - fi - -- test "$dlself" != no && \ -- func_warning "\`-dlopen self' is ignored for libtool libraries" -+ test no = "$dlself" \ -+ || func_warning "'-dlopen self' is ignored for libtool libraries" - - set dummy $rpath - shift -- test "$#" -gt 1 && \ -- func_warning "ignoring multiple \`-rpath's for a libtool library" -+ test 1 -lt "$#" \ -+ && func_warning "ignoring multiple '-rpath's for a libtool library" - -- install_libdir="$1" -+ install_libdir=$1 - - oldlibs= - if test -z "$rpath"; then -- if test "$build_libtool_libs" = yes; then -+ if test yes = "$build_libtool_libs"; then - # Building a libtool convenience library. -- # Some compilers have problems with a `.al' extension so -+ # Some compilers have problems with a '.al' extension so - # convenience libraries should have the same extension an - # archive normally would. - oldlibs="$output_objdir/$libname.$libext $oldlibs" -@@ -7301,20 +8773,20 @@ - fi - - test -n "$vinfo" && \ -- func_warning "\`-version-info/-version-number' is ignored for convenience libraries" -+ func_warning "'-version-info/-version-number' is ignored for convenience libraries" - - test -n "$release" && \ -- func_warning "\`-release' is ignored for convenience libraries" -+ func_warning "'-release' is ignored for convenience libraries" - else - - # Parse the version information argument. -- save_ifs="$IFS"; IFS=':' -+ save_ifs=$IFS; IFS=: - set dummy $vinfo 0 0 0 - shift -- IFS="$save_ifs" -+ IFS=$save_ifs - - test -n "$7" && \ -- func_fatal_help "too many parameters to \`-version-info'" -+ func_fatal_help "too many parameters to '-version-info'" - - # convert absolute version numbers to libtool ages - # this retains compatibility with .la files and attempts -@@ -7322,45 +8794,42 @@ - - case $vinfo_number in - yes) -- number_major="$1" -- number_minor="$2" -- number_revision="$3" -+ number_major=$1 -+ number_minor=$2 -+ number_revision=$3 - # - # There are really only two kinds -- those that - # use the current revision as the major version - # and those that subtract age and use age as - # a minor version. But, then there is irix -- # which has an extra 1 added just for fun -+ # that has an extra 1 added just for fun - # - case $version_type in - # correct linux to gnu/linux during the next big refactor -- darwin|linux|osf|windows|none) -+ darwin|freebsd-elf|linux|osf|windows|none) - func_arith $number_major + $number_minor - current=$func_arith_result -- age="$number_minor" -- revision="$number_revision" -+ age=$number_minor -+ revision=$number_revision - ;; -- freebsd-aout|freebsd-elf|qnx|sunos) -- current="$number_major" -- revision="$number_minor" -- age="0" -+ freebsd-aout|qnx|sunos) -+ current=$number_major -+ revision=$number_minor -+ age=0 - ;; - irix|nonstopux) - func_arith $number_major + $number_minor - current=$func_arith_result -- age="$number_minor" -- revision="$number_minor" -+ age=$number_minor -+ revision=$number_minor - lt_irix_increment=no - ;; -- *) -- func_fatal_configuration "$modename: unknown library version type \`$version_type'" -- ;; - esac - ;; - no) -- current="$1" -- revision="$2" -- age="$3" -+ current=$1 -+ revision=$2 -+ age=$3 - ;; - esac - -@@ -7368,30 +8837,30 @@ - case $current in - 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; - *) -- func_error "CURRENT \`$current' must be a nonnegative integer" -- func_fatal_error "\`$vinfo' is not valid version information" -+ func_error "CURRENT '$current' must be a nonnegative integer" -+ func_fatal_error "'$vinfo' is not valid version information" - ;; - esac - - case $revision in - 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; - *) -- func_error "REVISION \`$revision' must be a nonnegative integer" -- func_fatal_error "\`$vinfo' is not valid version information" -+ func_error "REVISION '$revision' must be a nonnegative integer" -+ func_fatal_error "'$vinfo' is not valid version information" - ;; - esac - - case $age in - 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; - *) -- func_error "AGE \`$age' must be a nonnegative integer" -- func_fatal_error "\`$vinfo' is not valid version information" -+ func_error "AGE '$age' must be a nonnegative integer" -+ func_fatal_error "'$vinfo' is not valid version information" - ;; - esac - - if test "$age" -gt "$current"; then -- func_error "AGE \`$age' is greater than the current interface number \`$current'" -- func_fatal_error "\`$vinfo' is not valid version information" -+ func_error "AGE '$age' is greater than the current interface number '$current'" -+ func_fatal_error "'$vinfo' is not valid version information" - fi - - # Calculate the version variables. -@@ -7406,26 +8875,36 @@ - # verstring for coding it into the library header - func_arith $current - $age - major=.$func_arith_result -- versuffix="$major.$age.$revision" -+ versuffix=$major.$age.$revision - # Darwin ld doesn't like 0 for these options... - func_arith $current + 1 - minor_current=$func_arith_result -- xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision" -+ xlcverstring="$wl-compatibility_version $wl$minor_current $wl-current_version $wl$minor_current.$revision" - verstring="-compatibility_version $minor_current -current_version $minor_current.$revision" -+ # On Darwin other compilers -+ case $CC in -+ nagfor*) -+ verstring="$wl-compatibility_version $wl$minor_current $wl-current_version $wl$minor_current.$revision" -+ ;; -+ *) -+ verstring="-compatibility_version $minor_current -current_version $minor_current.$revision" -+ ;; -+ esac - ;; - - freebsd-aout) -- major=".$current" -- versuffix=".$current.$revision"; -+ major=.$current -+ versuffix=.$current.$revision - ;; - - freebsd-elf) -- major=".$current" -- versuffix=".$current" -+ func_arith $current - $age -+ major=.$func_arith_result -+ versuffix=$major.$age.$revision - ;; - - irix | nonstopux) -- if test "X$lt_irix_increment" = "Xno"; then -+ if test no = "$lt_irix_increment"; then - func_arith $current - $age - else - func_arith $current - $age + 1 -@@ -7436,69 +8915,74 @@ - nonstopux) verstring_prefix=nonstopux ;; - *) verstring_prefix=sgi ;; - esac -- verstring="$verstring_prefix$major.$revision" -+ verstring=$verstring_prefix$major.$revision - - # Add in all the interfaces that we are compatible with. - loop=$revision -- while test "$loop" -ne 0; do -+ while test 0 -ne "$loop"; do - func_arith $revision - $loop - iface=$func_arith_result - func_arith $loop - 1 - loop=$func_arith_result -- verstring="$verstring_prefix$major.$iface:$verstring" -+ verstring=$verstring_prefix$major.$iface:$verstring - done - -- # Before this point, $major must not contain `.'. -+ # Before this point, $major must not contain '.'. - major=.$major -- versuffix="$major.$revision" -+ versuffix=$major.$revision - ;; - - linux) # correct to gnu/linux during the next big refactor - func_arith $current - $age - major=.$func_arith_result -- versuffix="$major.$age.$revision" -+ versuffix=$major.$age.$revision - ;; - - osf) - func_arith $current - $age - major=.$func_arith_result -- versuffix=".$current.$age.$revision" -- verstring="$current.$age.$revision" -+ versuffix=.$current.$age.$revision -+ verstring=$current.$age.$revision - - # Add in all the interfaces that we are compatible with. - loop=$age -- while test "$loop" -ne 0; do -+ while test 0 -ne "$loop"; do - func_arith $current - $loop - iface=$func_arith_result - func_arith $loop - 1 - loop=$func_arith_result -- verstring="$verstring:${iface}.0" -+ verstring=$verstring:$iface.0 - done - - # Make executables depend on our current version. -- func_append verstring ":${current}.0" -+ func_append verstring ":$current.0" - ;; - - qnx) -- major=".$current" -- versuffix=".$current" -+ major=.$current -+ versuffix=.$current -+ ;; -+ -+ sco) -+ major=.$current -+ versuffix=.$current - ;; - - sunos) -- major=".$current" -- versuffix=".$current.$revision" -+ major=.$current -+ versuffix=.$current.$revision - ;; - - windows) - # Use '-' rather than '.', since we only want one -- # extension on DOS 8.3 filesystems. -+ # extension on DOS 8.3 file systems. - func_arith $current - $age - major=$func_arith_result -- versuffix="-$major" -+ versuffix=-$major - ;; - - *) -- func_fatal_configuration "unknown library version type \`$version_type'" -+ func_fatal_configuration "unknown library version type '$version_type'" - ;; - esac - -@@ -7512,42 +8996,45 @@ - verstring= - ;; - *) -- verstring="0.0" -+ verstring=0.0 - ;; - esac -- if test "$need_version" = no; then -+ if test no = "$need_version"; then - versuffix= - else -- versuffix=".0.0" -+ versuffix=.0.0 - fi - fi - - # Remove version info from name if versioning should be avoided -- if test "$avoid_version" = yes && test "$need_version" = no; then -+ if test yes,no = "$avoid_version,$need_version"; then - major= - versuffix= -- verstring="" -+ verstring= - fi - - # Check to see if the archive will have undefined symbols. -- if test "$allow_undefined" = yes; then -- if test "$allow_undefined_flag" = unsupported; then -- func_warning "undefined symbols not allowed in $host shared libraries" -- build_libtool_libs=no -- build_old_libs=yes -+ if test yes = "$allow_undefined"; then -+ if test unsupported = "$allow_undefined_flag"; then -+ if test yes = "$build_old_libs"; then -+ func_warning "undefined symbols not allowed in $host shared libraries; building static only" -+ build_libtool_libs=no -+ else -+ func_fatal_error "can't build $host shared library unless -no-undefined is specified" -+ fi - fi - else - # Don't allow undefined symbols. -- allow_undefined_flag="$no_undefined_flag" -+ allow_undefined_flag=$no_undefined_flag - fi - - fi - -- func_generate_dlsyms "$libname" "$libname" "yes" -+ func_generate_dlsyms "$libname" "$libname" : - func_append libobjs " $symfileobj" -- test "X$libobjs" = "X " && libobjs= -+ test " " = "$libobjs" && libobjs= - -- if test "$opt_mode" != relink; then -+ if test relink != "$opt_mode"; then - # Remove our outputs, but don't remove object files since they - # may have been created when compiling PIC objects. - removelist= -@@ -7556,8 +9043,8 @@ - case $p in - *.$objext | *.gcno) - ;; -- $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*) -- if test "X$precious_files_regex" != "X"; then -+ $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/$libname$release.*) -+ if test -n "$precious_files_regex"; then - if $ECHO "$p" | $EGREP -e "$precious_files_regex" >/dev/null 2>&1 - then - continue -@@ -7573,11 +9060,11 @@ - fi - - # Now set the variables for building old libraries. -- if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then -+ if test yes = "$build_old_libs" && test convenience != "$build_libtool_libs"; then - func_append oldlibs " $output_objdir/$libname.$libext" - - # Transform .lo files to .o files. -- oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP` -+ oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.$libext$/d; $lo2o" | $NL2SP` - fi - - # Eliminate all temporary directories. -@@ -7598,13 +9085,13 @@ - *) func_append finalize_rpath " $libdir" ;; - esac - done -- if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then -+ if test yes != "$hardcode_into_libs" || test yes = "$build_old_libs"; then - dependency_libs="$temp_xrpath $dependency_libs" - fi - fi - - # Make sure dlfiles contains only unique files that won't be dlpreopened -- old_dlfiles="$dlfiles" -+ old_dlfiles=$dlfiles - dlfiles= - for lib in $old_dlfiles; do - case " $dlprefiles $dlfiles " in -@@ -7614,7 +9101,7 @@ - done - - # Make sure dlprefiles contains only unique files -- old_dlprefiles="$dlprefiles" -+ old_dlprefiles=$dlprefiles - dlprefiles= - for lib in $old_dlprefiles; do - case "$dlprefiles " in -@@ -7623,10 +9110,10 @@ - esac - done - -- if test "$build_libtool_libs" = yes; then -+ if test yes = "$build_libtool_libs"; then - if test -n "$rpath"; then - case $host in -- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*) -+ *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*) - # these systems don't actually have a c library (as such)! - ;; - *-*-rhapsody* | *-*-darwin1.[012]) -@@ -7647,7 +9134,7 @@ - ;; - *) - # Add libc to deplibs on all other systems if necessary. -- if test "$build_libtool_need_lc" = "yes"; then -+ if test yes = "$build_libtool_need_lc"; then - func_append deplibs " -lc" - fi - ;; -@@ -7663,9 +9150,9 @@ - # I'm not sure if I'm treating the release correctly. I think - # release should show up in the -l (ie -lgmp5) so we don't want to - # add it in twice. Is that correct? -- release="" -- versuffix="" -- major="" -+ release= -+ versuffix= -+ major= - newdeplibs= - droppeddeps=no - case $deplibs_check_method in -@@ -7694,20 +9181,20 @@ - -l*) - func_stripname -l '' "$i" - name=$func_stripname_result -- if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then -+ if test yes = "$allow_libtool_libs_with_static_runtimes"; then - case " $predeps $postdeps " in - *" $i "*) - func_append newdeplibs " $i" -- i="" -+ i= - ;; - esac - fi -- if test -n "$i" ; then -+ if test -n "$i"; then - libname=`eval "\\$ECHO \"$libname_spec\""` - deplib_matches=`eval "\\$ECHO \"$library_names_spec\""` - set dummy $deplib_matches; shift - deplib_match=$1 -- if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then -+ if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0; then - func_append newdeplibs " $i" - else - droppeddeps=yes -@@ -7737,20 +9224,20 @@ - $opt_dry_run || $RM conftest - if $LTCC $LTCFLAGS -o conftest conftest.c $i; then - ldd_output=`ldd conftest` -- if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then -+ if test yes = "$allow_libtool_libs_with_static_runtimes"; then - case " $predeps $postdeps " in - *" $i "*) - func_append newdeplibs " $i" -- i="" -+ i= - ;; - esac - fi -- if test -n "$i" ; then -+ if test -n "$i"; then - libname=`eval "\\$ECHO \"$libname_spec\""` - deplib_matches=`eval "\\$ECHO \"$library_names_spec\""` - set dummy $deplib_matches; shift - deplib_match=$1 -- if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then -+ if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0; then - func_append newdeplibs " $i" - else - droppeddeps=yes -@@ -7787,24 +9274,24 @@ - -l*) - func_stripname -l '' "$a_deplib" - name=$func_stripname_result -- if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then -+ if test yes = "$allow_libtool_libs_with_static_runtimes"; then - case " $predeps $postdeps " in - *" $a_deplib "*) - func_append newdeplibs " $a_deplib" -- a_deplib="" -+ a_deplib= - ;; - esac - fi -- if test -n "$a_deplib" ; then -+ if test -n "$a_deplib"; then - libname=`eval "\\$ECHO \"$libname_spec\""` - if test -n "$file_magic_glob"; then - libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob` - else - libnameglob=$libname - fi -- test "$want_nocaseglob" = yes && nocaseglob=`shopt -p nocaseglob` -+ test yes = "$want_nocaseglob" && nocaseglob=`shopt -p nocaseglob` - for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do -- if test "$want_nocaseglob" = yes; then -+ if test yes = "$want_nocaseglob"; then - shopt -s nocaseglob - potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null` - $nocaseglob -@@ -7822,25 +9309,25 @@ - # We might still enter an endless loop, since a link - # loop can be closed while we follow links, - # but so what? -- potlib="$potent_lib" -+ potlib=$potent_lib - while test -h "$potlib" 2>/dev/null; do -- potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'` -+ potliblink=`ls -ld $potlib | $SED 's/.* -> //'` - case $potliblink in -- [\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";; -- *) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";; -+ [\\/]* | [A-Za-z]:[\\/]*) potlib=$potliblink;; -+ *) potlib=`$ECHO "$potlib" | $SED 's|[^/]*$||'`"$potliblink";; - esac - done - if eval $file_magic_cmd \"\$potlib\" 2>/dev/null | - $SED -e 10q | - $EGREP "$file_magic_regex" > /dev/null; then - func_append newdeplibs " $a_deplib" -- a_deplib="" -+ a_deplib= - break 2 - fi - done - done - fi -- if test -n "$a_deplib" ; then -+ if test -n "$a_deplib"; then - droppeddeps=yes - echo - $ECHO "*** Warning: linker path does not have real file for library $a_deplib." -@@ -7848,7 +9335,7 @@ - echo "*** you link to this library. But I can only do this if you have a" - echo "*** shared version of the library, which you do not appear to have" - echo "*** because I did check the linker path looking for a file starting" -- if test -z "$potlib" ; then -+ if test -z "$potlib"; then - $ECHO "*** with $libname but no candidates were found. (...for file magic test)" - else - $ECHO "*** with $libname and none of the candidates passed a file format test" -@@ -7871,30 +9358,30 @@ - -l*) - func_stripname -l '' "$a_deplib" - name=$func_stripname_result -- if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then -+ if test yes = "$allow_libtool_libs_with_static_runtimes"; then - case " $predeps $postdeps " in - *" $a_deplib "*) - func_append newdeplibs " $a_deplib" -- a_deplib="" -+ a_deplib= - ;; - esac - fi -- if test -n "$a_deplib" ; then -+ if test -n "$a_deplib"; then - libname=`eval "\\$ECHO \"$libname_spec\""` - for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do - potential_libs=`ls $i/$libname[.-]* 2>/dev/null` - for potent_lib in $potential_libs; do -- potlib="$potent_lib" # see symlink-check above in file_magic test -+ potlib=$potent_lib # see symlink-check above in file_magic test - if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \ - $EGREP "$match_pattern_regex" > /dev/null; then - func_append newdeplibs " $a_deplib" -- a_deplib="" -+ a_deplib= - break 2 - fi - done - done - fi -- if test -n "$a_deplib" ; then -+ if test -n "$a_deplib"; then - droppeddeps=yes - echo - $ECHO "*** Warning: linker path does not have real file for library $a_deplib." -@@ -7902,7 +9389,7 @@ - echo "*** you link to this library. But I can only do this if you have a" - echo "*** shared version of the library, which you do not appear to have" - echo "*** because I did check the linker path looking for a file starting" -- if test -z "$potlib" ; then -+ if test -z "$potlib"; then - $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)" - else - $ECHO "*** with $libname and none of the candidates passed a file format test" -@@ -7918,18 +9405,18 @@ - done # Gone through all deplibs. - ;; - none | unknown | *) -- newdeplibs="" -+ newdeplibs= - tmp_deplibs=`$ECHO " $deplibs" | $SED 's/ -lc$//; s/ -[LR][^ ]*//g'` -- if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then -- for i in $predeps $postdeps ; do -+ if test yes = "$allow_libtool_libs_with_static_runtimes"; then -+ for i in $predeps $postdeps; do - # can't use Xsed below, because $i might contain '/' -- tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s,$i,,"` -+ tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s|$i||"` - done - fi - case $tmp_deplibs in - *[!\ \ ]*) - echo -- if test "X$deplibs_check_method" = "Xnone"; then -+ if test none = "$deplibs_check_method"; then - echo "*** Warning: inter-library dependencies are not supported in this platform." - else - echo "*** Warning: inter-library dependencies are not known to be supported." -@@ -7953,8 +9440,8 @@ - ;; - esac - -- if test "$droppeddeps" = yes; then -- if test "$module" = yes; then -+ if test yes = "$droppeddeps"; then -+ if test yes = "$module"; then - echo - echo "*** Warning: libtool could not satisfy all declared inter-library" - $ECHO "*** dependencies of module $libname. Therefore, libtool will create" -@@ -7963,12 +9450,12 @@ - if test -z "$global_symbol_pipe"; then - echo - echo "*** However, this would only work if libtool was able to extract symbol" -- echo "*** lists from a program, using \`nm' or equivalent, but libtool could" -+ echo "*** lists from a program, using 'nm' or equivalent, but libtool could" - echo "*** not find such a program. So, this module is probably useless." -- echo "*** \`nm' from GNU binutils and a full rebuild may help." -+ echo "*** 'nm' from GNU binutils and a full rebuild may help." - fi -- if test "$build_old_libs" = no; then -- oldlibs="$output_objdir/$libname.$libext" -+ if test no = "$build_old_libs"; then -+ oldlibs=$output_objdir/$libname.$libext - build_libtool_libs=module - build_old_libs=yes - else -@@ -7979,14 +9466,14 @@ - echo "*** automatically added whenever a program is linked with this library" - echo "*** or is declared to -dlopen it." - -- if test "$allow_undefined" = no; then -+ if test no = "$allow_undefined"; then - echo - echo "*** Since this library must not contain undefined symbols," - echo "*** because either the platform does not support them or" - echo "*** it was explicitly requested with -no-undefined," - echo "*** libtool will only create a static version of it." -- if test "$build_old_libs" = no; then -- oldlibs="$output_objdir/$libname.$libext" -+ if test no = "$build_old_libs"; then -+ oldlibs=$output_objdir/$libname.$libext - build_libtool_libs=module - build_old_libs=yes - else -@@ -8032,7 +9519,7 @@ - *) func_append new_libs " $deplib" ;; - esac - done -- deplibs="$new_libs" -+ deplibs=$new_libs - - # All the library-specific variables (install_libdir is set above). - library_names= -@@ -8040,25 +9527,25 @@ - dlname= - - # Test again, we may have decided not to build it any more -- if test "$build_libtool_libs" = yes; then -- # Remove ${wl} instances when linking with ld. -+ if test yes = "$build_libtool_libs"; then -+ # Remove $wl instances when linking with ld. - # FIXME: should test the right _cmds variable. - case $archive_cmds in - *\$LD\ *) wl= ;; - esac -- if test "$hardcode_into_libs" = yes; then -+ if test yes = "$hardcode_into_libs"; then - # Hardcode the library paths - hardcode_libdirs= - dep_rpath= -- rpath="$finalize_rpath" -- test "$opt_mode" != relink && rpath="$compile_rpath$rpath" -+ rpath=$finalize_rpath -+ test relink = "$opt_mode" || rpath=$compile_rpath$rpath - for libdir in $rpath; do - if test -n "$hardcode_libdir_flag_spec"; then - if test -n "$hardcode_libdir_separator"; then - func_replace_sysroot "$libdir" - libdir=$func_replace_sysroot_result - if test -z "$hardcode_libdirs"; then -- hardcode_libdirs="$libdir" -+ hardcode_libdirs=$libdir - else - # Just accumulate the unique libdirs. - case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in -@@ -8083,7 +9570,7 @@ - # Substitute the hardcoded libdirs into the rpath. - if test -n "$hardcode_libdir_separator" && - test -n "$hardcode_libdirs"; then -- libdir="$hardcode_libdirs" -+ libdir=$hardcode_libdirs - eval "dep_rpath=\"$hardcode_libdir_flag_spec\"" - fi - if test -n "$runpath_var" && test -n "$perm_rpath"; then -@@ -8097,8 +9584,8 @@ - test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs" - fi - -- shlibpath="$finalize_shlibpath" -- test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath" -+ shlibpath=$finalize_shlibpath -+ test relink = "$opt_mode" || shlibpath=$compile_shlibpath$shlibpath - if test -n "$shlibpath"; then - eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var" - fi -@@ -8108,19 +9595,19 @@ - eval library_names=\"$library_names_spec\" - set dummy $library_names - shift -- realname="$1" -+ realname=$1 - shift - - if test -n "$soname_spec"; then - eval soname=\"$soname_spec\" - else -- soname="$realname" -+ soname=$realname - fi - if test -z "$dlname"; then - dlname=$soname - fi - -- lib="$output_objdir/$realname" -+ lib=$output_objdir/$realname - linknames= - for link - do -@@ -8134,40 +9621,40 @@ - delfiles= - if test -n "$export_symbols" && test -n "$include_expsyms"; then - $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp" -- export_symbols="$output_objdir/$libname.uexp" -+ export_symbols=$output_objdir/$libname.uexp - func_append delfiles " $export_symbols" - fi - - orig_export_symbols= - case $host_os in -- cygwin* | mingw* | cegcc*) -+ cygwin* | *msys* | mingw* | cegcc*) - if test -n "$export_symbols" && test -z "$export_symbols_regex"; then - # exporting using user supplied symfile -- if test "x`$SED 1q $export_symbols`" != xEXPORTS; then -+ func_dll_def_p "$export_symbols" || { - # and it's NOT already a .def file. Must figure out - # which of the given symbols are data symbols and tag - # them as such. So, trigger use of export_symbols_cmds. - # export_symbols gets reassigned inside the "prepare - # the list of exported symbols" if statement, so the - # include_expsyms logic still works. -- orig_export_symbols="$export_symbols" -+ orig_export_symbols=$export_symbols - export_symbols= - always_export_symbols=yes -- fi -+ } - fi - ;; - esac - - # Prepare the list of exported symbols - if test -z "$export_symbols"; then -- if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then -- func_verbose "generating symbol list for \`$libname.la'" -- export_symbols="$output_objdir/$libname.exp" -+ if test yes = "$always_export_symbols" || test -n "$export_symbols_regex"; then -+ func_verbose "generating symbol list for '$libname.la'" -+ export_symbols=$output_objdir/$libname.exp - $opt_dry_run || $RM $export_symbols - cmds=$export_symbols_cmds -- save_ifs="$IFS"; IFS='~' -+ save_ifs=$IFS; IFS='~' - for cmd1 in $cmds; do -- IFS="$save_ifs" -+ IFS=$save_ifs - # Take the normal branch if the nm_file_list_spec branch - # doesn't work or if tool conversion is not needed. - case $nm_file_list_spec~$to_tool_file_cmd in -@@ -8181,7 +9668,7 @@ - try_normal_branch=no - ;; - esac -- if test "$try_normal_branch" = yes \ -+ if test yes = "$try_normal_branch" \ - && { test "$len" -lt "$max_cmd_len" \ - || test "$max_cmd_len" -le -1; } - then -@@ -8192,7 +9679,7 @@ - output_la=$func_basename_result - save_libobjs=$libobjs - save_output=$output -- output=${output_objdir}/${output_la}.nm -+ output=$output_objdir/$output_la.nm - func_to_tool_file "$output" - libobjs=$nm_file_list_spec$func_to_tool_file_result - func_append delfiles " $output" -@@ -8215,8 +9702,8 @@ - break - fi - done -- IFS="$save_ifs" -- if test -n "$export_symbols_regex" && test "X$skipped_export" != "X:"; then -+ IFS=$save_ifs -+ if test -n "$export_symbols_regex" && test : != "$skipped_export"; then - func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"' - func_show_eval '$MV "${export_symbols}T" "$export_symbols"' - fi -@@ -8224,16 +9711,16 @@ - fi - - if test -n "$export_symbols" && test -n "$include_expsyms"; then -- tmp_export_symbols="$export_symbols" -- test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" -+ tmp_export_symbols=$export_symbols -+ test -n "$orig_export_symbols" && tmp_export_symbols=$orig_export_symbols - $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' - fi - -- if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then -+ if test : != "$skipped_export" && test -n "$orig_export_symbols"; then - # The given exports_symbols file has to be filtered, so filter it. -- func_verbose "filter symbol list for \`$libname.la' to tag DATA exports" -+ func_verbose "filter symbol list for '$libname.la' to tag DATA exports" - # FIXME: $output_objdir/$libname.filter potentially contains lots of -- # 's' commands which not all seds can handle. GNU sed should be fine -+ # 's' commands, which not all seds can handle. GNU sed should be fine - # though. Also, the filter scales superlinearly with the number of - # global variables. join(1) would be nice here, but unfortunately - # isn't a blessed tool. -@@ -8252,11 +9739,11 @@ - ;; - esac - done -- deplibs="$tmp_deplibs" -+ deplibs=$tmp_deplibs - - if test -n "$convenience"; then - if test -n "$whole_archive_flag_spec" && -- test "$compiler_needs_object" = yes && -+ test yes = "$compiler_needs_object" && - test -z "$libobjs"; then - # extract the archives, so we have objects to list. - # TODO: could optimize this to just extract one archive. -@@ -8267,7 +9754,7 @@ - eval libobjs=\"\$libobjs $whole_archive_flag_spec\" - test "X$libobjs" = "X " && libobjs= - else -- gentop="$output_objdir/${outputname}x" -+ gentop=$output_objdir/${outputname}x - func_append generated " $gentop" - - func_extract_archives $gentop $convenience -@@ -8276,18 +9763,18 @@ - fi - fi - -- if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then -+ if test yes = "$thread_safe" && test -n "$thread_safe_flag_spec"; then - eval flag=\"$thread_safe_flag_spec\" - func_append linker_flags " $flag" - fi - - # Make a backup of the uninstalled library when relinking -- if test "$opt_mode" = relink; then -+ if test relink = "$opt_mode"; then - $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $? - fi - - # Do each of the archive commands. -- if test "$module" = yes && test -n "$module_cmds" ; then -+ if test yes = "$module" && test -n "$module_cmds"; then - if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then - eval test_cmds=\"$module_expsym_cmds\" - cmds=$module_expsym_cmds -@@ -8305,7 +9792,7 @@ - fi - fi - -- if test "X$skipped_export" != "X:" && -+ if test : != "$skipped_export" && - func_len " $test_cmds" && - len=$func_len_result && - test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then -@@ -8338,8 +9825,8 @@ - last_robj= - k=1 - -- if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then -- output=${output_objdir}/${output_la}.lnkscript -+ if test -n "$save_libobjs" && test : != "$skipped_export" && test yes = "$with_gnu_ld"; then -+ output=$output_objdir/$output_la.lnkscript - func_verbose "creating GNU ld script: $output" - echo 'INPUT (' > $output - for obj in $save_libobjs -@@ -8351,14 +9838,14 @@ - func_append delfiles " $output" - func_to_tool_file "$output" - output=$func_to_tool_file_result -- elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then -- output=${output_objdir}/${output_la}.lnk -+ elif test -n "$save_libobjs" && test : != "$skipped_export" && test -n "$file_list_spec"; then -+ output=$output_objdir/$output_la.lnk - func_verbose "creating linker input file list: $output" - : > $output - set x $save_libobjs - shift - firstobj= -- if test "$compiler_needs_object" = yes; then -+ if test yes = "$compiler_needs_object"; then - firstobj="$1 " - shift - fi -@@ -8373,7 +9860,7 @@ - else - if test -n "$save_libobjs"; then - func_verbose "creating reloadable object files..." -- output=$output_objdir/$output_la-${k}.$objext -+ output=$output_objdir/$output_la-$k.$objext - eval test_cmds=\"$reload_cmds\" - func_len " $test_cmds" - len0=$func_len_result -@@ -8385,13 +9872,13 @@ - func_len " $obj" - func_arith $len + $func_len_result - len=$func_arith_result -- if test "X$objlist" = X || -+ if test -z "$objlist" || - test "$len" -lt "$max_cmd_len"; then - func_append objlist " $obj" - else - # The command $test_cmds is almost too long, add a - # command to the queue. -- if test "$k" -eq 1 ; then -+ if test 1 -eq "$k"; then - # The first file doesn't have a previous command to add. - reload_objs=$objlist - eval concat_cmds=\"$reload_cmds\" -@@ -8401,10 +9888,10 @@ - reload_objs="$objlist $last_robj" - eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\" - fi -- last_robj=$output_objdir/$output_la-${k}.$objext -+ last_robj=$output_objdir/$output_la-$k.$objext - func_arith $k + 1 - k=$func_arith_result -- output=$output_objdir/$output_la-${k}.$objext -+ output=$output_objdir/$output_la-$k.$objext - objlist=" $obj" - func_len " $last_robj" - func_arith $len0 + $func_len_result -@@ -8416,9 +9903,9 @@ - # files will link in the last one created. - test -z "$concat_cmds" || concat_cmds=$concat_cmds~ - reload_objs="$objlist $last_robj" -- eval concat_cmds=\"\${concat_cmds}$reload_cmds\" -+ eval concat_cmds=\"\$concat_cmds$reload_cmds\" - if test -n "$last_robj"; then -- eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\" -+ eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\" - fi - func_append delfiles " $output" - -@@ -8426,9 +9913,9 @@ - output= - fi - -- if ${skipped_export-false}; then -- func_verbose "generating symbol list for \`$libname.la'" -- export_symbols="$output_objdir/$libname.exp" -+ ${skipped_export-false} && { -+ func_verbose "generating symbol list for '$libname.la'" -+ export_symbols=$output_objdir/$libname.exp - $opt_dry_run || $RM $export_symbols - libobjs=$output - # Append the command to create the export file. -@@ -8437,16 +9924,16 @@ - if test -n "$last_robj"; then - eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\" - fi -- fi -+ } - - test -n "$save_libobjs" && - func_verbose "creating a temporary reloadable object file: $output" - - # Loop through the commands generated above and execute them. -- save_ifs="$IFS"; IFS='~' -+ save_ifs=$IFS; IFS='~' - for cmd in $concat_cmds; do -- IFS="$save_ifs" -- $opt_silent || { -+ IFS=$save_ifs -+ $opt_quiet || { - func_quote_for_expand "$cmd" - eval "func_echo $func_quote_for_expand_result" - } -@@ -8454,7 +9941,7 @@ - lt_exit=$? - - # Restore the uninstalled library and exit -- if test "$opt_mode" = relink; then -+ if test relink = "$opt_mode"; then - ( cd "$output_objdir" && \ - $RM "${realname}T" && \ - $MV "${realname}U" "$realname" ) -@@ -8463,7 +9950,7 @@ - exit $lt_exit - } - done -- IFS="$save_ifs" -+ IFS=$save_ifs - - if test -n "$export_symbols_regex" && ${skipped_export-false}; then - func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"' -@@ -8471,18 +9958,18 @@ - fi - fi - -- if ${skipped_export-false}; then -+ ${skipped_export-false} && { - if test -n "$export_symbols" && test -n "$include_expsyms"; then -- tmp_export_symbols="$export_symbols" -- test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" -+ tmp_export_symbols=$export_symbols -+ test -n "$orig_export_symbols" && tmp_export_symbols=$orig_export_symbols - $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' - fi - - if test -n "$orig_export_symbols"; then - # The given exports_symbols file has to be filtered, so filter it. -- func_verbose "filter symbol list for \`$libname.la' to tag DATA exports" -+ func_verbose "filter symbol list for '$libname.la' to tag DATA exports" - # FIXME: $output_objdir/$libname.filter potentially contains lots of -- # 's' commands which not all seds can handle. GNU sed should be fine -+ # 's' commands, which not all seds can handle. GNU sed should be fine - # though. Also, the filter scales superlinearly with the number of - # global variables. join(1) would be nice here, but unfortunately - # isn't a blessed tool. -@@ -8491,7 +9978,7 @@ - export_symbols=$output_objdir/$libname.def - $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols - fi -- fi -+ } - - libobjs=$output - # Restore the value of output. -@@ -8505,7 +9992,7 @@ - # value of $libobjs for piecewise linking. - - # Do each of the archive commands. -- if test "$module" = yes && test -n "$module_cmds" ; then -+ if test yes = "$module" && test -n "$module_cmds"; then - if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then - cmds=$module_expsym_cmds - else -@@ -8527,7 +10014,7 @@ - - # Add any objects from preloaded convenience libraries - if test -n "$dlprefiles"; then -- gentop="$output_objdir/${outputname}x" -+ gentop=$output_objdir/${outputname}x - func_append generated " $gentop" - - func_extract_archives $gentop $dlprefiles -@@ -8535,11 +10022,12 @@ - test "X$libobjs" = "X " && libobjs= - fi - -- save_ifs="$IFS"; IFS='~' -+ save_ifs=$IFS; IFS='~' - for cmd in $cmds; do -- IFS="$save_ifs" -+ IFS=$sp$nl - eval cmd=\"$cmd\" -- $opt_silent || { -+ IFS=$save_ifs -+ $opt_quiet || { - func_quote_for_expand "$cmd" - eval "func_echo $func_quote_for_expand_result" - } -@@ -8547,7 +10035,7 @@ - lt_exit=$? - - # Restore the uninstalled library and exit -- if test "$opt_mode" = relink; then -+ if test relink = "$opt_mode"; then - ( cd "$output_objdir" && \ - $RM "${realname}T" && \ - $MV "${realname}U" "$realname" ) -@@ -8556,10 +10044,10 @@ - exit $lt_exit - } - done -- IFS="$save_ifs" -+ IFS=$save_ifs - - # Restore the uninstalled library and exit -- if test "$opt_mode" = relink; then -+ if test relink = "$opt_mode"; then - $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $? - - if test -n "$convenience"; then -@@ -8579,39 +10067,39 @@ - done - - # If -module or -export-dynamic was specified, set the dlname. -- if test "$module" = yes || test "$export_dynamic" = yes; then -+ if test yes = "$module" || test yes = "$export_dynamic"; then - # On all known operating systems, these are identical. -- dlname="$soname" -+ dlname=$soname - fi - fi - ;; - - obj) -- if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then -- func_warning "\`-dlopen' is ignored for objects" -+ if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then -+ func_warning "'-dlopen' is ignored for objects" - fi - - case " $deplibs" in - *\ -l* | *\ -L*) -- func_warning "\`-l' and \`-L' are ignored for objects" ;; -+ func_warning "'-l' and '-L' are ignored for objects" ;; - esac - - test -n "$rpath" && \ -- func_warning "\`-rpath' is ignored for objects" -+ func_warning "'-rpath' is ignored for objects" - - test -n "$xrpath" && \ -- func_warning "\`-R' is ignored for objects" -+ func_warning "'-R' is ignored for objects" - - test -n "$vinfo" && \ -- func_warning "\`-version-info' is ignored for objects" -+ func_warning "'-version-info' is ignored for objects" - - test -n "$release" && \ -- func_warning "\`-release' is ignored for objects" -+ func_warning "'-release' is ignored for objects" - - case $output in - *.lo) - test -n "$objs$old_deplibs" && \ -- func_fatal_error "cannot build library object \`$output' from non-libtool objects" -+ func_fatal_error "cannot build library object '$output' from non-libtool objects" - - libobj=$output - func_lo2o "$libobj" -@@ -8619,7 +10107,7 @@ - ;; - *) - libobj= -- obj="$output" -+ obj=$output - ;; - esac - -@@ -8632,17 +10120,19 @@ - # the extraction. - reload_conv_objs= - gentop= -- # reload_cmds runs $LD directly, so let us get rid of -- # -Wl from whole_archive_flag_spec and hope we can get by with -- # turning comma into space.. -- wl= -- -+ # if reload_cmds runs $LD directly, get rid of -Wl from -+ # whole_archive_flag_spec and hope we can get by with turning comma -+ # into space. -+ case $reload_cmds in -+ *\$LD[\ \$]*) wl= ;; -+ esac - if test -n "$convenience"; then - if test -n "$whole_archive_flag_spec"; then - eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\" -- reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'` -+ test -n "$wl" || tmp_whole_archive_flags=`$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'` -+ reload_conv_objs=$reload_objs\ $tmp_whole_archive_flags - else -- gentop="$output_objdir/${obj}x" -+ gentop=$output_objdir/${obj}x - func_append generated " $gentop" - - func_extract_archives $gentop $convenience -@@ -8651,12 +10141,12 @@ - fi - - # If we're not building shared, we need to use non_pic_objs -- test "$build_libtool_libs" != yes && libobjs="$non_pic_objects" -+ test yes = "$build_libtool_libs" || libobjs=$non_pic_objects - - # Create the old-style object. -- reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test -+ reload_objs=$objs$old_deplibs' '`$ECHO "$libobjs" | $SP2NL | $SED "/\.$libext$/d; /\.lib$/d; $lo2o" | $NL2SP`' '$reload_conv_objs - -- output="$obj" -+ output=$obj - func_execute_cmds "$reload_cmds" 'exit $?' - - # Exit if we aren't doing a library object file. -@@ -8668,7 +10158,7 @@ - exit $EXIT_SUCCESS - fi - -- if test "$build_libtool_libs" != yes; then -+ test yes = "$build_libtool_libs" || { - if test -n "$gentop"; then - func_show_eval '${RM}r "$gentop"' - fi -@@ -8678,12 +10168,12 @@ - # $show "echo timestamp > $libobj" - # $opt_dry_run || eval "echo timestamp > $libobj" || exit $? - exit $EXIT_SUCCESS -- fi -+ } - -- if test -n "$pic_flag" || test "$pic_mode" != default; then -+ if test -n "$pic_flag" || test default != "$pic_mode"; then - # Only do commands if we really have different PIC objects. - reload_objs="$libobjs $reload_conv_objs" -- output="$libobj" -+ output=$libobj - func_execute_cmds "$reload_cmds" 'exit $?' - fi - -@@ -8696,20 +10186,18 @@ - - prog) - case $host in -- *cygwin*) func_stripname '' '.exe' "$output" -+ *cygwin* | *msys*) func_stripname '' '.exe' "$output" - output=$func_stripname_result.exe;; - esac - test -n "$vinfo" && \ -- func_warning "\`-version-info' is ignored for programs" -+ func_warning "'-version-info' is ignored for programs" - - test -n "$release" && \ -- func_warning "\`-release' is ignored for programs" -+ func_warning "'-release' is ignored for programs" - -- test "$preload" = yes \ -- && test "$dlopen_support" = unknown \ -- && test "$dlopen_self" = unknown \ -- && test "$dlopen_self_static" = unknown && \ -- func_warning "\`LT_INIT([dlopen])' not used. Assuming no dlopen support." -+ $preload \ -+ && test unknown,unknown,unknown = "$dlopen_support,$dlopen_self,$dlopen_self_static" \ -+ && func_warning "'LT_INIT([dlopen])' not used. Assuming no dlopen support." - - case $host in - *-*-rhapsody* | *-*-darwin1.[012]) -@@ -8723,11 +10211,11 @@ - *-*-darwin*) - # Don't allow lazy linking, it breaks C++ global constructors - # But is supposedly fixed on 10.4 or later (yay!). -- if test "$tagname" = CXX ; then -+ if test CXX = "$tagname"; then - case ${MACOSX_DEPLOYMENT_TARGET-10.0} in - 10.[0123]) -- func_append compile_command " ${wl}-bind_at_load" -- func_append finalize_command " ${wl}-bind_at_load" -+ func_append compile_command " $wl-bind_at_load" -+ func_append finalize_command " $wl-bind_at_load" - ;; - esac - fi -@@ -8763,7 +10251,7 @@ - *) func_append new_libs " $deplib" ;; - esac - done -- compile_deplibs="$new_libs" -+ compile_deplibs=$new_libs - - - func_append compile_command " $compile_deplibs" -@@ -8787,7 +10275,7 @@ - if test -n "$hardcode_libdir_flag_spec"; then - if test -n "$hardcode_libdir_separator"; then - if test -z "$hardcode_libdirs"; then -- hardcode_libdirs="$libdir" -+ hardcode_libdirs=$libdir - else - # Just accumulate the unique libdirs. - case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in -@@ -8809,8 +10297,8 @@ - esac - fi - case $host in -- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) -- testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'` -+ *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) -+ testbindir=`$ECHO "$libdir" | $SED -e 's*/lib$*/bin*'` - case :$dllsearchpath: in - *":$libdir:"*) ;; - ::) dllsearchpath=$libdir;; -@@ -8827,10 +10315,10 @@ - # Substitute the hardcoded libdirs into the rpath. - if test -n "$hardcode_libdir_separator" && - test -n "$hardcode_libdirs"; then -- libdir="$hardcode_libdirs" -+ libdir=$hardcode_libdirs - eval rpath=\" $hardcode_libdir_flag_spec\" - fi -- compile_rpath="$rpath" -+ compile_rpath=$rpath - - rpath= - hardcode_libdirs= -@@ -8838,7 +10326,7 @@ - if test -n "$hardcode_libdir_flag_spec"; then - if test -n "$hardcode_libdir_separator"; then - if test -z "$hardcode_libdirs"; then -- hardcode_libdirs="$libdir" -+ hardcode_libdirs=$libdir - else - # Just accumulate the unique libdirs. - case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in -@@ -8863,45 +10351,43 @@ - # Substitute the hardcoded libdirs into the rpath. - if test -n "$hardcode_libdir_separator" && - test -n "$hardcode_libdirs"; then -- libdir="$hardcode_libdirs" -+ libdir=$hardcode_libdirs - eval rpath=\" $hardcode_libdir_flag_spec\" - fi -- finalize_rpath="$rpath" -+ finalize_rpath=$rpath - -- if test -n "$libobjs" && test "$build_old_libs" = yes; then -+ if test -n "$libobjs" && test yes = "$build_old_libs"; then - # Transform all the library objects into standard objects. - compile_command=`$ECHO "$compile_command" | $SP2NL | $SED "$lo2o" | $NL2SP` - finalize_command=`$ECHO "$finalize_command" | $SP2NL | $SED "$lo2o" | $NL2SP` - fi - -- func_generate_dlsyms "$outputname" "@PROGRAM@" "no" -+ func_generate_dlsyms "$outputname" "@PROGRAM@" false - - # template prelinking step - if test -n "$prelink_cmds"; then - func_execute_cmds "$prelink_cmds" 'exit $?' - fi - -- wrappers_required=yes -+ wrappers_required=: - case $host in - *cegcc* | *mingw32ce*) - # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway. -- wrappers_required=no -+ wrappers_required=false - ;; -- *cygwin* | *mingw* ) -- if test "$build_libtool_libs" != yes; then -- wrappers_required=no -- fi -+ *cygwin* | *msys* | *mingw* ) -+ test yes = "$build_libtool_libs" || wrappers_required=false - ;; - *) -- if test "$need_relink" = no || test "$build_libtool_libs" != yes; then -- wrappers_required=no -+ if test no = "$need_relink" || test yes != "$build_libtool_libs"; then -+ wrappers_required=false - fi - ;; - esac -- if test "$wrappers_required" = no; then -+ $wrappers_required || { - # Replace the output file specification. - compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'` -- link_command="$compile_command$compile_rpath" -+ link_command=$compile_command$compile_rpath - - # We have no uninstalled library dependencies, so finalize right now. - exit_status=0 -@@ -8914,12 +10400,12 @@ - fi - - # Delete the generated files. -- if test -f "$output_objdir/${outputname}S.${objext}"; then -- func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"' -+ if test -f "$output_objdir/${outputname}S.$objext"; then -+ func_show_eval '$RM "$output_objdir/${outputname}S.$objext"' - fi - - exit $exit_status -- fi -+ } - - if test -n "$compile_shlibpath$finalize_shlibpath"; then - compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command" -@@ -8949,9 +10435,9 @@ - fi - fi - -- if test "$no_install" = yes; then -+ if test yes = "$no_install"; then - # We don't need to create a wrapper script. -- link_command="$compile_var$compile_command$compile_rpath" -+ link_command=$compile_var$compile_command$compile_rpath - # Replace the output file specification. - link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'` - # Delete the old output file. -@@ -8968,27 +10454,28 @@ - exit $EXIT_SUCCESS - fi - -- if test "$hardcode_action" = relink; then -- # Fast installation is not supported -- link_command="$compile_var$compile_command$compile_rpath" -- relink_command="$finalize_var$finalize_command$finalize_rpath" -+ case $hardcode_action,$fast_install in -+ relink,*) -+ # Fast installation is not supported -+ link_command=$compile_var$compile_command$compile_rpath -+ relink_command=$finalize_var$finalize_command$finalize_rpath - -- func_warning "this platform does not like uninstalled shared libraries" -- func_warning "\`$output' will be relinked during installation" -- else -- if test "$fast_install" != no; then -- link_command="$finalize_var$compile_command$finalize_rpath" -- if test "$fast_install" = yes; then -- relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'` -- else -- # fast_install is set to needless -- relink_command= -- fi -- else -- link_command="$compile_var$compile_command$compile_rpath" -- relink_command="$finalize_var$finalize_command$finalize_rpath" -- fi -- fi -+ func_warning "this platform does not like uninstalled shared libraries" -+ func_warning "'$output' will be relinked during installation" -+ ;; -+ *,yes) -+ link_command=$finalize_var$compile_command$finalize_rpath -+ relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'` -+ ;; -+ *,no) -+ link_command=$compile_var$compile_command$compile_rpath -+ relink_command=$finalize_var$finalize_command$finalize_rpath -+ ;; -+ *,needless) -+ link_command=$finalize_var$compile_command$finalize_rpath -+ relink_command= -+ ;; -+ esac - - # Replace the output file specification. - link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'` -@@ -9034,19 +10521,19 @@ - esac - # test for cygwin because mv fails w/o .exe extensions - case $host in -- *cygwin*) -+ *cygwin* | *msys*) - exeext=.exe - func_stripname '' '.exe' "$outputname" - outputname=$func_stripname_result ;; - *) exeext= ;; - esac - case $host in -- *cygwin* | *mingw* ) -+ *cygwin* | *msys* | *mingw* ) - func_dirname_and_basename "$output" "" "." - output_name=$func_basename_result - output_path=$func_dirname_result -- cwrappersource="$output_path/$objdir/lt-$output_name.c" -- cwrapper="$output_path/$output_name.exe" -+ cwrappersource=$output_path/$objdir/lt-$output_name.c -+ cwrapper=$output_path/$output_name.exe - $RM $cwrappersource $cwrapper - trap "$RM $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15 - -@@ -9067,7 +10554,7 @@ - trap "$RM $func_ltwrapper_scriptname_result; exit $EXIT_FAILURE" 1 2 15 - $opt_dry_run || { - # note: this script will not be executed, so do not chmod. -- if test "x$build" = "x$host" ; then -+ if test "x$build" = "x$host"; then - $cwrapper --lt-dump-script > $func_ltwrapper_scriptname_result - else - func_emit_wrapper no > $func_ltwrapper_scriptname_result -@@ -9090,25 +10577,27 @@ - # See if we need to build an old-fashioned archive. - for oldlib in $oldlibs; do - -- if test "$build_libtool_libs" = convenience; then -- oldobjs="$libobjs_save $symfileobj" -- addlibs="$convenience" -- build_libtool_libs=no -- else -- if test "$build_libtool_libs" = module; then -- oldobjs="$libobjs_save" -+ case $build_libtool_libs in -+ convenience) -+ oldobjs="$libobjs_save $symfileobj" -+ addlibs=$convenience - build_libtool_libs=no -- else -+ ;; -+ module) -+ oldobjs=$libobjs_save -+ addlibs=$old_convenience -+ build_libtool_libs=no -+ ;; -+ *) - oldobjs="$old_deplibs $non_pic_objects" -- if test "$preload" = yes && test -f "$symfileobj"; then -- func_append oldobjs " $symfileobj" -- fi -- fi -- addlibs="$old_convenience" -- fi -+ $preload && test -f "$symfileobj" \ -+ && func_append oldobjs " $symfileobj" -+ addlibs=$old_convenience -+ ;; -+ esac - - if test -n "$addlibs"; then -- gentop="$output_objdir/${outputname}x" -+ gentop=$output_objdir/${outputname}x - func_append generated " $gentop" - - func_extract_archives $gentop $addlibs -@@ -9116,13 +10605,13 @@ - fi - - # Do each command in the archive commands. -- if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then -+ if test -n "$old_archive_from_new_cmds" && test yes = "$build_libtool_libs"; then - cmds=$old_archive_from_new_cmds - else - - # Add any objects from preloaded convenience libraries - if test -n "$dlprefiles"; then -- gentop="$output_objdir/${outputname}x" -+ gentop=$output_objdir/${outputname}x - func_append generated " $gentop" - - func_extract_archives $gentop $dlprefiles -@@ -9143,7 +10632,7 @@ - : - else - echo "copying selected object files to avoid basename conflicts..." -- gentop="$output_objdir/${outputname}x" -+ gentop=$output_objdir/${outputname}x - func_append generated " $gentop" - func_mkdir_p "$gentop" - save_oldobjs=$oldobjs -@@ -9152,7 +10641,7 @@ - for obj in $save_oldobjs - do - func_basename "$obj" -- objbase="$func_basename_result" -+ objbase=$func_basename_result - case " $oldobjs " in - " ") oldobjs=$obj ;; - *[\ /]"$objbase "*) -@@ -9221,18 +10710,18 @@ - else - # the above command should be used before it gets too long - oldobjs=$objlist -- if test "$obj" = "$last_oldobj" ; then -+ if test "$obj" = "$last_oldobj"; then - RANLIB=$save_RANLIB - fi - test -z "$concat_cmds" || concat_cmds=$concat_cmds~ -- eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\" -+ eval concat_cmds=\"\$concat_cmds$old_archive_cmds\" - objlist= - len=$len0 - fi - done - RANLIB=$save_RANLIB - oldobjs=$objlist -- if test "X$oldobjs" = "X" ; then -+ if test -z "$oldobjs"; then - eval cmds=\"\$concat_cmds\" - else - eval cmds=\"\$concat_cmds~\$old_archive_cmds\" -@@ -9249,7 +10738,7 @@ - case $output in - *.la) - old_library= -- test "$build_old_libs" = yes && old_library="$libname.$libext" -+ test yes = "$build_old_libs" && old_library=$libname.$libext - func_verbose "creating $output" - - # Preserve any variables that may affect compiler behavior -@@ -9264,31 +10753,31 @@ - fi - done - # Quote the link command for shipping. -- relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)" -+ relink_command="(cd `pwd`; $SHELL \"$progpath\" $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)" - relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"` -- if test "$hardcode_automatic" = yes ; then -+ if test yes = "$hardcode_automatic"; then - relink_command= - fi - - # Only create the output if not a dry run. - $opt_dry_run || { - for installed in no yes; do -- if test "$installed" = yes; then -+ if test yes = "$installed"; then - if test -z "$install_libdir"; then - break - fi -- output="$output_objdir/$outputname"i -+ output=$output_objdir/${outputname}i - # Replace all uninstalled libtool libraries with the installed ones - newdependency_libs= - for deplib in $dependency_libs; do - case $deplib in - *.la) - func_basename "$deplib" -- name="$func_basename_result" -+ name=$func_basename_result - func_resolve_sysroot "$deplib" -- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` -+ eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` - test -z "$libdir" && \ -- func_fatal_error "\`$deplib' is not a valid libtool archive" -+ func_fatal_error "'$deplib' is not a valid libtool archive" - func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name" - ;; - -L*) -@@ -9304,23 +10793,23 @@ - *) func_append newdependency_libs " $deplib" ;; - esac - done -- dependency_libs="$newdependency_libs" -+ dependency_libs=$newdependency_libs - newdlfiles= - - for lib in $dlfiles; do - case $lib in - *.la) - func_basename "$lib" -- name="$func_basename_result" -- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` -+ name=$func_basename_result -+ eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $lib` - test -z "$libdir" && \ -- func_fatal_error "\`$lib' is not a valid libtool archive" -+ func_fatal_error "'$lib' is not a valid libtool archive" - func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name" - ;; - *) func_append newdlfiles " $lib" ;; - esac - done -- dlfiles="$newdlfiles" -+ dlfiles=$newdlfiles - newdlprefiles= - for lib in $dlprefiles; do - case $lib in -@@ -9330,34 +10819,34 @@ - # didn't already link the preopened objects directly into - # the library: - func_basename "$lib" -- name="$func_basename_result" -- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` -+ name=$func_basename_result -+ eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $lib` - test -z "$libdir" && \ -- func_fatal_error "\`$lib' is not a valid libtool archive" -+ func_fatal_error "'$lib' is not a valid libtool archive" - func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name" - ;; - esac - done -- dlprefiles="$newdlprefiles" -+ dlprefiles=$newdlprefiles - else - newdlfiles= - for lib in $dlfiles; do - case $lib in -- [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; -+ [\\/]* | [A-Za-z]:[\\/]*) abs=$lib ;; - *) abs=`pwd`"/$lib" ;; - esac - func_append newdlfiles " $abs" - done -- dlfiles="$newdlfiles" -+ dlfiles=$newdlfiles - newdlprefiles= - for lib in $dlprefiles; do - case $lib in -- [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; -+ [\\/]* | [A-Za-z]:[\\/]*) abs=$lib ;; - *) abs=`pwd`"/$lib" ;; - esac - func_append newdlprefiles " $abs" - done -- dlprefiles="$newdlprefiles" -+ dlprefiles=$newdlprefiles - fi - $RM $output - # place dlname in correct position for cygwin -@@ -9371,12 +10860,11 @@ - # tests/bindir.at for full details. - tdlname=$dlname - case $host,$output,$installed,$module,$dlname in -- *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) -+ *cygwin*,*lai,yes,no,*.dll | *msys*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) - # If a -bindir argument was supplied, place the dll there. -- if test "x$bindir" != x ; -- then -+ if test -n "$bindir"; then - func_relative_path "$install_libdir" "$bindir" -- tdlname=$func_relative_path_result$dlname -+ tdlname=$func_relative_path_result/$dlname - else - # Otherwise fall back on heuristic. - tdlname=../bin/$dlname -@@ -9385,7 +10873,7 @@ - esac - $ECHO > $output "\ - # $outputname - a libtool library file --# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION -+# Generated by $PROGRAM (GNU $PACKAGE) $VERSION - # - # Please DO NOT delete this file! - # It is necessary for linking the library. -@@ -9399,7 +10887,7 @@ - # The name of the static archive. - old_library='$old_library' - --# Linker flags that can not go in dependency_libs. -+# Linker flags that cannot go in dependency_libs. - inherited_linker_flags='$new_inherited_linker_flags' - - # Libraries that this one depends upon. -@@ -9425,7 +10913,7 @@ - - # Directory that this library needs to be installed in: - libdir='$install_libdir'" -- if test "$installed" = no && test "$need_relink" = yes; then -+ if test no,yes = "$installed,$need_relink"; then - $ECHO >> $output "\ - relink_command=\"$relink_command\"" - fi -@@ -9440,27 +10928,29 @@ - exit $EXIT_SUCCESS - } - --{ test "$opt_mode" = link || test "$opt_mode" = relink; } && -- func_mode_link ${1+"$@"} -+if test link = "$opt_mode" || test relink = "$opt_mode"; then -+ func_mode_link ${1+"$@"} -+fi - - - # func_mode_uninstall arg... - func_mode_uninstall () - { -- $opt_debug -- RM="$nonopt" -+ $debug_cmd -+ -+ RM=$nonopt - files= -- rmforce= -+ rmforce=false - exit_status=0 - - # This variable tells wrapper scripts just to set variables rather - # than running their programs. -- libtool_install_magic="$magic" -+ libtool_install_magic=$magic - - for arg - do - case $arg in -- -f) func_append RM " $arg"; rmforce=yes ;; -+ -f) func_append RM " $arg"; rmforce=: ;; - -*) func_append RM " $arg" ;; - *) func_append files " $arg" ;; - esac -@@ -9473,18 +10963,18 @@ - - for file in $files; do - func_dirname "$file" "" "." -- dir="$func_dirname_result" -- if test "X$dir" = X.; then -- odir="$objdir" -+ dir=$func_dirname_result -+ if test . = "$dir"; then -+ odir=$objdir - else -- odir="$dir/$objdir" -+ odir=$dir/$objdir - fi - func_basename "$file" -- name="$func_basename_result" -- test "$opt_mode" = uninstall && odir="$dir" -+ name=$func_basename_result -+ test uninstall = "$opt_mode" && odir=$dir - - # Remember odir for removal later, being careful to avoid duplicates -- if test "$opt_mode" = clean; then -+ if test clean = "$opt_mode"; then - case " $rmdirs " in - *" $odir "*) ;; - *) func_append rmdirs " $odir" ;; -@@ -9499,11 +10989,11 @@ - elif test -d "$file"; then - exit_status=1 - continue -- elif test "$rmforce" = yes; then -+ elif $rmforce; then - continue - fi - -- rmfiles="$file" -+ rmfiles=$file - - case $name in - *.la) -@@ -9517,7 +11007,7 @@ - done - test -n "$old_library" && func_append rmfiles " $odir/$old_library" - -- case "$opt_mode" in -+ case $opt_mode in - clean) - case " $library_names " in - *" $dlname "*) ;; -@@ -9528,12 +11018,12 @@ - uninstall) - if test -n "$library_names"; then - # Do each command in the postuninstall commands. -- func_execute_cmds "$postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1' -+ func_execute_cmds "$postuninstall_cmds" '$rmforce || exit_status=1' - fi - - if test -n "$old_library"; then - # Do each command in the old_postuninstall commands. -- func_execute_cmds "$old_postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1' -+ func_execute_cmds "$old_postuninstall_cmds" '$rmforce || exit_status=1' - fi - # FIXME: should reinstall the best remaining shared library. - ;; -@@ -9549,21 +11039,19 @@ - func_source $dir/$name - - # Add PIC object to the list of files to remove. -- if test -n "$pic_object" && -- test "$pic_object" != none; then -+ if test -n "$pic_object" && test none != "$pic_object"; then - func_append rmfiles " $dir/$pic_object" - fi - - # Add non-PIC object to the list of files to remove. -- if test -n "$non_pic_object" && -- test "$non_pic_object" != none; then -+ if test -n "$non_pic_object" && test none != "$non_pic_object"; then - func_append rmfiles " $dir/$non_pic_object" - fi - fi - ;; - - *) -- if test "$opt_mode" = clean ; then -+ if test clean = "$opt_mode"; then - noexename=$name - case $file in - *.exe) -@@ -9590,12 +11078,12 @@ - - # note $name still contains .exe if it was in $file originally - # as does the version of $file that was added into $rmfiles -- func_append rmfiles " $odir/$name $odir/${name}S.${objext}" -- if test "$fast_install" = yes && test -n "$relink_command"; then -+ func_append rmfiles " $odir/$name $odir/${name}S.$objext" -+ if test yes = "$fast_install" && test -n "$relink_command"; then - func_append rmfiles " $odir/lt-$name" - fi -- if test "X$noexename" != "X$name" ; then -- func_append rmfiles " $odir/lt-${noexename}.c" -+ if test "X$noexename" != "X$name"; then -+ func_append rmfiles " $odir/lt-$noexename.c" - fi - fi - fi -@@ -9604,7 +11092,7 @@ - func_show_eval "$RM $rmfiles" 'exit_status=1' - done - -- # Try to remove the ${objdir}s in the directories where we deleted files -+ # Try to remove the $objdir's in the directories where we deleted files - for dir in $rmdirs; do - if test -d "$dir"; then - func_show_eval "rmdir $dir >/dev/null 2>&1" -@@ -9614,16 +11102,17 @@ - exit $exit_status - } - --{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } && -- func_mode_uninstall ${1+"$@"} -+if test uninstall = "$opt_mode" || test clean = "$opt_mode"; then -+ func_mode_uninstall ${1+"$@"} -+fi - - test -z "$opt_mode" && { -- help="$generic_help" -+ help=$generic_help - func_fatal_help "you must specify a MODE" - } - - test -z "$exec_cmd" && \ -- func_fatal_help "invalid operation mode \`$opt_mode'" -+ func_fatal_help "invalid operation mode '$opt_mode'" - - if test -n "$exec_cmd"; then - eval exec "$exec_cmd" -@@ -9634,7 +11123,7 @@ - - - # The TAGs below are defined such that we never get into a situation --# in which we disable both kinds of libraries. Given conflicting -+# where we disable both kinds of libraries. Given conflicting - # choices, we go for a static library, that is the most portable, - # since we can't tell whether shared libraries were disabled because - # the user asked for that or because the platform doesn't support -@@ -9657,5 +11146,3 @@ - # mode:shell-script - # sh-indentation:2 - # End: --# vi:sw=2 -- -diff -durN libpipeline-1.4.1.orig/build-aux/snippet/_Noreturn.h libpipeline-1.4.1/build-aux/snippet/_Noreturn.h ---- libpipeline-1.4.1.orig/build-aux/snippet/_Noreturn.h 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/build-aux/snippet/_Noreturn.h 1970-01-01 08:00:00.000000000 +0800 -@@ -1,10 +0,0 @@ --#if !defined _Noreturn && __STDC_VERSION__ < 201112 --# if (3 <= __GNUC__ || (__GNUC__ == 2 && 8 <= __GNUC_MINOR__) \ -- || 0x5110 <= __SUNPRO_C) --# define _Noreturn __attribute__ ((__noreturn__)) --# elif 1200 <= _MSC_VER --# define _Noreturn __declspec (noreturn) --# else --# define _Noreturn --# endif --#endif -diff -durN libpipeline-1.4.1.orig/build-aux/snippet/arg-nonnull.h libpipeline-1.4.1/build-aux/snippet/arg-nonnull.h ---- libpipeline-1.4.1.orig/build-aux/snippet/arg-nonnull.h 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/build-aux/snippet/arg-nonnull.h 1970-01-01 08:00:00.000000000 +0800 -@@ -1,26 +0,0 @@ --/* A C macro for declaring that specific arguments must not be NULL. -- Copyright (C) 2009-2014 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 3 of the License, 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, see . */ -- --/* _GL_ARG_NONNULL((n,...,m)) tells the compiler and static analyzer tools -- that the values passed as arguments n, ..., m must be non-NULL pointers. -- n = 1 stands for the first argument, n = 2 for the second argument etc. */ --#ifndef _GL_ARG_NONNULL --# if (__GNUC__ == 3 && __GNUC_MINOR__ >= 3) || __GNUC__ > 3 --# define _GL_ARG_NONNULL(params) __attribute__ ((__nonnull__ params)) --# else --# define _GL_ARG_NONNULL(params) --# endif --#endif -diff -durN libpipeline-1.4.1.orig/build-aux/snippet/c++defs.h libpipeline-1.4.1/build-aux/snippet/c++defs.h ---- libpipeline-1.4.1.orig/build-aux/snippet/c++defs.h 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/build-aux/snippet/c++defs.h 1970-01-01 08:00:00.000000000 +0800 -@@ -1,271 +0,0 @@ --/* C++ compatible function declaration macros. -- Copyright (C) 2010-2014 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 3 of the License, 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, see . */ -- --#ifndef _GL_CXXDEFS_H --#define _GL_CXXDEFS_H -- --/* The three most frequent use cases of these macros are: -- -- * For providing a substitute for a function that is missing on some -- platforms, but is declared and works fine on the platforms on which -- it exists: -- -- #if @GNULIB_FOO@ -- # if !@HAVE_FOO@ -- _GL_FUNCDECL_SYS (foo, ...); -- # endif -- _GL_CXXALIAS_SYS (foo, ...); -- _GL_CXXALIASWARN (foo); -- #elif defined GNULIB_POSIXCHECK -- ... -- #endif -- -- * For providing a replacement for a function that exists on all platforms, -- but is broken/insufficient and needs to be replaced on some platforms: -- -- #if @GNULIB_FOO@ -- # if @REPLACE_FOO@ -- # if !(defined __cplusplus && defined GNULIB_NAMESPACE) -- # undef foo -- # define foo rpl_foo -- # endif -- _GL_FUNCDECL_RPL (foo, ...); -- _GL_CXXALIAS_RPL (foo, ...); -- # else -- _GL_CXXALIAS_SYS (foo, ...); -- # endif -- _GL_CXXALIASWARN (foo); -- #elif defined GNULIB_POSIXCHECK -- ... -- #endif -- -- * For providing a replacement for a function that exists on some platforms -- but is broken/insufficient and needs to be replaced on some of them and -- is additionally either missing or undeclared on some other platforms: -- -- #if @GNULIB_FOO@ -- # if @REPLACE_FOO@ -- # if !(defined __cplusplus && defined GNULIB_NAMESPACE) -- # undef foo -- # define foo rpl_foo -- # endif -- _GL_FUNCDECL_RPL (foo, ...); -- _GL_CXXALIAS_RPL (foo, ...); -- # else -- # if !@HAVE_FOO@ or if !@HAVE_DECL_FOO@ -- _GL_FUNCDECL_SYS (foo, ...); -- # endif -- _GL_CXXALIAS_SYS (foo, ...); -- # endif -- _GL_CXXALIASWARN (foo); -- #elif defined GNULIB_POSIXCHECK -- ... -- #endif --*/ -- --/* _GL_EXTERN_C declaration; -- performs the declaration with C linkage. */ --#if defined __cplusplus --# define _GL_EXTERN_C extern "C" --#else --# define _GL_EXTERN_C extern --#endif -- --/* _GL_FUNCDECL_RPL (func, rettype, parameters_and_attributes); -- declares a replacement function, named rpl_func, with the given prototype, -- consisting of return type, parameters, and attributes. -- Example: -- _GL_FUNCDECL_RPL (open, int, (const char *filename, int flags, ...) -- _GL_ARG_NONNULL ((1))); -- */ --#define _GL_FUNCDECL_RPL(func,rettype,parameters_and_attributes) \ -- _GL_FUNCDECL_RPL_1 (rpl_##func, rettype, parameters_and_attributes) --#define _GL_FUNCDECL_RPL_1(rpl_func,rettype,parameters_and_attributes) \ -- _GL_EXTERN_C rettype rpl_func parameters_and_attributes -- --/* _GL_FUNCDECL_SYS (func, rettype, parameters_and_attributes); -- declares the system function, named func, with the given prototype, -- consisting of return type, parameters, and attributes. -- Example: -- _GL_FUNCDECL_SYS (open, int, (const char *filename, int flags, ...) -- _GL_ARG_NONNULL ((1))); -- */ --#define _GL_FUNCDECL_SYS(func,rettype,parameters_and_attributes) \ -- _GL_EXTERN_C rettype func parameters_and_attributes -- --/* _GL_CXXALIAS_RPL (func, rettype, parameters); -- declares a C++ alias called GNULIB_NAMESPACE::func -- that redirects to rpl_func, if GNULIB_NAMESPACE is defined. -- Example: -- _GL_CXXALIAS_RPL (open, int, (const char *filename, int flags, ...)); -- */ --#define _GL_CXXALIAS_RPL(func,rettype,parameters) \ -- _GL_CXXALIAS_RPL_1 (func, rpl_##func, rettype, parameters) --#if defined __cplusplus && defined GNULIB_NAMESPACE --# define _GL_CXXALIAS_RPL_1(func,rpl_func,rettype,parameters) \ -- namespace GNULIB_NAMESPACE \ -- { \ -- rettype (*const func) parameters = ::rpl_func; \ -- } \ -- _GL_EXTERN_C int _gl_cxxalias_dummy --#else --# define _GL_CXXALIAS_RPL_1(func,rpl_func,rettype,parameters) \ -- _GL_EXTERN_C int _gl_cxxalias_dummy --#endif -- --/* _GL_CXXALIAS_RPL_CAST_1 (func, rpl_func, rettype, parameters); -- is like _GL_CXXALIAS_RPL_1 (func, rpl_func, rettype, parameters); -- except that the C function rpl_func may have a slightly different -- declaration. A cast is used to silence the "invalid conversion" error -- that would otherwise occur. */ --#if defined __cplusplus && defined GNULIB_NAMESPACE --# define _GL_CXXALIAS_RPL_CAST_1(func,rpl_func,rettype,parameters) \ -- namespace GNULIB_NAMESPACE \ -- { \ -- rettype (*const func) parameters = \ -- reinterpret_cast(::rpl_func); \ -- } \ -- _GL_EXTERN_C int _gl_cxxalias_dummy --#else --# define _GL_CXXALIAS_RPL_CAST_1(func,rpl_func,rettype,parameters) \ -- _GL_EXTERN_C int _gl_cxxalias_dummy --#endif -- --/* _GL_CXXALIAS_SYS (func, rettype, parameters); -- declares a C++ alias called GNULIB_NAMESPACE::func -- that redirects to the system provided function func, if GNULIB_NAMESPACE -- is defined. -- Example: -- _GL_CXXALIAS_SYS (open, int, (const char *filename, int flags, ...)); -- */ --#if defined __cplusplus && defined GNULIB_NAMESPACE -- /* If we were to write -- rettype (*const func) parameters = ::func; -- like above in _GL_CXXALIAS_RPL_1, the compiler could optimize calls -- better (remove an indirection through a 'static' pointer variable), -- but then the _GL_CXXALIASWARN macro below would cause a warning not only -- for uses of ::func but also for uses of GNULIB_NAMESPACE::func. */ --# define _GL_CXXALIAS_SYS(func,rettype,parameters) \ -- namespace GNULIB_NAMESPACE \ -- { \ -- static rettype (*func) parameters = ::func; \ -- } \ -- _GL_EXTERN_C int _gl_cxxalias_dummy --#else --# define _GL_CXXALIAS_SYS(func,rettype,parameters) \ -- _GL_EXTERN_C int _gl_cxxalias_dummy --#endif -- --/* _GL_CXXALIAS_SYS_CAST (func, rettype, parameters); -- is like _GL_CXXALIAS_SYS (func, rettype, parameters); -- except that the C function func may have a slightly different declaration. -- A cast is used to silence the "invalid conversion" error that would -- otherwise occur. */ --#if defined __cplusplus && defined GNULIB_NAMESPACE --# define _GL_CXXALIAS_SYS_CAST(func,rettype,parameters) \ -- namespace GNULIB_NAMESPACE \ -- { \ -- static rettype (*func) parameters = \ -- reinterpret_cast(::func); \ -- } \ -- _GL_EXTERN_C int _gl_cxxalias_dummy --#else --# define _GL_CXXALIAS_SYS_CAST(func,rettype,parameters) \ -- _GL_EXTERN_C int _gl_cxxalias_dummy --#endif -- --/* _GL_CXXALIAS_SYS_CAST2 (func, rettype, parameters, rettype2, parameters2); -- is like _GL_CXXALIAS_SYS (func, rettype, parameters); -- except that the C function is picked among a set of overloaded functions, -- namely the one with rettype2 and parameters2. Two consecutive casts -- are used to silence the "cannot find a match" and "invalid conversion" -- errors that would otherwise occur. */ --#if defined __cplusplus && defined GNULIB_NAMESPACE -- /* The outer cast must be a reinterpret_cast. -- The inner cast: When the function is defined as a set of overloaded -- functions, it works as a static_cast<>, choosing the designated variant. -- When the function is defined as a single variant, it works as a -- reinterpret_cast<>. The parenthesized cast syntax works both ways. */ --# define _GL_CXXALIAS_SYS_CAST2(func,rettype,parameters,rettype2,parameters2) \ -- namespace GNULIB_NAMESPACE \ -- { \ -- static rettype (*func) parameters = \ -- reinterpret_cast( \ -- (rettype2(*)parameters2)(::func)); \ -- } \ -- _GL_EXTERN_C int _gl_cxxalias_dummy --#else --# define _GL_CXXALIAS_SYS_CAST2(func,rettype,parameters,rettype2,parameters2) \ -- _GL_EXTERN_C int _gl_cxxalias_dummy --#endif -- --/* _GL_CXXALIASWARN (func); -- causes a warning to be emitted when ::func is used but not when -- GNULIB_NAMESPACE::func is used. func must be defined without overloaded -- variants. */ --#if defined __cplusplus && defined GNULIB_NAMESPACE --# define _GL_CXXALIASWARN(func) \ -- _GL_CXXALIASWARN_1 (func, GNULIB_NAMESPACE) --# define _GL_CXXALIASWARN_1(func,namespace) \ -- _GL_CXXALIASWARN_2 (func, namespace) --/* To work around GCC bug , -- we enable the warning only when not optimizing. */ --# if !__OPTIMIZE__ --# define _GL_CXXALIASWARN_2(func,namespace) \ -- _GL_WARN_ON_USE (func, \ -- "The symbol ::" #func " refers to the system function. " \ -- "Use " #namespace "::" #func " instead.") --# elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING --# define _GL_CXXALIASWARN_2(func,namespace) \ -- extern __typeof__ (func) func --# else --# define _GL_CXXALIASWARN_2(func,namespace) \ -- _GL_EXTERN_C int _gl_cxxalias_dummy --# endif --#else --# define _GL_CXXALIASWARN(func) \ -- _GL_EXTERN_C int _gl_cxxalias_dummy --#endif -- --/* _GL_CXXALIASWARN1 (func, rettype, parameters_and_attributes); -- causes a warning to be emitted when the given overloaded variant of ::func -- is used but not when GNULIB_NAMESPACE::func is used. */ --#if defined __cplusplus && defined GNULIB_NAMESPACE --# define _GL_CXXALIASWARN1(func,rettype,parameters_and_attributes) \ -- _GL_CXXALIASWARN1_1 (func, rettype, parameters_and_attributes, \ -- GNULIB_NAMESPACE) --# define _GL_CXXALIASWARN1_1(func,rettype,parameters_and_attributes,namespace) \ -- _GL_CXXALIASWARN1_2 (func, rettype, parameters_and_attributes, namespace) --/* To work around GCC bug , -- we enable the warning only when not optimizing. */ --# if !__OPTIMIZE__ --# define _GL_CXXALIASWARN1_2(func,rettype,parameters_and_attributes,namespace) \ -- _GL_WARN_ON_USE_CXX (func, rettype, parameters_and_attributes, \ -- "The symbol ::" #func " refers to the system function. " \ -- "Use " #namespace "::" #func " instead.") --# elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING --# define _GL_CXXALIASWARN1_2(func,rettype,parameters_and_attributes,namespace) \ -- extern __typeof__ (func) func --# else --# define _GL_CXXALIASWARN1_2(func,rettype,parameters_and_attributes,namespace) \ -- _GL_EXTERN_C int _gl_cxxalias_dummy --# endif --#else --# define _GL_CXXALIASWARN1(func,rettype,parameters_and_attributes) \ -- _GL_EXTERN_C int _gl_cxxalias_dummy --#endif -- --#endif /* _GL_CXXDEFS_H */ -diff -durN libpipeline-1.4.1.orig/build-aux/snippet/warn-on-use.h libpipeline-1.4.1/build-aux/snippet/warn-on-use.h ---- libpipeline-1.4.1.orig/build-aux/snippet/warn-on-use.h 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/build-aux/snippet/warn-on-use.h 1970-01-01 08:00:00.000000000 +0800 -@@ -1,109 +0,0 @@ --/* A C macro for emitting warnings if a function is used. -- Copyright (C) 2010-2014 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 3 of the License, 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, see . */ -- --/* _GL_WARN_ON_USE (function, "literal string") issues a declaration -- for FUNCTION which will then trigger a compiler warning containing -- the text of "literal string" anywhere that function is called, if -- supported by the compiler. If the compiler does not support this -- feature, the macro expands to an unused extern declaration. -- -- This macro is useful for marking a function as a potential -- portability trap, with the intent that "literal string" include -- instructions on the replacement function that should be used -- instead. However, one of the reasons that a function is a -- portability trap is if it has the wrong signature. Declaring -- FUNCTION with a different signature in C is a compilation error, so -- this macro must use the same type as any existing declaration so -- that programs that avoid the problematic FUNCTION do not fail to -- compile merely because they included a header that poisoned the -- function. But this implies that _GL_WARN_ON_USE is only safe to -- use if FUNCTION is known to already have a declaration. Use of -- this macro implies that there must not be any other macro hiding -- the declaration of FUNCTION; but undefining FUNCTION first is part -- of the poisoning process anyway (although for symbols that are -- provided only via a macro, the result is a compilation error rather -- than a warning containing "literal string"). Also note that in -- C++, it is only safe to use if FUNCTION has no overloads. -- -- For an example, it is possible to poison 'getline' by: -- - adding a call to gl_WARN_ON_USE_PREPARE([[#include ]], -- [getline]) in configure.ac, which potentially defines -- HAVE_RAW_DECL_GETLINE -- - adding this code to a header that wraps the system : -- #undef getline -- #if HAVE_RAW_DECL_GETLINE -- _GL_WARN_ON_USE (getline, "getline is required by POSIX 2008, but" -- "not universally present; use the gnulib module getline"); -- #endif -- -- It is not possible to directly poison global variables. But it is -- possible to write a wrapper accessor function, and poison that -- (less common usage, like &environ, will cause a compilation error -- rather than issue the nice warning, but the end result of informing -- the developer about their portability problem is still achieved): -- #if HAVE_RAW_DECL_ENVIRON -- static char ***rpl_environ (void) { return &environ; } -- _GL_WARN_ON_USE (rpl_environ, "environ is not always properly declared"); -- # undef environ -- # define environ (*rpl_environ ()) -- #endif -- */ --#ifndef _GL_WARN_ON_USE -- --# if 4 < __GNUC__ || (__GNUC__ == 4 && 3 <= __GNUC_MINOR__) --/* A compiler attribute is available in gcc versions 4.3.0 and later. */ --# define _GL_WARN_ON_USE(function, message) \ --extern __typeof__ (function) function __attribute__ ((__warning__ (message))) --# elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING --/* Verify the existence of the function. */ --# define _GL_WARN_ON_USE(function, message) \ --extern __typeof__ (function) function --# else /* Unsupported. */ --# define _GL_WARN_ON_USE(function, message) \ --_GL_WARN_EXTERN_C int _gl_warn_on_use --# endif --#endif -- --/* _GL_WARN_ON_USE_CXX (function, rettype, parameters_and_attributes, "string") -- is like _GL_WARN_ON_USE (function, "string"), except that the function is -- declared with the given prototype, consisting of return type, parameters, -- and attributes. -- This variant is useful for overloaded functions in C++. _GL_WARN_ON_USE does -- not work in this case. */ --#ifndef _GL_WARN_ON_USE_CXX --# if 4 < __GNUC__ || (__GNUC__ == 4 && 3 <= __GNUC_MINOR__) --# define _GL_WARN_ON_USE_CXX(function,rettype,parameters_and_attributes,msg) \ --extern rettype function parameters_and_attributes \ -- __attribute__ ((__warning__ (msg))) --# elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING --/* Verify the existence of the function. */ --# define _GL_WARN_ON_USE_CXX(function,rettype,parameters_and_attributes,msg) \ --extern rettype function parameters_and_attributes --# else /* Unsupported. */ --# define _GL_WARN_ON_USE_CXX(function,rettype,parameters_and_attributes,msg) \ --_GL_WARN_EXTERN_C int _gl_warn_on_use --# endif --#endif -- --/* _GL_WARN_EXTERN_C declaration; -- performs the declaration with C linkage. */ --#ifndef _GL_WARN_EXTERN_C --# if defined __cplusplus --# define _GL_WARN_EXTERN_C extern "C" --# else --# define _GL_WARN_EXTERN_C extern --# endif --#endif -diff -durN libpipeline-1.4.1.orig/config.h.in libpipeline-1.4.1/config.h.in ---- libpipeline-1.4.1.orig/config.h.in 2015-08-17 17:14:23.000000000 +0800 -+++ libpipeline-1.4.1/config.h.in 2017-05-17 10:38:43.000000000 +0800 -@@ -59,6 +59,14 @@ - #undef GNULIB_LOCK - - /* Define to a C preprocessor expression that evaluates to 1 or 0, depending -+ whether the gnulib module msvc-nothrow shall be considered present. */ -+#undef GNULIB_MSVC_NOTHROW -+ -+/* Define to 1 if printf and friends should be labeled with attribute -+ "__gnu_printf__" instead of "__printf__" */ -+#undef GNULIB_PRINTF_ATTRIBUTE_FLAVOR_GNU -+ -+/* Define to a C preprocessor expression that evaluates to 1 or 0, depending - whether the gnulib module scanf shall be considered present. */ - #undef GNULIB_SCANF - -@@ -150,6 +158,17 @@ - /* Define to 1 if you have the `clearenv' function. */ - #undef HAVE_CLEARENV - -+/* Define to 1 if you have the header file. */ -+#undef HAVE_CRTDEFS_H -+ -+/* Define to 1 if you have the declaration of `program_invocation_name', and -+ to 0 if you don't. */ -+#undef HAVE_DECL_PROGRAM_INVOCATION_NAME -+ -+/* Define to 1 if you have the declaration of `program_invocation_short_name', -+ and to 0 if you don't. */ -+#undef HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME -+ - /* Define to 1 if you have the declaration of `setenv', and to 0 if you don't. - */ - #undef HAVE_DECL_SETENV -@@ -190,6 +209,10 @@ - don't. */ - #undef HAVE_DECL__SYS_SIGLIST - -+/* Define to 1 if you have the declaration of `__argv', and to 0 if you don't. -+ */ -+#undef HAVE_DECL___ARGV -+ - /* Define to 1 if you have the header file. */ - #undef HAVE_DLFCN_H - -@@ -205,9 +228,27 @@ - /* Define to 1 if you have the `fork' function. */ - #undef HAVE_FORK - -+/* Define to 1 if you have the 'getegid' function. */ -+#undef HAVE_GETEGID -+ -+/* Define to 1 if you have the 'geteuid' function. */ -+#undef HAVE_GETEUID -+ -+/* Define to 1 if you have the 'getexecname' function. */ -+#undef HAVE_GETEXECNAME -+ -+/* Define to 1 if you have the 'getgid' function. */ -+#undef HAVE_GETGID -+ -+/* Define to 1 if you have the 'getprogname' function. */ -+#undef HAVE_GETPROGNAME -+ - /* Define to 1 if you have the 'gettimeofday' function. */ - #undef HAVE_GETTIMEOFDAY - -+/* Define to 1 if you have the 'getuid' function. */ -+#undef HAVE_GETUID -+ - /* Define if you have the 'intmax_t' type in or . */ - #undef HAVE_INTMAX_T - -@@ -221,6 +262,9 @@ - /* Define to 1 if you have the `issetugid' function. */ - #undef HAVE_ISSETUGID - -+/* Define to 1 if you have the header file. */ -+#undef HAVE_LIMITS_H -+ - /* Define to 1 if the system has the type 'long long int'. */ - #undef HAVE_LONG_LONG_INT - -@@ -256,6 +300,10 @@ - /* Define if the POSIX multithreading library has read/write locks. */ - #undef HAVE_PTHREAD_RWLOCK - -+/* Define if the 'pthread_rwlock_rdlock' function prefers a writer to a -+ reader. */ -+#undef HAVE_PTHREAD_RWLOCK_RDLOCK_PREFER_WRITER -+ - /* Define to 1 if you have the `raise' function. */ - #undef HAVE_RAISE - -@@ -512,6 +560,9 @@ - /* Define to 1 if pwrite is declared even after undefining macros. */ - #undef HAVE_RAW_DECL_PWRITE - -+/* Define to 1 if qsort_r is declared even after undefining macros. */ -+#undef HAVE_RAW_DECL_QSORT_R -+ - /* Define to 1 if random is declared even after undefining macros. */ - #undef HAVE_RAW_DECL_RANDOM - -@@ -659,6 +710,9 @@ - /* Define to 1 if tmpfile is declared even after undefining macros. */ - #undef HAVE_RAW_DECL_TMPFILE - -+/* Define to 1 if truncate is declared even after undefining macros. */ -+#undef HAVE_RAW_DECL_TRUNCATE -+ - /* Define to 1 if ttyname_r is declared even after undefining macros. */ - #undef HAVE_RAW_DECL_TTYNAME_R - -@@ -722,6 +776,9 @@ - /* Define to 1 if wcsdup is declared even after undefining macros. */ - #undef HAVE_RAW_DECL_WCSDUP - -+/* Define to 1 if wcsftime is declared even after undefining macros. */ -+#undef HAVE_RAW_DECL_WCSFTIME -+ - /* Define to 1 if wcslen is declared even after undefining macros. */ - #undef HAVE_RAW_DECL_WCSLEN - -@@ -887,9 +944,6 @@ - /* Define to 1 if you have the header file. */ - #undef HAVE_SYS_STAT_H - --/* Define to 1 if you have the header file. */ --#undef HAVE_SYS_TIMEB_H -- - /* Define to 1 if you have the header file. */ - #undef HAVE_SYS_TIME_H - -@@ -911,6 +965,9 @@ - /* Define to 1 if the system has the type 'unsigned long long int'. */ - #undef HAVE_UNSIGNED_LONG_LONG_INT - -+/* Define if you have a global __progname variable */ -+#undef HAVE_VAR___PROGNAME -+ - /* Define to 1 if you have the 'vasnprintf' function. */ - #undef HAVE_VASNPRINTF - -@@ -959,9 +1016,6 @@ - /* Define to 1 if the system has the type `_Bool'. */ - #undef HAVE__BOOL - --/* Define to 1 if you have the `_ftime' function. */ --#undef HAVE__FTIME -- - /* Define to 1 if you have the '_set_invalid_parameter_handler' function. */ - #undef HAVE__SET_INVALID_PARAMETER_HANDLER - -@@ -972,8 +1026,7 @@ - slash. */ - #undef LSTAT_FOLLOWS_SLASHED_SYMLINK - --/* Define to the sub-directory in which libtool stores uninstalled libraries. -- */ -+/* Define to the sub-directory where libtool stores uninstalled libraries. */ - #undef LT_OBJDIR - - /* If malloc(0) is != NULL, define this to 1. Otherwise define this to 0. */ -@@ -982,6 +1035,12 @@ - /* Define to a substitute value for mmap()'s MAP_ANONYMOUS flag. */ - #undef MAP_ANONYMOUS - -+/* Use GNU style printf and scanf. */ -+#ifndef __USE_MINGW_ANSI_STDIO -+# undef __USE_MINGW_ANSI_STDIO -+#endif -+ -+ - /* Name of package */ - #undef PACKAGE - -@@ -1010,10 +1069,6 @@ - 'ptrdiff_t'. */ - #undef PTRDIFF_T_SUFFIX - --/* Define to 1 if stat needs help when passed a directory name with a trailing -- slash */ --#undef REPLACE_FUNC_STAT_DIR -- - /* Define to 1 if stat needs help when passed a file name with a trailing - slash */ - #undef REPLACE_FUNC_STAT_FILE -@@ -1086,7 +1141,7 @@ - #ifndef _ALL_SOURCE - # undef _ALL_SOURCE - #endif --/* Enable general extensions on OS X. */ -+/* Enable general extensions on macOS. */ - #ifndef _DARWIN_C_SOURCE - # undef _DARWIN_C_SOURCE - #endif -@@ -1098,6 +1153,34 @@ - #ifndef _POSIX_PTHREAD_SEMANTICS - # undef _POSIX_PTHREAD_SEMANTICS - #endif -+/* Enable extensions specified by ISO/IEC TS 18661-5:2014. */ -+#ifndef __STDC_WANT_IEC_60559_ATTRIBS_EXT__ -+# undef __STDC_WANT_IEC_60559_ATTRIBS_EXT__ -+#endif -+/* Enable extensions specified by ISO/IEC TS 18661-1:2014. */ -+#ifndef __STDC_WANT_IEC_60559_BFP_EXT__ -+# undef __STDC_WANT_IEC_60559_BFP_EXT__ -+#endif -+/* Enable extensions specified by ISO/IEC TS 18661-2:2015. */ -+#ifndef __STDC_WANT_IEC_60559_DFP_EXT__ -+# undef __STDC_WANT_IEC_60559_DFP_EXT__ -+#endif -+/* Enable extensions specified by ISO/IEC TS 18661-4:2015. */ -+#ifndef __STDC_WANT_IEC_60559_FUNCS_EXT__ -+# undef __STDC_WANT_IEC_60559_FUNCS_EXT__ -+#endif -+/* Enable extensions specified by ISO/IEC TS 18661-3:2015. */ -+#ifndef __STDC_WANT_IEC_60559_TYPES_EXT__ -+# undef __STDC_WANT_IEC_60559_TYPES_EXT__ -+#endif -+/* Enable extensions specified by ISO/IEC TR 24731-2:2010. */ -+#ifndef __STDC_WANT_LIB_EXT2__ -+# undef __STDC_WANT_LIB_EXT2__ -+#endif -+/* Enable extensions specified by ISO/IEC 24747:2009. */ -+#ifndef __STDC_WANT_MATH_SPEC_FUNCS__ -+# undef __STDC_WANT_MATH_SPEC_FUNCS__ -+#endif - /* Enable extensions on HP NonStop. */ - #ifndef _TANDEM_SOURCE - # undef _TANDEM_SOURCE -@@ -1149,10 +1232,6 @@ - /* Number of bits in a file offset, on hosts where this is settable. */ - #undef _FILE_OFFSET_BITS - --/* Define to 1 if Gnulib overrides 'struct stat' on Windows so that struct -- stat.st_size becomes 64-bit. */ --#undef _GL_WINDOWS_64_BIT_ST_SIZE -- - /* Define for large files, on AIX-style hosts. */ - #undef _LARGE_FILES - -@@ -1183,6 +1262,12 @@ - /* Define to 1 if you need to in order for 'stat' and other things to work. */ - #undef _POSIX_SOURCE - -+/* Define to 1 if the system predates C++11. */ -+#undef __STDC_CONSTANT_MACROS -+ -+/* Define to 1 if the system predates C++11. */ -+#undef __STDC_LIMIT_MACROS -+ - /* Define to empty if `const' does not conform to ANSI C. */ - #undef const - -@@ -1197,13 +1282,28 @@ - 'reference to static identifier "f" in extern inline function'. - This bug was observed with Sun C 5.12 SunOS_i386 2011/11/16. - -- Suppress the use of extern inline on problematic Apple configurations. -- OS X 10.8 and earlier mishandle it; see, e.g., -- . -+ Suppress extern inline (with or without __attribute__ ((__gnu_inline__))) -+ on configurations that mistakenly use 'static inline' to implement -+ functions or macros in standard C headers like . For example, -+ if isdigit is mistakenly implemented via a static inline function, -+ a program containing an extern inline function that calls isdigit -+ may not work since the C standard prohibits extern inline functions -+ from calling static functions. This bug is known to occur on: -+ -+ OS X 10.8 and earlier; see: -+ http://lists.gnu.org/archive/html/bug-gnulib/2012-12/msg00023.html -+ -+ DragonFly; see -+ http://muscles.dragonflybsd.org/bulk/bleeding-edge-potential/latest-per-pkg/ah-tty-0.3.12.log -+ -+ FreeBSD; see: -+ http://lists.gnu.org/archive/html/bug-gnulib/2014-07/msg00104.html -+ - OS X 10.9 has a macro __header_inline indicating the bug is fixed for C and - for clang but remains for g++; see . -- Perhaps Apple will fix this some day. */ --#if (defined __APPLE__ \ -+ Assume DragonFly and FreeBSD will be similar. */ -+#if (((defined __APPLE__ && defined __MACH__) \ -+ || defined __DragonFly__ || defined __FreeBSD__) \ - && (defined __header_inline \ - ? (defined __cplusplus && defined __GNUC_STDC_INLINE__ \ - && ! defined __clang__) \ -@@ -1211,19 +1311,20 @@ - && (defined __GNUC__ || defined __cplusplus)) \ - || (defined _FORTIFY_SOURCE && 0 < _FORTIFY_SOURCE \ - && defined __GNUC__ && ! defined __cplusplus)))) --# define _GL_EXTERN_INLINE_APPLE_BUG -+# define _GL_EXTERN_INLINE_STDHEADER_BUG - #endif - #if ((__GNUC__ \ - ? defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__ \ - : (199901L <= __STDC_VERSION__ \ - && !defined __HP_cc \ -+ && !defined __PGI \ - && !(defined __SUNPRO_C && __STDC__))) \ -- && !defined _GL_EXTERN_INLINE_APPLE_BUG) -+ && !defined _GL_EXTERN_INLINE_STDHEADER_BUG) - # define _GL_INLINE inline - # define _GL_EXTERN_INLINE extern inline - # define _GL_EXTERN_INLINE_IN_USE - #elif (2 < __GNUC__ + (7 <= __GNUC_MINOR__) && !defined __STRICT_ANSI__ \ -- && !defined _GL_EXTERN_INLINE_APPLE_BUG) -+ && !defined _GL_EXTERN_INLINE_STDHEADER_BUG) - # if defined __GNUC_GNU_INLINE__ && __GNUC_GNU_INLINE__ - /* __gnu_inline__ suppresses a GCC 4.2 diagnostic. */ - # define _GL_INLINE extern inline __attribute__ ((__gnu_inline__)) -@@ -1237,17 +1338,19 @@ - # define _GL_EXTERN_INLINE static _GL_UNUSED - #endif - --#if 4 < __GNUC__ + (6 <= __GNUC_MINOR__) -+/* In GCC 4.6 (inclusive) to 5.1 (exclusive), -+ suppress bogus "no previous prototype for 'FOO'" -+ and "no previous declaration for 'FOO'" diagnostics, -+ when FOO is an inline function in the header; see -+ and -+ . */ -+#if __GNUC__ == 4 && 6 <= __GNUC_MINOR__ - # if defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__ - # define _GL_INLINE_HEADER_CONST_PRAGMA - # else - # define _GL_INLINE_HEADER_CONST_PRAGMA \ - _Pragma ("GCC diagnostic ignored \"-Wsuggest-attribute=const\"") - # endif -- /* Suppress GCC's bogus "no previous prototype for 'FOO'" -- and "no previous declaration for 'FOO'" diagnostics, -- when FOO is an inline function in the header; see -- . */ - # define _GL_INLINE_HEADER_BEGIN \ - _Pragma ("GCC diagnostic push") \ - _Pragma ("GCC diagnostic ignored \"-Wmissing-prototypes\"") \ -@@ -1327,6 +1430,16 @@ - is a misnomer outside of parameter lists. */ - #define _UNUSED_PARAMETER_ _GL_UNUSED - -+/* gcc supports the "unused" attribute on possibly unused labels, and -+ g++ has since version 4.5. Note to support C++ as well as C, -+ _GL_UNUSED_LABEL should be used with a trailing ; */ -+#if !defined __cplusplus || __GNUC__ > 4 \ -+ || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5) -+# define _GL_UNUSED_LABEL _GL_UNUSED -+#else -+# define _GL_UNUSED_LABEL -+#endif -+ - /* The __pure__ attribute was added in gcc 2.96. */ - #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96) - # define _GL_ATTRIBUTE_PURE __attribute__ ((__pure__)) -diff -durN libpipeline-1.4.1.orig/configure libpipeline-1.4.1/configure ---- libpipeline-1.4.1.orig/configure 2015-08-17 17:14:22.000000000 +0800 -+++ libpipeline-1.4.1/configure 2017-05-17 10:38:38.515625000 +0800 -@@ -644,9 +644,11 @@ - LTLIBOBJS - LIBOBJS - gltests_WITNESS -+HAVE_CRTDEFS_H - HAVE_WINT_T - NEXT_AS_FIRST_DIRECTIVE_WCHAR_H - NEXT_WCHAR_H -+REPLACE_WCSFTIME - REPLACE_WCSWIDTH - REPLACE_WCWIDTH - REPLACE_WCSNRTOMBS -@@ -662,6 +664,7 @@ - REPLACE_MBSTATE_T - HAVE_DECL_WCWIDTH - HAVE_DECL_WCTOB -+HAVE_WCSFTIME - HAVE_WCSWIDTH - HAVE_WCSTOK - HAVE_WCSSTR -@@ -699,6 +702,7 @@ - HAVE_MBRTOWC - HAVE_MBSINIT - HAVE_BTOWC -+GNULIB_WCSFTIME - GNULIB_WCSWIDTH - GNULIB_WCSTOK - GNULIB_WCSSTR -@@ -742,35 +746,19 @@ - HAVE_UNISTD_H - NEXT_AS_FIRST_DIRECTIVE_UNISTD_H - NEXT_UNISTD_H -+UNISTD_H_DEFINES_STRUCT_TIMESPEC - PTHREAD_H_DEFINES_STRUCT_TIMESPEC - SYS_TIME_H_DEFINES_STRUCT_TIMESPEC - TIME_H_DEFINES_STRUCT_TIMESPEC - NEXT_AS_FIRST_DIRECTIVE_TIME_H - NEXT_TIME_H --REPLACE_LOCALTIME --REPLACE_GMTIME --REPLACE_TIMEGM --REPLACE_NANOSLEEP --REPLACE_MKTIME --REPLACE_LOCALTIME_R --HAVE_TIMEGM --HAVE_STRPTIME --HAVE_NANOSLEEP --HAVE_DECL_LOCALTIME_R --GNULIB_TIME_R --GNULIB_TIMEGM --GNULIB_STRPTIME --GNULIB_NANOSLEEP --GNULIB_MKTIME - NEXT_AS_FIRST_DIRECTIVE_SYS_WAIT_H - NEXT_SYS_WAIT_H - GNULIB_WAITPID -+WINDOWS_STAT_INODES - WINDOWS_64_BIT_OFF_T - NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H - NEXT_SYS_TYPES_H --WINDOWS_64_BIT_ST_SIZE --NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H --NEXT_SYS_STAT_H - HAVE_SYS_SELECT_H - NEXT_AS_FIRST_DIRECTIVE_SYS_SELECT_H - NEXT_SYS_SELECT_H -@@ -788,6 +776,9 @@ - GL_GENERATE_STDINT_H_FALSE - GL_GENERATE_STDINT_H_TRUE - STDINT_H -+HAVE_SYS_INTTYPES_H -+HAVE_SYS_BITYPES_H -+HAVE_C99_STDINT_H - WINT_T_SUFFIX - WCHAR_T_SUFFIX - SIG_ATOMIC_T_SUFFIX -@@ -801,8 +792,6 @@ - BITSIZEOF_SIG_ATOMIC_T - BITSIZEOF_SIZE_T - BITSIZEOF_PTRDIFF_T --HAVE_SYS_BITYPES_H --HAVE_SYS_INTTYPES_H - HAVE_STDINT_H - NEXT_AS_FIRST_DIRECTIVE_STDINT_H - NEXT_STDINT_H -@@ -811,12 +800,14 @@ - HAVE_WCHAR_H - HAVE_UNSIGNED_LONG_LONG_INT - HAVE_LONG_LONG_INT -+GNULIB_OVERRIDES_WINT_T - NEXT_AS_FIRST_DIRECTIVE_STDDEF_H - NEXT_STDDEF_H - GL_GENERATE_STDDEF_H_FALSE - GL_GENERATE_STDDEF_H_TRUE - STDDEF_H - HAVE_WCHAR_T -+HAVE_MAX_ALIGN_T - REPLACE_NULL - HAVE__BOOL - GL_GENERATE_STDBOOL_H_FALSE -@@ -827,6 +818,10 @@ - STDARG_H - NEXT_AS_FIRST_DIRECTIVE_STDARG_H - NEXT_STDARG_H -+WINDOWS_64_BIT_ST_SIZE -+WINDOWS_STAT_TIMESPEC -+NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H -+NEXT_SYS_STAT_H - REPLACE_VSPRINTF - REPLACE_VSNPRINTF - REPLACE_VPRINTF -@@ -1028,6 +1023,7 @@ - REPLACE_REALPATH - REPLACE_REALLOC - REPLACE_RANDOM_R -+REPLACE_QSORT_R - REPLACE_PUTENV - REPLACE_PTSNAME_R - REPLACE_PTSNAME -@@ -1051,6 +1047,7 @@ - HAVE_RANDOM_R - HAVE_RANDOM_H - HAVE_RANDOM -+HAVE_QSORT_R - HAVE_PTSNAME_R - HAVE_PTSNAME - HAVE_POSIX_OPENPT -@@ -1079,6 +1076,7 @@ - GNULIB_REALLOC_POSIX - GNULIB_RANDOM_R - GNULIB_RANDOM -+GNULIB_QSORT_R - GNULIB_PUTENV - GNULIB_PTSNAME_R - GNULIB_PTSNAME -@@ -1117,6 +1115,7 @@ - HAVE_FUTIMENS - HAVE_FSTATAT - HAVE_FCHMODAT -+GNULIB_OVERRIDES_STRUCT_STAT - GNULIB_UTIMENSAT - GNULIB_STAT - GNULIB_MKNODAT -@@ -1137,7 +1136,37 @@ - LIBPTH_PREFIX - LTLIBPTH - LIBPTH -+GL_GENERATE_LIMITS_H_FALSE -+GL_GENERATE_LIMITS_H_TRUE -+LIMITS_H -+NEXT_AS_FIRST_DIRECTIVE_LIMITS_H -+NEXT_LIMITS_H - IGNORE_UNUSED_LIBRARIES_CFLAGS -+REPLACE_LOCALTIME -+REPLACE_GMTIME -+REPLACE_TZSET -+REPLACE_TIMEGM -+REPLACE_STRFTIME -+REPLACE_NANOSLEEP -+REPLACE_MKTIME -+REPLACE_LOCALTIME_R -+REPLACE_CTIME -+HAVE_TIMEZONE_T -+HAVE_TZSET -+HAVE_TIMEGM -+HAVE_STRPTIME -+HAVE_NANOSLEEP -+HAVE_DECL_LOCALTIME_R -+GNULIB_TZSET -+GNULIB_TIME_RZ -+GNULIB_TIME_R -+GNULIB_TIMEGM -+GNULIB_STRPTIME -+GNULIB_STRFTIME -+GNULIB_NANOSLEEP -+GNULIB_LOCALTIME -+GNULIB_MKTIME -+GNULIB_CTIME - HAVE_WINSOCK2_H - NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H - NEXT_SYS_TIME_H -@@ -1188,9 +1217,12 @@ - REPLACE_UNLINKAT - REPLACE_UNLINK - REPLACE_TTYNAME_R -+REPLACE_TRUNCATE -+REPLACE_SYMLINKAT - REPLACE_SYMLINK - REPLACE_SLEEP - REPLACE_RMDIR -+REPLACE_READLINKAT - REPLACE_READLINK - REPLACE_READ - REPLACE_PWRITE -@@ -1219,12 +1251,14 @@ - HAVE_DECL_GETUSERSHELL - HAVE_DECL_GETPAGESIZE - HAVE_DECL_GETLOGIN_R -+HAVE_DECL_GETLOGIN - HAVE_DECL_GETDOMAINNAME - HAVE_DECL_FDATASYNC - HAVE_DECL_FCHDIR - HAVE_DECL_ENVIRON - HAVE_USLEEP - HAVE_UNLINKAT -+HAVE_TRUNCATE - HAVE_SYMLINKAT - HAVE_SYMLINK - HAVE_SLEEP -@@ -1261,6 +1295,7 @@ - GNULIB_UNISTD_H_SIGPIPE - GNULIB_UNISTD_H_NONBLOCKING - GNULIB_TTYNAME_R -+GNULIB_TRUNCATE - GNULIB_SYMLINKAT - GNULIB_SYMLINK - GNULIB_SLEEP -@@ -1317,6 +1352,7 @@ - PKG_CONFIG - WARN_CFLAGS - ARFLAGS -+LT_SYS_LIBRARY_PATH - OTOOL64 - OTOOL - LIPO -@@ -1442,6 +1478,7 @@ - enable_shared - with_pic - enable_fast_install -+with_aix_soname - with_gnu_ld - with_sysroot - enable_libtool_lock -@@ -1460,6 +1497,7 @@ - LIBS - CPPFLAGS - CPP -+LT_SYS_LIBRARY_PATH - PKG_CONFIG - PKG_CONFIG_PATH - PKG_CONFIG_LIBDIR -@@ -2110,9 +2148,12 @@ - --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use - both] -+ --with-aix-soname=aix|svr4|both -+ shared library versioning (aka "SONAME") variant to -+ provide on AIX, [default=aix]. - --with-gnu-ld assume the C compiler uses GNU ld [default=no] -- --with-sysroot=DIR Search for dependent libraries within DIR -- (or the compiler's sysroot if not specified). -+ --with-sysroot[=DIR] Search for dependent libraries within DIR (or the -+ compiler's sysroot if not specified). - --with-gnu-ld assume the C compiler uses GNU ld [default=no] - --with-libpth-prefix[=DIR] search for libpth in DIR/include and DIR/lib - --without-libpth-prefix don't search for libpth in includedir and libdir -@@ -2126,6 +2167,8 @@ - CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if - you have headers in a nonstandard directory - CPP C preprocessor -+ LT_SYS_LIBRARY_PATH -+ User-defined run-time library search path. - PKG_CONFIG path to pkg-config utility - PKG_CONFIG_PATH - directories to add to pkg-config's search path -@@ -3192,28 +3235,36 @@ - - gl_header_list="$gl_header_list unistd.h" - gl_func_list="$gl_func_list symlink" -+gl_func_list="$gl_func_list getprogname" -+gl_func_list="$gl_func_list getexecname" - gl_header_list="$gl_header_list sys/time.h" - gl_header_list="$gl_header_list sys/socket.h" - gl_func_list="$gl_func_list gettimeofday" -+gl_header_list="$gl_header_list limits.h" - gl_func_list="$gl_func_list lstat" - gl_header_list="$gl_header_list sys/mman.h" - gl_func_list="$gl_func_list mprotect" - gl_func_list="$gl_func_list _set_invalid_parameter_handler" - gl_header_list="$gl_header_list sys/param.h" - gl_func_list="$gl_func_list secure_getenv" -+gl_func_list="$gl_func_list getuid" -+gl_func_list="$gl_func_list geteuid" -+gl_func_list="$gl_func_list getgid" -+gl_func_list="$gl_func_list getegid" - gl_func_list="$gl_func_list setenv" - gl_func_list="$gl_func_list sigaction" - gl_func_list="$gl_func_list sigaltstack" - gl_func_list="$gl_func_list siginterrupt" - gl_func_list="$gl_func_list snprintf" -+gl_header_list="$gl_header_list sys/stat.h" - gl_header_list="$gl_header_list wchar.h" - gl_header_list="$gl_header_list stdint.h" - gl_func_list="$gl_func_list strndup" - gl_header_list="$gl_header_list sys/select.h" --gl_header_list="$gl_header_list sys/stat.h" - gl_header_list="$gl_header_list sys/wait.h" - gl_func_list="$gl_func_list vasnprintf" - gl_header_list="$gl_header_list features.h" -+gl_header_list="$gl_header_list crtdefs.h" - # Check that the precious variables saved in the cache have kept the same - # value. - ac_cache_corrupted=false -@@ -5454,6 +5505,20 @@ - - $as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h - -+ $as_echo "#define __STDC_WANT_IEC_60559_ATTRIBS_EXT__ 1" >>confdefs.h -+ -+ $as_echo "#define __STDC_WANT_IEC_60559_BFP_EXT__ 1" >>confdefs.h -+ -+ $as_echo "#define __STDC_WANT_IEC_60559_DFP_EXT__ 1" >>confdefs.h -+ -+ $as_echo "#define __STDC_WANT_IEC_60559_FUNCS_EXT__ 1" >>confdefs.h -+ -+ $as_echo "#define __STDC_WANT_IEC_60559_TYPES_EXT__ 1" >>confdefs.h -+ -+ $as_echo "#define __STDC_WANT_LIB_EXT2__ 1" >>confdefs.h -+ -+ $as_echo "#define __STDC_WANT_MATH_SPEC_FUNCS__ 1" >>confdefs.h -+ - $as_echo "#define _TANDEM_SOURCE 1" >>confdefs.h - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether _XOPEN_SOURCE should be defined" >&5 -@@ -5685,8 +5750,8 @@ - - - --macro_version='2.4.2' --macro_revision='1.3337' -+macro_version='2.4.6' -+macro_revision='2.4.6' - - - -@@ -5700,7 +5765,7 @@ - - - --ltmain="$ac_aux_dir/ltmain.sh" -+ltmain=$ac_aux_dir/ltmain.sh - - # Make sure we can run config.sub. - $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || -@@ -5820,7 +5885,7 @@ - $ECHO "" - } - --case "$ECHO" in -+case $ECHO in - printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5 - $as_echo "printf" >&6; } ;; - print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5 -@@ -6013,19 +6078,19 @@ - - # Check whether --with-gnu-ld was given. - if test "${with_gnu_ld+set}" = set; then : -- withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes -+ withval=$with_gnu_ld; test no = "$withval" || with_gnu_ld=yes - else - with_gnu_ld=no - fi - - ac_prog=ld --if test "$GCC" = yes; then -+if test yes = "$GCC"; then - # Check if gcc -print-prog-name=ld gives a path. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 - $as_echo_n "checking for ld used by $CC... " >&6; } - case $host in - *-*-mingw*) -- # gcc leaves a trailing carriage return which upsets mingw -+ # gcc leaves a trailing carriage return, which upsets mingw - ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; - *) - ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; -@@ -6039,7 +6104,7 @@ - while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do - ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` - done -- test -z "$LD" && LD="$ac_prog" -+ test -z "$LD" && LD=$ac_prog - ;; - "") - # If it fails, then pretend we aren't using GCC. -@@ -6050,7 +6115,7 @@ - with_gnu_ld=unknown - ;; - esac --elif test "$with_gnu_ld" = yes; then -+elif test yes = "$with_gnu_ld"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 - $as_echo_n "checking for GNU ld... " >&6; } - else -@@ -6061,32 +6126,32 @@ - $as_echo_n "(cached) " >&6 - else - if test -z "$LD"; then -- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR -+ lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR - for ac_dir in $PATH; do -- IFS="$lt_save_ifs" -+ IFS=$lt_save_ifs - test -z "$ac_dir" && ac_dir=. - if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then -- lt_cv_path_LD="$ac_dir/$ac_prog" -+ lt_cv_path_LD=$ac_dir/$ac_prog - # Check to see if the program is GNU ld. I'd rather use --version, - # but apparently some variants of GNU ld only accept -v. - # Break only if it was the GNU/non-GNU ld that we prefer. - case `"$lt_cv_path_LD" -v 2>&1 &5 - $as_echo "$LD" >&6; } -@@ -6129,33 +6194,38 @@ - else - if test -n "$NM"; then - # Let the user override the test. -- lt_cv_path_NM="$NM" -+ lt_cv_path_NM=$NM - else -- lt_nm_to_check="${ac_tool_prefix}nm" -+ lt_nm_to_check=${ac_tool_prefix}nm - if test -n "$ac_tool_prefix" && test "$build" = "$host"; then - lt_nm_to_check="$lt_nm_to_check nm" - fi - for lt_tmp_nm in $lt_nm_to_check; do -- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR -+ lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR - for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do -- IFS="$lt_save_ifs" -+ IFS=$lt_save_ifs - test -z "$ac_dir" && ac_dir=. -- tmp_nm="$ac_dir/$lt_tmp_nm" -- if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then -+ tmp_nm=$ac_dir/$lt_tmp_nm -+ if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext"; then - # Check to see if the nm accepts a BSD-compat flag. -- # Adding the `sed 1q' prevents false positives on HP-UX, which says: -+ # Adding the 'sed 1q' prevents false positives on HP-UX, which says: - # nm: unknown option "B" ignored - # Tru64's nm complains that /dev/null is an invalid object file -- case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in -- */dev/null* | *'Invalid file or object type'*) -+ # MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty -+ case $build_os in -+ mingw*) lt_bad_file=conftest.nm/nofile ;; -+ *) lt_bad_file=/dev/null ;; -+ esac -+ case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in -+ *$lt_bad_file* | *'Invalid file or object type'*) - lt_cv_path_NM="$tmp_nm -B" -- break -+ break 2 - ;; - *) - case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in - */dev/null*) - lt_cv_path_NM="$tmp_nm -p" -- break -+ break 2 - ;; - *) - lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but -@@ -6166,15 +6236,15 @@ - esac - fi - done -- IFS="$lt_save_ifs" -+ IFS=$lt_save_ifs - done - : ${lt_cv_path_NM=no} - fi - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5 - $as_echo "$lt_cv_path_NM" >&6; } --if test "$lt_cv_path_NM" != "no"; then -- NM="$lt_cv_path_NM" -+if test no != "$lt_cv_path_NM"; then -+ NM=$lt_cv_path_NM - else - # Didn't find any BSD compatible name lister, look for dumpbin. - if test -n "$DUMPBIN"; then : -@@ -6280,9 +6350,9 @@ - fi - fi - -- case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in -+ case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in - *COFF*) -- DUMPBIN="$DUMPBIN -symbols" -+ DUMPBIN="$DUMPBIN -symbols -headers" - ;; - *) - DUMPBIN=: -@@ -6290,8 +6360,8 @@ - esac - fi - -- if test "$DUMPBIN" != ":"; then -- NM="$DUMPBIN" -+ if test : != "$DUMPBIN"; then -+ NM=$DUMPBIN - fi - fi - test -z "$NM" && NM=nm -@@ -6342,7 +6412,7 @@ - $as_echo_n "(cached) " >&6 - else - i=0 -- teststring="ABCD" -+ teststring=ABCD - - case $build_os in - msdosdjgpp*) -@@ -6360,7 +6430,7 @@ - lt_cv_sys_max_cmd_len=-1; - ;; - -- cygwin* | mingw* | cegcc*) -+ cygwin* | msys* | mingw* | cegcc*) - # On Win9x/ME, this test blows up -- it succeeds, but takes - # about 5 minutes as the teststring grows exponentially. - # Worse, since 9x/ME are not pre-emptively multitasking, -@@ -6382,7 +6452,7 @@ - lt_cv_sys_max_cmd_len=8192; - ;; - -- netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) -+ bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*) - # This has been around since 386BSD, at least. Likely further. - if test -x /sbin/sysctl; then - lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` -@@ -6433,22 +6503,22 @@ - *) - lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` - if test -n "$lt_cv_sys_max_cmd_len" && \ -- test undefined != "$lt_cv_sys_max_cmd_len"; then -+ test undefined != "$lt_cv_sys_max_cmd_len"; then - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` - else - # Make teststring a little bigger before we do anything with it. - # a 1K string should be a reasonable start. -- for i in 1 2 3 4 5 6 7 8 ; do -+ for i in 1 2 3 4 5 6 7 8; do - teststring=$teststring$teststring - done - SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} - # If test is not a shell built-in, we'll probably end up computing a - # maximum length that is only half of the actual maximum length, but - # we can't tell. -- while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ -+ while { test X`env echo "$teststring$teststring" 2>/dev/null` \ - = "X$teststring$teststring"; } >/dev/null 2>&1 && -- test $i != 17 # 1/2 MB should be enough -+ test 17 != "$i" # 1/2 MB should be enough - do - i=`expr $i + 1` - teststring=$teststring$teststring -@@ -6466,7 +6536,7 @@ - - fi - --if test -n $lt_cv_sys_max_cmd_len ; then -+if test -n "$lt_cv_sys_max_cmd_len"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5 - $as_echo "$lt_cv_sys_max_cmd_len" >&6; } - else -@@ -6484,30 +6554,6 @@ - : ${MV="mv -f"} - : ${RM="rm -f"} - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5 --$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; } --# Try some XSI features --xsi_shell=no --( _lt_dummy="a/b/c" -- test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ -- = c,a/b,b/c, \ -- && eval 'test $(( 1 + 1 )) -eq 2 \ -- && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ -- && xsi_shell=yes --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5 --$as_echo "$xsi_shell" >&6; } -- -- --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5 --$as_echo_n "checking whether the shell understands \"+=\"... " >&6; } --lt_shell_append=no --( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \ -- >/dev/null 2>&1 \ -- && lt_shell_append=yes --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5 --$as_echo "$lt_shell_append" >&6; } -- -- - if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then - lt_unset=unset - else -@@ -6550,7 +6596,7 @@ - *-*-mingw* ) # actually msys - lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 - ;; -- *-*-cygwin* ) -+ *-*-cygwin* | *-*-msys* ) - lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 - ;; - * ) # otherwise, assume *nix -@@ -6558,12 +6604,12 @@ - ;; - esac - ;; -- *-*-cygwin* ) -+ *-*-cygwin* | *-*-msys* ) - case $build in - *-*-mingw* ) # actually msys - lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin - ;; -- *-*-cygwin* ) -+ *-*-cygwin* | *-*-msys* ) - lt_cv_to_host_file_cmd=func_convert_file_noop - ;; - * ) # otherwise, assume *nix -@@ -6629,14 +6675,14 @@ - esac - reload_cmds='$LD$reload_flag -o $output$reload_objs' - case $host_os in -- cygwin* | mingw* | pw32* | cegcc*) -- if test "$GCC" != yes; then -+ cygwin* | msys* | mingw* | pw32* | cegcc*) -+ if test yes != "$GCC"; then - reload_cmds=false - fi - ;; - darwin*) -- if test "$GCC" = yes; then -- reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' -+ if test yes = "$GCC"; then -+ reload_cmds='$LTCC $LTCFLAGS -nostdlib $wl-r -o $output$reload_objs' - else - reload_cmds='$LD$reload_flag -o $output$reload_objs' - fi -@@ -6764,13 +6810,13 @@ - # Need to set the preceding variable on all platforms that support - # interlibrary dependencies. - # 'none' -- dependencies not supported. --# `unknown' -- same as none, but documents that we really don't know. -+# 'unknown' -- same as none, but documents that we really don't know. - # 'pass_all' -- all dependencies passed with no checks. - # 'test_compile' -- check by making test program. - # 'file_magic [[regex]]' -- check by looking for files in library path --# which responds to the $file_magic_cmd with a given extended regex. --# If you have `file' or equivalent on your system and you're not sure --# whether `pass_all' will *always* work, you probably want this one. -+# that responds to the $file_magic_cmd with a given extended regex. -+# If you have 'file' or equivalent on your system and you're not sure -+# whether 'pass_all' will *always* work, you probably want this one. - - case $host_os in - aix[4-9]*) -@@ -6787,7 +6833,7 @@ - lt_cv_file_magic_test_file=/shlib/libc.so - ;; - --cygwin*) -+cygwin* | msys*) - # func_win32_libid is a shell function defined in ltmain.sh - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' - lt_cv_file_magic_cmd='func_win32_libid' -@@ -6797,8 +6843,7 @@ - # Base MSYS/MinGW do not provide the 'file' command needed by - # func_win32_libid shell function, so use a weaker test based on 'objdump', - # unless we find 'file', for example because we are cross-compiling. -- # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin. -- if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then -+ if ( file / ) >/dev/null 2>&1; then - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' - lt_cv_file_magic_cmd='func_win32_libid' - else -@@ -6876,7 +6921,7 @@ - lt_cv_deplibs_check_method=pass_all - ;; - --netbsd* | netbsdelf*-gnu) -+netbsd*) - if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then - lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' - else -@@ -6894,8 +6939,8 @@ - lt_cv_deplibs_check_method=pass_all - ;; - --openbsd*) -- if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -+openbsd* | bitrig*) -+ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then - lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$' - else - lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' -@@ -6948,6 +6993,9 @@ - tpf*) - lt_cv_deplibs_check_method=pass_all - ;; -+os2*) -+ lt_cv_deplibs_check_method=pass_all -+ ;; - esac - - fi -@@ -7104,9 +7152,9 @@ - lt_cv_sharedlib_from_linklib_cmd='unknown' - - case $host_os in --cygwin* | mingw* | pw32* | cegcc*) -- # two different shell functions defined in ltmain.sh -- # decide which to use based on capabilities of $DLLTOOL -+cygwin* | msys* | mingw* | pw32* | cegcc*) -+ # two different shell functions defined in ltmain.sh; -+ # decide which one to use based on capabilities of $DLLTOOL - case `$DLLTOOL --help 2>&1` in - *--identify-strict*) - lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib -@@ -7118,7 +7166,7 @@ - ;; - *) - # fallback: assume linklib IS sharedlib -- lt_cv_sharedlib_from_linklib_cmd="$ECHO" -+ lt_cv_sharedlib_from_linklib_cmd=$ECHO - ;; - esac - -@@ -7272,7 +7320,7 @@ - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } -- if test "$ac_status" -eq 0; then -+ if test 0 -eq "$ac_status"; then - # Ensure the archiver fails upon bogus file names. - rm -f conftest.$ac_objext libconftest.a - { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 -@@ -7280,7 +7328,7 @@ - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } -- if test "$ac_status" -ne 0; then -+ if test 0 -ne "$ac_status"; then - lt_cv_ar_at_file=@ - fi - fi -@@ -7293,7 +7341,7 @@ - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 - $as_echo "$lt_cv_ar_at_file" >&6; } - --if test "x$lt_cv_ar_at_file" = xno; then -+if test no = "$lt_cv_ar_at_file"; then - archiver_list_spec= - else - archiver_list_spec=$lt_cv_ar_at_file -@@ -7510,7 +7558,7 @@ - - if test -n "$RANLIB"; then - case $host_os in -- openbsd*) -+ bitrig* | openbsd*) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" - ;; - *) -@@ -7596,11 +7644,11 @@ - aix*) - symcode='[BCDT]' - ;; --cygwin* | mingw* | pw32* | cegcc*) -+cygwin* | msys* | mingw* | pw32* | cegcc*) - symcode='[ABCDGISTW]' - ;; - hpux*) -- if test "$host_cpu" = ia64; then -+ if test ia64 = "$host_cpu"; then - symcode='[ABCDEGRST]' - fi - ;; -@@ -7633,14 +7681,44 @@ - symcode='[ABCDGIRSTW]' ;; - esac - -+if test "$lt_cv_nm_interface" = "MS dumpbin"; then -+ # Gets list of data symbols to import. -+ lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* \(.*\)$/\1/p'" -+ # Adjust the below global symbol transforms to fixup imported variables. -+ lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'" -+ lt_c_name_hook=" -e 's/^I .* \(.*\)$/ {\"\1\", (void *) 0},/p'" -+ lt_c_name_lib_hook="\ -+ -e 's/^I .* \(lib.*\)$/ {\"\1\", (void *) 0},/p'\ -+ -e 's/^I .* \(.*\)$/ {\"lib\1\", (void *) 0},/p'" -+else -+ # Disable hooks by default. -+ lt_cv_sys_global_symbol_to_import= -+ lt_cdecl_hook= -+ lt_c_name_hook= -+ lt_c_name_lib_hook= -+fi -+ - # Transform an extracted symbol line into a proper C declaration. - # Some systems (esp. on ia64) link data and code symbols differently, - # so use this general approach. --lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" -+lt_cv_sys_global_symbol_to_cdecl="sed -n"\ -+$lt_cdecl_hook\ -+" -e 's/^T .* \(.*\)$/extern int \1();/p'"\ -+" -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'" - - # Transform an extracted symbol line into symbol name and symbol address --lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" --lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" -+lt_cv_sys_global_symbol_to_c_name_address="sed -n"\ -+$lt_c_name_hook\ -+" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ -+" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/p'" -+ -+# Transform an extracted symbol line into symbol name with lib prefix and -+# symbol address. -+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\ -+$lt_c_name_lib_hook\ -+" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ -+" -e 's/^$symcode$symcode* .* \(lib.*\)$/ {\"\1\", (void *) \&\1},/p'"\ -+" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"lib\1\", (void *) \&\1},/p'" - - # Handle CRLF in mingw tool chain - opt_cr= -@@ -7658,21 +7736,24 @@ - - # Write the raw and C identifiers. - if test "$lt_cv_nm_interface" = "MS dumpbin"; then -- # Fake it for dumpbin and say T for any non-static function -- # and D for any global variable. -+ # Fake it for dumpbin and say T for any non-static function, -+ # D for any global variable and I for any imported variable. - # Also find C++ and __fastcall symbols from MSVC++, - # which start with @ or ?. - lt_cv_sys_global_symbol_pipe="$AWK '"\ - " {last_section=section; section=\$ 3};"\ - " /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ - " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ -+" /^ *Symbol name *: /{split(\$ 0,sn,\":\"); si=substr(sn[2],2)};"\ -+" /^ *Type *: code/{print \"T\",si,substr(si,length(prfx))};"\ -+" /^ *Type *: data/{print \"I\",si,substr(si,length(prfx))};"\ - " \$ 0!~/External *\|/{next};"\ - " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ - " {if(hide[section]) next};"\ --" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\ --" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\ --" s[1]~/^[@?]/{print s[1], s[1]; next};"\ --" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\ -+" {f=\"D\"}; \$ 0~/\(\).*\|/{f=\"T\"};"\ -+" {split(\$ 0,a,/\||\r/); split(a[2],s)};"\ -+" s[1]~/^[@?]/{print f,s[1],s[1]; next};"\ -+" s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\ - " ' prfx=^$ac_symprfx" - else - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" -@@ -7720,11 +7801,11 @@ - if $GREP ' nm_test_func$' "$nlist" >/dev/null; then - cat <<_LT_EOF > conftest.$ac_ext - /* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ --#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) --/* DATA imports from DLLs on WIN32 con't be const, because runtime -+#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE -+/* DATA imports from DLLs on WIN32 can't be const, because runtime - relocations are performed -- see ld's documentation on pseudo-relocs. */ - # define LT_DLSYM_CONST --#elif defined(__osf__) -+#elif defined __osf__ - /* This system does not cope well with relocations in const data. */ - # define LT_DLSYM_CONST - #else -@@ -7750,7 +7831,7 @@ - { - { "@PROGRAM@", (void *) 0 }, - _LT_EOF -- $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext -+ $SED "s/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext - cat <<\_LT_EOF >> conftest.$ac_ext - {0, (void *) 0} - }; -@@ -7770,13 +7851,13 @@ - mv conftest.$ac_objext conftstm.$ac_objext - lt_globsym_save_LIBS=$LIBS - lt_globsym_save_CFLAGS=$CFLAGS -- LIBS="conftstm.$ac_objext" -+ LIBS=conftstm.$ac_objext - CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 - (eval $ac_link) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; } && test -s conftest${ac_exeext}; then -+ test $ac_status = 0; } && test -s conftest$ac_exeext; then - pipe_works=yes - fi - LIBS=$lt_globsym_save_LIBS -@@ -7797,7 +7878,7 @@ - rm -rf conftest* conftst* - - # Do not use the global_symbol_pipe unless it works. -- if test "$pipe_works" = yes; then -+ if test yes = "$pipe_works"; then - break - else - lt_cv_sys_global_symbol_pipe= -@@ -7850,6 +7931,16 @@ - - - -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 - $as_echo_n "checking for sysroot... " >&6; } - -@@ -7862,9 +7953,9 @@ - - - lt_sysroot= --case ${with_sysroot} in #( -+case $with_sysroot in #( - yes) -- if test "$GCC" = yes; then -+ if test yes = "$GCC"; then - lt_sysroot=`$CC --print-sysroot 2>/dev/null` - fi - ;; #( -@@ -7874,8 +7965,8 @@ - no|'') - ;; #( - *) -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5 --$as_echo "${with_sysroot}" >&6; } -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_sysroot" >&5 -+$as_echo "$with_sysroot" >&6; } - as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 - ;; - esac -@@ -7887,18 +7978,99 @@ - - - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a working dd" >&5 -+$as_echo_n "checking for a working dd... " >&6; } -+if ${ac_cv_path_lt_DD+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ printf 0123456789abcdef0123456789abcdef >conftest.i -+cat conftest.i conftest.i >conftest2.i -+: ${lt_DD:=$DD} -+if test -z "$lt_DD"; then -+ ac_path_lt_DD_found=false -+ # Loop through the user's path and test for each of PROGNAME-LIST -+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_prog in dd; do -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ ac_path_lt_DD="$as_dir/$ac_prog$ac_exec_ext" -+ as_fn_executable_p "$ac_path_lt_DD" || continue -+if "$ac_path_lt_DD" bs=32 count=1 conftest.out 2>/dev/null; then -+ cmp -s conftest.i conftest.out \ -+ && ac_cv_path_lt_DD="$ac_path_lt_DD" ac_path_lt_DD_found=: -+fi -+ $ac_path_lt_DD_found && break 3 -+ done -+ done -+ done -+IFS=$as_save_IFS -+ if test -z "$ac_cv_path_lt_DD"; then -+ : -+ fi -+else -+ ac_cv_path_lt_DD=$lt_DD -+fi -+ -+rm -f conftest.i conftest2.i conftest.out -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_lt_DD" >&5 -+$as_echo "$ac_cv_path_lt_DD" >&6; } -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to truncate binary pipes" >&5 -+$as_echo_n "checking how to truncate binary pipes... " >&6; } -+if ${lt_cv_truncate_bin+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ printf 0123456789abcdef0123456789abcdef >conftest.i -+cat conftest.i conftest.i >conftest2.i -+lt_cv_truncate_bin= -+if "$ac_cv_path_lt_DD" bs=32 count=1 conftest.out 2>/dev/null; then -+ cmp -s conftest.i conftest.out \ -+ && lt_cv_truncate_bin="$ac_cv_path_lt_DD bs=4096 count=1" -+fi -+rm -f conftest.i conftest2.i conftest.out -+test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q" -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_truncate_bin" >&5 -+$as_echo "$lt_cv_truncate_bin" >&6; } -+ -+ -+ -+ -+ -+ -+ -+# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. -+func_cc_basename () -+{ -+ for cc_temp in $*""; do -+ case $cc_temp in -+ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; -+ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; -+ \-*) ;; -+ *) break;; -+ esac -+ done -+ func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` -+} -+ - # Check whether --enable-libtool-lock was given. - if test "${enable_libtool_lock+set}" = set; then : - enableval=$enable_libtool_lock; - fi - --test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes -+test no = "$enable_libtool_lock" || enable_libtool_lock=yes - - # Some flags need to be propagated to the compiler or linker for good - # libtool support. - case $host in - ia64-*-hpux*) -- # Find out which ABI we are using. -+ # Find out what ABI is being produced by ac_compile, and set mode -+ # options accordingly. - echo 'int i;' > conftest.$ac_ext - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 - (eval $ac_compile) 2>&5 -@@ -7907,24 +8079,25 @@ - test $ac_status = 0; }; then - case `/usr/bin/file conftest.$ac_objext` in - *ELF-32*) -- HPUX_IA64_MODE="32" -+ HPUX_IA64_MODE=32 - ;; - *ELF-64*) -- HPUX_IA64_MODE="64" -+ HPUX_IA64_MODE=64 - ;; - esac - fi - rm -rf conftest* - ;; - *-*-irix6*) -- # Find out which ABI we are using. -+ # Find out what ABI is being produced by ac_compile, and set linker -+ # options accordingly. - echo '#line '$LINENO' "configure"' > conftest.$ac_ext - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then -- if test "$lt_cv_prog_gnu_ld" = yes; then -+ if test yes = "$lt_cv_prog_gnu_ld"; then - case `/usr/bin/file conftest.$ac_objext` in - *32-bit*) - LD="${LD-ld} -melf32bsmip" -@@ -7953,9 +8126,50 @@ - rm -rf conftest* - ;; - -+mips64*-*linux*) -+ # Find out what ABI is being produced by ac_compile, and set linker -+ # options accordingly. -+ echo '#line '$LINENO' "configure"' > conftest.$ac_ext -+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 -+ (eval $ac_compile) 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; then -+ emul=elf -+ case `/usr/bin/file conftest.$ac_objext` in -+ *32-bit*) -+ emul="${emul}32" -+ ;; -+ *64-bit*) -+ emul="${emul}64" -+ ;; -+ esac -+ case `/usr/bin/file conftest.$ac_objext` in -+ *MSB*) -+ emul="${emul}btsmip" -+ ;; -+ *LSB*) -+ emul="${emul}ltsmip" -+ ;; -+ esac -+ case `/usr/bin/file conftest.$ac_objext` in -+ *N32*) -+ emul="${emul}n32" -+ ;; -+ esac -+ LD="${LD-ld} -m $emul" -+ fi -+ rm -rf conftest* -+ ;; -+ - x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ - s390*-*linux*|s390*-*tpf*|sparc*-*linux*) -- # Find out which ABI we are using. -+ # Find out what ABI is being produced by ac_compile, and set linker -+ # options accordingly. Note that the listed cases only cover the -+ # situations where additional linker options are needed (such as when -+ # doing 32-bit compilation for a host where ld defaults to 64-bit, or -+ # vice versa); the common cases where no linker options are needed do -+ # not appear in the list. - echo 'int i;' > conftest.$ac_ext - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 - (eval $ac_compile) 2>&5 -@@ -7978,10 +8192,10 @@ - ;; - esac - ;; -- powerpc64le-*) -+ powerpc64le-*linux*) - LD="${LD-ld} -m elf32lppclinux" - ;; -- powerpc64-*) -+ powerpc64-*linux*) - LD="${LD-ld} -m elf32ppclinux" - ;; - s390x-*linux*) -@@ -8000,10 +8214,10 @@ - x86_64-*linux*) - LD="${LD-ld} -m elf_x86_64" - ;; -- powerpcle-*) -+ powerpcle-*linux*) - LD="${LD-ld} -m elf64lppc" - ;; -- powerpc-*) -+ powerpc-*linux*) - LD="${LD-ld} -m elf64ppc" - ;; - s390*-*linux*|s390*-*tpf*) -@@ -8021,7 +8235,7 @@ - - *-*-sco3.2v5*) - # On SCO OpenServer 5, we need -belf to get full-featured binaries. -- SAVE_CFLAGS="$CFLAGS" -+ SAVE_CFLAGS=$CFLAGS - CFLAGS="$CFLAGS -belf" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5 - $as_echo_n "checking whether the C compiler needs -belf... " >&6; } -@@ -8061,13 +8275,14 @@ - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5 - $as_echo "$lt_cv_cc_needs_belf" >&6; } -- if test x"$lt_cv_cc_needs_belf" != x"yes"; then -+ if test yes != "$lt_cv_cc_needs_belf"; then - # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf -- CFLAGS="$SAVE_CFLAGS" -+ CFLAGS=$SAVE_CFLAGS - fi - ;; - *-*solaris*) -- # Find out which ABI we are using. -+ # Find out what ABI is being produced by ac_compile, and set linker -+ # options accordingly. - echo 'int i;' > conftest.$ac_ext - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 - (eval $ac_compile) 2>&5 -@@ -8079,7 +8294,7 @@ - case $lt_cv_prog_gnu_ld in - yes*) - case $host in -- i?86-*-solaris*) -+ i?86-*-solaris*|x86_64-*-solaris*) - LD="${LD-ld} -m elf_x86_64" - ;; - sparc*-*-solaris*) -@@ -8088,7 +8303,7 @@ - esac - # GNU ld 2.21 introduced _sol2 emulations. Use them if available. - if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then -- LD="${LD-ld}_sol2" -+ LD=${LD-ld}_sol2 - fi - ;; - *) -@@ -8104,7 +8319,7 @@ - ;; - esac - --need_locks="$enable_libtool_lock" -+need_locks=$enable_libtool_lock - - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. -@@ -8215,7 +8430,7 @@ - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 - $as_echo "$lt_cv_path_mainfest_tool" >&6; } --if test "x$lt_cv_path_mainfest_tool" != xyes; then -+if test yes != "$lt_cv_path_mainfest_tool"; then - MANIFEST_TOOL=: - fi - -@@ -8718,7 +8933,7 @@ - $as_echo_n "(cached) " >&6 - else - lt_cv_apple_cc_single_mod=no -- if test -z "${LT_MULTI_MODULE}"; then -+ if test -z "$LT_MULTI_MODULE"; then - # By default we will add the -single_module flag. You can override - # by either setting the environment variable LT_MULTI_MODULE - # non-empty at configure time, or by adding -multi_module to the -@@ -8736,7 +8951,7 @@ - cat conftest.err >&5 - # Otherwise, if the output was created with a 0 exit code from - # the compiler, it worked. -- elif test -f libconftest.dylib && test $_lt_result -eq 0; then -+ elif test -f libconftest.dylib && test 0 = "$_lt_result"; then - lt_cv_apple_cc_single_mod=yes - else - cat conftest.err >&5 -@@ -8775,7 +8990,7 @@ - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -- LDFLAGS="$save_LDFLAGS" -+ LDFLAGS=$save_LDFLAGS - - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 -@@ -8804,7 +9019,7 @@ - _lt_result=$? - if test -s conftest.err && $GREP force_load conftest.err; then - cat conftest.err >&5 -- elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then -+ elif test -f conftest && test 0 = "$_lt_result" && $GREP forced_load conftest >/dev/null 2>&1; then - lt_cv_ld_force_load=yes - else - cat conftest.err >&5 -@@ -8817,32 +9032,32 @@ - $as_echo "$lt_cv_ld_force_load" >&6; } - case $host_os in - rhapsody* | darwin1.[012]) -- _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; -+ _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;; - darwin1.*) -- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; -+ _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; - darwin*) # darwin 5.x on - # if running on 10.5 or later, the deployment target defaults - # to the OS version, if on x86, and 10.4, the deployment - # target defaults to 10.4. Don't you love it? - case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in - 10.0,*86*-darwin8*|10.0,*-darwin[91]*) -- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; -- 10.[012]*) -- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; -+ _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; -+ 10.[012][,.]*) -+ _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; - 10.*) -- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; -+ _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; - esac - ;; - esac -- if test "$lt_cv_apple_cc_single_mod" = "yes"; then -+ if test yes = "$lt_cv_apple_cc_single_mod"; then - _lt_dar_single_mod='$single_module' - fi -- if test "$lt_cv_ld_exported_symbols_list" = "yes"; then -- _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' -+ if test yes = "$lt_cv_ld_exported_symbols_list"; then -+ _lt_dar_export_syms=' $wl-exported_symbols_list,$output_objdir/$libname-symbols.expsym' - else -- _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ _lt_dar_export_syms='~$NMEDIT -s $output_objdir/$libname-symbols.expsym $lib' - fi -- if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then -+ if test : != "$DSYMUTIL" && test no = "$lt_cv_ld_force_load"; then - _lt_dsymutil='~$DSYMUTIL $lib || :' - else - _lt_dsymutil= -@@ -8850,6 +9065,41 @@ - ;; - esac - -+# func_munge_path_list VARIABLE PATH -+# ----------------------------------- -+# VARIABLE is name of variable containing _space_ separated list of -+# directories to be munged by the contents of PATH, which is string -+# having a format: -+# "DIR[:DIR]:" -+# string "DIR[ DIR]" will be prepended to VARIABLE -+# ":DIR[:DIR]" -+# string "DIR[ DIR]" will be appended to VARIABLE -+# "DIRP[:DIRP]::[DIRA:]DIRA" -+# string "DIRP[ DIRP]" will be prepended to VARIABLE and string -+# "DIRA[ DIRA]" will be appended to VARIABLE -+# "DIR[:DIR]" -+# VARIABLE will be replaced by "DIR[ DIR]" -+func_munge_path_list () -+{ -+ case x$2 in -+ x) -+ ;; -+ *:) -+ eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\" -+ ;; -+ x:*) -+ eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\" -+ ;; -+ *::*) -+ eval $1=\"\$$1\ `$ECHO $2 | $SED -e 's/.*:://' -e 's/:/ /g'`\" -+ eval $1=\"`$ECHO $2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \$$1\" -+ ;; -+ *) -+ eval $1=\"`$ECHO $2 | $SED 's/:/ /g'`\" -+ ;; -+ esac -+} -+ - for ac_header in dlfcn.h - do : - ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default -@@ -8877,14 +9127,14 @@ - *) - enable_static=no - # Look at the argument we got. We use all the common list separators. -- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," -+ lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, - for pkg in $enableval; do -- IFS="$lt_save_ifs" -+ IFS=$lt_save_ifs - if test "X$pkg" = "X$p"; then - enable_static=yes - fi - done -- IFS="$lt_save_ifs" -+ IFS=$lt_save_ifs - ;; - esac - else -@@ -8915,14 +9165,14 @@ - *) - enable_shared=no - # Look at the argument we got. We use all the common list separators. -- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," -+ lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, - for pkg in $enableval; do -- IFS="$lt_save_ifs" -+ IFS=$lt_save_ifs - if test "X$pkg" = "X$p"; then - enable_shared=yes - fi - done -- IFS="$lt_save_ifs" -+ IFS=$lt_save_ifs - ;; - esac - else -@@ -8947,14 +9197,14 @@ - *) - pic_mode=default - # Look at the argument we got. We use all the common list separators. -- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," -+ lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, - for lt_pkg in $withval; do -- IFS="$lt_save_ifs" -+ IFS=$lt_save_ifs - if test "X$lt_pkg" = "X$lt_p"; then - pic_mode=yes - fi - done -- IFS="$lt_save_ifs" -+ IFS=$lt_save_ifs - ;; - esac - else -@@ -8962,8 +9212,6 @@ - fi - - --test -z "$pic_mode" && pic_mode=default -- - - - -@@ -8979,14 +9227,14 @@ - *) - enable_fast_install=no - # Look at the argument we got. We use all the common list separators. -- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," -+ lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, - for pkg in $enableval; do -- IFS="$lt_save_ifs" -+ IFS=$lt_save_ifs - if test "X$pkg" = "X$p"; then - enable_fast_install=yes - fi - done -- IFS="$lt_save_ifs" -+ IFS=$lt_save_ifs - ;; - esac - else -@@ -9000,11 +9248,63 @@ - - - -+ shared_archive_member_spec= -+case $host,$enable_shared in -+power*-*-aix[5-9]*,yes) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking which variant of shared library versioning to provide" >&5 -+$as_echo_n "checking which variant of shared library versioning to provide... " >&6; } -+ -+# Check whether --with-aix-soname was given. -+if test "${with_aix_soname+set}" = set; then : -+ withval=$with_aix_soname; case $withval in -+ aix|svr4|both) -+ ;; -+ *) -+ as_fn_error $? "Unknown argument to --with-aix-soname" "$LINENO" 5 -+ ;; -+ esac -+ lt_cv_with_aix_soname=$with_aix_soname -+else -+ if ${lt_cv_with_aix_soname+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ lt_cv_with_aix_soname=aix -+fi -+ -+ with_aix_soname=$lt_cv_with_aix_soname -+fi -+ -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_aix_soname" >&5 -+$as_echo "$with_aix_soname" >&6; } -+ if test aix != "$with_aix_soname"; then -+ # For the AIX way of multilib, we name the shared archive member -+ # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o', -+ # and 'shr.imp' or 'shr_64.imp', respectively, for the Import File. -+ # Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag, -+ # the AIX toolchain works better with OBJECT_MODE set (default 32). -+ if test 64 = "${OBJECT_MODE-32}"; then -+ shared_archive_member_spec=shr_64 -+ else -+ shared_archive_member_spec=shr -+ fi -+ fi -+ ;; -+*) -+ with_aix_soname=aix -+ ;; -+esac -+ -+ -+ -+ -+ -+ -+ - - - - # This can be used to rebuild libtool when needed --LIBTOOL_DEPS="$ltmain" -+LIBTOOL_DEPS=$ltmain - - # Always use our own libtool. - LIBTOOL='$(SHELL) $(top_builddir)/libtool' -@@ -9053,7 +9353,7 @@ - - - --if test -n "${ZSH_VERSION+set}" ; then -+if test -n "${ZSH_VERSION+set}"; then - setopt NO_GLOB_SUBST - fi - -@@ -9092,7 +9392,7 @@ - # AIX sometimes has problems with the GCC collect2 program. For some - # reason, if we set the COLLECT_NAMES environment variable, the problems - # vanish in a puff of smoke. -- if test "X${COLLECT_NAMES+set}" != Xset; then -+ if test set != "${COLLECT_NAMES+set}"; then - COLLECT_NAMES= - export COLLECT_NAMES - fi -@@ -9103,14 +9403,14 @@ - ofile=libtool - can_build_shared=yes - --# All known linkers require a `.a' archive for static linking (except MSVC, -+# All known linkers require a '.a' archive for static linking (except MSVC, - # which needs '.lib'). - libext=a - --with_gnu_ld="$lt_cv_prog_gnu_ld" -+with_gnu_ld=$lt_cv_prog_gnu_ld - --old_CC="$CC" --old_CFLAGS="$CFLAGS" -+old_CC=$CC -+old_CFLAGS=$CFLAGS - - # Set sane defaults for various variables - test -z "$CC" && CC=cc -@@ -9119,15 +9419,8 @@ - test -z "$LD" && LD=ld - test -z "$ac_objext" && ac_objext=o - --for cc_temp in $compiler""; do -- case $cc_temp in -- compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; -- distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; -- \-*) ;; -- *) break;; -- esac --done --cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` -+func_cc_basename $compiler -+cc_basename=$func_cc_basename_result - - - # Only perform the check for file, if the check method requires it -@@ -9142,22 +9435,22 @@ - else - case $MAGIC_CMD in - [\\/*] | ?:[\\/]*) -- lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. -+ lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path. - ;; - *) -- lt_save_MAGIC_CMD="$MAGIC_CMD" -- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR -+ lt_save_MAGIC_CMD=$MAGIC_CMD -+ lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR - ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" - for ac_dir in $ac_dummy; do -- IFS="$lt_save_ifs" -+ IFS=$lt_save_ifs - test -z "$ac_dir" && ac_dir=. -- if test -f $ac_dir/${ac_tool_prefix}file; then -- lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file" -+ if test -f "$ac_dir/${ac_tool_prefix}file"; then -+ lt_cv_path_MAGIC_CMD=$ac_dir/"${ac_tool_prefix}file" - if test -n "$file_magic_test_file"; then - case $deplibs_check_method in - "file_magic "*) - file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` -- MAGIC_CMD="$lt_cv_path_MAGIC_CMD" -+ MAGIC_CMD=$lt_cv_path_MAGIC_CMD - if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | - $EGREP "$file_magic_regex" > /dev/null; then - : -@@ -9180,13 +9473,13 @@ - break - fi - done -- IFS="$lt_save_ifs" -- MAGIC_CMD="$lt_save_MAGIC_CMD" -+ IFS=$lt_save_ifs -+ MAGIC_CMD=$lt_save_MAGIC_CMD - ;; - esac - fi - --MAGIC_CMD="$lt_cv_path_MAGIC_CMD" -+MAGIC_CMD=$lt_cv_path_MAGIC_CMD - if test -n "$MAGIC_CMD"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 - $as_echo "$MAGIC_CMD" >&6; } -@@ -9208,22 +9501,22 @@ - else - case $MAGIC_CMD in - [\\/*] | ?:[\\/]*) -- lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. -+ lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path. - ;; - *) -- lt_save_MAGIC_CMD="$MAGIC_CMD" -- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR -+ lt_save_MAGIC_CMD=$MAGIC_CMD -+ lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR - ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" - for ac_dir in $ac_dummy; do -- IFS="$lt_save_ifs" -+ IFS=$lt_save_ifs - test -z "$ac_dir" && ac_dir=. -- if test -f $ac_dir/file; then -- lt_cv_path_MAGIC_CMD="$ac_dir/file" -+ if test -f "$ac_dir/file"; then -+ lt_cv_path_MAGIC_CMD=$ac_dir/"file" - if test -n "$file_magic_test_file"; then - case $deplibs_check_method in - "file_magic "*) - file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` -- MAGIC_CMD="$lt_cv_path_MAGIC_CMD" -+ MAGIC_CMD=$lt_cv_path_MAGIC_CMD - if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | - $EGREP "$file_magic_regex" > /dev/null; then - : -@@ -9246,13 +9539,13 @@ - break - fi - done -- IFS="$lt_save_ifs" -- MAGIC_CMD="$lt_save_MAGIC_CMD" -+ IFS=$lt_save_ifs -+ MAGIC_CMD=$lt_save_MAGIC_CMD - ;; - esac - fi - --MAGIC_CMD="$lt_cv_path_MAGIC_CMD" -+MAGIC_CMD=$lt_cv_path_MAGIC_CMD - if test -n "$MAGIC_CMD"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 - $as_echo "$MAGIC_CMD" >&6; } -@@ -9273,7 +9566,7 @@ - - # Use C for the default configuration in the libtool script - --lt_save_CC="$CC" -+lt_save_CC=$CC - ac_ext=c - ac_cpp='$CPP $CPPFLAGS' - ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -@@ -9335,7 +9628,7 @@ - - lt_prog_compiler_no_builtin_flag= - --if test "$GCC" = yes; then -+if test yes = "$GCC"; then - case $cc_basename in - nvcc*) - lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;; -@@ -9351,7 +9644,7 @@ - lt_cv_prog_compiler_rtti_exceptions=no - ac_outfile=conftest.$ac_objext - echo "$lt_simple_compile_test_code" > conftest.$ac_ext -- lt_compiler_flag="-fno-rtti -fno-exceptions" -+ lt_compiler_flag="-fno-rtti -fno-exceptions" ## exclude from sc_useless_quotes_in_assignment - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins -@@ -9381,7 +9674,7 @@ - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 - $as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; } - --if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then -+if test yes = "$lt_cv_prog_compiler_rtti_exceptions"; then - lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions" - else - : -@@ -9399,17 +9692,18 @@ - lt_prog_compiler_static= - - -- if test "$GCC" = yes; then -+ if test yes = "$GCC"; then - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_static='-static' - - case $host_os in - aix*) - # All AIX code is PIC. -- if test "$host_cpu" = ia64; then -+ if test ia64 = "$host_cpu"; then - # AIX 5 now supports IA64 processor - lt_prog_compiler_static='-Bstatic' - fi -+ lt_prog_compiler_pic='-fPIC' - ;; - - amigaos*) -@@ -9420,8 +9714,8 @@ - ;; - m68k) - # FIXME: we need at least 68020 code to build shared libraries, but -- # adding the `-m68020' flag to GCC prevents building anything better, -- # like `-m68040'. -+ # adding the '-m68020' flag to GCC prevents building anything better, -+ # like '-m68040'. - lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4' - ;; - esac -@@ -9431,12 +9725,17 @@ - # PIC is the default for these OSes. - ;; - -- mingw* | cygwin* | pw32* | os2* | cegcc*) -+ mingw* | cygwin* | msys* | pw32* | os2* | cegcc*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - # Although the cygwin gcc ignores -fPIC, still need this for old-style - # (--disable-auto-import) libraries - lt_prog_compiler_pic='-DDLL_EXPORT' -+ case $host_os in -+ os2*) -+ lt_prog_compiler_static='$wl-static' -+ ;; -+ esac - ;; - - darwin* | rhapsody*) -@@ -9507,7 +9806,7 @@ - case $host_os in - aix*) - lt_prog_compiler_wl='-Wl,' -- if test "$host_cpu" = ia64; then -+ if test ia64 = "$host_cpu"; then - # AIX 5 now supports IA64 processor - lt_prog_compiler_static='-Bstatic' - else -@@ -9515,10 +9814,29 @@ - fi - ;; - -- mingw* | cygwin* | pw32* | os2* | cegcc*) -+ darwin* | rhapsody*) -+ # PIC is the default on this platform -+ # Common symbols not allowed in MH_DYLIB files -+ lt_prog_compiler_pic='-fno-common' -+ case $cc_basename in -+ nagfor*) -+ # NAG Fortran compiler -+ lt_prog_compiler_wl='-Wl,-Wl,,' -+ lt_prog_compiler_pic='-PIC' -+ lt_prog_compiler_static='-Bstatic' -+ ;; -+ esac -+ ;; -+ -+ mingw* | cygwin* | msys* | pw32* | os2* | cegcc*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - lt_prog_compiler_pic='-DDLL_EXPORT' -+ case $host_os in -+ os2*) -+ lt_prog_compiler_static='$wl-static' -+ ;; -+ esac - ;; - - hpux9* | hpux10* | hpux11*) -@@ -9534,7 +9852,7 @@ - ;; - esac - # Is there a better lt_prog_compiler_static that works with the bundled CC? -- lt_prog_compiler_static='${wl}-a ${wl}archive' -+ lt_prog_compiler_static='$wl-a ${wl}archive' - ;; - - irix5* | irix6* | nonstopux*) -@@ -9545,7 +9863,7 @@ - - linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) - case $cc_basename in -- # old Intel for x86_64 which still supported -KPIC. -+ # old Intel for x86_64, which still supported -KPIC. - ecc*) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='-KPIC' -@@ -9570,6 +9888,12 @@ - lt_prog_compiler_pic='-PIC' - lt_prog_compiler_static='-Bstatic' - ;; -+ tcc*) -+ # Fabrice Bellard et al's Tiny C Compiler -+ lt_prog_compiler_wl='-Wl,' -+ lt_prog_compiler_pic='-fPIC' -+ lt_prog_compiler_static='-static' -+ ;; - pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) - # Portland Group compilers (*not* the Pentium gcc compiler, - # which looks to be a dead project) -@@ -9667,7 +9991,7 @@ - ;; - - sysv4*MP*) -- if test -d /usr/nec ;then -+ if test -d /usr/nec; then - lt_prog_compiler_pic='-Kconform_pic' - lt_prog_compiler_static='-Bstatic' - fi -@@ -9696,7 +10020,7 @@ - fi - - case $host_os in -- # For platforms which do not support PIC, -DPIC is meaningless: -+ # For platforms that do not support PIC, -DPIC is meaningless: - *djgpp*) - lt_prog_compiler_pic= - ;; -@@ -9728,7 +10052,7 @@ - lt_cv_prog_compiler_pic_works=no - ac_outfile=conftest.$ac_objext - echo "$lt_simple_compile_test_code" > conftest.$ac_ext -- lt_compiler_flag="$lt_prog_compiler_pic -DPIC" -+ lt_compiler_flag="$lt_prog_compiler_pic -DPIC" ## exclude from sc_useless_quotes_in_assignment - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins -@@ -9758,7 +10082,7 @@ - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5 - $as_echo "$lt_cv_prog_compiler_pic_works" >&6; } - --if test x"$lt_cv_prog_compiler_pic_works" = xyes; then -+if test yes = "$lt_cv_prog_compiler_pic_works"; then - case $lt_prog_compiler_pic in - "" | " "*) ;; - *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;; -@@ -9790,7 +10114,7 @@ - $as_echo_n "(cached) " >&6 - else - lt_cv_prog_compiler_static_works=no -- save_LDFLAGS="$LDFLAGS" -+ save_LDFLAGS=$LDFLAGS - LDFLAGS="$LDFLAGS $lt_tmp_static_flag" - echo "$lt_simple_link_test_code" > conftest.$ac_ext - if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then -@@ -9809,13 +10133,13 @@ - fi - fi - $RM -r conftest* -- LDFLAGS="$save_LDFLAGS" -+ LDFLAGS=$save_LDFLAGS - - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5 - $as_echo "$lt_cv_prog_compiler_static_works" >&6; } - --if test x"$lt_cv_prog_compiler_static_works" = xyes; then -+if test yes = "$lt_cv_prog_compiler_static_works"; then - : - else - lt_prog_compiler_static= -@@ -9935,8 +10259,8 @@ - - - --hard_links="nottested" --if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then -+hard_links=nottested -+if test no = "$lt_cv_prog_compiler_c_o" && test no != "$need_locks"; then - # do not overwrite the value of need_locks provided by the user - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5 - $as_echo_n "checking if we can lock with hard links... " >&6; } -@@ -9948,9 +10272,9 @@ - ln conftest.a conftest.b 2>/dev/null && hard_links=no - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 - $as_echo "$hard_links" >&6; } -- if test "$hard_links" = no; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 --$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} -+ if test no = "$hard_links"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5 -+$as_echo "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;} - need_locks=warn - fi - else -@@ -9993,9 +10317,9 @@ - # included in the symbol list - include_expsyms= - # exclude_expsyms can be an extended regexp of symbols to exclude -- # it will be wrapped by ` (' and `)$', so one must not match beginning or -- # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', -- # as well as any symbol that contains `d'. -+ # it will be wrapped by ' (' and ')$', so one must not match beginning or -+ # end of line. Example: 'a|bc|.*d.*' will exclude the symbols 'a' and 'bc', -+ # as well as any symbol that contains 'd'. - exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' - # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out - # platforms (ab)use it in PIC code, but their linkers get confused if -@@ -10006,11 +10330,11 @@ - extract_expsyms_cmds= - - case $host_os in -- cygwin* | mingw* | pw32* | cegcc*) -+ cygwin* | msys* | mingw* | pw32* | cegcc*) - # FIXME: the MSVC++ port hasn't been tested in a loooong time - # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. -- if test "$GCC" != yes; then -+ if test yes != "$GCC"; then - with_gnu_ld=no - fi - ;; -@@ -10018,12 +10342,9 @@ - # we just hope/assume this is gcc and not c89 (= MSVC++) - with_gnu_ld=yes - ;; -- openbsd*) -+ openbsd* | bitrig*) - with_gnu_ld=no - ;; -- linux* | k*bsd*-gnu | gnu*) -- link_all_deplibs=no -- ;; - esac - - ld_shlibs=yes -@@ -10031,7 +10352,7 @@ - # On some targets, GNU ld is compatible enough with the native linker - # that we're better off using the native interface for both. - lt_use_gnu_ld_interface=no -- if test "$with_gnu_ld" = yes; then -+ if test yes = "$with_gnu_ld"; then - case $host_os in - aix*) - # The AIX port of GNU ld has always aspired to compatibility -@@ -10053,24 +10374,24 @@ - esac - fi - -- if test "$lt_use_gnu_ld_interface" = yes; then -+ if test yes = "$lt_use_gnu_ld_interface"; then - # If archive_cmds runs LD, not CC, wlarc should be empty -- wlarc='${wl}' -+ wlarc='$wl' - - # Set some defaults for GNU ld with shared library support. These - # are reset later if shared libraries are not supported. Putting them - # here allows them to be overridden if necessary. - runpath_var=LD_RUN_PATH -- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' -- export_dynamic_flag_spec='${wl}--export-dynamic' -+ hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' -+ export_dynamic_flag_spec='$wl--export-dynamic' - # ancient GNU ld didn't support --whole-archive et. al. - if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then -- whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' -+ whole_archive_flag_spec=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive' - else - whole_archive_flag_spec= - fi - supports_anon_versioning=no -- case `$LD -v 2>&1` in -+ case `$LD -v | $SED -e 's/(^)\+)\s\+//' 2>&1` in - *GNU\ gold*) supports_anon_versioning=yes ;; - *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 - *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... -@@ -10083,7 +10404,7 @@ - case $host_os in - aix[3-9]*) - # On AIX/PPC, the GNU linker is very broken -- if test "$host_cpu" != ia64; then -+ if test ia64 != "$host_cpu"; then - ld_shlibs=no - cat <<_LT_EOF 1>&2 - -@@ -10102,7 +10423,7 @@ - case $host_cpu in - powerpc) - # see comment about AmigaOS4 .so support -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' - archive_expsym_cmds='' - ;; - m68k) -@@ -10118,17 +10439,17 @@ - allow_undefined_flag=unsupported - # Joseph Beckenbach says some releases of gcc - # support --undefined. This deserves some investigation. FIXME -- archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' - else - ld_shlibs=no - fi - ;; - -- cygwin* | mingw* | pw32* | cegcc*) -+ cygwin* | msys* | mingw* | pw32* | cegcc*) - # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless, - # as there is no search path for DLLs. - hardcode_libdir_flag_spec='-L$libdir' -- export_dynamic_flag_spec='${wl}--export-all-symbols' -+ export_dynamic_flag_spec='$wl--export-all-symbols' - allow_undefined_flag=unsupported - always_export_symbols=no - enable_shared_with_static_runtimes=yes -@@ -10136,61 +10457,89 @@ - exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' - - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -- # If the export-symbols file already is a .def file (1st line -- # is EXPORTS), use it as is; otherwise, prepend... -- archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -- cp $export_symbols $output_objdir/$soname.def; -- else -- echo EXPORTS > $output_objdir/$soname.def; -- cat $export_symbols >> $output_objdir/$soname.def; -- fi~ -- $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -+ # If the export-symbols file already is a .def file, use it as -+ # is; otherwise, prepend EXPORTS... -+ archive_expsym_cmds='if test DEF = "`$SED -n -e '\''s/^[ ]*//'\'' -e '\''/^\(;.*\)*$/d'\'' -e '\''s/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p'\'' -e q $export_symbols`" ; then -+ cp $export_symbols $output_objdir/$soname.def; -+ else -+ echo EXPORTS > $output_objdir/$soname.def; -+ cat $export_symbols >> $output_objdir/$soname.def; -+ fi~ -+ $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - else - ld_shlibs=no - fi - ;; - - haiku*) -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' - link_all_deplibs=yes - ;; - -+ os2*) -+ hardcode_libdir_flag_spec='-L$libdir' -+ hardcode_minus_L=yes -+ allow_undefined_flag=unsupported -+ shrext_cmds=.dll -+ archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ -+ $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ -+ $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ -+ $ECHO EXPORTS >> $output_objdir/$libname.def~ -+ emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ -+ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ -+ emximp -o $lib $output_objdir/$libname.def' -+ archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ -+ $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ -+ $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ -+ $ECHO EXPORTS >> $output_objdir/$libname.def~ -+ prefix_cmds="$SED"~ -+ if test EXPORTS = "`$SED 1q $export_symbols`"; then -+ prefix_cmds="$prefix_cmds -e 1d"; -+ fi~ -+ prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~ -+ cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ -+ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ -+ emximp -o $lib $output_objdir/$libname.def' -+ old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' -+ enable_shared_with_static_runtimes=yes -+ ;; -+ - interix[3-9]*) - hardcode_direct=no - hardcode_shlibpath_var=no -- hardcode_libdir_flag_spec='${wl}-rpath,$libdir' -- export_dynamic_flag_spec='${wl}-E' -+ hardcode_libdir_flag_spec='$wl-rpath,$libdir' -+ export_dynamic_flag_spec='$wl-E' - # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. - # Instead, shared libraries are loaded at an image base (0x10000000 by - # default) and relocated if they conflict, which is a slow very memory - # consuming and fragmenting process. To avoid this, we pick a random, - # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link - # time. Moving up from 0x10000000 also allows more sbrk(2) space. -- archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' -- archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' -+ archive_expsym_cmds='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - ;; - - gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) - tmp_diet=no -- if test "$host_os" = linux-dietlibc; then -+ if test linux-dietlibc = "$host_os"; then - case $cc_basename in - diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn) - esac - fi - if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ -- && test "$tmp_diet" = no -+ && test no = "$tmp_diet" - then - tmp_addflag=' $pic_flag' - tmp_sharedflag='-shared' - case $cc_basename,$host_cpu in - pgcc*) # Portland Group C compiler -- whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' -+ whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' - tmp_addflag=' $pic_flag' - ;; - pgf77* | pgf90* | pgf95* | pgfortran*) - # Portland Group f77 and f90 compilers -- whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' -+ whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' - tmp_addflag=' $pic_flag -Mnomain' ;; - ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 - tmp_addflag=' -i_dynamic' ;; -@@ -10201,42 +10550,47 @@ - lf95*) # Lahey Fortran 8.1 - whole_archive_flag_spec= - tmp_sharedflag='--shared' ;; -+ nagfor*) # NAGFOR 5.3 -+ tmp_sharedflag='-Wl,-shared' ;; - xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below) - tmp_sharedflag='-qmkshrobj' - tmp_addflag= ;; - nvcc*) # Cuda Compiler Driver 2.2 -- whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' -+ whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' - compiler_needs_object=yes - ;; - esac - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) # Sun C 5.9 -- whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' -+ whole_archive_flag_spec='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' - compiler_needs_object=yes - tmp_sharedflag='-G' ;; - *Sun\ F*) # Sun Fortran 8.3 - tmp_sharedflag='-G' ;; - esac -- archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' - -- if test "x$supports_anon_versioning" = xyes; then -+ if test yes = "$supports_anon_versioning"; then - archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ -- cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ -- echo "local: *; };" >> $output_objdir/$libname.ver~ -- $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' -+ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ -+ echo "local: *; };" >> $output_objdir/$libname.ver~ -+ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' - fi - - case $cc_basename in -+ tcc*) -+ export_dynamic_flag_spec='-rdynamic' -+ ;; - xlf* | bgf* | bgxlf* | mpixlf*) - # IBM XL Fortran 10.1 on PPC cannot create shared libs itself - whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' -- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' -+ hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' - archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' -- if test "x$supports_anon_versioning" = xyes; then -+ if test yes = "$supports_anon_versioning"; then - archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ -- cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ -- echo "local: *; };" >> $output_objdir/$libname.ver~ -- $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' -+ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ -+ echo "local: *; };" >> $output_objdir/$libname.ver~ -+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' - fi - ;; - esac -@@ -10245,13 +10599,13 @@ - fi - ;; - -- netbsd* | netbsdelf*-gnu) -+ netbsd*) - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= - else -- archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' - fi - ;; - -@@ -10269,8 +10623,8 @@ - - _LT_EOF - elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -- archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi -@@ -10282,7 +10636,7 @@ - ld_shlibs=no - cat <<_LT_EOF 1>&2 - --*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not -+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 cannot - *** reliably create shared libraries on SCO systems. Therefore, libtool - *** is disabling shared libraries support. We urge you to upgrade GNU - *** binutils to release 2.16.91.0.3 or newer. Another option is to modify -@@ -10297,9 +10651,9 @@ - # DT_RUNPATH tag from executables and libraries. But doing so - # requires that you compile everything twice, which is a pain. - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' -+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi -@@ -10316,15 +10670,15 @@ - - *) - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -- archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi - ;; - esac - -- if test "$ld_shlibs" = no; then -+ if test no = "$ld_shlibs"; then - runpath_var= - hardcode_libdir_flag_spec= - export_dynamic_flag_spec= -@@ -10340,7 +10694,7 @@ - # Note: this linker hardcodes the directories in LIBPATH if there - # are no directories specified by -L. - hardcode_minus_L=yes -- if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then -+ if test yes = "$GCC" && test -z "$lt_prog_compiler_static"; then - # Neither direct hardcoding nor static linking is supported with a - # broken collect2. - hardcode_direct=unsupported -@@ -10348,34 +10702,57 @@ - ;; - - aix[4-9]*) -- if test "$host_cpu" = ia64; then -+ if test ia64 = "$host_cpu"; then - # On IA64, the linker does run time linking by default, so we don't - # have to do anything special. - aix_use_runtimelinking=no - exp_sym_flag='-Bexport' -- no_entry_flag="" -+ no_entry_flag= - else - # If we're using GNU nm, then we don't want the "-C" option. -- # -C means demangle to AIX nm, but means don't demangle with GNU nm -- # Also, AIX nm treats weak defined symbols like other global -- # defined symbols, whereas GNU nm marks them as "W". -+ # -C means demangle to GNU nm, but means don't demangle to AIX nm. -+ # Without the "-l" option, or with the "-B" option, AIX nm treats -+ # weak defined symbols like other global defined symbols, whereas -+ # GNU nm marks them as "W". -+ # While the 'weak' keyword is ignored in the Export File, we need -+ # it in the Import File for the 'aix-soname' feature, so we have -+ # to replace the "-B" option with "-P" for AIX nm. - if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then -- export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' -+ export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' - else -- export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' -+ export_symbols_cmds='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' - fi - aix_use_runtimelinking=no - - # Test if we are trying to use run time linking or normal - # AIX style linking. If -brtl is somewhere in LDFLAGS, we -- # need to do runtime linking. -+ # have runtime linking enabled, and use it for executables. -+ # For shared libraries, we enable/disable runtime linking -+ # depending on the kind of the shared library created - -+ # when "with_aix_soname,aix_use_runtimelinking" is: -+ # "aix,no" lib.a(lib.so.V) shared, rtl:no, for executables -+ # "aix,yes" lib.so shared, rtl:yes, for executables -+ # lib.a static archive -+ # "both,no" lib.so.V(shr.o) shared, rtl:yes -+ # lib.a(lib.so.V) shared, rtl:no, for executables -+ # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables -+ # lib.a(lib.so.V) shared, rtl:no -+ # "svr4,*" lib.so.V(shr.o) shared, rtl:yes, for executables -+ # lib.a static archive - case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) - for ld_flag in $LDFLAGS; do -- if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then -+ if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then - aix_use_runtimelinking=yes - break - fi - done -+ if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then -+ # With aix-soname=svr4, we create the lib.so.V shared archives only, -+ # so we don't have lib.a shared libs to link our executables. -+ # We have to force runtime linking in this case. -+ aix_use_runtimelinking=yes -+ LDFLAGS="$LDFLAGS -Wl,-brtl" -+ fi - ;; - esac - -@@ -10394,13 +10771,21 @@ - hardcode_direct_absolute=yes - hardcode_libdir_separator=':' - link_all_deplibs=yes -- file_list_spec='${wl}-f,' -+ file_list_spec='$wl-f,' -+ case $with_aix_soname,$aix_use_runtimelinking in -+ aix,*) ;; # traditional, no import file -+ svr4,* | *,yes) # use import file -+ # The Import File defines what to hardcode. -+ hardcode_direct=no -+ hardcode_direct_absolute=no -+ ;; -+ esac - -- if test "$GCC" = yes; then -+ if test yes = "$GCC"; then - case $host_os in aix4.[012]|aix4.[012].*) - # We only want to do this on AIX 4.2 and lower, the check - # below for broken collect2 doesn't work under 4.3+ -- collect2name=`${CC} -print-prog-name=collect2` -+ collect2name=`$CC -print-prog-name=collect2` - if test -f "$collect2name" && - strings "$collect2name" | $GREP resolve_lib_name >/dev/null - then -@@ -10419,36 +10804,42 @@ - ;; - esac - shared_flag='-shared' -- if test "$aix_use_runtimelinking" = yes; then -- shared_flag="$shared_flag "'${wl}-G' -+ if test yes = "$aix_use_runtimelinking"; then -+ shared_flag="$shared_flag "'$wl-G' - fi -- link_all_deplibs=no -+ # Need to ensure runtime linking is disabled for the traditional -+ # shared library, or the linker may eventually find shared libraries -+ # /with/ Import File - we do not want to mix them. -+ shared_flag_aix='-shared' -+ shared_flag_svr4='-shared $wl-G' - else - # not using gcc -- if test "$host_cpu" = ia64; then -+ if test ia64 = "$host_cpu"; then - # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release - # chokes on -Wl,-G. The following line is correct: - shared_flag='-G' - else -- if test "$aix_use_runtimelinking" = yes; then -- shared_flag='${wl}-G' -+ if test yes = "$aix_use_runtimelinking"; then -+ shared_flag='$wl-G' - else -- shared_flag='${wl}-bM:SRE' -+ shared_flag='$wl-bM:SRE' - fi -+ shared_flag_aix='$wl-bM:SRE' -+ shared_flag_svr4='$wl-G' - fi - fi - -- export_dynamic_flag_spec='${wl}-bexpall' -+ export_dynamic_flag_spec='$wl-bexpall' - # It seems that -bexpall does not export symbols beginning with - # underscore (_), so it is better to generate a list of symbols to export. - always_export_symbols=yes -- if test "$aix_use_runtimelinking" = yes; then -+ if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then - # Warning - without using the other runtime loading flags (-brtl), - # -berok will link without error, but may produce a broken library. - allow_undefined_flag='-berok' - # Determine the default libpath from the value encoded in an - # empty executable. -- if test "${lt_cv_aix_libpath+set}" = set; then -+ if test set = "${lt_cv_aix_libpath+set}"; then - aix_libpath=$lt_cv_aix_libpath - else - if ${lt_cv_aix_libpath_+:} false; then : -@@ -10483,7 +10874,7 @@ - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - if test -z "$lt_cv_aix_libpath_"; then -- lt_cv_aix_libpath_="/usr/lib:/lib" -+ lt_cv_aix_libpath_=/usr/lib:/lib - fi - - fi -@@ -10491,17 +10882,17 @@ - aix_libpath=$lt_cv_aix_libpath_ - fi - -- hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" -- archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -+ hardcode_libdir_flag_spec='$wl-blibpath:$libdir:'"$aix_libpath" -+ archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag - else -- if test "$host_cpu" = ia64; then -- hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' -+ if test ia64 = "$host_cpu"; then -+ hardcode_libdir_flag_spec='$wl-R $libdir:/usr/lib:/lib' - allow_undefined_flag="-z nodefs" -- archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" -+ archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols" - else - # Determine the default libpath from the value encoded in an - # empty executable. -- if test "${lt_cv_aix_libpath+set}" = set; then -+ if test set = "${lt_cv_aix_libpath+set}"; then - aix_libpath=$lt_cv_aix_libpath - else - if ${lt_cv_aix_libpath_+:} false; then : -@@ -10536,7 +10927,7 @@ - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - if test -z "$lt_cv_aix_libpath_"; then -- lt_cv_aix_libpath_="/usr/lib:/lib" -+ lt_cv_aix_libpath_=/usr/lib:/lib - fi - - fi -@@ -10544,21 +10935,33 @@ - aix_libpath=$lt_cv_aix_libpath_ - fi - -- hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" -+ hardcode_libdir_flag_spec='$wl-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, - # -berok will link without error, but may produce a broken library. -- no_undefined_flag=' ${wl}-bernotok' -- allow_undefined_flag=' ${wl}-berok' -- if test "$with_gnu_ld" = yes; then -+ no_undefined_flag=' $wl-bernotok' -+ allow_undefined_flag=' $wl-berok' -+ if test yes = "$with_gnu_ld"; then - # We only use this code for GNU lds that support --whole-archive. -- whole_archive_flag_spec='${wl}--whole-archive$convenience ${wl}--no-whole-archive' -+ whole_archive_flag_spec='$wl--whole-archive$convenience $wl--no-whole-archive' - else - # Exported symbols can be pulled into shared objects from archives - whole_archive_flag_spec='$convenience' - fi - archive_cmds_need_lc=yes -- # This is similar to how AIX traditionally builds its shared libraries. -- archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' -+ archive_expsym_cmds='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d' -+ # -brtl affects multiple linker settings, -berok does not and is overridden later -+ compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([, ]\\)%-berok\\1%g"`' -+ if test svr4 != "$with_aix_soname"; then -+ # This is similar to how AIX traditionally builds its shared libraries. -+ archive_expsym_cmds="$archive_expsym_cmds"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname' -+ fi -+ if test aix != "$with_aix_soname"; then -+ archive_expsym_cmds="$archive_expsym_cmds"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp' -+ else -+ # used by -dlpreopen to get the symbols -+ archive_expsym_cmds="$archive_expsym_cmds"'~$MV $output_objdir/$realname.d/$soname $output_objdir' -+ fi -+ archive_expsym_cmds="$archive_expsym_cmds"'~$RM -r $output_objdir/$realname.d' - fi - fi - ;; -@@ -10567,7 +10970,7 @@ - case $host_cpu in - powerpc) - # see comment about AmigaOS4 .so support -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' - archive_expsym_cmds='' - ;; - m68k) -@@ -10582,7 +10985,7 @@ - export_dynamic_flag_spec=-rdynamic - ;; - -- cygwin* | mingw* | pw32* | cegcc*) -+ cygwin* | msys* | mingw* | pw32* | cegcc*) - # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. - # hardcode_libdir_flag_spec is actually meaningless, as there is -@@ -10597,16 +11000,17 @@ - # Tell ltmain to make .lib files, not .a files. - libext=lib - # Tell ltmain to make .dll files, not .so files. -- shrext_cmds=".dll" -+ shrext_cmds=.dll - # FIXME: Setting linknames here is a bad hack. -- archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' -- archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -- sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; -- else -- sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; -- fi~ -- $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ -- linknames=' -+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames=' -+ archive_expsym_cmds='if test DEF = "`$SED -n -e '\''s/^[ ]*//'\'' -e '\''/^\(;.*\)*$/d'\'' -e '\''s/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p'\'' -e q $export_symbols`" ; then -+ cp "$export_symbols" "$output_objdir/$soname.def"; -+ echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp"; -+ else -+ $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp; -+ fi~ -+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ -+ linknames=' - # The linker will not automatically build a static lib if we build a DLL. - # _LT_TAGVAR(old_archive_from_new_cmds, )='true' - enable_shared_with_static_runtimes=yes -@@ -10615,18 +11019,18 @@ - # Don't use ranlib - old_postinstall_cmds='chmod 644 $oldlib' - postlink_cmds='lt_outputfile="@OUTPUT@"~ -- lt_tool_outputfile="@TOOL_OUTPUT@"~ -- case $lt_outputfile in -- *.exe|*.EXE) ;; -- *) -- lt_outputfile="$lt_outputfile.exe" -- lt_tool_outputfile="$lt_tool_outputfile.exe" -- ;; -- esac~ -- if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then -- $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; -- $RM "$lt_outputfile.manifest"; -- fi' -+ lt_tool_outputfile="@TOOL_OUTPUT@"~ -+ case $lt_outputfile in -+ *.exe|*.EXE) ;; -+ *) -+ lt_outputfile=$lt_outputfile.exe -+ lt_tool_outputfile=$lt_tool_outputfile.exe -+ ;; -+ esac~ -+ if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then -+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; -+ $RM "$lt_outputfile.manifest"; -+ fi' - ;; - *) - # Assume MSVC wrapper -@@ -10635,7 +11039,7 @@ - # Tell ltmain to make .lib files, not .a files. - libext=lib - # Tell ltmain to make .dll files, not .so files. -- shrext_cmds=".dll" -+ shrext_cmds=.dll - # FIXME: Setting linknames here is a bad hack. - archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' - # The linker will automatically build a .lib file if we build a DLL. -@@ -10654,24 +11058,24 @@ - hardcode_direct=no - hardcode_automatic=yes - hardcode_shlibpath_var=unsupported -- if test "$lt_cv_ld_force_load" = "yes"; then -- whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' -+ if test yes = "$lt_cv_ld_force_load"; then -+ whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience $wl-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' - - else - whole_archive_flag_spec='' - fi - link_all_deplibs=yes -- allow_undefined_flag="$_lt_dar_allow_undefined" -+ allow_undefined_flag=$_lt_dar_allow_undefined - case $cc_basename in -- ifort*) _lt_dar_can_shared=yes ;; -+ ifort*|nagfor*) _lt_dar_can_shared=yes ;; - *) _lt_dar_can_shared=$GCC ;; - esac -- if test "$_lt_dar_can_shared" = "yes"; then -+ if test yes = "$_lt_dar_can_shared"; then - output_verbose_link_cmd=func_echo_all -- archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" -- module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -- archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -- module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" -+ archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil" -+ module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil" -+ archive_expsym_cmds="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil" -+ module_expsym_cmds="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil" - - else - ld_shlibs=no -@@ -10713,33 +11117,33 @@ - ;; - - hpux9*) -- if test "$GCC" = yes; then -- archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ if test yes = "$GCC"; then -+ archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' - else -- archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' - fi -- hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' -+ hardcode_libdir_flag_spec='$wl+b $wl$libdir' - hardcode_libdir_separator=: - hardcode_direct=yes - - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - hardcode_minus_L=yes -- export_dynamic_flag_spec='${wl}-E' -+ export_dynamic_flag_spec='$wl-E' - ;; - - hpux10*) -- if test "$GCC" = yes && test "$with_gnu_ld" = no; then -- archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ if test yes,no = "$GCC,$with_gnu_ld"; then -+ archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' - fi -- if test "$with_gnu_ld" = no; then -- hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' -+ if test no = "$with_gnu_ld"; then -+ hardcode_libdir_flag_spec='$wl+b $wl$libdir' - hardcode_libdir_separator=: - hardcode_direct=yes - hardcode_direct_absolute=yes -- export_dynamic_flag_spec='${wl}-E' -+ export_dynamic_flag_spec='$wl-E' - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - hardcode_minus_L=yes -@@ -10747,25 +11151,25 @@ - ;; - - hpux11*) -- if test "$GCC" = yes && test "$with_gnu_ld" = no; then -+ if test yes,no = "$GCC,$with_gnu_ld"; then - case $host_cpu in - hppa*64*) -- archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) -- archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) -- archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - else - case $host_cpu in - hppa*64*) -- archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -b $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) -- archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - -@@ -10777,7 +11181,7 @@ - $as_echo_n "(cached) " >&6 - else - lt_cv_prog_compiler__b=no -- save_LDFLAGS="$LDFLAGS" -+ save_LDFLAGS=$LDFLAGS - LDFLAGS="$LDFLAGS -b" - echo "$lt_simple_link_test_code" > conftest.$ac_ext - if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then -@@ -10796,14 +11200,14 @@ - fi - fi - $RM -r conftest* -- LDFLAGS="$save_LDFLAGS" -+ LDFLAGS=$save_LDFLAGS - - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5 - $as_echo "$lt_cv_prog_compiler__b" >&6; } - --if test x"$lt_cv_prog_compiler__b" = xyes; then -- archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+if test yes = "$lt_cv_prog_compiler__b"; then -+ archive_cmds='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' - fi -@@ -10811,8 +11215,8 @@ - ;; - esac - fi -- if test "$with_gnu_ld" = no; then -- hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' -+ if test no = "$with_gnu_ld"; then -+ hardcode_libdir_flag_spec='$wl+b $wl$libdir' - hardcode_libdir_separator=: - - case $host_cpu in -@@ -10823,7 +11227,7 @@ - *) - hardcode_direct=yes - hardcode_direct_absolute=yes -- export_dynamic_flag_spec='${wl}-E' -+ export_dynamic_flag_spec='$wl-E' - - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. -@@ -10834,8 +11238,8 @@ - ;; - - irix5* | irix6* | nonstopux*) -- if test "$GCC" = yes; then -- archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ if test yes = "$GCC"; then -+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' - # Try to use the -exported_symbol ld option, if it does not - # work, assume that -exports_file does not work either and - # implicitly export all symbols. -@@ -10845,8 +11249,8 @@ - if ${lt_cv_irix_exported_symbol+:} false; then : - $as_echo_n "(cached) " >&6 - else -- save_LDFLAGS="$LDFLAGS" -- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" -+ save_LDFLAGS=$LDFLAGS -+ LDFLAGS="$LDFLAGS -shared $wl-exported_symbol ${wl}foo $wl-update_registry $wl/dev/null" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - int foo (void) { return 0; } -@@ -10858,25 +11262,35 @@ - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -- LDFLAGS="$save_LDFLAGS" -+ LDFLAGS=$save_LDFLAGS - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 - $as_echo "$lt_cv_irix_exported_symbol" >&6; } -- if test "$lt_cv_irix_exported_symbol" = yes; then -- archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' -+ if test yes = "$lt_cv_irix_exported_symbol"; then -+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib' - fi - else -- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' -+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' -+ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib' - fi - archive_cmds_need_lc='no' -- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' -+ hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' - hardcode_libdir_separator=: - inherit_rpath=yes - link_all_deplibs=yes - ;; - -- netbsd* | netbsdelf*-gnu) -+ linux*) -+ case $cc_basename in -+ tcc*) -+ # Fabrice Bellard et al's Tiny C Compiler -+ ld_shlibs=yes -+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ esac -+ ;; -+ -+ netbsd*) - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out - else -@@ -10890,7 +11304,7 @@ - newsos6) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct=yes -- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' -+ hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' - hardcode_libdir_separator=: - hardcode_shlibpath_var=no - ;; -@@ -10898,27 +11312,19 @@ - *nto* | *qnx*) - ;; - -- openbsd*) -+ openbsd* | bitrig*) - if test -f /usr/libexec/ld.so; then - hardcode_direct=yes - hardcode_shlibpath_var=no - hardcode_direct_absolute=yes -- if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -+ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then - archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' -- archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' -- hardcode_libdir_flag_spec='${wl}-rpath,$libdir' -- export_dynamic_flag_spec='${wl}-E' -+ archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols' -+ hardcode_libdir_flag_spec='$wl-rpath,$libdir' -+ export_dynamic_flag_spec='$wl-E' - else -- case $host_os in -- openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) -- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' -- hardcode_libdir_flag_spec='-R$libdir' -- ;; -- *) -- archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' -- hardcode_libdir_flag_spec='${wl}-rpath,$libdir' -- ;; -- esac -+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' -+ hardcode_libdir_flag_spec='$wl-rpath,$libdir' - fi - else - ld_shlibs=no -@@ -10929,33 +11335,53 @@ - hardcode_libdir_flag_spec='-L$libdir' - hardcode_minus_L=yes - allow_undefined_flag=unsupported -- archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' -- old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' -+ shrext_cmds=.dll -+ archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ -+ $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ -+ $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ -+ $ECHO EXPORTS >> $output_objdir/$libname.def~ -+ emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ -+ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ -+ emximp -o $lib $output_objdir/$libname.def' -+ archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ -+ $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ -+ $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ -+ $ECHO EXPORTS >> $output_objdir/$libname.def~ -+ prefix_cmds="$SED"~ -+ if test EXPORTS = "`$SED 1q $export_symbols`"; then -+ prefix_cmds="$prefix_cmds -e 1d"; -+ fi~ -+ prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~ -+ cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ -+ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ -+ emximp -o $lib $output_objdir/$libname.def' -+ old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' -+ enable_shared_with_static_runtimes=yes - ;; - - osf3*) -- if test "$GCC" = yes; then -- allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' -- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ if test yes = "$GCC"; then -+ allow_undefined_flag=' $wl-expect_unresolved $wl\*' -+ archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' - else - allow_undefined_flag=' -expect_unresolved \*' -- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' -+ archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' - fi - archive_cmds_need_lc='no' -- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' -+ hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' - hardcode_libdir_separator=: - ;; - - osf4* | osf5*) # as osf3* with the addition of -msym flag -- if test "$GCC" = yes; then -- allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' -- archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' -+ if test yes = "$GCC"; then -+ allow_undefined_flag=' $wl-expect_unresolved $wl\*' -+ archive_cmds='$CC -shared$allow_undefined_flag $pic_flag $libobjs $deplibs $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' -+ hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' - else - allow_undefined_flag=' -expect_unresolved \*' -- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' -+ archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' - archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ -- $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' -+ $CC -shared$allow_undefined_flag $wl-input $wl$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.exp' - - # Both c and cxx compiler support -rpath directly - hardcode_libdir_flag_spec='-rpath $libdir' -@@ -10966,24 +11392,24 @@ - - solaris*) - no_undefined_flag=' -z defs' -- if test "$GCC" = yes; then -- wlarc='${wl}' -- archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ if test yes = "$GCC"; then -+ wlarc='$wl' -+ archive_cmds='$CC -shared $pic_flag $wl-z ${wl}text $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ -- $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' -+ $CC -shared $pic_flag $wl-z ${wl}text $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' - else - case `$CC -V 2>&1` in - *"Compilers 5.0"*) - wlarc='' -- archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ archive_cmds='$LD -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $linker_flags' - archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ -- $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' -+ $LD -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' - ;; - *) -- wlarc='${wl}' -- archive_cmds='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags' -+ wlarc='$wl' -+ archive_cmds='$CC -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ -- $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' -+ $CC -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' - ;; - esac - fi -@@ -10993,11 +11419,11 @@ - solaris2.[0-5] | solaris2.[0-5].*) ;; - *) - # The compiler driver will combine and reorder linker options, -- # but understands `-z linker_flag'. GCC discards it without `$wl', -+ # but understands '-z linker_flag'. GCC discards it without '$wl', - # but is careful enough not to reorder. - # Supported since Solaris 2.6 (maybe 2.5.1?) -- if test "$GCC" = yes; then -- whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' -+ if test yes = "$GCC"; then -+ whole_archive_flag_spec='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract' - else - whole_archive_flag_spec='-z allextract$convenience -z defaultextract' - fi -@@ -11007,10 +11433,10 @@ - ;; - - sunos4*) -- if test "x$host_vendor" = xsequent; then -+ if test sequent = "$host_vendor"; then - # Use $CC to link under sequent, because it throws in some extra .o - # files that make .init and .fini sections work. -- archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -G $wl-h $soname -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' - fi -@@ -11059,43 +11485,43 @@ - ;; - - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) -- no_undefined_flag='${wl}-z,text' -+ no_undefined_flag='$wl-z,text' - archive_cmds_need_lc=no - hardcode_shlibpath_var=no - runpath_var='LD_RUN_PATH' - -- if test "$GCC" = yes; then -- archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -- archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ if test yes = "$GCC"; then -+ archive_cmds='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_expsym_cmds='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - else -- archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -- archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_expsym_cmds='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - fi - ;; - - sysv5* | sco3.2v5* | sco5v6*) -- # Note: We can NOT use -z defs as we might desire, because we do not -+ # Note: We CANNOT use -z defs as we might desire, because we do not - # link with -lc, and that would cause any symbols used from libc to - # always be unresolved, which means just about no library would - # ever link correctly. If we're not using GNU ld we use -z text - # though, which does catch some bad symbols but isn't as heavy-handed - # as -z defs. -- no_undefined_flag='${wl}-z,text' -- allow_undefined_flag='${wl}-z,nodefs' -+ no_undefined_flag='$wl-z,text' -+ allow_undefined_flag='$wl-z,nodefs' - archive_cmds_need_lc=no - hardcode_shlibpath_var=no -- hardcode_libdir_flag_spec='${wl}-R,$libdir' -+ hardcode_libdir_flag_spec='$wl-R,$libdir' - hardcode_libdir_separator=':' - link_all_deplibs=yes -- export_dynamic_flag_spec='${wl}-Bexport' -+ export_dynamic_flag_spec='$wl-Bexport' - runpath_var='LD_RUN_PATH' - -- if test "$GCC" = yes; then -- archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -- archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ if test yes = "$GCC"; then -+ archive_cmds='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_expsym_cmds='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - else -- archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -- archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ archive_expsym_cmds='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - fi - ;; - -@@ -11110,10 +11536,10 @@ - ;; - esac - -- if test x$host_vendor = xsni; then -+ if test sni = "$host_vendor"; then - case $host in - sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) -- export_dynamic_flag_spec='${wl}-Blargedynsym' -+ export_dynamic_flag_spec='$wl-Blargedynsym' - ;; - esac - fi -@@ -11121,7 +11547,7 @@ - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5 - $as_echo "$ld_shlibs" >&6; } --test "$ld_shlibs" = no && can_build_shared=no -+test no = "$ld_shlibs" && can_build_shared=no - - with_gnu_ld=$with_gnu_ld - -@@ -11147,7 +11573,7 @@ - # Assume -lc should be added - archive_cmds_need_lc=yes - -- if test "$enable_shared" = yes && test "$GCC" = yes; then -+ if test yes,yes = "$GCC,$enable_shared"; then - case $archive_cmds in - *'~'*) - # FIXME: we may have to deal with multi-command sequences. -@@ -11362,14 +11788,14 @@ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 - $as_echo_n "checking dynamic linker characteristics... " >&6; } - --if test "$GCC" = yes; then -+if test yes = "$GCC"; then - case $host_os in -- darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; -- *) lt_awk_arg="/^libraries:/" ;; -+ darwin*) lt_awk_arg='/^libraries:/,/LR/' ;; -+ *) lt_awk_arg='/^libraries:/' ;; - esac - case $host_os in -- mingw* | cegcc*) lt_sed_strip_eq="s,=\([A-Za-z]:\),\1,g" ;; -- *) lt_sed_strip_eq="s,=/,/,g" ;; -+ mingw* | cegcc*) lt_sed_strip_eq='s|=\([A-Za-z]:\)|\1|g' ;; -+ *) lt_sed_strip_eq='s|=/|/|g' ;; - esac - lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq` - case $lt_search_path_spec in -@@ -11385,28 +11811,35 @@ - ;; - esac - # Ok, now we have the path, separated by spaces, we can step through it -- # and add multilib dir if necessary. -+ # and add multilib dir if necessary... - lt_tmp_lt_search_path_spec= -- lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` -+ lt_multi_os_dir=/`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` -+ # ...but if some path component already ends with the multilib dir we assume -+ # that all is fine and trust -print-search-dirs as is (GCC 4.2? or newer). -+ case "$lt_multi_os_dir; $lt_search_path_spec " in -+ "/; "* | "/.; "* | "/./; "* | *"$lt_multi_os_dir "* | *"$lt_multi_os_dir/ "*) -+ lt_multi_os_dir= -+ ;; -+ esac - for lt_sys_path in $lt_search_path_spec; do -- if test -d "$lt_sys_path/$lt_multi_os_dir"; then -- lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" -- else -+ if test -d "$lt_sys_path$lt_multi_os_dir"; then -+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path$lt_multi_os_dir" -+ elif test -n "$lt_multi_os_dir"; then - test -d "$lt_sys_path" && \ - lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" - fi - done - lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' --BEGIN {RS=" "; FS="/|\n";} { -- lt_foo=""; -- lt_count=0; -+BEGIN {RS = " "; FS = "/|\n";} { -+ lt_foo = ""; -+ lt_count = 0; - for (lt_i = NF; lt_i > 0; lt_i--) { - if ($lt_i != "" && $lt_i != ".") { - if ($lt_i == "..") { - lt_count++; - } else { - if (lt_count == 0) { -- lt_foo="/" $lt_i lt_foo; -+ lt_foo = "/" $lt_i lt_foo; - } else { - lt_count--; - } -@@ -11420,7 +11853,7 @@ - # for these hosts. - case $host_os in - mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\ -- $SED 's,/\([A-Za-z]:\),\1,g'` ;; -+ $SED 's|/\([A-Za-z]:\)|\1|g'` ;; - esac - sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP` - else -@@ -11429,7 +11862,7 @@ - library_names_spec= - libname_spec='lib$name' - soname_spec= --shrext_cmds=".so" -+shrext_cmds=.so - postinstall_cmds= - postuninstall_cmds= - finish_cmds= -@@ -11446,14 +11879,16 @@ - # flags to be left without arguments - need_version=unknown - -+ -+ - case $host_os in - aix3*) - version_type=linux # correct to gnu/linux during the next big refactor -- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' -+ library_names_spec='$libname$release$shared_ext$versuffix $libname.a' - shlibpath_var=LIBPATH - - # AIX 3 has no versioning support, so we append a major version to the name. -- soname_spec='${libname}${release}${shared_ext}$major' -+ soname_spec='$libname$release$shared_ext$major' - ;; - - aix[4-9]*) -@@ -11461,41 +11896,91 @@ - need_lib_prefix=no - need_version=no - hardcode_into_libs=yes -- if test "$host_cpu" = ia64; then -+ if test ia64 = "$host_cpu"; then - # AIX 5 supports IA64 -- library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' -+ library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext' - shlibpath_var=LD_LIBRARY_PATH - else - # With GCC up to 2.95.x, collect2 would create an import file - # for dependence libraries. The import file would start with -- # the line `#! .'. This would cause the generated library to -- # depend on `.', always an invalid library. This was fixed in -+ # the line '#! .'. This would cause the generated library to -+ # depend on '.', always an invalid library. This was fixed in - # development snapshots of GCC prior to 3.0. - case $host_os in - aix4 | aix4.[01] | aix4.[01].*) - if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' - echo ' yes ' -- echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then -+ echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then - : - else - can_build_shared=no - fi - ;; - esac -- # AIX (on Power*) has no versioning support, so currently we can not hardcode correct -+ # Using Import Files as archive members, it is possible to support -+ # filename-based versioning of shared library archives on AIX. While -+ # this would work for both with and without runtime linking, it will -+ # prevent static linking of such archives. So we do filename-based -+ # shared library versioning with .so extension only, which is used -+ # when both runtime linking and shared linking is enabled. -+ # Unfortunately, runtime linking may impact performance, so we do -+ # not want this to be the default eventually. Also, we use the -+ # versioned .so libs for executables only if there is the -brtl -+ # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only. -+ # To allow for filename-based versioning support, we need to create -+ # libNAME.so.V as an archive file, containing: -+ # *) an Import File, referring to the versioned filename of the -+ # archive as well as the shared archive member, telling the -+ # bitwidth (32 or 64) of that shared object, and providing the -+ # list of exported symbols of that shared object, eventually -+ # decorated with the 'weak' keyword -+ # *) the shared object with the F_LOADONLY flag set, to really avoid -+ # it being seen by the linker. -+ # At run time we better use the real file rather than another symlink, -+ # but for link time we create the symlink libNAME.so -> libNAME.so.V -+ -+ case $with_aix_soname,$aix_use_runtimelinking in -+ # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct - # soname into executable. Probably we can add versioning support to - # collect2, so additional links can be useful in future. -- if test "$aix_use_runtimelinking" = yes; then -+ aix,yes) # traditional libtool -+ dynamic_linker='AIX unversionable lib.so' - # If using run time linking (on AIX 4.2 or later) use lib.so - # instead of lib.a to let people know that these are not - # typical AIX shared libraries. -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -- else -+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' -+ ;; -+ aix,no) # traditional AIX only -+ dynamic_linker='AIX lib.a(lib.so.V)' - # We preserve .a as extension for shared libraries through AIX4.2 - # and later when we are not doing run time linking. -- library_names_spec='${libname}${release}.a $libname.a' -- soname_spec='${libname}${release}${shared_ext}$major' -- fi -+ library_names_spec='$libname$release.a $libname.a' -+ soname_spec='$libname$release$shared_ext$major' -+ ;; -+ svr4,*) # full svr4 only -+ dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o)" -+ library_names_spec='$libname$release$shared_ext$major $libname$shared_ext' -+ # We do not specify a path in Import Files, so LIBPATH fires. -+ shlibpath_overrides_runpath=yes -+ ;; -+ *,yes) # both, prefer svr4 -+ dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o), lib.a(lib.so.V)" -+ library_names_spec='$libname$release$shared_ext$major $libname$shared_ext' -+ # unpreferred sharedlib libNAME.a needs extra handling -+ postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"' -+ postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"' -+ # We do not specify a path in Import Files, so LIBPATH fires. -+ shlibpath_overrides_runpath=yes -+ ;; -+ *,no) # both, prefer aix -+ dynamic_linker="AIX lib.a(lib.so.V), lib.so.V($shared_archive_member_spec.o)" -+ library_names_spec='$libname$release.a $libname.a' -+ soname_spec='$libname$release$shared_ext$major' -+ # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling -+ postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)' -+ postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"' -+ ;; -+ esac - shlibpath_var=LIBPATH - fi - ;; -@@ -11505,18 +11990,18 @@ - powerpc) - # Since July 2007 AmigaOS4 officially supports .so libraries. - # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' - ;; - m68k) - library_names_spec='$libname.ixlibrary $libname.a' - # Create ${libname}_ixlibrary.a entries in /sys/libs. -- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' -+ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' - ;; - esac - ;; - - beos*) -- library_names_spec='${libname}${shared_ext}' -+ library_names_spec='$libname$shared_ext' - dynamic_linker="$host_os ld.so" - shlibpath_var=LIBRARY_PATH - ;; -@@ -11524,8 +12009,8 @@ - bsdi[45]*) - version_type=linux # correct to gnu/linux during the next big refactor - need_version=no -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' -+ soname_spec='$libname$release$shared_ext$major' - finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' - shlibpath_var=LD_LIBRARY_PATH - sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" -@@ -11535,9 +12020,9 @@ - # libtool to hard-code these into programs - ;; - --cygwin* | mingw* | pw32* | cegcc*) -+cygwin* | msys* | mingw* | pw32* | cegcc*) - version_type=windows -- shrext_cmds=".dll" -+ shrext_cmds=.dll - need_version=no - need_lib_prefix=no - -@@ -11546,8 +12031,8 @@ - # gcc - library_names_spec='$libname.dll.a' - # DLL is installed to $(libdir)/../bin by postinstall_cmds -- postinstall_cmds='base_file=`basename \${file}`~ -- dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ -+ postinstall_cmds='base_file=`basename \$file`~ -+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~ - dldir=$destdir/`dirname \$dlpath`~ - test -d \$dldir || mkdir -p \$dldir~ - $install_prog $dir/$dlname \$dldir/$dlname~ -@@ -11563,17 +12048,23 @@ - case $host_os in - cygwin*) - # Cygwin DLLs use 'cyg' prefix rather than 'lib' -- soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -+ soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' -+ -+ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api" -+ ;; -+ msys*) -+ # MSYS DLLs use 'msys-' prefix rather than 'lib' -+ soname_spec='`echo $libname | sed -e 's/^lib/msys-/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' - - sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api" - ;; - mingw* | cegcc*) - # MinGW DLLs use traditional 'lib' prefix -- soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -+ soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' - ;; - pw32*) - # pw32 DLLs use 'pw' prefix rather than 'lib' -- library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -+ library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' - ;; - esac - dynamic_linker='Win32 ld.exe' -@@ -11582,8 +12073,8 @@ - *,cl*) - # Native MSVC - libname_spec='$name' -- soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -- library_names_spec='${libname}.dll.lib' -+ soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' -+ library_names_spec='$libname.dll.lib' - - case $build_os in - mingw*) -@@ -11601,7 +12092,7 @@ - # Convert to MSYS style. - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` - ;; -- cygwin*) -+ cygwin* | msys*) - # Convert to unix form, then to dos form, then back to unix form - # but this time dos style (no spaces!) so that the unix form looks - # like /cygdrive/c/PROGRA~1:/cygdr... -@@ -11610,7 +12101,7 @@ - sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - ;; - *) -- sys_lib_search_path_spec="$LIB" -+ sys_lib_search_path_spec=$LIB - if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then - # It is most probably a Windows format PATH. - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` -@@ -11623,8 +12114,8 @@ - esac - - # DLL is installed to $(libdir)/../bin by postinstall_cmds -- postinstall_cmds='base_file=`basename \${file}`~ -- dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ -+ postinstall_cmds='base_file=`basename \$file`~ -+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~ - dldir=$destdir/`dirname \$dlpath`~ - test -d \$dldir || mkdir -p \$dldir~ - $install_prog $dir/$dlname \$dldir/$dlname' -@@ -11637,7 +12128,7 @@ - - *) - # Assume MSVC wrapper -- library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' -+ library_names_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext $libname.lib' - dynamic_linker='Win32 ld.exe' - ;; - esac -@@ -11650,8 +12141,8 @@ - version_type=darwin - need_lib_prefix=no - need_version=no -- library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' -- soname_spec='${libname}${release}${major}$shared_ext' -+ library_names_spec='$libname$release$major$shared_ext $libname$shared_ext' -+ soname_spec='$libname$release$major$shared_ext' - shlibpath_overrides_runpath=yes - shlibpath_var=DYLD_LIBRARY_PATH - shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' -@@ -11664,8 +12155,8 @@ - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' -- soname_spec='${libname}${release}${shared_ext}$major' -+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' -+ soname_spec='$libname$release$shared_ext$major' - shlibpath_var=LD_LIBRARY_PATH - ;; - -@@ -11683,12 +12174,13 @@ - version_type=freebsd-$objformat - case $version_type in - freebsd-elf*) -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' -+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' -+ soname_spec='$libname$release$shared_ext$major' - need_version=no - need_lib_prefix=no - ;; - freebsd-*) -- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' -+ library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' - need_version=yes - ;; - esac -@@ -11718,10 +12210,10 @@ - need_lib_prefix=no - need_version=no - dynamic_linker="$host_os runtime_loader" -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' -+ soname_spec='$libname$release$shared_ext$major' - shlibpath_var=LIBRARY_PATH -- shlibpath_overrides_runpath=yes -+ shlibpath_overrides_runpath=no - sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' - hardcode_into_libs=yes - ;; -@@ -11739,14 +12231,15 @@ - dynamic_linker="$host_os dld.so" - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -- if test "X$HPUX_IA64_MODE" = X32; then -+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' -+ soname_spec='$libname$release$shared_ext$major' -+ if test 32 = "$HPUX_IA64_MODE"; then - sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" -+ sys_lib_dlsearch_path_spec=/usr/lib/hpux32 - else - sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" -+ sys_lib_dlsearch_path_spec=/usr/lib/hpux64 - fi -- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; - hppa*64*) - shrext_cmds='.sl' -@@ -11754,8 +12247,8 @@ - dynamic_linker="$host_os dld.sl" - shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH - shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' -+ soname_spec='$libname$release$shared_ext$major' - sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; -@@ -11764,8 +12257,8 @@ - dynamic_linker="$host_os dld.sl" - shlibpath_var=SHLIB_PATH - shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' -+ soname_spec='$libname$release$shared_ext$major' - ;; - esac - # HP-UX runs *really* slowly unless shared libraries are mode 555, ... -@@ -11778,8 +12271,8 @@ - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' -+ soname_spec='$libname$release$shared_ext$major' - dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no -@@ -11790,7 +12283,7 @@ - case $host_os in - nonstopux*) version_type=nonstopux ;; - *) -- if test "$lt_cv_prog_gnu_ld" = yes; then -+ if test yes = "$lt_cv_prog_gnu_ld"; then - version_type=linux # correct to gnu/linux during the next big refactor - else - version_type=irix -@@ -11798,8 +12291,8 @@ - esac - need_lib_prefix=no - need_version=no -- soname_spec='${libname}${release}${shared_ext}$major' -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' -+ soname_spec='$libname$release$shared_ext$major' -+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$release$shared_ext $libname$shared_ext' - case $host_os in - irix5* | nonstopux*) - libsuff= shlibsuff= -@@ -11818,8 +12311,8 @@ - esac - shlibpath_var=LD_LIBRARY${shlibsuff}_PATH - shlibpath_overrides_runpath=no -- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" -- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" -+ sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff" -+ sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff" - hardcode_into_libs=yes - ;; - -@@ -11828,13 +12321,33 @@ - dynamic_linker=no - ;; - -+linux*android*) -+ version_type=none # Android doesn't support versioned libraries. -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='$libname$release$shared_ext' -+ soname_spec='$libname$release$shared_ext' -+ finish_cmds= -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=yes -+ -+ # This implies no fast_install, which is unacceptable. -+ # Some rework will be needed to allow for fast_install -+ # before this can be enabled. -+ hardcode_into_libs=yes -+ -+ dynamic_linker='Android linker' -+ # Don't embed -rpath directories since the linker doesn't support them. -+ hardcode_libdir_flag_spec='-L$libdir' -+ ;; -+ - # This must be glibc/ELF. - linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' -+ soname_spec='$libname$release$shared_ext$major' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no -@@ -11878,7 +12391,12 @@ - # before this can be enabled. - hardcode_into_libs=yes - -- # Append ld.so.conf contents to the search path -+ # Ideally, we could use ldconfig to report *all* directores which are -+ # searched for libraries, however this is still not possible. Aside from not -+ # being certain /sbin/ldconfig is available, command -+ # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64, -+ # even though it is searched at run-time. Try to do the best guess by -+ # appending ld.so.conf contents (and includes) to the search path. - if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" -@@ -11893,29 +12411,17 @@ - dynamic_linker='GNU/Linux ld.so' - ;; - --netbsdelf*-gnu) -- version_type=linux -- need_lib_prefix=no -- need_version=no -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -- shlibpath_var=LD_LIBRARY_PATH -- shlibpath_overrides_runpath=no -- hardcode_into_libs=yes -- dynamic_linker='NetBSD ld.elf_so' -- ;; -- - netbsd*) - version_type=sunos - need_lib_prefix=no - need_version=no - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' -+ library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - dynamic_linker='NetBSD (a.out) ld.so' - else -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' -+ soname_spec='$libname$release$shared_ext$major' - dynamic_linker='NetBSD ld.elf_so' - fi - shlibpath_var=LD_LIBRARY_PATH -@@ -11925,7 +12431,7 @@ - - newsos6) - version_type=linux # correct to gnu/linux during the next big refactor -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - ;; -@@ -11934,58 +12440,68 @@ - version_type=qnx - need_lib_prefix=no - need_version=no -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' -+ soname_spec='$libname$release$shared_ext$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='ldqnx.so' - ;; - --openbsd*) -+openbsd* | bitrig*) - version_type=sunos -- sys_lib_dlsearch_path_spec="/usr/lib" -+ sys_lib_dlsearch_path_spec=/usr/lib - need_lib_prefix=no -- # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. -- case $host_os in -- openbsd3.3 | openbsd3.3.*) need_version=yes ;; -- *) need_version=no ;; -- esac -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' -- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' -- shlibpath_var=LD_LIBRARY_PATH -- if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -- case $host_os in -- openbsd2.[89] | openbsd2.[89].*) -- shlibpath_overrides_runpath=no -- ;; -- *) -- shlibpath_overrides_runpath=yes -- ;; -- esac -+ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then -+ need_version=no - else -- shlibpath_overrides_runpath=yes -+ need_version=yes - fi -+ library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' -+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=yes - ;; - - os2*) - libname_spec='$name' -- shrext_cmds=".dll" -+ version_type=windows -+ shrext_cmds=.dll -+ need_version=no - need_lib_prefix=no -- library_names_spec='$libname${shared_ext} $libname.a' -+ # OS/2 can only load a DLL with a base name of 8 characters or less. -+ soname_spec='`test -n "$os2dllname" && libname="$os2dllname"; -+ v=$($ECHO $release$versuffix | tr -d .-); -+ n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _); -+ $ECHO $n$v`$shared_ext' -+ library_names_spec='${libname}_dll.$libext' - dynamic_linker='OS/2 ld.exe' -- shlibpath_var=LIBPATH -+ shlibpath_var=BEGINLIBPATH -+ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" -+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec -+ postinstall_cmds='base_file=`basename \$file`~ -+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; $ECHO \$dlname'\''`~ -+ dldir=$destdir/`dirname \$dlpath`~ -+ test -d \$dldir || mkdir -p \$dldir~ -+ $install_prog $dir/$dlname \$dldir/$dlname~ -+ chmod a+x \$dldir/$dlname~ -+ if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then -+ eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; -+ fi' -+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~ -+ dlpath=$dir/\$dldll~ -+ $RM \$dlpath' - ;; - - osf3* | osf4* | osf5*) - version_type=osf - need_lib_prefix=no - need_version=no -- soname_spec='${libname}${release}${shared_ext}$major' -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='$libname$release$shared_ext$major' -+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' - shlibpath_var=LD_LIBRARY_PATH - sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" -- sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" -+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; - - rdos*) -@@ -11996,8 +12512,8 @@ - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' -+ soname_spec='$libname$release$shared_ext$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes -@@ -12007,11 +12523,11 @@ - - sunos4*) - version_type=sunos -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' -+ library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' - finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes -- if test "$with_gnu_ld" = yes; then -+ if test yes = "$with_gnu_ld"; then - need_lib_prefix=no - fi - need_version=yes -@@ -12019,8 +12535,8 @@ - - sysv4 | sysv4.3*) - version_type=linux # correct to gnu/linux during the next big refactor -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' -+ soname_spec='$libname$release$shared_ext$major' - shlibpath_var=LD_LIBRARY_PATH - case $host_vendor in - sni) -@@ -12041,24 +12557,24 @@ - ;; - - sysv4*MP*) -- if test -d /usr/nec ;then -+ if test -d /usr/nec; then - version_type=linux # correct to gnu/linux during the next big refactor -- library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' -- soname_spec='$libname${shared_ext}.$major' -+ library_names_spec='$libname$shared_ext.$versuffix $libname$shared_ext.$major $libname$shared_ext' -+ soname_spec='$libname$shared_ext.$major' - shlibpath_var=LD_LIBRARY_PATH - fi - ;; - - sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) -- version_type=freebsd-elf -+ version_type=sco - need_lib_prefix=no - need_version=no -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext' -+ soname_spec='$libname$release$shared_ext$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes -- if test "$with_gnu_ld" = yes; then -+ if test yes = "$with_gnu_ld"; then - sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' - else - sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' -@@ -12076,7 +12592,7 @@ - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes -@@ -12084,8 +12600,8 @@ - - uts4*) - version_type=linux # correct to gnu/linux during the next big refactor -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' -+ soname_spec='$libname$release$shared_ext$major' - shlibpath_var=LD_LIBRARY_PATH - ;; - -@@ -12095,20 +12611,35 @@ - esac - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 - $as_echo "$dynamic_linker" >&6; } --test "$dynamic_linker" = no && can_build_shared=no -+test no = "$dynamic_linker" && can_build_shared=no - - variables_saved_for_relink="PATH $shlibpath_var $runpath_var" --if test "$GCC" = yes; then -+if test yes = "$GCC"; then - variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" - fi - --if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then -- sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" -+if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then -+ sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec - fi --if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then -- sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" -+ -+if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then -+ sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec - fi - -+# remember unaugmented sys_lib_dlsearch_path content for libtool script decls... -+configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec -+ -+# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code -+func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH" -+ -+# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool -+configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH -+ -+ -+ -+ -+ -+ - - - -@@ -12205,15 +12736,15 @@ - hardcode_action= - if test -n "$hardcode_libdir_flag_spec" || - test -n "$runpath_var" || -- test "X$hardcode_automatic" = "Xyes" ; then -+ test yes = "$hardcode_automatic"; then - - # We can hardcode non-existent directories. -- if test "$hardcode_direct" != no && -+ if test no != "$hardcode_direct" && - # If the only mechanism to avoid hardcoding is shlibpath_var, we - # have to relink, otherwise we might link with an installed library - # when we should be linking with a yet-to-be-installed one -- ## test "$_LT_TAGVAR(hardcode_shlibpath_var, )" != no && -- test "$hardcode_minus_L" != no; then -+ ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, )" && -+ test no != "$hardcode_minus_L"; then - # Linking always hardcodes the temporary library directory. - hardcode_action=relink - else -@@ -12228,12 +12759,12 @@ - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5 - $as_echo "$hardcode_action" >&6; } - --if test "$hardcode_action" = relink || -- test "$inherit_rpath" = yes; then -+if test relink = "$hardcode_action" || -+ test yes = "$inherit_rpath"; then - # Fast installation is not supported - enable_fast_install=no --elif test "$shlibpath_overrides_runpath" = yes || -- test "$enable_shared" = no; then -+elif test yes = "$shlibpath_overrides_runpath" || -+ test no = "$enable_shared"; then - # Fast installation is not necessary - enable_fast_install=needless - fi -@@ -12243,7 +12774,7 @@ - - - -- if test "x$enable_dlopen" != xyes; then -+ if test yes != "$enable_dlopen"; then - enable_dlopen=unknown - enable_dlopen_self=unknown - enable_dlopen_self_static=unknown -@@ -12253,23 +12784,23 @@ - - case $host_os in - beos*) -- lt_cv_dlopen="load_add_on" -+ lt_cv_dlopen=load_add_on - lt_cv_dlopen_libs= - lt_cv_dlopen_self=yes - ;; - - mingw* | pw32* | cegcc*) -- lt_cv_dlopen="LoadLibrary" -+ lt_cv_dlopen=LoadLibrary - lt_cv_dlopen_libs= - ;; - -- cygwin*) -- lt_cv_dlopen="dlopen" -+ cygwin* | msys*) -+ lt_cv_dlopen=dlopen - lt_cv_dlopen_libs= - ;; - - darwin*) -- # if libdl is installed we need to link against it -+ # if libdl is installed we need to link against it - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 - $as_echo_n "checking for dlopen in -ldl... " >&6; } - if ${ac_cv_lib_dl_dlopen+:} false; then : -@@ -12307,10 +12838,10 @@ - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 - $as_echo "$ac_cv_lib_dl_dlopen" >&6; } - if test "x$ac_cv_lib_dl_dlopen" = xyes; then : -- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" -+ lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl - else - -- lt_cv_dlopen="dyld" -+ lt_cv_dlopen=dyld - lt_cv_dlopen_libs= - lt_cv_dlopen_self=yes - -@@ -12318,10 +12849,18 @@ - - ;; - -+ tpf*) -+ # Don't try to run any link tests for TPF. We know it's impossible -+ # because TPF is a cross-compiler, and we know how we open DSOs. -+ lt_cv_dlopen=dlopen -+ lt_cv_dlopen_libs= -+ lt_cv_dlopen_self=no -+ ;; -+ - *) - ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load" - if test "x$ac_cv_func_shl_load" = xyes; then : -- lt_cv_dlopen="shl_load" -+ lt_cv_dlopen=shl_load - else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5 - $as_echo_n "checking for shl_load in -ldld... " >&6; } -@@ -12360,11 +12899,11 @@ - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5 - $as_echo "$ac_cv_lib_dld_shl_load" >&6; } - if test "x$ac_cv_lib_dld_shl_load" = xyes; then : -- lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" -+ lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld - else - ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen" - if test "x$ac_cv_func_dlopen" = xyes; then : -- lt_cv_dlopen="dlopen" -+ lt_cv_dlopen=dlopen - else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 - $as_echo_n "checking for dlopen in -ldl... " >&6; } -@@ -12403,7 +12942,7 @@ - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 - $as_echo "$ac_cv_lib_dl_dlopen" >&6; } - if test "x$ac_cv_lib_dl_dlopen" = xyes; then : -- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" -+ lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl - else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5 - $as_echo_n "checking for dlopen in -lsvld... " >&6; } -@@ -12442,7 +12981,7 @@ - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5 - $as_echo "$ac_cv_lib_svld_dlopen" >&6; } - if test "x$ac_cv_lib_svld_dlopen" = xyes; then : -- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" -+ lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld - else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5 - $as_echo_n "checking for dld_link in -ldld... " >&6; } -@@ -12481,7 +13020,7 @@ - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5 - $as_echo "$ac_cv_lib_dld_dld_link" >&6; } - if test "x$ac_cv_lib_dld_dld_link" = xyes; then : -- lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" -+ lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld - fi - - -@@ -12502,21 +13041,21 @@ - ;; - esac - -- if test "x$lt_cv_dlopen" != xno; then -- enable_dlopen=yes -- else -+ if test no = "$lt_cv_dlopen"; then - enable_dlopen=no -+ else -+ enable_dlopen=yes - fi - - case $lt_cv_dlopen in - dlopen) -- save_CPPFLAGS="$CPPFLAGS" -- test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" -+ save_CPPFLAGS=$CPPFLAGS -+ test yes = "$ac_cv_header_dlfcn_h" && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" - -- save_LDFLAGS="$LDFLAGS" -+ save_LDFLAGS=$LDFLAGS - wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" - -- save_LIBS="$LIBS" -+ save_LIBS=$LIBS - LIBS="$lt_cv_dlopen_libs $LIBS" - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5 -@@ -12524,7 +13063,7 @@ - if ${lt_cv_dlopen_self+:} false; then : - $as_echo_n "(cached) " >&6 - else -- if test "$cross_compiling" = yes; then : -+ if test yes = "$cross_compiling"; then : - lt_cv_dlopen_self=cross - else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 -@@ -12571,9 +13110,9 @@ - # endif - #endif - --/* When -fvisbility=hidden is used, assume the code has been annotated -+/* When -fvisibility=hidden is used, assume the code has been annotated - correspondingly for the symbols needed. */ --#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) -+#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) - int fnord () __attribute__((visibility("default"))); - #endif - -@@ -12603,7 +13142,7 @@ - (eval $ac_link) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then -+ test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then - (./conftest; exit; ) >&5 2>/dev/null - lt_status=$? - case x$lt_status in -@@ -12623,14 +13162,14 @@ - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5 - $as_echo "$lt_cv_dlopen_self" >&6; } - -- if test "x$lt_cv_dlopen_self" = xyes; then -+ if test yes = "$lt_cv_dlopen_self"; then - wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5 - $as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; } - if ${lt_cv_dlopen_self_static+:} false; then : - $as_echo_n "(cached) " >&6 - else -- if test "$cross_compiling" = yes; then : -+ if test yes = "$cross_compiling"; then : - lt_cv_dlopen_self_static=cross - else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 -@@ -12677,9 +13216,9 @@ - # endif - #endif - --/* When -fvisbility=hidden is used, assume the code has been annotated -+/* When -fvisibility=hidden is used, assume the code has been annotated - correspondingly for the symbols needed. */ --#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) -+#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) - int fnord () __attribute__((visibility("default"))); - #endif - -@@ -12709,7 +13248,7 @@ - (eval $ac_link) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then -+ test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then - (./conftest; exit; ) >&5 2>/dev/null - lt_status=$? - case x$lt_status in -@@ -12730,9 +13269,9 @@ - $as_echo "$lt_cv_dlopen_self_static" >&6; } - fi - -- CPPFLAGS="$save_CPPFLAGS" -- LDFLAGS="$save_LDFLAGS" -- LIBS="$save_LIBS" -+ CPPFLAGS=$save_CPPFLAGS -+ LDFLAGS=$save_LDFLAGS -+ LIBS=$save_LIBS - ;; - esac - -@@ -12776,7 +13315,7 @@ - # FIXME - insert some real tests, host_os isn't really good enough - case $host_os in - darwin*) -- if test -n "$STRIP" ; then -+ if test -n "$STRIP"; then - striplib="$STRIP -x" - old_striplib="$STRIP -S" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -@@ -12804,7 +13343,7 @@ - - - -- # Report which library types will actually be built -+ # Report what library types will actually be built - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5 - $as_echo_n "checking if libtool supports shared libraries... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5 -@@ -12812,13 +13351,13 @@ - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5 - $as_echo_n "checking whether to build shared libraries... " >&6; } -- test "$can_build_shared" = "no" && enable_shared=no -+ test no = "$can_build_shared" && enable_shared=no - - # On AIX, shared libraries and static libraries use the same namespace, and - # are all built from PIC. - case $host_os in - aix3*) -- test "$enable_shared" = yes && enable_static=no -+ test yes = "$enable_shared" && enable_static=no - if test -n "$RANLIB"; then - archive_cmds="$archive_cmds~\$RANLIB \$lib" - postinstall_cmds='$RANLIB $lib' -@@ -12826,8 +13365,12 @@ - ;; - - aix[4-9]*) -- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then -- test "$enable_shared" = yes && enable_static=no -+ if test ia64 != "$host_cpu"; then -+ case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in -+ yes,aix,yes) ;; # shared object as lib.so file only -+ yes,svr4,*) ;; # shared object as lib.so archive member only -+ yes,*) enable_static=no ;; # shared object in lib.a archive as well -+ esac - fi - ;; - esac -@@ -12837,7 +13380,7 @@ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5 - $as_echo_n "checking whether to build static libraries... " >&6; } - # Make sure either enable_shared or enable_static is yes. -- test "$enable_shared" = yes || enable_static=yes -+ test yes = "$enable_shared" || enable_static=yes - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5 - $as_echo "$enable_static" >&6; } - -@@ -12851,7 +13394,7 @@ - ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' - ac_compiler_gnu=$ac_cv_c_compiler_gnu - --CC="$lt_save_CC" -+CC=$lt_save_CC - - - -@@ -13609,6 +14152,12 @@ - - - -+ -+ -+ -+ -+ -+ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Minix Amsterdam compiler" >&5 - $as_echo_n "checking for Minix Amsterdam compiler... " >&6; } - if ${gl_cv_c_amsterdam_compiler+:} false; then : -@@ -13635,14 +14184,189 @@ - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_c_amsterdam_compiler" >&5 - $as_echo "$gl_cv_c_amsterdam_compiler" >&6; } -- if test -z "$AR"; then -- if test $gl_cv_c_amsterdam_compiler = yes; then -+ -+ if test $gl_cv_c_amsterdam_compiler = yes; then -+ if test -z "$AR"; then - AR='cc -c.a' -- if test -z "$ARFLAGS"; then -- ARFLAGS='-o' -+ fi -+ if test -z "$ARFLAGS"; then -+ ARFLAGS='-o' -+ fi -+ else -+ if test -n "$ac_tool_prefix"; then -+ for ac_prog in ar lib "link -lib" -+ do -+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -+set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_AR+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$AR"; then -+ ac_cv_prog_AR="$AR" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+AR=$ac_cv_prog_AR -+if test -n "$AR"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5 -+$as_echo "$AR" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ -+ test -n "$AR" && break -+ done -+fi -+if test -z "$AR"; then -+ ac_ct_AR=$AR -+ for ac_prog in ar lib "link -lib" -+do -+ # Extract the first word of "$ac_prog", so it can be a program name with args. -+set dummy $ac_prog; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_ac_ct_AR+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -n "$ac_ct_AR"; then -+ ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_ac_ct_AR="$ac_prog" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+fi -+fi -+ac_ct_AR=$ac_cv_prog_ac_ct_AR -+if test -n "$ac_ct_AR"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5 -+$as_echo "$ac_ct_AR" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ -+ test -n "$ac_ct_AR" && break -+done -+ -+ if test "x$ac_ct_AR" = x; then -+ AR="false" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ AR=$ac_ct_AR -+ fi -+fi -+ -+: ${AR=ar} -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the archiver ($AR) interface" >&5 -+$as_echo_n "checking the archiver ($AR) interface... " >&6; } -+if ${am_cv_ar_interface+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ ac_ext=c -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_c_compiler_gnu -+ -+ am_cv_ar_interface=ar -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+int some_variable = 0; -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ am_ar_try='$AR cru libconftest.a conftest.$ac_objext >&5' -+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$am_ar_try\""; } >&5 -+ (eval $am_ar_try) 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+ if test "$ac_status" -eq 0; then -+ am_cv_ar_interface=ar -+ else -+ am_ar_try='$AR -NOLOGO -OUT:conftest.lib conftest.$ac_objext >&5' -+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$am_ar_try\""; } >&5 -+ (eval $am_ar_try) 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+ if test "$ac_status" -eq 0; then -+ am_cv_ar_interface=lib -+ else -+ am_cv_ar_interface=unknown -+ fi - fi -- else -- if test -n "$ac_tool_prefix"; then -+ rm -f conftest.lib libconftest.a -+ -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ ac_ext=c -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_c_compiler_gnu -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_ar_interface" >&5 -+$as_echo "$am_cv_ar_interface" >&6; } -+ -+case $am_cv_ar_interface in -+ar) -+ ;; -+lib) -+ # Microsoft lib, so override with the ar-lib wrapper script. -+ # FIXME: It is wrong to rewrite AR. -+ # But if we don't then we get into trouble of one sort or another. -+ # A longer-term fix would be to have automake use am__AR in this case, -+ # and then we could set am__AR="$am_aux_dir/ar-lib \$(AR)" or something -+ # similar. -+ AR="$am_aux_dir/ar-lib $AR" -+ ;; -+unknown) -+ as_fn_error $? "could not determine $AR interface" "$LINENO" 5 -+ ;; -+esac -+ -+ fi -+ -+ if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. - set dummy ${ac_tool_prefix}ar; ac_word=$2 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -@@ -13734,17 +14458,12 @@ - AR="$ac_cv_prog_AR" - fi - -- if test -z "$ARFLAGS"; then -- ARFLAGS='cru' -- fi -- fi -- else -- if test -z "$ARFLAGS"; then -- ARFLAGS='cru' -- fi -+ if test -z "$ARFLAGS"; then -+ ARFLAGS='cr' - fi - - -+ - if test -z "$RANLIB"; then - if test $gl_cv_c_amsterdam_compiler = yes; then - RANLIB=':' -@@ -13846,11 +14565,6 @@ - - - -- -- -- -- -- - # Check whether --enable-largefile was given. - if test "${enable_largefile+set}" = set; then : - enableval=$enable_largefile; -@@ -14395,6 +15109,10 @@ - - - -+ # Pre-early section. -+ -+ -+ - - # Code from module absolute-header: - # Code from module alloca-opt: -@@ -14407,11 +15125,12 @@ - # Code from module error: - # Code from module exitfail: - # Code from module extensions: -- - # Code from module extern-inline: - # Code from module fcntl-h: -+ # Code from module filename: - # Code from module float: - # Code from module full-write: -+ # Code from module getprogname: - # Code from module gettext-h: - # Code from module gettimeofday: - # Code from module gitlog-to-changelog: -@@ -14422,6 +15141,8 @@ - # Code from module largefile: - - # Code from module lib-ignore: -+ # Code from module limits-h: -+ # Code from module localtime-buffer: - # Code from module lock: - # Code from module lstat: - # Code from module malloc-posix: -@@ -15534,6 +16255,7 @@ - GNULIB_SLEEP=0; - GNULIB_SYMLINK=0; - GNULIB_SYMLINKAT=0; -+ GNULIB_TRUNCATE=0; - GNULIB_TTYNAME_R=0; - GNULIB_UNISTD_H_NONBLOCKING=0; - GNULIB_UNISTD_H_SIGPIPE=0; -@@ -15570,12 +16292,14 @@ - HAVE_SLEEP=1; - HAVE_SYMLINK=1; - HAVE_SYMLINKAT=1; -+ HAVE_TRUNCATE=1; - HAVE_UNLINKAT=1; - HAVE_USLEEP=1; - HAVE_DECL_ENVIRON=1; - HAVE_DECL_FCHDIR=1; - HAVE_DECL_FDATASYNC=1; - HAVE_DECL_GETDOMAINNAME=1; -+ HAVE_DECL_GETLOGIN=1; - HAVE_DECL_GETLOGIN_R=1; - HAVE_DECL_GETPAGESIZE=1; - HAVE_DECL_GETUSERSHELL=1; -@@ -15604,9 +16328,12 @@ - REPLACE_PWRITE=0; - REPLACE_READ=0; - REPLACE_READLINK=0; -+ REPLACE_READLINKAT=0; - REPLACE_RMDIR=0; - REPLACE_SLEEP=0; - REPLACE_SYMLINK=0; -+ REPLACE_SYMLINKAT=0; -+ REPLACE_TRUNCATE=0; - REPLACE_TTYNAME_R=0; - REPLACE_UNLINK=0; - REPLACE_UNLINKAT=0; -@@ -16493,6 +17220,24 @@ - - fi - -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ GNULIB_GETTIMEOFDAY=0; -+ HAVE_GETTIMEOFDAY=1; -+ HAVE_STRUCT_TIMEVAL=1; -+ HAVE_SYS_TIME_H=1; -+ REPLACE_GETTIMEOFDAY=0; -+ REPLACE_STRUCT_TIMEVAL=0; -+ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for C/C++ restrict keyword" >&5 - $as_echo_n "checking for C/C++ restrict keyword... " >&6; } - if ${ac_cv_c_restrict+:} false; then : -@@ -16503,17 +17248,19 @@ - for ac_kw in __restrict __restrict__ _Restrict restrict; do - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ --typedef int * int_ptr; -- int foo (int_ptr $ac_kw ip) { -- return ip[0]; -- } -+typedef int *int_ptr; -+ int foo (int_ptr $ac_kw ip) { return ip[0]; } -+ int bar (int [$ac_kw]); /* Catch GCC bug 14050. */ -+ int bar (int ip[$ac_kw]) { return ip[0]; } -+ - int - main () - { - int s[1]; -- int * $ac_kw t = s; -- t[0] = 0; -- return foo(t) -+ int *$ac_kw t = s; -+ t[0] = 0; -+ return foo (t) + bar (t); -+ - ; - return 0; - } -@@ -16540,14 +17287,6 @@ - esac - - -- GNULIB_GETTIMEOFDAY=0; -- HAVE_GETTIMEOFDAY=1; -- HAVE_STRUCT_TIMEVAL=1; -- HAVE_SYS_TIME_H=1; -- REPLACE_GETTIMEOFDAY=0; -- REPLACE_STRUCT_TIMEVAL=0; -- -- - - - -@@ -16821,6 +17560,38 @@ - - - -+ NEED_LOCALTIME_BUFFER=0 -+ -+ -+ GNULIB_CTIME=0; -+ GNULIB_MKTIME=0; -+ GNULIB_LOCALTIME=0; -+ GNULIB_NANOSLEEP=0; -+ GNULIB_STRFTIME=0; -+ GNULIB_STRPTIME=0; -+ GNULIB_TIMEGM=0; -+ GNULIB_TIME_R=0; -+ GNULIB_TIME_RZ=0; -+ GNULIB_TZSET=0; -+ HAVE_DECL_LOCALTIME_R=1; -+ HAVE_NANOSLEEP=1; -+ HAVE_STRPTIME=1; -+ HAVE_TIMEGM=1; -+ HAVE_TZSET=1; -+ HAVE_TIMEZONE_T=0; -+ REPLACE_CTIME=GNULIB_PORTCHECK; -+ REPLACE_LOCALTIME_R=GNULIB_PORTCHECK; -+ REPLACE_MKTIME=GNULIB_PORTCHECK; -+ REPLACE_NANOSLEEP=GNULIB_PORTCHECK; -+ REPLACE_STRFTIME=GNULIB_PORTCHECK; -+ REPLACE_TIMEGM=GNULIB_PORTCHECK; -+ REPLACE_TZSET=GNULIB_PORTCHECK; -+ -+ : ${GNULIB_GETTIMEOFDAY=0}; -+ REPLACE_GMTIME=0; -+ REPLACE_LOCALTIME=0; -+ -+ - - case "$host_os" in - mingw*) -@@ -16857,7 +17628,40 @@ - else - WINDOWS_64_BIT_OFF_T=0 - fi -- WINDOWS_64_BIT_ST_SIZE=1 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for 64-bit st_size" >&5 -+$as_echo_n "checking for 64-bit st_size... " >&6; } -+if ${gl_cv_member_st_size_64+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include -+ struct stat buf; -+ int verify_st_size_size[sizeof (buf.st_size) >= 8 ? 1 : -1]; -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ gl_cv_member_st_size_64=yes -+else -+ gl_cv_member_st_size_64=no -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_member_st_size_64" >&5 -+$as_echo "$gl_cv_member_st_size_64" >&6; } -+ if test $gl_cv_member_st_size_64 = no; then -+ WINDOWS_64_BIT_ST_SIZE=1 -+ else -+ WINDOWS_64_BIT_ST_SIZE=0 -+ fi - ;; - *) - WINDOWS_64_BIT_OFF_T=0 -@@ -16866,6 +17670,141 @@ - esac - - -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ : -+ -+ -+ -+ -+ -+ -+ -+ -+ if test $gl_cv_have_include_next = yes; then -+ gl_cv_next_limits_h='<'limits.h'>' -+ else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of " >&5 -+$as_echo_n "checking absolute name of ... " >&6; } -+if ${gl_cv_next_limits_h+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ -+ if test $ac_cv_header_limits_h = yes; then -+ -+ -+ -+ -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include -+_ACEOF -+ case "$host_os" in -+ aix*) gl_absname_cpp="$ac_cpp -C" ;; -+ *) gl_absname_cpp="$ac_cpp" ;; -+ esac -+ -+ case "$host_os" in -+ mingw*) -+ gl_dirsep_regex='[/\\]' -+ ;; -+ *) -+ gl_dirsep_regex='\/' -+ ;; -+ esac -+ gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' -+ gl_header_literal_regex=`echo 'limits.h' \ -+ | sed -e "$gl_make_literal_regex_sed"` -+ gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{ -+ s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/ -+ s|^/[^/]|//&| -+ p -+ q -+ }' -+ -+ gl_cv_absolute_limits_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | -+ sed -n "$gl_absolute_header_sed"` -+ -+ gl_header=$gl_cv_absolute_limits_h -+ gl_cv_next_limits_h='"'$gl_header'"' -+ else -+ gl_cv_next_limits_h='<'limits.h'>' -+ fi -+ -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_limits_h" >&5 -+$as_echo "$gl_cv_next_limits_h" >&6; } -+ fi -+ NEXT_LIMITS_H=$gl_cv_next_limits_h -+ -+ if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then -+ # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next' -+ gl_next_as_first_directive='<'limits.h'>' -+ else -+ # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include' -+ gl_next_as_first_directive=$gl_cv_next_limits_h -+ fi -+ NEXT_AS_FIRST_DIRECTIVE_LIMITS_H=$gl_next_as_first_directive -+ -+ -+ -+ -+ -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether limits.h has ULLONG_WIDTH etc." >&5 -+$as_echo_n "checking whether limits.h has ULLONG_WIDTH etc.... " >&6; } -+if ${gl_cv_header_limits_width+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#ifndef __STDC_WANT_IEC_60559_BFP_EXT__ -+ #define __STDC_WANT_IEC_60559_BFP_EXT__ 1 -+ #endif -+ #include -+ int ullw = ULLONG_WIDTH; -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ gl_cv_header_limits_width=yes -+else -+ gl_cv_header_limits_width=no -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_limits_width" >&5 -+$as_echo "$gl_cv_header_limits_width" >&6; } -+ if test "$gl_cv_header_limits_width" = yes; then -+ LIMITS_H= -+ else -+ LIMITS_H=limits.h -+ fi -+ -+ if test -n "$LIMITS_H"; then -+ GL_GENERATE_LIMITS_H_TRUE= -+ GL_GENERATE_LIMITS_H_FALSE='#' -+else -+ GL_GENERATE_LIMITS_H_TRUE='#' -+ GL_GENERATE_LIMITS_H_FALSE= -+fi -+ -+ -+ - if test "X$prefix" = "XNONE"; then - acl_final_prefix="$ac_default_prefix" - else -@@ -16903,38 +17842,12 @@ - } - fi - --ac_prog=ld --if test "$GCC" = yes; then -- # Check if gcc -print-prog-name=ld gives a path. -+if test -n "$LD"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld" >&5 -+$as_echo_n "checking for ld... " >&6; } -+elif test "$GCC" = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 - $as_echo_n "checking for ld used by $CC... " >&6; } -- case $host in -- *-*-mingw*) -- # gcc leaves a trailing carriage return which upsets mingw -- ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; -- *) -- ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; -- esac -- case $ac_prog in -- # Accept absolute paths. -- [\\/]* | ?:[\\/]*) -- re_direlt='/[^/][^/]*/\.\./' -- # Canonicalize the pathname of ld -- ac_prog=`echo "$ac_prog"| sed 's%\\\\%/%g'` -- while echo "$ac_prog" | grep "$re_direlt" > /dev/null 2>&1; do -- ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` -- done -- test -z "$LD" && LD="$ac_prog" -- ;; -- "") -- # If it fails, then pretend we aren't using GCC. -- ac_prog=ld -- ;; -- *) -- # If it is relative, then search for the first ld in PATH. -- with_gnu_ld=unknown -- ;; -- esac - elif test "$with_gnu_ld" = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 - $as_echo_n "checking for GNU ld... " >&6; } -@@ -16942,44 +17855,106 @@ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 - $as_echo_n "checking for non-GNU ld... " >&6; } - fi --if ${acl_cv_path_LD+:} false; then : -+if test -n "$LD"; then -+ # Let the user override the test with a path. -+ : -+else -+ if ${acl_cv_path_LD+:} false; then : - $as_echo_n "(cached) " >&6 - else -- if test -z "$LD"; then -- acl_save_ifs="$IFS"; IFS=$PATH_SEPARATOR -- for ac_dir in $PATH; do -- IFS="$acl_save_ifs" -- test -z "$ac_dir" && ac_dir=. -- if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then -- acl_cv_path_LD="$ac_dir/$ac_prog" -- # Check to see if the program is GNU ld. I'd rather use --version, -- # but apparently some variants of GNU ld only accept -v. -- # Break only if it was the GNU/non-GNU ld that we prefer. -- case `"$acl_cv_path_LD" -v 2>&1 &5 | tr -d '\015'` ;; -+ *) -+ acl_output=`($CC -print-prog-name=ld) 2>&5` ;; -+ esac -+ case $acl_output in -+ # Accept absolute paths. -+ [\\/]* | ?:[\\/]*) -+ re_direlt='/[^/][^/]*/\.\./' -+ # Canonicalize the pathname of ld -+ acl_output=`echo "$acl_output" | sed 's%\\\\%/%g'` -+ while echo "$acl_output" | grep "$re_direlt" > /dev/null 2>&1; do -+ acl_output=`echo $acl_output | sed "s%$re_direlt%/%"` -+ done -+ # Got the pathname. No search in PATH is needed. -+ acl_cv_path_LD="$acl_output" -+ ac_prog= -+ ;; -+ "") -+ # If it fails, then pretend we aren't using GCC. -+ ;; -+ *) -+ # If it is relative, then search for the first ld in PATH. -+ with_gnu_ld=unknown -+ ;; - esac - fi -- done -- IFS="$acl_save_ifs" --else -- acl_cv_path_LD="$LD" # Let the user override the test with a path. -+ if test -n "$ac_prog"; then -+ # Search for $ac_prog in $PATH. -+ acl_save_ifs="$IFS"; IFS=$PATH_SEPARATOR -+ for ac_dir in $PATH; do -+ IFS="$acl_save_ifs" -+ test -z "$ac_dir" && ac_dir=. -+ if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then -+ acl_cv_path_LD="$ac_dir/$ac_prog" -+ # Check to see if the program is GNU ld. I'd rather use --version, -+ # but apparently some variants of GNU ld only accept -v. -+ # Break only if it was the GNU/non-GNU ld that we prefer. -+ case `"$acl_cv_path_LD" -v 2>&1 conftest.$ac_ext -+/* end confdefs.h. */ -+#if defined __powerpc64__ || defined _ARCH_PPC64 -+ yes -+ #endif -+ -+_ACEOF -+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -+ $EGREP "yes" >/dev/null 2>&1; then : -+ # The compiler produces 64-bit code. Add option '-b64' so that the -+ # linker groks 64-bit object files. -+ case "$acl_cv_path_LD " in -+ *" -b64 "*) ;; -+ *) acl_cv_path_LD="$acl_cv_path_LD -b64" ;; -+ esac -+ - fi -+rm -f conftest* -+ -+ ;; -+ esac -+ - fi - --LD="$acl_cv_path_LD" -+ LD="$acl_cv_path_LD" -+fi - if test -n "$LD"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5 - $as_echo "$LD" >&6; } - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } -+ as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 - fi --test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 - $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } - if ${acl_cv_prog_gnu_ld+:} false; then : -@@ -17036,11 +18011,16 @@ - - - -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the common suffixes of directories in the library search path" >&5 -+$as_echo_n "checking for the common suffixes of directories in the library search path... " >&6; } -+if ${acl_cv_libdirstems+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else - acl_libdirstem=lib -- acl_libdirstem2= -- case "$host_os" in -- solaris*) -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for 64-bit host" >&5 -+ acl_libdirstem2= -+ case "$host_os" in -+ solaris*) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for 64-bit host" >&5 - $as_echo_n "checking for 64-bit host... " >&6; } - if ${gl_cv_solaris_64bit+:} false; then : - $as_echo_n "(cached) " >&6 -@@ -17065,37 +18045,51 @@ - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_solaris_64bit" >&5 - $as_echo "$gl_cv_solaris_64bit" >&6; } -- if test $gl_cv_solaris_64bit = yes; then -- acl_libdirstem=lib/64 -- case "$host_cpu" in -- sparc*) acl_libdirstem2=lib/sparcv9 ;; -- i*86 | x86_64) acl_libdirstem2=lib/amd64 ;; -- esac -- fi -- ;; -- *) -- searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'` -- if test -n "$searchpath"; then -- acl_save_IFS="${IFS= }"; IFS=":" -- for searchdir in $searchpath; do -- if test -d "$searchdir"; then -- case "$searchdir" in -- */lib64/ | */lib64 ) acl_libdirstem=lib64 ;; -- */../ | */.. ) -- # Better ignore directories of this form. They are misleading. -- ;; -- *) searchdir=`cd "$searchdir" && pwd` -- case "$searchdir" in -- */lib64 ) acl_libdirstem=lib64 ;; -- esac ;; -- esac -- fi -- done -- IFS="$acl_save_IFS" -- fi -- ;; -- esac -- test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem" -+ if test $gl_cv_solaris_64bit = yes; then -+ acl_libdirstem=lib/64 -+ case "$host_cpu" in -+ sparc*) acl_libdirstem2=lib/sparcv9 ;; -+ i*86 | x86_64) acl_libdirstem2=lib/amd64 ;; -+ esac -+ fi -+ ;; -+ *) -+ searchpath=`(if test -f /usr/bin/gcc \ -+ && LC_ALL=C /usr/bin/gcc -print-search-dirs >/dev/null 2>/dev/null; then \ -+ LC_ALL=C /usr/bin/gcc -print-search-dirs; \ -+ else \ -+ LC_ALL=C $CC -print-search-dirs; \ -+ fi) 2>/dev/null \ -+ | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'` -+ if test -n "$searchpath"; then -+ acl_save_IFS="${IFS= }"; IFS=":" -+ for searchdir in $searchpath; do -+ if test -d "$searchdir"; then -+ case "$searchdir" in -+ */lib64/ | */lib64 ) acl_libdirstem=lib64 ;; -+ */../ | */.. ) -+ # Better ignore directories of this form. They are misleading. -+ ;; -+ *) searchdir=`cd "$searchdir" && pwd` -+ case "$searchdir" in -+ */lib64 ) acl_libdirstem=lib64 ;; -+ esac ;; -+ esac -+ fi -+ done -+ IFS="$acl_save_IFS" -+ fi -+ ;; -+ esac -+ test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem" -+ acl_cv_libdirstems="$acl_libdirstem,$acl_libdirstem2" -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $acl_cv_libdirstems" >&5 -+$as_echo "$acl_cv_libdirstems" >&6; } -+ # Decompose acl_cv_libdirstems into acl_libdirstem and acl_libdirstem2. -+ acl_libdirstem=`echo "$acl_cv_libdirstems" | sed -e 's/,.*//'` -+ acl_libdirstem2=`echo "$acl_cv_libdirstems" | sed -e '/,/s/.*,//'` - - - -@@ -17190,26 +18184,42 @@ - # Test whether both pthread_mutex_lock and pthread_mutexattr_init exist - # in libc. IRIX 6.5 has the first one in both libc and libpthread, but - # the second one only in libpthread, and lock.c needs it. -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ # -+ # If -pthread works, prefer it to -lpthread, since Ubuntu 14.04 -+ # needs -pthread for some reason. See: -+ # http://lists.gnu.org/archive/html/bug-gnulib/2014-09/msg00023.html -+ save_LIBS=$LIBS -+ for gl_pthread in '' '-pthread'; do -+ LIBS="$LIBS $gl_pthread" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include -+ pthread_mutex_t m; -+ pthread_mutexattr_t ma; -+ - int - main () - { --pthread_mutex_lock((pthread_mutex_t*)0); -- pthread_mutexattr_init((pthread_mutexattr_t*)0); -+pthread_mutex_lock (&m); -+ pthread_mutexattr_init (&ma); - ; - return 0; - } - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : - gl_have_pthread=yes -+ LIBTHREAD=$gl_pthread LTLIBTHREAD=$gl_pthread -+ LIBMULTITHREAD=$gl_pthread LTLIBMULTITHREAD=$gl_pthread - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -+ LIBS=$save_LIBS -+ test -n "$gl_have_pthread" && break -+ done -+ - # Test for libpthread by looking for pthread_kill. (Not pthread_self, - # since it is defined as a macro on OSF/1.) -- if test -n "$gl_have_pthread"; then -+ if test -n "$gl_have_pthread" && test -z "$LIBTHREAD"; then - # The program links fine without libpthread. But it may actually - # need to link with libpthread in order to create multiple threads. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_kill in -lpthread" >&5 -@@ -17254,8 +18264,10 @@ - # Therefore pthread_in_use() needs to actually try to create a - # thread: pthread_create from libc will fail, whereas - # pthread_create will actually create a thread. -+ # On Solaris 10 or newer, this test is no longer needed, because -+ # libc contains the fully functional pthread functions. - case "$host_os" in -- solaris* | hpux*) -+ solaris | solaris2.1-9 | solaris2.1-9.* | hpux*) - - $as_echo "#define PTHREAD_IN_USE_DETECTION_HARD 1" >>confdefs.h - -@@ -17263,7 +18275,7 @@ - - fi - -- else -+ elif test -z "$gl_have_pthread"; then - # Some library is needed. Try libpthread and libc_r. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_kill in -lpthread" >&5 - $as_echo_n "checking for pthread_kill in -lpthread... " >&6; } -@@ -18016,6 +19028,7 @@ - GNULIB_MKNODAT=0; - GNULIB_STAT=0; - GNULIB_UTIMENSAT=0; -+ GNULIB_OVERRIDES_STRUCT_STAT=0; - HAVE_FCHMODAT=1; - HAVE_FSTATAT=1; - HAVE_FUTIMENS=1; -@@ -18050,14 +19063,15 @@ - else - rm -f conftest.sym conftest.file - echo >conftest.file -- if test "$as_ln_s" = "ln -s" && ln -s conftest.file conftest.sym; then -- if test "$cross_compiling" = yes; then : -+ if test "$cross_compiling" = yes; then : - case "$host_os" in -- # Guess yes on glibc systems. -- *-gnu*) gl_cv_func_lstat_dereferences_slashed_symlink="guessing yes" ;; -- # If we don't know, assume the worst. -- *) gl_cv_func_lstat_dereferences_slashed_symlink="guessing no" ;; -- esac -+ *-gnu*) -+ # Guess yes on glibc systems. -+ gl_cv_func_lstat_dereferences_slashed_symlink="guessing yes" ;; -+ *) -+ # If we don't know, assume the worst. -+ gl_cv_func_lstat_dereferences_slashed_symlink="guessing no" ;; -+ esac - - else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -18067,10 +19081,12 @@ - main () - { - struct stat sbuf; -- /* Linux will dereference the symlink and fail, as required by -- POSIX. That is better in the sense that it means we will not -- have to compile and use the lstat wrapper. */ -- return lstat ("conftest.sym/", &sbuf) == 0; -+ if (symlink ("conftest.file", "conftest.sym") != 0) -+ return 1; -+ /* Linux will dereference the symlink and fail, as required by -+ POSIX. That is better in the sense that it means we will not -+ have to compile and use the lstat wrapper. */ -+ return lstat ("conftest.sym/", &sbuf) == 0; - - ; - return 0; -@@ -18085,11 +19101,6 @@ - conftest.$ac_objext conftest.beam conftest.$ac_ext - fi - -- else -- # If the 'ln -s' command failed, then we probably don't even -- # have an lstat function. -- gl_cv_func_lstat_dereferences_slashed_symlink="guessing no" -- fi - rm -f conftest.sym conftest.file - - fi -@@ -18124,6 +19135,7 @@ - GNULIB_PTSNAME=0; - GNULIB_PTSNAME_R=0; - GNULIB_PUTENV=0; -+ GNULIB_QSORT_R=0; - GNULIB_RANDOM=0; - GNULIB_RANDOM_R=0; - GNULIB_REALLOC_POSIX=0; -@@ -18152,6 +19164,7 @@ - HAVE_POSIX_OPENPT=1; - HAVE_PTSNAME=1; - HAVE_PTSNAME_R=1; -+ HAVE_QSORT_R=1; - HAVE_RANDOM=1; - HAVE_RANDOM_H=1; - HAVE_RANDOM_R=1; -@@ -18175,6 +19188,7 @@ - REPLACE_PTSNAME=0; - REPLACE_PTSNAME_R=0; - REPLACE_PUTENV=0; -+ REPLACE_QSORT_R=0; - REPLACE_RANDOM_R=0; - REPLACE_REALLOC=0; - REPLACE_REALPATH=0; -@@ -18256,7 +19270,10 @@ - int - main () - { --return ! malloc (0); -+char *p = malloc (0); -+ int result = !p; -+ free (p); -+ return result; - ; - return 0; - } -@@ -18664,6 +19681,27 @@ - - - -+ -+ : -+ -+ -+ -+ -+ -+ if test $ac_cv_func__set_invalid_parameter_handler = yes; then -+ HAVE_MSVC_INVALID_PARAMETER_HANDLER=1 -+ -+$as_echo "#define HAVE_MSVC_INVALID_PARAMETER_HANDLER 1" >>confdefs.h -+ -+ else -+ HAVE_MSVC_INVALID_PARAMETER_HANDLER=0 -+ fi -+ -+ -+ -+ -+ -+ - gl_cv_c_multiarch=no - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ -@@ -18791,6 +19829,26 @@ - - - -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - ac_fn_c_check_decl "$LINENO" "setenv" "ac_cv_have_decl_setenv" "$ac_includes_default" - if test "x$ac_cv_have_decl_setenv" = xyes; then : - ac_have_decl=1 -@@ -19040,7 +20098,7 @@ - # Guess yes on glibc systems. - *-gnu*) gl_cv_func_snprintf_retval_c99="guessing yes";; - # Guess yes on FreeBSD >= 5. -- freebsd[1-4]*) gl_cv_func_snprintf_retval_c99="guessing no";; -+ freebsd[1-4].*) gl_cv_func_snprintf_retval_c99="guessing no";; - freebsd* | kfreebsd*) gl_cv_func_snprintf_retval_c99="guessing yes";; - # Guess yes on Mac OS X >= 10.3. - darwin[1-6].*) gl_cv_func_snprintf_retval_c99="guessing no";; -@@ -19125,6 +20183,208 @@ - _ACEOF - - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stat file-mode macros are broken" >&5 -+$as_echo_n "checking whether stat file-mode macros are broken... " >&6; } -+if ${ac_cv_header_stat_broken+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include -+#include -+ -+#if defined S_ISBLK && defined S_IFDIR -+extern char c1[S_ISBLK (S_IFDIR) ? -1 : 1]; -+#endif -+ -+#if defined S_ISBLK && defined S_IFCHR -+extern char c2[S_ISBLK (S_IFCHR) ? -1 : 1]; -+#endif -+ -+#if defined S_ISLNK && defined S_IFREG -+extern char c3[S_ISLNK (S_IFREG) ? -1 : 1]; -+#endif -+ -+#if defined S_ISSOCK && defined S_IFREG -+extern char c4[S_ISSOCK (S_IFREG) ? -1 : 1]; -+#endif -+ -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ ac_cv_header_stat_broken=no -+else -+ ac_cv_header_stat_broken=yes -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stat_broken" >&5 -+$as_echo "$ac_cv_header_stat_broken" >&6; } -+if test $ac_cv_header_stat_broken = yes; then -+ -+$as_echo "#define STAT_MACROS_BROKEN 1" >>confdefs.h -+ -+fi -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ : -+ -+ -+ -+ -+ -+ -+ -+ -+ if test $gl_cv_have_include_next = yes; then -+ gl_cv_next_sys_stat_h='<'sys/stat.h'>' -+ else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of " >&5 -+$as_echo_n "checking absolute name of ... " >&6; } -+if ${gl_cv_next_sys_stat_h+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ -+ if test $ac_cv_header_sys_stat_h = yes; then -+ -+ -+ -+ -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include -+_ACEOF -+ case "$host_os" in -+ aix*) gl_absname_cpp="$ac_cpp -C" ;; -+ *) gl_absname_cpp="$ac_cpp" ;; -+ esac -+ -+ case "$host_os" in -+ mingw*) -+ gl_dirsep_regex='[/\\]' -+ ;; -+ *) -+ gl_dirsep_regex='\/' -+ ;; -+ esac -+ gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' -+ gl_header_literal_regex=`echo 'sys/stat.h' \ -+ | sed -e "$gl_make_literal_regex_sed"` -+ gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{ -+ s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/ -+ s|^/[^/]|//&| -+ p -+ q -+ }' -+ -+ gl_cv_absolute_sys_stat_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | -+ sed -n "$gl_absolute_header_sed"` -+ -+ gl_header=$gl_cv_absolute_sys_stat_h -+ gl_cv_next_sys_stat_h='"'$gl_header'"' -+ else -+ gl_cv_next_sys_stat_h='<'sys/stat.h'>' -+ fi -+ -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_sys_stat_h" >&5 -+$as_echo "$gl_cv_next_sys_stat_h" >&6; } -+ fi -+ NEXT_SYS_STAT_H=$gl_cv_next_sys_stat_h -+ -+ if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then -+ # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next' -+ gl_next_as_first_directive='<'sys/stat.h'>' -+ else -+ # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include' -+ gl_next_as_first_directive=$gl_cv_next_sys_stat_h -+ fi -+ NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H=$gl_next_as_first_directive -+ -+ -+ -+ -+ -+ -+ -+ -+ WINDOWS_STAT_TIMESPEC=0 -+ -+ -+ -+ -+ -+ -+ -+ -+ ac_fn_c_check_type "$LINENO" "nlink_t" "ac_cv_type_nlink_t" "#include -+ #include -+" -+if test "x$ac_cv_type_nlink_t" = xyes; then : -+ -+else -+ -+$as_echo "#define nlink_t int" >>confdefs.h -+ -+fi -+ -+ -+ -+ for gl_func in fchmodat fstat fstatat futimens lchmod lstat mkdirat mkfifo mkfifoat mknod mknodat stat utimensat; do -+ as_gl_Symbol=`$as_echo "gl_cv_have_raw_decl_$gl_func" | $as_tr_sh` -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $gl_func is declared without a macro" >&5 -+$as_echo_n "checking whether $gl_func is declared without a macro... " >&6; } -+if eval \${$as_gl_Symbol+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include -+ -+int -+main () -+{ -+#undef $gl_func -+ (void) $gl_func; -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ eval "$as_gl_Symbol=yes" -+else -+ eval "$as_gl_Symbol=no" -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+eval ac_res=\$$as_gl_Symbol -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+ if eval test \"x\$"$as_gl_Symbol"\" = x"yes"; then : -+ cat >>confdefs.h <<_ACEOF -+#define `$as_echo "HAVE_RAW_DECL_$gl_func" | $as_tr_cpp` 1 -+_ACEOF -+ -+ eval ac_cv_have_decl_$gl_func=yes -+fi -+ done -+ -+ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdbool.h that conforms to C99" >&5 - $as_echo_n "checking for stdbool.h that conforms to C99... " >&6; } - if ${ac_cv_header_stdbool_h+:} false; then : -@@ -19134,59 +20394,67 @@ - /* end confdefs.h. */ - - #include -- #ifndef bool -- "error: bool is not defined" -- #endif -- #ifndef false -- "error: false is not defined" -- #endif -- #if false -- "error: false is not 0" -- #endif -- #ifndef true -- "error: true is not defined" -- #endif -- #if true != 1 -- "error: true is not 1" -+ -+ #ifdef __cplusplus -+ typedef bool Bool; -+ #else -+ typedef _Bool Bool; -+ #ifndef bool -+ "error: bool is not defined" -+ #endif -+ #ifndef false -+ "error: false is not defined" -+ #endif -+ #if false -+ "error: false is not 0" -+ #endif -+ #ifndef true -+ "error: true is not defined" -+ #endif -+ #if true != 1 -+ "error: true is not 1" -+ #endif - #endif -+ - #ifndef __bool_true_false_are_defined - "error: __bool_true_false_are_defined is not defined" - #endif - -- struct s { _Bool s: 1; _Bool t; } s; -+ struct s { Bool s: 1; Bool t; bool u: 1; bool v; } s; - - char a[true == 1 ? 1 : -1]; - char b[false == 0 ? 1 : -1]; - char c[__bool_true_false_are_defined == 1 ? 1 : -1]; - char d[(bool) 0.5 == true ? 1 : -1]; - /* See body of main program for 'e'. */ -- char f[(_Bool) 0.0 == false ? 1 : -1]; -+ char f[(Bool) 0.0 == false ? 1 : -1]; - char g[true]; -- char h[sizeof (_Bool)]; -+ char h[sizeof (Bool)]; - char i[sizeof s.t]; - enum { j = false, k = true, l = false * true, m = true * 256 }; - /* The following fails for - HP aC++/ANSI C B3910B A.05.55 [Dec 04 2003]. */ -- _Bool n[m]; -+ Bool n[m]; - char o[sizeof n == m * sizeof n[0] ? 1 : -1]; -- char p[-1 - (_Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1]; -+ char p[-1 - (Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1]; - /* Catch a bug in an HP-UX C compiler. See - http://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html - http://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html - */ -- _Bool q = true; -- _Bool *pq = &q; -+ Bool q = true; -+ Bool *pq = &q; -+ bool *qq = &q; - - int - main () - { - - bool e = &s; -- *pq |= q; -- *pq |= ! q; -+ *pq |= q; *pq |= ! q; -+ *qq |= q; *qq |= ! q; - /* Refer to every declared value, to avoid compiler optimizations. */ - return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !!j + !k + !!l -- + !m + !n + !o + !p + !q + !pq); -+ + !m + !n + !o + !p + !q + !pq + !qq); - - ; - return 0; -@@ -19214,6 +20482,7 @@ - - - REPLACE_NULL=0; -+ HAVE_MAX_ALIGN_T=1; - HAVE_WCHAR_T=1; - - -@@ -19250,6 +20519,96 @@ - fi - - -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wint_t" >&5 -+$as_echo_n "checking for wint_t... " >&6; } -+if ${gt_cv_c_wint_t+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+/* Tru64 with Desktop Toolkit C has a bug: must be included before -+ . -+ BSD/OS 4.0.1 has a bug: , and must be included -+ before . */ -+#include -+#include -+#include -+#include -+ wint_t foo = (wchar_t)'\0'; -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ gt_cv_c_wint_t=yes -+else -+ gt_cv_c_wint_t=no -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_c_wint_t" >&5 -+$as_echo "$gt_cv_c_wint_t" >&6; } -+ if test $gt_cv_c_wint_t = yes; then -+ -+$as_echo "#define HAVE_WINT_T 1" >>confdefs.h -+ -+ -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether wint_t is too small" >&5 -+$as_echo_n "checking whether wint_t is too small... " >&6; } -+if ${gl_cv_type_wint_t_too_small+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+/* Tru64 with Desktop Toolkit C has a bug: must be included before -+ . -+ BSD/OS 4.0.1 has a bug: , and must be -+ included before . */ -+#if !(defined __GLIBC__ && !defined __UCLIBC__) -+# include -+# include -+# include -+#endif -+#include -+ int verify[sizeof (wint_t) < sizeof (int) ? -1 : 1]; -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ gl_cv_type_wint_t_too_small=no -+else -+ gl_cv_type_wint_t_too_small=yes -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_type_wint_t_too_small" >&5 -+$as_echo "$gl_cv_type_wint_t_too_small" >&6; } -+ if test $gl_cv_type_wint_t_too_small = yes; then -+ GNULIB_OVERRIDES_WINT_T=1 -+ else -+ GNULIB_OVERRIDES_WINT_T=0 -+ fi -+ else -+ GNULIB_OVERRIDES_WINT_T=0 -+ fi -+ -+ -+ -+ -+ -+ - - - -@@ -19407,6 +20766,8 @@ - - - #define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 /* work if build isn't clean */ -+#define __STDC_CONSTANT_MACROS 1 -+#define __STDC_LIMIT_MACROS 1 - #include - /* Dragonfly defines WCHAR_MIN, WCHAR_MAX only in . */ - #if !(defined WCHAR_MIN && defined WCHAR_MAX) -@@ -19497,6 +20858,15 @@ - intmax_t i = INTMAX_MAX; - uintmax_t j = UINTMAX_MAX; - -+/* Check that SIZE_MAX has the correct type, if possible. */ -+#if 201112 <= __STDC_VERSION__ -+int k = _Generic (SIZE_MAX, size_t: 0); -+#elif (2 <= __GNUC__ || defined __IBM__TYPEOF__ \ -+ || (0x5110 <= __SUNPRO_C && !__STDC__)) -+extern size_t k; -+extern __typeof__ (SIZE_MAX) k; -+#endif -+ - #include /* for CHAR_BIT */ - #define TYPE_MINIMUM(t) \ - ((t) ((t) 0 < (t) -1 ? (t) 0 : ~ TYPE_MAXIMUM (t))) -@@ -19575,6 +20945,8 @@ - - - #define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 /* work if build isn't clean */ -+#define __STDC_CONSTANT_MACROS 1 -+#define __STDC_LIMIT_MACROS 1 - #include - - -@@ -19660,8 +21032,111 @@ - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_working_stdint_h" >&5 - $as_echo "$gl_cv_header_working_stdint_h" >&6; } - fi -+ -+ HAVE_C99_STDINT_H=0 -+ HAVE_SYS_BITYPES_H=0 -+ HAVE_SYS_INTTYPES_H=0 -+ STDINT_H=stdint.h - if test "$gl_cv_header_working_stdint_h" = yes; then -- STDINT_H= -+ HAVE_C99_STDINT_H=1 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stdint.h predates C++11" >&5 -+$as_echo_n "checking whether stdint.h predates C++11... " >&6; } -+if ${gl_cv_header_stdint_predates_cxx11_h+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ gl_cv_header_stdint_predates_cxx11_h=yes -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+ -+#define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 /* work if build isn't clean */ -+#include -+ -+ -+ /* BSD/OS 4.0.1 has a bug: , and must be -+ included before . */ -+ #include -+ #include -+ #if HAVE_WCHAR_H -+ # include -+ # include -+ # include -+ #endif -+ -+ -+intmax_t im = INTMAX_MAX; -+int32_t i32 = INT32_C (0x7fffffff); -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ gl_cv_header_stdint_predates_cxx11_h=no -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_stdint_predates_cxx11_h" >&5 -+$as_echo "$gl_cv_header_stdint_predates_cxx11_h" >&6; } -+ -+ if test "$gl_cv_header_stdint_predates_cxx11_h" = yes; then -+ -+$as_echo "#define __STDC_CONSTANT_MACROS 1" >>confdefs.h -+ -+ -+$as_echo "#define __STDC_LIMIT_MACROS 1" >>confdefs.h -+ -+ fi -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stdint.h has UINTMAX_WIDTH etc." >&5 -+$as_echo_n "checking whether stdint.h has UINTMAX_WIDTH etc.... " >&6; } -+if ${gl_cv_header_stdint_width+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ gl_cv_header_stdint_width=no -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+ /* Work if build is not clean. */ -+ #define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 -+ #ifndef __STDC_WANT_IEC_60559_BFP_EXT__ -+ #define __STDC_WANT_IEC_60559_BFP_EXT__ 1 -+ #endif -+ #include -+ -+ /* BSD/OS 4.0.1 has a bug: , and must be -+ included before . */ -+ #include -+ #include -+ #if HAVE_WCHAR_H -+ # include -+ # include -+ # include -+ #endif -+ -+ int iw = UINTMAX_WIDTH; -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ gl_cv_header_stdint_width=yes -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_stdint_width" >&5 -+$as_echo "$gl_cv_header_stdint_width" >&6; } -+ if test "$gl_cv_header_stdint_width" = yes; then -+ STDINT_H= -+ fi - else - for ac_header in sys/inttypes.h sys/bitypes.h - do : -@@ -19678,19 +21153,12 @@ - - if test $ac_cv_header_sys_inttypes_h = yes; then - HAVE_SYS_INTTYPES_H=1 -- else -- HAVE_SYS_INTTYPES_H=0 - fi -- - if test $ac_cv_header_sys_bitypes_h = yes; then - HAVE_SYS_BITYPES_H=1 -- else -- HAVE_SYS_BITYPES_H=0 - fi - - -- -- - if test $APPLE_UNIVERSAL_BUILD = 0; then - - -@@ -19984,13 +21452,26 @@ - - - -- if test $BITSIZEOF_WINT_T -lt 32; then -+ if test $GNULIB_OVERRIDES_WINT_T = 1; then - BITSIZEOF_WINT_T=32 - fi - -- STDINT_H=stdint.h - fi - -+ LIMITS_H=limits.h -+ if test -n "$LIMITS_H"; then -+ GL_GENERATE_LIMITS_H_TRUE= -+ GL_GENERATE_LIMITS_H_FALSE='#' -+else -+ GL_GENERATE_LIMITS_H_TRUE='#' -+ GL_GENERATE_LIMITS_H_FALSE= -+fi -+ -+ -+ -+ -+ -+ - if test -n "$STDINT_H"; then - GL_GENERATE_STDINT_H_TRUE= - GL_GENERATE_STDINT_H_FALSE='#' -@@ -20250,53 +21731,6 @@ - - - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stat file-mode macros are broken" >&5 --$as_echo_n "checking whether stat file-mode macros are broken... " >&6; } --if ${ac_cv_header_stat_broken+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ --#include --#include -- --#if defined S_ISBLK && defined S_IFDIR --extern char c1[S_ISBLK (S_IFDIR) ? -1 : 1]; --#endif -- --#if defined S_ISBLK && defined S_IFCHR --extern char c2[S_ISBLK (S_IFCHR) ? -1 : 1]; --#endif -- --#if defined S_ISLNK && defined S_IFREG --extern char c3[S_ISLNK (S_IFREG) ? -1 : 1]; --#endif -- --#if defined S_ISSOCK && defined S_IFREG --extern char c4[S_ISSOCK (S_IFREG) ? -1 : 1]; --#endif -- --_ACEOF --if ac_fn_c_try_compile "$LINENO"; then : -- ac_cv_header_stat_broken=no --else -- ac_cv_header_stat_broken=yes --fi --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext --fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stat_broken" >&5 --$as_echo "$ac_cv_header_stat_broken" >&6; } --if test $ac_cv_header_stat_broken = yes; then -- --$as_echo "#define STAT_MACROS_BROKEN 1" >>confdefs.h -- --fi -- -- -- -- -- -- - - - -@@ -20386,31 +21820,17 @@ - - - -- GNULIB_WAITPID=0; -+ WINDOWS_STAT_INODES=0 - - - - -+ GNULIB_WAITPID=0; -+ - - - -- GNULIB_MKTIME=0; -- GNULIB_NANOSLEEP=0; -- GNULIB_STRPTIME=0; -- GNULIB_TIMEGM=0; -- GNULIB_TIME_R=0; -- HAVE_DECL_LOCALTIME_R=1; -- HAVE_NANOSLEEP=1; -- HAVE_STRPTIME=1; -- HAVE_TIMEGM=1; -- REPLACE_LOCALTIME_R=GNULIB_PORTCHECK; -- REPLACE_MKTIME=GNULIB_PORTCHECK; -- REPLACE_NANOSLEEP=GNULIB_PORTCHECK; -- REPLACE_TIMEGM=GNULIB_PORTCHECK; - -- : ${GNULIB_GETTIMEOFDAY=0}; -- REPLACE_GMTIME=0; -- REPLACE_LOCALTIME=0; - - - -@@ -20450,6 +21870,7 @@ - TIME_H_DEFINES_STRUCT_TIMESPEC=0 - SYS_TIME_H_DEFINES_STRUCT_TIMESPEC=0 - PTHREAD_H_DEFINES_STRUCT_TIMESPEC=0 -+ UNISTD_H_DEFINES_STRUCT_TIMESPEC=0 - if test $gl_cv_sys_struct_timespec_in_time_h = yes; then - TIME_H_DEFINES_STRUCT_TIMESPEC=1 - else -@@ -20510,6 +21931,36 @@ - $as_echo "$gl_cv_sys_struct_timespec_in_pthread_h" >&6; } - if test $gl_cv_sys_struct_timespec_in_pthread_h = yes; then - PTHREAD_H_DEFINES_STRUCT_TIMESPEC=1 -+ else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct timespec in " >&5 -+$as_echo_n "checking for struct timespec in ... " >&6; } -+if ${gl_cv_sys_struct_timespec_in_unistd_h+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include -+ -+int -+main () -+{ -+static struct timespec x; x.tv_sec = x.tv_nsec; -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ gl_cv_sys_struct_timespec_in_unistd_h=yes -+else -+ gl_cv_sys_struct_timespec_in_unistd_h=no -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_sys_struct_timespec_in_unistd_h" >&5 -+$as_echo "$gl_cv_sys_struct_timespec_in_unistd_h" >&6; } -+ if test $gl_cv_sys_struct_timespec_in_unistd_h = yes; then -+ UNISTD_H_DEFINES_STRUCT_TIMESPEC=1 -+ fi - fi - fi - fi -@@ -20528,6 +21979,7 @@ - - - -+ - if test $gl_cv_have_include_next = yes; then - gl_cv_next_time_h='<'time.h'>' - else -@@ -20612,47 +22064,6 @@ - - - -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wint_t" >&5 --$as_echo_n "checking for wint_t... " >&6; } --if ${gt_cv_c_wint_t+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ -- --/* Tru64 with Desktop Toolkit C has a bug: must be included before -- . -- BSD/OS 4.0.1 has a bug: , and must be included -- before . */ --#include --#include --#include --#include -- wint_t foo = (wchar_t)'\0'; --int --main () --{ -- -- ; -- return 0; --} --_ACEOF --if ac_fn_c_try_compile "$LINENO"; then : -- gt_cv_c_wint_t=yes --else -- gt_cv_c_wint_t=no --fi --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext --fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_c_wint_t" >&5 --$as_echo "$gt_cv_c_wint_t" >&6; } -- if test $gt_cv_c_wint_t = yes; then -- --$as_echo "#define HAVE_WINT_T 1" >>confdefs.h -- -- fi -- -- - - - -@@ -21222,6 +22633,7 @@ - GNULIB_WCSSTR=0; - GNULIB_WCSTOK=0; - GNULIB_WCSWIDTH=0; -+ GNULIB_WCSFTIME=0; - HAVE_BTOWC=1; - HAVE_MBSINIT=1; - HAVE_MBRTOWC=1; -@@ -21259,6 +22671,7 @@ - HAVE_WCSSTR=1; - HAVE_WCSTOK=1; - HAVE_WCSWIDTH=1; -+ HAVE_WCSFTIME=1; - HAVE_DECL_WCTOB=1; - HAVE_DECL_WCWIDTH=1; - REPLACE_MBSTATE_T=0; -@@ -21274,6 +22687,7 @@ - REPLACE_WCSNRTOMBS=0; - REPLACE_WCWIDTH=0; - REPLACE_WCSWIDTH=0; -+ REPLACE_WCSFTIME=0; - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether uses 'inline' correctly" >&5 -@@ -21298,12 +22712,13 @@ - int main () { return zero(); } - - _ACEOF -+ save_ac_compile="$ac_compile" -+ ac_compile=`echo "$save_ac_compile" | sed s/conftest/conftest1/` - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then -- mv conftest.$ac_objext conftest1.$ac_objext - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - -@@ -21319,12 +22734,12 @@ - int zero (void) { return 0; } - - _ACEOF -+ ac_compile=`echo "$save_ac_compile" | sed s/conftest/conftest2/` - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then -- mv conftest.$ac_objext conftest2.$ac_objext - if $CC -o conftest$ac_exeext $CFLAGS $LDFLAGS conftest1.$ac_objext conftest2.$ac_objext $LIBS >&5 2>&1; then - : - else -@@ -21332,6 +22747,7 @@ - fi - fi - fi -+ ac_compile="$save_ac_compile" - rm -f conftest1.$ac_objext conftest2.$ac_objext conftest$ac_exeext - - fi -@@ -21350,6 +22766,26 @@ - fi - - -+ -+ -+ -+ -+ -+ -+ : -+ -+ -+ -+ -+ -+ if test $ac_cv_header_crtdefs_h = yes; then -+ HAVE_CRTDEFS_H=1 -+ else -+ HAVE_CRTDEFS_H=0 -+ fi -+ -+ -+ - if true; then - GL_COND_LIBTOOL_TRUE= - GL_COND_LIBTOOL_FALSE='#' -@@ -21890,6 +23326,107 @@ - fi - - -+ : -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ ac_found=0 -+ ac_fn_c_check_decl "$LINENO" "program_invocation_name" "ac_cv_have_decl_program_invocation_name" "#include -+" -+if test "x$ac_cv_have_decl_program_invocation_name" = xyes; then : -+ ac_have_decl=1 -+else -+ ac_have_decl=0 -+fi -+ -+cat >>confdefs.h <<_ACEOF -+#define HAVE_DECL_PROGRAM_INVOCATION_NAME $ac_have_decl -+_ACEOF -+if test $ac_have_decl = 1; then : -+ ac_found=1 -+fi -+ -+ ac_fn_c_check_decl "$LINENO" "program_invocation_short_name" "ac_cv_have_decl_program_invocation_short_name" "#include -+" -+if test "x$ac_cv_have_decl_program_invocation_short_name" = xyes; then : -+ ac_have_decl=1 -+else -+ ac_have_decl=0 -+fi -+ -+cat >>confdefs.h <<_ACEOF -+#define HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME $ac_have_decl -+_ACEOF -+if test $ac_have_decl = 1; then : -+ ac_found=1 -+fi -+ -+ ac_fn_c_check_decl "$LINENO" "__argv" "ac_cv_have_decl___argv" "#include -+" -+if test "x$ac_cv_have_decl___argv" = xyes; then : -+ ac_have_decl=1 -+else -+ ac_have_decl=0 -+fi -+ -+cat >>confdefs.h <<_ACEOF -+#define HAVE_DECL___ARGV $ac_have_decl -+_ACEOF -+if test $ac_have_decl = 1; then : -+ ac_found=1 -+fi -+ -+ -+ # Incur the cost of this test only if none of the above worked. -+ if test $ac_found = 0; then -+ # On OpenBSD 5.1, using the global __progname variable appears to be -+ # the only way to implement getprogname. -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether __progname is defined in default libraries" >&5 -+$as_echo_n "checking whether __progname is defined in default libraries... " >&6; } -+if ${gl_cv_var___progname+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ -+ gl_cv_var___progname= -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+extern char *__progname; -+int -+main () -+{ -+return *__progname; -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_link "$LINENO"; then : -+ gl_cv_var___progname=yes -+ -+fi -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+ -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_var___progname" >&5 -+$as_echo "$gl_cv_var___progname" >&6; } -+ if test "$gl_cv_var___progname" = yes; then -+ -+$as_echo "#define HAVE_VAR___PROGNAME 1" >>confdefs.h -+ -+ fi -+ fi -+ -+ -+ -+ - - - -@@ -21909,6 +23446,7 @@ - - - -+ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether gettimeofday clobbers localtime buffer" >&5 - $as_echo_n "checking whether gettimeofday clobbers localtime buffer... " >&6; } - if ${gl_cv_func_gettimeofday_clobber+:} false; then : -@@ -21965,11 +23503,14 @@ - *yes) - REPLACE_GETTIMEOFDAY=1 - -- REPLACE_GMTIME=1 -- REPLACE_LOCALTIME=1 -+$as_echo "#define GETTIMEOFDAY_CLOBBERS_LOCALTIME 1" >>confdefs.h - - --$as_echo "#define GETTIMEOFDAY_CLOBBERS_LOCALTIME 1" >>confdefs.h -+ -+ -+ NEED_LOCALTIME_BUFFER=1 -+ REPLACE_GMTIME=1 -+ REPLACE_LOCALTIME=1 - - ;; - esac -@@ -22037,7 +23578,9 @@ - if test $REPLACE_STRUCT_TIMEVAL = 1; then - REPLACE_GETTIMEOFDAY=1 - fi -- -+ case "$host_os" in -+ mingw*) REPLACE_GETTIMEOFDAY=1 ;; -+ esac - fi - - cat >>confdefs.h <<_ACEOF -@@ -22056,31 +23599,7 @@ - - gl_LIBOBJS="$gl_LIBOBJS gettimeofday.$ac_objext" - -- -- for ac_header in sys/timeb.h --do : -- ac_fn_c_check_header_mongrel "$LINENO" "sys/timeb.h" "ac_cv_header_sys_timeb_h" "$ac_includes_default" --if test "x$ac_cv_header_sys_timeb_h" = xyes; then : -- cat >>confdefs.h <<_ACEOF --#define HAVE_SYS_TIMEB_H 1 --_ACEOF -- --fi -- --done -- -- for ac_func in _ftime --do : -- ac_fn_c_check_func "$LINENO" "_ftime" "ac_cv_func__ftime" --if test "x$ac_cv_func__ftime" = xyes; then : -- cat >>confdefs.h <<_ACEOF --#define HAVE__FTIME 1 --_ACEOF -- --fi --done -- -- -+ : - fi - - -@@ -22157,17 +23676,182 @@ - - - -+ -+ -+ -+ -+ -+ -+ -+ -+ gl_LIBOBJS="$gl_LIBOBJS localtime-buffer.$ac_objext" -+ -+ -+ - if test "$gl_threads_api" = posix; then - # OSF/1 4.0 and Mac OS X 10.1 lack the pthread_rwlock_t type and the - # pthread_rwlock_* functions. -+ has_rwlock=false - ac_fn_c_check_type "$LINENO" "pthread_rwlock_t" "ac_cv_type_pthread_rwlock_t" "#include - " - if test "x$ac_cv_type_pthread_rwlock_t" = xyes; then : -+ has_rwlock=true - - $as_echo "#define HAVE_PTHREAD_RWLOCK 1" >>confdefs.h - - fi - -+ if $has_rwlock; then -+ -+ -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pthread_rwlock_rdlock prefers a writer to a reader" >&5 -+$as_echo_n "checking whether pthread_rwlock_rdlock prefers a writer to a reader... " >&6; } -+if ${gl_cv_pthread_rwlock_rdlock_prefer_writer+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ save_LIBS="$LIBS" -+ LIBS="$LIBS $LIBMULTITHREAD" -+ if test "$cross_compiling" = yes; then : -+ gl_cv_pthread_rwlock_rdlock_prefer_writer="guessing yes" -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+#include -+#include -+#include -+#include -+ -+#define SUCCEED() exit (0) -+#define FAILURE() exit (1) -+#define UNEXPECTED(n) (exit (10 + (n))) -+ -+/* The main thread creates the waiting writer and the requesting reader threads -+ in the default way; this guarantees that they have the same priority. -+ We can reuse the main thread as first reader thread. */ -+ -+static pthread_rwlock_t lock; -+static pthread_t reader1; -+static pthread_t writer; -+static pthread_t reader2; -+static pthread_t timer; -+/* Used to pass control from writer to reader2 and from reader2 to timer, -+ as in a relay race. -+ Passing control from one running thread to another running thread -+ is most likely faster than to create the second thread. */ -+static pthread_mutex_t baton; -+ -+static void * -+timer_func (void *ignored) -+{ -+ /* Step 13 (can be before or after step 12): -+ The timer thread takes the baton, then waits a moment to make sure -+ it can tell whether the second reader thread is blocked at step 12. */ -+ if (pthread_mutex_lock (&baton)) -+ UNEXPECTED (13); -+ usleep (100000); -+ /* By the time we get here, it's clear that the second reader thread is -+ blocked at step 12. This is the desired behaviour. */ -+ SUCCEED (); -+} -+ -+static void * -+reader2_func (void *ignored) -+{ -+ int err; -+ -+ /* Step 8 (can be before or after step 7): -+ The second reader thread takes the baton, then waits a moment to make sure -+ the writer thread has reached step 7. */ -+ if (pthread_mutex_lock (&baton)) -+ UNEXPECTED (8); -+ usleep (100000); -+ /* Step 9: The second reader thread requests the lock. */ -+ err = pthread_rwlock_tryrdlock (&lock); -+ if (err == 0) -+ FAILURE (); -+ else if (err != EBUSY) -+ UNEXPECTED (9); -+ /* Step 10: Launch a timer, to test whether the next call blocks. */ -+ if (pthread_create (&timer, NULL, timer_func, NULL)) -+ UNEXPECTED (10); -+ /* Step 11: Release the baton. */ -+ if (pthread_mutex_unlock (&baton)) -+ UNEXPECTED (11); -+ /* Step 12: The second reader thread requests the lock. */ -+ err = pthread_rwlock_rdlock (&lock); -+ if (err == 0) -+ FAILURE (); -+ else -+ UNEXPECTED (12); -+} -+ -+static void * -+writer_func (void *ignored) -+{ -+ /* Step 4: Take the baton, so that the second reader thread does not go ahead -+ too early. */ -+ if (pthread_mutex_lock (&baton)) -+ UNEXPECTED (4); -+ /* Step 5: Create the second reader thread. */ -+ if (pthread_create (&reader2, NULL, reader2_func, NULL)) -+ UNEXPECTED (5); -+ /* Step 6: Release the baton. */ -+ if (pthread_mutex_unlock (&baton)) -+ UNEXPECTED (6); -+ /* Step 7: The writer thread requests the lock. */ -+ if (pthread_rwlock_wrlock (&lock)) -+ UNEXPECTED (7); -+ return NULL; -+} -+ -+int -+main () -+{ -+ reader1 = pthread_self (); -+ -+ /* Step 1: The main thread initializes the lock and the baton. */ -+ if (pthread_rwlock_init (&lock, NULL)) -+ UNEXPECTED (1); -+ if (pthread_mutex_init (&baton, NULL)) -+ UNEXPECTED (1); -+ /* Step 2: The main thread acquires the lock as a reader. */ -+ if (pthread_rwlock_rdlock (&lock)) -+ UNEXPECTED (2); -+ /* Step 3: Create the writer thread. */ -+ if (pthread_create (&writer, NULL, writer_func, NULL)) -+ UNEXPECTED (3); -+ /* Job done. Go to sleep. */ -+ for (;;) -+ { -+ sleep (1); -+ } -+} -+ -+_ACEOF -+if ac_fn_c_try_run "$LINENO"; then : -+ gl_cv_pthread_rwlock_rdlock_prefer_writer=yes -+else -+ gl_cv_pthread_rwlock_rdlock_prefer_writer=no -+fi -+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ -+ conftest.$ac_objext conftest.beam conftest.$ac_ext -+fi -+ -+ LIBS="$save_LIBS" -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_pthread_rwlock_rdlock_prefer_writer" >&5 -+$as_echo "$gl_cv_pthread_rwlock_rdlock_prefer_writer" >&6; } -+ case "$gl_cv_pthread_rwlock_rdlock_prefer_writer" in -+ *yes) -+ -+$as_echo "#define HAVE_PTHREAD_RWLOCK_RDLOCK_PREFER_WRITER 1" >>confdefs.h -+ -+ ;; -+ esac -+ -+ fi - # glibc defines PTHREAD_MUTEX_RECURSIVE as enum, not as a macro. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ -@@ -22386,23 +24070,6 @@ - - - -- -- : -- -- -- -- -- -- if test $ac_cv_func__set_invalid_parameter_handler = yes; then -- HAVE_MSVC_INVALID_PARAMETER_HANDLER=1 -- --$as_echo "#define HAVE_MSVC_INVALID_PARAMETER_HANDLER 1" >>confdefs.h -- -- else -- HAVE_MSVC_INVALID_PARAMETER_HANDLER=0 -- fi -- -- - if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then - - -@@ -22416,8 +24083,6 @@ - - fi - -- -- - if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then - - -@@ -22432,9 +24097,15 @@ - fi - - -+cat >>confdefs.h <<_ACEOF -+#define GNULIB_MSVC_NOTHROW 1 -+_ACEOF -+ -+ -+ - -- : - -+ : - - - -@@ -22458,9 +24129,12 @@ - if test $ac_cv_func_raise = no; then - HAVE_RAISE=0 - else -- if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then -- REPLACE_RAISE=1 -- fi -+ -+ -+ if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then -+ REPLACE_RAISE=1 -+ fi -+ - - - -@@ -22513,9 +24187,11 @@ - - - -- if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then -- REPLACE_READ=1 -- fi -+ -+ if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then -+ REPLACE_READ=1 -+ fi -+ - - - if test $REPLACE_READ = 1; then -@@ -22606,6 +24282,22 @@ - - fi - -+ : -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - fi - - -@@ -23231,6 +24923,17 @@ - - if test $ac_cv_func_snprintf = yes; then - REPLACE_SNPRINTF=1 -+ else -+ -+ : -+ -+ -+ -+ -+ -+ if test $ac_cv_have_decl_snprintf = yes; then -+ REPLACE_SNPRINTF=1 -+ fi - fi - : - -@@ -23304,64 +25007,35 @@ - - - -- : - -+ : - - - - -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stat handles trailing slashes on directories" >&5 --$as_echo_n "checking whether stat handles trailing slashes on directories... " >&6; } --if ${gl_cv_func_stat_dir_slash+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- if test "$cross_compiling" = yes; then : -- case $host_os in -- mingw*) gl_cv_func_stat_dir_slash="guessing no";; -- *) gl_cv_func_stat_dir_slash="guessing yes";; -- esac --else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ --#include - --int --main () --{ --struct stat st; return stat (".", &st) != stat ("./", &st); -- ; -- return 0; --} --_ACEOF --if ac_fn_c_try_run "$LINENO"; then : -- gl_cv_func_stat_dir_slash=yes --else -- gl_cv_func_stat_dir_slash=no --fi --rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ -- conftest.$ac_objext conftest.beam conftest.$ac_ext --fi -- --fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_stat_dir_slash" >&5 --$as_echo "$gl_cv_func_stat_dir_slash" >&6; } -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stat handles trailing slashes on files" >&5 -+ case "$host_os" in -+ mingw*) -+ REPLACE_STAT=1 -+ ;; -+ *) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stat handles trailing slashes on files" >&5 - $as_echo_n "checking whether stat handles trailing slashes on files... " >&6; } - if ${gl_cv_func_stat_file_slash+:} false; then : - $as_echo_n "(cached) " >&6 - else - touch conftest.tmp -- # Assume that if we have lstat, we can also check symlinks. -- if test $ac_cv_func_lstat = yes; then -- ln -s conftest.tmp conftest.lnk -- fi -- if test "$cross_compiling" = yes; then : -+ # Assume that if we have lstat, we can also check symlinks. -+ if test $ac_cv_func_lstat = yes; then -+ ln -s conftest.tmp conftest.lnk -+ fi -+ if test "$cross_compiling" = yes; then : - case "$host_os" in -- # Guess yes on glibc systems. -- *-gnu*) gl_cv_func_stat_file_slash="guessing yes" ;; -- # If we don't know, assume the worst. -- *) gl_cv_func_stat_file_slash="guessing no" ;; -- esac -+ # Guess yes on glibc systems. -+ *-gnu*) gl_cv_func_stat_file_slash="guessing yes" ;; -+ # If we don't know, assume the worst. -+ *) gl_cv_func_stat_file_slash="guessing no" ;; -+ esac - - else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -23372,14 +25046,14 @@ - main () - { - int result = 0; -- struct stat st; -- if (!stat ("conftest.tmp/", &st)) -- result |= 1; -+ struct stat st; -+ if (!stat ("conftest.tmp/", &st)) -+ result |= 1; - #if HAVE_LSTAT -- if (!stat ("conftest.lnk/", &st)) -- result |= 2; -+ if (!stat ("conftest.lnk/", &st)) -+ result |= 2; - #endif -- return result; -+ return result; - - ; - return 0; -@@ -23394,21 +25068,18 @@ - conftest.$ac_objext conftest.beam conftest.$ac_ext - fi - -- rm -f conftest.tmp conftest.lnk -+ rm -f conftest.tmp conftest.lnk - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_stat_file_slash" >&5 - $as_echo "$gl_cv_func_stat_file_slash" >&6; } -- case $gl_cv_func_stat_dir_slash in -- *no) REPLACE_STAT=1 -- --$as_echo "#define REPLACE_FUNC_STAT_DIR 1" >>confdefs.h --;; -- esac -- case $gl_cv_func_stat_file_slash in -- *no) REPLACE_STAT=1 -+ case $gl_cv_func_stat_file_slash in -+ *no) -+ REPLACE_STAT=1 - - $as_echo "#define REPLACE_FUNC_STAT_FILE 1" >>confdefs.h - ;; -+ esac -+ ;; - esac - - if test $REPLACE_STAT = 1; then -@@ -23422,7 +25093,20 @@ - - gl_LIBOBJS="$gl_LIBOBJS stat.$ac_objext" - -- : -+ -+ -+ -+ -+ -+ -+ -+ -+ gl_LIBOBJS="$gl_LIBOBJS stat-w32.$ac_objext" -+ -+ -+ -+ : -+ - fi - - -@@ -23653,6 +25337,15 @@ - - - STDDEF_H= -+ ac_fn_c_check_type "$LINENO" "max_align_t" "ac_cv_type_max_align_t" "#include -+ -+" -+if test "x$ac_cv_type_max_align_t" = xyes; then : -+ -+else -+ HAVE_MAX_ALIGN_T=0; STDDEF_H=stddef.h -+fi -+ - if test $gt_cv_c_wchar_t = no; then - HAVE_WCHAR_T=0 - STDDEF_H=stddef.h -@@ -23774,6 +25467,9 @@ - - - -+ $as_echo "#define __USE_MINGW_ANSI_STDIO 1" >>confdefs.h -+ -+ - - - -@@ -23846,6 +25542,48 @@ - - - -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking which flavor of printf attribute matches inttypes macros" >&5 -+$as_echo_n "checking which flavor of printf attribute matches inttypes macros... " >&6; } -+if ${gl_cv_func_printf_attribute_flavor+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+ #define __STDC_FORMAT_MACROS 1 -+ #include -+ #include -+ /* For non-mingw systems, compilation will trivially succeed. -+ For mingw, compilation will succeed for older mingw (system -+ printf, "I64d") and fail for newer mingw (gnu printf, "lld"). */ -+ #if ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__) && \ -+ (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)) -+ extern char PRIdMAX_probe[sizeof PRIdMAX == sizeof "I64d" ? 1 : -1]; -+ #endif -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ gl_cv_func_printf_attribute_flavor=system -+else -+ gl_cv_func_printf_attribute_flavor=gnu -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_printf_attribute_flavor" >&5 -+$as_echo "$gl_cv_func_printf_attribute_flavor" >&6; } -+ if test "$gl_cv_func_printf_attribute_flavor" = gnu; then -+ -+$as_echo "#define GNULIB_PRINTF_ATTRIBUTE_FLAVOR_GNU 1" >>confdefs.h -+ -+ fi -+ - GNULIB_FSCANF=1 - - -@@ -23998,7 +25736,7 @@ - - - -- for gl_func in _Exit atoll canonicalize_file_name getloadavg getsubopt grantpt initstate initstate_r mkdtemp mkostemp mkostemps mkstemp mkstemps posix_openpt ptsname ptsname_r random random_r realpath rpmatch secure_getenv setenv setstate setstate_r srandom srandom_r strtod strtoll strtoull unlockpt unsetenv; do -+ for gl_func in _Exit atoll canonicalize_file_name getloadavg getsubopt grantpt initstate initstate_r mkdtemp mkostemp mkostemps mkstemp mkstemps posix_openpt ptsname ptsname_r qsort_r random random_r realpath rpmatch secure_getenv setenv setstate setstate_r srandom srandom_r strtod strtoll strtoull unlockpt unsetenv; do - as_gl_Symbol=`$as_echo "gl_cv_have_raw_decl_$gl_func" | $as_tr_sh` - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $gl_func is declared without a macro" >&5 - $as_echo_n "checking whether $gl_func is declared without a macro... " >&6; } -@@ -24238,11 +25976,14 @@ - #endif - char *strndup (const char *, size_t); - #endif -+ int result; - char *s; - s = strndup ("some longer string", 15); - free (s); - s = strndup ("shorter string", 13); -- return s[13] != '\0'; -+ result = s[13] != '\0'; -+ free (s); -+ return result; - ; - return 0; - } -@@ -24872,14 +26613,14 @@ - - - -+ WINDOWS_STAT_TIMESPEC=0 -+ -+ - - - -- if test $WINDOWS_64_BIT_ST_SIZE = 1; then - --$as_echo "#define _GL_WINDOWS_64_BIT_ST_SIZE 1" >>confdefs.h - -- fi - - ac_fn_c_check_type "$LINENO" "nlink_t" "ac_cv_type_nlink_t" "#include - #include -@@ -25186,7 +26927,7 @@ - - - -- for gl_func in chdir chown dup dup2 dup3 environ euidaccess faccessat fchdir fchownat fdatasync fsync ftruncate getcwd getdomainname getdtablesize getgroups gethostname getlogin getlogin_r getpagesize getusershell setusershell endusershell group_member isatty lchown link linkat lseek pipe pipe2 pread pwrite readlink readlinkat rmdir sethostname sleep symlink symlinkat ttyname_r unlink unlinkat usleep; do -+ for gl_func in chdir chown dup dup2 dup3 environ euidaccess faccessat fchdir fchownat fdatasync fsync ftruncate getcwd getdomainname getdtablesize getgroups gethostname getlogin getlogin_r getpagesize getusershell setusershell endusershell group_member isatty lchown link linkat lseek pipe pipe2 pread pwrite readlink readlinkat rmdir sethostname sleep symlink symlinkat truncate ttyname_r unlink unlinkat usleep; do - as_gl_Symbol=`$as_echo "gl_cv_have_raw_decl_$gl_func" | $as_tr_sh` - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $gl_func is declared without a macro" >&5 - $as_echo_n "checking whether $gl_func is declared without a macro... " >&6; } -@@ -25711,7 +27452,9 @@ - - - -- for gl_func in btowc wctob mbsinit mbrtowc mbrlen mbsrtowcs mbsnrtowcs wcrtomb wcsrtombs wcsnrtombs wcwidth wmemchr wmemcmp wmemcpy wmemmove wmemset wcslen wcsnlen wcscpy wcpcpy wcsncpy wcpncpy wcscat wcsncat wcscmp wcsncmp wcscasecmp wcsncasecmp wcscoll wcsxfrm wcsdup wcschr wcsrchr wcscspn wcsspn wcspbrk wcsstr wcstok wcswidth ; do -+ -+ -+ for gl_func in btowc wctob mbsinit mbrtowc mbrlen mbsrtowcs mbsnrtowcs wcrtomb wcsrtombs wcsnrtombs wcwidth wmemchr wmemcmp wmemcpy wmemmove wmemset wcslen wcsnlen wcscpy wcpcpy wcsncpy wcpncpy wcscat wcsncat wcscmp wcsncmp wcscasecmp wcsncasecmp wcscoll wcsxfrm wcsdup wcschr wcsrchr wcscspn wcsspn wcspbrk wcsstr wcstok wcswidth wcsftime ; do - as_gl_Symbol=`$as_echo "gl_cv_have_raw_decl_$gl_func" | $as_tr_sh` - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $gl_func is declared without a macro" >&5 - $as_echo_n "checking whether $gl_func is declared without a macro... " >&6; } -@@ -25764,9 +27507,11 @@ - - - -- if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then -- REPLACE_WRITE=1 -- fi -+ -+ if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then -+ REPLACE_WRITE=1 -+ fi -+ - - - -@@ -26547,6 +28292,10 @@ - as_fn_error $? "conditional \"GL_GENERATE_FLOAT_H\" was never defined. - Usually this means the macro was only invoked conditionally." "$LINENO" 5 - fi -+if test -z "${GL_GENERATE_LIMITS_H_TRUE}" && test -z "${GL_GENERATE_LIMITS_H_FALSE}"; then -+ as_fn_error $? "conditional \"GL_GENERATE_LIMITS_H\" was never defined. -+Usually this means the macro was only invoked conditionally." "$LINENO" 5 -+fi - if test -z "${GL_GENERATE_STDARG_H_TRUE}" && test -z "${GL_GENERATE_STDARG_H_FALSE}"; then - as_fn_error $? "conditional \"GL_GENERATE_STDARG_H\" was never defined. - Usually this means the macro was only invoked conditionally." "$LINENO" 5 -@@ -26559,6 +28308,10 @@ - as_fn_error $? "conditional \"GL_GENERATE_STDDEF_H\" was never defined. - Usually this means the macro was only invoked conditionally." "$LINENO" 5 - fi -+if test -z "${GL_GENERATE_LIMITS_H_TRUE}" && test -z "${GL_GENERATE_LIMITS_H_FALSE}"; then -+ as_fn_error $? "conditional \"GL_GENERATE_LIMITS_H\" was never defined. -+Usually this means the macro was only invoked conditionally." "$LINENO" 5 -+fi - if test -z "${GL_GENERATE_STDINT_H_TRUE}" && test -z "${GL_GENERATE_STDINT_H_FALSE}"; then - as_fn_error $? "conditional \"GL_GENERATE_STDINT_H\" was never defined. - Usually this means the macro was only invoked conditionally." "$LINENO" 5 -@@ -27194,6 +28947,7 @@ - enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`' - pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`' - enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`' -+shared_archive_member_spec='`$ECHO "$shared_archive_member_spec" | $SED "$delay_single_quote_subst"`' - SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`' - ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`' - PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`' -@@ -27243,10 +28997,13 @@ - GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`' - lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`' - lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' -+lt_cv_sys_global_symbol_to_import='`$ECHO "$lt_cv_sys_global_symbol_to_import" | $SED "$delay_single_quote_subst"`' - lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' - lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' -+lt_cv_nm_interface='`$ECHO "$lt_cv_nm_interface" | $SED "$delay_single_quote_subst"`' - nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' - lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' -+lt_cv_truncate_bin='`$ECHO "$lt_cv_truncate_bin" | $SED "$delay_single_quote_subst"`' - objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' - MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' - lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' -@@ -27311,7 +29068,8 @@ - finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`' - hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`' - sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`' --sys_lib_dlsearch_path_spec='`$ECHO "$sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`' -+configure_time_dlsearch_path='`$ECHO "$configure_time_dlsearch_path" | $SED "$delay_single_quote_subst"`' -+configure_time_lt_sys_library_path='`$ECHO "$configure_time_lt_sys_library_path" | $SED "$delay_single_quote_subst"`' - hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`' - enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`' - enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`' -@@ -27362,9 +29120,12 @@ - compiler \ - lt_cv_sys_global_symbol_pipe \ - lt_cv_sys_global_symbol_to_cdecl \ -+lt_cv_sys_global_symbol_to_import \ - lt_cv_sys_global_symbol_to_c_name_address \ - lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ -+lt_cv_nm_interface \ - nm_file_list_spec \ -+lt_cv_truncate_bin \ - lt_prog_compiler_no_builtin_flag \ - lt_prog_compiler_pic \ - lt_prog_compiler_wl \ -@@ -27399,7 +29160,7 @@ - striplib; do - case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in - *[\\\\\\\`\\"\\\$]*) -- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" -+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes - ;; - *) - eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" -@@ -27426,10 +29187,11 @@ - postuninstall_cmds \ - finish_cmds \ - sys_lib_search_path_spec \ --sys_lib_dlsearch_path_spec; do -+configure_time_dlsearch_path \ -+configure_time_lt_sys_library_path; do - case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in - *[\\\\\\\`\\"\\\$]*) -- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" -+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes - ;; - *) - eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" -@@ -27438,19 +29200,16 @@ - done - - ac_aux_dir='$ac_aux_dir' --xsi_shell='$xsi_shell' --lt_shell_append='$lt_shell_append' - --# See if we are running on zsh, and set the options which allow our -+# See if we are running on zsh, and set the options that allow our - # commands through without removal of \ escapes INIT. --if test -n "\${ZSH_VERSION+set}" ; then -+if test -n "\${ZSH_VERSION+set}"; then - setopt NO_GLOB_SUBST - fi - - - PACKAGE='$PACKAGE' - VERSION='$VERSION' -- TIMESTAMP='$TIMESTAMP' - RM='$RM' - ofile='$ofile' - -@@ -28164,55 +29923,53 @@ - ;; - "libtool":C) - -- # See if we are running on zsh, and set the options which allow our -+ # See if we are running on zsh, and set the options that allow our - # commands through without removal of \ escapes. -- if test -n "${ZSH_VERSION+set}" ; then -+ if test -n "${ZSH_VERSION+set}"; then - setopt NO_GLOB_SUBST - fi - -- cfgfile="${ofile}T" -+ cfgfile=${ofile}T - trap "$RM \"$cfgfile\"; exit 1" 1 2 15 - $RM "$cfgfile" - - cat <<_LT_EOF >> "$cfgfile" - #! $SHELL -- --# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. --# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION -+# Generated automatically by $as_me ($PACKAGE) $VERSION - # Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: - # NOTE: Changes made to this file will be lost: look at ltmain.sh. -+ -+# Provide generalized library-building support services. -+# Written by Gordon Matzigkeit, 1996 -+ -+# Copyright (C) 2014 Free Software Foundation, Inc. -+# This is free software; see the source for copying conditions. There is NO -+# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -+ -+# GNU Libtool 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 of of the License, or -+# (at your option) any later version. - # --# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, --# 2006, 2007, 2008, 2009, 2010, 2011 Free Software --# Foundation, Inc. --# Written by Gordon Matzigkeit, 1996 --# --# This file is part of GNU Libtool. --# --# GNU Libtool 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 of --# the License, or (at your option) any later version. --# --# As a special exception to the GNU General Public License, --# if you distribute this file as part of a program or library that --# is built using GNU Libtool, you may include this file under the --# same distribution terms that you use for the rest of that program. -+# As a special exception to the GNU General Public License, if you -+# distribute this file as part of a program or library that is built -+# using GNU Libtool, you may include this file under the same -+# distribution terms that you use for the rest of that program. - # --# GNU Libtool is distributed in the hope that it will be useful, --# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# GNU Libtool 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 GNU Libtool; see the file COPYING. If not, a copy --# can be downloaded from http://www.gnu.org/licenses/gpl.html, or --# obtained by writing to the Free Software Foundation, Inc., --# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+# along with this program. If not, see . - - - # The names of the tagged configurations supported by this script. --available_tags="" -+available_tags='' -+ -+# Configured defaults for sys_lib_dlsearch_path munging. -+: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"} - - # ### BEGIN LIBTOOL CONFIG - -@@ -28232,6 +29989,9 @@ - # Whether or not to optimize for fast installation. - fast_install=$enable_fast_install - -+# Shared archive member basename,for filename based shared library versioning on AIX. -+shared_archive_member_spec=$shared_archive_member_spec -+ - # Shell to use when invoking shell scripts. - SHELL=$lt_SHELL - -@@ -28349,18 +30109,27 @@ - # Transform the output of nm in a proper C declaration. - global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl - -+# Transform the output of nm into a list of symbols to manually relocate. -+global_symbol_to_import=$lt_lt_cv_sys_global_symbol_to_import -+ - # Transform the output of nm in a C name address pair. - global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address - - # Transform the output of nm in a C name address pair when lib prefix is needed. - global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix - -+# The name lister interface. -+nm_interface=$lt_lt_cv_nm_interface -+ - # Specify filename containing input files for \$NM. - nm_file_list_spec=$lt_nm_file_list_spec - --# The root where to search for dependent libraries,and in which our libraries should be installed. -+# The root where to search for dependent libraries,and where our libraries should be installed. - lt_sysroot=$lt_sysroot - -+# Command to truncate a binary pipe. -+lt_truncate_bin=$lt_lt_cv_truncate_bin -+ - # The name of the directory that contains temporary libtool files. - objdir=$objdir - -@@ -28451,8 +30220,11 @@ - # Compile-time system search path for libraries. - sys_lib_search_path_spec=$lt_sys_lib_search_path_spec - --# Run-time system search path for libraries. --sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec -+# Detected run-time system search path for libraries. -+sys_lib_dlsearch_path_spec=$lt_configure_time_dlsearch_path -+ -+# Explicit LT_SYS_LIBRARY_PATH set during ./configure time. -+configure_time_lt_sys_library_path=$lt_configure_time_lt_sys_library_path - - # Whether dlopen is supported. - dlopen_support=$enable_dlopen -@@ -28545,13 +30317,13 @@ - # Whether we need a single "-rpath" flag with a separated argument. - hardcode_libdir_separator=$lt_hardcode_libdir_separator - --# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes -+# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes - # DIR into the resulting binary. - hardcode_direct=$hardcode_direct - --# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes -+# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes - # DIR into the resulting binary and the resulting library dependency is --# "absolute",i.e impossible to change by setting \${shlibpath_var} if the -+# "absolute",i.e impossible to change by setting \$shlibpath_var if the - # library is relocated. - hardcode_direct_absolute=$hardcode_direct_absolute - -@@ -28603,13 +30375,72 @@ - - _LT_EOF - -+ cat <<'_LT_EOF' >> "$cfgfile" -+ -+# ### BEGIN FUNCTIONS SHARED WITH CONFIGURE -+ -+# func_munge_path_list VARIABLE PATH -+# ----------------------------------- -+# VARIABLE is name of variable containing _space_ separated list of -+# directories to be munged by the contents of PATH, which is string -+# having a format: -+# "DIR[:DIR]:" -+# string "DIR[ DIR]" will be prepended to VARIABLE -+# ":DIR[:DIR]" -+# string "DIR[ DIR]" will be appended to VARIABLE -+# "DIRP[:DIRP]::[DIRA:]DIRA" -+# string "DIRP[ DIRP]" will be prepended to VARIABLE and string -+# "DIRA[ DIRA]" will be appended to VARIABLE -+# "DIR[:DIR]" -+# VARIABLE will be replaced by "DIR[ DIR]" -+func_munge_path_list () -+{ -+ case x$2 in -+ x) -+ ;; -+ *:) -+ eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\" -+ ;; -+ x:*) -+ eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\" -+ ;; -+ *::*) -+ eval $1=\"\$$1\ `$ECHO $2 | $SED -e 's/.*:://' -e 's/:/ /g'`\" -+ eval $1=\"`$ECHO $2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \$$1\" -+ ;; -+ *) -+ eval $1=\"`$ECHO $2 | $SED 's/:/ /g'`\" -+ ;; -+ esac -+} -+ -+ -+# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. -+func_cc_basename () -+{ -+ for cc_temp in $*""; do -+ case $cc_temp in -+ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; -+ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; -+ \-*) ;; -+ *) break;; -+ esac -+ done -+ func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` -+} -+ -+ -+# ### END FUNCTIONS SHARED WITH CONFIGURE -+ -+_LT_EOF -+ - case $host_os in - aix3*) - cat <<\_LT_EOF >> "$cfgfile" - # AIX sometimes has problems with the GCC collect2 program. For some - # reason, if we set the COLLECT_NAMES environment variable, the problems - # vanish in a puff of smoke. --if test "X${COLLECT_NAMES+set}" != Xset; then -+if test set != "${COLLECT_NAMES+set}"; then - COLLECT_NAMES= - export COLLECT_NAMES - fi -@@ -28618,7 +30449,7 @@ - esac - - --ltmain="$ac_aux_dir/ltmain.sh" -+ltmain=$ac_aux_dir/ltmain.sh - - - # We use sed instead of cat because bash on DJGPP gets confused if -@@ -28628,165 +30459,6 @@ - sed '$q' "$ltmain" >> "$cfgfile" \ - || (rm -f "$cfgfile"; exit 1) - -- if test x"$xsi_shell" = xyes; then -- sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ --func_dirname ()\ --{\ --\ case ${1} in\ --\ */*) func_dirname_result="${1%/*}${2}" ;;\ --\ * ) func_dirname_result="${3}" ;;\ --\ esac\ --} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ -- && mv -f "$cfgfile.tmp" "$cfgfile" \ -- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") --test 0 -eq $? || _lt_function_replace_fail=: -- -- -- sed -e '/^func_basename ()$/,/^} # func_basename /c\ --func_basename ()\ --{\ --\ func_basename_result="${1##*/}"\ --} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ -- && mv -f "$cfgfile.tmp" "$cfgfile" \ -- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") --test 0 -eq $? || _lt_function_replace_fail=: -- -- -- sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ --func_dirname_and_basename ()\ --{\ --\ case ${1} in\ --\ */*) func_dirname_result="${1%/*}${2}" ;;\ --\ * ) func_dirname_result="${3}" ;;\ --\ esac\ --\ func_basename_result="${1##*/}"\ --} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ -- && mv -f "$cfgfile.tmp" "$cfgfile" \ -- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") --test 0 -eq $? || _lt_function_replace_fail=: -- -- -- sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ --func_stripname ()\ --{\ --\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ --\ # positional parameters, so assign one to ordinary parameter first.\ --\ func_stripname_result=${3}\ --\ func_stripname_result=${func_stripname_result#"${1}"}\ --\ func_stripname_result=${func_stripname_result%"${2}"}\ --} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ -- && mv -f "$cfgfile.tmp" "$cfgfile" \ -- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") --test 0 -eq $? || _lt_function_replace_fail=: -- -- -- sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ --func_split_long_opt ()\ --{\ --\ func_split_long_opt_name=${1%%=*}\ --\ func_split_long_opt_arg=${1#*=}\ --} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ -- && mv -f "$cfgfile.tmp" "$cfgfile" \ -- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") --test 0 -eq $? || _lt_function_replace_fail=: -- -- -- sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ --func_split_short_opt ()\ --{\ --\ func_split_short_opt_arg=${1#??}\ --\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ --} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ -- && mv -f "$cfgfile.tmp" "$cfgfile" \ -- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") --test 0 -eq $? || _lt_function_replace_fail=: -- -- -- sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ --func_lo2o ()\ --{\ --\ case ${1} in\ --\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ --\ *) func_lo2o_result=${1} ;;\ --\ esac\ --} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ -- && mv -f "$cfgfile.tmp" "$cfgfile" \ -- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") --test 0 -eq $? || _lt_function_replace_fail=: -- -- -- sed -e '/^func_xform ()$/,/^} # func_xform /c\ --func_xform ()\ --{\ -- func_xform_result=${1%.*}.lo\ --} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ -- && mv -f "$cfgfile.tmp" "$cfgfile" \ -- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") --test 0 -eq $? || _lt_function_replace_fail=: -- -- -- sed -e '/^func_arith ()$/,/^} # func_arith /c\ --func_arith ()\ --{\ -- func_arith_result=$(( $* ))\ --} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ -- && mv -f "$cfgfile.tmp" "$cfgfile" \ -- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") --test 0 -eq $? || _lt_function_replace_fail=: -- -- -- sed -e '/^func_len ()$/,/^} # func_len /c\ --func_len ()\ --{\ -- func_len_result=${#1}\ --} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ -- && mv -f "$cfgfile.tmp" "$cfgfile" \ -- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") --test 0 -eq $? || _lt_function_replace_fail=: -- --fi -- --if test x"$lt_shell_append" = xyes; then -- sed -e '/^func_append ()$/,/^} # func_append /c\ --func_append ()\ --{\ -- eval "${1}+=\\${2}"\ --} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ -- && mv -f "$cfgfile.tmp" "$cfgfile" \ -- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") --test 0 -eq $? || _lt_function_replace_fail=: -- -- -- sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ --func_append_quoted ()\ --{\ --\ func_quote_for_eval "${2}"\ --\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ --} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ -- && mv -f "$cfgfile.tmp" "$cfgfile" \ -- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") --test 0 -eq $? || _lt_function_replace_fail=: -- -- -- # Save a `func_append' function call where possible by direct use of '+=' -- sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ -- && mv -f "$cfgfile.tmp" "$cfgfile" \ -- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -- test 0 -eq $? || _lt_function_replace_fail=: --else -- # Save a `func_append' function call even when '+=' is not available -- sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ -- && mv -f "$cfgfile.tmp" "$cfgfile" \ -- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -- test 0 -eq $? || _lt_function_replace_fail=: --fi -- --if test x"$_lt_function_replace_fail" = x":"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 --$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} --fi -- -- - mv -f "$cfgfile" "$ofile" || - (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") - chmod +x "$ofile" -diff -durN libpipeline-1.4.1.orig/gnulib/lib/_Noreturn.h libpipeline-1.4.1/gnulib/lib/_Noreturn.h ---- libpipeline-1.4.1.orig/gnulib/lib/_Noreturn.h 1970-01-01 08:00:00.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/lib/_Noreturn.h 2017-05-17 10:35:03.375000000 +0800 -@@ -0,0 +1,10 @@ -+#if !defined _Noreturn && __STDC_VERSION__ < 201112 -+# if (3 <= __GNUC__ || (__GNUC__ == 2 && 8 <= __GNUC_MINOR__) \ -+ || 0x5110 <= __SUNPRO_C) -+# define _Noreturn __attribute__ ((__noreturn__)) -+# elif 1200 <= _MSC_VER -+# define _Noreturn __declspec (noreturn) -+# else -+# define _Noreturn -+# endif -+#endif -diff -durN libpipeline-1.4.1.orig/gnulib/lib/alloca.in.h libpipeline-1.4.1/gnulib/lib/alloca.in.h ---- libpipeline-1.4.1.orig/gnulib/lib/alloca.in.h 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/lib/alloca.in.h 2017-05-17 10:35:08.171875000 +0800 -@@ -1,6 +1,6 @@ - /* Memory allocation on the stack. - -- Copyright (C) 1995, 1999, 2001-2004, 2006-2014 Free Software Foundation, -+ Copyright (C) 1995, 1999, 2001-2004, 2006-2017 Free Software Foundation, - Inc. - - This program is free software; you can redistribute it and/or modify it -@@ -51,6 +51,8 @@ - void *_alloca (unsigned short); - # pragma intrinsic (_alloca) - # define alloca _alloca -+# elif defined __MVS__ -+# include - # else - # include - # ifdef __cplusplus -diff -durN libpipeline-1.4.1.orig/gnulib/lib/arg-nonnull.h libpipeline-1.4.1/gnulib/lib/arg-nonnull.h ---- libpipeline-1.4.1.orig/gnulib/lib/arg-nonnull.h 1970-01-01 08:00:00.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/lib/arg-nonnull.h 2017-05-17 10:35:03.578125000 +0800 -@@ -0,0 +1,26 @@ -+/* A C macro for declaring that specific arguments must not be NULL. -+ Copyright (C) 2009-2017 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 3 of the License, 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, see . */ -+ -+/* _GL_ARG_NONNULL((n,...,m)) tells the compiler and static analyzer tools -+ that the values passed as arguments n, ..., m must be non-NULL pointers. -+ n = 1 stands for the first argument, n = 2 for the second argument etc. */ -+#ifndef _GL_ARG_NONNULL -+# if (__GNUC__ == 3 && __GNUC_MINOR__ >= 3) || __GNUC__ > 3 -+# define _GL_ARG_NONNULL(params) __attribute__ ((__nonnull__ params)) -+# else -+# define _GL_ARG_NONNULL(params) -+# endif -+#endif -diff -durN libpipeline-1.4.1.orig/gnulib/lib/asnprintf.c libpipeline-1.4.1/gnulib/lib/asnprintf.c ---- libpipeline-1.4.1.orig/gnulib/lib/asnprintf.c 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/lib/asnprintf.c 2017-05-17 10:35:08.578125000 +0800 -@@ -1,5 +1,5 @@ - /* Formatted output to strings. -- Copyright (C) 1999, 2002, 2006, 2009-2014 Free Software Foundation, Inc. -+ Copyright (C) 1999, 2002, 2006, 2009-2017 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 -diff -durN libpipeline-1.4.1.orig/gnulib/lib/asprintf.c libpipeline-1.4.1/gnulib/lib/asprintf.c ---- libpipeline-1.4.1.orig/gnulib/lib/asprintf.c 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/lib/asprintf.c 2017-05-17 10:35:09.125000000 +0800 -@@ -1,5 +1,5 @@ - /* Formatted output to strings. -- Copyright (C) 1999, 2002, 2006-2007, 2009-2014 Free Software Foundation, -+ Copyright (C) 1999, 2002, 2006-2007, 2009-2017 Free Software Foundation, - Inc. - - This program is free software; you can redistribute it and/or modify -diff -durN libpipeline-1.4.1.orig/gnulib/lib/basename.c libpipeline-1.4.1/gnulib/lib/basename.c ---- libpipeline-1.4.1.orig/gnulib/lib/basename.c 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/lib/basename.c 2017-05-17 10:35:09.671875000 +0800 -@@ -1,6 +1,6 @@ - /* basename.c -- return the last element in a file name - -- Copyright (C) 1990, 1998-2001, 2003-2006, 2009-2014 Free Software -+ Copyright (C) 1990, 1998-2001, 2003-2006, 2009-2017 Free Software - Foundation, Inc. - - This program is free software: you can redistribute it and/or modify -diff -durN libpipeline-1.4.1.orig/gnulib/lib/basename-lgpl.c libpipeline-1.4.1/gnulib/lib/basename-lgpl.c ---- libpipeline-1.4.1.orig/gnulib/lib/basename-lgpl.c 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/lib/basename-lgpl.c 2017-05-17 10:35:09.406250000 +0800 -@@ -1,6 +1,6 @@ - /* basename.c -- return the last element in a file name - -- Copyright (C) 1990, 1998-2001, 2003-2006, 2009-2014 Free Software -+ Copyright (C) 1990, 1998-2001, 2003-2006, 2009-2017 Free Software - Foundation, Inc. - - This program is free software: you can redistribute it and/or modify -diff -durN libpipeline-1.4.1.orig/gnulib/lib/c++defs.h libpipeline-1.4.1/gnulib/lib/c++defs.h ---- libpipeline-1.4.1.orig/gnulib/lib/c++defs.h 1970-01-01 08:00:00.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/lib/c++defs.h 2017-05-17 10:35:03.859375000 +0800 -@@ -0,0 +1,316 @@ -+/* C++ compatible function declaration macros. -+ Copyright (C) 2010-2017 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 3 of the License, 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, see . */ -+ -+#ifndef _GL_CXXDEFS_H -+#define _GL_CXXDEFS_H -+ -+/* Begin/end the GNULIB_NAMESPACE namespace. */ -+#if defined __cplusplus && defined GNULIB_NAMESPACE -+# define _GL_BEGIN_NAMESPACE namespace GNULIB_NAMESPACE { -+# define _GL_END_NAMESPACE } -+#else -+# define _GL_BEGIN_NAMESPACE -+# define _GL_END_NAMESPACE -+#endif -+ -+/* The three most frequent use cases of these macros are: -+ -+ * For providing a substitute for a function that is missing on some -+ platforms, but is declared and works fine on the platforms on which -+ it exists: -+ -+ #if @GNULIB_FOO@ -+ # if !@HAVE_FOO@ -+ _GL_FUNCDECL_SYS (foo, ...); -+ # endif -+ _GL_CXXALIAS_SYS (foo, ...); -+ _GL_CXXALIASWARN (foo); -+ #elif defined GNULIB_POSIXCHECK -+ ... -+ #endif -+ -+ * For providing a replacement for a function that exists on all platforms, -+ but is broken/insufficient and needs to be replaced on some platforms: -+ -+ #if @GNULIB_FOO@ -+ # if @REPLACE_FOO@ -+ # if !(defined __cplusplus && defined GNULIB_NAMESPACE) -+ # undef foo -+ # define foo rpl_foo -+ # endif -+ _GL_FUNCDECL_RPL (foo, ...); -+ _GL_CXXALIAS_RPL (foo, ...); -+ # else -+ _GL_CXXALIAS_SYS (foo, ...); -+ # endif -+ _GL_CXXALIASWARN (foo); -+ #elif defined GNULIB_POSIXCHECK -+ ... -+ #endif -+ -+ * For providing a replacement for a function that exists on some platforms -+ but is broken/insufficient and needs to be replaced on some of them and -+ is additionally either missing or undeclared on some other platforms: -+ -+ #if @GNULIB_FOO@ -+ # if @REPLACE_FOO@ -+ # if !(defined __cplusplus && defined GNULIB_NAMESPACE) -+ # undef foo -+ # define foo rpl_foo -+ # endif -+ _GL_FUNCDECL_RPL (foo, ...); -+ _GL_CXXALIAS_RPL (foo, ...); -+ # else -+ # if !@HAVE_FOO@ or if !@HAVE_DECL_FOO@ -+ _GL_FUNCDECL_SYS (foo, ...); -+ # endif -+ _GL_CXXALIAS_SYS (foo, ...); -+ # endif -+ _GL_CXXALIASWARN (foo); -+ #elif defined GNULIB_POSIXCHECK -+ ... -+ #endif -+*/ -+ -+/* _GL_EXTERN_C declaration; -+ performs the declaration with C linkage. */ -+#if defined __cplusplus -+# define _GL_EXTERN_C extern "C" -+#else -+# define _GL_EXTERN_C extern -+#endif -+ -+/* _GL_FUNCDECL_RPL (func, rettype, parameters_and_attributes); -+ declares a replacement function, named rpl_func, with the given prototype, -+ consisting of return type, parameters, and attributes. -+ Example: -+ _GL_FUNCDECL_RPL (open, int, (const char *filename, int flags, ...) -+ _GL_ARG_NONNULL ((1))); -+ */ -+#define _GL_FUNCDECL_RPL(func,rettype,parameters_and_attributes) \ -+ _GL_FUNCDECL_RPL_1 (rpl_##func, rettype, parameters_and_attributes) -+#define _GL_FUNCDECL_RPL_1(rpl_func,rettype,parameters_and_attributes) \ -+ _GL_EXTERN_C rettype rpl_func parameters_and_attributes -+ -+/* _GL_FUNCDECL_SYS (func, rettype, parameters_and_attributes); -+ declares the system function, named func, with the given prototype, -+ consisting of return type, parameters, and attributes. -+ Example: -+ _GL_FUNCDECL_SYS (open, int, (const char *filename, int flags, ...) -+ _GL_ARG_NONNULL ((1))); -+ */ -+#define _GL_FUNCDECL_SYS(func,rettype,parameters_and_attributes) \ -+ _GL_EXTERN_C rettype func parameters_and_attributes -+ -+/* _GL_CXXALIAS_RPL (func, rettype, parameters); -+ declares a C++ alias called GNULIB_NAMESPACE::func -+ that redirects to rpl_func, if GNULIB_NAMESPACE is defined. -+ Example: -+ _GL_CXXALIAS_RPL (open, int, (const char *filename, int flags, ...)); -+ -+ Wrapping rpl_func in an object with an inline conversion operator -+ avoids a reference to rpl_func unless GNULIB_NAMESPACE::func is -+ actually used in the program. */ -+#define _GL_CXXALIAS_RPL(func,rettype,parameters) \ -+ _GL_CXXALIAS_RPL_1 (func, rpl_##func, rettype, parameters) -+#if defined __cplusplus && defined GNULIB_NAMESPACE -+# define _GL_CXXALIAS_RPL_1(func,rpl_func,rettype,parameters) \ -+ namespace GNULIB_NAMESPACE \ -+ { \ -+ static const struct _gl_ ## func ## _wrapper \ -+ { \ -+ typedef rettype (*type) parameters; \ -+ \ -+ inline operator type () const \ -+ { \ -+ return ::rpl_func; \ -+ } \ -+ } func = {}; \ -+ } \ -+ _GL_EXTERN_C int _gl_cxxalias_dummy -+#else -+# define _GL_CXXALIAS_RPL_1(func,rpl_func,rettype,parameters) \ -+ _GL_EXTERN_C int _gl_cxxalias_dummy -+#endif -+ -+/* _GL_CXXALIAS_RPL_CAST_1 (func, rpl_func, rettype, parameters); -+ is like _GL_CXXALIAS_RPL_1 (func, rpl_func, rettype, parameters); -+ except that the C function rpl_func may have a slightly different -+ declaration. A cast is used to silence the "invalid conversion" error -+ that would otherwise occur. */ -+#if defined __cplusplus && defined GNULIB_NAMESPACE -+# define _GL_CXXALIAS_RPL_CAST_1(func,rpl_func,rettype,parameters) \ -+ namespace GNULIB_NAMESPACE \ -+ { \ -+ static const struct _gl_ ## func ## _wrapper \ -+ { \ -+ typedef rettype (*type) parameters; \ -+ \ -+ inline operator type () const \ -+ { \ -+ return reinterpret_cast(::rpl_func); \ -+ } \ -+ } func = {}; \ -+ } \ -+ _GL_EXTERN_C int _gl_cxxalias_dummy -+#else -+# define _GL_CXXALIAS_RPL_CAST_1(func,rpl_func,rettype,parameters) \ -+ _GL_EXTERN_C int _gl_cxxalias_dummy -+#endif -+ -+/* _GL_CXXALIAS_SYS (func, rettype, parameters); -+ declares a C++ alias called GNULIB_NAMESPACE::func -+ that redirects to the system provided function func, if GNULIB_NAMESPACE -+ is defined. -+ Example: -+ _GL_CXXALIAS_SYS (open, int, (const char *filename, int flags, ...)); -+ -+ Wrapping func in an object with an inline conversion operator -+ avoids a reference to func unless GNULIB_NAMESPACE::func is -+ actually used in the program. */ -+#if defined __cplusplus && defined GNULIB_NAMESPACE -+# define _GL_CXXALIAS_SYS(func,rettype,parameters) \ -+ namespace GNULIB_NAMESPACE \ -+ { \ -+ static const struct _gl_ ## func ## _wrapper \ -+ { \ -+ typedef rettype (*type) parameters; \ -+ \ -+ inline operator type () const \ -+ { \ -+ return ::func; \ -+ } \ -+ } func = {}; \ -+ } \ -+ _GL_EXTERN_C int _gl_cxxalias_dummy -+#else -+# define _GL_CXXALIAS_SYS(func,rettype,parameters) \ -+ _GL_EXTERN_C int _gl_cxxalias_dummy -+#endif -+ -+/* _GL_CXXALIAS_SYS_CAST (func, rettype, parameters); -+ is like _GL_CXXALIAS_SYS (func, rettype, parameters); -+ except that the C function func may have a slightly different declaration. -+ A cast is used to silence the "invalid conversion" error that would -+ otherwise occur. */ -+#if defined __cplusplus && defined GNULIB_NAMESPACE -+# define _GL_CXXALIAS_SYS_CAST(func,rettype,parameters) \ -+ namespace GNULIB_NAMESPACE \ -+ { \ -+ static const struct _gl_ ## func ## _wrapper \ -+ { \ -+ typedef rettype (*type) parameters; \ -+ \ -+ inline operator type () const \ -+ { \ -+ return reinterpret_cast(::func); \ -+ } \ -+ } func = {}; \ -+ } \ -+ _GL_EXTERN_C int _gl_cxxalias_dummy -+#else -+# define _GL_CXXALIAS_SYS_CAST(func,rettype,parameters) \ -+ _GL_EXTERN_C int _gl_cxxalias_dummy -+#endif -+ -+/* _GL_CXXALIAS_SYS_CAST2 (func, rettype, parameters, rettype2, parameters2); -+ is like _GL_CXXALIAS_SYS (func, rettype, parameters); -+ except that the C function is picked among a set of overloaded functions, -+ namely the one with rettype2 and parameters2. Two consecutive casts -+ are used to silence the "cannot find a match" and "invalid conversion" -+ errors that would otherwise occur. */ -+#if defined __cplusplus && defined GNULIB_NAMESPACE -+ /* The outer cast must be a reinterpret_cast. -+ The inner cast: When the function is defined as a set of overloaded -+ functions, it works as a static_cast<>, choosing the designated variant. -+ When the function is defined as a single variant, it works as a -+ reinterpret_cast<>. The parenthesized cast syntax works both ways. */ -+# define _GL_CXXALIAS_SYS_CAST2(func,rettype,parameters,rettype2,parameters2) \ -+ namespace GNULIB_NAMESPACE \ -+ { \ -+ static const struct _gl_ ## func ## _wrapper \ -+ { \ -+ typedef rettype (*type) parameters; \ -+ \ -+ inline operator type () const \ -+ { \ -+ return reinterpret_cast((rettype2 (*) parameters2)(::func)); \ -+ } \ -+ } func = {}; \ -+ } \ -+ _GL_EXTERN_C int _gl_cxxalias_dummy -+#else -+# define _GL_CXXALIAS_SYS_CAST2(func,rettype,parameters,rettype2,parameters2) \ -+ _GL_EXTERN_C int _gl_cxxalias_dummy -+#endif -+ -+/* _GL_CXXALIASWARN (func); -+ causes a warning to be emitted when ::func is used but not when -+ GNULIB_NAMESPACE::func is used. func must be defined without overloaded -+ variants. */ -+#if defined __cplusplus && defined GNULIB_NAMESPACE -+# define _GL_CXXALIASWARN(func) \ -+ _GL_CXXALIASWARN_1 (func, GNULIB_NAMESPACE) -+# define _GL_CXXALIASWARN_1(func,namespace) \ -+ _GL_CXXALIASWARN_2 (func, namespace) -+/* To work around GCC bug , -+ we enable the warning only when not optimizing. */ -+# if !__OPTIMIZE__ -+# define _GL_CXXALIASWARN_2(func,namespace) \ -+ _GL_WARN_ON_USE (func, \ -+ "The symbol ::" #func " refers to the system function. " \ -+ "Use " #namespace "::" #func " instead.") -+# elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING -+# define _GL_CXXALIASWARN_2(func,namespace) \ -+ extern __typeof__ (func) func -+# else -+# define _GL_CXXALIASWARN_2(func,namespace) \ -+ _GL_EXTERN_C int _gl_cxxalias_dummy -+# endif -+#else -+# define _GL_CXXALIASWARN(func) \ -+ _GL_EXTERN_C int _gl_cxxalias_dummy -+#endif -+ -+/* _GL_CXXALIASWARN1 (func, rettype, parameters_and_attributes); -+ causes a warning to be emitted when the given overloaded variant of ::func -+ is used but not when GNULIB_NAMESPACE::func is used. */ -+#if defined __cplusplus && defined GNULIB_NAMESPACE -+# define _GL_CXXALIASWARN1(func,rettype,parameters_and_attributes) \ -+ _GL_CXXALIASWARN1_1 (func, rettype, parameters_and_attributes, \ -+ GNULIB_NAMESPACE) -+# define _GL_CXXALIASWARN1_1(func,rettype,parameters_and_attributes,namespace) \ -+ _GL_CXXALIASWARN1_2 (func, rettype, parameters_and_attributes, namespace) -+/* To work around GCC bug , -+ we enable the warning only when not optimizing. */ -+# if !__OPTIMIZE__ -+# define _GL_CXXALIASWARN1_2(func,rettype,parameters_and_attributes,namespace) \ -+ _GL_WARN_ON_USE_CXX (func, rettype, parameters_and_attributes, \ -+ "The symbol ::" #func " refers to the system function. " \ -+ "Use " #namespace "::" #func " instead.") -+# elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING -+# define _GL_CXXALIASWARN1_2(func,rettype,parameters_and_attributes,namespace) \ -+ extern __typeof__ (func) func -+# else -+# define _GL_CXXALIASWARN1_2(func,rettype,parameters_and_attributes,namespace) \ -+ _GL_EXTERN_C int _gl_cxxalias_dummy -+# endif -+#else -+# define _GL_CXXALIASWARN1(func,rettype,parameters_and_attributes) \ -+ _GL_EXTERN_C int _gl_cxxalias_dummy -+#endif -+ -+#endif /* _GL_CXXDEFS_H */ -diff -durN libpipeline-1.4.1.orig/gnulib/lib/dirname.c libpipeline-1.4.1/gnulib/lib/dirname.c ---- libpipeline-1.4.1.orig/gnulib/lib/dirname.c 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/lib/dirname.c 2017-05-17 10:35:10.281250000 +0800 -@@ -1,6 +1,6 @@ - /* dirname.c -- return all but the last element in a file name - -- Copyright (C) 1990, 1998, 2000-2001, 2003-2006, 2009-2014 Free Software -+ Copyright (C) 1990, 1998, 2000-2001, 2003-2006, 2009-2017 Free Software - Foundation, Inc. - - This program is free software: you can redistribute it and/or modify -diff -durN libpipeline-1.4.1.orig/gnulib/lib/dirname.h libpipeline-1.4.1/gnulib/lib/dirname.h ---- libpipeline-1.4.1.orig/gnulib/lib/dirname.h 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/lib/dirname.h 2017-05-17 10:35:10.656250000 +0800 -@@ -1,6 +1,6 @@ - /* Take file names apart into directory and base names. - -- Copyright (C) 1998, 2001, 2003-2006, 2009-2014 Free Software Foundation, -+ Copyright (C) 1998, 2001, 2003-2006, 2009-2017 Free Software Foundation, - Inc. - - This program is free software: you can redistribute it and/or modify -@@ -31,6 +31,10 @@ - # define DOUBLE_SLASH_IS_DISTINCT_ROOT 0 - # endif - -+#ifdef __cplusplus -+extern "C" { -+#endif -+ - # if GNULIB_DIRNAME - char *base_name (char const *file); - char *dir_name (char const *file); -@@ -43,4 +47,8 @@ - - bool strip_trailing_slashes (char *file); - -+#ifdef __cplusplus -+} /* extern "C" */ -+#endif -+ - #endif /* not DIRNAME_H_ */ -diff -durN libpipeline-1.4.1.orig/gnulib/lib/dirname-lgpl.c libpipeline-1.4.1/gnulib/lib/dirname-lgpl.c ---- libpipeline-1.4.1.orig/gnulib/lib/dirname-lgpl.c 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/lib/dirname-lgpl.c 2017-05-17 10:35:09.968750000 +0800 -@@ -1,6 +1,6 @@ - /* dirname.c -- return all but the last element in a file name - -- Copyright (C) 1990, 1998, 2000-2001, 2003-2006, 2009-2014 Free Software -+ Copyright (C) 1990, 1998, 2000-2001, 2003-2006, 2009-2017 Free Software - Foundation, Inc. - - This program is free software: you can redistribute it and/or modify -diff -durN libpipeline-1.4.1.orig/gnulib/lib/dosname.h libpipeline-1.4.1/gnulib/lib/dosname.h ---- libpipeline-1.4.1.orig/gnulib/lib/dosname.h 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/lib/dosname.h 2017-05-17 10:35:10.984375000 +0800 -@@ -1,6 +1,6 @@ - /* File names on MS-DOS/Windows systems. - -- Copyright (C) 2000-2001, 2004-2006, 2009-2014 Free Software Foundation, Inc. -+ Copyright (C) 2000-2001, 2004-2006, 2009-2017 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 -diff -durN libpipeline-1.4.1.orig/gnulib/lib/errno.in.h libpipeline-1.4.1/gnulib/lib/errno.in.h ---- libpipeline-1.4.1.orig/gnulib/lib/errno.in.h 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/lib/errno.in.h 2017-05-17 10:35:11.281250000 +0800 -@@ -1,6 +1,6 @@ - /* A POSIX-like . - -- Copyright (C) 2008-2014 Free Software Foundation, Inc. -+ Copyright (C) 2008-2017 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 -diff -durN libpipeline-1.4.1.orig/gnulib/lib/error.c libpipeline-1.4.1/gnulib/lib/error.c ---- libpipeline-1.4.1.orig/gnulib/lib/error.c 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/lib/error.c 2017-05-17 10:35:11.562500000 +0800 -@@ -1,5 +1,5 @@ - /* Error handler for noninteractive utilities -- Copyright (C) 1990-1998, 2000-2007, 2009-2014 Free Software Foundation, Inc. -+ Copyright (C) 1990-1998, 2000-2007, 2009-2017 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - This program is free software: you can redistribute it and/or modify -@@ -39,6 +39,11 @@ - # include - # include - # define mbsrtowcs __mbsrtowcs -+# define USE_UNLOCKED_IO 0 -+# define _GL_ATTRIBUTE_FORMAT_PRINTF(a, b) -+# define _GL_ARG_NONNULL(a) -+#else -+# include "getprogname.h" - #endif - - #if USE_UNLOCKED_IO -@@ -72,14 +77,14 @@ - extern void __error_at_line (int status, int errnum, const char *file_name, - unsigned int line_number, const char *message, - ...) -- __attribute__ ((__format__ (__printf__, 5, 6)));; -+ __attribute__ ((__format__ (__printf__, 5, 6))); - # define error __error - # define error_at_line __error_at_line - - # include --# define fflush(s) INTUSE(_IO_fflush) (s) -+# define fflush(s) _IO_fflush (s) - # undef putc --# define putc(c, fp) INTUSE(_IO_putc) (c, fp) -+# define putc(c, fp) _IO_putc (c, fp) - - # include - -@@ -93,30 +98,32 @@ - # define WIN32_LEAN_AND_MEAN - # include - /* Get _get_osfhandle. */ --# include "msvc-nothrow.h" -+# if GNULIB_MSVC_NOTHROW -+# include "msvc-nothrow.h" -+# else -+# include -+# endif - # endif - - /* The gnulib override of fcntl is not needed in this file. */ - # undef fcntl - --# if !HAVE_DECL_STRERROR_R -+# if !(GNULIB_STRERROR_R_POSIX || HAVE_DECL_STRERROR_R) - # ifndef HAVE_DECL_STRERROR_R - "this configure-time declaration test was not run" - # endif - # if STRERROR_R_CHAR_P --char *strerror_r (); -+char *strerror_r (int errnum, char *buf, size_t buflen); - # else --int strerror_r (); -+int strerror_r (int errnum, char *buf, size_t buflen); - # endif - # endif - --/* The calling program should define program_name and set it to the -- name of the executing program. */ --extern char *program_name; -+#define program_name getprogname () - --# if HAVE_STRERROR_R || defined strerror_r -+# if GNULIB_STRERROR_R_POSIX || HAVE_STRERROR_R || defined strerror_r - # define __strerror_r strerror_r --# endif /* HAVE_STRERROR_R || defined strerror_r */ -+# endif /* GNULIB_STRERROR_R_POSIX || HAVE_STRERROR_R || defined strerror_r */ - #endif /* not _LIBC */ - - #if !_LIBC -@@ -169,9 +176,9 @@ - { - char const *s; - --#if defined HAVE_STRERROR_R || _LIBC -+#if _LIBC || GNULIB_STRERROR_R_POSIX || defined HAVE_STRERROR_R - char errbuf[1024]; --# if STRERROR_R_CHAR_P || _LIBC -+# if _LIBC || (!GNULIB_STRERROR_R_POSIX && STRERROR_R_CHAR_P) - s = __strerror_r (errnum, errbuf, sizeof errbuf); - # else - if (__strerror_r (errnum, errbuf, sizeof errbuf) == 0) -@@ -201,7 +208,6 @@ - #if _LIBC - if (_IO_fwide (stderr, 0) > 0) - { --# define ALLOCA_LIMIT 2000 - size_t len = strlen (message) + 1; - wchar_t *wmessage = NULL; - mbstate_t st; -@@ -237,7 +243,7 @@ - if (res != len) - break; - -- if (__builtin_expect (len >= SIZE_MAX / 2, 0)) -+ if (__builtin_expect (len >= SIZE_MAX / sizeof (wchar_t) / 2, 0)) - { - /* This really should not happen if everything is fine. */ - res = (size_t) -1; -@@ -342,7 +348,10 @@ - - if (old_line_number == line_number - && (file_name == old_file_name -- || strcmp (old_file_name, file_name) == 0)) -+ || (old_file_name != NULL -+ && file_name != NULL -+ && strcmp (old_file_name, file_name) == 0))) -+ - /* Simply return and print nothing. */ - return; - -@@ -374,10 +383,10 @@ - } - - #if _LIBC -- __fxprintf (NULL, file_name != NULL ? "%s:%d: " : " ", -+ __fxprintf (NULL, file_name != NULL ? "%s:%u: " : " ", - file_name, line_number); - #else -- fprintf (stderr, file_name != NULL ? "%s:%d: " : " ", -+ fprintf (stderr, file_name != NULL ? "%s:%u: " : " ", - file_name, line_number); - #endif - -diff -durN libpipeline-1.4.1.orig/gnulib/lib/error.h libpipeline-1.4.1/gnulib/lib/error.h ---- libpipeline-1.4.1.orig/gnulib/lib/error.h 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/lib/error.h 2017-05-17 10:35:11.859375000 +0800 -@@ -1,5 +1,5 @@ - /* Declaration for error-reporting function -- Copyright (C) 1995-1997, 2003, 2006, 2008-2014 Free Software Foundation, -+ Copyright (C) 1995-1997, 2003, 2006, 2008-2017 Free Software Foundation, - Inc. - This file is part of the GNU C Library. - -@@ -31,6 +31,16 @@ - # define _GL_ATTRIBUTE_FORMAT(spec) /* empty */ - #endif - -+/* On mingw, the flavor of printf depends on whether the extensions module -+ * is in use; the check for determines the witness macro. */ -+#ifndef _GL_ATTRIBUTE_SPEC_PRINTF -+# if GNULIB_PRINTF_ATTRIBUTE_FLAVOR_GNU -+# define _GL_ATTRIBUTE_SPEC_PRINTF __gnu_printf__ -+# else -+# define _GL_ATTRIBUTE_SPEC_PRINTF __printf__ -+# endif -+#endif -+ - #ifdef __cplusplus - extern "C" { - #endif -@@ -40,11 +50,11 @@ - If STATUS is nonzero, terminate the program with 'exit (STATUS)'. */ - - extern void error (int __status, int __errnum, const char *__format, ...) -- _GL_ATTRIBUTE_FORMAT ((__printf__, 3, 4)); -+ _GL_ATTRIBUTE_FORMAT ((_GL_ATTRIBUTE_SPEC_PRINTF, 3, 4)); - - extern void error_at_line (int __status, int __errnum, const char *__fname, - unsigned int __lineno, const char *__format, ...) -- _GL_ATTRIBUTE_FORMAT ((__printf__, 5, 6)); -+ _GL_ATTRIBUTE_FORMAT ((_GL_ATTRIBUTE_SPEC_PRINTF, 5, 6)); - - /* If NULL, error will flush stdout, then print on stderr the program - name, a colon and a space. Otherwise, error will call this -diff -durN libpipeline-1.4.1.orig/gnulib/lib/exitfail.c libpipeline-1.4.1/gnulib/lib/exitfail.c ---- libpipeline-1.4.1.orig/gnulib/lib/exitfail.c 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/lib/exitfail.c 2017-05-17 10:35:12.171875000 +0800 -@@ -1,6 +1,6 @@ - /* Failure exit status - -- Copyright (C) 2002-2003, 2005-2007, 2009-2014 Free Software Foundation, Inc. -+ Copyright (C) 2002-2003, 2005-2007, 2009-2017 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 -diff -durN libpipeline-1.4.1.orig/gnulib/lib/exitfail.h libpipeline-1.4.1/gnulib/lib/exitfail.h ---- libpipeline-1.4.1.orig/gnulib/lib/exitfail.h 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/lib/exitfail.h 2017-05-17 10:35:12.453125000 +0800 -@@ -1,6 +1,6 @@ - /* Failure exit status - -- Copyright (C) 2002, 2009-2014 Free Software Foundation, Inc. -+ Copyright (C) 2002, 2009-2017 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 -diff -durN libpipeline-1.4.1.orig/gnulib/lib/fcntl.in.h libpipeline-1.4.1/gnulib/lib/fcntl.in.h ---- libpipeline-1.4.1.orig/gnulib/lib/fcntl.in.h 2014-11-08 21:53:37.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/lib/fcntl.in.h 2017-05-17 10:35:12.750000000 +0800 -@@ -1,6 +1,6 @@ - /* Like , but with non-working flags defined to 0. - -- Copyright (C) 2006-2014 Free Software Foundation, Inc. -+ Copyright (C) 2006-2017 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 -@@ -34,7 +34,7 @@ - extern "C" { ... } block, which leads to errors in C++ mode with the - overridden from gnulib. These errors are known to be gone - with g++ version >= 4.3. */ --#if !(defined __GLIBC__ || defined __UCLIBC__) || (defined __cplusplus && defined GNULIB_NAMESPACE && !(__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3))) -+#if !(defined __GLIBC__ || defined __UCLIBC__) || (defined __cplusplus && defined GNULIB_NAMESPACE && (defined __ICC || !(__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)))) - # include - #endif - #@INCLUDE_NEXT@ @NEXT_FCNTL_H@ -@@ -53,7 +53,7 @@ - extern "C" { ... } block, which leads to errors in C++ mode with the - overridden from gnulib. These errors are known to be gone - with g++ version >= 4.3. */ --#if !(defined __GLIBC__ || defined __UCLIBC__) || (defined __cplusplus && defined GNULIB_NAMESPACE && !(__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3))) -+#if !(defined __GLIBC__ || defined __UCLIBC__) || (defined __cplusplus && defined GNULIB_NAMESPACE && (defined __ICC || !(__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)))) - # include - #endif - /* The include_next requires a split double-inclusion guard. */ -@@ -186,6 +186,22 @@ - - /* Fix up the O_* macros. */ - -+/* AIX 7.1 with XL C 12.1 defines O_CLOEXEC, O_NOFOLLOW, and O_TTY_INIT -+ to values outside 'int' range, so omit these misdefinitions. -+ But avoid namespace pollution on non-AIX systems. */ -+#ifdef _AIX -+# include -+# if defined O_CLOEXEC && ! (INT_MIN <= O_CLOEXEC && O_CLOEXEC <= INT_MAX) -+# undef O_CLOEXEC -+# endif -+# if defined O_NOFOLLOW && ! (INT_MIN <= O_NOFOLLOW && O_NOFOLLOW <= INT_MAX) -+# undef O_NOFOLLOW -+# endif -+# if defined O_TTY_INIT && ! (INT_MIN <= O_TTY_INIT && O_TTY_INIT <= INT_MAX) -+# undef O_TTY_INIT -+# endif -+#endif -+ - #if !defined O_DIRECT && defined O_DIRECTIO - /* Tru64 spells it 'O_DIRECTIO'. */ - # define O_DIRECT O_DIRECTIO -diff -durN libpipeline-1.4.1.orig/gnulib/lib/filename.h libpipeline-1.4.1/gnulib/lib/filename.h ---- libpipeline-1.4.1.orig/gnulib/lib/filename.h 1970-01-01 08:00:00.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/lib/filename.h 2017-05-17 10:35:04.078125000 +0800 -@@ -0,0 +1,54 @@ -+/* Basic filename support macros. -+ Copyright (C) 2001-2004, 2007-2017 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 3 of the License, 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, see . */ -+ -+#ifndef _FILENAME_H -+#define _FILENAME_H -+ -+#ifdef __cplusplus -+extern "C" { -+#endif -+ -+ -+/* Pathname support. -+ ISSLASH(C) tests whether C is a directory separator character. -+ IS_ABSOLUTE_PATH(P) tests whether P is an absolute path. If it is not, -+ it may be concatenated to a directory pathname. -+ IS_PATH_WITH_DIR(P) tests whether P contains a directory specification. -+ */ -+#if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__ || defined __EMX__ || defined __DJGPP__ -+ /* Native Windows, Cygwin, OS/2, DOS */ -+# define ISSLASH(C) ((C) == '/' || (C) == '\\') -+# define HAS_DEVICE(P) \ -+ ((((P)[0] >= 'A' && (P)[0] <= 'Z') || ((P)[0] >= 'a' && (P)[0] <= 'z')) \ -+ && (P)[1] == ':') -+# define IS_ABSOLUTE_PATH(P) (ISSLASH ((P)[0]) || HAS_DEVICE (P)) -+# define IS_PATH_WITH_DIR(P) \ -+ (strchr (P, '/') != NULL || strchr (P, '\\') != NULL || HAS_DEVICE (P)) -+# define FILE_SYSTEM_PREFIX_LEN(P) (HAS_DEVICE (P) ? 2 : 0) -+#else -+ /* Unix */ -+# define ISSLASH(C) ((C) == '/') -+# define IS_ABSOLUTE_PATH(P) ISSLASH ((P)[0]) -+# define IS_PATH_WITH_DIR(P) (strchr (P, '/') != NULL) -+# define FILE_SYSTEM_PREFIX_LEN(P) 0 -+#endif -+ -+ -+#ifdef __cplusplus -+} -+#endif -+ -+#endif /* _FILENAME_H */ -diff -durN libpipeline-1.4.1.orig/gnulib/lib/float.c libpipeline-1.4.1/gnulib/lib/float.c ---- libpipeline-1.4.1.orig/gnulib/lib/float.c 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/lib/float.c 2017-05-17 10:35:13.296875000 +0800 -@@ -1,5 +1,5 @@ - /* Auxiliary definitions for . -- Copyright (C) 2011-2014 Free Software Foundation, Inc. -+ Copyright (C) 2011-2017 Free Software Foundation, Inc. - Written by Bruno Haible , 2011. - - This program is free software: you can redistribute it and/or modify -diff -durN libpipeline-1.4.1.orig/gnulib/lib/float.in.h libpipeline-1.4.1/gnulib/lib/float.in.h ---- libpipeline-1.4.1.orig/gnulib/lib/float.in.h 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/lib/float.in.h 2017-05-17 10:35:13.578125000 +0800 -@@ -1,6 +1,6 @@ - /* A correct . - -- Copyright (C) 2007-2014 Free Software Foundation, Inc. -+ Copyright (C) 2007-2017 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 -diff -durN libpipeline-1.4.1.orig/gnulib/lib/float+.h libpipeline-1.4.1/gnulib/lib/float+.h ---- libpipeline-1.4.1.orig/gnulib/lib/float+.h 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/lib/float+.h 2017-05-17 10:35:13.031250000 +0800 -@@ -1,5 +1,5 @@ - /* Supplemental information about the floating-point formats. -- Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc. -+ Copyright (C) 2007, 2009-2017 Free Software Foundation, Inc. - Written by Bruno Haible , 2007. - - This program is free software; you can redistribute it and/or modify -diff -durN libpipeline-1.4.1.orig/gnulib/lib/full-write.c libpipeline-1.4.1/gnulib/lib/full-write.c ---- libpipeline-1.4.1.orig/gnulib/lib/full-write.c 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/lib/full-write.c 2017-05-17 10:35:13.875000000 +0800 -@@ -1,6 +1,6 @@ - /* An interface to read and write that retries (if necessary) until complete. - -- Copyright (C) 1993-1994, 1997-2006, 2009-2014 Free Software Foundation, Inc. -+ Copyright (C) 1993-1994, 1997-2006, 2009-2017 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 -diff -durN libpipeline-1.4.1.orig/gnulib/lib/full-write.h libpipeline-1.4.1/gnulib/lib/full-write.h ---- libpipeline-1.4.1.orig/gnulib/lib/full-write.h 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/lib/full-write.h 2017-05-17 10:35:14.250000000 +0800 -@@ -1,6 +1,6 @@ - /* An interface to write() that writes all it is asked to write. - -- Copyright (C) 2002-2003, 2009-2014 Free Software Foundation, Inc. -+ Copyright (C) 2002-2003, 2009-2017 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 -diff -durN libpipeline-1.4.1.orig/gnulib/lib/getprogname.c libpipeline-1.4.1/gnulib/lib/getprogname.c ---- libpipeline-1.4.1.orig/gnulib/lib/getprogname.c 1970-01-01 08:00:00.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/lib/getprogname.c 2017-05-17 10:35:04.328125000 +0800 -@@ -0,0 +1,185 @@ -+/* Program name management. -+ Copyright (C) 2016-2017 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 3 of the License, 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, see . */ -+ -+#include -+ -+/* Specification. */ -+#include "getprogname.h" -+ -+#include /* get program_invocation_name declaration */ -+#include /* get __argv declaration */ -+ -+#ifdef _AIX -+# include -+# include -+# include -+#endif -+ -+#ifdef __MVS__ -+# ifndef _OPEN_SYS -+# define _OPEN_SYS -+# endif -+# include -+# include -+#endif -+ -+#ifdef __hpux -+# include -+# include -+# include -+# include -+#endif -+ -+#ifdef __sgi -+# include -+# include -+# include -+# include -+# include -+#endif -+ -+#include "dirname.h" -+ -+#ifndef HAVE_GETPROGNAME /* not Mac OS X, FreeBSD, NetBSD, OpenBSD >= 5.4, Cygwin */ -+char const * -+getprogname (void) -+{ -+# if HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME /* glibc, BeOS */ -+ /* https://www.gnu.org/software/libc/manual/html_node/Error-Messages.html */ -+ return program_invocation_short_name; -+# elif HAVE_DECL_PROGRAM_INVOCATION_NAME /* glibc, BeOS */ -+ /* https://www.gnu.org/software/libc/manual/html_node/Error-Messages.html */ -+ return last_component (program_invocation_name); -+# elif HAVE_GETEXECNAME /* Solaris */ -+ /* http://docs.oracle.com/cd/E19253-01/816-5168/6mbb3hrb1/index.html */ -+ const char *p = getexecname (); -+ if (!p) -+ p = "?"; -+ return last_component (p); -+# elif HAVE_DECL___ARGV /* mingw, MSVC */ -+ /* https://msdn.microsoft.com/en-us/library/dn727674.aspx */ -+ const char *p = __argv && __argv[0] ? __argv[0] : "?"; -+ return last_component (p); -+# elif HAVE_VAR___PROGNAME /* OpenBSD, QNX */ -+ /* http://man.openbsd.org/style.9 */ -+ /* http://www.qnx.de/developers/docs/6.5.0/index.jsp?topic=%2Fcom.qnx.doc.neutrino_lib_ref%2Fp%2F__progname.html */ -+ /* Be careful to declare this only when we absolutely need it -+ (OpenBSD 5.1), rather than when it's available. Otherwise, -+ its mere declaration makes program_invocation_short_name -+ malfunction (have zero length) with Fedora 25's glibc. */ -+ extern char *__progname; -+ const char *p = __progname; -+ return p && p[0] ? p : "?"; -+# elif _AIX /* AIX */ -+ /* Idea by Bastien ROUCARIÈS, -+ http://lists.gnu.org/archive/html/bug-gnulib/2010-12/msg00095.html -+ Reference: http:// -+ ibm.biz/knowctr#ssw_aix_53/com.ibm.aix.basetechref/doc/basetrf1/getprocs.htm -+ */ -+ static char *p; -+ static int first = 1; -+ if (first) -+ { -+ first = 0; -+ pid_t pid = getpid (); -+ struct procentry64 procs; -+ p = (0 < getprocs64 (&procs, sizeof procs, NULL, 0, &pid, 1) -+ ? strdup (procs.pi_comm) -+ : NULL); -+ if (!p) -+ p = "?"; -+ } -+ return p; -+# elif defined __hpux -+ static char *p; -+ static int first = 1; -+ if (first) -+ { -+ first = 0; -+ pid_t pid = getpid (); -+ struct pst_status status; -+ p = (0 < pstat_getproc (&status, sizeof status, 0, pid) -+ ? strdup (status.pst_ucomm) -+ : NULL); -+ if (!p) -+ p = "?"; -+ } -+ return p; -+# elif __MVS__ /* z/OS */ -+ /* https://www.ibm.com/support/knowledgecenter/SSLTBW_2.1.0/com.ibm.zos.v2r1.bpxbd00/rtwgetp.htm */ -+ static char *p = "?"; -+ static int first = 1; -+ if (first) -+ { -+ pid_t pid = getpid (); -+ int token; -+ W_PSPROC buf; -+ first = 0; -+ memset (&buf, 0, sizeof(buf)); -+ buf.ps_cmdptr = (char *) malloc (buf.ps_cmdlen = PS_CMDBLEN_LONG); -+ buf.ps_conttyptr = (char *) malloc (buf.ps_conttylen = PS_CONTTYBLEN); -+ buf.ps_pathptr = (char *) malloc (buf.ps_pathlen = PS_PATHBLEN); -+ if (buf.ps_cmdptr && buf.ps_conttyptr && buf.ps_pathptr) -+ { -+ for (token = 0; token >= 0; -+ token = w_getpsent (token, &buf, sizeof(buf))) -+ { -+ if (token > 0 && buf.ps_pid == pid) -+ { -+ char *s = strdup (last_component (buf.ps_pathptr)); -+ if (s) -+ p = s; -+ break; -+ } -+ } -+ } -+ free (buf.ps_cmdptr); -+ free (buf.ps_conttyptr); -+ free (buf.ps_pathptr); -+ } -+ return p; -+# elif defined __sgi /* IRIX */ -+ char filename[50]; -+ int fd; -+ -+ sprintf (filename, "/proc/pinfo/%d", (int) getpid ()); -+ fd = open (filename, O_RDONLY); -+ if (0 <= fd) -+ { -+ prpsinfo_t buf; -+ int ioctl_ok = 0 <= ioctl (fd, PIOCPSINFO, &buf); -+ close (fd); -+ if (ioctl_ok) -+ { -+ char *name = buf.pr_fname; -+ char *namesize = sizeof buf.pr_fname; -+ char *namenul = memchr (name, '\0', namesize); -+ size_t namelen = namenul ? namenul - name : namesize; -+ char *namecopy = malloc (namelen + 1); -+ if (namecopy) -+ { -+ namecopy[namelen] = 0; -+ return memcpy (namecopy, name, namelen); -+ } -+ } -+ } -+ return NULL; -+# else -+# error "getprogname module not ported to this OS" -+# endif -+} -+ -+#endif -diff -durN libpipeline-1.4.1.orig/gnulib/lib/getprogname.h libpipeline-1.4.1/gnulib/lib/getprogname.h ---- libpipeline-1.4.1.orig/gnulib/lib/getprogname.h 1970-01-01 08:00:00.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/lib/getprogname.h 2017-05-17 10:35:04.500000000 +0800 -@@ -0,0 +1,40 @@ -+/* Program name management. -+ Copyright (C) 2016-2017 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 3 of the License, 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, see . */ -+ -+#ifndef _GL_GETPROGNAME_H -+#define _GL_GETPROGNAME_H -+ -+#include -+ -+#ifdef __cplusplus -+extern "C" { -+#endif -+ -+/* Return the base name of the executing program. -+ On native Windows this will usually end in ".exe" or ".EXE". */ -+#ifndef HAVE_GETPROGNAME -+extern char const *getprogname (void) -+# ifdef HAVE_DECL_PROGRAM_INVOCATION_NAME -+ _GL_ATTRIBUTE_PURE -+# endif -+ ; -+#endif -+ -+#ifdef __cplusplus -+} -+#endif -+ -+#endif -diff -durN libpipeline-1.4.1.orig/gnulib/lib/gettext.h libpipeline-1.4.1/gnulib/lib/gettext.h ---- libpipeline-1.4.1.orig/gnulib/lib/gettext.h 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/lib/gettext.h 2017-05-17 10:35:14.578125000 +0800 -@@ -1,5 +1,5 @@ - /* Convenience header for conditional use of GNU . -- Copyright (C) 1995-1998, 2000-2002, 2004-2006, 2009-2014 Free Software -+ Copyright (C) 1995-1998, 2000-2002, 2004-2006, 2009-2017 Free Software - Foundation, Inc. - - This program is free software; you can redistribute it and/or modify -@@ -18,8 +18,9 @@ - #ifndef _LIBGETTEXT_H - #define _LIBGETTEXT_H 1 - --/* NLS can be disabled through the configure --disable-nls option. */ --#if ENABLE_NLS -+/* NLS can be disabled through the configure --disable-nls option -+ or through "#define ENABLE NLS 0" before including this file. */ -+#if defined ENABLE_NLS && ENABLE_NLS - - /* Get declarations of GNU message catalog functions. */ - # include -@@ -225,15 +226,17 @@ - if (msg_ctxt_id != NULL) - #endif - { -+ int found_translation; - memcpy (msg_ctxt_id, msgctxt, msgctxt_len - 1); - msg_ctxt_id[msgctxt_len - 1] = '\004'; - memcpy (msg_ctxt_id + msgctxt_len, msgid, msgid_len); - translation = dcgettext (domain, msg_ctxt_id, category); -+ found_translation = (translation != msg_ctxt_id); - #if !_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS - if (msg_ctxt_id != buf) - free (msg_ctxt_id); - #endif -- if (translation != msg_ctxt_id) -+ if (found_translation) - return translation; - } - return msgid; -@@ -271,15 +274,17 @@ - if (msg_ctxt_id != NULL) - #endif - { -+ int found_translation; - memcpy (msg_ctxt_id, msgctxt, msgctxt_len - 1); - msg_ctxt_id[msgctxt_len - 1] = '\004'; - memcpy (msg_ctxt_id + msgctxt_len, msgid, msgid_len); - translation = dcngettext (domain, msg_ctxt_id, msgid_plural, n, category); -+ found_translation = !(translation == msg_ctxt_id || translation == msgid_plural); - #if !_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS - if (msg_ctxt_id != buf) - free (msg_ctxt_id); - #endif -- if (!(translation == msg_ctxt_id || translation == msgid_plural)) -+ if (found_translation) - return translation; - } - return (n == 1 ? msgid : msgid_plural); -diff -durN libpipeline-1.4.1.orig/gnulib/lib/gettimeofday.c libpipeline-1.4.1/gnulib/lib/gettimeofday.c ---- libpipeline-1.4.1.orig/gnulib/lib/gettimeofday.c 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/lib/gettimeofday.c 2017-05-17 10:35:14.843750000 +0800 -@@ -1,6 +1,6 @@ - /* Provide gettimeofday for systems that don't have it or for which it's broken. - -- Copyright (C) 2001-2003, 2005-2007, 2009-2014 Free Software Foundation, Inc. -+ Copyright (C) 2001-2003, 2005-2007, 2009-2017 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 -@@ -24,93 +24,95 @@ - - #include - --#if HAVE_SYS_TIMEB_H --# include -+#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ -+# define WINDOWS_NATIVE -+# include - #endif - --#if GETTIMEOFDAY_CLOBBERS_LOCALTIME || TZSET_CLOBBERS_LOCALTIME -- --/* Work around the bug in some systems whereby gettimeofday clobbers -- the static buffer that localtime uses for its return value. The -- gettimeofday function from Mac OS X 10.0.4 (i.e., Darwin 1.3.7) has -- this problem. The tzset replacement is necessary for at least -- Solaris 2.5, 2.5.1, and 2.6. */ -- --static struct tm tm_zero_buffer; --static struct tm *localtime_buffer_addr = &tm_zero_buffer; -- --# undef localtime --extern struct tm *localtime (time_t const *); -- --# undef gmtime --extern struct tm *gmtime (time_t const *); -- --/* This is a wrapper for localtime. It is used only on systems for which -- gettimeofday clobbers the static buffer used for localtime's result. -- -- On the first call, record the address of the static buffer that -- localtime uses for its result. */ -- --struct tm * --rpl_localtime (time_t const *timep) --{ -- struct tm *tm = localtime (timep); -+#include "localtime-buffer.h" - -- if (localtime_buffer_addr == &tm_zero_buffer) -- localtime_buffer_addr = tm; -+#ifdef WINDOWS_NATIVE - -- return tm; --} -+/* GetSystemTimePreciseAsFileTime was introduced only in Windows 8. */ -+typedef void (WINAPI * GetSystemTimePreciseAsFileTimeFuncType) (FILETIME *lpTime); -+static GetSystemTimePreciseAsFileTimeFuncType GetSystemTimePreciseAsFileTimeFunc = NULL; -+static BOOL initialized = FALSE; - --/* Same as above, since gmtime and localtime use the same buffer. */ --struct tm * --rpl_gmtime (time_t const *timep) -+static void -+initialize (void) - { -- struct tm *tm = gmtime (timep); -- -- if (localtime_buffer_addr == &tm_zero_buffer) -- localtime_buffer_addr = tm; -- -- return tm; -+ HMODULE kernel32 = LoadLibrary ("kernel32.dll"); -+ if (kernel32 != NULL) -+ { -+ GetSystemTimePreciseAsFileTimeFunc = -+ (GetSystemTimePreciseAsFileTimeFuncType) GetProcAddress (kernel32, "GetSystemTimePreciseAsFileTime"); -+ } -+ initialized = TRUE; - } - --#endif /* GETTIMEOFDAY_CLOBBERS_LOCALTIME || TZSET_CLOBBERS_LOCALTIME */ -- --#if TZSET_CLOBBERS_LOCALTIME -- --# undef tzset --extern void tzset (void); -- --/* This is a wrapper for tzset, for systems on which tzset may clobber -- the static buffer used for localtime's result. */ --void --rpl_tzset (void) --{ -- /* Save and restore the contents of the buffer used for localtime's -- result around the call to tzset. */ -- struct tm save = *localtime_buffer_addr; -- tzset (); -- *localtime_buffer_addr = save; --} - #endif - - /* This is a wrapper for gettimeofday. It is used only on systems - that lack this function, or whose implementation of this function -- causes problems. */ -+ causes problems. -+ Work around the bug in some systems whereby gettimeofday clobbers -+ the static buffer that localtime uses for its return value. The -+ gettimeofday function from Mac OS X 10.0.4 (i.e., Darwin 1.3.7) has -+ this problem. */ - - int - gettimeofday (struct timeval *restrict tv, void *restrict tz) - { - #undef gettimeofday --#if HAVE_GETTIMEOFDAY --# if GETTIMEOFDAY_CLOBBERS_LOCALTIME -+#ifdef WINDOWS_NATIVE -+ -+ /* On native Windows, there are two ways to get the current time: -+ GetSystemTimeAsFileTime -+ -+ or -+ GetSystemTimePreciseAsFileTime -+ . -+ GetSystemTimeAsFileTime produces values that jump by increments of -+ 15.627 milliseconds (!) on average. -+ Whereas GetSystemTimePreciseAsFileTime values usually jump by 1 or 2 -+ microseconds. -+ More discussion on this topic: -+ . */ -+ FILETIME current_time; -+ -+ if (!initialized) -+ initialize (); -+ if (GetSystemTimePreciseAsFileTimeFunc != NULL) -+ GetSystemTimePreciseAsFileTimeFunc (¤t_time); -+ else -+ GetSystemTimeAsFileTime (¤t_time); -+ -+ /* Convert from FILETIME to 'struct timeval'. */ -+ /* FILETIME: */ -+ ULONGLONG since_1601 = -+ ((ULONGLONG) current_time.dwHighDateTime << 32) -+ | (ULONGLONG) current_time.dwLowDateTime; -+ /* Between 1601-01-01 and 1970-01-01 there were 280 normal years and 89 leap -+ years, in total 134774 days. */ -+ ULONGLONG since_1970 = -+ since_1601 - (ULONGLONG) 134774 * (ULONGLONG) 86400 * (ULONGLONG) 10000000; -+ ULONGLONG microseconds_since_1970 = since_1970 / (ULONGLONG) 10; -+ tv->tv_sec = microseconds_since_1970 / (ULONGLONG) 1000000; -+ tv->tv_usec = microseconds_since_1970 % (ULONGLONG) 1000000; -+ -+ return 0; -+ -+#else -+ -+# if HAVE_GETTIMEOFDAY -+# if GETTIMEOFDAY_CLOBBERS_LOCALTIME - /* Save and restore the contents of the buffer used for localtime's - result around the call to gettimeofday. */ - struct tm save = *localtime_buffer_addr; --# endif -+# endif - --# if defined timeval /* 'struct timeval' overridden by gnulib? */ --# undef timeval -+# if defined timeval /* 'struct timeval' overridden by gnulib? */ -+# undef timeval - struct timeval otv; - int result = gettimeofday (&otv, (struct timezone *) tz); - if (result == 0) -@@ -118,25 +120,16 @@ - tv->tv_sec = otv.tv_sec; - tv->tv_usec = otv.tv_usec; - } --# else -+# else - int result = gettimeofday (tv, (struct timezone *) tz); --# endif -+# endif - --# if GETTIMEOFDAY_CLOBBERS_LOCALTIME -+# if GETTIMEOFDAY_CLOBBERS_LOCALTIME - *localtime_buffer_addr = save; --# endif -+# endif - - return result; - --#else -- --# if HAVE__FTIME -- -- struct _timeb timebuf; -- _ftime (&timebuf); -- tv->tv_sec = timebuf.time; -- tv->tv_usec = timebuf.millitm * 1000; -- - # else - - # if !defined OK_TO_USE_1S_CLOCK -@@ -146,9 +139,8 @@ - tv->tv_sec = time (NULL); - tv->tv_usec = 0; - --# endif -- - return 0; - -+# endif - #endif - } -diff -durN libpipeline-1.4.1.orig/gnulib/lib/glthread/lock.c libpipeline-1.4.1/gnulib/lib/glthread/lock.c ---- libpipeline-1.4.1.orig/gnulib/lib/glthread/lock.c 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/lib/glthread/lock.c 2017-05-17 10:35:15.171875000 +0800 -@@ -1,5 +1,5 @@ - /* Locking in multithreaded situations. -- Copyright (C) 2005-2014 Free Software Foundation, Inc. -+ Copyright (C) 2005-2017 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 -@@ -30,9 +30,38 @@ - - /* ------------------------- gl_rwlock_t datatype ------------------------- */ - --# if HAVE_PTHREAD_RWLOCK -+# if HAVE_PTHREAD_RWLOCK && (HAVE_PTHREAD_RWLOCK_RDLOCK_PREFER_WRITER || (defined PTHREAD_RWLOCK_WRITER_NONRECURSIVE_INITIALIZER_NP && (__GNU_LIBRARY__ > 1))) - --# if !defined PTHREAD_RWLOCK_INITIALIZER -+# ifdef PTHREAD_RWLOCK_INITIALIZER -+ -+# if !HAVE_PTHREAD_RWLOCK_RDLOCK_PREFER_WRITER -+ /* glibc with bug https://sourceware.org/bugzilla/show_bug.cgi?id=13701 */ -+ -+int -+glthread_rwlock_init_for_glibc (pthread_rwlock_t *lock) -+{ -+ pthread_rwlockattr_t attributes; -+ int err; -+ -+ err = pthread_rwlockattr_init (&attributes); -+ if (err != 0) -+ return err; -+ /* Note: PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP is the only value that -+ causes the writer to be preferred. PTHREAD_RWLOCK_PREFER_WRITER_NP does not -+ do this; see -+ http://man7.org/linux/man-pages/man3/pthread_rwlockattr_setkind_np.3.html */ -+ err = pthread_rwlockattr_setkind_np (&attributes, -+ PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP); -+ if (err == 0) -+ err = pthread_rwlock_init(lock, &attributes); -+ /* pthread_rwlockattr_destroy always returns 0. It cannot influence the -+ return value. */ -+ pthread_rwlockattr_destroy (&attributes); -+ return err; -+} -+ -+# endif -+# else - - int - glthread_rwlock_init_multithreaded (gl_rwlock_t *lock) -@@ -152,11 +181,9 @@ - if (err != 0) - return err; - /* Test whether only readers are currently running, and whether the runcount -- field will not overflow. */ -- /* POSIX says: "It is implementation-defined whether the calling thread -- acquires the lock when a writer does not hold the lock and there are -- writers blocked on the lock." Let's say, no: give the writers a higher -- priority. */ -+ field will not overflow, and whether no writer is waiting. The latter -+ condition is because POSIX recommends that "write locks shall take -+ precedence over read locks", to avoid "writer starvation". */ - while (!(lock->runcount + 1 > 0 && lock->waiting_writers_count == 0)) - { - /* This thread has to wait for a while. Enqueue it among the -@@ -481,6 +508,141 @@ - - /* ------------------------- gl_rwlock_t datatype ------------------------- */ - -+# if !HAVE_PTH_RWLOCK_ACQUIRE_PREFER_WRITER -+ -+int -+glthread_rwlock_init_multithreaded (gl_rwlock_t *lock) -+{ -+ if (!pth_mutex_init (&lock->lock)) -+ return errno; -+ if (!pth_cond_init (&lock->waiting_readers)) -+ return errno; -+ if (!pth_cond_init (&lock->waiting_writers)) -+ return errno; -+ lock->waiting_writers_count = 0; -+ lock->runcount = 0; -+ lock->initialized = 1; -+ return 0; -+} -+ -+int -+glthread_rwlock_rdlock_multithreaded (gl_rwlock_t *lock) -+{ -+ if (!lock->initialized) -+ glthread_rwlock_init_multithreaded (lock); -+ if (!pth_mutex_acquire (&lock->lock, 0, NULL)) -+ return errno; -+ /* Test whether only readers are currently running, and whether the runcount -+ field will not overflow, and whether no writer is waiting. The latter -+ condition is because POSIX recommends that "write locks shall take -+ precedence over read locks", to avoid "writer starvation". */ -+ while (!(lock->runcount + 1 > 0 && lock->waiting_writers_count == 0)) -+ { -+ /* This thread has to wait for a while. Enqueue it among the -+ waiting_readers. */ -+ if (!pth_cond_await (&lock->waiting_readers, &lock->lock, NULL)) -+ { -+ int err = errno; -+ pth_mutex_release (&lock->lock); -+ return err; -+ } -+ } -+ lock->runcount++; -+ return (!pth_mutex_release (&lock->lock) ? errno : 0); -+} -+ -+int -+glthread_rwlock_wrlock_multithreaded (gl_rwlock_t *lock) -+{ -+ if (!lock->initialized) -+ glthread_rwlock_init_multithreaded (lock); -+ if (!pth_mutex_acquire (&lock->lock, 0, NULL)) -+ return errno; -+ /* Test whether no readers or writers are currently running. */ -+ while (!(lock->runcount == 0)) -+ { -+ /* This thread has to wait for a while. Enqueue it among the -+ waiting_writers. */ -+ lock->waiting_writers_count++; -+ if (!pth_cond_await (&lock->waiting_writers, &lock->lock, NULL)) -+ { -+ int err = errno; -+ lock->waiting_writers_count--; -+ pth_mutex_release (&lock->lock); -+ return err; -+ } -+ lock->waiting_writers_count--; -+ } -+ lock->runcount--; /* runcount becomes -1 */ -+ return (!pth_mutex_release (&lock->lock) ? errno : 0); -+} -+ -+int -+glthread_rwlock_unlock_multithreaded (gl_rwlock_t *lock) -+{ -+ int err; -+ -+ if (!lock->initialized) -+ return EINVAL; -+ if (!pth_mutex_acquire (&lock->lock, 0, NULL)) -+ return errno; -+ if (lock->runcount < 0) -+ { -+ /* Drop a writer lock. */ -+ if (!(lock->runcount == -1)) -+ { -+ pth_mutex_release (&lock->lock); -+ return EINVAL; -+ } -+ lock->runcount = 0; -+ } -+ else -+ { -+ /* Drop a reader lock. */ -+ if (!(lock->runcount > 0)) -+ { -+ pth_mutex_release (&lock->lock); -+ return EINVAL; -+ } -+ lock->runcount--; -+ } -+ if (lock->runcount == 0) -+ { -+ /* POSIX recommends that "write locks shall take precedence over read -+ locks", to avoid "writer starvation". */ -+ if (lock->waiting_writers_count > 0) -+ { -+ /* Wake up one of the waiting writers. */ -+ if (!pth_cond_notify (&lock->waiting_writers, FALSE)) -+ { -+ int err = errno; -+ pth_mutex_release (&lock->lock); -+ return err; -+ } -+ } -+ else -+ { -+ /* Wake up all waiting readers. */ -+ if (!pth_cond_notify (&lock->waiting_readers, TRUE)) -+ { -+ int err = errno; -+ pth_mutex_release (&lock->lock); -+ return err; -+ } -+ } -+ } -+ return (!pth_mutex_release (&lock->lock) ? errno : 0); -+} -+ -+int -+glthread_rwlock_destroy_multithreaded (gl_rwlock_t *lock) -+{ -+ lock->initialized = 0; -+ return 0; -+} -+ -+# endif -+ - /* --------------------- gl_recursive_lock_t datatype --------------------- */ - - /* -------------------------- gl_once_t datatype -------------------------- */ -@@ -796,8 +958,10 @@ - } - EnterCriticalSection (&lock->lock); - /* Test whether only readers are currently running, and whether the runcount -- field will not overflow. */ -- if (!(lock->runcount + 1 > 0)) -+ field will not overflow, and whether no writer is waiting. The latter -+ condition is because POSIX recommends that "write locks shall take -+ precedence over read locks", to avoid "writer starvation". */ -+ if (!(lock->runcount + 1 > 0 && lock->waiting_writers.count == 0)) - { - /* This thread has to wait for a while. Enqueue it among the - waiting_readers. */ -diff -durN libpipeline-1.4.1.orig/gnulib/lib/glthread/lock.h libpipeline-1.4.1/gnulib/lib/glthread/lock.h ---- libpipeline-1.4.1.orig/gnulib/lib/glthread/lock.h 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/lib/glthread/lock.h 2017-05-17 10:35:15.500000000 +0800 -@@ -1,5 +1,5 @@ - /* Locking in multithreaded situations. -- Copyright (C) 2005-2014 Free Software Foundation, Inc. -+ Copyright (C) 2005-2017 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 -@@ -139,6 +139,11 @@ - # pragma weak pthread_mutexattr_init - # pragma weak pthread_mutexattr_settype - # pragma weak pthread_mutexattr_destroy -+# pragma weak pthread_rwlockattr_init -+# if __GNU_LIBRARY__ > 1 -+# pragma weak pthread_rwlockattr_setkind_np -+# endif -+# pragma weak pthread_rwlockattr_destroy - # ifndef pthread_self - # pragma weak pthread_self - # endif -@@ -176,7 +181,7 @@ - - /* ------------------------- gl_rwlock_t datatype ------------------------- */ - --# if HAVE_PTHREAD_RWLOCK -+# if HAVE_PTHREAD_RWLOCK && (HAVE_PTHREAD_RWLOCK_RDLOCK_PREFER_WRITER || (defined PTHREAD_RWLOCK_WRITER_NONRECURSIVE_INITIALIZER_NP && (__GNU_LIBRARY__ > 1))) - - # ifdef PTHREAD_RWLOCK_INITIALIZER - -@@ -185,10 +190,18 @@ - STORAGECLASS pthread_rwlock_t NAME; - # define gl_rwlock_define_initialized(STORAGECLASS, NAME) \ - STORAGECLASS pthread_rwlock_t NAME = gl_rwlock_initializer; --# define gl_rwlock_initializer \ -- PTHREAD_RWLOCK_INITIALIZER --# define glthread_rwlock_init(LOCK) \ -- (pthread_in_use () ? pthread_rwlock_init (LOCK, NULL) : 0) -+# if HAVE_PTHREAD_RWLOCK_RDLOCK_PREFER_WRITER -+# define gl_rwlock_initializer \ -+ PTHREAD_RWLOCK_INITIALIZER -+# define glthread_rwlock_init(LOCK) \ -+ (pthread_in_use () ? pthread_rwlock_init (LOCK, NULL) : 0) -+# else /* glibc with bug https://sourceware.org/bugzilla/show_bug.cgi?id=13701 */ -+# define gl_rwlock_initializer \ -+ PTHREAD_RWLOCK_WRITER_NONRECURSIVE_INITIALIZER_NP -+# define glthread_rwlock_init(LOCK) \ -+ (pthread_in_use () ? glthread_rwlock_init_for_glibc (LOCK) : 0) -+extern int glthread_rwlock_init_for_glibc (pthread_rwlock_t *lock); -+# endif - # define glthread_rwlock_rdlock(LOCK) \ - (pthread_in_use () ? pthread_rwlock_rdlock (LOCK) : 0) - # define glthread_rwlock_wrlock(LOCK) \ -@@ -427,6 +440,9 @@ - - /* ------------------------- gl_rwlock_t datatype ------------------------- */ - -+/* Pth pth_rwlock_acquire always prefers readers. No autoconf test so far. */ -+# if HAVE_PTH_RWLOCK_ACQUIRE_PREFER_WRITER -+ - typedef pth_rwlock_t gl_rwlock_t; - # define gl_rwlock_define(STORAGECLASS, NAME) \ - STORAGECLASS pth_rwlock_t NAME; -@@ -445,6 +461,42 @@ - # define glthread_rwlock_destroy(LOCK) \ - ((void)(LOCK), 0) - -+# else -+ -+typedef struct -+ { -+ int initialized; -+ pth_mutex_t lock; /* protects the remaining fields */ -+ pth_cond_t waiting_readers; /* waiting readers */ -+ pth_cond_t waiting_writers; /* waiting writers */ -+ unsigned int waiting_writers_count; /* number of waiting writers */ -+ int runcount; /* number of readers running, or -1 when a writer runs */ -+ } -+ gl_rwlock_t; -+# define gl_rwlock_define(STORAGECLASS, NAME) \ -+ STORAGECLASS gl_rwlock_t NAME; -+# define gl_rwlock_define_initialized(STORAGECLASS, NAME) \ -+ STORAGECLASS gl_rwlock_t NAME = gl_rwlock_initializer; -+# define gl_rwlock_initializer \ -+ { 0 } -+# define glthread_rwlock_init(LOCK) \ -+ (pth_in_use () ? glthread_rwlock_init_multithreaded (LOCK) : 0) -+# define glthread_rwlock_rdlock(LOCK) \ -+ (pth_in_use () ? glthread_rwlock_rdlock_multithreaded (LOCK) : 0) -+# define glthread_rwlock_wrlock(LOCK) \ -+ (pth_in_use () ? glthread_rwlock_wrlock_multithreaded (LOCK) : 0) -+# define glthread_rwlock_unlock(LOCK) \ -+ (pth_in_use () ? glthread_rwlock_unlock_multithreaded (LOCK) : 0) -+# define glthread_rwlock_destroy(LOCK) \ -+ (pth_in_use () ? glthread_rwlock_destroy_multithreaded (LOCK) : 0) -+extern int glthread_rwlock_init_multithreaded (gl_rwlock_t *lock); -+extern int glthread_rwlock_rdlock_multithreaded (gl_rwlock_t *lock); -+extern int glthread_rwlock_wrlock_multithreaded (gl_rwlock_t *lock); -+extern int glthread_rwlock_unlock_multithreaded (gl_rwlock_t *lock); -+extern int glthread_rwlock_destroy_multithreaded (gl_rwlock_t *lock); -+ -+# endif -+ - /* --------------------- gl_recursive_lock_t datatype --------------------- */ - - /* In Pth, mutexes are recursive by default. */ -diff -durN libpipeline-1.4.1.orig/gnulib/lib/glthread/threadlib.c libpipeline-1.4.1/gnulib/lib/glthread/threadlib.c ---- libpipeline-1.4.1.orig/gnulib/lib/glthread/threadlib.c 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/lib/glthread/threadlib.c 2017-05-17 10:35:15.890625000 +0800 -@@ -1,5 +1,5 @@ - /* Multithreading primitives. -- Copyright (C) 2005-2014 Free Software Foundation, Inc. -+ Copyright (C) 2005-2017 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 -diff -durN libpipeline-1.4.1.orig/gnulib/lib/glthread/tls.c libpipeline-1.4.1/gnulib/lib/glthread/tls.c ---- libpipeline-1.4.1.orig/gnulib/lib/glthread/tls.c 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/lib/glthread/tls.c 2017-05-17 10:35:16.187500000 +0800 -@@ -1,5 +1,5 @@ - /* Thread-local storage in multithreaded situations. -- Copyright (C) 2005-2014 Free Software Foundation, Inc. -+ Copyright (C) 2005-2017 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 -diff -durN libpipeline-1.4.1.orig/gnulib/lib/glthread/tls.h libpipeline-1.4.1/gnulib/lib/glthread/tls.h ---- libpipeline-1.4.1.orig/gnulib/lib/glthread/tls.h 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/lib/glthread/tls.h 2017-05-17 10:35:16.453125000 +0800 -@@ -1,5 +1,5 @@ - /* Thread-local storage in multithreaded situations. -- Copyright (C) 2005, 2007-2014 Free Software Foundation, Inc. -+ Copyright (C) 2005, 2007-2017 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 -diff -durN libpipeline-1.4.1.orig/gnulib/lib/intprops.h libpipeline-1.4.1/gnulib/lib/intprops.h ---- libpipeline-1.4.1.orig/gnulib/lib/intprops.h 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/lib/intprops.h 2017-05-17 10:35:16.750000000 +0800 -@@ -1,10 +1,10 @@ - /* intprops.h -- properties of integer types - -- Copyright (C) 2001-2005, 2009-2014 Free Software Foundation, Inc. -+ Copyright (C) 2001-2017 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 3 of the License, or -+ 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 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, -@@ -22,8 +22,7 @@ - - #include - --/* Return an integer value, converted to the same type as the integer -- expression E after integer type promotion. V is the unconverted value. */ -+/* Return a value with the common real type of E and V and the value of V. */ - #define _GL_INT_CONVERT(e, v) (0 * (e) + (v)) - - /* Act like _GL_INT_CONVERT (E, -V) but work around a bug in IRIX 6.5 cc; see -@@ -37,59 +36,55 @@ - an integer. */ - #define TYPE_IS_INTEGER(t) ((t) 1.5 == 1) - --/* True if negative values of the signed integer type T use two's -- complement, ones' complement, or signed magnitude representation, -- respectively. Much GNU code assumes two's complement, but some -- people like to be portable to all possible C hosts. */ --#define TYPE_TWOS_COMPLEMENT(t) ((t) ~ (t) 0 == (t) -1) --#define TYPE_ONES_COMPLEMENT(t) ((t) ~ (t) 0 == 0) --#define TYPE_SIGNED_MAGNITUDE(t) ((t) ~ (t) 0 < (t) -1) -- --/* True if the signed integer expression E uses two's complement. */ --#define _GL_INT_TWOS_COMPLEMENT(e) (~ _GL_INT_CONVERT (e, 0) == -1) -- --/* True if the arithmetic type T is signed. */ -+/* True if the real type T is signed. */ - #define TYPE_SIGNED(t) (! ((t) 0 < (t) -1)) - --/* Return 1 if the integer expression E, after integer promotion, has -- a signed type. */ --#define _GL_INT_SIGNED(e) (_GL_INT_NEGATE_CONVERT (e, 1) < 0) -+/* Return 1 if the real expression E, after promotion, has a -+ signed or floating type. */ -+#define EXPR_SIGNED(e) (_GL_INT_NEGATE_CONVERT (e, 1) < 0) - - --/* Minimum and maximum values for integer types and expressions. These -- macros have undefined behavior if T is signed and has padding bits. -- If this is a problem for you, please let us know how to fix it for -- your host. */ -+/* Minimum and maximum values for integer types and expressions. */ -+ -+/* The width in bits of the integer type or expression T. -+ Padding bits are not supported; this is checked at compile-time below. */ -+#define TYPE_WIDTH(t) (sizeof (t) * CHAR_BIT) - - /* The maximum and minimum values for the integer type T. */ --#define TYPE_MINIMUM(t) \ -- ((t) (! TYPE_SIGNED (t) \ -- ? (t) 0 \ -- : TYPE_SIGNED_MAGNITUDE (t) \ -- ? ~ (t) 0 \ -- : ~ TYPE_MAXIMUM (t))) -+#define TYPE_MINIMUM(t) ((t) ~ TYPE_MAXIMUM (t)) - #define TYPE_MAXIMUM(t) \ - ((t) (! TYPE_SIGNED (t) \ - ? (t) -1 \ -- : ((((t) 1 << (sizeof (t) * CHAR_BIT - 2)) - 1) * 2 + 1))) -+ : ((((t) 1 << (TYPE_WIDTH (t) - 2)) - 1) * 2 + 1))) - - /* The maximum and minimum values for the type of the expression E, - after integer promotion. E should not have side effects. */ - #define _GL_INT_MINIMUM(e) \ -- (_GL_INT_SIGNED (e) \ -- ? - _GL_INT_TWOS_COMPLEMENT (e) - _GL_SIGNED_INT_MAXIMUM (e) \ -+ (EXPR_SIGNED (e) \ -+ ? ~ _GL_SIGNED_INT_MAXIMUM (e) \ - : _GL_INT_CONVERT (e, 0)) - #define _GL_INT_MAXIMUM(e) \ -- (_GL_INT_SIGNED (e) \ -+ (EXPR_SIGNED (e) \ - ? _GL_SIGNED_INT_MAXIMUM (e) \ - : _GL_INT_NEGATE_CONVERT (e, 1)) - #define _GL_SIGNED_INT_MAXIMUM(e) \ -- (((_GL_INT_CONVERT (e, 1) << (sizeof ((e) + 0) * CHAR_BIT - 2)) - 1) * 2 + 1) -+ (((_GL_INT_CONVERT (e, 1) << (TYPE_WIDTH ((e) + 0) - 2)) - 1) * 2 + 1) - -+/* Work around OpenVMS incompatibility with C99. */ -+#if !defined LLONG_MAX && defined __INT64_MAX -+# define LLONG_MAX __INT64_MAX -+# define LLONG_MIN __INT64_MIN -+#endif - --/* Return 1 if the __typeof__ keyword works. This could be done by -+/* This include file assumes that signed types are two's complement without -+ padding bits; the above macros have undefined behavior otherwise. -+ If this is a problem for you, please let us know how to fix it for your host. -+ This assumption is tested by the intprops-tests module. */ -+ -+/* Does the __typeof__ keyword work? This could be done by - 'configure', but for now it's easier to do it by hand. */ --#if (2 <= __GNUC__ || defined __IBM__TYPEOF__ \ -+#if (2 <= __GNUC__ \ -+ || (1210 <= __IBMC__ && defined __IBM__TYPEOF__) \ - || (0x5110 <= __SUNPRO_C && !__STDC__)) - # define _GL_HAVE___TYPEOF__ 1 - #else -@@ -118,8 +113,7 @@ - signed, this macro may overestimate the true bound by one byte when - applied to unsigned types of size 2, 4, 16, ... bytes. */ - #define INT_STRLEN_BOUND(t) \ -- (INT_BITS_STRLEN_BOUND (sizeof (t) * CHAR_BIT \ -- - _GL_SIGNED_TYPE_OR_EXPR (t)) \ -+ (INT_BITS_STRLEN_BOUND (TYPE_WIDTH (t) - _GL_SIGNED_TYPE_OR_EXPR (t)) \ - + _GL_SIGNED_TYPE_OR_EXPR (t)) - - /* Bound on buffer size needed to represent an integer type or expression T, -@@ -224,24 +218,38 @@ - ? (a) < (min) >> (b) \ - : (max) >> (b) < (a)) - -+/* True if __builtin_add_overflow (A, B, P) works when P is non-null. */ -+#define _GL_HAS_BUILTIN_OVERFLOW (5 <= __GNUC__) -+ -+/* True if __builtin_add_overflow_p (A, B, C) works. */ -+#define _GL_HAS_BUILTIN_OVERFLOW_P (7 <= __GNUC__) - - /* The _GL*_OVERFLOW macros have the same restrictions as the - *_RANGE_OVERFLOW macros, except that they do not assume that operands - (e.g., A and B) have the same type as MIN and MAX. Instead, they assume - that the result (e.g., A + B) has that type. */ --#define _GL_ADD_OVERFLOW(a, b, min, max) \ -- ((min) < 0 ? INT_ADD_RANGE_OVERFLOW (a, b, min, max) \ -- : (a) < 0 ? (b) <= (a) + (b) \ -- : (b) < 0 ? (a) <= (a) + (b) \ -- : (a) + (b) < (b)) --#define _GL_SUBTRACT_OVERFLOW(a, b, min, max) \ -- ((min) < 0 ? INT_SUBTRACT_RANGE_OVERFLOW (a, b, min, max) \ -- : (a) < 0 ? 1 \ -- : (b) < 0 ? (a) - (b) <= (a) \ -- : (a) < (b)) --#define _GL_MULTIPLY_OVERFLOW(a, b, min, max) \ -- (((min) == 0 && (((a) < 0 && 0 < (b)) || ((b) < 0 && 0 < (a)))) \ -- || INT_MULTIPLY_RANGE_OVERFLOW (a, b, min, max)) -+#if _GL_HAS_BUILTIN_OVERFLOW_P -+# define _GL_ADD_OVERFLOW(a, b, min, max) \ -+ __builtin_add_overflow_p (a, b, (__typeof__ ((a) + (b))) 0) -+# define _GL_SUBTRACT_OVERFLOW(a, b, min, max) \ -+ __builtin_sub_overflow_p (a, b, (__typeof__ ((a) - (b))) 0) -+# define _GL_MULTIPLY_OVERFLOW(a, b, min, max) \ -+ __builtin_mul_overflow_p (a, b, (__typeof__ ((a) * (b))) 0) -+#else -+# define _GL_ADD_OVERFLOW(a, b, min, max) \ -+ ((min) < 0 ? INT_ADD_RANGE_OVERFLOW (a, b, min, max) \ -+ : (a) < 0 ? (b) <= (a) + (b) \ -+ : (b) < 0 ? (a) <= (a) + (b) \ -+ : (a) + (b) < (b)) -+# define _GL_SUBTRACT_OVERFLOW(a, b, min, max) \ -+ ((min) < 0 ? INT_SUBTRACT_RANGE_OVERFLOW (a, b, min, max) \ -+ : (a) < 0 ? 1 \ -+ : (b) < 0 ? (a) - (b) <= (a) \ -+ : (a) < (b)) -+# define _GL_MULTIPLY_OVERFLOW(a, b, min, max) \ -+ (((min) == 0 && (((a) < 0 && 0 < (b)) || ((b) < 0 && 0 < (a)))) \ -+ || INT_MULTIPLY_RANGE_OVERFLOW (a, b, min, max)) -+#endif - #define _GL_DIVIDE_OVERFLOW(a, b, min, max) \ - ((min) < 0 ? (b) == _GL_INT_NEGATE_CONVERT (min, 1) && (a) < - (max) \ - : (a) < 0 ? (b) <= (a) + (b) - 1 \ -@@ -263,22 +271,29 @@ - : (a) % - (b)) \ - == 0) - -- --/* Integer overflow checks. -+/* Check for integer overflow, and report low order bits of answer. - - The INT__OVERFLOW macros return 1 if the corresponding C operators - might not yield numerically correct answers due to arithmetic overflow. -- They work correctly on all known practical hosts, and do not rely -+ The INT__WRAPV macros also store the low-order bits of the answer. -+ These macros work correctly on all known practical hosts, and do not rely - on undefined behavior due to signed arithmetic overflow. - -- Example usage: -+ Example usage, assuming A and B are long int: - -- long int i = ...; -- long int j = ...; -- if (INT_MULTIPLY_OVERFLOW (i, j)) -- printf ("multiply would overflow"); -+ if (INT_MULTIPLY_OVERFLOW (a, b)) -+ printf ("result would overflow\n"); - else -- printf ("product is %ld", i * j); -+ printf ("result is %ld (no overflow)\n", a * b); -+ -+ Example usage with WRAPV flavor: -+ -+ long int result; -+ bool overflow = INT_MULTIPLY_WRAPV (a, b, &result); -+ printf ("result is %ld (%s)\n", result, -+ overflow ? "after overflow" : "no overflow"); -+ -+ Restrictions on these macros: - - These macros do not check for all possible numerical problems or - undefined or unspecified behavior: they do not check for division -@@ -287,6 +302,9 @@ - These macros may evaluate their arguments zero or multiple times, so the - arguments should not have side effects. - -+ The WRAPV macros are not constant expressions. They support only -+ +, binary -, and *. The result type must be signed. -+ - These macros are tuned for their last argument being a constant. - - Return 1 if the integer expressions A * B, A - B, -A, A * B, A / B, -@@ -296,8 +314,12 @@ - _GL_BINARY_OP_OVERFLOW (a, b, _GL_ADD_OVERFLOW) - #define INT_SUBTRACT_OVERFLOW(a, b) \ - _GL_BINARY_OP_OVERFLOW (a, b, _GL_SUBTRACT_OVERFLOW) --#define INT_NEGATE_OVERFLOW(a) \ -- INT_NEGATE_RANGE_OVERFLOW (a, _GL_INT_MINIMUM (a), _GL_INT_MAXIMUM (a)) -+#if _GL_HAS_BUILTIN_OVERFLOW_P -+# define INT_NEGATE_OVERFLOW(a) INT_SUBTRACT_OVERFLOW (0, a) -+#else -+# define INT_NEGATE_OVERFLOW(a) \ -+ INT_NEGATE_RANGE_OVERFLOW (a, _GL_INT_MINIMUM (a), _GL_INT_MAXIMUM (a)) -+#endif - #define INT_MULTIPLY_OVERFLOW(a, b) \ - _GL_BINARY_OP_OVERFLOW (a, b, _GL_MULTIPLY_OVERFLOW) - #define INT_DIVIDE_OVERFLOW(a, b) \ -@@ -317,4 +339,111 @@ - _GL_INT_MINIMUM (0 * (b) + (a)), \ - _GL_INT_MAXIMUM (0 * (b) + (a))) - -+/* Store the low-order bits of A + B, A - B, A * B, respectively, into *R. -+ Return 1 if the result overflows. See above for restrictions. */ -+#define INT_ADD_WRAPV(a, b, r) \ -+ _GL_INT_OP_WRAPV (a, b, r, +, __builtin_add_overflow, INT_ADD_OVERFLOW) -+#define INT_SUBTRACT_WRAPV(a, b, r) \ -+ _GL_INT_OP_WRAPV (a, b, r, -, __builtin_sub_overflow, INT_SUBTRACT_OVERFLOW) -+#define INT_MULTIPLY_WRAPV(a, b, r) \ -+ _GL_INT_OP_WRAPV (a, b, r, *, __builtin_mul_overflow, INT_MULTIPLY_OVERFLOW) -+ -+/* Nonzero if this compiler has GCC bug 68193 or Clang bug 25390. See: -+ https://gcc.gnu.org/bugzilla/show_bug.cgi?id=68193 -+ https://llvm.org/bugs/show_bug.cgi?id=25390 -+ For now, assume all versions of GCC-like compilers generate bogus -+ warnings for _Generic. This matters only for older compilers that -+ lack __builtin_add_overflow. */ -+#if __GNUC__ -+# define _GL__GENERIC_BOGUS 1 -+#else -+# define _GL__GENERIC_BOGUS 0 -+#endif -+ -+/* Store the low-order bits of A B into *R, where OP specifies -+ the operation. BUILTIN is the builtin operation, and OVERFLOW the -+ overflow predicate. Return 1 if the result overflows. See above -+ for restrictions. */ -+#if _GL_HAS_BUILTIN_OVERFLOW -+# define _GL_INT_OP_WRAPV(a, b, r, op, builtin, overflow) builtin (a, b, r) -+#elif 201112 <= __STDC_VERSION__ && !_GL__GENERIC_BOGUS -+# define _GL_INT_OP_WRAPV(a, b, r, op, builtin, overflow) \ -+ (_Generic \ -+ (*(r), \ -+ signed char: \ -+ _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \ -+ signed char, SCHAR_MIN, SCHAR_MAX), \ -+ short int: \ -+ _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \ -+ short int, SHRT_MIN, SHRT_MAX), \ -+ int: \ -+ _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \ -+ int, INT_MIN, INT_MAX), \ -+ long int: \ -+ _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned long int, \ -+ long int, LONG_MIN, LONG_MAX), \ -+ long long int: \ -+ _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned long long int, \ -+ long long int, LLONG_MIN, LLONG_MAX))) -+#else -+# define _GL_INT_OP_WRAPV(a, b, r, op, builtin, overflow) \ -+ (sizeof *(r) == sizeof (signed char) \ -+ ? _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \ -+ signed char, SCHAR_MIN, SCHAR_MAX) \ -+ : sizeof *(r) == sizeof (short int) \ -+ ? _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \ -+ short int, SHRT_MIN, SHRT_MAX) \ -+ : sizeof *(r) == sizeof (int) \ -+ ? _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \ -+ int, INT_MIN, INT_MAX) \ -+ : _GL_INT_OP_WRAPV_LONGISH(a, b, r, op, overflow)) -+# ifdef LLONG_MAX -+# define _GL_INT_OP_WRAPV_LONGISH(a, b, r, op, overflow) \ -+ (sizeof *(r) == sizeof (long int) \ -+ ? _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned long int, \ -+ long int, LONG_MIN, LONG_MAX) \ -+ : _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned long long int, \ -+ long long int, LLONG_MIN, LLONG_MAX)) -+# else -+# define _GL_INT_OP_WRAPV_LONGISH(a, b, r, op, overflow) \ -+ _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned long int, \ -+ long int, LONG_MIN, LONG_MAX) -+# endif -+#endif -+ -+/* Store the low-order bits of A B into *R, where the operation -+ is given by OP. Use the unsigned type UT for calculation to avoid -+ overflow problems. *R's type is T, with extrema TMIN and TMAX. -+ T must be a signed integer type. Return 1 if the result overflows. */ -+#define _GL_INT_OP_CALC(a, b, r, op, overflow, ut, t, tmin, tmax) \ -+ (sizeof ((a) op (b)) < sizeof (t) \ -+ ? _GL_INT_OP_CALC1 ((t) (a), (t) (b), r, op, overflow, ut, t, tmin, tmax) \ -+ : _GL_INT_OP_CALC1 (a, b, r, op, overflow, ut, t, tmin, tmax)) -+#define _GL_INT_OP_CALC1(a, b, r, op, overflow, ut, t, tmin, tmax) \ -+ ((overflow (a, b) \ -+ || (EXPR_SIGNED ((a) op (b)) && ((a) op (b)) < (tmin)) \ -+ || (tmax) < ((a) op (b))) \ -+ ? (*(r) = _GL_INT_OP_WRAPV_VIA_UNSIGNED (a, b, op, ut, t), 1) \ -+ : (*(r) = _GL_INT_OP_WRAPV_VIA_UNSIGNED (a, b, op, ut, t), 0)) -+ -+/* Return the low-order bits of A B, where the operation is given -+ by OP. Use the unsigned type UT for calculation to avoid undefined -+ behavior on signed integer overflow, and convert the result to type T. -+ UT is at least as wide as T and is no narrower than unsigned int, -+ T is two's complement, and there is no padding or trap representations. -+ Assume that converting UT to T yields the low-order bits, as is -+ done in all known two's-complement C compilers. E.g., see: -+ https://gcc.gnu.org/onlinedocs/gcc/Integers-implementation.html -+ -+ According to the C standard, converting UT to T yields an -+ implementation-defined result or signal for values outside T's -+ range. However, code that works around this theoretical problem -+ runs afoul of a compiler bug in Oracle Studio 12.3 x86. See: -+ http://lists.gnu.org/archive/html/bug-gnulib/2017-04/msg00049.html -+ As the compiler bug is real, don't try to work around the -+ theoretical problem. */ -+ -+#define _GL_INT_OP_WRAPV_VIA_UNSIGNED(a, b, op, ut, t) \ -+ ((t) ((ut) (a) op (ut) (b))) -+ - #endif /* _GL_INTPROPS_H */ -diff -durN libpipeline-1.4.1.orig/gnulib/lib/itold.c libpipeline-1.4.1/gnulib/lib/itold.c ---- libpipeline-1.4.1.orig/gnulib/lib/itold.c 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/lib/itold.c 2017-05-17 10:35:17.031250000 +0800 -@@ -1,5 +1,5 @@ - /* Replacement for 'int' to 'long double' conversion routine. -- Copyright (C) 2011-2014 Free Software Foundation, Inc. -+ Copyright (C) 2011-2017 Free Software Foundation, Inc. - Written by Bruno Haible , 2011. - - This program is free software: you can redistribute it and/or modify -diff -durN libpipeline-1.4.1.orig/gnulib/lib/limits.in.h libpipeline-1.4.1/gnulib/lib/limits.in.h ---- libpipeline-1.4.1.orig/gnulib/lib/limits.in.h 1970-01-01 08:00:00.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/lib/limits.in.h 2017-05-17 10:35:04.718750000 +0800 -@@ -0,0 +1,74 @@ -+/* A GNU-like . -+ -+ Copyright 2016-2017 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 3, 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, see . */ -+ -+#ifndef _@GUARD_PREFIX@_LIMITS_H -+ -+#if __GNUC__ >= 3 -+@PRAGMA_SYSTEM_HEADER@ -+#endif -+@PRAGMA_COLUMNS@ -+ -+/* The include_next requires a split double-inclusion guard. */ -+#@INCLUDE_NEXT@ @NEXT_LIMITS_H@ -+ -+#ifndef _@GUARD_PREFIX@_LIMITS_H -+#define _@GUARD_PREFIX@_LIMITS_H -+ -+/* For HP-UX 11.31. */ -+#if defined LONG_LONG_MIN && !defined LLONG_MIN -+# define LLONG_MIN LONG_LONG_MIN -+#endif -+#if defined LONG_LONG_MAX && !defined LLONG_MAX -+# define LLONG_MAX LONG_LONG_MAX -+#endif -+#if defined ULONG_LONG_MAX && !defined ULLONG_MAX -+# define ULLONG_MAX ULONG_LONG_MAX -+#endif -+ -+/* The number of usable bits in an unsigned or signed integer type -+ with minimum value MIN and maximum value MAX, as an int expression -+ suitable in #if. Cover all known practical hosts. This -+ implementation exploits the fact that MAX is 1 less than a power of -+ 2, and merely counts the number of 1 bits in MAX; "COBn" means -+ "count the number of 1 bits in the low-order n bits"). */ -+#define _GL_INTEGER_WIDTH(min, max) (((min) < 0) + _GL_COB128 (max)) -+#define _GL_COB128(n) (_GL_COB64 ((n) >> 31 >> 31 >> 2) + _GL_COB64 (n)) -+#define _GL_COB64(n) (_GL_COB32 ((n) >> 31 >> 1) + _GL_COB32 (n)) -+#define _GL_COB32(n) (_GL_COB16 ((n) >> 16) + _GL_COB16 (n)) -+#define _GL_COB16(n) (_GL_COB8 ((n) >> 8) + _GL_COB8 (n)) -+#define _GL_COB8(n) (_GL_COB4 ((n) >> 4) + _GL_COB4 (n)) -+#define _GL_COB4(n) (!!((n) & 8) + !!((n) & 4) + !!((n) & 2) + !!((n) & 1)) -+ -+/* Macros specified by ISO/IEC TS 18661-1:2014. */ -+ -+#if (! defined ULLONG_WIDTH \ -+ && (defined _GNU_SOURCE || defined __STDC_WANT_IEC_60559_BFP_EXT__)) -+# define CHAR_WIDTH _GL_INTEGER_WIDTH (CHAR_MIN, CHAR_MAX) -+# define SCHAR_WIDTH _GL_INTEGER_WIDTH (SCHAR_MIN, SCHAR_MAX) -+# define UCHAR_WIDTH _GL_INTEGER_WIDTH (0, UCHAR_MAX) -+# define SHRT_WIDTH _GL_INTEGER_WIDTH (SHRT_MIN, SHRT_MAX) -+# define USHRT_WIDTH _GL_INTEGER_WIDTH (0, USHRT_MAX) -+# define INT_WIDTH _GL_INTEGER_WIDTH (INT_MIN, INT_MAX) -+# define UINT_WIDTH _GL_INTEGER_WIDTH (0, UINT_MAX) -+# define LONG_WIDTH _GL_INTEGER_WIDTH (LONG_MIN, LONG_MAX) -+# define ULONG_WIDTH _GL_INTEGER_WIDTH (0, ULONG_MAX) -+# define LLONG_WIDTH _GL_INTEGER_WIDTH (LLONG_MIN, LLONG_MAX) -+# define ULLONG_WIDTH _GL_INTEGER_WIDTH (0, ULLONG_MAX) -+#endif /* !ULLONG_WIDTH && (_GNU_SOURCE || __STDC_WANT_IEC_60559_BFP_EXT__) */ -+ -+#endif /* _@GUARD_PREFIX@_LIMITS_H */ -+#endif /* _@GUARD_PREFIX@_LIMITS_H */ -diff -durN libpipeline-1.4.1.orig/gnulib/lib/localtime-buffer.c libpipeline-1.4.1/gnulib/lib/localtime-buffer.c ---- libpipeline-1.4.1.orig/gnulib/lib/localtime-buffer.c 1970-01-01 08:00:00.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/lib/localtime-buffer.c 2017-05-17 10:35:04.890625000 +0800 -@@ -0,0 +1,58 @@ -+/* Provide access to the last buffer returned by localtime() or gmtime(). -+ -+ Copyright (C) 2001-2003, 2005-2007, 2009-2017 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 3, 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, see . */ -+ -+/* written by Jim Meyering */ -+ -+#include -+ -+/* Specification. */ -+#include "localtime-buffer.h" -+ -+#if GETTIMEOFDAY_CLOBBERS_LOCALTIME || TZSET_CLOBBERS_LOCALTIME -+ -+static struct tm tm_zero_buffer; -+struct tm *localtime_buffer_addr = &tm_zero_buffer; -+ -+/* This is a wrapper for localtime. -+ -+ On the first call, record the address of the static buffer that -+ localtime uses for its result. */ -+ -+struct tm * -+rpl_localtime (time_t const *timep) -+{ -+ struct tm *tm = localtime (timep); -+ -+ if (localtime_buffer_addr == &tm_zero_buffer) -+ localtime_buffer_addr = tm; -+ -+ return tm; -+} -+ -+/* Same as above, since gmtime and localtime use the same buffer. */ -+struct tm * -+rpl_gmtime (time_t const *timep) -+{ -+ struct tm *tm = gmtime (timep); -+ -+ if (localtime_buffer_addr == &tm_zero_buffer) -+ localtime_buffer_addr = tm; -+ -+ return tm; -+} -+ -+#endif -diff -durN libpipeline-1.4.1.orig/gnulib/lib/localtime-buffer.h libpipeline-1.4.1/gnulib/lib/localtime-buffer.h ---- libpipeline-1.4.1.orig/gnulib/lib/localtime-buffer.h 1970-01-01 08:00:00.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/lib/localtime-buffer.h 2017-05-17 10:35:05.078125000 +0800 -@@ -0,0 +1,27 @@ -+/* Provide access to the last buffer returned by localtime() or gmtime(). -+ -+ Copyright (C) 2001-2003, 2005-2007, 2009-2017 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 3, 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, see . */ -+ -+/* written by Jim Meyering */ -+ -+#include -+ -+#if GETTIMEOFDAY_CLOBBERS_LOCALTIME || TZSET_CLOBBERS_LOCALTIME -+ -+/* The address of the last buffer returned by localtime() or gmtime(). */ -+extern struct tm *localtime_buffer_addr; -+ -+#endif -diff -durN libpipeline-1.4.1.orig/gnulib/lib/lstat.c libpipeline-1.4.1/gnulib/lib/lstat.c ---- libpipeline-1.4.1.orig/gnulib/lib/lstat.c 2014-11-08 21:53:37.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/lib/lstat.c 2017-05-17 10:35:17.390625000 +0800 -@@ -1,6 +1,6 @@ - /* Work around a bug of lstat on some systems - -- Copyright (C) 1997-2006, 2008-2014 Free Software Foundation, Inc. -+ Copyright (C) 1997-2006, 2008-2017 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 -diff -durN libpipeline-1.4.1.orig/gnulib/lib/Makefile.am libpipeline-1.4.1/gnulib/lib/Makefile.am ---- libpipeline-1.4.1.orig/gnulib/lib/Makefile.am 2015-06-18 20:28:53.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/lib/Makefile.am 2017-05-17 10:37:09.593750000 +0800 -@@ -1,6 +1,6 @@ - ## DO NOT EDIT! GENERATED AUTOMATICALLY! - ## Process this file with automake to produce Makefile.in. --# Copyright (C) 2002-2014 Free Software Foundation, Inc. -+# Copyright (C) 2002-2017 Free Software Foundation, Inc. - # - # This file is free software; you can redistribute it and/or modify - # it under the terms of the GNU General Public License as published by -@@ -21,7 +21,7 @@ - # the same distribution terms as the rest of that program. - # - # Generated by gnulib-tool. --# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=gnulib/lib --m4-base=gnulib/m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --no-conditional-dependencies --libtool --macro-prefix=gl --no-vc-files dirname environ error full-write gitlog-to-changelog gnupload largefile lib-ignore mkdtemp safe-read safe-write setenv sigaction signal sigprocmask strerror strsignal sys_select sys_stat unsetenv waitpid warnings xalloc xstrndup xvasprintf -+# Reproduce by: gnulib-tool --import --lib=libgnu --source-base=gnulib/lib --m4-base=gnulib/m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --no-conditional-dependencies --libtool --macro-prefix=gl --no-vc-files dirname environ error full-write gitlog-to-changelog gnupload largefile lib-ignore mkdtemp safe-read safe-write setenv sigaction signal sigprocmask strerror strsignal sys_select sys_stat unsetenv waitpid warnings xalloc xstrndup xvasprintf - - AUTOMAKE_OPTIONS = 1.9.6 gnits subdir-objects - -@@ -37,6 +37,7 @@ - CLEANFILES = - DISTCLEANFILES = - MAINTAINERCLEANFILES = -+# No GNU Make output. - - AM_CPPFLAGS = - AM_CFLAGS = -@@ -195,6 +196,13 @@ - - ## end gnulib module fcntl-h - -+## begin gnulib module filename -+ -+ -+EXTRA_DIST += filename.h -+ -+## end gnulib module filename -+ - ## begin gnulib module float - - BUILT_SOURCES += $(FLOAT_H) -@@ -232,6 +240,12 @@ - - ## end gnulib module full-write - -+## begin gnulib module getprogname -+ -+libgnu_la_SOURCES += getprogname.h getprogname.c -+ -+## end gnulib module getprogname -+ - ## begin gnulib module gettext-h - - libgnu_la_SOURCES += gettext.h -@@ -275,6 +289,43 @@ - - ## end gnulib module intprops - -+## begin gnulib module limits-h -+ -+BUILT_SOURCES += $(LIMITS_H) -+ -+# We need the following in order to create when the system -+# doesn't have one that is compatible with GNU. -+if GL_GENERATE_LIMITS_H -+limits.h: limits.in.h $(top_builddir)/config.status -+ $(AM_V_GEN)rm -f $@-t $@ && \ -+ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ -+ sed -e 's|@''GUARD_PREFIX''@|GL|g' \ -+ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ -+ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ -+ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ -+ -e 's|@''NEXT_LIMITS_H''@|$(NEXT_LIMITS_H)|g' \ -+ < $(srcdir)/limits.in.h; \ -+ } > $@-t && \ -+ mv $@-t $@ -+else -+limits.h: $(top_builddir)/config.status -+ rm -f $@ -+endif -+MOSTLYCLEANFILES += limits.h limits.h-t -+ -+EXTRA_DIST += limits.in.h -+ -+## end gnulib module limits-h -+ -+## begin gnulib module localtime-buffer -+ -+ -+EXTRA_DIST += localtime-buffer.c localtime-buffer.h -+ -+EXTRA_libgnu_la_SOURCES += localtime-buffer.c -+ -+## end gnulib module localtime-buffer -+ - ## begin gnulib module lock - - libgnu_la_SOURCES += glthread/lock.h glthread/lock.c -@@ -474,81 +525,48 @@ - ## begin gnulib module snippet/_Noreturn - - # Because this Makefile snippet defines a variable used by other --# gnulib Makefile snippets, it must be present in all Makefile.am that -+# gnulib Makefile snippets, it must be present in all makefiles that - # need it. This is ensured by the applicability 'all' defined above. - --_NORETURN_H=$(top_srcdir)/build-aux/snippet/_Noreturn.h -+_NORETURN_H=$(srcdir)/_Noreturn.h - --EXTRA_DIST += $(top_srcdir)/build-aux/snippet/_Noreturn.h -+EXTRA_DIST += _Noreturn.h - - ## end gnulib module snippet/_Noreturn - - ## begin gnulib module snippet/arg-nonnull - --# The BUILT_SOURCES created by this Makefile snippet are not used via #include --# statements but through direct file reference. Therefore this snippet must be --# present in all Makefile.am that need it. This is ensured by the applicability --# 'all' defined above. -- --BUILT_SOURCES += arg-nonnull.h --# The arg-nonnull.h that gets inserted into generated .h files is the same as --# build-aux/snippet/arg-nonnull.h, except that it has the copyright header cut --# off. --arg-nonnull.h: $(top_srcdir)/build-aux/snippet/arg-nonnull.h -- $(AM_V_GEN)rm -f $@-t $@ && \ -- sed -n -e '/GL_ARG_NONNULL/,$$p' \ -- < $(top_srcdir)/build-aux/snippet/arg-nonnull.h \ -- > $@-t && \ -- mv $@-t $@ --MOSTLYCLEANFILES += arg-nonnull.h arg-nonnull.h-t -+# Because this Makefile snippet defines a variable used by other -+# gnulib Makefile snippets, it must be present in all makefiles that -+# need it. This is ensured by the applicability 'all' defined above. - --ARG_NONNULL_H=arg-nonnull.h -+ARG_NONNULL_H=$(srcdir)/arg-nonnull.h - --EXTRA_DIST += $(top_srcdir)/build-aux/snippet/arg-nonnull.h -+EXTRA_DIST += arg-nonnull.h - - ## end gnulib module snippet/arg-nonnull - - ## begin gnulib module snippet/c++defs - --# The BUILT_SOURCES created by this Makefile snippet are not used via #include --# statements but through direct file reference. Therefore this snippet must be --# present in all Makefile.am that need it. This is ensured by the applicability --# 'all' defined above. -- --BUILT_SOURCES += c++defs.h --# The c++defs.h that gets inserted into generated .h files is the same as --# build-aux/snippet/c++defs.h, except that it has the copyright header cut off. --c++defs.h: $(top_srcdir)/build-aux/snippet/c++defs.h -- $(AM_V_GEN)rm -f $@-t $@ && \ -- sed -n -e '/_GL_CXXDEFS/,$$p' \ -- < $(top_srcdir)/build-aux/snippet/c++defs.h \ -- > $@-t && \ -- mv $@-t $@ --MOSTLYCLEANFILES += c++defs.h c++defs.h-t -+# Because this Makefile snippet defines a variable used by other -+# gnulib Makefile snippets, it must be present in all makefiles that -+# need it. This is ensured by the applicability 'all' defined above. - --CXXDEFS_H=c++defs.h -+CXXDEFS_H=$(srcdir)/c++defs.h - --EXTRA_DIST += $(top_srcdir)/build-aux/snippet/c++defs.h -+EXTRA_DIST += c++defs.h - - ## end gnulib module snippet/c++defs - - ## begin gnulib module snippet/warn-on-use - --BUILT_SOURCES += warn-on-use.h --# The warn-on-use.h that gets inserted into generated .h files is the same as --# build-aux/snippet/warn-on-use.h, except that it has the copyright header cut --# off. --warn-on-use.h: $(top_srcdir)/build-aux/snippet/warn-on-use.h -- $(AM_V_GEN)rm -f $@-t $@ && \ -- sed -n -e '/^.ifndef/,$$p' \ -- < $(top_srcdir)/build-aux/snippet/warn-on-use.h \ -- > $@-t && \ -- mv $@-t $@ --MOSTLYCLEANFILES += warn-on-use.h warn-on-use.h-t -+# Because this Makefile snippet defines a variable used by other -+# gnulib Makefile snippets, it must be present in all makefiles that -+# need it. This is ensured by the applicability 'all' defined above. - --WARN_ON_USE_H=warn-on-use.h -+WARN_ON_USE_H=$(srcdir)/warn-on-use.h - --EXTRA_DIST += $(top_srcdir)/build-aux/snippet/warn-on-use.h -+EXTRA_DIST += warn-on-use.h - - ## end gnulib module snippet/warn-on-use - -@@ -564,9 +582,9 @@ - ## begin gnulib module stat - - --EXTRA_DIST += stat.c -+EXTRA_DIST += stat-w32.c stat-w32.h stat.c - --EXTRA_libgnu_la_SOURCES += stat.c -+EXTRA_libgnu_la_SOURCES += stat-w32.c stat.c - - ## end gnulib module stat - -@@ -636,6 +654,7 @@ - -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_STDDEF_H''@|$(NEXT_STDDEF_H)|g' \ -+ -e 's|@''HAVE_MAX_ALIGN_T''@|$(HAVE_MAX_ALIGN_T)|g' \ - -e 's|@''HAVE_WCHAR_T''@|$(HAVE_WCHAR_T)|g' \ - -e 's|@''REPLACE_NULL''@|$(REPLACE_NULL)|g' \ - < $(srcdir)/stddef.in.h; \ -@@ -667,6 +686,7 @@ - -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_STDINT_H''@|$(NEXT_STDINT_H)|g' \ -+ -e 's/@''HAVE_C99_STDINT_H''@/$(HAVE_C99_STDINT_H)/g' \ - -e 's/@''HAVE_SYS_TYPES_H''@/$(HAVE_SYS_TYPES_H)/g' \ - -e 's/@''HAVE_INTTYPES_H''@/$(HAVE_INTTYPES_H)/g' \ - -e 's/@''HAVE_SYS_INTTYPES_H''@/$(HAVE_SYS_INTTYPES_H)/g' \ -@@ -688,6 +708,7 @@ - -e 's/@''BITSIZEOF_WINT_T''@/$(BITSIZEOF_WINT_T)/g' \ - -e 's/@''HAVE_SIGNED_WINT_T''@/$(HAVE_SIGNED_WINT_T)/g' \ - -e 's/@''WINT_T_SUFFIX''@/$(WINT_T_SUFFIX)/g' \ -+ -e 's/@''GNULIB_OVERRIDES_WINT_T''@/$(GNULIB_OVERRIDES_WINT_T)/g' \ - < $(srcdir)/stdint.in.h; \ - } > $@-t && \ - mv $@-t $@ -@@ -862,6 +883,7 @@ - -e 's/@''GNULIB_PTSNAME''@/$(GNULIB_PTSNAME)/g' \ - -e 's/@''GNULIB_PTSNAME_R''@/$(GNULIB_PTSNAME_R)/g' \ - -e 's/@''GNULIB_PUTENV''@/$(GNULIB_PUTENV)/g' \ -+ -e 's/@''GNULIB_QSORT_R''@/$(GNULIB_QSORT_R)/g' \ - -e 's/@''GNULIB_RANDOM''@/$(GNULIB_RANDOM)/g' \ - -e 's/@''GNULIB_RANDOM_R''@/$(GNULIB_RANDOM_R)/g' \ - -e 's/@''GNULIB_REALLOC_POSIX''@/$(GNULIB_REALLOC_POSIX)/g' \ -@@ -891,6 +913,7 @@ - -e 's|@''HAVE_POSIX_OPENPT''@|$(HAVE_POSIX_OPENPT)|g' \ - -e 's|@''HAVE_PTSNAME''@|$(HAVE_PTSNAME)|g' \ - -e 's|@''HAVE_PTSNAME_R''@|$(HAVE_PTSNAME_R)|g' \ -+ -e 's|@''HAVE_QSORT_R''@|$(HAVE_QSORT_R)|g' \ - -e 's|@''HAVE_RANDOM''@|$(HAVE_RANDOM)|g' \ - -e 's|@''HAVE_RANDOM_H''@|$(HAVE_RANDOM_H)|g' \ - -e 's|@''HAVE_RANDOM_R''@|$(HAVE_RANDOM_R)|g' \ -@@ -913,6 +936,7 @@ - -e 's|@''REPLACE_PTSNAME''@|$(REPLACE_PTSNAME)|g' \ - -e 's|@''REPLACE_PTSNAME_R''@|$(REPLACE_PTSNAME_R)|g' \ - -e 's|@''REPLACE_PUTENV''@|$(REPLACE_PUTENV)|g' \ -+ -e 's|@''REPLACE_QSORT_R''@|$(REPLACE_QSORT_R)|g' \ - -e 's|@''REPLACE_RANDOM_R''@|$(REPLACE_RANDOM_R)|g' \ - -e 's|@''REPLACE_REALLOC''@|$(REPLACE_REALLOC)|g' \ - -e 's|@''REPLACE_REALPATH''@|$(REPLACE_REALPATH)|g' \ -@@ -1127,6 +1151,7 @@ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_SYS_STAT_H''@|$(NEXT_SYS_STAT_H)|g' \ - -e 's|@''WINDOWS_64_BIT_ST_SIZE''@|$(WINDOWS_64_BIT_ST_SIZE)|g' \ -+ -e 's|@''WINDOWS_STAT_TIMESPEC''@|$(WINDOWS_STAT_TIMESPEC)|g' \ - -e 's/@''GNULIB_FCHMODAT''@/$(GNULIB_FCHMODAT)/g' \ - -e 's/@''GNULIB_FSTAT''@/$(GNULIB_FSTAT)/g' \ - -e 's/@''GNULIB_FSTATAT''@/$(GNULIB_FSTATAT)/g' \ -@@ -1140,6 +1165,7 @@ - -e 's/@''GNULIB_MKNODAT''@/$(GNULIB_MKNODAT)/g' \ - -e 's/@''GNULIB_STAT''@/$(GNULIB_STAT)/g' \ - -e 's/@''GNULIB_UTIMENSAT''@/$(GNULIB_UTIMENSAT)/g' \ -+ -e 's/@''GNULIB_OVERRIDES_STRUCT_STAT''@/$(GNULIB_OVERRIDES_STRUCT_STAT)/g' \ - -e 's|@''HAVE_FCHMODAT''@|$(HAVE_FCHMODAT)|g' \ - -e 's|@''HAVE_FSTATAT''@|$(HAVE_FSTATAT)|g' \ - -e 's|@''HAVE_FUTIMENS''@|$(HAVE_FUTIMENS)|g' \ -@@ -1223,6 +1249,7 @@ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_SYS_TYPES_H''@|$(NEXT_SYS_TYPES_H)|g' \ - -e 's|@''WINDOWS_64_BIT_OFF_T''@|$(WINDOWS_64_BIT_OFF_T)|g' \ -+ -e 's|@''WINDOWS_STAT_INODES''@|$(WINDOWS_STAT_INODES)|g' \ - < $(srcdir)/sys_types.in.h; \ - } > $@-t && \ - mv $@-t $@ -@@ -1290,25 +1317,35 @@ - -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_TIME_H''@|$(NEXT_TIME_H)|g' \ -- -e 's/@''GNULIB_GETTIMEOFDAY''@/$(GNULIB_GETTIMEOFDAY)/g' \ -+ -e 's/@''GNULIB_CTIME''@/$(GNULIB_CTIME)/g' \ -+ -e 's/@''GNULIB_LOCALTIME''@/$(GNULIB_LOCALTIME)/g' \ - -e 's/@''GNULIB_MKTIME''@/$(GNULIB_MKTIME)/g' \ - -e 's/@''GNULIB_NANOSLEEP''@/$(GNULIB_NANOSLEEP)/g' \ -+ -e 's/@''GNULIB_STRFTIME''@/$(GNULIB_STRFTIME)/g' \ - -e 's/@''GNULIB_STRPTIME''@/$(GNULIB_STRPTIME)/g' \ - -e 's/@''GNULIB_TIMEGM''@/$(GNULIB_TIMEGM)/g' \ - -e 's/@''GNULIB_TIME_R''@/$(GNULIB_TIME_R)/g' \ -+ -e 's/@''GNULIB_TIME_RZ''@/$(GNULIB_TIME_RZ)/g' \ -+ -e 's/@''GNULIB_TZSET''@/$(GNULIB_TZSET)/g' \ - -e 's|@''HAVE_DECL_LOCALTIME_R''@|$(HAVE_DECL_LOCALTIME_R)|g' \ - -e 's|@''HAVE_NANOSLEEP''@|$(HAVE_NANOSLEEP)|g' \ - -e 's|@''HAVE_STRPTIME''@|$(HAVE_STRPTIME)|g' \ - -e 's|@''HAVE_TIMEGM''@|$(HAVE_TIMEGM)|g' \ -+ -e 's|@''HAVE_TIMEZONE_T''@|$(HAVE_TIMEZONE_T)|g' \ -+ -e 's|@''HAVE_TZSET''@|$(HAVE_TZSET)|g' \ -+ -e 's|@''REPLACE_CTIME''@|$(REPLACE_CTIME)|g' \ - -e 's|@''REPLACE_GMTIME''@|$(REPLACE_GMTIME)|g' \ - -e 's|@''REPLACE_LOCALTIME''@|$(REPLACE_LOCALTIME)|g' \ - -e 's|@''REPLACE_LOCALTIME_R''@|$(REPLACE_LOCALTIME_R)|g' \ - -e 's|@''REPLACE_MKTIME''@|$(REPLACE_MKTIME)|g' \ - -e 's|@''REPLACE_NANOSLEEP''@|$(REPLACE_NANOSLEEP)|g' \ -+ -e 's|@''REPLACE_STRFTIME''@|$(REPLACE_STRFTIME)|g' \ - -e 's|@''REPLACE_TIMEGM''@|$(REPLACE_TIMEGM)|g' \ -+ -e 's|@''REPLACE_TZSET''@|$(REPLACE_TZSET)|g' \ - -e 's|@''PTHREAD_H_DEFINES_STRUCT_TIMESPEC''@|$(PTHREAD_H_DEFINES_STRUCT_TIMESPEC)|g' \ - -e 's|@''SYS_TIME_H_DEFINES_STRUCT_TIMESPEC''@|$(SYS_TIME_H_DEFINES_STRUCT_TIMESPEC)|g' \ - -e 's|@''TIME_H_DEFINES_STRUCT_TIMESPEC''@|$(TIME_H_DEFINES_STRUCT_TIMESPEC)|g' \ -+ -e 's|@''UNISTD_H_DEFINES_STRUCT_TIMESPEC''@|$(UNISTD_H_DEFINES_STRUCT_TIMESPEC)|g' \ - -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ - -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ - -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ -@@ -1385,6 +1422,7 @@ - -e 's/@''GNULIB_SLEEP''@/$(GNULIB_SLEEP)/g' \ - -e 's/@''GNULIB_SYMLINK''@/$(GNULIB_SYMLINK)/g' \ - -e 's/@''GNULIB_SYMLINKAT''@/$(GNULIB_SYMLINKAT)/g' \ -+ -e 's/@''GNULIB_TRUNCATE''@/$(GNULIB_TRUNCATE)/g' \ - -e 's/@''GNULIB_TTYNAME_R''@/$(GNULIB_TTYNAME_R)/g' \ - -e 's/@''GNULIB_UNISTD_H_GETOPT''@/0$(GNULIB_GL_UNISTD_H_GETOPT)/g' \ - -e 's/@''GNULIB_UNISTD_H_NONBLOCKING''@/$(GNULIB_UNISTD_H_NONBLOCKING)/g' \ -@@ -1407,7 +1445,6 @@ - -e 's|@''HAVE_GETDTABLESIZE''@|$(HAVE_GETDTABLESIZE)|g' \ - -e 's|@''HAVE_GETGROUPS''@|$(HAVE_GETGROUPS)|g' \ - -e 's|@''HAVE_GETHOSTNAME''@|$(HAVE_GETHOSTNAME)|g' \ -- -e 's|@''HAVE_GETLOGIN''@|$(HAVE_GETLOGIN)|g' \ - -e 's|@''HAVE_GETPAGESIZE''@|$(HAVE_GETPAGESIZE)|g' \ - -e 's|@''HAVE_GROUP_MEMBER''@|$(HAVE_GROUP_MEMBER)|g' \ - -e 's|@''HAVE_LCHOWN''@|$(HAVE_LCHOWN)|g' \ -@@ -1423,12 +1460,14 @@ - -e 's|@''HAVE_SLEEP''@|$(HAVE_SLEEP)|g' \ - -e 's|@''HAVE_SYMLINK''@|$(HAVE_SYMLINK)|g' \ - -e 's|@''HAVE_SYMLINKAT''@|$(HAVE_SYMLINKAT)|g' \ -+ -e 's|@''HAVE_TRUNCATE''@|$(HAVE_TRUNCATE)|g' \ - -e 's|@''HAVE_UNLINKAT''@|$(HAVE_UNLINKAT)|g' \ - -e 's|@''HAVE_USLEEP''@|$(HAVE_USLEEP)|g' \ - -e 's|@''HAVE_DECL_ENVIRON''@|$(HAVE_DECL_ENVIRON)|g' \ - -e 's|@''HAVE_DECL_FCHDIR''@|$(HAVE_DECL_FCHDIR)|g' \ - -e 's|@''HAVE_DECL_FDATASYNC''@|$(HAVE_DECL_FDATASYNC)|g' \ - -e 's|@''HAVE_DECL_GETDOMAINNAME''@|$(HAVE_DECL_GETDOMAINNAME)|g' \ -+ -e 's|@''HAVE_DECL_GETLOGIN''@|$(HAVE_DECL_GETLOGIN)|g' \ - -e 's|@''HAVE_DECL_GETLOGIN_R''@|$(HAVE_DECL_GETLOGIN_R)|g' \ - -e 's|@''HAVE_DECL_GETPAGESIZE''@|$(HAVE_DECL_GETPAGESIZE)|g' \ - -e 's|@''HAVE_DECL_GETUSERSHELL''@|$(HAVE_DECL_GETUSERSHELL)|g' \ -@@ -1458,9 +1497,12 @@ - -e 's|@''REPLACE_PWRITE''@|$(REPLACE_PWRITE)|g' \ - -e 's|@''REPLACE_READ''@|$(REPLACE_READ)|g' \ - -e 's|@''REPLACE_READLINK''@|$(REPLACE_READLINK)|g' \ -+ -e 's|@''REPLACE_READLINKAT''@|$(REPLACE_READLINKAT)|g' \ - -e 's|@''REPLACE_RMDIR''@|$(REPLACE_RMDIR)|g' \ - -e 's|@''REPLACE_SLEEP''@|$(REPLACE_SLEEP)|g' \ - -e 's|@''REPLACE_SYMLINK''@|$(REPLACE_SYMLINK)|g' \ -+ -e 's|@''REPLACE_SYMLINKAT''@|$(REPLACE_SYMLINKAT)|g' \ -+ -e 's|@''REPLACE_TRUNCATE''@|$(REPLACE_TRUNCATE)|g' \ - -e 's|@''REPLACE_TTYNAME_R''@|$(REPLACE_TTYNAME_R)|g' \ - -e 's|@''REPLACE_UNLINK''@|$(REPLACE_UNLINK)|g' \ - -e 's|@''REPLACE_UNLINKAT''@|$(REPLACE_UNLINKAT)|g' \ -@@ -1538,6 +1580,8 @@ - -e 's|@''HAVE_FEATURES_H''@|$(HAVE_FEATURES_H)|g' \ - -e 's|@''NEXT_WCHAR_H''@|$(NEXT_WCHAR_H)|g' \ - -e 's|@''HAVE_WCHAR_H''@|$(HAVE_WCHAR_H)|g' \ -+ -e 's/@''HAVE_CRTDEFS_H''@/$(HAVE_CRTDEFS_H)/g' \ -+ -e 's/@''GNULIB_OVERRIDES_WINT_T''@/$(GNULIB_OVERRIDES_WINT_T)/g' \ - -e 's/@''GNULIB_BTOWC''@/$(GNULIB_BTOWC)/g' \ - -e 's/@''GNULIB_WCTOB''@/$(GNULIB_WCTOB)/g' \ - -e 's/@''GNULIB_MBSINIT''@/$(GNULIB_MBSINIT)/g' \ -@@ -1577,6 +1621,7 @@ - -e 's/@''GNULIB_WCSSTR''@/$(GNULIB_WCSSTR)/g' \ - -e 's/@''GNULIB_WCSTOK''@/$(GNULIB_WCSTOK)/g' \ - -e 's/@''GNULIB_WCSWIDTH''@/$(GNULIB_WCSWIDTH)/g' \ -+ -e 's/@''GNULIB_WCSFTIME''@/$(GNULIB_WCSFTIME)/g' \ - < $(srcdir)/wchar.in.h | \ - sed -e 's|@''HAVE_WINT_T''@|$(HAVE_WINT_T)|g' \ - -e 's|@''HAVE_BTOWC''@|$(HAVE_BTOWC)|g' \ -@@ -1616,6 +1661,7 @@ - -e 's|@''HAVE_WCSSTR''@|$(HAVE_WCSSTR)|g' \ - -e 's|@''HAVE_WCSTOK''@|$(HAVE_WCSTOK)|g' \ - -e 's|@''HAVE_WCSWIDTH''@|$(HAVE_WCSWIDTH)|g' \ -+ -e 's|@''HAVE_WCSFTIME''@|$(HAVE_WCSFTIME)|g' \ - -e 's|@''HAVE_DECL_WCTOB''@|$(HAVE_DECL_WCTOB)|g' \ - -e 's|@''HAVE_DECL_WCWIDTH''@|$(HAVE_DECL_WCWIDTH)|g' \ - | \ -@@ -1632,6 +1678,7 @@ - -e 's|@''REPLACE_WCSNRTOMBS''@|$(REPLACE_WCSNRTOMBS)|g' \ - -e 's|@''REPLACE_WCWIDTH''@|$(REPLACE_WCWIDTH)|g' \ - -e 's|@''REPLACE_WCSWIDTH''@|$(REPLACE_WCSWIDTH)|g' \ -+ -e 's|@''REPLACE_WCSFTIME''@|$(REPLACE_WCSFTIME)|g' \ - -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ - -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ - -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \ -diff -durN libpipeline-1.4.1.orig/gnulib/lib/Makefile.in libpipeline-1.4.1/gnulib/lib/Makefile.in ---- libpipeline-1.4.1.orig/gnulib/lib/Makefile.in 2015-08-17 17:14:24.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/lib/Makefile.in 2017-05-17 10:38:52.093750000 +0800 -@@ -14,7 +14,7 @@ - - @SET_MAKE@ - --# Copyright (C) 2002-2014 Free Software Foundation, Inc. -+# Copyright (C) 2002-2017 Free Software Foundation, Inc. - # - # This file is free software; you can redistribute it and/or modify - # it under the terms of the GNU General Public License as published by -@@ -35,7 +35,7 @@ - # the same distribution terms as the rest of that program. - # - # Generated by gnulib-tool. --# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=gnulib/lib --m4-base=gnulib/m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --no-conditional-dependencies --libtool --macro-prefix=gl --no-vc-files dirname environ error full-write gitlog-to-changelog gnupload largefile lib-ignore mkdtemp safe-read safe-write setenv sigaction signal sigprocmask strerror strsignal sys_select sys_stat unsetenv waitpid warnings xalloc xstrndup xvasprintf -+# Reproduce by: gnulib-tool --import --lib=libgnu --source-base=gnulib/lib --m4-base=gnulib/m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --no-conditional-dependencies --libtool --macro-prefix=gl --no-vc-files dirname environ error full-write gitlog-to-changelog gnupload largefile lib-ignore mkdtemp safe-read safe-write setenv sigaction signal sigprocmask strerror strsignal sys_select sys_stat unsetenv waitpid warnings xalloc xstrndup xvasprintf - - - -@@ -131,6 +131,7 @@ - $(top_srcdir)/gnulib/m4/fcntl-o.m4 \ - $(top_srcdir)/gnulib/m4/fcntl_h.m4 \ - $(top_srcdir)/gnulib/m4/float_h.m4 \ -+ $(top_srcdir)/gnulib/m4/getprogname.m4 \ - $(top_srcdir)/gnulib/m4/gettimeofday.m4 \ - $(top_srcdir)/gnulib/m4/gnulib-common.m4 \ - $(top_srcdir)/gnulib/m4/gnulib-comp.m4 \ -@@ -143,6 +144,8 @@ - $(top_srcdir)/gnulib/m4/lib-link.m4 \ - $(top_srcdir)/gnulib/m4/lib-prefix.m4 \ - $(top_srcdir)/gnulib/m4/libtool.m4 \ -+ $(top_srcdir)/gnulib/m4/limits-h.m4 \ -+ $(top_srcdir)/gnulib/m4/localtime-buffer.m4 \ - $(top_srcdir)/gnulib/m4/lock.m4 \ - $(top_srcdir)/gnulib/m4/longlong.m4 \ - $(top_srcdir)/gnulib/m4/lstat.m4 \ -@@ -162,6 +165,7 @@ - $(top_srcdir)/gnulib/m4/onceonly.m4 \ - $(top_srcdir)/gnulib/m4/pathmax.m4 \ - $(top_srcdir)/gnulib/m4/printf.m4 \ -+ $(top_srcdir)/gnulib/m4/pthread_rwlock_rdlock.m4 \ - $(top_srcdir)/gnulib/m4/raise.m4 \ - $(top_srcdir)/gnulib/m4/read.m4 \ - $(top_srcdir)/gnulib/m4/safe-read.m4 \ -@@ -226,8 +230,8 @@ - am__dirstamp = $(am__leading_dot)dirstamp - am_libgnu_la_OBJECTS = dirname.lo basename.lo dirname-lgpl.lo \ - basename-lgpl.lo stripslash.lo exitfail.lo full-write.lo \ -- glthread/lock.lo malloca.lo safe-read.lo safe-write.lo \ -- sig-handler.lo tempname.lo glthread/threadlib.lo \ -+ getprogname.lo glthread/lock.lo malloca.lo safe-read.lo \ -+ safe-write.lo sig-handler.lo tempname.lo glthread/threadlib.lo \ - glthread/tls.lo unistd.lo xmalloc.lo xalloc-die.lo xsize.lo \ - xstrndup.lo xvasprintf.lo xasprintf.lo - libgnu_la_OBJECTS = $(am_libgnu_la_OBJECTS) -@@ -395,6 +399,7 @@ - GNULIB_CHDIR = @GNULIB_CHDIR@ - GNULIB_CHOWN = @GNULIB_CHOWN@ - GNULIB_CLOSE = @GNULIB_CLOSE@ -+GNULIB_CTIME = @GNULIB_CTIME@ - GNULIB_DPRINTF = @GNULIB_DPRINTF@ - GNULIB_DUP = @GNULIB_DUP@ - GNULIB_DUP2 = @GNULIB_DUP2@ -@@ -456,6 +461,7 @@ - GNULIB_LCHOWN = @GNULIB_LCHOWN@ - GNULIB_LINK = @GNULIB_LINK@ - GNULIB_LINKAT = @GNULIB_LINKAT@ -+GNULIB_LOCALTIME = @GNULIB_LOCALTIME@ - GNULIB_LSEEK = @GNULIB_LSEEK@ - GNULIB_LSTAT = @GNULIB_LSTAT@ - GNULIB_MALLOC_POSIX = @GNULIB_MALLOC_POSIX@ -@@ -500,6 +506,8 @@ - GNULIB_OBSTACK_PRINTF_POSIX = @GNULIB_OBSTACK_PRINTF_POSIX@ - GNULIB_OPEN = @GNULIB_OPEN@ - GNULIB_OPENAT = @GNULIB_OPENAT@ -+GNULIB_OVERRIDES_STRUCT_STAT = @GNULIB_OVERRIDES_STRUCT_STAT@ -+GNULIB_OVERRIDES_WINT_T = @GNULIB_OVERRIDES_WINT_T@ - GNULIB_PCLOSE = @GNULIB_PCLOSE@ - GNULIB_PERROR = @GNULIB_PERROR@ - GNULIB_PIPE = @GNULIB_PIPE@ -@@ -518,6 +526,7 @@ - GNULIB_PUTENV = @GNULIB_PUTENV@ - GNULIB_PUTS = @GNULIB_PUTS@ - GNULIB_PWRITE = @GNULIB_PWRITE@ -+GNULIB_QSORT_R = @GNULIB_QSORT_R@ - GNULIB_RAISE = @GNULIB_RAISE@ - GNULIB_RANDOM = @GNULIB_RANDOM@ - GNULIB_RANDOM_R = @GNULIB_RANDOM_R@ -@@ -553,6 +562,7 @@ - GNULIB_STRDUP = @GNULIB_STRDUP@ - GNULIB_STRERROR = @GNULIB_STRERROR@ - GNULIB_STRERROR_R = @GNULIB_STRERROR_R@ -+GNULIB_STRFTIME = @GNULIB_STRFTIME@ - GNULIB_STRNCAT = @GNULIB_STRNCAT@ - GNULIB_STRNDUP = @GNULIB_STRNDUP@ - GNULIB_STRNLEN = @GNULIB_STRNLEN@ -@@ -571,8 +581,11 @@ - GNULIB_SYSTEM_POSIX = @GNULIB_SYSTEM_POSIX@ - GNULIB_TIMEGM = @GNULIB_TIMEGM@ - GNULIB_TIME_R = @GNULIB_TIME_R@ -+GNULIB_TIME_RZ = @GNULIB_TIME_RZ@ - GNULIB_TMPFILE = @GNULIB_TMPFILE@ -+GNULIB_TRUNCATE = @GNULIB_TRUNCATE@ - GNULIB_TTYNAME_R = @GNULIB_TTYNAME_R@ -+GNULIB_TZSET = @GNULIB_TZSET@ - GNULIB_UNISTD_H_NONBLOCKING = @GNULIB_UNISTD_H_NONBLOCKING@ - GNULIB_UNISTD_H_SIGPIPE = @GNULIB_UNISTD_H_SIGPIPE@ - GNULIB_UNLINK = @GNULIB_UNLINK@ -@@ -603,6 +616,7 @@ - GNULIB_WCSCPY = @GNULIB_WCSCPY@ - GNULIB_WCSCSPN = @GNULIB_WCSCSPN@ - GNULIB_WCSDUP = @GNULIB_WCSDUP@ -+GNULIB_WCSFTIME = @GNULIB_WCSFTIME@ - GNULIB_WCSLEN = @GNULIB_WCSLEN@ - GNULIB_WCSNCASECMP = @GNULIB_WCSNCASECMP@ - GNULIB_WCSNCAT = @GNULIB_WCSNCAT@ -@@ -631,8 +645,10 @@ - GREP = @GREP@ - HAVE_ATOLL = @HAVE_ATOLL@ - HAVE_BTOWC = @HAVE_BTOWC@ -+HAVE_C99_STDINT_H = @HAVE_C99_STDINT_H@ - HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@ - HAVE_CHOWN = @HAVE_CHOWN@ -+HAVE_CRTDEFS_H = @HAVE_CRTDEFS_H@ - HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@ - HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@ - HAVE_DECL_FDATASYNC = @HAVE_DECL_FDATASYNC@ -@@ -643,6 +659,7 @@ - HAVE_DECL_GETDOMAINNAME = @HAVE_DECL_GETDOMAINNAME@ - HAVE_DECL_GETLINE = @HAVE_DECL_GETLINE@ - HAVE_DECL_GETLOADAVG = @HAVE_DECL_GETLOADAVG@ -+HAVE_DECL_GETLOGIN = @HAVE_DECL_GETLOGIN@ - HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@ - HAVE_DECL_GETPAGESIZE = @HAVE_DECL_GETPAGESIZE@ - HAVE_DECL_GETUSERSHELL = @HAVE_DECL_GETUSERSHELL@ -@@ -699,6 +716,7 @@ - HAVE_LINKAT = @HAVE_LINKAT@ - HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@ - HAVE_LSTAT = @HAVE_LSTAT@ -+HAVE_MAX_ALIGN_T = @HAVE_MAX_ALIGN_T@ - HAVE_MBRLEN = @HAVE_MBRLEN@ - HAVE_MBRTOWC = @HAVE_MBRTOWC@ - HAVE_MBSINIT = @HAVE_MBSINIT@ -@@ -733,6 +751,7 @@ - HAVE_PTSNAME = @HAVE_PTSNAME@ - HAVE_PTSNAME_R = @HAVE_PTSNAME_R@ - HAVE_PWRITE = @HAVE_PWRITE@ -+HAVE_QSORT_R = @HAVE_QSORT_R@ - HAVE_RAISE = @HAVE_RAISE@ - HAVE_RANDOM = @HAVE_RANDOM@ - HAVE_RANDOM_H = @HAVE_RANDOM_H@ -@@ -779,7 +798,10 @@ - HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@ - HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@ - HAVE_TIMEGM = @HAVE_TIMEGM@ -+HAVE_TIMEZONE_T = @HAVE_TIMEZONE_T@ -+HAVE_TRUNCATE = @HAVE_TRUNCATE@ - HAVE_TYPE_VOLATILE_SIG_ATOMIC_T = @HAVE_TYPE_VOLATILE_SIG_ATOMIC_T@ -+HAVE_TZSET = @HAVE_TZSET@ - HAVE_UNISTD_H = @HAVE_UNISTD_H@ - HAVE_UNLINKAT = @HAVE_UNLINKAT@ - HAVE_UNLOCKPT = @HAVE_UNLOCKPT@ -@@ -801,6 +823,7 @@ - HAVE_WCSCPY = @HAVE_WCSCPY@ - HAVE_WCSCSPN = @HAVE_WCSCSPN@ - HAVE_WCSDUP = @HAVE_WCSDUP@ -+HAVE_WCSFTIME = @HAVE_WCSFTIME@ - HAVE_WCSLEN = @HAVE_WCSLEN@ - HAVE_WCSNCASECMP = @HAVE_WCSNCASECMP@ - HAVE_WCSNCAT = @HAVE_WCSNCAT@ -@@ -843,6 +866,7 @@ - LIBS = @LIBS@ - LIBTHREAD = @LIBTHREAD@ - LIBTOOL = @LIBTOOL@ -+LIMITS_H = @LIMITS_H@ - LIPO = @LIPO@ - LN_S = @LN_S@ - LTLIBINTL = @LTLIBINTL@ -@@ -850,6 +874,7 @@ - LTLIBOBJS = @LTLIBOBJS@ - LTLIBPTH = @LTLIBPTH@ - LTLIBTHREAD = @LTLIBTHREAD@ -+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ - MAINT = @MAINT@ - MAKEINFO = @MAKEINFO@ - MANIFEST_TOOL = @MANIFEST_TOOL@ -@@ -857,6 +882,7 @@ - NEXT_AS_FIRST_DIRECTIVE_ERRNO_H = @NEXT_AS_FIRST_DIRECTIVE_ERRNO_H@ - NEXT_AS_FIRST_DIRECTIVE_FCNTL_H = @NEXT_AS_FIRST_DIRECTIVE_FCNTL_H@ - NEXT_AS_FIRST_DIRECTIVE_FLOAT_H = @NEXT_AS_FIRST_DIRECTIVE_FLOAT_H@ -+NEXT_AS_FIRST_DIRECTIVE_LIMITS_H = @NEXT_AS_FIRST_DIRECTIVE_LIMITS_H@ - NEXT_AS_FIRST_DIRECTIVE_SIGNAL_H = @NEXT_AS_FIRST_DIRECTIVE_SIGNAL_H@ - NEXT_AS_FIRST_DIRECTIVE_STDARG_H = @NEXT_AS_FIRST_DIRECTIVE_STDARG_H@ - NEXT_AS_FIRST_DIRECTIVE_STDDEF_H = @NEXT_AS_FIRST_DIRECTIVE_STDDEF_H@ -@@ -875,6 +901,7 @@ - NEXT_ERRNO_H = @NEXT_ERRNO_H@ - NEXT_FCNTL_H = @NEXT_FCNTL_H@ - NEXT_FLOAT_H = @NEXT_FLOAT_H@ -+NEXT_LIMITS_H = @NEXT_LIMITS_H@ - NEXT_SIGNAL_H = @NEXT_SIGNAL_H@ - NEXT_STDARG_H = @NEXT_STDARG_H@ - NEXT_STDDEF_H = @NEXT_STDDEF_H@ -@@ -917,6 +944,7 @@ - REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@ - REPLACE_CHOWN = @REPLACE_CHOWN@ - REPLACE_CLOSE = @REPLACE_CLOSE@ -+REPLACE_CTIME = @REPLACE_CTIME@ - REPLACE_DPRINTF = @REPLACE_DPRINTF@ - REPLACE_DUP = @REPLACE_DUP@ - REPLACE_DUP2 = @REPLACE_DUP2@ -@@ -986,10 +1014,12 @@ - REPLACE_PTSNAME_R = @REPLACE_PTSNAME_R@ - REPLACE_PUTENV = @REPLACE_PUTENV@ - REPLACE_PWRITE = @REPLACE_PWRITE@ -+REPLACE_QSORT_R = @REPLACE_QSORT_R@ - REPLACE_RAISE = @REPLACE_RAISE@ - REPLACE_RANDOM_R = @REPLACE_RANDOM_R@ - REPLACE_READ = @REPLACE_READ@ - REPLACE_READLINK = @REPLACE_READLINK@ -+REPLACE_READLINKAT = @REPLACE_READLINKAT@ - REPLACE_REALLOC = @REPLACE_REALLOC@ - REPLACE_REALPATH = @REPLACE_REALPATH@ - REPLACE_REMOVE = @REPLACE_REMOVE@ -@@ -1010,6 +1040,7 @@ - REPLACE_STRDUP = @REPLACE_STRDUP@ - REPLACE_STRERROR = @REPLACE_STRERROR@ - REPLACE_STRERROR_R = @REPLACE_STRERROR_R@ -+REPLACE_STRFTIME = @REPLACE_STRFTIME@ - REPLACE_STRNCAT = @REPLACE_STRNCAT@ - REPLACE_STRNDUP = @REPLACE_STRNDUP@ - REPLACE_STRNLEN = @REPLACE_STRNLEN@ -@@ -1019,9 +1050,12 @@ - REPLACE_STRTOK_R = @REPLACE_STRTOK_R@ - REPLACE_STRUCT_TIMEVAL = @REPLACE_STRUCT_TIMEVAL@ - REPLACE_SYMLINK = @REPLACE_SYMLINK@ -+REPLACE_SYMLINKAT = @REPLACE_SYMLINKAT@ - REPLACE_TIMEGM = @REPLACE_TIMEGM@ - REPLACE_TMPFILE = @REPLACE_TMPFILE@ -+REPLACE_TRUNCATE = @REPLACE_TRUNCATE@ - REPLACE_TTYNAME_R = @REPLACE_TTYNAME_R@ -+REPLACE_TZSET = @REPLACE_TZSET@ - REPLACE_UNLINK = @REPLACE_UNLINK@ - REPLACE_UNLINKAT = @REPLACE_UNLINKAT@ - REPLACE_UNSETENV = @REPLACE_UNSETENV@ -@@ -1034,6 +1068,7 @@ - REPLACE_VSNPRINTF = @REPLACE_VSNPRINTF@ - REPLACE_VSPRINTF = @REPLACE_VSPRINTF@ - REPLACE_WCRTOMB = @REPLACE_WCRTOMB@ -+REPLACE_WCSFTIME = @REPLACE_WCSFTIME@ - REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@ - REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@ - REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@ -@@ -1054,6 +1089,7 @@ - SYS_TIME_H_DEFINES_STRUCT_TIMESPEC = @SYS_TIME_H_DEFINES_STRUCT_TIMESPEC@ - TIME_H_DEFINES_STRUCT_TIMESPEC = @TIME_H_DEFINES_STRUCT_TIMESPEC@ - UNDEFINE_STRTOK_R = @UNDEFINE_STRTOK_R@ -+UNISTD_H_DEFINES_STRUCT_TIMESPEC = @UNISTD_H_DEFINES_STRUCT_TIMESPEC@ - UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@ - UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS = @UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS@ - VERSION = @VERSION@ -@@ -1061,6 +1097,8 @@ - WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@ - WINDOWS_64_BIT_OFF_T = @WINDOWS_64_BIT_OFF_T@ - WINDOWS_64_BIT_ST_SIZE = @WINDOWS_64_BIT_ST_SIZE@ -+WINDOWS_STAT_INODES = @WINDOWS_STAT_INODES@ -+WINDOWS_STAT_TIMESPEC = @WINDOWS_STAT_TIMESPEC@ - WINT_T_SUFFIX = @WINT_T_SUFFIX@ - abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ -@@ -1125,50 +1163,36 @@ - noinst_LIBRARIES = - noinst_LTLIBRARIES = libgnu.la - EXTRA_DIST = alloca.in.h stripslash.c dirname.h dosname.h errno.in.h \ -- error.c error.h exitfail.h fcntl.in.h float.c float.in.h \ -- itold.c gettimeofday.c \ -+ error.c error.h exitfail.h fcntl.in.h filename.h float.c \ -+ float.in.h itold.c gettimeofday.c \ - $(top_srcdir)/build-aux/gitlog-to-changelog \ - $(top_srcdir)/build-aux/gnupload \ -- $(top_srcdir)/build-aux/config.rpath intprops.h lstat.c \ -- malloc.c malloca.h malloca.valgrind memchr.c memchr.valgrind \ -- mkdtemp.c msvc-inval.c msvc-inval.h msvc-nothrow.c \ -- msvc-nothrow.h pathmax.h raise.c read.c safe-read.h \ -- safe-read.c safe-write.h secure_getenv.c setenv.c \ -- sig-handler.h sigaction.c signal.in.h sigprocmask.c \ -- $(top_srcdir)/build-aux/snippet/_Noreturn.h \ -- $(top_srcdir)/build-aux/snippet/arg-nonnull.h \ -- $(top_srcdir)/build-aux/snippet/c++defs.h \ -- $(top_srcdir)/build-aux/snippet/warn-on-use.h snprintf.c \ -- stat.c stdarg.in.h stdbool.in.h stddef.in.h stdint.in.h \ -- stdio.in.h stdlib.in.h strerror.c strerror-override.c \ -- strerror-override.h string.in.h strndup.c strnlen.c siglist.h \ -- strsignal.c sys_select.in.h sys_stat.in.h sys_time.in.h \ -- sys_types.in.h sys_wait.in.h tempname.h \ -- $(top_srcdir)/build-aux/config.rpath time.in.h unistd.in.h \ -- unsetenv.c asnprintf.c float+.h printf-args.c printf-args.h \ -- printf-parse.c printf-parse.h vasnprintf.c vasnprintf.h \ -- asprintf.c vasprintf.c verify.h waitpid.c wchar.in.h write.c \ -- xalloc.h xalloc-oversized.h xalloc.h -- --# The BUILT_SOURCES created by this Makefile snippet are not used via #include --# statements but through direct file reference. Therefore this snippet must be --# present in all Makefile.am that need it. This is ensured by the applicability --# 'all' defined above. -- --# The BUILT_SOURCES created by this Makefile snippet are not used via #include --# statements but through direct file reference. Therefore this snippet must be --# present in all Makefile.am that need it. This is ensured by the applicability --# 'all' defined above. --BUILT_SOURCES = $(ALLOCA_H) $(ERRNO_H) fcntl.h $(FLOAT_H) signal.h \ -- arg-nonnull.h c++defs.h warn-on-use.h $(STDARG_H) $(STDBOOL_H) \ -- $(STDDEF_H) $(STDINT_H) stdio.h stdlib.h string.h sys/select.h \ -- sys/stat.h sys/time.h sys/types.h sys/wait.h time.h unistd.h \ -- wchar.h -+ $(top_srcdir)/build-aux/config.rpath intprops.h limits.in.h \ -+ localtime-buffer.c localtime-buffer.h lstat.c malloc.c \ -+ malloca.h malloca.valgrind memchr.c memchr.valgrind mkdtemp.c \ -+ msvc-inval.c msvc-inval.h msvc-nothrow.c msvc-nothrow.h \ -+ pathmax.h raise.c read.c safe-read.h safe-read.c safe-write.h \ -+ secure_getenv.c setenv.c sig-handler.h sigaction.c signal.in.h \ -+ sigprocmask.c _Noreturn.h arg-nonnull.h c++defs.h \ -+ warn-on-use.h snprintf.c stat-w32.c stat-w32.h stat.c \ -+ stdarg.in.h stdbool.in.h stddef.in.h stdint.in.h stdio.in.h \ -+ stdlib.in.h strerror.c strerror-override.c strerror-override.h \ -+ string.in.h strndup.c strnlen.c siglist.h strsignal.c \ -+ sys_select.in.h sys_stat.in.h sys_time.in.h sys_types.in.h \ -+ sys_wait.in.h tempname.h $(top_srcdir)/build-aux/config.rpath \ -+ time.in.h unistd.in.h unsetenv.c asnprintf.c float+.h \ -+ printf-args.c printf-args.h printf-parse.c printf-parse.h \ -+ vasnprintf.c vasnprintf.h asprintf.c vasprintf.c verify.h \ -+ waitpid.c wchar.in.h write.c xalloc.h xalloc-oversized.h \ -+ xalloc.h -+BUILT_SOURCES = $(ALLOCA_H) $(ERRNO_H) fcntl.h $(FLOAT_H) $(LIMITS_H) \ -+ signal.h $(STDARG_H) $(STDBOOL_H) $(STDDEF_H) $(STDINT_H) \ -+ stdio.h stdlib.h string.h sys/select.h sys/stat.h sys/time.h \ -+ sys/types.h sys/wait.h time.h unistd.h wchar.h - SUFFIXES = - MOSTLYCLEANFILES = core *.stackdump alloca.h alloca.h-t errno.h \ -- errno.h-t fcntl.h fcntl.h-t float.h float.h-t signal.h \ -- signal.h-t arg-nonnull.h arg-nonnull.h-t c++defs.h c++defs.h-t \ -- warn-on-use.h warn-on-use.h-t stdarg.h stdarg.h-t stdbool.h \ -+ errno.h-t fcntl.h fcntl.h-t float.h float.h-t limits.h \ -+ limits.h-t signal.h signal.h-t stdarg.h stdarg.h-t stdbool.h \ - stdbool.h-t stddef.h stddef.h-t stdint.h stdint.h-t stdio.h \ - stdio.h-t stdlib.h stdlib.h-t string.h string.h-t sys/select.h \ - sys/select.h-t sys/stat.h sys/stat.h-t sys/time.h sys/time.h-t \ -@@ -1178,25 +1202,27 @@ - CLEANFILES = - DISTCLEANFILES = - MAINTAINERCLEANFILES = -+# No GNU Make output. - AM_CPPFLAGS = - AM_CFLAGS = - libgnu_la_SOURCES = dirname.c basename.c dirname-lgpl.c \ - basename-lgpl.c stripslash.c exitfail.c full-write.h \ -- full-write.c gettext.h glthread/lock.h glthread/lock.c \ -- malloca.c safe-read.c safe-write.c sig-handler.c size_max.h \ -- tempname.c glthread/threadlib.c glthread/tls.h glthread/tls.c \ -- unistd.c xmalloc.c xalloc-die.c xsize.h xsize.c xstrndup.h \ -- xstrndup.c xvasprintf.h xvasprintf.c xasprintf.c -+ full-write.c getprogname.h getprogname.c gettext.h \ -+ glthread/lock.h glthread/lock.c malloca.c safe-read.c \ -+ safe-write.c sig-handler.c size_max.h tempname.c \ -+ glthread/threadlib.c glthread/tls.h glthread/tls.c unistd.c \ -+ xmalloc.c xalloc-die.c xsize.h xsize.c xstrndup.h xstrndup.c \ -+ xvasprintf.h xvasprintf.c xasprintf.c - libgnu_la_LIBADD = $(gl_LTLIBOBJS) - libgnu_la_DEPENDENCIES = $(gl_LTLIBOBJS) - EXTRA_libgnu_la_SOURCES = stripslash.c error.c float.c itold.c \ -- gettimeofday.c lstat.c malloc.c memchr.c mkdtemp.c \ -- msvc-inval.c msvc-nothrow.c raise.c read.c safe-read.c \ -- secure_getenv.c setenv.c sigaction.c sigprocmask.c snprintf.c \ -- stat.c strerror.c strerror-override.c strndup.c strnlen.c \ -- strsignal.c unsetenv.c asnprintf.c printf-args.c \ -- printf-parse.c vasnprintf.c asprintf.c vasprintf.c waitpid.c \ -- write.c -+ gettimeofday.c localtime-buffer.c lstat.c malloc.c memchr.c \ -+ mkdtemp.c msvc-inval.c msvc-nothrow.c raise.c read.c \ -+ safe-read.c secure_getenv.c setenv.c sigaction.c sigprocmask.c \ -+ snprintf.c stat-w32.c stat.c strerror.c strerror-override.c \ -+ strndup.c strnlen.c strsignal.c unsetenv.c asnprintf.c \ -+ printf-args.c printf-parse.c vasnprintf.c asprintf.c \ -+ vasprintf.c waitpid.c write.c - libgnu_la_LDFLAGS = $(AM_LDFLAGS) -no-undefined $(LTLIBINTL) \ - $(LTLIBTHREAD) - -@@ -1206,12 +1232,24 @@ - HAVE_INCLUDE_NEXT = (__GNUC__ || 60000000 <= __DECC_VER) - - # Because this Makefile snippet defines a variable used by other --# gnulib Makefile snippets, it must be present in all Makefile.am that -+# gnulib Makefile snippets, it must be present in all makefiles that - # need it. This is ensured by the applicability 'all' defined above. --_NORETURN_H = $(top_srcdir)/build-aux/snippet/_Noreturn.h --ARG_NONNULL_H = arg-nonnull.h --CXXDEFS_H = c++defs.h --WARN_ON_USE_H = warn-on-use.h -+_NORETURN_H = $(srcdir)/_Noreturn.h -+ -+# Because this Makefile snippet defines a variable used by other -+# gnulib Makefile snippets, it must be present in all makefiles that -+# need it. This is ensured by the applicability 'all' defined above. -+ARG_NONNULL_H = $(srcdir)/arg-nonnull.h -+ -+# Because this Makefile snippet defines a variable used by other -+# gnulib Makefile snippets, it must be present in all makefiles that -+# need it. This is ensured by the applicability 'all' defined above. -+CXXDEFS_H = $(srcdir)/c++defs.h -+ -+# Because this Makefile snippet defines a variable used by other -+# gnulib Makefile snippets, it must be present in all makefiles that -+# need it. This is ensured by the applicability 'all' defined above. -+WARN_ON_USE_H = $(srcdir)/warn-on-use.h - all: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) all-recursive - -@@ -1294,8 +1332,10 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/exitfail.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/float.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/full-write.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getprogname.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gettimeofday.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/itold.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/localtime-buffer.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lstat.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/malloc.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/malloca.Plo@am__quote@ -@@ -1315,6 +1355,7 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sigaction.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sigprocmask.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/snprintf.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stat-w32.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stat.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strerror-override.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strerror.Plo@am__quote@ -@@ -1736,6 +1777,22 @@ - @GL_GENERATE_FLOAT_H_FALSE@float.h: $(top_builddir)/config.status - @GL_GENERATE_FLOAT_H_FALSE@ rm -f $@ - -+# We need the following in order to create when the system -+# doesn't have one that is compatible with GNU. -+@GL_GENERATE_LIMITS_H_TRUE@limits.h: limits.in.h $(top_builddir)/config.status -+@GL_GENERATE_LIMITS_H_TRUE@ $(AM_V_GEN)rm -f $@-t $@ && \ -+@GL_GENERATE_LIMITS_H_TRUE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ -+@GL_GENERATE_LIMITS_H_TRUE@ sed -e 's|@''GUARD_PREFIX''@|GL|g' \ -+@GL_GENERATE_LIMITS_H_TRUE@ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ -+@GL_GENERATE_LIMITS_H_TRUE@ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ -+@GL_GENERATE_LIMITS_H_TRUE@ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ -+@GL_GENERATE_LIMITS_H_TRUE@ -e 's|@''NEXT_LIMITS_H''@|$(NEXT_LIMITS_H)|g' \ -+@GL_GENERATE_LIMITS_H_TRUE@ < $(srcdir)/limits.in.h; \ -+@GL_GENERATE_LIMITS_H_TRUE@ } > $@-t && \ -+@GL_GENERATE_LIMITS_H_TRUE@ mv $@-t $@ -+@GL_GENERATE_LIMITS_H_FALSE@limits.h: $(top_builddir)/config.status -+@GL_GENERATE_LIMITS_H_FALSE@ rm -f $@ -+ - # We need the following in order to create when the system - # doesn't have a complete one. - signal.h: signal.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) -@@ -1768,32 +1825,6 @@ - < $(srcdir)/signal.in.h; \ - } > $@-t && \ - mv $@-t $@ --# The arg-nonnull.h that gets inserted into generated .h files is the same as --# build-aux/snippet/arg-nonnull.h, except that it has the copyright header cut --# off. --arg-nonnull.h: $(top_srcdir)/build-aux/snippet/arg-nonnull.h -- $(AM_V_GEN)rm -f $@-t $@ && \ -- sed -n -e '/GL_ARG_NONNULL/,$$p' \ -- < $(top_srcdir)/build-aux/snippet/arg-nonnull.h \ -- > $@-t && \ -- mv $@-t $@ --# The c++defs.h that gets inserted into generated .h files is the same as --# build-aux/snippet/c++defs.h, except that it has the copyright header cut off. --c++defs.h: $(top_srcdir)/build-aux/snippet/c++defs.h -- $(AM_V_GEN)rm -f $@-t $@ && \ -- sed -n -e '/_GL_CXXDEFS/,$$p' \ -- < $(top_srcdir)/build-aux/snippet/c++defs.h \ -- > $@-t && \ -- mv $@-t $@ --# The warn-on-use.h that gets inserted into generated .h files is the same as --# build-aux/snippet/warn-on-use.h, except that it has the copyright header cut --# off. --warn-on-use.h: $(top_srcdir)/build-aux/snippet/warn-on-use.h -- $(AM_V_GEN)rm -f $@-t $@ && \ -- sed -n -e '/^.ifndef/,$$p' \ -- < $(top_srcdir)/build-aux/snippet/warn-on-use.h \ -- > $@-t && \ -- mv $@-t $@ - - # We need the following in order to create when the system - # doesn't have one that works with the given compiler. -@@ -1832,6 +1863,7 @@ - @GL_GENERATE_STDDEF_H_TRUE@ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ - @GL_GENERATE_STDDEF_H_TRUE@ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - @GL_GENERATE_STDDEF_H_TRUE@ -e 's|@''NEXT_STDDEF_H''@|$(NEXT_STDDEF_H)|g' \ -+@GL_GENERATE_STDDEF_H_TRUE@ -e 's|@''HAVE_MAX_ALIGN_T''@|$(HAVE_MAX_ALIGN_T)|g' \ - @GL_GENERATE_STDDEF_H_TRUE@ -e 's|@''HAVE_WCHAR_T''@|$(HAVE_WCHAR_T)|g' \ - @GL_GENERATE_STDDEF_H_TRUE@ -e 's|@''REPLACE_NULL''@|$(REPLACE_NULL)|g' \ - @GL_GENERATE_STDDEF_H_TRUE@ < $(srcdir)/stddef.in.h; \ -@@ -1851,6 +1883,7 @@ - @GL_GENERATE_STDINT_H_TRUE@ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ - @GL_GENERATE_STDINT_H_TRUE@ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - @GL_GENERATE_STDINT_H_TRUE@ -e 's|@''NEXT_STDINT_H''@|$(NEXT_STDINT_H)|g' \ -+@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_C99_STDINT_H''@/$(HAVE_C99_STDINT_H)/g' \ - @GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_SYS_TYPES_H''@/$(HAVE_SYS_TYPES_H)/g' \ - @GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_INTTYPES_H''@/$(HAVE_INTTYPES_H)/g' \ - @GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_SYS_INTTYPES_H''@/$(HAVE_SYS_INTTYPES_H)/g' \ -@@ -1872,6 +1905,7 @@ - @GL_GENERATE_STDINT_H_TRUE@ -e 's/@''BITSIZEOF_WINT_T''@/$(BITSIZEOF_WINT_T)/g' \ - @GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_SIGNED_WINT_T''@/$(HAVE_SIGNED_WINT_T)/g' \ - @GL_GENERATE_STDINT_H_TRUE@ -e 's/@''WINT_T_SUFFIX''@/$(WINT_T_SUFFIX)/g' \ -+@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''GNULIB_OVERRIDES_WINT_T''@/$(GNULIB_OVERRIDES_WINT_T)/g' \ - @GL_GENERATE_STDINT_H_TRUE@ < $(srcdir)/stdint.in.h; \ - @GL_GENERATE_STDINT_H_TRUE@ } > $@-t && \ - @GL_GENERATE_STDINT_H_TRUE@ mv $@-t $@ -@@ -2026,6 +2060,7 @@ - -e 's/@''GNULIB_PTSNAME''@/$(GNULIB_PTSNAME)/g' \ - -e 's/@''GNULIB_PTSNAME_R''@/$(GNULIB_PTSNAME_R)/g' \ - -e 's/@''GNULIB_PUTENV''@/$(GNULIB_PUTENV)/g' \ -+ -e 's/@''GNULIB_QSORT_R''@/$(GNULIB_QSORT_R)/g' \ - -e 's/@''GNULIB_RANDOM''@/$(GNULIB_RANDOM)/g' \ - -e 's/@''GNULIB_RANDOM_R''@/$(GNULIB_RANDOM_R)/g' \ - -e 's/@''GNULIB_REALLOC_POSIX''@/$(GNULIB_REALLOC_POSIX)/g' \ -@@ -2055,6 +2090,7 @@ - -e 's|@''HAVE_POSIX_OPENPT''@|$(HAVE_POSIX_OPENPT)|g' \ - -e 's|@''HAVE_PTSNAME''@|$(HAVE_PTSNAME)|g' \ - -e 's|@''HAVE_PTSNAME_R''@|$(HAVE_PTSNAME_R)|g' \ -+ -e 's|@''HAVE_QSORT_R''@|$(HAVE_QSORT_R)|g' \ - -e 's|@''HAVE_RANDOM''@|$(HAVE_RANDOM)|g' \ - -e 's|@''HAVE_RANDOM_H''@|$(HAVE_RANDOM_H)|g' \ - -e 's|@''HAVE_RANDOM_R''@|$(HAVE_RANDOM_R)|g' \ -@@ -2077,6 +2113,7 @@ - -e 's|@''REPLACE_PTSNAME''@|$(REPLACE_PTSNAME)|g' \ - -e 's|@''REPLACE_PTSNAME_R''@|$(REPLACE_PTSNAME_R)|g' \ - -e 's|@''REPLACE_PUTENV''@|$(REPLACE_PUTENV)|g' \ -+ -e 's|@''REPLACE_QSORT_R''@|$(REPLACE_QSORT_R)|g' \ - -e 's|@''REPLACE_RANDOM_R''@|$(REPLACE_RANDOM_R)|g' \ - -e 's|@''REPLACE_REALLOC''@|$(REPLACE_REALLOC)|g' \ - -e 's|@''REPLACE_REALPATH''@|$(REPLACE_REALPATH)|g' \ -@@ -2218,6 +2255,7 @@ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_SYS_STAT_H''@|$(NEXT_SYS_STAT_H)|g' \ - -e 's|@''WINDOWS_64_BIT_ST_SIZE''@|$(WINDOWS_64_BIT_ST_SIZE)|g' \ -+ -e 's|@''WINDOWS_STAT_TIMESPEC''@|$(WINDOWS_STAT_TIMESPEC)|g' \ - -e 's/@''GNULIB_FCHMODAT''@/$(GNULIB_FCHMODAT)/g' \ - -e 's/@''GNULIB_FSTAT''@/$(GNULIB_FSTAT)/g' \ - -e 's/@''GNULIB_FSTATAT''@/$(GNULIB_FSTATAT)/g' \ -@@ -2231,6 +2269,7 @@ - -e 's/@''GNULIB_MKNODAT''@/$(GNULIB_MKNODAT)/g' \ - -e 's/@''GNULIB_STAT''@/$(GNULIB_STAT)/g' \ - -e 's/@''GNULIB_UTIMENSAT''@/$(GNULIB_UTIMENSAT)/g' \ -+ -e 's/@''GNULIB_OVERRIDES_STRUCT_STAT''@/$(GNULIB_OVERRIDES_STRUCT_STAT)/g' \ - -e 's|@''HAVE_FCHMODAT''@|$(HAVE_FCHMODAT)|g' \ - -e 's|@''HAVE_FSTATAT''@|$(HAVE_FSTATAT)|g' \ - -e 's|@''HAVE_FUTIMENS''@|$(HAVE_FUTIMENS)|g' \ -@@ -2295,6 +2334,7 @@ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_SYS_TYPES_H''@|$(NEXT_SYS_TYPES_H)|g' \ - -e 's|@''WINDOWS_64_BIT_OFF_T''@|$(WINDOWS_64_BIT_OFF_T)|g' \ -+ -e 's|@''WINDOWS_STAT_INODES''@|$(WINDOWS_STAT_INODES)|g' \ - < $(srcdir)/sys_types.in.h; \ - } > $@-t && \ - mv $@-t $@ -@@ -2327,25 +2367,35 @@ - -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_TIME_H''@|$(NEXT_TIME_H)|g' \ -- -e 's/@''GNULIB_GETTIMEOFDAY''@/$(GNULIB_GETTIMEOFDAY)/g' \ -+ -e 's/@''GNULIB_CTIME''@/$(GNULIB_CTIME)/g' \ -+ -e 's/@''GNULIB_LOCALTIME''@/$(GNULIB_LOCALTIME)/g' \ - -e 's/@''GNULIB_MKTIME''@/$(GNULIB_MKTIME)/g' \ - -e 's/@''GNULIB_NANOSLEEP''@/$(GNULIB_NANOSLEEP)/g' \ -+ -e 's/@''GNULIB_STRFTIME''@/$(GNULIB_STRFTIME)/g' \ - -e 's/@''GNULIB_STRPTIME''@/$(GNULIB_STRPTIME)/g' \ - -e 's/@''GNULIB_TIMEGM''@/$(GNULIB_TIMEGM)/g' \ - -e 's/@''GNULIB_TIME_R''@/$(GNULIB_TIME_R)/g' \ -+ -e 's/@''GNULIB_TIME_RZ''@/$(GNULIB_TIME_RZ)/g' \ -+ -e 's/@''GNULIB_TZSET''@/$(GNULIB_TZSET)/g' \ - -e 's|@''HAVE_DECL_LOCALTIME_R''@|$(HAVE_DECL_LOCALTIME_R)|g' \ - -e 's|@''HAVE_NANOSLEEP''@|$(HAVE_NANOSLEEP)|g' \ - -e 's|@''HAVE_STRPTIME''@|$(HAVE_STRPTIME)|g' \ - -e 's|@''HAVE_TIMEGM''@|$(HAVE_TIMEGM)|g' \ -+ -e 's|@''HAVE_TIMEZONE_T''@|$(HAVE_TIMEZONE_T)|g' \ -+ -e 's|@''HAVE_TZSET''@|$(HAVE_TZSET)|g' \ -+ -e 's|@''REPLACE_CTIME''@|$(REPLACE_CTIME)|g' \ - -e 's|@''REPLACE_GMTIME''@|$(REPLACE_GMTIME)|g' \ - -e 's|@''REPLACE_LOCALTIME''@|$(REPLACE_LOCALTIME)|g' \ - -e 's|@''REPLACE_LOCALTIME_R''@|$(REPLACE_LOCALTIME_R)|g' \ - -e 's|@''REPLACE_MKTIME''@|$(REPLACE_MKTIME)|g' \ - -e 's|@''REPLACE_NANOSLEEP''@|$(REPLACE_NANOSLEEP)|g' \ -+ -e 's|@''REPLACE_STRFTIME''@|$(REPLACE_STRFTIME)|g' \ - -e 's|@''REPLACE_TIMEGM''@|$(REPLACE_TIMEGM)|g' \ -+ -e 's|@''REPLACE_TZSET''@|$(REPLACE_TZSET)|g' \ - -e 's|@''PTHREAD_H_DEFINES_STRUCT_TIMESPEC''@|$(PTHREAD_H_DEFINES_STRUCT_TIMESPEC)|g' \ - -e 's|@''SYS_TIME_H_DEFINES_STRUCT_TIMESPEC''@|$(SYS_TIME_H_DEFINES_STRUCT_TIMESPEC)|g' \ - -e 's|@''TIME_H_DEFINES_STRUCT_TIMESPEC''@|$(TIME_H_DEFINES_STRUCT_TIMESPEC)|g' \ -+ -e 's|@''UNISTD_H_DEFINES_STRUCT_TIMESPEC''@|$(UNISTD_H_DEFINES_STRUCT_TIMESPEC)|g' \ - -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ - -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ - -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ -@@ -2406,6 +2456,7 @@ - -e 's/@''GNULIB_SLEEP''@/$(GNULIB_SLEEP)/g' \ - -e 's/@''GNULIB_SYMLINK''@/$(GNULIB_SYMLINK)/g' \ - -e 's/@''GNULIB_SYMLINKAT''@/$(GNULIB_SYMLINKAT)/g' \ -+ -e 's/@''GNULIB_TRUNCATE''@/$(GNULIB_TRUNCATE)/g' \ - -e 's/@''GNULIB_TTYNAME_R''@/$(GNULIB_TTYNAME_R)/g' \ - -e 's/@''GNULIB_UNISTD_H_GETOPT''@/0$(GNULIB_GL_UNISTD_H_GETOPT)/g' \ - -e 's/@''GNULIB_UNISTD_H_NONBLOCKING''@/$(GNULIB_UNISTD_H_NONBLOCKING)/g' \ -@@ -2428,7 +2479,6 @@ - -e 's|@''HAVE_GETDTABLESIZE''@|$(HAVE_GETDTABLESIZE)|g' \ - -e 's|@''HAVE_GETGROUPS''@|$(HAVE_GETGROUPS)|g' \ - -e 's|@''HAVE_GETHOSTNAME''@|$(HAVE_GETHOSTNAME)|g' \ -- -e 's|@''HAVE_GETLOGIN''@|$(HAVE_GETLOGIN)|g' \ - -e 's|@''HAVE_GETPAGESIZE''@|$(HAVE_GETPAGESIZE)|g' \ - -e 's|@''HAVE_GROUP_MEMBER''@|$(HAVE_GROUP_MEMBER)|g' \ - -e 's|@''HAVE_LCHOWN''@|$(HAVE_LCHOWN)|g' \ -@@ -2444,12 +2494,14 @@ - -e 's|@''HAVE_SLEEP''@|$(HAVE_SLEEP)|g' \ - -e 's|@''HAVE_SYMLINK''@|$(HAVE_SYMLINK)|g' \ - -e 's|@''HAVE_SYMLINKAT''@|$(HAVE_SYMLINKAT)|g' \ -+ -e 's|@''HAVE_TRUNCATE''@|$(HAVE_TRUNCATE)|g' \ - -e 's|@''HAVE_UNLINKAT''@|$(HAVE_UNLINKAT)|g' \ - -e 's|@''HAVE_USLEEP''@|$(HAVE_USLEEP)|g' \ - -e 's|@''HAVE_DECL_ENVIRON''@|$(HAVE_DECL_ENVIRON)|g' \ - -e 's|@''HAVE_DECL_FCHDIR''@|$(HAVE_DECL_FCHDIR)|g' \ - -e 's|@''HAVE_DECL_FDATASYNC''@|$(HAVE_DECL_FDATASYNC)|g' \ - -e 's|@''HAVE_DECL_GETDOMAINNAME''@|$(HAVE_DECL_GETDOMAINNAME)|g' \ -+ -e 's|@''HAVE_DECL_GETLOGIN''@|$(HAVE_DECL_GETLOGIN)|g' \ - -e 's|@''HAVE_DECL_GETLOGIN_R''@|$(HAVE_DECL_GETLOGIN_R)|g' \ - -e 's|@''HAVE_DECL_GETPAGESIZE''@|$(HAVE_DECL_GETPAGESIZE)|g' \ - -e 's|@''HAVE_DECL_GETUSERSHELL''@|$(HAVE_DECL_GETUSERSHELL)|g' \ -@@ -2479,9 +2531,12 @@ - -e 's|@''REPLACE_PWRITE''@|$(REPLACE_PWRITE)|g' \ - -e 's|@''REPLACE_READ''@|$(REPLACE_READ)|g' \ - -e 's|@''REPLACE_READLINK''@|$(REPLACE_READLINK)|g' \ -+ -e 's|@''REPLACE_READLINKAT''@|$(REPLACE_READLINKAT)|g' \ - -e 's|@''REPLACE_RMDIR''@|$(REPLACE_RMDIR)|g' \ - -e 's|@''REPLACE_SLEEP''@|$(REPLACE_SLEEP)|g' \ - -e 's|@''REPLACE_SYMLINK''@|$(REPLACE_SYMLINK)|g' \ -+ -e 's|@''REPLACE_SYMLINKAT''@|$(REPLACE_SYMLINKAT)|g' \ -+ -e 's|@''REPLACE_TRUNCATE''@|$(REPLACE_TRUNCATE)|g' \ - -e 's|@''REPLACE_TTYNAME_R''@|$(REPLACE_TTYNAME_R)|g' \ - -e 's|@''REPLACE_UNLINK''@|$(REPLACE_UNLINK)|g' \ - -e 's|@''REPLACE_UNLINKAT''@|$(REPLACE_UNLINKAT)|g' \ -@@ -2507,6 +2562,8 @@ - -e 's|@''HAVE_FEATURES_H''@|$(HAVE_FEATURES_H)|g' \ - -e 's|@''NEXT_WCHAR_H''@|$(NEXT_WCHAR_H)|g' \ - -e 's|@''HAVE_WCHAR_H''@|$(HAVE_WCHAR_H)|g' \ -+ -e 's/@''HAVE_CRTDEFS_H''@/$(HAVE_CRTDEFS_H)/g' \ -+ -e 's/@''GNULIB_OVERRIDES_WINT_T''@/$(GNULIB_OVERRIDES_WINT_T)/g' \ - -e 's/@''GNULIB_BTOWC''@/$(GNULIB_BTOWC)/g' \ - -e 's/@''GNULIB_WCTOB''@/$(GNULIB_WCTOB)/g' \ - -e 's/@''GNULIB_MBSINIT''@/$(GNULIB_MBSINIT)/g' \ -@@ -2546,6 +2603,7 @@ - -e 's/@''GNULIB_WCSSTR''@/$(GNULIB_WCSSTR)/g' \ - -e 's/@''GNULIB_WCSTOK''@/$(GNULIB_WCSTOK)/g' \ - -e 's/@''GNULIB_WCSWIDTH''@/$(GNULIB_WCSWIDTH)/g' \ -+ -e 's/@''GNULIB_WCSFTIME''@/$(GNULIB_WCSFTIME)/g' \ - < $(srcdir)/wchar.in.h | \ - sed -e 's|@''HAVE_WINT_T''@|$(HAVE_WINT_T)|g' \ - -e 's|@''HAVE_BTOWC''@|$(HAVE_BTOWC)|g' \ -@@ -2585,6 +2643,7 @@ - -e 's|@''HAVE_WCSSTR''@|$(HAVE_WCSSTR)|g' \ - -e 's|@''HAVE_WCSTOK''@|$(HAVE_WCSTOK)|g' \ - -e 's|@''HAVE_WCSWIDTH''@|$(HAVE_WCSWIDTH)|g' \ -+ -e 's|@''HAVE_WCSFTIME''@|$(HAVE_WCSFTIME)|g' \ - -e 's|@''HAVE_DECL_WCTOB''@|$(HAVE_DECL_WCTOB)|g' \ - -e 's|@''HAVE_DECL_WCWIDTH''@|$(HAVE_DECL_WCWIDTH)|g' \ - | \ -@@ -2601,6 +2660,7 @@ - -e 's|@''REPLACE_WCSNRTOMBS''@|$(REPLACE_WCSNRTOMBS)|g' \ - -e 's|@''REPLACE_WCWIDTH''@|$(REPLACE_WCWIDTH)|g' \ - -e 's|@''REPLACE_WCSWIDTH''@|$(REPLACE_WCSWIDTH)|g' \ -+ -e 's|@''REPLACE_WCSFTIME''@|$(REPLACE_WCSFTIME)|g' \ - -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ - -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ - -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \ -diff -durN libpipeline-1.4.1.orig/gnulib/lib/malloc.c libpipeline-1.4.1/gnulib/lib/malloc.c ---- libpipeline-1.4.1.orig/gnulib/lib/malloc.c 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/lib/malloc.c 2017-05-17 10:35:17.640625000 +0800 -@@ -1,6 +1,6 @@ - /* malloc() function that is glibc compatible. - -- Copyright (C) 1997-1998, 2006-2007, 2009-2014 Free Software Foundation, Inc. -+ Copyright (C) 1997-1998, 2006-2007, 2009-2017 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 -diff -durN libpipeline-1.4.1.orig/gnulib/lib/malloca.c libpipeline-1.4.1/gnulib/lib/malloca.c ---- libpipeline-1.4.1.orig/gnulib/lib/malloca.c 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/lib/malloca.c 2017-05-17 10:35:17.921875000 +0800 -@@ -1,5 +1,5 @@ - /* Safe automatic memory allocation. -- Copyright (C) 2003, 2006-2007, 2009-2014 Free Software Foundation, Inc. -+ Copyright (C) 2003, 2006-2007, 2009-2017 Free Software Foundation, Inc. - Written by Bruno Haible , 2003. - - This program is free software; you can redistribute it and/or modify -diff -durN libpipeline-1.4.1.orig/gnulib/lib/malloca.h libpipeline-1.4.1/gnulib/lib/malloca.h ---- libpipeline-1.4.1.orig/gnulib/lib/malloca.h 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/lib/malloca.h 2017-05-17 10:35:18.281250000 +0800 -@@ -1,5 +1,5 @@ - /* Safe automatic memory allocation. -- Copyright (C) 2003-2007, 2009-2014 Free Software Foundation, Inc. -+ Copyright (C) 2003-2007, 2009-2017 Free Software Foundation, Inc. - Written by Bruno Haible , 2003. - - This program is free software; you can redistribute it and/or modify -@@ -21,6 +21,9 @@ - #include - #include - #include -+#include -+ -+#include "xalloc-oversized.h" - - - #ifdef __cplusplus -@@ -73,15 +76,7 @@ - It allocates an array of N objects, each with S bytes of memory, - on the stack. S must be positive and N must be nonnegative. - The array must be freed using freea() before the function returns. */ --#if 1 --/* Cf. the definition of xalloc_oversized. */ --# define nmalloca(n, s) \ -- ((n) > (size_t) (sizeof (ptrdiff_t) <= sizeof (size_t) ? -1 : -2) / (s) \ -- ? NULL \ -- : malloca ((n) * (s))) --#else --extern void * nmalloca (size_t n, size_t s); --#endif -+#define nmalloca(n, s) (xalloc_oversized (n, s) ? NULL : malloca ((n) * (s))) - - - #ifdef __cplusplus -diff -durN libpipeline-1.4.1.orig/gnulib/lib/memchr.c libpipeline-1.4.1/gnulib/lib/memchr.c ---- libpipeline-1.4.1.orig/gnulib/lib/memchr.c 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/lib/memchr.c 2017-05-17 10:35:18.718750000 +0800 -@@ -1,4 +1,4 @@ --/* Copyright (C) 1991, 1993, 1996-1997, 1999-2000, 2003-2004, 2006, 2008-2014 -+/* Copyright (C) 1991, 1993, 1996-1997, 1999-2000, 2003-2004, 2006, 2008-2017 - Free Software Foundation, Inc. - - Based on strlen implementation by Torbjorn Granlund (tege@sics.se), -diff -durN libpipeline-1.4.1.orig/gnulib/lib/mkdtemp.c libpipeline-1.4.1/gnulib/lib/mkdtemp.c ---- libpipeline-1.4.1.orig/gnulib/lib/mkdtemp.c 2014-11-08 21:53:37.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/lib/mkdtemp.c 2017-05-17 10:35:19.125000000 +0800 -@@ -1,4 +1,4 @@ --/* Copyright (C) 1999, 2001-2003, 2006-2007, 2009-2014 Free Software -+/* Copyright (C) 1999, 2001-2003, 2006-2007, 2009-2017 Free Software - Foundation, Inc. - This file is part of the GNU C Library. - -diff -durN libpipeline-1.4.1.orig/gnulib/lib/msvc-inval.c libpipeline-1.4.1/gnulib/lib/msvc-inval.c ---- libpipeline-1.4.1.orig/gnulib/lib/msvc-inval.c 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/lib/msvc-inval.c 2017-05-17 10:35:19.390625000 +0800 -@@ -1,5 +1,5 @@ - /* Invalid parameter handler for MSVC runtime libraries. -- Copyright (C) 2011-2014 Free Software Foundation, Inc. -+ Copyright (C) 2011-2017 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 -diff -durN libpipeline-1.4.1.orig/gnulib/lib/msvc-inval.h libpipeline-1.4.1/gnulib/lib/msvc-inval.h ---- libpipeline-1.4.1.orig/gnulib/lib/msvc-inval.h 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/lib/msvc-inval.h 2017-05-17 10:35:19.687500000 +0800 -@@ -1,5 +1,5 @@ - /* Invalid parameter handler for MSVC runtime libraries. -- Copyright (C) 2011-2014 Free Software Foundation, Inc. -+ Copyright (C) 2011-2017 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 -diff -durN libpipeline-1.4.1.orig/gnulib/lib/msvc-nothrow.c libpipeline-1.4.1/gnulib/lib/msvc-nothrow.c ---- libpipeline-1.4.1.orig/gnulib/lib/msvc-nothrow.c 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/lib/msvc-nothrow.c 2017-05-17 10:35:19.984375000 +0800 -@@ -1,6 +1,6 @@ - /* Wrappers that don't throw invalid parameter notifications - with MSVC runtime libraries. -- Copyright (C) 2011-2014 Free Software Foundation, Inc. -+ Copyright (C) 2011-2017 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 -@@ -24,7 +24,9 @@ - #define WIN32_LEAN_AND_MEAN - #include - --#include "msvc-inval.h" -+#if HAVE_MSVC_INVALID_PARAMETER_HANDLER -+# include "msvc-inval.h" -+#endif - - #undef _get_osfhandle - -diff -durN libpipeline-1.4.1.orig/gnulib/lib/msvc-nothrow.h libpipeline-1.4.1/gnulib/lib/msvc-nothrow.h ---- libpipeline-1.4.1.orig/gnulib/lib/msvc-nothrow.h 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/lib/msvc-nothrow.h 2017-05-17 10:35:20.265625000 +0800 -@@ -1,6 +1,6 @@ - /* Wrappers that don't throw invalid parameter notifications - with MSVC runtime libraries. -- Copyright (C) 2011-2014 Free Software Foundation, Inc. -+ Copyright (C) 2011-2017 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 -diff -durN libpipeline-1.4.1.orig/gnulib/lib/pathmax.h libpipeline-1.4.1/gnulib/lib/pathmax.h ---- libpipeline-1.4.1.orig/gnulib/lib/pathmax.h 2014-11-08 21:53:37.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/lib/pathmax.h 2017-05-17 10:35:20.578125000 +0800 -@@ -1,5 +1,5 @@ - /* Define PATH_MAX somehow. Requires sys/types.h. -- Copyright (C) 1992, 1999, 2001, 2003, 2005, 2009-2014 Free Software -+ Copyright (C) 1992, 1999, 2001, 2003, 2005, 2009-2017 Free Software - Foundation, Inc. - - This program is free software; you can redistribute it and/or modify -diff -durN libpipeline-1.4.1.orig/gnulib/lib/printf-args.c libpipeline-1.4.1/gnulib/lib/printf-args.c ---- libpipeline-1.4.1.orig/gnulib/lib/printf-args.c 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/lib/printf-args.c 2017-05-17 10:35:20.921875000 +0800 -@@ -1,5 +1,5 @@ - /* Decomposed printf argument list. -- Copyright (C) 1999, 2002-2003, 2005-2007, 2009-2014 Free Software -+ Copyright (C) 1999, 2002-2003, 2005-2007, 2009-2017 Free Software - Foundation, Inc. - - This program is free software; you can redistribute it and/or modify -diff -durN libpipeline-1.4.1.orig/gnulib/lib/printf-args.h libpipeline-1.4.1/gnulib/lib/printf-args.h ---- libpipeline-1.4.1.orig/gnulib/lib/printf-args.h 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/lib/printf-args.h 2017-05-17 10:35:21.171875000 +0800 -@@ -1,5 +1,5 @@ - /* Decomposed printf argument list. -- Copyright (C) 1999, 2002-2003, 2006-2007, 2011-2014 Free Software -+ Copyright (C) 1999, 2002-2003, 2006-2007, 2011-2017 Free Software - Foundation, Inc. - - This program is free software; you can redistribute it and/or modify -diff -durN libpipeline-1.4.1.orig/gnulib/lib/printf-parse.c libpipeline-1.4.1/gnulib/lib/printf-parse.c ---- libpipeline-1.4.1.orig/gnulib/lib/printf-parse.c 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/lib/printf-parse.c 2017-05-17 10:35:21.421875000 +0800 -@@ -1,5 +1,5 @@ - /* Formatted output to strings. -- Copyright (C) 1999-2000, 2002-2003, 2006-2014 Free Software Foundation, Inc. -+ Copyright (C) 1999-2000, 2002-2003, 2006-2017 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 -diff -durN libpipeline-1.4.1.orig/gnulib/lib/printf-parse.h libpipeline-1.4.1/gnulib/lib/printf-parse.h ---- libpipeline-1.4.1.orig/gnulib/lib/printf-parse.h 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/lib/printf-parse.h 2017-05-17 10:35:21.671875000 +0800 -@@ -1,5 +1,5 @@ - /* Parse printf format string. -- Copyright (C) 1999, 2002-2003, 2005, 2007, 2010-2014 Free Software -+ Copyright (C) 1999, 2002-2003, 2005, 2007, 2010-2017 Free Software - Foundation, Inc. - - This program is free software; you can redistribute it and/or modify -diff -durN libpipeline-1.4.1.orig/gnulib/lib/raise.c libpipeline-1.4.1/gnulib/lib/raise.c ---- libpipeline-1.4.1.orig/gnulib/lib/raise.c 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/lib/raise.c 2017-05-17 10:35:22.062500000 +0800 -@@ -1,6 +1,6 @@ - /* Provide a non-threads replacement for the POSIX raise function. - -- Copyright (C) 2002-2003, 2005-2006, 2009-2014 Free Software Foundation, Inc. -+ Copyright (C) 2002-2003, 2005-2006, 2009-2017 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 -@@ -27,7 +27,9 @@ - - # include - --# include "msvc-inval.h" -+# if HAVE_MSVC_INVALID_PARAMETER_HANDLER -+# include "msvc-inval.h" -+# endif - - # undef raise - -diff -durN libpipeline-1.4.1.orig/gnulib/lib/read.c libpipeline-1.4.1/gnulib/lib/read.c ---- libpipeline-1.4.1.orig/gnulib/lib/read.c 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/lib/read.c 2017-05-17 10:35:22.421875000 +0800 -@@ -1,5 +1,5 @@ - /* POSIX compatible read() function. -- Copyright (C) 2008-2014 Free Software Foundation, Inc. -+ Copyright (C) 2008-2017 Free Software Foundation, Inc. - Written by Bruno Haible , 2011. - - This program is free software: you can redistribute it and/or modify -@@ -28,8 +28,14 @@ - # define WIN32_LEAN_AND_MEAN /* avoid including junk */ - # include - --# include "msvc-inval.h" --# include "msvc-nothrow.h" -+# if HAVE_MSVC_INVALID_PARAMETER_HANDLER -+# include "msvc-inval.h" -+# endif -+# if GNULIB_MSVC_NOTHROW -+# include "msvc-nothrow.h" -+# else -+# include -+# endif - - # undef read - -diff -durN libpipeline-1.4.1.orig/gnulib/lib/safe-read.c libpipeline-1.4.1/gnulib/lib/safe-read.c ---- libpipeline-1.4.1.orig/gnulib/lib/safe-read.c 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/lib/safe-read.c 2017-05-17 10:35:22.765625000 +0800 -@@ -1,6 +1,6 @@ - /* An interface to read and write that retries after interrupts. - -- Copyright (C) 1993-1994, 1998, 2002-2006, 2009-2014 Free Software -+ Copyright (C) 1993-1994, 1998, 2002-2006, 2009-2017 Free Software - Foundation, Inc. - - This program is free software: you can redistribute it and/or modify -diff -durN libpipeline-1.4.1.orig/gnulib/lib/safe-read.h libpipeline-1.4.1/gnulib/lib/safe-read.h ---- libpipeline-1.4.1.orig/gnulib/lib/safe-read.h 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/lib/safe-read.h 2017-05-17 10:35:23.140625000 +0800 -@@ -1,5 +1,5 @@ - /* An interface to read() that retries after interrupts. -- Copyright (C) 2002, 2006, 2009-2014 Free Software Foundation, Inc. -+ Copyright (C) 2002, 2006, 2009-2017 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 -diff -durN libpipeline-1.4.1.orig/gnulib/lib/safe-write.c libpipeline-1.4.1/gnulib/lib/safe-write.c ---- libpipeline-1.4.1.orig/gnulib/lib/safe-write.c 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/lib/safe-write.c 2017-05-17 10:35:23.453125000 +0800 -@@ -1,5 +1,5 @@ - /* An interface to write that retries after interrupts. -- Copyright (C) 2002, 2009-2014 Free Software Foundation, Inc. -+ Copyright (C) 2002, 2009-2017 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 -diff -durN libpipeline-1.4.1.orig/gnulib/lib/safe-write.h libpipeline-1.4.1/gnulib/lib/safe-write.h ---- libpipeline-1.4.1.orig/gnulib/lib/safe-write.h 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/lib/safe-write.h 2017-05-17 10:35:23.718750000 +0800 -@@ -1,5 +1,5 @@ - /* An interface to write() that retries after interrupts. -- Copyright (C) 2002, 2009-2014 Free Software Foundation, Inc. -+ Copyright (C) 2002, 2009-2017 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 -diff -durN libpipeline-1.4.1.orig/gnulib/lib/secure_getenv.c libpipeline-1.4.1/gnulib/lib/secure_getenv.c ---- libpipeline-1.4.1.orig/gnulib/lib/secure_getenv.c 2014-11-08 21:53:37.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/lib/secure_getenv.c 2017-05-17 10:35:24.015625000 +0800 -@@ -1,6 +1,6 @@ --/* Look up an environment variable more securely. -+/* Look up an environment variable, returning NULL in insecure situations. - -- Copyright 2013-2014 Free Software Foundation, Inc. -+ Copyright 2013-2017 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 -@@ -20,22 +20,35 @@ - #include - - #if !HAVE___SECURE_GETENV --# if HAVE_ISSETUGID -+# if HAVE_ISSETUGID || (HAVE_GETUID && HAVE_GETEUID && HAVE_GETGID && HAVE_GETEGID) - # include --# else --# undef issetugid --# define issetugid() 1 - # endif - #endif - - char * - secure_getenv (char const *name) - { --#if HAVE___SECURE_GETENV -+#if HAVE___SECURE_GETENV /* glibc */ - return __secure_getenv (name); --#else -+#elif HAVE_ISSETUGID /* OS X, FreeBSD, NetBSD, OpenBSD */ - if (issetugid ()) -- return 0; -+ return NULL; - return getenv (name); -+#elif HAVE_GETUID && HAVE_GETEUID && HAVE_GETGID && HAVE_GETEGID /* other Unix */ -+ if (geteuid () != getuid () || getegid () != getgid ()) -+ return NULL; -+ return getenv (name); -+#elif (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ /* native Windows */ -+ /* On native Windows, there is no such concept as setuid or setgid binaries. -+ - Programs launched as system services have high privileges, but they don't -+ inherit environment variables from a user. -+ - Programs launched by a user with "Run as Administrator" have high -+ privileges and use the environment variables, but the user has been asked -+ whether he agrees. -+ - Programs launched by a user without "Run as Administrator" cannot gain -+ high privileges, therefore there is no risk. */ -+ return getenv (name); -+#else -+ return NULL; - #endif - } -diff -durN libpipeline-1.4.1.orig/gnulib/lib/setenv.c libpipeline-1.4.1/gnulib/lib/setenv.c ---- libpipeline-1.4.1.orig/gnulib/lib/setenv.c 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/lib/setenv.c 2017-05-17 10:35:24.375000000 +0800 -@@ -1,4 +1,4 @@ --/* Copyright (C) 1992, 1995-2003, 2005-2014 Free Software Foundation, Inc. -+/* Copyright (C) 1992, 1995-2003, 2005-2017 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - This program is free software: you can redistribute it and/or modify -diff -durN libpipeline-1.4.1.orig/gnulib/lib/sigaction.c libpipeline-1.4.1/gnulib/lib/sigaction.c ---- libpipeline-1.4.1.orig/gnulib/lib/sigaction.c 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/lib/sigaction.c 2017-05-17 10:35:25.156250000 +0800 -@@ -1,5 +1,5 @@ - /* POSIX compatible signal blocking. -- Copyright (C) 2008-2014 Free Software Foundation, Inc. -+ Copyright (C) 2008-2017 Free Software Foundation, Inc. - Written by Eric Blake , 2008. - - This program is free software: you can redistribute it and/or modify -diff -durN libpipeline-1.4.1.orig/gnulib/lib/sig-handler.h libpipeline-1.4.1/gnulib/lib/sig-handler.h ---- libpipeline-1.4.1.orig/gnulib/lib/sig-handler.h 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/lib/sig-handler.h 2017-05-17 10:35:24.859375000 +0800 -@@ -1,6 +1,6 @@ - /* Convenience declarations when working with . - -- Copyright (C) 2008-2014 Free Software Foundation, Inc. -+ Copyright (C) 2008-2017 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 -@@ -34,7 +34,7 @@ - /* Return the handler of a signal, as a sa_handler_t value regardless - of its true type. The resulting function can be compared to - special values like SIG_IGN but it is not portable to call it. */ --SIG_HANDLER_INLINE sa_handler_t -+SIG_HANDLER_INLINE sa_handler_t _GL_ATTRIBUTE_PURE - get_handler (struct sigaction const *a) - { - #ifdef SA_SIGINFO -diff -durN libpipeline-1.4.1.orig/gnulib/lib/siglist.h libpipeline-1.4.1/gnulib/lib/siglist.h ---- libpipeline-1.4.1.orig/gnulib/lib/siglist.h 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/lib/siglist.h 2017-05-17 10:35:25.437500000 +0800 -@@ -1,5 +1,5 @@ - /* Canonical list of all signal names. -- Copyright (C) 1996-1999, 2008-2014 Free Software Foundation, Inc. -+ Copyright (C) 1996-1999, 2008-2017 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - This program is free software: you can redistribute it and/or modify -diff -durN libpipeline-1.4.1.orig/gnulib/lib/signal.in.h libpipeline-1.4.1/gnulib/lib/signal.in.h ---- libpipeline-1.4.1.orig/gnulib/lib/signal.in.h 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/lib/signal.in.h 2017-05-17 10:35:25.765625000 +0800 -@@ -1,6 +1,6 @@ - /* A GNU-like . - -- Copyright (C) 2006-2014 Free Software Foundation, Inc. -+ Copyright (C) 2006-2017 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 -@@ -55,11 +55,13 @@ - #ifndef _@GUARD_PREFIX@_SIGNAL_H - #define _@GUARD_PREFIX@_SIGNAL_H - --/* Mac OS X 10.3, FreeBSD 6.4, OpenBSD 3.8, OSF/1 4.0, Solaris 2.6 declare -- pthread_sigmask in , not in . -+/* Mac OS X 10.3, FreeBSD 6.4, OpenBSD 3.8, OSF/1 4.0, Solaris 2.6, Android -+ declare pthread_sigmask in , not in . - But avoid namespace pollution on glibc systems.*/ - #if (@GNULIB_PTHREAD_SIGMASK@ || defined GNULIB_POSIXCHECK) \ -- && ((defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __OpenBSD__ || defined __osf__ || defined __sun) \ -+ && ((defined __APPLE__ && defined __MACH__) \ -+ || defined __FreeBSD__ || defined __OpenBSD__ || defined __osf__ \ -+ || defined __sun || defined __ANDROID__) \ - && ! defined __GLIBC__ - # include - #endif -diff -durN libpipeline-1.4.1.orig/gnulib/lib/sigprocmask.c libpipeline-1.4.1/gnulib/lib/sigprocmask.c ---- libpipeline-1.4.1.orig/gnulib/lib/sigprocmask.c 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/lib/sigprocmask.c 2017-05-17 10:35:26.093750000 +0800 -@@ -1,5 +1,5 @@ - /* POSIX compatible signal blocking. -- Copyright (C) 2006-2014 Free Software Foundation, Inc. -+ Copyright (C) 2006-2017 Free Software Foundation, Inc. - Written by Bruno Haible , 2006. - - This program is free software: you can redistribute it and/or modify -diff -durN libpipeline-1.4.1.orig/gnulib/lib/size_max.h libpipeline-1.4.1/gnulib/lib/size_max.h ---- libpipeline-1.4.1.orig/gnulib/lib/size_max.h 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/lib/size_max.h 2017-05-17 10:35:26.375000000 +0800 -@@ -1,5 +1,5 @@ - /* size_max.h -- declare SIZE_MAX through system headers -- Copyright (C) 2005-2006, 2009-2014 Free Software Foundation, Inc. -+ Copyright (C) 2005-2006, 2009-2017 Free Software Foundation, Inc. - Written by Simon Josefsson. - - This program is free software; you can redistribute it and/or modify -diff -durN libpipeline-1.4.1.orig/gnulib/lib/snprintf.c libpipeline-1.4.1/gnulib/lib/snprintf.c ---- libpipeline-1.4.1.orig/gnulib/lib/snprintf.c 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/lib/snprintf.c 2017-05-17 10:35:26.703125000 +0800 -@@ -1,5 +1,5 @@ - /* Formatted output to strings. -- Copyright (C) 2004, 2006-2014 Free Software Foundation, Inc. -+ Copyright (C) 2004, 2006-2017 Free Software Foundation, Inc. - Written by Simon Josefsson and Paul Eggert. - - This program is free software; you can redistribute it and/or modify -diff -durN libpipeline-1.4.1.orig/gnulib/lib/stat.c libpipeline-1.4.1/gnulib/lib/stat.c ---- libpipeline-1.4.1.orig/gnulib/lib/stat.c 2014-11-08 21:53:37.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/lib/stat.c 2017-05-17 10:35:27.046875000 +0800 -@@ -1,5 +1,5 @@ - /* Work around platform bugs in stat. -- Copyright (C) 2009-2014 Free Software Foundation, Inc. -+ Copyright (C) 2009-2017 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 -@@ -14,7 +14,7 @@ - You should have received a copy of the GNU General Public License - along with this program. If not, see . */ - --/* written by Eric Blake */ -+/* Written by Eric Blake and Bruno Haible. */ - - /* If the user's config.h happens to include , let it include only - the system's here, so that orig_stat doesn't recurse to -@@ -28,26 +28,19 @@ - #undef __need_system_sys_stat_h - - #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ --# if _GL_WINDOWS_64_BIT_ST_SIZE --# undef stat /* avoid warning on mingw64 with _FILE_OFFSET_BITS=64 */ --# define stat _stati64 --# define REPLACE_FUNC_STAT_DIR 1 --# undef REPLACE_FUNC_STAT_FILE --# elif REPLACE_FUNC_STAT_FILE --/* mingw64 has a broken stat() function, based on _stat(), in libmingwex.a. -- Bypass it. */ --# define stat _stat --# define REPLACE_FUNC_STAT_DIR 1 --# undef REPLACE_FUNC_STAT_FILE --# endif -+# define WINDOWS_NATIVE - #endif - -+#if !defined WINDOWS_NATIVE -+ - static int - orig_stat (const char *filename, struct stat *buf) - { - return stat (filename, buf); - } - -+#endif -+ - /* Specification. */ - /* Write "sys/stat.h" here, not , otherwise OSF/1 5.1 DTK cc - eliminates this include because of the preliminary #include -@@ -58,16 +51,42 @@ - #include - #include - #include --#include "dosname.h" -+#include "filename.h" -+#include "malloca.h" - #include "verify.h" - --#if REPLACE_FUNC_STAT_DIR --# include "pathmax.h" -- /* The only known systems where REPLACE_FUNC_STAT_DIR is needed also -- have a constant PATH_MAX. */ --# ifndef PATH_MAX --# error "Please port this replacement to your platform" --# endif -+#ifdef WINDOWS_NATIVE -+# define WIN32_LEAN_AND_MEAN -+# include -+# include "stat-w32.h" -+#endif -+ -+#ifdef WINDOWS_NATIVE -+/* Return TRUE if the given file name denotes an UNC root. */ -+static BOOL -+is_unc_root (const char *rname) -+{ -+ /* Test whether it has the syntax '\\server\share'. */ -+ if (ISSLASH (rname[0]) && ISSLASH (rname[1])) -+ { -+ /* It starts with two slashes. Find the next slash. */ -+ const char *p = rname + 2; -+ const char *q = p; -+ while (*q != '\0' && !ISSLASH (*q)) -+ q++; -+ if (q > p && *q != '\0') -+ { -+ /* Found the next slash at q. */ -+ q++; -+ const char *r = q; -+ while (*r != '\0' && !ISSLASH (*r)) -+ r++; -+ if (r > q && *r == '\0') -+ return TRUE; -+ } -+ } -+ return FALSE; -+} - #endif - - /* Store information about NAME into ST. Work around bugs with -@@ -77,62 +96,328 @@ - correctly. */ - - int --rpl_stat (char const *name, struct stat *st) -+rpl_stat (char const *name, struct stat *buf) - { -- int result = orig_stat (name, st); --#if REPLACE_FUNC_STAT_FILE -- /* Solaris 9 mistakenly succeeds when given a non-directory with a -- trailing slash. */ -- if (result == 0 && !S_ISDIR (st->st_mode)) -+#ifdef WINDOWS_NATIVE -+ /* Fill the fields ourselves, because the original stat function returns -+ values for st_atime, st_mtime, st_ctime that depend on the current time -+ zone. See -+ */ -+ /* XXX Should we convert to wchar_t* and prepend '\\?\', in order to work -+ around length limitations -+ ? */ -+ -+ /* POSIX -+ specifies: "More than two leading characters shall be treated as -+ a single character." */ -+ if (ISSLASH (name[0]) && ISSLASH (name[1]) && ISSLASH (name[2])) - { -- size_t len = strlen (name); -- if (ISSLASH (name[len - 1])) -+ name += 2; -+ while (ISSLASH (name[1])) -+ name++; -+ } -+ -+ size_t len = strlen (name); -+ size_t drive_prefix_len = (HAS_DEVICE (name) ? 2 : 0); -+ -+ /* Remove trailing slashes (except the very first one, at position -+ drive_prefix_len), but remember their presence. */ -+ size_t rlen; -+ bool check_dir = false; -+ -+ rlen = len; -+ while (rlen > drive_prefix_len && ISSLASH (name[rlen-1])) -+ { -+ check_dir = true; -+ if (rlen == drive_prefix_len + 1) -+ break; -+ rlen--; -+ } -+ -+ /* Handle '' and 'C:'. */ -+ if (!check_dir && rlen == drive_prefix_len) -+ { -+ errno = ENOENT; -+ return -1; -+ } -+ -+ /* Handle '\\'. */ -+ if (rlen == 1 && ISSLASH (name[0]) && len >= 2) -+ { -+ errno = ENOENT; -+ return -1; -+ } -+ -+ const char *rname; -+ char *malloca_rname; -+ if (rlen == len) -+ { -+ rname = name; -+ malloca_rname = NULL; -+ } -+ else -+ { -+ malloca_rname = malloca (rlen + 1); -+ if (malloca_rname == NULL) - { -- errno = ENOTDIR; -+ errno = ENOMEM; - return -1; - } -+ memcpy (malloca_rname, name, rlen); -+ malloca_rname[rlen] = '\0'; -+ rname = malloca_rname; - } --#endif /* REPLACE_FUNC_STAT_FILE */ --#if REPLACE_FUNC_STAT_DIR - -- if (result == -1 && errno == ENOENT) -+ /* There are two ways to get at the requested information: -+ - by scanning the parent directory and examining the relevant -+ directory entry, -+ - by opening the file directly. -+ The first approach fails for root directories (e.g. 'C:\') and -+ UNC root directories (e.g. '\\server\share'). -+ The second approach fails for some system files (e.g. 'C:\pagefile.sys' -+ and 'C:\hiberfil.sys'): ERROR_SHARING_VIOLATION. -+ The second approach gives more information (in particular, correct -+ st_dev, st_ino, st_nlink fields). -+ So we use the second approach and, as a fallback except for root and -+ UNC root directories, also the first approach. */ -+ { -+ int ret; -+ - { -- /* Due to mingw's oddities, there are some directories (like -- c:\) where stat() only succeeds with a trailing slash, and -- other directories (like c:\windows) where stat() only -- succeeds without a trailing slash. But we want the two to be -- synonymous, since chdir() manages either style. Likewise, Mingw also -- reports ENOENT for names longer than PATH_MAX, when we want -- ENAMETOOLONG, and for stat("file/"), when we want ENOTDIR. -- Fortunately, mingw PATH_MAX is small enough for stack -- allocation. */ -- char fixed_name[PATH_MAX + 1] = {0}; -- size_t len = strlen (name); -- bool check_dir = false; -- verify (PATH_MAX <= 4096); -- if (PATH_MAX <= len) -- errno = ENAMETOOLONG; -- else if (len) -+ /* Approach based on the file. */ -+ -+ /* Open a handle to the file. -+ CreateFile -+ -+ */ -+ HANDLE h = -+ CreateFile (rname, -+ FILE_READ_ATTRIBUTES, -+ FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, -+ NULL, -+ OPEN_EXISTING, -+ /* FILE_FLAG_POSIX_SEMANTICS (treat file names that differ only -+ in case as different) makes sense only when applied to *all* -+ filesystem operations. */ -+ FILE_FLAG_BACKUP_SEMANTICS /* | FILE_FLAG_POSIX_SEMANTICS */, -+ NULL); -+ if (h != INVALID_HANDLE_VALUE) - { -- strcpy (fixed_name, name); -- if (ISSLASH (fixed_name[len - 1])) -- { -- check_dir = true; -- while (len && ISSLASH (fixed_name[len - 1])) -- fixed_name[--len] = '\0'; -- if (!len) -- fixed_name[0] = '/'; -- } -- else -- fixed_name[len++] = '/'; -- result = orig_stat (fixed_name, st); -- if (result == 0 && check_dir && !S_ISDIR (st->st_mode)) -+ ret = _gl_fstat_by_handle (h, rname, buf); -+ CloseHandle (h); -+ goto done; -+ } -+ } -+ -+ /* Test for root and UNC root directories. */ -+ if ((rlen == drive_prefix_len + 1 && ISSLASH (rname[drive_prefix_len])) -+ || is_unc_root (rname)) -+ goto failed; -+ -+ /* Fallback. */ -+ { -+ /* Approach based on the directory entry. */ -+ -+ if (strchr (rname, '?') != NULL || strchr (rname, '*') != NULL) -+ { -+ /* Other Windows API functions would fail with error -+ ERROR_INVALID_NAME. */ -+ if (malloca_rname != NULL) -+ freea (malloca_rname); -+ errno = ENOENT; -+ return -1; -+ } -+ -+ /* Get the details about the directory entry. This can be done through -+ FindFirstFile -+ -+ -+ or through -+ FindFirstFileEx with argument FindExInfoBasic -+ -+ -+ */ -+ WIN32_FIND_DATA info; -+ HANDLE h = FindFirstFile (rname, &info); -+ if (h == INVALID_HANDLE_VALUE) -+ goto failed; -+ -+ /* Test for error conditions before starting to fill *buf. */ -+ if (sizeof (buf->st_size) <= 4 && info.nFileSizeHigh > 0) -+ { -+ FindClose (h); -+ if (malloca_rname != NULL) -+ freea (malloca_rname); -+ errno = EOVERFLOW; -+ return -1; -+ } -+ -+# if _GL_WINDOWS_STAT_INODES -+ buf->st_dev = 0; -+# if _GL_WINDOWS_STAT_INODES == 2 -+ buf->st_ino._gl_ino[0] = buf->st_ino._gl_ino[1] = 0; -+# else /* _GL_WINDOWS_STAT_INODES == 1 */ -+ buf->st_ino = 0; -+# endif -+# else -+ /* st_ino is not wide enough for identifying a file on a device. -+ Without st_ino, st_dev is pointless. */ -+ buf->st_dev = 0; -+ buf->st_ino = 0; -+# endif -+ -+ /* st_mode. */ -+ unsigned int mode = -+ /* XXX How to handle FILE_ATTRIBUTE_REPARSE_POINT ? */ -+ ((info.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) ? _S_IFDIR | S_IEXEC_UGO : _S_IFREG) -+ | S_IREAD_UGO -+ | ((info.dwFileAttributes & FILE_ATTRIBUTE_READONLY) ? 0 : S_IWRITE_UGO); -+ if (!(info.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) -+ { -+ /* Determine whether the file is executable by looking at the file -+ name suffix. */ -+ if (info.nFileSizeHigh > 0 || info.nFileSizeLow > 0) - { -- result = -1; -- errno = ENOTDIR; -+ const char *last_dot = NULL; -+ const char *p; -+ for (p = info.cFileName; *p != '\0'; p++) -+ if (*p == '.') -+ last_dot = p; -+ if (last_dot != NULL) -+ { -+ const char *suffix = last_dot + 1; -+ if (_stricmp (suffix, "exe") == 0 -+ || _stricmp (suffix, "bat") == 0 -+ || _stricmp (suffix, "cmd") == 0 -+ || _stricmp (suffix, "com") == 0) -+ mode |= S_IEXEC_UGO; -+ } - } - } -+ buf->st_mode = mode; -+ -+ /* st_nlink. Ignore hard links here. */ -+ buf->st_nlink = 1; -+ -+ /* There's no easy way to map the Windows SID concept to an integer. */ -+ buf->st_uid = 0; -+ buf->st_gid = 0; -+ -+ /* st_rdev is irrelevant for normal files and directories. */ -+ buf->st_rdev = 0; -+ -+ /* st_size. */ -+ if (sizeof (buf->st_size) <= 4) -+ /* Range check already done above. */ -+ buf->st_size = info.nFileSizeLow; -+ else -+ buf->st_size = ((long long) info.nFileSizeHigh << 32) | (long long) info.nFileSizeLow; -+ -+ /* st_atime, st_mtime, st_ctime. */ -+# if _GL_WINDOWS_STAT_TIMESPEC -+ buf->st_atim = _gl_convert_FILETIME_to_timespec (&info.ftLastAccessTime); -+ buf->st_mtim = _gl_convert_FILETIME_to_timespec (&info.ftLastWriteTime); -+ buf->st_ctim = _gl_convert_FILETIME_to_timespec (&info.ftCreationTime); -+# else -+ buf->st_atime = _gl_convert_FILETIME_to_POSIX (&info.ftLastAccessTime); -+ buf->st_mtime = _gl_convert_FILETIME_to_POSIX (&info.ftLastWriteTime); -+ buf->st_ctime = _gl_convert_FILETIME_to_POSIX (&info.ftCreationTime); -+# endif -+ -+ FindClose (h); -+ -+ ret = 0; -+ } -+ -+ done: -+ if (ret >= 0 && check_dir && !S_ISDIR (buf->st_mode)) -+ { -+ errno = ENOTDIR; -+ ret = -1; -+ } -+ if (malloca_rname != NULL) -+ { -+ int saved_errno = errno; -+ freea (malloca_rname); -+ errno = saved_errno; -+ } -+ return ret; -+ } -+ -+ failed: -+ { -+ DWORD error = GetLastError (); -+ #if 0 -+ fprintf (stderr, "rpl_stat error 0x%x\n", (unsigned int) error); -+ #endif -+ -+ if (malloca_rname != NULL) -+ freea (malloca_rname); -+ -+ switch (error) -+ { -+ /* Some of these errors probably cannot happen with the specific flags -+ that we pass to CreateFile. But who knows... */ -+ case ERROR_FILE_NOT_FOUND: /* The last component of rname does not exist. */ -+ case ERROR_PATH_NOT_FOUND: /* Some directory component in rname does not exist. */ -+ case ERROR_BAD_PATHNAME: /* rname is such as '\\server'. */ -+ case ERROR_BAD_NET_NAME: /* rname is such as '\\server\nonexistentshare'. */ -+ case ERROR_INVALID_NAME: /* rname contains wildcards, misplaced colon, etc. */ -+ case ERROR_DIRECTORY: -+ errno = ENOENT; -+ break; -+ -+ case ERROR_ACCESS_DENIED: /* rname is such as 'C:\System Volume Information\foo'. */ -+ case ERROR_SHARING_VIOLATION: /* rname is such as 'C:\pagefile.sys' (second approach only). */ -+ /* XXX map to EACCESS or EPERM? */ -+ errno = EACCES; -+ break; -+ -+ case ERROR_OUTOFMEMORY: -+ errno = ENOMEM; -+ break; -+ -+ case ERROR_WRITE_PROTECT: -+ errno = EROFS; -+ break; -+ -+ case ERROR_WRITE_FAULT: -+ case ERROR_READ_FAULT: -+ case ERROR_GEN_FAILURE: -+ errno = EIO; -+ break; -+ -+ case ERROR_BUFFER_OVERFLOW: -+ case ERROR_FILENAME_EXCED_RANGE: -+ errno = ENAMETOOLONG; -+ break; -+ -+ case ERROR_DELETE_PENDING: /* XXX map to EACCESS or EPERM? */ -+ errno = EPERM; -+ break; -+ -+ default: -+ errno = EINVAL; -+ break; -+ } -+ -+ return -1; -+ } -+#else -+ int result = orig_stat (name, buf); -+# if REPLACE_FUNC_STAT_FILE -+ /* Solaris 9 mistakenly succeeds when given a non-directory with a -+ trailing slash. */ -+ if (result == 0 && !S_ISDIR (buf->st_mode)) -+ { -+ size_t len = strlen (name); -+ if (ISSLASH (name[len - 1])) -+ { -+ errno = ENOTDIR; -+ return -1; -+ } - } --#endif /* REPLACE_FUNC_STAT_DIR */ -+# endif /* REPLACE_FUNC_STAT_FILE */ - return result; -+#endif - } -diff -durN libpipeline-1.4.1.orig/gnulib/lib/stat-w32.c libpipeline-1.4.1/gnulib/lib/stat-w32.c ---- libpipeline-1.4.1.orig/gnulib/lib/stat-w32.c 1970-01-01 08:00:00.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/lib/stat-w32.c 2017-05-17 10:35:05.421875000 +0800 -@@ -0,0 +1,415 @@ -+/* Core of implementation of fstat and stat for native Windows. -+ Copyright (C) 2017 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 3 of the License, 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, see . */ -+ -+/* Written by Bruno Haible. */ -+ -+#include -+ -+#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ -+ -+/* Ensure that defines FILE_ID_INFO. */ -+#undef _WIN32_WINNT -+#define _WIN32_WINNT _WIN32_WINNT_WIN8 -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+/* Specification. */ -+#include "stat-w32.h" -+ -+#include "pathmax.h" -+#include "verify.h" -+ -+#if _GL_WINDOWS_STAT_INODES == 2 -+/* GetFileInformationByHandleEx was introduced only in Windows Vista. */ -+typedef DWORD (WINAPI * GetFileInformationByHandleExFuncType) (HANDLE hFile, -+ FILE_INFO_BY_HANDLE_CLASS fiClass, -+ LPVOID lpBuffer, -+ DWORD dwBufferSize); -+static GetFileInformationByHandleExFuncType GetFileInformationByHandleExFunc = NULL; -+#endif -+/* GetFinalPathNameByHandle was introduced only in Windows Vista. */ -+typedef DWORD (WINAPI * GetFinalPathNameByHandleFuncType) (HANDLE hFile, -+ LPTSTR lpFilePath, -+ DWORD lenFilePath, -+ DWORD dwFlags); -+static GetFinalPathNameByHandleFuncType GetFinalPathNameByHandleFunc = NULL; -+static BOOL initialized = FALSE; -+ -+static void -+initialize (void) -+{ -+ HMODULE kernel32 = LoadLibrary ("kernel32.dll"); -+ if (kernel32 != NULL) -+ { -+#if _GL_WINDOWS_STAT_INODES == 2 -+ GetFileInformationByHandleExFunc = -+ (GetFileInformationByHandleExFuncType) GetProcAddress (kernel32, "GetFileInformationByHandleEx"); -+#endif -+ GetFinalPathNameByHandleFunc = -+ (GetFinalPathNameByHandleFuncType) GetProcAddress (kernel32, "GetFinalPathNameByHandleA"); -+ } -+ initialized = TRUE; -+} -+ -+/* Converts a FILETIME to GMT time since 1970-01-01 00:00:00. */ -+#if _GL_WINDOWS_STAT_TIMESPEC -+struct timespec -+_gl_convert_FILETIME_to_timespec (const FILETIME *ft) -+{ -+ struct timespec result; -+ /* FILETIME: */ -+ unsigned long long since_1601 = -+ ((unsigned long long) ft->dwHighDateTime << 32) -+ | (unsigned long long) ft->dwLowDateTime; -+ if (since_1601 == 0) -+ { -+ result.tv_sec = 0; -+ result.tv_nsec = 0; -+ } -+ else -+ { -+ /* Between 1601-01-01 and 1970-01-01 there were 280 normal years and 89 -+ leap years, in total 134774 days. */ -+ unsigned long long since_1970 = -+ since_1601 - (unsigned long long) 134774 * (unsigned long long) 86400 * (unsigned long long) 10000000; -+ result.tv_sec = since_1970 / (unsigned long long) 10000000; -+ result.tv_nsec = (unsigned long) (since_1970 % (unsigned long long) 10000000) * 100; -+ } -+ return result; -+} -+#else -+time_t -+_gl_convert_FILETIME_to_POSIX (const FILETIME *ft) -+{ -+ /* FILETIME: */ -+ unsigned long long since_1601 = -+ ((unsigned long long) ft->dwHighDateTime << 32) -+ | (unsigned long long) ft->dwLowDateTime; -+ if (since_1601 == 0) -+ return 0; -+ else -+ { -+ /* Between 1601-01-01 and 1970-01-01 there were 280 normal years and 89 -+ leap years, in total 134774 days. */ -+ unsigned long long since_1970 = -+ since_1601 - (unsigned long long) 134774 * (unsigned long long) 86400 * (unsigned long long) 10000000; -+ return since_1970 / (unsigned long long) 10000000; -+ } -+} -+#endif -+ -+/* Fill *BUF with information about the file designated by H. -+ PATH is the file name, if known, otherwise NULL. -+ Return 0 if successful, or -1 with errno set upon failure. */ -+int -+_gl_fstat_by_handle (HANDLE h, const char *path, struct stat *buf) -+{ -+ /* GetFileType -+ */ -+ DWORD type = GetFileType (h); -+ if (type == FILE_TYPE_DISK) -+ { -+ if (!initialized) -+ initialize (); -+ -+ /* st_mode can be determined through -+ GetFileAttributesEx -+ -+ -+ or through -+ GetFileInformationByHandle -+ -+ -+ or through -+ GetFileInformationByHandleEx with argument FileBasicInfo -+ -+ -+ The latter requires -D_WIN32_WINNT=_WIN32_WINNT_VISTA or higher. */ -+ BY_HANDLE_FILE_INFORMATION info; -+ if (! GetFileInformationByHandle (h, &info)) -+ goto failed; -+ -+ /* Test for error conditions before starting to fill *buf. */ -+ if (sizeof (buf->st_size) <= 4 && info.nFileSizeHigh > 0) -+ { -+ errno = EOVERFLOW; -+ return -1; -+ } -+ -+#if _GL_WINDOWS_STAT_INODES -+ /* st_ino can be determined through -+ GetFileInformationByHandle -+ -+ -+ as 64 bits, or through -+ GetFileInformationByHandleEx with argument FileIdInfo -+ -+ -+ as 128 bits. -+ The latter requires -D_WIN32_WINNT=_WIN32_WINNT_WIN8 or higher. */ -+ /* Experiments show that GetFileInformationByHandleEx does not provide -+ much more information than GetFileInformationByHandle: -+ * The dwVolumeSerialNumber from GetFileInformationByHandle is equal -+ to the low 32 bits of the 64-bit VolumeSerialNumber from -+ GetFileInformationByHandleEx, and is apparently sufficient for -+ identifying the device. -+ * The nFileIndex from GetFileInformationByHandle is equal to the low -+ 64 bits of the 128-bit FileId from GetFileInformationByHandleEx, -+ and the high 64 bits of this 128-bit FileId are zero. -+ * On a FAT file system, GetFileInformationByHandleEx fails with error -+ ERROR_INVALID_PARAMETER, whereas GetFileInformationByHandle -+ succeeds. -+ * On a CIFS/SMB file system, GetFileInformationByHandleEx fails with -+ error ERROR_INVALID_LEVEL, whereas GetFileInformationByHandle -+ succeeds. */ -+# if _GL_WINDOWS_STAT_INODES == 2 -+ if (GetFileInformationByHandleExFunc != NULL) -+ { -+ FILE_ID_INFO id; -+ if (GetFileInformationByHandleExFunc (h, FileIdInfo, &id, sizeof (id))) -+ { -+ buf->st_dev = id.VolumeSerialNumber; -+ verify (sizeof (ino_t) == sizeof (id.FileId)); -+ memcpy (&buf->st_ino, &id.FileId, sizeof (ino_t)); -+ goto ino_done; -+ } -+ else -+ { -+ switch (GetLastError ()) -+ { -+ case ERROR_INVALID_PARAMETER: /* older Windows version, or FAT */ -+ case ERROR_INVALID_LEVEL: /* CIFS/SMB file system */ -+ goto fallback; -+ default: -+ goto failed; -+ } -+ } -+ } -+ fallback: ; -+ /* Fallback for older Windows versions. */ -+ buf->st_dev = info.dwVolumeSerialNumber; -+ buf->st_ino._gl_ino[0] = ((ULONGLONG) info.nFileIndexHigh << 32) | (ULONGLONG) info.nFileIndexLow; -+ buf->st_ino._gl_ino[1] = 0; -+ ino_done: ; -+# else /* _GL_WINDOWS_STAT_INODES == 1 */ -+ buf->st_dev = info.dwVolumeSerialNumber; -+ buf->st_ino = ((ULONGLONG) info.nFileIndexHigh << 32) | (ULONGLONG) info.nFileIndexLow; -+# endif -+#else -+ /* st_ino is not wide enough for identifying a file on a device. -+ Without st_ino, st_dev is pointless. */ -+ buf->st_dev = 0; -+ buf->st_ino = 0; -+#endif -+ -+ /* st_mode. */ -+ unsigned int mode = -+ /* XXX How to handle FILE_ATTRIBUTE_REPARSE_POINT ? */ -+ ((info.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) ? _S_IFDIR | S_IEXEC_UGO : _S_IFREG) -+ | S_IREAD_UGO -+ | ((info.dwFileAttributes & FILE_ATTRIBUTE_READONLY) ? 0 : S_IWRITE_UGO); -+ if (!(info.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) -+ { -+ /* Determine whether the file is executable by looking at the file -+ name suffix. -+ If the file name is already known, use it. Otherwise, for -+ non-empty files, it can be determined through -+ GetFinalPathNameByHandle -+ -+ or through -+ GetFileInformationByHandleEx with argument FileNameInfo -+ -+ -+ Both require -D_WIN32_WINNT=_WIN32_WINNT_VISTA or higher. */ -+ if (info.nFileSizeHigh > 0 || info.nFileSizeLow > 0) -+ { -+ char fpath[PATH_MAX]; -+ if (path != NULL -+ || (GetFinalPathNameByHandleFunc != NULL -+ && GetFinalPathNameByHandleFunc (h, fpath, sizeof (fpath), VOLUME_NAME_NONE) -+ < sizeof (fpath) -+ && (path = fpath, 1))) -+ { -+ const char *last_dot = NULL; -+ const char *p; -+ for (p = path; *p != '\0'; p++) -+ if (*p == '.') -+ last_dot = p; -+ if (last_dot != NULL) -+ { -+ const char *suffix = last_dot + 1; -+ if (_stricmp (suffix, "exe") == 0 -+ || _stricmp (suffix, "bat") == 0 -+ || _stricmp (suffix, "cmd") == 0 -+ || _stricmp (suffix, "com") == 0) -+ mode |= S_IEXEC_UGO; -+ } -+ } -+ else -+ /* Cannot determine file name. Pretend that it is executable. */ -+ mode |= S_IEXEC_UGO; -+ } -+ } -+ buf->st_mode = mode; -+ -+ /* st_nlink can be determined through -+ GetFileInformationByHandle -+ -+ -+ or through -+ GetFileInformationByHandleEx with argument FileStandardInfo -+ -+ -+ The latter requires -D_WIN32_WINNT=_WIN32_WINNT_VISTA or higher. */ -+ buf->st_nlink = (info.nNumberOfLinks > SHRT_MAX ? SHRT_MAX : info.nNumberOfLinks); -+ -+ /* There's no easy way to map the Windows SID concept to an integer. */ -+ buf->st_uid = 0; -+ buf->st_gid = 0; -+ -+ /* st_rdev is irrelevant for normal files and directories. */ -+ buf->st_rdev = 0; -+ -+ /* st_size can be determined through -+ GetFileSizeEx -+ -+ or through -+ GetFileAttributesEx -+ -+ -+ or through -+ GetFileInformationByHandle -+ -+ -+ or through -+ GetFileInformationByHandleEx with argument FileStandardInfo -+ -+ -+ The latter requires -D_WIN32_WINNT=_WIN32_WINNT_VISTA or higher. */ -+ if (sizeof (buf->st_size) <= 4) -+ /* Range check already done above. */ -+ buf->st_size = info.nFileSizeLow; -+ else -+ buf->st_size = ((long long) info.nFileSizeHigh << 32) | (long long) info.nFileSizeLow; -+ -+ /* st_atime, st_mtime, st_ctime can be determined through -+ GetFileTime -+ -+ or through -+ GetFileAttributesEx -+ -+ -+ or through -+ GetFileInformationByHandle -+ -+ -+ or through -+ GetFileInformationByHandleEx with argument FileBasicInfo -+ -+ -+ The latter requires -D_WIN32_WINNT=_WIN32_WINNT_VISTA or higher. */ -+#if _GL_WINDOWS_STAT_TIMESPEC -+ buf->st_atim = _gl_convert_FILETIME_to_timespec (&info.ftLastAccessTime); -+ buf->st_mtim = _gl_convert_FILETIME_to_timespec (&info.ftLastWriteTime); -+ buf->st_ctim = _gl_convert_FILETIME_to_timespec (&info.ftCreationTime); -+#else -+ buf->st_atime = _gl_convert_FILETIME_to_POSIX (&info.ftLastAccessTime); -+ buf->st_mtime = _gl_convert_FILETIME_to_POSIX (&info.ftLastWriteTime); -+ buf->st_ctime = _gl_convert_FILETIME_to_POSIX (&info.ftCreationTime); -+#endif -+ -+ return 0; -+ } -+ else if (type == FILE_TYPE_CHAR || type == FILE_TYPE_PIPE) -+ { -+ buf->st_dev = 0; -+#if _GL_WINDOWS_STAT_INODES == 2 -+ buf->st_ino._gl_ino[0] = buf->st_ino._gl_ino[1] = 0; -+#else -+ buf->st_ino = 0; -+#endif -+ buf->st_mode = (type == FILE_TYPE_PIPE ? _S_IFIFO : _S_IFCHR); -+ buf->st_nlink = 1; -+ buf->st_uid = 0; -+ buf->st_gid = 0; -+ buf->st_rdev = 0; -+ if (type == FILE_TYPE_PIPE) -+ { -+ /* PeekNamedPipe -+ */ -+ DWORD bytes_available; -+ if (PeekNamedPipe (h, NULL, 0, NULL, &bytes_available, NULL)) -+ buf->st_size = bytes_available; -+ else -+ buf->st_size = 0; -+ } -+ else -+ buf->st_size = 0; -+#if _GL_WINDOWS_STAT_TIMESPEC -+ buf->st_atim.tv_sec = 0; buf->st_atim.tv_nsec = 0; -+ buf->st_mtim.tv_sec = 0; buf->st_mtim.tv_nsec = 0; -+ buf->st_ctim.tv_sec = 0; buf->st_ctim.tv_nsec = 0; -+#else -+ buf->st_atime = 0; -+ buf->st_mtime = 0; -+ buf->st_ctime = 0; -+#endif -+ return 0; -+ } -+ else -+ { -+ errno = ENOENT; -+ return -1; -+ } -+ -+ failed: -+ { -+ DWORD error = GetLastError (); -+ #if 0 -+ fprintf (stderr, "_gl_fstat_by_handle error 0x%x\n", (unsigned int) error); -+ #endif -+ switch (error) -+ { -+ case ERROR_ACCESS_DENIED: -+ case ERROR_SHARING_VIOLATION: -+ errno = EACCES; -+ break; -+ -+ case ERROR_OUTOFMEMORY: -+ errno = ENOMEM; -+ break; -+ -+ case ERROR_WRITE_FAULT: -+ case ERROR_READ_FAULT: -+ case ERROR_GEN_FAILURE: -+ errno = EIO; -+ break; -+ -+ default: -+ errno = EINVAL; -+ break; -+ } -+ return -1; -+ } -+} -+ -+#endif -diff -durN libpipeline-1.4.1.orig/gnulib/lib/stat-w32.h libpipeline-1.4.1/gnulib/lib/stat-w32.h ---- libpipeline-1.4.1.orig/gnulib/lib/stat-w32.h 1970-01-01 08:00:00.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/lib/stat-w32.h 2017-05-17 10:35:05.671875000 +0800 -@@ -0,0 +1,37 @@ -+/* Core of implementation of fstat and stat for native Windows. -+ Copyright (C) 2017 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 3 of the License, 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, see . */ -+ -+#ifndef _STAT_W32_H -+#define _STAT_W32_H 1 -+ -+/* Converts a FILETIME to GMT time since 1970-01-01 00:00:00. */ -+#if _GL_WINDOWS_STAT_TIMESPEC -+extern struct timespec _gl_convert_FILETIME_to_timespec (const FILETIME *ft); -+#else -+extern time_t _gl_convert_FILETIME_to_POSIX (const FILETIME *ft); -+#endif -+ -+/* Fill *BUF with information about the file designated by H. -+ PATH is the file name, if known, otherwise NULL. -+ Return 0 if successful, or -1 with errno set upon failure. */ -+extern int _gl_fstat_by_handle (HANDLE h, const char *path, struct stat *buf); -+ -+/* Bitmasks for st_mode. */ -+#define S_IREAD_UGO (_S_IREAD | (_S_IREAD >> 3) | (_S_IREAD >> 6)) -+#define S_IWRITE_UGO (_S_IWRITE | (_S_IWRITE >> 3) | (_S_IWRITE >> 6)) -+#define S_IEXEC_UGO (_S_IEXEC | (_S_IEXEC >> 3) | (_S_IEXEC >> 6)) -+ -+#endif /* _STAT_W32_H */ -diff -durN libpipeline-1.4.1.orig/gnulib/lib/stdarg.in.h libpipeline-1.4.1/gnulib/lib/stdarg.in.h ---- libpipeline-1.4.1.orig/gnulib/lib/stdarg.in.h 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/lib/stdarg.in.h 2017-05-17 10:35:27.390625000 +0800 -@@ -1,5 +1,5 @@ - /* Substitute for and wrapper around . -- Copyright (C) 2008-2014 Free Software Foundation, Inc. -+ Copyright (C) 2008-2017 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 -diff -durN libpipeline-1.4.1.orig/gnulib/lib/stdbool.in.h libpipeline-1.4.1/gnulib/lib/stdbool.in.h ---- libpipeline-1.4.1.orig/gnulib/lib/stdbool.in.h 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/lib/stdbool.in.h 2017-05-17 10:35:27.640625000 +0800 -@@ -1,4 +1,4 @@ --/* Copyright (C) 2001-2003, 2006-2014 Free Software Foundation, Inc. -+/* Copyright (C) 2001-2003, 2006-2017 Free Software Foundation, Inc. - Written by Bruno Haible , 2001. - - This program is free software; you can redistribute it and/or modify -diff -durN libpipeline-1.4.1.orig/gnulib/lib/stddef.in.h libpipeline-1.4.1/gnulib/lib/stddef.in.h ---- libpipeline-1.4.1.orig/gnulib/lib/stddef.in.h 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/lib/stddef.in.h 2017-05-17 10:35:27.906250000 +0800 -@@ -1,6 +1,6 @@ - /* A substitute for POSIX 2008 , for platforms that have issues. - -- Copyright (C) 2009-2014 Free Software Foundation, Inc. -+ Copyright (C) 2009-2017 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 -@@ -39,7 +39,6 @@ - - # if !(defined _@GUARD_PREFIX@_STDDEF_H && defined _GL_STDDEF_WINT_T) - # ifdef __need_wint_t --# undef _@GUARD_PREFIX@_STDDEF_H - # define _GL_STDDEF_WINT_T - # endif - # @INCLUDE_NEXT@ @NEXT_STDDEF_H@ -@@ -54,33 +53,58 @@ - - # @INCLUDE_NEXT@ @NEXT_STDDEF_H@ - --# ifndef _@GUARD_PREFIX@_STDDEF_H --# define _@GUARD_PREFIX@_STDDEF_H -- - /* On NetBSD 5.0, the definition of NULL lacks proper parentheses. */ --#if @REPLACE_NULL@ --# undef NULL --# ifdef __cplusplus -+# if (@REPLACE_NULL@ \ -+ && (!defined _@GUARD_PREFIX@_STDDEF_H || defined _GL_STDDEF_WINT_T)) -+# undef NULL -+# ifdef __cplusplus - /* ISO C++ says that the macro NULL must expand to an integer constant - expression, hence '((void *) 0)' is not allowed in C++. */ --# if __GNUG__ >= 3 -+# if __GNUG__ >= 3 - /* GNU C++ has a __null macro that behaves like an integer ('int' or - 'long') but has the same size as a pointer. Use that, to avoid - warnings. */ --# define NULL __null --# else --# define NULL 0L -+# define NULL __null -+# else -+# define NULL 0L -+# endif -+# else -+# define NULL ((void *) 0) -+# endif - # endif --# else --# define NULL ((void *) 0) --# endif --#endif -+ -+# ifndef _@GUARD_PREFIX@_STDDEF_H -+# define _@GUARD_PREFIX@_STDDEF_H - - /* Some platforms lack wchar_t. */ - #if !@HAVE_WCHAR_T@ - # define wchar_t int - #endif - -+/* Some platforms lack max_align_t. The check for _GCC_MAX_ALIGN_T is -+ a hack in case the configure-time test was done with g++ even though -+ we are currently compiling with gcc. */ -+#if ! (@HAVE_MAX_ALIGN_T@ || defined _GCC_MAX_ALIGN_T) -+/* On the x86, the maximum storage alignment of double, long, etc. is 4, -+ but GCC's C11 ABI for x86 says that max_align_t has an alignment of 8, -+ and the C11 standard allows this. Work around this problem by -+ using __alignof__ (which returns 8 for double) rather than _Alignof -+ (which returns 4), and align each union member accordingly. */ -+# ifdef __GNUC__ -+# define _GL_STDDEF_ALIGNAS(type) \ -+ __attribute__ ((__aligned__ (__alignof__ (type)))) -+# else -+# define _GL_STDDEF_ALIGNAS(type) /* */ -+# endif -+typedef union -+{ -+ char *__p _GL_STDDEF_ALIGNAS (char *); -+ double __d _GL_STDDEF_ALIGNAS (double); -+ long double __ld _GL_STDDEF_ALIGNAS (long double); -+ long int __i _GL_STDDEF_ALIGNAS (long int); -+} max_align_t; -+#endif -+ - # endif /* _@GUARD_PREFIX@_STDDEF_H */ - # endif /* _@GUARD_PREFIX@_STDDEF_H */ - #endif /* __need_XXX */ -diff -durN libpipeline-1.4.1.orig/gnulib/lib/stdint.in.h libpipeline-1.4.1/gnulib/lib/stdint.in.h ---- libpipeline-1.4.1.orig/gnulib/lib/stdint.in.h 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/lib/stdint.in.h 2017-05-17 10:35:28.234375000 +0800 -@@ -1,4 +1,4 @@ --/* Copyright (C) 2001-2002, 2004-2014 Free Software Foundation, Inc. -+/* Copyright (C) 2001-2002, 2004-2017 Free Software Foundation, Inc. - Written by Paul Eggert, Bruno Haible, Sam Steingold, Peter Burwood. - This file is part of gnulib. - -@@ -38,8 +38,7 @@ - other system header files; just include the system's . - Ideally we should test __BIONIC__ here, but it is only defined after - has been included; hence test __ANDROID__ instead. */ --#if defined __ANDROID__ \ -- && defined _SYS_TYPES_H_ && !defined __need_size_t -+#if defined __ANDROID__ && defined _GL_INCLUDING_SYS_TYPES_H - # @INCLUDE_NEXT@ @NEXT_STDINT_H@ - #else - -@@ -80,54 +79,65 @@ - #if ! defined _@GUARD_PREFIX@_STDINT_H && ! defined _GL_JUST_INCLUDE_SYSTEM_STDINT_H - #define _@GUARD_PREFIX@_STDINT_H - -+/* Get SCHAR_MIN, SCHAR_MAX, UCHAR_MAX, INT_MIN, INT_MAX, -+ LONG_MIN, LONG_MAX, ULONG_MAX, _GL_INTEGER_WIDTH. */ -+#include -+ -+/* Override WINT_MIN and WINT_MAX if gnulib's or overrides -+ wint_t. */ -+#if @GNULIB_OVERRIDES_WINT_T@ -+# undef WINT_MIN -+# undef WINT_MAX -+# define WINT_MIN 0x0U -+# define WINT_MAX 0xffffffffU -+#endif -+ -+#if ! @HAVE_C99_STDINT_H@ -+ - /* defines some of the stdint.h types as well, on glibc, - IRIX 6.5, and OpenBSD 3.8 (via ). - AIX 5.2 isn't needed and causes troubles. - Mac OS X 10.4.6 includes (which is us), but - relies on the system definitions, so include - after @NEXT_STDINT_H@. */ --#if @HAVE_SYS_TYPES_H@ && ! defined _AIX --# include --#endif -- --/* Get SCHAR_MIN, SCHAR_MAX, UCHAR_MAX, INT_MIN, INT_MAX, -- LONG_MIN, LONG_MAX, ULONG_MAX. */ --#include -+# if @HAVE_SYS_TYPES_H@ && ! defined _AIX -+# include -+# endif - --#if @HAVE_INTTYPES_H@ -+# if @HAVE_INTTYPES_H@ - /* In OpenBSD 3.8, includes , which defines - int{8,16,32,64}_t, uint{8,16,32,64}_t and __BIT_TYPES_DEFINED__. - also defines intptr_t and uintptr_t. */ --# include --#elif @HAVE_SYS_INTTYPES_H@ -+# include -+# elif @HAVE_SYS_INTTYPES_H@ - /* Solaris 7 has the types except the *_fast*_t types, and - the macros except for *_FAST*_*, INTPTR_MIN, PTRDIFF_MIN, PTRDIFF_MAX. */ --# include --#endif -+# include -+# endif - --#if @HAVE_SYS_BITYPES_H@ && ! defined __BIT_TYPES_DEFINED__ -+# if @HAVE_SYS_BITYPES_H@ && ! defined __BIT_TYPES_DEFINED__ - /* Linux libc4 >= 4.6.7 and libc5 have a that defines - int{8,16,32,64}_t and __BIT_TYPES_DEFINED__. In libc5 >= 5.2.2 it is - included by . */ --# include --#endif -+# include -+# endif - --#undef _GL_JUST_INCLUDE_SYSTEM_INTTYPES_H -+# undef _GL_JUST_INCLUDE_SYSTEM_INTTYPES_H - - /* Minimum and maximum values for an integer type under the usual assumption. - Return an unspecified value if BITS == 0, adding a check to pacify - picky compilers. */ - --#define _STDINT_MIN(signed, bits, zero) \ -- ((signed) ? (- ((zero) + 1) << ((bits) ? (bits) - 1 : 0)) : (zero)) -+/* These are separate macros, because if you try to merge these macros into -+ a single one, HP-UX cc rejects the resulting expression in constant -+ expressions. */ -+# define _STDINT_UNSIGNED_MIN(bits, zero) \ -+ (zero) -+# define _STDINT_SIGNED_MIN(bits, zero) \ -+ (~ _STDINT_MAX (1, bits, zero)) - --#define _STDINT_MAX(signed, bits, zero) \ -- ((signed) \ -- ? ~ _STDINT_MIN (signed, bits, zero) \ -- : /* The expression for the unsigned case. The subtraction of (signed) \ -- is a nop in the unsigned case and avoids "signed integer overflow" \ -- warnings in the signed case. */ \ -- ((((zero) + 1) << ((bits) ? (bits) - 1 - (signed) : 0)) - 1) * 2 + 1) -+# define _STDINT_MAX(signed, bits, zero) \ -+ (((((zero) + 1) << ((bits) ? (bits) - 1 - (signed) : 0)) - 1) * 2 + 1) - - #if !GNULIB_defined_stdint_types - -@@ -136,26 +146,26 @@ - /* Here we assume a standard architecture where the hardware integer - types have 8, 16, 32, optionally 64 bits. */ - --#undef int8_t --#undef uint8_t -+# undef int8_t -+# undef uint8_t - typedef signed char gl_int8_t; - typedef unsigned char gl_uint8_t; --#define int8_t gl_int8_t --#define uint8_t gl_uint8_t -+# define int8_t gl_int8_t -+# define uint8_t gl_uint8_t - --#undef int16_t --#undef uint16_t -+# undef int16_t -+# undef uint16_t - typedef short int gl_int16_t; - typedef unsigned short int gl_uint16_t; --#define int16_t gl_int16_t --#define uint16_t gl_uint16_t -+# define int16_t gl_int16_t -+# define uint16_t gl_uint16_t - --#undef int32_t --#undef uint32_t -+# undef int32_t -+# undef uint32_t - typedef int gl_int32_t; - typedef unsigned int gl_uint32_t; --#define int32_t gl_int32_t --#define uint32_t gl_uint32_t -+# define int32_t gl_int32_t -+# define uint32_t gl_uint32_t - - /* If the system defines INT64_MAX, assume int64_t works. That way, - if the underlying platform defines int64_t to be a 64-bit long long -@@ -163,54 +173,54 @@ - int, which would mess up C++ name mangling. We must use #ifdef - rather than #if, to avoid an error with HP-UX 10.20 cc. */ - --#ifdef INT64_MAX --# define GL_INT64_T --#else -+# ifdef INT64_MAX -+# define GL_INT64_T -+# else - /* Do not undefine int64_t if gnulib is not being used with 64-bit - types, since otherwise it breaks platforms like Tandem/NSK. */ --# if LONG_MAX >> 31 >> 31 == 1 --# undef int64_t -+# if LONG_MAX >> 31 >> 31 == 1 -+# undef int64_t - typedef long int gl_int64_t; --# define int64_t gl_int64_t --# define GL_INT64_T --# elif defined _MSC_VER --# undef int64_t -+# define int64_t gl_int64_t -+# define GL_INT64_T -+# elif defined _MSC_VER -+# undef int64_t - typedef __int64 gl_int64_t; --# define int64_t gl_int64_t --# define GL_INT64_T --# elif @HAVE_LONG_LONG_INT@ --# undef int64_t -+# define int64_t gl_int64_t -+# define GL_INT64_T -+# elif @HAVE_LONG_LONG_INT@ -+# undef int64_t - typedef long long int gl_int64_t; --# define int64_t gl_int64_t --# define GL_INT64_T -+# define int64_t gl_int64_t -+# define GL_INT64_T -+# endif - # endif --#endif - --#ifdef UINT64_MAX --# define GL_UINT64_T --#else --# if ULONG_MAX >> 31 >> 31 >> 1 == 1 --# undef uint64_t --typedef unsigned long int gl_uint64_t; --# define uint64_t gl_uint64_t -+# ifdef UINT64_MAX - # define GL_UINT64_T --# elif defined _MSC_VER --# undef uint64_t -+# else -+# if ULONG_MAX >> 31 >> 31 >> 1 == 1 -+# undef uint64_t -+typedef unsigned long int gl_uint64_t; -+# define uint64_t gl_uint64_t -+# define GL_UINT64_T -+# elif defined _MSC_VER -+# undef uint64_t - typedef unsigned __int64 gl_uint64_t; --# define uint64_t gl_uint64_t --# define GL_UINT64_T --# elif @HAVE_UNSIGNED_LONG_LONG_INT@ --# undef uint64_t -+# define uint64_t gl_uint64_t -+# define GL_UINT64_T -+# elif @HAVE_UNSIGNED_LONG_LONG_INT@ -+# undef uint64_t - typedef unsigned long long int gl_uint64_t; --# define uint64_t gl_uint64_t --# define GL_UINT64_T -+# define uint64_t gl_uint64_t -+# define GL_UINT64_T -+# endif - # endif --#endif - - /* Avoid collision with Solaris 2.5.1 etc. */ --#define _UINT8_T --#define _UINT32_T --#define _UINT64_T -+# define _UINT8_T -+# define _UINT32_T -+# define _UINT64_T - - - /* 7.18.1.2. Minimum-width integer types */ -@@ -219,26 +229,26 @@ - types have 8, 16, 32, optionally 64 bits. Therefore the leastN_t types - are the same as the corresponding N_t types. */ - --#undef int_least8_t --#undef uint_least8_t --#undef int_least16_t --#undef uint_least16_t --#undef int_least32_t --#undef uint_least32_t --#undef int_least64_t --#undef uint_least64_t --#define int_least8_t int8_t --#define uint_least8_t uint8_t --#define int_least16_t int16_t --#define uint_least16_t uint16_t --#define int_least32_t int32_t --#define uint_least32_t uint32_t --#ifdef GL_INT64_T --# define int_least64_t int64_t --#endif --#ifdef GL_UINT64_T --# define uint_least64_t uint64_t --#endif -+# undef int_least8_t -+# undef uint_least8_t -+# undef int_least16_t -+# undef uint_least16_t -+# undef int_least32_t -+# undef uint_least32_t -+# undef int_least64_t -+# undef uint_least64_t -+# define int_least8_t int8_t -+# define uint_least8_t uint8_t -+# define int_least16_t int16_t -+# define uint_least16_t uint16_t -+# define int_least32_t int32_t -+# define uint_least32_t uint32_t -+# ifdef GL_INT64_T -+# define int_least64_t int64_t -+# endif -+# ifdef GL_UINT64_T -+# define uint_least64_t uint64_t -+# endif - - /* 7.18.1.3. Fastest minimum-width integer types */ - -@@ -251,50 +261,55 @@ - uses types consistent with glibc, as that lessens the chance of - incompatibility with older GNU hosts. */ - --#undef int_fast8_t --#undef uint_fast8_t --#undef int_fast16_t --#undef uint_fast16_t --#undef int_fast32_t --#undef uint_fast32_t --#undef int_fast64_t --#undef uint_fast64_t -+# undef int_fast8_t -+# undef uint_fast8_t -+# undef int_fast16_t -+# undef uint_fast16_t -+# undef int_fast32_t -+# undef uint_fast32_t -+# undef int_fast64_t -+# undef uint_fast64_t - typedef signed char gl_int_fast8_t; - typedef unsigned char gl_uint_fast8_t; - --#ifdef __sun -+# ifdef __sun - /* Define types compatible with SunOS 5.10, so that code compiled under - earlier SunOS versions works with code compiled under SunOS 5.10. */ - typedef int gl_int_fast32_t; - typedef unsigned int gl_uint_fast32_t; --#else -+# else - typedef long int gl_int_fast32_t; - typedef unsigned long int gl_uint_fast32_t; --#endif -+# endif - typedef gl_int_fast32_t gl_int_fast16_t; - typedef gl_uint_fast32_t gl_uint_fast16_t; - --#define int_fast8_t gl_int_fast8_t --#define uint_fast8_t gl_uint_fast8_t --#define int_fast16_t gl_int_fast16_t --#define uint_fast16_t gl_uint_fast16_t --#define int_fast32_t gl_int_fast32_t --#define uint_fast32_t gl_uint_fast32_t --#ifdef GL_INT64_T --# define int_fast64_t int64_t --#endif --#ifdef GL_UINT64_T --# define uint_fast64_t uint64_t --#endif -+# define int_fast8_t gl_int_fast8_t -+# define uint_fast8_t gl_uint_fast8_t -+# define int_fast16_t gl_int_fast16_t -+# define uint_fast16_t gl_uint_fast16_t -+# define int_fast32_t gl_int_fast32_t -+# define uint_fast32_t gl_uint_fast32_t -+# ifdef GL_INT64_T -+# define int_fast64_t int64_t -+# endif -+# ifdef GL_UINT64_T -+# define uint_fast64_t uint64_t -+# endif - - /* 7.18.1.4. Integer types capable of holding object pointers */ - --#undef intptr_t --#undef uintptr_t -+/* kLIBC's stdint.h defines _INTPTR_T_DECLARED and needs its own -+ definitions of intptr_t and uintptr_t (which use int and unsigned) -+ to avoid clashes with declarations of system functions like sbrk. */ -+# ifndef _INTPTR_T_DECLARED -+# undef intptr_t -+# undef uintptr_t - typedef long int gl_intptr_t; - typedef unsigned long int gl_uintptr_t; --#define intptr_t gl_intptr_t --#define uintptr_t gl_uintptr_t -+# define intptr_t gl_intptr_t -+# define uintptr_t gl_uintptr_t -+# endif - - /* 7.18.1.5. Greatest-width integer types */ - -@@ -305,33 +320,33 @@ - similarly for UINTMAX_MAX and uintmax_t. This avoids problems with - assuming one type where another is used by the system. */ - --#ifndef INTMAX_MAX --# undef INTMAX_C --# undef intmax_t --# if @HAVE_LONG_LONG_INT@ && LONG_MAX >> 30 == 1 -+# ifndef INTMAX_MAX -+# undef INTMAX_C -+# undef intmax_t -+# if @HAVE_LONG_LONG_INT@ && LONG_MAX >> 30 == 1 - typedef long long int gl_intmax_t; --# define intmax_t gl_intmax_t --# elif defined GL_INT64_T --# define intmax_t int64_t --# else -+# define intmax_t gl_intmax_t -+# elif defined GL_INT64_T -+# define intmax_t int64_t -+# else - typedef long int gl_intmax_t; --# define intmax_t gl_intmax_t -+# define intmax_t gl_intmax_t -+# endif - # endif --#endif - --#ifndef UINTMAX_MAX --# undef UINTMAX_C --# undef uintmax_t --# if @HAVE_UNSIGNED_LONG_LONG_INT@ && ULONG_MAX >> 31 == 1 -+# ifndef UINTMAX_MAX -+# undef UINTMAX_C -+# undef uintmax_t -+# if @HAVE_UNSIGNED_LONG_LONG_INT@ && ULONG_MAX >> 31 == 1 - typedef unsigned long long int gl_uintmax_t; --# define uintmax_t gl_uintmax_t --# elif defined GL_UINT64_T --# define uintmax_t uint64_t --# else -+# define uintmax_t gl_uintmax_t -+# elif defined GL_UINT64_T -+# define uintmax_t uint64_t -+# else - typedef unsigned long int gl_uintmax_t; --# define uintmax_t gl_uintmax_t -+# define uintmax_t gl_uintmax_t -+# endif - # endif --#endif - - /* Verify that intmax_t and uintmax_t have the same size. Too much code - breaks if this is not the case. If this check fails, the reason is likely -@@ -339,8 +354,8 @@ - typedef int _verify_intmax_size[sizeof (intmax_t) == sizeof (uintmax_t) - ? 1 : -1]; - --#define GNULIB_defined_stdint_types 1 --#endif /* !GNULIB_defined_stdint_types */ -+# define GNULIB_defined_stdint_types 1 -+# endif /* !GNULIB_defined_stdint_types */ - - /* 7.18.2. Limits of specified-width integer types */ - -@@ -349,37 +364,37 @@ - /* Here we assume a standard architecture where the hardware integer - types have 8, 16, 32, optionally 64 bits. */ - --#undef INT8_MIN --#undef INT8_MAX --#undef UINT8_MAX --#define INT8_MIN (~ INT8_MAX) --#define INT8_MAX 127 --#define UINT8_MAX 255 -+# undef INT8_MIN -+# undef INT8_MAX -+# undef UINT8_MAX -+# define INT8_MIN (~ INT8_MAX) -+# define INT8_MAX 127 -+# define UINT8_MAX 255 - --#undef INT16_MIN --#undef INT16_MAX --#undef UINT16_MAX --#define INT16_MIN (~ INT16_MAX) --#define INT16_MAX 32767 --#define UINT16_MAX 65535 -+# undef INT16_MIN -+# undef INT16_MAX -+# undef UINT16_MAX -+# define INT16_MIN (~ INT16_MAX) -+# define INT16_MAX 32767 -+# define UINT16_MAX 65535 - --#undef INT32_MIN --#undef INT32_MAX --#undef UINT32_MAX --#define INT32_MIN (~ INT32_MAX) --#define INT32_MAX 2147483647 --#define UINT32_MAX 4294967295U -+# undef INT32_MIN -+# undef INT32_MAX -+# undef UINT32_MAX -+# define INT32_MIN (~ INT32_MAX) -+# define INT32_MAX 2147483647 -+# define UINT32_MAX 4294967295U - --#if defined GL_INT64_T && ! defined INT64_MAX -+# if defined GL_INT64_T && ! defined INT64_MAX - /* Prefer (- INTMAX_C (1) << 63) over (~ INT64_MAX) because SunPRO C 5.0 - evaluates the latter incorrectly in preprocessor expressions. */ --# define INT64_MIN (- INTMAX_C (1) << 63) --# define INT64_MAX INTMAX_C (9223372036854775807) --#endif -+# define INT64_MIN (- INTMAX_C (1) << 63) -+# define INT64_MAX INTMAX_C (9223372036854775807) -+# endif - --#if defined GL_UINT64_T && ! defined UINT64_MAX --# define UINT64_MAX UINTMAX_C (18446744073709551615) --#endif -+# if defined GL_UINT64_T && ! defined UINT64_MAX -+# define UINT64_MAX UINTMAX_C (18446744073709551615) -+# endif - - /* 7.18.2.2. Limits of minimum-width integer types */ - -@@ -387,38 +402,38 @@ - types have 8, 16, 32, optionally 64 bits. Therefore the leastN_t types - are the same as the corresponding N_t types. */ - --#undef INT_LEAST8_MIN --#undef INT_LEAST8_MAX --#undef UINT_LEAST8_MAX --#define INT_LEAST8_MIN INT8_MIN --#define INT_LEAST8_MAX INT8_MAX --#define UINT_LEAST8_MAX UINT8_MAX -+# undef INT_LEAST8_MIN -+# undef INT_LEAST8_MAX -+# undef UINT_LEAST8_MAX -+# define INT_LEAST8_MIN INT8_MIN -+# define INT_LEAST8_MAX INT8_MAX -+# define UINT_LEAST8_MAX UINT8_MAX - --#undef INT_LEAST16_MIN --#undef INT_LEAST16_MAX --#undef UINT_LEAST16_MAX --#define INT_LEAST16_MIN INT16_MIN --#define INT_LEAST16_MAX INT16_MAX --#define UINT_LEAST16_MAX UINT16_MAX -+# undef INT_LEAST16_MIN -+# undef INT_LEAST16_MAX -+# undef UINT_LEAST16_MAX -+# define INT_LEAST16_MIN INT16_MIN -+# define INT_LEAST16_MAX INT16_MAX -+# define UINT_LEAST16_MAX UINT16_MAX - --#undef INT_LEAST32_MIN --#undef INT_LEAST32_MAX --#undef UINT_LEAST32_MAX --#define INT_LEAST32_MIN INT32_MIN --#define INT_LEAST32_MAX INT32_MAX --#define UINT_LEAST32_MAX UINT32_MAX -+# undef INT_LEAST32_MIN -+# undef INT_LEAST32_MAX -+# undef UINT_LEAST32_MAX -+# define INT_LEAST32_MIN INT32_MIN -+# define INT_LEAST32_MAX INT32_MAX -+# define UINT_LEAST32_MAX UINT32_MAX - --#undef INT_LEAST64_MIN --#undef INT_LEAST64_MAX --#ifdef GL_INT64_T --# define INT_LEAST64_MIN INT64_MIN --# define INT_LEAST64_MAX INT64_MAX --#endif -+# undef INT_LEAST64_MIN -+# undef INT_LEAST64_MAX -+# ifdef GL_INT64_T -+# define INT_LEAST64_MIN INT64_MIN -+# define INT_LEAST64_MAX INT64_MAX -+# endif - --#undef UINT_LEAST64_MAX --#ifdef GL_UINT64_T --# define UINT_LEAST64_MAX UINT64_MAX --#endif -+# undef UINT_LEAST64_MAX -+# ifdef GL_UINT64_T -+# define UINT_LEAST64_MAX UINT64_MAX -+# endif - - /* 7.18.2.3. Limits of fastest minimum-width integer types */ - -@@ -426,117 +441,121 @@ - types have 8, 16, 32, optionally 64 bits. Therefore the fastN_t types - are taken from the same list of types. */ - --#undef INT_FAST8_MIN --#undef INT_FAST8_MAX --#undef UINT_FAST8_MAX --#define INT_FAST8_MIN SCHAR_MIN --#define INT_FAST8_MAX SCHAR_MAX --#define UINT_FAST8_MAX UCHAR_MAX -+# undef INT_FAST8_MIN -+# undef INT_FAST8_MAX -+# undef UINT_FAST8_MAX -+# define INT_FAST8_MIN SCHAR_MIN -+# define INT_FAST8_MAX SCHAR_MAX -+# define UINT_FAST8_MAX UCHAR_MAX - --#undef INT_FAST16_MIN --#undef INT_FAST16_MAX --#undef UINT_FAST16_MAX --#define INT_FAST16_MIN INT_FAST32_MIN --#define INT_FAST16_MAX INT_FAST32_MAX --#define UINT_FAST16_MAX UINT_FAST32_MAX -+# undef INT_FAST16_MIN -+# undef INT_FAST16_MAX -+# undef UINT_FAST16_MAX -+# define INT_FAST16_MIN INT_FAST32_MIN -+# define INT_FAST16_MAX INT_FAST32_MAX -+# define UINT_FAST16_MAX UINT_FAST32_MAX - --#undef INT_FAST32_MIN --#undef INT_FAST32_MAX --#undef UINT_FAST32_MAX --#ifdef __sun --# define INT_FAST32_MIN INT_MIN --# define INT_FAST32_MAX INT_MAX --# define UINT_FAST32_MAX UINT_MAX --#else --# define INT_FAST32_MIN LONG_MIN --# define INT_FAST32_MAX LONG_MAX --# define UINT_FAST32_MAX ULONG_MAX --#endif -+# undef INT_FAST32_MIN -+# undef INT_FAST32_MAX -+# undef UINT_FAST32_MAX -+# ifdef __sun -+# define INT_FAST32_MIN INT_MIN -+# define INT_FAST32_MAX INT_MAX -+# define UINT_FAST32_MAX UINT_MAX -+# else -+# define INT_FAST32_MIN LONG_MIN -+# define INT_FAST32_MAX LONG_MAX -+# define UINT_FAST32_MAX ULONG_MAX -+# endif - --#undef INT_FAST64_MIN --#undef INT_FAST64_MAX --#ifdef GL_INT64_T --# define INT_FAST64_MIN INT64_MIN --# define INT_FAST64_MAX INT64_MAX --#endif -+# undef INT_FAST64_MIN -+# undef INT_FAST64_MAX -+# ifdef GL_INT64_T -+# define INT_FAST64_MIN INT64_MIN -+# define INT_FAST64_MAX INT64_MAX -+# endif - --#undef UINT_FAST64_MAX --#ifdef GL_UINT64_T --# define UINT_FAST64_MAX UINT64_MAX --#endif -+# undef UINT_FAST64_MAX -+# ifdef GL_UINT64_T -+# define UINT_FAST64_MAX UINT64_MAX -+# endif - - /* 7.18.2.4. Limits of integer types capable of holding object pointers */ - --#undef INTPTR_MIN --#undef INTPTR_MAX --#undef UINTPTR_MAX --#define INTPTR_MIN LONG_MIN --#define INTPTR_MAX LONG_MAX --#define UINTPTR_MAX ULONG_MAX -+# undef INTPTR_MIN -+# undef INTPTR_MAX -+# undef UINTPTR_MAX -+# define INTPTR_MIN LONG_MIN -+# define INTPTR_MAX LONG_MAX -+# define UINTPTR_MAX ULONG_MAX - - /* 7.18.2.5. Limits of greatest-width integer types */ - --#ifndef INTMAX_MAX --# undef INTMAX_MIN --# ifdef INT64_MAX --# define INTMAX_MIN INT64_MIN --# define INTMAX_MAX INT64_MAX --# else --# define INTMAX_MIN INT32_MIN --# define INTMAX_MAX INT32_MAX -+# ifndef INTMAX_MAX -+# undef INTMAX_MIN -+# ifdef INT64_MAX -+# define INTMAX_MIN INT64_MIN -+# define INTMAX_MAX INT64_MAX -+# else -+# define INTMAX_MIN INT32_MIN -+# define INTMAX_MAX INT32_MAX -+# endif - # endif --#endif - --#ifndef UINTMAX_MAX --# ifdef UINT64_MAX --# define UINTMAX_MAX UINT64_MAX --# else --# define UINTMAX_MAX UINT32_MAX -+# ifndef UINTMAX_MAX -+# ifdef UINT64_MAX -+# define UINTMAX_MAX UINT64_MAX -+# else -+# define UINTMAX_MAX UINT32_MAX -+# endif - # endif --#endif - - /* 7.18.3. Limits of other integer types */ - - /* ptrdiff_t limits */ --#undef PTRDIFF_MIN --#undef PTRDIFF_MAX --#if @APPLE_UNIVERSAL_BUILD@ --# ifdef _LP64 --# define PTRDIFF_MIN _STDINT_MIN (1, 64, 0l) --# define PTRDIFF_MAX _STDINT_MAX (1, 64, 0l) -+# undef PTRDIFF_MIN -+# undef PTRDIFF_MAX -+# if @APPLE_UNIVERSAL_BUILD@ -+# ifdef _LP64 -+# define PTRDIFF_MIN _STDINT_SIGNED_MIN (64, 0l) -+# define PTRDIFF_MAX _STDINT_MAX (1, 64, 0l) -+# else -+# define PTRDIFF_MIN _STDINT_SIGNED_MIN (32, 0) -+# define PTRDIFF_MAX _STDINT_MAX (1, 32, 0) -+# endif - # else --# define PTRDIFF_MIN _STDINT_MIN (1, 32, 0) --# define PTRDIFF_MAX _STDINT_MAX (1, 32, 0) --# endif --#else --# define PTRDIFF_MIN \ -- _STDINT_MIN (1, @BITSIZEOF_PTRDIFF_T@, 0@PTRDIFF_T_SUFFIX@) --# define PTRDIFF_MAX \ -+# define PTRDIFF_MIN \ -+ _STDINT_SIGNED_MIN (@BITSIZEOF_PTRDIFF_T@, 0@PTRDIFF_T_SUFFIX@) -+# define PTRDIFF_MAX \ - _STDINT_MAX (1, @BITSIZEOF_PTRDIFF_T@, 0@PTRDIFF_T_SUFFIX@) --#endif -+# endif - - /* sig_atomic_t limits */ --#undef SIG_ATOMIC_MIN --#undef SIG_ATOMIC_MAX --#define SIG_ATOMIC_MIN \ -- _STDINT_MIN (@HAVE_SIGNED_SIG_ATOMIC_T@, @BITSIZEOF_SIG_ATOMIC_T@, \ -- 0@SIG_ATOMIC_T_SUFFIX@) --#define SIG_ATOMIC_MAX \ -+# undef SIG_ATOMIC_MIN -+# undef SIG_ATOMIC_MAX -+# if @HAVE_SIGNED_SIG_ATOMIC_T@ -+# define SIG_ATOMIC_MIN \ -+ _STDINT_SIGNED_MIN (@BITSIZEOF_SIG_ATOMIC_T@, 0@SIG_ATOMIC_T_SUFFIX@) -+# else -+# define SIG_ATOMIC_MIN \ -+ _STDINT_UNSIGNED_MIN (@BITSIZEOF_SIG_ATOMIC_T@, 0@SIG_ATOMIC_T_SUFFIX@) -+# endif -+# define SIG_ATOMIC_MAX \ - _STDINT_MAX (@HAVE_SIGNED_SIG_ATOMIC_T@, @BITSIZEOF_SIG_ATOMIC_T@, \ - 0@SIG_ATOMIC_T_SUFFIX@) - - - /* size_t limit */ --#undef SIZE_MAX --#if @APPLE_UNIVERSAL_BUILD@ --# ifdef _LP64 --# define SIZE_MAX _STDINT_MAX (0, 64, 0ul) -+# undef SIZE_MAX -+# if @APPLE_UNIVERSAL_BUILD@ -+# ifdef _LP64 -+# define SIZE_MAX _STDINT_MAX (0, 64, 0ul) -+# else -+# define SIZE_MAX _STDINT_MAX (0, 32, 0ul) -+# endif - # else --# define SIZE_MAX _STDINT_MAX (0, 32, 0ul) -+# define SIZE_MAX _STDINT_MAX (0, @BITSIZEOF_SIZE_T@, 0@SIZE_T_SUFFIX@) - # endif --#else --# define SIZE_MAX _STDINT_MAX (0, @BITSIZEOF_SIZE_T@, 0@SIZE_T_SUFFIX@) --#endif - - /* wchar_t limits */ - /* Get WCHAR_MIN, WCHAR_MAX. -@@ -544,29 +563,39 @@ - sequence of nested includes - -> -> -> , and the latter includes - and assumes its types are already defined. */ --#if @HAVE_WCHAR_H@ && ! (defined WCHAR_MIN && defined WCHAR_MAX) -+# if @HAVE_WCHAR_H@ && ! (defined WCHAR_MIN && defined WCHAR_MAX) - /* BSD/OS 4.0.1 has a bug: , and must be - included before . */ --# include --# include --# include --# define _GL_JUST_INCLUDE_SYSTEM_WCHAR_H --# include --# undef _GL_JUST_INCLUDE_SYSTEM_WCHAR_H --#endif --#undef WCHAR_MIN --#undef WCHAR_MAX --#define WCHAR_MIN \ -- _STDINT_MIN (@HAVE_SIGNED_WCHAR_T@, @BITSIZEOF_WCHAR_T@, 0@WCHAR_T_SUFFIX@) --#define WCHAR_MAX \ -+# include -+# include -+# include -+# define _GL_JUST_INCLUDE_SYSTEM_WCHAR_H -+# include -+# undef _GL_JUST_INCLUDE_SYSTEM_WCHAR_H -+# endif -+# undef WCHAR_MIN -+# undef WCHAR_MAX -+# if @HAVE_SIGNED_WCHAR_T@ -+# define WCHAR_MIN \ -+ _STDINT_SIGNED_MIN (@BITSIZEOF_WCHAR_T@, 0@WCHAR_T_SUFFIX@) -+# else -+# define WCHAR_MIN \ -+ _STDINT_UNSIGNED_MIN (@BITSIZEOF_WCHAR_T@, 0@WCHAR_T_SUFFIX@) -+# endif -+# define WCHAR_MAX \ - _STDINT_MAX (@HAVE_SIGNED_WCHAR_T@, @BITSIZEOF_WCHAR_T@, 0@WCHAR_T_SUFFIX@) - - /* wint_t limits */ --#undef WINT_MIN --#undef WINT_MAX --#define WINT_MIN \ -- _STDINT_MIN (@HAVE_SIGNED_WINT_T@, @BITSIZEOF_WINT_T@, 0@WINT_T_SUFFIX@) --#define WINT_MAX \ -+# undef WINT_MIN -+# undef WINT_MAX -+# if @HAVE_SIGNED_WINT_T@ -+# define WINT_MIN \ -+ _STDINT_SIGNED_MIN (@BITSIZEOF_WINT_T@, 0@WINT_T_SUFFIX@) -+# else -+# define WINT_MIN \ -+ _STDINT_UNSIGNED_MIN (@BITSIZEOF_WINT_T@, 0@WINT_T_SUFFIX@) -+# endif -+# define WINT_MAX \ - _STDINT_MAX (@HAVE_SIGNED_WINT_T@, @BITSIZEOF_WINT_T@, 0@WINT_T_SUFFIX@) - - /* 7.18.4. Macros for integer constants */ -@@ -577,59 +606,120 @@ - /* Here we assume a standard architecture where the hardware integer - types have 8, 16, 32, optionally 64 bits, and int is 32 bits. */ - --#undef INT8_C --#undef UINT8_C --#define INT8_C(x) x --#define UINT8_C(x) x -+# undef INT8_C -+# undef UINT8_C -+# define INT8_C(x) x -+# define UINT8_C(x) x - --#undef INT16_C --#undef UINT16_C --#define INT16_C(x) x --#define UINT16_C(x) x -+# undef INT16_C -+# undef UINT16_C -+# define INT16_C(x) x -+# define UINT16_C(x) x - --#undef INT32_C --#undef UINT32_C --#define INT32_C(x) x --#define UINT32_C(x) x ## U -+# undef INT32_C -+# undef UINT32_C -+# define INT32_C(x) x -+# define UINT32_C(x) x ## U - --#undef INT64_C --#undef UINT64_C --#if LONG_MAX >> 31 >> 31 == 1 --# define INT64_C(x) x##L --#elif defined _MSC_VER --# define INT64_C(x) x##i64 --#elif @HAVE_LONG_LONG_INT@ --# define INT64_C(x) x##LL --#endif --#if ULONG_MAX >> 31 >> 31 >> 1 == 1 --# define UINT64_C(x) x##UL --#elif defined _MSC_VER --# define UINT64_C(x) x##ui64 --#elif @HAVE_UNSIGNED_LONG_LONG_INT@ --# define UINT64_C(x) x##ULL --#endif -+# undef INT64_C -+# undef UINT64_C -+# if LONG_MAX >> 31 >> 31 == 1 -+# define INT64_C(x) x##L -+# elif defined _MSC_VER -+# define INT64_C(x) x##i64 -+# elif @HAVE_LONG_LONG_INT@ -+# define INT64_C(x) x##LL -+# endif -+# if ULONG_MAX >> 31 >> 31 >> 1 == 1 -+# define UINT64_C(x) x##UL -+# elif defined _MSC_VER -+# define UINT64_C(x) x##ui64 -+# elif @HAVE_UNSIGNED_LONG_LONG_INT@ -+# define UINT64_C(x) x##ULL -+# endif - - /* 7.18.4.2. Macros for greatest-width integer constants */ - --#ifndef INTMAX_C --# if @HAVE_LONG_LONG_INT@ && LONG_MAX >> 30 == 1 --# define INTMAX_C(x) x##LL --# elif defined GL_INT64_T --# define INTMAX_C(x) INT64_C(x) --# else --# define INTMAX_C(x) x##L -+# ifndef INTMAX_C -+# if @HAVE_LONG_LONG_INT@ && LONG_MAX >> 30 == 1 -+# define INTMAX_C(x) x##LL -+# elif defined GL_INT64_T -+# define INTMAX_C(x) INT64_C(x) -+# else -+# define INTMAX_C(x) x##L -+# endif - # endif --#endif - --#ifndef UINTMAX_C --# if @HAVE_UNSIGNED_LONG_LONG_INT@ && ULONG_MAX >> 31 == 1 --# define UINTMAX_C(x) x##ULL --# elif defined GL_UINT64_T --# define UINTMAX_C(x) UINT64_C(x) --# else --# define UINTMAX_C(x) x##UL -+# ifndef UINTMAX_C -+# if @HAVE_UNSIGNED_LONG_LONG_INT@ && ULONG_MAX >> 31 == 1 -+# define UINTMAX_C(x) x##ULL -+# elif defined GL_UINT64_T -+# define UINTMAX_C(x) UINT64_C(x) -+# else -+# define UINTMAX_C(x) x##UL -+# endif - # endif --#endif -+ -+#endif /* !@HAVE_C99_STDINT_H@ */ -+ -+/* Macros specified by ISO/IEC TS 18661-1:2014. */ -+ -+#if (!defined UINTMAX_WIDTH \ -+ && (defined _GNU_SOURCE || defined __STDC_WANT_IEC_60559_BFP_EXT__)) -+# ifdef INT8_MAX -+# define INT8_WIDTH _GL_INTEGER_WIDTH (INT8_MIN, INT8_MAX) -+# endif -+# ifdef UINT8_MAX -+# define UINT8_WIDTH _GL_INTEGER_WIDTH (0, UINT8_MAX) -+# endif -+# ifdef INT16_MAX -+# define INT16_WIDTH _GL_INTEGER_WIDTH (INT16_MIN, INT16_MAX) -+# endif -+# ifdef UINT16_MAX -+# define UINT16_WIDTH _GL_INTEGER_WIDTH (0, UINT16_MAX) -+# endif -+# ifdef INT32_MAX -+# define INT32_WIDTH _GL_INTEGER_WIDTH (INT32_MIN, INT32_MAX) -+# endif -+# ifdef UINT32_MAX -+# define UINT32_WIDTH _GL_INTEGER_WIDTH (0, UINT32_MAX) -+# endif -+# ifdef INT64_MAX -+# define INT64_WIDTH _GL_INTEGER_WIDTH (INT64_MIN, INT64_MAX) -+# endif -+# ifdef UINT64_MAX -+# define UINT64_WIDTH _GL_INTEGER_WIDTH (0, UINT64_MAX) -+# endif -+# define INT_LEAST8_WIDTH _GL_INTEGER_WIDTH (INT_LEAST8_MIN, INT_LEAST8_MAX) -+# define UINT_LEAST8_WIDTH _GL_INTEGER_WIDTH (0, UINT_LEAST8_MAX) -+# define INT_LEAST16_WIDTH _GL_INTEGER_WIDTH (INT_LEAST16_MIN, INT_LEAST16_MAX) -+# define UINT_LEAST16_WIDTH _GL_INTEGER_WIDTH (0, UINT_LEAST16_MAX) -+# define INT_LEAST32_WIDTH _GL_INTEGER_WIDTH (INT_LEAST32_MIN, INT_LEAST32_MAX) -+# define UINT_LEAST32_WIDTH _GL_INTEGER_WIDTH (0, UINT_LEAST32_MAX) -+# define INT_LEAST64_WIDTH _GL_INTEGER_WIDTH (INT_LEAST64_MIN, INT_LEAST64_MAX) -+# define UINT_LEAST64_WIDTH _GL_INTEGER_WIDTH (0, UINT_LEAST64_MAX) -+# define INT_FAST8_WIDTH _GL_INTEGER_WIDTH (INT_FAST8_MIN, INT_FAST8_MAX) -+# define UINT_FAST8_WIDTH _GL_INTEGER_WIDTH (0, UINT_FAST8_MAX) -+# define INT_FAST16_WIDTH _GL_INTEGER_WIDTH (INT_FAST16_MIN, INT_FAST16_MAX) -+# define UINT_FAST16_WIDTH _GL_INTEGER_WIDTH (0, UINT_FAST16_MAX) -+# define INT_FAST32_WIDTH _GL_INTEGER_WIDTH (INT_FAST32_MIN, INT_FAST32_MAX) -+# define UINT_FAST32_WIDTH _GL_INTEGER_WIDTH (0, UINT_FAST32_MAX) -+# define INT_FAST64_WIDTH _GL_INTEGER_WIDTH (INT_FAST64_MIN, INT_FAST64_MAX) -+# define UINT_FAST64_WIDTH _GL_INTEGER_WIDTH (0, UINT_FAST64_MAX) -+# define INTPTR_WIDTH _GL_INTEGER_WIDTH (INTPTR_MIN, INTPTR_MAX) -+# define UINTPTR_WIDTH _GL_INTEGER_WIDTH (0, UINTPTR_MAX) -+# define INTMAX_WIDTH _GL_INTEGER_WIDTH (INTMAX_MIN, INTMAX_MAX) -+# define UINTMAX_WIDTH _GL_INTEGER_WIDTH (0, UINTMAX_MAX) -+# define PTRDIFF_WIDTH _GL_INTEGER_WIDTH (PTRDIFF_MIN, PTRDIFF_MAX) -+# define SIZE_WIDTH _GL_INTEGER_WIDTH (0, SIZE_MAX) -+# define WCHAR_WIDTH _GL_INTEGER_WIDTH (WCHAR_MIN, WCHAR_MAX) -+# ifdef WINT_MAX -+# define WINT_WIDTH _GL_INTEGER_WIDTH (WINT_MIN, WINT_MAX) -+# endif -+# ifdef SIG_ATOMIC_MAX -+# define SIG_ATOMIC_WIDTH _GL_INTEGER_WIDTH (SIG_ATOMIC_MIN, SIG_ATOMIC_MAX) -+# endif -+#endif /* !WINT_WIDTH && (_GNU_SOURCE || __STDC_WANT_IEC_60559_BFP_EXT__) */ - - #endif /* _@GUARD_PREFIX@_STDINT_H */ - #endif /* !(defined __ANDROID__ && ...) */ -diff -durN libpipeline-1.4.1.orig/gnulib/lib/stdio.in.h libpipeline-1.4.1/gnulib/lib/stdio.in.h ---- libpipeline-1.4.1.orig/gnulib/lib/stdio.in.h 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/lib/stdio.in.h 2017-05-17 10:35:28.609375000 +0800 -@@ -1,6 +1,6 @@ - /* A GNU-like . - -- Copyright (C) 2004, 2007-2014 Free Software Foundation, Inc. -+ Copyright (C) 2004, 2007-2017 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 -@@ -84,8 +84,13 @@ - except that it indicates to GCC that the supported format string directives - are the ones of the system printf(), rather than the ones standardized by - ISO C99 and POSIX. */ --#define _GL_ATTRIBUTE_FORMAT_PRINTF_SYSTEM(formatstring_parameter, first_argument) \ -+#if GNULIB_PRINTF_ATTRIBUTE_FLAVOR_GNU -+# define _GL_ATTRIBUTE_FORMAT_PRINTF_SYSTEM(formatstring_parameter, first_argument) \ -+ _GL_ATTRIBUTE_FORMAT_PRINTF (formatstring_parameter, first_argument) -+#else -+# define _GL_ATTRIBUTE_FORMAT_PRINTF_SYSTEM(formatstring_parameter, first_argument) \ - _GL_ATTRIBUTE_FORMAT ((__printf__, formatstring_parameter, first_argument)) -+#endif - - /* _GL_ATTRIBUTE_FORMAT_SCANF - indicates to GCC that the function takes a format string and arguments, -@@ -113,6 +118,26 @@ - # include - #endif - -+/* MSVC declares 'perror' in , not in . We must include -+ it before we #define perror rpl_perror. */ -+/* But in any case avoid namespace pollution on glibc systems. */ -+#if (@GNULIB_PERROR@ || defined GNULIB_POSIXCHECK) \ -+ && ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__) \ -+ && ! defined __GLIBC__ -+# include -+#endif -+ -+/* MSVC declares 'remove' in , not in . We must include -+ it before we #define remove rpl_remove. */ -+/* MSVC declares 'rename' in , not in . We must include -+ it before we #define rename rpl_rename. */ -+/* But in any case avoid namespace pollution on glibc systems. */ -+#if (@GNULIB_REMOVE@ || @GNULIB_RENAME@ || defined GNULIB_POSIXCHECK) \ -+ && ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__) \ -+ && ! defined __GLIBC__ -+# include -+#endif -+ - - /* The definitions of _GL_FUNCDECL_RPL etc. are copied here. */ - -@@ -718,11 +743,10 @@ - so any use of gets warrants an unconditional warning; besides, C11 - removed it. */ - #undef gets --#if HAVE_RAW_DECL_GETS -+#if HAVE_RAW_DECL_GETS && !defined __cplusplus - _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); - #endif - -- - #if @GNULIB_OBSTACK_PRINTF@ || @GNULIB_OBSTACK_PRINTF_POSIX@ - struct obstack; - /* Grow an obstack with formatted output. Return the number of -diff -durN libpipeline-1.4.1.orig/gnulib/lib/stdlib.in.h libpipeline-1.4.1/gnulib/lib/stdlib.in.h ---- libpipeline-1.4.1.orig/gnulib/lib/stdlib.in.h 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/lib/stdlib.in.h 2017-05-17 10:35:28.906250000 +0800 -@@ -1,6 +1,6 @@ - /* A GNU-like . - -- Copyright (C) 1995, 2001-2004, 2006-2014 Free Software Foundation, Inc. -+ Copyright (C) 1995, 2001-2004, 2006-2017 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 -@@ -520,6 +520,44 @@ - _GL_CXXALIASWARN (putenv); - #endif - -+#if @GNULIB_QSORT_R@ -+/* Sort an array of NMEMB elements, starting at address BASE, each element -+ occupying SIZE bytes, in ascending order according to the comparison -+ function COMPARE. */ -+# if @REPLACE_QSORT_R@ -+# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -+# undef qsort_r -+# define qsort_r rpl_qsort_r -+# endif -+_GL_FUNCDECL_RPL (qsort_r, void, (void *base, size_t nmemb, size_t size, -+ int (*compare) (void const *, void const *, -+ void *), -+ void *arg) _GL_ARG_NONNULL ((1, 4))); -+_GL_CXXALIAS_RPL (qsort_r, void, (void *base, size_t nmemb, size_t size, -+ int (*compare) (void const *, void const *, -+ void *), -+ void *arg)); -+# else -+# if !@HAVE_QSORT_R@ -+_GL_FUNCDECL_SYS (qsort_r, void, (void *base, size_t nmemb, size_t size, -+ int (*compare) (void const *, void const *, -+ void *), -+ void *arg) _GL_ARG_NONNULL ((1, 4))); -+# endif -+_GL_CXXALIAS_SYS (qsort_r, void, (void *base, size_t nmemb, size_t size, -+ int (*compare) (void const *, void const *, -+ void *), -+ void *arg)); -+# endif -+_GL_CXXALIASWARN (qsort_r); -+#elif defined GNULIB_POSIXCHECK -+# undef qsort_r -+# if HAVE_RAW_DECL_QSORT_R -+_GL_WARN_ON_USE (qsort_r, "qsort_r is not portable - " -+ "use gnulib module qsort_r for portability"); -+# endif -+#endif -+ - - #if @GNULIB_RANDOM_R@ - # if !@HAVE_RANDOM_R@ -diff -durN libpipeline-1.4.1.orig/gnulib/lib/strerror.c libpipeline-1.4.1/gnulib/lib/strerror.c ---- libpipeline-1.4.1.orig/gnulib/lib/strerror.c 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/lib/strerror.c 2017-05-17 10:35:29.906250000 +0800 -@@ -1,6 +1,6 @@ - /* strerror.c --- POSIX compatible system error routine - -- Copyright (C) 2007-2014 Free Software Foundation, Inc. -+ Copyright (C) 2007-2017 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 -@@ -66,5 +66,6 @@ - if (sizeof buf <= len) - abort (); - -- return memcpy (buf, msg, len + 1); -+ memcpy (buf, msg, len + 1); -+ return buf; - } -diff -durN libpipeline-1.4.1.orig/gnulib/lib/strerror-override.c libpipeline-1.4.1/gnulib/lib/strerror-override.c ---- libpipeline-1.4.1.orig/gnulib/lib/strerror-override.c 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/lib/strerror-override.c 2017-05-17 10:35:29.203125000 +0800 -@@ -1,6 +1,6 @@ - /* strerror-override.c --- POSIX compatible system error routine - -- Copyright (C) 2010-2014 Free Software Foundation, Inc. -+ Copyright (C) 2010-2017 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 -diff -durN libpipeline-1.4.1.orig/gnulib/lib/strerror-override.h libpipeline-1.4.1/gnulib/lib/strerror-override.h ---- libpipeline-1.4.1.orig/gnulib/lib/strerror-override.h 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/lib/strerror-override.h 2017-05-17 10:35:29.546875000 +0800 -@@ -1,6 +1,6 @@ - /* strerror-override.h --- POSIX compatible system error routine - -- Copyright (C) 2010-2014 Free Software Foundation, Inc. -+ Copyright (C) 2010-2017 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 -diff -durN libpipeline-1.4.1.orig/gnulib/lib/string.in.h libpipeline-1.4.1/gnulib/lib/string.in.h ---- libpipeline-1.4.1.orig/gnulib/lib/string.in.h 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/lib/string.in.h 2017-05-17 10:35:30.234375000 +0800 -@@ -1,6 +1,6 @@ - /* A GNU-like . - -- Copyright (C) 1995-1996, 2001-2014 Free Software Foundation, Inc. -+ Copyright (C) 1995-1996, 2001-2017 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 -@@ -15,16 +15,32 @@ - You should have received a copy of the GNU General Public License - along with this program; if not, see . */ - --#ifndef _@GUARD_PREFIX@_STRING_H -- - #if __GNUC__ >= 3 - @PRAGMA_SYSTEM_HEADER@ - #endif - @PRAGMA_COLUMNS@ - -+#if defined _GL_ALREADY_INCLUDING_STRING_H -+/* Special invocation convention: -+ - On OS X/NetBSD we have a sequence of nested includes -+ -> -> "string.h" -+ In this situation system _chk variants due to -D_FORTIFY_SOURCE -+ might be used after any replacements defined here. */ -+ -+#@INCLUDE_NEXT@ @NEXT_STRING_H@ -+ -+#else -+/* Normal invocation convention. */ -+ -+#ifndef _@GUARD_PREFIX@_STRING_H -+ -+#define _GL_ALREADY_INCLUDING_STRING_H -+ - /* The include_next requires a split double-inclusion guard. */ - #@INCLUDE_NEXT@ @NEXT_STRING_H@ - -+#undef _GL_ALREADY_INCLUDING_STRING_H -+ - #ifndef _@GUARD_PREFIX@_STRING_H - #define _@GUARD_PREFIX@_STRING_H - -@@ -400,15 +416,15 @@ - # undef strndup - # define strndup rpl_strndup - # endif --_GL_FUNCDECL_RPL (strndup, char *, (char const *__string, size_t __n) -+_GL_FUNCDECL_RPL (strndup, char *, (char const *__s, size_t __n) - _GL_ARG_NONNULL ((1))); --_GL_CXXALIAS_RPL (strndup, char *, (char const *__string, size_t __n)); -+_GL_CXXALIAS_RPL (strndup, char *, (char const *__s, size_t __n)); - # else - # if ! @HAVE_DECL_STRNDUP@ --_GL_FUNCDECL_SYS (strndup, char *, (char const *__string, size_t __n) -+_GL_FUNCDECL_SYS (strndup, char *, (char const *__s, size_t __n) - _GL_ARG_NONNULL ((1))); - # endif --_GL_CXXALIAS_SYS (strndup, char *, (char const *__string, size_t __n)); -+_GL_CXXALIAS_SYS (strndup, char *, (char const *__s, size_t __n)); - # endif - _GL_CXXALIASWARN (strndup); - #elif defined GNULIB_POSIXCHECK -@@ -428,17 +444,17 @@ - # undef strnlen - # define strnlen rpl_strnlen - # endif --_GL_FUNCDECL_RPL (strnlen, size_t, (char const *__string, size_t __maxlen) -+_GL_FUNCDECL_RPL (strnlen, size_t, (char const *__s, size_t __maxlen) - _GL_ATTRIBUTE_PURE - _GL_ARG_NONNULL ((1))); --_GL_CXXALIAS_RPL (strnlen, size_t, (char const *__string, size_t __maxlen)); -+_GL_CXXALIAS_RPL (strnlen, size_t, (char const *__s, size_t __maxlen)); - # else - # if ! @HAVE_DECL_STRNLEN@ --_GL_FUNCDECL_SYS (strnlen, size_t, (char const *__string, size_t __maxlen) -+_GL_FUNCDECL_SYS (strnlen, size_t, (char const *__s, size_t __maxlen) - _GL_ATTRIBUTE_PURE - _GL_ARG_NONNULL ((1))); - # endif --_GL_CXXALIAS_SYS (strnlen, size_t, (char const *__string, size_t __maxlen)); -+_GL_CXXALIAS_SYS (strnlen, size_t, (char const *__s, size_t __maxlen)); - # endif - _GL_CXXALIASWARN (strnlen); - #elif defined GNULIB_POSIXCHECK -@@ -1027,3 +1043,4 @@ - - #endif /* _@GUARD_PREFIX@_STRING_H */ - #endif /* _@GUARD_PREFIX@_STRING_H */ -+#endif -diff -durN libpipeline-1.4.1.orig/gnulib/lib/stripslash.c libpipeline-1.4.1/gnulib/lib/stripslash.c ---- libpipeline-1.4.1.orig/gnulib/lib/stripslash.c 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/lib/stripslash.c 2017-05-17 10:35:30.593750000 +0800 -@@ -1,6 +1,6 @@ - /* stripslash.c -- remove redundant trailing slashes from a file name - -- Copyright (C) 1990, 2001, 2003-2006, 2009-2014 Free Software Foundation, -+ Copyright (C) 1990, 2001, 2003-2006, 2009-2017 Free Software Foundation, - Inc. - - This program is free software: you can redistribute it and/or modify -diff -durN libpipeline-1.4.1.orig/gnulib/lib/strndup.c libpipeline-1.4.1/gnulib/lib/strndup.c ---- libpipeline-1.4.1.orig/gnulib/lib/strndup.c 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/lib/strndup.c 2017-05-17 10:35:30.906250000 +0800 -@@ -1,6 +1,6 @@ - /* A replacement function, for systems that lack strndup. - -- Copyright (C) 1996-1998, 2001-2003, 2005-2007, 2009-2014 Free Software -+ Copyright (C) 1996-1998, 2001-2003, 2005-2007, 2009-2017 Free Software - Foundation, Inc. - - This program is free software; you can redistribute it and/or modify it -diff -durN libpipeline-1.4.1.orig/gnulib/lib/strnlen.c libpipeline-1.4.1/gnulib/lib/strnlen.c ---- libpipeline-1.4.1.orig/gnulib/lib/strnlen.c 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/lib/strnlen.c 2017-05-17 10:35:31.218750000 +0800 -@@ -1,5 +1,5 @@ - /* Find the length of STRING, but scan at most MAXLEN characters. -- Copyright (C) 2005-2007, 2009-2014 Free Software Foundation, Inc. -+ Copyright (C) 2005-2007, 2009-2017 Free Software Foundation, Inc. - Written by Simon Josefsson. - - This program is free software; you can redistribute it and/or modify -diff -durN libpipeline-1.4.1.orig/gnulib/lib/strsignal.c libpipeline-1.4.1/gnulib/lib/strsignal.c ---- libpipeline-1.4.1.orig/gnulib/lib/strsignal.c 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/lib/strsignal.c 2017-05-17 10:35:31.500000000 +0800 -@@ -1,4 +1,4 @@ --/* Copyright (C) 1991, 1994-2002, 2005, 2008-2014 Free Software Foundation, -+/* Copyright (C) 1991, 1994-2002, 2005, 2008-2017 Free Software Foundation, - Inc. - This file is part of the GNU C Library. - -diff -durN libpipeline-1.4.1.orig/gnulib/lib/sys_select.in.h libpipeline-1.4.1/gnulib/lib/sys_select.in.h ---- libpipeline-1.4.1.orig/gnulib/lib/sys_select.in.h 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/lib/sys_select.in.h 2017-05-17 10:35:31.828125000 +0800 -@@ -1,5 +1,5 @@ - /* Substitute for . -- Copyright (C) 2007-2014 Free Software Foundation, Inc. -+ Copyright (C) 2007-2017 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 -@@ -24,8 +24,8 @@ - On Cygwin, includes . - Simply delegate to the system's header in this case. */ - #if (@HAVE_SYS_SELECT_H@ \ -+ && !defined _GL_SYS_SELECT_H_REDIRECT_FROM_SYS_TYPES_H \ - && ((defined __osf__ && defined _SYS_TYPES_H_ \ -- && !defined _GL_SYS_SELECT_H_REDIRECT_FROM_SYS_TIME_H \ - && defined _OSF_SOURCE) \ - || (defined __sun && defined _SYS_TYPES_H \ - && (! (defined _XOPEN_SOURCE || defined _POSIX_C_SOURCE) \ -@@ -36,12 +36,13 @@ - - #elif (@HAVE_SYS_SELECT_H@ \ - && (defined _CYGWIN_SYS_TIME_H \ -- || (defined __osf__ && defined _SYS_TIME_H_ \ -- && !defined _GL_SYS_SELECT_H_REDIRECT_FROM_SYS_TIME_H \ -- && defined _OSF_SOURCE) \ -- || (defined __sun && defined _SYS_TIME_H \ -- && (! (defined _XOPEN_SOURCE || defined _POSIX_C_SOURCE) \ -- || defined __EXTENSIONS__)))) -+ || (!defined _GL_SYS_SELECT_H_REDIRECT_FROM_SYS_TIME_H \ -+ && ((defined __osf__ && defined _SYS_TIME_H_ \ -+ && defined _OSF_SOURCE) \ -+ || (defined __sun && defined _SYS_TIME_H \ -+ && (! (defined _XOPEN_SOURCE \ -+ || defined _POSIX_C_SOURCE) \ -+ || defined __EXTENSIONS__)))))) - - # define _GL_SYS_SELECT_H_REDIRECT_FROM_SYS_TIME_H - # @INCLUDE_NEXT@ @NEXT_SYS_SELECT_H@ -@@ -80,8 +81,9 @@ - of 'struct timeval', and no definition of this type. - Also, Mac OS X, AIX, HP-UX, IRIX, Solaris, Interix declare select() - in . -- But avoid namespace pollution on glibc systems. */ --# ifndef __GLIBC__ -+ But avoid namespace pollution on glibc systems and "unknown type -+ name" problems on Cygwin. */ -+# if !(defined __GLIBC__ || defined __CYGWIN__) - # include - # endif - -@@ -99,10 +101,11 @@ - #endif - - /* Get definition of 'sigset_t'. -- But avoid namespace pollution on glibc systems. -+ But avoid namespace pollution on glibc systems and "unknown type -+ name" problems on Cygwin. - Do this after the include_next (for the sake of OpenBSD 5.0) but before - the split double-inclusion guard (for the sake of Solaris). */ --#if !(defined __GLIBC__ && !defined __UCLIBC__) -+#if !((defined __GLIBC__ || defined __CYGWIN__) && !defined __UCLIBC__) - # include - #endif - -@@ -288,12 +291,15 @@ - # define select rpl_select - # endif - _GL_FUNCDECL_RPL (select, int, -- (int, fd_set *, fd_set *, fd_set *, struct timeval *)); -+ (int, fd_set *restrict, fd_set *restrict, fd_set *restrict, -+ struct timeval *restrict)); - _GL_CXXALIAS_RPL (select, int, -- (int, fd_set *, fd_set *, fd_set *, struct timeval *)); -+ (int, fd_set *restrict, fd_set *restrict, fd_set *restrict, -+ struct timeval *restrict)); - # else - _GL_CXXALIAS_SYS (select, int, -- (int, fd_set *, fd_set *, fd_set *, struct timeval *)); -+ (int, fd_set *restrict, fd_set *restrict, fd_set *restrict, -+ struct timeval *restrict)); - # endif - _GL_CXXALIASWARN (select); - #elif @HAVE_WINSOCK2_H@ -diff -durN libpipeline-1.4.1.orig/gnulib/lib/sys_stat.in.h libpipeline-1.4.1/gnulib/lib/sys_stat.in.h ---- libpipeline-1.4.1.orig/gnulib/lib/sys_stat.in.h 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/lib/sys_stat.in.h 2017-05-17 10:35:32.203125000 +0800 -@@ -1,5 +1,5 @@ --/* Provide a more complete sys/stat header file. -- Copyright (C) 2005-2014 Free Software Foundation, Inc. -+/* Provide a more complete sys/stat.h header file. -+ Copyright (C) 2005-2017 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 -@@ -72,6 +72,75 @@ - # define stat _stati64 - #endif - -+/* Optionally, override 'struct stat' on native Windows. */ -+#if @GNULIB_OVERRIDES_STRUCT_STAT@ -+ -+# undef stat -+# if @GNULIB_STAT@ -+# define stat rpl_stat -+# else -+ /* Provoke a clear link error if stat() is used as a function and -+ module 'stat' is not in use. */ -+# define stat stat_used_without_requesting_gnulib_module_stat -+# endif -+ -+# if !GNULIB_defined_struct_stat -+struct stat -+{ -+ dev_t st_dev; -+ ino_t st_ino; -+ mode_t st_mode; -+ nlink_t st_nlink; -+# if 0 -+ uid_t st_uid; -+# else /* uid_t is not defined by default on native Windows. */ -+ short st_uid; -+# endif -+# if 0 -+ gid_t st_gid; -+# else /* gid_t is not defined by default on native Windows. */ -+ short st_gid; -+# endif -+ dev_t st_rdev; -+ off_t st_size; -+# if 0 -+ blksize_t st_blksize; -+ blkcnt_t st_blocks; -+# endif -+ -+# if @WINDOWS_STAT_TIMESPEC@ -+ struct timespec st_atim; -+ struct timespec st_mtim; -+ struct timespec st_ctim; -+# else -+ time_t st_atime; -+ time_t st_mtime; -+ time_t st_ctime; -+# endif -+}; -+# if @WINDOWS_STAT_TIMESPEC@ -+# define st_atime st_atim.tv_sec -+# define st_mtime st_mtim.tv_sec -+# define st_ctime st_ctim.tv_sec -+ /* Indicator, for gnulib internal purposes. */ -+# define _GL_WINDOWS_STAT_TIMESPEC 1 -+# endif -+# define GNULIB_defined_struct_stat 1 -+# endif -+ -+/* Other possible values of st_mode. */ -+# if 0 -+# define _S_IFBLK 0x6000 -+# endif -+# if 0 -+# define _S_IFLNK 0xA000 -+# endif -+# if 0 -+# define _S_IFSOCK 0xC000 -+# endif -+ -+#endif -+ - #ifndef S_IFIFO - # ifdef _S_IFIFO - # define S_IFIFO _S_IFIFO -@@ -345,6 +414,9 @@ - _GL_CXXALIAS_SYS (fstat, int, (int fd, struct stat *buf)); - # endif - _GL_CXXALIASWARN (fstat); -+#elif @GNULIB_OVERRIDES_STRUCT_STAT@ -+# undef fstat -+# define fstat fstat_used_without_requesting_gnulib_module_fstat - #elif @WINDOWS_64_BIT_ST_SIZE@ - /* Above, we define stat to _stati64. */ - # define fstat _fstati64 -@@ -378,6 +450,9 @@ - (int fd, char const *name, struct stat *st, int flags)); - # endif - _GL_CXXALIASWARN (fstatat); -+#elif @GNULIB_OVERRIDES_STRUCT_STAT@ -+# undef fstatat -+# define fstatat fstatat_used_without_requesting_gnulib_module_fstatat - #elif defined GNULIB_POSIXCHECK - # undef fstatat - # if HAVE_RAW_DECL_FSTATAT -@@ -476,6 +551,9 @@ - # if @HAVE_LSTAT@ - _GL_CXXALIASWARN (lstat); - # endif -+#elif @GNULIB_OVERRIDES_STRUCT_STAT@ -+# undef lstat -+# define lstat lstat_used_without_requesting_gnulib_module_lstat - #elif defined GNULIB_POSIXCHECK - # undef lstat - # if HAVE_RAW_DECL_LSTAT -@@ -625,63 +703,69 @@ - - #if @GNULIB_STAT@ - # if @REPLACE_STAT@ --/* We can't use the object-like #define stat rpl_stat, because of -- struct stat. This means that rpl_stat will not be used if the user -- does (stat)(a,b). Oh well. */ --# if defined _AIX && defined stat && defined _LARGE_FILES -- /* With _LARGE_FILES defined, AIX (only) defines stat to stat64, -- so we have to replace stat64() instead of stat(). */ --# undef stat64 --# define stat64(name, st) rpl_stat (name, st) --# elif @WINDOWS_64_BIT_ST_SIZE@ -- /* Above, we define stat to _stati64. */ --# if defined __MINGW32__ && defined _stati64 --# ifndef _USE_32BIT_TIME_T -- /* The system headers define _stati64 to _stat64. */ --# undef _stat64 --# define _stat64(name, st) rpl_stat (name, st) -+# if !@GNULIB_OVERRIDES_STRUCT_STAT@ -+ /* We can't use the object-like #define stat rpl_stat, because of -+ struct stat. This means that rpl_stat will not be used if the user -+ does (stat)(a,b). Oh well. */ -+# if defined _AIX && defined stat && defined _LARGE_FILES -+ /* With _LARGE_FILES defined, AIX (only) defines stat to stat64, -+ so we have to replace stat64() instead of stat(). */ -+# undef stat64 -+# define stat64(name, st) rpl_stat (name, st) -+# elif @WINDOWS_64_BIT_ST_SIZE@ -+ /* Above, we define stat to _stati64. */ -+# if defined __MINGW32__ && defined _stati64 -+# ifndef _USE_32BIT_TIME_T -+ /* The system headers define _stati64 to _stat64. */ -+# undef _stat64 -+# define _stat64(name, st) rpl_stat (name, st) -+# endif -+# elif defined _MSC_VER && defined _stati64 -+# ifdef _USE_32BIT_TIME_T -+ /* The system headers define _stati64 to _stat32i64. */ -+# undef _stat32i64 -+# define _stat32i64(name, st) rpl_stat (name, st) -+# else -+ /* The system headers define _stati64 to _stat64. */ -+# undef _stat64 -+# define _stat64(name, st) rpl_stat (name, st) -+# endif -+# else -+# undef _stati64 -+# define _stati64(name, st) rpl_stat (name, st) - # endif --# elif defined _MSC_VER && defined _stati64 -+# elif defined __MINGW32__ && defined stat - # ifdef _USE_32BIT_TIME_T -- /* The system headers define _stati64 to _stat32i64. */ -+ /* The system headers define stat to _stat32i64. */ - # undef _stat32i64 - # define _stat32i64(name, st) rpl_stat (name, st) - # else -- /* The system headers define _stati64 to _stat64. */ -+ /* The system headers define stat to _stat64. */ - # undef _stat64 - # define _stat64(name, st) rpl_stat (name, st) - # endif --# else --# undef _stati64 --# define _stati64(name, st) rpl_stat (name, st) --# endif --# elif defined __MINGW32__ && defined stat --# ifdef _USE_32BIT_TIME_T -- /* The system headers define stat to _stat32i64. */ --# undef _stat32i64 --# define _stat32i64(name, st) rpl_stat (name, st) --# else -- /* The system headers define stat to _stat64. */ --# undef _stat64 --# define _stat64(name, st) rpl_stat (name, st) --# endif --# elif defined _MSC_VER && defined stat --# ifdef _USE_32BIT_TIME_T -- /* The system headers define stat to _stat32. */ --# undef _stat32 --# define _stat32(name, st) rpl_stat (name, st) --# else -- /* The system headers define stat to _stat64i32. */ --# undef _stat64i32 --# define _stat64i32(name, st) rpl_stat (name, st) --# endif --# else /* !(_AIX ||__MINGW32__ || _MSC_VER) */ --# undef stat --# define stat(name, st) rpl_stat (name, st) --# endif /* !_LARGE_FILES */ -+# elif defined _MSC_VER && defined stat -+# ifdef _USE_32BIT_TIME_T -+ /* The system headers define stat to _stat32. */ -+# undef _stat32 -+# define _stat32(name, st) rpl_stat (name, st) -+# else -+ /* The system headers define stat to _stat64i32. */ -+# undef _stat64i32 -+# define _stat64i32(name, st) rpl_stat (name, st) -+# endif -+# else /* !(_AIX || __MINGW32__ || _MSC_VER) */ -+# undef stat -+# define stat(name, st) rpl_stat (name, st) -+# endif /* !_LARGE_FILES */ -+# endif /* !@GNULIB_OVERRIDES_STRUCT_STAT@ */ - _GL_EXTERN_C int stat (const char *name, struct stat *buf) - _GL_ARG_NONNULL ((1, 2)); - # endif -+#elif @GNULIB_OVERRIDES_STRUCT_STAT@ -+/* see above: -+ #define stat stat_used_without_requesting_gnulib_module_stat -+ */ - #elif defined GNULIB_POSIXCHECK - # undef stat - # if HAVE_RAW_DECL_STAT -diff -durN libpipeline-1.4.1.orig/gnulib/lib/sys_time.in.h libpipeline-1.4.1/gnulib/lib/sys_time.in.h ---- libpipeline-1.4.1.orig/gnulib/lib/sys_time.in.h 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/lib/sys_time.in.h 2017-05-17 10:35:32.562500000 +0800 -@@ -1,6 +1,6 @@ - /* Provide a more complete sys/time.h. - -- Copyright (C) 2007-2014 Free Software Foundation, Inc. -+ Copyright (C) 2007-2017 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 -@@ -109,6 +109,13 @@ - (struct timeval *restrict, void *restrict)); - # endif - _GL_CXXALIASWARN (gettimeofday); -+# if defined __cplusplus && defined GNULIB_NAMESPACE -+namespace GNULIB_NAMESPACE { -+ typedef ::timeval -+#undef timeval -+ timeval; -+} -+# endif - #elif defined GNULIB_POSIXCHECK - # undef gettimeofday - # if HAVE_RAW_DECL_GETTIMEOFDAY -diff -durN libpipeline-1.4.1.orig/gnulib/lib/sys_types.in.h libpipeline-1.4.1/gnulib/lib/sys_types.in.h ---- libpipeline-1.4.1.orig/gnulib/lib/sys_types.in.h 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/lib/sys_types.in.h 2017-05-17 10:35:32.843750000 +0800 -@@ -1,6 +1,6 @@ - /* Provide a more complete sys/types.h. - -- Copyright (C) 2011-2014 Free Software Foundation, Inc. -+ Copyright (C) 2011-2017 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 -@@ -23,7 +23,9 @@ - #ifndef _@GUARD_PREFIX@_SYS_TYPES_H - - /* The include_next requires a split double-inclusion guard. */ -+# define _GL_INCLUDING_SYS_TYPES_H - #@INCLUDE_NEXT@ @NEXT_SYS_TYPES_H@ -+# undef _GL_INCLUDING_SYS_TYPES_H - - #ifndef _@GUARD_PREFIX@_SYS_TYPES_H - #define _@GUARD_PREFIX@_SYS_TYPES_H -@@ -40,6 +42,48 @@ - # define _GL_WINDOWS_64_BIT_OFF_T 1 - #endif - -+/* Override dev_t and ino_t if distinguishable inodes support is requested -+ on native Windows. */ -+#if @WINDOWS_STAT_INODES@ -+ -+# if @WINDOWS_STAT_INODES@ == 2 -+/* Experimental, not useful in Windows 10. */ -+ -+/* Define dev_t to a 64-bit type. */ -+# if !defined GNULIB_defined_dev_t -+typedef unsigned long long int rpl_dev_t; -+# undef dev_t -+# define dev_t rpl_dev_t -+# define GNULIB_defined_dev_t 1 -+# endif -+ -+/* Define ino_t to a 128-bit type. */ -+# if !defined GNULIB_defined_ino_t -+/* MSVC does not have a 128-bit integer type. -+ GCC has a 128-bit integer type __int128, but only on 64-bit targets. */ -+typedef struct { unsigned long long int _gl_ino[2]; } rpl_ino_t; -+# undef ino_t -+# define ino_t rpl_ino_t -+# define GNULIB_defined_ino_t 1 -+# endif -+ -+# else /* @WINDOWS_STAT_INODES@ == 1 */ -+ -+/* Define ino_t to a 64-bit type. */ -+# if !defined GNULIB_defined_ino_t -+typedef unsigned long long int rpl_ino_t; -+# undef ino_t -+# define ino_t rpl_ino_t -+# define GNULIB_defined_ino_t 1 -+# endif -+ -+# endif -+ -+/* Indicator, for gnulib internal purposes. */ -+# define _GL_WINDOWS_STAT_INODES @WINDOWS_STAT_INODES@ -+ -+#endif -+ - /* MSVC 9 defines size_t in , not in . */ - /* But avoid namespace pollution on glibc systems. */ - #if ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__) \ -diff -durN libpipeline-1.4.1.orig/gnulib/lib/sys_wait.in.h libpipeline-1.4.1/gnulib/lib/sys_wait.in.h ---- libpipeline-1.4.1.orig/gnulib/lib/sys_wait.in.h 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/lib/sys_wait.in.h 2017-05-17 10:35:33.109375000 +0800 -@@ -1,5 +1,5 @@ - /* A POSIX-like . -- Copyright (C) 2001-2003, 2005-2014 Free Software Foundation, Inc. -+ Copyright (C) 2001-2003, 2005-2017 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 -diff -durN libpipeline-1.4.1.orig/gnulib/lib/tempname.c libpipeline-1.4.1/gnulib/lib/tempname.c ---- libpipeline-1.4.1.orig/gnulib/lib/tempname.c 2014-11-08 21:53:37.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/lib/tempname.c 2017-05-17 10:35:33.390625000 +0800 -@@ -1,6 +1,6 @@ - /* tempname.c - generate the name of a temporary file. - -- Copyright (C) 1991-2003, 2005-2007, 2009-2014 Free Software Foundation, Inc. -+ Copyright (C) 1991-2003, 2005-2007, 2009-2017 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 -@@ -62,6 +62,7 @@ - # define struct_stat64 struct stat64 - #else - # define struct_stat64 struct stat -+# define __try_tempname try_tempname - # define __gen_tempname gen_tempname - # define __getpid getpid - # define __gettimeofday gettimeofday -@@ -176,21 +177,9 @@ - static const char letters[] = - "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"; - --/* Generate a temporary file name based on TMPL. TMPL must match the -- rules for mk[s]temp (i.e. end in "XXXXXX", possibly with a suffix). -- The name constructed does not exist at the time of the call to -- __gen_tempname. TMPL is overwritten with the result. -- -- KIND may be one of: -- __GT_NOCREATE: simply verify that the name does not exist -- at the time of the call. -- __GT_FILE: create the file using open(O_CREAT|O_EXCL) -- and return a read-write fd. The file is mode 0600. -- __GT_DIR: create a directory, which will be mode 0700. -- -- We use a clever algorithm to get hard-to-predict names. */ - int --__gen_tempname (char *tmpl, int suffixlen, int flags, int kind) -+__try_tempname (char *tmpl, int suffixlen, void *args, -+ int (*tryfunc) (char *, void *)) - { - int len; - char *XXXXXX; -@@ -199,7 +188,6 @@ - unsigned int count; - int fd = -1; - int save_errno = errno; -- struct_stat64 st; - - /* A lower bound on the number of temporary files to attempt to - generate. The maximum total number of temporary file names that -@@ -256,41 +244,7 @@ - v /= 62; - XXXXXX[5] = letters[v % 62]; - -- switch (kind) -- { -- case __GT_FILE: -- fd = __open (tmpl, -- (flags & ~O_ACCMODE) -- | O_RDWR | O_CREAT | O_EXCL, S_IRUSR | S_IWUSR); -- break; -- -- case __GT_DIR: -- fd = __mkdir (tmpl, S_IRUSR | S_IWUSR | S_IXUSR); -- break; -- -- case __GT_NOCREATE: -- /* This case is backward from the other three. __gen_tempname -- succeeds if __xstat fails because the name does not exist. -- Note the continue to bypass the common logic at the bottom -- of the loop. */ -- if (__lxstat64 (_STAT_VER, tmpl, &st) < 0) -- { -- if (errno == ENOENT) -- { -- __set_errno (save_errno); -- return 0; -- } -- else -- /* Give up now. */ -- return -1; -- } -- continue; -- -- default: -- assert (! "invalid KIND in __gen_tempname"); -- abort (); -- } -- -+ fd = tryfunc (tmpl, args); - if (fd >= 0) - { - __set_errno (save_errno); -@@ -304,3 +258,67 @@ - __set_errno (EEXIST); - return -1; - } -+ -+static int -+try_file (char *tmpl, void *flags) -+{ -+ int *openflags = flags; -+ return __open (tmpl, -+ (*openflags & ~O_ACCMODE) -+ | O_RDWR | O_CREAT | O_EXCL, S_IRUSR | S_IWUSR); -+} -+ -+static int -+try_dir (char *tmpl, void *flags _GL_UNUSED) -+{ -+ return __mkdir (tmpl, S_IRUSR | S_IWUSR | S_IXUSR); -+} -+ -+static int -+try_nocreate (char *tmpl, void *flags _GL_UNUSED) -+{ -+ struct_stat64 st; -+ -+ if (__lxstat64 (_STAT_VER, tmpl, &st) == 0) -+ __set_errno (EEXIST); -+ return errno == ENOENT ? 0 : -1; -+} -+ -+/* Generate a temporary file name based on TMPL. TMPL must match the -+ rules for mk[s]temp (i.e. end in "XXXXXX", possibly with a suffix). -+ The name constructed does not exist at the time of the call to -+ __gen_tempname. TMPL is overwritten with the result. -+ -+ KIND may be one of: -+ __GT_NOCREATE: simply verify that the name does not exist -+ at the time of the call. -+ __GT_FILE: create the file using open(O_CREAT|O_EXCL) -+ and return a read-write fd. The file is mode 0600. -+ __GT_DIR: create a directory, which will be mode 0700. -+ -+ We use a clever algorithm to get hard-to-predict names. */ -+int -+__gen_tempname (char *tmpl, int suffixlen, int flags, int kind) -+{ -+ int (*tryfunc) (char *, void *); -+ -+ switch (kind) -+ { -+ case __GT_FILE: -+ tryfunc = try_file; -+ break; -+ -+ case __GT_DIR: -+ tryfunc = try_dir; -+ break; -+ -+ case __GT_NOCREATE: -+ tryfunc = try_nocreate; -+ break; -+ -+ default: -+ assert (! "invalid KIND in __gen_tempname"); -+ abort (); -+ } -+ return __try_tempname (tmpl, suffixlen, &flags, tryfunc); -+} -diff -durN libpipeline-1.4.1.orig/gnulib/lib/tempname.h libpipeline-1.4.1/gnulib/lib/tempname.h ---- libpipeline-1.4.1.orig/gnulib/lib/tempname.h 2014-11-08 21:53:37.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/lib/tempname.h 2017-05-17 10:35:33.687500000 +0800 -@@ -1,6 +1,6 @@ - /* Create a temporary file or directory. - -- Copyright (C) 2006, 2009-2014 Free Software Foundation, Inc. -+ Copyright (C) 2006, 2009-2017 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 -@@ -32,6 +32,10 @@ - # define GT_NOCREATE 2 - # endif - -+#ifdef __cplusplus -+extern "C" { -+#endif -+ - /* Generate a temporary file name based on TMPL. TMPL must match the - rules for mk[s]temp (i.e. end in "XXXXXX", possibly with a suffix). - The name constructed does not exist at the time of the call to -@@ -47,4 +51,15 @@ - We use a clever algorithm to get hard-to-predict names. */ - extern int gen_tempname (char *tmpl, int suffixlen, int flags, int kind); - -+/* Similar to gen_tempname, but TRYFUNC is called for each temporary -+ name to try. If TRYFUNC returns a non-negative number, TRY_GEN_TEMPNAME -+ returns with this value. Otherwise, if errno is set to EEXIST, another -+ name is tried, or else TRY_GEN_TEMPNAME returns -1. */ -+extern int try_tempname (char *tmpl, int suffixlen, void *args, -+ int (*tryfunc) (char *, void *)); -+ -+#ifdef __cplusplus -+} -+#endif -+ - #endif /* GL_TEMPNAME_H */ -diff -durN libpipeline-1.4.1.orig/gnulib/lib/time.in.h libpipeline-1.4.1/gnulib/lib/time.in.h ---- libpipeline-1.4.1.orig/gnulib/lib/time.in.h 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/lib/time.in.h 2017-05-17 10:35:34.000000000 +0800 -@@ -1,6 +1,6 @@ - /* A more-standard . - -- Copyright (C) 2007-2014 Free Software Foundation, Inc. -+ Copyright (C) 2007-2017 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 -@@ -22,11 +22,13 @@ - - /* Don't get in the way of glibc when it includes time.h merely to - declare a few standard symbols, rather than to declare all the -- symbols. Also, Solaris 8 eventually includes itself -+ symbols. (However, skip this for MinGW as it treats __need_time_t -+ incompatibly.) Also, Solaris 8 eventually includes itself - recursively; if that is happening, just include the system - without adding our own declarations. */ --#if (defined __need_time_t || defined __need_clock_t \ -- || defined __need_timespec \ -+#if (((defined __need_time_t || defined __need_clock_t \ -+ || defined __need_timespec) \ -+ && !defined __MINGW32__) \ - || defined _@GUARD_PREFIX@_TIME_H) - - # @INCLUDE_NEXT@ @NEXT_TIME_H@ -@@ -48,20 +50,15 @@ - - /* Some systems don't define struct timespec (e.g., AIX 4.1, Ultrix 4.3). - Or they define it with the wrong member names or define it in -- (e.g., FreeBSD circa 1997). Stock Mingw does not define it, but the -- pthreads-win32 library defines it in . */ -+ (e.g., FreeBSD circa 1997). Stock Mingw prior to 3.0 does not define it, -+ but the pthreads-win32 library defines it in . */ - # if ! @TIME_H_DEFINES_STRUCT_TIMESPEC@ - # if @SYS_TIME_H_DEFINES_STRUCT_TIMESPEC@ - # include - # elif @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@ - # include --/* The pthreads-win32 also defines a couple of broken macros. */ --# undef asctime_r --# undef ctime_r --# undef gmtime_r --# undef localtime_r --# undef rand_r --# undef strtok_r -+# elif @UNISTD_H_DEFINES_STRUCT_TIMESPEC@ -+# include - # else - - # ifdef __cplusplus -@@ -123,6 +120,24 @@ - _GL_CXXALIASWARN (nanosleep); - # endif - -+/* Initialize time conversion information. */ -+# if @GNULIB_TZSET@ -+# if @REPLACE_TZSET@ -+# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -+# undef tzset -+# define tzset rpl_tzset -+# endif -+_GL_FUNCDECL_RPL (tzset, void, (void)); -+_GL_CXXALIAS_RPL (tzset, void, (void)); -+# else -+# if ! @HAVE_TZSET@ -+_GL_FUNCDECL_SYS (tzset, void, (void)); -+# endif -+_GL_CXXALIAS_SYS (tzset, void, (void)); -+# endif -+_GL_CXXALIASWARN (tzset); -+# endif -+ - /* Return the 'time_t' representation of TP and normalize TP. */ - # if @GNULIB_MKTIME@ - # if @REPLACE_MKTIME@ -@@ -190,7 +205,7 @@ - /* Convert TIMER to RESULT, assuming local time and UTC respectively. See - and - . */ --# if @GNULIB_GETTIMEOFDAY@ -+# if @GNULIB_LOCALTIME@ || @REPLACE_LOCALTIME@ - # if @REPLACE_LOCALTIME@ - # if !(defined __cplusplus && defined GNULIB_NAMESPACE) - # undef localtime -@@ -205,7 +220,7 @@ - _GL_CXXALIASWARN (localtime); - # endif - --# if @GNULIB_GETTIMEOFDAY@ -+# if 0 || @REPLACE_GMTIME@ - # if @REPLACE_GMTIME@ - # if !(defined __cplusplus && defined GNULIB_NAMESPACE) - # undef gmtime -@@ -220,7 +235,7 @@ - _GL_CXXALIASWARN (gmtime); - # endif - --/* Parse BUF as a time stamp, assuming FORMAT specifies its layout, and store -+/* Parse BUF as a timestamp, assuming FORMAT specifies its layout, and store - the resulting broken-down time into TM. See - . */ - # if @GNULIB_STRPTIME@ -@@ -236,6 +251,60 @@ - _GL_CXXALIASWARN (strptime); - # endif - -+/* Convert *TP to a date and time string. See -+ . */ -+# if @GNULIB_CTIME@ -+# if @REPLACE_CTIME@ -+# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -+# define ctime rpl_ctime -+# endif -+_GL_FUNCDECL_RPL (ctime, char *, (time_t const *__tp) -+ _GL_ARG_NONNULL ((1))); -+_GL_CXXALIAS_RPL (ctime, char *, (time_t const *__tp)); -+# else -+_GL_CXXALIAS_SYS (ctime, char *, (time_t const *__tp)); -+# endif -+_GL_CXXALIASWARN (ctime); -+# endif -+ -+/* Convert *TP to a date and time string. See -+ . */ -+# if @GNULIB_STRFTIME@ -+# if @REPLACE_STRFTIME@ -+# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -+# define strftime rpl_strftime -+# endif -+_GL_FUNCDECL_RPL (strftime, size_t, (char *__buf, size_t __bufsize, -+ const char *__fmt, const struct tm *__tp) -+ _GL_ARG_NONNULL ((1, 3, 4))); -+_GL_CXXALIAS_RPL (strftime, size_t, (char *__buf, size_t __bufsize, -+ const char *__fmt, const struct tm *__tp)); -+# else -+_GL_CXXALIAS_SYS (strftime, size_t, (char *__buf, size_t __bufsize, -+ const char *__fmt, const struct tm *__tp)); -+# endif -+_GL_CXXALIASWARN (strftime); -+# endif -+ -+# if defined _GNU_SOURCE && @GNULIB_TIME_RZ@ && ! @HAVE_TIMEZONE_T@ -+typedef struct tm_zone *timezone_t; -+_GL_FUNCDECL_SYS (tzalloc, timezone_t, (char const *__name)); -+_GL_CXXALIAS_SYS (tzalloc, timezone_t, (char const *__name)); -+_GL_FUNCDECL_SYS (tzfree, void, (timezone_t __tz)); -+_GL_CXXALIAS_SYS (tzfree, void, (timezone_t __tz)); -+_GL_FUNCDECL_SYS (localtime_rz, struct tm *, -+ (timezone_t __tz, time_t const *restrict __timer, -+ struct tm *restrict __result) _GL_ARG_NONNULL ((2, 3))); -+_GL_CXXALIAS_SYS (localtime_rz, struct tm *, -+ (timezone_t __tz, time_t const *restrict __timer, -+ struct tm *restrict __result)); -+_GL_FUNCDECL_SYS (mktime_z, time_t, -+ (timezone_t __tz, struct tm *restrict __result) -+ _GL_ARG_NONNULL ((2))); -+_GL_CXXALIAS_SYS (mktime_z, time_t, -+ (timezone_t __tz, struct tm *restrict __result)); -+# endif -+ - /* Convert TM to a time_t value, assuming UTC. */ - # if @GNULIB_TIMEGM@ - # if @REPLACE_TIMEGM@ -diff -durN libpipeline-1.4.1.orig/gnulib/lib/unistd.c libpipeline-1.4.1/gnulib/lib/unistd.c ---- libpipeline-1.4.1.orig/gnulib/lib/unistd.c 2014-02-18 21:42:59.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/lib/unistd.c 2017-05-17 10:35:34.312500000 +0800 -@@ -1,3 +1,4 @@ - #include - #define _GL_UNISTD_INLINE _GL_EXTERN_INLINE - #include "unistd.h" -+typedef int dummy; -diff -durN libpipeline-1.4.1.orig/gnulib/lib/unistd.in.h libpipeline-1.4.1/gnulib/lib/unistd.in.h ---- libpipeline-1.4.1.orig/gnulib/lib/unistd.in.h 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/lib/unistd.in.h 2017-05-17 10:35:34.671875000 +0800 -@@ -1,5 +1,5 @@ - /* Substitute for and wrapper around . -- Copyright (C) 2003-2014 Free Software Foundation, Inc. -+ Copyright (C) 2003-2017 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 -@@ -21,9 +21,23 @@ - #endif - @PRAGMA_COLUMNS@ - -+#ifdef _GL_INCLUDING_UNISTD_H -+/* Special invocation convention: -+ - On Mac OS X 10.3.9 we have a sequence of nested includes -+ -> -> -> -+ In this situation, the functions are not yet declared, therefore we cannot -+ provide the C++ aliases. */ -+ -+#@INCLUDE_NEXT@ @NEXT_UNISTD_H@ -+ -+#else -+/* Normal invocation convention. */ -+ - /* The include_next requires a split double-inclusion guard. */ - #if @HAVE_UNISTD_H@ -+# define _GL_INCLUDING_UNISTD_H - # @INCLUDE_NEXT@ @NEXT_UNISTD_H@ -+# undef _GL_INCLUDING_UNISTD_H - #endif - - /* Get all possible declarations of gethostname(). */ -@@ -41,9 +55,13 @@ - #include - - /* mingw doesn't define the SEEK_* or *_FILENO macros in . */ -+/* MSVC declares 'unlink' in , not in . We must include -+ it before we #define unlink rpl_unlink. */ - /* Cygwin 1.7.1 declares symlinkat in , not in . */ - /* But avoid namespace pollution on glibc systems. */ - #if (!(defined SEEK_CUR && defined SEEK_END && defined SEEK_SET) \ -+ || ((@GNULIB_UNLINK@ || defined GNULIB_POSIXCHECK) \ -+ && ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)) \ - || ((@GNULIB_SYMLINKAT@ || defined GNULIB_POSIXCHECK) \ - && defined __CYGWIN__)) \ - && ! defined __GLIBC__ -@@ -109,11 +127,18 @@ - # include - #endif - -+/* The definitions of _GL_FUNCDECL_RPL etc. are copied here. */ -+ -+/* The definition of _GL_ARG_NONNULL is copied here. */ -+ -+/* The definition of _GL_WARN_ON_USE is copied here. */ -+ -+ - /* Get getopt(), optarg, optind, opterr, optopt. - But avoid namespace pollution on glibc systems. */ - #if @GNULIB_UNISTD_H_GETOPT@ && !defined __GLIBC__ && !defined _GL_SYSTEM_GETOPT --# define __need_getopt --# include -+# include -+# include - #endif - - #ifndef _GL_INLINE_HEADER_BEGIN -@@ -124,13 +149,6 @@ - # define _GL_UNISTD_INLINE _GL_INLINE - #endif - --/* The definitions of _GL_FUNCDECL_RPL etc. are copied here. */ -- --/* The definition of _GL_ARG_NONNULL is copied here. */ -- --/* The definition of _GL_WARN_ON_USE is copied here. */ -- -- - /* Hide some function declarations from . */ - - #if @GNULIB_GETHOSTNAME@ && @UNISTD_H_HAVE_WINSOCK2_H@ -@@ -387,6 +405,12 @@ - /* Set of environment variables and values. An array of strings of the form - "VARIABLE=VALUE", terminated with a NULL. */ - # if defined __APPLE__ && defined __MACH__ -+# include -+# if !TARGET_OS_IPHONE && !TARGET_IPHONE_SIMULATOR -+# define _GL_USE_CRT_EXTERNS -+# endif -+# endif -+# ifdef _GL_USE_CRT_EXTERNS - # include - # define environ (*_NSGetEnviron ()) - # else -@@ -756,7 +780,7 @@ - ${LOGNAME-$USER} on Unix platforms, - $USERNAME on native Windows platforms. - */ --# if !@HAVE_GETLOGIN@ -+# if !@HAVE_DECL_GETLOGIN@ - _GL_FUNCDECL_SYS (getlogin, char *, (void)); - # endif - _GL_CXXALIAS_SYS (getlogin, char *, (void)); -@@ -1273,13 +1297,24 @@ - - - #if @GNULIB_READLINKAT@ --# if !@HAVE_READLINKAT@ -+# if @REPLACE_READLINKAT@ -+# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -+# define readlinkat rpl_readlinkat -+# endif -+_GL_FUNCDECL_RPL (readlinkat, ssize_t, -+ (int fd, char const *file, char *buf, size_t len) -+ _GL_ARG_NONNULL ((2, 3))); -+_GL_CXXALIAS_RPL (readlinkat, ssize_t, -+ (int fd, char const *file, char *buf, size_t len)); -+# else -+# if !@HAVE_READLINKAT@ - _GL_FUNCDECL_SYS (readlinkat, ssize_t, - (int fd, char const *file, char *buf, size_t len) - _GL_ARG_NONNULL ((2, 3))); --# endif -+# endif - _GL_CXXALIAS_SYS (readlinkat, ssize_t, - (int fd, char const *file, char *buf, size_t len)); -+# endif - _GL_CXXALIASWARN (readlinkat); - #elif defined GNULIB_POSIXCHECK - # undef readlinkat -@@ -1393,13 +1428,25 @@ - - - #if @GNULIB_SYMLINKAT@ --# if !@HAVE_SYMLINKAT@ -+# if @REPLACE_SYMLINKAT@ -+# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -+# undef symlinkat -+# define symlinkat rpl_symlinkat -+# endif -+_GL_FUNCDECL_RPL (symlinkat, int, -+ (char const *contents, int fd, char const *file) -+ _GL_ARG_NONNULL ((1, 3))); -+_GL_CXXALIAS_RPL (symlinkat, int, -+ (char const *contents, int fd, char const *file)); -+# else -+# if !@HAVE_SYMLINKAT@ - _GL_FUNCDECL_SYS (symlinkat, int, - (char const *contents, int fd, char const *file) - _GL_ARG_NONNULL ((1, 3))); --# endif -+# endif - _GL_CXXALIAS_SYS (symlinkat, int, - (char const *contents, int fd, char const *file)); -+# endif - _GL_CXXALIASWARN (symlinkat); - #elif defined GNULIB_POSIXCHECK - # undef symlinkat -@@ -1410,6 +1457,36 @@ - #endif - - -+#if @GNULIB_TRUNCATE@ -+/* Change the size of the file designated by FILENAME to become equal to LENGTH. -+ Return 0 if successful, otherwise -1 and errno set. -+ See the POSIX:2008 specification -+ . */ -+# if @REPLACE_TRUNCATE@ -+# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -+# undef truncate -+# define truncate rpl_truncate -+# endif -+_GL_FUNCDECL_RPL (truncate, int, (const char *filename, off_t length) -+ _GL_ARG_NONNULL ((1))); -+_GL_CXXALIAS_RPL (truncate, int, (const char *filename, off_t length)); -+# else -+# if !@HAVE_TRUNCATE@ -+_GL_FUNCDECL_SYS (truncate, int, (const char *filename, off_t length) -+ _GL_ARG_NONNULL ((1))); -+# endif -+_GL_CXXALIAS_SYS (truncate, int, (const char *filename, off_t length)); -+# endif -+_GL_CXXALIASWARN (truncate); -+#elif defined GNULIB_POSIXCHECK -+# undef truncate -+# if HAVE_RAW_DECL_TRUNCATE -+_GL_WARN_ON_USE (truncate, "truncate is unportable - " -+ "use gnulib module truncate for portability"); -+# endif -+#endif -+ -+ - #if @GNULIB_TTYNAME_R@ - /* Store at most BUFLEN characters of the pathname of the terminal FD is - open on in BUF. Return 0 on success, otherwise an error number. */ -@@ -1539,4 +1616,5 @@ - _GL_INLINE_HEADER_END - - #endif /* _@GUARD_PREFIX@_UNISTD_H */ -+#endif /* _GL_INCLUDING_UNISTD_H */ - #endif /* _@GUARD_PREFIX@_UNISTD_H */ -diff -durN libpipeline-1.4.1.orig/gnulib/lib/unsetenv.c libpipeline-1.4.1/gnulib/lib/unsetenv.c ---- libpipeline-1.4.1.orig/gnulib/lib/unsetenv.c 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/lib/unsetenv.c 2017-05-17 10:35:35.015625000 +0800 -@@ -1,4 +1,4 @@ --/* Copyright (C) 1992, 1995-2002, 2005-2014 Free Software Foundation, Inc. -+/* Copyright (C) 1992, 1995-2002, 2005-2017 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - This program is free software: you can redistribute it and/or modify -diff -durN libpipeline-1.4.1.orig/gnulib/lib/vasnprintf.c libpipeline-1.4.1/gnulib/lib/vasnprintf.c ---- libpipeline-1.4.1.orig/gnulib/lib/vasnprintf.c 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/lib/vasnprintf.c 2017-05-17 10:35:35.375000000 +0800 -@@ -1,5 +1,5 @@ - /* vsprintf with automatic memory allocation. -- Copyright (C) 1999, 2002-2014 Free Software Foundation, Inc. -+ Copyright (C) 1999, 2002-2017 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 -@@ -156,6 +156,7 @@ - # define SNPRINTF snwprintf - # else - # define SNPRINTF _snwprintf -+# define USE_MSVC__SNPRINTF 1 - # endif - # else - /* Unix. */ -@@ -181,7 +182,9 @@ - /* Here we need to call the native snprintf, not rpl_snprintf. */ - # undef snprintf - # else -+ /* MSVC versions < 14 did not have snprintf, only _snprintf. */ - # define SNPRINTF _snprintf -+# define USE_MSVC__SNPRINTF 1 - # endif - # else - /* Unix. */ -@@ -195,7 +198,7 @@ - - /* GCC >= 4.0 with -Wall emits unjustified "... may be used uninitialized" - warnings in this file. Use -Dlint to suppress them. */ --#ifdef lint -+#if defined GCC_LINT || defined lint - # define IF_LINT(Code) Code - #else - # define IF_LINT(Code) /* empty */ -@@ -208,7 +211,7 @@ - #undef remainder - #define remainder rem - --#if (!USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99) && !WIDE_CHAR_VERSION -+#if (!USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF) && !WIDE_CHAR_VERSION - # if (HAVE_STRNLEN && !defined _AIX) - # define local_strnlen strnlen - # else -@@ -224,7 +227,7 @@ - # endif - #endif - --#if (((!USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99) && WIDE_CHAR_VERSION) || ((!USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99 || (NEED_PRINTF_DIRECTIVE_LS && !defined IN_LIBINTL)) && !WIDE_CHAR_VERSION && DCHAR_IS_TCHAR)) && HAVE_WCHAR_T -+#if (((!USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF) && WIDE_CHAR_VERSION) || ((!USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF || (NEED_PRINTF_DIRECTIVE_LS && !defined IN_LIBINTL)) && !WIDE_CHAR_VERSION && DCHAR_IS_TCHAR)) && HAVE_WCHAR_T - # if HAVE_WCSLEN - # define local_wcslen wcslen - # else -@@ -247,7 +250,7 @@ - # endif - #endif - --#if (!USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99) && HAVE_WCHAR_T && WIDE_CHAR_VERSION -+#if (!USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF) && HAVE_WCHAR_T && WIDE_CHAR_VERSION - # if HAVE_WCSNLEN - # define local_wcsnlen wcsnlen - # else -@@ -1517,7 +1520,7 @@ - - #endif - --#if !USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99 -+#if !USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF - - /* Use a different function name, to make it possible that the 'wchar_t' - parametrization and the 'char' parametrization get compiled in the same -@@ -1886,7 +1889,7 @@ - else - { - do -- result[length++] = (unsigned char) *cp++; -+ result[length++] = *cp++; - while (--n > 0); - } - } -@@ -1957,15 +1960,14 @@ - if (!(a.arg[dp->width_arg_index].type == TYPE_INT)) - abort (); - arg = a.arg[dp->width_arg_index].a.a_int; -+ width = arg; - if (arg < 0) - { - /* "A negative field width is taken as a '-' flag - followed by a positive field width." */ - flags |= FLAG_LEFT; -- width = (unsigned int) (-arg); -+ width = -width; - } -- else -- width = arg; - } - else - { -@@ -2073,8 +2075,7 @@ - characters = 0; - } - -- if (has_width && width > characters -- && !(dp->flags & FLAG_LEFT)) -+ if (characters < width && !(dp->flags & FLAG_LEFT)) - { - size_t n = width - characters; - ENSURE_ALLOCATION (xsum (length, n)); -@@ -2127,8 +2128,7 @@ - } - # endif - -- if (has_width && width > characters -- && (dp->flags & FLAG_LEFT)) -+ if (characters < width && (dp->flags & FLAG_LEFT)) - { - size_t n = width - characters; - ENSURE_ALLOCATION (xsum (length, n)); -@@ -2201,8 +2201,7 @@ - characters = 0; - } - -- if (has_width && width > characters -- && !(dp->flags & FLAG_LEFT)) -+ if (characters < width && !(dp->flags & FLAG_LEFT)) - { - size_t n = width - characters; - ENSURE_ALLOCATION (xsum (length, n)); -@@ -2255,8 +2254,7 @@ - } - # endif - -- if (has_width && width > characters -- && (dp->flags & FLAG_LEFT)) -+ if (characters < width && (dp->flags & FLAG_LEFT)) - { - size_t n = width - characters; - ENSURE_ALLOCATION (xsum (length, n)); -@@ -2329,8 +2327,7 @@ - characters = 0; - } - -- if (has_width && width > characters -- && !(dp->flags & FLAG_LEFT)) -+ if (characters < width && !(dp->flags & FLAG_LEFT)) - { - size_t n = width - characters; - ENSURE_ALLOCATION (xsum (length, n)); -@@ -2383,8 +2380,7 @@ - } - # endif - -- if (has_width && width > characters -- && (dp->flags & FLAG_LEFT)) -+ if (characters < width && (dp->flags & FLAG_LEFT)) - { - size_t n = width - characters; - ENSURE_ALLOCATION (xsum (length, n)); -@@ -2399,7 +2395,7 @@ - } - } - #endif --#if (!USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99 || (NEED_PRINTF_DIRECTIVE_LS && !defined IN_LIBINTL)) && HAVE_WCHAR_T -+#if (!USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF || (NEED_PRINTF_DIRECTIVE_LS && !defined IN_LIBINTL)) && HAVE_WCHAR_T - else if (dp->conversion == 's' - # if WIDE_CHAR_VERSION - && a.arg[dp->arg_index].type != TYPE_WIDE_STRING -@@ -2435,15 +2431,14 @@ - if (!(a.arg[dp->width_arg_index].type == TYPE_INT)) - abort (); - arg = a.arg[dp->width_arg_index].a.a_int; -+ width = arg; - if (arg < 0) - { - /* "A negative field width is taken as a '-' flag - followed by a positive field width." */ - flags |= FLAG_LEFT; -- width = (unsigned int) (-arg); -+ width = -width; - } -- else -- width = arg; - } - else - { -@@ -2573,8 +2568,7 @@ - characters = 0; - } - -- if (has_width && width > characters -- && !(dp->flags & FLAG_LEFT)) -+ if (characters < width && !(dp->flags & FLAG_LEFT)) - { - size_t n = width - characters; - ENSURE_ALLOCATION (xsum (length, n)); -@@ -2635,8 +2629,7 @@ - } - } - -- if (has_width && width > characters -- && (dp->flags & FLAG_LEFT)) -+ if (characters < width && (dp->flags & FLAG_LEFT)) - { - size_t n = width - characters; - ENSURE_ALLOCATION (xsum (length, n)); -@@ -2827,8 +2820,7 @@ - /* w doesn't matter. */ - w = 0; - -- if (has_width && width > w -- && !(dp->flags & FLAG_LEFT)) -+ if (w < width && !(dp->flags & FLAG_LEFT)) - { - size_t n = width - w; - ENSURE_ALLOCATION (xsum (length, n)); -@@ -2911,8 +2903,7 @@ - length += tmpdst_len; - # endif - -- if (has_width && width > w -- && (dp->flags & FLAG_LEFT)) -+ if (w < width && (dp->flags & FLAG_LEFT)) - { - size_t n = width - w; - ENSURE_ALLOCATION (xsum (length, n)); -@@ -2939,17 +2930,16 @@ - { - arg_type type = a.arg[dp->arg_index].type; - int flags = dp->flags; -- int has_width; - size_t width; - int has_precision; - size_t precision; - size_t tmp_length; -+ size_t count; - DCHAR_T tmpbuf[700]; - DCHAR_T *tmp; - DCHAR_T *pad_ptr; - DCHAR_T *p; - -- has_width = 0; - width = 0; - if (dp->width_start != dp->width_end) - { -@@ -2960,15 +2950,14 @@ - if (!(a.arg[dp->width_arg_index].type == TYPE_INT)) - abort (); - arg = a.arg[dp->width_arg_index].a.a_int; -+ width = arg; - if (arg < 0) - { - /* "A negative field width is taken as a '-' flag - followed by a positive field width." */ - flags |= FLAG_LEFT; -- width = (unsigned int) (-arg); -+ width = -width; - } -- else -- width = arg; - } - else - { -@@ -2978,7 +2967,6 @@ - width = xsum (xtimes (width, 10), *digitp++ - '0'); - while (digitp != dp->width_end); - } -- has_width = 1; - } - - has_precision = 0; -@@ -3354,11 +3342,14 @@ - abort (); - # endif - } -+ - /* The generated string now extends from tmp to p, with the - zero padding insertion point being at pad_ptr. */ -- if (has_width && p - tmp < width) -+ count = p - tmp; -+ -+ if (count < width) - { -- size_t pad = width - (p - tmp); -+ size_t pad = width - count; - DCHAR_T *end = p + pad; - - if (flags & FLAG_LEFT) -@@ -3391,28 +3382,26 @@ - p = end; - } - -- { -- size_t count = p - tmp; -+ count = p - tmp; - -- if (count >= tmp_length) -- /* tmp_length was incorrectly calculated - fix the -- code above! */ -- abort (); -+ if (count >= tmp_length) -+ /* tmp_length was incorrectly calculated - fix the -+ code above! */ -+ abort (); - -- /* Make room for the result. */ -- if (count >= allocated - length) -- { -- size_t n = xsum (length, count); -+ /* Make room for the result. */ -+ if (count >= allocated - length) -+ { -+ size_t n = xsum (length, count); - -- ENSURE_ALLOCATION (n); -- } -+ ENSURE_ALLOCATION (n); -+ } - -- /* Append the result. */ -- memcpy (result + length, tmp, count * sizeof (DCHAR_T)); -- if (tmp != tmpbuf) -- free (tmp); -- length += count; -- } -+ /* Append the result. */ -+ memcpy (result + length, tmp, count * sizeof (DCHAR_T)); -+ if (tmp != tmpbuf) -+ free (tmp); -+ length += count; - } - #endif - #if (NEED_PRINTF_INFINITE_DOUBLE || NEED_PRINTF_DOUBLE || NEED_PRINTF_INFINITE_LONG_DOUBLE || NEED_PRINTF_LONG_DOUBLE) && !defined IN_LIBINTL -@@ -3446,8 +3435,8 @@ - arg_type type = a.arg[dp->arg_index].type; - # endif - int flags = dp->flags; -- int has_width; - size_t width; -+ size_t count; - int has_precision; - size_t precision; - size_t tmp_length; -@@ -3456,7 +3445,6 @@ - DCHAR_T *pad_ptr; - DCHAR_T *p; - -- has_width = 0; - width = 0; - if (dp->width_start != dp->width_end) - { -@@ -3467,15 +3455,14 @@ - if (!(a.arg[dp->width_arg_index].type == TYPE_INT)) - abort (); - arg = a.arg[dp->width_arg_index].a.a_int; -+ width = arg; - if (arg < 0) - { - /* "A negative field width is taken as a '-' flag - followed by a positive field width." */ - flags |= FLAG_LEFT; -- width = (unsigned int) (-arg); -+ width = -width; - } -- else -- width = arg; - } - else - { -@@ -3485,7 +3472,6 @@ - width = xsum (xtimes (width, 10), *digitp++ - '0'); - while (digitp != dp->width_end); - } -- has_width = 1; - } - - has_precision = 0; -@@ -3925,9 +3911,9 @@ - digits without trailing zeroes. */ - if (exponent >= 0) - { -- size_t count = exponent + 1; -+ size_t ecount = exponent + 1; - /* Note: count <= precision = ndigits. */ -- for (; count > 0; count--) -+ for (; ecount > 0; ecount--) - *p++ = digits[--ndigits]; - if ((flags & FLAG_ALT) || ndigits > nzeroes) - { -@@ -3941,10 +3927,10 @@ - } - else - { -- size_t count = -exponent - 1; -+ size_t ecount = -exponent - 1; - *p++ = '0'; - *p++ = decimal_point_char (); -- for (; count > 0; count--) -+ for (; ecount > 0; ecount--) - *p++ = '0'; - while (ndigits > nzeroes) - { -@@ -4395,9 +4381,9 @@ - digits without trailing zeroes. */ - if (exponent >= 0) - { -- size_t count = exponent + 1; -- /* Note: count <= precision = ndigits. */ -- for (; count > 0; count--) -+ size_t ecount = exponent + 1; -+ /* Note: ecount <= precision = ndigits. */ -+ for (; ecount > 0; ecount--) - *p++ = digits[--ndigits]; - if ((flags & FLAG_ALT) || ndigits > nzeroes) - { -@@ -4411,10 +4397,10 @@ - } - else - { -- size_t count = -exponent - 1; -+ size_t ecount = -exponent - 1; - *p++ = '0'; - *p++ = decimal_point_char (); -- for (; count > 0; count--) -+ for (; ecount > 0; ecount--) - *p++ = '0'; - while (ndigits > nzeroes) - { -@@ -4542,9 +4528,11 @@ - - /* The generated string now extends from tmp to p, with the - zero padding insertion point being at pad_ptr. */ -- if (has_width && p - tmp < width) -+ count = p - tmp; -+ -+ if (count < width) - { -- size_t pad = width - (p - tmp); -+ size_t pad = width - count; - DCHAR_T *end = p + pad; - - if (flags & FLAG_LEFT) -@@ -4577,39 +4565,39 @@ - p = end; - } - -- { -- size_t count = p - tmp; -+ count = p - tmp; - -- if (count >= tmp_length) -- /* tmp_length was incorrectly calculated - fix the -- code above! */ -- abort (); -+ if (count >= tmp_length) -+ /* tmp_length was incorrectly calculated - fix the -+ code above! */ -+ abort (); - -- /* Make room for the result. */ -- if (count >= allocated - length) -- { -- size_t n = xsum (length, count); -+ /* Make room for the result. */ -+ if (count >= allocated - length) -+ { -+ size_t n = xsum (length, count); - -- ENSURE_ALLOCATION (n); -- } -+ ENSURE_ALLOCATION (n); -+ } - -- /* Append the result. */ -- memcpy (result + length, tmp, count * sizeof (DCHAR_T)); -- if (tmp != tmpbuf) -- free (tmp); -- length += count; -- } -+ /* Append the result. */ -+ memcpy (result + length, tmp, count * sizeof (DCHAR_T)); -+ if (tmp != tmpbuf) -+ free (tmp); -+ length += count; - } - #endif - else - { - arg_type type = a.arg[dp->arg_index].type; - int flags = dp->flags; --#if !USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99 || !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_LEFTADJUST || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION -+#if !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_LEFTADJUST || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION - int has_width; -+#endif -+#if !USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF || !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_LEFTADJUST || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION - size_t width; - #endif --#if !USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99 || NEED_PRINTF_UNBOUNDED_PRECISION -+#if !USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF || NEED_PRINTF_UNBOUNDED_PRECISION - int has_precision; - size_t precision; - #endif -@@ -4635,8 +4623,10 @@ - TCHAR_T *tmp; - #endif - --#if !USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99 || !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_LEFTADJUST || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION -+#if !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_LEFTADJUST || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION - has_width = 0; -+#endif -+#if !USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF || !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_LEFTADJUST || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION - width = 0; - if (dp->width_start != dp->width_end) - { -@@ -4647,15 +4637,14 @@ - if (!(a.arg[dp->width_arg_index].type == TYPE_INT)) - abort (); - arg = a.arg[dp->width_arg_index].a.a_int; -+ width = arg; - if (arg < 0) - { - /* "A negative field width is taken as a '-' flag - followed by a positive field width." */ - flags |= FLAG_LEFT; -- width = (unsigned int) (-arg); -+ width = -width; - } -- else -- width = arg; - } - else - { -@@ -4665,11 +4654,13 @@ - width = xsum (xtimes (width, 10), *digitp++ - '0'); - while (digitp != dp->width_end); - } -+#if !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_LEFTADJUST || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION - has_width = 1; -+#endif - } - #endif - --#if !USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99 || NEED_PRINTF_UNBOUNDED_PRECISION -+#if !USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF || NEED_PRINTF_UNBOUNDED_PRECISION - has_precision = 0; - precision = 6; - if (dp->precision_start != dp->precision_end) -@@ -4805,7 +4796,7 @@ - { - const FCHAR_T *mp = dp->width_start; - do -- *fbp++ = (unsigned char) *mp++; -+ *fbp++ = *mp++; - while (--n > 0); - } - } -@@ -4826,7 +4817,7 @@ - { - const FCHAR_T *mp = dp->precision_start; - do -- *fbp++ = (unsigned char) *mp++; -+ *fbp++ = *mp++; - while (--n > 0); - } - } -@@ -4844,9 +4835,9 @@ - break; - # else - *fbp++ = 'l'; -- /*FALLTHROUGH*/ - # endif - #endif -+ /*FALLTHROUGH*/ - case TYPE_LONGINT: - case TYPE_ULONGINT: - #if HAVE_WINT_T -@@ -5139,7 +5130,7 @@ - /* Look at the snprintf() return value. */ - if (retcount < 0) - { --# if !HAVE_SNPRINTF_RETVAL_C99 -+# if !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF - /* HP-UX 10.20 snprintf() is doubly deficient: - It doesn't understand the '%n' directive, - *and* it returns -1 (rather than the length -@@ -5153,7 +5144,7 @@ - size_t tmp_length = - MAX_ROOM_NEEDED (&a, dp->arg_index, - dp->conversion, type, flags, -- has_width ? width : 0, -+ width, - has_precision, - precision, pad_ourselves); - -@@ -5191,18 +5182,21 @@ - /* SNPRINTF or sprintf failed. Save and use the errno - that it has set, if any. */ - int saved_errno = errno; -+ if (saved_errno == 0) -+ { -+ if (dp->conversion == 'c' || dp->conversion == 's') -+ saved_errno = EILSEQ; -+ else -+ saved_errno = EINVAL; -+ } - - if (!(result == resultbuf || result == NULL)) - free (result); - if (buf_malloced != NULL) - free (buf_malloced); - CLEANUP (); -- errno = -- (saved_errno != 0 -- ? saved_errno -- : (dp->conversion == 'c' || dp->conversion == 's' -- ? EILSEQ -- : EINVAL)); -+ -+ errno = saved_errno; - return NULL; - } - -@@ -5391,7 +5385,7 @@ - tmpsrc += count; - tmpdst += count; - for (n = count; n > 0; n--) -- *--tmpdst = (unsigned char) *--tmpsrc; -+ *--tmpdst = *--tmpsrc; - } - } - #endif -diff -durN libpipeline-1.4.1.orig/gnulib/lib/vasnprintf.h libpipeline-1.4.1/gnulib/lib/vasnprintf.h ---- libpipeline-1.4.1.orig/gnulib/lib/vasnprintf.h 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/lib/vasnprintf.h 2017-05-17 10:35:35.640625000 +0800 -@@ -1,5 +1,5 @@ - /* vsprintf with automatic memory allocation. -- Copyright (C) 2002-2004, 2007-2014 Free Software Foundation, Inc. -+ Copyright (C) 2002-2004, 2007-2017 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 -diff -durN libpipeline-1.4.1.orig/gnulib/lib/vasprintf.c libpipeline-1.4.1/gnulib/lib/vasprintf.c ---- libpipeline-1.4.1.orig/gnulib/lib/vasprintf.c 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/lib/vasprintf.c 2017-05-17 10:35:35.937500000 +0800 -@@ -1,5 +1,5 @@ - /* Formatted output to strings. -- Copyright (C) 1999, 2002, 2006-2014 Free Software Foundation, Inc. -+ Copyright (C) 1999, 2002, 2006-2017 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 -diff -durN libpipeline-1.4.1.orig/gnulib/lib/verify.h libpipeline-1.4.1/gnulib/lib/verify.h ---- libpipeline-1.4.1.orig/gnulib/lib/verify.h 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/lib/verify.h 2017-05-17 10:35:36.234375000 +0800 -@@ -1,6 +1,6 @@ - /* Compile-time assert-like macros. - -- Copyright (C) 2005-2006, 2009-2014 Free Software Foundation, Inc. -+ Copyright (C) 2005-2006, 2009-2017 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 -@@ -248,7 +248,12 @@ - /* Verify requirement R at compile-time, as a declaration without a - trailing ';'. */ - --#define verify(R) _GL_VERIFY (R, "verify (" #R ")") -+#ifdef __GNUC__ -+# define verify(R) _GL_VERIFY (R, "verify (" #R ")") -+#else -+/* PGI barfs if R is long. Play it safe. */ -+# define verify(R) _GL_VERIFY (R, "verify (...)") -+#endif - - #ifndef __has_builtin - # define __has_builtin(x) 0 -@@ -263,7 +268,7 @@ - # define assume(R) ((R) ? (void) 0 : __builtin_unreachable ()) - #elif 1200 <= _MSC_VER - # define assume(R) __assume (R) --#elif (defined lint \ -+#elif ((defined GCC_LINT || defined lint) \ - && (__has_builtin (__builtin_trap) \ - || 3 < __GNUC__ + (3 < __GNUC_MINOR__ + (4 <= __GNUC_PATCHLEVEL__)))) - /* Doing it this way helps various packages when configured with -diff -durN libpipeline-1.4.1.orig/gnulib/lib/waitpid.c libpipeline-1.4.1/gnulib/lib/waitpid.c ---- libpipeline-1.4.1.orig/gnulib/lib/waitpid.c 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/lib/waitpid.c 2017-05-17 10:35:36.515625000 +0800 -@@ -1,5 +1,5 @@ - /* Wait for process state change. -- Copyright (C) 2001-2003, 2005-2014 Free Software Foundation, Inc. -+ Copyright (C) 2001-2003, 2005-2017 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 -diff -durN libpipeline-1.4.1.orig/gnulib/lib/warn-on-use.h libpipeline-1.4.1/gnulib/lib/warn-on-use.h ---- libpipeline-1.4.1.orig/gnulib/lib/warn-on-use.h 1970-01-01 08:00:00.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/lib/warn-on-use.h 2017-05-17 10:35:05.875000000 +0800 -@@ -0,0 +1,109 @@ -+/* A C macro for emitting warnings if a function is used. -+ Copyright (C) 2010-2017 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 3 of the License, 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, see . */ -+ -+/* _GL_WARN_ON_USE (function, "literal string") issues a declaration -+ for FUNCTION which will then trigger a compiler warning containing -+ the text of "literal string" anywhere that function is called, if -+ supported by the compiler. If the compiler does not support this -+ feature, the macro expands to an unused extern declaration. -+ -+ This macro is useful for marking a function as a potential -+ portability trap, with the intent that "literal string" include -+ instructions on the replacement function that should be used -+ instead. However, one of the reasons that a function is a -+ portability trap is if it has the wrong signature. Declaring -+ FUNCTION with a different signature in C is a compilation error, so -+ this macro must use the same type as any existing declaration so -+ that programs that avoid the problematic FUNCTION do not fail to -+ compile merely because they included a header that poisoned the -+ function. But this implies that _GL_WARN_ON_USE is only safe to -+ use if FUNCTION is known to already have a declaration. Use of -+ this macro implies that there must not be any other macro hiding -+ the declaration of FUNCTION; but undefining FUNCTION first is part -+ of the poisoning process anyway (although for symbols that are -+ provided only via a macro, the result is a compilation error rather -+ than a warning containing "literal string"). Also note that in -+ C++, it is only safe to use if FUNCTION has no overloads. -+ -+ For an example, it is possible to poison 'getline' by: -+ - adding a call to gl_WARN_ON_USE_PREPARE([[#include ]], -+ [getline]) in configure.ac, which potentially defines -+ HAVE_RAW_DECL_GETLINE -+ - adding this code to a header that wraps the system : -+ #undef getline -+ #if HAVE_RAW_DECL_GETLINE -+ _GL_WARN_ON_USE (getline, "getline is required by POSIX 2008, but" -+ "not universally present; use the gnulib module getline"); -+ #endif -+ -+ It is not possible to directly poison global variables. But it is -+ possible to write a wrapper accessor function, and poison that -+ (less common usage, like &environ, will cause a compilation error -+ rather than issue the nice warning, but the end result of informing -+ the developer about their portability problem is still achieved): -+ #if HAVE_RAW_DECL_ENVIRON -+ static char ***rpl_environ (void) { return &environ; } -+ _GL_WARN_ON_USE (rpl_environ, "environ is not always properly declared"); -+ # undef environ -+ # define environ (*rpl_environ ()) -+ #endif -+ */ -+#ifndef _GL_WARN_ON_USE -+ -+# if 4 < __GNUC__ || (__GNUC__ == 4 && 3 <= __GNUC_MINOR__) -+/* A compiler attribute is available in gcc versions 4.3.0 and later. */ -+# define _GL_WARN_ON_USE(function, message) \ -+extern __typeof__ (function) function __attribute__ ((__warning__ (message))) -+# elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING -+/* Verify the existence of the function. */ -+# define _GL_WARN_ON_USE(function, message) \ -+extern __typeof__ (function) function -+# else /* Unsupported. */ -+# define _GL_WARN_ON_USE(function, message) \ -+_GL_WARN_EXTERN_C int _gl_warn_on_use -+# endif -+#endif -+ -+/* _GL_WARN_ON_USE_CXX (function, rettype, parameters_and_attributes, "string") -+ is like _GL_WARN_ON_USE (function, "string"), except that the function is -+ declared with the given prototype, consisting of return type, parameters, -+ and attributes. -+ This variant is useful for overloaded functions in C++. _GL_WARN_ON_USE does -+ not work in this case. */ -+#ifndef _GL_WARN_ON_USE_CXX -+# if 4 < __GNUC__ || (__GNUC__ == 4 && 3 <= __GNUC_MINOR__) -+# define _GL_WARN_ON_USE_CXX(function,rettype,parameters_and_attributes,msg) \ -+extern rettype function parameters_and_attributes \ -+ __attribute__ ((__warning__ (msg))) -+# elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING -+/* Verify the existence of the function. */ -+# define _GL_WARN_ON_USE_CXX(function,rettype,parameters_and_attributes,msg) \ -+extern rettype function parameters_and_attributes -+# else /* Unsupported. */ -+# define _GL_WARN_ON_USE_CXX(function,rettype,parameters_and_attributes,msg) \ -+_GL_WARN_EXTERN_C int _gl_warn_on_use -+# endif -+#endif -+ -+/* _GL_WARN_EXTERN_C declaration; -+ performs the declaration with C linkage. */ -+#ifndef _GL_WARN_EXTERN_C -+# if defined __cplusplus -+# define _GL_WARN_EXTERN_C extern "C" -+# else -+# define _GL_WARN_EXTERN_C extern -+# endif -+#endif -diff -durN libpipeline-1.4.1.orig/gnulib/lib/wchar.in.h libpipeline-1.4.1/gnulib/lib/wchar.in.h ---- libpipeline-1.4.1.orig/gnulib/lib/wchar.in.h 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/lib/wchar.in.h 2017-05-17 10:35:36.796875000 +0800 -@@ -1,6 +1,6 @@ - /* A substitute for ISO C99 , for platforms that have issues. - -- Copyright (C) 2007-2014 Free Software Foundation, Inc. -+ Copyright (C) 2007-2017 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 -@@ -30,15 +30,23 @@ - #endif - @PRAGMA_COLUMNS@ - --#if defined __need_mbstate_t || defined __need_wint_t || (defined __hpux && ((defined _INTTYPES_INCLUDED && !defined strtoimax) || defined _GL_JUST_INCLUDE_SYSTEM_WCHAR_H)) || defined _GL_ALREADY_INCLUDING_WCHAR_H -+#if (((defined __need_mbstate_t || defined __need_wint_t) \ -+ && !defined __MINGW32__ && !defined __KLIBC__) \ -+ || (defined __hpux \ -+ && ((defined _INTTYPES_INCLUDED && !defined strtoimax) \ -+ || defined _GL_JUST_INCLUDE_SYSTEM_WCHAR_H)) \ -+ || (defined __MINGW32__ && defined __STRING_H_SOURCED__) \ -+ || defined _GL_ALREADY_INCLUDING_WCHAR_H) - /* Special invocation convention: -- - Inside glibc and uClibc header files. -+ - Inside glibc and uClibc header files, but not MinGW. - - On HP-UX 11.00 we have a sequence of nested includes - -> -> , and the latter includes , - once indirectly -> -> -> - and once directly. In both situations 'wint_t' is not yet defined, - therefore we cannot provide the function overrides; instead include only - the system's . -+ - With MinGW 3.22, when includes , only some part of -+ is actually processed, and that doesn't include 'mbstate_t'. - - On IRIX 6.5, similarly, we have an include -> , and - the latter includes . But here, we have no way to detect whether - is completely included or is still being included. */ -@@ -105,12 +113,16 @@ - # define WEOF -1 - # endif - #else --/* MSVC defines wint_t as 'unsigned short' in . -- This is too small: ISO C 99 section 7.24.1.(2) says that wint_t must be -- "unchanged by default argument promotions". Override it. */ --# if defined _MSC_VER -+/* mingw and MSVC define wint_t as 'unsigned short' in or -+ . This is too small: ISO C 99 section 7.24.1.(2) says that -+ wint_t must be "unchanged by default argument promotions". Override it. */ -+# if @GNULIB_OVERRIDES_WINT_T@ - # if !GNULIB_defined_wint_t --# include -+# if @HAVE_CRTDEFS_H@ -+# include -+# else -+# include -+# endif - typedef unsigned int rpl_wint_t; - # undef wint_t - # define wint_t rpl_wint_t -@@ -440,6 +452,11 @@ - # if !@HAVE_DECL_WCWIDTH@ - /* wcwidth exists but is not declared. */ - _GL_FUNCDECL_SYS (wcwidth, int, (wchar_t) _GL_ATTRIBUTE_PURE); -+# elif defined __KLIBC__ -+/* On OS/2 kLIBC, wcwidth is a macro that expands to the name of a -+ static inline function. The implementation of wcwidth in wcwidth.c -+ causes a "conflicting types" error. */ -+# undef wcwidth - # endif - _GL_CXXALIAS_SYS (wcwidth, int, (wchar_t)); - # endif -@@ -1022,6 +1039,38 @@ - # endif - #endif - -+ -+/* Convert *TP to a date and time wide string. See -+ . */ -+#if @GNULIB_WCSFTIME@ -+# if @REPLACE_WCSFTIME@ -+# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -+# undef wcsftime -+# define wcsftime rpl_wcsftime -+# endif -+_GL_FUNCDECL_RPL (wcsftime, size_t, (wchar_t *__buf, size_t __bufsize, -+ const wchar_t *__fmt, const struct tm *__tp) -+ _GL_ARG_NONNULL ((1, 3, 4))); -+_GL_CXXALIAS_RPL (wcsftime, size_t, (wchar_t *__buf, size_t __bufsize, -+ const wchar_t *__fmt, const struct tm *__tp)); -+# else -+# if !@HAVE_WCSFTIME@ -+_GL_FUNCDECL_SYS (wcsftime, size_t, (wchar_t *__buf, size_t __bufsize, -+ const wchar_t *__fmt, const struct tm *__tp) -+ _GL_ARG_NONNULL ((1, 3, 4))); -+# endif -+_GL_CXXALIAS_SYS (wcsftime, size_t, (wchar_t *__buf, size_t __bufsize, -+ const wchar_t *__fmt, const struct tm *__tp)); -+# endif -+_GL_CXXALIASWARN (wcsftime); -+#elif defined GNULIB_POSIXCHECK -+# undef wcsftime -+# if HAVE_RAW_DECL_WCSFTIME -+_GL_WARN_ON_USE (wcsftime, "wcsftime is unportable - " -+ "use gnulib module wcsftime for portability"); -+# endif -+#endif -+ - - #endif /* _@GUARD_PREFIX@_WCHAR_H */ - #endif /* _@GUARD_PREFIX@_WCHAR_H */ -diff -durN libpipeline-1.4.1.orig/gnulib/lib/write.c libpipeline-1.4.1/gnulib/lib/write.c ---- libpipeline-1.4.1.orig/gnulib/lib/write.c 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/lib/write.c 2017-05-17 10:35:37.078125000 +0800 -@@ -1,5 +1,5 @@ - /* POSIX compatible write() function. -- Copyright (C) 2008-2014 Free Software Foundation, Inc. -+ Copyright (C) 2008-2017 Free Software Foundation, Inc. - Written by Bruno Haible , 2008. - - This program is free software: you can redistribute it and/or modify -@@ -34,8 +34,14 @@ - # define WIN32_LEAN_AND_MEAN /* avoid including junk */ - # include - --# include "msvc-inval.h" --# include "msvc-nothrow.h" -+# if HAVE_MSVC_INVALID_PARAMETER_HANDLER -+# include "msvc-inval.h" -+# endif -+# if GNULIB_MSVC_NOTHROW -+# include "msvc-nothrow.h" -+# else -+# include -+# endif - - # undef write - -diff -durN libpipeline-1.4.1.orig/gnulib/lib/xalloc.h libpipeline-1.4.1/gnulib/lib/xalloc.h ---- libpipeline-1.4.1.orig/gnulib/lib/xalloc.h 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/lib/xalloc.h 2017-05-17 10:35:37.968750000 +0800 -@@ -1,6 +1,6 @@ - /* xalloc.h -- malloc with out-of-memory checking - -- Copyright (C) 1990-2000, 2003-2004, 2006-2014 Free Software Foundation, Inc. -+ Copyright (C) 1990-2000, 2003-2004, 2006-2017 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 -@@ -19,6 +19,7 @@ - #define XALLOC_H_ - - #include -+#include - - #include "xalloc-oversized.h" - -@@ -41,7 +42,8 @@ - # define _GL_ATTRIBUTE_MALLOC - #endif - --#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3) -+#if ! defined __clang__ && \ -+ (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)) - # define _GL_ATTRIBUTE_ALLOC_SIZE(args) __attribute__ ((__alloc_size__ args)) - #else - # define _GL_ATTRIBUTE_ALLOC_SIZE(args) -@@ -64,7 +66,7 @@ - _GL_ATTRIBUTE_ALLOC_SIZE ((2)); - void *x2realloc (void *p, size_t *pn); - void *xmemdup (void const *p, size_t s) -- _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_ALLOC_SIZE ((2)); -+ _GL_ATTRIBUTE_ALLOC_SIZE ((2)); - char *xstrdup (char const *str) - _GL_ATTRIBUTE_MALLOC; - -@@ -122,10 +124,9 @@ - - /* If P is null, allocate a block of at least *PN such objects; - otherwise, reallocate P so that it contains more than *PN objects -- each of S bytes. *PN must be nonzero unless P is null, and S must -- be nonzero. Set *PN to the new number of objects, and return the -- pointer to the new block. *PN is never set to zero, and the -- returned pointer is never null. -+ each of S bytes. S must be nonzero. Set *PN to the new number of -+ objects, and return the pointer to the new block. *PN is never set -+ to zero, and the returned pointer is never null. - - Repeated reallocations are guaranteed to make progress, either by - allocating an initial block with a nonzero size, or by allocating a -@@ -193,16 +194,19 @@ - n = DEFAULT_MXFAST / s; - n += !n; - } -+ if (xalloc_oversized (n, s)) -+ xalloc_die (); - } - else - { -- /* Set N = ceil (1.5 * N) so that progress is made if N == 1. -- Check for overflow, so that N * S stays in size_t range. -- The check is slightly conservative, but an exact check isn't -- worth the trouble. */ -- if ((size_t) -1 / 3 * 2 / s <= n) -+ /* Set N = floor (1.5 * N) + 1 so that progress is made even if N == 0. -+ Check for overflow, so that N * S stays in both ptrdiff_t and -+ size_t range. The check may be slightly conservative, but an -+ exact check isn't worth the trouble. */ -+ if ((PTRDIFF_MAX < SIZE_MAX ? PTRDIFF_MAX : SIZE_MAX) / 3 * 2 / s -+ <= n) - xalloc_die (); -- n += (n + 1) / 2; -+ n += n / 2 + 1; - } - - *pn = n; -@@ -259,5 +263,6 @@ - - #endif - -+_GL_INLINE_HEADER_END - - #endif /* !XALLOC_H_ */ -diff -durN libpipeline-1.4.1.orig/gnulib/lib/xalloc-die.c libpipeline-1.4.1/gnulib/lib/xalloc-die.c ---- libpipeline-1.4.1.orig/gnulib/lib/xalloc-die.c 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/lib/xalloc-die.c 2017-05-17 10:35:37.375000000 +0800 -@@ -1,6 +1,6 @@ - /* Report a memory allocation failure and exit. - -- Copyright (C) 1997-2000, 2002-2004, 2006, 2009-2014 Free Software -+ Copyright (C) 1997-2000, 2002-2004, 2006, 2009-2017 Free Software - Foundation, Inc. - - This program is free software: you can redistribute it and/or modify -diff -durN libpipeline-1.4.1.orig/gnulib/lib/xalloc-oversized.h libpipeline-1.4.1/gnulib/lib/xalloc-oversized.h ---- libpipeline-1.4.1.orig/gnulib/lib/xalloc-oversized.h 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/lib/xalloc-oversized.h 2017-05-17 10:35:37.703125000 +0800 -@@ -1,6 +1,6 @@ - /* xalloc-oversized.h -- memory allocation size checking - -- Copyright (C) 1990-2000, 2003-2004, 2006-2014 Free Software Foundation, Inc. -+ Copyright (C) 1990-2000, 2003-2004, 2006-2017 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 -@@ -16,23 +16,45 @@ - along with this program. If not, see . */ - - #ifndef XALLOC_OVERSIZED_H_ --# define XALLOC_OVERSIZED_H_ -- --# include -+#define XALLOC_OVERSIZED_H_ - --/* Return 1 if an array of N objects, each of size S, cannot exist due -- to size arithmetic overflow. S must be positive and N must be -- nonnegative. This is a macro, not a function, so that it -- works correctly even when SIZE_MAX < N. -+#include -+#include - -+/* True if N * S would overflow in a size_t calculation, -+ or would generate a value larger than PTRDIFF_MAX. -+ This expands to a constant expression if N and S are both constants. - By gnulib convention, SIZE_MAX represents overflow in size -- calculations, so the conservative dividend to use here is -- SIZE_MAX - 1, since SIZE_MAX might represent an overflowed value. -- However, malloc (SIZE_MAX) fails on all known hosts where -- sizeof (ptrdiff_t) <= sizeof (size_t), so do not bother to test for -- exactly-SIZE_MAX allocations on such hosts; this avoids a test and -- branch when S is known to be 1. */ -+ calculations, so the conservative size_t-based dividend to use here -+ is SIZE_MAX - 1. */ -+#define __xalloc_oversized(n, s) \ -+ ((size_t) (PTRDIFF_MAX < SIZE_MAX ? PTRDIFF_MAX : SIZE_MAX - 1) / (s) < (n)) -+ -+#if PTRDIFF_MAX < SIZE_MAX -+typedef ptrdiff_t __xalloc_count_type; -+#else -+typedef size_t __xalloc_count_type; -+#endif -+ -+/* Return 1 if an array of N objects, each of size S, cannot exist -+ reliably due to size or ptrdiff_t arithmetic overflow. S must be -+ positive and N must be nonnegative. This is a macro, not a -+ function, so that it works correctly even when SIZE_MAX < N. */ -+ -+#if 7 <= __GNUC__ - # define xalloc_oversized(n, s) \ -- ((size_t) (sizeof (ptrdiff_t) <= sizeof (size_t) ? -1 : -2) / (s) < (n)) -+ __builtin_mul_overflow_p (n, s, (__xalloc_count_type) 1) -+#elif 5 <= __GNUC__ && !__STRICT_ANSI__ -+# define xalloc_oversized(n, s) \ -+ (__builtin_constant_p (n) && __builtin_constant_p (s) \ -+ ? __xalloc_oversized (n, s) \ -+ : ({ __xalloc_count_type __xalloc_count; \ -+ __builtin_mul_overflow (n, s, &__xalloc_count); })) -+ -+/* Other compilers use integer division; this may be slower but is -+ more portable. */ -+#else -+# define xalloc_oversized(n, s) __xalloc_oversized (n, s) -+#endif - - #endif /* !XALLOC_OVERSIZED_H_ */ -diff -durN libpipeline-1.4.1.orig/gnulib/lib/xasprintf.c libpipeline-1.4.1/gnulib/lib/xasprintf.c ---- libpipeline-1.4.1.orig/gnulib/lib/xasprintf.c 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/lib/xasprintf.c 2017-05-17 10:35:38.250000000 +0800 -@@ -1,5 +1,5 @@ - /* vasprintf and asprintf with out-of-memory checking. -- Copyright (C) 1999, 2002-2004, 2006, 2009-2014 Free Software Foundation, -+ Copyright (C) 1999, 2002-2004, 2006, 2009-2017 Free Software Foundation, - Inc. - - This program is free software: you can redistribute it and/or modify -diff -durN libpipeline-1.4.1.orig/gnulib/lib/xmalloc.c libpipeline-1.4.1/gnulib/lib/xmalloc.c ---- libpipeline-1.4.1.orig/gnulib/lib/xmalloc.c 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/lib/xmalloc.c 2017-05-17 10:35:38.531250000 +0800 -@@ -1,6 +1,6 @@ - /* xmalloc.c -- malloc with out of memory checking - -- Copyright (C) 1990-2000, 2002-2006, 2008-2014 Free Software Foundation, Inc. -+ Copyright (C) 1990-2000, 2002-2006, 2008-2017 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 -@@ -93,11 +93,11 @@ - xcalloc (size_t n, size_t s) - { - void *p; -- /* Test for overflow, since some calloc implementations don't have -- proper overflow checks. But omit overflow and size-zero tests if -- HAVE_GNU_CALLOC, since GNU calloc catches overflow and never -- returns NULL if successful. */ -- if ((! HAVE_GNU_CALLOC && xalloc_oversized (n, s)) -+ /* Test for overflow, since objects with size greater than -+ PTRDIFF_MAX cause pointer subtraction to go awry. Omit size-zero -+ tests if HAVE_GNU_CALLOC, since GNU calloc never returns NULL if -+ successful. */ -+ if (xalloc_oversized (n, s) - || (! (p = calloc (n, s)) && (HAVE_GNU_CALLOC || n != 0))) - xalloc_die (); - return p; -diff -durN libpipeline-1.4.1.orig/gnulib/lib/xsize.h libpipeline-1.4.1/gnulib/lib/xsize.h ---- libpipeline-1.4.1.orig/gnulib/lib/xsize.h 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/lib/xsize.h 2017-05-17 10:35:38.937500000 +0800 -@@ -1,6 +1,6 @@ - /* xsize.h -- Checked size_t computations. - -- Copyright (C) 2003, 2008-2014 Free Software Foundation, Inc. -+ Copyright (C) 2003, 2008-2017 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 -diff -durN libpipeline-1.4.1.orig/gnulib/lib/xstrndup.c libpipeline-1.4.1/gnulib/lib/xstrndup.c ---- libpipeline-1.4.1.orig/gnulib/lib/xstrndup.c 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/lib/xstrndup.c 2017-05-17 10:35:39.250000000 +0800 -@@ -1,6 +1,6 @@ - /* Duplicate a bounded initial segment of a string, with out-of-memory - checking. -- Copyright (C) 2003, 2006-2007, 2009-2014 Free Software Foundation, Inc. -+ Copyright (C) 2003, 2006-2007, 2009-2017 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 -diff -durN libpipeline-1.4.1.orig/gnulib/lib/xstrndup.h libpipeline-1.4.1/gnulib/lib/xstrndup.h ---- libpipeline-1.4.1.orig/gnulib/lib/xstrndup.h 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/lib/xstrndup.h 2017-05-17 10:35:39.578125000 +0800 -@@ -1,6 +1,6 @@ - /* Duplicate a bounded initial segment of a string, with out-of-memory - checking. -- Copyright (C) 2003, 2009-2014 Free Software Foundation, Inc. -+ Copyright (C) 2003, 2009-2017 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 -diff -durN libpipeline-1.4.1.orig/gnulib/lib/xvasprintf.c libpipeline-1.4.1/gnulib/lib/xvasprintf.c ---- libpipeline-1.4.1.orig/gnulib/lib/xvasprintf.c 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/lib/xvasprintf.c 2017-05-17 10:35:39.968750000 +0800 -@@ -1,5 +1,5 @@ - /* vasprintf and asprintf with out-of-memory checking. -- Copyright (C) 1999, 2002-2004, 2006-2014 Free Software Foundation, Inc. -+ Copyright (C) 1999, 2002-2004, 2006-2017 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 -diff -durN libpipeline-1.4.1.orig/gnulib/lib/xvasprintf.h libpipeline-1.4.1/gnulib/lib/xvasprintf.h ---- libpipeline-1.4.1.orig/gnulib/lib/xvasprintf.h 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/lib/xvasprintf.h 2017-05-17 10:35:40.281250000 +0800 -@@ -1,5 +1,5 @@ - /* vasprintf and asprintf with out-of-memory checking. -- Copyright (C) 2002-2004, 2006-2014 Free Software Foundation, Inc. -+ Copyright (C) 2002-2004, 2006-2017 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 -diff -durN libpipeline-1.4.1.orig/gnulib/m4/00gnulib.m4 libpipeline-1.4.1/gnulib/m4/00gnulib.m4 ---- libpipeline-1.4.1.orig/gnulib/m4/00gnulib.m4 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/m4/00gnulib.m4 2017-05-17 10:35:40.546875000 +0800 -@@ -1,12 +1,28 @@ --# 00gnulib.m4 serial 2 --dnl Copyright (C) 2009-2014 Free Software Foundation, Inc. -+# 00gnulib.m4 serial 3 -+dnl Copyright (C) 2009-2017 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. - - dnl This file must be named something that sorts before all other - dnl gnulib-provided .m4 files. It is needed until such time as we can --dnl assume Autoconf 2.64, with its improved AC_DEFUN_ONCE semantics. -+dnl assume Autoconf 2.64, with its improved AC_DEFUN_ONCE and -+dnl m4_divert semantics. -+ -+# Until autoconf 2.63, handling of the diversion stack required m4_init -+# to be called first; but this does not happen with aclocal. Wrapping -+# the entire execution in another layer of the diversion stack fixes this. -+# Worse, prior to autoconf 2.62, m4_wrap depended on the underlying m4 -+# for whether it was FIFO or LIFO; in order to properly balance with -+# m4_init, we need to undo our push just before anything wrapped within -+# the m4_init body. The way to ensure this is to wrap both sides of -+# m4_init with a one-shot macro that does the pop at the right time. -+m4_ifndef([_m4_divert_diversion], -+[m4_divert_push([KILL]) -+m4_define([gl_divert_fixup], [m4_divert_pop()m4_define([$0])]) -+m4_define([m4_init], -+ [gl_divert_fixup()]m4_defn([m4_init])[gl_divert_fixup()])]) -+ - - # AC_DEFUN_ONCE([NAME], VALUE) - # ---------------------------- -diff -durN libpipeline-1.4.1.orig/gnulib/m4/absolute-header.m4 libpipeline-1.4.1/gnulib/m4/absolute-header.m4 ---- libpipeline-1.4.1.orig/gnulib/m4/absolute-header.m4 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/m4/absolute-header.m4 2017-05-17 10:35:40.781250000 +0800 -@@ -1,5 +1,5 @@ - # absolute-header.m4 serial 16 --dnl Copyright (C) 2006-2014 Free Software Foundation, Inc. -+dnl Copyright (C) 2006-2017 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. -diff -durN libpipeline-1.4.1.orig/gnulib/m4/alloca.m4 libpipeline-1.4.1/gnulib/m4/alloca.m4 ---- libpipeline-1.4.1.orig/gnulib/m4/alloca.m4 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/m4/alloca.m4 2017-05-17 10:35:41.078125000 +0800 -@@ -1,5 +1,5 @@ - # alloca.m4 serial 14 --dnl Copyright (C) 2002-2004, 2006-2007, 2009-2014 Free Software Foundation, -+dnl Copyright (C) 2002-2004, 2006-2007, 2009-2017 Free Software Foundation, - dnl Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -diff -durN libpipeline-1.4.1.orig/gnulib/m4/dirname.m4 libpipeline-1.4.1/gnulib/m4/dirname.m4 ---- libpipeline-1.4.1.orig/gnulib/m4/dirname.m4 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/m4/dirname.m4 2017-05-17 10:35:41.421875000 +0800 -@@ -1,5 +1,5 @@ - #serial 10 -*- autoconf -*- --dnl Copyright (C) 2002-2006, 2009-2014 Free Software Foundation, Inc. -+dnl Copyright (C) 2002-2006, 2009-2017 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. -diff -durN libpipeline-1.4.1.orig/gnulib/m4/double-slash-root.m4 libpipeline-1.4.1/gnulib/m4/double-slash-root.m4 ---- libpipeline-1.4.1.orig/gnulib/m4/double-slash-root.m4 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/m4/double-slash-root.m4 2017-05-17 10:35:41.640625000 +0800 -@@ -1,5 +1,5 @@ - # double-slash-root.m4 serial 4 -*- Autoconf -*- --dnl Copyright (C) 2006, 2008-2014 Free Software Foundation, Inc. -+dnl Copyright (C) 2006, 2008-2017 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. -diff -durN libpipeline-1.4.1.orig/gnulib/m4/eealloc.m4 libpipeline-1.4.1/gnulib/m4/eealloc.m4 ---- libpipeline-1.4.1.orig/gnulib/m4/eealloc.m4 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/m4/eealloc.m4 2017-05-17 10:35:41.890625000 +0800 -@@ -1,5 +1,5 @@ - # eealloc.m4 serial 3 --dnl Copyright (C) 2003, 2009-2014 Free Software Foundation, Inc. -+dnl Copyright (C) 2003, 2009-2017 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. -diff -durN libpipeline-1.4.1.orig/gnulib/m4/environ.m4 libpipeline-1.4.1/gnulib/m4/environ.m4 ---- libpipeline-1.4.1.orig/gnulib/m4/environ.m4 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/m4/environ.m4 2017-05-17 10:35:42.171875000 +0800 -@@ -1,5 +1,5 @@ - # environ.m4 serial 6 --dnl Copyright (C) 2001-2004, 2006-2014 Free Software Foundation, Inc. -+dnl Copyright (C) 2001-2004, 2006-2017 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. -diff -durN libpipeline-1.4.1.orig/gnulib/m4/errno_h.m4 libpipeline-1.4.1/gnulib/m4/errno_h.m4 ---- libpipeline-1.4.1.orig/gnulib/m4/errno_h.m4 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/m4/errno_h.m4 2017-05-17 10:35:42.515625000 +0800 -@@ -1,5 +1,5 @@ - # errno_h.m4 serial 12 --dnl Copyright (C) 2004, 2006, 2008-2014 Free Software Foundation, Inc. -+dnl Copyright (C) 2004, 2006, 2008-2017 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. -diff -durN libpipeline-1.4.1.orig/gnulib/m4/error.m4 libpipeline-1.4.1/gnulib/m4/error.m4 ---- libpipeline-1.4.1.orig/gnulib/m4/error.m4 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/m4/error.m4 2017-05-17 10:35:42.796875000 +0800 -@@ -1,6 +1,6 @@ - #serial 14 - --# Copyright (C) 1996-1998, 2001-2004, 2009-2014 Free Software Foundation, Inc. -+# Copyright (C) 1996-1998, 2001-2004, 2009-2017 Free Software Foundation, Inc. - # - # This file is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, -diff -durN libpipeline-1.4.1.orig/gnulib/m4/exponentd.m4 libpipeline-1.4.1/gnulib/m4/exponentd.m4 ---- libpipeline-1.4.1.orig/gnulib/m4/exponentd.m4 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/m4/exponentd.m4 2017-05-17 10:35:43.078125000 +0800 -@@ -1,5 +1,5 @@ - # exponentd.m4 serial 3 --dnl Copyright (C) 2007-2008, 2010-2014 Free Software Foundation, Inc. -+dnl Copyright (C) 2007-2008, 2010-2017 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. -diff -durN libpipeline-1.4.1.orig/gnulib/m4/extensions.m4 libpipeline-1.4.1/gnulib/m4/extensions.m4 ---- libpipeline-1.4.1.orig/gnulib/m4/extensions.m4 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/m4/extensions.m4 2017-05-17 10:35:43.359375000 +0800 -@@ -1,7 +1,7 @@ --# serial 13 -*- Autoconf -*- -+# serial 15 -*- Autoconf -*- - # Enable extensions on systems that normally disable them. - --# Copyright (C) 2003, 2006-2014 Free Software Foundation, Inc. -+# Copyright (C) 2003, 2006-2017 Free Software Foundation, Inc. - # This file is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -60,7 +60,7 @@ - #ifndef _ALL_SOURCE - # undef _ALL_SOURCE - #endif --/* Enable general extensions on OS X. */ -+/* Enable general extensions on macOS. */ - #ifndef _DARWIN_C_SOURCE - # undef _DARWIN_C_SOURCE - #endif -@@ -72,6 +72,34 @@ - #ifndef _POSIX_PTHREAD_SEMANTICS - # undef _POSIX_PTHREAD_SEMANTICS - #endif -+/* Enable extensions specified by ISO/IEC TS 18661-5:2014. */ -+#ifndef __STDC_WANT_IEC_60559_ATTRIBS_EXT__ -+# undef __STDC_WANT_IEC_60559_ATTRIBS_EXT__ -+#endif -+/* Enable extensions specified by ISO/IEC TS 18661-1:2014. */ -+#ifndef __STDC_WANT_IEC_60559_BFP_EXT__ -+# undef __STDC_WANT_IEC_60559_BFP_EXT__ -+#endif -+/* Enable extensions specified by ISO/IEC TS 18661-2:2015. */ -+#ifndef __STDC_WANT_IEC_60559_DFP_EXT__ -+# undef __STDC_WANT_IEC_60559_DFP_EXT__ -+#endif -+/* Enable extensions specified by ISO/IEC TS 18661-4:2015. */ -+#ifndef __STDC_WANT_IEC_60559_FUNCS_EXT__ -+# undef __STDC_WANT_IEC_60559_FUNCS_EXT__ -+#endif -+/* Enable extensions specified by ISO/IEC TS 18661-3:2015. */ -+#ifndef __STDC_WANT_IEC_60559_TYPES_EXT__ -+# undef __STDC_WANT_IEC_60559_TYPES_EXT__ -+#endif -+/* Enable extensions specified by ISO/IEC TR 24731-2:2010. */ -+#ifndef __STDC_WANT_LIB_EXT2__ -+# undef __STDC_WANT_LIB_EXT2__ -+#endif -+/* Enable extensions specified by ISO/IEC 24747:2009. */ -+#ifndef __STDC_WANT_MATH_SPEC_FUNCS__ -+# undef __STDC_WANT_MATH_SPEC_FUNCS__ -+#endif - /* Enable extensions on HP NonStop. */ - #ifndef _TANDEM_SOURCE - # undef _TANDEM_SOURCE -@@ -101,6 +129,13 @@ - AC_DEFINE([_DARWIN_C_SOURCE]) - AC_DEFINE([_GNU_SOURCE]) - AC_DEFINE([_POSIX_PTHREAD_SEMANTICS]) -+ AC_DEFINE([__STDC_WANT_IEC_60559_ATTRIBS_EXT__]) -+ AC_DEFINE([__STDC_WANT_IEC_60559_BFP_EXT__]) -+ AC_DEFINE([__STDC_WANT_IEC_60559_DFP_EXT__]) -+ AC_DEFINE([__STDC_WANT_IEC_60559_FUNCS_EXT__]) -+ AC_DEFINE([__STDC_WANT_IEC_60559_TYPES_EXT__]) -+ AC_DEFINE([__STDC_WANT_LIB_EXT2__]) -+ AC_DEFINE([__STDC_WANT_MATH_SPEC_FUNCS__]) - AC_DEFINE([_TANDEM_SOURCE]) - AC_CACHE_CHECK([whether _XOPEN_SOURCE should be defined], - [ac_cv_should_define__xopen_source], -diff -durN libpipeline-1.4.1.orig/gnulib/m4/extern-inline.m4 libpipeline-1.4.1/gnulib/m4/extern-inline.m4 ---- libpipeline-1.4.1.orig/gnulib/m4/extern-inline.m4 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/m4/extern-inline.m4 2017-05-17 10:35:43.656250000 +0800 -@@ -1,6 +1,6 @@ - dnl 'extern inline' a la ISO C99. - --dnl Copyright 2012-2014 Free Software Foundation, Inc. -+dnl Copyright 2012-2017 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. -@@ -19,13 +19,28 @@ - 'reference to static identifier "f" in extern inline function'. - This bug was observed with Sun C 5.12 SunOS_i386 2011/11/16. - -- Suppress the use of extern inline on problematic Apple configurations. -- OS X 10.8 and earlier mishandle it; see, e.g., -- . -+ Suppress extern inline (with or without __attribute__ ((__gnu_inline__))) -+ on configurations that mistakenly use 'static inline' to implement -+ functions or macros in standard C headers like . For example, -+ if isdigit is mistakenly implemented via a static inline function, -+ a program containing an extern inline function that calls isdigit -+ may not work since the C standard prohibits extern inline functions -+ from calling static functions. This bug is known to occur on: -+ -+ OS X 10.8 and earlier; see: -+ http://lists.gnu.org/archive/html/bug-gnulib/2012-12/msg00023.html -+ -+ DragonFly; see -+ http://muscles.dragonflybsd.org/bulk/bleeding-edge-potential/latest-per-pkg/ah-tty-0.3.12.log -+ -+ FreeBSD; see: -+ http://lists.gnu.org/archive/html/bug-gnulib/2014-07/msg00104.html -+ - OS X 10.9 has a macro __header_inline indicating the bug is fixed for C and - for clang but remains for g++; see . -- Perhaps Apple will fix this some day. */ --#if (defined __APPLE__ \ -+ Assume DragonFly and FreeBSD will be similar. */ -+#if (((defined __APPLE__ && defined __MACH__) \ -+ || defined __DragonFly__ || defined __FreeBSD__) \ - && (defined __header_inline \ - ? (defined __cplusplus && defined __GNUC_STDC_INLINE__ \ - && ! defined __clang__) \ -@@ -33,19 +48,20 @@ - && (defined __GNUC__ || defined __cplusplus)) \ - || (defined _FORTIFY_SOURCE && 0 < _FORTIFY_SOURCE \ - && defined __GNUC__ && ! defined __cplusplus)))) --# define _GL_EXTERN_INLINE_APPLE_BUG -+# define _GL_EXTERN_INLINE_STDHEADER_BUG - #endif - #if ((__GNUC__ \ - ? defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__ \ - : (199901L <= __STDC_VERSION__ \ - && !defined __HP_cc \ -+ && !defined __PGI \ - && !(defined __SUNPRO_C && __STDC__))) \ -- && !defined _GL_EXTERN_INLINE_APPLE_BUG) -+ && !defined _GL_EXTERN_INLINE_STDHEADER_BUG) - # define _GL_INLINE inline - # define _GL_EXTERN_INLINE extern inline - # define _GL_EXTERN_INLINE_IN_USE - #elif (2 < __GNUC__ + (7 <= __GNUC_MINOR__) && !defined __STRICT_ANSI__ \ -- && !defined _GL_EXTERN_INLINE_APPLE_BUG) -+ && !defined _GL_EXTERN_INLINE_STDHEADER_BUG) - # if defined __GNUC_GNU_INLINE__ && __GNUC_GNU_INLINE__ - /* __gnu_inline__ suppresses a GCC 4.2 diagnostic. */ - # define _GL_INLINE extern inline __attribute__ ((__gnu_inline__)) -@@ -59,17 +75,19 @@ - # define _GL_EXTERN_INLINE static _GL_UNUSED - #endif - --#if 4 < __GNUC__ + (6 <= __GNUC_MINOR__) -+/* In GCC 4.6 (inclusive) to 5.1 (exclusive), -+ suppress bogus "no previous prototype for 'FOO'" -+ and "no previous declaration for 'FOO'" diagnostics, -+ when FOO is an inline function in the header; see -+ and -+ . */ -+#if __GNUC__ == 4 && 6 <= __GNUC_MINOR__ - # if defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__ - # define _GL_INLINE_HEADER_CONST_PRAGMA - # else - # define _GL_INLINE_HEADER_CONST_PRAGMA \ - _Pragma ("GCC diagnostic ignored \"-Wsuggest-attribute=const\"") - # endif -- /* Suppress GCC's bogus "no previous prototype for 'FOO'" -- and "no previous declaration for 'FOO'" diagnostics, -- when FOO is an inline function in the header; see -- . */ - # define _GL_INLINE_HEADER_BEGIN \ - _Pragma ("GCC diagnostic push") \ - _Pragma ("GCC diagnostic ignored \"-Wmissing-prototypes\"") \ -diff -durN libpipeline-1.4.1.orig/gnulib/m4/fcntl_h.m4 libpipeline-1.4.1/gnulib/m4/fcntl_h.m4 ---- libpipeline-1.4.1.orig/gnulib/m4/fcntl_h.m4 2014-11-08 21:53:37.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/m4/fcntl_h.m4 2017-05-17 10:35:44.234375000 +0800 -@@ -1,6 +1,6 @@ - # serial 15 - # Configure fcntl.h. --dnl Copyright (C) 2006-2007, 2009-2014 Free Software Foundation, Inc. -+dnl Copyright (C) 2006-2007, 2009-2017 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. -diff -durN libpipeline-1.4.1.orig/gnulib/m4/fcntl-o.m4 libpipeline-1.4.1/gnulib/m4/fcntl-o.m4 ---- libpipeline-1.4.1.orig/gnulib/m4/fcntl-o.m4 2014-11-08 21:53:37.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/m4/fcntl-o.m4 2017-05-17 10:35:43.968750000 +0800 -@@ -1,5 +1,5 @@ - # fcntl-o.m4 serial 4 --dnl Copyright (C) 2006, 2009-2014 Free Software Foundation, Inc. -+dnl Copyright (C) 2006, 2009-2017 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. -diff -durN libpipeline-1.4.1.orig/gnulib/m4/float_h.m4 libpipeline-1.4.1/gnulib/m4/float_h.m4 ---- libpipeline-1.4.1.orig/gnulib/m4/float_h.m4 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/m4/float_h.m4 2017-05-17 10:35:44.546875000 +0800 -@@ -1,5 +1,5 @@ - # float_h.m4 serial 9 --dnl Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc. -+dnl Copyright (C) 2007, 2009-2017 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. -diff -durN libpipeline-1.4.1.orig/gnulib/m4/getprogname.m4 libpipeline-1.4.1/gnulib/m4/getprogname.m4 ---- libpipeline-1.4.1.orig/gnulib/m4/getprogname.m4 1970-01-01 08:00:00.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/m4/getprogname.m4 2017-05-17 10:35:06.062500000 +0800 -@@ -0,0 +1,43 @@ -+# getprogname.m4 - check for getprogname or replacements for it -+ -+# Copyright (C) 2016-2017 Free Software Foundation, Inc. -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. -+ -+# serial 4 -+ -+AC_DEFUN([gl_FUNC_GETPROGNAME], -+[ -+ AC_CHECK_FUNCS_ONCE([getprogname getexecname]) -+ AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) -+ ac_found=0 -+ AC_CHECK_DECLS([program_invocation_name], [ac_found=1], [], -+ [#include ]) -+ AC_CHECK_DECLS([program_invocation_short_name], [ac_found=1], [], -+ [#include ]) -+ AC_CHECK_DECLS([__argv], [ac_found=1], [], [#include ]) -+ -+ # Incur the cost of this test only if none of the above worked. -+ if test $ac_found = 0; then -+ # On OpenBSD 5.1, using the global __progname variable appears to be -+ # the only way to implement getprogname. -+ AC_CACHE_CHECK([whether __progname is defined in default libraries], -+ [gl_cv_var___progname], -+ [ -+ gl_cv_var___progname= -+ AC_LINK_IFELSE( -+ [AC_LANG_PROGRAM( -+ [[extern char *__progname;]], -+ [[return *__progname;]] -+ )], -+ [gl_cv_var___progname=yes] -+ ) -+ ] -+ ) -+ if test "$gl_cv_var___progname" = yes; then -+ AC_DEFINE([HAVE_VAR___PROGNAME], 1, -+ [Define if you have a global __progname variable]) -+ fi -+ fi -+]) -diff -durN libpipeline-1.4.1.orig/gnulib/m4/gettimeofday.m4 libpipeline-1.4.1/gnulib/m4/gettimeofday.m4 ---- libpipeline-1.4.1.orig/gnulib/m4/gettimeofday.m4 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/m4/gettimeofday.m4 2017-05-17 10:35:44.875000000 +0800 -@@ -1,6 +1,6 @@ --# serial 21 -+# serial 23 - --# Copyright (C) 2001-2003, 2005, 2007, 2009-2014 Free Software Foundation, Inc. -+# Copyright (C) 2001-2003, 2005, 2007, 2009-2017 Free Software Foundation, Inc. - # This file is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -9,9 +9,10 @@ - - AC_DEFUN([gl_FUNC_GETTIMEOFDAY], - [ -+ AC_REQUIRE([gl_HEADER_SYS_TIME_H_DEFAULTS]) - AC_REQUIRE([AC_C_RESTRICT]) -+ AC_REQUIRE([AC_CANONICAL_HOST]) - AC_REQUIRE([gl_HEADER_SYS_TIME_H]) -- AC_REQUIRE([gl_HEADER_SYS_TIME_H_DEFAULTS]) - AC_CHECK_FUNCS_ONCE([gettimeofday]) - - gl_gettimeofday_timezone=void -@@ -54,19 +55,11 @@ - if test $REPLACE_STRUCT_TIMEVAL = 1; then - REPLACE_GETTIMEOFDAY=1 - fi -- m4_ifdef([gl_FUNC_TZSET_CLOBBER], [ -- gl_FUNC_TZSET_CLOBBER -- case "$gl_cv_func_tzset_clobber" in -- *yes) -- REPLACE_GETTIMEOFDAY=1 -- gl_GETTIMEOFDAY_REPLACE_LOCALTIME -- AC_DEFINE([tzset], [rpl_tzset], -- [Define to rpl_tzset if the wrapper function should be used.]) -- AC_DEFINE([TZSET_CLOBBERS_LOCALTIME], [1], -- [Define if tzset clobbers localtime's static buffer.]) -- ;; -- esac -- ]) -+ dnl On mingw, the original gettimeofday has only a precision of 15.6 -+ dnl milliseconds. So override it. -+ case "$host_os" in -+ mingw*) REPLACE_GETTIMEOFDAY=1 ;; -+ esac - fi - AC_DEFINE_UNQUOTED([GETTIMEOFDAY_TIMEZONE], [$gl_gettimeofday_timezone], - [Define this to 'void' or 'struct timezone' to match the system's -@@ -85,6 +78,7 @@ - [ - AC_REQUIRE([gl_HEADER_SYS_TIME_H]) - AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles -+ AC_REQUIRE([gl_LOCALTIME_BUFFER_DEFAULTS]) - - AC_CACHE_CHECK([whether gettimeofday clobbers localtime buffer], - [gl_cv_func_gettimeofday_clobber], -@@ -119,20 +113,12 @@ - case "$gl_cv_func_gettimeofday_clobber" in - *yes) - REPLACE_GETTIMEOFDAY=1 -- gl_GETTIMEOFDAY_REPLACE_LOCALTIME - AC_DEFINE([GETTIMEOFDAY_CLOBBERS_LOCALTIME], [1], - [Define if gettimeofday clobbers the localtime buffer.]) -+ gl_LOCALTIME_BUFFER_NEEDED - ;; - esac - ]) - --AC_DEFUN([gl_GETTIMEOFDAY_REPLACE_LOCALTIME], [ -- REPLACE_GMTIME=1 -- REPLACE_LOCALTIME=1 --]) -- - # Prerequisites of lib/gettimeofday.c. --AC_DEFUN([gl_PREREQ_GETTIMEOFDAY], [ -- AC_CHECK_HEADERS([sys/timeb.h]) -- AC_CHECK_FUNCS([_ftime]) --]) -+AC_DEFUN([gl_PREREQ_GETTIMEOFDAY], [:]) -diff -durN libpipeline-1.4.1.orig/gnulib/m4/gnulib-cache.m4 libpipeline-1.4.1/gnulib/m4/gnulib-cache.m4 ---- libpipeline-1.4.1.orig/gnulib/m4/gnulib-cache.m4 2015-06-18 20:28:53.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/m4/gnulib-cache.m4 2017-05-17 10:37:09.875000000 +0800 -@@ -1,4 +1,4 @@ --# Copyright (C) 2002-2014 Free Software Foundation, Inc. -+# Copyright (C) 2002-2017 Free Software Foundation, Inc. - # - # This file is free software; you can redistribute it and/or modify - # it under the terms of the GNU General Public License as published by -@@ -27,7 +27,7 @@ - - - # Specification in the form of a command-line invocation: --# gnulib-tool --import --dir=. --lib=libgnu --source-base=gnulib/lib --m4-base=gnulib/m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --no-conditional-dependencies --libtool --macro-prefix=gl --no-vc-files dirname environ error full-write gitlog-to-changelog gnupload largefile lib-ignore mkdtemp safe-read safe-write setenv sigaction signal sigprocmask strerror strsignal sys_select sys_stat unsetenv waitpid warnings xalloc xstrndup xvasprintf -+# gnulib-tool --import --lib=libgnu --source-base=gnulib/lib --m4-base=gnulib/m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --no-conditional-dependencies --libtool --macro-prefix=gl --no-vc-files dirname environ error full-write gitlog-to-changelog gnupload largefile lib-ignore mkdtemp safe-read safe-write setenv sigaction signal sigprocmask strerror strsignal sys_select sys_stat unsetenv waitpid warnings xalloc xstrndup xvasprintf - - # Specification in the form of a few gnulib-tool.m4 macro invocations: - gl_LOCAL_DIR([]) -diff -durN libpipeline-1.4.1.orig/gnulib/m4/gnulib-common.m4 libpipeline-1.4.1/gnulib/m4/gnulib-common.m4 ---- libpipeline-1.4.1.orig/gnulib/m4/gnulib-common.m4 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/m4/gnulib-common.m4 2017-05-17 10:35:45.218750000 +0800 -@@ -1,5 +1,5 @@ --# gnulib-common.m4 serial 34 --dnl Copyright (C) 2007-2014 Free Software Foundation, Inc. -+# gnulib-common.m4 serial 38 -+dnl Copyright (C) 2007-2017 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. -@@ -49,6 +49,16 @@ - is a misnomer outside of parameter lists. */ - #define _UNUSED_PARAMETER_ _GL_UNUSED - -+/* gcc supports the "unused" attribute on possibly unused labels, and -+ g++ has since version 4.5. Note to support C++ as well as C, -+ _GL_UNUSED_LABEL should be used with a trailing ; */ -+#if !defined __cplusplus || __GNUC__ > 4 \ -+ || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5) -+# define _GL_UNUSED_LABEL _GL_UNUSED -+#else -+# define _GL_UNUSED_LABEL -+#endif -+ - /* The __pure__ attribute was added in gcc 2.96. */ - #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96) - # define _GL_ATTRIBUTE_PURE __attribute__ ((__pure__)) -@@ -243,9 +253,11 @@ - [ - dnl Minix 3 comes with two toolchains: The Amsterdam Compiler Kit compiler - dnl as "cc", and GCC as "gcc". They have different object file formats and -- dnl library formats. In particular, the GNU binutils programs ar, ranlib -+ dnl library formats. In particular, the GNU binutils programs ar and ranlib - dnl produce libraries that work only with gcc, not with cc. - AC_REQUIRE([AC_PROG_CC]) -+ dnl The '][' hides this use from 'aclocal'. -+ AC_BEFORE([$0], [A][M_PROG_AR]) - AC_CACHE_CHECK([for Minix Amsterdam compiler], [gl_cv_c_amsterdam_compiler], - [ - AC_EGREP_CPP([Amsterdam], -@@ -257,25 +269,39 @@ - [gl_cv_c_amsterdam_compiler=yes], - [gl_cv_c_amsterdam_compiler=no]) - ]) -- if test -z "$AR"; then -- if test $gl_cv_c_amsterdam_compiler = yes; then -+ -+ dnl Don't compete with AM_PROG_AR's decision about AR/ARFLAGS if we are not -+ dnl building with __ACK__. -+ if test $gl_cv_c_amsterdam_compiler = yes; then -+ if test -z "$AR"; then - AR='cc -c.a' -- if test -z "$ARFLAGS"; then -- ARFLAGS='-o' -- fi -- else -- dnl Use the Automake-documented default values for AR and ARFLAGS, -- dnl but prefer ${host}-ar over ar (useful for cross-compiling). -- AC_CHECK_TOOL([AR], [ar], [ar]) -- if test -z "$ARFLAGS"; then -- ARFLAGS='cru' -- fi - fi -- else - if test -z "$ARFLAGS"; then -- ARFLAGS='cru' -+ ARFLAGS='-o' - fi -+ else -+ dnl AM_PROG_AR was added in automake v1.11.2. AM_PROG_AR does not AC_SUBST -+ dnl ARFLAGS variable (it is filed into Makefile.in directly by automake -+ dnl script on-demand, if not specified by ./configure of course). -+ dnl Don't AC_REQUIRE the AM_PROG_AR otherwise the code for __ACK__ above -+ dnl will be ignored. Also, pay attention to call AM_PROG_AR in else block -+ dnl because AM_PROG_AR is written so it could re-set AR variable even for -+ dnl __ACK__. It may seem like its easier to avoid calling the macro here, -+ dnl but we need to AC_SUBST both AR/ARFLAGS (thus those must have some good -+ dnl default value and automake should usually know them). -+ dnl -+ dnl The '][' hides this use from 'aclocal'. -+ m4_ifdef([A][M_PROG_AR], [A][M_PROG_AR], [:]) - fi -+ -+ dnl In case the code above has not helped with setting AR/ARFLAGS, use -+ dnl Automake-documented default values for AR and ARFLAGS, but prefer -+ dnl ${host}-ar over ar (useful for cross-compiling). -+ AC_CHECK_TOOL([AR], [ar], [ar]) -+ if test -z "$ARFLAGS"; then -+ ARFLAGS='cr' -+ fi -+ - AC_SUBST([AR]) - AC_SUBST([ARFLAGS]) - if test -z "$RANLIB"; then -@@ -309,26 +335,28 @@ - ]) - - # AC_C_RESTRICT --# This definition overrides the AC_C_RESTRICT macro from autoconf 2.60..2.61, --# so that mixed use of GNU C and GNU C++ and mixed use of Sun C and Sun C++ --# works. --# This definition can be removed once autoconf >= 2.62 can be assumed. --# AC_AUTOCONF_VERSION was introduced in 2.62, so use that as the witness. --m4_ifndef([AC_AUTOCONF_VERSION],[ -+# This definition is copied from post-2.69 Autoconf and overrides the -+# AC_C_RESTRICT macro from autoconf 2.60..2.69. It can be removed -+# once autoconf >= 2.70 can be assumed. It's painful to check version -+# numbers, and in practice this macro is more up-to-date than Autoconf -+# is, so override Autoconf unconditionally. - AC_DEFUN([AC_C_RESTRICT], - [AC_CACHE_CHECK([for C/C++ restrict keyword], [ac_cv_c_restrict], - [ac_cv_c_restrict=no - # The order here caters to the fact that C++ does not require restrict. - for ac_kw in __restrict __restrict__ _Restrict restrict; do -- AC_COMPILE_IFELSE([AC_LANG_PROGRAM( -- [[typedef int * int_ptr; -- int foo (int_ptr $ac_kw ip) { -- return ip[0]; -- }]], -- [[int s[1]; -- int * $ac_kw t = s; -- t[0] = 0; -- return foo(t)]])], -+ AC_COMPILE_IFELSE( -+ [AC_LANG_PROGRAM( -+ [[typedef int *int_ptr; -+ int foo (int_ptr $ac_kw ip) { return ip[0]; } -+ int bar (int [$ac_kw]); /* Catch GCC bug 14050. */ -+ int bar (int ip[$ac_kw]) { return ip[0]; } -+ ]], -+ [[int s[1]; -+ int *$ac_kw t = s; -+ t[0] = 0; -+ return foo (t) + bar (t); -+ ]])], - [ac_cv_c_restrict=$ac_kw]) - test "$ac_cv_c_restrict" != no && break - done -@@ -338,21 +366,21 @@ - nothing if this is not supported. Do not define if restrict is - supported directly. */ - #undef restrict --/* Work around a bug in Sun C++: it does not support _Restrict, even -- though the corresponding Sun C compiler does, which causes -- "#define restrict _Restrict" in the previous line. Perhaps some future -- version of Sun C++ will work with _Restrict; if so, it'll probably -- define __RESTRICT, just as Sun C does. */ -+/* Work around a bug in Sun C++: it does not support _Restrict or -+ __restrict__, even though the corresponding Sun C compiler ends up with -+ "#define restrict _Restrict" or "#define restrict __restrict__" in the -+ previous line. Perhaps some future version of Sun C++ will work with -+ restrict; if so, hopefully it defines __RESTRICT like Sun C does. */ - #if defined __SUNPRO_CC && !defined __RESTRICT - # define _Restrict -+# define __restrict__ - #endif]) - case $ac_cv_c_restrict in - restrict) ;; - no) AC_DEFINE([restrict], []) ;; - *) AC_DEFINE_UNQUOTED([restrict], [$ac_cv_c_restrict]) ;; - esac --]) --]) -+])# AC_C_RESTRICT - - # gl_BIGENDIAN - # is like AC_C_BIGENDIAN, except that it can be AC_REQUIREd. -@@ -379,3 +407,61 @@ - # AS_VAR_COPY was added in autoconf 2.63b - m4_define_default([AS_VAR_COPY], - [AS_LITERAL_IF([$1[]$2], [$1=$$2], [eval $1=\$$2])]) -+ -+# AC_PROG_SED was added in autoconf 2.59b -+m4_ifndef([AC_PROG_SED], -+[AC_DEFUN([AC_PROG_SED], -+[AC_CACHE_CHECK([for a sed that does not truncate output], ac_cv_path_SED, -+ [dnl ac_script should not contain more than 99 commands (for HP-UX sed), -+ dnl but more than about 7000 bytes, to catch a limit in Solaris 8 /usr/ucb/sed. -+ ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ -+ for ac_i in 1 2 3 4 5 6 7; do -+ ac_script="$ac_script$as_nl$ac_script" -+ done -+ echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed -+ AS_UNSET([ac_script]) -+ if test -z "$SED"; then -+ ac_path_SED_found=false -+ _AS_PATH_WALK([], [ -+ for ac_prog in sed gsed; do -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" -+ AS_EXECUTABLE_P(["$ac_path_SED"]) || continue -+ case `"$ac_path_SED" --version 2>&1` in -+ *GNU*) ac_cv_path_SED=$ac_path_SED ac_path_SED_found=:;; -+ *) -+ ac_count=0 -+ _AS_ECHO_N([0123456789]) >conftest.in -+ while : -+ do -+ cat conftest.in conftest.in >conftest.tmp -+ mv conftest.tmp conftest.in -+ cp conftest.in conftest.nl -+ echo >> conftest.nl -+ "$ac_path_SED" -f conftest.sed conftest.out 2>/dev/null || break -+ diff conftest.out conftest.nl >/dev/null 2>&1 || break -+ ac_count=`expr $ac_count + 1` -+ if test $ac_count -gt ${ac_path_SED_max-0}; then -+ # Best so far, but keep looking for better -+ ac_cv_path_SED=$ac_path_SED -+ ac_path_SED_max=$ac_count -+ fi -+ test $ac_count -gt 10 && break -+ done -+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -+ esac -+ $ac_path_SED_found && break 3 -+ done -+ done]) -+ if test -z "$ac_cv_path_SED"; then -+ AC_ERROR([no acceptable sed could be found in \$PATH]) -+ fi -+ else -+ ac_cv_path_SED=$SED -+ fi -+ ]) -+ SED="$ac_cv_path_SED" -+ AC_SUBST([SED])dnl -+ rm -f conftest.sed -+]) -+]) -diff -durN libpipeline-1.4.1.orig/gnulib/m4/gnulib-comp.m4 libpipeline-1.4.1/gnulib/m4/gnulib-comp.m4 ---- libpipeline-1.4.1.orig/gnulib/m4/gnulib-comp.m4 2015-06-18 20:28:53.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/m4/gnulib-comp.m4 2017-05-17 10:37:26.250000000 +0800 -@@ -1,5 +1,5 @@ - # DO NOT EDIT! GENERATED AUTOMATICALLY! --# Copyright (C) 2002-2014 Free Software Foundation, Inc. -+# Copyright (C) 2002-2017 Free Software Foundation, Inc. - # - # This file is free software; you can redistribute it and/or modify - # it under the terms of the GNU General Public License as published by -@@ -37,7 +37,11 @@ - m4_pattern_allow([^gl_ES$])dnl a valid locale name - m4_pattern_allow([^gl_LIBOBJS$])dnl a variable - m4_pattern_allow([^gl_LTLIBOBJS$])dnl a variable -+ -+ # Pre-early section. -+ AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) - AC_REQUIRE([gl_PROG_AR_RANLIB]) -+ - AC_REQUIRE([AM_PROG_CC_C_O]) - # Code from module absolute-header: - # Code from module alloca-opt: -@@ -50,11 +54,12 @@ - # Code from module error: - # Code from module exitfail: - # Code from module extensions: -- AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) - # Code from module extern-inline: - # Code from module fcntl-h: -+ # Code from module filename: - # Code from module float: - # Code from module full-write: -+ # Code from module getprogname: - # Code from module gettext-h: - # Code from module gettimeofday: - # Code from module gitlog-to-changelog: -@@ -65,6 +70,8 @@ - # Code from module largefile: - AC_REQUIRE([AC_SYS_LARGEFILE]) - # Code from module lib-ignore: -+ # Code from module limits-h: -+ # Code from module localtime-buffer: - # Code from module lock: - # Code from module lstat: - # Code from module malloc-posix: -@@ -176,6 +183,7 @@ - if test $REPLACE_ITOLD = 1; then - AC_LIBOBJ([itold]) - fi -+ gl_FUNC_GETPROGNAME - AC_SUBST([LIBINTL]) - AC_SUBST([LTLIBINTL]) - gl_FUNC_GETTIMEOFDAY -@@ -186,6 +194,9 @@ - gl_SYS_TIME_MODULE_INDICATOR([gettimeofday]) - AC_REQUIRE([gl_LARGEFILE]) - gl_IGNORE_UNUSED_LIBRARIES -+ gl_LIMITS_H -+ AC_REQUIRE([gl_LOCALTIME_BUFFER_DEFAULTS]) -+ AC_LIBOBJ([localtime-buffer]) - gl_LOCK - gl_MODULE_INDICATOR([lock]) - gl_FUNC_LSTAT -@@ -212,14 +223,15 @@ - gl_PREREQ_MKDTEMP - fi - gl_STDLIB_MODULE_INDICATOR([mkdtemp]) -- gl_MSVC_INVAL -+ AC_REQUIRE([gl_MSVC_INVAL]) - if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then - AC_LIBOBJ([msvc-inval]) - fi -- gl_MSVC_NOTHROW -+ AC_REQUIRE([gl_MSVC_NOTHROW]) - if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then - AC_LIBOBJ([msvc-nothrow]) - fi -+ gl_MODULE_INDICATOR([msvc-nothrow]) - gl_MULTIARCH - gl_PATHMAX - gl_FUNC_RAISE -@@ -268,6 +280,7 @@ - gl_FUNC_STAT - if test $REPLACE_STAT = 1; then - AC_LIBOBJ([stat]) -+ AC_LIBOBJ([stat-w32]) - gl_PREREQ_STAT - fi - gl_SYS_STAT_MODULE_INDICATOR([stat]) -@@ -491,15 +504,14 @@ - build-aux/config.rpath - build-aux/gitlog-to-changelog - build-aux/gnupload -- build-aux/snippet/_Noreturn.h -- build-aux/snippet/arg-nonnull.h -- build-aux/snippet/c++defs.h -- build-aux/snippet/warn-on-use.h -+ lib/_Noreturn.h - lib/alloca.in.h -+ lib/arg-nonnull.h - lib/asnprintf.c - lib/asprintf.c - lib/basename-lgpl.c - lib/basename.c -+ lib/c++defs.h - lib/dirname-lgpl.c - lib/dirname.c - lib/dirname.h -@@ -510,11 +522,14 @@ - lib/exitfail.c - lib/exitfail.h - lib/fcntl.in.h -+ lib/filename.h - lib/float+.h - lib/float.c - lib/float.in.h - lib/full-write.c - lib/full-write.h -+ lib/getprogname.c -+ lib/getprogname.h - lib/gettext.h - lib/gettimeofday.c - lib/glthread/lock.c -@@ -524,6 +539,9 @@ - lib/glthread/tls.h - lib/intprops.h - lib/itold.c -+ lib/limits.in.h -+ lib/localtime-buffer.c -+ lib/localtime-buffer.h - lib/lstat.c - lib/malloc.c - lib/malloca.c -@@ -557,6 +575,8 @@ - lib/sigprocmask.c - lib/size_max.h - lib/snprintf.c -+ lib/stat-w32.c -+ lib/stat-w32.h - lib/stat.c - lib/stdarg.in.h - lib/stdbool.in.h -@@ -588,6 +608,7 @@ - lib/vasprintf.c - lib/verify.h - lib/waitpid.c -+ lib/warn-on-use.h - lib/wchar.in.h - lib/write.c - lib/xalloc-die.c -@@ -616,6 +637,7 @@ - m4/fcntl-o.m4 - m4/fcntl_h.m4 - m4/float_h.m4 -+ m4/getprogname.m4 - m4/gettimeofday.m4 - m4/gnulib-common.m4 - m4/include_next.m4 -@@ -626,6 +648,8 @@ - m4/lib-ld.m4 - m4/lib-link.m4 - m4/lib-prefix.m4 -+ m4/limits-h.m4 -+ m4/localtime-buffer.m4 - m4/lock.m4 - m4/longlong.m4 - m4/lstat.m4 -@@ -642,6 +666,7 @@ - m4/onceonly.m4 - m4/pathmax.m4 - m4/printf.m4 -+ m4/pthread_rwlock_rdlock.m4 - m4/raise.m4 - m4/read.m4 - m4/safe-read.m4 -diff -durN libpipeline-1.4.1.orig/gnulib/m4/gnulib-tool.m4 libpipeline-1.4.1/gnulib/m4/gnulib-tool.m4 ---- libpipeline-1.4.1.orig/gnulib/m4/gnulib-tool.m4 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/m4/gnulib-tool.m4 2017-05-17 10:35:45.562500000 +0800 -@@ -1,5 +1,5 @@ - # gnulib-tool.m4 serial 2 --dnl Copyright (C) 2004-2005, 2009-2014 Free Software Foundation, Inc. -+dnl Copyright (C) 2004-2005, 2009-2017 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. -diff -durN libpipeline-1.4.1.orig/gnulib/m4/include_next.m4 libpipeline-1.4.1/gnulib/m4/include_next.m4 ---- libpipeline-1.4.1.orig/gnulib/m4/include_next.m4 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/m4/include_next.m4 2017-05-17 10:35:45.812500000 +0800 -@@ -1,12 +1,13 @@ --# include_next.m4 serial 23 --dnl Copyright (C) 2006-2014 Free Software Foundation, Inc. -+# include_next.m4 serial 24 -+dnl Copyright (C) 2006-2017 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. - - dnl From Paul Eggert and Derek Price. - --dnl Sets INCLUDE_NEXT and PRAGMA_SYSTEM_HEADER. -+dnl Sets INCLUDE_NEXT, INCLUDE_NEXT_AS_FIRST_DIRECTIVE, PRAGMA_SYSTEM_HEADER, -+dnl and PRAGMA_COLUMNS. - dnl - dnl INCLUDE_NEXT expands to 'include_next' if the compiler supports it, or to - dnl 'include' otherwise. -diff -durN libpipeline-1.4.1.orig/gnulib/m4/intmax_t.m4 libpipeline-1.4.1/gnulib/m4/intmax_t.m4 ---- libpipeline-1.4.1.orig/gnulib/m4/intmax_t.m4 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/m4/intmax_t.m4 2017-05-17 10:35:46.093750000 +0800 -@@ -1,5 +1,5 @@ - # intmax_t.m4 serial 8 --dnl Copyright (C) 1997-2004, 2006-2007, 2009-2014 Free Software Foundation, -+dnl Copyright (C) 1997-2004, 2006-2007, 2009-2017 Free Software Foundation, - dnl Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -diff -durN libpipeline-1.4.1.orig/gnulib/m4/inttypes_h.m4 libpipeline-1.4.1/gnulib/m4/inttypes_h.m4 ---- libpipeline-1.4.1.orig/gnulib/m4/inttypes_h.m4 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/m4/inttypes_h.m4 2017-05-17 10:35:46.421875000 +0800 -@@ -1,5 +1,5 @@ - # inttypes_h.m4 serial 10 --dnl Copyright (C) 1997-2004, 2006, 2008-2014 Free Software Foundation, Inc. -+dnl Copyright (C) 1997-2004, 2006, 2008-2017 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. -diff -durN libpipeline-1.4.1.orig/gnulib/m4/largefile.m4 libpipeline-1.4.1/gnulib/m4/largefile.m4 ---- libpipeline-1.4.1.orig/gnulib/m4/largefile.m4 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/m4/largefile.m4 2017-05-17 10:35:46.750000000 +0800 -@@ -1,6 +1,6 @@ - # Enable large files on systems where this is not the default. - --# Copyright 1992-1996, 1998-2014 Free Software Foundation, Inc. -+# Copyright 1992-1996, 1998-2017 Free Software Foundation, Inc. - # This file is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -126,9 +126,24 @@ - else - WINDOWS_64_BIT_OFF_T=0 - fi -- dnl But all native Windows platforms (including mingw64) have a 32-bit -- dnl st_size member in 'struct stat'. -- WINDOWS_64_BIT_ST_SIZE=1 -+ dnl Some mingw versions define, if _FILE_OFFSET_BITS=64, 'struct stat' -+ dnl to 'struct _stat32i64' or 'struct _stat64' (depending on -+ dnl _USE_32BIT_TIME_T), which has a 32-bit st_size member. -+ AC_CACHE_CHECK([for 64-bit st_size], [gl_cv_member_st_size_64], -+ [AC_COMPILE_IFELSE( -+ [AC_LANG_PROGRAM( -+ [[#include -+ struct stat buf; -+ int verify_st_size_size[sizeof (buf.st_size) >= 8 ? 1 : -1]; -+ ]], -+ [[]])], -+ [gl_cv_member_st_size_64=yes], [gl_cv_member_st_size_64=no]) -+ ]) -+ if test $gl_cv_member_st_size_64 = no; then -+ WINDOWS_64_BIT_ST_SIZE=1 -+ else -+ WINDOWS_64_BIT_ST_SIZE=0 -+ fi - ;; - *) - dnl Nothing to do on gnulib's side. -diff -durN libpipeline-1.4.1.orig/gnulib/m4/lib-ignore.m4 libpipeline-1.4.1/gnulib/m4/lib-ignore.m4 ---- libpipeline-1.4.1.orig/gnulib/m4/lib-ignore.m4 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/m4/lib-ignore.m4 2017-05-17 10:35:47.031250000 +0800 -@@ -1,6 +1,6 @@ - # If possible, ignore libraries that are not depended on. - --dnl Copyright (C) 2006, 2009-2014 Free Software Foundation, Inc. -+dnl Copyright (C) 2006, 2009-2017 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. -diff -durN libpipeline-1.4.1.orig/gnulib/m4/lib-ld.m4 libpipeline-1.4.1/gnulib/m4/lib-ld.m4 ---- libpipeline-1.4.1.orig/gnulib/m4/lib-ld.m4 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/m4/lib-ld.m4 2017-05-17 10:35:47.281250000 +0800 -@@ -1,5 +1,5 @@ --# lib-ld.m4 serial 6 --dnl Copyright (C) 1996-2003, 2009-2014 Free Software Foundation, Inc. -+# lib-ld.m4 serial 7 -+dnl Copyright (C) 1996-2003, 2009-2017 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. -@@ -47,73 +47,101 @@ - } - fi - --ac_prog=ld --if test "$GCC" = yes; then -- # Check if gcc -print-prog-name=ld gives a path. -+if test -n "$LD"; then -+ AC_MSG_CHECKING([for ld]) -+elif test "$GCC" = yes; then - AC_MSG_CHECKING([for ld used by $CC]) -- case $host in -- *-*-mingw*) -- # gcc leaves a trailing carriage return which upsets mingw -- ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; -- *) -- ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; -- esac -- case $ac_prog in -- # Accept absolute paths. -- [[\\/]]* | ?:[[\\/]]*) -- re_direlt='/[[^/]][[^/]]*/\.\./' -- # Canonicalize the pathname of ld -- ac_prog=`echo "$ac_prog"| sed 's%\\\\%/%g'` -- while echo "$ac_prog" | grep "$re_direlt" > /dev/null 2>&1; do -- ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` -- done -- test -z "$LD" && LD="$ac_prog" -- ;; -- "") -- # If it fails, then pretend we aren't using GCC. -- ac_prog=ld -- ;; -- *) -- # If it is relative, then search for the first ld in PATH. -- with_gnu_ld=unknown -- ;; -- esac - elif test "$with_gnu_ld" = yes; then - AC_MSG_CHECKING([for GNU ld]) - else - AC_MSG_CHECKING([for non-GNU ld]) - fi --AC_CACHE_VAL([acl_cv_path_LD], --[if test -z "$LD"; then -- acl_save_ifs="$IFS"; IFS=$PATH_SEPARATOR -- for ac_dir in $PATH; do -- IFS="$acl_save_ifs" -- test -z "$ac_dir" && ac_dir=. -- if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then -- acl_cv_path_LD="$ac_dir/$ac_prog" -- # Check to see if the program is GNU ld. I'd rather use --version, -- # but apparently some variants of GNU ld only accept -v. -- # Break only if it was the GNU/non-GNU ld that we prefer. -- case `"$acl_cv_path_LD" -v 2>&1 &5 | tr -d '\015'` ;; -+ *) -+ acl_output=`($CC -print-prog-name=ld) 2>&5` ;; -+ esac -+ case $acl_output in -+ # Accept absolute paths. -+ [[\\/]]* | ?:[[\\/]]*) -+ re_direlt='/[[^/]][[^/]]*/\.\./' -+ # Canonicalize the pathname of ld -+ acl_output=`echo "$acl_output" | sed 's%\\\\%/%g'` -+ while echo "$acl_output" | grep "$re_direlt" > /dev/null 2>&1; do -+ acl_output=`echo $acl_output | sed "s%$re_direlt%/%"` -+ done -+ # Got the pathname. No search in PATH is needed. -+ acl_cv_path_LD="$acl_output" -+ ac_prog= -+ ;; -+ "") -+ # If it fails, then pretend we aren't using GCC. -+ ;; -+ *) -+ # If it is relative, then search for the first ld in PATH. -+ with_gnu_ld=unknown -+ ;; - esac - fi -- done -- IFS="$acl_save_ifs" --else -- acl_cv_path_LD="$LD" # Let the user override the test with a path. --fi]) --LD="$acl_cv_path_LD" -+ if test -n "$ac_prog"; then -+ # Search for $ac_prog in $PATH. -+ acl_save_ifs="$IFS"; IFS=$PATH_SEPARATOR -+ for ac_dir in $PATH; do -+ IFS="$acl_save_ifs" -+ test -z "$ac_dir" && ac_dir=. -+ if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then -+ acl_cv_path_LD="$ac_dir/$ac_prog" -+ # Check to see if the program is GNU ld. I'd rather use --version, -+ # but apparently some variants of GNU ld only accept -v. -+ # Break only if it was the GNU/non-GNU ld that we prefer. -+ case `"$acl_cv_path_LD" -v 2>&1 Solaris 64-bit Developer's Guide > The Development Environment -- dnl . -- dnl "Portable Makefiles should refer to any library directories using the 64 symbolic link." -- dnl But we want to recognize the sparcv9 or amd64 subdirectory also if the -- dnl symlink is missing, so we set acl_libdirstem2 too. -- AC_CACHE_CHECK([for 64-bit host], [gl_cv_solaris_64bit], -- [AC_EGREP_CPP([sixtyfour bits], [ -+ dnl Allow the user to override the result by setting acl_cv_libdirstems. -+ AC_CACHE_CHECK([for the common suffixes of directories in the library search path], -+ [acl_cv_libdirstems], -+ [acl_libdirstem=lib -+ acl_libdirstem2= -+ case "$host_os" in -+ solaris*) -+ dnl See Solaris 10 Software Developer Collection > Solaris 64-bit Developer's Guide > The Development Environment -+ dnl . -+ dnl "Portable Makefiles should refer to any library directories using the 64 symbolic link." -+ dnl But we want to recognize the sparcv9 or amd64 subdirectory also if the -+ dnl symlink is missing, so we set acl_libdirstem2 too. -+ AC_CACHE_CHECK([for 64-bit host], [gl_cv_solaris_64bit], -+ [AC_EGREP_CPP([sixtyfour bits], [ - #ifdef _LP64 - sixtyfour bits - #endif -- ], [gl_cv_solaris_64bit=yes], [gl_cv_solaris_64bit=no]) -- ]) -- if test $gl_cv_solaris_64bit = yes; then -- acl_libdirstem=lib/64 -- case "$host_cpu" in -- sparc*) acl_libdirstem2=lib/sparcv9 ;; -- i*86 | x86_64) acl_libdirstem2=lib/amd64 ;; -- esac -- fi -- ;; -- *) -- searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'` -- if test -n "$searchpath"; then -- acl_save_IFS="${IFS= }"; IFS=":" -- for searchdir in $searchpath; do -- if test -d "$searchdir"; then -- case "$searchdir" in -- */lib64/ | */lib64 ) acl_libdirstem=lib64 ;; -- */../ | */.. ) -- # Better ignore directories of this form. They are misleading. -- ;; -- *) searchdir=`cd "$searchdir" && pwd` -- case "$searchdir" in -- */lib64 ) acl_libdirstem=lib64 ;; -- esac ;; -- esac -- fi -- done -- IFS="$acl_save_IFS" -- fi -- ;; -- esac -- test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem" -+ ], [gl_cv_solaris_64bit=yes], [gl_cv_solaris_64bit=no]) -+ ]) -+ if test $gl_cv_solaris_64bit = yes; then -+ acl_libdirstem=lib/64 -+ case "$host_cpu" in -+ sparc*) acl_libdirstem2=lib/sparcv9 ;; -+ i*86 | x86_64) acl_libdirstem2=lib/amd64 ;; -+ esac -+ fi -+ ;; -+ *) -+ dnl The result is a property of the system. However, non-system -+ dnl compilers sometimes have odd library search paths. Therefore -+ dnl prefer asking /usr/bin/gcc, if available, rather than $CC. -+ searchpath=`(if test -f /usr/bin/gcc \ -+ && LC_ALL=C /usr/bin/gcc -print-search-dirs >/dev/null 2>/dev/null; then \ -+ LC_ALL=C /usr/bin/gcc -print-search-dirs; \ -+ else \ -+ LC_ALL=C $CC -print-search-dirs; \ -+ fi) 2>/dev/null \ -+ | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'` -+ if test -n "$searchpath"; then -+ acl_save_IFS="${IFS= }"; IFS=":" -+ for searchdir in $searchpath; do -+ if test -d "$searchdir"; then -+ case "$searchdir" in -+ */lib64/ | */lib64 ) acl_libdirstem=lib64 ;; -+ */../ | */.. ) -+ # Better ignore directories of this form. They are misleading. -+ ;; -+ *) searchdir=`cd "$searchdir" && pwd` -+ case "$searchdir" in -+ */lib64 ) acl_libdirstem=lib64 ;; -+ esac ;; -+ esac -+ fi -+ done -+ IFS="$acl_save_IFS" -+ fi -+ ;; -+ esac -+ test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem" -+ acl_cv_libdirstems="$acl_libdirstem,$acl_libdirstem2" -+ ]) -+ # Decompose acl_cv_libdirstems into acl_libdirstem and acl_libdirstem2. -+ acl_libdirstem=`echo "$acl_cv_libdirstems" | sed -e 's/,.*//'` -+ acl_libdirstem2=`echo "$acl_cv_libdirstems" | sed -e '/,/s/.*,//'` - ]) -diff -durN libpipeline-1.4.1.orig/gnulib/m4/libtool.m4 libpipeline-1.4.1/gnulib/m4/libtool.m4 ---- libpipeline-1.4.1.orig/gnulib/m4/libtool.m4 2015-08-17 17:14:16.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/m4/libtool.m4 2017-05-17 10:38:00.890625000 +0800 -@@ -1,8 +1,6 @@ - # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- - # --# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, --# 2006, 2007, 2008, 2009, 2010, 2011 Free Software --# Foundation, Inc. -+# Copyright (C) 1996-2001, 2003-2015 Free Software Foundation, Inc. - # Written by Gordon Matzigkeit, 1996 - # - # This file is free software; the Free Software Foundation gives -@@ -10,36 +8,30 @@ - # modifications, as long as this notice is preserved. - - m4_define([_LT_COPYING], [dnl --# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, --# 2006, 2007, 2008, 2009, 2010, 2011 Free Software --# Foundation, Inc. --# Written by Gordon Matzigkeit, 1996 --# --# This file is part of GNU Libtool. --# --# GNU Libtool 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 of --# the License, or (at your option) any later version. -+# Copyright (C) 2014 Free Software Foundation, Inc. -+# This is free software; see the source for copying conditions. There is NO -+# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -+ -+# GNU Libtool 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 of of the License, or -+# (at your option) any later version. - # --# As a special exception to the GNU General Public License, --# if you distribute this file as part of a program or library that --# is built using GNU Libtool, you may include this file under the --# same distribution terms that you use for the rest of that program. -+# As a special exception to the GNU General Public License, if you -+# distribute this file as part of a program or library that is built -+# using GNU Libtool, you may include this file under the same -+# distribution terms that you use for the rest of that program. - # --# GNU Libtool is distributed in the hope that it will be useful, --# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# GNU Libtool 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 GNU Libtool; see the file COPYING. If not, a copy --# can be downloaded from http://www.gnu.org/licenses/gpl.html, or --# obtained by writing to the Free Software Foundation, Inc., --# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+# along with this program. If not, see . - ]) - --# serial 57 LT_INIT -+# serial 58 LT_INIT - - - # LT_PREREQ(VERSION) -@@ -67,7 +59,7 @@ - # LT_INIT([OPTIONS]) - # ------------------ - AC_DEFUN([LT_INIT], --[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT -+[AC_PREREQ([2.62])dnl We use AC_PATH_PROGS_FEATURE_CHECK - AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl - AC_BEFORE([$0], [LT_LANG])dnl - AC_BEFORE([$0], [LT_OUTPUT])dnl -@@ -91,7 +83,7 @@ - _LT_SET_OPTIONS([$0], [$1]) - - # This can be used to rebuild libtool when needed --LIBTOOL_DEPS="$ltmain" -+LIBTOOL_DEPS=$ltmain - - # Always use our own libtool. - LIBTOOL='$(SHELL) $(top_builddir)/libtool' -@@ -111,26 +103,43 @@ - dnl AC_DEFUN([AM_PROG_LIBTOOL], []) - - -+# _LT_PREPARE_CC_BASENAME -+# ----------------------- -+m4_defun([_LT_PREPARE_CC_BASENAME], [ -+# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. -+func_cc_basename () -+{ -+ for cc_temp in @S|@*""; do -+ case $cc_temp in -+ compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; -+ distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; -+ \-*) ;; -+ *) break;; -+ esac -+ done -+ func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` -+} -+])# _LT_PREPARE_CC_BASENAME -+ -+ - # _LT_CC_BASENAME(CC) - # ------------------- --# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. -+# It would be clearer to call AC_REQUIREs from _LT_PREPARE_CC_BASENAME, -+# but that macro is also expanded into generated libtool script, which -+# arranges for $SED and $ECHO to be set by different means. - m4_defun([_LT_CC_BASENAME], --[for cc_temp in $1""; do -- case $cc_temp in -- compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; -- distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; -- \-*) ;; -- *) break;; -- esac --done --cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` -+[m4_require([_LT_PREPARE_CC_BASENAME])dnl -+AC_REQUIRE([_LT_DECL_SED])dnl -+AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl -+func_cc_basename $1 -+cc_basename=$func_cc_basename_result - ]) - - - # _LT_FILEUTILS_DEFAULTS - # ---------------------- - # It is okay to use these file commands and assume they have been set --# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'. -+# sensibly after 'm4_require([_LT_FILEUTILS_DEFAULTS])'. - m4_defun([_LT_FILEUTILS_DEFAULTS], - [: ${CP="cp -f"} - : ${MV="mv -f"} -@@ -177,15 +186,16 @@ - m4_require([_LT_CMD_OLD_ARCHIVE])dnl - m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl - m4_require([_LT_WITH_SYSROOT])dnl -+m4_require([_LT_CMD_TRUNCATE])dnl - - _LT_CONFIG_LIBTOOL_INIT([ --# See if we are running on zsh, and set the options which allow our -+# See if we are running on zsh, and set the options that allow our - # commands through without removal of \ escapes INIT. --if test -n "\${ZSH_VERSION+set}" ; then -+if test -n "\${ZSH_VERSION+set}"; then - setopt NO_GLOB_SUBST - fi - ]) --if test -n "${ZSH_VERSION+set}" ; then -+if test -n "${ZSH_VERSION+set}"; then - setopt NO_GLOB_SUBST - fi - -@@ -198,7 +208,7 @@ - # AIX sometimes has problems with the GCC collect2 program. For some - # reason, if we set the COLLECT_NAMES environment variable, the problems - # vanish in a puff of smoke. -- if test "X${COLLECT_NAMES+set}" != Xset; then -+ if test set != "${COLLECT_NAMES+set}"; then - COLLECT_NAMES= - export COLLECT_NAMES - fi -@@ -209,14 +219,14 @@ - ofile=libtool - can_build_shared=yes - --# All known linkers require a `.a' archive for static linking (except MSVC, -+# All known linkers require a '.a' archive for static linking (except MSVC, - # which needs '.lib'). - libext=a - --with_gnu_ld="$lt_cv_prog_gnu_ld" -+with_gnu_ld=$lt_cv_prog_gnu_ld - --old_CC="$CC" --old_CFLAGS="$CFLAGS" -+old_CC=$CC -+old_CFLAGS=$CFLAGS - - # Set sane defaults for various variables - test -z "$CC" && CC=cc -@@ -269,14 +279,14 @@ - - # _LT_PROG_LTMAIN - # --------------- --# Note that this code is called both from `configure', and `config.status' -+# Note that this code is called both from 'configure', and 'config.status' - # now that we use AC_CONFIG_COMMANDS to generate libtool. Notably, --# `config.status' has no value for ac_aux_dir unless we are using Automake, -+# 'config.status' has no value for ac_aux_dir unless we are using Automake, - # so we pass a copy along to make sure it has a sensible value anyway. - m4_defun([_LT_PROG_LTMAIN], - [m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl - _LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir']) --ltmain="$ac_aux_dir/ltmain.sh" -+ltmain=$ac_aux_dir/ltmain.sh - ])# _LT_PROG_LTMAIN - - -@@ -286,7 +296,7 @@ - - # So that we can recreate a full libtool script including additional - # tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS --# in macros and then make a single call at the end using the `libtool' -+# in macros and then make a single call at the end using the 'libtool' - # label. - - -@@ -421,8 +431,8 @@ - - # _LT_CONFIG_STATUS_DECLARE([VARNAME]) - # ------------------------------------ --# Quote a variable value, and forward it to `config.status' so that its --# declaration there will have the same value as in `configure'. VARNAME -+# Quote a variable value, and forward it to 'config.status' so that its -+# declaration there will have the same value as in 'configure'. VARNAME - # must have a single quote delimited value for this to work. - m4_define([_LT_CONFIG_STATUS_DECLARE], - [$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`']) -@@ -446,7 +456,7 @@ - # Output comment and list of tags supported by the script - m4_defun([_LT_LIBTOOL_TAGS], - [_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl --available_tags="_LT_TAGS"dnl -+available_tags='_LT_TAGS'dnl - ]) - - -@@ -474,7 +484,7 @@ - # _LT_LIBTOOL_CONFIG_VARS - # ----------------------- - # Produce commented declarations of non-tagged libtool config variables --# suitable for insertion in the LIBTOOL CONFIG section of the `libtool' -+# suitable for insertion in the LIBTOOL CONFIG section of the 'libtool' - # script. Tagged libtool config variables (even for the LIBTOOL CONFIG - # section) are produced by _LT_LIBTOOL_TAG_VARS. - m4_defun([_LT_LIBTOOL_CONFIG_VARS], -@@ -500,8 +510,8 @@ - # Send accumulated output to $CONFIG_STATUS. Thanks to the lists of - # variables for single and double quote escaping we saved from calls - # to _LT_DECL, we can put quote escaped variables declarations --# into `config.status', and then the shell code to quote escape them in --# for loops in `config.status'. Finally, any additional code accumulated -+# into 'config.status', and then the shell code to quote escape them in -+# for loops in 'config.status'. Finally, any additional code accumulated - # from calls to _LT_CONFIG_LIBTOOL_INIT is expanded. - m4_defun([_LT_CONFIG_COMMANDS], - [AC_PROVIDE_IFELSE([LT_OUTPUT], -@@ -547,7 +557,7 @@ - ]], lt_decl_quote_varnames); do - case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in - *[[\\\\\\\`\\"\\\$]]*) -- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" -+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes - ;; - *) - eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" -@@ -560,7 +570,7 @@ - ]], lt_decl_dquote_varnames); do - case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in - *[[\\\\\\\`\\"\\\$]]*) -- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" -+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes - ;; - *) - eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" -@@ -576,7 +586,7 @@ - # Generate a child script FILE with all initialization necessary to - # reuse the environment learned by the parent script, and make the - # file executable. If COMMENT is supplied, it is inserted after the --# `#!' sequence but before initialization text begins. After this -+# '#!' sequence but before initialization text begins. After this - # macro, additional text can be appended to FILE to form the body of - # the child script. The macro ends with non-zero status if the - # file could not be fully written (such as if the disk is full). -@@ -598,7 +608,7 @@ - _AS_PREPARE - exec AS_MESSAGE_FD>&1 - _ASEOF --test $lt_write_fail = 0 && chmod +x $1[]dnl -+test 0 = "$lt_write_fail" && chmod +x $1[]dnl - m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT - - # LT_OUTPUT -@@ -621,7 +631,7 @@ - } >&AS_MESSAGE_LOG_FD - - lt_cl_help="\ --\`$as_me' creates a local libtool stub from the current configuration, -+'$as_me' creates a local libtool stub from the current configuration, - for use in further configure time tests before the real libtool is - generated. - -@@ -643,7 +653,7 @@ - This config.lt script is free software; the Free Software Foundation - gives unlimited permision to copy, distribute and modify it." - --while test $[#] != 0 -+while test 0 != $[#] - do - case $[1] in - --version | --v* | -V ) -@@ -656,10 +666,10 @@ - lt_cl_silent=: ;; - - -*) AC_MSG_ERROR([unrecognized option: $[1] --Try \`$[0] --help' for more information.]) ;; -+Try '$[0] --help' for more information.]) ;; - - *) AC_MSG_ERROR([unrecognized argument: $[1] --Try \`$[0] --help' for more information.]) ;; -+Try '$[0] --help' for more information.]) ;; - esac - shift - done -@@ -685,7 +695,7 @@ - # open by configure. Here we exec the FD to /dev/null, effectively closing - # config.log, so it can be properly (re)opened and appended to by config.lt. - lt_cl_success=: --test "$silent" = yes && -+test yes = "$silent" && - lt_config_lt_args="$lt_config_lt_args --quiet" - exec AS_MESSAGE_LOG_FD>/dev/null - $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false -@@ -705,27 +715,31 @@ - _LT_CONFIG_SAVE_COMMANDS([ - m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl - m4_if(_LT_TAG, [C], [ -- # See if we are running on zsh, and set the options which allow our -+ # See if we are running on zsh, and set the options that allow our - # commands through without removal of \ escapes. -- if test -n "${ZSH_VERSION+set}" ; then -+ if test -n "${ZSH_VERSION+set}"; then - setopt NO_GLOB_SUBST - fi - -- cfgfile="${ofile}T" -+ cfgfile=${ofile}T - trap "$RM \"$cfgfile\"; exit 1" 1 2 15 - $RM "$cfgfile" - - cat <<_LT_EOF >> "$cfgfile" - #! $SHELL -- --# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. --# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION -+# Generated automatically by $as_me ($PACKAGE) $VERSION - # Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: - # NOTE: Changes made to this file will be lost: look at ltmain.sh. --# -+ -+# Provide generalized library-building support services. -+# Written by Gordon Matzigkeit, 1996 -+ - _LT_COPYING - _LT_LIBTOOL_TAGS - -+# Configured defaults for sys_lib_dlsearch_path munging. -+: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"} -+ - # ### BEGIN LIBTOOL CONFIG - _LT_LIBTOOL_CONFIG_VARS - _LT_LIBTOOL_TAG_VARS -@@ -733,13 +747,24 @@ - - _LT_EOF - -+ cat <<'_LT_EOF' >> "$cfgfile" -+ -+# ### BEGIN FUNCTIONS SHARED WITH CONFIGURE -+ -+_LT_PREPARE_MUNGE_PATH_LIST -+_LT_PREPARE_CC_BASENAME -+ -+# ### END FUNCTIONS SHARED WITH CONFIGURE -+ -+_LT_EOF -+ - case $host_os in - aix3*) - cat <<\_LT_EOF >> "$cfgfile" - # AIX sometimes has problems with the GCC collect2 program. For some - # reason, if we set the COLLECT_NAMES environment variable, the problems - # vanish in a puff of smoke. --if test "X${COLLECT_NAMES+set}" != Xset; then -+if test set != "${COLLECT_NAMES+set}"; then - COLLECT_NAMES= - export COLLECT_NAMES - fi -@@ -756,8 +781,6 @@ - sed '$q' "$ltmain" >> "$cfgfile" \ - || (rm -f "$cfgfile"; exit 1) - -- _LT_PROG_REPLACE_SHELLFNS -- - mv -f "$cfgfile" "$ofile" || - (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") - chmod +x "$ofile" -@@ -775,7 +798,6 @@ - [m4_if([$1], [], [ - PACKAGE='$PACKAGE' - VERSION='$VERSION' -- TIMESTAMP='$TIMESTAMP' - RM='$RM' - ofile='$ofile'], []) - ])dnl /_LT_CONFIG_SAVE_COMMANDS -@@ -974,7 +996,7 @@ - - AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod], - [lt_cv_apple_cc_single_mod=no -- if test -z "${LT_MULTI_MODULE}"; then -+ if test -z "$LT_MULTI_MODULE"; then - # By default we will add the -single_module flag. You can override - # by either setting the environment variable LT_MULTI_MODULE - # non-empty at configure time, or by adding -multi_module to the -@@ -992,7 +1014,7 @@ - cat conftest.err >&AS_MESSAGE_LOG_FD - # Otherwise, if the output was created with a 0 exit code from - # the compiler, it worked. -- elif test -f libconftest.dylib && test $_lt_result -eq 0; then -+ elif test -f libconftest.dylib && test 0 = "$_lt_result"; then - lt_cv_apple_cc_single_mod=yes - else - cat conftest.err >&AS_MESSAGE_LOG_FD -@@ -1010,7 +1032,7 @@ - AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], - [lt_cv_ld_exported_symbols_list=yes], - [lt_cv_ld_exported_symbols_list=no]) -- LDFLAGS="$save_LDFLAGS" -+ LDFLAGS=$save_LDFLAGS - ]) - - AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load], -@@ -1032,7 +1054,7 @@ - _lt_result=$? - if test -s conftest.err && $GREP force_load conftest.err; then - cat conftest.err >&AS_MESSAGE_LOG_FD -- elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then -+ elif test -f conftest && test 0 = "$_lt_result" && $GREP forced_load conftest >/dev/null 2>&1; then - lt_cv_ld_force_load=yes - else - cat conftest.err >&AS_MESSAGE_LOG_FD -@@ -1042,32 +1064,32 @@ - ]) - case $host_os in - rhapsody* | darwin1.[[012]]) -- _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; -+ _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;; - darwin1.*) -- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; -+ _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; - darwin*) # darwin 5.x on - # if running on 10.5 or later, the deployment target defaults - # to the OS version, if on x86, and 10.4, the deployment - # target defaults to 10.4. Don't you love it? - case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in - 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) -- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; -- 10.[[012]]*) -- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; -+ _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; -+ 10.[[012]][[,.]]*) -+ _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; - 10.*) -- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; -+ _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; - esac - ;; - esac -- if test "$lt_cv_apple_cc_single_mod" = "yes"; then -+ if test yes = "$lt_cv_apple_cc_single_mod"; then - _lt_dar_single_mod='$single_module' - fi -- if test "$lt_cv_ld_exported_symbols_list" = "yes"; then -- _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' -+ if test yes = "$lt_cv_ld_exported_symbols_list"; then -+ _lt_dar_export_syms=' $wl-exported_symbols_list,$output_objdir/$libname-symbols.expsym' - else -- _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ _lt_dar_export_syms='~$NMEDIT -s $output_objdir/$libname-symbols.expsym $lib' - fi -- if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then -+ if test : != "$DSYMUTIL" && test no = "$lt_cv_ld_force_load"; then - _lt_dsymutil='~$DSYMUTIL $lib || :' - else - _lt_dsymutil= -@@ -1087,29 +1109,29 @@ - _LT_TAGVAR(hardcode_direct, $1)=no - _LT_TAGVAR(hardcode_automatic, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported -- if test "$lt_cv_ld_force_load" = "yes"; then -- _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' -+ if test yes = "$lt_cv_ld_force_load"; then -+ _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience $wl-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' - m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes], - [FC], [_LT_TAGVAR(compiler_needs_object, $1)=yes]) - else - _LT_TAGVAR(whole_archive_flag_spec, $1)='' - fi - _LT_TAGVAR(link_all_deplibs, $1)=yes -- _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" -+ _LT_TAGVAR(allow_undefined_flag, $1)=$_lt_dar_allow_undefined - case $cc_basename in -- ifort*) _lt_dar_can_shared=yes ;; -+ ifort*|nagfor*) _lt_dar_can_shared=yes ;; - *) _lt_dar_can_shared=$GCC ;; - esac -- if test "$_lt_dar_can_shared" = "yes"; then -+ if test yes = "$_lt_dar_can_shared"; then - output_verbose_link_cmd=func_echo_all -- _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" -- _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -- _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -- _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" -+ _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil" -+ _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil" -+ _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil" -+ _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil" - m4_if([$1], [CXX], --[ if test "$lt_cv_apple_cc_single_mod" != "yes"; then -- _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" -- _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" -+[ if test yes != "$lt_cv_apple_cc_single_mod"; then -+ _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dsymutil" -+ _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil" - fi - ],[]) - else -@@ -1129,7 +1151,7 @@ - # Allow to override them for all tags through lt_cv_aix_libpath. - m4_defun([_LT_SYS_MODULE_PATH_AIX], - [m4_require([_LT_DECL_SED])dnl --if test "${lt_cv_aix_libpath+set}" = set; then -+if test set = "${lt_cv_aix_libpath+set}"; then - aix_libpath=$lt_cv_aix_libpath - else - AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])], -@@ -1147,7 +1169,7 @@ - _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` - fi],[]) - if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then -- _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib" -+ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=/usr/lib:/lib - fi - ]) - aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1]) -@@ -1167,8 +1189,8 @@ - # ----------------------- - # Find how we can fake an echo command that does not interpret backslash. - # In particular, with Autoconf 2.60 or later we add some code to the start --# of the generated configure script which will find a shell with a builtin --# printf (which we can use as an echo command). -+# of the generated configure script that will find a shell with a builtin -+# printf (that we can use as an echo command). - m4_defun([_LT_PROG_ECHO_BACKSLASH], - [ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' - ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO -@@ -1196,10 +1218,10 @@ - # Invoke $ECHO with all args, space-separated. - func_echo_all () - { -- $ECHO "$*" -+ $ECHO "$*" - } - --case "$ECHO" in -+case $ECHO in - printf*) AC_MSG_RESULT([printf]) ;; - print*) AC_MSG_RESULT([print -r]) ;; - *) AC_MSG_RESULT([cat]) ;; -@@ -1225,16 +1247,17 @@ - AC_DEFUN([_LT_WITH_SYSROOT], - [AC_MSG_CHECKING([for sysroot]) - AC_ARG_WITH([sysroot], --[ --with-sysroot[=DIR] Search for dependent libraries within DIR -- (or the compiler's sysroot if not specified).], -+[AS_HELP_STRING([--with-sysroot@<:@=DIR@:>@], -+ [Search for dependent libraries within DIR (or the compiler's sysroot -+ if not specified).])], - [], [with_sysroot=no]) - - dnl lt_sysroot will always be passed unquoted. We quote it here - dnl in case the user passed a directory name. - lt_sysroot= --case ${with_sysroot} in #( -+case $with_sysroot in #( - yes) -- if test "$GCC" = yes; then -+ if test yes = "$GCC"; then - lt_sysroot=`$CC --print-sysroot 2>/dev/null` - fi - ;; #( -@@ -1244,14 +1267,14 @@ - no|'') - ;; #( - *) -- AC_MSG_RESULT([${with_sysroot}]) -+ AC_MSG_RESULT([$with_sysroot]) - AC_MSG_ERROR([The sysroot must be an absolute path.]) - ;; - esac - - AC_MSG_RESULT([${lt_sysroot:-no}]) - _LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl --[dependent libraries, and in which our libraries should be installed.])]) -+[dependent libraries, and where our libraries should be installed.])]) - - # _LT_ENABLE_LOCK - # --------------- -@@ -1259,31 +1282,33 @@ - [AC_ARG_ENABLE([libtool-lock], - [AS_HELP_STRING([--disable-libtool-lock], - [avoid locking (might break parallel builds)])]) --test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes -+test no = "$enable_libtool_lock" || enable_libtool_lock=yes - - # Some flags need to be propagated to the compiler or linker for good - # libtool support. - case $host in - ia64-*-hpux*) -- # Find out which ABI we are using. -+ # Find out what ABI is being produced by ac_compile, and set mode -+ # options accordingly. - echo 'int i;' > conftest.$ac_ext - if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.$ac_objext` in - *ELF-32*) -- HPUX_IA64_MODE="32" -+ HPUX_IA64_MODE=32 - ;; - *ELF-64*) -- HPUX_IA64_MODE="64" -+ HPUX_IA64_MODE=64 - ;; - esac - fi - rm -rf conftest* - ;; - *-*-irix6*) -- # Find out which ABI we are using. -+ # Find out what ABI is being produced by ac_compile, and set linker -+ # options accordingly. - echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext - if AC_TRY_EVAL(ac_compile); then -- if test "$lt_cv_prog_gnu_ld" = yes; then -+ if test yes = "$lt_cv_prog_gnu_ld"; then - case `/usr/bin/file conftest.$ac_objext` in - *32-bit*) - LD="${LD-ld} -melf32bsmip" -@@ -1312,9 +1337,46 @@ - rm -rf conftest* - ;; - -+mips64*-*linux*) -+ # Find out what ABI is being produced by ac_compile, and set linker -+ # options accordingly. -+ echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext -+ if AC_TRY_EVAL(ac_compile); then -+ emul=elf -+ case `/usr/bin/file conftest.$ac_objext` in -+ *32-bit*) -+ emul="${emul}32" -+ ;; -+ *64-bit*) -+ emul="${emul}64" -+ ;; -+ esac -+ case `/usr/bin/file conftest.$ac_objext` in -+ *MSB*) -+ emul="${emul}btsmip" -+ ;; -+ *LSB*) -+ emul="${emul}ltsmip" -+ ;; -+ esac -+ case `/usr/bin/file conftest.$ac_objext` in -+ *N32*) -+ emul="${emul}n32" -+ ;; -+ esac -+ LD="${LD-ld} -m $emul" -+ fi -+ rm -rf conftest* -+ ;; -+ - x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ - s390*-*linux*|s390*-*tpf*|sparc*-*linux*) -- # Find out which ABI we are using. -+ # Find out what ABI is being produced by ac_compile, and set linker -+ # options accordingly. Note that the listed cases only cover the -+ # situations where additional linker options are needed (such as when -+ # doing 32-bit compilation for a host where ld defaults to 64-bit, or -+ # vice versa); the common cases where no linker options are needed do -+ # not appear in the list. - echo 'int i;' > conftest.$ac_ext - if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.o` in -@@ -1333,10 +1395,10 @@ - ;; - esac - ;; -- powerpc64le-*) -+ powerpc64le-*linux*) - LD="${LD-ld} -m elf32lppclinux" - ;; -- powerpc64-*) -+ powerpc64-*linux*) - LD="${LD-ld} -m elf32ppclinux" - ;; - s390x-*linux*) -@@ -1355,10 +1417,10 @@ - x86_64-*linux*) - LD="${LD-ld} -m elf_x86_64" - ;; -- powerpcle-*) -+ powerpcle-*linux*) - LD="${LD-ld} -m elf64lppc" - ;; -- powerpc-*) -+ powerpc-*linux*) - LD="${LD-ld} -m elf64ppc" - ;; - s390*-*linux*|s390*-*tpf*) -@@ -1376,19 +1438,20 @@ - - *-*-sco3.2v5*) - # On SCO OpenServer 5, we need -belf to get full-featured binaries. -- SAVE_CFLAGS="$CFLAGS" -+ SAVE_CFLAGS=$CFLAGS - CFLAGS="$CFLAGS -belf" - AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf, - [AC_LANG_PUSH(C) - AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no]) - AC_LANG_POP]) -- if test x"$lt_cv_cc_needs_belf" != x"yes"; then -+ if test yes != "$lt_cv_cc_needs_belf"; then - # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf -- CFLAGS="$SAVE_CFLAGS" -+ CFLAGS=$SAVE_CFLAGS - fi - ;; - *-*solaris*) -- # Find out which ABI we are using. -+ # Find out what ABI is being produced by ac_compile, and set linker -+ # options accordingly. - echo 'int i;' > conftest.$ac_ext - if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.o` in -@@ -1396,7 +1459,7 @@ - case $lt_cv_prog_gnu_ld in - yes*) - case $host in -- i?86-*-solaris*) -+ i?86-*-solaris*|x86_64-*-solaris*) - LD="${LD-ld} -m elf_x86_64" - ;; - sparc*-*-solaris*) -@@ -1405,7 +1468,7 @@ - esac - # GNU ld 2.21 introduced _sol2 emulations. Use them if available. - if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then -- LD="${LD-ld}_sol2" -+ LD=${LD-ld}_sol2 - fi - ;; - *) -@@ -1421,7 +1484,7 @@ - ;; - esac - --need_locks="$enable_libtool_lock" -+need_locks=$enable_libtool_lock - ])# _LT_ENABLE_LOCK - - -@@ -1440,11 +1503,11 @@ - [echo conftest.$ac_objext > conftest.lst - lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD' - AC_TRY_EVAL([lt_ar_try]) -- if test "$ac_status" -eq 0; then -+ if test 0 -eq "$ac_status"; then - # Ensure the archiver fails upon bogus file names. - rm -f conftest.$ac_objext libconftest.a - AC_TRY_EVAL([lt_ar_try]) -- if test "$ac_status" -ne 0; then -+ if test 0 -ne "$ac_status"; then - lt_cv_ar_at_file=@ - fi - fi -@@ -1452,7 +1515,7 @@ - ]) - ]) - --if test "x$lt_cv_ar_at_file" = xno; then -+if test no = "$lt_cv_ar_at_file"; then - archiver_list_spec= - else - archiver_list_spec=$lt_cv_ar_at_file -@@ -1483,7 +1546,7 @@ - - if test -n "$RANLIB"; then - case $host_os in -- openbsd*) -+ bitrig* | openbsd*) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" - ;; - *) -@@ -1519,7 +1582,7 @@ - [$2=no - m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4]) - echo "$lt_simple_compile_test_code" > conftest.$ac_ext -- lt_compiler_flag="$3" -+ lt_compiler_flag="$3" ## exclude from sc_useless_quotes_in_assignment - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins -@@ -1546,7 +1609,7 @@ - $RM conftest* - ]) - --if test x"[$]$2" = xyes; then -+if test yes = "[$]$2"; then - m4_if([$5], , :, [$5]) - else - m4_if([$6], , :, [$6]) -@@ -1568,7 +1631,7 @@ - m4_require([_LT_DECL_SED])dnl - AC_CACHE_CHECK([$1], [$2], - [$2=no -- save_LDFLAGS="$LDFLAGS" -+ save_LDFLAGS=$LDFLAGS - LDFLAGS="$LDFLAGS $3" - echo "$lt_simple_link_test_code" > conftest.$ac_ext - if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then -@@ -1587,10 +1650,10 @@ - fi - fi - $RM -r conftest* -- LDFLAGS="$save_LDFLAGS" -+ LDFLAGS=$save_LDFLAGS - ]) - --if test x"[$]$2" = xyes; then -+if test yes = "[$]$2"; then - m4_if([$4], , :, [$4]) - else - m4_if([$5], , :, [$5]) -@@ -1611,7 +1674,7 @@ - AC_MSG_CHECKING([the maximum length of command line arguments]) - AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl - i=0 -- teststring="ABCD" -+ teststring=ABCD - - case $build_os in - msdosdjgpp*) -@@ -1629,7 +1692,7 @@ - lt_cv_sys_max_cmd_len=-1; - ;; - -- cygwin* | mingw* | cegcc*) -+ cygwin* | msys* | mingw* | cegcc*) - # On Win9x/ME, this test blows up -- it succeeds, but takes - # about 5 minutes as the teststring grows exponentially. - # Worse, since 9x/ME are not pre-emptively multitasking, -@@ -1651,7 +1714,7 @@ - lt_cv_sys_max_cmd_len=8192; - ;; - -- netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) -+ bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*) - # This has been around since 386BSD, at least. Likely further. - if test -x /sbin/sysctl; then - lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` -@@ -1702,22 +1765,22 @@ - *) - lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` - if test -n "$lt_cv_sys_max_cmd_len" && \ -- test undefined != "$lt_cv_sys_max_cmd_len"; then -+ test undefined != "$lt_cv_sys_max_cmd_len"; then - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` - else - # Make teststring a little bigger before we do anything with it. - # a 1K string should be a reasonable start. -- for i in 1 2 3 4 5 6 7 8 ; do -+ for i in 1 2 3 4 5 6 7 8; do - teststring=$teststring$teststring - done - SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} - # If test is not a shell built-in, we'll probably end up computing a - # maximum length that is only half of the actual maximum length, but - # we can't tell. -- while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ -+ while { test X`env echo "$teststring$teststring" 2>/dev/null` \ - = "X$teststring$teststring"; } >/dev/null 2>&1 && -- test $i != 17 # 1/2 MB should be enough -+ test 17 != "$i" # 1/2 MB should be enough - do - i=`expr $i + 1` - teststring=$teststring$teststring -@@ -1733,7 +1796,7 @@ - ;; - esac - ]) --if test -n $lt_cv_sys_max_cmd_len ; then -+if test -n "$lt_cv_sys_max_cmd_len"; then - AC_MSG_RESULT($lt_cv_sys_max_cmd_len) - else - AC_MSG_RESULT(none) -@@ -1761,7 +1824,7 @@ - # ---------------------------------------------------------------- - m4_defun([_LT_TRY_DLOPEN_SELF], - [m4_require([_LT_HEADER_DLFCN])dnl --if test "$cross_compiling" = yes; then : -+if test yes = "$cross_compiling"; then : - [$4] - else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 -@@ -1808,9 +1871,9 @@ - # endif - #endif - --/* When -fvisbility=hidden is used, assume the code has been annotated -+/* When -fvisibility=hidden is used, assume the code has been annotated - correspondingly for the symbols needed. */ --#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) -+#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) - int fnord () __attribute__((visibility("default"))); - #endif - -@@ -1836,7 +1899,7 @@ - return status; - }] - _LT_EOF -- if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then -+ if AC_TRY_EVAL(ac_link) && test -s "conftest$ac_exeext" 2>/dev/null; then - (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null - lt_status=$? - case x$lt_status in -@@ -1857,7 +1920,7 @@ - # ------------------ - AC_DEFUN([LT_SYS_DLOPEN_SELF], - [m4_require([_LT_HEADER_DLFCN])dnl --if test "x$enable_dlopen" != xyes; then -+if test yes != "$enable_dlopen"; then - enable_dlopen=unknown - enable_dlopen_self=unknown - enable_dlopen_self_static=unknown -@@ -1867,44 +1930,52 @@ - - case $host_os in - beos*) -- lt_cv_dlopen="load_add_on" -+ lt_cv_dlopen=load_add_on - lt_cv_dlopen_libs= - lt_cv_dlopen_self=yes - ;; - - mingw* | pw32* | cegcc*) -- lt_cv_dlopen="LoadLibrary" -+ lt_cv_dlopen=LoadLibrary - lt_cv_dlopen_libs= - ;; - -- cygwin*) -- lt_cv_dlopen="dlopen" -+ cygwin* | msys*) -+ lt_cv_dlopen=dlopen - lt_cv_dlopen_libs= - ;; - - darwin*) -- # if libdl is installed we need to link against it -+ # if libdl is installed we need to link against it - AC_CHECK_LIB([dl], [dlopen], -- [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[ -- lt_cv_dlopen="dyld" -+ [lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl],[ -+ lt_cv_dlopen=dyld - lt_cv_dlopen_libs= - lt_cv_dlopen_self=yes - ]) - ;; - -+ tpf*) -+ # Don't try to run any link tests for TPF. We know it's impossible -+ # because TPF is a cross-compiler, and we know how we open DSOs. -+ lt_cv_dlopen=dlopen -+ lt_cv_dlopen_libs= -+ lt_cv_dlopen_self=no -+ ;; -+ - *) - AC_CHECK_FUNC([shl_load], -- [lt_cv_dlopen="shl_load"], -+ [lt_cv_dlopen=shl_load], - [AC_CHECK_LIB([dld], [shl_load], -- [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"], -+ [lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld], - [AC_CHECK_FUNC([dlopen], -- [lt_cv_dlopen="dlopen"], -+ [lt_cv_dlopen=dlopen], - [AC_CHECK_LIB([dl], [dlopen], -- [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"], -+ [lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl], - [AC_CHECK_LIB([svld], [dlopen], -- [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], -+ [lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld], - [AC_CHECK_LIB([dld], [dld_link], -- [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"]) -+ [lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld]) - ]) - ]) - ]) -@@ -1913,21 +1984,21 @@ - ;; - esac - -- if test "x$lt_cv_dlopen" != xno; then -- enable_dlopen=yes -- else -+ if test no = "$lt_cv_dlopen"; then - enable_dlopen=no -+ else -+ enable_dlopen=yes - fi - - case $lt_cv_dlopen in - dlopen) -- save_CPPFLAGS="$CPPFLAGS" -- test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" -+ save_CPPFLAGS=$CPPFLAGS -+ test yes = "$ac_cv_header_dlfcn_h" && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" - -- save_LDFLAGS="$LDFLAGS" -+ save_LDFLAGS=$LDFLAGS - wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" - -- save_LIBS="$LIBS" -+ save_LIBS=$LIBS - LIBS="$lt_cv_dlopen_libs $LIBS" - - AC_CACHE_CHECK([whether a program can dlopen itself], -@@ -1937,7 +2008,7 @@ - lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross) - ]) - -- if test "x$lt_cv_dlopen_self" = xyes; then -+ if test yes = "$lt_cv_dlopen_self"; then - wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" - AC_CACHE_CHECK([whether a statically linked program can dlopen itself], - lt_cv_dlopen_self_static, [dnl -@@ -1947,9 +2018,9 @@ - ]) - fi - -- CPPFLAGS="$save_CPPFLAGS" -- LDFLAGS="$save_LDFLAGS" -- LIBS="$save_LIBS" -+ CPPFLAGS=$save_CPPFLAGS -+ LDFLAGS=$save_LDFLAGS -+ LIBS=$save_LIBS - ;; - esac - -@@ -2041,8 +2112,8 @@ - m4_require([_LT_FILEUTILS_DEFAULTS])dnl - _LT_COMPILER_C_O([$1]) - --hard_links="nottested" --if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then -+hard_links=nottested -+if test no = "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" && test no != "$need_locks"; then - # do not overwrite the value of need_locks provided by the user - AC_MSG_CHECKING([if we can lock with hard links]) - hard_links=yes -@@ -2052,8 +2123,8 @@ - ln conftest.a conftest.b 2>&5 || hard_links=no - ln conftest.a conftest.b 2>/dev/null && hard_links=no - AC_MSG_RESULT([$hard_links]) -- if test "$hard_links" = no; then -- AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe]) -+ if test no = "$hard_links"; then -+ AC_MSG_WARN(['$CC' does not support '-c -o', so 'make -j' may be unsafe]) - need_locks=warn - fi - else -@@ -2080,8 +2151,8 @@ - _LT_DECL([], [objdir], [0], - [The name of the directory that contains temporary libtool files])dnl - m4_pattern_allow([LT_OBJDIR])dnl --AC_DEFINE_UNQUOTED(LT_OBJDIR, "$lt_cv_objdir/", -- [Define to the sub-directory in which libtool stores uninstalled libraries.]) -+AC_DEFINE_UNQUOTED([LT_OBJDIR], "$lt_cv_objdir/", -+ [Define to the sub-directory where libtool stores uninstalled libraries.]) - ])# _LT_CHECK_OBJDIR - - -@@ -2093,15 +2164,15 @@ - _LT_TAGVAR(hardcode_action, $1)= - if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" || - test -n "$_LT_TAGVAR(runpath_var, $1)" || -- test "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then -+ test yes = "$_LT_TAGVAR(hardcode_automatic, $1)"; then - - # We can hardcode non-existent directories. -- if test "$_LT_TAGVAR(hardcode_direct, $1)" != no && -+ if test no != "$_LT_TAGVAR(hardcode_direct, $1)" && - # If the only mechanism to avoid hardcoding is shlibpath_var, we - # have to relink, otherwise we might link with an installed library - # when we should be linking with a yet-to-be-installed one -- ## test "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" != no && -- test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then -+ ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" && -+ test no != "$_LT_TAGVAR(hardcode_minus_L, $1)"; then - # Linking always hardcodes the temporary library directory. - _LT_TAGVAR(hardcode_action, $1)=relink - else -@@ -2115,12 +2186,12 @@ - fi - AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)]) - --if test "$_LT_TAGVAR(hardcode_action, $1)" = relink || -- test "$_LT_TAGVAR(inherit_rpath, $1)" = yes; then -+if test relink = "$_LT_TAGVAR(hardcode_action, $1)" || -+ test yes = "$_LT_TAGVAR(inherit_rpath, $1)"; then - # Fast installation is not supported - enable_fast_install=no --elif test "$shlibpath_overrides_runpath" = yes || -- test "$enable_shared" = no; then -+elif test yes = "$shlibpath_overrides_runpath" || -+ test no = "$enable_shared"; then - # Fast installation is not necessary - enable_fast_install=needless - fi -@@ -2144,7 +2215,7 @@ - # FIXME - insert some real tests, host_os isn't really good enough - case $host_os in - darwin*) -- if test -n "$STRIP" ; then -+ if test -n "$STRIP"; then - striplib="$STRIP -x" - old_striplib="$STRIP -S" - AC_MSG_RESULT([yes]) -@@ -2162,6 +2233,47 @@ - ])# _LT_CMD_STRIPLIB - - -+# _LT_PREPARE_MUNGE_PATH_LIST -+# --------------------------- -+# Make sure func_munge_path_list() is defined correctly. -+m4_defun([_LT_PREPARE_MUNGE_PATH_LIST], -+[[# func_munge_path_list VARIABLE PATH -+# ----------------------------------- -+# VARIABLE is name of variable containing _space_ separated list of -+# directories to be munged by the contents of PATH, which is string -+# having a format: -+# "DIR[:DIR]:" -+# string "DIR[ DIR]" will be prepended to VARIABLE -+# ":DIR[:DIR]" -+# string "DIR[ DIR]" will be appended to VARIABLE -+# "DIRP[:DIRP]::[DIRA:]DIRA" -+# string "DIRP[ DIRP]" will be prepended to VARIABLE and string -+# "DIRA[ DIRA]" will be appended to VARIABLE -+# "DIR[:DIR]" -+# VARIABLE will be replaced by "DIR[ DIR]" -+func_munge_path_list () -+{ -+ case x@S|@2 in -+ x) -+ ;; -+ *:) -+ eval @S|@1=\"`$ECHO @S|@2 | $SED 's/:/ /g'` \@S|@@S|@1\" -+ ;; -+ x:*) -+ eval @S|@1=\"\@S|@@S|@1 `$ECHO @S|@2 | $SED 's/:/ /g'`\" -+ ;; -+ *::*) -+ eval @S|@1=\"\@S|@@S|@1\ `$ECHO @S|@2 | $SED -e 's/.*:://' -e 's/:/ /g'`\" -+ eval @S|@1=\"`$ECHO @S|@2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \@S|@@S|@1\" -+ ;; -+ *) -+ eval @S|@1=\"`$ECHO @S|@2 | $SED 's/:/ /g'`\" -+ ;; -+ esac -+} -+]])# _LT_PREPARE_PATH_LIST -+ -+ - # _LT_SYS_DYNAMIC_LINKER([TAG]) - # ----------------------------- - # PORTME Fill in your ld.so characteristics -@@ -2172,17 +2284,18 @@ - m4_require([_LT_DECL_OBJDUMP])dnl - m4_require([_LT_DECL_SED])dnl - m4_require([_LT_CHECK_SHELL_FEATURES])dnl -+m4_require([_LT_PREPARE_MUNGE_PATH_LIST])dnl - AC_MSG_CHECKING([dynamic linker characteristics]) - m4_if([$1], - [], [ --if test "$GCC" = yes; then -+if test yes = "$GCC"; then - case $host_os in -- darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; -- *) lt_awk_arg="/^libraries:/" ;; -+ darwin*) lt_awk_arg='/^libraries:/,/LR/' ;; -+ *) lt_awk_arg='/^libraries:/' ;; - esac - case $host_os in -- mingw* | cegcc*) lt_sed_strip_eq="s,=\([[A-Za-z]]:\),\1,g" ;; -- *) lt_sed_strip_eq="s,=/,/,g" ;; -+ mingw* | cegcc*) lt_sed_strip_eq='s|=\([[A-Za-z]]:\)|\1|g' ;; -+ *) lt_sed_strip_eq='s|=/|/|g' ;; - esac - lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq` - case $lt_search_path_spec in -@@ -2198,28 +2311,35 @@ - ;; - esac - # Ok, now we have the path, separated by spaces, we can step through it -- # and add multilib dir if necessary. -+ # and add multilib dir if necessary... - lt_tmp_lt_search_path_spec= -- lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` -+ lt_multi_os_dir=/`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` -+ # ...but if some path component already ends with the multilib dir we assume -+ # that all is fine and trust -print-search-dirs as is (GCC 4.2? or newer). -+ case "$lt_multi_os_dir; $lt_search_path_spec " in -+ "/; "* | "/.; "* | "/./; "* | *"$lt_multi_os_dir "* | *"$lt_multi_os_dir/ "*) -+ lt_multi_os_dir= -+ ;; -+ esac - for lt_sys_path in $lt_search_path_spec; do -- if test -d "$lt_sys_path/$lt_multi_os_dir"; then -- lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" -- else -+ if test -d "$lt_sys_path$lt_multi_os_dir"; then -+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path$lt_multi_os_dir" -+ elif test -n "$lt_multi_os_dir"; then - test -d "$lt_sys_path" && \ - lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" - fi - done - lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' --BEGIN {RS=" "; FS="/|\n";} { -- lt_foo=""; -- lt_count=0; -+BEGIN {RS = " "; FS = "/|\n";} { -+ lt_foo = ""; -+ lt_count = 0; - for (lt_i = NF; lt_i > 0; lt_i--) { - if ($lt_i != "" && $lt_i != ".") { - if ($lt_i == "..") { - lt_count++; - } else { - if (lt_count == 0) { -- lt_foo="/" $lt_i lt_foo; -+ lt_foo = "/" $lt_i lt_foo; - } else { - lt_count--; - } -@@ -2233,7 +2353,7 @@ - # for these hosts. - case $host_os in - mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\ -- $SED 's,/\([[A-Za-z]]:\),\1,g'` ;; -+ $SED 's|/\([[A-Za-z]]:\)|\1|g'` ;; - esac - sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP` - else -@@ -2242,7 +2362,7 @@ - library_names_spec= - libname_spec='lib$name' - soname_spec= --shrext_cmds=".so" -+shrext_cmds=.so - postinstall_cmds= - postuninstall_cmds= - finish_cmds= -@@ -2259,14 +2379,17 @@ - # flags to be left without arguments - need_version=unknown - -+AC_ARG_VAR([LT_SYS_LIBRARY_PATH], -+[User-defined run-time library search path.]) -+ - case $host_os in - aix3*) - version_type=linux # correct to gnu/linux during the next big refactor -- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' -+ library_names_spec='$libname$release$shared_ext$versuffix $libname.a' - shlibpath_var=LIBPATH - - # AIX 3 has no versioning support, so we append a major version to the name. -- soname_spec='${libname}${release}${shared_ext}$major' -+ soname_spec='$libname$release$shared_ext$major' - ;; - - aix[[4-9]]*) -@@ -2274,41 +2397,91 @@ - need_lib_prefix=no - need_version=no - hardcode_into_libs=yes -- if test "$host_cpu" = ia64; then -+ if test ia64 = "$host_cpu"; then - # AIX 5 supports IA64 -- library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' -+ library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext' - shlibpath_var=LD_LIBRARY_PATH - else - # With GCC up to 2.95.x, collect2 would create an import file - # for dependence libraries. The import file would start with -- # the line `#! .'. This would cause the generated library to -- # depend on `.', always an invalid library. This was fixed in -+ # the line '#! .'. This would cause the generated library to -+ # depend on '.', always an invalid library. This was fixed in - # development snapshots of GCC prior to 3.0. - case $host_os in - aix4 | aix4.[[01]] | aix4.[[01]].*) - if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' - echo ' yes ' -- echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then -+ echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then - : - else - can_build_shared=no - fi - ;; - esac -- # AIX (on Power*) has no versioning support, so currently we can not hardcode correct -+ # Using Import Files as archive members, it is possible to support -+ # filename-based versioning of shared library archives on AIX. While -+ # this would work for both with and without runtime linking, it will -+ # prevent static linking of such archives. So we do filename-based -+ # shared library versioning with .so extension only, which is used -+ # when both runtime linking and shared linking is enabled. -+ # Unfortunately, runtime linking may impact performance, so we do -+ # not want this to be the default eventually. Also, we use the -+ # versioned .so libs for executables only if there is the -brtl -+ # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only. -+ # To allow for filename-based versioning support, we need to create -+ # libNAME.so.V as an archive file, containing: -+ # *) an Import File, referring to the versioned filename of the -+ # archive as well as the shared archive member, telling the -+ # bitwidth (32 or 64) of that shared object, and providing the -+ # list of exported symbols of that shared object, eventually -+ # decorated with the 'weak' keyword -+ # *) the shared object with the F_LOADONLY flag set, to really avoid -+ # it being seen by the linker. -+ # At run time we better use the real file rather than another symlink, -+ # but for link time we create the symlink libNAME.so -> libNAME.so.V -+ -+ case $with_aix_soname,$aix_use_runtimelinking in -+ # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct - # soname into executable. Probably we can add versioning support to - # collect2, so additional links can be useful in future. -- if test "$aix_use_runtimelinking" = yes; then -+ aix,yes) # traditional libtool -+ dynamic_linker='AIX unversionable lib.so' - # If using run time linking (on AIX 4.2 or later) use lib.so - # instead of lib.a to let people know that these are not - # typical AIX shared libraries. -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -- else -+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' -+ ;; -+ aix,no) # traditional AIX only -+ dynamic_linker='AIX lib.a[(]lib.so.V[)]' - # We preserve .a as extension for shared libraries through AIX4.2 - # and later when we are not doing run time linking. -- library_names_spec='${libname}${release}.a $libname.a' -- soname_spec='${libname}${release}${shared_ext}$major' -- fi -+ library_names_spec='$libname$release.a $libname.a' -+ soname_spec='$libname$release$shared_ext$major' -+ ;; -+ svr4,*) # full svr4 only -+ dynamic_linker="AIX lib.so.V[(]$shared_archive_member_spec.o[)]" -+ library_names_spec='$libname$release$shared_ext$major $libname$shared_ext' -+ # We do not specify a path in Import Files, so LIBPATH fires. -+ shlibpath_overrides_runpath=yes -+ ;; -+ *,yes) # both, prefer svr4 -+ dynamic_linker="AIX lib.so.V[(]$shared_archive_member_spec.o[)], lib.a[(]lib.so.V[)]" -+ library_names_spec='$libname$release$shared_ext$major $libname$shared_ext' -+ # unpreferred sharedlib libNAME.a needs extra handling -+ postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"' -+ postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"' -+ # We do not specify a path in Import Files, so LIBPATH fires. -+ shlibpath_overrides_runpath=yes -+ ;; -+ *,no) # both, prefer aix -+ dynamic_linker="AIX lib.a[(]lib.so.V[)], lib.so.V[(]$shared_archive_member_spec.o[)]" -+ library_names_spec='$libname$release.a $libname.a' -+ soname_spec='$libname$release$shared_ext$major' -+ # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling -+ postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)' -+ postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"' -+ ;; -+ esac - shlibpath_var=LIBPATH - fi - ;; -@@ -2318,18 +2491,18 @@ - powerpc) - # Since July 2007 AmigaOS4 officially supports .so libraries. - # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' - ;; - m68k) - library_names_spec='$libname.ixlibrary $libname.a' - # Create ${libname}_ixlibrary.a entries in /sys/libs. -- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' -+ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' - ;; - esac - ;; - - beos*) -- library_names_spec='${libname}${shared_ext}' -+ library_names_spec='$libname$shared_ext' - dynamic_linker="$host_os ld.so" - shlibpath_var=LIBRARY_PATH - ;; -@@ -2337,8 +2510,8 @@ - bsdi[[45]]*) - version_type=linux # correct to gnu/linux during the next big refactor - need_version=no -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' -+ soname_spec='$libname$release$shared_ext$major' - finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' - shlibpath_var=LD_LIBRARY_PATH - sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" -@@ -2348,9 +2521,9 @@ - # libtool to hard-code these into programs - ;; - --cygwin* | mingw* | pw32* | cegcc*) -+cygwin* | msys* | mingw* | pw32* | cegcc*) - version_type=windows -- shrext_cmds=".dll" -+ shrext_cmds=.dll - need_version=no - need_lib_prefix=no - -@@ -2359,8 +2532,8 @@ - # gcc - library_names_spec='$libname.dll.a' - # DLL is installed to $(libdir)/../bin by postinstall_cmds -- postinstall_cmds='base_file=`basename \${file}`~ -- dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ -+ postinstall_cmds='base_file=`basename \$file`~ -+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~ - dldir=$destdir/`dirname \$dlpath`~ - test -d \$dldir || mkdir -p \$dldir~ - $install_prog $dir/$dlname \$dldir/$dlname~ -@@ -2376,17 +2549,23 @@ - case $host_os in - cygwin*) - # Cygwin DLLs use 'cyg' prefix rather than 'lib' -- soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' -+ soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' -+m4_if([$1], [],[ -+ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"]) -+ ;; -+ msys*) -+ # MSYS DLLs use 'msys-' prefix rather than 'lib' -+ soname_spec='`echo $libname | sed -e 's/^lib/msys-/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' - m4_if([$1], [],[ - sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"]) - ;; - mingw* | cegcc*) - # MinGW DLLs use traditional 'lib' prefix -- soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' -+ soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' - ;; - pw32*) - # pw32 DLLs use 'pw' prefix rather than 'lib' -- library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' -+ library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' - ;; - esac - dynamic_linker='Win32 ld.exe' -@@ -2395,8 +2574,8 @@ - *,cl*) - # Native MSVC - libname_spec='$name' -- soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' -- library_names_spec='${libname}.dll.lib' -+ soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' -+ library_names_spec='$libname.dll.lib' - - case $build_os in - mingw*) -@@ -2414,7 +2593,7 @@ - # Convert to MSYS style. - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'` - ;; -- cygwin*) -+ cygwin* | msys*) - # Convert to unix form, then to dos form, then back to unix form - # but this time dos style (no spaces!) so that the unix form looks - # like /cygdrive/c/PROGRA~1:/cygdr... -@@ -2423,7 +2602,7 @@ - sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - ;; - *) -- sys_lib_search_path_spec="$LIB" -+ sys_lib_search_path_spec=$LIB - if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then - # It is most probably a Windows format PATH. - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` -@@ -2436,8 +2615,8 @@ - esac - - # DLL is installed to $(libdir)/../bin by postinstall_cmds -- postinstall_cmds='base_file=`basename \${file}`~ -- dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ -+ postinstall_cmds='base_file=`basename \$file`~ -+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~ - dldir=$destdir/`dirname \$dlpath`~ - test -d \$dldir || mkdir -p \$dldir~ - $install_prog $dir/$dlname \$dldir/$dlname' -@@ -2450,7 +2629,7 @@ - - *) - # Assume MSVC wrapper -- library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' -+ library_names_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext $libname.lib' - dynamic_linker='Win32 ld.exe' - ;; - esac -@@ -2463,8 +2642,8 @@ - version_type=darwin - need_lib_prefix=no - need_version=no -- library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' -- soname_spec='${libname}${release}${major}$shared_ext' -+ library_names_spec='$libname$release$major$shared_ext $libname$shared_ext' -+ soname_spec='$libname$release$major$shared_ext' - shlibpath_overrides_runpath=yes - shlibpath_var=DYLD_LIBRARY_PATH - shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' -@@ -2477,8 +2656,8 @@ - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' -- soname_spec='${libname}${release}${shared_ext}$major' -+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' -+ soname_spec='$libname$release$shared_ext$major' - shlibpath_var=LD_LIBRARY_PATH - ;; - -@@ -2496,12 +2675,13 @@ - version_type=freebsd-$objformat - case $version_type in - freebsd-elf*) -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' -+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' -+ soname_spec='$libname$release$shared_ext$major' - need_version=no - need_lib_prefix=no - ;; - freebsd-*) -- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' -+ library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' - need_version=yes - ;; - esac -@@ -2531,10 +2711,10 @@ - need_lib_prefix=no - need_version=no - dynamic_linker="$host_os runtime_loader" -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' -+ soname_spec='$libname$release$shared_ext$major' - shlibpath_var=LIBRARY_PATH -- shlibpath_overrides_runpath=yes -+ shlibpath_overrides_runpath=no - sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' - hardcode_into_libs=yes - ;; -@@ -2552,14 +2732,15 @@ - dynamic_linker="$host_os dld.so" - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -- if test "X$HPUX_IA64_MODE" = X32; then -+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' -+ soname_spec='$libname$release$shared_ext$major' -+ if test 32 = "$HPUX_IA64_MODE"; then - sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" -+ sys_lib_dlsearch_path_spec=/usr/lib/hpux32 - else - sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" -+ sys_lib_dlsearch_path_spec=/usr/lib/hpux64 - fi -- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; - hppa*64*) - shrext_cmds='.sl' -@@ -2567,8 +2748,8 @@ - dynamic_linker="$host_os dld.sl" - shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH - shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' -+ soname_spec='$libname$release$shared_ext$major' - sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; -@@ -2577,8 +2758,8 @@ - dynamic_linker="$host_os dld.sl" - shlibpath_var=SHLIB_PATH - shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' -+ soname_spec='$libname$release$shared_ext$major' - ;; - esac - # HP-UX runs *really* slowly unless shared libraries are mode 555, ... -@@ -2591,8 +2772,8 @@ - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' -+ soname_spec='$libname$release$shared_ext$major' - dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no -@@ -2603,7 +2784,7 @@ - case $host_os in - nonstopux*) version_type=nonstopux ;; - *) -- if test "$lt_cv_prog_gnu_ld" = yes; then -+ if test yes = "$lt_cv_prog_gnu_ld"; then - version_type=linux # correct to gnu/linux during the next big refactor - else - version_type=irix -@@ -2611,8 +2792,8 @@ - esac - need_lib_prefix=no - need_version=no -- soname_spec='${libname}${release}${shared_ext}$major' -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' -+ soname_spec='$libname$release$shared_ext$major' -+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$release$shared_ext $libname$shared_ext' - case $host_os in - irix5* | nonstopux*) - libsuff= shlibsuff= -@@ -2631,8 +2812,8 @@ - esac - shlibpath_var=LD_LIBRARY${shlibsuff}_PATH - shlibpath_overrides_runpath=no -- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" -- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" -+ sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff" -+ sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff" - hardcode_into_libs=yes - ;; - -@@ -2641,13 +2822,33 @@ - dynamic_linker=no - ;; - -+linux*android*) -+ version_type=none # Android doesn't support versioned libraries. -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='$libname$release$shared_ext' -+ soname_spec='$libname$release$shared_ext' -+ finish_cmds= -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=yes -+ -+ # This implies no fast_install, which is unacceptable. -+ # Some rework will be needed to allow for fast_install -+ # before this can be enabled. -+ hardcode_into_libs=yes -+ -+ dynamic_linker='Android linker' -+ # Don't embed -rpath directories since the linker doesn't support them. -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -+ ;; -+ - # This must be glibc/ELF. - linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' -+ soname_spec='$libname$release$shared_ext$major' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no -@@ -2672,7 +2873,12 @@ - # before this can be enabled. - hardcode_into_libs=yes - -- # Append ld.so.conf contents to the search path -+ # Ideally, we could use ldconfig to report *all* directores which are -+ # searched for libraries, however this is still not possible. Aside from not -+ # being certain /sbin/ldconfig is available, command -+ # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64, -+ # even though it is searched at run-time. Try to do the best guess by -+ # appending ld.so.conf contents (and includes) to the search path. - if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" -@@ -2687,29 +2893,17 @@ - dynamic_linker='GNU/Linux ld.so' - ;; - --netbsdelf*-gnu) -- version_type=linux -- need_lib_prefix=no -- need_version=no -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -- shlibpath_var=LD_LIBRARY_PATH -- shlibpath_overrides_runpath=no -- hardcode_into_libs=yes -- dynamic_linker='NetBSD ld.elf_so' -- ;; -- - netbsd*) - version_type=sunos - need_lib_prefix=no - need_version=no - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' -+ library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - dynamic_linker='NetBSD (a.out) ld.so' - else -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' -+ soname_spec='$libname$release$shared_ext$major' - dynamic_linker='NetBSD ld.elf_so' - fi - shlibpath_var=LD_LIBRARY_PATH -@@ -2719,7 +2913,7 @@ - - newsos6) - version_type=linux # correct to gnu/linux during the next big refactor -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - ;; -@@ -2728,58 +2922,68 @@ - version_type=qnx - need_lib_prefix=no - need_version=no -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' -+ soname_spec='$libname$release$shared_ext$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='ldqnx.so' - ;; - --openbsd*) -+openbsd* | bitrig*) - version_type=sunos -- sys_lib_dlsearch_path_spec="/usr/lib" -+ sys_lib_dlsearch_path_spec=/usr/lib - need_lib_prefix=no -- # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. -- case $host_os in -- openbsd3.3 | openbsd3.3.*) need_version=yes ;; -- *) need_version=no ;; -- esac -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' -- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' -- shlibpath_var=LD_LIBRARY_PATH -- if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -- case $host_os in -- openbsd2.[[89]] | openbsd2.[[89]].*) -- shlibpath_overrides_runpath=no -- ;; -- *) -- shlibpath_overrides_runpath=yes -- ;; -- esac -+ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then -+ need_version=no - else -- shlibpath_overrides_runpath=yes -+ need_version=yes - fi -+ library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' -+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=yes - ;; - - os2*) - libname_spec='$name' -- shrext_cmds=".dll" -+ version_type=windows -+ shrext_cmds=.dll -+ need_version=no - need_lib_prefix=no -- library_names_spec='$libname${shared_ext} $libname.a' -+ # OS/2 can only load a DLL with a base name of 8 characters or less. -+ soname_spec='`test -n "$os2dllname" && libname="$os2dllname"; -+ v=$($ECHO $release$versuffix | tr -d .-); -+ n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _); -+ $ECHO $n$v`$shared_ext' -+ library_names_spec='${libname}_dll.$libext' - dynamic_linker='OS/2 ld.exe' -- shlibpath_var=LIBPATH -+ shlibpath_var=BEGINLIBPATH -+ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" -+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec -+ postinstall_cmds='base_file=`basename \$file`~ -+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; $ECHO \$dlname'\''`~ -+ dldir=$destdir/`dirname \$dlpath`~ -+ test -d \$dldir || mkdir -p \$dldir~ -+ $install_prog $dir/$dlname \$dldir/$dlname~ -+ chmod a+x \$dldir/$dlname~ -+ if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then -+ eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; -+ fi' -+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~ -+ dlpath=$dir/\$dldll~ -+ $RM \$dlpath' - ;; - - osf3* | osf4* | osf5*) - version_type=osf - need_lib_prefix=no - need_version=no -- soname_spec='${libname}${release}${shared_ext}$major' -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='$libname$release$shared_ext$major' -+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' - shlibpath_var=LD_LIBRARY_PATH - sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" -- sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" -+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; - - rdos*) -@@ -2790,8 +2994,8 @@ - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' -+ soname_spec='$libname$release$shared_ext$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes -@@ -2801,11 +3005,11 @@ - - sunos4*) - version_type=sunos -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' -+ library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' - finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes -- if test "$with_gnu_ld" = yes; then -+ if test yes = "$with_gnu_ld"; then - need_lib_prefix=no - fi - need_version=yes -@@ -2813,8 +3017,8 @@ - - sysv4 | sysv4.3*) - version_type=linux # correct to gnu/linux during the next big refactor -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' -+ soname_spec='$libname$release$shared_ext$major' - shlibpath_var=LD_LIBRARY_PATH - case $host_vendor in - sni) -@@ -2835,24 +3039,24 @@ - ;; - - sysv4*MP*) -- if test -d /usr/nec ;then -+ if test -d /usr/nec; then - version_type=linux # correct to gnu/linux during the next big refactor -- library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' -- soname_spec='$libname${shared_ext}.$major' -+ library_names_spec='$libname$shared_ext.$versuffix $libname$shared_ext.$major $libname$shared_ext' -+ soname_spec='$libname$shared_ext.$major' - shlibpath_var=LD_LIBRARY_PATH - fi - ;; - - sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) -- version_type=freebsd-elf -+ version_type=sco - need_lib_prefix=no - need_version=no -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext' -+ soname_spec='$libname$release$shared_ext$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes -- if test "$with_gnu_ld" = yes; then -+ if test yes = "$with_gnu_ld"; then - sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' - else - sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' -@@ -2870,7 +3074,7 @@ - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes -@@ -2878,8 +3082,8 @@ - - uts4*) - version_type=linux # correct to gnu/linux during the next big refactor -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' -+ soname_spec='$libname$release$shared_ext$major' - shlibpath_var=LD_LIBRARY_PATH - ;; - -@@ -2888,20 +3092,30 @@ - ;; - esac - AC_MSG_RESULT([$dynamic_linker]) --test "$dynamic_linker" = no && can_build_shared=no -+test no = "$dynamic_linker" && can_build_shared=no - - variables_saved_for_relink="PATH $shlibpath_var $runpath_var" --if test "$GCC" = yes; then -+if test yes = "$GCC"; then - variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" - fi - --if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then -- sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" -+if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then -+ sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec - fi --if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then -- sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" -+ -+if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then -+ sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec - fi - -+# remember unaugmented sys_lib_dlsearch_path content for libtool script decls... -+configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec -+ -+# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code -+func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH" -+ -+# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool -+configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH -+ - _LT_DECL([], [variables_saved_for_relink], [1], - [Variables whose values should be saved in libtool wrapper scripts and - restored at link time]) -@@ -2934,39 +3148,41 @@ - [Whether we should hardcode library paths into libraries]) - _LT_DECL([], [sys_lib_search_path_spec], [2], - [Compile-time system search path for libraries]) --_LT_DECL([], [sys_lib_dlsearch_path_spec], [2], -- [Run-time system search path for libraries]) -+_LT_DECL([sys_lib_dlsearch_path_spec], [configure_time_dlsearch_path], [2], -+ [Detected run-time system search path for libraries]) -+_LT_DECL([], [configure_time_lt_sys_library_path], [2], -+ [Explicit LT_SYS_LIBRARY_PATH set during ./configure time]) - ])# _LT_SYS_DYNAMIC_LINKER - - - # _LT_PATH_TOOL_PREFIX(TOOL) - # -------------------------- --# find a file program which can recognize shared library -+# find a file program that can recognize shared library - AC_DEFUN([_LT_PATH_TOOL_PREFIX], - [m4_require([_LT_DECL_EGREP])dnl - AC_MSG_CHECKING([for $1]) - AC_CACHE_VAL(lt_cv_path_MAGIC_CMD, - [case $MAGIC_CMD in - [[\\/*] | ?:[\\/]*]) -- lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. -+ lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path. - ;; - *) -- lt_save_MAGIC_CMD="$MAGIC_CMD" -- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR -+ lt_save_MAGIC_CMD=$MAGIC_CMD -+ lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR - dnl $ac_dummy forces splitting on constant user-supplied paths. - dnl POSIX.2 word splitting is done only on the output of word expansions, - dnl not every word. This closes a longstanding sh security hole. - ac_dummy="m4_if([$2], , $PATH, [$2])" - for ac_dir in $ac_dummy; do -- IFS="$lt_save_ifs" -+ IFS=$lt_save_ifs - test -z "$ac_dir" && ac_dir=. -- if test -f $ac_dir/$1; then -- lt_cv_path_MAGIC_CMD="$ac_dir/$1" -+ if test -f "$ac_dir/$1"; then -+ lt_cv_path_MAGIC_CMD=$ac_dir/"$1" - if test -n "$file_magic_test_file"; then - case $deplibs_check_method in - "file_magic "*) - file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` -- MAGIC_CMD="$lt_cv_path_MAGIC_CMD" -+ MAGIC_CMD=$lt_cv_path_MAGIC_CMD - if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | - $EGREP "$file_magic_regex" > /dev/null; then - : -@@ -2989,11 +3205,11 @@ - break - fi - done -- IFS="$lt_save_ifs" -- MAGIC_CMD="$lt_save_MAGIC_CMD" -+ IFS=$lt_save_ifs -+ MAGIC_CMD=$lt_save_MAGIC_CMD - ;; - esac]) --MAGIC_CMD="$lt_cv_path_MAGIC_CMD" -+MAGIC_CMD=$lt_cv_path_MAGIC_CMD - if test -n "$MAGIC_CMD"; then - AC_MSG_RESULT($MAGIC_CMD) - else -@@ -3011,7 +3227,7 @@ - - # _LT_PATH_MAGIC - # -------------- --# find a file program which can recognize a shared library -+# find a file program that can recognize a shared library - m4_defun([_LT_PATH_MAGIC], - [_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH) - if test -z "$lt_cv_path_MAGIC_CMD"; then -@@ -3038,16 +3254,16 @@ - AC_ARG_WITH([gnu-ld], - [AS_HELP_STRING([--with-gnu-ld], - [assume the C compiler uses GNU ld @<:@default=no@:>@])], -- [test "$withval" = no || with_gnu_ld=yes], -+ [test no = "$withval" || with_gnu_ld=yes], - [with_gnu_ld=no])dnl - - ac_prog=ld --if test "$GCC" = yes; then -+if test yes = "$GCC"; then - # Check if gcc -print-prog-name=ld gives a path. - AC_MSG_CHECKING([for ld used by $CC]) - case $host in - *-*-mingw*) -- # gcc leaves a trailing carriage return which upsets mingw -+ # gcc leaves a trailing carriage return, which upsets mingw - ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; - *) - ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; -@@ -3061,7 +3277,7 @@ - while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do - ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` - done -- test -z "$LD" && LD="$ac_prog" -+ test -z "$LD" && LD=$ac_prog - ;; - "") - # If it fails, then pretend we aren't using GCC. -@@ -3072,37 +3288,37 @@ - with_gnu_ld=unknown - ;; - esac --elif test "$with_gnu_ld" = yes; then -+elif test yes = "$with_gnu_ld"; then - AC_MSG_CHECKING([for GNU ld]) - else - AC_MSG_CHECKING([for non-GNU ld]) - fi - AC_CACHE_VAL(lt_cv_path_LD, - [if test -z "$LD"; then -- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR -+ lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR - for ac_dir in $PATH; do -- IFS="$lt_save_ifs" -+ IFS=$lt_save_ifs - test -z "$ac_dir" && ac_dir=. - if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then -- lt_cv_path_LD="$ac_dir/$ac_prog" -+ lt_cv_path_LD=$ac_dir/$ac_prog - # Check to see if the program is GNU ld. I'd rather use --version, - # but apparently some variants of GNU ld only accept -v. - # Break only if it was the GNU/non-GNU ld that we prefer. - case `"$lt_cv_path_LD" -v 2>&1 conftest.i -+cat conftest.i conftest.i >conftest2.i -+: ${lt_DD:=$DD} -+AC_PATH_PROGS_FEATURE_CHECK([lt_DD], [dd], -+[if "$ac_path_lt_DD" bs=32 count=1 conftest.out 2>/dev/null; then -+ cmp -s conftest.i conftest.out \ -+ && ac_cv_path_lt_DD="$ac_path_lt_DD" ac_path_lt_DD_found=: -+fi]) -+rm -f conftest.i conftest2.i conftest.out]) -+])# _LT_PATH_DD -+ -+ -+# _LT_CMD_TRUNCATE -+# ---------------- -+# find command to truncate a binary pipe -+m4_defun([_LT_CMD_TRUNCATE], -+[m4_require([_LT_PATH_DD]) -+AC_CACHE_CHECK([how to truncate binary pipes], [lt_cv_truncate_bin], -+[printf 0123456789abcdef0123456789abcdef >conftest.i -+cat conftest.i conftest.i >conftest2.i -+lt_cv_truncate_bin= -+if "$ac_cv_path_lt_DD" bs=32 count=1 conftest.out 2>/dev/null; then -+ cmp -s conftest.i conftest.out \ -+ && lt_cv_truncate_bin="$ac_cv_path_lt_DD bs=4096 count=1" -+fi -+rm -f conftest.i conftest2.i conftest.out -+test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q"]) -+_LT_DECL([lt_truncate_bin], [lt_cv_truncate_bin], [1], -+ [Command to truncate a binary pipe]) -+])# _LT_CMD_TRUNCATE -+ -+ - # _LT_CHECK_MAGIC_METHOD - # ---------------------- - # how to check for library dependencies -@@ -3188,13 +3441,13 @@ - # Need to set the preceding variable on all platforms that support - # interlibrary dependencies. - # 'none' -- dependencies not supported. --# `unknown' -- same as none, but documents that we really don't know. -+# 'unknown' -- same as none, but documents that we really don't know. - # 'pass_all' -- all dependencies passed with no checks. - # 'test_compile' -- check by making test program. - # 'file_magic [[regex]]' -- check by looking for files in library path --# which responds to the $file_magic_cmd with a given extended regex. --# If you have `file' or equivalent on your system and you're not sure --# whether `pass_all' will *always* work, you probably want this one. -+# that responds to the $file_magic_cmd with a given extended regex. -+# If you have 'file' or equivalent on your system and you're not sure -+# whether 'pass_all' will *always* work, you probably want this one. - - case $host_os in - aix[[4-9]]*) -@@ -3211,7 +3464,7 @@ - lt_cv_file_magic_test_file=/shlib/libc.so - ;; - --cygwin*) -+cygwin* | msys*) - # func_win32_libid is a shell function defined in ltmain.sh - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' - lt_cv_file_magic_cmd='func_win32_libid' -@@ -3221,8 +3474,7 @@ - # Base MSYS/MinGW do not provide the 'file' command needed by - # func_win32_libid shell function, so use a weaker test based on 'objdump', - # unless we find 'file', for example because we are cross-compiling. -- # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin. -- if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then -+ if ( file / ) >/dev/null 2>&1; then - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' - lt_cv_file_magic_cmd='func_win32_libid' - else -@@ -3300,7 +3552,7 @@ - lt_cv_deplibs_check_method=pass_all - ;; - --netbsd* | netbsdelf*-gnu) -+netbsd*) - if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' - else -@@ -3318,8 +3570,8 @@ - lt_cv_deplibs_check_method=pass_all - ;; - --openbsd*) -- if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -+openbsd* | bitrig*) -+ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$' - else - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' -@@ -3372,6 +3624,9 @@ - tpf*) - lt_cv_deplibs_check_method=pass_all - ;; -+os2*) -+ lt_cv_deplibs_check_method=pass_all -+ ;; - esac - ]) - -@@ -3412,33 +3667,38 @@ - AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM, - [if test -n "$NM"; then - # Let the user override the test. -- lt_cv_path_NM="$NM" -+ lt_cv_path_NM=$NM - else -- lt_nm_to_check="${ac_tool_prefix}nm" -+ lt_nm_to_check=${ac_tool_prefix}nm - if test -n "$ac_tool_prefix" && test "$build" = "$host"; then - lt_nm_to_check="$lt_nm_to_check nm" - fi - for lt_tmp_nm in $lt_nm_to_check; do -- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR -+ lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR - for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do -- IFS="$lt_save_ifs" -+ IFS=$lt_save_ifs - test -z "$ac_dir" && ac_dir=. -- tmp_nm="$ac_dir/$lt_tmp_nm" -- if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then -+ tmp_nm=$ac_dir/$lt_tmp_nm -+ if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext"; then - # Check to see if the nm accepts a BSD-compat flag. -- # Adding the `sed 1q' prevents false positives on HP-UX, which says: -+ # Adding the 'sed 1q' prevents false positives on HP-UX, which says: - # nm: unknown option "B" ignored - # Tru64's nm complains that /dev/null is an invalid object file -- case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in -- */dev/null* | *'Invalid file or object type'*) -+ # MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty -+ case $build_os in -+ mingw*) lt_bad_file=conftest.nm/nofile ;; -+ *) lt_bad_file=/dev/null ;; -+ esac -+ case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in -+ *$lt_bad_file* | *'Invalid file or object type'*) - lt_cv_path_NM="$tmp_nm -B" -- break -+ break 2 - ;; - *) - case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in - */dev/null*) - lt_cv_path_NM="$tmp_nm -p" -- break -+ break 2 - ;; - *) - lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but -@@ -3449,21 +3709,21 @@ - esac - fi - done -- IFS="$lt_save_ifs" -+ IFS=$lt_save_ifs - done - : ${lt_cv_path_NM=no} - fi]) --if test "$lt_cv_path_NM" != "no"; then -- NM="$lt_cv_path_NM" -+if test no != "$lt_cv_path_NM"; then -+ NM=$lt_cv_path_NM - else - # Didn't find any BSD compatible name lister, look for dumpbin. - if test -n "$DUMPBIN"; then : - # Let the user override the test. - else - AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :) -- case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in -+ case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in - *COFF*) -- DUMPBIN="$DUMPBIN -symbols" -+ DUMPBIN="$DUMPBIN -symbols -headers" - ;; - *) - DUMPBIN=: -@@ -3471,8 +3731,8 @@ - esac - fi - AC_SUBST([DUMPBIN]) -- if test "$DUMPBIN" != ":"; then -- NM="$DUMPBIN" -+ if test : != "$DUMPBIN"; then -+ NM=$DUMPBIN - fi - fi - test -z "$NM" && NM=nm -@@ -3517,9 +3777,9 @@ - [lt_cv_sharedlib_from_linklib_cmd='unknown' - - case $host_os in --cygwin* | mingw* | pw32* | cegcc*) -- # two different shell functions defined in ltmain.sh -- # decide which to use based on capabilities of $DLLTOOL -+cygwin* | msys* | mingw* | pw32* | cegcc*) -+ # two different shell functions defined in ltmain.sh; -+ # decide which one to use based on capabilities of $DLLTOOL - case `$DLLTOOL --help 2>&1` in - *--identify-strict*) - lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib -@@ -3531,7 +3791,7 @@ - ;; - *) - # fallback: assume linklib IS sharedlib -- lt_cv_sharedlib_from_linklib_cmd="$ECHO" -+ lt_cv_sharedlib_from_linklib_cmd=$ECHO - ;; - esac - ]) -@@ -3558,13 +3818,28 @@ - lt_cv_path_mainfest_tool=yes - fi - rm -f conftest*]) --if test "x$lt_cv_path_mainfest_tool" != xyes; then -+if test yes != "$lt_cv_path_mainfest_tool"; then - MANIFEST_TOOL=: - fi - _LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl - ])# _LT_PATH_MANIFEST_TOOL - - -+# _LT_DLL_DEF_P([FILE]) -+# --------------------- -+# True iff FILE is a Windows DLL '.def' file. -+# Keep in sync with func_dll_def_p in the libtool script -+AC_DEFUN([_LT_DLL_DEF_P], -+[dnl -+ test DEF = "`$SED -n dnl -+ -e '\''s/^[[ ]]*//'\'' dnl Strip leading whitespace -+ -e '\''/^\(;.*\)*$/d'\'' dnl Delete empty lines and comments -+ -e '\''s/^\(EXPORTS\|LIBRARY\)\([[ ]].*\)*$/DEF/p'\'' dnl -+ -e q dnl Only consider the first "real" line -+ $1`" dnl -+])# _LT_DLL_DEF_P -+ -+ - # LT_LIB_M - # -------- - # check for math library -@@ -3572,15 +3847,15 @@ - [AC_REQUIRE([AC_CANONICAL_HOST])dnl - LIBM= - case $host in --*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*) -+*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-msys* | *-*-haiku* | *-*-pw32* | *-*-darwin*) - # These system don't have libm, or don't need it - ;; - *-ncr-sysv4.3*) -- AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw") -+ AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM=-lmw) - AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm") - ;; - *) -- AC_CHECK_LIB(m, cos, LIBM="-lm") -+ AC_CHECK_LIB(m, cos, LIBM=-lm) - ;; - esac - AC_SUBST([LIBM]) -@@ -3599,7 +3874,7 @@ - - _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= - --if test "$GCC" = yes; then -+if test yes = "$GCC"; then - case $cc_basename in - nvcc*) - _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;; -@@ -3647,11 +3922,11 @@ - aix*) - symcode='[[BCDT]]' - ;; --cygwin* | mingw* | pw32* | cegcc*) -+cygwin* | msys* | mingw* | pw32* | cegcc*) - symcode='[[ABCDGISTW]]' - ;; - hpux*) -- if test "$host_cpu" = ia64; then -+ if test ia64 = "$host_cpu"; then - symcode='[[ABCDEGRST]]' - fi - ;; -@@ -3684,14 +3959,44 @@ - symcode='[[ABCDGIRSTW]]' ;; - esac - -+if test "$lt_cv_nm_interface" = "MS dumpbin"; then -+ # Gets list of data symbols to import. -+ lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* \(.*\)$/\1/p'" -+ # Adjust the below global symbol transforms to fixup imported variables. -+ lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'" -+ lt_c_name_hook=" -e 's/^I .* \(.*\)$/ {\"\1\", (void *) 0},/p'" -+ lt_c_name_lib_hook="\ -+ -e 's/^I .* \(lib.*\)$/ {\"\1\", (void *) 0},/p'\ -+ -e 's/^I .* \(.*\)$/ {\"lib\1\", (void *) 0},/p'" -+else -+ # Disable hooks by default. -+ lt_cv_sys_global_symbol_to_import= -+ lt_cdecl_hook= -+ lt_c_name_hook= -+ lt_c_name_lib_hook= -+fi -+ - # Transform an extracted symbol line into a proper C declaration. - # Some systems (esp. on ia64) link data and code symbols differently, - # so use this general approach. --lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" -+lt_cv_sys_global_symbol_to_cdecl="sed -n"\ -+$lt_cdecl_hook\ -+" -e 's/^T .* \(.*\)$/extern int \1();/p'"\ -+" -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'" - - # Transform an extracted symbol line into symbol name and symbol address --lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" --lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'" -+lt_cv_sys_global_symbol_to_c_name_address="sed -n"\ -+$lt_c_name_hook\ -+" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ -+" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/p'" -+ -+# Transform an extracted symbol line into symbol name with lib prefix and -+# symbol address. -+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\ -+$lt_c_name_lib_hook\ -+" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ -+" -e 's/^$symcode$symcode* .* \(lib.*\)$/ {\"\1\", (void *) \&\1},/p'"\ -+" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"lib\1\", (void *) \&\1},/p'" - - # Handle CRLF in mingw tool chain - opt_cr= -@@ -3709,21 +4014,24 @@ - - # Write the raw and C identifiers. - if test "$lt_cv_nm_interface" = "MS dumpbin"; then -- # Fake it for dumpbin and say T for any non-static function -- # and D for any global variable. -+ # Fake it for dumpbin and say T for any non-static function, -+ # D for any global variable and I for any imported variable. - # Also find C++ and __fastcall symbols from MSVC++, - # which start with @ or ?. - lt_cv_sys_global_symbol_pipe="$AWK ['"\ - " {last_section=section; section=\$ 3};"\ - " /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ - " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ -+" /^ *Symbol name *: /{split(\$ 0,sn,\":\"); si=substr(sn[2],2)};"\ -+" /^ *Type *: code/{print \"T\",si,substr(si,length(prfx))};"\ -+" /^ *Type *: data/{print \"I\",si,substr(si,length(prfx))};"\ - " \$ 0!~/External *\|/{next};"\ - " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ - " {if(hide[section]) next};"\ --" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\ --" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\ --" s[1]~/^[@?]/{print s[1], s[1]; next};"\ --" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\ -+" {f=\"D\"}; \$ 0~/\(\).*\|/{f=\"T\"};"\ -+" {split(\$ 0,a,/\||\r/); split(a[2],s)};"\ -+" s[1]~/^[@?]/{print f,s[1],s[1]; next};"\ -+" s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\ - " ' prfx=^$ac_symprfx]" - else - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" -@@ -3763,11 +4071,11 @@ - if $GREP ' nm_test_func$' "$nlist" >/dev/null; then - cat <<_LT_EOF > conftest.$ac_ext - /* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ --#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) --/* DATA imports from DLLs on WIN32 con't be const, because runtime -+#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE -+/* DATA imports from DLLs on WIN32 can't be const, because runtime - relocations are performed -- see ld's documentation on pseudo-relocs. */ - # define LT@&t@_DLSYM_CONST --#elif defined(__osf__) -+#elif defined __osf__ - /* This system does not cope well with relocations in const data. */ - # define LT@&t@_DLSYM_CONST - #else -@@ -3793,7 +4101,7 @@ - { - { "@PROGRAM@", (void *) 0 }, - _LT_EOF -- $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext -+ $SED "s/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext - cat <<\_LT_EOF >> conftest.$ac_ext - {0, (void *) 0} - }; -@@ -3813,9 +4121,9 @@ - mv conftest.$ac_objext conftstm.$ac_objext - lt_globsym_save_LIBS=$LIBS - lt_globsym_save_CFLAGS=$CFLAGS -- LIBS="conftstm.$ac_objext" -+ LIBS=conftstm.$ac_objext - CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)" -- if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then -+ if AC_TRY_EVAL(ac_link) && test -s conftest$ac_exeext; then - pipe_works=yes - fi - LIBS=$lt_globsym_save_LIBS -@@ -3836,7 +4144,7 @@ - rm -rf conftest* conftst* - - # Do not use the global_symbol_pipe unless it works. -- if test "$pipe_works" = yes; then -+ if test yes = "$pipe_works"; then - break - else - lt_cv_sys_global_symbol_pipe= -@@ -3863,12 +4171,16 @@ - [Take the output of nm and produce a listing of raw symbols and C names]) - _LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1], - [Transform the output of nm in a proper C declaration]) -+_LT_DECL([global_symbol_to_import], [lt_cv_sys_global_symbol_to_import], [1], -+ [Transform the output of nm into a list of symbols to manually relocate]) - _LT_DECL([global_symbol_to_c_name_address], - [lt_cv_sys_global_symbol_to_c_name_address], [1], - [Transform the output of nm in a C name address pair]) - _LT_DECL([global_symbol_to_c_name_address_lib_prefix], - [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1], - [Transform the output of nm in a C name address pair when lib prefix is needed]) -+_LT_DECL([nm_interface], [lt_cv_nm_interface], [1], -+ [The name lister interface]) - _LT_DECL([], [nm_file_list_spec], [1], - [Specify filename containing input files for $NM]) - ]) # _LT_CMD_GLOBAL_SYMBOLS -@@ -3884,17 +4196,18 @@ - - m4_if([$1], [CXX], [ - # C++ specific cases for pic, static, wl, etc. -- if test "$GXX" = yes; then -+ if test yes = "$GXX"; then - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' - - case $host_os in - aix*) - # All AIX code is PIC. -- if test "$host_cpu" = ia64; then -+ if test ia64 = "$host_cpu"; then - # AIX 5 now supports IA64 processor - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - fi -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - - amigaos*) -@@ -3905,8 +4218,8 @@ - ;; - m68k) - # FIXME: we need at least 68020 code to build shared libraries, but -- # adding the `-m68020' flag to GCC prevents building anything better, -- # like `-m68040'. -+ # adding the '-m68020' flag to GCC prevents building anything better, -+ # like '-m68040'. - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' - ;; - esac -@@ -3915,13 +4228,18 @@ - beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; -- mingw* | cygwin* | os2* | pw32* | cegcc*) -+ mingw* | cygwin* | msys* | os2* | pw32* | cegcc*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - # Although the cygwin gcc ignores -fPIC, still need this for old-style - # (--disable-auto-import) libraries - m4_if([$1], [GCJ], [], - [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) -+ case $host_os in -+ os2*) -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static' -+ ;; -+ esac - ;; - darwin* | rhapsody*) - # PIC is the default on this platform -@@ -3971,7 +4289,7 @@ - case $host_os in - aix[[4-9]]*) - # All AIX code is PIC. -- if test "$host_cpu" = ia64; then -+ if test ia64 = "$host_cpu"; then - # AIX 5 now supports IA64 processor - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - else -@@ -3986,7 +4304,7 @@ - ;; - esac - ;; -- mingw* | cygwin* | os2* | pw32* | cegcc*) -+ mingw* | cygwin* | msys* | os2* | pw32* | cegcc*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - m4_if([$1], [GCJ], [], -@@ -4012,14 +4330,14 @@ - case $cc_basename in - CC*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -- _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' -- if test "$host_cpu" != ia64; then -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive' -+ if test ia64 != "$host_cpu"; then - _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' - fi - ;; - aCC*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -- _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive' - case $host_cpu in - hppa*64*|ia64*) - # +Z the default -@@ -4056,7 +4374,7 @@ - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - ecpc* ) -- # old Intel C++ for x86_64 which still supported -KPIC. -+ # old Intel C++ for x86_64, which still supported -KPIC. - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' -@@ -4112,7 +4430,7 @@ - ;; - esac - ;; -- netbsd* | netbsdelf*-gnu) -+ netbsd*) - ;; - *qnx* | *nto*) - # QNX uses GNU C++, but need to define -shared option too, otherwise -@@ -4201,17 +4519,18 @@ - fi - ], - [ -- if test "$GCC" = yes; then -+ if test yes = "$GCC"; then - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' - - case $host_os in - aix*) - # All AIX code is PIC. -- if test "$host_cpu" = ia64; then -+ if test ia64 = "$host_cpu"; then - # AIX 5 now supports IA64 processor - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - fi -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - - amigaos*) -@@ -4222,8 +4541,8 @@ - ;; - m68k) - # FIXME: we need at least 68020 code to build shared libraries, but -- # adding the `-m68020' flag to GCC prevents building anything better, -- # like `-m68040'. -+ # adding the '-m68020' flag to GCC prevents building anything better, -+ # like '-m68040'. - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' - ;; - esac -@@ -4233,13 +4552,18 @@ - # PIC is the default for these OSes. - ;; - -- mingw* | cygwin* | pw32* | os2* | cegcc*) -+ mingw* | cygwin* | msys* | pw32* | os2* | cegcc*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - # Although the cygwin gcc ignores -fPIC, still need this for old-style - # (--disable-auto-import) libraries - m4_if([$1], [GCJ], [], - [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) -+ case $host_os in -+ os2*) -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static' -+ ;; -+ esac - ;; - - darwin* | rhapsody*) -@@ -4310,7 +4634,7 @@ - case $host_os in - aix*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -- if test "$host_cpu" = ia64; then -+ if test ia64 = "$host_cpu"; then - # AIX 5 now supports IA64 processor - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - else -@@ -4318,11 +4642,30 @@ - fi - ;; - -- mingw* | cygwin* | pw32* | os2* | cegcc*) -+ darwin* | rhapsody*) -+ # PIC is the default on this platform -+ # Common symbols not allowed in MH_DYLIB files -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' -+ case $cc_basename in -+ nagfor*) -+ # NAG Fortran compiler -+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,' -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ ;; -+ esac -+ ;; -+ -+ mingw* | cygwin* | msys* | pw32* | os2* | cegcc*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - m4_if([$1], [GCJ], [], - [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) -+ case $host_os in -+ os2*) -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static' -+ ;; -+ esac - ;; - - hpux9* | hpux10* | hpux11*) -@@ -4338,7 +4681,7 @@ - ;; - esac - # Is there a better lt_prog_compiler_static that works with the bundled CC? -- _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive' - ;; - - irix5* | irix6* | nonstopux*) -@@ -4349,7 +4692,7 @@ - - linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) - case $cc_basename in -- # old Intel for x86_64 which still supported -KPIC. -+ # old Intel for x86_64, which still supported -KPIC. - ecc*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -@@ -4374,6 +4717,12 @@ - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; -+ tcc*) -+ # Fabrice Bellard et al's Tiny C Compiler -+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' -+ ;; - pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) - # Portland Group compilers (*not* the Pentium gcc compiler, - # which looks to be a dead project) -@@ -4471,7 +4820,7 @@ - ;; - - sysv4*MP*) -- if test -d /usr/nec ;then -+ if test -d /usr/nec; then - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - fi -@@ -4500,7 +4849,7 @@ - fi - ]) - case $host_os in -- # For platforms which do not support PIC, -DPIC is meaningless: -+ # For platforms that do not support PIC, -DPIC is meaningless: - *djgpp*) - _LT_TAGVAR(lt_prog_compiler_pic, $1)= - ;; -@@ -4566,19 +4915,23 @@ - case $host_os in - aix[[4-9]]*) - # If we're using GNU nm, then we don't want the "-C" option. -- # -C means demangle to AIX nm, but means don't demangle with GNU nm -- # Also, AIX nm treats weak defined symbols like other global defined -- # symbols, whereas GNU nm marks them as "W". -+ # -C means demangle to GNU nm, but means don't demangle to AIX nm. -+ # Without the "-l" option, or with the "-B" option, AIX nm treats -+ # weak defined symbols like other global defined symbols, whereas -+ # GNU nm marks them as "W". -+ # While the 'weak' keyword is ignored in the Export File, we need -+ # it in the Import File for the 'aix-soname' feature, so we have -+ # to replace the "-B" option with "-P" for AIX nm. - if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then -- _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' -+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' - else -- _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' -+ _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' - fi - ;; - pw32*) -- _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" -+ _LT_TAGVAR(export_symbols_cmds, $1)=$ltdll_cmds - ;; -- cygwin* | mingw* | cegcc*) -+ cygwin* | msys* | mingw* | cegcc*) - case $cc_basename in - cl*) - _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' -@@ -4589,9 +4942,6 @@ - ;; - esac - ;; -- linux* | k*bsd*-gnu | gnu*) -- _LT_TAGVAR(link_all_deplibs, $1)=no -- ;; - *) - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - ;; -@@ -4625,9 +4975,9 @@ - # included in the symbol list - _LT_TAGVAR(include_expsyms, $1)= - # exclude_expsyms can be an extended regexp of symbols to exclude -- # it will be wrapped by ` (' and `)$', so one must not match beginning or -- # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', -- # as well as any symbol that contains `d'. -+ # it will be wrapped by ' (' and ')$', so one must not match beginning or -+ # end of line. Example: 'a|bc|.*d.*' will exclude the symbols 'a' and 'bc', -+ # as well as any symbol that contains 'd'. - _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] - # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out - # platforms (ab)use it in PIC code, but their linkers get confused if -@@ -4639,11 +4989,11 @@ - extract_expsyms_cmds= - - case $host_os in -- cygwin* | mingw* | pw32* | cegcc*) -+ cygwin* | msys* | mingw* | pw32* | cegcc*) - # FIXME: the MSVC++ port hasn't been tested in a loooong time - # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. -- if test "$GCC" != yes; then -+ if test yes != "$GCC"; then - with_gnu_ld=no - fi - ;; -@@ -4651,12 +5001,9 @@ - # we just hope/assume this is gcc and not c89 (= MSVC++) - with_gnu_ld=yes - ;; -- openbsd*) -+ openbsd* | bitrig*) - with_gnu_ld=no - ;; -- linux* | k*bsd*-gnu | gnu*) -- _LT_TAGVAR(link_all_deplibs, $1)=no -- ;; - esac - - _LT_TAGVAR(ld_shlibs, $1)=yes -@@ -4664,7 +5011,7 @@ - # On some targets, GNU ld is compatible enough with the native linker - # that we're better off using the native interface for both. - lt_use_gnu_ld_interface=no -- if test "$with_gnu_ld" = yes; then -+ if test yes = "$with_gnu_ld"; then - case $host_os in - aix*) - # The AIX port of GNU ld has always aspired to compatibility -@@ -4686,24 +5033,24 @@ - esac - fi - -- if test "$lt_use_gnu_ld_interface" = yes; then -+ if test yes = "$lt_use_gnu_ld_interface"; then - # If archive_cmds runs LD, not CC, wlarc should be empty -- wlarc='${wl}' -+ wlarc='$wl' - - # Set some defaults for GNU ld with shared library support. These - # are reset later if shared libraries are not supported. Putting them - # here allows them to be overridden if necessary. - runpath_var=LD_RUN_PATH -- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' -+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' - # ancient GNU ld didn't support --whole-archive et. al. - if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then -- _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' -+ _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive' - else - _LT_TAGVAR(whole_archive_flag_spec, $1)= - fi - supports_anon_versioning=no -- case `$LD -v 2>&1` in -+ case `$LD -v | $SED -e 's/([^)]\+)\s\+//' 2>&1` in - *GNU\ gold*) supports_anon_versioning=yes ;; - *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 - *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... -@@ -4716,7 +5063,7 @@ - case $host_os in - aix[[3-9]]*) - # On AIX/PPC, the GNU linker is very broken -- if test "$host_cpu" != ia64; then -+ if test ia64 != "$host_cpu"; then - _LT_TAGVAR(ld_shlibs, $1)=no - cat <<_LT_EOF 1>&2 - -@@ -4735,7 +5082,7 @@ - case $host_cpu in - powerpc) - # see comment about AmigaOS4 .so support -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='' - ;; - m68k) -@@ -4751,17 +5098,17 @@ - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - # Joseph Beckenbach says some releases of gcc - # support --undefined. This deserves some investigation. FIXME -- _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - -- cygwin* | mingw* | pw32* | cegcc*) -+ cygwin* | msys* | mingw* | pw32* | cegcc*) - # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, - # as there is no search path for DLLs. - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' -+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-all-symbols' - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_TAGVAR(always_export_symbols, $1)=no - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes -@@ -4769,61 +5116,89 @@ - _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] - - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -- # If the export-symbols file already is a .def file (1st line -- # is EXPORTS), use it as is; otherwise, prepend... -- _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -- cp $export_symbols $output_objdir/$soname.def; -- else -- echo EXPORTS > $output_objdir/$soname.def; -- cat $export_symbols >> $output_objdir/$soname.def; -- fi~ -- $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -+ # If the export-symbols file already is a .def file, use it as -+ # is; otherwise, prepend EXPORTS... -+ _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then -+ cp $export_symbols $output_objdir/$soname.def; -+ else -+ echo EXPORTS > $output_objdir/$soname.def; -+ cat $export_symbols >> $output_objdir/$soname.def; -+ fi~ -+ $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - - haiku*) -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' - _LT_TAGVAR(link_all_deplibs, $1)=yes - ;; - -+ os2*) -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -+ _LT_TAGVAR(hardcode_minus_L, $1)=yes -+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported -+ shrext_cmds=.dll -+ _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ -+ $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ -+ $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ -+ $ECHO EXPORTS >> $output_objdir/$libname.def~ -+ emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ -+ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ -+ emximp -o $lib $output_objdir/$libname.def' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ -+ $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ -+ $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ -+ $ECHO EXPORTS >> $output_objdir/$libname.def~ -+ prefix_cmds="$SED"~ -+ if test EXPORTS = "`$SED 1q $export_symbols`"; then -+ prefix_cmds="$prefix_cmds -e 1d"; -+ fi~ -+ prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~ -+ cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ -+ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ -+ emximp -o $lib $output_objdir/$libname.def' -+ _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' -+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes -+ ;; -+ - interix[[3-9]]*) - _LT_TAGVAR(hardcode_direct, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no -- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' -- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' -+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' - # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. - # Instead, shared libraries are loaded at an image base (0x10000000 by - # default) and relocated if they conflict, which is a slow very memory - # consuming and fragmenting process. To avoid this, we pick a random, - # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link - # time. Moving up from 0x10000000 also allows more sbrk(2) space. -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' -- _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - ;; - - gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) - tmp_diet=no -- if test "$host_os" = linux-dietlibc; then -+ if test linux-dietlibc = "$host_os"; then - case $cc_basename in - diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn) - esac - fi - if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ -- && test "$tmp_diet" = no -+ && test no = "$tmp_diet" - then - tmp_addflag=' $pic_flag' - tmp_sharedflag='-shared' - case $cc_basename,$host_cpu in - pgcc*) # Portland Group C compiler -- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' -+ _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' - tmp_addflag=' $pic_flag' - ;; - pgf77* | pgf90* | pgf95* | pgfortran*) - # Portland Group f77 and f90 compilers -- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' -+ _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' - tmp_addflag=' $pic_flag -Mnomain' ;; - ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 - tmp_addflag=' -i_dynamic' ;; -@@ -4834,42 +5209,47 @@ - lf95*) # Lahey Fortran 8.1 - _LT_TAGVAR(whole_archive_flag_spec, $1)= - tmp_sharedflag='--shared' ;; -+ nagfor*) # NAGFOR 5.3 -+ tmp_sharedflag='-Wl,-shared' ;; - xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below) - tmp_sharedflag='-qmkshrobj' - tmp_addflag= ;; - nvcc*) # Cuda Compiler Driver 2.2 -- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' -+ _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' - _LT_TAGVAR(compiler_needs_object, $1)=yes - ;; - esac - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) # Sun C 5.9 -- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' -+ _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' - _LT_TAGVAR(compiler_needs_object, $1)=yes - tmp_sharedflag='-G' ;; - *Sun\ F*) # Sun Fortran 8.3 - tmp_sharedflag='-G' ;; - esac -- _LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' - -- if test "x$supports_anon_versioning" = xyes; then -+ if test yes = "$supports_anon_versioning"; then - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ -- cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ -- echo "local: *; };" >> $output_objdir/$libname.ver~ -- $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' -+ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ -+ echo "local: *; };" >> $output_objdir/$libname.ver~ -+ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' - fi - - case $cc_basename in -+ tcc*) -+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='-rdynamic' -+ ;; - xlf* | bgf* | bgxlf* | mpixlf*) - # IBM XL Fortran 10.1 on PPC cannot create shared libs itself - _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' -- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' - _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' -- if test "x$supports_anon_versioning" = xyes; then -+ if test yes = "$supports_anon_versioning"; then - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ -- cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ -- echo "local: *; };" >> $output_objdir/$libname.ver~ -- $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' -+ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ -+ echo "local: *; };" >> $output_objdir/$libname.ver~ -+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' - fi - ;; - esac -@@ -4878,13 +5258,13 @@ - fi - ;; - -- netbsd* | netbsdelf*-gnu) -+ netbsd*) - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= - else -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' - fi - ;; - -@@ -4902,8 +5282,8 @@ - - _LT_EOF - elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi -@@ -4915,7 +5295,7 @@ - _LT_TAGVAR(ld_shlibs, $1)=no - cat <<_LT_EOF 1>&2 - --*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not -+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 cannot - *** reliably create shared libraries on SCO systems. Therefore, libtool - *** is disabling shared libraries support. We urge you to upgrade GNU - *** binutils to release 2.16.91.0.3 or newer. Another option is to modify -@@ -4930,9 +5310,9 @@ - # DT_RUNPATH tag from executables and libraries. But doing so - # requires that you compile everything twice, which is a pain. - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi -@@ -4949,15 +5329,15 @@ - - *) - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - esac - -- if test "$_LT_TAGVAR(ld_shlibs, $1)" = no; then -+ if test no = "$_LT_TAGVAR(ld_shlibs, $1)"; then - runpath_var= - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= - _LT_TAGVAR(export_dynamic_flag_spec, $1)= -@@ -4973,7 +5353,7 @@ - # Note: this linker hardcodes the directories in LIBPATH if there - # are no directories specified by -L. - _LT_TAGVAR(hardcode_minus_L, $1)=yes -- if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then -+ if test yes = "$GCC" && test -z "$lt_prog_compiler_static"; then - # Neither direct hardcoding nor static linking is supported with a - # broken collect2. - _LT_TAGVAR(hardcode_direct, $1)=unsupported -@@ -4981,34 +5361,57 @@ - ;; - - aix[[4-9]]*) -- if test "$host_cpu" = ia64; then -+ if test ia64 = "$host_cpu"; then - # On IA64, the linker does run time linking by default, so we don't - # have to do anything special. - aix_use_runtimelinking=no - exp_sym_flag='-Bexport' -- no_entry_flag="" -+ no_entry_flag= - else - # If we're using GNU nm, then we don't want the "-C" option. -- # -C means demangle to AIX nm, but means don't demangle with GNU nm -- # Also, AIX nm treats weak defined symbols like other global -- # defined symbols, whereas GNU nm marks them as "W". -+ # -C means demangle to GNU nm, but means don't demangle to AIX nm. -+ # Without the "-l" option, or with the "-B" option, AIX nm treats -+ # weak defined symbols like other global defined symbols, whereas -+ # GNU nm marks them as "W". -+ # While the 'weak' keyword is ignored in the Export File, we need -+ # it in the Import File for the 'aix-soname' feature, so we have -+ # to replace the "-B" option with "-P" for AIX nm. - if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then -- _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' -+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' - else -- _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' -+ _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' - fi - aix_use_runtimelinking=no - - # Test if we are trying to use run time linking or normal - # AIX style linking. If -brtl is somewhere in LDFLAGS, we -- # need to do runtime linking. -+ # have runtime linking enabled, and use it for executables. -+ # For shared libraries, we enable/disable runtime linking -+ # depending on the kind of the shared library created - -+ # when "with_aix_soname,aix_use_runtimelinking" is: -+ # "aix,no" lib.a(lib.so.V) shared, rtl:no, for executables -+ # "aix,yes" lib.so shared, rtl:yes, for executables -+ # lib.a static archive -+ # "both,no" lib.so.V(shr.o) shared, rtl:yes -+ # lib.a(lib.so.V) shared, rtl:no, for executables -+ # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables -+ # lib.a(lib.so.V) shared, rtl:no -+ # "svr4,*" lib.so.V(shr.o) shared, rtl:yes, for executables -+ # lib.a static archive - case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) - for ld_flag in $LDFLAGS; do -- if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then -+ if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then - aix_use_runtimelinking=yes - break - fi - done -+ if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then -+ # With aix-soname=svr4, we create the lib.so.V shared archives only, -+ # so we don't have lib.a shared libs to link our executables. -+ # We have to force runtime linking in this case. -+ aix_use_runtimelinking=yes -+ LDFLAGS="$LDFLAGS -Wl,-brtl" -+ fi - ;; - esac - -@@ -5027,13 +5430,21 @@ - _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - _LT_TAGVAR(hardcode_libdir_separator, $1)=':' - _LT_TAGVAR(link_all_deplibs, $1)=yes -- _LT_TAGVAR(file_list_spec, $1)='${wl}-f,' -+ _LT_TAGVAR(file_list_spec, $1)='$wl-f,' -+ case $with_aix_soname,$aix_use_runtimelinking in -+ aix,*) ;; # traditional, no import file -+ svr4,* | *,yes) # use import file -+ # The Import File defines what to hardcode. -+ _LT_TAGVAR(hardcode_direct, $1)=no -+ _LT_TAGVAR(hardcode_direct_absolute, $1)=no -+ ;; -+ esac - -- if test "$GCC" = yes; then -+ if test yes = "$GCC"; then - case $host_os in aix4.[[012]]|aix4.[[012]].*) - # We only want to do this on AIX 4.2 and lower, the check - # below for broken collect2 doesn't work under 4.3+ -- collect2name=`${CC} -print-prog-name=collect2` -+ collect2name=`$CC -print-prog-name=collect2` - if test -f "$collect2name" && - strings "$collect2name" | $GREP resolve_lib_name >/dev/null - then -@@ -5052,62 +5463,80 @@ - ;; - esac - shared_flag='-shared' -- if test "$aix_use_runtimelinking" = yes; then -- shared_flag="$shared_flag "'${wl}-G' -+ if test yes = "$aix_use_runtimelinking"; then -+ shared_flag="$shared_flag "'$wl-G' - fi -- _LT_TAGVAR(link_all_deplibs, $1)=no -+ # Need to ensure runtime linking is disabled for the traditional -+ # shared library, or the linker may eventually find shared libraries -+ # /with/ Import File - we do not want to mix them. -+ shared_flag_aix='-shared' -+ shared_flag_svr4='-shared $wl-G' - else - # not using gcc -- if test "$host_cpu" = ia64; then -+ if test ia64 = "$host_cpu"; then - # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release - # chokes on -Wl,-G. The following line is correct: - shared_flag='-G' - else -- if test "$aix_use_runtimelinking" = yes; then -- shared_flag='${wl}-G' -+ if test yes = "$aix_use_runtimelinking"; then -+ shared_flag='$wl-G' - else -- shared_flag='${wl}-bM:SRE' -+ shared_flag='$wl-bM:SRE' - fi -+ shared_flag_aix='$wl-bM:SRE' -+ shared_flag_svr4='$wl-G' - fi - fi - -- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall' -+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-bexpall' - # It seems that -bexpall does not export symbols beginning with - # underscore (_), so it is better to generate a list of symbols to export. - _LT_TAGVAR(always_export_symbols, $1)=yes -- if test "$aix_use_runtimelinking" = yes; then -+ if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then - # Warning - without using the other runtime loading flags (-brtl), - # -berok will link without error, but may produce a broken library. - _LT_TAGVAR(allow_undefined_flag, $1)='-berok' - # Determine the default libpath from the value encoded in an - # empty executable. - _LT_SYS_MODULE_PATH_AIX([$1]) -- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" -- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath" -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag - else -- if test "$host_cpu" = ia64; then -- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' -+ if test ia64 = "$host_cpu"; then -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $libdir:/usr/lib:/lib' - _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs" -- _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" -+ _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols" - else - # Determine the default libpath from the value encoded in an - # empty executable. - _LT_SYS_MODULE_PATH_AIX([$1]) -- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, - # -berok will link without error, but may produce a broken library. -- _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' -- _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' -- if test "$with_gnu_ld" = yes; then -+ _LT_TAGVAR(no_undefined_flag, $1)=' $wl-bernotok' -+ _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-berok' -+ if test yes = "$with_gnu_ld"; then - # We only use this code for GNU lds that support --whole-archive. -- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' -+ _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive' - else - # Exported symbols can be pulled into shared objects from archives - _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' - fi - _LT_TAGVAR(archive_cmds_need_lc, $1)=yes -- # This is similar to how AIX traditionally builds its shared libraries. -- _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d' -+ # -brtl affects multiple linker settings, -berok does not and is overridden later -+ compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([[, ]]\\)%-berok\\1%g"`' -+ if test svr4 != "$with_aix_soname"; then -+ # This is similar to how AIX traditionally builds its shared libraries. -+ _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname' -+ fi -+ if test aix != "$with_aix_soname"; then -+ _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp' -+ else -+ # used by -dlpreopen to get the symbols -+ _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$MV $output_objdir/$realname.d/$soname $output_objdir' -+ fi -+ _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$RM -r $output_objdir/$realname.d' - fi - fi - ;; -@@ -5116,7 +5545,7 @@ - case $host_cpu in - powerpc) - # see comment about AmigaOS4 .so support -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='' - ;; - m68k) -@@ -5131,7 +5560,7 @@ - _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic - ;; - -- cygwin* | mingw* | pw32* | cegcc*) -+ cygwin* | msys* | mingw* | pw32* | cegcc*) - # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. - # hardcode_libdir_flag_spec is actually meaningless, as there is -@@ -5146,16 +5575,17 @@ - # Tell ltmain to make .lib files, not .a files. - libext=lib - # Tell ltmain to make .dll files, not .so files. -- shrext_cmds=".dll" -+ shrext_cmds=.dll - # FIXME: Setting linknames here is a bad hack. -- _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' -- _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -- sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; -- else -- sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; -- fi~ -- $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ -- linknames=' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames=' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then -+ cp "$export_symbols" "$output_objdir/$soname.def"; -+ echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp"; -+ else -+ $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp; -+ fi~ -+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ -+ linknames=' - # The linker will not automatically build a static lib if we build a DLL. - # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes -@@ -5164,18 +5594,18 @@ - # Don't use ranlib - _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' - _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ -- lt_tool_outputfile="@TOOL_OUTPUT@"~ -- case $lt_outputfile in -- *.exe|*.EXE) ;; -- *) -- lt_outputfile="$lt_outputfile.exe" -- lt_tool_outputfile="$lt_tool_outputfile.exe" -- ;; -- esac~ -- if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then -- $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; -- $RM "$lt_outputfile.manifest"; -- fi' -+ lt_tool_outputfile="@TOOL_OUTPUT@"~ -+ case $lt_outputfile in -+ *.exe|*.EXE) ;; -+ *) -+ lt_outputfile=$lt_outputfile.exe -+ lt_tool_outputfile=$lt_tool_outputfile.exe -+ ;; -+ esac~ -+ if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then -+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; -+ $RM "$lt_outputfile.manifest"; -+ fi' - ;; - *) - # Assume MSVC wrapper -@@ -5184,7 +5614,7 @@ - # Tell ltmain to make .lib files, not .a files. - libext=lib - # Tell ltmain to make .dll files, not .so files. -- shrext_cmds=".dll" -+ shrext_cmds=.dll - # FIXME: Setting linknames here is a bad hack. - _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' - # The linker will automatically build a .lib file if we build a DLL. -@@ -5234,33 +5664,33 @@ - ;; - - hpux9*) -- if test "$GCC" = yes; then -- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ if test yes = "$GCC"; then -+ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' - else -- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' - fi -- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_TAGVAR(hardcode_direct, $1)=yes - - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - _LT_TAGVAR(hardcode_minus_L, $1)=yes -- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' - ;; - - hpux10*) -- if test "$GCC" = yes && test "$with_gnu_ld" = no; then -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ if test yes,no = "$GCC,$with_gnu_ld"; then -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - else - _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' - fi -- if test "$with_gnu_ld" = no; then -- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' -+ if test no = "$with_gnu_ld"; then -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_direct_absolute, $1)=yes -- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - _LT_TAGVAR(hardcode_minus_L, $1)=yes -@@ -5268,25 +5698,25 @@ - ;; - - hpux11*) -- if test "$GCC" = yes && test "$with_gnu_ld" = no; then -+ if test yes,no = "$GCC,$with_gnu_ld"; then - case $host_cpu in - hppa*64*) -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - else - case $host_cpu in - hppa*64*) -- _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) -- _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - m4_if($1, [], [ -@@ -5294,14 +5724,14 @@ - # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does) - _LT_LINKER_OPTION([if $CC understands -b], - _LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b], -- [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'], -+ [_LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'], - [_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])], -- [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags']) -+ [_LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags']) - ;; - esac - fi -- if test "$with_gnu_ld" = no; then -- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' -+ if test no = "$with_gnu_ld"; then -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - - case $host_cpu in -@@ -5312,7 +5742,7 @@ - *) - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_direct_absolute, $1)=yes -- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' - - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. -@@ -5323,16 +5753,16 @@ - ;; - - irix5* | irix6* | nonstopux*) -- if test "$GCC" = yes; then -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ if test yes = "$GCC"; then -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' - # Try to use the -exported_symbol ld option, if it does not - # work, assume that -exports_file does not work either and - # implicitly export all symbols. - # This should be the same for all languages, so no per-tag cache variable. - AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol], - [lt_cv_irix_exported_symbol], -- [save_LDFLAGS="$LDFLAGS" -- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" -+ [save_LDFLAGS=$LDFLAGS -+ LDFLAGS="$LDFLAGS -shared $wl-exported_symbol ${wl}foo $wl-update_registry $wl/dev/null" - AC_LINK_IFELSE( - [AC_LANG_SOURCE( - [AC_LANG_CASE([C], [[int foo (void) { return 0; }]], -@@ -5345,22 +5775,32 @@ - end]])])], - [lt_cv_irix_exported_symbol=yes], - [lt_cv_irix_exported_symbol=no]) -- LDFLAGS="$save_LDFLAGS"]) -- if test "$lt_cv_irix_exported_symbol" = yes; then -- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' -+ LDFLAGS=$save_LDFLAGS]) -+ if test yes = "$lt_cv_irix_exported_symbol"; then -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib' - fi - else -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' -- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib' - fi - _LT_TAGVAR(archive_cmds_need_lc, $1)='no' -- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_TAGVAR(inherit_rpath, $1)=yes - _LT_TAGVAR(link_all_deplibs, $1)=yes - ;; - -- netbsd* | netbsdelf*-gnu) -+ linux*) -+ case $cc_basename in -+ tcc*) -+ # Fabrice Bellard et al's Tiny C Compiler -+ _LT_TAGVAR(ld_shlibs, $1)=yes -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ esac -+ ;; -+ -+ netbsd*) - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out - else -@@ -5374,7 +5814,7 @@ - newsos6) - _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_direct, $1)=yes -- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; -@@ -5382,27 +5822,19 @@ - *nto* | *qnx*) - ;; - -- openbsd*) -+ openbsd* | bitrig*) - if test -f /usr/libexec/ld.so; then - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_direct_absolute, $1)=yes -- if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -+ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' -- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' -- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' -- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols' -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' -+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' - else -- case $host_os in -- openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*) -- _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' -- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' -- ;; -- *) -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' -- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' -- ;; -- esac -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' - fi - else - _LT_TAGVAR(ld_shlibs, $1)=no -@@ -5413,33 +5845,53 @@ - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(hardcode_minus_L, $1)=yes - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported -- _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' -- _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' -+ shrext_cmds=.dll -+ _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ -+ $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ -+ $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ -+ $ECHO EXPORTS >> $output_objdir/$libname.def~ -+ emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ -+ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ -+ emximp -o $lib $output_objdir/$libname.def' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ -+ $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ -+ $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ -+ $ECHO EXPORTS >> $output_objdir/$libname.def~ -+ prefix_cmds="$SED"~ -+ if test EXPORTS = "`$SED 1q $export_symbols`"; then -+ prefix_cmds="$prefix_cmds -e 1d"; -+ fi~ -+ prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~ -+ cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ -+ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ -+ emximp -o $lib $output_objdir/$libname.def' -+ _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' -+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - ;; - - osf3*) -- if test "$GCC" = yes; then -- _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ if test yes = "$GCC"; then -+ _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' - else - _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' - fi - _LT_TAGVAR(archive_cmds_need_lc, $1)='no' -- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - ;; - - osf4* | osf5*) # as osf3* with the addition of -msym flag -- if test "$GCC" = yes; then -- _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -+ if test yes = "$GCC"; then -+ _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $pic_flag $libobjs $deplibs $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' - else - _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ -- $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' -+ $CC -shared$allow_undefined_flag $wl-input $wl$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.exp' - - # Both c and cxx compiler support -rpath directly - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' -@@ -5450,24 +5902,24 @@ - - solaris*) - _LT_TAGVAR(no_undefined_flag, $1)=' -z defs' -- if test "$GCC" = yes; then -- wlarc='${wl}' -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ if test yes = "$GCC"; then -+ wlarc='$wl' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl-z ${wl}text $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ -- $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' -+ $CC -shared $pic_flag $wl-z ${wl}text $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' - else - case `$CC -V 2>&1` in - *"Compilers 5.0"*) - wlarc='' -- _LT_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ _LT_TAGVAR(archive_cmds, $1)='$LD -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ -- $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' -+ $LD -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' - ;; - *) -- wlarc='${wl}' -- _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags' -+ wlarc='$wl' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ -- $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' -+ $CC -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' - ;; - esac - fi -@@ -5477,11 +5929,11 @@ - solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; - *) - # The compiler driver will combine and reorder linker options, -- # but understands `-z linker_flag'. GCC discards it without `$wl', -+ # but understands '-z linker_flag'. GCC discards it without '$wl', - # but is careful enough not to reorder. - # Supported since Solaris 2.6 (maybe 2.5.1?) -- if test "$GCC" = yes; then -- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' -+ if test yes = "$GCC"; then -+ _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract' - else - _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' - fi -@@ -5491,10 +5943,10 @@ - ;; - - sunos4*) -- if test "x$host_vendor" = xsequent; then -+ if test sequent = "$host_vendor"; then - # Use $CC to link under sequent, because it throws in some extra .o - # files that make .init and .fini sections work. -- _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h $soname -o $lib $libobjs $deplibs $compiler_flags' - else - _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' - fi -@@ -5543,43 +5995,43 @@ - ;; - - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) -- _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' -+ _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text' - _LT_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - runpath_var='LD_RUN_PATH' - -- if test "$GCC" = yes; then -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ if test yes = "$GCC"; then -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - else -- _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - fi - ;; - - sysv5* | sco3.2v5* | sco5v6*) -- # Note: We can NOT use -z defs as we might desire, because we do not -+ # Note: We CANNOT use -z defs as we might desire, because we do not - # link with -lc, and that would cause any symbols used from libc to - # always be unresolved, which means just about no library would - # ever link correctly. If we're not using GNU ld we use -z text - # though, which does catch some bad symbols but isn't as heavy-handed - # as -z defs. -- _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' -- _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' -+ _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text' -+ _LT_TAGVAR(allow_undefined_flag, $1)='$wl-z,nodefs' - _LT_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no -- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir' -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R,$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=':' - _LT_TAGVAR(link_all_deplibs, $1)=yes -- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' -+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Bexport' - runpath_var='LD_RUN_PATH' - -- if test "$GCC" = yes; then -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ if test yes = "$GCC"; then -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - else -- _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - fi - ;; - -@@ -5594,17 +6046,17 @@ - ;; - esac - -- if test x$host_vendor = xsni; then -+ if test sni = "$host_vendor"; then - case $host in - sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) -- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Blargedynsym' -+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Blargedynsym' - ;; - esac - fi - fi - ]) - AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)]) --test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no -+test no = "$_LT_TAGVAR(ld_shlibs, $1)" && can_build_shared=no - - _LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld - -@@ -5621,7 +6073,7 @@ - # Assume -lc should be added - _LT_TAGVAR(archive_cmds_need_lc, $1)=yes - -- if test "$enable_shared" = yes && test "$GCC" = yes; then -+ if test yes,yes = "$GCC,$enable_shared"; then - case $_LT_TAGVAR(archive_cmds, $1) in - *'~'*) - # FIXME: we may have to deal with multi-command sequences. -@@ -5701,12 +6153,12 @@ - _LT_TAGDECL([], [hardcode_libdir_separator], [1], - [Whether we need a single "-rpath" flag with a separated argument]) - _LT_TAGDECL([], [hardcode_direct], [0], -- [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes -+ [Set to "yes" if using DIR/libNAME$shared_ext during linking hardcodes - DIR into the resulting binary]) - _LT_TAGDECL([], [hardcode_direct_absolute], [0], -- [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes -+ [Set to "yes" if using DIR/libNAME$shared_ext during linking hardcodes - DIR into the resulting binary and the resulting library dependency is -- "absolute", i.e impossible to change by setting ${shlibpath_var} if the -+ "absolute", i.e impossible to change by setting $shlibpath_var if the - library is relocated]) - _LT_TAGDECL([], [hardcode_minus_L], [0], - [Set to "yes" if using the -LDIR flag during linking hardcodes DIR -@@ -5747,10 +6199,10 @@ - # ------------------------ - # Ensure that the configuration variables for a C compiler are suitably - # defined. These variables are subsequently used by _LT_CONFIG to write --# the compiler configuration to `libtool'. -+# the compiler configuration to 'libtool'. - m4_defun([_LT_LANG_C_CONFIG], - [m4_require([_LT_DECL_EGREP])dnl --lt_save_CC="$CC" -+lt_save_CC=$CC - AC_LANG_PUSH(C) - - # Source file extension for C test sources. -@@ -5790,18 +6242,18 @@ - LT_SYS_DLOPEN_SELF - _LT_CMD_STRIPLIB - -- # Report which library types will actually be built -+ # Report what library types will actually be built - AC_MSG_CHECKING([if libtool supports shared libraries]) - AC_MSG_RESULT([$can_build_shared]) - - AC_MSG_CHECKING([whether to build shared libraries]) -- test "$can_build_shared" = "no" && enable_shared=no -+ test no = "$can_build_shared" && enable_shared=no - - # On AIX, shared libraries and static libraries use the same namespace, and - # are all built from PIC. - case $host_os in - aix3*) -- test "$enable_shared" = yes && enable_static=no -+ test yes = "$enable_shared" && enable_static=no - if test -n "$RANLIB"; then - archive_cmds="$archive_cmds~\$RANLIB \$lib" - postinstall_cmds='$RANLIB $lib' -@@ -5809,8 +6261,12 @@ - ;; - - aix[[4-9]]*) -- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then -- test "$enable_shared" = yes && enable_static=no -+ if test ia64 != "$host_cpu"; then -+ case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in -+ yes,aix,yes) ;; # shared object as lib.so file only -+ yes,svr4,*) ;; # shared object as lib.so archive member only -+ yes,*) enable_static=no ;; # shared object in lib.a archive as well -+ esac - fi - ;; - esac -@@ -5818,13 +6274,13 @@ - - AC_MSG_CHECKING([whether to build static libraries]) - # Make sure either enable_shared or enable_static is yes. -- test "$enable_shared" = yes || enable_static=yes -+ test yes = "$enable_shared" || enable_static=yes - AC_MSG_RESULT([$enable_static]) - - _LT_CONFIG($1) - fi - AC_LANG_POP --CC="$lt_save_CC" -+CC=$lt_save_CC - ])# _LT_LANG_C_CONFIG - - -@@ -5832,14 +6288,14 @@ - # -------------------------- - # Ensure that the configuration variables for a C++ compiler are suitably - # defined. These variables are subsequently used by _LT_CONFIG to write --# the compiler configuration to `libtool'. -+# the compiler configuration to 'libtool'. - m4_defun([_LT_LANG_CXX_CONFIG], - [m4_require([_LT_FILEUTILS_DEFAULTS])dnl - m4_require([_LT_DECL_EGREP])dnl - m4_require([_LT_PATH_MANIFEST_TOOL])dnl --if test -n "$CXX" && ( test "X$CXX" != "Xno" && -- ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || -- (test "X$CXX" != "Xg++"))) ; then -+if test -n "$CXX" && ( test no != "$CXX" && -+ ( (test g++ = "$CXX" && `g++ -v >/dev/null 2>&1` ) || -+ (test g++ != "$CXX"))); then - AC_PROG_CXXCPP - else - _lt_caught_CXX_error=yes -@@ -5881,7 +6337,7 @@ - # the CXX compiler isn't working. Some variables (like enable_shared) - # are currently assumed to apply to all compilers on this platform, - # and will be corrupted by setting them based on a non-working compiler. --if test "$_lt_caught_CXX_error" != yes; then -+if test yes != "$_lt_caught_CXX_error"; then - # Code to be used in simple compile tests - lt_simple_compile_test_code="int some_variable = 0;" - -@@ -5923,35 +6379,35 @@ - if test -n "$compiler"; then - # We don't want -fno-exception when compiling C++ code, so set the - # no_builtin_flag separately -- if test "$GXX" = yes; then -+ if test yes = "$GXX"; then - _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' - else - _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= - fi - -- if test "$GXX" = yes; then -+ if test yes = "$GXX"; then - # Set up default GNU C++ configuration - - LT_PATH_LD - - # Check if GNU C++ uses GNU ld as the underlying linker, since the - # archiving commands below assume that GNU ld is being used. -- if test "$with_gnu_ld" = yes; then -- _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' -- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ if test yes = "$with_gnu_ld"; then -+ _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' - -- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' -+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' - - # If archive_cmds runs LD, not CC, wlarc should be empty - # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to - # investigate it a little bit more. (MM) -- wlarc='${wl}' -+ wlarc='$wl' - - # ancient GNU ld didn't support --whole-archive et. al. - if eval "`$CC -print-prog-name=ld` --help 2>&1" | - $GREP 'no-whole-archive' > /dev/null; then -- _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' -+ _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive' - else - _LT_TAGVAR(whole_archive_flag_spec, $1)= - fi -@@ -5987,18 +6443,30 @@ - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - aix[[4-9]]*) -- if test "$host_cpu" = ia64; then -+ if test ia64 = "$host_cpu"; then - # On IA64, the linker does run time linking by default, so we don't - # have to do anything special. - aix_use_runtimelinking=no - exp_sym_flag='-Bexport' -- no_entry_flag="" -+ no_entry_flag= - else - aix_use_runtimelinking=no - - # Test if we are trying to use run time linking or normal - # AIX style linking. If -brtl is somewhere in LDFLAGS, we -- # need to do runtime linking. -+ # have runtime linking enabled, and use it for executables. -+ # For shared libraries, we enable/disable runtime linking -+ # depending on the kind of the shared library created - -+ # when "with_aix_soname,aix_use_runtimelinking" is: -+ # "aix,no" lib.a(lib.so.V) shared, rtl:no, for executables -+ # "aix,yes" lib.so shared, rtl:yes, for executables -+ # lib.a static archive -+ # "both,no" lib.so.V(shr.o) shared, rtl:yes -+ # lib.a(lib.so.V) shared, rtl:no, for executables -+ # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables -+ # lib.a(lib.so.V) shared, rtl:no -+ # "svr4,*" lib.so.V(shr.o) shared, rtl:yes, for executables -+ # lib.a static archive - case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) - for ld_flag in $LDFLAGS; do - case $ld_flag in -@@ -6008,6 +6476,13 @@ - ;; - esac - done -+ if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then -+ # With aix-soname=svr4, we create the lib.so.V shared archives only, -+ # so we don't have lib.a shared libs to link our executables. -+ # We have to force runtime linking in this case. -+ aix_use_runtimelinking=yes -+ LDFLAGS="$LDFLAGS -Wl,-brtl" -+ fi - ;; - esac - -@@ -6026,13 +6501,21 @@ - _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - _LT_TAGVAR(hardcode_libdir_separator, $1)=':' - _LT_TAGVAR(link_all_deplibs, $1)=yes -- _LT_TAGVAR(file_list_spec, $1)='${wl}-f,' -+ _LT_TAGVAR(file_list_spec, $1)='$wl-f,' -+ case $with_aix_soname,$aix_use_runtimelinking in -+ aix,*) ;; # no import file -+ svr4,* | *,yes) # use import file -+ # The Import File defines what to hardcode. -+ _LT_TAGVAR(hardcode_direct, $1)=no -+ _LT_TAGVAR(hardcode_direct_absolute, $1)=no -+ ;; -+ esac - -- if test "$GXX" = yes; then -+ if test yes = "$GXX"; then - case $host_os in aix4.[[012]]|aix4.[[012]].*) - # We only want to do this on AIX 4.2 and lower, the check - # below for broken collect2 doesn't work under 4.3+ -- collect2name=`${CC} -print-prog-name=collect2` -+ collect2name=`$CC -print-prog-name=collect2` - if test -f "$collect2name" && - strings "$collect2name" | $GREP resolve_lib_name >/dev/null - then -@@ -6050,64 +6533,84 @@ - fi - esac - shared_flag='-shared' -- if test "$aix_use_runtimelinking" = yes; then -- shared_flag="$shared_flag "'${wl}-G' -+ if test yes = "$aix_use_runtimelinking"; then -+ shared_flag=$shared_flag' $wl-G' - fi -+ # Need to ensure runtime linking is disabled for the traditional -+ # shared library, or the linker may eventually find shared libraries -+ # /with/ Import File - we do not want to mix them. -+ shared_flag_aix='-shared' -+ shared_flag_svr4='-shared $wl-G' - else - # not using gcc -- if test "$host_cpu" = ia64; then -+ if test ia64 = "$host_cpu"; then - # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release - # chokes on -Wl,-G. The following line is correct: - shared_flag='-G' - else -- if test "$aix_use_runtimelinking" = yes; then -- shared_flag='${wl}-G' -+ if test yes = "$aix_use_runtimelinking"; then -+ shared_flag='$wl-G' - else -- shared_flag='${wl}-bM:SRE' -+ shared_flag='$wl-bM:SRE' - fi -+ shared_flag_aix='$wl-bM:SRE' -+ shared_flag_svr4='$wl-G' - fi - fi - -- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall' -+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-bexpall' - # It seems that -bexpall does not export symbols beginning with - # underscore (_), so it is better to generate a list of symbols to - # export. - _LT_TAGVAR(always_export_symbols, $1)=yes -- if test "$aix_use_runtimelinking" = yes; then -+ if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then - # Warning - without using the other runtime loading flags (-brtl), - # -berok will link without error, but may produce a broken library. -- _LT_TAGVAR(allow_undefined_flag, $1)='-berok' -+ # The "-G" linker flag allows undefined symbols. -+ _LT_TAGVAR(no_undefined_flag, $1)='-bernotok' - # Determine the default libpath from the value encoded in an empty - # executable. - _LT_SYS_MODULE_PATH_AIX([$1]) -- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath" - -- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag - else -- if test "$host_cpu" = ia64; then -- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' -+ if test ia64 = "$host_cpu"; then -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $libdir:/usr/lib:/lib' - _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs" -- _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" -+ _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols" - else - # Determine the default libpath from the value encoded in an - # empty executable. - _LT_SYS_MODULE_PATH_AIX([$1]) -- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, - # -berok will link without error, but may produce a broken library. -- _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' -- _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' -- if test "$with_gnu_ld" = yes; then -+ _LT_TAGVAR(no_undefined_flag, $1)=' $wl-bernotok' -+ _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-berok' -+ if test yes = "$with_gnu_ld"; then - # We only use this code for GNU lds that support --whole-archive. -- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' -+ _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive' - else - # Exported symbols can be pulled into shared objects from archives - _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' - fi - _LT_TAGVAR(archive_cmds_need_lc, $1)=yes -- # This is similar to how AIX traditionally builds its shared -- # libraries. -- _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d' -+ # -brtl affects multiple linker settings, -berok does not and is overridden later -+ compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([[, ]]\\)%-berok\\1%g"`' -+ if test svr4 != "$with_aix_soname"; then -+ # This is similar to how AIX traditionally builds its shared -+ # libraries. Need -bnortl late, we may have -brtl in LDFLAGS. -+ _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname' -+ fi -+ if test aix != "$with_aix_soname"; then -+ _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp' -+ else -+ # used by -dlpreopen to get the symbols -+ _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$MV $output_objdir/$realname.d/$soname $output_objdir' -+ fi -+ _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$RM -r $output_objdir/$realname.d' - fi - fi - ;; -@@ -6117,7 +6620,7 @@ - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - # Joseph Beckenbach says some releases of gcc - # support --undefined. This deserves some investigation. FIXME -- _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi -@@ -6132,7 +6635,7 @@ - esac - ;; - -- cygwin* | mingw* | pw32* | cegcc*) -+ cygwin* | msys* | mingw* | pw32* | cegcc*) - case $GXX,$cc_basename in - ,cl* | no,cl*) - # Native MSVC -@@ -6145,57 +6648,58 @@ - # Tell ltmain to make .lib files, not .a files. - libext=lib - # Tell ltmain to make .dll files, not .so files. -- shrext_cmds=".dll" -+ shrext_cmds=.dll - # FIXME: Setting linknames here is a bad hack. -- _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' -- _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -- $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; -- else -- $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; -- fi~ -- $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ -- linknames=' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames=' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then -+ cp "$export_symbols" "$output_objdir/$soname.def"; -+ echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp"; -+ else -+ $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp; -+ fi~ -+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ -+ linknames=' - # The linker will not automatically build a static lib if we build a DLL. - # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - # Don't use ranlib - _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' - _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ -- lt_tool_outputfile="@TOOL_OUTPUT@"~ -- case $lt_outputfile in -- *.exe|*.EXE) ;; -- *) -- lt_outputfile="$lt_outputfile.exe" -- lt_tool_outputfile="$lt_tool_outputfile.exe" -- ;; -- esac~ -- func_to_tool_file "$lt_outputfile"~ -- if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then -- $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; -- $RM "$lt_outputfile.manifest"; -- fi' -+ lt_tool_outputfile="@TOOL_OUTPUT@"~ -+ case $lt_outputfile in -+ *.exe|*.EXE) ;; -+ *) -+ lt_outputfile=$lt_outputfile.exe -+ lt_tool_outputfile=$lt_tool_outputfile.exe -+ ;; -+ esac~ -+ func_to_tool_file "$lt_outputfile"~ -+ if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then -+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; -+ $RM "$lt_outputfile.manifest"; -+ fi' - ;; - *) - # g++ - # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, - # as there is no search path for DLLs. - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' -+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-all-symbols' - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_TAGVAR(always_export_symbols, $1)=no - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -- # If the export-symbols file already is a .def file (1st line -- # is EXPORTS), use it as is; otherwise, prepend... -- _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -- cp $export_symbols $output_objdir/$soname.def; -- else -- echo EXPORTS > $output_objdir/$soname.def; -- cat $export_symbols >> $output_objdir/$soname.def; -- fi~ -- $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -+ # If the export-symbols file already is a .def file, use it as -+ # is; otherwise, prepend EXPORTS... -+ _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then -+ cp $export_symbols $output_objdir/$soname.def; -+ else -+ echo EXPORTS > $output_objdir/$soname.def; -+ cat $export_symbols >> $output_objdir/$soname.def; -+ fi~ -+ $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi -@@ -6206,6 +6710,34 @@ - _LT_DARWIN_LINKER_FEATURES($1) - ;; - -+ os2*) -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -+ _LT_TAGVAR(hardcode_minus_L, $1)=yes -+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported -+ shrext_cmds=.dll -+ _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ -+ $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ -+ $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ -+ $ECHO EXPORTS >> $output_objdir/$libname.def~ -+ emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ -+ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ -+ emximp -o $lib $output_objdir/$libname.def' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ -+ $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ -+ $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ -+ $ECHO EXPORTS >> $output_objdir/$libname.def~ -+ prefix_cmds="$SED"~ -+ if test EXPORTS = "`$SED 1q $export_symbols`"; then -+ prefix_cmds="$prefix_cmds -e 1d"; -+ fi~ -+ prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~ -+ cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ -+ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ -+ emximp -o $lib $output_objdir/$libname.def' -+ _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' -+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes -+ ;; -+ - dgux*) - case $cc_basename in - ec++*) -@@ -6241,14 +6773,14 @@ - ;; - - haiku*) -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' - _LT_TAGVAR(link_all_deplibs, $1)=yes - ;; - - hpux9*) -- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: -- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, - # but as the default -@@ -6260,7 +6792,7 @@ - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - aCC*) -- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. -@@ -6269,11 +6801,11 @@ - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. -- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' -+ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' - ;; - *) -- if test "$GXX" = yes; then -- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ if test yes = "$GXX"; then -+ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' - else - # FIXME: insert proper C++ library support - _LT_TAGVAR(ld_shlibs, $1)=no -@@ -6283,15 +6815,15 @@ - ;; - - hpux10*|hpux11*) -- if test $with_gnu_ld = no; then -- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' -+ if test no = "$with_gnu_ld"; then -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - - case $host_cpu in - hppa*64*|ia64*) - ;; - *) -- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' - ;; - esac - fi -@@ -6317,13 +6849,13 @@ - aCC*) - case $host_cpu in - hppa*64*) -- _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - ia64*) -- _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - *) -- _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - esac - # Commands to make compiler produce verbose output that lists -@@ -6334,20 +6866,20 @@ - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. -- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' -+ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' - ;; - *) -- if test "$GXX" = yes; then -- if test $with_gnu_ld = no; then -+ if test yes = "$GXX"; then -+ if test no = "$with_gnu_ld"; then - case $host_cpu in - hppa*64*) -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - ia64*) -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - *) -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - esac - fi -@@ -6362,22 +6894,22 @@ - interix[[3-9]]*) - _LT_TAGVAR(hardcode_direct, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no -- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' -- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' -+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' - # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. - # Instead, shared libraries are loaded at an image base (0x10000000 by - # default) and relocated if they conflict, which is a slow very memory - # consuming and fragmenting process. To avoid this, we pick a random, - # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link - # time. Moving up from 0x10000000 also allows more sbrk(2) space. -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' -- _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - ;; - irix5* | irix6*) - case $cc_basename in - CC*) - # SGI C++ -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' - - # Archives containing C++ object files must be created using - # "CC -ar", where "CC" is the IRIX C++ compiler. This is -@@ -6386,17 +6918,17 @@ - _LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs' - ;; - *) -- if test "$GXX" = yes; then -- if test "$with_gnu_ld" = no; then -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ if test yes = "$GXX"; then -+ if test no = "$with_gnu_ld"; then -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' - else -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` -o $lib' - fi - fi - _LT_TAGVAR(link_all_deplibs, $1)=yes - ;; - esac -- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_TAGVAR(inherit_rpath, $1)=yes - ;; -@@ -6409,8 +6941,8 @@ - # KCC will only create a shared library if the output file - # ends with ".so" (or ".sl" for HP-UX), so rename the library - # to its proper name (with version) after linking. -- _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' -- _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' -+ _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib $wl-retain-symbols-file,$export_symbols; mv \$templib $lib' - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. -@@ -6419,10 +6951,10 @@ - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. -- output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' -+ output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' - -- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' -- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' -+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' - - # Archives containing C++ object files must be created using - # "CC -Bstatic", where "CC" is the KAI C++ compiler. -@@ -6436,59 +6968,59 @@ - # earlier do not add the objects themselves. - case `$CC -V 2>&1` in - *"Version 7."*) -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' -- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' - ;; - *) # Version 8.0 or newer - tmp_idyn= - case $host_cpu in - ia64*) tmp_idyn=' -i_dynamic';; - esac -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' - ;; - esac - _LT_TAGVAR(archive_cmds_need_lc, $1)=no -- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' -- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' -- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' -+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' -+ _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive' - ;; - pgCC* | pgcpp*) - # Portland Group C++ compiler - case `$CC -V` in - *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*) - _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~ -- rm -rf $tpldir~ -- $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ -- compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' -+ rm -rf $tpldir~ -+ $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ -+ compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' - _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~ -- rm -rf $tpldir~ -- $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ -- $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ -- $RANLIB $oldlib' -+ rm -rf $tpldir~ -+ $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ -+ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ -+ $RANLIB $oldlib' - _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~ -- rm -rf $tpldir~ -- $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ -- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' -+ rm -rf $tpldir~ -+ $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ -+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~ -- rm -rf $tpldir~ -- $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ -- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' -+ rm -rf $tpldir~ -+ $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ -+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' - ;; - *) # Version 6 and above use weak symbols -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' -- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' - ;; - esac - -- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' -- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' -- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl--rpath $wl$libdir' -+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' -+ _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' - ;; - cxx*) - # Compaq C++ -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' -- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib $wl-retain-symbols-file $wl$export_symbols' - - runpath_var=LD_RUN_PATH - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' -@@ -6502,18 +7034,18 @@ - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. -- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed' -+ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed' - ;; - xl* | mpixl* | bgxl*) - # IBM XL 8.0 on PPC, with GNU ld -- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' -- _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -- if test "x$supports_anon_versioning" = xyes; then -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' -+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' -+ if test yes = "$supports_anon_versioning"; then - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ -- cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ -- echo "local: *; };" >> $output_objdir/$libname.ver~ -- $CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' -+ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ -+ echo "local: *; };" >> $output_objdir/$libname.ver~ -+ $CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' - fi - ;; - *) -@@ -6521,10 +7053,10 @@ - *Sun\ C*) - # Sun C++ 5.9 - _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' -- _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file $wl$export_symbols' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' -- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' -+ _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' - _LT_TAGVAR(compiler_needs_object, $1)=yes - - # Not sure whether something based on -@@ -6582,22 +7114,17 @@ - _LT_TAGVAR(ld_shlibs, $1)=yes - ;; - -- openbsd2*) -- # C++ shared libraries are fairly broken -- _LT_TAGVAR(ld_shlibs, $1)=no -- ;; -- -- openbsd*) -+ openbsd* | bitrig*) - if test -f /usr/libexec/ld.so; then - _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' -- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' -- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' -- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -- _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' -+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`"; then -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file,$export_symbols -o $lib' -+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' -+ _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive' - fi - output_verbose_link_cmd=func_echo_all - else -@@ -6613,9 +7140,9 @@ - # KCC will only create a shared library if the output file - # ends with ".so" (or ".sl" for HP-UX), so rename the library - # to its proper name (with version) after linking. -- _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' -+ _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' - -- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - - # Archives containing C++ object files must be created using -@@ -6633,17 +7160,17 @@ - cxx*) - case $host in - osf3*) -- _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' -- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -+ _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $soname `test -n "$verstring" && func_echo_all "$wl-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' - ;; - *) - _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ -- echo "-hidden">> $lib.exp~ -- $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~ -- $RM $lib.exp' -+ echo "-hidden">> $lib.exp~ -+ $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname $wl-input $wl$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~ -+ $RM $lib.exp' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' - ;; - esac -@@ -6658,21 +7185,21 @@ - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. -- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' -+ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' - ;; - *) -- if test "$GXX" = yes && test "$with_gnu_ld" = no; then -- _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' -+ if test yes,no = "$GXX,$with_gnu_ld"; then -+ _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*' - case $host in - osf3*) -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' - ;; - *) -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' - ;; - esac - -- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=: - - # Commands to make compiler produce verbose output that lists -@@ -6718,9 +7245,9 @@ - # Sun C++ 4.2, 5.x and Centerline C++ - _LT_TAGVAR(archive_cmds_need_lc,$1)=yes - _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' -- _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ -- $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' -+ $CC -G$allow_undefined_flag $wl-M $wl$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' - - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no -@@ -6728,7 +7255,7 @@ - solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; - *) - # The compiler driver will combine and reorder linker options, -- # but understands `-z linker_flag'. -+ # but understands '-z linker_flag'. - # Supported since Solaris 2.6 (maybe 2.5.1?) - _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' - ;; -@@ -6745,30 +7272,30 @@ - ;; - gcx*) - # Green Hills C++ Compiler -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib' - - # The C++ compiler must be used to create the archive. - _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs' - ;; - *) - # GNU C++ compiler with Solaris linker -- if test "$GXX" = yes && test "$with_gnu_ld" = no; then -- _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' -+ if test yes,no = "$GXX,$with_gnu_ld"; then -+ _LT_TAGVAR(no_undefined_flag, $1)=' $wl-z ${wl}defs' - if $CC --version | $GREP -v '^2\.7' > /dev/null; then -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ -- $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' -+ $CC -shared $pic_flag -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' - else -- # g++ 2.7 appears to require `-G' NOT `-shared' on this -+ # g++ 2.7 appears to require '-G' NOT '-shared' on this - # platform. -- _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ -- $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' -+ $CC -G -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when -@@ -6776,11 +7303,11 @@ - output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' - fi - -- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir' -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $wl$libdir' - case $host_os in - solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; - *) -- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' -+ _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract' - ;; - esac - fi -@@ -6789,52 +7316,52 @@ - ;; - - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) -- _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' -+ _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text' - _LT_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - runpath_var='LD_RUN_PATH' - - case $cc_basename in - CC*) -- _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - ;; - - sysv5* | sco3.2v5* | sco5v6*) -- # Note: We can NOT use -z defs as we might desire, because we do not -+ # Note: We CANNOT use -z defs as we might desire, because we do not - # link with -lc, and that would cause any symbols used from libc to - # always be unresolved, which means just about no library would - # ever link correctly. If we're not using GNU ld we use -z text - # though, which does catch some bad symbols but isn't as heavy-handed - # as -z defs. -- _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' -- _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' -+ _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text' -+ _LT_TAGVAR(allow_undefined_flag, $1)='$wl-z,nodefs' - _LT_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_TAGVAR(hardcode_shlibpath_var, $1)=no -- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir' -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R,$libdir' - _LT_TAGVAR(hardcode_libdir_separator, $1)=':' - _LT_TAGVAR(link_all_deplibs, $1)=yes -- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' -+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Bexport' - runpath_var='LD_RUN_PATH' - - case $cc_basename in - CC*) -- _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~ -- '"$_LT_TAGVAR(old_archive_cmds, $1)" -+ '"$_LT_TAGVAR(old_archive_cmds, $1)" - _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~ -- '"$_LT_TAGVAR(reload_cmds, $1)" -+ '"$_LT_TAGVAR(reload_cmds, $1)" - ;; - *) -- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - esac - ;; -@@ -6865,10 +7392,10 @@ - esac - - AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)]) -- test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no -+ test no = "$_LT_TAGVAR(ld_shlibs, $1)" && can_build_shared=no - -- _LT_TAGVAR(GCC, $1)="$GXX" -- _LT_TAGVAR(LD, $1)="$LD" -+ _LT_TAGVAR(GCC, $1)=$GXX -+ _LT_TAGVAR(LD, $1)=$LD - - ## CAVEAT EMPTOR: - ## There is no encapsulation within the following macros, do not change -@@ -6895,7 +7422,7 @@ - lt_cv_path_LD=$lt_save_path_LD - lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld - lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld --fi # test "$_lt_caught_CXX_error" != yes -+fi # test yes != "$_lt_caught_CXX_error" - - AC_LANG_POP - ])# _LT_LANG_CXX_CONFIG -@@ -6917,13 +7444,14 @@ - AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH]) - func_stripname_cnf () - { -- case ${2} in -- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; -- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; -+ case @S|@2 in -+ .*) func_stripname_result=`$ECHO "@S|@3" | $SED "s%^@S|@1%%; s%\\\\@S|@2\$%%"`;; -+ *) func_stripname_result=`$ECHO "@S|@3" | $SED "s%^@S|@1%%; s%@S|@2\$%%"`;; - esac - } # func_stripname_cnf - ])# _LT_FUNC_STRIPNAME_CNF - -+ - # _LT_SYS_HIDDEN_LIBDEPS([TAGNAME]) - # --------------------------------- - # Figure out "hidden" library dependencies from verbose -@@ -7007,13 +7535,13 @@ - pre_test_object_deps_done=no - - for p in `eval "$output_verbose_link_cmd"`; do -- case ${prev}${p} in -+ case $prev$p in - - -L* | -R* | -l*) - # Some compilers place space between "-{L,R}" and the path. - # Remove the space. -- if test $p = "-L" || -- test $p = "-R"; then -+ if test x-L = "$p" || -+ test x-R = "$p"; then - prev=$p - continue - fi -@@ -7029,16 +7557,16 @@ - case $p in - =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;; - esac -- if test "$pre_test_object_deps_done" = no; then -- case ${prev} in -+ if test no = "$pre_test_object_deps_done"; then -+ case $prev in - -L | -R) - # Internal compiler library paths should come after those - # provided the user. The postdeps already come after the - # user supplied libs so there is no need to process them. - if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then -- _LT_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}" -+ _LT_TAGVAR(compiler_lib_search_path, $1)=$prev$p - else -- _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}" -+ _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} $prev$p" - fi - ;; - # The "-l" case would never come before the object being -@@ -7046,9 +7574,9 @@ - esac - else - if test -z "$_LT_TAGVAR(postdeps, $1)"; then -- _LT_TAGVAR(postdeps, $1)="${prev}${p}" -+ _LT_TAGVAR(postdeps, $1)=$prev$p - else -- _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}" -+ _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} $prev$p" - fi - fi - prev= -@@ -7063,15 +7591,15 @@ - continue - fi - -- if test "$pre_test_object_deps_done" = no; then -+ if test no = "$pre_test_object_deps_done"; then - if test -z "$_LT_TAGVAR(predep_objects, $1)"; then -- _LT_TAGVAR(predep_objects, $1)="$p" -+ _LT_TAGVAR(predep_objects, $1)=$p - else - _LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p" - fi - else - if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then -- _LT_TAGVAR(postdep_objects, $1)="$p" -+ _LT_TAGVAR(postdep_objects, $1)=$p - else - _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p" - fi -@@ -7102,51 +7630,6 @@ - _LT_TAGVAR(postdep_objects,$1)= - _LT_TAGVAR(postdeps,$1)= - ;; -- --linux*) -- case `$CC -V 2>&1 | sed 5q` in -- *Sun\ C*) -- # Sun C++ 5.9 -- -- # The more standards-conforming stlport4 library is -- # incompatible with the Cstd library. Avoid specifying -- # it if it's in CXXFLAGS. Ignore libCrun as -- # -library=stlport4 depends on it. -- case " $CXX $CXXFLAGS " in -- *" -library=stlport4 "*) -- solaris_use_stlport4=yes -- ;; -- esac -- -- if test "$solaris_use_stlport4" != yes; then -- _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' -- fi -- ;; -- esac -- ;; -- --solaris*) -- case $cc_basename in -- CC* | sunCC*) -- # The more standards-conforming stlport4 library is -- # incompatible with the Cstd library. Avoid specifying -- # it if it's in CXXFLAGS. Ignore libCrun as -- # -library=stlport4 depends on it. -- case " $CXX $CXXFLAGS " in -- *" -library=stlport4 "*) -- solaris_use_stlport4=yes -- ;; -- esac -- -- # Adding this requires a known-good setup of shared libraries for -- # Sun compiler versions before 5.6, else PIC objects from an old -- # archive will be linked into the output, leading to subtle bugs. -- if test "$solaris_use_stlport4" != yes; then -- _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' -- fi -- ;; -- esac -- ;; - esac - ]) - -@@ -7155,7 +7638,7 @@ - esac - _LT_TAGVAR(compiler_lib_search_dirs, $1)= - if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then -- _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'` -+ _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | $SED -e 's! -L! !g' -e 's!^ !!'` - fi - _LT_TAGDECL([], [compiler_lib_search_dirs], [1], - [The directories searched by this compiler when creating a shared library]) -@@ -7175,10 +7658,10 @@ - # -------------------------- - # Ensure that the configuration variables for a Fortran 77 compiler are - # suitably defined. These variables are subsequently used by _LT_CONFIG --# to write the compiler configuration to `libtool'. -+# to write the compiler configuration to 'libtool'. - m4_defun([_LT_LANG_F77_CONFIG], - [AC_LANG_PUSH(Fortran 77) --if test -z "$F77" || test "X$F77" = "Xno"; then -+if test -z "$F77" || test no = "$F77"; then - _lt_disable_F77=yes - fi - -@@ -7215,7 +7698,7 @@ - # the F77 compiler isn't working. Some variables (like enable_shared) - # are currently assumed to apply to all compilers on this platform, - # and will be corrupted by setting them based on a non-working compiler. --if test "$_lt_disable_F77" != yes; then -+if test yes != "$_lt_disable_F77"; then - # Code to be used in simple compile tests - lt_simple_compile_test_code="\ - subroutine t -@@ -7237,7 +7720,7 @@ - _LT_LINKER_BOILERPLATE - - # Allow CC to be a program name with arguments. -- lt_save_CC="$CC" -+ lt_save_CC=$CC - lt_save_GCC=$GCC - lt_save_CFLAGS=$CFLAGS - CC=${F77-"f77"} -@@ -7251,21 +7734,25 @@ - AC_MSG_RESULT([$can_build_shared]) - - AC_MSG_CHECKING([whether to build shared libraries]) -- test "$can_build_shared" = "no" && enable_shared=no -+ test no = "$can_build_shared" && enable_shared=no - - # On AIX, shared libraries and static libraries use the same namespace, and - # are all built from PIC. - case $host_os in - aix3*) -- test "$enable_shared" = yes && enable_static=no -+ test yes = "$enable_shared" && enable_static=no - if test -n "$RANLIB"; then - archive_cmds="$archive_cmds~\$RANLIB \$lib" - postinstall_cmds='$RANLIB $lib' - fi - ;; - aix[[4-9]]*) -- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then -- test "$enable_shared" = yes && enable_static=no -+ if test ia64 != "$host_cpu"; then -+ case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in -+ yes,aix,yes) ;; # shared object as lib.so file only -+ yes,svr4,*) ;; # shared object as lib.so archive member only -+ yes,*) enable_static=no ;; # shared object in lib.a archive as well -+ esac - fi - ;; - esac -@@ -7273,11 +7760,11 @@ - - AC_MSG_CHECKING([whether to build static libraries]) - # Make sure either enable_shared or enable_static is yes. -- test "$enable_shared" = yes || enable_static=yes -+ test yes = "$enable_shared" || enable_static=yes - AC_MSG_RESULT([$enable_static]) - -- _LT_TAGVAR(GCC, $1)="$G77" -- _LT_TAGVAR(LD, $1)="$LD" -+ _LT_TAGVAR(GCC, $1)=$G77 -+ _LT_TAGVAR(LD, $1)=$LD - - ## CAVEAT EMPTOR: - ## There is no encapsulation within the following macros, do not change -@@ -7294,9 +7781,9 @@ - fi # test -n "$compiler" - - GCC=$lt_save_GCC -- CC="$lt_save_CC" -- CFLAGS="$lt_save_CFLAGS" --fi # test "$_lt_disable_F77" != yes -+ CC=$lt_save_CC -+ CFLAGS=$lt_save_CFLAGS -+fi # test yes != "$_lt_disable_F77" - - AC_LANG_POP - ])# _LT_LANG_F77_CONFIG -@@ -7306,11 +7793,11 @@ - # ------------------------- - # Ensure that the configuration variables for a Fortran compiler are - # suitably defined. These variables are subsequently used by _LT_CONFIG --# to write the compiler configuration to `libtool'. -+# to write the compiler configuration to 'libtool'. - m4_defun([_LT_LANG_FC_CONFIG], - [AC_LANG_PUSH(Fortran) - --if test -z "$FC" || test "X$FC" = "Xno"; then -+if test -z "$FC" || test no = "$FC"; then - _lt_disable_FC=yes - fi - -@@ -7347,7 +7834,7 @@ - # the FC compiler isn't working. Some variables (like enable_shared) - # are currently assumed to apply to all compilers on this platform, - # and will be corrupted by setting them based on a non-working compiler. --if test "$_lt_disable_FC" != yes; then -+if test yes != "$_lt_disable_FC"; then - # Code to be used in simple compile tests - lt_simple_compile_test_code="\ - subroutine t -@@ -7369,7 +7856,7 @@ - _LT_LINKER_BOILERPLATE - - # Allow CC to be a program name with arguments. -- lt_save_CC="$CC" -+ lt_save_CC=$CC - lt_save_GCC=$GCC - lt_save_CFLAGS=$CFLAGS - CC=${FC-"f95"} -@@ -7385,21 +7872,25 @@ - AC_MSG_RESULT([$can_build_shared]) - - AC_MSG_CHECKING([whether to build shared libraries]) -- test "$can_build_shared" = "no" && enable_shared=no -+ test no = "$can_build_shared" && enable_shared=no - - # On AIX, shared libraries and static libraries use the same namespace, and - # are all built from PIC. - case $host_os in - aix3*) -- test "$enable_shared" = yes && enable_static=no -+ test yes = "$enable_shared" && enable_static=no - if test -n "$RANLIB"; then - archive_cmds="$archive_cmds~\$RANLIB \$lib" - postinstall_cmds='$RANLIB $lib' - fi - ;; - aix[[4-9]]*) -- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then -- test "$enable_shared" = yes && enable_static=no -+ if test ia64 != "$host_cpu"; then -+ case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in -+ yes,aix,yes) ;; # shared object as lib.so file only -+ yes,svr4,*) ;; # shared object as lib.so archive member only -+ yes,*) enable_static=no ;; # shared object in lib.a archive as well -+ esac - fi - ;; - esac -@@ -7407,11 +7898,11 @@ - - AC_MSG_CHECKING([whether to build static libraries]) - # Make sure either enable_shared or enable_static is yes. -- test "$enable_shared" = yes || enable_static=yes -+ test yes = "$enable_shared" || enable_static=yes - AC_MSG_RESULT([$enable_static]) - -- _LT_TAGVAR(GCC, $1)="$ac_cv_fc_compiler_gnu" -- _LT_TAGVAR(LD, $1)="$LD" -+ _LT_TAGVAR(GCC, $1)=$ac_cv_fc_compiler_gnu -+ _LT_TAGVAR(LD, $1)=$LD - - ## CAVEAT EMPTOR: - ## There is no encapsulation within the following macros, do not change -@@ -7431,7 +7922,7 @@ - GCC=$lt_save_GCC - CC=$lt_save_CC - CFLAGS=$lt_save_CFLAGS --fi # test "$_lt_disable_FC" != yes -+fi # test yes != "$_lt_disable_FC" - - AC_LANG_POP - ])# _LT_LANG_FC_CONFIG -@@ -7441,7 +7932,7 @@ - # -------------------------- - # Ensure that the configuration variables for the GNU Java Compiler compiler - # are suitably defined. These variables are subsequently used by _LT_CONFIG --# to write the compiler configuration to `libtool'. -+# to write the compiler configuration to 'libtool'. - m4_defun([_LT_LANG_GCJ_CONFIG], - [AC_REQUIRE([LT_PROG_GCJ])dnl - AC_LANG_SAVE -@@ -7475,7 +7966,7 @@ - CFLAGS=$GCJFLAGS - compiler=$CC - _LT_TAGVAR(compiler, $1)=$CC --_LT_TAGVAR(LD, $1)="$LD" -+_LT_TAGVAR(LD, $1)=$LD - _LT_CC_BASENAME([$compiler]) - - # GCJ did not exist at the time GCC didn't implicitly link libc in. -@@ -7512,7 +8003,7 @@ - # -------------------------- - # Ensure that the configuration variables for the GNU Go compiler - # are suitably defined. These variables are subsequently used by _LT_CONFIG --# to write the compiler configuration to `libtool'. -+# to write the compiler configuration to 'libtool'. - m4_defun([_LT_LANG_GO_CONFIG], - [AC_REQUIRE([LT_PROG_GO])dnl - AC_LANG_SAVE -@@ -7546,7 +8037,7 @@ - CFLAGS=$GOFLAGS - compiler=$CC - _LT_TAGVAR(compiler, $1)=$CC --_LT_TAGVAR(LD, $1)="$LD" -+_LT_TAGVAR(LD, $1)=$LD - _LT_CC_BASENAME([$compiler]) - - # Go did not exist at the time GCC didn't implicitly link libc in. -@@ -7583,7 +8074,7 @@ - # ------------------------- - # Ensure that the configuration variables for the Windows resource compiler - # are suitably defined. These variables are subsequently used by _LT_CONFIG --# to write the compiler configuration to `libtool'. -+# to write the compiler configuration to 'libtool'. - m4_defun([_LT_LANG_RC_CONFIG], - [AC_REQUIRE([LT_PROG_RC])dnl - AC_LANG_SAVE -@@ -7599,7 +8090,7 @@ - lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }' - - # Code to be used in simple link tests --lt_simple_link_test_code="$lt_simple_compile_test_code" -+lt_simple_link_test_code=$lt_simple_compile_test_code - - # ltmain only uses $CC for tagged configurations so make sure $CC is set. - _LT_TAG_COMPILER -@@ -7609,7 +8100,7 @@ - _LT_LINKER_BOILERPLATE - - # Allow CC to be a program name with arguments. --lt_save_CC="$CC" -+lt_save_CC=$CC - lt_save_CFLAGS=$CFLAGS - lt_save_GCC=$GCC - GCC= -@@ -7638,7 +8129,7 @@ - [m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ], - [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ], - [AC_CHECK_TOOL(GCJ, gcj,) -- test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2" -+ test set = "${GCJFLAGS+set}" || GCJFLAGS="-g -O2" - AC_SUBST(GCJFLAGS)])])[]dnl - ]) - -@@ -7749,7 +8240,7 @@ - # Add /usr/xpg4/bin/sed as it is typically found on Solaris - # along with /bin/sed that truncates output. - for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do -- test ! -f $lt_ac_sed && continue -+ test ! -f "$lt_ac_sed" && continue - cat /dev/null > conftest.in - lt_ac_count=0 - echo $ECHO_N "0123456789$ECHO_C" >conftest.in -@@ -7766,9 +8257,9 @@ - $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break - cmp -s conftest.out conftest.nl || break - # 10000 chars as input seems more than enough -- test $lt_ac_count -gt 10 && break -+ test 10 -lt "$lt_ac_count" && break - lt_ac_count=`expr $lt_ac_count + 1` -- if test $lt_ac_count -gt $lt_ac_max; then -+ if test "$lt_ac_count" -gt "$lt_ac_max"; then - lt_ac_max=$lt_ac_count - lt_cv_path_SED=$lt_ac_sed - fi -@@ -7792,27 +8283,7 @@ - # Find out whether the shell is Bourne or XSI compatible, - # or has some other useful features. - m4_defun([_LT_CHECK_SHELL_FEATURES], --[AC_MSG_CHECKING([whether the shell understands some XSI constructs]) --# Try some XSI features --xsi_shell=no --( _lt_dummy="a/b/c" -- test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ -- = c,a/b,b/c, \ -- && eval 'test $(( 1 + 1 )) -eq 2 \ -- && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ -- && xsi_shell=yes --AC_MSG_RESULT([$xsi_shell]) --_LT_CONFIG_LIBTOOL_INIT([xsi_shell='$xsi_shell']) -- --AC_MSG_CHECKING([whether the shell understands "+="]) --lt_shell_append=no --( foo=bar; set foo baz; eval "$[1]+=\$[2]" && test "$foo" = barbaz ) \ -- >/dev/null 2>&1 \ -- && lt_shell_append=yes --AC_MSG_RESULT([$lt_shell_append]) --_LT_CONFIG_LIBTOOL_INIT([lt_shell_append='$lt_shell_append']) -- --if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then -+[if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then - lt_unset=unset - else - lt_unset=false -@@ -7836,102 +8307,9 @@ - ])# _LT_CHECK_SHELL_FEATURES - - --# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY) --# ------------------------------------------------------ --# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and --# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY. --m4_defun([_LT_PROG_FUNCTION_REPLACE], --[dnl { --sed -e '/^$1 ()$/,/^} # $1 /c\ --$1 ()\ --{\ --m4_bpatsubsts([$2], [$], [\\], [^\([ ]\)], [\\\1]) --} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \ -- && mv -f "$cfgfile.tmp" "$cfgfile" \ -- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") --test 0 -eq $? || _lt_function_replace_fail=: --]) -- -- --# _LT_PROG_REPLACE_SHELLFNS --# ------------------------- --# Replace existing portable implementations of several shell functions with --# equivalent extended shell implementations where those features are available.. --m4_defun([_LT_PROG_REPLACE_SHELLFNS], --[if test x"$xsi_shell" = xyes; then -- _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl -- case ${1} in -- */*) func_dirname_result="${1%/*}${2}" ;; -- * ) func_dirname_result="${3}" ;; -- esac]) -- -- _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl -- func_basename_result="${1##*/}"]) -- -- _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl -- case ${1} in -- */*) func_dirname_result="${1%/*}${2}" ;; -- * ) func_dirname_result="${3}" ;; -- esac -- func_basename_result="${1##*/}"]) -- -- _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl -- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are -- # positional parameters, so assign one to ordinary parameter first. -- func_stripname_result=${3} -- func_stripname_result=${func_stripname_result#"${1}"} -- func_stripname_result=${func_stripname_result%"${2}"}]) -- -- _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl -- func_split_long_opt_name=${1%%=*} -- func_split_long_opt_arg=${1#*=}]) -- -- _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl -- func_split_short_opt_arg=${1#??} -- func_split_short_opt_name=${1%"$func_split_short_opt_arg"}]) -- -- _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl -- case ${1} in -- *.lo) func_lo2o_result=${1%.lo}.${objext} ;; -- *) func_lo2o_result=${1} ;; -- esac]) -- -- _LT_PROG_FUNCTION_REPLACE([func_xform], [ func_xform_result=${1%.*}.lo]) -- -- _LT_PROG_FUNCTION_REPLACE([func_arith], [ func_arith_result=$(( $[*] ))]) -- -- _LT_PROG_FUNCTION_REPLACE([func_len], [ func_len_result=${#1}]) --fi -- --if test x"$lt_shell_append" = xyes; then -- _LT_PROG_FUNCTION_REPLACE([func_append], [ eval "${1}+=\\${2}"]) -- -- _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl -- func_quote_for_eval "${2}" --dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \ -- eval "${1}+=\\\\ \\$func_quote_for_eval_result"]) -- -- # Save a `func_append' function call where possible by direct use of '+=' -- sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ -- && mv -f "$cfgfile.tmp" "$cfgfile" \ -- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -- test 0 -eq $? || _lt_function_replace_fail=: --else -- # Save a `func_append' function call even when '+=' is not available -- sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ -- && mv -f "$cfgfile.tmp" "$cfgfile" \ -- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -- test 0 -eq $? || _lt_function_replace_fail=: --fi -- --if test x"$_lt_function_replace_fail" = x":"; then -- AC_MSG_WARN([Unable to substitute extended shell functions in $ofile]) --fi --]) -- - # _LT_PATH_CONVERSION_FUNCTIONS - # ----------------------------- --# Determine which file name conversion functions should be used by -+# Determine what file name conversion functions should be used by - # func_to_host_file (and, implicitly, by func_to_host_path). These are needed - # for certain cross-compile configurations and native mingw. - m4_defun([_LT_PATH_CONVERSION_FUNCTIONS], -@@ -7945,7 +8323,7 @@ - *-*-mingw* ) # actually msys - lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 - ;; -- *-*-cygwin* ) -+ *-*-cygwin* | *-*-msys* ) - lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 - ;; - * ) # otherwise, assume *nix -@@ -7953,12 +8331,12 @@ - ;; - esac - ;; -- *-*-cygwin* ) -+ *-*-cygwin* | *-*-msys* ) - case $build in - *-*-mingw* ) # actually msys - lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin - ;; -- *-*-cygwin* ) -+ *-*-cygwin* | *-*-msys* ) - lt_cv_to_host_file_cmd=func_convert_file_noop - ;; - * ) # otherwise, assume *nix -diff -durN libpipeline-1.4.1.orig/gnulib/m4/limits-h.m4 libpipeline-1.4.1/gnulib/m4/limits-h.m4 ---- libpipeline-1.4.1.orig/gnulib/m4/limits-h.m4 1970-01-01 08:00:00.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/m4/limits-h.m4 2017-05-17 10:35:06.281250000 +0800 -@@ -0,0 +1,31 @@ -+dnl Check whether limits.h has needed features. -+ -+dnl Copyright 2016-2017 Free Software Foundation, Inc. -+dnl This file is free software; the Free Software Foundation -+dnl gives unlimited permission to copy and/or distribute it, -+dnl with or without modifications, as long as this notice is preserved. -+ -+dnl From Paul Eggert. -+ -+AC_DEFUN_ONCE([gl_LIMITS_H], -+[ -+ gl_CHECK_NEXT_HEADERS([limits.h]) -+ -+ AC_CACHE_CHECK([whether limits.h has ULLONG_WIDTH etc.], -+ [gl_cv_header_limits_width], -+ [AC_COMPILE_IFELSE( -+ [AC_LANG_PROGRAM([[#ifndef __STDC_WANT_IEC_60559_BFP_EXT__ -+ #define __STDC_WANT_IEC_60559_BFP_EXT__ 1 -+ #endif -+ #include -+ int ullw = ULLONG_WIDTH;]])], -+ [gl_cv_header_limits_width=yes], -+ [gl_cv_header_limits_width=no])]) -+ if test "$gl_cv_header_limits_width" = yes; then -+ LIMITS_H= -+ else -+ LIMITS_H=limits.h -+ fi -+ AC_SUBST([LIMITS_H]) -+ AM_CONDITIONAL([GL_GENERATE_LIMITS_H], [test -n "$LIMITS_H"]) -+]) -diff -durN libpipeline-1.4.1.orig/gnulib/m4/localtime-buffer.m4 libpipeline-1.4.1/gnulib/m4/localtime-buffer.m4 ---- libpipeline-1.4.1.orig/gnulib/m4/localtime-buffer.m4 1970-01-01 08:00:00.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/m4/localtime-buffer.m4 2017-05-17 10:35:06.453125000 +0800 -@@ -0,0 +1,21 @@ -+# localtime-buffer.m4 serial 1 -+dnl Copyright (C) 2017 Free Software Foundation, Inc. -+dnl This file is free software; the Free Software Foundation -+dnl gives unlimited permission to copy and/or distribute it, -+dnl with or without modifications, as long as this notice is preserved. -+ -+AC_DEFUN([gl_LOCALTIME_BUFFER_DEFAULTS], -+[ -+ NEED_LOCALTIME_BUFFER=0 -+]) -+ -+dnl Macro invoked from other modules, to signal that the compilation of -+dnl module 'localtime-buffer' is needed. -+AC_DEFUN([gl_LOCALTIME_BUFFER_NEEDED], -+[ -+ AC_REQUIRE([gl_LOCALTIME_BUFFER_DEFAULTS]) -+ AC_REQUIRE([gl_HEADER_TIME_H_DEFAULTS]) -+ NEED_LOCALTIME_BUFFER=1 -+ REPLACE_GMTIME=1 -+ REPLACE_LOCALTIME=1 -+]) -diff -durN libpipeline-1.4.1.orig/gnulib/m4/lock.m4 libpipeline-1.4.1/gnulib/m4/lock.m4 ---- libpipeline-1.4.1.orig/gnulib/m4/lock.m4 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/m4/lock.m4 2017-05-17 10:35:48.218750000 +0800 -@@ -1,5 +1,5 @@ --# lock.m4 serial 13 (gettext-0.18.2) --dnl Copyright (C) 2005-2014 Free Software Foundation, Inc. -+# lock.m4 serial 14 -+dnl Copyright (C) 2005-2017 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. -@@ -12,11 +12,16 @@ - if test "$gl_threads_api" = posix; then - # OSF/1 4.0 and Mac OS X 10.1 lack the pthread_rwlock_t type and the - # pthread_rwlock_* functions. -+ has_rwlock=false - AC_CHECK_TYPE([pthread_rwlock_t], -- [AC_DEFINE([HAVE_PTHREAD_RWLOCK], [1], -+ [has_rwlock=true -+ AC_DEFINE([HAVE_PTHREAD_RWLOCK], [1], - [Define if the POSIX multithreading library has read/write locks.])], - [], - [#include ]) -+ if $has_rwlock; then -+ gl_PTHREAD_RWLOCK_RDLOCK_PREFER_WRITER -+ fi - # glibc defines PTHREAD_MUTEX_RECURSIVE as enum, not as a macro. - AC_COMPILE_IFELSE([ - AC_LANG_PROGRAM( -diff -durN libpipeline-1.4.1.orig/gnulib/m4/longlong.m4 libpipeline-1.4.1/gnulib/m4/longlong.m4 ---- libpipeline-1.4.1.orig/gnulib/m4/longlong.m4 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/m4/longlong.m4 2017-05-17 10:35:48.453125000 +0800 -@@ -1,5 +1,5 @@ - # longlong.m4 serial 17 --dnl Copyright (C) 1999-2007, 2009-2014 Free Software Foundation, Inc. -+dnl Copyright (C) 1999-2007, 2009-2017 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. -diff -durN libpipeline-1.4.1.orig/gnulib/m4/lstat.m4 libpipeline-1.4.1/gnulib/m4/lstat.m4 ---- libpipeline-1.4.1.orig/gnulib/m4/lstat.m4 2014-11-08 21:53:38.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/m4/lstat.m4 2017-05-17 10:35:48.734375000 +0800 -@@ -1,6 +1,6 @@ --# serial 26 -+# serial 27 - --# Copyright (C) 1997-2001, 2003-2014 Free Software Foundation, Inc. -+# Copyright (C) 1997-2001, 2003-2017 Free Software Foundation, Inc. - # - # This file is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, -@@ -37,30 +37,28 @@ - [gl_cv_func_lstat_dereferences_slashed_symlink], - [rm -f conftest.sym conftest.file - echo >conftest.file -- if test "$as_ln_s" = "ln -s" && ln -s conftest.file conftest.sym; then -- AC_RUN_IFELSE( -- [AC_LANG_PROGRAM( -- [AC_INCLUDES_DEFAULT], -- [[struct stat sbuf; -- /* Linux will dereference the symlink and fail, as required by -- POSIX. That is better in the sense that it means we will not -- have to compile and use the lstat wrapper. */ -- return lstat ("conftest.sym/", &sbuf) == 0; -- ]])], -- [gl_cv_func_lstat_dereferences_slashed_symlink=yes], -- [gl_cv_func_lstat_dereferences_slashed_symlink=no], -- [case "$host_os" in -- # Guess yes on glibc systems. -- *-gnu*) gl_cv_func_lstat_dereferences_slashed_symlink="guessing yes" ;; -- # If we don't know, assume the worst. -- *) gl_cv_func_lstat_dereferences_slashed_symlink="guessing no" ;; -- esac -- ]) -- else -- # If the 'ln -s' command failed, then we probably don't even -- # have an lstat function. -- gl_cv_func_lstat_dereferences_slashed_symlink="guessing no" -- fi -+ AC_RUN_IFELSE( -+ [AC_LANG_PROGRAM( -+ [AC_INCLUDES_DEFAULT], -+ [[struct stat sbuf; -+ if (symlink ("conftest.file", "conftest.sym") != 0) -+ return 1; -+ /* Linux will dereference the symlink and fail, as required by -+ POSIX. That is better in the sense that it means we will not -+ have to compile and use the lstat wrapper. */ -+ return lstat ("conftest.sym/", &sbuf) == 0; -+ ]])], -+ [gl_cv_func_lstat_dereferences_slashed_symlink=yes], -+ [gl_cv_func_lstat_dereferences_slashed_symlink=no], -+ [case "$host_os" in -+ *-gnu*) -+ # Guess yes on glibc systems. -+ gl_cv_func_lstat_dereferences_slashed_symlink="guessing yes" ;; -+ *) -+ # If we don't know, assume the worst. -+ gl_cv_func_lstat_dereferences_slashed_symlink="guessing no" ;; -+ esac -+ ]) - rm -f conftest.sym conftest.file - ]) - case "$gl_cv_func_lstat_dereferences_slashed_symlink" in -diff -durN libpipeline-1.4.1.orig/gnulib/m4/lt~obsolete.m4 libpipeline-1.4.1/gnulib/m4/lt~obsolete.m4 ---- libpipeline-1.4.1.orig/gnulib/m4/lt~obsolete.m4 2015-08-17 17:14:17.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/m4/lt~obsolete.m4 1970-01-01 08:00:00.000000000 +0800 -@@ -1,98 +0,0 @@ --# lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*- --# --# Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc. --# Written by Scott James Remnant, 2004. --# --# This file is free software; the Free Software Foundation gives --# unlimited permission to copy and/or distribute it, with or without --# modifications, as long as this notice is preserved. -- --# serial 5 lt~obsolete.m4 -- --# These exist entirely to fool aclocal when bootstrapping libtool. --# --# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN) --# which have later been changed to m4_define as they aren't part of the --# exported API, or moved to Autoconf or Automake where they belong. --# --# The trouble is, aclocal is a bit thick. It'll see the old AC_DEFUN --# in /usr/share/aclocal/libtool.m4 and remember it, then when it sees us --# using a macro with the same name in our local m4/libtool.m4 it'll --# pull the old libtool.m4 in (it doesn't see our shiny new m4_define --# and doesn't know about Autoconf macros at all.) --# --# So we provide this file, which has a silly filename so it's always --# included after everything else. This provides aclocal with the --# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything --# because those macros already exist, or will be overwritten later. --# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. --# --# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here. --# Yes, that means every name once taken will need to remain here until --# we give up compatibility with versions before 1.7, at which point --# we need to keep only those names which we still refer to. -- --# This is to help aclocal find these macros, as it can't see m4_define. --AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])]) -- --m4_ifndef([AC_LIBTOOL_LINKER_OPTION], [AC_DEFUN([AC_LIBTOOL_LINKER_OPTION])]) --m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP])]) --m4_ifndef([_LT_AC_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])]) --m4_ifndef([_LT_AC_SHELL_INIT], [AC_DEFUN([_LT_AC_SHELL_INIT])]) --m4_ifndef([_LT_AC_SYS_LIBPATH_AIX], [AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX])]) --m4_ifndef([_LT_PROG_LTMAIN], [AC_DEFUN([_LT_PROG_LTMAIN])]) --m4_ifndef([_LT_AC_TAGVAR], [AC_DEFUN([_LT_AC_TAGVAR])]) --m4_ifndef([AC_LTDL_ENABLE_INSTALL], [AC_DEFUN([AC_LTDL_ENABLE_INSTALL])]) --m4_ifndef([AC_LTDL_PREOPEN], [AC_DEFUN([AC_LTDL_PREOPEN])]) --m4_ifndef([_LT_AC_SYS_COMPILER], [AC_DEFUN([_LT_AC_SYS_COMPILER])]) --m4_ifndef([_LT_AC_LOCK], [AC_DEFUN([_LT_AC_LOCK])]) --m4_ifndef([AC_LIBTOOL_SYS_OLD_ARCHIVE], [AC_DEFUN([AC_LIBTOOL_SYS_OLD_ARCHIVE])]) --m4_ifndef([_LT_AC_TRY_DLOPEN_SELF], [AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF])]) --m4_ifndef([AC_LIBTOOL_PROG_CC_C_O], [AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O])]) --m4_ifndef([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], [AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS])]) --m4_ifndef([AC_LIBTOOL_OBJDIR], [AC_DEFUN([AC_LIBTOOL_OBJDIR])]) --m4_ifndef([AC_LTDL_OBJDIR], [AC_DEFUN([AC_LTDL_OBJDIR])]) --m4_ifndef([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], [AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH])]) --m4_ifndef([AC_LIBTOOL_SYS_LIB_STRIP], [AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP])]) --m4_ifndef([AC_PATH_MAGIC], [AC_DEFUN([AC_PATH_MAGIC])]) --m4_ifndef([AC_PROG_LD_GNU], [AC_DEFUN([AC_PROG_LD_GNU])]) --m4_ifndef([AC_PROG_LD_RELOAD_FLAG], [AC_DEFUN([AC_PROG_LD_RELOAD_FLAG])]) --m4_ifndef([AC_DEPLIBS_CHECK_METHOD], [AC_DEFUN([AC_DEPLIBS_CHECK_METHOD])]) --m4_ifndef([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI])]) --m4_ifndef([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], [AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])]) --m4_ifndef([AC_LIBTOOL_PROG_COMPILER_PIC], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC])]) --m4_ifndef([AC_LIBTOOL_PROG_LD_SHLIBS], [AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS])]) --m4_ifndef([AC_LIBTOOL_POSTDEP_PREDEP], [AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP])]) --m4_ifndef([LT_AC_PROG_EGREP], [AC_DEFUN([LT_AC_PROG_EGREP])]) --m4_ifndef([LT_AC_PROG_SED], [AC_DEFUN([LT_AC_PROG_SED])]) --m4_ifndef([_LT_CC_BASENAME], [AC_DEFUN([_LT_CC_BASENAME])]) --m4_ifndef([_LT_COMPILER_BOILERPLATE], [AC_DEFUN([_LT_COMPILER_BOILERPLATE])]) --m4_ifndef([_LT_LINKER_BOILERPLATE], [AC_DEFUN([_LT_LINKER_BOILERPLATE])]) --m4_ifndef([_AC_PROG_LIBTOOL], [AC_DEFUN([_AC_PROG_LIBTOOL])]) --m4_ifndef([AC_LIBTOOL_SETUP], [AC_DEFUN([AC_LIBTOOL_SETUP])]) --m4_ifndef([_LT_AC_CHECK_DLFCN], [AC_DEFUN([_LT_AC_CHECK_DLFCN])]) --m4_ifndef([AC_LIBTOOL_SYS_DYNAMIC_LINKER], [AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER])]) --m4_ifndef([_LT_AC_TAGCONFIG], [AC_DEFUN([_LT_AC_TAGCONFIG])]) --m4_ifndef([AC_DISABLE_FAST_INSTALL], [AC_DEFUN([AC_DISABLE_FAST_INSTALL])]) --m4_ifndef([_LT_AC_LANG_CXX], [AC_DEFUN([_LT_AC_LANG_CXX])]) --m4_ifndef([_LT_AC_LANG_F77], [AC_DEFUN([_LT_AC_LANG_F77])]) --m4_ifndef([_LT_AC_LANG_GCJ], [AC_DEFUN([_LT_AC_LANG_GCJ])]) --m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])]) --m4_ifndef([_LT_AC_LANG_C_CONFIG], [AC_DEFUN([_LT_AC_LANG_C_CONFIG])]) --m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])]) --m4_ifndef([_LT_AC_LANG_CXX_CONFIG], [AC_DEFUN([_LT_AC_LANG_CXX_CONFIG])]) --m4_ifndef([AC_LIBTOOL_LANG_F77_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG])]) --m4_ifndef([_LT_AC_LANG_F77_CONFIG], [AC_DEFUN([_LT_AC_LANG_F77_CONFIG])]) --m4_ifndef([AC_LIBTOOL_LANG_GCJ_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG])]) --m4_ifndef([_LT_AC_LANG_GCJ_CONFIG], [AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG])]) --m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])]) --m4_ifndef([_LT_AC_LANG_RC_CONFIG], [AC_DEFUN([_LT_AC_LANG_RC_CONFIG])]) --m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])]) --m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])]) --m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS], [AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])]) --m4_ifndef([_LT_AC_PROG_CXXCPP], [AC_DEFUN([_LT_AC_PROG_CXXCPP])]) --m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS], [AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])]) --m4_ifndef([_LT_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])]) --m4_ifndef([_LT_PROG_F77], [AC_DEFUN([_LT_PROG_F77])]) --m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])]) --m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])]) -diff -durN libpipeline-1.4.1.orig/gnulib/m4/ltoptions.m4 libpipeline-1.4.1/gnulib/m4/ltoptions.m4 ---- libpipeline-1.4.1.orig/gnulib/m4/ltoptions.m4 2015-08-17 17:14:16.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/m4/ltoptions.m4 2017-05-17 10:38:04.781250000 +0800 -@@ -1,14 +1,14 @@ - # Helper functions for option handling. -*- Autoconf -*- - # --# Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation, --# Inc. -+# Copyright (C) 2004-2005, 2007-2009, 2011-2015 Free Software -+# Foundation, Inc. - # Written by Gary V. Vaughan, 2004 - # - # This file is free software; the Free Software Foundation gives - # unlimited permission to copy and/or distribute it, with or without - # modifications, as long as this notice is preserved. - --# serial 7 ltoptions.m4 -+# serial 8 ltoptions.m4 - - # This is to help aclocal find these macros, as it can't see m4_define. - AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])]) -@@ -29,7 +29,7 @@ - [m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl - m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]), - _LT_MANGLE_DEFUN([$1], [$2]), -- [m4_warning([Unknown $1 option `$2'])])[]dnl -+ [m4_warning([Unknown $1 option '$2'])])[]dnl - ]) - - -@@ -75,13 +75,15 @@ - dnl - dnl If no reference was made to various pairs of opposing options, then - dnl we run the default mode handler for the pair. For example, if neither -- dnl `shared' nor `disable-shared' was passed, we enable building of shared -+ dnl 'shared' nor 'disable-shared' was passed, we enable building of shared - dnl archives by default: - _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED]) - _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC]) - _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC]) - _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install], -- [_LT_ENABLE_FAST_INSTALL]) -+ [_LT_ENABLE_FAST_INSTALL]) -+ _LT_UNLESS_OPTIONS([LT_INIT], [aix-soname=aix aix-soname=both aix-soname=svr4], -+ [_LT_WITH_AIX_SONAME([aix])]) - ]) - ])# _LT_SET_OPTIONS - -@@ -112,7 +114,7 @@ - [_LT_SET_OPTION([LT_INIT], [dlopen]) - AC_DIAGNOSE([obsolete], - [$0: Remove this warning and the call to _LT_SET_OPTION when you --put the `dlopen' option into LT_INIT's first parameter.]) -+put the 'dlopen' option into LT_INIT's first parameter.]) - ]) - - dnl aclocal-1.4 backwards compatibility: -@@ -126,7 +128,7 @@ - [enable_win32_dll=yes - - case $host in --*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*) -+*-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-cegcc*) - AC_CHECK_TOOL(AS, as, false) - AC_CHECK_TOOL(DLLTOOL, dlltool, false) - AC_CHECK_TOOL(OBJDUMP, objdump, false) -@@ -148,7 +150,7 @@ - _LT_SET_OPTION([LT_INIT], [win32-dll]) - AC_DIAGNOSE([obsolete], - [$0: Remove this warning and the call to _LT_SET_OPTION when you --put the `win32-dll' option into LT_INIT's first parameter.]) -+put the 'win32-dll' option into LT_INIT's first parameter.]) - ]) - - dnl aclocal-1.4 backwards compatibility: -@@ -157,9 +159,9 @@ - - # _LT_ENABLE_SHARED([DEFAULT]) - # ---------------------------- --# implement the --enable-shared flag, and supports the `shared' and --# `disable-shared' LT_INIT options. --# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. -+# implement the --enable-shared flag, and supports the 'shared' and -+# 'disable-shared' LT_INIT options. -+# DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'. - m4_define([_LT_ENABLE_SHARED], - [m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl - AC_ARG_ENABLE([shared], -@@ -172,14 +174,14 @@ - *) - enable_shared=no - # Look at the argument we got. We use all the common list separators. -- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," -+ lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, - for pkg in $enableval; do -- IFS="$lt_save_ifs" -+ IFS=$lt_save_ifs - if test "X$pkg" = "X$p"; then - enable_shared=yes - fi - done -- IFS="$lt_save_ifs" -+ IFS=$lt_save_ifs - ;; - esac], - [enable_shared=]_LT_ENABLE_SHARED_DEFAULT) -@@ -211,9 +213,9 @@ - - # _LT_ENABLE_STATIC([DEFAULT]) - # ---------------------------- --# implement the --enable-static flag, and support the `static' and --# `disable-static' LT_INIT options. --# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. -+# implement the --enable-static flag, and support the 'static' and -+# 'disable-static' LT_INIT options. -+# DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'. - m4_define([_LT_ENABLE_STATIC], - [m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl - AC_ARG_ENABLE([static], -@@ -226,14 +228,14 @@ - *) - enable_static=no - # Look at the argument we got. We use all the common list separators. -- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," -+ lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, - for pkg in $enableval; do -- IFS="$lt_save_ifs" -+ IFS=$lt_save_ifs - if test "X$pkg" = "X$p"; then - enable_static=yes - fi - done -- IFS="$lt_save_ifs" -+ IFS=$lt_save_ifs - ;; - esac], - [enable_static=]_LT_ENABLE_STATIC_DEFAULT) -@@ -265,9 +267,9 @@ - - # _LT_ENABLE_FAST_INSTALL([DEFAULT]) - # ---------------------------------- --# implement the --enable-fast-install flag, and support the `fast-install' --# and `disable-fast-install' LT_INIT options. --# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. -+# implement the --enable-fast-install flag, and support the 'fast-install' -+# and 'disable-fast-install' LT_INIT options. -+# DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'. - m4_define([_LT_ENABLE_FAST_INSTALL], - [m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl - AC_ARG_ENABLE([fast-install], -@@ -280,14 +282,14 @@ - *) - enable_fast_install=no - # Look at the argument we got. We use all the common list separators. -- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," -+ lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, - for pkg in $enableval; do -- IFS="$lt_save_ifs" -+ IFS=$lt_save_ifs - if test "X$pkg" = "X$p"; then - enable_fast_install=yes - fi - done -- IFS="$lt_save_ifs" -+ IFS=$lt_save_ifs - ;; - esac], - [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT) -@@ -304,14 +306,14 @@ - [_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install]) - AC_DIAGNOSE([obsolete], - [$0: Remove this warning and the call to _LT_SET_OPTION when you put --the `fast-install' option into LT_INIT's first parameter.]) -+the 'fast-install' option into LT_INIT's first parameter.]) - ]) - - AU_DEFUN([AC_DISABLE_FAST_INSTALL], - [_LT_SET_OPTION([LT_INIT], [disable-fast-install]) - AC_DIAGNOSE([obsolete], - [$0: Remove this warning and the call to _LT_SET_OPTION when you put --the `disable-fast-install' option into LT_INIT's first parameter.]) -+the 'disable-fast-install' option into LT_INIT's first parameter.]) - ]) - - dnl aclocal-1.4 backwards compatibility: -@@ -319,11 +321,64 @@ - dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], []) - - -+# _LT_WITH_AIX_SONAME([DEFAULT]) -+# ---------------------------------- -+# implement the --with-aix-soname flag, and support the `aix-soname=aix' -+# and `aix-soname=both' and `aix-soname=svr4' LT_INIT options. DEFAULT -+# is either `aix', `both' or `svr4'. If omitted, it defaults to `aix'. -+m4_define([_LT_WITH_AIX_SONAME], -+[m4_define([_LT_WITH_AIX_SONAME_DEFAULT], [m4_if($1, svr4, svr4, m4_if($1, both, both, aix))])dnl -+shared_archive_member_spec= -+case $host,$enable_shared in -+power*-*-aix[[5-9]]*,yes) -+ AC_MSG_CHECKING([which variant of shared library versioning to provide]) -+ AC_ARG_WITH([aix-soname], -+ [AS_HELP_STRING([--with-aix-soname=aix|svr4|both], -+ [shared library versioning (aka "SONAME") variant to provide on AIX, @<:@default=]_LT_WITH_AIX_SONAME_DEFAULT[@:>@.])], -+ [case $withval in -+ aix|svr4|both) -+ ;; -+ *) -+ AC_MSG_ERROR([Unknown argument to --with-aix-soname]) -+ ;; -+ esac -+ lt_cv_with_aix_soname=$with_aix_soname], -+ [AC_CACHE_VAL([lt_cv_with_aix_soname], -+ [lt_cv_with_aix_soname=]_LT_WITH_AIX_SONAME_DEFAULT) -+ with_aix_soname=$lt_cv_with_aix_soname]) -+ AC_MSG_RESULT([$with_aix_soname]) -+ if test aix != "$with_aix_soname"; then -+ # For the AIX way of multilib, we name the shared archive member -+ # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o', -+ # and 'shr.imp' or 'shr_64.imp', respectively, for the Import File. -+ # Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag, -+ # the AIX toolchain works better with OBJECT_MODE set (default 32). -+ if test 64 = "${OBJECT_MODE-32}"; then -+ shared_archive_member_spec=shr_64 -+ else -+ shared_archive_member_spec=shr -+ fi -+ fi -+ ;; -+*) -+ with_aix_soname=aix -+ ;; -+esac -+ -+_LT_DECL([], [shared_archive_member_spec], [0], -+ [Shared archive member basename, for filename based shared library versioning on AIX])dnl -+])# _LT_WITH_AIX_SONAME -+ -+LT_OPTION_DEFINE([LT_INIT], [aix-soname=aix], [_LT_WITH_AIX_SONAME([aix])]) -+LT_OPTION_DEFINE([LT_INIT], [aix-soname=both], [_LT_WITH_AIX_SONAME([both])]) -+LT_OPTION_DEFINE([LT_INIT], [aix-soname=svr4], [_LT_WITH_AIX_SONAME([svr4])]) -+ -+ - # _LT_WITH_PIC([MODE]) - # -------------------- --# implement the --with-pic flag, and support the `pic-only' and `no-pic' -+# implement the --with-pic flag, and support the 'pic-only' and 'no-pic' - # LT_INIT options. --# MODE is either `yes' or `no'. If omitted, it defaults to `both'. -+# MODE is either 'yes' or 'no'. If omitted, it defaults to 'both'. - m4_define([_LT_WITH_PIC], - [AC_ARG_WITH([pic], - [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@], -@@ -334,19 +389,17 @@ - *) - pic_mode=default - # Look at the argument we got. We use all the common list separators. -- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," -+ lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, - for lt_pkg in $withval; do -- IFS="$lt_save_ifs" -+ IFS=$lt_save_ifs - if test "X$lt_pkg" = "X$lt_p"; then - pic_mode=yes - fi - done -- IFS="$lt_save_ifs" -+ IFS=$lt_save_ifs - ;; - esac], -- [pic_mode=default]) -- --test -z "$pic_mode" && pic_mode=m4_default([$1], [default]) -+ [pic_mode=m4_default([$1], [default])]) - - _LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl - ])# _LT_WITH_PIC -@@ -359,7 +412,7 @@ - [_LT_SET_OPTION([LT_INIT], [pic-only]) - AC_DIAGNOSE([obsolete], - [$0: Remove this warning and the call to _LT_SET_OPTION when you --put the `pic-only' option into LT_INIT's first parameter.]) -+put the 'pic-only' option into LT_INIT's first parameter.]) - ]) - - dnl aclocal-1.4 backwards compatibility: -diff -durN libpipeline-1.4.1.orig/gnulib/m4/ltsugar.m4 libpipeline-1.4.1/gnulib/m4/ltsugar.m4 ---- libpipeline-1.4.1.orig/gnulib/m4/ltsugar.m4 2015-08-17 17:14:17.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/m4/ltsugar.m4 2017-05-17 10:38:08.750000000 +0800 -@@ -1,6 +1,7 @@ - # ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*- - # --# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc. -+# Copyright (C) 2004-2005, 2007-2008, 2011-2015 Free Software -+# Foundation, Inc. - # Written by Gary V. Vaughan, 2004 - # - # This file is free software; the Free Software Foundation gives -@@ -33,7 +34,7 @@ - # ------------ - # Manipulate m4 lists. - # These macros are necessary as long as will still need to support --# Autoconf-2.59 which quotes differently. -+# Autoconf-2.59, which quotes differently. - m4_define([lt_car], [[$1]]) - m4_define([lt_cdr], - [m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])], -@@ -44,7 +45,7 @@ - - # lt_append(MACRO-NAME, STRING, [SEPARATOR]) - # ------------------------------------------ --# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'. -+# Redefine MACRO-NAME to hold its former content plus 'SEPARATOR''STRING'. - # Note that neither SEPARATOR nor STRING are expanded; they are appended - # to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked). - # No SEPARATOR is output if MACRO-NAME was previously undefined (different -diff -durN libpipeline-1.4.1.orig/gnulib/m4/ltversion.m4 libpipeline-1.4.1/gnulib/m4/ltversion.m4 ---- libpipeline-1.4.1.orig/gnulib/m4/ltversion.m4 2015-08-17 17:14:17.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/m4/ltversion.m4 2017-05-17 10:38:12.718750000 +0800 -@@ -1,6 +1,6 @@ - # ltversion.m4 -- version numbers -*- Autoconf -*- - # --# Copyright (C) 2004 Free Software Foundation, Inc. -+# Copyright (C) 2004, 2011-2015 Free Software Foundation, Inc. - # Written by Scott James Remnant, 2004 - # - # This file is free software; the Free Software Foundation gives -@@ -9,15 +9,15 @@ - - # @configure_input@ - --# serial 3337 ltversion.m4 -+# serial 4179 ltversion.m4 - # This file is part of GNU Libtool - --m4_define([LT_PACKAGE_VERSION], [2.4.2]) --m4_define([LT_PACKAGE_REVISION], [1.3337]) -+m4_define([LT_PACKAGE_VERSION], [2.4.6]) -+m4_define([LT_PACKAGE_REVISION], [2.4.6]) - - AC_DEFUN([LTVERSION_VERSION], --[macro_version='2.4.2' --macro_revision='1.3337' -+[macro_version='2.4.6' -+macro_revision='2.4.6' - _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) - _LT_DECL(, macro_revision, 0) - ]) -diff -durN libpipeline-1.4.1.orig/gnulib/m4/malloc.m4 libpipeline-1.4.1/gnulib/m4/malloc.m4 ---- libpipeline-1.4.1.orig/gnulib/m4/malloc.m4 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/m4/malloc.m4 2017-05-17 10:35:49.015625000 +0800 -@@ -1,13 +1,13 @@ --# malloc.m4 serial 14 --dnl Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc. -+# malloc.m4 serial 15 -+dnl Copyright (C) 2007, 2009-2017 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. - - m4_version_prereq([2.70], [] ,[ - --# This is taken from the following Autoconf patch: --# http://git.savannah.gnu.org/gitweb/?p=autoconf.git;a=commitdiff;h=7fbb553727ed7e0e689a17594b58559ecf3ea6e9 -+# This is adapted with modifications from upstream Autoconf here: -+# http://git.savannah.gnu.org/cgit/autoconf.git/commit/?id=04be2b7a29d65d9a08e64e8e56e594c91749598c - AC_DEFUN([_AC_FUNC_MALLOC_IF], - [ - AC_REQUIRE([AC_HEADER_STDC])dnl -@@ -23,7 +23,10 @@ - char *malloc (); - #endif - ]], -- [[return ! malloc (0);]]) -+ [[char *p = malloc (0); -+ int result = !p; -+ free (p); -+ return result;]]) - ], - [ac_cv_func_malloc_0_nonnull=yes], - [ac_cv_func_malloc_0_nonnull=no], -diff -durN libpipeline-1.4.1.orig/gnulib/m4/malloca.m4 libpipeline-1.4.1/gnulib/m4/malloca.m4 ---- libpipeline-1.4.1.orig/gnulib/m4/malloca.m4 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/m4/malloca.m4 2017-05-17 10:35:49.296875000 +0800 -@@ -1,5 +1,5 @@ - # malloca.m4 serial 1 --dnl Copyright (C) 2003-2004, 2006-2007, 2009-2014 Free Software Foundation, -+dnl Copyright (C) 2003-2004, 2006-2007, 2009-2017 Free Software Foundation, - dnl Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -diff -durN libpipeline-1.4.1.orig/gnulib/m4/math_h.m4 libpipeline-1.4.1/gnulib/m4/math_h.m4 ---- libpipeline-1.4.1.orig/gnulib/m4/math_h.m4 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/m4/math_h.m4 2017-05-17 10:35:49.562500000 +0800 -@@ -1,5 +1,5 @@ --# math_h.m4 serial 114 --dnl Copyright (C) 2007-2014 Free Software Foundation, Inc. -+# math_h.m4 serial 115 -+dnl Copyright (C) 2007-2017 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. -@@ -256,11 +256,18 @@ - HAVE_DECL_TRUNC=1; AC_SUBST([HAVE_DECL_TRUNC]) - HAVE_DECL_TRUNCF=1; AC_SUBST([HAVE_DECL_TRUNCF]) - HAVE_DECL_TRUNCL=1; AC_SUBST([HAVE_DECL_TRUNCL]) -+ REPLACE_ACOSF=0; AC_SUBST([REPLACE_ACOSF]) -+ REPLACE_ASINF=0; AC_SUBST([REPLACE_ASINF]) -+ REPLACE_ATANF=0; AC_SUBST([REPLACE_ATANF]) -+ REPLACE_ATAN2F=0; AC_SUBST([REPLACE_ATAN2F]) - REPLACE_CBRTF=0; AC_SUBST([REPLACE_CBRTF]) - REPLACE_CBRTL=0; AC_SUBST([REPLACE_CBRTL]) - REPLACE_CEIL=0; AC_SUBST([REPLACE_CEIL]) - REPLACE_CEILF=0; AC_SUBST([REPLACE_CEILF]) - REPLACE_CEILL=0; AC_SUBST([REPLACE_CEILL]) -+ REPLACE_COSF=0; AC_SUBST([REPLACE_COSF]) -+ REPLACE_COSHF=0; AC_SUBST([REPLACE_COSHF]) -+ REPLACE_EXPF=0; AC_SUBST([REPLACE_EXPF]) - REPLACE_EXPM1=0; AC_SUBST([REPLACE_EXPM1]) - REPLACE_EXPM1F=0; AC_SUBST([REPLACE_EXPM1F]) - REPLACE_EXP2=0; AC_SUBST([REPLACE_EXP2]) -@@ -315,7 +322,12 @@ - REPLACE_ROUNDL=0; AC_SUBST([REPLACE_ROUNDL]) - REPLACE_SIGNBIT=0; AC_SUBST([REPLACE_SIGNBIT]) - REPLACE_SIGNBIT_USING_GCC=0; AC_SUBST([REPLACE_SIGNBIT_USING_GCC]) -+ REPLACE_SINF=0; AC_SUBST([REPLACE_SINF]) -+ REPLACE_SINHF=0; AC_SUBST([REPLACE_SINHF]) -+ REPLACE_SQRTF=0; AC_SUBST([REPLACE_SQRTF]) - REPLACE_SQRTL=0; AC_SUBST([REPLACE_SQRTL]) -+ REPLACE_TANF=0; AC_SUBST([REPLACE_TANF]) -+ REPLACE_TANHF=0; AC_SUBST([REPLACE_TANHF]) - REPLACE_TRUNC=0; AC_SUBST([REPLACE_TRUNC]) - REPLACE_TRUNCF=0; AC_SUBST([REPLACE_TRUNCF]) - REPLACE_TRUNCL=0; AC_SUBST([REPLACE_TRUNCL]) -diff -durN libpipeline-1.4.1.orig/gnulib/m4/memchr.m4 libpipeline-1.4.1/gnulib/m4/memchr.m4 ---- libpipeline-1.4.1.orig/gnulib/m4/memchr.m4 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/m4/memchr.m4 2017-05-17 10:35:49.843750000 +0800 -@@ -1,5 +1,5 @@ - # memchr.m4 serial 12 --dnl Copyright (C) 2002-2004, 2009-2014 Free Software Foundation, Inc. -+dnl Copyright (C) 2002-2004, 2009-2017 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. -diff -durN libpipeline-1.4.1.orig/gnulib/m4/mkdtemp.m4 libpipeline-1.4.1/gnulib/m4/mkdtemp.m4 ---- libpipeline-1.4.1.orig/gnulib/m4/mkdtemp.m4 2014-11-08 21:53:38.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/m4/mkdtemp.m4 2017-05-17 10:35:50.156250000 +0800 -@@ -1,5 +1,5 @@ - # mkdtemp.m4 serial 8 --dnl Copyright (C) 2001-2003, 2006-2007, 2009-2014 Free Software Foundation, -+dnl Copyright (C) 2001-2003, 2006-2007, 2009-2017 Free Software Foundation, - dnl Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -diff -durN libpipeline-1.4.1.orig/gnulib/m4/mmap-anon.m4 libpipeline-1.4.1/gnulib/m4/mmap-anon.m4 ---- libpipeline-1.4.1.orig/gnulib/m4/mmap-anon.m4 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/m4/mmap-anon.m4 2017-05-17 10:35:50.484375000 +0800 -@@ -1,5 +1,5 @@ - # mmap-anon.m4 serial 10 --dnl Copyright (C) 2005, 2007, 2009-2014 Free Software Foundation, Inc. -+dnl Copyright (C) 2005, 2007, 2009-2017 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. -diff -durN libpipeline-1.4.1.orig/gnulib/m4/msvc-inval.m4 libpipeline-1.4.1/gnulib/m4/msvc-inval.m4 ---- libpipeline-1.4.1.orig/gnulib/m4/msvc-inval.m4 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/m4/msvc-inval.m4 2017-05-17 10:35:50.812500000 +0800 -@@ -1,5 +1,5 @@ - # msvc-inval.m4 serial 1 --dnl Copyright (C) 2011-2014 Free Software Foundation, Inc. -+dnl Copyright (C) 2011-2017 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. -diff -durN libpipeline-1.4.1.orig/gnulib/m4/msvc-nothrow.m4 libpipeline-1.4.1/gnulib/m4/msvc-nothrow.m4 ---- libpipeline-1.4.1.orig/gnulib/m4/msvc-nothrow.m4 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/m4/msvc-nothrow.m4 2017-05-17 10:35:51.109375000 +0800 -@@ -1,5 +1,5 @@ - # msvc-nothrow.m4 serial 1 --dnl Copyright (C) 2011-2014 Free Software Foundation, Inc. -+dnl Copyright (C) 2011-2017 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. -diff -durN libpipeline-1.4.1.orig/gnulib/m4/multiarch.m4 libpipeline-1.4.1/gnulib/m4/multiarch.m4 ---- libpipeline-1.4.1.orig/gnulib/m4/multiarch.m4 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/m4/multiarch.m4 2017-05-17 10:35:51.312500000 +0800 -@@ -1,5 +1,5 @@ - # multiarch.m4 serial 7 --dnl Copyright (C) 2008-2014 Free Software Foundation, Inc. -+dnl Copyright (C) 2008-2017 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. -diff -durN libpipeline-1.4.1.orig/gnulib/m4/off_t.m4 libpipeline-1.4.1/gnulib/m4/off_t.m4 ---- libpipeline-1.4.1.orig/gnulib/m4/off_t.m4 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/m4/off_t.m4 2017-05-17 10:35:51.593750000 +0800 -@@ -1,5 +1,5 @@ - # off_t.m4 serial 1 --dnl Copyright (C) 2012-2014 Free Software Foundation, Inc. -+dnl Copyright (C) 2012-2017 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. -diff -durN libpipeline-1.4.1.orig/gnulib/m4/onceonly.m4 libpipeline-1.4.1/gnulib/m4/onceonly.m4 ---- libpipeline-1.4.1.orig/gnulib/m4/onceonly.m4 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/m4/onceonly.m4 2017-05-17 10:35:51.906250000 +0800 -@@ -1,5 +1,5 @@ - # onceonly.m4 serial 9 --dnl Copyright (C) 2002-2003, 2005-2006, 2008-2014 Free Software Foundation, -+dnl Copyright (C) 2002-2003, 2005-2006, 2008-2017 Free Software Foundation, - dnl Inc. - dnl - dnl This file is free software; you can redistribute it and/or modify -diff -durN libpipeline-1.4.1.orig/gnulib/m4/pathmax.m4 libpipeline-1.4.1/gnulib/m4/pathmax.m4 ---- libpipeline-1.4.1.orig/gnulib/m4/pathmax.m4 2014-11-08 21:53:38.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/m4/pathmax.m4 2017-05-17 10:35:52.140625000 +0800 -@@ -1,5 +1,5 @@ - # pathmax.m4 serial 10 --dnl Copyright (C) 2002-2003, 2005-2006, 2009-2014 Free Software Foundation, -+dnl Copyright (C) 2002-2003, 2005-2006, 2009-2017 Free Software Foundation, - dnl Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -diff -durN libpipeline-1.4.1.orig/gnulib/m4/printf.m4 libpipeline-1.4.1/gnulib/m4/printf.m4 ---- libpipeline-1.4.1.orig/gnulib/m4/printf.m4 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/m4/printf.m4 2017-05-17 10:35:52.421875000 +0800 -@@ -1,5 +1,5 @@ --# printf.m4 serial 50 --dnl Copyright (C) 2003, 2007-2014 Free Software Foundation, Inc. -+# printf.m4 serial 53 -+dnl Copyright (C) 2003, 2007-2017 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. -@@ -38,6 +38,8 @@ - if (sprintf (buf, "%ju %d", (uintmax_t) 12345671, 33, 44, 55) < 0 - || strcmp (buf, "12345671 33") != 0) - result |= 1; -+#else -+ result |= 1; - #endif - buf[0] = '\0'; - if (sprintf (buf, "%zu %d", (size_t) 12345672, 33, 44, 55) < 0 -@@ -61,7 +63,7 @@ - # Guess yes on glibc systems. - *-gnu*) gl_cv_func_printf_sizes_c99="guessing yes";; - # Guess yes on FreeBSD >= 5. -- freebsd[1-4]*) gl_cv_func_printf_sizes_c99="guessing no";; -+ freebsd[1-4].*) gl_cv_func_printf_sizes_c99="guessing no";; - freebsd* | kfreebsd*) gl_cv_func_printf_sizes_c99="guessing yes";; - # Guess yes on Mac OS X >= 10.3. - darwin[1-6].*) gl_cv_func_printf_sizes_c99="guessing no";; -@@ -220,7 +222,7 @@ - # Guess yes on glibc systems. - *-gnu*) gl_cv_func_printf_infinite="guessing yes";; - # Guess yes on FreeBSD >= 6. -- freebsd[1-5]*) gl_cv_func_printf_infinite="guessing no";; -+ freebsd[1-5].*) gl_cv_func_printf_infinite="guessing no";; - freebsd* | kfreebsd*) gl_cv_func_printf_infinite="guessing yes";; - # Guess yes on Mac OS X >= 10.3. - darwin[1-6].*) gl_cv_func_printf_infinite="guessing no";; -@@ -328,7 +330,7 @@ - # ifdef WORDS_BIGENDIAN - # define LDBL80_WORDS(exponent,manthi,mantlo) \ - { ((unsigned int) (exponent) << 16) | ((unsigned int) (manthi) >> 16), \ -- ((unsigned int) (manthi) << 16) | (unsigned int) (mantlo) >> 16), \ -+ ((unsigned int) (manthi) << 16) | ((unsigned int) (mantlo) >> 16), \ - (unsigned int) (mantlo) << 16 \ - } - # else -@@ -365,66 +367,51 @@ - { /* Pseudo-NaN. */ - static union { unsigned int word[4]; long double value; } x = - { LDBL80_WORDS (0xFFFF, 0x40000001, 0x00000000) }; -- if (sprintf (buf, "%Lf", x.value) < 0 -- || !strisnan (buf, 0, strlen (buf))) -+ if (sprintf (buf, "%Lf", x.value) <= 0) - result |= 4; -- if (sprintf (buf, "%Le", x.value) < 0 -- || !strisnan (buf, 0, strlen (buf))) -+ if (sprintf (buf, "%Le", x.value) <= 0) - result |= 4; -- if (sprintf (buf, "%Lg", x.value) < 0 -- || !strisnan (buf, 0, strlen (buf))) -+ if (sprintf (buf, "%Lg", x.value) <= 0) - result |= 4; - } - { /* Pseudo-Infinity. */ - static union { unsigned int word[4]; long double value; } x = - { LDBL80_WORDS (0xFFFF, 0x00000000, 0x00000000) }; -- if (sprintf (buf, "%Lf", x.value) < 0 -- || !strisnan (buf, 0, strlen (buf))) -+ if (sprintf (buf, "%Lf", x.value) <= 0) - result |= 8; -- if (sprintf (buf, "%Le", x.value) < 0 -- || !strisnan (buf, 0, strlen (buf))) -+ if (sprintf (buf, "%Le", x.value) <= 0) - result |= 8; -- if (sprintf (buf, "%Lg", x.value) < 0 -- || !strisnan (buf, 0, strlen (buf))) -+ if (sprintf (buf, "%Lg", x.value) <= 0) - result |= 8; - } - { /* Pseudo-Zero. */ - static union { unsigned int word[4]; long double value; } x = - { LDBL80_WORDS (0x4004, 0x00000000, 0x00000000) }; -- if (sprintf (buf, "%Lf", x.value) < 0 -- || !strisnan (buf, 0, strlen (buf))) -+ if (sprintf (buf, "%Lf", x.value) <= 0) - result |= 16; -- if (sprintf (buf, "%Le", x.value) < 0 -- || !strisnan (buf, 0, strlen (buf))) -+ if (sprintf (buf, "%Le", x.value) <= 0) - result |= 16; -- if (sprintf (buf, "%Lg", x.value) < 0 -- || !strisnan (buf, 0, strlen (buf))) -+ if (sprintf (buf, "%Lg", x.value) <= 0) - result |= 16; - } - { /* Unnormalized number. */ - static union { unsigned int word[4]; long double value; } x = - { LDBL80_WORDS (0x4000, 0x63333333, 0x00000000) }; -- if (sprintf (buf, "%Lf", x.value) < 0 -- || !strisnan (buf, 0, strlen (buf))) -+ if (sprintf (buf, "%Lf", x.value) <= 0) - result |= 32; -- if (sprintf (buf, "%Le", x.value) < 0 -- || !strisnan (buf, 0, strlen (buf))) -+ if (sprintf (buf, "%Le", x.value) <= 0) - result |= 32; -- if (sprintf (buf, "%Lg", x.value) < 0 -- || !strisnan (buf, 0, strlen (buf))) -+ if (sprintf (buf, "%Lg", x.value) <= 0) - result |= 32; - } - { /* Pseudo-Denormal. */ - static union { unsigned int word[4]; long double value; } x = - { LDBL80_WORDS (0x0000, 0x83333333, 0x00000000) }; -- if (sprintf (buf, "%Lf", x.value) < 0 -- || !strisnan (buf, 0, strlen (buf))) -+ if (sprintf (buf, "%Lf", x.value) <= 0) - result |= 64; -- if (sprintf (buf, "%Le", x.value) < 0 -- || !strisnan (buf, 0, strlen (buf))) -+ if (sprintf (buf, "%Le", x.value) <= 0) - result |= 64; -- if (sprintf (buf, "%Lg", x.value) < 0 -- || !strisnan (buf, 0, strlen (buf))) -+ if (sprintf (buf, "%Lg", x.value) <= 0) - result |= 64; - } - #endif -@@ -442,7 +429,7 @@ - # Guess yes on glibc systems. - *-gnu*) gl_cv_func_printf_infinite_long_double="guessing yes";; - # Guess yes on FreeBSD >= 6. -- freebsd[1-5]*) gl_cv_func_printf_infinite_long_double="guessing no";; -+ freebsd[1-5].*) gl_cv_func_printf_infinite_long_double="guessing no";; - freebsd* | kfreebsd*) gl_cv_func_printf_infinite_long_double="guessing yes";; - # Guess yes on HP-UX >= 11. - hpux[7-9]* | hpux10*) gl_cv_func_printf_infinite_long_double="guessing no";; -@@ -502,6 +489,13 @@ - && strcmp (buf, "0x6.0ap-2 33") != 0 - && strcmp (buf, "0xc.14p-3 33") != 0)) - result |= 4; -+ /* This catches a Mac OS X 10.12.4 (Darwin 16.5) bug: it doesn't round. */ -+ if (sprintf (buf, "%.0a %d", 1.51, 33, 44, 55) < 0 -+ || (strcmp (buf, "0x2p+0 33") != 0 -+ && strcmp (buf, "0x3p-1 33") != 0 -+ && strcmp (buf, "0x6p-2 33") != 0 -+ && strcmp (buf, "0xcp-3 33") != 0)) -+ result |= 4; - /* This catches a FreeBSD 6.1 bug. See - */ - if (sprintf (buf, "%010a %d", 1.0 / zero, 33, 44, 55) < 0 -@@ -588,7 +582,7 @@ - # Guess yes on glibc systems. - *-gnu*) gl_cv_func_printf_directive_f="guessing yes";; - # Guess yes on FreeBSD >= 6. -- freebsd[1-5]*) gl_cv_func_printf_directive_f="guessing no";; -+ freebsd[1-5].*) gl_cv_func_printf_directive_f="guessing no";; - freebsd* | kfreebsd*) gl_cv_func_printf_directive_f="guessing yes";; - # Guess yes on Mac OS X >= 10.3. - darwin[1-6].*) gl_cv_func_printf_directive_f="guessing no";; -@@ -1136,7 +1130,7 @@ - # Guess yes on glibc systems. - *-gnu*) gl_cv_func_snprintf_truncation_c99="guessing yes";; - # Guess yes on FreeBSD >= 5. -- freebsd[1-4]*) gl_cv_func_snprintf_truncation_c99="guessing no";; -+ freebsd[1-4].*) gl_cv_func_snprintf_truncation_c99="guessing no";; - freebsd* | kfreebsd*) gl_cv_func_snprintf_truncation_c99="guessing yes";; - # Guess yes on Mac OS X >= 10.3. - darwin[1-6].*) gl_cv_func_snprintf_truncation_c99="guessing no";; -@@ -1235,7 +1229,7 @@ - # Guess yes on glibc systems. - *-gnu*) gl_cv_func_snprintf_retval_c99="guessing yes";; - # Guess yes on FreeBSD >= 5. -- freebsd[1-4]*) gl_cv_func_snprintf_retval_c99="guessing no";; -+ freebsd[1-4].*) gl_cv_func_snprintf_retval_c99="guessing no";; - freebsd* | kfreebsd*) gl_cv_func_snprintf_retval_c99="guessing yes";; - # Guess yes on Mac OS X >= 10.3. - darwin[1-6].*) gl_cv_func_snprintf_retval_c99="guessing no";; -@@ -1316,7 +1310,7 @@ - # Guess yes on glibc systems. - *-gnu*) gl_cv_func_snprintf_directive_n="guessing yes";; - # Guess yes on FreeBSD >= 5. -- freebsd[1-4]*) gl_cv_func_snprintf_directive_n="guessing no";; -+ freebsd[1-4].*) gl_cv_func_snprintf_directive_n="guessing no";; - freebsd* | kfreebsd*) gl_cv_func_snprintf_directive_n="guessing yes";; - # Guess yes on Mac OS X >= 10.3. - darwin[1-6].*) gl_cv_func_snprintf_directive_n="guessing no";; -@@ -1458,7 +1452,7 @@ - # Guess yes on glibc systems. - *-gnu*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";; - # Guess yes on FreeBSD >= 5. -- freebsd[1-4]*) gl_cv_func_vsnprintf_zerosize_c99="guessing no";; -+ freebsd[1-4].*) gl_cv_func_vsnprintf_zerosize_c99="guessing no";; - freebsd* | kfreebsd*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";; - # Guess yes on Mac OS X >= 10.3. - darwin[1-6].*) gl_cv_func_vsnprintf_zerosize_c99="guessing no";; -diff -durN libpipeline-1.4.1.orig/gnulib/m4/pthread_rwlock_rdlock.m4 libpipeline-1.4.1/gnulib/m4/pthread_rwlock_rdlock.m4 ---- libpipeline-1.4.1.orig/gnulib/m4/pthread_rwlock_rdlock.m4 1970-01-01 08:00:00.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/m4/pthread_rwlock_rdlock.m4 2017-05-17 10:35:06.625000000 +0800 -@@ -0,0 +1,163 @@ -+# pthread_rwlock_rdlock.m4 serial 1 -+dnl Copyright (C) 2017 Free Software Foundation, Inc. -+dnl This file is free software; the Free Software Foundation -+dnl gives unlimited permission to copy and/or distribute it, -+dnl with or without modifications, as long as this notice is preserved. -+ -+dnl From Bruno Haible. -+dnl Inspired by -+dnl https://github.com/linux-test-project/ltp/blob/master/testcases/open_posix_testsuite/conformance/interfaces/pthread_rwlock_rdlock/2-2.c -+dnl by Intel Corporation. -+ -+dnl Test whether in a situation where -+dnl - an rwlock is taken by a reader and has a writer waiting, -+dnl - an additional reader requests the lock, -+dnl - the waiting writer and the requesting reader threads have the same -+dnl priority, -+dnl the requesting reader thread gets blocked, so that at some point the -+dnl waiting writer can acquire the lock. -+dnl Without such a guarantee, when there a N readers and each of the readers -+dnl spends more than 1/Nth of the time with the lock held, there is a high -+dnl probability that the waiting writer will not get the lock in a given finite -+dnl time, a phenomenon called "writer starvation". -+dnl Without such a guarantee, applications have a hard time avoiding writer -+dnl starvation. -+dnl -+dnl POSIX:2008 makes this requirement only for implementations that support TPS -+dnl (Thread Priority Scheduling) and only for the scheduling policies SCHED_FIFO -+dnl and SCHED_RR, see -+dnl http://pubs.opengroup.org/onlinepubs/9699919799/functions/pthread_rwlock_rdlock.html -+dnl but test verifies the guarantee regardless of TPS and regardless of -+dnl scheduling policy. -+AC_DEFUN([gl_PTHREAD_RWLOCK_RDLOCK_PREFER_WRITER], -+[ -+ AC_REQUIRE([gl_THREADLIB_EARLY]) -+ AC_CACHE_CHECK([whether pthread_rwlock_rdlock prefers a writer to a reader], -+ [gl_cv_pthread_rwlock_rdlock_prefer_writer], -+ [save_LIBS="$LIBS" -+ LIBS="$LIBS $LIBMULTITHREAD" -+ AC_RUN_IFELSE( -+ [AC_LANG_SOURCE([[ -+#include -+#include -+#include -+#include -+ -+#define SUCCEED() exit (0) -+#define FAILURE() exit (1) -+#define UNEXPECTED(n) (exit (10 + (n))) -+ -+/* The main thread creates the waiting writer and the requesting reader threads -+ in the default way; this guarantees that they have the same priority. -+ We can reuse the main thread as first reader thread. */ -+ -+static pthread_rwlock_t lock; -+static pthread_t reader1; -+static pthread_t writer; -+static pthread_t reader2; -+static pthread_t timer; -+/* Used to pass control from writer to reader2 and from reader2 to timer, -+ as in a relay race. -+ Passing control from one running thread to another running thread -+ is most likely faster than to create the second thread. */ -+static pthread_mutex_t baton; -+ -+static void * -+timer_func (void *ignored) -+{ -+ /* Step 13 (can be before or after step 12): -+ The timer thread takes the baton, then waits a moment to make sure -+ it can tell whether the second reader thread is blocked at step 12. */ -+ if (pthread_mutex_lock (&baton)) -+ UNEXPECTED (13); -+ usleep (100000); -+ /* By the time we get here, it's clear that the second reader thread is -+ blocked at step 12. This is the desired behaviour. */ -+ SUCCEED (); -+} -+ -+static void * -+reader2_func (void *ignored) -+{ -+ int err; -+ -+ /* Step 8 (can be before or after step 7): -+ The second reader thread takes the baton, then waits a moment to make sure -+ the writer thread has reached step 7. */ -+ if (pthread_mutex_lock (&baton)) -+ UNEXPECTED (8); -+ usleep (100000); -+ /* Step 9: The second reader thread requests the lock. */ -+ err = pthread_rwlock_tryrdlock (&lock); -+ if (err == 0) -+ FAILURE (); -+ else if (err != EBUSY) -+ UNEXPECTED (9); -+ /* Step 10: Launch a timer, to test whether the next call blocks. */ -+ if (pthread_create (&timer, NULL, timer_func, NULL)) -+ UNEXPECTED (10); -+ /* Step 11: Release the baton. */ -+ if (pthread_mutex_unlock (&baton)) -+ UNEXPECTED (11); -+ /* Step 12: The second reader thread requests the lock. */ -+ err = pthread_rwlock_rdlock (&lock); -+ if (err == 0) -+ FAILURE (); -+ else -+ UNEXPECTED (12); -+} -+ -+static void * -+writer_func (void *ignored) -+{ -+ /* Step 4: Take the baton, so that the second reader thread does not go ahead -+ too early. */ -+ if (pthread_mutex_lock (&baton)) -+ UNEXPECTED (4); -+ /* Step 5: Create the second reader thread. */ -+ if (pthread_create (&reader2, NULL, reader2_func, NULL)) -+ UNEXPECTED (5); -+ /* Step 6: Release the baton. */ -+ if (pthread_mutex_unlock (&baton)) -+ UNEXPECTED (6); -+ /* Step 7: The writer thread requests the lock. */ -+ if (pthread_rwlock_wrlock (&lock)) -+ UNEXPECTED (7); -+ return NULL; -+} -+ -+int -+main () -+{ -+ reader1 = pthread_self (); -+ -+ /* Step 1: The main thread initializes the lock and the baton. */ -+ if (pthread_rwlock_init (&lock, NULL)) -+ UNEXPECTED (1); -+ if (pthread_mutex_init (&baton, NULL)) -+ UNEXPECTED (1); -+ /* Step 2: The main thread acquires the lock as a reader. */ -+ if (pthread_rwlock_rdlock (&lock)) -+ UNEXPECTED (2); -+ /* Step 3: Create the writer thread. */ -+ if (pthread_create (&writer, NULL, writer_func, NULL)) -+ UNEXPECTED (3); -+ /* Job done. Go to sleep. */ -+ for (;;) -+ { -+ sleep (1); -+ } -+} -+]])], -+ [gl_cv_pthread_rwlock_rdlock_prefer_writer=yes], -+ [gl_cv_pthread_rwlock_rdlock_prefer_writer=no], -+ [gl_cv_pthread_rwlock_rdlock_prefer_writer="guessing yes"]) -+ LIBS="$save_LIBS" -+ ]) -+ case "$gl_cv_pthread_rwlock_rdlock_prefer_writer" in -+ *yes) -+ AC_DEFINE([HAVE_PTHREAD_RWLOCK_RDLOCK_PREFER_WRITER], [1], -+ [Define if the 'pthread_rwlock_rdlock' function prefers a writer to a reader.]) -+ ;; -+ esac -+]) -diff -durN libpipeline-1.4.1.orig/gnulib/m4/raise.m4 libpipeline-1.4.1/gnulib/m4/raise.m4 ---- libpipeline-1.4.1.orig/gnulib/m4/raise.m4 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/m4/raise.m4 2017-05-17 10:35:52.671875000 +0800 -@@ -1,5 +1,5 @@ --# raise.m4 serial 3 --dnl Copyright (C) 2011-2014 Free Software Foundation, Inc. -+# raise.m4 serial 4 -+dnl Copyright (C) 2011-2017 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. -@@ -8,14 +8,16 @@ - [ - AC_REQUIRE([gl_SIGNAL_H_DEFAULTS]) - AC_REQUIRE([AC_CANONICAL_HOST]) -- AC_REQUIRE([gl_MSVC_INVAL]) - AC_CHECK_FUNCS([raise]) - if test $ac_cv_func_raise = no; then - HAVE_RAISE=0 - else -- if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then -- REPLACE_RAISE=1 -- fi -+ m4_ifdef([gl_MSVC_INVAL], [ -+ AC_REQUIRE([gl_MSVC_INVAL]) -+ if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then -+ REPLACE_RAISE=1 -+ fi -+ ]) - m4_ifdef([gl_SIGNALBLOCKING], [ - gl_SIGNALBLOCKING - if test $HAVE_POSIX_SIGNALBLOCKING = 0; then -diff -durN libpipeline-1.4.1.orig/gnulib/m4/read.m4 libpipeline-1.4.1/gnulib/m4/read.m4 ---- libpipeline-1.4.1.orig/gnulib/m4/read.m4 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/m4/read.m4 2017-05-17 10:35:52.984375000 +0800 -@@ -1,5 +1,5 @@ --# read.m4 serial 4 --dnl Copyright (C) 2011-2014 Free Software Foundation, Inc. -+# read.m4 serial 5 -+dnl Copyright (C) 2011-2017 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. -@@ -7,10 +7,12 @@ - AC_DEFUN([gl_FUNC_READ], - [ - AC_REQUIRE([gl_UNISTD_H_DEFAULTS]) -- AC_REQUIRE([gl_MSVC_INVAL]) -- if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then -- REPLACE_READ=1 -- fi -+ m4_ifdef([gl_MSVC_INVAL], [ -+ AC_REQUIRE([gl_MSVC_INVAL]) -+ if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then -+ REPLACE_READ=1 -+ fi -+ ]) - dnl This ifdef is just an optimization, to avoid performing a configure - dnl check whose result is not used. It does not make the test of - dnl GNULIB_UNISTD_H_NONBLOCKING or GNULIB_NONBLOCKING redundant. -diff -durN libpipeline-1.4.1.orig/gnulib/m4/safe-read.m4 libpipeline-1.4.1/gnulib/m4/safe-read.m4 ---- libpipeline-1.4.1.orig/gnulib/m4/safe-read.m4 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/m4/safe-read.m4 2017-05-17 10:35:53.359375000 +0800 -@@ -1,5 +1,5 @@ - # safe-read.m4 serial 6 --dnl Copyright (C) 2002-2003, 2005-2006, 2009-2014 Free Software Foundation, -+dnl Copyright (C) 2002-2003, 2005-2006, 2009-2017 Free Software Foundation, - dnl Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -diff -durN libpipeline-1.4.1.orig/gnulib/m4/safe-write.m4 libpipeline-1.4.1/gnulib/m4/safe-write.m4 ---- libpipeline-1.4.1.orig/gnulib/m4/safe-write.m4 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/m4/safe-write.m4 2017-05-17 10:35:53.578125000 +0800 -@@ -1,5 +1,5 @@ - # safe-write.m4 serial 4 --dnl Copyright (C) 2002, 2005-2006, 2009-2014 Free Software Foundation, Inc. -+dnl Copyright (C) 2002, 2005-2006, 2009-2017 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. -diff -durN libpipeline-1.4.1.orig/gnulib/m4/secure_getenv.m4 libpipeline-1.4.1/gnulib/m4/secure_getenv.m4 ---- libpipeline-1.4.1.orig/gnulib/m4/secure_getenv.m4 2014-11-08 21:53:38.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/m4/secure_getenv.m4 2017-05-17 10:35:53.796875000 +0800 -@@ -1,5 +1,5 @@ - # Look up an environment variable more securely. --dnl Copyright 2013-2014 Free Software Foundation, Inc. -+dnl Copyright 2013-2017 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. -@@ -22,4 +22,5 @@ - if test $ac_cv_func___secure_getenv = no; then - AC_CHECK_FUNCS([issetugid]) - fi -+ AC_CHECK_FUNCS_ONCE([getuid geteuid getgid getegid]) - ]) -diff -durN libpipeline-1.4.1.orig/gnulib/m4/setenv.m4 libpipeline-1.4.1/gnulib/m4/setenv.m4 ---- libpipeline-1.4.1.orig/gnulib/m4/setenv.m4 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/m4/setenv.m4 2017-05-17 10:35:54.125000000 +0800 -@@ -1,5 +1,5 @@ - # setenv.m4 serial 26 --dnl Copyright (C) 2001-2004, 2006-2014 Free Software Foundation, Inc. -+dnl Copyright (C) 2001-2004, 2006-2017 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. -diff -durN libpipeline-1.4.1.orig/gnulib/m4/sigaction.m4 libpipeline-1.4.1/gnulib/m4/sigaction.m4 ---- libpipeline-1.4.1.orig/gnulib/m4/sigaction.m4 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/m4/sigaction.m4 2017-05-17 10:35:54.421875000 +0800 -@@ -1,5 +1,5 @@ - # sigaction.m4 serial 7 --dnl Copyright (C) 2008-2014 Free Software Foundation, Inc. -+dnl Copyright (C) 2008-2017 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. -diff -durN libpipeline-1.4.1.orig/gnulib/m4/signal_h.m4 libpipeline-1.4.1/gnulib/m4/signal_h.m4 ---- libpipeline-1.4.1.orig/gnulib/m4/signal_h.m4 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/m4/signal_h.m4 2017-05-17 10:35:54.703125000 +0800 -@@ -1,5 +1,5 @@ - # signal_h.m4 serial 18 --dnl Copyright (C) 2007-2014 Free Software Foundation, Inc. -+dnl Copyright (C) 2007-2017 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. -diff -durN libpipeline-1.4.1.orig/gnulib/m4/signalblocking.m4 libpipeline-1.4.1/gnulib/m4/signalblocking.m4 ---- libpipeline-1.4.1.orig/gnulib/m4/signalblocking.m4 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/m4/signalblocking.m4 2017-05-17 10:35:54.953125000 +0800 -@@ -1,5 +1,5 @@ - # signalblocking.m4 serial 14 --dnl Copyright (C) 2001-2002, 2006-2014 Free Software Foundation, Inc. -+dnl Copyright (C) 2001-2002, 2006-2017 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. -diff -durN libpipeline-1.4.1.orig/gnulib/m4/size_max.m4 libpipeline-1.4.1/gnulib/m4/size_max.m4 ---- libpipeline-1.4.1.orig/gnulib/m4/size_max.m4 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/m4/size_max.m4 2017-05-17 10:35:55.218750000 +0800 -@@ -1,5 +1,5 @@ - # size_max.m4 serial 10 --dnl Copyright (C) 2003, 2005-2006, 2008-2014 Free Software Foundation, Inc. -+dnl Copyright (C) 2003, 2005-2006, 2008-2017 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. -diff -durN libpipeline-1.4.1.orig/gnulib/m4/snprintf.m4 libpipeline-1.4.1/gnulib/m4/snprintf.m4 ---- libpipeline-1.4.1.orig/gnulib/m4/snprintf.m4 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/m4/snprintf.m4 2017-05-17 10:35:55.500000000 +0800 -@@ -1,5 +1,5 @@ --# snprintf.m4 serial 6 --dnl Copyright (C) 2002-2004, 2007-2014 Free Software Foundation, Inc. -+# snprintf.m4 serial 7 -+dnl Copyright (C) 2002-2004, 2007-2017 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. -@@ -46,6 +46,14 @@ - AC_LIBOBJ([snprintf]) - if test $ac_cv_func_snprintf = yes; then - REPLACE_SNPRINTF=1 -+ else -+ AC_CHECK_DECLS_ONCE([snprintf]) -+ if test $ac_cv_have_decl_snprintf = yes; then -+ dnl If the function is declared but does not appear to exist, it may be -+ dnl defined as an inline function. In order to avoid a conflict, we have -+ dnl to define rpl_snprintf, not snprintf. -+ REPLACE_SNPRINTF=1 -+ fi - fi - gl_PREREQ_SNPRINTF - ]) -diff -durN libpipeline-1.4.1.orig/gnulib/m4/ssize_t.m4 libpipeline-1.4.1/gnulib/m4/ssize_t.m4 ---- libpipeline-1.4.1.orig/gnulib/m4/ssize_t.m4 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/m4/ssize_t.m4 2017-05-17 10:35:55.812500000 +0800 -@@ -1,5 +1,5 @@ - # ssize_t.m4 serial 5 (gettext-0.18.2) --dnl Copyright (C) 2001-2003, 2006, 2010-2014 Free Software Foundation, Inc. -+dnl Copyright (C) 2001-2003, 2006, 2010-2017 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. -diff -durN libpipeline-1.4.1.orig/gnulib/m4/stat.m4 libpipeline-1.4.1/gnulib/m4/stat.m4 ---- libpipeline-1.4.1.orig/gnulib/m4/stat.m4 2014-11-08 21:53:38.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/m4/stat.m4 2017-05-17 10:35:56.078125000 +0800 -@@ -1,6 +1,6 @@ --# serial 11 -+# serial 12 - --# Copyright (C) 2009-2014 Free Software Foundation, Inc. -+# Copyright (C) 2009-2017 Free Software Foundation, Inc. - # - # This file is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, -@@ -8,64 +8,60 @@ - - AC_DEFUN([gl_FUNC_STAT], - [ -- AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles -+ AC_REQUIRE([AC_CANONICAL_HOST]) - AC_REQUIRE([gl_SYS_STAT_H_DEFAULTS]) - AC_CHECK_FUNCS_ONCE([lstat]) -- dnl mingw is the only known platform where stat(".") and stat("./") differ -- AC_CACHE_CHECK([whether stat handles trailing slashes on directories], -- [gl_cv_func_stat_dir_slash], -- [AC_RUN_IFELSE( -- [AC_LANG_PROGRAM( -- [[#include --]], [[struct stat st; return stat (".", &st) != stat ("./", &st);]])], -- [gl_cv_func_stat_dir_slash=yes], [gl_cv_func_stat_dir_slash=no], -- [case $host_os in -- mingw*) gl_cv_func_stat_dir_slash="guessing no";; -- *) gl_cv_func_stat_dir_slash="guessing yes";; -- esac])]) -- dnl AIX 7.1, Solaris 9, mingw64 mistakenly succeed on stat("file/"). -- dnl (For mingw, this is due to a broken stat() override in libmingwex.a.) -- dnl FreeBSD 7.2 mistakenly succeeds on stat("link-to-file/"). -- AC_CACHE_CHECK([whether stat handles trailing slashes on files], -- [gl_cv_func_stat_file_slash], -- [touch conftest.tmp -- # Assume that if we have lstat, we can also check symlinks. -- if test $ac_cv_func_lstat = yes; then -- ln -s conftest.tmp conftest.lnk -- fi -- AC_RUN_IFELSE( -- [AC_LANG_PROGRAM( -- [[#include -+ case "$host_os" in -+ mingw*) -+ dnl On this platform, the original stat() returns st_atime, st_mtime, -+ dnl st_ctime values that are affected by the time zone. -+ REPLACE_STAT=1 -+ ;; -+ *) -+ dnl AIX 7.1, Solaris 9, mingw64 mistakenly succeed on stat("file/"). -+ dnl (For mingw, this is due to a broken stat() override in libmingwex.a.) -+ dnl FreeBSD 7.2 mistakenly succeeds on stat("link-to-file/"). -+ AC_CACHE_CHECK([whether stat handles trailing slashes on files], -+ [gl_cv_func_stat_file_slash], -+ [touch conftest.tmp -+ # Assume that if we have lstat, we can also check symlinks. -+ if test $ac_cv_func_lstat = yes; then -+ ln -s conftest.tmp conftest.lnk -+ fi -+ AC_RUN_IFELSE( -+ [AC_LANG_PROGRAM( -+ [[#include - ]], [[int result = 0; -- struct stat st; -- if (!stat ("conftest.tmp/", &st)) -- result |= 1; -+ struct stat st; -+ if (!stat ("conftest.tmp/", &st)) -+ result |= 1; - #if HAVE_LSTAT -- if (!stat ("conftest.lnk/", &st)) -- result |= 2; -+ if (!stat ("conftest.lnk/", &st)) -+ result |= 2; - #endif -- return result; -- ]])], -- [gl_cv_func_stat_file_slash=yes], [gl_cv_func_stat_file_slash=no], -- [case "$host_os" in -- # Guess yes on glibc systems. -- *-gnu*) gl_cv_func_stat_file_slash="guessing yes" ;; -- # If we don't know, assume the worst. -- *) gl_cv_func_stat_file_slash="guessing no" ;; -- esac -- ]) -- rm -f conftest.tmp conftest.lnk]) -- case $gl_cv_func_stat_dir_slash in -- *no) REPLACE_STAT=1 -- AC_DEFINE([REPLACE_FUNC_STAT_DIR], [1], [Define to 1 if stat needs -- help when passed a directory name with a trailing slash]);; -- esac -- case $gl_cv_func_stat_file_slash in -- *no) REPLACE_STAT=1 -- AC_DEFINE([REPLACE_FUNC_STAT_FILE], [1], [Define to 1 if stat needs -- help when passed a file name with a trailing slash]);; -+ return result; -+ ]])], -+ [gl_cv_func_stat_file_slash=yes], [gl_cv_func_stat_file_slash=no], -+ [case "$host_os" in -+ # Guess yes on glibc systems. -+ *-gnu*) gl_cv_func_stat_file_slash="guessing yes" ;; -+ # If we don't know, assume the worst. -+ *) gl_cv_func_stat_file_slash="guessing no" ;; -+ esac -+ ]) -+ rm -f conftest.tmp conftest.lnk]) -+ case $gl_cv_func_stat_file_slash in -+ *no) -+ REPLACE_STAT=1 -+ AC_DEFINE([REPLACE_FUNC_STAT_FILE], [1], [Define to 1 if stat needs -+ help when passed a file name with a trailing slash]);; -+ esac -+ ;; - esac - ]) - --# Prerequisites of lib/stat.c. --AC_DEFUN([gl_PREREQ_STAT], [:]) -+# Prerequisites of lib/stat.c and lib/stat-w32.c. -+AC_DEFUN([gl_PREREQ_STAT], [ -+ AC_REQUIRE([gl_HEADER_SYS_STAT_H]) -+ : -+]) -diff -durN libpipeline-1.4.1.orig/gnulib/m4/stdarg.m4 libpipeline-1.4.1/gnulib/m4/stdarg.m4 ---- libpipeline-1.4.1.orig/gnulib/m4/stdarg.m4 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/m4/stdarg.m4 2017-05-17 10:35:56.296875000 +0800 -@@ -1,5 +1,5 @@ - # stdarg.m4 serial 6 --dnl Copyright (C) 2006, 2008-2014 Free Software Foundation, Inc. -+dnl Copyright (C) 2006, 2008-2017 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. -diff -durN libpipeline-1.4.1.orig/gnulib/m4/stdbool.m4 libpipeline-1.4.1/gnulib/m4/stdbool.m4 ---- libpipeline-1.4.1.orig/gnulib/m4/stdbool.m4 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/m4/stdbool.m4 2017-05-17 10:35:56.531250000 +0800 -@@ -1,11 +1,11 @@ - # Check for stdbool.h that conforms to C99. - --dnl Copyright (C) 2002-2006, 2009-2014 Free Software Foundation, Inc. -+dnl Copyright (C) 2002-2006, 2009-2017 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. - --#serial 5 -+#serial 7 - - # Prepare for substituting if it is not supported. - -@@ -43,56 +43,64 @@ - [AC_LANG_PROGRAM( - [[ - #include -- #ifndef bool -- "error: bool is not defined" -- #endif -- #ifndef false -- "error: false is not defined" -- #endif -- #if false -- "error: false is not 0" -- #endif -- #ifndef true -- "error: true is not defined" -- #endif -- #if true != 1 -- "error: true is not 1" -+ -+ #ifdef __cplusplus -+ typedef bool Bool; -+ #else -+ typedef _Bool Bool; -+ #ifndef bool -+ "error: bool is not defined" -+ #endif -+ #ifndef false -+ "error: false is not defined" -+ #endif -+ #if false -+ "error: false is not 0" -+ #endif -+ #ifndef true -+ "error: true is not defined" -+ #endif -+ #if true != 1 -+ "error: true is not 1" -+ #endif - #endif -+ - #ifndef __bool_true_false_are_defined - "error: __bool_true_false_are_defined is not defined" - #endif - -- struct s { _Bool s: 1; _Bool t; } s; -+ struct s { Bool s: 1; Bool t; bool u: 1; bool v; } s; - - char a[true == 1 ? 1 : -1]; - char b[false == 0 ? 1 : -1]; - char c[__bool_true_false_are_defined == 1 ? 1 : -1]; - char d[(bool) 0.5 == true ? 1 : -1]; - /* See body of main program for 'e'. */ -- char f[(_Bool) 0.0 == false ? 1 : -1]; -+ char f[(Bool) 0.0 == false ? 1 : -1]; - char g[true]; -- char h[sizeof (_Bool)]; -+ char h[sizeof (Bool)]; - char i[sizeof s.t]; - enum { j = false, k = true, l = false * true, m = true * 256 }; - /* The following fails for - HP aC++/ANSI C B3910B A.05.55 [Dec 04 2003]. */ -- _Bool n[m]; -+ Bool n[m]; - char o[sizeof n == m * sizeof n[0] ? 1 : -1]; -- char p[-1 - (_Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1]; -+ char p[-1 - (Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1]; - /* Catch a bug in an HP-UX C compiler. See - http://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html - http://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html - */ -- _Bool q = true; -- _Bool *pq = &q; -+ Bool q = true; -+ Bool *pq = &q; -+ bool *qq = &q; - ]], - [[ - bool e = &s; -- *pq |= q; -- *pq |= ! q; -+ *pq |= q; *pq |= ! q; -+ *qq |= q; *qq |= ! q; - /* Refer to every declared value, to avoid compiler optimizations. */ - return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !!j + !k + !!l -- + !m + !n + !o + !p + !q + !pq); -+ + !m + !n + !o + !p + !q + !pq + !qq); - ]])], - [ac_cv_header_stdbool_h=yes], - [ac_cv_header_stdbool_h=no])]) -diff -durN libpipeline-1.4.1.orig/gnulib/m4/stddef_h.m4 libpipeline-1.4.1/gnulib/m4/stddef_h.m4 ---- libpipeline-1.4.1.orig/gnulib/m4/stddef_h.m4 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/m4/stddef_h.m4 2017-05-17 10:35:56.781250000 +0800 -@@ -1,6 +1,6 @@ --dnl A placeholder for POSIX 2008 , for platforms that have issues. --# stddef_h.m4 serial 4 --dnl Copyright (C) 2009-2014 Free Software Foundation, Inc. -+dnl A placeholder for , for platforms that have issues. -+# stddef_h.m4 serial 5 -+dnl Copyright (C) 2009-2017 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. -@@ -10,6 +10,9 @@ - AC_REQUIRE([gl_STDDEF_H_DEFAULTS]) - AC_REQUIRE([gt_TYPE_WCHAR_T]) - STDDEF_H= -+ AC_CHECK_TYPE([max_align_t], [], [HAVE_MAX_ALIGN_T=0; STDDEF_H=stddef.h], -+ [[#include -+ ]]) - if test $gt_cv_c_wchar_t = no; then - HAVE_WCHAR_T=0 - STDDEF_H=stddef.h -@@ -43,5 +46,6 @@ - [ - dnl Assume proper GNU behavior unless another module says otherwise. - REPLACE_NULL=0; AC_SUBST([REPLACE_NULL]) -+ HAVE_MAX_ALIGN_T=1; AC_SUBST([HAVE_MAX_ALIGN_T]) - HAVE_WCHAR_T=1; AC_SUBST([HAVE_WCHAR_T]) - ]) -diff -durN libpipeline-1.4.1.orig/gnulib/m4/stdint.m4 libpipeline-1.4.1/gnulib/m4/stdint.m4 ---- libpipeline-1.4.1.orig/gnulib/m4/stdint.m4 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/m4/stdint.m4 2017-05-17 10:35:57.078125000 +0800 -@@ -1,5 +1,5 @@ --# stdint.m4 serial 43 --dnl Copyright (C) 2001-2014 Free Software Foundation, Inc. -+# stdint.m4 serial 50 -+dnl Copyright (C) 2001-2017 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. -@@ -11,6 +11,9 @@ - [ - AC_PREREQ([2.59])dnl - -+ AC_REQUIRE([gl_LIMITS_H]) -+ AC_REQUIRE([gt_TYPE_WINT_T]) -+ - dnl Check for long long int and unsigned long long int. - AC_REQUIRE([AC_TYPE_LONG_LONG_INT]) - if test $ac_cv_type_long_long_int = yes; then -@@ -70,6 +73,8 @@ - AC_COMPILE_IFELSE([ - AC_LANG_PROGRAM([[ - #define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 /* work if build isn't clean */ -+#define __STDC_CONSTANT_MACROS 1 -+#define __STDC_LIMIT_MACROS 1 - #include - /* Dragonfly defines WCHAR_MIN, WCHAR_MAX only in . */ - #if !(defined WCHAR_MIN && defined WCHAR_MAX) -@@ -150,6 +155,15 @@ - intmax_t i = INTMAX_MAX; - uintmax_t j = UINTMAX_MAX; - -+/* Check that SIZE_MAX has the correct type, if possible. */ -+#if 201112 <= __STDC_VERSION__ -+int k = _Generic (SIZE_MAX, size_t: 0); -+#elif (2 <= __GNUC__ || defined __IBM__TYPEOF__ \ -+ || (0x5110 <= __SUNPRO_C && !__STDC__)) -+extern size_t k; -+extern __typeof__ (SIZE_MAX) k; -+#endif -+ - #include /* for CHAR_BIT */ - #define TYPE_MINIMUM(t) \ - ((t) ((t) 0 < (t) -1 ? (t) 0 : ~ TYPE_MAXIMUM (t))) -@@ -218,6 +232,8 @@ - AC_RUN_IFELSE([ - AC_LANG_PROGRAM([[ - #define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 /* work if build isn't clean */ -+#define __STDC_CONSTANT_MACROS 1 -+#define __STDC_LIMIT_MACROS 1 - #include - ] - gl_STDINT_INCLUDES -@@ -278,28 +294,74 @@ - ]) - ]) - fi -+ -+ HAVE_C99_STDINT_H=0 -+ HAVE_SYS_BITYPES_H=0 -+ HAVE_SYS_INTTYPES_H=0 -+ STDINT_H=stdint.h - if test "$gl_cv_header_working_stdint_h" = yes; then -- STDINT_H= -+ HAVE_C99_STDINT_H=1 -+ dnl Now see whether the system works without -+ dnl __STDC_CONSTANT_MACROS/__STDC_LIMIT_MACROS defined. -+ AC_CACHE_CHECK([whether stdint.h predates C++11], -+ [gl_cv_header_stdint_predates_cxx11_h], -+ [gl_cv_header_stdint_predates_cxx11_h=yes -+ AC_COMPILE_IFELSE([ -+ AC_LANG_PROGRAM([[ -+#define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 /* work if build isn't clean */ -+#include -+] -+gl_STDINT_INCLUDES -+[ -+intmax_t im = INTMAX_MAX; -+int32_t i32 = INT32_C (0x7fffffff); -+ ]])], -+ [gl_cv_header_stdint_predates_cxx11_h=no])]) -+ -+ if test "$gl_cv_header_stdint_predates_cxx11_h" = yes; then -+ AC_DEFINE([__STDC_CONSTANT_MACROS], [1], -+ [Define to 1 if the system predates C++11.]) -+ AC_DEFINE([__STDC_LIMIT_MACROS], [1], -+ [Define to 1 if the system predates C++11.]) -+ fi -+ AC_CACHE_CHECK([whether stdint.h has UINTMAX_WIDTH etc.], -+ [gl_cv_header_stdint_width], -+ [gl_cv_header_stdint_width=no -+ AC_COMPILE_IFELSE( -+ [AC_LANG_PROGRAM([[ -+ /* Work if build is not clean. */ -+ #define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 -+ #ifndef __STDC_WANT_IEC_60559_BFP_EXT__ -+ #define __STDC_WANT_IEC_60559_BFP_EXT__ 1 -+ #endif -+ #include -+ ]gl_STDINT_INCLUDES[ -+ int iw = UINTMAX_WIDTH; -+ ]])], -+ [gl_cv_header_stdint_width=yes])]) -+ if test "$gl_cv_header_stdint_width" = yes; then -+ STDINT_H= -+ fi - else - dnl Check for , and for - dnl (used in Linux libc4 >= 4.6.7 and libc5). - AC_CHECK_HEADERS([sys/inttypes.h sys/bitypes.h]) - if test $ac_cv_header_sys_inttypes_h = yes; then - HAVE_SYS_INTTYPES_H=1 -- else -- HAVE_SYS_INTTYPES_H=0 - fi -- AC_SUBST([HAVE_SYS_INTTYPES_H]) - if test $ac_cv_header_sys_bitypes_h = yes; then - HAVE_SYS_BITYPES_H=1 -- else -- HAVE_SYS_BITYPES_H=0 - fi -- AC_SUBST([HAVE_SYS_BITYPES_H]) -- - gl_STDINT_TYPE_PROPERTIES -- STDINT_H=stdint.h - fi -+ -+ dnl The substitute stdint.h needs the substitute limit.h's _GL_INTEGER_WIDTH. -+ LIMITS_H=limits.h -+ AM_CONDITIONAL([GL_GENERATE_LIMITS_H], [test -n "$LIMITS_H"]) -+ -+ AC_SUBST([HAVE_C99_STDINT_H]) -+ AC_SUBST([HAVE_SYS_BITYPES_H]) -+ AC_SUBST([HAVE_SYS_INTTYPES_H]) - AC_SUBST([STDINT_H]) - AM_CONDITIONAL([GL_GENERATE_STDINT_H], [test -n "$STDINT_H"]) - ]) -@@ -467,7 +529,7 @@ - dnl requirement that wint_t is "unchanged by default argument promotions". - dnl In this case gnulib's and override wint_t. - dnl Set the variable BITSIZEOF_WINT_T accordingly. -- if test $BITSIZEOF_WINT_T -lt 32; then -+ if test $GNULIB_OVERRIDES_WINT_T = 1; then - BITSIZEOF_WINT_T=32 - fi - ]) -@@ -477,8 +539,3 @@ - m4_ifdef([AC_COMPUTE_INT], [], [ - AC_DEFUN([AC_COMPUTE_INT], [_AC_COMPUTE_INT([$2],[$1],[$3],[$4])]) - ]) -- --# Hey Emacs! --# Local Variables: --# indent-tabs-mode: nil --# End: -diff -durN libpipeline-1.4.1.orig/gnulib/m4/stdint_h.m4 libpipeline-1.4.1/gnulib/m4/stdint_h.m4 ---- libpipeline-1.4.1.orig/gnulib/m4/stdint_h.m4 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/m4/stdint_h.m4 2017-05-17 10:35:57.359375000 +0800 -@@ -1,5 +1,5 @@ - # stdint_h.m4 serial 9 --dnl Copyright (C) 1997-2004, 2006, 2008-2014 Free Software Foundation, Inc. -+dnl Copyright (C) 1997-2004, 2006, 2008-2017 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. -diff -durN libpipeline-1.4.1.orig/gnulib/m4/stdio_h.m4 libpipeline-1.4.1/gnulib/m4/stdio_h.m4 ---- libpipeline-1.4.1.orig/gnulib/m4/stdio_h.m4 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/m4/stdio_h.m4 2017-05-17 10:35:57.656250000 +0800 -@@ -1,14 +1,45 @@ --# stdio_h.m4 serial 43 --dnl Copyright (C) 2007-2014 Free Software Foundation, Inc. -+# stdio_h.m4 serial 48 -+dnl Copyright (C) 2007-2017 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. - - AC_DEFUN([gl_STDIO_H], - [ -+ AH_VERBATIM([MINGW_ANSI_STDIO], -+[/* Use GNU style printf and scanf. */ -+#ifndef __USE_MINGW_ANSI_STDIO -+# undef __USE_MINGW_ANSI_STDIO -+#endif -+]) -+ AC_DEFINE([__USE_MINGW_ANSI_STDIO]) - AC_REQUIRE([gl_STDIO_H_DEFAULTS]) - gl_NEXT_HEADERS([stdio.h]) - -+ dnl Determine whether __USE_MINGW_ANSI_STDIO makes printf and -+ dnl inttypes.h behave like gnu instead of system; we must give our -+ dnl printf wrapper the right attribute to match. -+ AC_CACHE_CHECK([which flavor of printf attribute matches inttypes macros], -+ [gl_cv_func_printf_attribute_flavor], -+ [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ -+ #define __STDC_FORMAT_MACROS 1 -+ #include -+ #include -+ /* For non-mingw systems, compilation will trivially succeed. -+ For mingw, compilation will succeed for older mingw (system -+ printf, "I64d") and fail for newer mingw (gnu printf, "lld"). */ -+ #if ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__) && \ -+ (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)) -+ extern char PRIdMAX_probe[sizeof PRIdMAX == sizeof "I64d" ? 1 : -1]; -+ #endif -+ ]])], [gl_cv_func_printf_attribute_flavor=system], -+ [gl_cv_func_printf_attribute_flavor=gnu])]) -+ if test "$gl_cv_func_printf_attribute_flavor" = gnu; then -+ AC_DEFINE([GNULIB_PRINTF_ATTRIBUTE_FLAVOR_GNU], [1], -+ [Define to 1 if printf and friends should be labeled with -+ attribute "__gnu_printf__" instead of "__printf__"]) -+ fi -+ - dnl No need to create extra modules for these functions. Everyone who uses - dnl likely needs them. - GNULIB_FSCANF=1 -diff -durN libpipeline-1.4.1.orig/gnulib/m4/stdlib_h.m4 libpipeline-1.4.1/gnulib/m4/stdlib_h.m4 ---- libpipeline-1.4.1.orig/gnulib/m4/stdlib_h.m4 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/m4/stdlib_h.m4 2017-05-17 10:35:57.921875000 +0800 -@@ -1,5 +1,5 @@ --# stdlib_h.m4 serial 42 --dnl Copyright (C) 2007-2014 Free Software Foundation, Inc. -+# stdlib_h.m4 serial 43 -+dnl Copyright (C) 2007-2017 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. -@@ -21,7 +21,7 @@ - #endif - ]], [_Exit atoll canonicalize_file_name getloadavg getsubopt grantpt - initstate initstate_r mkdtemp mkostemp mkostemps mkstemp mkstemps -- posix_openpt ptsname ptsname_r random random_r realpath rpmatch -+ posix_openpt ptsname ptsname_r qsort_r random random_r realpath rpmatch - secure_getenv setenv setstate setstate_r srandom srandom_r - strtod strtoll strtoull unlockpt unsetenv]) - ]) -@@ -55,6 +55,7 @@ - GNULIB_PTSNAME=0; AC_SUBST([GNULIB_PTSNAME]) - GNULIB_PTSNAME_R=0; AC_SUBST([GNULIB_PTSNAME_R]) - GNULIB_PUTENV=0; AC_SUBST([GNULIB_PUTENV]) -+ GNULIB_QSORT_R=0; AC_SUBST([GNULIB_QSORT_R]) - GNULIB_RANDOM=0; AC_SUBST([GNULIB_RANDOM]) - GNULIB_RANDOM_R=0; AC_SUBST([GNULIB_RANDOM_R]) - GNULIB_REALLOC_POSIX=0; AC_SUBST([GNULIB_REALLOC_POSIX]) -@@ -84,6 +85,7 @@ - HAVE_POSIX_OPENPT=1; AC_SUBST([HAVE_POSIX_OPENPT]) - HAVE_PTSNAME=1; AC_SUBST([HAVE_PTSNAME]) - HAVE_PTSNAME_R=1; AC_SUBST([HAVE_PTSNAME_R]) -+ HAVE_QSORT_R=1; AC_SUBST([HAVE_QSORT_R]) - HAVE_RANDOM=1; AC_SUBST([HAVE_RANDOM]) - HAVE_RANDOM_H=1; AC_SUBST([HAVE_RANDOM_H]) - HAVE_RANDOM_R=1; AC_SUBST([HAVE_RANDOM_R]) -@@ -107,6 +109,7 @@ - REPLACE_PTSNAME=0; AC_SUBST([REPLACE_PTSNAME]) - REPLACE_PTSNAME_R=0; AC_SUBST([REPLACE_PTSNAME_R]) - REPLACE_PUTENV=0; AC_SUBST([REPLACE_PUTENV]) -+ REPLACE_QSORT_R=0; AC_SUBST([REPLACE_QSORT_R]) - REPLACE_RANDOM_R=0; AC_SUBST([REPLACE_RANDOM_R]) - REPLACE_REALLOC=0; AC_SUBST([REPLACE_REALLOC]) - REPLACE_REALPATH=0; AC_SUBST([REPLACE_REALPATH]) -diff -durN libpipeline-1.4.1.orig/gnulib/m4/strerror.m4 libpipeline-1.4.1/gnulib/m4/strerror.m4 ---- libpipeline-1.4.1.orig/gnulib/m4/strerror.m4 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/m4/strerror.m4 2017-05-17 10:35:58.203125000 +0800 -@@ -1,5 +1,5 @@ - # strerror.m4 serial 17 --dnl Copyright (C) 2002, 2007-2014 Free Software Foundation, Inc. -+dnl Copyright (C) 2002, 2007-2017 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. -diff -durN libpipeline-1.4.1.orig/gnulib/m4/string_h.m4 libpipeline-1.4.1/gnulib/m4/string_h.m4 ---- libpipeline-1.4.1.orig/gnulib/m4/string_h.m4 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/m4/string_h.m4 2017-05-17 10:35:58.500000000 +0800 -@@ -1,6 +1,6 @@ - # Configure a GNU-like replacement for . - --# Copyright (C) 2007-2014 Free Software Foundation, Inc. -+# Copyright (C) 2007-2017 Free Software Foundation, Inc. - # This file is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -diff -durN libpipeline-1.4.1.orig/gnulib/m4/strndup.m4 libpipeline-1.4.1/gnulib/m4/strndup.m4 ---- libpipeline-1.4.1.orig/gnulib/m4/strndup.m4 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/m4/strndup.m4 2017-05-17 10:35:58.734375000 +0800 -@@ -1,5 +1,5 @@ --# strndup.m4 serial 21 --dnl Copyright (C) 2002-2003, 2005-2014 Free Software Foundation, Inc. -+# strndup.m4 serial 22 -+dnl Copyright (C) 2002-2003, 2005-2017 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. -@@ -31,11 +31,14 @@ - #endif - char *strndup (const char *, size_t); - #endif -+ int result; - char *s; - s = strndup ("some longer string", 15); - free (s); - s = strndup ("shorter string", 13); -- return s[13] != '\0';]])], -+ result = s[13] != '\0'; -+ free (s); -+ return result;]])], - [gl_cv_func_strndup_works=yes], - [gl_cv_func_strndup_works=no], - [ -diff -durN libpipeline-1.4.1.orig/gnulib/m4/strnlen.m4 libpipeline-1.4.1/gnulib/m4/strnlen.m4 ---- libpipeline-1.4.1.orig/gnulib/m4/strnlen.m4 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/m4/strnlen.m4 2017-05-17 10:35:59.000000000 +0800 -@@ -1,5 +1,5 @@ - # strnlen.m4 serial 13 --dnl Copyright (C) 2002-2003, 2005-2007, 2009-2014 Free Software Foundation, -+dnl Copyright (C) 2002-2003, 2005-2007, 2009-2017 Free Software Foundation, - dnl Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -diff -durN libpipeline-1.4.1.orig/gnulib/m4/strsignal.m4 libpipeline-1.4.1/gnulib/m4/strsignal.m4 ---- libpipeline-1.4.1.orig/gnulib/m4/strsignal.m4 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/m4/strsignal.m4 2017-05-17 10:35:59.328125000 +0800 -@@ -1,5 +1,5 @@ - # strsignal.m4 serial 8 --dnl Copyright (C) 2008-2014 Free Software Foundation, Inc. -+dnl Copyright (C) 2008-2017 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. -diff -durN libpipeline-1.4.1.orig/gnulib/m4/sys_select_h.m4 libpipeline-1.4.1/gnulib/m4/sys_select_h.m4 ---- libpipeline-1.4.1.orig/gnulib/m4/sys_select_h.m4 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/m4/sys_select_h.m4 2017-05-17 10:35:59.687500000 +0800 -@@ -1,5 +1,5 @@ - # sys_select_h.m4 serial 20 --dnl Copyright (C) 2006-2014 Free Software Foundation, Inc. -+dnl Copyright (C) 2006-2017 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. -diff -durN libpipeline-1.4.1.orig/gnulib/m4/sys_socket_h.m4 libpipeline-1.4.1/gnulib/m4/sys_socket_h.m4 ---- libpipeline-1.4.1.orig/gnulib/m4/sys_socket_h.m4 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/m4/sys_socket_h.m4 2017-05-17 10:35:59.968750000 +0800 -@@ -1,5 +1,5 @@ - # sys_socket_h.m4 serial 23 --dnl Copyright (C) 2005-2014 Free Software Foundation, Inc. -+dnl Copyright (C) 2005-2017 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. -diff -durN libpipeline-1.4.1.orig/gnulib/m4/sys_stat_h.m4 libpipeline-1.4.1/gnulib/m4/sys_stat_h.m4 ---- libpipeline-1.4.1.orig/gnulib/m4/sys_stat_h.m4 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/m4/sys_stat_h.m4 2017-05-17 10:36:00.234375000 +0800 -@@ -1,5 +1,5 @@ --# sys_stat_h.m4 serial 28 -*- Autoconf -*- --dnl Copyright (C) 2006-2014 Free Software Foundation, Inc. -+# sys_stat_h.m4 serial 31 -*- Autoconf -*- -+dnl Copyright (C) 2006-2017 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. -@@ -19,18 +19,21 @@ - dnl Ensure the type mode_t gets defined. - AC_REQUIRE([AC_TYPE_MODE_T]) - -- dnl Whether to override 'struct stat'. -+ dnl Whether to enable precise timestamps in 'struct stat'. -+ m4_ifdef([gl_WINDOWS_STAT_TIMESPEC], [ -+ AC_REQUIRE([gl_WINDOWS_STAT_TIMESPEC]) -+ ], [ -+ WINDOWS_STAT_TIMESPEC=0 -+ ]) -+ AC_SUBST([WINDOWS_STAT_TIMESPEC]) -+ -+ dnl Whether to ensure that struct stat.st_size is 64-bit wide. - m4_ifdef([gl_LARGEFILE], [ - AC_REQUIRE([gl_LARGEFILE]) - ], [ - WINDOWS_64_BIT_ST_SIZE=0 - ]) - AC_SUBST([WINDOWS_64_BIT_ST_SIZE]) -- if test $WINDOWS_64_BIT_ST_SIZE = 1; then -- AC_DEFINE([_GL_WINDOWS_64_BIT_ST_SIZE], [1], -- [Define to 1 if Gnulib overrides 'struct stat' on Windows so that -- struct stat.st_size becomes 64-bit.]) -- fi - - dnl Define types that are supposed to be defined in or - dnl . -@@ -72,6 +75,7 @@ - GNULIB_MKNODAT=0; AC_SUBST([GNULIB_MKNODAT]) - GNULIB_STAT=0; AC_SUBST([GNULIB_STAT]) - GNULIB_UTIMENSAT=0; AC_SUBST([GNULIB_UTIMENSAT]) -+ GNULIB_OVERRIDES_STRUCT_STAT=0; AC_SUBST([GNULIB_OVERRIDES_STRUCT_STAT]) - dnl Assume proper GNU behavior unless another module says otherwise. - HAVE_FCHMODAT=1; AC_SUBST([HAVE_FCHMODAT]) - HAVE_FSTATAT=1; AC_SUBST([HAVE_FSTATAT]) -diff -durN libpipeline-1.4.1.orig/gnulib/m4/sys_time_h.m4 libpipeline-1.4.1/gnulib/m4/sys_time_h.m4 ---- libpipeline-1.4.1.orig/gnulib/m4/sys_time_h.m4 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/m4/sys_time_h.m4 2017-05-17 10:36:00.531250000 +0800 -@@ -1,7 +1,7 @@ - # Configure a replacement for . --# serial 8 -+# serial 9 - --# Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc. -+# Copyright (C) 2007, 2009-2017 Free Software Foundation, Inc. - # This file is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -diff -durN libpipeline-1.4.1.orig/gnulib/m4/sys_types_h.m4 libpipeline-1.4.1/gnulib/m4/sys_types_h.m4 ---- libpipeline-1.4.1.orig/gnulib/m4/sys_types_h.m4 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/m4/sys_types_h.m4 2017-05-17 10:36:00.828125000 +0800 -@@ -1,5 +1,5 @@ --# sys_types_h.m4 serial 5 --dnl Copyright (C) 2011-2014 Free Software Foundation, Inc. -+# sys_types_h.m4 serial 7 -+dnl Copyright (C) 2011-2017 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. -@@ -17,8 +17,41 @@ - - dnl Whether to override the 'off_t' type. - AC_REQUIRE([gl_TYPE_OFF_T]) -+ -+ dnl Whether to override the 'dev_t' and 'ino_t' types. -+ m4_ifdef([gl_WINDOWS_STAT_INODES], [ -+ AC_REQUIRE([gl_WINDOWS_STAT_INODES]) -+ ], [ -+ WINDOWS_STAT_INODES=0 -+ ]) -+ AC_SUBST([WINDOWS_STAT_INODES]) - ]) - - AC_DEFUN([gl_SYS_TYPES_H_DEFAULTS], - [ - ]) -+ -+# This works around a buggy version in autoconf <= 2.69. -+# See -+ -+m4_version_prereq([2.70], [], [ -+ -+# This is taken from the following Autoconf patch: -+# http://git.sv.gnu.org/cgit/autoconf.git/commit/?id=e17a30e98 -+ -+m4_undefine([AC_HEADER_MAJOR]) -+AC_DEFUN([AC_HEADER_MAJOR], -+[AC_CHECK_HEADERS_ONCE([sys/types.h]) -+AC_CHECK_HEADER([sys/mkdev.h], -+ [AC_DEFINE([MAJOR_IN_MKDEV], [1], -+ [Define to 1 if `major', `minor', and `makedev' are declared in -+ .])]) -+if test $ac_cv_header_sys_mkdev_h = no; then -+ AC_CHECK_HEADER([sys/sysmacros.h], -+ [AC_DEFINE([MAJOR_IN_SYSMACROS], [1], -+ [Define to 1 if `major', `minor', and `makedev' are declared in -+ .])]) -+fi -+]) -+ -+]) -diff -durN libpipeline-1.4.1.orig/gnulib/m4/sys_wait_h.m4 libpipeline-1.4.1/gnulib/m4/sys_wait_h.m4 ---- libpipeline-1.4.1.orig/gnulib/m4/sys_wait_h.m4 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/m4/sys_wait_h.m4 2017-05-17 10:36:01.156250000 +0800 -@@ -1,5 +1,5 @@ - # sys_wait_h.m4 serial 6 --dnl Copyright (C) 2008-2014 Free Software Foundation, Inc. -+dnl Copyright (C) 2008-2017 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. -diff -durN libpipeline-1.4.1.orig/gnulib/m4/tempname.m4 libpipeline-1.4.1/gnulib/m4/tempname.m4 ---- libpipeline-1.4.1.orig/gnulib/m4/tempname.m4 2014-11-08 21:53:38.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/m4/tempname.m4 2017-05-17 10:36:01.421875000 +0800 -@@ -1,6 +1,6 @@ - #serial 5 - --# Copyright (C) 2006-2007, 2009-2014 Free Software Foundation, Inc. -+# Copyright (C) 2006-2007, 2009-2017 Free Software Foundation, Inc. - # This file is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -diff -durN libpipeline-1.4.1.orig/gnulib/m4/threadlib.m4 libpipeline-1.4.1/gnulib/m4/threadlib.m4 ---- libpipeline-1.4.1.orig/gnulib/m4/threadlib.m4 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/m4/threadlib.m4 2017-05-17 10:36:01.656250000 +0800 -@@ -1,5 +1,5 @@ --# threadlib.m4 serial 10 (gettext-0.18.2) --dnl Copyright (C) 2005-2014 Free Software Foundation, Inc. -+# threadlib.m4 serial 12 -+dnl Copyright (C) 2005-2017 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. -@@ -22,7 +22,7 @@ - dnl Sets the variables LIBMULTITHREAD and LTLIBMULTITHREAD similarly, for - dnl programs that really need multithread functionality. The difference - dnl between LIBTHREAD and LIBMULTITHREAD is that on platforms supporting weak --dnl symbols, typically LIBTHREAD="" whereas LIBMULTITHREAD="-lpthread". -+dnl symbols, typically LIBTHREAD is empty whereas LIBMULTITHREAD is not. - dnl Adds to CPPFLAGS the flag -D_REENTRANT or -D_THREAD_SAFE if needed for - dnl multithread-safe programs. - -@@ -162,15 +162,31 @@ - # Test whether both pthread_mutex_lock and pthread_mutexattr_init exist - # in libc. IRIX 6.5 has the first one in both libc and libpthread, but - # the second one only in libpthread, and lock.c needs it. -- AC_LINK_IFELSE( -- [AC_LANG_PROGRAM( -- [[#include ]], -- [[pthread_mutex_lock((pthread_mutex_t*)0); -- pthread_mutexattr_init((pthread_mutexattr_t*)0);]])], -- [gl_have_pthread=yes]) -+ # -+ # If -pthread works, prefer it to -lpthread, since Ubuntu 14.04 -+ # needs -pthread for some reason. See: -+ # http://lists.gnu.org/archive/html/bug-gnulib/2014-09/msg00023.html -+ save_LIBS=$LIBS -+ for gl_pthread in '' '-pthread'; do -+ LIBS="$LIBS $gl_pthread" -+ AC_LINK_IFELSE( -+ [AC_LANG_PROGRAM( -+ [[#include -+ pthread_mutex_t m; -+ pthread_mutexattr_t ma; -+ ]], -+ [[pthread_mutex_lock (&m); -+ pthread_mutexattr_init (&ma);]])], -+ [gl_have_pthread=yes -+ LIBTHREAD=$gl_pthread LTLIBTHREAD=$gl_pthread -+ LIBMULTITHREAD=$gl_pthread LTLIBMULTITHREAD=$gl_pthread]) -+ LIBS=$save_LIBS -+ test -n "$gl_have_pthread" && break -+ done -+ - # Test for libpthread by looking for pthread_kill. (Not pthread_self, - # since it is defined as a macro on OSF/1.) -- if test -n "$gl_have_pthread"; then -+ if test -n "$gl_have_pthread" && test -z "$LIBTHREAD"; then - # The program links fine without libpthread. But it may actually - # need to link with libpthread in order to create multiple threads. - AC_CHECK_LIB([pthread], [pthread_kill], -@@ -179,13 +195,15 @@ - # Therefore pthread_in_use() needs to actually try to create a - # thread: pthread_create from libc will fail, whereas - # pthread_create will actually create a thread. -+ # On Solaris 10 or newer, this test is no longer needed, because -+ # libc contains the fully functional pthread functions. - case "$host_os" in -- solaris* | hpux*) -+ solaris | solaris2.[1-9] | solaris2.[1-9].* | hpux*) - AC_DEFINE([PTHREAD_IN_USE_DETECTION_HARD], [1], - [Define if the pthread_in_use() detection is hard.]) - esac - ]) -- else -+ elif test -z "$gl_have_pthread"; then - # Some library is needed. Try libpthread and libc_r. - AC_CHECK_LIB([pthread], [pthread_kill], - [gl_have_pthread=yes -@@ -326,6 +344,8 @@ - dnl - dnl GNU Hurd/glibc posix - dnl -+dnl Ubuntu 14.04 posix -pthread Y OK -+dnl - dnl FreeBSD 5.3 posix -lc_r Y - dnl posix -lkse ? Y - dnl posix -lpthread ? Y -diff -durN libpipeline-1.4.1.orig/gnulib/m4/time_h.m4 libpipeline-1.4.1/gnulib/m4/time_h.m4 ---- libpipeline-1.4.1.orig/gnulib/m4/time_h.m4 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/m4/time_h.m4 2017-05-17 10:36:01.937500000 +0800 -@@ -1,8 +1,8 @@ - # Configure a more-standard replacement for . - --# Copyright (C) 2000-2001, 2003-2007, 2009-2014 Free Software Foundation, Inc. -+# Copyright (C) 2000-2001, 2003-2007, 2009-2017 Free Software Foundation, Inc. - --# serial 8 -+# serial 11 - - # This file is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, -@@ -26,7 +26,7 @@ - ]) - - dnl Check whether 'struct timespec' is declared --dnl in time.h, sys/time.h, or pthread.h. -+dnl in time.h, sys/time.h, pthread.h, or unistd.h. - - AC_DEFUN([gl_CHECK_TYPE_STRUCT_TIMESPEC], - [ -@@ -44,6 +44,7 @@ - TIME_H_DEFINES_STRUCT_TIMESPEC=0 - SYS_TIME_H_DEFINES_STRUCT_TIMESPEC=0 - PTHREAD_H_DEFINES_STRUCT_TIMESPEC=0 -+ UNISTD_H_DEFINES_STRUCT_TIMESPEC=0 - if test $gl_cv_sys_struct_timespec_in_time_h = yes; then - TIME_H_DEFINES_STRUCT_TIMESPEC=1 - else -@@ -70,12 +71,26 @@ - [gl_cv_sys_struct_timespec_in_pthread_h=no])]) - if test $gl_cv_sys_struct_timespec_in_pthread_h = yes; then - PTHREAD_H_DEFINES_STRUCT_TIMESPEC=1 -+ else -+ AC_CACHE_CHECK([for struct timespec in ], -+ [gl_cv_sys_struct_timespec_in_unistd_h], -+ [AC_COMPILE_IFELSE( -+ [AC_LANG_PROGRAM( -+ [[#include -+ ]], -+ [[static struct timespec x; x.tv_sec = x.tv_nsec;]])], -+ [gl_cv_sys_struct_timespec_in_unistd_h=yes], -+ [gl_cv_sys_struct_timespec_in_unistd_h=no])]) -+ if test $gl_cv_sys_struct_timespec_in_unistd_h = yes; then -+ UNISTD_H_DEFINES_STRUCT_TIMESPEC=1 -+ fi - fi - fi - fi - AC_SUBST([TIME_H_DEFINES_STRUCT_TIMESPEC]) - AC_SUBST([SYS_TIME_H_DEFINES_STRUCT_TIMESPEC]) - AC_SUBST([PTHREAD_H_DEFINES_STRUCT_TIMESPEC]) -+ AC_SUBST([UNISTD_H_DEFINES_STRUCT_TIMESPEC]) - ]) - - AC_DEFUN([gl_TIME_MODULE_INDICATOR], -@@ -89,23 +104,34 @@ - - AC_DEFUN([gl_HEADER_TIME_H_DEFAULTS], - [ -+ GNULIB_CTIME=0; AC_SUBST([GNULIB_CTIME]) - GNULIB_MKTIME=0; AC_SUBST([GNULIB_MKTIME]) -+ GNULIB_LOCALTIME=0; AC_SUBST([GNULIB_LOCALTIME]) - GNULIB_NANOSLEEP=0; AC_SUBST([GNULIB_NANOSLEEP]) -+ GNULIB_STRFTIME=0; AC_SUBST([GNULIB_STRFTIME]) - GNULIB_STRPTIME=0; AC_SUBST([GNULIB_STRPTIME]) - GNULIB_TIMEGM=0; AC_SUBST([GNULIB_TIMEGM]) - GNULIB_TIME_R=0; AC_SUBST([GNULIB_TIME_R]) -+ GNULIB_TIME_RZ=0; AC_SUBST([GNULIB_TIME_RZ]) -+ GNULIB_TZSET=0; AC_SUBST([GNULIB_TZSET]) - dnl Assume proper GNU behavior unless another module says otherwise. - HAVE_DECL_LOCALTIME_R=1; AC_SUBST([HAVE_DECL_LOCALTIME_R]) - HAVE_NANOSLEEP=1; AC_SUBST([HAVE_NANOSLEEP]) - HAVE_STRPTIME=1; AC_SUBST([HAVE_STRPTIME]) - HAVE_TIMEGM=1; AC_SUBST([HAVE_TIMEGM]) -+ HAVE_TZSET=1; AC_SUBST([HAVE_TZSET]) -+ dnl Even GNU libc does not have timezone_t yet. -+ HAVE_TIMEZONE_T=0; AC_SUBST([HAVE_TIMEZONE_T]) - dnl If another module says to replace or to not replace, do that. - dnl Otherwise, replace only if someone compiles with -DGNULIB_PORTCHECK; - dnl this lets maintainers check for portability. -+ REPLACE_CTIME=GNULIB_PORTCHECK; AC_SUBST([REPLACE_CTIME]) - REPLACE_LOCALTIME_R=GNULIB_PORTCHECK; AC_SUBST([REPLACE_LOCALTIME_R]) - REPLACE_MKTIME=GNULIB_PORTCHECK; AC_SUBST([REPLACE_MKTIME]) - REPLACE_NANOSLEEP=GNULIB_PORTCHECK; AC_SUBST([REPLACE_NANOSLEEP]) -+ REPLACE_STRFTIME=GNULIB_PORTCHECK; AC_SUBST([REPLACE_STRFTIME]) - REPLACE_TIMEGM=GNULIB_PORTCHECK; AC_SUBST([REPLACE_TIMEGM]) -+ REPLACE_TZSET=GNULIB_PORTCHECK; AC_SUBST([REPLACE_TZSET]) - - dnl Hack so that the time module doesn't depend on the sys_time module. - dnl First, default GNULIB_GETTIMEOFDAY to 0 if sys_time is absent. -diff -durN libpipeline-1.4.1.orig/gnulib/m4/tls.m4 libpipeline-1.4.1/gnulib/m4/tls.m4 ---- libpipeline-1.4.1.orig/gnulib/m4/tls.m4 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/m4/tls.m4 2017-05-17 10:36:02.203125000 +0800 -@@ -1,5 +1,5 @@ - # tls.m4 serial 2 (gettext-0.18) --dnl Copyright (C) 2005, 2008-2014 Free Software Foundation, Inc. -+dnl Copyright (C) 2005, 2008-2017 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. -diff -durN libpipeline-1.4.1.orig/gnulib/m4/unistd_h.m4 libpipeline-1.4.1/gnulib/m4/unistd_h.m4 ---- libpipeline-1.4.1.orig/gnulib/m4/unistd_h.m4 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/m4/unistd_h.m4 2017-05-17 10:36:02.484375000 +0800 -@@ -1,5 +1,5 @@ --# unistd_h.m4 serial 67 --dnl Copyright (C) 2006-2014 Free Software Foundation, Inc. -+# unistd_h.m4 serial 70 -+dnl Copyright (C) 2006-2017 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. -@@ -46,8 +46,8 @@ - gethostname getlogin getlogin_r getpagesize - getusershell setusershell endusershell - group_member isatty lchown link linkat lseek pipe pipe2 pread pwrite -- readlink readlinkat rmdir sethostname sleep symlink symlinkat ttyname_r -- unlink unlinkat usleep]) -+ readlink readlinkat rmdir sethostname sleep symlink symlinkat -+ truncate ttyname_r unlink unlinkat usleep]) - ]) - - AC_DEFUN([gl_UNISTD_MODULE_INDICATOR], -@@ -102,6 +102,7 @@ - GNULIB_SLEEP=0; AC_SUBST([GNULIB_SLEEP]) - GNULIB_SYMLINK=0; AC_SUBST([GNULIB_SYMLINK]) - GNULIB_SYMLINKAT=0; AC_SUBST([GNULIB_SYMLINKAT]) -+ GNULIB_TRUNCATE=0; AC_SUBST([GNULIB_TRUNCATE]) - GNULIB_TTYNAME_R=0; AC_SUBST([GNULIB_TTYNAME_R]) - GNULIB_UNISTD_H_NONBLOCKING=0; AC_SUBST([GNULIB_UNISTD_H_NONBLOCKING]) - GNULIB_UNISTD_H_SIGPIPE=0; AC_SUBST([GNULIB_UNISTD_H_SIGPIPE]) -@@ -139,12 +140,14 @@ - HAVE_SLEEP=1; AC_SUBST([HAVE_SLEEP]) - HAVE_SYMLINK=1; AC_SUBST([HAVE_SYMLINK]) - HAVE_SYMLINKAT=1; AC_SUBST([HAVE_SYMLINKAT]) -+ HAVE_TRUNCATE=1; AC_SUBST([HAVE_TRUNCATE]) - HAVE_UNLINKAT=1; AC_SUBST([HAVE_UNLINKAT]) - HAVE_USLEEP=1; AC_SUBST([HAVE_USLEEP]) - HAVE_DECL_ENVIRON=1; AC_SUBST([HAVE_DECL_ENVIRON]) - HAVE_DECL_FCHDIR=1; AC_SUBST([HAVE_DECL_FCHDIR]) - HAVE_DECL_FDATASYNC=1; AC_SUBST([HAVE_DECL_FDATASYNC]) - HAVE_DECL_GETDOMAINNAME=1; AC_SUBST([HAVE_DECL_GETDOMAINNAME]) -+ HAVE_DECL_GETLOGIN=1; AC_SUBST([HAVE_DECL_GETLOGIN]) - HAVE_DECL_GETLOGIN_R=1; AC_SUBST([HAVE_DECL_GETLOGIN_R]) - HAVE_DECL_GETPAGESIZE=1; AC_SUBST([HAVE_DECL_GETPAGESIZE]) - HAVE_DECL_GETUSERSHELL=1; AC_SUBST([HAVE_DECL_GETUSERSHELL]) -@@ -173,9 +176,12 @@ - REPLACE_PWRITE=0; AC_SUBST([REPLACE_PWRITE]) - REPLACE_READ=0; AC_SUBST([REPLACE_READ]) - REPLACE_READLINK=0; AC_SUBST([REPLACE_READLINK]) -+ REPLACE_READLINKAT=0; AC_SUBST([REPLACE_READLINKAT]) - REPLACE_RMDIR=0; AC_SUBST([REPLACE_RMDIR]) - REPLACE_SLEEP=0; AC_SUBST([REPLACE_SLEEP]) - REPLACE_SYMLINK=0; AC_SUBST([REPLACE_SYMLINK]) -+ REPLACE_SYMLINKAT=0; AC_SUBST([REPLACE_SYMLINKAT]) -+ REPLACE_TRUNCATE=0; AC_SUBST([REPLACE_TRUNCATE]) - REPLACE_TTYNAME_R=0; AC_SUBST([REPLACE_TTYNAME_R]) - REPLACE_UNLINK=0; AC_SUBST([REPLACE_UNLINK]) - REPLACE_UNLINKAT=0; AC_SUBST([REPLACE_UNLINKAT]) -diff -durN libpipeline-1.4.1.orig/gnulib/m4/vasnprintf.m4 libpipeline-1.4.1/gnulib/m4/vasnprintf.m4 ---- libpipeline-1.4.1.orig/gnulib/m4/vasnprintf.m4 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/m4/vasnprintf.m4 2017-05-17 10:36:02.750000000 +0800 -@@ -1,5 +1,5 @@ - # vasnprintf.m4 serial 36 --dnl Copyright (C) 2002-2004, 2006-2014 Free Software Foundation, Inc. -+dnl Copyright (C) 2002-2004, 2006-2017 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. -diff -durN libpipeline-1.4.1.orig/gnulib/m4/vasprintf.m4 libpipeline-1.4.1/gnulib/m4/vasprintf.m4 ---- libpipeline-1.4.1.orig/gnulib/m4/vasprintf.m4 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/m4/vasprintf.m4 2017-05-17 10:36:03.000000000 +0800 -@@ -1,5 +1,5 @@ - # vasprintf.m4 serial 6 --dnl Copyright (C) 2002-2003, 2006-2007, 2009-2014 Free Software Foundation, -+dnl Copyright (C) 2002-2003, 2006-2007, 2009-2017 Free Software Foundation, - dnl Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -diff -durN libpipeline-1.4.1.orig/gnulib/m4/waitpid.m4 libpipeline-1.4.1/gnulib/m4/waitpid.m4 ---- libpipeline-1.4.1.orig/gnulib/m4/waitpid.m4 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/m4/waitpid.m4 2017-05-17 10:36:03.265625000 +0800 -@@ -1,5 +1,5 @@ - # waitpid.m4 serial 2 --dnl Copyright (C) 2010-2014 Free Software Foundation, Inc. -+dnl Copyright (C) 2010-2017 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. -diff -durN libpipeline-1.4.1.orig/gnulib/m4/warnings.m4 libpipeline-1.4.1/gnulib/m4/warnings.m4 ---- libpipeline-1.4.1.orig/gnulib/m4/warnings.m4 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/m4/warnings.m4 2017-05-17 10:36:03.921875000 +0800 -@@ -1,5 +1,5 @@ - # warnings.m4 serial 11 --dnl Copyright (C) 2008-2014 Free Software Foundation, Inc. -+dnl Copyright (C) 2008-2017 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. -diff -durN libpipeline-1.4.1.orig/gnulib/m4/warn-on-use.m4 libpipeline-1.4.1/gnulib/m4/warn-on-use.m4 ---- libpipeline-1.4.1.orig/gnulib/m4/warn-on-use.m4 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/m4/warn-on-use.m4 2017-05-17 10:36:03.609375000 +0800 -@@ -1,5 +1,5 @@ - # warn-on-use.m4 serial 5 --dnl Copyright (C) 2010-2014 Free Software Foundation, Inc. -+dnl Copyright (C) 2010-2017 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. -diff -durN libpipeline-1.4.1.orig/gnulib/m4/wchar_h.m4 libpipeline-1.4.1/gnulib/m4/wchar_h.m4 ---- libpipeline-1.4.1.orig/gnulib/m4/wchar_h.m4 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/m4/wchar_h.m4 2017-05-17 10:36:04.265625000 +0800 -@@ -1,13 +1,13 @@ - dnl A placeholder for ISO C99 , for platforms that have issues. - --dnl Copyright (C) 2007-2014 Free Software Foundation, Inc. -+dnl Copyright (C) 2007-2017 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. - - dnl Written by Eric Blake. - --# wchar_h.m4 serial 39 -+# wchar_h.m4 serial 42 - - AC_DEFUN([gl_WCHAR_H], - [ -@@ -35,6 +35,8 @@ - fi - AC_SUBST([HAVE_WINT_T]) - -+ AC_REQUIRE([gl_TYPE_WINT_T_PREREQ]) -+ - dnl Check for declarations of anything we want to poison if the - dnl corresponding gnulib module is not in use. - gl_WARN_ON_USE_PREPARE([[ -@@ -53,7 +55,7 @@ - wcsrtombs wcsnrtombs wcwidth wmemchr wmemcmp wmemcpy wmemmove wmemset - wcslen wcsnlen wcscpy wcpcpy wcsncpy wcpncpy wcscat wcsncat wcscmp - wcsncmp wcscasecmp wcsncasecmp wcscoll wcsxfrm wcsdup wcschr wcsrchr -- wcscspn wcsspn wcspbrk wcsstr wcstok wcswidth -+ wcscspn wcsspn wcspbrk wcsstr wcstok wcswidth wcsftime - ]) - ]) - -@@ -81,8 +83,14 @@ - extern int zero (void); - int main () { return zero(); } - ]])]) -+ dnl Do not rename the object file from conftest.$ac_objext to -+ dnl conftest1.$ac_objext, as this will cause the link to fail on -+ dnl z/OS when using the XPLINK object format (due to duplicate -+ dnl CSECT names). Instead, temporarily redefine $ac_compile so -+ dnl that the object file has the latter name from the start. -+ save_ac_compile="$ac_compile" -+ ac_compile=`echo "$save_ac_compile" | sed s/conftest/conftest1/` - if AC_TRY_EVAL([ac_compile]); then -- mv conftest.$ac_objext conftest1.$ac_objext - AC_LANG_CONFTEST([ - AC_LANG_SOURCE([[#define wcstod renamed_wcstod - /* Tru64 with Desktop Toolkit C has a bug: must be included before -@@ -95,8 +103,9 @@ - #include - int zero (void) { return 0; } - ]])]) -+ dnl See note above about renaming object files. -+ ac_compile=`echo "$save_ac_compile" | sed s/conftest/conftest2/` - if AC_TRY_EVAL([ac_compile]); then -- mv conftest.$ac_objext conftest2.$ac_objext - if $CC -o conftest$ac_exeext $CFLAGS $LDFLAGS conftest1.$ac_objext conftest2.$ac_objext $LIBS >&AS_MESSAGE_LOG_FD 2>&1; then - : - else -@@ -104,6 +113,7 @@ - fi - fi - fi -+ ac_compile="$save_ac_compile" - rm -f conftest1.$ac_objext conftest2.$ac_objext conftest$ac_exeext - ]) - if test $gl_cv_header_wchar_h_correct_inline = no; then -@@ -169,6 +179,7 @@ - GNULIB_WCSSTR=0; AC_SUBST([GNULIB_WCSSTR]) - GNULIB_WCSTOK=0; AC_SUBST([GNULIB_WCSTOK]) - GNULIB_WCSWIDTH=0; AC_SUBST([GNULIB_WCSWIDTH]) -+ GNULIB_WCSFTIME=0; AC_SUBST([GNULIB_WCSFTIME]) - dnl Assume proper GNU behavior unless another module says otherwise. - HAVE_BTOWC=1; AC_SUBST([HAVE_BTOWC]) - HAVE_MBSINIT=1; AC_SUBST([HAVE_MBSINIT]) -@@ -207,6 +218,7 @@ - HAVE_WCSSTR=1; AC_SUBST([HAVE_WCSSTR]) - HAVE_WCSTOK=1; AC_SUBST([HAVE_WCSTOK]) - HAVE_WCSWIDTH=1; AC_SUBST([HAVE_WCSWIDTH]) -+ HAVE_WCSFTIME=1; AC_SUBST([HAVE_WCSFTIME]) - HAVE_DECL_WCTOB=1; AC_SUBST([HAVE_DECL_WCTOB]) - HAVE_DECL_WCWIDTH=1; AC_SUBST([HAVE_DECL_WCWIDTH]) - REPLACE_MBSTATE_T=0; AC_SUBST([REPLACE_MBSTATE_T]) -@@ -222,4 +234,5 @@ - REPLACE_WCSNRTOMBS=0; AC_SUBST([REPLACE_WCSNRTOMBS]) - REPLACE_WCWIDTH=0; AC_SUBST([REPLACE_WCWIDTH]) - REPLACE_WCSWIDTH=0; AC_SUBST([REPLACE_WCSWIDTH]) -+ REPLACE_WCSFTIME=0; AC_SUBST([REPLACE_WCSFTIME]) - ]) -diff -durN libpipeline-1.4.1.orig/gnulib/m4/wchar_t.m4 libpipeline-1.4.1/gnulib/m4/wchar_t.m4 ---- libpipeline-1.4.1.orig/gnulib/m4/wchar_t.m4 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/m4/wchar_t.m4 2017-05-17 10:36:04.531250000 +0800 -@@ -1,5 +1,5 @@ - # wchar_t.m4 serial 4 (gettext-0.18.2) --dnl Copyright (C) 2002-2003, 2008-2014 Free Software Foundation, Inc. -+dnl Copyright (C) 2002-2003, 2008-2017 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. -diff -durN libpipeline-1.4.1.orig/gnulib/m4/wint_t.m4 libpipeline-1.4.1/gnulib/m4/wint_t.m4 ---- libpipeline-1.4.1.orig/gnulib/m4/wint_t.m4 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/m4/wint_t.m4 2017-05-17 10:36:04.937500000 +0800 -@@ -1,11 +1,12 @@ --# wint_t.m4 serial 5 (gettext-0.18.2) --dnl Copyright (C) 2003, 2007-2014 Free Software Foundation, Inc. -+# wint_t.m4 serial 7 -+dnl Copyright (C) 2003, 2007-2017 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. - - dnl From Bruno Haible. --dnl Test whether has the 'wint_t' type. -+dnl Test whether has the 'wint_t' type and whether gnulib's -+dnl or would, if present, override 'wint_t'. - dnl Prerequisite: AC_PROG_CC - - AC_DEFUN([gt_TYPE_WINT_T], -@@ -28,5 +29,46 @@ - [gt_cv_c_wint_t=no])]) - if test $gt_cv_c_wint_t = yes; then - AC_DEFINE([HAVE_WINT_T], [1], [Define if you have the 'wint_t' type.]) -+ -+ dnl Determine whether gnulib's or would, if present, -+ dnl override 'wint_t'. -+ AC_CACHE_CHECK([whether wint_t is too small], -+ [gl_cv_type_wint_t_too_small], -+ [AC_COMPILE_IFELSE( -+ [AC_LANG_PROGRAM([[ -+/* Tru64 with Desktop Toolkit C has a bug: must be included before -+ . -+ BSD/OS 4.0.1 has a bug: , and must be -+ included before . */ -+#if !(defined __GLIBC__ && !defined __UCLIBC__) -+# include -+# include -+# include -+#endif -+#include -+ int verify[sizeof (wint_t) < sizeof (int) ? -1 : 1]; -+ ]])], -+ [gl_cv_type_wint_t_too_small=no], -+ [gl_cv_type_wint_t_too_small=yes])]) -+ if test $gl_cv_type_wint_t_too_small = yes; then -+ GNULIB_OVERRIDES_WINT_T=1 -+ else -+ GNULIB_OVERRIDES_WINT_T=0 -+ fi -+ else -+ GNULIB_OVERRIDES_WINT_T=0 -+ fi -+ AC_SUBST([GNULIB_OVERRIDES_WINT_T]) -+]) -+ -+dnl Prerequisites of the 'wint_t' override. -+AC_DEFUN([gl_TYPE_WINT_T_PREREQ], -+[ -+ AC_CHECK_HEADERS_ONCE([crtdefs.h]) -+ if test $ac_cv_header_crtdefs_h = yes; then -+ HAVE_CRTDEFS_H=1 -+ else -+ HAVE_CRTDEFS_H=0 - fi -+ AC_SUBST([HAVE_CRTDEFS_H]) - ]) -diff -durN libpipeline-1.4.1.orig/gnulib/m4/write.m4 libpipeline-1.4.1/gnulib/m4/write.m4 ---- libpipeline-1.4.1.orig/gnulib/m4/write.m4 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/m4/write.m4 2017-05-17 10:36:05.234375000 +0800 -@@ -1,5 +1,5 @@ --# write.m4 serial 5 --dnl Copyright (C) 2008-2014 Free Software Foundation, Inc. -+# write.m4 serial 6 -+dnl Copyright (C) 2008-2017 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. -@@ -7,10 +7,12 @@ - AC_DEFUN([gl_FUNC_WRITE], - [ - AC_REQUIRE([gl_UNISTD_H_DEFAULTS]) -- AC_REQUIRE([gl_MSVC_INVAL]) -- if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then -- REPLACE_WRITE=1 -- fi -+ m4_ifdef([gl_MSVC_INVAL], [ -+ AC_REQUIRE([gl_MSVC_INVAL]) -+ if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then -+ REPLACE_WRITE=1 -+ fi -+ ]) - dnl This ifdef is just an optimization, to avoid performing a configure - dnl check whose result is not used. It does not make the test of - dnl GNULIB_UNISTD_H_SIGPIPE or GNULIB_SIGPIPE redundant. -diff -durN libpipeline-1.4.1.orig/gnulib/m4/xalloc.m4 libpipeline-1.4.1/gnulib/m4/xalloc.m4 ---- libpipeline-1.4.1.orig/gnulib/m4/xalloc.m4 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/m4/xalloc.m4 2017-05-17 10:36:05.437500000 +0800 -@@ -1,5 +1,5 @@ - # xalloc.m4 serial 18 --dnl Copyright (C) 2002-2006, 2009-2014 Free Software Foundation, Inc. -+dnl Copyright (C) 2002-2006, 2009-2017 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. -diff -durN libpipeline-1.4.1.orig/gnulib/m4/xsize.m4 libpipeline-1.4.1/gnulib/m4/xsize.m4 ---- libpipeline-1.4.1.orig/gnulib/m4/xsize.m4 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/m4/xsize.m4 2017-05-17 10:36:05.687500000 +0800 -@@ -1,5 +1,5 @@ - # xsize.m4 serial 5 --dnl Copyright (C) 2003-2004, 2008-2014 Free Software Foundation, Inc. -+dnl Copyright (C) 2003-2004, 2008-2017 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. -diff -durN libpipeline-1.4.1.orig/gnulib/m4/xstrndup.m4 libpipeline-1.4.1/gnulib/m4/xstrndup.m4 ---- libpipeline-1.4.1.orig/gnulib/m4/xstrndup.m4 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/m4/xstrndup.m4 2017-05-17 10:36:05.968750000 +0800 -@@ -1,5 +1,5 @@ - # xstrndup.m4 serial 2 --dnl Copyright (C) 2003, 2009-2014 Free Software Foundation, Inc. -+dnl Copyright (C) 2003, 2009-2017 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. -diff -durN libpipeline-1.4.1.orig/gnulib/m4/xvasprintf.m4 libpipeline-1.4.1/gnulib/m4/xvasprintf.m4 ---- libpipeline-1.4.1.orig/gnulib/m4/xvasprintf.m4 2014-08-03 21:31:22.000000000 +0800 -+++ libpipeline-1.4.1/gnulib/m4/xvasprintf.m4 2017-05-17 10:36:06.312500000 +0800 -@@ -1,5 +1,5 @@ - # xvasprintf.m4 serial 2 --dnl Copyright (C) 2006, 2009-2014 Free Software Foundation, Inc. -+dnl Copyright (C) 2006, 2009-2017 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. -diff -durN libpipeline-1.4.1.orig/lib/Makefile.in libpipeline-1.4.1/lib/Makefile.in ---- libpipeline-1.4.1.orig/lib/Makefile.in 2015-08-17 17:14:24.000000000 +0800 -+++ libpipeline-1.4.1/lib/Makefile.in 2017-05-17 10:38:52.328125000 +0800 -@@ -108,6 +108,7 @@ - $(top_srcdir)/gnulib/m4/fcntl-o.m4 \ - $(top_srcdir)/gnulib/m4/fcntl_h.m4 \ - $(top_srcdir)/gnulib/m4/float_h.m4 \ -+ $(top_srcdir)/gnulib/m4/getprogname.m4 \ - $(top_srcdir)/gnulib/m4/gettimeofday.m4 \ - $(top_srcdir)/gnulib/m4/gnulib-common.m4 \ - $(top_srcdir)/gnulib/m4/gnulib-comp.m4 \ -@@ -120,6 +121,8 @@ - $(top_srcdir)/gnulib/m4/lib-link.m4 \ - $(top_srcdir)/gnulib/m4/lib-prefix.m4 \ - $(top_srcdir)/gnulib/m4/libtool.m4 \ -+ $(top_srcdir)/gnulib/m4/limits-h.m4 \ -+ $(top_srcdir)/gnulib/m4/localtime-buffer.m4 \ - $(top_srcdir)/gnulib/m4/lock.m4 \ - $(top_srcdir)/gnulib/m4/longlong.m4 \ - $(top_srcdir)/gnulib/m4/lstat.m4 \ -@@ -139,6 +142,7 @@ - $(top_srcdir)/gnulib/m4/onceonly.m4 \ - $(top_srcdir)/gnulib/m4/pathmax.m4 \ - $(top_srcdir)/gnulib/m4/printf.m4 \ -+ $(top_srcdir)/gnulib/m4/pthread_rwlock_rdlock.m4 \ - $(top_srcdir)/gnulib/m4/raise.m4 \ - $(top_srcdir)/gnulib/m4/read.m4 \ - $(top_srcdir)/gnulib/m4/safe-read.m4 \ -@@ -355,6 +359,7 @@ - GNULIB_CHDIR = @GNULIB_CHDIR@ - GNULIB_CHOWN = @GNULIB_CHOWN@ - GNULIB_CLOSE = @GNULIB_CLOSE@ -+GNULIB_CTIME = @GNULIB_CTIME@ - GNULIB_DPRINTF = @GNULIB_DPRINTF@ - GNULIB_DUP = @GNULIB_DUP@ - GNULIB_DUP2 = @GNULIB_DUP2@ -@@ -416,6 +421,7 @@ - GNULIB_LCHOWN = @GNULIB_LCHOWN@ - GNULIB_LINK = @GNULIB_LINK@ - GNULIB_LINKAT = @GNULIB_LINKAT@ -+GNULIB_LOCALTIME = @GNULIB_LOCALTIME@ - GNULIB_LSEEK = @GNULIB_LSEEK@ - GNULIB_LSTAT = @GNULIB_LSTAT@ - GNULIB_MALLOC_POSIX = @GNULIB_MALLOC_POSIX@ -@@ -460,6 +466,8 @@ - GNULIB_OBSTACK_PRINTF_POSIX = @GNULIB_OBSTACK_PRINTF_POSIX@ - GNULIB_OPEN = @GNULIB_OPEN@ - GNULIB_OPENAT = @GNULIB_OPENAT@ -+GNULIB_OVERRIDES_STRUCT_STAT = @GNULIB_OVERRIDES_STRUCT_STAT@ -+GNULIB_OVERRIDES_WINT_T = @GNULIB_OVERRIDES_WINT_T@ - GNULIB_PCLOSE = @GNULIB_PCLOSE@ - GNULIB_PERROR = @GNULIB_PERROR@ - GNULIB_PIPE = @GNULIB_PIPE@ -@@ -478,6 +486,7 @@ - GNULIB_PUTENV = @GNULIB_PUTENV@ - GNULIB_PUTS = @GNULIB_PUTS@ - GNULIB_PWRITE = @GNULIB_PWRITE@ -+GNULIB_QSORT_R = @GNULIB_QSORT_R@ - GNULIB_RAISE = @GNULIB_RAISE@ - GNULIB_RANDOM = @GNULIB_RANDOM@ - GNULIB_RANDOM_R = @GNULIB_RANDOM_R@ -@@ -513,6 +522,7 @@ - GNULIB_STRDUP = @GNULIB_STRDUP@ - GNULIB_STRERROR = @GNULIB_STRERROR@ - GNULIB_STRERROR_R = @GNULIB_STRERROR_R@ -+GNULIB_STRFTIME = @GNULIB_STRFTIME@ - GNULIB_STRNCAT = @GNULIB_STRNCAT@ - GNULIB_STRNDUP = @GNULIB_STRNDUP@ - GNULIB_STRNLEN = @GNULIB_STRNLEN@ -@@ -531,8 +541,11 @@ - GNULIB_SYSTEM_POSIX = @GNULIB_SYSTEM_POSIX@ - GNULIB_TIMEGM = @GNULIB_TIMEGM@ - GNULIB_TIME_R = @GNULIB_TIME_R@ -+GNULIB_TIME_RZ = @GNULIB_TIME_RZ@ - GNULIB_TMPFILE = @GNULIB_TMPFILE@ -+GNULIB_TRUNCATE = @GNULIB_TRUNCATE@ - GNULIB_TTYNAME_R = @GNULIB_TTYNAME_R@ -+GNULIB_TZSET = @GNULIB_TZSET@ - GNULIB_UNISTD_H_NONBLOCKING = @GNULIB_UNISTD_H_NONBLOCKING@ - GNULIB_UNISTD_H_SIGPIPE = @GNULIB_UNISTD_H_SIGPIPE@ - GNULIB_UNLINK = @GNULIB_UNLINK@ -@@ -563,6 +576,7 @@ - GNULIB_WCSCPY = @GNULIB_WCSCPY@ - GNULIB_WCSCSPN = @GNULIB_WCSCSPN@ - GNULIB_WCSDUP = @GNULIB_WCSDUP@ -+GNULIB_WCSFTIME = @GNULIB_WCSFTIME@ - GNULIB_WCSLEN = @GNULIB_WCSLEN@ - GNULIB_WCSNCASECMP = @GNULIB_WCSNCASECMP@ - GNULIB_WCSNCAT = @GNULIB_WCSNCAT@ -@@ -591,8 +605,10 @@ - GREP = @GREP@ - HAVE_ATOLL = @HAVE_ATOLL@ - HAVE_BTOWC = @HAVE_BTOWC@ -+HAVE_C99_STDINT_H = @HAVE_C99_STDINT_H@ - HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@ - HAVE_CHOWN = @HAVE_CHOWN@ -+HAVE_CRTDEFS_H = @HAVE_CRTDEFS_H@ - HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@ - HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@ - HAVE_DECL_FDATASYNC = @HAVE_DECL_FDATASYNC@ -@@ -603,6 +619,7 @@ - HAVE_DECL_GETDOMAINNAME = @HAVE_DECL_GETDOMAINNAME@ - HAVE_DECL_GETLINE = @HAVE_DECL_GETLINE@ - HAVE_DECL_GETLOADAVG = @HAVE_DECL_GETLOADAVG@ -+HAVE_DECL_GETLOGIN = @HAVE_DECL_GETLOGIN@ - HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@ - HAVE_DECL_GETPAGESIZE = @HAVE_DECL_GETPAGESIZE@ - HAVE_DECL_GETUSERSHELL = @HAVE_DECL_GETUSERSHELL@ -@@ -659,6 +676,7 @@ - HAVE_LINKAT = @HAVE_LINKAT@ - HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@ - HAVE_LSTAT = @HAVE_LSTAT@ -+HAVE_MAX_ALIGN_T = @HAVE_MAX_ALIGN_T@ - HAVE_MBRLEN = @HAVE_MBRLEN@ - HAVE_MBRTOWC = @HAVE_MBRTOWC@ - HAVE_MBSINIT = @HAVE_MBSINIT@ -@@ -693,6 +711,7 @@ - HAVE_PTSNAME = @HAVE_PTSNAME@ - HAVE_PTSNAME_R = @HAVE_PTSNAME_R@ - HAVE_PWRITE = @HAVE_PWRITE@ -+HAVE_QSORT_R = @HAVE_QSORT_R@ - HAVE_RAISE = @HAVE_RAISE@ - HAVE_RANDOM = @HAVE_RANDOM@ - HAVE_RANDOM_H = @HAVE_RANDOM_H@ -@@ -739,7 +758,10 @@ - HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@ - HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@ - HAVE_TIMEGM = @HAVE_TIMEGM@ -+HAVE_TIMEZONE_T = @HAVE_TIMEZONE_T@ -+HAVE_TRUNCATE = @HAVE_TRUNCATE@ - HAVE_TYPE_VOLATILE_SIG_ATOMIC_T = @HAVE_TYPE_VOLATILE_SIG_ATOMIC_T@ -+HAVE_TZSET = @HAVE_TZSET@ - HAVE_UNISTD_H = @HAVE_UNISTD_H@ - HAVE_UNLINKAT = @HAVE_UNLINKAT@ - HAVE_UNLOCKPT = @HAVE_UNLOCKPT@ -@@ -761,6 +783,7 @@ - HAVE_WCSCPY = @HAVE_WCSCPY@ - HAVE_WCSCSPN = @HAVE_WCSCSPN@ - HAVE_WCSDUP = @HAVE_WCSDUP@ -+HAVE_WCSFTIME = @HAVE_WCSFTIME@ - HAVE_WCSLEN = @HAVE_WCSLEN@ - HAVE_WCSNCASECMP = @HAVE_WCSNCASECMP@ - HAVE_WCSNCAT = @HAVE_WCSNCAT@ -@@ -803,6 +826,7 @@ - LIBS = @LIBS@ - LIBTHREAD = @LIBTHREAD@ - LIBTOOL = @LIBTOOL@ -+LIMITS_H = @LIMITS_H@ - LIPO = @LIPO@ - LN_S = @LN_S@ - LTLIBINTL = @LTLIBINTL@ -@@ -810,6 +834,7 @@ - LTLIBOBJS = @LTLIBOBJS@ - LTLIBPTH = @LTLIBPTH@ - LTLIBTHREAD = @LTLIBTHREAD@ -+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ - MAINT = @MAINT@ - MAKEINFO = @MAKEINFO@ - MANIFEST_TOOL = @MANIFEST_TOOL@ -@@ -817,6 +842,7 @@ - NEXT_AS_FIRST_DIRECTIVE_ERRNO_H = @NEXT_AS_FIRST_DIRECTIVE_ERRNO_H@ - NEXT_AS_FIRST_DIRECTIVE_FCNTL_H = @NEXT_AS_FIRST_DIRECTIVE_FCNTL_H@ - NEXT_AS_FIRST_DIRECTIVE_FLOAT_H = @NEXT_AS_FIRST_DIRECTIVE_FLOAT_H@ -+NEXT_AS_FIRST_DIRECTIVE_LIMITS_H = @NEXT_AS_FIRST_DIRECTIVE_LIMITS_H@ - NEXT_AS_FIRST_DIRECTIVE_SIGNAL_H = @NEXT_AS_FIRST_DIRECTIVE_SIGNAL_H@ - NEXT_AS_FIRST_DIRECTIVE_STDARG_H = @NEXT_AS_FIRST_DIRECTIVE_STDARG_H@ - NEXT_AS_FIRST_DIRECTIVE_STDDEF_H = @NEXT_AS_FIRST_DIRECTIVE_STDDEF_H@ -@@ -835,6 +861,7 @@ - NEXT_ERRNO_H = @NEXT_ERRNO_H@ - NEXT_FCNTL_H = @NEXT_FCNTL_H@ - NEXT_FLOAT_H = @NEXT_FLOAT_H@ -+NEXT_LIMITS_H = @NEXT_LIMITS_H@ - NEXT_SIGNAL_H = @NEXT_SIGNAL_H@ - NEXT_STDARG_H = @NEXT_STDARG_H@ - NEXT_STDDEF_H = @NEXT_STDDEF_H@ -@@ -877,6 +904,7 @@ - REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@ - REPLACE_CHOWN = @REPLACE_CHOWN@ - REPLACE_CLOSE = @REPLACE_CLOSE@ -+REPLACE_CTIME = @REPLACE_CTIME@ - REPLACE_DPRINTF = @REPLACE_DPRINTF@ - REPLACE_DUP = @REPLACE_DUP@ - REPLACE_DUP2 = @REPLACE_DUP2@ -@@ -946,10 +974,12 @@ - REPLACE_PTSNAME_R = @REPLACE_PTSNAME_R@ - REPLACE_PUTENV = @REPLACE_PUTENV@ - REPLACE_PWRITE = @REPLACE_PWRITE@ -+REPLACE_QSORT_R = @REPLACE_QSORT_R@ - REPLACE_RAISE = @REPLACE_RAISE@ - REPLACE_RANDOM_R = @REPLACE_RANDOM_R@ - REPLACE_READ = @REPLACE_READ@ - REPLACE_READLINK = @REPLACE_READLINK@ -+REPLACE_READLINKAT = @REPLACE_READLINKAT@ - REPLACE_REALLOC = @REPLACE_REALLOC@ - REPLACE_REALPATH = @REPLACE_REALPATH@ - REPLACE_REMOVE = @REPLACE_REMOVE@ -@@ -970,6 +1000,7 @@ - REPLACE_STRDUP = @REPLACE_STRDUP@ - REPLACE_STRERROR = @REPLACE_STRERROR@ - REPLACE_STRERROR_R = @REPLACE_STRERROR_R@ -+REPLACE_STRFTIME = @REPLACE_STRFTIME@ - REPLACE_STRNCAT = @REPLACE_STRNCAT@ - REPLACE_STRNDUP = @REPLACE_STRNDUP@ - REPLACE_STRNLEN = @REPLACE_STRNLEN@ -@@ -979,9 +1010,12 @@ - REPLACE_STRTOK_R = @REPLACE_STRTOK_R@ - REPLACE_STRUCT_TIMEVAL = @REPLACE_STRUCT_TIMEVAL@ - REPLACE_SYMLINK = @REPLACE_SYMLINK@ -+REPLACE_SYMLINKAT = @REPLACE_SYMLINKAT@ - REPLACE_TIMEGM = @REPLACE_TIMEGM@ - REPLACE_TMPFILE = @REPLACE_TMPFILE@ -+REPLACE_TRUNCATE = @REPLACE_TRUNCATE@ - REPLACE_TTYNAME_R = @REPLACE_TTYNAME_R@ -+REPLACE_TZSET = @REPLACE_TZSET@ - REPLACE_UNLINK = @REPLACE_UNLINK@ - REPLACE_UNLINKAT = @REPLACE_UNLINKAT@ - REPLACE_UNSETENV = @REPLACE_UNSETENV@ -@@ -994,6 +1028,7 @@ - REPLACE_VSNPRINTF = @REPLACE_VSNPRINTF@ - REPLACE_VSPRINTF = @REPLACE_VSPRINTF@ - REPLACE_WCRTOMB = @REPLACE_WCRTOMB@ -+REPLACE_WCSFTIME = @REPLACE_WCSFTIME@ - REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@ - REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@ - REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@ -@@ -1014,6 +1049,7 @@ - SYS_TIME_H_DEFINES_STRUCT_TIMESPEC = @SYS_TIME_H_DEFINES_STRUCT_TIMESPEC@ - TIME_H_DEFINES_STRUCT_TIMESPEC = @TIME_H_DEFINES_STRUCT_TIMESPEC@ - UNDEFINE_STRTOK_R = @UNDEFINE_STRTOK_R@ -+UNISTD_H_DEFINES_STRUCT_TIMESPEC = @UNISTD_H_DEFINES_STRUCT_TIMESPEC@ - UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@ - UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS = @UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS@ - VERSION = @VERSION@ -@@ -1021,6 +1057,8 @@ - WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@ - WINDOWS_64_BIT_OFF_T = @WINDOWS_64_BIT_OFF_T@ - WINDOWS_64_BIT_ST_SIZE = @WINDOWS_64_BIT_ST_SIZE@ -+WINDOWS_STAT_INODES = @WINDOWS_STAT_INODES@ -+WINDOWS_STAT_TIMESPEC = @WINDOWS_STAT_TIMESPEC@ - WINT_T_SUFFIX = @WINT_T_SUFFIX@ - abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ -diff -durN libpipeline-1.4.1.orig/Makefile.in libpipeline-1.4.1/Makefile.in ---- libpipeline-1.4.1.orig/Makefile.in 2015-08-17 17:14:24.000000000 +0800 -+++ libpipeline-1.4.1/Makefile.in 2017-05-17 10:38:51.812500000 +0800 -@@ -107,6 +107,7 @@ - $(top_srcdir)/gnulib/m4/fcntl-o.m4 \ - $(top_srcdir)/gnulib/m4/fcntl_h.m4 \ - $(top_srcdir)/gnulib/m4/float_h.m4 \ -+ $(top_srcdir)/gnulib/m4/getprogname.m4 \ - $(top_srcdir)/gnulib/m4/gettimeofday.m4 \ - $(top_srcdir)/gnulib/m4/gnulib-common.m4 \ - $(top_srcdir)/gnulib/m4/gnulib-comp.m4 \ -@@ -119,6 +120,8 @@ - $(top_srcdir)/gnulib/m4/lib-link.m4 \ - $(top_srcdir)/gnulib/m4/lib-prefix.m4 \ - $(top_srcdir)/gnulib/m4/libtool.m4 \ -+ $(top_srcdir)/gnulib/m4/limits-h.m4 \ -+ $(top_srcdir)/gnulib/m4/localtime-buffer.m4 \ - $(top_srcdir)/gnulib/m4/lock.m4 \ - $(top_srcdir)/gnulib/m4/longlong.m4 \ - $(top_srcdir)/gnulib/m4/lstat.m4 \ -@@ -138,6 +141,7 @@ - $(top_srcdir)/gnulib/m4/onceonly.m4 \ - $(top_srcdir)/gnulib/m4/pathmax.m4 \ - $(top_srcdir)/gnulib/m4/printf.m4 \ -+ $(top_srcdir)/gnulib/m4/pthread_rwlock_rdlock.m4 \ - $(top_srcdir)/gnulib/m4/raise.m4 \ - $(top_srcdir)/gnulib/m4/read.m4 \ - $(top_srcdir)/gnulib/m4/safe-read.m4 \ -@@ -263,10 +267,11 @@ - $(top_srcdir)/build-aux/config.sub \ - $(top_srcdir)/build-aux/install-sh \ - $(top_srcdir)/build-aux/ltmain.sh \ -- $(top_srcdir)/build-aux/missing COPYING INSTALL NEWS README \ -- TODO build-aux/ar-lib build-aux/compile build-aux/config.guess \ -- build-aux/config.rpath build-aux/config.sub build-aux/depcomp \ -- build-aux/install-sh build-aux/ltmain.sh build-aux/missing -+ $(top_srcdir)/build-aux/missing COPYING ChangeLog INSTALL NEWS \ -+ README TODO build-aux/ar-lib build-aux/compile \ -+ build-aux/config.guess build-aux/config.rpath \ -+ build-aux/config.sub build-aux/install-sh build-aux/ltmain.sh \ -+ build-aux/missing - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - distdir = $(PACKAGE)-$(VERSION) - top_distdir = $(distdir) -@@ -360,6 +365,7 @@ - GNULIB_CHDIR = @GNULIB_CHDIR@ - GNULIB_CHOWN = @GNULIB_CHOWN@ - GNULIB_CLOSE = @GNULIB_CLOSE@ -+GNULIB_CTIME = @GNULIB_CTIME@ - GNULIB_DPRINTF = @GNULIB_DPRINTF@ - GNULIB_DUP = @GNULIB_DUP@ - GNULIB_DUP2 = @GNULIB_DUP2@ -@@ -421,6 +427,7 @@ - GNULIB_LCHOWN = @GNULIB_LCHOWN@ - GNULIB_LINK = @GNULIB_LINK@ - GNULIB_LINKAT = @GNULIB_LINKAT@ -+GNULIB_LOCALTIME = @GNULIB_LOCALTIME@ - GNULIB_LSEEK = @GNULIB_LSEEK@ - GNULIB_LSTAT = @GNULIB_LSTAT@ - GNULIB_MALLOC_POSIX = @GNULIB_MALLOC_POSIX@ -@@ -465,6 +472,8 @@ - GNULIB_OBSTACK_PRINTF_POSIX = @GNULIB_OBSTACK_PRINTF_POSIX@ - GNULIB_OPEN = @GNULIB_OPEN@ - GNULIB_OPENAT = @GNULIB_OPENAT@ -+GNULIB_OVERRIDES_STRUCT_STAT = @GNULIB_OVERRIDES_STRUCT_STAT@ -+GNULIB_OVERRIDES_WINT_T = @GNULIB_OVERRIDES_WINT_T@ - GNULIB_PCLOSE = @GNULIB_PCLOSE@ - GNULIB_PERROR = @GNULIB_PERROR@ - GNULIB_PIPE = @GNULIB_PIPE@ -@@ -483,6 +492,7 @@ - GNULIB_PUTENV = @GNULIB_PUTENV@ - GNULIB_PUTS = @GNULIB_PUTS@ - GNULIB_PWRITE = @GNULIB_PWRITE@ -+GNULIB_QSORT_R = @GNULIB_QSORT_R@ - GNULIB_RAISE = @GNULIB_RAISE@ - GNULIB_RANDOM = @GNULIB_RANDOM@ - GNULIB_RANDOM_R = @GNULIB_RANDOM_R@ -@@ -518,6 +528,7 @@ - GNULIB_STRDUP = @GNULIB_STRDUP@ - GNULIB_STRERROR = @GNULIB_STRERROR@ - GNULIB_STRERROR_R = @GNULIB_STRERROR_R@ -+GNULIB_STRFTIME = @GNULIB_STRFTIME@ - GNULIB_STRNCAT = @GNULIB_STRNCAT@ - GNULIB_STRNDUP = @GNULIB_STRNDUP@ - GNULIB_STRNLEN = @GNULIB_STRNLEN@ -@@ -536,8 +547,11 @@ - GNULIB_SYSTEM_POSIX = @GNULIB_SYSTEM_POSIX@ - GNULIB_TIMEGM = @GNULIB_TIMEGM@ - GNULIB_TIME_R = @GNULIB_TIME_R@ -+GNULIB_TIME_RZ = @GNULIB_TIME_RZ@ - GNULIB_TMPFILE = @GNULIB_TMPFILE@ -+GNULIB_TRUNCATE = @GNULIB_TRUNCATE@ - GNULIB_TTYNAME_R = @GNULIB_TTYNAME_R@ -+GNULIB_TZSET = @GNULIB_TZSET@ - GNULIB_UNISTD_H_NONBLOCKING = @GNULIB_UNISTD_H_NONBLOCKING@ - GNULIB_UNISTD_H_SIGPIPE = @GNULIB_UNISTD_H_SIGPIPE@ - GNULIB_UNLINK = @GNULIB_UNLINK@ -@@ -568,6 +582,7 @@ - GNULIB_WCSCPY = @GNULIB_WCSCPY@ - GNULIB_WCSCSPN = @GNULIB_WCSCSPN@ - GNULIB_WCSDUP = @GNULIB_WCSDUP@ -+GNULIB_WCSFTIME = @GNULIB_WCSFTIME@ - GNULIB_WCSLEN = @GNULIB_WCSLEN@ - GNULIB_WCSNCASECMP = @GNULIB_WCSNCASECMP@ - GNULIB_WCSNCAT = @GNULIB_WCSNCAT@ -@@ -596,8 +611,10 @@ - GREP = @GREP@ - HAVE_ATOLL = @HAVE_ATOLL@ - HAVE_BTOWC = @HAVE_BTOWC@ -+HAVE_C99_STDINT_H = @HAVE_C99_STDINT_H@ - HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@ - HAVE_CHOWN = @HAVE_CHOWN@ -+HAVE_CRTDEFS_H = @HAVE_CRTDEFS_H@ - HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@ - HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@ - HAVE_DECL_FDATASYNC = @HAVE_DECL_FDATASYNC@ -@@ -608,6 +625,7 @@ - HAVE_DECL_GETDOMAINNAME = @HAVE_DECL_GETDOMAINNAME@ - HAVE_DECL_GETLINE = @HAVE_DECL_GETLINE@ - HAVE_DECL_GETLOADAVG = @HAVE_DECL_GETLOADAVG@ -+HAVE_DECL_GETLOGIN = @HAVE_DECL_GETLOGIN@ - HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@ - HAVE_DECL_GETPAGESIZE = @HAVE_DECL_GETPAGESIZE@ - HAVE_DECL_GETUSERSHELL = @HAVE_DECL_GETUSERSHELL@ -@@ -664,6 +682,7 @@ - HAVE_LINKAT = @HAVE_LINKAT@ - HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@ - HAVE_LSTAT = @HAVE_LSTAT@ -+HAVE_MAX_ALIGN_T = @HAVE_MAX_ALIGN_T@ - HAVE_MBRLEN = @HAVE_MBRLEN@ - HAVE_MBRTOWC = @HAVE_MBRTOWC@ - HAVE_MBSINIT = @HAVE_MBSINIT@ -@@ -698,6 +717,7 @@ - HAVE_PTSNAME = @HAVE_PTSNAME@ - HAVE_PTSNAME_R = @HAVE_PTSNAME_R@ - HAVE_PWRITE = @HAVE_PWRITE@ -+HAVE_QSORT_R = @HAVE_QSORT_R@ - HAVE_RAISE = @HAVE_RAISE@ - HAVE_RANDOM = @HAVE_RANDOM@ - HAVE_RANDOM_H = @HAVE_RANDOM_H@ -@@ -744,7 +764,10 @@ - HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@ - HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@ - HAVE_TIMEGM = @HAVE_TIMEGM@ -+HAVE_TIMEZONE_T = @HAVE_TIMEZONE_T@ -+HAVE_TRUNCATE = @HAVE_TRUNCATE@ - HAVE_TYPE_VOLATILE_SIG_ATOMIC_T = @HAVE_TYPE_VOLATILE_SIG_ATOMIC_T@ -+HAVE_TZSET = @HAVE_TZSET@ - HAVE_UNISTD_H = @HAVE_UNISTD_H@ - HAVE_UNLINKAT = @HAVE_UNLINKAT@ - HAVE_UNLOCKPT = @HAVE_UNLOCKPT@ -@@ -766,6 +789,7 @@ - HAVE_WCSCPY = @HAVE_WCSCPY@ - HAVE_WCSCSPN = @HAVE_WCSCSPN@ - HAVE_WCSDUP = @HAVE_WCSDUP@ -+HAVE_WCSFTIME = @HAVE_WCSFTIME@ - HAVE_WCSLEN = @HAVE_WCSLEN@ - HAVE_WCSNCASECMP = @HAVE_WCSNCASECMP@ - HAVE_WCSNCAT = @HAVE_WCSNCAT@ -@@ -808,6 +832,7 @@ - LIBS = @LIBS@ - LIBTHREAD = @LIBTHREAD@ - LIBTOOL = @LIBTOOL@ -+LIMITS_H = @LIMITS_H@ - LIPO = @LIPO@ - LN_S = @LN_S@ - LTLIBINTL = @LTLIBINTL@ -@@ -815,6 +840,7 @@ - LTLIBOBJS = @LTLIBOBJS@ - LTLIBPTH = @LTLIBPTH@ - LTLIBTHREAD = @LTLIBTHREAD@ -+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ - MAINT = @MAINT@ - MAKEINFO = @MAKEINFO@ - MANIFEST_TOOL = @MANIFEST_TOOL@ -@@ -822,6 +848,7 @@ - NEXT_AS_FIRST_DIRECTIVE_ERRNO_H = @NEXT_AS_FIRST_DIRECTIVE_ERRNO_H@ - NEXT_AS_FIRST_DIRECTIVE_FCNTL_H = @NEXT_AS_FIRST_DIRECTIVE_FCNTL_H@ - NEXT_AS_FIRST_DIRECTIVE_FLOAT_H = @NEXT_AS_FIRST_DIRECTIVE_FLOAT_H@ -+NEXT_AS_FIRST_DIRECTIVE_LIMITS_H = @NEXT_AS_FIRST_DIRECTIVE_LIMITS_H@ - NEXT_AS_FIRST_DIRECTIVE_SIGNAL_H = @NEXT_AS_FIRST_DIRECTIVE_SIGNAL_H@ - NEXT_AS_FIRST_DIRECTIVE_STDARG_H = @NEXT_AS_FIRST_DIRECTIVE_STDARG_H@ - NEXT_AS_FIRST_DIRECTIVE_STDDEF_H = @NEXT_AS_FIRST_DIRECTIVE_STDDEF_H@ -@@ -840,6 +867,7 @@ - NEXT_ERRNO_H = @NEXT_ERRNO_H@ - NEXT_FCNTL_H = @NEXT_FCNTL_H@ - NEXT_FLOAT_H = @NEXT_FLOAT_H@ -+NEXT_LIMITS_H = @NEXT_LIMITS_H@ - NEXT_SIGNAL_H = @NEXT_SIGNAL_H@ - NEXT_STDARG_H = @NEXT_STDARG_H@ - NEXT_STDDEF_H = @NEXT_STDDEF_H@ -@@ -882,6 +910,7 @@ - REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@ - REPLACE_CHOWN = @REPLACE_CHOWN@ - REPLACE_CLOSE = @REPLACE_CLOSE@ -+REPLACE_CTIME = @REPLACE_CTIME@ - REPLACE_DPRINTF = @REPLACE_DPRINTF@ - REPLACE_DUP = @REPLACE_DUP@ - REPLACE_DUP2 = @REPLACE_DUP2@ -@@ -951,10 +980,12 @@ - REPLACE_PTSNAME_R = @REPLACE_PTSNAME_R@ - REPLACE_PUTENV = @REPLACE_PUTENV@ - REPLACE_PWRITE = @REPLACE_PWRITE@ -+REPLACE_QSORT_R = @REPLACE_QSORT_R@ - REPLACE_RAISE = @REPLACE_RAISE@ - REPLACE_RANDOM_R = @REPLACE_RANDOM_R@ - REPLACE_READ = @REPLACE_READ@ - REPLACE_READLINK = @REPLACE_READLINK@ -+REPLACE_READLINKAT = @REPLACE_READLINKAT@ - REPLACE_REALLOC = @REPLACE_REALLOC@ - REPLACE_REALPATH = @REPLACE_REALPATH@ - REPLACE_REMOVE = @REPLACE_REMOVE@ -@@ -975,6 +1006,7 @@ - REPLACE_STRDUP = @REPLACE_STRDUP@ - REPLACE_STRERROR = @REPLACE_STRERROR@ - REPLACE_STRERROR_R = @REPLACE_STRERROR_R@ -+REPLACE_STRFTIME = @REPLACE_STRFTIME@ - REPLACE_STRNCAT = @REPLACE_STRNCAT@ - REPLACE_STRNDUP = @REPLACE_STRNDUP@ - REPLACE_STRNLEN = @REPLACE_STRNLEN@ -@@ -984,9 +1016,12 @@ - REPLACE_STRTOK_R = @REPLACE_STRTOK_R@ - REPLACE_STRUCT_TIMEVAL = @REPLACE_STRUCT_TIMEVAL@ - REPLACE_SYMLINK = @REPLACE_SYMLINK@ -+REPLACE_SYMLINKAT = @REPLACE_SYMLINKAT@ - REPLACE_TIMEGM = @REPLACE_TIMEGM@ - REPLACE_TMPFILE = @REPLACE_TMPFILE@ -+REPLACE_TRUNCATE = @REPLACE_TRUNCATE@ - REPLACE_TTYNAME_R = @REPLACE_TTYNAME_R@ -+REPLACE_TZSET = @REPLACE_TZSET@ - REPLACE_UNLINK = @REPLACE_UNLINK@ - REPLACE_UNLINKAT = @REPLACE_UNLINKAT@ - REPLACE_UNSETENV = @REPLACE_UNSETENV@ -@@ -999,6 +1034,7 @@ - REPLACE_VSNPRINTF = @REPLACE_VSNPRINTF@ - REPLACE_VSPRINTF = @REPLACE_VSPRINTF@ - REPLACE_WCRTOMB = @REPLACE_WCRTOMB@ -+REPLACE_WCSFTIME = @REPLACE_WCSFTIME@ - REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@ - REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@ - REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@ -@@ -1019,6 +1055,7 @@ - SYS_TIME_H_DEFINES_STRUCT_TIMESPEC = @SYS_TIME_H_DEFINES_STRUCT_TIMESPEC@ - TIME_H_DEFINES_STRUCT_TIMESPEC = @TIME_H_DEFINES_STRUCT_TIMESPEC@ - UNDEFINE_STRTOK_R = @UNDEFINE_STRTOK_R@ -+UNISTD_H_DEFINES_STRUCT_TIMESPEC = @UNISTD_H_DEFINES_STRUCT_TIMESPEC@ - UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@ - UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS = @UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS@ - VERSION = @VERSION@ -@@ -1026,6 +1063,8 @@ - WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@ - WINDOWS_64_BIT_OFF_T = @WINDOWS_64_BIT_OFF_T@ - WINDOWS_64_BIT_ST_SIZE = @WINDOWS_64_BIT_ST_SIZE@ -+WINDOWS_STAT_INODES = @WINDOWS_STAT_INODES@ -+WINDOWS_STAT_TIMESPEC = @WINDOWS_STAT_TIMESPEC@ - WINT_T_SUFFIX = @WINT_T_SUFFIX@ - abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ -diff -durN libpipeline-1.4.1.orig/man/Makefile.in libpipeline-1.4.1/man/Makefile.in ---- libpipeline-1.4.1.orig/man/Makefile.in 2015-08-17 17:14:24.000000000 +0800 -+++ libpipeline-1.4.1/man/Makefile.in 2017-05-17 10:38:52.531250000 +0800 -@@ -105,6 +105,7 @@ - $(top_srcdir)/gnulib/m4/fcntl-o.m4 \ - $(top_srcdir)/gnulib/m4/fcntl_h.m4 \ - $(top_srcdir)/gnulib/m4/float_h.m4 \ -+ $(top_srcdir)/gnulib/m4/getprogname.m4 \ - $(top_srcdir)/gnulib/m4/gettimeofday.m4 \ - $(top_srcdir)/gnulib/m4/gnulib-common.m4 \ - $(top_srcdir)/gnulib/m4/gnulib-comp.m4 \ -@@ -117,6 +118,8 @@ - $(top_srcdir)/gnulib/m4/lib-link.m4 \ - $(top_srcdir)/gnulib/m4/lib-prefix.m4 \ - $(top_srcdir)/gnulib/m4/libtool.m4 \ -+ $(top_srcdir)/gnulib/m4/limits-h.m4 \ -+ $(top_srcdir)/gnulib/m4/localtime-buffer.m4 \ - $(top_srcdir)/gnulib/m4/lock.m4 \ - $(top_srcdir)/gnulib/m4/longlong.m4 \ - $(top_srcdir)/gnulib/m4/lstat.m4 \ -@@ -136,6 +139,7 @@ - $(top_srcdir)/gnulib/m4/onceonly.m4 \ - $(top_srcdir)/gnulib/m4/pathmax.m4 \ - $(top_srcdir)/gnulib/m4/printf.m4 \ -+ $(top_srcdir)/gnulib/m4/pthread_rwlock_rdlock.m4 \ - $(top_srcdir)/gnulib/m4/raise.m4 \ - $(top_srcdir)/gnulib/m4/read.m4 \ - $(top_srcdir)/gnulib/m4/safe-read.m4 \ -@@ -297,6 +301,7 @@ - GNULIB_CHDIR = @GNULIB_CHDIR@ - GNULIB_CHOWN = @GNULIB_CHOWN@ - GNULIB_CLOSE = @GNULIB_CLOSE@ -+GNULIB_CTIME = @GNULIB_CTIME@ - GNULIB_DPRINTF = @GNULIB_DPRINTF@ - GNULIB_DUP = @GNULIB_DUP@ - GNULIB_DUP2 = @GNULIB_DUP2@ -@@ -358,6 +363,7 @@ - GNULIB_LCHOWN = @GNULIB_LCHOWN@ - GNULIB_LINK = @GNULIB_LINK@ - GNULIB_LINKAT = @GNULIB_LINKAT@ -+GNULIB_LOCALTIME = @GNULIB_LOCALTIME@ - GNULIB_LSEEK = @GNULIB_LSEEK@ - GNULIB_LSTAT = @GNULIB_LSTAT@ - GNULIB_MALLOC_POSIX = @GNULIB_MALLOC_POSIX@ -@@ -402,6 +408,8 @@ - GNULIB_OBSTACK_PRINTF_POSIX = @GNULIB_OBSTACK_PRINTF_POSIX@ - GNULIB_OPEN = @GNULIB_OPEN@ - GNULIB_OPENAT = @GNULIB_OPENAT@ -+GNULIB_OVERRIDES_STRUCT_STAT = @GNULIB_OVERRIDES_STRUCT_STAT@ -+GNULIB_OVERRIDES_WINT_T = @GNULIB_OVERRIDES_WINT_T@ - GNULIB_PCLOSE = @GNULIB_PCLOSE@ - GNULIB_PERROR = @GNULIB_PERROR@ - GNULIB_PIPE = @GNULIB_PIPE@ -@@ -420,6 +428,7 @@ - GNULIB_PUTENV = @GNULIB_PUTENV@ - GNULIB_PUTS = @GNULIB_PUTS@ - GNULIB_PWRITE = @GNULIB_PWRITE@ -+GNULIB_QSORT_R = @GNULIB_QSORT_R@ - GNULIB_RAISE = @GNULIB_RAISE@ - GNULIB_RANDOM = @GNULIB_RANDOM@ - GNULIB_RANDOM_R = @GNULIB_RANDOM_R@ -@@ -455,6 +464,7 @@ - GNULIB_STRDUP = @GNULIB_STRDUP@ - GNULIB_STRERROR = @GNULIB_STRERROR@ - GNULIB_STRERROR_R = @GNULIB_STRERROR_R@ -+GNULIB_STRFTIME = @GNULIB_STRFTIME@ - GNULIB_STRNCAT = @GNULIB_STRNCAT@ - GNULIB_STRNDUP = @GNULIB_STRNDUP@ - GNULIB_STRNLEN = @GNULIB_STRNLEN@ -@@ -473,8 +483,11 @@ - GNULIB_SYSTEM_POSIX = @GNULIB_SYSTEM_POSIX@ - GNULIB_TIMEGM = @GNULIB_TIMEGM@ - GNULIB_TIME_R = @GNULIB_TIME_R@ -+GNULIB_TIME_RZ = @GNULIB_TIME_RZ@ - GNULIB_TMPFILE = @GNULIB_TMPFILE@ -+GNULIB_TRUNCATE = @GNULIB_TRUNCATE@ - GNULIB_TTYNAME_R = @GNULIB_TTYNAME_R@ -+GNULIB_TZSET = @GNULIB_TZSET@ - GNULIB_UNISTD_H_NONBLOCKING = @GNULIB_UNISTD_H_NONBLOCKING@ - GNULIB_UNISTD_H_SIGPIPE = @GNULIB_UNISTD_H_SIGPIPE@ - GNULIB_UNLINK = @GNULIB_UNLINK@ -@@ -505,6 +518,7 @@ - GNULIB_WCSCPY = @GNULIB_WCSCPY@ - GNULIB_WCSCSPN = @GNULIB_WCSCSPN@ - GNULIB_WCSDUP = @GNULIB_WCSDUP@ -+GNULIB_WCSFTIME = @GNULIB_WCSFTIME@ - GNULIB_WCSLEN = @GNULIB_WCSLEN@ - GNULIB_WCSNCASECMP = @GNULIB_WCSNCASECMP@ - GNULIB_WCSNCAT = @GNULIB_WCSNCAT@ -@@ -533,8 +547,10 @@ - GREP = @GREP@ - HAVE_ATOLL = @HAVE_ATOLL@ - HAVE_BTOWC = @HAVE_BTOWC@ -+HAVE_C99_STDINT_H = @HAVE_C99_STDINT_H@ - HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@ - HAVE_CHOWN = @HAVE_CHOWN@ -+HAVE_CRTDEFS_H = @HAVE_CRTDEFS_H@ - HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@ - HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@ - HAVE_DECL_FDATASYNC = @HAVE_DECL_FDATASYNC@ -@@ -545,6 +561,7 @@ - HAVE_DECL_GETDOMAINNAME = @HAVE_DECL_GETDOMAINNAME@ - HAVE_DECL_GETLINE = @HAVE_DECL_GETLINE@ - HAVE_DECL_GETLOADAVG = @HAVE_DECL_GETLOADAVG@ -+HAVE_DECL_GETLOGIN = @HAVE_DECL_GETLOGIN@ - HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@ - HAVE_DECL_GETPAGESIZE = @HAVE_DECL_GETPAGESIZE@ - HAVE_DECL_GETUSERSHELL = @HAVE_DECL_GETUSERSHELL@ -@@ -601,6 +618,7 @@ - HAVE_LINKAT = @HAVE_LINKAT@ - HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@ - HAVE_LSTAT = @HAVE_LSTAT@ -+HAVE_MAX_ALIGN_T = @HAVE_MAX_ALIGN_T@ - HAVE_MBRLEN = @HAVE_MBRLEN@ - HAVE_MBRTOWC = @HAVE_MBRTOWC@ - HAVE_MBSINIT = @HAVE_MBSINIT@ -@@ -635,6 +653,7 @@ - HAVE_PTSNAME = @HAVE_PTSNAME@ - HAVE_PTSNAME_R = @HAVE_PTSNAME_R@ - HAVE_PWRITE = @HAVE_PWRITE@ -+HAVE_QSORT_R = @HAVE_QSORT_R@ - HAVE_RAISE = @HAVE_RAISE@ - HAVE_RANDOM = @HAVE_RANDOM@ - HAVE_RANDOM_H = @HAVE_RANDOM_H@ -@@ -681,7 +700,10 @@ - HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@ - HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@ - HAVE_TIMEGM = @HAVE_TIMEGM@ -+HAVE_TIMEZONE_T = @HAVE_TIMEZONE_T@ -+HAVE_TRUNCATE = @HAVE_TRUNCATE@ - HAVE_TYPE_VOLATILE_SIG_ATOMIC_T = @HAVE_TYPE_VOLATILE_SIG_ATOMIC_T@ -+HAVE_TZSET = @HAVE_TZSET@ - HAVE_UNISTD_H = @HAVE_UNISTD_H@ - HAVE_UNLINKAT = @HAVE_UNLINKAT@ - HAVE_UNLOCKPT = @HAVE_UNLOCKPT@ -@@ -703,6 +725,7 @@ - HAVE_WCSCPY = @HAVE_WCSCPY@ - HAVE_WCSCSPN = @HAVE_WCSCSPN@ - HAVE_WCSDUP = @HAVE_WCSDUP@ -+HAVE_WCSFTIME = @HAVE_WCSFTIME@ - HAVE_WCSLEN = @HAVE_WCSLEN@ - HAVE_WCSNCASECMP = @HAVE_WCSNCASECMP@ - HAVE_WCSNCAT = @HAVE_WCSNCAT@ -@@ -745,6 +768,7 @@ - LIBS = @LIBS@ - LIBTHREAD = @LIBTHREAD@ - LIBTOOL = @LIBTOOL@ -+LIMITS_H = @LIMITS_H@ - LIPO = @LIPO@ - LN_S = @LN_S@ - LTLIBINTL = @LTLIBINTL@ -@@ -752,6 +776,7 @@ - LTLIBOBJS = @LTLIBOBJS@ - LTLIBPTH = @LTLIBPTH@ - LTLIBTHREAD = @LTLIBTHREAD@ -+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ - MAINT = @MAINT@ - MAKEINFO = @MAKEINFO@ - MANIFEST_TOOL = @MANIFEST_TOOL@ -@@ -759,6 +784,7 @@ - NEXT_AS_FIRST_DIRECTIVE_ERRNO_H = @NEXT_AS_FIRST_DIRECTIVE_ERRNO_H@ - NEXT_AS_FIRST_DIRECTIVE_FCNTL_H = @NEXT_AS_FIRST_DIRECTIVE_FCNTL_H@ - NEXT_AS_FIRST_DIRECTIVE_FLOAT_H = @NEXT_AS_FIRST_DIRECTIVE_FLOAT_H@ -+NEXT_AS_FIRST_DIRECTIVE_LIMITS_H = @NEXT_AS_FIRST_DIRECTIVE_LIMITS_H@ - NEXT_AS_FIRST_DIRECTIVE_SIGNAL_H = @NEXT_AS_FIRST_DIRECTIVE_SIGNAL_H@ - NEXT_AS_FIRST_DIRECTIVE_STDARG_H = @NEXT_AS_FIRST_DIRECTIVE_STDARG_H@ - NEXT_AS_FIRST_DIRECTIVE_STDDEF_H = @NEXT_AS_FIRST_DIRECTIVE_STDDEF_H@ -@@ -777,6 +803,7 @@ - NEXT_ERRNO_H = @NEXT_ERRNO_H@ - NEXT_FCNTL_H = @NEXT_FCNTL_H@ - NEXT_FLOAT_H = @NEXT_FLOAT_H@ -+NEXT_LIMITS_H = @NEXT_LIMITS_H@ - NEXT_SIGNAL_H = @NEXT_SIGNAL_H@ - NEXT_STDARG_H = @NEXT_STDARG_H@ - NEXT_STDDEF_H = @NEXT_STDDEF_H@ -@@ -819,6 +846,7 @@ - REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@ - REPLACE_CHOWN = @REPLACE_CHOWN@ - REPLACE_CLOSE = @REPLACE_CLOSE@ -+REPLACE_CTIME = @REPLACE_CTIME@ - REPLACE_DPRINTF = @REPLACE_DPRINTF@ - REPLACE_DUP = @REPLACE_DUP@ - REPLACE_DUP2 = @REPLACE_DUP2@ -@@ -888,10 +916,12 @@ - REPLACE_PTSNAME_R = @REPLACE_PTSNAME_R@ - REPLACE_PUTENV = @REPLACE_PUTENV@ - REPLACE_PWRITE = @REPLACE_PWRITE@ -+REPLACE_QSORT_R = @REPLACE_QSORT_R@ - REPLACE_RAISE = @REPLACE_RAISE@ - REPLACE_RANDOM_R = @REPLACE_RANDOM_R@ - REPLACE_READ = @REPLACE_READ@ - REPLACE_READLINK = @REPLACE_READLINK@ -+REPLACE_READLINKAT = @REPLACE_READLINKAT@ - REPLACE_REALLOC = @REPLACE_REALLOC@ - REPLACE_REALPATH = @REPLACE_REALPATH@ - REPLACE_REMOVE = @REPLACE_REMOVE@ -@@ -912,6 +942,7 @@ - REPLACE_STRDUP = @REPLACE_STRDUP@ - REPLACE_STRERROR = @REPLACE_STRERROR@ - REPLACE_STRERROR_R = @REPLACE_STRERROR_R@ -+REPLACE_STRFTIME = @REPLACE_STRFTIME@ - REPLACE_STRNCAT = @REPLACE_STRNCAT@ - REPLACE_STRNDUP = @REPLACE_STRNDUP@ - REPLACE_STRNLEN = @REPLACE_STRNLEN@ -@@ -921,9 +952,12 @@ - REPLACE_STRTOK_R = @REPLACE_STRTOK_R@ - REPLACE_STRUCT_TIMEVAL = @REPLACE_STRUCT_TIMEVAL@ - REPLACE_SYMLINK = @REPLACE_SYMLINK@ -+REPLACE_SYMLINKAT = @REPLACE_SYMLINKAT@ - REPLACE_TIMEGM = @REPLACE_TIMEGM@ - REPLACE_TMPFILE = @REPLACE_TMPFILE@ -+REPLACE_TRUNCATE = @REPLACE_TRUNCATE@ - REPLACE_TTYNAME_R = @REPLACE_TTYNAME_R@ -+REPLACE_TZSET = @REPLACE_TZSET@ - REPLACE_UNLINK = @REPLACE_UNLINK@ - REPLACE_UNLINKAT = @REPLACE_UNLINKAT@ - REPLACE_UNSETENV = @REPLACE_UNSETENV@ -@@ -936,6 +970,7 @@ - REPLACE_VSNPRINTF = @REPLACE_VSNPRINTF@ - REPLACE_VSPRINTF = @REPLACE_VSPRINTF@ - REPLACE_WCRTOMB = @REPLACE_WCRTOMB@ -+REPLACE_WCSFTIME = @REPLACE_WCSFTIME@ - REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@ - REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@ - REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@ -@@ -956,6 +991,7 @@ - SYS_TIME_H_DEFINES_STRUCT_TIMESPEC = @SYS_TIME_H_DEFINES_STRUCT_TIMESPEC@ - TIME_H_DEFINES_STRUCT_TIMESPEC = @TIME_H_DEFINES_STRUCT_TIMESPEC@ - UNDEFINE_STRTOK_R = @UNDEFINE_STRTOK_R@ -+UNISTD_H_DEFINES_STRUCT_TIMESPEC = @UNISTD_H_DEFINES_STRUCT_TIMESPEC@ - UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@ - UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS = @UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS@ - VERSION = @VERSION@ -@@ -963,6 +999,8 @@ - WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@ - WINDOWS_64_BIT_OFF_T = @WINDOWS_64_BIT_OFF_T@ - WINDOWS_64_BIT_ST_SIZE = @WINDOWS_64_BIT_ST_SIZE@ -+WINDOWS_STAT_INODES = @WINDOWS_STAT_INODES@ -+WINDOWS_STAT_TIMESPEC = @WINDOWS_STAT_TIMESPEC@ - WINT_T_SUFFIX = @WINT_T_SUFFIX@ - abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ -diff -durN libpipeline-1.4.1.orig/tests/Makefile.in libpipeline-1.4.1/tests/Makefile.in ---- libpipeline-1.4.1.orig/tests/Makefile.in 2015-08-17 17:14:24.000000000 +0800 -+++ libpipeline-1.4.1/tests/Makefile.in 2017-05-17 10:38:52.890625000 +0800 -@@ -108,6 +108,7 @@ - $(top_srcdir)/gnulib/m4/fcntl-o.m4 \ - $(top_srcdir)/gnulib/m4/fcntl_h.m4 \ - $(top_srcdir)/gnulib/m4/float_h.m4 \ -+ $(top_srcdir)/gnulib/m4/getprogname.m4 \ - $(top_srcdir)/gnulib/m4/gettimeofday.m4 \ - $(top_srcdir)/gnulib/m4/gnulib-common.m4 \ - $(top_srcdir)/gnulib/m4/gnulib-comp.m4 \ -@@ -120,6 +121,8 @@ - $(top_srcdir)/gnulib/m4/lib-link.m4 \ - $(top_srcdir)/gnulib/m4/lib-prefix.m4 \ - $(top_srcdir)/gnulib/m4/libtool.m4 \ -+ $(top_srcdir)/gnulib/m4/limits-h.m4 \ -+ $(top_srcdir)/gnulib/m4/localtime-buffer.m4 \ - $(top_srcdir)/gnulib/m4/lock.m4 \ - $(top_srcdir)/gnulib/m4/longlong.m4 \ - $(top_srcdir)/gnulib/m4/lstat.m4 \ -@@ -139,6 +142,7 @@ - $(top_srcdir)/gnulib/m4/onceonly.m4 \ - $(top_srcdir)/gnulib/m4/pathmax.m4 \ - $(top_srcdir)/gnulib/m4/printf.m4 \ -+ $(top_srcdir)/gnulib/m4/pthread_rwlock_rdlock.m4 \ - $(top_srcdir)/gnulib/m4/raise.m4 \ - $(top_srcdir)/gnulib/m4/read.m4 \ - $(top_srcdir)/gnulib/m4/safe-read.m4 \ -@@ -548,6 +552,7 @@ - GNULIB_CHDIR = @GNULIB_CHDIR@ - GNULIB_CHOWN = @GNULIB_CHOWN@ - GNULIB_CLOSE = @GNULIB_CLOSE@ -+GNULIB_CTIME = @GNULIB_CTIME@ - GNULIB_DPRINTF = @GNULIB_DPRINTF@ - GNULIB_DUP = @GNULIB_DUP@ - GNULIB_DUP2 = @GNULIB_DUP2@ -@@ -609,6 +614,7 @@ - GNULIB_LCHOWN = @GNULIB_LCHOWN@ - GNULIB_LINK = @GNULIB_LINK@ - GNULIB_LINKAT = @GNULIB_LINKAT@ -+GNULIB_LOCALTIME = @GNULIB_LOCALTIME@ - GNULIB_LSEEK = @GNULIB_LSEEK@ - GNULIB_LSTAT = @GNULIB_LSTAT@ - GNULIB_MALLOC_POSIX = @GNULIB_MALLOC_POSIX@ -@@ -653,6 +659,8 @@ - GNULIB_OBSTACK_PRINTF_POSIX = @GNULIB_OBSTACK_PRINTF_POSIX@ - GNULIB_OPEN = @GNULIB_OPEN@ - GNULIB_OPENAT = @GNULIB_OPENAT@ -+GNULIB_OVERRIDES_STRUCT_STAT = @GNULIB_OVERRIDES_STRUCT_STAT@ -+GNULIB_OVERRIDES_WINT_T = @GNULIB_OVERRIDES_WINT_T@ - GNULIB_PCLOSE = @GNULIB_PCLOSE@ - GNULIB_PERROR = @GNULIB_PERROR@ - GNULIB_PIPE = @GNULIB_PIPE@ -@@ -671,6 +679,7 @@ - GNULIB_PUTENV = @GNULIB_PUTENV@ - GNULIB_PUTS = @GNULIB_PUTS@ - GNULIB_PWRITE = @GNULIB_PWRITE@ -+GNULIB_QSORT_R = @GNULIB_QSORT_R@ - GNULIB_RAISE = @GNULIB_RAISE@ - GNULIB_RANDOM = @GNULIB_RANDOM@ - GNULIB_RANDOM_R = @GNULIB_RANDOM_R@ -@@ -706,6 +715,7 @@ - GNULIB_STRDUP = @GNULIB_STRDUP@ - GNULIB_STRERROR = @GNULIB_STRERROR@ - GNULIB_STRERROR_R = @GNULIB_STRERROR_R@ -+GNULIB_STRFTIME = @GNULIB_STRFTIME@ - GNULIB_STRNCAT = @GNULIB_STRNCAT@ - GNULIB_STRNDUP = @GNULIB_STRNDUP@ - GNULIB_STRNLEN = @GNULIB_STRNLEN@ -@@ -724,8 +734,11 @@ - GNULIB_SYSTEM_POSIX = @GNULIB_SYSTEM_POSIX@ - GNULIB_TIMEGM = @GNULIB_TIMEGM@ - GNULIB_TIME_R = @GNULIB_TIME_R@ -+GNULIB_TIME_RZ = @GNULIB_TIME_RZ@ - GNULIB_TMPFILE = @GNULIB_TMPFILE@ -+GNULIB_TRUNCATE = @GNULIB_TRUNCATE@ - GNULIB_TTYNAME_R = @GNULIB_TTYNAME_R@ -+GNULIB_TZSET = @GNULIB_TZSET@ - GNULIB_UNISTD_H_NONBLOCKING = @GNULIB_UNISTD_H_NONBLOCKING@ - GNULIB_UNISTD_H_SIGPIPE = @GNULIB_UNISTD_H_SIGPIPE@ - GNULIB_UNLINK = @GNULIB_UNLINK@ -@@ -756,6 +769,7 @@ - GNULIB_WCSCPY = @GNULIB_WCSCPY@ - GNULIB_WCSCSPN = @GNULIB_WCSCSPN@ - GNULIB_WCSDUP = @GNULIB_WCSDUP@ -+GNULIB_WCSFTIME = @GNULIB_WCSFTIME@ - GNULIB_WCSLEN = @GNULIB_WCSLEN@ - GNULIB_WCSNCASECMP = @GNULIB_WCSNCASECMP@ - GNULIB_WCSNCAT = @GNULIB_WCSNCAT@ -@@ -784,8 +798,10 @@ - GREP = @GREP@ - HAVE_ATOLL = @HAVE_ATOLL@ - HAVE_BTOWC = @HAVE_BTOWC@ -+HAVE_C99_STDINT_H = @HAVE_C99_STDINT_H@ - HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@ - HAVE_CHOWN = @HAVE_CHOWN@ -+HAVE_CRTDEFS_H = @HAVE_CRTDEFS_H@ - HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@ - HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@ - HAVE_DECL_FDATASYNC = @HAVE_DECL_FDATASYNC@ -@@ -796,6 +812,7 @@ - HAVE_DECL_GETDOMAINNAME = @HAVE_DECL_GETDOMAINNAME@ - HAVE_DECL_GETLINE = @HAVE_DECL_GETLINE@ - HAVE_DECL_GETLOADAVG = @HAVE_DECL_GETLOADAVG@ -+HAVE_DECL_GETLOGIN = @HAVE_DECL_GETLOGIN@ - HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@ - HAVE_DECL_GETPAGESIZE = @HAVE_DECL_GETPAGESIZE@ - HAVE_DECL_GETUSERSHELL = @HAVE_DECL_GETUSERSHELL@ -@@ -852,6 +869,7 @@ - HAVE_LINKAT = @HAVE_LINKAT@ - HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@ - HAVE_LSTAT = @HAVE_LSTAT@ -+HAVE_MAX_ALIGN_T = @HAVE_MAX_ALIGN_T@ - HAVE_MBRLEN = @HAVE_MBRLEN@ - HAVE_MBRTOWC = @HAVE_MBRTOWC@ - HAVE_MBSINIT = @HAVE_MBSINIT@ -@@ -886,6 +904,7 @@ - HAVE_PTSNAME = @HAVE_PTSNAME@ - HAVE_PTSNAME_R = @HAVE_PTSNAME_R@ - HAVE_PWRITE = @HAVE_PWRITE@ -+HAVE_QSORT_R = @HAVE_QSORT_R@ - HAVE_RAISE = @HAVE_RAISE@ - HAVE_RANDOM = @HAVE_RANDOM@ - HAVE_RANDOM_H = @HAVE_RANDOM_H@ -@@ -932,7 +951,10 @@ - HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@ - HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@ - HAVE_TIMEGM = @HAVE_TIMEGM@ -+HAVE_TIMEZONE_T = @HAVE_TIMEZONE_T@ -+HAVE_TRUNCATE = @HAVE_TRUNCATE@ - HAVE_TYPE_VOLATILE_SIG_ATOMIC_T = @HAVE_TYPE_VOLATILE_SIG_ATOMIC_T@ -+HAVE_TZSET = @HAVE_TZSET@ - HAVE_UNISTD_H = @HAVE_UNISTD_H@ - HAVE_UNLINKAT = @HAVE_UNLINKAT@ - HAVE_UNLOCKPT = @HAVE_UNLOCKPT@ -@@ -954,6 +976,7 @@ - HAVE_WCSCPY = @HAVE_WCSCPY@ - HAVE_WCSCSPN = @HAVE_WCSCSPN@ - HAVE_WCSDUP = @HAVE_WCSDUP@ -+HAVE_WCSFTIME = @HAVE_WCSFTIME@ - HAVE_WCSLEN = @HAVE_WCSLEN@ - HAVE_WCSNCASECMP = @HAVE_WCSNCASECMP@ - HAVE_WCSNCAT = @HAVE_WCSNCAT@ -@@ -996,6 +1019,7 @@ - LIBS = ../gnulib/lib/libgnu.la $(LTLIBOBJS) $(top_builddir)/lib/libpipeline.la - LIBTHREAD = @LIBTHREAD@ - LIBTOOL = @LIBTOOL@ -+LIMITS_H = @LIMITS_H@ - LIPO = @LIPO@ - LN_S = @LN_S@ - LTLIBINTL = @LTLIBINTL@ -@@ -1003,6 +1027,7 @@ - LTLIBOBJS = @LTLIBOBJS@ - LTLIBPTH = @LTLIBPTH@ - LTLIBTHREAD = @LTLIBTHREAD@ -+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ - MAINT = @MAINT@ - MAKEINFO = @MAKEINFO@ - MANIFEST_TOOL = @MANIFEST_TOOL@ -@@ -1010,6 +1035,7 @@ - NEXT_AS_FIRST_DIRECTIVE_ERRNO_H = @NEXT_AS_FIRST_DIRECTIVE_ERRNO_H@ - NEXT_AS_FIRST_DIRECTIVE_FCNTL_H = @NEXT_AS_FIRST_DIRECTIVE_FCNTL_H@ - NEXT_AS_FIRST_DIRECTIVE_FLOAT_H = @NEXT_AS_FIRST_DIRECTIVE_FLOAT_H@ -+NEXT_AS_FIRST_DIRECTIVE_LIMITS_H = @NEXT_AS_FIRST_DIRECTIVE_LIMITS_H@ - NEXT_AS_FIRST_DIRECTIVE_SIGNAL_H = @NEXT_AS_FIRST_DIRECTIVE_SIGNAL_H@ - NEXT_AS_FIRST_DIRECTIVE_STDARG_H = @NEXT_AS_FIRST_DIRECTIVE_STDARG_H@ - NEXT_AS_FIRST_DIRECTIVE_STDDEF_H = @NEXT_AS_FIRST_DIRECTIVE_STDDEF_H@ -@@ -1028,6 +1054,7 @@ - NEXT_ERRNO_H = @NEXT_ERRNO_H@ - NEXT_FCNTL_H = @NEXT_FCNTL_H@ - NEXT_FLOAT_H = @NEXT_FLOAT_H@ -+NEXT_LIMITS_H = @NEXT_LIMITS_H@ - NEXT_SIGNAL_H = @NEXT_SIGNAL_H@ - NEXT_STDARG_H = @NEXT_STDARG_H@ - NEXT_STDDEF_H = @NEXT_STDDEF_H@ -@@ -1070,6 +1097,7 @@ - REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@ - REPLACE_CHOWN = @REPLACE_CHOWN@ - REPLACE_CLOSE = @REPLACE_CLOSE@ -+REPLACE_CTIME = @REPLACE_CTIME@ - REPLACE_DPRINTF = @REPLACE_DPRINTF@ - REPLACE_DUP = @REPLACE_DUP@ - REPLACE_DUP2 = @REPLACE_DUP2@ -@@ -1139,10 +1167,12 @@ - REPLACE_PTSNAME_R = @REPLACE_PTSNAME_R@ - REPLACE_PUTENV = @REPLACE_PUTENV@ - REPLACE_PWRITE = @REPLACE_PWRITE@ -+REPLACE_QSORT_R = @REPLACE_QSORT_R@ - REPLACE_RAISE = @REPLACE_RAISE@ - REPLACE_RANDOM_R = @REPLACE_RANDOM_R@ - REPLACE_READ = @REPLACE_READ@ - REPLACE_READLINK = @REPLACE_READLINK@ -+REPLACE_READLINKAT = @REPLACE_READLINKAT@ - REPLACE_REALLOC = @REPLACE_REALLOC@ - REPLACE_REALPATH = @REPLACE_REALPATH@ - REPLACE_REMOVE = @REPLACE_REMOVE@ -@@ -1163,6 +1193,7 @@ - REPLACE_STRDUP = @REPLACE_STRDUP@ - REPLACE_STRERROR = @REPLACE_STRERROR@ - REPLACE_STRERROR_R = @REPLACE_STRERROR_R@ -+REPLACE_STRFTIME = @REPLACE_STRFTIME@ - REPLACE_STRNCAT = @REPLACE_STRNCAT@ - REPLACE_STRNDUP = @REPLACE_STRNDUP@ - REPLACE_STRNLEN = @REPLACE_STRNLEN@ -@@ -1172,9 +1203,12 @@ - REPLACE_STRTOK_R = @REPLACE_STRTOK_R@ - REPLACE_STRUCT_TIMEVAL = @REPLACE_STRUCT_TIMEVAL@ - REPLACE_SYMLINK = @REPLACE_SYMLINK@ -+REPLACE_SYMLINKAT = @REPLACE_SYMLINKAT@ - REPLACE_TIMEGM = @REPLACE_TIMEGM@ - REPLACE_TMPFILE = @REPLACE_TMPFILE@ -+REPLACE_TRUNCATE = @REPLACE_TRUNCATE@ - REPLACE_TTYNAME_R = @REPLACE_TTYNAME_R@ -+REPLACE_TZSET = @REPLACE_TZSET@ - REPLACE_UNLINK = @REPLACE_UNLINK@ - REPLACE_UNLINKAT = @REPLACE_UNLINKAT@ - REPLACE_UNSETENV = @REPLACE_UNSETENV@ -@@ -1187,6 +1221,7 @@ - REPLACE_VSNPRINTF = @REPLACE_VSNPRINTF@ - REPLACE_VSPRINTF = @REPLACE_VSPRINTF@ - REPLACE_WCRTOMB = @REPLACE_WCRTOMB@ -+REPLACE_WCSFTIME = @REPLACE_WCSFTIME@ - REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@ - REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@ - REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@ -@@ -1207,6 +1242,7 @@ - SYS_TIME_H_DEFINES_STRUCT_TIMESPEC = @SYS_TIME_H_DEFINES_STRUCT_TIMESPEC@ - TIME_H_DEFINES_STRUCT_TIMESPEC = @TIME_H_DEFINES_STRUCT_TIMESPEC@ - UNDEFINE_STRTOK_R = @UNDEFINE_STRTOK_R@ -+UNISTD_H_DEFINES_STRUCT_TIMESPEC = @UNISTD_H_DEFINES_STRUCT_TIMESPEC@ - UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@ - UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS = @UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS@ - VERSION = @VERSION@ -@@ -1214,6 +1250,8 @@ - WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@ - WINDOWS_64_BIT_OFF_T = @WINDOWS_64_BIT_OFF_T@ - WINDOWS_64_BIT_ST_SIZE = @WINDOWS_64_BIT_ST_SIZE@ -+WINDOWS_STAT_INODES = @WINDOWS_STAT_INODES@ -+WINDOWS_STAT_TIMESPEC = @WINDOWS_STAT_TIMESPEC@ - WINT_T_SUFFIX = @WINT_T_SUFFIX@ - abs_builddir = @abs_builddir@ - abs_srcdir = @abs_srcdir@ diff --git a/libpipeline/libpipeline-1.5.0-gnulib.patch b/libpipeline/libpipeline-1.5.0-gnulib.patch new file mode 100644 index 00000000..9c6a8a7a --- /dev/null +++ b/libpipeline/libpipeline-1.5.0-gnulib.patch @@ -0,0 +1,14667 @@ +diff -Naur libpipeline-1.5.0-orig/aclocal.m4 libpipeline-1.5.0/aclocal.m4 +--- libpipeline-1.5.0-orig/aclocal.m4 2017-11-14 13:50:55.000000000 +0300 ++++ libpipeline-1.5.0/aclocal.m4 2018-07-02 13:16:50.927771100 +0300 +@@ -296,6 +296,80 @@ + AS_VAR_IF([$1], [""], [$5], [$4])dnl + ])dnl PKG_CHECK_VAR + ++# PKG_WITH_MODULES(VARIABLE-PREFIX, MODULES, ++# [ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND], ++# [DESCRIPTION], [DEFAULT]) ++# ++# Prepare a "--with-" configure option using the lowercase [VARIABLE-PREFIX] ++# name, merging the behaviour of AC_ARG_WITH and PKG_CHECK_MODULES in a single ++# macro ++# ++# -------------------------------------------------------------- ++AC_DEFUN([PKG_WITH_MODULES], ++[ ++m4_pushdef([with_arg], m4_tolower([$1])) ++ ++m4_pushdef([description], ++ [m4_default([$5], [build with ]with_arg[ support])]) ++ ++m4_pushdef([def_arg], [m4_default([$6], [auto])]) ++m4_pushdef([def_action_if_found], [AS_TR_SH([with_]with_arg)=yes]) ++m4_pushdef([def_action_if_not_found], [AS_TR_SH([with_]with_arg)=no]) ++ ++m4_case(def_arg, ++ [yes],[m4_pushdef([with_without], [--without-]with_arg)], ++ [m4_pushdef([with_without],[--with-]with_arg)]) ++ ++AC_ARG_WITH(with_arg, ++ AS_HELP_STRING(with_without, description[ @<:@default=]def_arg[@:>@]),, ++ [AS_TR_SH([with_]with_arg)=def_arg]) ++ ++AS_CASE([$AS_TR_SH([with_]with_arg)], ++ [yes],[PKG_CHECK_MODULES([$1],[$2],$3,$4)], ++ [auto],[PKG_CHECK_MODULES([$1],[$2], ++ [m4_n([def_action_if_found]) $3], ++ [m4_n([def_action_if_not_found]) $4])]) ++ ++m4_popdef([with_arg]) ++m4_popdef([description]) ++m4_popdef([def_arg]) ++ ++]) dnl PKG_WITH_MODULES ++ ++# PKG_HAVE_WITH_MODULES(VARIABLE-PREFIX, MODULES, ++# [DESCRIPTION], [DEFAULT]) ++# ++# Convenience macro to trigger AM_CONDITIONAL after ++# PKG_WITH_MODULES check. ++# ++# HAVE_[VARIABLE-PREFIX] is exported as make variable. ++# ++# -------------------------------------------------------------- ++AC_DEFUN([PKG_HAVE_WITH_MODULES], ++[ ++PKG_WITH_MODULES([$1],[$2],,,[$3],[$4]) ++ ++AM_CONDITIONAL([HAVE_][$1], ++ [test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"]) ++]) ++ ++# PKG_HAVE_DEFINE_WITH_MODULES(VARIABLE-PREFIX, MODULES, ++# [DESCRIPTION], [DEFAULT]) ++# ++# Convenience macro to run AM_CONDITIONAL and AC_DEFINE after ++# PKG_WITH_MODULES check. ++# ++# HAVE_[VARIABLE-PREFIX] is exported as make and preprocessor variable. ++# ++# -------------------------------------------------------------- ++AC_DEFUN([PKG_HAVE_DEFINE_WITH_MODULES], ++[ ++PKG_HAVE_WITH_MODULES([$1],[$2],[$3],[$4]) ++ ++AS_IF([test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"], ++ [AC_DEFINE([HAVE_][$1], 1, [Enable ]m4_tolower([$1])[ support])]) ++]) ++ + # po.m4 serial 24 (gettext-0.19) + dnl Copyright (C) 1995-2014, 2016 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation +@@ -1992,6 +2066,7 @@ + m4_include([gnulib/m4/fcntl-o.m4]) + m4_include([gnulib/m4/fcntl_h.m4]) + m4_include([gnulib/m4/float_h.m4]) ++m4_include([gnulib/m4/getprogname.m4]) + m4_include([gnulib/m4/gettimeofday.m4]) + m4_include([gnulib/m4/gnulib-common.m4]) + m4_include([gnulib/m4/gnulib-comp.m4]) +@@ -2004,6 +2079,8 @@ + m4_include([gnulib/m4/lib-link.m4]) + m4_include([gnulib/m4/lib-prefix.m4]) + m4_include([gnulib/m4/libtool.m4]) ++m4_include([gnulib/m4/limits-h.m4]) ++m4_include([gnulib/m4/localtime-buffer.m4]) + m4_include([gnulib/m4/lock.m4]) + m4_include([gnulib/m4/longlong.m4]) + m4_include([gnulib/m4/lstat.m4]) +@@ -2023,6 +2100,7 @@ + m4_include([gnulib/m4/onceonly.m4]) + m4_include([gnulib/m4/pathmax.m4]) + m4_include([gnulib/m4/printf.m4]) ++m4_include([gnulib/m4/pthread_rwlock_rdlock.m4]) + m4_include([gnulib/m4/raise.m4]) + m4_include([gnulib/m4/read.m4]) + m4_include([gnulib/m4/safe-read.m4]) +diff -Naur libpipeline-1.5.0-orig/build-aux/ar-lib libpipeline-1.5.0/build-aux/ar-lib +--- libpipeline-1.5.0-orig/build-aux/ar-lib 2017-11-14 13:51:01.000000000 +0300 ++++ libpipeline-1.5.0/build-aux/ar-lib 2018-07-02 13:09:56.420432000 +0300 +@@ -53,7 +53,7 @@ + MINGW*) + file_conv=mingw + ;; +- CYGWIN*) ++ CYGWIN*|MSYS*) + file_conv=cygwin + ;; + *) +@@ -65,7 +65,7 @@ + mingw) + file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` + ;; +- cygwin) ++ cygwin|msys) + file=`cygpath -m "$file" || echo "$file"` + ;; + wine) +diff -Naur libpipeline-1.5.0-orig/build-aux/compile libpipeline-1.5.0/build-aux/compile +--- libpipeline-1.5.0-orig/build-aux/compile 2017-11-14 13:51:01.000000000 +0300 ++++ libpipeline-1.5.0/build-aux/compile 2018-07-02 13:09:56.420432000 +0300 +@@ -53,7 +53,7 @@ + MINGW*) + file_conv=mingw + ;; +- CYGWIN*) ++ CYGWIN*|MSYS*) + file_conv=cygwin + ;; + *) +@@ -67,7 +67,7 @@ + mingw/*) + file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` + ;; +- cygwin/*) ++ cygwin/*|msys/*) + file=`cygpath -m "$file" || echo "$file"` + ;; + wine/*) +diff -Naur libpipeline-1.5.0-orig/build-aux/config.rpath libpipeline-1.5.0/build-aux/config.rpath +--- libpipeline-1.5.0-orig/build-aux/config.rpath 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/build-aux/config.rpath 2018-07-02 13:09:56.430432000 +0300 +@@ -2,7 +2,7 @@ + # Output a system dependent set of variables, describing how to set the + # run time search path of shared libraries in an executable. + # +-# Copyright 1996-2014 Free Software Foundation, Inc. ++# Copyright 1996-2017 Free Software Foundation, Inc. + # Taken from GNU libtool, 2001 + # Originally by Gordon Matzigkeit , 1996 + # +@@ -367,11 +367,7 @@ + dgux*) + hardcode_libdir_flag_spec='-L$libdir' + ;; +- freebsd2.2*) +- hardcode_libdir_flag_spec='-R$libdir' +- hardcode_direct=yes +- ;; +- freebsd2*) ++ freebsd2.[01]*) + hardcode_direct=yes + hardcode_minus_L=yes + ;; +@@ -548,13 +544,11 @@ + dgux*) + library_names_spec='$libname$shrext' + ;; ++ freebsd[23].*) ++ library_names_spec='$libname$shrext$versuffix' ++ ;; + freebsd* | dragonfly*) +- case "$host_os" in +- freebsd[123]*) +- library_names_spec='$libname$shrext$versuffix' ;; +- *) +- library_names_spec='$libname$shrext' ;; +- esac ++ library_names_spec='$libname$shrext' + ;; + gnu*) + library_names_spec='$libname$shrext' +diff -Naur libpipeline-1.5.0-orig/build-aux/config.sub libpipeline-1.5.0/build-aux/config.sub +--- libpipeline-1.5.0-orig/build-aux/config.sub 2017-11-14 13:51:01.000000000 +0300 ++++ libpipeline-1.5.0/build-aux/config.sub 2018-07-02 13:09:56.440432000 +0300 +@@ -332,6 +332,9 @@ + leon|leon[3-9]) + basic_machine=sparc-$basic_machine + ;; ++ leon|leon[3-9]) ++ basic_machine=sparc-$basic_machine ++ ;; + m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip) + basic_machine=$basic_machine-unknown + os=-none +@@ -796,6 +799,9 @@ + ;; + leon-*|leon[3-9]-*) + basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'` ++ ;; ++ leon-*|leon[3-9]-*) ++ basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'` + ;; + m68knommu) + basic_machine=m68k-unknown +diff -Naur libpipeline-1.5.0-orig/build-aux/gitlog-to-changelog libpipeline-1.5.0/build-aux/gitlog-to-changelog +--- libpipeline-1.5.0-orig/build-aux/gitlog-to-changelog 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/build-aux/gitlog-to-changelog 2018-07-02 13:09:56.440432000 +0300 +@@ -1,15 +1,15 @@ +-eval '(exit $?0)' && eval 'exec perl -wS "$0" ${1+"$@"}' ++eval '(exit $?0)' && eval 'exec perl -wS "$0" "$@"' + & eval 'exec perl -wS "$0" $argv:q' + if 0; + # Convert git log output to ChangeLog format. + +-my $VERSION = '2012-07-29 06:11'; # UTC ++my $VERSION = '2016-03-22 21:49'; # UTC + # The definition above must lie within the first 8 lines in order + # for the Emacs time-stamp write hook (at end) to update it. + # If you change this file with Emacs, please let the write hook + # do its job. Otherwise, update this string manually. + +-# Copyright (C) 2008-2014 Free Software Foundation, Inc. ++# Copyright (C) 2008-2017 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 +@@ -72,6 +72,9 @@ + directory can be derived. + --since=DATE convert only the logs since DATE; + the default is to convert all log entries. ++ --until=DATE convert only the logs older than DATE. ++ --ignore-matching=PAT ignore commit messages whose first lines match PAT. ++ --ignore-line=PAT ignore lines of commit messages that match PAT. + --format=FMT set format string for commit subject and body; + see 'man git-log' for the list of format metacharacters; + the default is '%s%n%b%n' +@@ -220,10 +223,13 @@ + + { + my $since_date; ++ my $until_date; + my $format_string = '%s%n%b%n'; + my $amend_file; + my $append_dot = 0; + my $cluster = 1; ++ my $ignore_matching; ++ my $ignore_line; + my $strip_tab = 0; + my $strip_cherry_pick = 0; + my $srcdir; +@@ -232,10 +238,13 @@ + help => sub { usage 0 }, + version => sub { print "$ME version $VERSION\n"; exit }, + 'since=s' => \$since_date, ++ 'until=s' => \$until_date, + 'format=s' => \$format_string, + 'amend=s' => \$amend_file, + 'append-dot' => \$append_dot, + 'cluster!' => \$cluster, ++ 'ignore-matching=s' => \$ignore_matching, ++ 'ignore-line=s' => \$ignore_line, + 'strip-tab' => \$strip_tab, + 'strip-cherry-pick' => \$strip_cherry_pick, + 'srcdir=s' => \$srcdir, +@@ -243,6 +252,8 @@ + + defined $since_date + and unshift @ARGV, "--since=$since_date"; ++ defined $until_date ++ and unshift @ARGV, "--until=$until_date"; + + # This is a hash that maps an SHA1 to perl code (i.e., s/old/new/) + # that makes a correction in the log or attribution of that commit. +@@ -259,6 +270,7 @@ + my $prev_multi_paragraph; + my $prev_date_line = ''; + my @prev_coauthors = (); ++ my @skipshas = (); + while (1) + { + defined (my $in = ) +@@ -279,6 +291,19 @@ + $sha =~ /^[0-9a-fA-F]{40}$/ + or die "$ME:$.: invalid SHA1: $sha\n"; + ++ my $skipflag = 0; ++ if (@skipshas) ++ { ++ foreach(@skipshas) ++ { ++ if ($sha =~ /^$_/) ++ { ++ $skipflag = $_; ++ last; ++ } ++ } ++ } ++ + # If this commit's log requires any transformation, do it now. + my $code = $amend_code->{$sha}; + if (defined $code) +@@ -306,7 +331,7 @@ + $rest =~ s/^\s*\(cherry picked from commit [\da-f]+\)\n//m; + } + +- my @line = split "\n", $rest; ++ my @line = split /[ \t]*\n/, $rest; + my $author_line = shift @line; + defined $author_line + or die "$ME:$.: unexpected EOF\n"; +@@ -316,17 +341,18 @@ + + # Format 'Copyright-paperwork-exempt: Yes' as a standard ChangeLog + # `(tiny change)' annotation. +- my $tiny = (grep (/^Copyright-paperwork-exempt:\s+[Yy]es$/, @line) ++ my $tiny = (grep (/^(?:Copyright-paperwork-exempt|Tiny-change):\s+[Yy]es$/, @line) + ? ' (tiny change)' : ''); + + my $date_line = sprintf "%s %s$tiny\n", +- strftime ("%F", localtime ($1)), $2; ++ strftime ("%Y-%m-%d", localtime ($1)), $2; + + my @coauthors = grep /^Co-authored-by:.*$/, @line; + # Omit meta-data lines we've already interpreted. + @line = grep !/^(?:Signed-off-by:[ ].*>$ + |Co-authored-by:[ ] + |Copyright-paperwork-exempt:[ ] ++ |Tiny-change:[ ] + )/x, @line; + + # Remove leading and trailing blank lines. +@@ -336,68 +362,109 @@ + while ($line[$#line] =~ /^\s*$/) { pop @line; } + } + +- # Record whether there are two or more paragraphs. +- my $multi_paragraph = grep /^\s*$/, @line; ++ # Handle Emacs gitmerge.el "skipped" commits. ++ # Yes, this should be controlled by an option. So sue me. ++ if ( grep /^(; )?Merge from /, @line ) ++ { ++ my $found = 0; ++ foreach (@line) ++ { ++ if (grep /^The following commit.*skipped:$/, $_) ++ { ++ $found = 1; ++ ## Reset at each merge to reduce chance of false matches. ++ @skipshas = (); ++ next; ++ } ++ if ($found && $_ =~ /^([0-9a-fA-F]{7,}) [^ ]/) ++ { ++ push ( @skipshas, $1 ); ++ } ++ } ++ } + +- # Format 'Co-authored-by: A U Thor ' lines in +- # standard multi-author ChangeLog format. +- for (@coauthors) ++ # Ignore commits that match the --ignore-matching pattern, if specified. ++ if (defined $ignore_matching && @line && $line[0] =~ /$ignore_matching/) + { +- s/^Co-authored-by:\s*/\t /; +- s/\s*/ +- or warn "$ME: warning: missing email address for " +- . substr ($_, 5) . "\n"; ++ $skipflag = 1; + } +- +- # If clustering of commit messages has been disabled, if this header +- # would be different from the previous date/name/email/coauthors header, +- # or if this or the previous entry consists of two or more paragraphs, +- # then print the header. +- if ( ! $cluster +- || $date_line ne $prev_date_line +- || "@coauthors" ne "@prev_coauthors" +- || $multi_paragraph +- || $prev_multi_paragraph) ++ elsif ($skipflag) + { +- $prev_date_line eq '' +- or print "\n"; +- print $date_line; +- @coauthors +- and print join ("\n", @coauthors), "\n"; ++ ## Perhaps only warn if a pattern matches more than once? ++ warn "$ME: warning: skipping $sha due to $skipflag\n"; + } +- $prev_date_line = $date_line; +- @prev_coauthors = @coauthors; +- $prev_multi_paragraph = $multi_paragraph; + +- # If there were any lines +- if (@line == 0) ++ if (! $skipflag) + { +- warn "$ME: warning: empty commit message:\n $date_line\n"; +- } +- else +- { +- if ($append_dot) ++ if (defined $ignore_line && @line) + { +- # If the first line of the message has enough room, then +- if (length $line[0] < 72) ++ @line = grep ! /$ignore_line/, @line; ++ while ($line[$#line] =~ /^\s*$/) { pop @line; } ++ } ++ ++ # Record whether there are two or more paragraphs. ++ my $multi_paragraph = grep /^\s*$/, @line; ++ ++ # Format 'Co-authored-by: A U Thor ' lines in ++ # standard multi-author ChangeLog format. ++ for (@coauthors) ++ { ++ s/^Co-authored-by:\s*/\t /; ++ s/\s*/ ++ or warn "$ME: warning: missing email address for " ++ . substr ($_, 5) . "\n"; ++ } ++ ++ # If clustering of commit messages has been disabled, if this header ++ # would be different from the previous date/name/etc. header, ++ # or if this or the previous entry consists of two or more paragraphs, ++ # then print the header. ++ if ( ! $cluster ++ || $date_line ne $prev_date_line ++ || "@coauthors" ne "@prev_coauthors" ++ || $multi_paragraph ++ || $prev_multi_paragraph) ++ { ++ $prev_date_line eq '' ++ or print "\n"; ++ print $date_line; ++ @coauthors ++ and print join ("\n", @coauthors), "\n"; ++ } ++ $prev_date_line = $date_line; ++ @prev_coauthors = @coauthors; ++ $prev_multi_paragraph = $multi_paragraph; ++ ++ # If there were any lines ++ if (@line == 0) ++ { ++ warn "$ME: warning: empty commit message:\n $date_line\n"; ++ } ++ else ++ { ++ if ($append_dot) + { +- # append a dot if there is no other punctuation or blank +- # at the end. +- $line[0] =~ /[[:punct:]\s]$/ +- or $line[0] .= '.'; ++ # If the first line of the message has enough room, then ++ if (length $line[0] < 72) ++ { ++ # append a dot if there is no other punctuation or blank ++ # at the end. ++ $line[0] =~ /[[:punct:]\s]$/ ++ or $line[0] .= '.'; ++ } + } +- } + +- # Remove one additional leading TAB from each line. +- $strip_tab +- and map { s/^\t// } @line; ++ # Remove one additional leading TAB from each line. ++ $strip_tab ++ and map { s/^\t// } @line; + +- # Prefix each non-empty line with a TAB. +- @line = map { length $_ ? "\t$_" : '' } @line; ++ # Prefix each non-empty line with a TAB. ++ @line = map { length $_ ? "\t$_" : '' } @line; + +- print "\n", join ("\n", @line), "\n"; ++ print "\n", join ("\n", @line), "\n"; ++ } + } + + defined ($in = ) +@@ -427,6 +494,6 @@ + # eval: (add-hook 'write-file-hooks 'time-stamp) + # time-stamp-start: "my $VERSION = '" + # time-stamp-format: "%:y-%02m-%02d %02H:%02M" +-# time-stamp-time-zone: "UTC" ++# time-stamp-time-zone: "UTC0" + # time-stamp-end: "'; # UTC" + # End: +diff -Naur libpipeline-1.5.0-orig/build-aux/gnupload libpipeline-1.5.0/build-aux/gnupload +--- libpipeline-1.5.0-orig/build-aux/gnupload 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/build-aux/gnupload 2018-07-02 13:09:56.450432000 +0300 +@@ -1,9 +1,9 @@ + #!/bin/sh + # Sign files and upload them. + +-scriptversion=2013-03-19.17; # UTC ++scriptversion=2016-01-11.22; # UTC + +-# Copyright (C) 2004-2014 Free Software Foundation, Inc. ++# Copyright (C) 2004-2017 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 +@@ -435,6 +435,6 @@ + # eval: (add-hook 'write-file-hooks 'time-stamp) + # time-stamp-start: "scriptversion=" + # time-stamp-format: "%:y-%02m-%02d.%02H" +-# time-stamp-time-zone: "UTC" ++# time-stamp-time-zone: "UTC0" + # time-stamp-end: "; # UTC" + # End: +diff -Naur libpipeline-1.5.0-orig/build-aux/install-sh libpipeline-1.5.0/build-aux/install-sh +--- libpipeline-1.5.0-orig/build-aux/install-sh 2017-11-14 13:51:01.000000000 +0300 ++++ libpipeline-1.5.0/build-aux/install-sh 2018-07-02 13:09:56.450432000 +0300 +@@ -1,7 +1,7 @@ + #!/bin/sh + # install - install a program, script, or datafile + +-scriptversion=2014-09-12.12; # UTC ++scriptversion=2013-12-25.23; # UTC + + # This originates from X11R5 (mit/util/scripts/install.sh), which was + # later released in X11R6 (xc/config/util/install.sh) with the +@@ -324,41 +324,34 @@ + # is incompatible with FreeBSD 'install' when (umask & 300) != 0. + ;; + *) +- # $RANDOM is not portable (e.g. dash); use it when possible to +- # lower collision chance + tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ +- trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null; exit $ret' 0 ++ trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 + +- # As "mkdir -p" follows symlinks and we work in /tmp possibly; so +- # create the $tmpdir first (and fail if unsuccessful) to make sure +- # that nobody tries to guess the $tmpdir name. + if (umask $mkdir_umask && +- $mkdirprog $mkdir_mode "$tmpdir" && +- exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1 ++ exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 + then + if test -z "$dir_arg" || { + # Check for POSIX incompatibilities with -m. + # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or + # other-writable bit of parent directory when it shouldn't. + # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. +- test_tmpdir="$tmpdir/a" +- ls_ld_tmpdir=`ls -ld "$test_tmpdir"` ++ ls_ld_tmpdir=`ls -ld "$tmpdir"` + case $ls_ld_tmpdir in + d????-?r-*) different_mode=700;; + d????-?--*) different_mode=755;; + *) false;; + esac && +- $mkdirprog -m$different_mode -p -- "$test_tmpdir" && { +- ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"` ++ $mkdirprog -m$different_mode -p -- "$tmpdir" && { ++ ls_ld_tmpdir_1=`ls -ld "$tmpdir"` + test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" + } + } + then posix_mkdir=: + fi +- rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" ++ rmdir "$tmpdir/d" "$tmpdir" + else + # Remove any dirs left behind by ancient mkdir implementations. +- rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null ++ rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null + fi + trap '' 0;; + esac;; +diff -Naur libpipeline-1.5.0-orig/build-aux/snippet/_Noreturn.h libpipeline-1.5.0/build-aux/snippet/_Noreturn.h +--- libpipeline-1.5.0-orig/build-aux/snippet/_Noreturn.h 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/build-aux/snippet/_Noreturn.h 1970-01-01 03:00:00.000000000 +0300 +@@ -1,10 +0,0 @@ +-#if !defined _Noreturn && __STDC_VERSION__ < 201112 +-# if (3 <= __GNUC__ || (__GNUC__ == 2 && 8 <= __GNUC_MINOR__) \ +- || 0x5110 <= __SUNPRO_C) +-# define _Noreturn __attribute__ ((__noreturn__)) +-# elif 1200 <= _MSC_VER +-# define _Noreturn __declspec (noreturn) +-# else +-# define _Noreturn +-# endif +-#endif +diff -Naur libpipeline-1.5.0-orig/build-aux/snippet/arg-nonnull.h libpipeline-1.5.0/build-aux/snippet/arg-nonnull.h +--- libpipeline-1.5.0-orig/build-aux/snippet/arg-nonnull.h 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/build-aux/snippet/arg-nonnull.h 1970-01-01 03:00:00.000000000 +0300 +@@ -1,26 +0,0 @@ +-/* A C macro for declaring that specific arguments must not be NULL. +- Copyright (C) 2009-2014 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 3 of the License, 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, see . */ +- +-/* _GL_ARG_NONNULL((n,...,m)) tells the compiler and static analyzer tools +- that the values passed as arguments n, ..., m must be non-NULL pointers. +- n = 1 stands for the first argument, n = 2 for the second argument etc. */ +-#ifndef _GL_ARG_NONNULL +-# if (__GNUC__ == 3 && __GNUC_MINOR__ >= 3) || __GNUC__ > 3 +-# define _GL_ARG_NONNULL(params) __attribute__ ((__nonnull__ params)) +-# else +-# define _GL_ARG_NONNULL(params) +-# endif +-#endif +diff -Naur libpipeline-1.5.0-orig/build-aux/snippet/c++defs.h libpipeline-1.5.0/build-aux/snippet/c++defs.h +--- libpipeline-1.5.0-orig/build-aux/snippet/c++defs.h 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/build-aux/snippet/c++defs.h 1970-01-01 03:00:00.000000000 +0300 +@@ -1,271 +0,0 @@ +-/* C++ compatible function declaration macros. +- Copyright (C) 2010-2014 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 3 of the License, 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, see . */ +- +-#ifndef _GL_CXXDEFS_H +-#define _GL_CXXDEFS_H +- +-/* The three most frequent use cases of these macros are: +- +- * For providing a substitute for a function that is missing on some +- platforms, but is declared and works fine on the platforms on which +- it exists: +- +- #if @GNULIB_FOO@ +- # if !@HAVE_FOO@ +- _GL_FUNCDECL_SYS (foo, ...); +- # endif +- _GL_CXXALIAS_SYS (foo, ...); +- _GL_CXXALIASWARN (foo); +- #elif defined GNULIB_POSIXCHECK +- ... +- #endif +- +- * For providing a replacement for a function that exists on all platforms, +- but is broken/insufficient and needs to be replaced on some platforms: +- +- #if @GNULIB_FOO@ +- # if @REPLACE_FOO@ +- # if !(defined __cplusplus && defined GNULIB_NAMESPACE) +- # undef foo +- # define foo rpl_foo +- # endif +- _GL_FUNCDECL_RPL (foo, ...); +- _GL_CXXALIAS_RPL (foo, ...); +- # else +- _GL_CXXALIAS_SYS (foo, ...); +- # endif +- _GL_CXXALIASWARN (foo); +- #elif defined GNULIB_POSIXCHECK +- ... +- #endif +- +- * For providing a replacement for a function that exists on some platforms +- but is broken/insufficient and needs to be replaced on some of them and +- is additionally either missing or undeclared on some other platforms: +- +- #if @GNULIB_FOO@ +- # if @REPLACE_FOO@ +- # if !(defined __cplusplus && defined GNULIB_NAMESPACE) +- # undef foo +- # define foo rpl_foo +- # endif +- _GL_FUNCDECL_RPL (foo, ...); +- _GL_CXXALIAS_RPL (foo, ...); +- # else +- # if !@HAVE_FOO@ or if !@HAVE_DECL_FOO@ +- _GL_FUNCDECL_SYS (foo, ...); +- # endif +- _GL_CXXALIAS_SYS (foo, ...); +- # endif +- _GL_CXXALIASWARN (foo); +- #elif defined GNULIB_POSIXCHECK +- ... +- #endif +-*/ +- +-/* _GL_EXTERN_C declaration; +- performs the declaration with C linkage. */ +-#if defined __cplusplus +-# define _GL_EXTERN_C extern "C" +-#else +-# define _GL_EXTERN_C extern +-#endif +- +-/* _GL_FUNCDECL_RPL (func, rettype, parameters_and_attributes); +- declares a replacement function, named rpl_func, with the given prototype, +- consisting of return type, parameters, and attributes. +- Example: +- _GL_FUNCDECL_RPL (open, int, (const char *filename, int flags, ...) +- _GL_ARG_NONNULL ((1))); +- */ +-#define _GL_FUNCDECL_RPL(func,rettype,parameters_and_attributes) \ +- _GL_FUNCDECL_RPL_1 (rpl_##func, rettype, parameters_and_attributes) +-#define _GL_FUNCDECL_RPL_1(rpl_func,rettype,parameters_and_attributes) \ +- _GL_EXTERN_C rettype rpl_func parameters_and_attributes +- +-/* _GL_FUNCDECL_SYS (func, rettype, parameters_and_attributes); +- declares the system function, named func, with the given prototype, +- consisting of return type, parameters, and attributes. +- Example: +- _GL_FUNCDECL_SYS (open, int, (const char *filename, int flags, ...) +- _GL_ARG_NONNULL ((1))); +- */ +-#define _GL_FUNCDECL_SYS(func,rettype,parameters_and_attributes) \ +- _GL_EXTERN_C rettype func parameters_and_attributes +- +-/* _GL_CXXALIAS_RPL (func, rettype, parameters); +- declares a C++ alias called GNULIB_NAMESPACE::func +- that redirects to rpl_func, if GNULIB_NAMESPACE is defined. +- Example: +- _GL_CXXALIAS_RPL (open, int, (const char *filename, int flags, ...)); +- */ +-#define _GL_CXXALIAS_RPL(func,rettype,parameters) \ +- _GL_CXXALIAS_RPL_1 (func, rpl_##func, rettype, parameters) +-#if defined __cplusplus && defined GNULIB_NAMESPACE +-# define _GL_CXXALIAS_RPL_1(func,rpl_func,rettype,parameters) \ +- namespace GNULIB_NAMESPACE \ +- { \ +- rettype (*const func) parameters = ::rpl_func; \ +- } \ +- _GL_EXTERN_C int _gl_cxxalias_dummy +-#else +-# define _GL_CXXALIAS_RPL_1(func,rpl_func,rettype,parameters) \ +- _GL_EXTERN_C int _gl_cxxalias_dummy +-#endif +- +-/* _GL_CXXALIAS_RPL_CAST_1 (func, rpl_func, rettype, parameters); +- is like _GL_CXXALIAS_RPL_1 (func, rpl_func, rettype, parameters); +- except that the C function rpl_func may have a slightly different +- declaration. A cast is used to silence the "invalid conversion" error +- that would otherwise occur. */ +-#if defined __cplusplus && defined GNULIB_NAMESPACE +-# define _GL_CXXALIAS_RPL_CAST_1(func,rpl_func,rettype,parameters) \ +- namespace GNULIB_NAMESPACE \ +- { \ +- rettype (*const func) parameters = \ +- reinterpret_cast(::rpl_func); \ +- } \ +- _GL_EXTERN_C int _gl_cxxalias_dummy +-#else +-# define _GL_CXXALIAS_RPL_CAST_1(func,rpl_func,rettype,parameters) \ +- _GL_EXTERN_C int _gl_cxxalias_dummy +-#endif +- +-/* _GL_CXXALIAS_SYS (func, rettype, parameters); +- declares a C++ alias called GNULIB_NAMESPACE::func +- that redirects to the system provided function func, if GNULIB_NAMESPACE +- is defined. +- Example: +- _GL_CXXALIAS_SYS (open, int, (const char *filename, int flags, ...)); +- */ +-#if defined __cplusplus && defined GNULIB_NAMESPACE +- /* If we were to write +- rettype (*const func) parameters = ::func; +- like above in _GL_CXXALIAS_RPL_1, the compiler could optimize calls +- better (remove an indirection through a 'static' pointer variable), +- but then the _GL_CXXALIASWARN macro below would cause a warning not only +- for uses of ::func but also for uses of GNULIB_NAMESPACE::func. */ +-# define _GL_CXXALIAS_SYS(func,rettype,parameters) \ +- namespace GNULIB_NAMESPACE \ +- { \ +- static rettype (*func) parameters = ::func; \ +- } \ +- _GL_EXTERN_C int _gl_cxxalias_dummy +-#else +-# define _GL_CXXALIAS_SYS(func,rettype,parameters) \ +- _GL_EXTERN_C int _gl_cxxalias_dummy +-#endif +- +-/* _GL_CXXALIAS_SYS_CAST (func, rettype, parameters); +- is like _GL_CXXALIAS_SYS (func, rettype, parameters); +- except that the C function func may have a slightly different declaration. +- A cast is used to silence the "invalid conversion" error that would +- otherwise occur. */ +-#if defined __cplusplus && defined GNULIB_NAMESPACE +-# define _GL_CXXALIAS_SYS_CAST(func,rettype,parameters) \ +- namespace GNULIB_NAMESPACE \ +- { \ +- static rettype (*func) parameters = \ +- reinterpret_cast(::func); \ +- } \ +- _GL_EXTERN_C int _gl_cxxalias_dummy +-#else +-# define _GL_CXXALIAS_SYS_CAST(func,rettype,parameters) \ +- _GL_EXTERN_C int _gl_cxxalias_dummy +-#endif +- +-/* _GL_CXXALIAS_SYS_CAST2 (func, rettype, parameters, rettype2, parameters2); +- is like _GL_CXXALIAS_SYS (func, rettype, parameters); +- except that the C function is picked among a set of overloaded functions, +- namely the one with rettype2 and parameters2. Two consecutive casts +- are used to silence the "cannot find a match" and "invalid conversion" +- errors that would otherwise occur. */ +-#if defined __cplusplus && defined GNULIB_NAMESPACE +- /* The outer cast must be a reinterpret_cast. +- The inner cast: When the function is defined as a set of overloaded +- functions, it works as a static_cast<>, choosing the designated variant. +- When the function is defined as a single variant, it works as a +- reinterpret_cast<>. The parenthesized cast syntax works both ways. */ +-# define _GL_CXXALIAS_SYS_CAST2(func,rettype,parameters,rettype2,parameters2) \ +- namespace GNULIB_NAMESPACE \ +- { \ +- static rettype (*func) parameters = \ +- reinterpret_cast( \ +- (rettype2(*)parameters2)(::func)); \ +- } \ +- _GL_EXTERN_C int _gl_cxxalias_dummy +-#else +-# define _GL_CXXALIAS_SYS_CAST2(func,rettype,parameters,rettype2,parameters2) \ +- _GL_EXTERN_C int _gl_cxxalias_dummy +-#endif +- +-/* _GL_CXXALIASWARN (func); +- causes a warning to be emitted when ::func is used but not when +- GNULIB_NAMESPACE::func is used. func must be defined without overloaded +- variants. */ +-#if defined __cplusplus && defined GNULIB_NAMESPACE +-# define _GL_CXXALIASWARN(func) \ +- _GL_CXXALIASWARN_1 (func, GNULIB_NAMESPACE) +-# define _GL_CXXALIASWARN_1(func,namespace) \ +- _GL_CXXALIASWARN_2 (func, namespace) +-/* To work around GCC bug , +- we enable the warning only when not optimizing. */ +-# if !__OPTIMIZE__ +-# define _GL_CXXALIASWARN_2(func,namespace) \ +- _GL_WARN_ON_USE (func, \ +- "The symbol ::" #func " refers to the system function. " \ +- "Use " #namespace "::" #func " instead.") +-# elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING +-# define _GL_CXXALIASWARN_2(func,namespace) \ +- extern __typeof__ (func) func +-# else +-# define _GL_CXXALIASWARN_2(func,namespace) \ +- _GL_EXTERN_C int _gl_cxxalias_dummy +-# endif +-#else +-# define _GL_CXXALIASWARN(func) \ +- _GL_EXTERN_C int _gl_cxxalias_dummy +-#endif +- +-/* _GL_CXXALIASWARN1 (func, rettype, parameters_and_attributes); +- causes a warning to be emitted when the given overloaded variant of ::func +- is used but not when GNULIB_NAMESPACE::func is used. */ +-#if defined __cplusplus && defined GNULIB_NAMESPACE +-# define _GL_CXXALIASWARN1(func,rettype,parameters_and_attributes) \ +- _GL_CXXALIASWARN1_1 (func, rettype, parameters_and_attributes, \ +- GNULIB_NAMESPACE) +-# define _GL_CXXALIASWARN1_1(func,rettype,parameters_and_attributes,namespace) \ +- _GL_CXXALIASWARN1_2 (func, rettype, parameters_and_attributes, namespace) +-/* To work around GCC bug , +- we enable the warning only when not optimizing. */ +-# if !__OPTIMIZE__ +-# define _GL_CXXALIASWARN1_2(func,rettype,parameters_and_attributes,namespace) \ +- _GL_WARN_ON_USE_CXX (func, rettype, parameters_and_attributes, \ +- "The symbol ::" #func " refers to the system function. " \ +- "Use " #namespace "::" #func " instead.") +-# elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING +-# define _GL_CXXALIASWARN1_2(func,rettype,parameters_and_attributes,namespace) \ +- extern __typeof__ (func) func +-# else +-# define _GL_CXXALIASWARN1_2(func,rettype,parameters_and_attributes,namespace) \ +- _GL_EXTERN_C int _gl_cxxalias_dummy +-# endif +-#else +-# define _GL_CXXALIASWARN1(func,rettype,parameters_and_attributes) \ +- _GL_EXTERN_C int _gl_cxxalias_dummy +-#endif +- +-#endif /* _GL_CXXDEFS_H */ +diff -Naur libpipeline-1.5.0-orig/build-aux/snippet/warn-on-use.h libpipeline-1.5.0/build-aux/snippet/warn-on-use.h +--- libpipeline-1.5.0-orig/build-aux/snippet/warn-on-use.h 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/build-aux/snippet/warn-on-use.h 1970-01-01 03:00:00.000000000 +0300 +@@ -1,109 +0,0 @@ +-/* A C macro for emitting warnings if a function is used. +- Copyright (C) 2010-2014 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 3 of the License, 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, see . */ +- +-/* _GL_WARN_ON_USE (function, "literal string") issues a declaration +- for FUNCTION which will then trigger a compiler warning containing +- the text of "literal string" anywhere that function is called, if +- supported by the compiler. If the compiler does not support this +- feature, the macro expands to an unused extern declaration. +- +- This macro is useful for marking a function as a potential +- portability trap, with the intent that "literal string" include +- instructions on the replacement function that should be used +- instead. However, one of the reasons that a function is a +- portability trap is if it has the wrong signature. Declaring +- FUNCTION with a different signature in C is a compilation error, so +- this macro must use the same type as any existing declaration so +- that programs that avoid the problematic FUNCTION do not fail to +- compile merely because they included a header that poisoned the +- function. But this implies that _GL_WARN_ON_USE is only safe to +- use if FUNCTION is known to already have a declaration. Use of +- this macro implies that there must not be any other macro hiding +- the declaration of FUNCTION; but undefining FUNCTION first is part +- of the poisoning process anyway (although for symbols that are +- provided only via a macro, the result is a compilation error rather +- than a warning containing "literal string"). Also note that in +- C++, it is only safe to use if FUNCTION has no overloads. +- +- For an example, it is possible to poison 'getline' by: +- - adding a call to gl_WARN_ON_USE_PREPARE([[#include ]], +- [getline]) in configure.ac, which potentially defines +- HAVE_RAW_DECL_GETLINE +- - adding this code to a header that wraps the system : +- #undef getline +- #if HAVE_RAW_DECL_GETLINE +- _GL_WARN_ON_USE (getline, "getline is required by POSIX 2008, but" +- "not universally present; use the gnulib module getline"); +- #endif +- +- It is not possible to directly poison global variables. But it is +- possible to write a wrapper accessor function, and poison that +- (less common usage, like &environ, will cause a compilation error +- rather than issue the nice warning, but the end result of informing +- the developer about their portability problem is still achieved): +- #if HAVE_RAW_DECL_ENVIRON +- static char ***rpl_environ (void) { return &environ; } +- _GL_WARN_ON_USE (rpl_environ, "environ is not always properly declared"); +- # undef environ +- # define environ (*rpl_environ ()) +- #endif +- */ +-#ifndef _GL_WARN_ON_USE +- +-# if 4 < __GNUC__ || (__GNUC__ == 4 && 3 <= __GNUC_MINOR__) +-/* A compiler attribute is available in gcc versions 4.3.0 and later. */ +-# define _GL_WARN_ON_USE(function, message) \ +-extern __typeof__ (function) function __attribute__ ((__warning__ (message))) +-# elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING +-/* Verify the existence of the function. */ +-# define _GL_WARN_ON_USE(function, message) \ +-extern __typeof__ (function) function +-# else /* Unsupported. */ +-# define _GL_WARN_ON_USE(function, message) \ +-_GL_WARN_EXTERN_C int _gl_warn_on_use +-# endif +-#endif +- +-/* _GL_WARN_ON_USE_CXX (function, rettype, parameters_and_attributes, "string") +- is like _GL_WARN_ON_USE (function, "string"), except that the function is +- declared with the given prototype, consisting of return type, parameters, +- and attributes. +- This variant is useful for overloaded functions in C++. _GL_WARN_ON_USE does +- not work in this case. */ +-#ifndef _GL_WARN_ON_USE_CXX +-# if 4 < __GNUC__ || (__GNUC__ == 4 && 3 <= __GNUC_MINOR__) +-# define _GL_WARN_ON_USE_CXX(function,rettype,parameters_and_attributes,msg) \ +-extern rettype function parameters_and_attributes \ +- __attribute__ ((__warning__ (msg))) +-# elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING +-/* Verify the existence of the function. */ +-# define _GL_WARN_ON_USE_CXX(function,rettype,parameters_and_attributes,msg) \ +-extern rettype function parameters_and_attributes +-# else /* Unsupported. */ +-# define _GL_WARN_ON_USE_CXX(function,rettype,parameters_and_attributes,msg) \ +-_GL_WARN_EXTERN_C int _gl_warn_on_use +-# endif +-#endif +- +-/* _GL_WARN_EXTERN_C declaration; +- performs the declaration with C linkage. */ +-#ifndef _GL_WARN_EXTERN_C +-# if defined __cplusplus +-# define _GL_WARN_EXTERN_C extern "C" +-# else +-# define _GL_WARN_EXTERN_C extern +-# endif +-#endif +diff -Naur libpipeline-1.5.0-orig/config.h.in libpipeline-1.5.0/config.h.in +--- libpipeline-1.5.0-orig/config.h.in 2017-11-14 13:51:00.000000000 +0300 ++++ libpipeline-1.5.0/config.h.in 2018-07-02 13:09:59.170435800 +0300 +@@ -59,6 +59,14 @@ + #undef GNULIB_LOCK + + /* Define to a C preprocessor expression that evaluates to 1 or 0, depending ++ whether the gnulib module msvc-nothrow shall be considered present. */ ++#undef GNULIB_MSVC_NOTHROW ++ ++/* Define to 1 if printf and friends should be labeled with attribute ++ "__gnu_printf__" instead of "__printf__" */ ++#undef GNULIB_PRINTF_ATTRIBUTE_FLAVOR_GNU ++ ++/* Define to a C preprocessor expression that evaluates to 1 or 0, depending + whether the gnulib module scanf shall be considered present. */ + #undef GNULIB_SCANF + +@@ -150,6 +158,17 @@ + /* Define to 1 if you have the `clearenv' function. */ + #undef HAVE_CLEARENV + ++/* Define to 1 if you have the header file. */ ++#undef HAVE_CRTDEFS_H ++ ++/* Define to 1 if you have the declaration of `program_invocation_name', and ++ to 0 if you don't. */ ++#undef HAVE_DECL_PROGRAM_INVOCATION_NAME ++ ++/* Define to 1 if you have the declaration of `program_invocation_short_name', ++ and to 0 if you don't. */ ++#undef HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME ++ + /* Define to 1 if you have the declaration of `setenv', and to 0 if you don't. + */ + #undef HAVE_DECL_SETENV +@@ -190,6 +209,10 @@ + don't. */ + #undef HAVE_DECL__SYS_SIGLIST + ++/* Define to 1 if you have the declaration of `__argv', and to 0 if you don't. ++ */ ++#undef HAVE_DECL___ARGV ++ + /* Define to 1 if you have the header file. */ + #undef HAVE_DLFCN_H + +@@ -205,9 +228,27 @@ + /* Define to 1 if you have the `fork' function. */ + #undef HAVE_FORK + ++/* Define to 1 if you have the 'getegid' function. */ ++#undef HAVE_GETEGID ++ ++/* Define to 1 if you have the 'geteuid' function. */ ++#undef HAVE_GETEUID ++ ++/* Define to 1 if you have the 'getexecname' function. */ ++#undef HAVE_GETEXECNAME ++ ++/* Define to 1 if you have the 'getgid' function. */ ++#undef HAVE_GETGID ++ ++/* Define to 1 if you have the 'getprogname' function. */ ++#undef HAVE_GETPROGNAME ++ + /* Define to 1 if you have the 'gettimeofday' function. */ + #undef HAVE_GETTIMEOFDAY + ++/* Define to 1 if you have the 'getuid' function. */ ++#undef HAVE_GETUID ++ + /* Define if you have the 'intmax_t' type in or . */ + #undef HAVE_INTMAX_T + +@@ -221,6 +262,9 @@ + /* Define to 1 if you have the `issetugid' function. */ + #undef HAVE_ISSETUGID + ++/* Define to 1 if you have the header file. */ ++#undef HAVE_LIMITS_H ++ + /* Define to 1 if the system has the type 'long long int'. */ + #undef HAVE_LONG_LONG_INT + +@@ -256,6 +300,10 @@ + /* Define if the POSIX multithreading library has read/write locks. */ + #undef HAVE_PTHREAD_RWLOCK + ++/* Define if the 'pthread_rwlock_rdlock' function prefers a writer to a ++ reader. */ ++#undef HAVE_PTHREAD_RWLOCK_RDLOCK_PREFER_WRITER ++ + /* Define to 1 if you have the `raise' function. */ + #undef HAVE_RAISE + +@@ -512,6 +560,9 @@ + /* Define to 1 if pwrite is declared even after undefining macros. */ + #undef HAVE_RAW_DECL_PWRITE + ++/* Define to 1 if qsort_r is declared even after undefining macros. */ ++#undef HAVE_RAW_DECL_QSORT_R ++ + /* Define to 1 if random is declared even after undefining macros. */ + #undef HAVE_RAW_DECL_RANDOM + +@@ -659,6 +710,9 @@ + /* Define to 1 if tmpfile is declared even after undefining macros. */ + #undef HAVE_RAW_DECL_TMPFILE + ++/* Define to 1 if truncate is declared even after undefining macros. */ ++#undef HAVE_RAW_DECL_TRUNCATE ++ + /* Define to 1 if ttyname_r is declared even after undefining macros. */ + #undef HAVE_RAW_DECL_TTYNAME_R + +@@ -722,6 +776,9 @@ + /* Define to 1 if wcsdup is declared even after undefining macros. */ + #undef HAVE_RAW_DECL_WCSDUP + ++/* Define to 1 if wcsftime is declared even after undefining macros. */ ++#undef HAVE_RAW_DECL_WCSFTIME ++ + /* Define to 1 if wcslen is declared even after undefining macros. */ + #undef HAVE_RAW_DECL_WCSLEN + +@@ -887,9 +944,6 @@ + /* Define to 1 if you have the header file. */ + #undef HAVE_SYS_STAT_H + +-/* Define to 1 if you have the header file. */ +-#undef HAVE_SYS_TIMEB_H +- + /* Define to 1 if you have the header file. */ + #undef HAVE_SYS_TIME_H + +@@ -911,6 +965,9 @@ + /* Define to 1 if the system has the type 'unsigned long long int'. */ + #undef HAVE_UNSIGNED_LONG_LONG_INT + ++/* Define if you have a global __progname variable */ ++#undef HAVE_VAR___PROGNAME ++ + /* Define to 1 if you have the 'vasnprintf' function. */ + #undef HAVE_VASNPRINTF + +@@ -959,9 +1016,6 @@ + /* Define to 1 if the system has the type `_Bool'. */ + #undef HAVE__BOOL + +-/* Define to 1 if you have the `_ftime' function. */ +-#undef HAVE__FTIME +- + /* Define to 1 if you have the '_set_invalid_parameter_handler' function. */ + #undef HAVE__SET_INVALID_PARAMETER_HANDLER + +@@ -981,6 +1035,12 @@ + /* Define to a substitute value for mmap()'s MAP_ANONYMOUS flag. */ + #undef MAP_ANONYMOUS + ++/* Use GNU style printf and scanf. */ ++#ifndef __USE_MINGW_ANSI_STDIO ++# undef __USE_MINGW_ANSI_STDIO ++#endif ++ ++ + /* Name of package */ + #undef PACKAGE + +@@ -1009,10 +1069,6 @@ + 'ptrdiff_t'. */ + #undef PTRDIFF_T_SUFFIX + +-/* Define to 1 if stat needs help when passed a directory name with a trailing +- slash */ +-#undef REPLACE_FUNC_STAT_DIR +- + /* Define to 1 if stat needs help when passed a file name with a trailing + slash */ + #undef REPLACE_FUNC_STAT_FILE +@@ -1085,7 +1141,7 @@ + #ifndef _ALL_SOURCE + # undef _ALL_SOURCE + #endif +-/* Enable general extensions on OS X. */ ++/* Enable general extensions on macOS. */ + #ifndef _DARWIN_C_SOURCE + # undef _DARWIN_C_SOURCE + #endif +@@ -1097,6 +1153,34 @@ + #ifndef _POSIX_PTHREAD_SEMANTICS + # undef _POSIX_PTHREAD_SEMANTICS + #endif ++/* Enable extensions specified by ISO/IEC TS 18661-5:2014. */ ++#ifndef __STDC_WANT_IEC_60559_ATTRIBS_EXT__ ++# undef __STDC_WANT_IEC_60559_ATTRIBS_EXT__ ++#endif ++/* Enable extensions specified by ISO/IEC TS 18661-1:2014. */ ++#ifndef __STDC_WANT_IEC_60559_BFP_EXT__ ++# undef __STDC_WANT_IEC_60559_BFP_EXT__ ++#endif ++/* Enable extensions specified by ISO/IEC TS 18661-2:2015. */ ++#ifndef __STDC_WANT_IEC_60559_DFP_EXT__ ++# undef __STDC_WANT_IEC_60559_DFP_EXT__ ++#endif ++/* Enable extensions specified by ISO/IEC TS 18661-4:2015. */ ++#ifndef __STDC_WANT_IEC_60559_FUNCS_EXT__ ++# undef __STDC_WANT_IEC_60559_FUNCS_EXT__ ++#endif ++/* Enable extensions specified by ISO/IEC TS 18661-3:2015. */ ++#ifndef __STDC_WANT_IEC_60559_TYPES_EXT__ ++# undef __STDC_WANT_IEC_60559_TYPES_EXT__ ++#endif ++/* Enable extensions specified by ISO/IEC TR 24731-2:2010. */ ++#ifndef __STDC_WANT_LIB_EXT2__ ++# undef __STDC_WANT_LIB_EXT2__ ++#endif ++/* Enable extensions specified by ISO/IEC 24747:2009. */ ++#ifndef __STDC_WANT_MATH_SPEC_FUNCS__ ++# undef __STDC_WANT_MATH_SPEC_FUNCS__ ++#endif + /* Enable extensions on HP NonStop. */ + #ifndef _TANDEM_SOURCE + # undef _TANDEM_SOURCE +@@ -1148,10 +1232,6 @@ + /* Number of bits in a file offset, on hosts where this is settable. */ + #undef _FILE_OFFSET_BITS + +-/* Define to 1 if Gnulib overrides 'struct stat' on Windows so that struct +- stat.st_size becomes 64-bit. */ +-#undef _GL_WINDOWS_64_BIT_ST_SIZE +- + /* Define for large files, on AIX-style hosts. */ + #undef _LARGE_FILES + +@@ -1182,6 +1262,12 @@ + /* Define to 1 if you need to in order for 'stat' and other things to work. */ + #undef _POSIX_SOURCE + ++/* Define to 1 if the system predates C++11. */ ++#undef __STDC_CONSTANT_MACROS ++ ++/* Define to 1 if the system predates C++11. */ ++#undef __STDC_LIMIT_MACROS ++ + /* Define to empty if `const' does not conform to ANSI C. */ + #undef const + +@@ -1196,13 +1282,28 @@ + 'reference to static identifier "f" in extern inline function'. + This bug was observed with Sun C 5.12 SunOS_i386 2011/11/16. + +- Suppress the use of extern inline on problematic Apple configurations. +- OS X 10.8 and earlier mishandle it; see, e.g., +- . ++ Suppress extern inline (with or without __attribute__ ((__gnu_inline__))) ++ on configurations that mistakenly use 'static inline' to implement ++ functions or macros in standard C headers like . For example, ++ if isdigit is mistakenly implemented via a static inline function, ++ a program containing an extern inline function that calls isdigit ++ may not work since the C standard prohibits extern inline functions ++ from calling static functions. This bug is known to occur on: ++ ++ OS X 10.8 and earlier; see: ++ http://lists.gnu.org/archive/html/bug-gnulib/2012-12/msg00023.html ++ ++ DragonFly; see ++ http://muscles.dragonflybsd.org/bulk/bleeding-edge-potential/latest-per-pkg/ah-tty-0.3.12.log ++ ++ FreeBSD; see: ++ http://lists.gnu.org/archive/html/bug-gnulib/2014-07/msg00104.html ++ + OS X 10.9 has a macro __header_inline indicating the bug is fixed for C and + for clang but remains for g++; see . +- Perhaps Apple will fix this some day. */ +-#if (defined __APPLE__ \ ++ Assume DragonFly and FreeBSD will be similar. */ ++#if (((defined __APPLE__ && defined __MACH__) \ ++ || defined __DragonFly__ || defined __FreeBSD__) \ + && (defined __header_inline \ + ? (defined __cplusplus && defined __GNUC_STDC_INLINE__ \ + && ! defined __clang__) \ +@@ -1210,19 +1311,20 @@ + && (defined __GNUC__ || defined __cplusplus)) \ + || (defined _FORTIFY_SOURCE && 0 < _FORTIFY_SOURCE \ + && defined __GNUC__ && ! defined __cplusplus)))) +-# define _GL_EXTERN_INLINE_APPLE_BUG ++# define _GL_EXTERN_INLINE_STDHEADER_BUG + #endif + #if ((__GNUC__ \ + ? defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__ \ + : (199901L <= __STDC_VERSION__ \ + && !defined __HP_cc \ ++ && !defined __PGI \ + && !(defined __SUNPRO_C && __STDC__))) \ +- && !defined _GL_EXTERN_INLINE_APPLE_BUG) ++ && !defined _GL_EXTERN_INLINE_STDHEADER_BUG) + # define _GL_INLINE inline + # define _GL_EXTERN_INLINE extern inline + # define _GL_EXTERN_INLINE_IN_USE + #elif (2 < __GNUC__ + (7 <= __GNUC_MINOR__) && !defined __STRICT_ANSI__ \ +- && !defined _GL_EXTERN_INLINE_APPLE_BUG) ++ && !defined _GL_EXTERN_INLINE_STDHEADER_BUG) + # if defined __GNUC_GNU_INLINE__ && __GNUC_GNU_INLINE__ + /* __gnu_inline__ suppresses a GCC 4.2 diagnostic. */ + # define _GL_INLINE extern inline __attribute__ ((__gnu_inline__)) +@@ -1236,17 +1338,19 @@ + # define _GL_EXTERN_INLINE static _GL_UNUSED + #endif + +-#if 4 < __GNUC__ + (6 <= __GNUC_MINOR__) ++/* In GCC 4.6 (inclusive) to 5.1 (exclusive), ++ suppress bogus "no previous prototype for 'FOO'" ++ and "no previous declaration for 'FOO'" diagnostics, ++ when FOO is an inline function in the header; see ++ and ++ . */ ++#if __GNUC__ == 4 && 6 <= __GNUC_MINOR__ + # if defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__ + # define _GL_INLINE_HEADER_CONST_PRAGMA + # else + # define _GL_INLINE_HEADER_CONST_PRAGMA \ + _Pragma ("GCC diagnostic ignored \"-Wsuggest-attribute=const\"") + # endif +- /* Suppress GCC's bogus "no previous prototype for 'FOO'" +- and "no previous declaration for 'FOO'" diagnostics, +- when FOO is an inline function in the header; see +- . */ + # define _GL_INLINE_HEADER_BEGIN \ + _Pragma ("GCC diagnostic push") \ + _Pragma ("GCC diagnostic ignored \"-Wmissing-prototypes\"") \ +@@ -1326,6 +1430,16 @@ + is a misnomer outside of parameter lists. */ + #define _UNUSED_PARAMETER_ _GL_UNUSED + ++/* gcc supports the "unused" attribute on possibly unused labels, and ++ g++ has since version 4.5. Note to support C++ as well as C, ++ _GL_UNUSED_LABEL should be used with a trailing ; */ ++#if !defined __cplusplus || __GNUC__ > 4 \ ++ || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5) ++# define _GL_UNUSED_LABEL _GL_UNUSED ++#else ++# define _GL_UNUSED_LABEL ++#endif ++ + /* The __pure__ attribute was added in gcc 2.96. */ + #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96) + # define _GL_ATTRIBUTE_PURE __attribute__ ((__pure__)) +diff -Naur libpipeline-1.5.0-orig/configure libpipeline-1.5.0/configure +--- libpipeline-1.5.0-orig/configure 2017-11-14 13:50:58.000000000 +0300 ++++ libpipeline-1.5.0/configure 2018-07-02 13:09:59.390436100 +0300 +@@ -644,9 +644,11 @@ + LTLIBOBJS + LIBOBJS + gltests_WITNESS ++HAVE_CRTDEFS_H + HAVE_WINT_T + NEXT_AS_FIRST_DIRECTIVE_WCHAR_H + NEXT_WCHAR_H ++REPLACE_WCSFTIME + REPLACE_WCSWIDTH + REPLACE_WCWIDTH + REPLACE_WCSNRTOMBS +@@ -662,6 +664,7 @@ + REPLACE_MBSTATE_T + HAVE_DECL_WCWIDTH + HAVE_DECL_WCTOB ++HAVE_WCSFTIME + HAVE_WCSWIDTH + HAVE_WCSTOK + HAVE_WCSSTR +@@ -699,6 +702,7 @@ + HAVE_MBRTOWC + HAVE_MBSINIT + HAVE_BTOWC ++GNULIB_WCSFTIME + GNULIB_WCSWIDTH + GNULIB_WCSTOK + GNULIB_WCSSTR +@@ -742,35 +746,19 @@ + HAVE_UNISTD_H + NEXT_AS_FIRST_DIRECTIVE_UNISTD_H + NEXT_UNISTD_H ++UNISTD_H_DEFINES_STRUCT_TIMESPEC + PTHREAD_H_DEFINES_STRUCT_TIMESPEC + SYS_TIME_H_DEFINES_STRUCT_TIMESPEC + TIME_H_DEFINES_STRUCT_TIMESPEC + NEXT_AS_FIRST_DIRECTIVE_TIME_H + NEXT_TIME_H +-REPLACE_LOCALTIME +-REPLACE_GMTIME +-REPLACE_TIMEGM +-REPLACE_NANOSLEEP +-REPLACE_MKTIME +-REPLACE_LOCALTIME_R +-HAVE_TIMEGM +-HAVE_STRPTIME +-HAVE_NANOSLEEP +-HAVE_DECL_LOCALTIME_R +-GNULIB_TIME_R +-GNULIB_TIMEGM +-GNULIB_STRPTIME +-GNULIB_NANOSLEEP +-GNULIB_MKTIME + NEXT_AS_FIRST_DIRECTIVE_SYS_WAIT_H + NEXT_SYS_WAIT_H + GNULIB_WAITPID ++WINDOWS_STAT_INODES + WINDOWS_64_BIT_OFF_T + NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H + NEXT_SYS_TYPES_H +-WINDOWS_64_BIT_ST_SIZE +-NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H +-NEXT_SYS_STAT_H + HAVE_SYS_SELECT_H + NEXT_AS_FIRST_DIRECTIVE_SYS_SELECT_H + NEXT_SYS_SELECT_H +@@ -788,6 +776,9 @@ + GL_GENERATE_STDINT_H_FALSE + GL_GENERATE_STDINT_H_TRUE + STDINT_H ++HAVE_SYS_INTTYPES_H ++HAVE_SYS_BITYPES_H ++HAVE_C99_STDINT_H + WINT_T_SUFFIX + WCHAR_T_SUFFIX + SIG_ATOMIC_T_SUFFIX +@@ -801,8 +792,6 @@ + BITSIZEOF_SIG_ATOMIC_T + BITSIZEOF_SIZE_T + BITSIZEOF_PTRDIFF_T +-HAVE_SYS_BITYPES_H +-HAVE_SYS_INTTYPES_H + HAVE_STDINT_H + NEXT_AS_FIRST_DIRECTIVE_STDINT_H + NEXT_STDINT_H +@@ -811,12 +800,14 @@ + HAVE_WCHAR_H + HAVE_UNSIGNED_LONG_LONG_INT + HAVE_LONG_LONG_INT ++GNULIB_OVERRIDES_WINT_T + NEXT_AS_FIRST_DIRECTIVE_STDDEF_H + NEXT_STDDEF_H + GL_GENERATE_STDDEF_H_FALSE + GL_GENERATE_STDDEF_H_TRUE + STDDEF_H + HAVE_WCHAR_T ++HAVE_MAX_ALIGN_T + REPLACE_NULL + HAVE__BOOL + GL_GENERATE_STDBOOL_H_FALSE +@@ -827,6 +818,10 @@ + STDARG_H + NEXT_AS_FIRST_DIRECTIVE_STDARG_H + NEXT_STDARG_H ++WINDOWS_64_BIT_ST_SIZE ++WINDOWS_STAT_TIMESPEC ++NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H ++NEXT_SYS_STAT_H + REPLACE_VSPRINTF + REPLACE_VSNPRINTF + REPLACE_VPRINTF +@@ -1028,6 +1023,7 @@ + REPLACE_REALPATH + REPLACE_REALLOC + REPLACE_RANDOM_R ++REPLACE_QSORT_R + REPLACE_PUTENV + REPLACE_PTSNAME_R + REPLACE_PTSNAME +@@ -1051,6 +1047,7 @@ + HAVE_RANDOM_R + HAVE_RANDOM_H + HAVE_RANDOM ++HAVE_QSORT_R + HAVE_PTSNAME_R + HAVE_PTSNAME + HAVE_POSIX_OPENPT +@@ -1079,6 +1076,7 @@ + GNULIB_REALLOC_POSIX + GNULIB_RANDOM_R + GNULIB_RANDOM ++GNULIB_QSORT_R + GNULIB_PUTENV + GNULIB_PTSNAME_R + GNULIB_PTSNAME +@@ -1117,6 +1115,7 @@ + HAVE_FUTIMENS + HAVE_FSTATAT + HAVE_FCHMODAT ++GNULIB_OVERRIDES_STRUCT_STAT + GNULIB_UTIMENSAT + GNULIB_STAT + GNULIB_MKNODAT +@@ -1137,7 +1136,37 @@ + LIBPTH_PREFIX + LTLIBPTH + LIBPTH ++GL_GENERATE_LIMITS_H_FALSE ++GL_GENERATE_LIMITS_H_TRUE ++LIMITS_H ++NEXT_AS_FIRST_DIRECTIVE_LIMITS_H ++NEXT_LIMITS_H + IGNORE_UNUSED_LIBRARIES_CFLAGS ++REPLACE_LOCALTIME ++REPLACE_GMTIME ++REPLACE_TZSET ++REPLACE_TIMEGM ++REPLACE_STRFTIME ++REPLACE_NANOSLEEP ++REPLACE_MKTIME ++REPLACE_LOCALTIME_R ++REPLACE_CTIME ++HAVE_TIMEZONE_T ++HAVE_TZSET ++HAVE_TIMEGM ++HAVE_STRPTIME ++HAVE_NANOSLEEP ++HAVE_DECL_LOCALTIME_R ++GNULIB_TZSET ++GNULIB_TIME_RZ ++GNULIB_TIME_R ++GNULIB_TIMEGM ++GNULIB_STRPTIME ++GNULIB_STRFTIME ++GNULIB_NANOSLEEP ++GNULIB_LOCALTIME ++GNULIB_MKTIME ++GNULIB_CTIME + HAVE_WINSOCK2_H + NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H + NEXT_SYS_TIME_H +@@ -1188,9 +1217,12 @@ + REPLACE_UNLINKAT + REPLACE_UNLINK + REPLACE_TTYNAME_R ++REPLACE_TRUNCATE ++REPLACE_SYMLINKAT + REPLACE_SYMLINK + REPLACE_SLEEP + REPLACE_RMDIR ++REPLACE_READLINKAT + REPLACE_READLINK + REPLACE_READ + REPLACE_PWRITE +@@ -1219,12 +1251,14 @@ + HAVE_DECL_GETUSERSHELL + HAVE_DECL_GETPAGESIZE + HAVE_DECL_GETLOGIN_R ++HAVE_DECL_GETLOGIN + HAVE_DECL_GETDOMAINNAME + HAVE_DECL_FDATASYNC + HAVE_DECL_FCHDIR + HAVE_DECL_ENVIRON + HAVE_USLEEP + HAVE_UNLINKAT ++HAVE_TRUNCATE + HAVE_SYMLINKAT + HAVE_SYMLINK + HAVE_SLEEP +@@ -1261,6 +1295,7 @@ + GNULIB_UNISTD_H_SIGPIPE + GNULIB_UNISTD_H_NONBLOCKING + GNULIB_TTYNAME_R ++GNULIB_TRUNCATE + GNULIB_SYMLINKAT + GNULIB_SYMLINK + GNULIB_SLEEP +@@ -3212,28 +3247,36 @@ + + gl_header_list="$gl_header_list unistd.h" + gl_func_list="$gl_func_list symlink" ++gl_func_list="$gl_func_list getprogname" ++gl_func_list="$gl_func_list getexecname" + gl_header_list="$gl_header_list sys/time.h" + gl_header_list="$gl_header_list sys/socket.h" + gl_func_list="$gl_func_list gettimeofday" ++gl_header_list="$gl_header_list limits.h" + gl_func_list="$gl_func_list lstat" + gl_header_list="$gl_header_list sys/mman.h" + gl_func_list="$gl_func_list mprotect" + gl_func_list="$gl_func_list _set_invalid_parameter_handler" + gl_header_list="$gl_header_list sys/param.h" + gl_func_list="$gl_func_list secure_getenv" ++gl_func_list="$gl_func_list getuid" ++gl_func_list="$gl_func_list geteuid" ++gl_func_list="$gl_func_list getgid" ++gl_func_list="$gl_func_list getegid" + gl_func_list="$gl_func_list setenv" + gl_func_list="$gl_func_list sigaction" + gl_func_list="$gl_func_list sigaltstack" + gl_func_list="$gl_func_list siginterrupt" + gl_func_list="$gl_func_list snprintf" ++gl_header_list="$gl_header_list sys/stat.h" + gl_header_list="$gl_header_list wchar.h" + gl_header_list="$gl_header_list stdint.h" + gl_func_list="$gl_func_list strndup" + gl_header_list="$gl_header_list sys/select.h" +-gl_header_list="$gl_header_list sys/stat.h" + gl_header_list="$gl_header_list sys/wait.h" + gl_func_list="$gl_func_list vasnprintf" + gl_header_list="$gl_header_list features.h" ++gl_header_list="$gl_header_list crtdefs.h" + # Check that the precious variables saved in the cache have kept the same + # value. + ac_cache_corrupted=false +@@ -5474,6 +5517,20 @@ + + $as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h + ++ $as_echo "#define __STDC_WANT_IEC_60559_ATTRIBS_EXT__ 1" >>confdefs.h ++ ++ $as_echo "#define __STDC_WANT_IEC_60559_BFP_EXT__ 1" >>confdefs.h ++ ++ $as_echo "#define __STDC_WANT_IEC_60559_DFP_EXT__ 1" >>confdefs.h ++ ++ $as_echo "#define __STDC_WANT_IEC_60559_FUNCS_EXT__ 1" >>confdefs.h ++ ++ $as_echo "#define __STDC_WANT_IEC_60559_TYPES_EXT__ 1" >>confdefs.h ++ ++ $as_echo "#define __STDC_WANT_LIB_EXT2__ 1" >>confdefs.h ++ ++ $as_echo "#define __STDC_WANT_MATH_SPEC_FUNCS__ 1" >>confdefs.h ++ + $as_echo "#define _TANDEM_SOURCE 1" >>confdefs.h + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether _XOPEN_SOURCE should be defined" >&5 +@@ -17432,7 +17489,7 @@ + while echo "$ac_prog" | grep "$re_direlt" > /dev/null 2>&1; do + ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` + done +- test -z "$LD" && LD="$ac_prog" ++ test -z "$LD" && LD=$ac_prog + ;; + "") + # If it fails, then pretend we aren't using GCC. +@@ -17443,7 +17500,7 @@ + with_gnu_ld=unknown + ;; + esac +-elif test "$with_gnu_ld" = yes; then ++elif test yes = "$with_gnu_ld"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 + $as_echo_n "checking for GNU ld... " >&6; } + else +@@ -17501,6 +17558,9 @@ + *) + acl_cv_prog_gnu_ld=no + ;; ++os2*) ++ lt_cv_deplibs_check_method=pass_all ++ ;; + esac + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $acl_cv_prog_gnu_ld" >&5 +@@ -24914,6 +24974,10 @@ + + + ++ # Pre-early section. ++ ++ ++ + + if test $ac_cv_have_decl_strsignal = no; then + HAVE_DECL_STRSIGNAL=0 +@@ -27330,6 +27394,38 @@ + } + fi # as_fn_arith + ++ NEED_LOCALTIME_BUFFER=0 ++ ++ ++ GNULIB_CTIME=0; ++ GNULIB_MKTIME=0; ++ GNULIB_LOCALTIME=0; ++ GNULIB_NANOSLEEP=0; ++ GNULIB_STRFTIME=0; ++ GNULIB_STRPTIME=0; ++ GNULIB_TIMEGM=0; ++ GNULIB_TIME_R=0; ++ GNULIB_TIME_RZ=0; ++ GNULIB_TZSET=0; ++ HAVE_DECL_LOCALTIME_R=1; ++ HAVE_NANOSLEEP=1; ++ HAVE_STRPTIME=1; ++ HAVE_TIMEGM=1; ++ HAVE_TZSET=1; ++ HAVE_TIMEZONE_T=0; ++ REPLACE_CTIME=GNULIB_PORTCHECK; ++ REPLACE_LOCALTIME_R=GNULIB_PORTCHECK; ++ REPLACE_MKTIME=GNULIB_PORTCHECK; ++ REPLACE_NANOSLEEP=GNULIB_PORTCHECK; ++ REPLACE_STRFTIME=GNULIB_PORTCHECK; ++ REPLACE_TIMEGM=GNULIB_PORTCHECK; ++ REPLACE_TZSET=GNULIB_PORTCHECK; ++ ++ : ${GNULIB_GETTIMEOFDAY=0}; ++ REPLACE_GMTIME=0; ++ REPLACE_LOCALTIME=0; ++ ++ + + if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then +@@ -27969,6 +28065,96 @@ + ofile='$ofile' + + ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wint_t" >&5 ++$as_echo_n "checking for wint_t... " >&6; } ++if ${gt_cv_c_wint_t+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++/* Tru64 with Desktop Toolkit C has a bug: must be included before ++ . ++ BSD/OS 4.0.1 has a bug: , and must be included ++ before . */ ++#include ++#include ++#include ++#include ++ wint_t foo = (wchar_t)'\0'; ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ gt_cv_c_wint_t=yes ++else ++ gt_cv_c_wint_t=no ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_c_wint_t" >&5 ++$as_echo "$gt_cv_c_wint_t" >&6; } ++ if test $gt_cv_c_wint_t = yes; then ++ ++$as_echo "#define HAVE_WINT_T 1" >>confdefs.h ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether wint_t is too small" >&5 ++$as_echo_n "checking whether wint_t is too small... " >&6; } ++if ${gl_cv_type_wint_t_too_small+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++/* Tru64 with Desktop Toolkit C has a bug: must be included before ++ . ++ BSD/OS 4.0.1 has a bug: , and must be ++ included before . */ ++#if !(defined __GLIBC__ && !defined __UCLIBC__) ++# include ++# include ++# include ++#endif ++#include ++ int verify[sizeof (wint_t) < sizeof (int) ? -1 : 1]; ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ gl_cv_type_wint_t_too_small=no ++else ++ gl_cv_type_wint_t_too_small=yes ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_type_wint_t_too_small" >&5 ++$as_echo "$gl_cv_type_wint_t_too_small" >&6; } ++ if test $gl_cv_type_wint_t_too_small = yes; then ++ GNULIB_OVERRIDES_WINT_T=1 ++ else ++ GNULIB_OVERRIDES_WINT_T=0 ++ fi ++ else ++ GNULIB_OVERRIDES_WINT_T=0 ++ fi ++ ++ ++ ++ ++ ++ + + + _ACEOF +@@ -29230,6 +29416,107 @@ + test $ac_write_fail = 0 || + as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5 + ++ : ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ac_found=0 ++ ac_fn_c_check_decl "$LINENO" "program_invocation_name" "ac_cv_have_decl_program_invocation_name" "#include ++" ++if test "x$ac_cv_have_decl_program_invocation_name" = xyes; then : ++ ac_have_decl=1 ++else ++ ac_have_decl=0 ++fi ++ ++cat >>confdefs.h <<_ACEOF ++#define HAVE_DECL_PROGRAM_INVOCATION_NAME $ac_have_decl ++_ACEOF ++if test $ac_have_decl = 1; then : ++ ac_found=1 ++fi ++ ++ ac_fn_c_check_decl "$LINENO" "program_invocation_short_name" "ac_cv_have_decl_program_invocation_short_name" "#include ++" ++if test "x$ac_cv_have_decl_program_invocation_short_name" = xyes; then : ++ ac_have_decl=1 ++else ++ ac_have_decl=0 ++fi ++ ++cat >>confdefs.h <<_ACEOF ++#define HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME $ac_have_decl ++_ACEOF ++if test $ac_have_decl = 1; then : ++ ac_found=1 ++fi ++ ++ ac_fn_c_check_decl "$LINENO" "__argv" "ac_cv_have_decl___argv" "#include ++" ++if test "x$ac_cv_have_decl___argv" = xyes; then : ++ ac_have_decl=1 ++else ++ ac_have_decl=0 ++fi ++ ++cat >>confdefs.h <<_ACEOF ++#define HAVE_DECL___ARGV $ac_have_decl ++_ACEOF ++if test $ac_have_decl = 1; then : ++ ac_found=1 ++fi ++ ++ ++ # Incur the cost of this test only if none of the above worked. ++ if test $ac_found = 0; then ++ # On OpenBSD 5.1, using the global __progname variable appears to be ++ # the only way to implement getprogname. ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether __progname is defined in default libraries" >&5 ++$as_echo_n "checking whether __progname is defined in default libraries... " >&6; } ++if ${gl_cv_var___progname+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ gl_cv_var___progname= ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++extern char *__progname; ++int ++main () ++{ ++return *__progname; ++ ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_link "$LINENO"; then : ++ gl_cv_var___progname=yes ++ ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++ ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_var___progname" >&5 ++$as_echo "$gl_cv_var___progname" >&6; } ++ if test "$gl_cv_var___progname" = yes; then ++ ++$as_echo "#define HAVE_VAR___PROGNAME 1" >>confdefs.h ++ ++ fi ++ fi ++ ++ ++ ++ + + # configure is writing to config.log, and then calls config.status. + # config.status does its own redirection, appending to config.log. +diff -Naur libpipeline-1.5.0-orig/gnulib/lib/_Noreturn.h libpipeline-1.5.0/gnulib/lib/_Noreturn.h +--- libpipeline-1.5.0-orig/gnulib/lib/_Noreturn.h 1970-01-01 03:00:00.000000000 +0300 ++++ libpipeline-1.5.0/gnulib/lib/_Noreturn.h 2018-07-02 13:09:59.400436100 +0300 +@@ -0,0 +1,10 @@ ++#if !defined _Noreturn && __STDC_VERSION__ < 201112 ++# if (3 <= __GNUC__ || (__GNUC__ == 2 && 8 <= __GNUC_MINOR__) \ ++ || 0x5110 <= __SUNPRO_C) ++# define _Noreturn __attribute__ ((__noreturn__)) ++# elif 1200 <= _MSC_VER ++# define _Noreturn __declspec (noreturn) ++# else ++# define _Noreturn ++# endif ++#endif +diff -Naur libpipeline-1.5.0-orig/gnulib/lib/alloca.in.h libpipeline-1.5.0/gnulib/lib/alloca.in.h +--- libpipeline-1.5.0-orig/gnulib/lib/alloca.in.h 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/lib/alloca.in.h 2018-07-02 13:09:59.410436100 +0300 +@@ -1,6 +1,6 @@ + /* Memory allocation on the stack. + +- Copyright (C) 1995, 1999, 2001-2004, 2006-2014 Free Software Foundation, ++ Copyright (C) 1995, 1999, 2001-2004, 2006-2017 Free Software Foundation, + Inc. + + This program is free software; you can redistribute it and/or modify it +@@ -51,6 +51,8 @@ + void *_alloca (unsigned short); + # pragma intrinsic (_alloca) + # define alloca _alloca ++# elif defined __MVS__ ++# include + # else + # include + # ifdef __cplusplus +diff -Naur libpipeline-1.5.0-orig/gnulib/lib/arg-nonnull.h libpipeline-1.5.0/gnulib/lib/arg-nonnull.h +--- libpipeline-1.5.0-orig/gnulib/lib/arg-nonnull.h 1970-01-01 03:00:00.000000000 +0300 ++++ libpipeline-1.5.0/gnulib/lib/arg-nonnull.h 2018-07-02 13:09:59.410436100 +0300 +@@ -0,0 +1,26 @@ ++/* A C macro for declaring that specific arguments must not be NULL. ++ Copyright (C) 2009-2017 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 3 of the License, 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, see . */ ++ ++/* _GL_ARG_NONNULL((n,...,m)) tells the compiler and static analyzer tools ++ that the values passed as arguments n, ..., m must be non-NULL pointers. ++ n = 1 stands for the first argument, n = 2 for the second argument etc. */ ++#ifndef _GL_ARG_NONNULL ++# if (__GNUC__ == 3 && __GNUC_MINOR__ >= 3) || __GNUC__ > 3 ++# define _GL_ARG_NONNULL(params) __attribute__ ((__nonnull__ params)) ++# else ++# define _GL_ARG_NONNULL(params) ++# endif ++#endif +diff -Naur libpipeline-1.5.0-orig/gnulib/lib/asnprintf.c libpipeline-1.5.0/gnulib/lib/asnprintf.c +--- libpipeline-1.5.0-orig/gnulib/lib/asnprintf.c 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/lib/asnprintf.c 2018-07-02 13:09:59.410436100 +0300 +@@ -1,5 +1,5 @@ + /* Formatted output to strings. +- Copyright (C) 1999, 2002, 2006, 2009-2014 Free Software Foundation, Inc. ++ Copyright (C) 1999, 2002, 2006, 2009-2017 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 +diff -Naur libpipeline-1.5.0-orig/gnulib/lib/asprintf.c libpipeline-1.5.0/gnulib/lib/asprintf.c +--- libpipeline-1.5.0-orig/gnulib/lib/asprintf.c 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/lib/asprintf.c 2018-07-02 13:09:59.410436100 +0300 +@@ -1,5 +1,5 @@ + /* Formatted output to strings. +- Copyright (C) 1999, 2002, 2006-2007, 2009-2014 Free Software Foundation, ++ Copyright (C) 1999, 2002, 2006-2007, 2009-2017 Free Software Foundation, + Inc. + + This program is free software; you can redistribute it and/or modify +diff -Naur libpipeline-1.5.0-orig/gnulib/lib/basename.c libpipeline-1.5.0/gnulib/lib/basename.c +--- libpipeline-1.5.0-orig/gnulib/lib/basename.c 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/lib/basename.c 2018-07-02 13:09:59.410436100 +0300 +@@ -1,6 +1,6 @@ + /* basename.c -- return the last element in a file name + +- Copyright (C) 1990, 1998-2001, 2003-2006, 2009-2014 Free Software ++ Copyright (C) 1990, 1998-2001, 2003-2006, 2009-2017 Free Software + Foundation, Inc. + + This program is free software: you can redistribute it and/or modify +diff -Naur libpipeline-1.5.0-orig/gnulib/lib/basename-lgpl.c libpipeline-1.5.0/gnulib/lib/basename-lgpl.c +--- libpipeline-1.5.0-orig/gnulib/lib/basename-lgpl.c 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/lib/basename-lgpl.c 2018-07-02 13:09:59.420436200 +0300 +@@ -1,6 +1,6 @@ + /* basename.c -- return the last element in a file name + +- Copyright (C) 1990, 1998-2001, 2003-2006, 2009-2014 Free Software ++ Copyright (C) 1990, 1998-2001, 2003-2006, 2009-2017 Free Software + Foundation, Inc. + + This program is free software: you can redistribute it and/or modify +diff -Naur libpipeline-1.5.0-orig/gnulib/lib/c++defs.h libpipeline-1.5.0/gnulib/lib/c++defs.h +--- libpipeline-1.5.0-orig/gnulib/lib/c++defs.h 1970-01-01 03:00:00.000000000 +0300 ++++ libpipeline-1.5.0/gnulib/lib/c++defs.h 2018-07-02 13:09:59.420436200 +0300 +@@ -0,0 +1,316 @@ ++/* C++ compatible function declaration macros. ++ Copyright (C) 2010-2017 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 3 of the License, 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, see . */ ++ ++#ifndef _GL_CXXDEFS_H ++#define _GL_CXXDEFS_H ++ ++/* Begin/end the GNULIB_NAMESPACE namespace. */ ++#if defined __cplusplus && defined GNULIB_NAMESPACE ++# define _GL_BEGIN_NAMESPACE namespace GNULIB_NAMESPACE { ++# define _GL_END_NAMESPACE } ++#else ++# define _GL_BEGIN_NAMESPACE ++# define _GL_END_NAMESPACE ++#endif ++ ++/* The three most frequent use cases of these macros are: ++ ++ * For providing a substitute for a function that is missing on some ++ platforms, but is declared and works fine on the platforms on which ++ it exists: ++ ++ #if @GNULIB_FOO@ ++ # if !@HAVE_FOO@ ++ _GL_FUNCDECL_SYS (foo, ...); ++ # endif ++ _GL_CXXALIAS_SYS (foo, ...); ++ _GL_CXXALIASWARN (foo); ++ #elif defined GNULIB_POSIXCHECK ++ ... ++ #endif ++ ++ * For providing a replacement for a function that exists on all platforms, ++ but is broken/insufficient and needs to be replaced on some platforms: ++ ++ #if @GNULIB_FOO@ ++ # if @REPLACE_FOO@ ++ # if !(defined __cplusplus && defined GNULIB_NAMESPACE) ++ # undef foo ++ # define foo rpl_foo ++ # endif ++ _GL_FUNCDECL_RPL (foo, ...); ++ _GL_CXXALIAS_RPL (foo, ...); ++ # else ++ _GL_CXXALIAS_SYS (foo, ...); ++ # endif ++ _GL_CXXALIASWARN (foo); ++ #elif defined GNULIB_POSIXCHECK ++ ... ++ #endif ++ ++ * For providing a replacement for a function that exists on some platforms ++ but is broken/insufficient and needs to be replaced on some of them and ++ is additionally either missing or undeclared on some other platforms: ++ ++ #if @GNULIB_FOO@ ++ # if @REPLACE_FOO@ ++ # if !(defined __cplusplus && defined GNULIB_NAMESPACE) ++ # undef foo ++ # define foo rpl_foo ++ # endif ++ _GL_FUNCDECL_RPL (foo, ...); ++ _GL_CXXALIAS_RPL (foo, ...); ++ # else ++ # if !@HAVE_FOO@ or if !@HAVE_DECL_FOO@ ++ _GL_FUNCDECL_SYS (foo, ...); ++ # endif ++ _GL_CXXALIAS_SYS (foo, ...); ++ # endif ++ _GL_CXXALIASWARN (foo); ++ #elif defined GNULIB_POSIXCHECK ++ ... ++ #endif ++*/ ++ ++/* _GL_EXTERN_C declaration; ++ performs the declaration with C linkage. */ ++#if defined __cplusplus ++# define _GL_EXTERN_C extern "C" ++#else ++# define _GL_EXTERN_C extern ++#endif ++ ++/* _GL_FUNCDECL_RPL (func, rettype, parameters_and_attributes); ++ declares a replacement function, named rpl_func, with the given prototype, ++ consisting of return type, parameters, and attributes. ++ Example: ++ _GL_FUNCDECL_RPL (open, int, (const char *filename, int flags, ...) ++ _GL_ARG_NONNULL ((1))); ++ */ ++#define _GL_FUNCDECL_RPL(func,rettype,parameters_and_attributes) \ ++ _GL_FUNCDECL_RPL_1 (rpl_##func, rettype, parameters_and_attributes) ++#define _GL_FUNCDECL_RPL_1(rpl_func,rettype,parameters_and_attributes) \ ++ _GL_EXTERN_C rettype rpl_func parameters_and_attributes ++ ++/* _GL_FUNCDECL_SYS (func, rettype, parameters_and_attributes); ++ declares the system function, named func, with the given prototype, ++ consisting of return type, parameters, and attributes. ++ Example: ++ _GL_FUNCDECL_SYS (open, int, (const char *filename, int flags, ...) ++ _GL_ARG_NONNULL ((1))); ++ */ ++#define _GL_FUNCDECL_SYS(func,rettype,parameters_and_attributes) \ ++ _GL_EXTERN_C rettype func parameters_and_attributes ++ ++/* _GL_CXXALIAS_RPL (func, rettype, parameters); ++ declares a C++ alias called GNULIB_NAMESPACE::func ++ that redirects to rpl_func, if GNULIB_NAMESPACE is defined. ++ Example: ++ _GL_CXXALIAS_RPL (open, int, (const char *filename, int flags, ...)); ++ ++ Wrapping rpl_func in an object with an inline conversion operator ++ avoids a reference to rpl_func unless GNULIB_NAMESPACE::func is ++ actually used in the program. */ ++#define _GL_CXXALIAS_RPL(func,rettype,parameters) \ ++ _GL_CXXALIAS_RPL_1 (func, rpl_##func, rettype, parameters) ++#if defined __cplusplus && defined GNULIB_NAMESPACE ++# define _GL_CXXALIAS_RPL_1(func,rpl_func,rettype,parameters) \ ++ namespace GNULIB_NAMESPACE \ ++ { \ ++ static const struct _gl_ ## func ## _wrapper \ ++ { \ ++ typedef rettype (*type) parameters; \ ++ \ ++ inline operator type () const \ ++ { \ ++ return ::rpl_func; \ ++ } \ ++ } func = {}; \ ++ } \ ++ _GL_EXTERN_C int _gl_cxxalias_dummy ++#else ++# define _GL_CXXALIAS_RPL_1(func,rpl_func,rettype,parameters) \ ++ _GL_EXTERN_C int _gl_cxxalias_dummy ++#endif ++ ++/* _GL_CXXALIAS_RPL_CAST_1 (func, rpl_func, rettype, parameters); ++ is like _GL_CXXALIAS_RPL_1 (func, rpl_func, rettype, parameters); ++ except that the C function rpl_func may have a slightly different ++ declaration. A cast is used to silence the "invalid conversion" error ++ that would otherwise occur. */ ++#if defined __cplusplus && defined GNULIB_NAMESPACE ++# define _GL_CXXALIAS_RPL_CAST_1(func,rpl_func,rettype,parameters) \ ++ namespace GNULIB_NAMESPACE \ ++ { \ ++ static const struct _gl_ ## func ## _wrapper \ ++ { \ ++ typedef rettype (*type) parameters; \ ++ \ ++ inline operator type () const \ ++ { \ ++ return reinterpret_cast(::rpl_func); \ ++ } \ ++ } func = {}; \ ++ } \ ++ _GL_EXTERN_C int _gl_cxxalias_dummy ++#else ++# define _GL_CXXALIAS_RPL_CAST_1(func,rpl_func,rettype,parameters) \ ++ _GL_EXTERN_C int _gl_cxxalias_dummy ++#endif ++ ++/* _GL_CXXALIAS_SYS (func, rettype, parameters); ++ declares a C++ alias called GNULIB_NAMESPACE::func ++ that redirects to the system provided function func, if GNULIB_NAMESPACE ++ is defined. ++ Example: ++ _GL_CXXALIAS_SYS (open, int, (const char *filename, int flags, ...)); ++ ++ Wrapping func in an object with an inline conversion operator ++ avoids a reference to func unless GNULIB_NAMESPACE::func is ++ actually used in the program. */ ++#if defined __cplusplus && defined GNULIB_NAMESPACE ++# define _GL_CXXALIAS_SYS(func,rettype,parameters) \ ++ namespace GNULIB_NAMESPACE \ ++ { \ ++ static const struct _gl_ ## func ## _wrapper \ ++ { \ ++ typedef rettype (*type) parameters; \ ++ \ ++ inline operator type () const \ ++ { \ ++ return ::func; \ ++ } \ ++ } func = {}; \ ++ } \ ++ _GL_EXTERN_C int _gl_cxxalias_dummy ++#else ++# define _GL_CXXALIAS_SYS(func,rettype,parameters) \ ++ _GL_EXTERN_C int _gl_cxxalias_dummy ++#endif ++ ++/* _GL_CXXALIAS_SYS_CAST (func, rettype, parameters); ++ is like _GL_CXXALIAS_SYS (func, rettype, parameters); ++ except that the C function func may have a slightly different declaration. ++ A cast is used to silence the "invalid conversion" error that would ++ otherwise occur. */ ++#if defined __cplusplus && defined GNULIB_NAMESPACE ++# define _GL_CXXALIAS_SYS_CAST(func,rettype,parameters) \ ++ namespace GNULIB_NAMESPACE \ ++ { \ ++ static const struct _gl_ ## func ## _wrapper \ ++ { \ ++ typedef rettype (*type) parameters; \ ++ \ ++ inline operator type () const \ ++ { \ ++ return reinterpret_cast(::func); \ ++ } \ ++ } func = {}; \ ++ } \ ++ _GL_EXTERN_C int _gl_cxxalias_dummy ++#else ++# define _GL_CXXALIAS_SYS_CAST(func,rettype,parameters) \ ++ _GL_EXTERN_C int _gl_cxxalias_dummy ++#endif ++ ++/* _GL_CXXALIAS_SYS_CAST2 (func, rettype, parameters, rettype2, parameters2); ++ is like _GL_CXXALIAS_SYS (func, rettype, parameters); ++ except that the C function is picked among a set of overloaded functions, ++ namely the one with rettype2 and parameters2. Two consecutive casts ++ are used to silence the "cannot find a match" and "invalid conversion" ++ errors that would otherwise occur. */ ++#if defined __cplusplus && defined GNULIB_NAMESPACE ++ /* The outer cast must be a reinterpret_cast. ++ The inner cast: When the function is defined as a set of overloaded ++ functions, it works as a static_cast<>, choosing the designated variant. ++ When the function is defined as a single variant, it works as a ++ reinterpret_cast<>. The parenthesized cast syntax works both ways. */ ++# define _GL_CXXALIAS_SYS_CAST2(func,rettype,parameters,rettype2,parameters2) \ ++ namespace GNULIB_NAMESPACE \ ++ { \ ++ static const struct _gl_ ## func ## _wrapper \ ++ { \ ++ typedef rettype (*type) parameters; \ ++ \ ++ inline operator type () const \ ++ { \ ++ return reinterpret_cast((rettype2 (*) parameters2)(::func)); \ ++ } \ ++ } func = {}; \ ++ } \ ++ _GL_EXTERN_C int _gl_cxxalias_dummy ++#else ++# define _GL_CXXALIAS_SYS_CAST2(func,rettype,parameters,rettype2,parameters2) \ ++ _GL_EXTERN_C int _gl_cxxalias_dummy ++#endif ++ ++/* _GL_CXXALIASWARN (func); ++ causes a warning to be emitted when ::func is used but not when ++ GNULIB_NAMESPACE::func is used. func must be defined without overloaded ++ variants. */ ++#if defined __cplusplus && defined GNULIB_NAMESPACE ++# define _GL_CXXALIASWARN(func) \ ++ _GL_CXXALIASWARN_1 (func, GNULIB_NAMESPACE) ++# define _GL_CXXALIASWARN_1(func,namespace) \ ++ _GL_CXXALIASWARN_2 (func, namespace) ++/* To work around GCC bug , ++ we enable the warning only when not optimizing. */ ++# if !__OPTIMIZE__ ++# define _GL_CXXALIASWARN_2(func,namespace) \ ++ _GL_WARN_ON_USE (func, \ ++ "The symbol ::" #func " refers to the system function. " \ ++ "Use " #namespace "::" #func " instead.") ++# elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING ++# define _GL_CXXALIASWARN_2(func,namespace) \ ++ extern __typeof__ (func) func ++# else ++# define _GL_CXXALIASWARN_2(func,namespace) \ ++ _GL_EXTERN_C int _gl_cxxalias_dummy ++# endif ++#else ++# define _GL_CXXALIASWARN(func) \ ++ _GL_EXTERN_C int _gl_cxxalias_dummy ++#endif ++ ++/* _GL_CXXALIASWARN1 (func, rettype, parameters_and_attributes); ++ causes a warning to be emitted when the given overloaded variant of ::func ++ is used but not when GNULIB_NAMESPACE::func is used. */ ++#if defined __cplusplus && defined GNULIB_NAMESPACE ++# define _GL_CXXALIASWARN1(func,rettype,parameters_and_attributes) \ ++ _GL_CXXALIASWARN1_1 (func, rettype, parameters_and_attributes, \ ++ GNULIB_NAMESPACE) ++# define _GL_CXXALIASWARN1_1(func,rettype,parameters_and_attributes,namespace) \ ++ _GL_CXXALIASWARN1_2 (func, rettype, parameters_and_attributes, namespace) ++/* To work around GCC bug , ++ we enable the warning only when not optimizing. */ ++# if !__OPTIMIZE__ ++# define _GL_CXXALIASWARN1_2(func,rettype,parameters_and_attributes,namespace) \ ++ _GL_WARN_ON_USE_CXX (func, rettype, parameters_and_attributes, \ ++ "The symbol ::" #func " refers to the system function. " \ ++ "Use " #namespace "::" #func " instead.") ++# elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING ++# define _GL_CXXALIASWARN1_2(func,rettype,parameters_and_attributes,namespace) \ ++ extern __typeof__ (func) func ++# else ++# define _GL_CXXALIASWARN1_2(func,rettype,parameters_and_attributes,namespace) \ ++ _GL_EXTERN_C int _gl_cxxalias_dummy ++# endif ++#else ++# define _GL_CXXALIASWARN1(func,rettype,parameters_and_attributes) \ ++ _GL_EXTERN_C int _gl_cxxalias_dummy ++#endif ++ ++#endif /* _GL_CXXDEFS_H */ +diff -Naur libpipeline-1.5.0-orig/gnulib/lib/dirname.c libpipeline-1.5.0/gnulib/lib/dirname.c +--- libpipeline-1.5.0-orig/gnulib/lib/dirname.c 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/lib/dirname.c 2018-07-02 13:09:59.420436200 +0300 +@@ -1,6 +1,6 @@ + /* dirname.c -- return all but the last element in a file name + +- Copyright (C) 1990, 1998, 2000-2001, 2003-2006, 2009-2014 Free Software ++ Copyright (C) 1990, 1998, 2000-2001, 2003-2006, 2009-2017 Free Software + Foundation, Inc. + + This program is free software: you can redistribute it and/or modify +diff -Naur libpipeline-1.5.0-orig/gnulib/lib/dirname.h libpipeline-1.5.0/gnulib/lib/dirname.h +--- libpipeline-1.5.0-orig/gnulib/lib/dirname.h 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/lib/dirname.h 2018-07-02 13:09:59.430436200 +0300 +@@ -1,6 +1,6 @@ + /* Take file names apart into directory and base names. + +- Copyright (C) 1998, 2001, 2003-2006, 2009-2014 Free Software Foundation, ++ Copyright (C) 1998, 2001, 2003-2006, 2009-2017 Free Software Foundation, + Inc. + + This program is free software: you can redistribute it and/or modify +@@ -31,6 +31,10 @@ + # define DOUBLE_SLASH_IS_DISTINCT_ROOT 0 + # endif + ++#ifdef __cplusplus ++extern "C" { ++#endif ++ + # if GNULIB_DIRNAME + char *base_name (char const *file); + char *dir_name (char const *file); +@@ -43,4 +47,8 @@ + + bool strip_trailing_slashes (char *file); + ++#ifdef __cplusplus ++} /* extern "C" */ ++#endif ++ + #endif /* not DIRNAME_H_ */ +diff -Naur libpipeline-1.5.0-orig/gnulib/lib/dirname-lgpl.c libpipeline-1.5.0/gnulib/lib/dirname-lgpl.c +--- libpipeline-1.5.0-orig/gnulib/lib/dirname-lgpl.c 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/lib/dirname-lgpl.c 2018-07-02 13:09:59.430436200 +0300 +@@ -1,6 +1,6 @@ + /* dirname.c -- return all but the last element in a file name + +- Copyright (C) 1990, 1998, 2000-2001, 2003-2006, 2009-2014 Free Software ++ Copyright (C) 1990, 1998, 2000-2001, 2003-2006, 2009-2017 Free Software + Foundation, Inc. + + This program is free software: you can redistribute it and/or modify +diff -Naur libpipeline-1.5.0-orig/gnulib/lib/dosname.h libpipeline-1.5.0/gnulib/lib/dosname.h +--- libpipeline-1.5.0-orig/gnulib/lib/dosname.h 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/lib/dosname.h 2018-07-02 13:09:59.430436200 +0300 +@@ -1,6 +1,6 @@ + /* File names on MS-DOS/Windows systems. + +- Copyright (C) 2000-2001, 2004-2006, 2009-2014 Free Software Foundation, Inc. ++ Copyright (C) 2000-2001, 2004-2006, 2009-2017 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 +diff -Naur libpipeline-1.5.0-orig/gnulib/lib/errno.in.h libpipeline-1.5.0/gnulib/lib/errno.in.h +--- libpipeline-1.5.0-orig/gnulib/lib/errno.in.h 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/lib/errno.in.h 2018-07-02 13:09:59.430436200 +0300 +@@ -1,6 +1,6 @@ + /* A POSIX-like . + +- Copyright (C) 2008-2014 Free Software Foundation, Inc. ++ Copyright (C) 2008-2017 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 +diff -Naur libpipeline-1.5.0-orig/gnulib/lib/error.c libpipeline-1.5.0/gnulib/lib/error.c +--- libpipeline-1.5.0-orig/gnulib/lib/error.c 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/lib/error.c 2018-07-02 13:09:59.440436200 +0300 +@@ -1,5 +1,5 @@ + /* Error handler for noninteractive utilities +- Copyright (C) 1990-1998, 2000-2007, 2009-2014 Free Software Foundation, Inc. ++ Copyright (C) 1990-1998, 2000-2007, 2009-2017 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + This program is free software: you can redistribute it and/or modify +@@ -39,6 +39,11 @@ + # include + # include + # define mbsrtowcs __mbsrtowcs ++# define USE_UNLOCKED_IO 0 ++# define _GL_ATTRIBUTE_FORMAT_PRINTF(a, b) ++# define _GL_ARG_NONNULL(a) ++#else ++# include "getprogname.h" + #endif + + #if USE_UNLOCKED_IO +@@ -72,14 +77,14 @@ + extern void __error_at_line (int status, int errnum, const char *file_name, + unsigned int line_number, const char *message, + ...) +- __attribute__ ((__format__ (__printf__, 5, 6)));; ++ __attribute__ ((__format__ (__printf__, 5, 6))); + # define error __error + # define error_at_line __error_at_line + + # include +-# define fflush(s) INTUSE(_IO_fflush) (s) ++# define fflush(s) _IO_fflush (s) + # undef putc +-# define putc(c, fp) INTUSE(_IO_putc) (c, fp) ++# define putc(c, fp) _IO_putc (c, fp) + + # include + +@@ -93,30 +98,32 @@ + # define WIN32_LEAN_AND_MEAN + # include + /* Get _get_osfhandle. */ +-# include "msvc-nothrow.h" ++# if GNULIB_MSVC_NOTHROW ++# include "msvc-nothrow.h" ++# else ++# include ++# endif + # endif + + /* The gnulib override of fcntl is not needed in this file. */ + # undef fcntl + +-# if !HAVE_DECL_STRERROR_R ++# if !(GNULIB_STRERROR_R_POSIX || HAVE_DECL_STRERROR_R) + # ifndef HAVE_DECL_STRERROR_R + "this configure-time declaration test was not run" + # endif + # if STRERROR_R_CHAR_P +-char *strerror_r (); ++char *strerror_r (int errnum, char *buf, size_t buflen); + # else +-int strerror_r (); ++int strerror_r (int errnum, char *buf, size_t buflen); + # endif + # endif + +-/* The calling program should define program_name and set it to the +- name of the executing program. */ +-extern char *program_name; ++#define program_name getprogname () + +-# if HAVE_STRERROR_R || defined strerror_r ++# if GNULIB_STRERROR_R_POSIX || HAVE_STRERROR_R || defined strerror_r + # define __strerror_r strerror_r +-# endif /* HAVE_STRERROR_R || defined strerror_r */ ++# endif /* GNULIB_STRERROR_R_POSIX || HAVE_STRERROR_R || defined strerror_r */ + #endif /* not _LIBC */ + + #if !_LIBC +@@ -169,9 +176,9 @@ + { + char const *s; + +-#if defined HAVE_STRERROR_R || _LIBC ++#if _LIBC || GNULIB_STRERROR_R_POSIX || defined HAVE_STRERROR_R + char errbuf[1024]; +-# if STRERROR_R_CHAR_P || _LIBC ++# if _LIBC || (!GNULIB_STRERROR_R_POSIX && STRERROR_R_CHAR_P) + s = __strerror_r (errnum, errbuf, sizeof errbuf); + # else + if (__strerror_r (errnum, errbuf, sizeof errbuf) == 0) +@@ -201,7 +208,6 @@ + #if _LIBC + if (_IO_fwide (stderr, 0) > 0) + { +-# define ALLOCA_LIMIT 2000 + size_t len = strlen (message) + 1; + wchar_t *wmessage = NULL; + mbstate_t st; +@@ -237,7 +243,7 @@ + if (res != len) + break; + +- if (__builtin_expect (len >= SIZE_MAX / 2, 0)) ++ if (__builtin_expect (len >= SIZE_MAX / sizeof (wchar_t) / 2, 0)) + { + /* This really should not happen if everything is fine. */ + res = (size_t) -1; +@@ -342,7 +348,10 @@ + + if (old_line_number == line_number + && (file_name == old_file_name +- || strcmp (old_file_name, file_name) == 0)) ++ || (old_file_name != NULL ++ && file_name != NULL ++ && strcmp (old_file_name, file_name) == 0))) ++ + /* Simply return and print nothing. */ + return; + +@@ -374,10 +383,10 @@ + } + + #if _LIBC +- __fxprintf (NULL, file_name != NULL ? "%s:%d: " : " ", ++ __fxprintf (NULL, file_name != NULL ? "%s:%u: " : " ", + file_name, line_number); + #else +- fprintf (stderr, file_name != NULL ? "%s:%d: " : " ", ++ fprintf (stderr, file_name != NULL ? "%s:%u: " : " ", + file_name, line_number); + #endif + +diff -Naur libpipeline-1.5.0-orig/gnulib/lib/error.h libpipeline-1.5.0/gnulib/lib/error.h +--- libpipeline-1.5.0-orig/gnulib/lib/error.h 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/lib/error.h 2018-07-02 13:09:59.440436200 +0300 +@@ -1,5 +1,5 @@ + /* Declaration for error-reporting function +- Copyright (C) 1995-1997, 2003, 2006, 2008-2014 Free Software Foundation, ++ Copyright (C) 1995-1997, 2003, 2006, 2008-2017 Free Software Foundation, + Inc. + This file is part of the GNU C Library. + +@@ -31,6 +31,16 @@ + # define _GL_ATTRIBUTE_FORMAT(spec) /* empty */ + #endif + ++/* On mingw, the flavor of printf depends on whether the extensions module ++ * is in use; the check for determines the witness macro. */ ++#ifndef _GL_ATTRIBUTE_SPEC_PRINTF ++# if GNULIB_PRINTF_ATTRIBUTE_FLAVOR_GNU ++# define _GL_ATTRIBUTE_SPEC_PRINTF __gnu_printf__ ++# else ++# define _GL_ATTRIBUTE_SPEC_PRINTF __printf__ ++# endif ++#endif ++ + #ifdef __cplusplus + extern "C" { + #endif +@@ -40,11 +50,11 @@ + If STATUS is nonzero, terminate the program with 'exit (STATUS)'. */ + + extern void error (int __status, int __errnum, const char *__format, ...) +- _GL_ATTRIBUTE_FORMAT ((__printf__, 3, 4)); ++ _GL_ATTRIBUTE_FORMAT ((_GL_ATTRIBUTE_SPEC_PRINTF, 3, 4)); + + extern void error_at_line (int __status, int __errnum, const char *__fname, + unsigned int __lineno, const char *__format, ...) +- _GL_ATTRIBUTE_FORMAT ((__printf__, 5, 6)); ++ _GL_ATTRIBUTE_FORMAT ((_GL_ATTRIBUTE_SPEC_PRINTF, 5, 6)); + + /* If NULL, error will flush stdout, then print on stderr the program + name, a colon and a space. Otherwise, error will call this +diff -Naur libpipeline-1.5.0-orig/gnulib/lib/exitfail.c libpipeline-1.5.0/gnulib/lib/exitfail.c +--- libpipeline-1.5.0-orig/gnulib/lib/exitfail.c 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/lib/exitfail.c 2018-07-02 13:09:59.440436200 +0300 +@@ -1,6 +1,6 @@ + /* Failure exit status + +- Copyright (C) 2002-2003, 2005-2007, 2009-2014 Free Software Foundation, Inc. ++ Copyright (C) 2002-2003, 2005-2007, 2009-2017 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 +diff -Naur libpipeline-1.5.0-orig/gnulib/lib/exitfail.h libpipeline-1.5.0/gnulib/lib/exitfail.h +--- libpipeline-1.5.0-orig/gnulib/lib/exitfail.h 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/lib/exitfail.h 2018-07-02 13:09:59.440436200 +0300 +@@ -1,6 +1,6 @@ + /* Failure exit status + +- Copyright (C) 2002, 2009-2014 Free Software Foundation, Inc. ++ Copyright (C) 2002, 2009-2017 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 +diff -Naur libpipeline-1.5.0-orig/gnulib/lib/fcntl.in.h libpipeline-1.5.0/gnulib/lib/fcntl.in.h +--- libpipeline-1.5.0-orig/gnulib/lib/fcntl.in.h 2014-11-08 16:53:37.000000000 +0300 ++++ libpipeline-1.5.0/gnulib/lib/fcntl.in.h 2018-07-02 13:09:59.450436200 +0300 +@@ -1,6 +1,6 @@ + /* Like , but with non-working flags defined to 0. + +- Copyright (C) 2006-2014 Free Software Foundation, Inc. ++ Copyright (C) 2006-2017 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 +@@ -34,7 +34,7 @@ + extern "C" { ... } block, which leads to errors in C++ mode with the + overridden from gnulib. These errors are known to be gone + with g++ version >= 4.3. */ +-#if !(defined __GLIBC__ || defined __UCLIBC__) || (defined __cplusplus && defined GNULIB_NAMESPACE && !(__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3))) ++#if !(defined __GLIBC__ || defined __UCLIBC__) || (defined __cplusplus && defined GNULIB_NAMESPACE && (defined __ICC || !(__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)))) + # include + #endif + #@INCLUDE_NEXT@ @NEXT_FCNTL_H@ +@@ -53,7 +53,7 @@ + extern "C" { ... } block, which leads to errors in C++ mode with the + overridden from gnulib. These errors are known to be gone + with g++ version >= 4.3. */ +-#if !(defined __GLIBC__ || defined __UCLIBC__) || (defined __cplusplus && defined GNULIB_NAMESPACE && !(__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3))) ++#if !(defined __GLIBC__ || defined __UCLIBC__) || (defined __cplusplus && defined GNULIB_NAMESPACE && (defined __ICC || !(__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)))) + # include + #endif + /* The include_next requires a split double-inclusion guard. */ +@@ -186,6 +186,22 @@ + + /* Fix up the O_* macros. */ + ++/* AIX 7.1 with XL C 12.1 defines O_CLOEXEC, O_NOFOLLOW, and O_TTY_INIT ++ to values outside 'int' range, so omit these misdefinitions. ++ But avoid namespace pollution on non-AIX systems. */ ++#ifdef _AIX ++# include ++# if defined O_CLOEXEC && ! (INT_MIN <= O_CLOEXEC && O_CLOEXEC <= INT_MAX) ++# undef O_CLOEXEC ++# endif ++# if defined O_NOFOLLOW && ! (INT_MIN <= O_NOFOLLOW && O_NOFOLLOW <= INT_MAX) ++# undef O_NOFOLLOW ++# endif ++# if defined O_TTY_INIT && ! (INT_MIN <= O_TTY_INIT && O_TTY_INIT <= INT_MAX) ++# undef O_TTY_INIT ++# endif ++#endif ++ + #if !defined O_DIRECT && defined O_DIRECTIO + /* Tru64 spells it 'O_DIRECTIO'. */ + # define O_DIRECT O_DIRECTIO +diff -Naur libpipeline-1.5.0-orig/gnulib/lib/filename.h libpipeline-1.5.0/gnulib/lib/filename.h +--- libpipeline-1.5.0-orig/gnulib/lib/filename.h 1970-01-01 03:00:00.000000000 +0300 ++++ libpipeline-1.5.0/gnulib/lib/filename.h 2018-07-02 13:09:59.450436200 +0300 +@@ -0,0 +1,54 @@ ++/* Basic filename support macros. ++ Copyright (C) 2001-2004, 2007-2017 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 3 of the License, 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, see . */ ++ ++#ifndef _FILENAME_H ++#define _FILENAME_H ++ ++#ifdef __cplusplus ++extern "C" { ++#endif ++ ++ ++/* Pathname support. ++ ISSLASH(C) tests whether C is a directory separator character. ++ IS_ABSOLUTE_PATH(P) tests whether P is an absolute path. If it is not, ++ it may be concatenated to a directory pathname. ++ IS_PATH_WITH_DIR(P) tests whether P contains a directory specification. ++ */ ++#if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__ || defined __EMX__ || defined __DJGPP__ ++ /* Native Windows, Cygwin, OS/2, DOS */ ++# define ISSLASH(C) ((C) == '/' || (C) == '\\') ++# define HAS_DEVICE(P) \ ++ ((((P)[0] >= 'A' && (P)[0] <= 'Z') || ((P)[0] >= 'a' && (P)[0] <= 'z')) \ ++ && (P)[1] == ':') ++# define IS_ABSOLUTE_PATH(P) (ISSLASH ((P)[0]) || HAS_DEVICE (P)) ++# define IS_PATH_WITH_DIR(P) \ ++ (strchr (P, '/') != NULL || strchr (P, '\\') != NULL || HAS_DEVICE (P)) ++# define FILE_SYSTEM_PREFIX_LEN(P) (HAS_DEVICE (P) ? 2 : 0) ++#else ++ /* Unix */ ++# define ISSLASH(C) ((C) == '/') ++# define IS_ABSOLUTE_PATH(P) ISSLASH ((P)[0]) ++# define IS_PATH_WITH_DIR(P) (strchr (P, '/') != NULL) ++# define FILE_SYSTEM_PREFIX_LEN(P) 0 ++#endif ++ ++ ++#ifdef __cplusplus ++} ++#endif ++ ++#endif /* _FILENAME_H */ +diff -Naur libpipeline-1.5.0-orig/gnulib/lib/float.c libpipeline-1.5.0/gnulib/lib/float.c +--- libpipeline-1.5.0-orig/gnulib/lib/float.c 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/lib/float.c 2018-07-02 13:09:59.450436200 +0300 +@@ -1,5 +1,5 @@ + /* Auxiliary definitions for . +- Copyright (C) 2011-2014 Free Software Foundation, Inc. ++ Copyright (C) 2011-2017 Free Software Foundation, Inc. + Written by Bruno Haible , 2011. + + This program is free software: you can redistribute it and/or modify +diff -Naur libpipeline-1.5.0-orig/gnulib/lib/float.in.h libpipeline-1.5.0/gnulib/lib/float.in.h +--- libpipeline-1.5.0-orig/gnulib/lib/float.in.h 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/lib/float.in.h 2018-07-02 13:09:59.450436200 +0300 +@@ -1,6 +1,6 @@ + /* A correct . + +- Copyright (C) 2007-2014 Free Software Foundation, Inc. ++ Copyright (C) 2007-2017 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 +diff -Naur libpipeline-1.5.0-orig/gnulib/lib/float+.h libpipeline-1.5.0/gnulib/lib/float+.h +--- libpipeline-1.5.0-orig/gnulib/lib/float+.h 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/lib/float+.h 2018-07-02 13:09:59.460436200 +0300 +@@ -1,5 +1,5 @@ + /* Supplemental information about the floating-point formats. +- Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc. ++ Copyright (C) 2007, 2009-2017 Free Software Foundation, Inc. + Written by Bruno Haible , 2007. + + This program is free software; you can redistribute it and/or modify +diff -Naur libpipeline-1.5.0-orig/gnulib/lib/full-write.c libpipeline-1.5.0/gnulib/lib/full-write.c +--- libpipeline-1.5.0-orig/gnulib/lib/full-write.c 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/lib/full-write.c 2018-07-02 13:09:59.460436200 +0300 +@@ -1,6 +1,6 @@ + /* An interface to read and write that retries (if necessary) until complete. + +- Copyright (C) 1993-1994, 1997-2006, 2009-2014 Free Software Foundation, Inc. ++ Copyright (C) 1993-1994, 1997-2006, 2009-2017 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 +diff -Naur libpipeline-1.5.0-orig/gnulib/lib/full-write.h libpipeline-1.5.0/gnulib/lib/full-write.h +--- libpipeline-1.5.0-orig/gnulib/lib/full-write.h 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/lib/full-write.h 2018-07-02 13:09:59.460436200 +0300 +@@ -1,6 +1,6 @@ + /* An interface to write() that writes all it is asked to write. + +- Copyright (C) 2002-2003, 2009-2014 Free Software Foundation, Inc. ++ Copyright (C) 2002-2003, 2009-2017 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 +diff -Naur libpipeline-1.5.0-orig/gnulib/lib/getprogname.c libpipeline-1.5.0/gnulib/lib/getprogname.c +--- libpipeline-1.5.0-orig/gnulib/lib/getprogname.c 1970-01-01 03:00:00.000000000 +0300 ++++ libpipeline-1.5.0/gnulib/lib/getprogname.c 2018-07-02 13:09:59.460436200 +0300 +@@ -0,0 +1,185 @@ ++/* Program name management. ++ Copyright (C) 2016-2017 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 3 of the License, 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, see . */ ++ ++#include ++ ++/* Specification. */ ++#include "getprogname.h" ++ ++#include /* get program_invocation_name declaration */ ++#include /* get __argv declaration */ ++ ++#ifdef _AIX ++# include ++# include ++# include ++#endif ++ ++#ifdef __MVS__ ++# ifndef _OPEN_SYS ++# define _OPEN_SYS ++# endif ++# include ++# include ++#endif ++ ++#ifdef __hpux ++# include ++# include ++# include ++# include ++#endif ++ ++#ifdef __sgi ++# include ++# include ++# include ++# include ++# include ++#endif ++ ++#include "dirname.h" ++ ++#ifndef HAVE_GETPROGNAME /* not Mac OS X, FreeBSD, NetBSD, OpenBSD >= 5.4, Cygwin */ ++char const * ++getprogname (void) ++{ ++# if HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME /* glibc, BeOS */ ++ /* https://www.gnu.org/software/libc/manual/html_node/Error-Messages.html */ ++ return program_invocation_short_name; ++# elif HAVE_DECL_PROGRAM_INVOCATION_NAME /* glibc, BeOS */ ++ /* https://www.gnu.org/software/libc/manual/html_node/Error-Messages.html */ ++ return last_component (program_invocation_name); ++# elif HAVE_GETEXECNAME /* Solaris */ ++ /* http://docs.oracle.com/cd/E19253-01/816-5168/6mbb3hrb1/index.html */ ++ const char *p = getexecname (); ++ if (!p) ++ p = "?"; ++ return last_component (p); ++# elif HAVE_DECL___ARGV /* mingw, MSVC */ ++ /* https://msdn.microsoft.com/en-us/library/dn727674.aspx */ ++ const char *p = __argv && __argv[0] ? __argv[0] : "?"; ++ return last_component (p); ++# elif HAVE_VAR___PROGNAME /* OpenBSD, QNX */ ++ /* http://man.openbsd.org/style.9 */ ++ /* http://www.qnx.de/developers/docs/6.5.0/index.jsp?topic=%2Fcom.qnx.doc.neutrino_lib_ref%2Fp%2F__progname.html */ ++ /* Be careful to declare this only when we absolutely need it ++ (OpenBSD 5.1), rather than when it's available. Otherwise, ++ its mere declaration makes program_invocation_short_name ++ malfunction (have zero length) with Fedora 25's glibc. */ ++ extern char *__progname; ++ const char *p = __progname; ++ return p && p[0] ? p : "?"; ++# elif _AIX /* AIX */ ++ /* Idea by Bastien ROUCARIÈS, ++ http://lists.gnu.org/archive/html/bug-gnulib/2010-12/msg00095.html ++ Reference: http:// ++ ibm.biz/knowctr#ssw_aix_53/com.ibm.aix.basetechref/doc/basetrf1/getprocs.htm ++ */ ++ static char *p; ++ static int first = 1; ++ if (first) ++ { ++ first = 0; ++ pid_t pid = getpid (); ++ struct procentry64 procs; ++ p = (0 < getprocs64 (&procs, sizeof procs, NULL, 0, &pid, 1) ++ ? strdup (procs.pi_comm) ++ : NULL); ++ if (!p) ++ p = "?"; ++ } ++ return p; ++# elif defined __hpux ++ static char *p; ++ static int first = 1; ++ if (first) ++ { ++ first = 0; ++ pid_t pid = getpid (); ++ struct pst_status status; ++ p = (0 < pstat_getproc (&status, sizeof status, 0, pid) ++ ? strdup (status.pst_ucomm) ++ : NULL); ++ if (!p) ++ p = "?"; ++ } ++ return p; ++# elif __MVS__ /* z/OS */ ++ /* https://www.ibm.com/support/knowledgecenter/SSLTBW_2.1.0/com.ibm.zos.v2r1.bpxbd00/rtwgetp.htm */ ++ static char *p = "?"; ++ static int first = 1; ++ if (first) ++ { ++ pid_t pid = getpid (); ++ int token; ++ W_PSPROC buf; ++ first = 0; ++ memset (&buf, 0, sizeof(buf)); ++ buf.ps_cmdptr = (char *) malloc (buf.ps_cmdlen = PS_CMDBLEN_LONG); ++ buf.ps_conttyptr = (char *) malloc (buf.ps_conttylen = PS_CONTTYBLEN); ++ buf.ps_pathptr = (char *) malloc (buf.ps_pathlen = PS_PATHBLEN); ++ if (buf.ps_cmdptr && buf.ps_conttyptr && buf.ps_pathptr) ++ { ++ for (token = 0; token >= 0; ++ token = w_getpsent (token, &buf, sizeof(buf))) ++ { ++ if (token > 0 && buf.ps_pid == pid) ++ { ++ char *s = strdup (last_component (buf.ps_pathptr)); ++ if (s) ++ p = s; ++ break; ++ } ++ } ++ } ++ free (buf.ps_cmdptr); ++ free (buf.ps_conttyptr); ++ free (buf.ps_pathptr); ++ } ++ return p; ++# elif defined __sgi /* IRIX */ ++ char filename[50]; ++ int fd; ++ ++ sprintf (filename, "/proc/pinfo/%d", (int) getpid ()); ++ fd = open (filename, O_RDONLY); ++ if (0 <= fd) ++ { ++ prpsinfo_t buf; ++ int ioctl_ok = 0 <= ioctl (fd, PIOCPSINFO, &buf); ++ close (fd); ++ if (ioctl_ok) ++ { ++ char *name = buf.pr_fname; ++ char *namesize = sizeof buf.pr_fname; ++ char *namenul = memchr (name, '\0', namesize); ++ size_t namelen = namenul ? namenul - name : namesize; ++ char *namecopy = malloc (namelen + 1); ++ if (namecopy) ++ { ++ namecopy[namelen] = 0; ++ return memcpy (namecopy, name, namelen); ++ } ++ } ++ } ++ return NULL; ++# else ++# error "getprogname module not ported to this OS" ++# endif ++} ++ ++#endif +diff -Naur libpipeline-1.5.0-orig/gnulib/lib/getprogname.h libpipeline-1.5.0/gnulib/lib/getprogname.h +--- libpipeline-1.5.0-orig/gnulib/lib/getprogname.h 1970-01-01 03:00:00.000000000 +0300 ++++ libpipeline-1.5.0/gnulib/lib/getprogname.h 2018-07-02 13:09:59.470436200 +0300 +@@ -0,0 +1,40 @@ ++/* Program name management. ++ Copyright (C) 2016-2017 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 3 of the License, 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, see . */ ++ ++#ifndef _GL_GETPROGNAME_H ++#define _GL_GETPROGNAME_H ++ ++#include ++ ++#ifdef __cplusplus ++extern "C" { ++#endif ++ ++/* Return the base name of the executing program. ++ On native Windows this will usually end in ".exe" or ".EXE". */ ++#ifndef HAVE_GETPROGNAME ++extern char const *getprogname (void) ++# ifdef HAVE_DECL_PROGRAM_INVOCATION_NAME ++ _GL_ATTRIBUTE_PURE ++# endif ++ ; ++#endif ++ ++#ifdef __cplusplus ++} ++#endif ++ ++#endif +diff -Naur libpipeline-1.5.0-orig/gnulib/lib/gettext.h libpipeline-1.5.0/gnulib/lib/gettext.h +--- libpipeline-1.5.0-orig/gnulib/lib/gettext.h 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/lib/gettext.h 2018-07-02 13:09:59.470436200 +0300 +@@ -1,5 +1,5 @@ + /* Convenience header for conditional use of GNU . +- Copyright (C) 1995-1998, 2000-2002, 2004-2006, 2009-2014 Free Software ++ Copyright (C) 1995-1998, 2000-2002, 2004-2006, 2009-2017 Free Software + Foundation, Inc. + + This program is free software; you can redistribute it and/or modify +@@ -18,8 +18,9 @@ + #ifndef _LIBGETTEXT_H + #define _LIBGETTEXT_H 1 + +-/* NLS can be disabled through the configure --disable-nls option. */ +-#if ENABLE_NLS ++/* NLS can be disabled through the configure --disable-nls option ++ or through "#define ENABLE NLS 0" before including this file. */ ++#if defined ENABLE_NLS && ENABLE_NLS + + /* Get declarations of GNU message catalog functions. */ + # include +@@ -225,15 +226,17 @@ + if (msg_ctxt_id != NULL) + #endif + { ++ int found_translation; + memcpy (msg_ctxt_id, msgctxt, msgctxt_len - 1); + msg_ctxt_id[msgctxt_len - 1] = '\004'; + memcpy (msg_ctxt_id + msgctxt_len, msgid, msgid_len); + translation = dcgettext (domain, msg_ctxt_id, category); ++ found_translation = (translation != msg_ctxt_id); + #if !_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS + if (msg_ctxt_id != buf) + free (msg_ctxt_id); + #endif +- if (translation != msg_ctxt_id) ++ if (found_translation) + return translation; + } + return msgid; +@@ -271,15 +274,17 @@ + if (msg_ctxt_id != NULL) + #endif + { ++ int found_translation; + memcpy (msg_ctxt_id, msgctxt, msgctxt_len - 1); + msg_ctxt_id[msgctxt_len - 1] = '\004'; + memcpy (msg_ctxt_id + msgctxt_len, msgid, msgid_len); + translation = dcngettext (domain, msg_ctxt_id, msgid_plural, n, category); ++ found_translation = !(translation == msg_ctxt_id || translation == msgid_plural); + #if !_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS + if (msg_ctxt_id != buf) + free (msg_ctxt_id); + #endif +- if (!(translation == msg_ctxt_id || translation == msgid_plural)) ++ if (found_translation) + return translation; + } + return (n == 1 ? msgid : msgid_plural); +diff -Naur libpipeline-1.5.0-orig/gnulib/lib/gettimeofday.c libpipeline-1.5.0/gnulib/lib/gettimeofday.c +--- libpipeline-1.5.0-orig/gnulib/lib/gettimeofday.c 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/lib/gettimeofday.c 2018-07-02 13:09:59.470436200 +0300 +@@ -1,6 +1,6 @@ + /* Provide gettimeofday for systems that don't have it or for which it's broken. + +- Copyright (C) 2001-2003, 2005-2007, 2009-2014 Free Software Foundation, Inc. ++ Copyright (C) 2001-2003, 2005-2007, 2009-2017 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 +@@ -24,93 +24,95 @@ + + #include + +-#if HAVE_SYS_TIMEB_H +-# include ++#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ ++# define WINDOWS_NATIVE ++# include + #endif + +-#if GETTIMEOFDAY_CLOBBERS_LOCALTIME || TZSET_CLOBBERS_LOCALTIME ++#include "localtime-buffer.h" + +-/* Work around the bug in some systems whereby gettimeofday clobbers +- the static buffer that localtime uses for its return value. The +- gettimeofday function from Mac OS X 10.0.4 (i.e., Darwin 1.3.7) has +- this problem. The tzset replacement is necessary for at least +- Solaris 2.5, 2.5.1, and 2.6. */ +- +-static struct tm tm_zero_buffer; +-static struct tm *localtime_buffer_addr = &tm_zero_buffer; +- +-# undef localtime +-extern struct tm *localtime (time_t const *); +- +-# undef gmtime +-extern struct tm *gmtime (time_t const *); +- +-/* This is a wrapper for localtime. It is used only on systems for which +- gettimeofday clobbers the static buffer used for localtime's result. ++#ifdef WINDOWS_NATIVE + +- On the first call, record the address of the static buffer that +- localtime uses for its result. */ ++/* GetSystemTimePreciseAsFileTime was introduced only in Windows 8. */ ++typedef void (WINAPI * GetSystemTimePreciseAsFileTimeFuncType) (FILETIME *lpTime); ++static GetSystemTimePreciseAsFileTimeFuncType GetSystemTimePreciseAsFileTimeFunc = NULL; ++static BOOL initialized = FALSE; + +-struct tm * +-rpl_localtime (time_t const *timep) ++static void ++initialize (void) + { +- struct tm *tm = localtime (timep); +- +- if (localtime_buffer_addr == &tm_zero_buffer) +- localtime_buffer_addr = tm; +- +- return tm; +-} +- +-/* Same as above, since gmtime and localtime use the same buffer. */ +-struct tm * +-rpl_gmtime (time_t const *timep) +-{ +- struct tm *tm = gmtime (timep); +- +- if (localtime_buffer_addr == &tm_zero_buffer) +- localtime_buffer_addr = tm; +- +- return tm; ++ HMODULE kernel32 = LoadLibrary ("kernel32.dll"); ++ if (kernel32 != NULL) ++ { ++ GetSystemTimePreciseAsFileTimeFunc = ++ (GetSystemTimePreciseAsFileTimeFuncType) GetProcAddress (kernel32, "GetSystemTimePreciseAsFileTime"); ++ } ++ initialized = TRUE; + } + +-#endif /* GETTIMEOFDAY_CLOBBERS_LOCALTIME || TZSET_CLOBBERS_LOCALTIME */ +- +-#if TZSET_CLOBBERS_LOCALTIME +- +-# undef tzset +-extern void tzset (void); +- +-/* This is a wrapper for tzset, for systems on which tzset may clobber +- the static buffer used for localtime's result. */ +-void +-rpl_tzset (void) +-{ +- /* Save and restore the contents of the buffer used for localtime's +- result around the call to tzset. */ +- struct tm save = *localtime_buffer_addr; +- tzset (); +- *localtime_buffer_addr = save; +-} + #endif + + /* This is a wrapper for gettimeofday. It is used only on systems + that lack this function, or whose implementation of this function +- causes problems. */ ++ causes problems. ++ Work around the bug in some systems whereby gettimeofday clobbers ++ the static buffer that localtime uses for its return value. The ++ gettimeofday function from Mac OS X 10.0.4 (i.e., Darwin 1.3.7) has ++ this problem. */ + + int + gettimeofday (struct timeval *restrict tv, void *restrict tz) + { + #undef gettimeofday +-#if HAVE_GETTIMEOFDAY +-# if GETTIMEOFDAY_CLOBBERS_LOCALTIME ++#ifdef WINDOWS_NATIVE ++ ++ /* On native Windows, there are two ways to get the current time: ++ GetSystemTimeAsFileTime ++ ++ or ++ GetSystemTimePreciseAsFileTime ++ . ++ GetSystemTimeAsFileTime produces values that jump by increments of ++ 15.627 milliseconds (!) on average. ++ Whereas GetSystemTimePreciseAsFileTime values usually jump by 1 or 2 ++ microseconds. ++ More discussion on this topic: ++ . */ ++ FILETIME current_time; ++ ++ if (!initialized) ++ initialize (); ++ if (GetSystemTimePreciseAsFileTimeFunc != NULL) ++ GetSystemTimePreciseAsFileTimeFunc (¤t_time); ++ else ++ GetSystemTimeAsFileTime (¤t_time); ++ ++ /* Convert from FILETIME to 'struct timeval'. */ ++ /* FILETIME: */ ++ ULONGLONG since_1601 = ++ ((ULONGLONG) current_time.dwHighDateTime << 32) ++ | (ULONGLONG) current_time.dwLowDateTime; ++ /* Between 1601-01-01 and 1970-01-01 there were 280 normal years and 89 leap ++ years, in total 134774 days. */ ++ ULONGLONG since_1970 = ++ since_1601 - (ULONGLONG) 134774 * (ULONGLONG) 86400 * (ULONGLONG) 10000000; ++ ULONGLONG microseconds_since_1970 = since_1970 / (ULONGLONG) 10; ++ tv->tv_sec = microseconds_since_1970 / (ULONGLONG) 1000000; ++ tv->tv_usec = microseconds_since_1970 % (ULONGLONG) 1000000; ++ ++ return 0; ++ ++#else ++ ++# if HAVE_GETTIMEOFDAY ++# if GETTIMEOFDAY_CLOBBERS_LOCALTIME + /* Save and restore the contents of the buffer used for localtime's + result around the call to gettimeofday. */ + struct tm save = *localtime_buffer_addr; +-# endif ++# endif + +-# if defined timeval /* 'struct timeval' overridden by gnulib? */ +-# undef timeval ++# if defined timeval /* 'struct timeval' overridden by gnulib? */ ++# undef timeval + struct timeval otv; + int result = gettimeofday (&otv, (struct timezone *) tz); + if (result == 0) +@@ -118,25 +120,16 @@ + tv->tv_sec = otv.tv_sec; + tv->tv_usec = otv.tv_usec; + } +-# else ++# else + int result = gettimeofday (tv, (struct timezone *) tz); +-# endif ++# endif + +-# if GETTIMEOFDAY_CLOBBERS_LOCALTIME ++# if GETTIMEOFDAY_CLOBBERS_LOCALTIME + *localtime_buffer_addr = save; +-# endif ++# endif + + return result; + +-#else +- +-# if HAVE__FTIME +- +- struct _timeb timebuf; +- _ftime (&timebuf); +- tv->tv_sec = timebuf.time; +- tv->tv_usec = timebuf.millitm * 1000; +- + # else + + # if !defined OK_TO_USE_1S_CLOCK +@@ -146,9 +139,8 @@ + tv->tv_sec = time (NULL); + tv->tv_usec = 0; + +-# endif +- + return 0; + ++# endif + #endif + } +diff -Naur libpipeline-1.5.0-orig/gnulib/lib/glthread/lock.c libpipeline-1.5.0/gnulib/lib/glthread/lock.c +--- libpipeline-1.5.0-orig/gnulib/lib/glthread/lock.c 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/lib/glthread/lock.c 2018-07-02 13:09:59.480436200 +0300 +@@ -1,5 +1,5 @@ + /* Locking in multithreaded situations. +- Copyright (C) 2005-2014 Free Software Foundation, Inc. ++ Copyright (C) 2005-2017 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 +@@ -30,9 +30,38 @@ + + /* ------------------------- gl_rwlock_t datatype ------------------------- */ + +-# if HAVE_PTHREAD_RWLOCK ++# if HAVE_PTHREAD_RWLOCK && (HAVE_PTHREAD_RWLOCK_RDLOCK_PREFER_WRITER || (defined PTHREAD_RWLOCK_WRITER_NONRECURSIVE_INITIALIZER_NP && (__GNU_LIBRARY__ > 1))) + +-# if !defined PTHREAD_RWLOCK_INITIALIZER ++# ifdef PTHREAD_RWLOCK_INITIALIZER ++ ++# if !HAVE_PTHREAD_RWLOCK_RDLOCK_PREFER_WRITER ++ /* glibc with bug https://sourceware.org/bugzilla/show_bug.cgi?id=13701 */ ++ ++int ++glthread_rwlock_init_for_glibc (pthread_rwlock_t *lock) ++{ ++ pthread_rwlockattr_t attributes; ++ int err; ++ ++ err = pthread_rwlockattr_init (&attributes); ++ if (err != 0) ++ return err; ++ /* Note: PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP is the only value that ++ causes the writer to be preferred. PTHREAD_RWLOCK_PREFER_WRITER_NP does not ++ do this; see ++ http://man7.org/linux/man-pages/man3/pthread_rwlockattr_setkind_np.3.html */ ++ err = pthread_rwlockattr_setkind_np (&attributes, ++ PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP); ++ if (err == 0) ++ err = pthread_rwlock_init(lock, &attributes); ++ /* pthread_rwlockattr_destroy always returns 0. It cannot influence the ++ return value. */ ++ pthread_rwlockattr_destroy (&attributes); ++ return err; ++} ++ ++# endif ++# else + + int + glthread_rwlock_init_multithreaded (gl_rwlock_t *lock) +@@ -152,11 +181,9 @@ + if (err != 0) + return err; + /* Test whether only readers are currently running, and whether the runcount +- field will not overflow. */ +- /* POSIX says: "It is implementation-defined whether the calling thread +- acquires the lock when a writer does not hold the lock and there are +- writers blocked on the lock." Let's say, no: give the writers a higher +- priority. */ ++ field will not overflow, and whether no writer is waiting. The latter ++ condition is because POSIX recommends that "write locks shall take ++ precedence over read locks", to avoid "writer starvation". */ + while (!(lock->runcount + 1 > 0 && lock->waiting_writers_count == 0)) + { + /* This thread has to wait for a while. Enqueue it among the +@@ -481,6 +508,141 @@ + + /* ------------------------- gl_rwlock_t datatype ------------------------- */ + ++# if !HAVE_PTH_RWLOCK_ACQUIRE_PREFER_WRITER ++ ++int ++glthread_rwlock_init_multithreaded (gl_rwlock_t *lock) ++{ ++ if (!pth_mutex_init (&lock->lock)) ++ return errno; ++ if (!pth_cond_init (&lock->waiting_readers)) ++ return errno; ++ if (!pth_cond_init (&lock->waiting_writers)) ++ return errno; ++ lock->waiting_writers_count = 0; ++ lock->runcount = 0; ++ lock->initialized = 1; ++ return 0; ++} ++ ++int ++glthread_rwlock_rdlock_multithreaded (gl_rwlock_t *lock) ++{ ++ if (!lock->initialized) ++ glthread_rwlock_init_multithreaded (lock); ++ if (!pth_mutex_acquire (&lock->lock, 0, NULL)) ++ return errno; ++ /* Test whether only readers are currently running, and whether the runcount ++ field will not overflow, and whether no writer is waiting. The latter ++ condition is because POSIX recommends that "write locks shall take ++ precedence over read locks", to avoid "writer starvation". */ ++ while (!(lock->runcount + 1 > 0 && lock->waiting_writers_count == 0)) ++ { ++ /* This thread has to wait for a while. Enqueue it among the ++ waiting_readers. */ ++ if (!pth_cond_await (&lock->waiting_readers, &lock->lock, NULL)) ++ { ++ int err = errno; ++ pth_mutex_release (&lock->lock); ++ return err; ++ } ++ } ++ lock->runcount++; ++ return (!pth_mutex_release (&lock->lock) ? errno : 0); ++} ++ ++int ++glthread_rwlock_wrlock_multithreaded (gl_rwlock_t *lock) ++{ ++ if (!lock->initialized) ++ glthread_rwlock_init_multithreaded (lock); ++ if (!pth_mutex_acquire (&lock->lock, 0, NULL)) ++ return errno; ++ /* Test whether no readers or writers are currently running. */ ++ while (!(lock->runcount == 0)) ++ { ++ /* This thread has to wait for a while. Enqueue it among the ++ waiting_writers. */ ++ lock->waiting_writers_count++; ++ if (!pth_cond_await (&lock->waiting_writers, &lock->lock, NULL)) ++ { ++ int err = errno; ++ lock->waiting_writers_count--; ++ pth_mutex_release (&lock->lock); ++ return err; ++ } ++ lock->waiting_writers_count--; ++ } ++ lock->runcount--; /* runcount becomes -1 */ ++ return (!pth_mutex_release (&lock->lock) ? errno : 0); ++} ++ ++int ++glthread_rwlock_unlock_multithreaded (gl_rwlock_t *lock) ++{ ++ int err; ++ ++ if (!lock->initialized) ++ return EINVAL; ++ if (!pth_mutex_acquire (&lock->lock, 0, NULL)) ++ return errno; ++ if (lock->runcount < 0) ++ { ++ /* Drop a writer lock. */ ++ if (!(lock->runcount == -1)) ++ { ++ pth_mutex_release (&lock->lock); ++ return EINVAL; ++ } ++ lock->runcount = 0; ++ } ++ else ++ { ++ /* Drop a reader lock. */ ++ if (!(lock->runcount > 0)) ++ { ++ pth_mutex_release (&lock->lock); ++ return EINVAL; ++ } ++ lock->runcount--; ++ } ++ if (lock->runcount == 0) ++ { ++ /* POSIX recommends that "write locks shall take precedence over read ++ locks", to avoid "writer starvation". */ ++ if (lock->waiting_writers_count > 0) ++ { ++ /* Wake up one of the waiting writers. */ ++ if (!pth_cond_notify (&lock->waiting_writers, FALSE)) ++ { ++ int err = errno; ++ pth_mutex_release (&lock->lock); ++ return err; ++ } ++ } ++ else ++ { ++ /* Wake up all waiting readers. */ ++ if (!pth_cond_notify (&lock->waiting_readers, TRUE)) ++ { ++ int err = errno; ++ pth_mutex_release (&lock->lock); ++ return err; ++ } ++ } ++ } ++ return (!pth_mutex_release (&lock->lock) ? errno : 0); ++} ++ ++int ++glthread_rwlock_destroy_multithreaded (gl_rwlock_t *lock) ++{ ++ lock->initialized = 0; ++ return 0; ++} ++ ++# endif ++ + /* --------------------- gl_recursive_lock_t datatype --------------------- */ + + /* -------------------------- gl_once_t datatype -------------------------- */ +@@ -796,8 +958,10 @@ + } + EnterCriticalSection (&lock->lock); + /* Test whether only readers are currently running, and whether the runcount +- field will not overflow. */ +- if (!(lock->runcount + 1 > 0)) ++ field will not overflow, and whether no writer is waiting. The latter ++ condition is because POSIX recommends that "write locks shall take ++ precedence over read locks", to avoid "writer starvation". */ ++ if (!(lock->runcount + 1 > 0 && lock->waiting_writers.count == 0)) + { + /* This thread has to wait for a while. Enqueue it among the + waiting_readers. */ +diff -Naur libpipeline-1.5.0-orig/gnulib/lib/glthread/lock.h libpipeline-1.5.0/gnulib/lib/glthread/lock.h +--- libpipeline-1.5.0-orig/gnulib/lib/glthread/lock.h 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/lib/glthread/lock.h 2018-07-02 13:09:59.480436200 +0300 +@@ -1,5 +1,5 @@ + /* Locking in multithreaded situations. +- Copyright (C) 2005-2014 Free Software Foundation, Inc. ++ Copyright (C) 2005-2017 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 +@@ -139,6 +139,11 @@ + # pragma weak pthread_mutexattr_init + # pragma weak pthread_mutexattr_settype + # pragma weak pthread_mutexattr_destroy ++# pragma weak pthread_rwlockattr_init ++# if __GNU_LIBRARY__ > 1 ++# pragma weak pthread_rwlockattr_setkind_np ++# endif ++# pragma weak pthread_rwlockattr_destroy + # ifndef pthread_self + # pragma weak pthread_self + # endif +@@ -176,7 +181,7 @@ + + /* ------------------------- gl_rwlock_t datatype ------------------------- */ + +-# if HAVE_PTHREAD_RWLOCK ++# if HAVE_PTHREAD_RWLOCK && (HAVE_PTHREAD_RWLOCK_RDLOCK_PREFER_WRITER || (defined PTHREAD_RWLOCK_WRITER_NONRECURSIVE_INITIALIZER_NP && (__GNU_LIBRARY__ > 1))) + + # ifdef PTHREAD_RWLOCK_INITIALIZER + +@@ -185,10 +190,18 @@ + STORAGECLASS pthread_rwlock_t NAME; + # define gl_rwlock_define_initialized(STORAGECLASS, NAME) \ + STORAGECLASS pthread_rwlock_t NAME = gl_rwlock_initializer; +-# define gl_rwlock_initializer \ +- PTHREAD_RWLOCK_INITIALIZER +-# define glthread_rwlock_init(LOCK) \ +- (pthread_in_use () ? pthread_rwlock_init (LOCK, NULL) : 0) ++# if HAVE_PTHREAD_RWLOCK_RDLOCK_PREFER_WRITER ++# define gl_rwlock_initializer \ ++ PTHREAD_RWLOCK_INITIALIZER ++# define glthread_rwlock_init(LOCK) \ ++ (pthread_in_use () ? pthread_rwlock_init (LOCK, NULL) : 0) ++# else /* glibc with bug https://sourceware.org/bugzilla/show_bug.cgi?id=13701 */ ++# define gl_rwlock_initializer \ ++ PTHREAD_RWLOCK_WRITER_NONRECURSIVE_INITIALIZER_NP ++# define glthread_rwlock_init(LOCK) \ ++ (pthread_in_use () ? glthread_rwlock_init_for_glibc (LOCK) : 0) ++extern int glthread_rwlock_init_for_glibc (pthread_rwlock_t *lock); ++# endif + # define glthread_rwlock_rdlock(LOCK) \ + (pthread_in_use () ? pthread_rwlock_rdlock (LOCK) : 0) + # define glthread_rwlock_wrlock(LOCK) \ +@@ -427,6 +440,9 @@ + + /* ------------------------- gl_rwlock_t datatype ------------------------- */ + ++/* Pth pth_rwlock_acquire always prefers readers. No autoconf test so far. */ ++# if HAVE_PTH_RWLOCK_ACQUIRE_PREFER_WRITER ++ + typedef pth_rwlock_t gl_rwlock_t; + # define gl_rwlock_define(STORAGECLASS, NAME) \ + STORAGECLASS pth_rwlock_t NAME; +@@ -445,6 +461,42 @@ + # define glthread_rwlock_destroy(LOCK) \ + ((void)(LOCK), 0) + ++# else ++ ++typedef struct ++ { ++ int initialized; ++ pth_mutex_t lock; /* protects the remaining fields */ ++ pth_cond_t waiting_readers; /* waiting readers */ ++ pth_cond_t waiting_writers; /* waiting writers */ ++ unsigned int waiting_writers_count; /* number of waiting writers */ ++ int runcount; /* number of readers running, or -1 when a writer runs */ ++ } ++ gl_rwlock_t; ++# define gl_rwlock_define(STORAGECLASS, NAME) \ ++ STORAGECLASS gl_rwlock_t NAME; ++# define gl_rwlock_define_initialized(STORAGECLASS, NAME) \ ++ STORAGECLASS gl_rwlock_t NAME = gl_rwlock_initializer; ++# define gl_rwlock_initializer \ ++ { 0 } ++# define glthread_rwlock_init(LOCK) \ ++ (pth_in_use () ? glthread_rwlock_init_multithreaded (LOCK) : 0) ++# define glthread_rwlock_rdlock(LOCK) \ ++ (pth_in_use () ? glthread_rwlock_rdlock_multithreaded (LOCK) : 0) ++# define glthread_rwlock_wrlock(LOCK) \ ++ (pth_in_use () ? glthread_rwlock_wrlock_multithreaded (LOCK) : 0) ++# define glthread_rwlock_unlock(LOCK) \ ++ (pth_in_use () ? glthread_rwlock_unlock_multithreaded (LOCK) : 0) ++# define glthread_rwlock_destroy(LOCK) \ ++ (pth_in_use () ? glthread_rwlock_destroy_multithreaded (LOCK) : 0) ++extern int glthread_rwlock_init_multithreaded (gl_rwlock_t *lock); ++extern int glthread_rwlock_rdlock_multithreaded (gl_rwlock_t *lock); ++extern int glthread_rwlock_wrlock_multithreaded (gl_rwlock_t *lock); ++extern int glthread_rwlock_unlock_multithreaded (gl_rwlock_t *lock); ++extern int glthread_rwlock_destroy_multithreaded (gl_rwlock_t *lock); ++ ++# endif ++ + /* --------------------- gl_recursive_lock_t datatype --------------------- */ + + /* In Pth, mutexes are recursive by default. */ +diff -Naur libpipeline-1.5.0-orig/gnulib/lib/glthread/threadlib.c libpipeline-1.5.0/gnulib/lib/glthread/threadlib.c +--- libpipeline-1.5.0-orig/gnulib/lib/glthread/threadlib.c 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/lib/glthread/threadlib.c 2018-07-02 13:09:59.480436200 +0300 +@@ -1,5 +1,5 @@ + /* Multithreading primitives. +- Copyright (C) 2005-2014 Free Software Foundation, Inc. ++ Copyright (C) 2005-2017 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 +diff -Naur libpipeline-1.5.0-orig/gnulib/lib/glthread/tls.c libpipeline-1.5.0/gnulib/lib/glthread/tls.c +--- libpipeline-1.5.0-orig/gnulib/lib/glthread/tls.c 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/lib/glthread/tls.c 2018-07-02 13:09:59.490436300 +0300 +@@ -1,5 +1,5 @@ + /* Thread-local storage in multithreaded situations. +- Copyright (C) 2005-2014 Free Software Foundation, Inc. ++ Copyright (C) 2005-2017 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 +diff -Naur libpipeline-1.5.0-orig/gnulib/lib/glthread/tls.h libpipeline-1.5.0/gnulib/lib/glthread/tls.h +--- libpipeline-1.5.0-orig/gnulib/lib/glthread/tls.h 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/lib/glthread/tls.h 2018-07-02 13:09:59.490436300 +0300 +@@ -1,5 +1,5 @@ + /* Thread-local storage in multithreaded situations. +- Copyright (C) 2005, 2007-2014 Free Software Foundation, Inc. ++ Copyright (C) 2005, 2007-2017 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 +diff -Naur libpipeline-1.5.0-orig/gnulib/lib/intprops.h libpipeline-1.5.0/gnulib/lib/intprops.h +--- libpipeline-1.5.0-orig/gnulib/lib/intprops.h 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/lib/intprops.h 2018-07-02 13:09:59.500436300 +0300 +@@ -1,10 +1,10 @@ + /* intprops.h -- properties of integer types + +- Copyright (C) 2001-2005, 2009-2014 Free Software Foundation, Inc. ++ Copyright (C) 2001-2017 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 3 of the License, or ++ 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 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, +@@ -22,8 +22,7 @@ + + #include + +-/* Return an integer value, converted to the same type as the integer +- expression E after integer type promotion. V is the unconverted value. */ ++/* Return a value with the common real type of E and V and the value of V. */ + #define _GL_INT_CONVERT(e, v) (0 * (e) + (v)) + + /* Act like _GL_INT_CONVERT (E, -V) but work around a bug in IRIX 6.5 cc; see +@@ -37,59 +36,55 @@ + an integer. */ + #define TYPE_IS_INTEGER(t) ((t) 1.5 == 1) + +-/* True if negative values of the signed integer type T use two's +- complement, ones' complement, or signed magnitude representation, +- respectively. Much GNU code assumes two's complement, but some +- people like to be portable to all possible C hosts. */ +-#define TYPE_TWOS_COMPLEMENT(t) ((t) ~ (t) 0 == (t) -1) +-#define TYPE_ONES_COMPLEMENT(t) ((t) ~ (t) 0 == 0) +-#define TYPE_SIGNED_MAGNITUDE(t) ((t) ~ (t) 0 < (t) -1) +- +-/* True if the signed integer expression E uses two's complement. */ +-#define _GL_INT_TWOS_COMPLEMENT(e) (~ _GL_INT_CONVERT (e, 0) == -1) +- +-/* True if the arithmetic type T is signed. */ ++/* True if the real type T is signed. */ + #define TYPE_SIGNED(t) (! ((t) 0 < (t) -1)) + +-/* Return 1 if the integer expression E, after integer promotion, has +- a signed type. */ +-#define _GL_INT_SIGNED(e) (_GL_INT_NEGATE_CONVERT (e, 1) < 0) ++/* Return 1 if the real expression E, after promotion, has a ++ signed or floating type. */ ++#define EXPR_SIGNED(e) (_GL_INT_NEGATE_CONVERT (e, 1) < 0) + + +-/* Minimum and maximum values for integer types and expressions. These +- macros have undefined behavior if T is signed and has padding bits. +- If this is a problem for you, please let us know how to fix it for +- your host. */ ++/* Minimum and maximum values for integer types and expressions. */ ++ ++/* The width in bits of the integer type or expression T. ++ Padding bits are not supported; this is checked at compile-time below. */ ++#define TYPE_WIDTH(t) (sizeof (t) * CHAR_BIT) + + /* The maximum and minimum values for the integer type T. */ +-#define TYPE_MINIMUM(t) \ +- ((t) (! TYPE_SIGNED (t) \ +- ? (t) 0 \ +- : TYPE_SIGNED_MAGNITUDE (t) \ +- ? ~ (t) 0 \ +- : ~ TYPE_MAXIMUM (t))) ++#define TYPE_MINIMUM(t) ((t) ~ TYPE_MAXIMUM (t)) + #define TYPE_MAXIMUM(t) \ + ((t) (! TYPE_SIGNED (t) \ + ? (t) -1 \ +- : ((((t) 1 << (sizeof (t) * CHAR_BIT - 2)) - 1) * 2 + 1))) ++ : ((((t) 1 << (TYPE_WIDTH (t) - 2)) - 1) * 2 + 1))) + + /* The maximum and minimum values for the type of the expression E, + after integer promotion. E should not have side effects. */ + #define _GL_INT_MINIMUM(e) \ +- (_GL_INT_SIGNED (e) \ +- ? - _GL_INT_TWOS_COMPLEMENT (e) - _GL_SIGNED_INT_MAXIMUM (e) \ ++ (EXPR_SIGNED (e) \ ++ ? ~ _GL_SIGNED_INT_MAXIMUM (e) \ + : _GL_INT_CONVERT (e, 0)) + #define _GL_INT_MAXIMUM(e) \ +- (_GL_INT_SIGNED (e) \ ++ (EXPR_SIGNED (e) \ + ? _GL_SIGNED_INT_MAXIMUM (e) \ + : _GL_INT_NEGATE_CONVERT (e, 1)) + #define _GL_SIGNED_INT_MAXIMUM(e) \ +- (((_GL_INT_CONVERT (e, 1) << (sizeof ((e) + 0) * CHAR_BIT - 2)) - 1) * 2 + 1) ++ (((_GL_INT_CONVERT (e, 1) << (TYPE_WIDTH ((e) + 0) - 2)) - 1) * 2 + 1) + ++/* Work around OpenVMS incompatibility with C99. */ ++#if !defined LLONG_MAX && defined __INT64_MAX ++# define LLONG_MAX __INT64_MAX ++# define LLONG_MIN __INT64_MIN ++#endif ++ ++/* This include file assumes that signed types are two's complement without ++ padding bits; the above macros have undefined behavior otherwise. ++ If this is a problem for you, please let us know how to fix it for your host. ++ This assumption is tested by the intprops-tests module. */ + +-/* Return 1 if the __typeof__ keyword works. This could be done by ++/* Does the __typeof__ keyword work? This could be done by + 'configure', but for now it's easier to do it by hand. */ +-#if (2 <= __GNUC__ || defined __IBM__TYPEOF__ \ ++#if (2 <= __GNUC__ \ ++ || (1210 <= __IBMC__ && defined __IBM__TYPEOF__) \ + || (0x5110 <= __SUNPRO_C && !__STDC__)) + # define _GL_HAVE___TYPEOF__ 1 + #else +@@ -118,8 +113,7 @@ + signed, this macro may overestimate the true bound by one byte when + applied to unsigned types of size 2, 4, 16, ... bytes. */ + #define INT_STRLEN_BOUND(t) \ +- (INT_BITS_STRLEN_BOUND (sizeof (t) * CHAR_BIT \ +- - _GL_SIGNED_TYPE_OR_EXPR (t)) \ ++ (INT_BITS_STRLEN_BOUND (TYPE_WIDTH (t) - _GL_SIGNED_TYPE_OR_EXPR (t)) \ + + _GL_SIGNED_TYPE_OR_EXPR (t)) + + /* Bound on buffer size needed to represent an integer type or expression T, +@@ -224,24 +218,38 @@ + ? (a) < (min) >> (b) \ + : (max) >> (b) < (a)) + ++/* True if __builtin_add_overflow (A, B, P) works when P is non-null. */ ++#define _GL_HAS_BUILTIN_OVERFLOW (5 <= __GNUC__) ++ ++/* True if __builtin_add_overflow_p (A, B, C) works. */ ++#define _GL_HAS_BUILTIN_OVERFLOW_P (7 <= __GNUC__) + + /* The _GL*_OVERFLOW macros have the same restrictions as the + *_RANGE_OVERFLOW macros, except that they do not assume that operands + (e.g., A and B) have the same type as MIN and MAX. Instead, they assume + that the result (e.g., A + B) has that type. */ +-#define _GL_ADD_OVERFLOW(a, b, min, max) \ +- ((min) < 0 ? INT_ADD_RANGE_OVERFLOW (a, b, min, max) \ +- : (a) < 0 ? (b) <= (a) + (b) \ +- : (b) < 0 ? (a) <= (a) + (b) \ +- : (a) + (b) < (b)) +-#define _GL_SUBTRACT_OVERFLOW(a, b, min, max) \ +- ((min) < 0 ? INT_SUBTRACT_RANGE_OVERFLOW (a, b, min, max) \ +- : (a) < 0 ? 1 \ +- : (b) < 0 ? (a) - (b) <= (a) \ +- : (a) < (b)) +-#define _GL_MULTIPLY_OVERFLOW(a, b, min, max) \ +- (((min) == 0 && (((a) < 0 && 0 < (b)) || ((b) < 0 && 0 < (a)))) \ +- || INT_MULTIPLY_RANGE_OVERFLOW (a, b, min, max)) ++#if _GL_HAS_BUILTIN_OVERFLOW_P ++# define _GL_ADD_OVERFLOW(a, b, min, max) \ ++ __builtin_add_overflow_p (a, b, (__typeof__ ((a) + (b))) 0) ++# define _GL_SUBTRACT_OVERFLOW(a, b, min, max) \ ++ __builtin_sub_overflow_p (a, b, (__typeof__ ((a) - (b))) 0) ++# define _GL_MULTIPLY_OVERFLOW(a, b, min, max) \ ++ __builtin_mul_overflow_p (a, b, (__typeof__ ((a) * (b))) 0) ++#else ++# define _GL_ADD_OVERFLOW(a, b, min, max) \ ++ ((min) < 0 ? INT_ADD_RANGE_OVERFLOW (a, b, min, max) \ ++ : (a) < 0 ? (b) <= (a) + (b) \ ++ : (b) < 0 ? (a) <= (a) + (b) \ ++ : (a) + (b) < (b)) ++# define _GL_SUBTRACT_OVERFLOW(a, b, min, max) \ ++ ((min) < 0 ? INT_SUBTRACT_RANGE_OVERFLOW (a, b, min, max) \ ++ : (a) < 0 ? 1 \ ++ : (b) < 0 ? (a) - (b) <= (a) \ ++ : (a) < (b)) ++# define _GL_MULTIPLY_OVERFLOW(a, b, min, max) \ ++ (((min) == 0 && (((a) < 0 && 0 < (b)) || ((b) < 0 && 0 < (a)))) \ ++ || INT_MULTIPLY_RANGE_OVERFLOW (a, b, min, max)) ++#endif + #define _GL_DIVIDE_OVERFLOW(a, b, min, max) \ + ((min) < 0 ? (b) == _GL_INT_NEGATE_CONVERT (min, 1) && (a) < - (max) \ + : (a) < 0 ? (b) <= (a) + (b) - 1 \ +@@ -263,22 +271,29 @@ + : (a) % - (b)) \ + == 0) + +- +-/* Integer overflow checks. ++/* Check for integer overflow, and report low order bits of answer. + + The INT__OVERFLOW macros return 1 if the corresponding C operators + might not yield numerically correct answers due to arithmetic overflow. +- They work correctly on all known practical hosts, and do not rely ++ The INT__WRAPV macros also store the low-order bits of the answer. ++ These macros work correctly on all known practical hosts, and do not rely + on undefined behavior due to signed arithmetic overflow. + +- Example usage: ++ Example usage, assuming A and B are long int: + +- long int i = ...; +- long int j = ...; +- if (INT_MULTIPLY_OVERFLOW (i, j)) +- printf ("multiply would overflow"); ++ if (INT_MULTIPLY_OVERFLOW (a, b)) ++ printf ("result would overflow\n"); + else +- printf ("product is %ld", i * j); ++ printf ("result is %ld (no overflow)\n", a * b); ++ ++ Example usage with WRAPV flavor: ++ ++ long int result; ++ bool overflow = INT_MULTIPLY_WRAPV (a, b, &result); ++ printf ("result is %ld (%s)\n", result, ++ overflow ? "after overflow" : "no overflow"); ++ ++ Restrictions on these macros: + + These macros do not check for all possible numerical problems or + undefined or unspecified behavior: they do not check for division +@@ -287,6 +302,9 @@ + These macros may evaluate their arguments zero or multiple times, so the + arguments should not have side effects. + ++ The WRAPV macros are not constant expressions. They support only ++ +, binary -, and *. The result type must be signed. ++ + These macros are tuned for their last argument being a constant. + + Return 1 if the integer expressions A * B, A - B, -A, A * B, A / B, +@@ -296,8 +314,12 @@ + _GL_BINARY_OP_OVERFLOW (a, b, _GL_ADD_OVERFLOW) + #define INT_SUBTRACT_OVERFLOW(a, b) \ + _GL_BINARY_OP_OVERFLOW (a, b, _GL_SUBTRACT_OVERFLOW) +-#define INT_NEGATE_OVERFLOW(a) \ +- INT_NEGATE_RANGE_OVERFLOW (a, _GL_INT_MINIMUM (a), _GL_INT_MAXIMUM (a)) ++#if _GL_HAS_BUILTIN_OVERFLOW_P ++# define INT_NEGATE_OVERFLOW(a) INT_SUBTRACT_OVERFLOW (0, a) ++#else ++# define INT_NEGATE_OVERFLOW(a) \ ++ INT_NEGATE_RANGE_OVERFLOW (a, _GL_INT_MINIMUM (a), _GL_INT_MAXIMUM (a)) ++#endif + #define INT_MULTIPLY_OVERFLOW(a, b) \ + _GL_BINARY_OP_OVERFLOW (a, b, _GL_MULTIPLY_OVERFLOW) + #define INT_DIVIDE_OVERFLOW(a, b) \ +@@ -317,4 +339,111 @@ + _GL_INT_MINIMUM (0 * (b) + (a)), \ + _GL_INT_MAXIMUM (0 * (b) + (a))) + ++/* Store the low-order bits of A + B, A - B, A * B, respectively, into *R. ++ Return 1 if the result overflows. See above for restrictions. */ ++#define INT_ADD_WRAPV(a, b, r) \ ++ _GL_INT_OP_WRAPV (a, b, r, +, __builtin_add_overflow, INT_ADD_OVERFLOW) ++#define INT_SUBTRACT_WRAPV(a, b, r) \ ++ _GL_INT_OP_WRAPV (a, b, r, -, __builtin_sub_overflow, INT_SUBTRACT_OVERFLOW) ++#define INT_MULTIPLY_WRAPV(a, b, r) \ ++ _GL_INT_OP_WRAPV (a, b, r, *, __builtin_mul_overflow, INT_MULTIPLY_OVERFLOW) ++ ++/* Nonzero if this compiler has GCC bug 68193 or Clang bug 25390. See: ++ https://gcc.gnu.org/bugzilla/show_bug.cgi?id=68193 ++ https://llvm.org/bugs/show_bug.cgi?id=25390 ++ For now, assume all versions of GCC-like compilers generate bogus ++ warnings for _Generic. This matters only for older compilers that ++ lack __builtin_add_overflow. */ ++#if __GNUC__ ++# define _GL__GENERIC_BOGUS 1 ++#else ++# define _GL__GENERIC_BOGUS 0 ++#endif ++ ++/* Store the low-order bits of A B into *R, where OP specifies ++ the operation. BUILTIN is the builtin operation, and OVERFLOW the ++ overflow predicate. Return 1 if the result overflows. See above ++ for restrictions. */ ++#if _GL_HAS_BUILTIN_OVERFLOW ++# define _GL_INT_OP_WRAPV(a, b, r, op, builtin, overflow) builtin (a, b, r) ++#elif 201112 <= __STDC_VERSION__ && !_GL__GENERIC_BOGUS ++# define _GL_INT_OP_WRAPV(a, b, r, op, builtin, overflow) \ ++ (_Generic \ ++ (*(r), \ ++ signed char: \ ++ _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \ ++ signed char, SCHAR_MIN, SCHAR_MAX), \ ++ short int: \ ++ _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \ ++ short int, SHRT_MIN, SHRT_MAX), \ ++ int: \ ++ _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \ ++ int, INT_MIN, INT_MAX), \ ++ long int: \ ++ _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned long int, \ ++ long int, LONG_MIN, LONG_MAX), \ ++ long long int: \ ++ _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned long long int, \ ++ long long int, LLONG_MIN, LLONG_MAX))) ++#else ++# define _GL_INT_OP_WRAPV(a, b, r, op, builtin, overflow) \ ++ (sizeof *(r) == sizeof (signed char) \ ++ ? _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \ ++ signed char, SCHAR_MIN, SCHAR_MAX) \ ++ : sizeof *(r) == sizeof (short int) \ ++ ? _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \ ++ short int, SHRT_MIN, SHRT_MAX) \ ++ : sizeof *(r) == sizeof (int) \ ++ ? _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \ ++ int, INT_MIN, INT_MAX) \ ++ : _GL_INT_OP_WRAPV_LONGISH(a, b, r, op, overflow)) ++# ifdef LLONG_MAX ++# define _GL_INT_OP_WRAPV_LONGISH(a, b, r, op, overflow) \ ++ (sizeof *(r) == sizeof (long int) \ ++ ? _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned long int, \ ++ long int, LONG_MIN, LONG_MAX) \ ++ : _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned long long int, \ ++ long long int, LLONG_MIN, LLONG_MAX)) ++# else ++# define _GL_INT_OP_WRAPV_LONGISH(a, b, r, op, overflow) \ ++ _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned long int, \ ++ long int, LONG_MIN, LONG_MAX) ++# endif ++#endif ++ ++/* Store the low-order bits of A B into *R, where the operation ++ is given by OP. Use the unsigned type UT for calculation to avoid ++ overflow problems. *R's type is T, with extrema TMIN and TMAX. ++ T must be a signed integer type. Return 1 if the result overflows. */ ++#define _GL_INT_OP_CALC(a, b, r, op, overflow, ut, t, tmin, tmax) \ ++ (sizeof ((a) op (b)) < sizeof (t) \ ++ ? _GL_INT_OP_CALC1 ((t) (a), (t) (b), r, op, overflow, ut, t, tmin, tmax) \ ++ : _GL_INT_OP_CALC1 (a, b, r, op, overflow, ut, t, tmin, tmax)) ++#define _GL_INT_OP_CALC1(a, b, r, op, overflow, ut, t, tmin, tmax) \ ++ ((overflow (a, b) \ ++ || (EXPR_SIGNED ((a) op (b)) && ((a) op (b)) < (tmin)) \ ++ || (tmax) < ((a) op (b))) \ ++ ? (*(r) = _GL_INT_OP_WRAPV_VIA_UNSIGNED (a, b, op, ut, t), 1) \ ++ : (*(r) = _GL_INT_OP_WRAPV_VIA_UNSIGNED (a, b, op, ut, t), 0)) ++ ++/* Return the low-order bits of A B, where the operation is given ++ by OP. Use the unsigned type UT for calculation to avoid undefined ++ behavior on signed integer overflow, and convert the result to type T. ++ UT is at least as wide as T and is no narrower than unsigned int, ++ T is two's complement, and there is no padding or trap representations. ++ Assume that converting UT to T yields the low-order bits, as is ++ done in all known two's-complement C compilers. E.g., see: ++ https://gcc.gnu.org/onlinedocs/gcc/Integers-implementation.html ++ ++ According to the C standard, converting UT to T yields an ++ implementation-defined result or signal for values outside T's ++ range. However, code that works around this theoretical problem ++ runs afoul of a compiler bug in Oracle Studio 12.3 x86. See: ++ http://lists.gnu.org/archive/html/bug-gnulib/2017-04/msg00049.html ++ As the compiler bug is real, don't try to work around the ++ theoretical problem. */ ++ ++#define _GL_INT_OP_WRAPV_VIA_UNSIGNED(a, b, op, ut, t) \ ++ ((t) ((ut) (a) op (ut) (b))) ++ + #endif /* _GL_INTPROPS_H */ +diff -Naur libpipeline-1.5.0-orig/gnulib/lib/itold.c libpipeline-1.5.0/gnulib/lib/itold.c +--- libpipeline-1.5.0-orig/gnulib/lib/itold.c 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/lib/itold.c 2018-07-02 13:09:59.500436300 +0300 +@@ -1,5 +1,5 @@ + /* Replacement for 'int' to 'long double' conversion routine. +- Copyright (C) 2011-2014 Free Software Foundation, Inc. ++ Copyright (C) 2011-2017 Free Software Foundation, Inc. + Written by Bruno Haible , 2011. + + This program is free software: you can redistribute it and/or modify +diff -Naur libpipeline-1.5.0-orig/gnulib/lib/limits.in.h libpipeline-1.5.0/gnulib/lib/limits.in.h +--- libpipeline-1.5.0-orig/gnulib/lib/limits.in.h 1970-01-01 03:00:00.000000000 +0300 ++++ libpipeline-1.5.0/gnulib/lib/limits.in.h 2018-07-02 13:09:59.500436300 +0300 +@@ -0,0 +1,74 @@ ++/* A GNU-like . ++ ++ Copyright 2016-2017 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 3, 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, see . */ ++ ++#ifndef _@GUARD_PREFIX@_LIMITS_H ++ ++#if __GNUC__ >= 3 ++@PRAGMA_SYSTEM_HEADER@ ++#endif ++@PRAGMA_COLUMNS@ ++ ++/* The include_next requires a split double-inclusion guard. */ ++#@INCLUDE_NEXT@ @NEXT_LIMITS_H@ ++ ++#ifndef _@GUARD_PREFIX@_LIMITS_H ++#define _@GUARD_PREFIX@_LIMITS_H ++ ++/* For HP-UX 11.31. */ ++#if defined LONG_LONG_MIN && !defined LLONG_MIN ++# define LLONG_MIN LONG_LONG_MIN ++#endif ++#if defined LONG_LONG_MAX && !defined LLONG_MAX ++# define LLONG_MAX LONG_LONG_MAX ++#endif ++#if defined ULONG_LONG_MAX && !defined ULLONG_MAX ++# define ULLONG_MAX ULONG_LONG_MAX ++#endif ++ ++/* The number of usable bits in an unsigned or signed integer type ++ with minimum value MIN and maximum value MAX, as an int expression ++ suitable in #if. Cover all known practical hosts. This ++ implementation exploits the fact that MAX is 1 less than a power of ++ 2, and merely counts the number of 1 bits in MAX; "COBn" means ++ "count the number of 1 bits in the low-order n bits"). */ ++#define _GL_INTEGER_WIDTH(min, max) (((min) < 0) + _GL_COB128 (max)) ++#define _GL_COB128(n) (_GL_COB64 ((n) >> 31 >> 31 >> 2) + _GL_COB64 (n)) ++#define _GL_COB64(n) (_GL_COB32 ((n) >> 31 >> 1) + _GL_COB32 (n)) ++#define _GL_COB32(n) (_GL_COB16 ((n) >> 16) + _GL_COB16 (n)) ++#define _GL_COB16(n) (_GL_COB8 ((n) >> 8) + _GL_COB8 (n)) ++#define _GL_COB8(n) (_GL_COB4 ((n) >> 4) + _GL_COB4 (n)) ++#define _GL_COB4(n) (!!((n) & 8) + !!((n) & 4) + !!((n) & 2) + !!((n) & 1)) ++ ++/* Macros specified by ISO/IEC TS 18661-1:2014. */ ++ ++#if (! defined ULLONG_WIDTH \ ++ && (defined _GNU_SOURCE || defined __STDC_WANT_IEC_60559_BFP_EXT__)) ++# define CHAR_WIDTH _GL_INTEGER_WIDTH (CHAR_MIN, CHAR_MAX) ++# define SCHAR_WIDTH _GL_INTEGER_WIDTH (SCHAR_MIN, SCHAR_MAX) ++# define UCHAR_WIDTH _GL_INTEGER_WIDTH (0, UCHAR_MAX) ++# define SHRT_WIDTH _GL_INTEGER_WIDTH (SHRT_MIN, SHRT_MAX) ++# define USHRT_WIDTH _GL_INTEGER_WIDTH (0, USHRT_MAX) ++# define INT_WIDTH _GL_INTEGER_WIDTH (INT_MIN, INT_MAX) ++# define UINT_WIDTH _GL_INTEGER_WIDTH (0, UINT_MAX) ++# define LONG_WIDTH _GL_INTEGER_WIDTH (LONG_MIN, LONG_MAX) ++# define ULONG_WIDTH _GL_INTEGER_WIDTH (0, ULONG_MAX) ++# define LLONG_WIDTH _GL_INTEGER_WIDTH (LLONG_MIN, LLONG_MAX) ++# define ULLONG_WIDTH _GL_INTEGER_WIDTH (0, ULLONG_MAX) ++#endif /* !ULLONG_WIDTH && (_GNU_SOURCE || __STDC_WANT_IEC_60559_BFP_EXT__) */ ++ ++#endif /* _@GUARD_PREFIX@_LIMITS_H */ ++#endif /* _@GUARD_PREFIX@_LIMITS_H */ +diff -Naur libpipeline-1.5.0-orig/gnulib/lib/localtime-buffer.c libpipeline-1.5.0/gnulib/lib/localtime-buffer.c +--- libpipeline-1.5.0-orig/gnulib/lib/localtime-buffer.c 1970-01-01 03:00:00.000000000 +0300 ++++ libpipeline-1.5.0/gnulib/lib/localtime-buffer.c 2018-07-02 13:09:59.500436300 +0300 +@@ -0,0 +1,58 @@ ++/* Provide access to the last buffer returned by localtime() or gmtime(). ++ ++ Copyright (C) 2001-2003, 2005-2007, 2009-2017 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 3, 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, see . */ ++ ++/* written by Jim Meyering */ ++ ++#include ++ ++/* Specification. */ ++#include "localtime-buffer.h" ++ ++#if GETTIMEOFDAY_CLOBBERS_LOCALTIME || TZSET_CLOBBERS_LOCALTIME ++ ++static struct tm tm_zero_buffer; ++struct tm *localtime_buffer_addr = &tm_zero_buffer; ++ ++/* This is a wrapper for localtime. ++ ++ On the first call, record the address of the static buffer that ++ localtime uses for its result. */ ++ ++struct tm * ++rpl_localtime (time_t const *timep) ++{ ++ struct tm *tm = localtime (timep); ++ ++ if (localtime_buffer_addr == &tm_zero_buffer) ++ localtime_buffer_addr = tm; ++ ++ return tm; ++} ++ ++/* Same as above, since gmtime and localtime use the same buffer. */ ++struct tm * ++rpl_gmtime (time_t const *timep) ++{ ++ struct tm *tm = gmtime (timep); ++ ++ if (localtime_buffer_addr == &tm_zero_buffer) ++ localtime_buffer_addr = tm; ++ ++ return tm; ++} ++ ++#endif +diff -Naur libpipeline-1.5.0-orig/gnulib/lib/localtime-buffer.h libpipeline-1.5.0/gnulib/lib/localtime-buffer.h +--- libpipeline-1.5.0-orig/gnulib/lib/localtime-buffer.h 1970-01-01 03:00:00.000000000 +0300 ++++ libpipeline-1.5.0/gnulib/lib/localtime-buffer.h 2018-07-02 13:09:59.500436300 +0300 +@@ -0,0 +1,27 @@ ++/* Provide access to the last buffer returned by localtime() or gmtime(). ++ ++ Copyright (C) 2001-2003, 2005-2007, 2009-2017 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 3, 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, see . */ ++ ++/* written by Jim Meyering */ ++ ++#include ++ ++#if GETTIMEOFDAY_CLOBBERS_LOCALTIME || TZSET_CLOBBERS_LOCALTIME ++ ++/* The address of the last buffer returned by localtime() or gmtime(). */ ++extern struct tm *localtime_buffer_addr; ++ ++#endif +diff -Naur libpipeline-1.5.0-orig/gnulib/lib/lstat.c libpipeline-1.5.0/gnulib/lib/lstat.c +--- libpipeline-1.5.0-orig/gnulib/lib/lstat.c 2014-11-08 16:53:37.000000000 +0300 ++++ libpipeline-1.5.0/gnulib/lib/lstat.c 2018-07-02 13:09:59.510436300 +0300 +@@ -1,6 +1,6 @@ + /* Work around a bug of lstat on some systems + +- Copyright (C) 1997-2006, 2008-2014 Free Software Foundation, Inc. ++ Copyright (C) 1997-2006, 2008-2017 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 +diff -Naur libpipeline-1.5.0-orig/gnulib/lib/Makefile.am libpipeline-1.5.0/gnulib/lib/Makefile.am +--- libpipeline-1.5.0-orig/gnulib/lib/Makefile.am 2017-07-10 13:29:08.000000000 +0300 ++++ libpipeline-1.5.0/gnulib/lib/Makefile.am 2018-07-02 13:09:59.510436300 +0300 +@@ -1,6 +1,6 @@ + ## DO NOT EDIT! GENERATED AUTOMATICALLY! + ## Process this file with automake to produce Makefile.in. +-# Copyright (C) 2002-2014 Free Software Foundation, Inc. ++# Copyright (C) 2002-2017 Free Software Foundation, Inc. + # + # This file is free software; you can redistribute it and/or modify + # it under the terms of the GNU General Public License as published by +@@ -21,7 +21,7 @@ + # the same distribution terms as the rest of that program. + # + # Generated by gnulib-tool. +-# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=gnulib/lib --m4-base=gnulib/m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --no-conditional-dependencies --libtool --macro-prefix=gl --no-vc-files dirname environ error full-write gitlog-to-changelog gnupload largefile lib-ignore mkdtemp safe-read safe-write setenv sigaction signal sigprocmask strerror strsignal sys_select sys_stat unsetenv waitpid warnings xalloc xstrndup xvasprintf ++# Reproduce by: gnulib-tool --import --lib=libgnu --source-base=gnulib/lib --m4-base=gnulib/m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --no-conditional-dependencies --libtool --macro-prefix=gl --no-vc-files dirname environ error full-write gitlog-to-changelog gnupload largefile lib-ignore mkdtemp safe-read safe-write setenv sigaction signal sigprocmask strerror strsignal sys_select sys_stat unsetenv waitpid warnings xalloc xstrndup xvasprintf + + AUTOMAKE_OPTIONS = 1.9.6 gnits subdir-objects + +@@ -37,6 +37,7 @@ + CLEANFILES = + DISTCLEANFILES = + MAINTAINERCLEANFILES = ++# No GNU Make output. + + AM_CPPFLAGS = + AM_CFLAGS = +@@ -195,6 +196,13 @@ + + ## end gnulib module fcntl-h + ++## begin gnulib module filename ++ ++ ++EXTRA_DIST += filename.h ++ ++## end gnulib module filename ++ + ## begin gnulib module float + + BUILT_SOURCES += $(FLOAT_H) +@@ -232,6 +240,12 @@ + + ## end gnulib module full-write + ++## begin gnulib module getprogname ++ ++libgnu_la_SOURCES += getprogname.h getprogname.c ++ ++## end gnulib module getprogname ++ + ## begin gnulib module gettext-h + + libgnu_la_SOURCES += gettext.h +@@ -275,6 +289,43 @@ + + ## end gnulib module intprops + ++## begin gnulib module limits-h ++ ++BUILT_SOURCES += $(LIMITS_H) ++ ++# We need the following in order to create when the system ++# doesn't have one that is compatible with GNU. ++if GL_GENERATE_LIMITS_H ++limits.h: limits.in.h $(top_builddir)/config.status ++ $(AM_V_GEN)rm -f $@-t $@ && \ ++ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ ++ sed -e 's|@''GUARD_PREFIX''@|GL|g' \ ++ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ ++ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ ++ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ ++ -e 's|@''NEXT_LIMITS_H''@|$(NEXT_LIMITS_H)|g' \ ++ < $(srcdir)/limits.in.h; \ ++ } > $@-t && \ ++ mv $@-t $@ ++else ++limits.h: $(top_builddir)/config.status ++ rm -f $@ ++endif ++MOSTLYCLEANFILES += limits.h limits.h-t ++ ++EXTRA_DIST += limits.in.h ++ ++## end gnulib module limits-h ++ ++## begin gnulib module localtime-buffer ++ ++ ++EXTRA_DIST += localtime-buffer.c localtime-buffer.h ++ ++EXTRA_libgnu_la_SOURCES += localtime-buffer.c ++ ++## end gnulib module localtime-buffer ++ + ## begin gnulib module lock + + libgnu_la_SOURCES += glthread/lock.h glthread/lock.c +@@ -474,81 +525,48 @@ + ## begin gnulib module snippet/_Noreturn + + # Because this Makefile snippet defines a variable used by other +-# gnulib Makefile snippets, it must be present in all Makefile.am that ++# gnulib Makefile snippets, it must be present in all makefiles that + # need it. This is ensured by the applicability 'all' defined above. + +-_NORETURN_H=$(top_srcdir)/build-aux/snippet/_Noreturn.h ++_NORETURN_H=$(srcdir)/_Noreturn.h + +-EXTRA_DIST += $(top_srcdir)/build-aux/snippet/_Noreturn.h ++EXTRA_DIST += _Noreturn.h + + ## end gnulib module snippet/_Noreturn + + ## begin gnulib module snippet/arg-nonnull + +-# The BUILT_SOURCES created by this Makefile snippet are not used via #include +-# statements but through direct file reference. Therefore this snippet must be +-# present in all Makefile.am that need it. This is ensured by the applicability +-# 'all' defined above. +- +-BUILT_SOURCES += arg-nonnull.h +-# The arg-nonnull.h that gets inserted into generated .h files is the same as +-# build-aux/snippet/arg-nonnull.h, except that it has the copyright header cut +-# off. +-arg-nonnull.h: $(top_srcdir)/build-aux/snippet/arg-nonnull.h +- $(AM_V_GEN)rm -f $@-t $@ && \ +- sed -n -e '/GL_ARG_NONNULL/,$$p' \ +- < $(top_srcdir)/build-aux/snippet/arg-nonnull.h \ +- > $@-t && \ +- mv $@-t $@ +-MOSTLYCLEANFILES += arg-nonnull.h arg-nonnull.h-t ++# Because this Makefile snippet defines a variable used by other ++# gnulib Makefile snippets, it must be present in all makefiles that ++# need it. This is ensured by the applicability 'all' defined above. + +-ARG_NONNULL_H=arg-nonnull.h ++ARG_NONNULL_H=$(srcdir)/arg-nonnull.h + +-EXTRA_DIST += $(top_srcdir)/build-aux/snippet/arg-nonnull.h ++EXTRA_DIST += arg-nonnull.h + + ## end gnulib module snippet/arg-nonnull + + ## begin gnulib module snippet/c++defs + +-# The BUILT_SOURCES created by this Makefile snippet are not used via #include +-# statements but through direct file reference. Therefore this snippet must be +-# present in all Makefile.am that need it. This is ensured by the applicability +-# 'all' defined above. +- +-BUILT_SOURCES += c++defs.h +-# The c++defs.h that gets inserted into generated .h files is the same as +-# build-aux/snippet/c++defs.h, except that it has the copyright header cut off. +-c++defs.h: $(top_srcdir)/build-aux/snippet/c++defs.h +- $(AM_V_GEN)rm -f $@-t $@ && \ +- sed -n -e '/_GL_CXXDEFS/,$$p' \ +- < $(top_srcdir)/build-aux/snippet/c++defs.h \ +- > $@-t && \ +- mv $@-t $@ +-MOSTLYCLEANFILES += c++defs.h c++defs.h-t ++# Because this Makefile snippet defines a variable used by other ++# gnulib Makefile snippets, it must be present in all makefiles that ++# need it. This is ensured by the applicability 'all' defined above. + +-CXXDEFS_H=c++defs.h ++CXXDEFS_H=$(srcdir)/c++defs.h + +-EXTRA_DIST += $(top_srcdir)/build-aux/snippet/c++defs.h ++EXTRA_DIST += c++defs.h + + ## end gnulib module snippet/c++defs + + ## begin gnulib module snippet/warn-on-use + +-BUILT_SOURCES += warn-on-use.h +-# The warn-on-use.h that gets inserted into generated .h files is the same as +-# build-aux/snippet/warn-on-use.h, except that it has the copyright header cut +-# off. +-warn-on-use.h: $(top_srcdir)/build-aux/snippet/warn-on-use.h +- $(AM_V_GEN)rm -f $@-t $@ && \ +- sed -n -e '/^.ifndef/,$$p' \ +- < $(top_srcdir)/build-aux/snippet/warn-on-use.h \ +- > $@-t && \ +- mv $@-t $@ +-MOSTLYCLEANFILES += warn-on-use.h warn-on-use.h-t ++# Because this Makefile snippet defines a variable used by other ++# gnulib Makefile snippets, it must be present in all makefiles that ++# need it. This is ensured by the applicability 'all' defined above. + +-WARN_ON_USE_H=warn-on-use.h ++WARN_ON_USE_H=$(srcdir)/warn-on-use.h + +-EXTRA_DIST += $(top_srcdir)/build-aux/snippet/warn-on-use.h ++EXTRA_DIST += warn-on-use.h + + ## end gnulib module snippet/warn-on-use + +@@ -564,9 +582,9 @@ + ## begin gnulib module stat + + +-EXTRA_DIST += stat.c ++EXTRA_DIST += stat-w32.c stat-w32.h stat.c + +-EXTRA_libgnu_la_SOURCES += stat.c ++EXTRA_libgnu_la_SOURCES += stat-w32.c stat.c + + ## end gnulib module stat + +@@ -636,6 +654,7 @@ + -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ + -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ + -e 's|@''NEXT_STDDEF_H''@|$(NEXT_STDDEF_H)|g' \ ++ -e 's|@''HAVE_MAX_ALIGN_T''@|$(HAVE_MAX_ALIGN_T)|g' \ + -e 's|@''HAVE_WCHAR_T''@|$(HAVE_WCHAR_T)|g' \ + -e 's|@''REPLACE_NULL''@|$(REPLACE_NULL)|g' \ + < $(srcdir)/stddef.in.h; \ +@@ -667,6 +686,7 @@ + -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ + -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ + -e 's|@''NEXT_STDINT_H''@|$(NEXT_STDINT_H)|g' \ ++ -e 's/@''HAVE_C99_STDINT_H''@/$(HAVE_C99_STDINT_H)/g' \ + -e 's/@''HAVE_SYS_TYPES_H''@/$(HAVE_SYS_TYPES_H)/g' \ + -e 's/@''HAVE_INTTYPES_H''@/$(HAVE_INTTYPES_H)/g' \ + -e 's/@''HAVE_SYS_INTTYPES_H''@/$(HAVE_SYS_INTTYPES_H)/g' \ +@@ -688,6 +708,7 @@ + -e 's/@''BITSIZEOF_WINT_T''@/$(BITSIZEOF_WINT_T)/g' \ + -e 's/@''HAVE_SIGNED_WINT_T''@/$(HAVE_SIGNED_WINT_T)/g' \ + -e 's/@''WINT_T_SUFFIX''@/$(WINT_T_SUFFIX)/g' \ ++ -e 's/@''GNULIB_OVERRIDES_WINT_T''@/$(GNULIB_OVERRIDES_WINT_T)/g' \ + < $(srcdir)/stdint.in.h; \ + } > $@-t && \ + mv $@-t $@ +@@ -862,6 +883,7 @@ + -e 's/@''GNULIB_PTSNAME''@/$(GNULIB_PTSNAME)/g' \ + -e 's/@''GNULIB_PTSNAME_R''@/$(GNULIB_PTSNAME_R)/g' \ + -e 's/@''GNULIB_PUTENV''@/$(GNULIB_PUTENV)/g' \ ++ -e 's/@''GNULIB_QSORT_R''@/$(GNULIB_QSORT_R)/g' \ + -e 's/@''GNULIB_RANDOM''@/$(GNULIB_RANDOM)/g' \ + -e 's/@''GNULIB_RANDOM_R''@/$(GNULIB_RANDOM_R)/g' \ + -e 's/@''GNULIB_REALLOC_POSIX''@/$(GNULIB_REALLOC_POSIX)/g' \ +@@ -891,6 +913,7 @@ + -e 's|@''HAVE_POSIX_OPENPT''@|$(HAVE_POSIX_OPENPT)|g' \ + -e 's|@''HAVE_PTSNAME''@|$(HAVE_PTSNAME)|g' \ + -e 's|@''HAVE_PTSNAME_R''@|$(HAVE_PTSNAME_R)|g' \ ++ -e 's|@''HAVE_QSORT_R''@|$(HAVE_QSORT_R)|g' \ + -e 's|@''HAVE_RANDOM''@|$(HAVE_RANDOM)|g' \ + -e 's|@''HAVE_RANDOM_H''@|$(HAVE_RANDOM_H)|g' \ + -e 's|@''HAVE_RANDOM_R''@|$(HAVE_RANDOM_R)|g' \ +@@ -913,6 +936,7 @@ + -e 's|@''REPLACE_PTSNAME''@|$(REPLACE_PTSNAME)|g' \ + -e 's|@''REPLACE_PTSNAME_R''@|$(REPLACE_PTSNAME_R)|g' \ + -e 's|@''REPLACE_PUTENV''@|$(REPLACE_PUTENV)|g' \ ++ -e 's|@''REPLACE_QSORT_R''@|$(REPLACE_QSORT_R)|g' \ + -e 's|@''REPLACE_RANDOM_R''@|$(REPLACE_RANDOM_R)|g' \ + -e 's|@''REPLACE_REALLOC''@|$(REPLACE_REALLOC)|g' \ + -e 's|@''REPLACE_REALPATH''@|$(REPLACE_REALPATH)|g' \ +@@ -1127,6 +1151,7 @@ + -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ + -e 's|@''NEXT_SYS_STAT_H''@|$(NEXT_SYS_STAT_H)|g' \ + -e 's|@''WINDOWS_64_BIT_ST_SIZE''@|$(WINDOWS_64_BIT_ST_SIZE)|g' \ ++ -e 's|@''WINDOWS_STAT_TIMESPEC''@|$(WINDOWS_STAT_TIMESPEC)|g' \ + -e 's/@''GNULIB_FCHMODAT''@/$(GNULIB_FCHMODAT)/g' \ + -e 's/@''GNULIB_FSTAT''@/$(GNULIB_FSTAT)/g' \ + -e 's/@''GNULIB_FSTATAT''@/$(GNULIB_FSTATAT)/g' \ +@@ -1140,6 +1165,7 @@ + -e 's/@''GNULIB_MKNODAT''@/$(GNULIB_MKNODAT)/g' \ + -e 's/@''GNULIB_STAT''@/$(GNULIB_STAT)/g' \ + -e 's/@''GNULIB_UTIMENSAT''@/$(GNULIB_UTIMENSAT)/g' \ ++ -e 's/@''GNULIB_OVERRIDES_STRUCT_STAT''@/$(GNULIB_OVERRIDES_STRUCT_STAT)/g' \ + -e 's|@''HAVE_FCHMODAT''@|$(HAVE_FCHMODAT)|g' \ + -e 's|@''HAVE_FSTATAT''@|$(HAVE_FSTATAT)|g' \ + -e 's|@''HAVE_FUTIMENS''@|$(HAVE_FUTIMENS)|g' \ +@@ -1223,6 +1249,7 @@ + -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ + -e 's|@''NEXT_SYS_TYPES_H''@|$(NEXT_SYS_TYPES_H)|g' \ + -e 's|@''WINDOWS_64_BIT_OFF_T''@|$(WINDOWS_64_BIT_OFF_T)|g' \ ++ -e 's|@''WINDOWS_STAT_INODES''@|$(WINDOWS_STAT_INODES)|g' \ + < $(srcdir)/sys_types.in.h; \ + } > $@-t && \ + mv $@-t $@ +@@ -1290,25 +1317,35 @@ + -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ + -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ + -e 's|@''NEXT_TIME_H''@|$(NEXT_TIME_H)|g' \ +- -e 's/@''GNULIB_GETTIMEOFDAY''@/$(GNULIB_GETTIMEOFDAY)/g' \ ++ -e 's/@''GNULIB_CTIME''@/$(GNULIB_CTIME)/g' \ ++ -e 's/@''GNULIB_LOCALTIME''@/$(GNULIB_LOCALTIME)/g' \ + -e 's/@''GNULIB_MKTIME''@/$(GNULIB_MKTIME)/g' \ + -e 's/@''GNULIB_NANOSLEEP''@/$(GNULIB_NANOSLEEP)/g' \ ++ -e 's/@''GNULIB_STRFTIME''@/$(GNULIB_STRFTIME)/g' \ + -e 's/@''GNULIB_STRPTIME''@/$(GNULIB_STRPTIME)/g' \ + -e 's/@''GNULIB_TIMEGM''@/$(GNULIB_TIMEGM)/g' \ + -e 's/@''GNULIB_TIME_R''@/$(GNULIB_TIME_R)/g' \ ++ -e 's/@''GNULIB_TIME_RZ''@/$(GNULIB_TIME_RZ)/g' \ ++ -e 's/@''GNULIB_TZSET''@/$(GNULIB_TZSET)/g' \ + -e 's|@''HAVE_DECL_LOCALTIME_R''@|$(HAVE_DECL_LOCALTIME_R)|g' \ + -e 's|@''HAVE_NANOSLEEP''@|$(HAVE_NANOSLEEP)|g' \ + -e 's|@''HAVE_STRPTIME''@|$(HAVE_STRPTIME)|g' \ + -e 's|@''HAVE_TIMEGM''@|$(HAVE_TIMEGM)|g' \ ++ -e 's|@''HAVE_TIMEZONE_T''@|$(HAVE_TIMEZONE_T)|g' \ ++ -e 's|@''HAVE_TZSET''@|$(HAVE_TZSET)|g' \ ++ -e 's|@''REPLACE_CTIME''@|$(REPLACE_CTIME)|g' \ + -e 's|@''REPLACE_GMTIME''@|$(REPLACE_GMTIME)|g' \ + -e 's|@''REPLACE_LOCALTIME''@|$(REPLACE_LOCALTIME)|g' \ + -e 's|@''REPLACE_LOCALTIME_R''@|$(REPLACE_LOCALTIME_R)|g' \ + -e 's|@''REPLACE_MKTIME''@|$(REPLACE_MKTIME)|g' \ + -e 's|@''REPLACE_NANOSLEEP''@|$(REPLACE_NANOSLEEP)|g' \ ++ -e 's|@''REPLACE_STRFTIME''@|$(REPLACE_STRFTIME)|g' \ + -e 's|@''REPLACE_TIMEGM''@|$(REPLACE_TIMEGM)|g' \ ++ -e 's|@''REPLACE_TZSET''@|$(REPLACE_TZSET)|g' \ + -e 's|@''PTHREAD_H_DEFINES_STRUCT_TIMESPEC''@|$(PTHREAD_H_DEFINES_STRUCT_TIMESPEC)|g' \ + -e 's|@''SYS_TIME_H_DEFINES_STRUCT_TIMESPEC''@|$(SYS_TIME_H_DEFINES_STRUCT_TIMESPEC)|g' \ + -e 's|@''TIME_H_DEFINES_STRUCT_TIMESPEC''@|$(TIME_H_DEFINES_STRUCT_TIMESPEC)|g' \ ++ -e 's|@''UNISTD_H_DEFINES_STRUCT_TIMESPEC''@|$(UNISTD_H_DEFINES_STRUCT_TIMESPEC)|g' \ + -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ + -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ + -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ +@@ -1385,6 +1422,7 @@ + -e 's/@''GNULIB_SLEEP''@/$(GNULIB_SLEEP)/g' \ + -e 's/@''GNULIB_SYMLINK''@/$(GNULIB_SYMLINK)/g' \ + -e 's/@''GNULIB_SYMLINKAT''@/$(GNULIB_SYMLINKAT)/g' \ ++ -e 's/@''GNULIB_TRUNCATE''@/$(GNULIB_TRUNCATE)/g' \ + -e 's/@''GNULIB_TTYNAME_R''@/$(GNULIB_TTYNAME_R)/g' \ + -e 's/@''GNULIB_UNISTD_H_GETOPT''@/0$(GNULIB_GL_UNISTD_H_GETOPT)/g' \ + -e 's/@''GNULIB_UNISTD_H_NONBLOCKING''@/$(GNULIB_UNISTD_H_NONBLOCKING)/g' \ +@@ -1407,7 +1445,6 @@ + -e 's|@''HAVE_GETDTABLESIZE''@|$(HAVE_GETDTABLESIZE)|g' \ + -e 's|@''HAVE_GETGROUPS''@|$(HAVE_GETGROUPS)|g' \ + -e 's|@''HAVE_GETHOSTNAME''@|$(HAVE_GETHOSTNAME)|g' \ +- -e 's|@''HAVE_GETLOGIN''@|$(HAVE_GETLOGIN)|g' \ + -e 's|@''HAVE_GETPAGESIZE''@|$(HAVE_GETPAGESIZE)|g' \ + -e 's|@''HAVE_GROUP_MEMBER''@|$(HAVE_GROUP_MEMBER)|g' \ + -e 's|@''HAVE_LCHOWN''@|$(HAVE_LCHOWN)|g' \ +@@ -1423,12 +1460,14 @@ + -e 's|@''HAVE_SLEEP''@|$(HAVE_SLEEP)|g' \ + -e 's|@''HAVE_SYMLINK''@|$(HAVE_SYMLINK)|g' \ + -e 's|@''HAVE_SYMLINKAT''@|$(HAVE_SYMLINKAT)|g' \ ++ -e 's|@''HAVE_TRUNCATE''@|$(HAVE_TRUNCATE)|g' \ + -e 's|@''HAVE_UNLINKAT''@|$(HAVE_UNLINKAT)|g' \ + -e 's|@''HAVE_USLEEP''@|$(HAVE_USLEEP)|g' \ + -e 's|@''HAVE_DECL_ENVIRON''@|$(HAVE_DECL_ENVIRON)|g' \ + -e 's|@''HAVE_DECL_FCHDIR''@|$(HAVE_DECL_FCHDIR)|g' \ + -e 's|@''HAVE_DECL_FDATASYNC''@|$(HAVE_DECL_FDATASYNC)|g' \ + -e 's|@''HAVE_DECL_GETDOMAINNAME''@|$(HAVE_DECL_GETDOMAINNAME)|g' \ ++ -e 's|@''HAVE_DECL_GETLOGIN''@|$(HAVE_DECL_GETLOGIN)|g' \ + -e 's|@''HAVE_DECL_GETLOGIN_R''@|$(HAVE_DECL_GETLOGIN_R)|g' \ + -e 's|@''HAVE_DECL_GETPAGESIZE''@|$(HAVE_DECL_GETPAGESIZE)|g' \ + -e 's|@''HAVE_DECL_GETUSERSHELL''@|$(HAVE_DECL_GETUSERSHELL)|g' \ +@@ -1458,9 +1497,12 @@ + -e 's|@''REPLACE_PWRITE''@|$(REPLACE_PWRITE)|g' \ + -e 's|@''REPLACE_READ''@|$(REPLACE_READ)|g' \ + -e 's|@''REPLACE_READLINK''@|$(REPLACE_READLINK)|g' \ ++ -e 's|@''REPLACE_READLINKAT''@|$(REPLACE_READLINKAT)|g' \ + -e 's|@''REPLACE_RMDIR''@|$(REPLACE_RMDIR)|g' \ + -e 's|@''REPLACE_SLEEP''@|$(REPLACE_SLEEP)|g' \ + -e 's|@''REPLACE_SYMLINK''@|$(REPLACE_SYMLINK)|g' \ ++ -e 's|@''REPLACE_SYMLINKAT''@|$(REPLACE_SYMLINKAT)|g' \ ++ -e 's|@''REPLACE_TRUNCATE''@|$(REPLACE_TRUNCATE)|g' \ + -e 's|@''REPLACE_TTYNAME_R''@|$(REPLACE_TTYNAME_R)|g' \ + -e 's|@''REPLACE_UNLINK''@|$(REPLACE_UNLINK)|g' \ + -e 's|@''REPLACE_UNLINKAT''@|$(REPLACE_UNLINKAT)|g' \ +@@ -1538,6 +1580,8 @@ + -e 's|@''HAVE_FEATURES_H''@|$(HAVE_FEATURES_H)|g' \ + -e 's|@''NEXT_WCHAR_H''@|$(NEXT_WCHAR_H)|g' \ + -e 's|@''HAVE_WCHAR_H''@|$(HAVE_WCHAR_H)|g' \ ++ -e 's/@''HAVE_CRTDEFS_H''@/$(HAVE_CRTDEFS_H)/g' \ ++ -e 's/@''GNULIB_OVERRIDES_WINT_T''@/$(GNULIB_OVERRIDES_WINT_T)/g' \ + -e 's/@''GNULIB_BTOWC''@/$(GNULIB_BTOWC)/g' \ + -e 's/@''GNULIB_WCTOB''@/$(GNULIB_WCTOB)/g' \ + -e 's/@''GNULIB_MBSINIT''@/$(GNULIB_MBSINIT)/g' \ +@@ -1577,6 +1621,7 @@ + -e 's/@''GNULIB_WCSSTR''@/$(GNULIB_WCSSTR)/g' \ + -e 's/@''GNULIB_WCSTOK''@/$(GNULIB_WCSTOK)/g' \ + -e 's/@''GNULIB_WCSWIDTH''@/$(GNULIB_WCSWIDTH)/g' \ ++ -e 's/@''GNULIB_WCSFTIME''@/$(GNULIB_WCSFTIME)/g' \ + < $(srcdir)/wchar.in.h | \ + sed -e 's|@''HAVE_WINT_T''@|$(HAVE_WINT_T)|g' \ + -e 's|@''HAVE_BTOWC''@|$(HAVE_BTOWC)|g' \ +@@ -1616,6 +1661,7 @@ + -e 's|@''HAVE_WCSSTR''@|$(HAVE_WCSSTR)|g' \ + -e 's|@''HAVE_WCSTOK''@|$(HAVE_WCSTOK)|g' \ + -e 's|@''HAVE_WCSWIDTH''@|$(HAVE_WCSWIDTH)|g' \ ++ -e 's|@''HAVE_WCSFTIME''@|$(HAVE_WCSFTIME)|g' \ + -e 's|@''HAVE_DECL_WCTOB''@|$(HAVE_DECL_WCTOB)|g' \ + -e 's|@''HAVE_DECL_WCWIDTH''@|$(HAVE_DECL_WCWIDTH)|g' \ + | \ +@@ -1632,6 +1678,7 @@ + -e 's|@''REPLACE_WCSNRTOMBS''@|$(REPLACE_WCSNRTOMBS)|g' \ + -e 's|@''REPLACE_WCWIDTH''@|$(REPLACE_WCWIDTH)|g' \ + -e 's|@''REPLACE_WCSWIDTH''@|$(REPLACE_WCSWIDTH)|g' \ ++ -e 's|@''REPLACE_WCSFTIME''@|$(REPLACE_WCSFTIME)|g' \ + -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ + -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ + -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \ +diff -Naur libpipeline-1.5.0-orig/gnulib/lib/Makefile.in libpipeline-1.5.0/gnulib/lib/Makefile.in +--- libpipeline-1.5.0-orig/gnulib/lib/Makefile.in 2017-11-14 13:51:02.000000000 +0300 ++++ libpipeline-1.5.0/gnulib/lib/Makefile.in 2018-07-02 13:09:59.520436300 +0300 +@@ -14,7 +14,7 @@ + + @SET_MAKE@ + +-# Copyright (C) 2002-2014 Free Software Foundation, Inc. ++# Copyright (C) 2002-2017 Free Software Foundation, Inc. + # + # This file is free software; you can redistribute it and/or modify + # it under the terms of the GNU General Public License as published by +@@ -35,7 +35,7 @@ + # the same distribution terms as the rest of that program. + # + # Generated by gnulib-tool. +-# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=gnulib/lib --m4-base=gnulib/m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --no-conditional-dependencies --libtool --macro-prefix=gl --no-vc-files dirname environ error full-write gitlog-to-changelog gnupload largefile lib-ignore mkdtemp safe-read safe-write setenv sigaction signal sigprocmask strerror strsignal sys_select sys_stat unsetenv waitpid warnings xalloc xstrndup xvasprintf ++# Reproduce by: gnulib-tool --import --lib=libgnu --source-base=gnulib/lib --m4-base=gnulib/m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --no-conditional-dependencies --libtool --macro-prefix=gl --no-vc-files dirname environ error full-write gitlog-to-changelog gnupload largefile lib-ignore mkdtemp safe-read safe-write setenv sigaction signal sigprocmask strerror strsignal sys_select sys_stat unsetenv waitpid warnings xalloc xstrndup xvasprintf + + + +@@ -131,6 +131,7 @@ + $(top_srcdir)/gnulib/m4/fcntl-o.m4 \ + $(top_srcdir)/gnulib/m4/fcntl_h.m4 \ + $(top_srcdir)/gnulib/m4/float_h.m4 \ ++ $(top_srcdir)/gnulib/m4/getprogname.m4 \ + $(top_srcdir)/gnulib/m4/gettimeofday.m4 \ + $(top_srcdir)/gnulib/m4/gnulib-common.m4 \ + $(top_srcdir)/gnulib/m4/gnulib-comp.m4 \ +@@ -143,6 +144,8 @@ + $(top_srcdir)/gnulib/m4/lib-link.m4 \ + $(top_srcdir)/gnulib/m4/lib-prefix.m4 \ + $(top_srcdir)/gnulib/m4/libtool.m4 \ ++ $(top_srcdir)/gnulib/m4/limits-h.m4 \ ++ $(top_srcdir)/gnulib/m4/localtime-buffer.m4 \ + $(top_srcdir)/gnulib/m4/lock.m4 \ + $(top_srcdir)/gnulib/m4/longlong.m4 \ + $(top_srcdir)/gnulib/m4/lstat.m4 \ +@@ -162,6 +165,7 @@ + $(top_srcdir)/gnulib/m4/onceonly.m4 \ + $(top_srcdir)/gnulib/m4/pathmax.m4 \ + $(top_srcdir)/gnulib/m4/printf.m4 \ ++ $(top_srcdir)/gnulib/m4/pthread_rwlock_rdlock.m4 \ + $(top_srcdir)/gnulib/m4/raise.m4 \ + $(top_srcdir)/gnulib/m4/read.m4 \ + $(top_srcdir)/gnulib/m4/safe-read.m4 \ +@@ -226,8 +230,8 @@ + am__dirstamp = $(am__leading_dot)dirstamp + am_libgnu_la_OBJECTS = dirname.lo basename.lo dirname-lgpl.lo \ + basename-lgpl.lo stripslash.lo exitfail.lo full-write.lo \ +- glthread/lock.lo malloca.lo safe-read.lo safe-write.lo \ +- sig-handler.lo tempname.lo glthread/threadlib.lo \ ++ getprogname.lo glthread/lock.lo malloca.lo safe-read.lo \ ++ safe-write.lo sig-handler.lo tempname.lo glthread/threadlib.lo \ + glthread/tls.lo unistd.lo xmalloc.lo xalloc-die.lo xsize.lo \ + xstrndup.lo xvasprintf.lo xasprintf.lo + libgnu_la_OBJECTS = $(am_libgnu_la_OBJECTS) +@@ -395,6 +399,7 @@ + GNULIB_CHDIR = @GNULIB_CHDIR@ + GNULIB_CHOWN = @GNULIB_CHOWN@ + GNULIB_CLOSE = @GNULIB_CLOSE@ ++GNULIB_CTIME = @GNULIB_CTIME@ + GNULIB_DPRINTF = @GNULIB_DPRINTF@ + GNULIB_DUP = @GNULIB_DUP@ + GNULIB_DUP2 = @GNULIB_DUP2@ +@@ -456,6 +461,7 @@ + GNULIB_LCHOWN = @GNULIB_LCHOWN@ + GNULIB_LINK = @GNULIB_LINK@ + GNULIB_LINKAT = @GNULIB_LINKAT@ ++GNULIB_LOCALTIME = @GNULIB_LOCALTIME@ + GNULIB_LSEEK = @GNULIB_LSEEK@ + GNULIB_LSTAT = @GNULIB_LSTAT@ + GNULIB_MALLOC_POSIX = @GNULIB_MALLOC_POSIX@ +@@ -500,6 +506,8 @@ + GNULIB_OBSTACK_PRINTF_POSIX = @GNULIB_OBSTACK_PRINTF_POSIX@ + GNULIB_OPEN = @GNULIB_OPEN@ + GNULIB_OPENAT = @GNULIB_OPENAT@ ++GNULIB_OVERRIDES_STRUCT_STAT = @GNULIB_OVERRIDES_STRUCT_STAT@ ++GNULIB_OVERRIDES_WINT_T = @GNULIB_OVERRIDES_WINT_T@ + GNULIB_PCLOSE = @GNULIB_PCLOSE@ + GNULIB_PERROR = @GNULIB_PERROR@ + GNULIB_PIPE = @GNULIB_PIPE@ +@@ -518,6 +526,7 @@ + GNULIB_PUTENV = @GNULIB_PUTENV@ + GNULIB_PUTS = @GNULIB_PUTS@ + GNULIB_PWRITE = @GNULIB_PWRITE@ ++GNULIB_QSORT_R = @GNULIB_QSORT_R@ + GNULIB_RAISE = @GNULIB_RAISE@ + GNULIB_RANDOM = @GNULIB_RANDOM@ + GNULIB_RANDOM_R = @GNULIB_RANDOM_R@ +@@ -553,6 +562,7 @@ + GNULIB_STRDUP = @GNULIB_STRDUP@ + GNULIB_STRERROR = @GNULIB_STRERROR@ + GNULIB_STRERROR_R = @GNULIB_STRERROR_R@ ++GNULIB_STRFTIME = @GNULIB_STRFTIME@ + GNULIB_STRNCAT = @GNULIB_STRNCAT@ + GNULIB_STRNDUP = @GNULIB_STRNDUP@ + GNULIB_STRNLEN = @GNULIB_STRNLEN@ +@@ -571,8 +581,11 @@ + GNULIB_SYSTEM_POSIX = @GNULIB_SYSTEM_POSIX@ + GNULIB_TIMEGM = @GNULIB_TIMEGM@ + GNULIB_TIME_R = @GNULIB_TIME_R@ ++GNULIB_TIME_RZ = @GNULIB_TIME_RZ@ + GNULIB_TMPFILE = @GNULIB_TMPFILE@ ++GNULIB_TRUNCATE = @GNULIB_TRUNCATE@ + GNULIB_TTYNAME_R = @GNULIB_TTYNAME_R@ ++GNULIB_TZSET = @GNULIB_TZSET@ + GNULIB_UNISTD_H_NONBLOCKING = @GNULIB_UNISTD_H_NONBLOCKING@ + GNULIB_UNISTD_H_SIGPIPE = @GNULIB_UNISTD_H_SIGPIPE@ + GNULIB_UNLINK = @GNULIB_UNLINK@ +@@ -603,6 +616,7 @@ + GNULIB_WCSCPY = @GNULIB_WCSCPY@ + GNULIB_WCSCSPN = @GNULIB_WCSCSPN@ + GNULIB_WCSDUP = @GNULIB_WCSDUP@ ++GNULIB_WCSFTIME = @GNULIB_WCSFTIME@ + GNULIB_WCSLEN = @GNULIB_WCSLEN@ + GNULIB_WCSNCASECMP = @GNULIB_WCSNCASECMP@ + GNULIB_WCSNCAT = @GNULIB_WCSNCAT@ +@@ -631,8 +645,10 @@ + GREP = @GREP@ + HAVE_ATOLL = @HAVE_ATOLL@ + HAVE_BTOWC = @HAVE_BTOWC@ ++HAVE_C99_STDINT_H = @HAVE_C99_STDINT_H@ + HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@ + HAVE_CHOWN = @HAVE_CHOWN@ ++HAVE_CRTDEFS_H = @HAVE_CRTDEFS_H@ + HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@ + HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@ + HAVE_DECL_FDATASYNC = @HAVE_DECL_FDATASYNC@ +@@ -643,6 +659,7 @@ + HAVE_DECL_GETDOMAINNAME = @HAVE_DECL_GETDOMAINNAME@ + HAVE_DECL_GETLINE = @HAVE_DECL_GETLINE@ + HAVE_DECL_GETLOADAVG = @HAVE_DECL_GETLOADAVG@ ++HAVE_DECL_GETLOGIN = @HAVE_DECL_GETLOGIN@ + HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@ + HAVE_DECL_GETPAGESIZE = @HAVE_DECL_GETPAGESIZE@ + HAVE_DECL_GETUSERSHELL = @HAVE_DECL_GETUSERSHELL@ +@@ -699,6 +716,7 @@ + HAVE_LINKAT = @HAVE_LINKAT@ + HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@ + HAVE_LSTAT = @HAVE_LSTAT@ ++HAVE_MAX_ALIGN_T = @HAVE_MAX_ALIGN_T@ + HAVE_MBRLEN = @HAVE_MBRLEN@ + HAVE_MBRTOWC = @HAVE_MBRTOWC@ + HAVE_MBSINIT = @HAVE_MBSINIT@ +@@ -733,6 +751,7 @@ + HAVE_PTSNAME = @HAVE_PTSNAME@ + HAVE_PTSNAME_R = @HAVE_PTSNAME_R@ + HAVE_PWRITE = @HAVE_PWRITE@ ++HAVE_QSORT_R = @HAVE_QSORT_R@ + HAVE_RAISE = @HAVE_RAISE@ + HAVE_RANDOM = @HAVE_RANDOM@ + HAVE_RANDOM_H = @HAVE_RANDOM_H@ +@@ -779,7 +798,10 @@ + HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@ + HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@ + HAVE_TIMEGM = @HAVE_TIMEGM@ ++HAVE_TIMEZONE_T = @HAVE_TIMEZONE_T@ ++HAVE_TRUNCATE = @HAVE_TRUNCATE@ + HAVE_TYPE_VOLATILE_SIG_ATOMIC_T = @HAVE_TYPE_VOLATILE_SIG_ATOMIC_T@ ++HAVE_TZSET = @HAVE_TZSET@ + HAVE_UNISTD_H = @HAVE_UNISTD_H@ + HAVE_UNLINKAT = @HAVE_UNLINKAT@ + HAVE_UNLOCKPT = @HAVE_UNLOCKPT@ +@@ -801,6 +823,7 @@ + HAVE_WCSCPY = @HAVE_WCSCPY@ + HAVE_WCSCSPN = @HAVE_WCSCSPN@ + HAVE_WCSDUP = @HAVE_WCSDUP@ ++HAVE_WCSFTIME = @HAVE_WCSFTIME@ + HAVE_WCSLEN = @HAVE_WCSLEN@ + HAVE_WCSNCASECMP = @HAVE_WCSNCASECMP@ + HAVE_WCSNCAT = @HAVE_WCSNCAT@ +@@ -843,6 +866,7 @@ + LIBS = @LIBS@ + LIBTHREAD = @LIBTHREAD@ + LIBTOOL = @LIBTOOL@ ++LIMITS_H = @LIMITS_H@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBINTL = @LTLIBINTL@ +@@ -858,6 +882,7 @@ + NEXT_AS_FIRST_DIRECTIVE_ERRNO_H = @NEXT_AS_FIRST_DIRECTIVE_ERRNO_H@ + NEXT_AS_FIRST_DIRECTIVE_FCNTL_H = @NEXT_AS_FIRST_DIRECTIVE_FCNTL_H@ + NEXT_AS_FIRST_DIRECTIVE_FLOAT_H = @NEXT_AS_FIRST_DIRECTIVE_FLOAT_H@ ++NEXT_AS_FIRST_DIRECTIVE_LIMITS_H = @NEXT_AS_FIRST_DIRECTIVE_LIMITS_H@ + NEXT_AS_FIRST_DIRECTIVE_SIGNAL_H = @NEXT_AS_FIRST_DIRECTIVE_SIGNAL_H@ + NEXT_AS_FIRST_DIRECTIVE_STDARG_H = @NEXT_AS_FIRST_DIRECTIVE_STDARG_H@ + NEXT_AS_FIRST_DIRECTIVE_STDDEF_H = @NEXT_AS_FIRST_DIRECTIVE_STDDEF_H@ +@@ -876,6 +901,7 @@ + NEXT_ERRNO_H = @NEXT_ERRNO_H@ + NEXT_FCNTL_H = @NEXT_FCNTL_H@ + NEXT_FLOAT_H = @NEXT_FLOAT_H@ ++NEXT_LIMITS_H = @NEXT_LIMITS_H@ + NEXT_SIGNAL_H = @NEXT_SIGNAL_H@ + NEXT_STDARG_H = @NEXT_STDARG_H@ + NEXT_STDDEF_H = @NEXT_STDDEF_H@ +@@ -918,6 +944,7 @@ + REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@ + REPLACE_CHOWN = @REPLACE_CHOWN@ + REPLACE_CLOSE = @REPLACE_CLOSE@ ++REPLACE_CTIME = @REPLACE_CTIME@ + REPLACE_DPRINTF = @REPLACE_DPRINTF@ + REPLACE_DUP = @REPLACE_DUP@ + REPLACE_DUP2 = @REPLACE_DUP2@ +@@ -987,10 +1014,12 @@ + REPLACE_PTSNAME_R = @REPLACE_PTSNAME_R@ + REPLACE_PUTENV = @REPLACE_PUTENV@ + REPLACE_PWRITE = @REPLACE_PWRITE@ ++REPLACE_QSORT_R = @REPLACE_QSORT_R@ + REPLACE_RAISE = @REPLACE_RAISE@ + REPLACE_RANDOM_R = @REPLACE_RANDOM_R@ + REPLACE_READ = @REPLACE_READ@ + REPLACE_READLINK = @REPLACE_READLINK@ ++REPLACE_READLINKAT = @REPLACE_READLINKAT@ + REPLACE_REALLOC = @REPLACE_REALLOC@ + REPLACE_REALPATH = @REPLACE_REALPATH@ + REPLACE_REMOVE = @REPLACE_REMOVE@ +@@ -1011,6 +1040,7 @@ + REPLACE_STRDUP = @REPLACE_STRDUP@ + REPLACE_STRERROR = @REPLACE_STRERROR@ + REPLACE_STRERROR_R = @REPLACE_STRERROR_R@ ++REPLACE_STRFTIME = @REPLACE_STRFTIME@ + REPLACE_STRNCAT = @REPLACE_STRNCAT@ + REPLACE_STRNDUP = @REPLACE_STRNDUP@ + REPLACE_STRNLEN = @REPLACE_STRNLEN@ +@@ -1020,9 +1050,12 @@ + REPLACE_STRTOK_R = @REPLACE_STRTOK_R@ + REPLACE_STRUCT_TIMEVAL = @REPLACE_STRUCT_TIMEVAL@ + REPLACE_SYMLINK = @REPLACE_SYMLINK@ ++REPLACE_SYMLINKAT = @REPLACE_SYMLINKAT@ + REPLACE_TIMEGM = @REPLACE_TIMEGM@ + REPLACE_TMPFILE = @REPLACE_TMPFILE@ ++REPLACE_TRUNCATE = @REPLACE_TRUNCATE@ + REPLACE_TTYNAME_R = @REPLACE_TTYNAME_R@ ++REPLACE_TZSET = @REPLACE_TZSET@ + REPLACE_UNLINK = @REPLACE_UNLINK@ + REPLACE_UNLINKAT = @REPLACE_UNLINKAT@ + REPLACE_UNSETENV = @REPLACE_UNSETENV@ +@@ -1035,6 +1068,7 @@ + REPLACE_VSNPRINTF = @REPLACE_VSNPRINTF@ + REPLACE_VSPRINTF = @REPLACE_VSPRINTF@ + REPLACE_WCRTOMB = @REPLACE_WCRTOMB@ ++REPLACE_WCSFTIME = @REPLACE_WCSFTIME@ + REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@ + REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@ + REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@ +@@ -1055,6 +1089,7 @@ + SYS_TIME_H_DEFINES_STRUCT_TIMESPEC = @SYS_TIME_H_DEFINES_STRUCT_TIMESPEC@ + TIME_H_DEFINES_STRUCT_TIMESPEC = @TIME_H_DEFINES_STRUCT_TIMESPEC@ + UNDEFINE_STRTOK_R = @UNDEFINE_STRTOK_R@ ++UNISTD_H_DEFINES_STRUCT_TIMESPEC = @UNISTD_H_DEFINES_STRUCT_TIMESPEC@ + UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@ + UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS = @UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS@ + VERSION = @VERSION@ +@@ -1062,6 +1097,8 @@ + WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@ + WINDOWS_64_BIT_OFF_T = @WINDOWS_64_BIT_OFF_T@ + WINDOWS_64_BIT_ST_SIZE = @WINDOWS_64_BIT_ST_SIZE@ ++WINDOWS_STAT_INODES = @WINDOWS_STAT_INODES@ ++WINDOWS_STAT_TIMESPEC = @WINDOWS_STAT_TIMESPEC@ + WINT_T_SUFFIX = @WINT_T_SUFFIX@ + abs_builddir = @abs_builddir@ + abs_srcdir = @abs_srcdir@ +@@ -1127,50 +1164,36 @@ + noinst_LIBRARIES = + noinst_LTLIBRARIES = libgnu.la + EXTRA_DIST = alloca.in.h stripslash.c dirname.h dosname.h errno.in.h \ +- error.c error.h exitfail.h fcntl.in.h float.c float.in.h \ +- itold.c gettimeofday.c \ ++ error.c error.h exitfail.h fcntl.in.h filename.h float.c \ ++ float.in.h itold.c gettimeofday.c \ + $(top_srcdir)/build-aux/gitlog-to-changelog \ + $(top_srcdir)/build-aux/gnupload \ +- $(top_srcdir)/build-aux/config.rpath intprops.h lstat.c \ +- malloc.c malloca.h malloca.valgrind memchr.c memchr.valgrind \ +- mkdtemp.c msvc-inval.c msvc-inval.h msvc-nothrow.c \ +- msvc-nothrow.h pathmax.h raise.c read.c safe-read.h \ +- safe-read.c safe-write.h secure_getenv.c setenv.c \ +- sig-handler.h sigaction.c signal.in.h sigprocmask.c \ +- $(top_srcdir)/build-aux/snippet/_Noreturn.h \ +- $(top_srcdir)/build-aux/snippet/arg-nonnull.h \ +- $(top_srcdir)/build-aux/snippet/c++defs.h \ +- $(top_srcdir)/build-aux/snippet/warn-on-use.h snprintf.c \ +- stat.c stdarg.in.h stdbool.in.h stddef.in.h stdint.in.h \ +- stdio.in.h stdlib.in.h strerror.c strerror-override.c \ +- strerror-override.h string.in.h strndup.c strnlen.c siglist.h \ +- strsignal.c sys_select.in.h sys_stat.in.h sys_time.in.h \ +- sys_types.in.h sys_wait.in.h tempname.h \ +- $(top_srcdir)/build-aux/config.rpath time.in.h unistd.in.h \ +- unsetenv.c asnprintf.c float+.h printf-args.c printf-args.h \ +- printf-parse.c printf-parse.h vasnprintf.c vasnprintf.h \ +- asprintf.c vasprintf.c verify.h waitpid.c wchar.in.h write.c \ +- xalloc.h xalloc-oversized.h xalloc.h +- +-# The BUILT_SOURCES created by this Makefile snippet are not used via #include +-# statements but through direct file reference. Therefore this snippet must be +-# present in all Makefile.am that need it. This is ensured by the applicability +-# 'all' defined above. +- +-# The BUILT_SOURCES created by this Makefile snippet are not used via #include +-# statements but through direct file reference. Therefore this snippet must be +-# present in all Makefile.am that need it. This is ensured by the applicability +-# 'all' defined above. +-BUILT_SOURCES = $(ALLOCA_H) $(ERRNO_H) fcntl.h $(FLOAT_H) signal.h \ +- arg-nonnull.h c++defs.h warn-on-use.h $(STDARG_H) $(STDBOOL_H) \ +- $(STDDEF_H) $(STDINT_H) stdio.h stdlib.h string.h sys/select.h \ +- sys/stat.h sys/time.h sys/types.h sys/wait.h time.h unistd.h \ +- wchar.h ++ $(top_srcdir)/build-aux/config.rpath intprops.h limits.in.h \ ++ localtime-buffer.c localtime-buffer.h lstat.c malloc.c \ ++ malloca.h malloca.valgrind memchr.c memchr.valgrind mkdtemp.c \ ++ msvc-inval.c msvc-inval.h msvc-nothrow.c msvc-nothrow.h \ ++ pathmax.h raise.c read.c safe-read.h safe-read.c safe-write.h \ ++ secure_getenv.c setenv.c sig-handler.h sigaction.c signal.in.h \ ++ sigprocmask.c _Noreturn.h arg-nonnull.h c++defs.h \ ++ warn-on-use.h snprintf.c stat-w32.c stat-w32.h stat.c \ ++ stdarg.in.h stdbool.in.h stddef.in.h stdint.in.h stdio.in.h \ ++ stdlib.in.h strerror.c strerror-override.c strerror-override.h \ ++ string.in.h strndup.c strnlen.c siglist.h strsignal.c \ ++ sys_select.in.h sys_stat.in.h sys_time.in.h sys_types.in.h \ ++ sys_wait.in.h tempname.h $(top_srcdir)/build-aux/config.rpath \ ++ time.in.h unistd.in.h unsetenv.c asnprintf.c float+.h \ ++ printf-args.c printf-args.h printf-parse.c printf-parse.h \ ++ vasnprintf.c vasnprintf.h asprintf.c vasprintf.c verify.h \ ++ waitpid.c wchar.in.h write.c xalloc.h xalloc-oversized.h \ ++ xalloc.h ++BUILT_SOURCES = $(ALLOCA_H) $(ERRNO_H) fcntl.h $(FLOAT_H) $(LIMITS_H) \ ++ signal.h $(STDARG_H) $(STDBOOL_H) $(STDDEF_H) $(STDINT_H) \ ++ stdio.h stdlib.h string.h sys/select.h sys/stat.h sys/time.h \ ++ sys/types.h sys/wait.h time.h unistd.h wchar.h + SUFFIXES = + MOSTLYCLEANFILES = core *.stackdump alloca.h alloca.h-t errno.h \ +- errno.h-t fcntl.h fcntl.h-t float.h float.h-t signal.h \ +- signal.h-t arg-nonnull.h arg-nonnull.h-t c++defs.h c++defs.h-t \ +- warn-on-use.h warn-on-use.h-t stdarg.h stdarg.h-t stdbool.h \ ++ errno.h-t fcntl.h fcntl.h-t float.h float.h-t limits.h \ ++ limits.h-t signal.h signal.h-t stdarg.h stdarg.h-t stdbool.h \ + stdbool.h-t stddef.h stddef.h-t stdint.h stdint.h-t stdio.h \ + stdio.h-t stdlib.h stdlib.h-t string.h string.h-t sys/select.h \ + sys/select.h-t sys/stat.h sys/stat.h-t sys/time.h sys/time.h-t \ +@@ -1180,25 +1203,27 @@ + CLEANFILES = + DISTCLEANFILES = + MAINTAINERCLEANFILES = ++# No GNU Make output. + AM_CPPFLAGS = + AM_CFLAGS = + libgnu_la_SOURCES = dirname.c basename.c dirname-lgpl.c \ + basename-lgpl.c stripslash.c exitfail.c full-write.h \ +- full-write.c gettext.h glthread/lock.h glthread/lock.c \ +- malloca.c safe-read.c safe-write.c sig-handler.c size_max.h \ +- tempname.c glthread/threadlib.c glthread/tls.h glthread/tls.c \ +- unistd.c xmalloc.c xalloc-die.c xsize.h xsize.c xstrndup.h \ +- xstrndup.c xvasprintf.h xvasprintf.c xasprintf.c ++ full-write.c getprogname.h getprogname.c gettext.h \ ++ glthread/lock.h glthread/lock.c malloca.c safe-read.c \ ++ safe-write.c sig-handler.c size_max.h tempname.c \ ++ glthread/threadlib.c glthread/tls.h glthread/tls.c unistd.c \ ++ xmalloc.c xalloc-die.c xsize.h xsize.c xstrndup.h xstrndup.c \ ++ xvasprintf.h xvasprintf.c xasprintf.c + libgnu_la_LIBADD = $(gl_LTLIBOBJS) + libgnu_la_DEPENDENCIES = $(gl_LTLIBOBJS) + EXTRA_libgnu_la_SOURCES = stripslash.c error.c float.c itold.c \ +- gettimeofday.c lstat.c malloc.c memchr.c mkdtemp.c \ +- msvc-inval.c msvc-nothrow.c raise.c read.c safe-read.c \ +- secure_getenv.c setenv.c sigaction.c sigprocmask.c snprintf.c \ +- stat.c strerror.c strerror-override.c strndup.c strnlen.c \ +- strsignal.c unsetenv.c asnprintf.c printf-args.c \ +- printf-parse.c vasnprintf.c asprintf.c vasprintf.c waitpid.c \ +- write.c ++ gettimeofday.c localtime-buffer.c lstat.c malloc.c memchr.c \ ++ mkdtemp.c msvc-inval.c msvc-nothrow.c raise.c read.c \ ++ safe-read.c secure_getenv.c setenv.c sigaction.c sigprocmask.c \ ++ snprintf.c stat-w32.c stat.c strerror.c strerror-override.c \ ++ strndup.c strnlen.c strsignal.c unsetenv.c asnprintf.c \ ++ printf-args.c printf-parse.c vasnprintf.c asprintf.c \ ++ vasprintf.c waitpid.c write.c + libgnu_la_LDFLAGS = $(AM_LDFLAGS) -no-undefined $(LTLIBINTL) \ + $(LTLIBTHREAD) + +@@ -1208,12 +1233,24 @@ + HAVE_INCLUDE_NEXT = (__GNUC__ || 60000000 <= __DECC_VER) + + # Because this Makefile snippet defines a variable used by other +-# gnulib Makefile snippets, it must be present in all Makefile.am that ++# gnulib Makefile snippets, it must be present in all makefiles that + # need it. This is ensured by the applicability 'all' defined above. +-_NORETURN_H = $(top_srcdir)/build-aux/snippet/_Noreturn.h +-ARG_NONNULL_H = arg-nonnull.h +-CXXDEFS_H = c++defs.h +-WARN_ON_USE_H = warn-on-use.h ++_NORETURN_H = $(srcdir)/_Noreturn.h ++ ++# Because this Makefile snippet defines a variable used by other ++# gnulib Makefile snippets, it must be present in all makefiles that ++# need it. This is ensured by the applicability 'all' defined above. ++ARG_NONNULL_H = $(srcdir)/arg-nonnull.h ++ ++# Because this Makefile snippet defines a variable used by other ++# gnulib Makefile snippets, it must be present in all makefiles that ++# need it. This is ensured by the applicability 'all' defined above. ++CXXDEFS_H = $(srcdir)/c++defs.h ++ ++# Because this Makefile snippet defines a variable used by other ++# gnulib Makefile snippets, it must be present in all makefiles that ++# need it. This is ensured by the applicability 'all' defined above. ++WARN_ON_USE_H = $(srcdir)/warn-on-use.h + all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-recursive + +@@ -1296,8 +1333,10 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/exitfail.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/float.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/full-write.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getprogname.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gettimeofday.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/itold.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/localtime-buffer.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lstat.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/malloc.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/malloca.Plo@am__quote@ +@@ -1317,6 +1356,7 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sigaction.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sigprocmask.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/snprintf.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stat-w32.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stat.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strerror-override.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strerror.Plo@am__quote@ +@@ -1738,6 +1778,22 @@ + @GL_GENERATE_FLOAT_H_FALSE@float.h: $(top_builddir)/config.status + @GL_GENERATE_FLOAT_H_FALSE@ rm -f $@ + ++# We need the following in order to create when the system ++# doesn't have one that is compatible with GNU. ++@GL_GENERATE_LIMITS_H_TRUE@limits.h: limits.in.h $(top_builddir)/config.status ++@GL_GENERATE_LIMITS_H_TRUE@ $(AM_V_GEN)rm -f $@-t $@ && \ ++@GL_GENERATE_LIMITS_H_TRUE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ ++@GL_GENERATE_LIMITS_H_TRUE@ sed -e 's|@''GUARD_PREFIX''@|GL|g' \ ++@GL_GENERATE_LIMITS_H_TRUE@ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ ++@GL_GENERATE_LIMITS_H_TRUE@ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ ++@GL_GENERATE_LIMITS_H_TRUE@ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ ++@GL_GENERATE_LIMITS_H_TRUE@ -e 's|@''NEXT_LIMITS_H''@|$(NEXT_LIMITS_H)|g' \ ++@GL_GENERATE_LIMITS_H_TRUE@ < $(srcdir)/limits.in.h; \ ++@GL_GENERATE_LIMITS_H_TRUE@ } > $@-t && \ ++@GL_GENERATE_LIMITS_H_TRUE@ mv $@-t $@ ++@GL_GENERATE_LIMITS_H_FALSE@limits.h: $(top_builddir)/config.status ++@GL_GENERATE_LIMITS_H_FALSE@ rm -f $@ ++ + # We need the following in order to create when the system + # doesn't have a complete one. + signal.h: signal.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) +@@ -1770,32 +1826,6 @@ + < $(srcdir)/signal.in.h; \ + } > $@-t && \ + mv $@-t $@ +-# The arg-nonnull.h that gets inserted into generated .h files is the same as +-# build-aux/snippet/arg-nonnull.h, except that it has the copyright header cut +-# off. +-arg-nonnull.h: $(top_srcdir)/build-aux/snippet/arg-nonnull.h +- $(AM_V_GEN)rm -f $@-t $@ && \ +- sed -n -e '/GL_ARG_NONNULL/,$$p' \ +- < $(top_srcdir)/build-aux/snippet/arg-nonnull.h \ +- > $@-t && \ +- mv $@-t $@ +-# The c++defs.h that gets inserted into generated .h files is the same as +-# build-aux/snippet/c++defs.h, except that it has the copyright header cut off. +-c++defs.h: $(top_srcdir)/build-aux/snippet/c++defs.h +- $(AM_V_GEN)rm -f $@-t $@ && \ +- sed -n -e '/_GL_CXXDEFS/,$$p' \ +- < $(top_srcdir)/build-aux/snippet/c++defs.h \ +- > $@-t && \ +- mv $@-t $@ +-# The warn-on-use.h that gets inserted into generated .h files is the same as +-# build-aux/snippet/warn-on-use.h, except that it has the copyright header cut +-# off. +-warn-on-use.h: $(top_srcdir)/build-aux/snippet/warn-on-use.h +- $(AM_V_GEN)rm -f $@-t $@ && \ +- sed -n -e '/^.ifndef/,$$p' \ +- < $(top_srcdir)/build-aux/snippet/warn-on-use.h \ +- > $@-t && \ +- mv $@-t $@ + + # We need the following in order to create when the system + # doesn't have one that works with the given compiler. +@@ -1834,6 +1864,7 @@ + @GL_GENERATE_STDDEF_H_TRUE@ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ + @GL_GENERATE_STDDEF_H_TRUE@ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ + @GL_GENERATE_STDDEF_H_TRUE@ -e 's|@''NEXT_STDDEF_H''@|$(NEXT_STDDEF_H)|g' \ ++@GL_GENERATE_STDDEF_H_TRUE@ -e 's|@''HAVE_MAX_ALIGN_T''@|$(HAVE_MAX_ALIGN_T)|g' \ + @GL_GENERATE_STDDEF_H_TRUE@ -e 's|@''HAVE_WCHAR_T''@|$(HAVE_WCHAR_T)|g' \ + @GL_GENERATE_STDDEF_H_TRUE@ -e 's|@''REPLACE_NULL''@|$(REPLACE_NULL)|g' \ + @GL_GENERATE_STDDEF_H_TRUE@ < $(srcdir)/stddef.in.h; \ +@@ -1853,6 +1884,7 @@ + @GL_GENERATE_STDINT_H_TRUE@ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ + @GL_GENERATE_STDINT_H_TRUE@ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ + @GL_GENERATE_STDINT_H_TRUE@ -e 's|@''NEXT_STDINT_H''@|$(NEXT_STDINT_H)|g' \ ++@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_C99_STDINT_H''@/$(HAVE_C99_STDINT_H)/g' \ + @GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_SYS_TYPES_H''@/$(HAVE_SYS_TYPES_H)/g' \ + @GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_INTTYPES_H''@/$(HAVE_INTTYPES_H)/g' \ + @GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_SYS_INTTYPES_H''@/$(HAVE_SYS_INTTYPES_H)/g' \ +@@ -1874,6 +1906,7 @@ + @GL_GENERATE_STDINT_H_TRUE@ -e 's/@''BITSIZEOF_WINT_T''@/$(BITSIZEOF_WINT_T)/g' \ + @GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_SIGNED_WINT_T''@/$(HAVE_SIGNED_WINT_T)/g' \ + @GL_GENERATE_STDINT_H_TRUE@ -e 's/@''WINT_T_SUFFIX''@/$(WINT_T_SUFFIX)/g' \ ++@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''GNULIB_OVERRIDES_WINT_T''@/$(GNULIB_OVERRIDES_WINT_T)/g' \ + @GL_GENERATE_STDINT_H_TRUE@ < $(srcdir)/stdint.in.h; \ + @GL_GENERATE_STDINT_H_TRUE@ } > $@-t && \ + @GL_GENERATE_STDINT_H_TRUE@ mv $@-t $@ +@@ -2028,6 +2061,7 @@ + -e 's/@''GNULIB_PTSNAME''@/$(GNULIB_PTSNAME)/g' \ + -e 's/@''GNULIB_PTSNAME_R''@/$(GNULIB_PTSNAME_R)/g' \ + -e 's/@''GNULIB_PUTENV''@/$(GNULIB_PUTENV)/g' \ ++ -e 's/@''GNULIB_QSORT_R''@/$(GNULIB_QSORT_R)/g' \ + -e 's/@''GNULIB_RANDOM''@/$(GNULIB_RANDOM)/g' \ + -e 's/@''GNULIB_RANDOM_R''@/$(GNULIB_RANDOM_R)/g' \ + -e 's/@''GNULIB_REALLOC_POSIX''@/$(GNULIB_REALLOC_POSIX)/g' \ +@@ -2057,6 +2091,7 @@ + -e 's|@''HAVE_POSIX_OPENPT''@|$(HAVE_POSIX_OPENPT)|g' \ + -e 's|@''HAVE_PTSNAME''@|$(HAVE_PTSNAME)|g' \ + -e 's|@''HAVE_PTSNAME_R''@|$(HAVE_PTSNAME_R)|g' \ ++ -e 's|@''HAVE_QSORT_R''@|$(HAVE_QSORT_R)|g' \ + -e 's|@''HAVE_RANDOM''@|$(HAVE_RANDOM)|g' \ + -e 's|@''HAVE_RANDOM_H''@|$(HAVE_RANDOM_H)|g' \ + -e 's|@''HAVE_RANDOM_R''@|$(HAVE_RANDOM_R)|g' \ +@@ -2079,6 +2114,7 @@ + -e 's|@''REPLACE_PTSNAME''@|$(REPLACE_PTSNAME)|g' \ + -e 's|@''REPLACE_PTSNAME_R''@|$(REPLACE_PTSNAME_R)|g' \ + -e 's|@''REPLACE_PUTENV''@|$(REPLACE_PUTENV)|g' \ ++ -e 's|@''REPLACE_QSORT_R''@|$(REPLACE_QSORT_R)|g' \ + -e 's|@''REPLACE_RANDOM_R''@|$(REPLACE_RANDOM_R)|g' \ + -e 's|@''REPLACE_REALLOC''@|$(REPLACE_REALLOC)|g' \ + -e 's|@''REPLACE_REALPATH''@|$(REPLACE_REALPATH)|g' \ +@@ -2220,6 +2256,7 @@ + -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ + -e 's|@''NEXT_SYS_STAT_H''@|$(NEXT_SYS_STAT_H)|g' \ + -e 's|@''WINDOWS_64_BIT_ST_SIZE''@|$(WINDOWS_64_BIT_ST_SIZE)|g' \ ++ -e 's|@''WINDOWS_STAT_TIMESPEC''@|$(WINDOWS_STAT_TIMESPEC)|g' \ + -e 's/@''GNULIB_FCHMODAT''@/$(GNULIB_FCHMODAT)/g' \ + -e 's/@''GNULIB_FSTAT''@/$(GNULIB_FSTAT)/g' \ + -e 's/@''GNULIB_FSTATAT''@/$(GNULIB_FSTATAT)/g' \ +@@ -2233,6 +2270,7 @@ + -e 's/@''GNULIB_MKNODAT''@/$(GNULIB_MKNODAT)/g' \ + -e 's/@''GNULIB_STAT''@/$(GNULIB_STAT)/g' \ + -e 's/@''GNULIB_UTIMENSAT''@/$(GNULIB_UTIMENSAT)/g' \ ++ -e 's/@''GNULIB_OVERRIDES_STRUCT_STAT''@/$(GNULIB_OVERRIDES_STRUCT_STAT)/g' \ + -e 's|@''HAVE_FCHMODAT''@|$(HAVE_FCHMODAT)|g' \ + -e 's|@''HAVE_FSTATAT''@|$(HAVE_FSTATAT)|g' \ + -e 's|@''HAVE_FUTIMENS''@|$(HAVE_FUTIMENS)|g' \ +@@ -2297,6 +2335,7 @@ + -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ + -e 's|@''NEXT_SYS_TYPES_H''@|$(NEXT_SYS_TYPES_H)|g' \ + -e 's|@''WINDOWS_64_BIT_OFF_T''@|$(WINDOWS_64_BIT_OFF_T)|g' \ ++ -e 's|@''WINDOWS_STAT_INODES''@|$(WINDOWS_STAT_INODES)|g' \ + < $(srcdir)/sys_types.in.h; \ + } > $@-t && \ + mv $@-t $@ +@@ -2329,25 +2368,35 @@ + -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ + -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ + -e 's|@''NEXT_TIME_H''@|$(NEXT_TIME_H)|g' \ +- -e 's/@''GNULIB_GETTIMEOFDAY''@/$(GNULIB_GETTIMEOFDAY)/g' \ ++ -e 's/@''GNULIB_CTIME''@/$(GNULIB_CTIME)/g' \ ++ -e 's/@''GNULIB_LOCALTIME''@/$(GNULIB_LOCALTIME)/g' \ + -e 's/@''GNULIB_MKTIME''@/$(GNULIB_MKTIME)/g' \ + -e 's/@''GNULIB_NANOSLEEP''@/$(GNULIB_NANOSLEEP)/g' \ ++ -e 's/@''GNULIB_STRFTIME''@/$(GNULIB_STRFTIME)/g' \ + -e 's/@''GNULIB_STRPTIME''@/$(GNULIB_STRPTIME)/g' \ + -e 's/@''GNULIB_TIMEGM''@/$(GNULIB_TIMEGM)/g' \ + -e 's/@''GNULIB_TIME_R''@/$(GNULIB_TIME_R)/g' \ ++ -e 's/@''GNULIB_TIME_RZ''@/$(GNULIB_TIME_RZ)/g' \ ++ -e 's/@''GNULIB_TZSET''@/$(GNULIB_TZSET)/g' \ + -e 's|@''HAVE_DECL_LOCALTIME_R''@|$(HAVE_DECL_LOCALTIME_R)|g' \ + -e 's|@''HAVE_NANOSLEEP''@|$(HAVE_NANOSLEEP)|g' \ + -e 's|@''HAVE_STRPTIME''@|$(HAVE_STRPTIME)|g' \ + -e 's|@''HAVE_TIMEGM''@|$(HAVE_TIMEGM)|g' \ ++ -e 's|@''HAVE_TIMEZONE_T''@|$(HAVE_TIMEZONE_T)|g' \ ++ -e 's|@''HAVE_TZSET''@|$(HAVE_TZSET)|g' \ ++ -e 's|@''REPLACE_CTIME''@|$(REPLACE_CTIME)|g' \ + -e 's|@''REPLACE_GMTIME''@|$(REPLACE_GMTIME)|g' \ + -e 's|@''REPLACE_LOCALTIME''@|$(REPLACE_LOCALTIME)|g' \ + -e 's|@''REPLACE_LOCALTIME_R''@|$(REPLACE_LOCALTIME_R)|g' \ + -e 's|@''REPLACE_MKTIME''@|$(REPLACE_MKTIME)|g' \ + -e 's|@''REPLACE_NANOSLEEP''@|$(REPLACE_NANOSLEEP)|g' \ ++ -e 's|@''REPLACE_STRFTIME''@|$(REPLACE_STRFTIME)|g' \ + -e 's|@''REPLACE_TIMEGM''@|$(REPLACE_TIMEGM)|g' \ ++ -e 's|@''REPLACE_TZSET''@|$(REPLACE_TZSET)|g' \ + -e 's|@''PTHREAD_H_DEFINES_STRUCT_TIMESPEC''@|$(PTHREAD_H_DEFINES_STRUCT_TIMESPEC)|g' \ + -e 's|@''SYS_TIME_H_DEFINES_STRUCT_TIMESPEC''@|$(SYS_TIME_H_DEFINES_STRUCT_TIMESPEC)|g' \ + -e 's|@''TIME_H_DEFINES_STRUCT_TIMESPEC''@|$(TIME_H_DEFINES_STRUCT_TIMESPEC)|g' \ ++ -e 's|@''UNISTD_H_DEFINES_STRUCT_TIMESPEC''@|$(UNISTD_H_DEFINES_STRUCT_TIMESPEC)|g' \ + -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ + -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ + -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ +@@ -2408,6 +2457,7 @@ + -e 's/@''GNULIB_SLEEP''@/$(GNULIB_SLEEP)/g' \ + -e 's/@''GNULIB_SYMLINK''@/$(GNULIB_SYMLINK)/g' \ + -e 's/@''GNULIB_SYMLINKAT''@/$(GNULIB_SYMLINKAT)/g' \ ++ -e 's/@''GNULIB_TRUNCATE''@/$(GNULIB_TRUNCATE)/g' \ + -e 's/@''GNULIB_TTYNAME_R''@/$(GNULIB_TTYNAME_R)/g' \ + -e 's/@''GNULIB_UNISTD_H_GETOPT''@/0$(GNULIB_GL_UNISTD_H_GETOPT)/g' \ + -e 's/@''GNULIB_UNISTD_H_NONBLOCKING''@/$(GNULIB_UNISTD_H_NONBLOCKING)/g' \ +@@ -2430,7 +2480,6 @@ + -e 's|@''HAVE_GETDTABLESIZE''@|$(HAVE_GETDTABLESIZE)|g' \ + -e 's|@''HAVE_GETGROUPS''@|$(HAVE_GETGROUPS)|g' \ + -e 's|@''HAVE_GETHOSTNAME''@|$(HAVE_GETHOSTNAME)|g' \ +- -e 's|@''HAVE_GETLOGIN''@|$(HAVE_GETLOGIN)|g' \ + -e 's|@''HAVE_GETPAGESIZE''@|$(HAVE_GETPAGESIZE)|g' \ + -e 's|@''HAVE_GROUP_MEMBER''@|$(HAVE_GROUP_MEMBER)|g' \ + -e 's|@''HAVE_LCHOWN''@|$(HAVE_LCHOWN)|g' \ +@@ -2446,12 +2495,14 @@ + -e 's|@''HAVE_SLEEP''@|$(HAVE_SLEEP)|g' \ + -e 's|@''HAVE_SYMLINK''@|$(HAVE_SYMLINK)|g' \ + -e 's|@''HAVE_SYMLINKAT''@|$(HAVE_SYMLINKAT)|g' \ ++ -e 's|@''HAVE_TRUNCATE''@|$(HAVE_TRUNCATE)|g' \ + -e 's|@''HAVE_UNLINKAT''@|$(HAVE_UNLINKAT)|g' \ + -e 's|@''HAVE_USLEEP''@|$(HAVE_USLEEP)|g' \ + -e 's|@''HAVE_DECL_ENVIRON''@|$(HAVE_DECL_ENVIRON)|g' \ + -e 's|@''HAVE_DECL_FCHDIR''@|$(HAVE_DECL_FCHDIR)|g' \ + -e 's|@''HAVE_DECL_FDATASYNC''@|$(HAVE_DECL_FDATASYNC)|g' \ + -e 's|@''HAVE_DECL_GETDOMAINNAME''@|$(HAVE_DECL_GETDOMAINNAME)|g' \ ++ -e 's|@''HAVE_DECL_GETLOGIN''@|$(HAVE_DECL_GETLOGIN)|g' \ + -e 's|@''HAVE_DECL_GETLOGIN_R''@|$(HAVE_DECL_GETLOGIN_R)|g' \ + -e 's|@''HAVE_DECL_GETPAGESIZE''@|$(HAVE_DECL_GETPAGESIZE)|g' \ + -e 's|@''HAVE_DECL_GETUSERSHELL''@|$(HAVE_DECL_GETUSERSHELL)|g' \ +@@ -2481,9 +2532,12 @@ + -e 's|@''REPLACE_PWRITE''@|$(REPLACE_PWRITE)|g' \ + -e 's|@''REPLACE_READ''@|$(REPLACE_READ)|g' \ + -e 's|@''REPLACE_READLINK''@|$(REPLACE_READLINK)|g' \ ++ -e 's|@''REPLACE_READLINKAT''@|$(REPLACE_READLINKAT)|g' \ + -e 's|@''REPLACE_RMDIR''@|$(REPLACE_RMDIR)|g' \ + -e 's|@''REPLACE_SLEEP''@|$(REPLACE_SLEEP)|g' \ + -e 's|@''REPLACE_SYMLINK''@|$(REPLACE_SYMLINK)|g' \ ++ -e 's|@''REPLACE_SYMLINKAT''@|$(REPLACE_SYMLINKAT)|g' \ ++ -e 's|@''REPLACE_TRUNCATE''@|$(REPLACE_TRUNCATE)|g' \ + -e 's|@''REPLACE_TTYNAME_R''@|$(REPLACE_TTYNAME_R)|g' \ + -e 's|@''REPLACE_UNLINK''@|$(REPLACE_UNLINK)|g' \ + -e 's|@''REPLACE_UNLINKAT''@|$(REPLACE_UNLINKAT)|g' \ +@@ -2509,6 +2563,8 @@ + -e 's|@''HAVE_FEATURES_H''@|$(HAVE_FEATURES_H)|g' \ + -e 's|@''NEXT_WCHAR_H''@|$(NEXT_WCHAR_H)|g' \ + -e 's|@''HAVE_WCHAR_H''@|$(HAVE_WCHAR_H)|g' \ ++ -e 's/@''HAVE_CRTDEFS_H''@/$(HAVE_CRTDEFS_H)/g' \ ++ -e 's/@''GNULIB_OVERRIDES_WINT_T''@/$(GNULIB_OVERRIDES_WINT_T)/g' \ + -e 's/@''GNULIB_BTOWC''@/$(GNULIB_BTOWC)/g' \ + -e 's/@''GNULIB_WCTOB''@/$(GNULIB_WCTOB)/g' \ + -e 's/@''GNULIB_MBSINIT''@/$(GNULIB_MBSINIT)/g' \ +@@ -2548,6 +2604,7 @@ + -e 's/@''GNULIB_WCSSTR''@/$(GNULIB_WCSSTR)/g' \ + -e 's/@''GNULIB_WCSTOK''@/$(GNULIB_WCSTOK)/g' \ + -e 's/@''GNULIB_WCSWIDTH''@/$(GNULIB_WCSWIDTH)/g' \ ++ -e 's/@''GNULIB_WCSFTIME''@/$(GNULIB_WCSFTIME)/g' \ + < $(srcdir)/wchar.in.h | \ + sed -e 's|@''HAVE_WINT_T''@|$(HAVE_WINT_T)|g' \ + -e 's|@''HAVE_BTOWC''@|$(HAVE_BTOWC)|g' \ +@@ -2587,6 +2644,7 @@ + -e 's|@''HAVE_WCSSTR''@|$(HAVE_WCSSTR)|g' \ + -e 's|@''HAVE_WCSTOK''@|$(HAVE_WCSTOK)|g' \ + -e 's|@''HAVE_WCSWIDTH''@|$(HAVE_WCSWIDTH)|g' \ ++ -e 's|@''HAVE_WCSFTIME''@|$(HAVE_WCSFTIME)|g' \ + -e 's|@''HAVE_DECL_WCTOB''@|$(HAVE_DECL_WCTOB)|g' \ + -e 's|@''HAVE_DECL_WCWIDTH''@|$(HAVE_DECL_WCWIDTH)|g' \ + | \ +@@ -2603,6 +2661,7 @@ + -e 's|@''REPLACE_WCSNRTOMBS''@|$(REPLACE_WCSNRTOMBS)|g' \ + -e 's|@''REPLACE_WCWIDTH''@|$(REPLACE_WCWIDTH)|g' \ + -e 's|@''REPLACE_WCSWIDTH''@|$(REPLACE_WCSWIDTH)|g' \ ++ -e 's|@''REPLACE_WCSFTIME''@|$(REPLACE_WCSFTIME)|g' \ + -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ + -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ + -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \ +diff -Naur libpipeline-1.5.0-orig/gnulib/lib/malloc.c libpipeline-1.5.0/gnulib/lib/malloc.c +--- libpipeline-1.5.0-orig/gnulib/lib/malloc.c 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/lib/malloc.c 2018-07-02 13:09:59.520436300 +0300 +@@ -1,6 +1,6 @@ + /* malloc() function that is glibc compatible. + +- Copyright (C) 1997-1998, 2006-2007, 2009-2014 Free Software Foundation, Inc. ++ Copyright (C) 1997-1998, 2006-2007, 2009-2017 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 +diff -Naur libpipeline-1.5.0-orig/gnulib/lib/malloca.c libpipeline-1.5.0/gnulib/lib/malloca.c +--- libpipeline-1.5.0-orig/gnulib/lib/malloca.c 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/lib/malloca.c 2018-07-02 13:09:59.530436300 +0300 +@@ -1,5 +1,5 @@ + /* Safe automatic memory allocation. +- Copyright (C) 2003, 2006-2007, 2009-2014 Free Software Foundation, Inc. ++ Copyright (C) 2003, 2006-2007, 2009-2017 Free Software Foundation, Inc. + Written by Bruno Haible , 2003. + + This program is free software; you can redistribute it and/or modify +diff -Naur libpipeline-1.5.0-orig/gnulib/lib/malloca.h libpipeline-1.5.0/gnulib/lib/malloca.h +--- libpipeline-1.5.0-orig/gnulib/lib/malloca.h 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/lib/malloca.h 2018-07-02 13:09:59.530436300 +0300 +@@ -1,5 +1,5 @@ + /* Safe automatic memory allocation. +- Copyright (C) 2003-2007, 2009-2014 Free Software Foundation, Inc. ++ Copyright (C) 2003-2007, 2009-2017 Free Software Foundation, Inc. + Written by Bruno Haible , 2003. + + This program is free software; you can redistribute it and/or modify +@@ -21,6 +21,9 @@ + #include + #include + #include ++#include ++ ++#include "xalloc-oversized.h" + + + #ifdef __cplusplus +@@ -73,15 +76,7 @@ + It allocates an array of N objects, each with S bytes of memory, + on the stack. S must be positive and N must be nonnegative. + The array must be freed using freea() before the function returns. */ +-#if 1 +-/* Cf. the definition of xalloc_oversized. */ +-# define nmalloca(n, s) \ +- ((n) > (size_t) (sizeof (ptrdiff_t) <= sizeof (size_t) ? -1 : -2) / (s) \ +- ? NULL \ +- : malloca ((n) * (s))) +-#else +-extern void * nmalloca (size_t n, size_t s); +-#endif ++#define nmalloca(n, s) (xalloc_oversized (n, s) ? NULL : malloca ((n) * (s))) + + + #ifdef __cplusplus +diff -Naur libpipeline-1.5.0-orig/gnulib/lib/memchr.c libpipeline-1.5.0/gnulib/lib/memchr.c +--- libpipeline-1.5.0-orig/gnulib/lib/memchr.c 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/lib/memchr.c 2018-07-02 13:09:59.530436300 +0300 +@@ -1,4 +1,4 @@ +-/* Copyright (C) 1991, 1993, 1996-1997, 1999-2000, 2003-2004, 2006, 2008-2014 ++/* Copyright (C) 1991, 1993, 1996-1997, 1999-2000, 2003-2004, 2006, 2008-2017 + Free Software Foundation, Inc. + + Based on strlen implementation by Torbjorn Granlund (tege@sics.se), +diff -Naur libpipeline-1.5.0-orig/gnulib/lib/mkdtemp.c libpipeline-1.5.0/gnulib/lib/mkdtemp.c +--- libpipeline-1.5.0-orig/gnulib/lib/mkdtemp.c 2014-11-08 16:53:37.000000000 +0300 ++++ libpipeline-1.5.0/gnulib/lib/mkdtemp.c 2018-07-02 13:09:59.540436300 +0300 +@@ -1,4 +1,4 @@ +-/* Copyright (C) 1999, 2001-2003, 2006-2007, 2009-2014 Free Software ++/* Copyright (C) 1999, 2001-2003, 2006-2007, 2009-2017 Free Software + Foundation, Inc. + This file is part of the GNU C Library. + +diff -Naur libpipeline-1.5.0-orig/gnulib/lib/msvc-inval.c libpipeline-1.5.0/gnulib/lib/msvc-inval.c +--- libpipeline-1.5.0-orig/gnulib/lib/msvc-inval.c 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/lib/msvc-inval.c 2018-07-02 13:09:59.540436300 +0300 +@@ -1,5 +1,5 @@ + /* Invalid parameter handler for MSVC runtime libraries. +- Copyright (C) 2011-2014 Free Software Foundation, Inc. ++ Copyright (C) 2011-2017 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 +diff -Naur libpipeline-1.5.0-orig/gnulib/lib/msvc-inval.h libpipeline-1.5.0/gnulib/lib/msvc-inval.h +--- libpipeline-1.5.0-orig/gnulib/lib/msvc-inval.h 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/lib/msvc-inval.h 2018-07-02 13:09:59.540436300 +0300 +@@ -1,5 +1,5 @@ + /* Invalid parameter handler for MSVC runtime libraries. +- Copyright (C) 2011-2014 Free Software Foundation, Inc. ++ Copyright (C) 2011-2017 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 +diff -Naur libpipeline-1.5.0-orig/gnulib/lib/msvc-nothrow.c libpipeline-1.5.0/gnulib/lib/msvc-nothrow.c +--- libpipeline-1.5.0-orig/gnulib/lib/msvc-nothrow.c 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/lib/msvc-nothrow.c 2018-07-02 13:09:59.540436300 +0300 +@@ -1,6 +1,6 @@ + /* Wrappers that don't throw invalid parameter notifications + with MSVC runtime libraries. +- Copyright (C) 2011-2014 Free Software Foundation, Inc. ++ Copyright (C) 2011-2017 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 +@@ -24,7 +24,9 @@ + #define WIN32_LEAN_AND_MEAN + #include + +-#include "msvc-inval.h" ++#if HAVE_MSVC_INVALID_PARAMETER_HANDLER ++# include "msvc-inval.h" ++#endif + + #undef _get_osfhandle + +diff -Naur libpipeline-1.5.0-orig/gnulib/lib/msvc-nothrow.h libpipeline-1.5.0/gnulib/lib/msvc-nothrow.h +--- libpipeline-1.5.0-orig/gnulib/lib/msvc-nothrow.h 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/lib/msvc-nothrow.h 2018-07-02 13:09:59.550436300 +0300 +@@ -1,6 +1,6 @@ + /* Wrappers that don't throw invalid parameter notifications + with MSVC runtime libraries. +- Copyright (C) 2011-2014 Free Software Foundation, Inc. ++ Copyright (C) 2011-2017 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 +diff -Naur libpipeline-1.5.0-orig/gnulib/lib/pathmax.h libpipeline-1.5.0/gnulib/lib/pathmax.h +--- libpipeline-1.5.0-orig/gnulib/lib/pathmax.h 2014-11-08 16:53:37.000000000 +0300 ++++ libpipeline-1.5.0/gnulib/lib/pathmax.h 2018-07-02 13:09:59.550436300 +0300 +@@ -1,5 +1,5 @@ + /* Define PATH_MAX somehow. Requires sys/types.h. +- Copyright (C) 1992, 1999, 2001, 2003, 2005, 2009-2014 Free Software ++ Copyright (C) 1992, 1999, 2001, 2003, 2005, 2009-2017 Free Software + Foundation, Inc. + + This program is free software; you can redistribute it and/or modify +diff -Naur libpipeline-1.5.0-orig/gnulib/lib/printf-args.c libpipeline-1.5.0/gnulib/lib/printf-args.c +--- libpipeline-1.5.0-orig/gnulib/lib/printf-args.c 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/lib/printf-args.c 2018-07-02 13:09:59.550436300 +0300 +@@ -1,5 +1,5 @@ + /* Decomposed printf argument list. +- Copyright (C) 1999, 2002-2003, 2005-2007, 2009-2014 Free Software ++ Copyright (C) 1999, 2002-2003, 2005-2007, 2009-2017 Free Software + Foundation, Inc. + + This program is free software; you can redistribute it and/or modify +diff -Naur libpipeline-1.5.0-orig/gnulib/lib/printf-args.h libpipeline-1.5.0/gnulib/lib/printf-args.h +--- libpipeline-1.5.0-orig/gnulib/lib/printf-args.h 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/lib/printf-args.h 2018-07-02 13:09:59.550436300 +0300 +@@ -1,5 +1,5 @@ + /* Decomposed printf argument list. +- Copyright (C) 1999, 2002-2003, 2006-2007, 2011-2014 Free Software ++ Copyright (C) 1999, 2002-2003, 2006-2007, 2011-2017 Free Software + Foundation, Inc. + + This program is free software; you can redistribute it and/or modify +diff -Naur libpipeline-1.5.0-orig/gnulib/lib/printf-parse.c libpipeline-1.5.0/gnulib/lib/printf-parse.c +--- libpipeline-1.5.0-orig/gnulib/lib/printf-parse.c 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/lib/printf-parse.c 2018-07-02 13:09:59.560436400 +0300 +@@ -1,5 +1,5 @@ + /* Formatted output to strings. +- Copyright (C) 1999-2000, 2002-2003, 2006-2014 Free Software Foundation, Inc. ++ Copyright (C) 1999-2000, 2002-2003, 2006-2017 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 +diff -Naur libpipeline-1.5.0-orig/gnulib/lib/printf-parse.h libpipeline-1.5.0/gnulib/lib/printf-parse.h +--- libpipeline-1.5.0-orig/gnulib/lib/printf-parse.h 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/lib/printf-parse.h 2018-07-02 13:09:59.560436400 +0300 +@@ -1,5 +1,5 @@ + /* Parse printf format string. +- Copyright (C) 1999, 2002-2003, 2005, 2007, 2010-2014 Free Software ++ Copyright (C) 1999, 2002-2003, 2005, 2007, 2010-2017 Free Software + Foundation, Inc. + + This program is free software; you can redistribute it and/or modify +diff -Naur libpipeline-1.5.0-orig/gnulib/lib/raise.c libpipeline-1.5.0/gnulib/lib/raise.c +--- libpipeline-1.5.0-orig/gnulib/lib/raise.c 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/lib/raise.c 2018-07-02 13:09:59.560436400 +0300 +@@ -1,6 +1,6 @@ + /* Provide a non-threads replacement for the POSIX raise function. + +- Copyright (C) 2002-2003, 2005-2006, 2009-2014 Free Software Foundation, Inc. ++ Copyright (C) 2002-2003, 2005-2006, 2009-2017 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 +@@ -27,7 +27,9 @@ + + # include + +-# include "msvc-inval.h" ++# if HAVE_MSVC_INVALID_PARAMETER_HANDLER ++# include "msvc-inval.h" ++# endif + + # undef raise + +diff -Naur libpipeline-1.5.0-orig/gnulib/lib/read.c libpipeline-1.5.0/gnulib/lib/read.c +--- libpipeline-1.5.0-orig/gnulib/lib/read.c 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/lib/read.c 2018-07-02 13:09:59.560436400 +0300 +@@ -1,5 +1,5 @@ + /* POSIX compatible read() function. +- Copyright (C) 2008-2014 Free Software Foundation, Inc. ++ Copyright (C) 2008-2017 Free Software Foundation, Inc. + Written by Bruno Haible , 2011. + + This program is free software: you can redistribute it and/or modify +@@ -28,8 +28,14 @@ + # define WIN32_LEAN_AND_MEAN /* avoid including junk */ + # include + +-# include "msvc-inval.h" +-# include "msvc-nothrow.h" ++# if HAVE_MSVC_INVALID_PARAMETER_HANDLER ++# include "msvc-inval.h" ++# endif ++# if GNULIB_MSVC_NOTHROW ++# include "msvc-nothrow.h" ++# else ++# include ++# endif + + # undef read + +diff -Naur libpipeline-1.5.0-orig/gnulib/lib/safe-read.c libpipeline-1.5.0/gnulib/lib/safe-read.c +--- libpipeline-1.5.0-orig/gnulib/lib/safe-read.c 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/lib/safe-read.c 2018-07-02 13:09:59.570436400 +0300 +@@ -1,6 +1,6 @@ + /* An interface to read and write that retries after interrupts. + +- Copyright (C) 1993-1994, 1998, 2002-2006, 2009-2014 Free Software ++ Copyright (C) 1993-1994, 1998, 2002-2006, 2009-2017 Free Software + Foundation, Inc. + + This program is free software: you can redistribute it and/or modify +diff -Naur libpipeline-1.5.0-orig/gnulib/lib/safe-read.h libpipeline-1.5.0/gnulib/lib/safe-read.h +--- libpipeline-1.5.0-orig/gnulib/lib/safe-read.h 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/lib/safe-read.h 2018-07-02 13:09:59.570436400 +0300 +@@ -1,5 +1,5 @@ + /* An interface to read() that retries after interrupts. +- Copyright (C) 2002, 2006, 2009-2014 Free Software Foundation, Inc. ++ Copyright (C) 2002, 2006, 2009-2017 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 +diff -Naur libpipeline-1.5.0-orig/gnulib/lib/safe-write.c libpipeline-1.5.0/gnulib/lib/safe-write.c +--- libpipeline-1.5.0-orig/gnulib/lib/safe-write.c 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/lib/safe-write.c 2018-07-02 13:09:59.570436400 +0300 +@@ -1,5 +1,5 @@ + /* An interface to write that retries after interrupts. +- Copyright (C) 2002, 2009-2014 Free Software Foundation, Inc. ++ Copyright (C) 2002, 2009-2017 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 +diff -Naur libpipeline-1.5.0-orig/gnulib/lib/safe-write.h libpipeline-1.5.0/gnulib/lib/safe-write.h +--- libpipeline-1.5.0-orig/gnulib/lib/safe-write.h 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/lib/safe-write.h 2018-07-02 13:09:59.570436400 +0300 +@@ -1,5 +1,5 @@ + /* An interface to write() that retries after interrupts. +- Copyright (C) 2002, 2009-2014 Free Software Foundation, Inc. ++ Copyright (C) 2002, 2009-2017 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 +diff -Naur libpipeline-1.5.0-orig/gnulib/lib/secure_getenv.c libpipeline-1.5.0/gnulib/lib/secure_getenv.c +--- libpipeline-1.5.0-orig/gnulib/lib/secure_getenv.c 2014-11-08 16:53:37.000000000 +0300 ++++ libpipeline-1.5.0/gnulib/lib/secure_getenv.c 2018-07-02 13:09:59.580436400 +0300 +@@ -1,6 +1,6 @@ +-/* Look up an environment variable more securely. ++/* Look up an environment variable, returning NULL in insecure situations. + +- Copyright 2013-2014 Free Software Foundation, Inc. ++ Copyright 2013-2017 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 +@@ -20,22 +20,35 @@ + #include + + #if !HAVE___SECURE_GETENV +-# if HAVE_ISSETUGID ++# if HAVE_ISSETUGID || (HAVE_GETUID && HAVE_GETEUID && HAVE_GETGID && HAVE_GETEGID) + # include +-# else +-# undef issetugid +-# define issetugid() 1 + # endif + #endif + + char * + secure_getenv (char const *name) + { +-#if HAVE___SECURE_GETENV ++#if HAVE___SECURE_GETENV /* glibc */ + return __secure_getenv (name); +-#else ++#elif HAVE_ISSETUGID /* OS X, FreeBSD, NetBSD, OpenBSD */ + if (issetugid ()) +- return 0; ++ return NULL; ++ return getenv (name); ++#elif HAVE_GETUID && HAVE_GETEUID && HAVE_GETGID && HAVE_GETEGID /* other Unix */ ++ if (geteuid () != getuid () || getegid () != getgid ()) ++ return NULL; + return getenv (name); ++#elif (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ /* native Windows */ ++ /* On native Windows, there is no such concept as setuid or setgid binaries. ++ - Programs launched as system services have high privileges, but they don't ++ inherit environment variables from a user. ++ - Programs launched by a user with "Run as Administrator" have high ++ privileges and use the environment variables, but the user has been asked ++ whether he agrees. ++ - Programs launched by a user without "Run as Administrator" cannot gain ++ high privileges, therefore there is no risk. */ ++ return getenv (name); ++#else ++ return NULL; + #endif + } +diff -Naur libpipeline-1.5.0-orig/gnulib/lib/setenv.c libpipeline-1.5.0/gnulib/lib/setenv.c +--- libpipeline-1.5.0-orig/gnulib/lib/setenv.c 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/lib/setenv.c 2018-07-02 13:09:59.580436400 +0300 +@@ -1,4 +1,4 @@ +-/* Copyright (C) 1992, 1995-2003, 2005-2014 Free Software Foundation, Inc. ++/* Copyright (C) 1992, 1995-2003, 2005-2017 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + This program is free software: you can redistribute it and/or modify +diff -Naur libpipeline-1.5.0-orig/gnulib/lib/sigaction.c libpipeline-1.5.0/gnulib/lib/sigaction.c +--- libpipeline-1.5.0-orig/gnulib/lib/sigaction.c 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/lib/sigaction.c 2018-07-02 13:09:59.580436400 +0300 +@@ -1,5 +1,5 @@ + /* POSIX compatible signal blocking. +- Copyright (C) 2008-2014 Free Software Foundation, Inc. ++ Copyright (C) 2008-2017 Free Software Foundation, Inc. + Written by Eric Blake , 2008. + + This program is free software: you can redistribute it and/or modify +diff -Naur libpipeline-1.5.0-orig/gnulib/lib/sig-handler.h libpipeline-1.5.0/gnulib/lib/sig-handler.h +--- libpipeline-1.5.0-orig/gnulib/lib/sig-handler.h 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/lib/sig-handler.h 2018-07-02 13:09:59.580436400 +0300 +@@ -1,6 +1,6 @@ + /* Convenience declarations when working with . + +- Copyright (C) 2008-2014 Free Software Foundation, Inc. ++ Copyright (C) 2008-2017 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 +@@ -34,7 +34,7 @@ + /* Return the handler of a signal, as a sa_handler_t value regardless + of its true type. The resulting function can be compared to + special values like SIG_IGN but it is not portable to call it. */ +-SIG_HANDLER_INLINE sa_handler_t ++SIG_HANDLER_INLINE sa_handler_t _GL_ATTRIBUTE_PURE + get_handler (struct sigaction const *a) + { + #ifdef SA_SIGINFO +diff -Naur libpipeline-1.5.0-orig/gnulib/lib/siglist.h libpipeline-1.5.0/gnulib/lib/siglist.h +--- libpipeline-1.5.0-orig/gnulib/lib/siglist.h 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/lib/siglist.h 2018-07-02 13:09:59.590436400 +0300 +@@ -1,5 +1,5 @@ + /* Canonical list of all signal names. +- Copyright (C) 1996-1999, 2008-2014 Free Software Foundation, Inc. ++ Copyright (C) 1996-1999, 2008-2017 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + This program is free software: you can redistribute it and/or modify +diff -Naur libpipeline-1.5.0-orig/gnulib/lib/signal.in.h libpipeline-1.5.0/gnulib/lib/signal.in.h +--- libpipeline-1.5.0-orig/gnulib/lib/signal.in.h 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/lib/signal.in.h 2018-07-02 13:09:59.590436400 +0300 +@@ -1,6 +1,6 @@ + /* A GNU-like . + +- Copyright (C) 2006-2014 Free Software Foundation, Inc. ++ Copyright (C) 2006-2017 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 +@@ -55,11 +55,13 @@ + #ifndef _@GUARD_PREFIX@_SIGNAL_H + #define _@GUARD_PREFIX@_SIGNAL_H + +-/* Mac OS X 10.3, FreeBSD 6.4, OpenBSD 3.8, OSF/1 4.0, Solaris 2.6 declare +- pthread_sigmask in , not in . ++/* Mac OS X 10.3, FreeBSD 6.4, OpenBSD 3.8, OSF/1 4.0, Solaris 2.6, Android ++ declare pthread_sigmask in , not in . + But avoid namespace pollution on glibc systems.*/ + #if (@GNULIB_PTHREAD_SIGMASK@ || defined GNULIB_POSIXCHECK) \ +- && ((defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __OpenBSD__ || defined __osf__ || defined __sun) \ ++ && ((defined __APPLE__ && defined __MACH__) \ ++ || defined __FreeBSD__ || defined __OpenBSD__ || defined __osf__ \ ++ || defined __sun || defined __ANDROID__) \ + && ! defined __GLIBC__ + # include + #endif +diff -Naur libpipeline-1.5.0-orig/gnulib/lib/sigprocmask.c libpipeline-1.5.0/gnulib/lib/sigprocmask.c +--- libpipeline-1.5.0-orig/gnulib/lib/sigprocmask.c 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/lib/sigprocmask.c 2018-07-02 13:09:59.590436400 +0300 +@@ -1,5 +1,5 @@ + /* POSIX compatible signal blocking. +- Copyright (C) 2006-2014 Free Software Foundation, Inc. ++ Copyright (C) 2006-2017 Free Software Foundation, Inc. + Written by Bruno Haible , 2006. + + This program is free software: you can redistribute it and/or modify +diff -Naur libpipeline-1.5.0-orig/gnulib/lib/size_max.h libpipeline-1.5.0/gnulib/lib/size_max.h +--- libpipeline-1.5.0-orig/gnulib/lib/size_max.h 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/lib/size_max.h 2018-07-02 13:09:59.590436400 +0300 +@@ -1,5 +1,5 @@ + /* size_max.h -- declare SIZE_MAX through system headers +- Copyright (C) 2005-2006, 2009-2014 Free Software Foundation, Inc. ++ Copyright (C) 2005-2006, 2009-2017 Free Software Foundation, Inc. + Written by Simon Josefsson. + + This program is free software; you can redistribute it and/or modify +diff -Naur libpipeline-1.5.0-orig/gnulib/lib/snprintf.c libpipeline-1.5.0/gnulib/lib/snprintf.c +--- libpipeline-1.5.0-orig/gnulib/lib/snprintf.c 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/lib/snprintf.c 2018-07-02 13:09:59.590436400 +0300 +@@ -1,5 +1,5 @@ + /* Formatted output to strings. +- Copyright (C) 2004, 2006-2014 Free Software Foundation, Inc. ++ Copyright (C) 2004, 2006-2017 Free Software Foundation, Inc. + Written by Simon Josefsson and Paul Eggert. + + This program is free software; you can redistribute it and/or modify +diff -Naur libpipeline-1.5.0-orig/gnulib/lib/stat.c libpipeline-1.5.0/gnulib/lib/stat.c +--- libpipeline-1.5.0-orig/gnulib/lib/stat.c 2014-11-08 16:53:37.000000000 +0300 ++++ libpipeline-1.5.0/gnulib/lib/stat.c 2018-07-02 13:09:59.600436400 +0300 +@@ -1,5 +1,5 @@ + /* Work around platform bugs in stat. +- Copyright (C) 2009-2014 Free Software Foundation, Inc. ++ Copyright (C) 2009-2017 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 +@@ -14,7 +14,7 @@ + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +-/* written by Eric Blake */ ++/* Written by Eric Blake and Bruno Haible. */ + + /* If the user's config.h happens to include , let it include only + the system's here, so that orig_stat doesn't recurse to +@@ -28,26 +28,19 @@ + #undef __need_system_sys_stat_h + + #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ +-# if _GL_WINDOWS_64_BIT_ST_SIZE +-# undef stat /* avoid warning on mingw64 with _FILE_OFFSET_BITS=64 */ +-# define stat _stati64 +-# define REPLACE_FUNC_STAT_DIR 1 +-# undef REPLACE_FUNC_STAT_FILE +-# elif REPLACE_FUNC_STAT_FILE +-/* mingw64 has a broken stat() function, based on _stat(), in libmingwex.a. +- Bypass it. */ +-# define stat _stat +-# define REPLACE_FUNC_STAT_DIR 1 +-# undef REPLACE_FUNC_STAT_FILE +-# endif ++# define WINDOWS_NATIVE + #endif + ++#if !defined WINDOWS_NATIVE ++ + static int + orig_stat (const char *filename, struct stat *buf) + { + return stat (filename, buf); + } + ++#endif ++ + /* Specification. */ + /* Write "sys/stat.h" here, not , otherwise OSF/1 5.1 DTK cc + eliminates this include because of the preliminary #include +@@ -58,16 +51,42 @@ + #include + #include + #include +-#include "dosname.h" ++#include "filename.h" ++#include "malloca.h" + #include "verify.h" + +-#if REPLACE_FUNC_STAT_DIR +-# include "pathmax.h" +- /* The only known systems where REPLACE_FUNC_STAT_DIR is needed also +- have a constant PATH_MAX. */ +-# ifndef PATH_MAX +-# error "Please port this replacement to your platform" +-# endif ++#ifdef WINDOWS_NATIVE ++# define WIN32_LEAN_AND_MEAN ++# include ++# include "stat-w32.h" ++#endif ++ ++#ifdef WINDOWS_NATIVE ++/* Return TRUE if the given file name denotes an UNC root. */ ++static BOOL ++is_unc_root (const char *rname) ++{ ++ /* Test whether it has the syntax '\\server\share'. */ ++ if (ISSLASH (rname[0]) && ISSLASH (rname[1])) ++ { ++ /* It starts with two slashes. Find the next slash. */ ++ const char *p = rname + 2; ++ const char *q = p; ++ while (*q != '\0' && !ISSLASH (*q)) ++ q++; ++ if (q > p && *q != '\0') ++ { ++ /* Found the next slash at q. */ ++ q++; ++ const char *r = q; ++ while (*r != '\0' && !ISSLASH (*r)) ++ r++; ++ if (r > q && *r == '\0') ++ return TRUE; ++ } ++ } ++ return FALSE; ++} + #endif + + /* Store information about NAME into ST. Work around bugs with +@@ -77,62 +96,328 @@ + correctly. */ + + int +-rpl_stat (char const *name, struct stat *st) ++rpl_stat (char const *name, struct stat *buf) + { +- int result = orig_stat (name, st); +-#if REPLACE_FUNC_STAT_FILE +- /* Solaris 9 mistakenly succeeds when given a non-directory with a +- trailing slash. */ +- if (result == 0 && !S_ISDIR (st->st_mode)) ++#ifdef WINDOWS_NATIVE ++ /* Fill the fields ourselves, because the original stat function returns ++ values for st_atime, st_mtime, st_ctime that depend on the current time ++ zone. See ++ */ ++ /* XXX Should we convert to wchar_t* and prepend '\\?\', in order to work ++ around length limitations ++ ? */ ++ ++ /* POSIX ++ specifies: "More than two leading characters shall be treated as ++ a single character." */ ++ if (ISSLASH (name[0]) && ISSLASH (name[1]) && ISSLASH (name[2])) + { +- size_t len = strlen (name); +- if (ISSLASH (name[len - 1])) ++ name += 2; ++ while (ISSLASH (name[1])) ++ name++; ++ } ++ ++ size_t len = strlen (name); ++ size_t drive_prefix_len = (HAS_DEVICE (name) ? 2 : 0); ++ ++ /* Remove trailing slashes (except the very first one, at position ++ drive_prefix_len), but remember their presence. */ ++ size_t rlen; ++ bool check_dir = false; ++ ++ rlen = len; ++ while (rlen > drive_prefix_len && ISSLASH (name[rlen-1])) ++ { ++ check_dir = true; ++ if (rlen == drive_prefix_len + 1) ++ break; ++ rlen--; ++ } ++ ++ /* Handle '' and 'C:'. */ ++ if (!check_dir && rlen == drive_prefix_len) ++ { ++ errno = ENOENT; ++ return -1; ++ } ++ ++ /* Handle '\\'. */ ++ if (rlen == 1 && ISSLASH (name[0]) && len >= 2) ++ { ++ errno = ENOENT; ++ return -1; ++ } ++ ++ const char *rname; ++ char *malloca_rname; ++ if (rlen == len) ++ { ++ rname = name; ++ malloca_rname = NULL; ++ } ++ else ++ { ++ malloca_rname = malloca (rlen + 1); ++ if (malloca_rname == NULL) + { +- errno = ENOTDIR; ++ errno = ENOMEM; + return -1; + } ++ memcpy (malloca_rname, name, rlen); ++ malloca_rname[rlen] = '\0'; ++ rname = malloca_rname; + } +-#endif /* REPLACE_FUNC_STAT_FILE */ +-#if REPLACE_FUNC_STAT_DIR + +- if (result == -1 && errno == ENOENT) ++ /* There are two ways to get at the requested information: ++ - by scanning the parent directory and examining the relevant ++ directory entry, ++ - by opening the file directly. ++ The first approach fails for root directories (e.g. 'C:\') and ++ UNC root directories (e.g. '\\server\share'). ++ The second approach fails for some system files (e.g. 'C:\pagefile.sys' ++ and 'C:\hiberfil.sys'): ERROR_SHARING_VIOLATION. ++ The second approach gives more information (in particular, correct ++ st_dev, st_ino, st_nlink fields). ++ So we use the second approach and, as a fallback except for root and ++ UNC root directories, also the first approach. */ ++ { ++ int ret; ++ + { +- /* Due to mingw's oddities, there are some directories (like +- c:\) where stat() only succeeds with a trailing slash, and +- other directories (like c:\windows) where stat() only +- succeeds without a trailing slash. But we want the two to be +- synonymous, since chdir() manages either style. Likewise, Mingw also +- reports ENOENT for names longer than PATH_MAX, when we want +- ENAMETOOLONG, and for stat("file/"), when we want ENOTDIR. +- Fortunately, mingw PATH_MAX is small enough for stack +- allocation. */ +- char fixed_name[PATH_MAX + 1] = {0}; +- size_t len = strlen (name); +- bool check_dir = false; +- verify (PATH_MAX <= 4096); +- if (PATH_MAX <= len) +- errno = ENAMETOOLONG; +- else if (len) ++ /* Approach based on the file. */ ++ ++ /* Open a handle to the file. ++ CreateFile ++ ++ */ ++ HANDLE h = ++ CreateFile (rname, ++ FILE_READ_ATTRIBUTES, ++ FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, ++ NULL, ++ OPEN_EXISTING, ++ /* FILE_FLAG_POSIX_SEMANTICS (treat file names that differ only ++ in case as different) makes sense only when applied to *all* ++ filesystem operations. */ ++ FILE_FLAG_BACKUP_SEMANTICS /* | FILE_FLAG_POSIX_SEMANTICS */, ++ NULL); ++ if (h != INVALID_HANDLE_VALUE) + { +- strcpy (fixed_name, name); +- if (ISSLASH (fixed_name[len - 1])) +- { +- check_dir = true; +- while (len && ISSLASH (fixed_name[len - 1])) +- fixed_name[--len] = '\0'; +- if (!len) +- fixed_name[0] = '/'; +- } +- else +- fixed_name[len++] = '/'; +- result = orig_stat (fixed_name, st); +- if (result == 0 && check_dir && !S_ISDIR (st->st_mode)) ++ ret = _gl_fstat_by_handle (h, rname, buf); ++ CloseHandle (h); ++ goto done; ++ } ++ } ++ ++ /* Test for root and UNC root directories. */ ++ if ((rlen == drive_prefix_len + 1 && ISSLASH (rname[drive_prefix_len])) ++ || is_unc_root (rname)) ++ goto failed; ++ ++ /* Fallback. */ ++ { ++ /* Approach based on the directory entry. */ ++ ++ if (strchr (rname, '?') != NULL || strchr (rname, '*') != NULL) ++ { ++ /* Other Windows API functions would fail with error ++ ERROR_INVALID_NAME. */ ++ if (malloca_rname != NULL) ++ freea (malloca_rname); ++ errno = ENOENT; ++ return -1; ++ } ++ ++ /* Get the details about the directory entry. This can be done through ++ FindFirstFile ++ ++ ++ or through ++ FindFirstFileEx with argument FindExInfoBasic ++ ++ ++ */ ++ WIN32_FIND_DATA info; ++ HANDLE h = FindFirstFile (rname, &info); ++ if (h == INVALID_HANDLE_VALUE) ++ goto failed; ++ ++ /* Test for error conditions before starting to fill *buf. */ ++ if (sizeof (buf->st_size) <= 4 && info.nFileSizeHigh > 0) ++ { ++ FindClose (h); ++ if (malloca_rname != NULL) ++ freea (malloca_rname); ++ errno = EOVERFLOW; ++ return -1; ++ } ++ ++# if _GL_WINDOWS_STAT_INODES ++ buf->st_dev = 0; ++# if _GL_WINDOWS_STAT_INODES == 2 ++ buf->st_ino._gl_ino[0] = buf->st_ino._gl_ino[1] = 0; ++# else /* _GL_WINDOWS_STAT_INODES == 1 */ ++ buf->st_ino = 0; ++# endif ++# else ++ /* st_ino is not wide enough for identifying a file on a device. ++ Without st_ino, st_dev is pointless. */ ++ buf->st_dev = 0; ++ buf->st_ino = 0; ++# endif ++ ++ /* st_mode. */ ++ unsigned int mode = ++ /* XXX How to handle FILE_ATTRIBUTE_REPARSE_POINT ? */ ++ ((info.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) ? _S_IFDIR | S_IEXEC_UGO : _S_IFREG) ++ | S_IREAD_UGO ++ | ((info.dwFileAttributes & FILE_ATTRIBUTE_READONLY) ? 0 : S_IWRITE_UGO); ++ if (!(info.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) ++ { ++ /* Determine whether the file is executable by looking at the file ++ name suffix. */ ++ if (info.nFileSizeHigh > 0 || info.nFileSizeLow > 0) + { +- result = -1; +- errno = ENOTDIR; ++ const char *last_dot = NULL; ++ const char *p; ++ for (p = info.cFileName; *p != '\0'; p++) ++ if (*p == '.') ++ last_dot = p; ++ if (last_dot != NULL) ++ { ++ const char *suffix = last_dot + 1; ++ if (_stricmp (suffix, "exe") == 0 ++ || _stricmp (suffix, "bat") == 0 ++ || _stricmp (suffix, "cmd") == 0 ++ || _stricmp (suffix, "com") == 0) ++ mode |= S_IEXEC_UGO; ++ } + } + } ++ buf->st_mode = mode; ++ ++ /* st_nlink. Ignore hard links here. */ ++ buf->st_nlink = 1; ++ ++ /* There's no easy way to map the Windows SID concept to an integer. */ ++ buf->st_uid = 0; ++ buf->st_gid = 0; ++ ++ /* st_rdev is irrelevant for normal files and directories. */ ++ buf->st_rdev = 0; ++ ++ /* st_size. */ ++ if (sizeof (buf->st_size) <= 4) ++ /* Range check already done above. */ ++ buf->st_size = info.nFileSizeLow; ++ else ++ buf->st_size = ((long long) info.nFileSizeHigh << 32) | (long long) info.nFileSizeLow; ++ ++ /* st_atime, st_mtime, st_ctime. */ ++# if _GL_WINDOWS_STAT_TIMESPEC ++ buf->st_atim = _gl_convert_FILETIME_to_timespec (&info.ftLastAccessTime); ++ buf->st_mtim = _gl_convert_FILETIME_to_timespec (&info.ftLastWriteTime); ++ buf->st_ctim = _gl_convert_FILETIME_to_timespec (&info.ftCreationTime); ++# else ++ buf->st_atime = _gl_convert_FILETIME_to_POSIX (&info.ftLastAccessTime); ++ buf->st_mtime = _gl_convert_FILETIME_to_POSIX (&info.ftLastWriteTime); ++ buf->st_ctime = _gl_convert_FILETIME_to_POSIX (&info.ftCreationTime); ++# endif ++ ++ FindClose (h); ++ ++ ret = 0; + } +-#endif /* REPLACE_FUNC_STAT_DIR */ ++ ++ done: ++ if (ret >= 0 && check_dir && !S_ISDIR (buf->st_mode)) ++ { ++ errno = ENOTDIR; ++ ret = -1; ++ } ++ if (malloca_rname != NULL) ++ { ++ int saved_errno = errno; ++ freea (malloca_rname); ++ errno = saved_errno; ++ } ++ return ret; ++ } ++ ++ failed: ++ { ++ DWORD error = GetLastError (); ++ #if 0 ++ fprintf (stderr, "rpl_stat error 0x%x\n", (unsigned int) error); ++ #endif ++ ++ if (malloca_rname != NULL) ++ freea (malloca_rname); ++ ++ switch (error) ++ { ++ /* Some of these errors probably cannot happen with the specific flags ++ that we pass to CreateFile. But who knows... */ ++ case ERROR_FILE_NOT_FOUND: /* The last component of rname does not exist. */ ++ case ERROR_PATH_NOT_FOUND: /* Some directory component in rname does not exist. */ ++ case ERROR_BAD_PATHNAME: /* rname is such as '\\server'. */ ++ case ERROR_BAD_NET_NAME: /* rname is such as '\\server\nonexistentshare'. */ ++ case ERROR_INVALID_NAME: /* rname contains wildcards, misplaced colon, etc. */ ++ case ERROR_DIRECTORY: ++ errno = ENOENT; ++ break; ++ ++ case ERROR_ACCESS_DENIED: /* rname is such as 'C:\System Volume Information\foo'. */ ++ case ERROR_SHARING_VIOLATION: /* rname is such as 'C:\pagefile.sys' (second approach only). */ ++ /* XXX map to EACCESS or EPERM? */ ++ errno = EACCES; ++ break; ++ ++ case ERROR_OUTOFMEMORY: ++ errno = ENOMEM; ++ break; ++ ++ case ERROR_WRITE_PROTECT: ++ errno = EROFS; ++ break; ++ ++ case ERROR_WRITE_FAULT: ++ case ERROR_READ_FAULT: ++ case ERROR_GEN_FAILURE: ++ errno = EIO; ++ break; ++ ++ case ERROR_BUFFER_OVERFLOW: ++ case ERROR_FILENAME_EXCED_RANGE: ++ errno = ENAMETOOLONG; ++ break; ++ ++ case ERROR_DELETE_PENDING: /* XXX map to EACCESS or EPERM? */ ++ errno = EPERM; ++ break; ++ ++ default: ++ errno = EINVAL; ++ break; ++ } ++ ++ return -1; ++ } ++#else ++ int result = orig_stat (name, buf); ++# if REPLACE_FUNC_STAT_FILE ++ /* Solaris 9 mistakenly succeeds when given a non-directory with a ++ trailing slash. */ ++ if (result == 0 && !S_ISDIR (buf->st_mode)) ++ { ++ size_t len = strlen (name); ++ if (ISSLASH (name[len - 1])) ++ { ++ errno = ENOTDIR; ++ return -1; ++ } ++ } ++# endif /* REPLACE_FUNC_STAT_FILE */ + return result; ++#endif + } +diff -Naur libpipeline-1.5.0-orig/gnulib/lib/stat-w32.c libpipeline-1.5.0/gnulib/lib/stat-w32.c +--- libpipeline-1.5.0-orig/gnulib/lib/stat-w32.c 1970-01-01 03:00:00.000000000 +0300 ++++ libpipeline-1.5.0/gnulib/lib/stat-w32.c 2018-07-02 13:09:59.600436400 +0300 +@@ -0,0 +1,415 @@ ++/* Core of implementation of fstat and stat for native Windows. ++ Copyright (C) 2017 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 3 of the License, 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, see . */ ++ ++/* Written by Bruno Haible. */ ++ ++#include ++ ++#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ ++ ++/* Ensure that defines FILE_ID_INFO. */ ++#undef _WIN32_WINNT ++#define _WIN32_WINNT _WIN32_WINNT_WIN8 ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++/* Specification. */ ++#include "stat-w32.h" ++ ++#include "pathmax.h" ++#include "verify.h" ++ ++#if _GL_WINDOWS_STAT_INODES == 2 ++/* GetFileInformationByHandleEx was introduced only in Windows Vista. */ ++typedef DWORD (WINAPI * GetFileInformationByHandleExFuncType) (HANDLE hFile, ++ FILE_INFO_BY_HANDLE_CLASS fiClass, ++ LPVOID lpBuffer, ++ DWORD dwBufferSize); ++static GetFileInformationByHandleExFuncType GetFileInformationByHandleExFunc = NULL; ++#endif ++/* GetFinalPathNameByHandle was introduced only in Windows Vista. */ ++typedef DWORD (WINAPI * GetFinalPathNameByHandleFuncType) (HANDLE hFile, ++ LPTSTR lpFilePath, ++ DWORD lenFilePath, ++ DWORD dwFlags); ++static GetFinalPathNameByHandleFuncType GetFinalPathNameByHandleFunc = NULL; ++static BOOL initialized = FALSE; ++ ++static void ++initialize (void) ++{ ++ HMODULE kernel32 = LoadLibrary ("kernel32.dll"); ++ if (kernel32 != NULL) ++ { ++#if _GL_WINDOWS_STAT_INODES == 2 ++ GetFileInformationByHandleExFunc = ++ (GetFileInformationByHandleExFuncType) GetProcAddress (kernel32, "GetFileInformationByHandleEx"); ++#endif ++ GetFinalPathNameByHandleFunc = ++ (GetFinalPathNameByHandleFuncType) GetProcAddress (kernel32, "GetFinalPathNameByHandleA"); ++ } ++ initialized = TRUE; ++} ++ ++/* Converts a FILETIME to GMT time since 1970-01-01 00:00:00. */ ++#if _GL_WINDOWS_STAT_TIMESPEC ++struct timespec ++_gl_convert_FILETIME_to_timespec (const FILETIME *ft) ++{ ++ struct timespec result; ++ /* FILETIME: */ ++ unsigned long long since_1601 = ++ ((unsigned long long) ft->dwHighDateTime << 32) ++ | (unsigned long long) ft->dwLowDateTime; ++ if (since_1601 == 0) ++ { ++ result.tv_sec = 0; ++ result.tv_nsec = 0; ++ } ++ else ++ { ++ /* Between 1601-01-01 and 1970-01-01 there were 280 normal years and 89 ++ leap years, in total 134774 days. */ ++ unsigned long long since_1970 = ++ since_1601 - (unsigned long long) 134774 * (unsigned long long) 86400 * (unsigned long long) 10000000; ++ result.tv_sec = since_1970 / (unsigned long long) 10000000; ++ result.tv_nsec = (unsigned long) (since_1970 % (unsigned long long) 10000000) * 100; ++ } ++ return result; ++} ++#else ++time_t ++_gl_convert_FILETIME_to_POSIX (const FILETIME *ft) ++{ ++ /* FILETIME: */ ++ unsigned long long since_1601 = ++ ((unsigned long long) ft->dwHighDateTime << 32) ++ | (unsigned long long) ft->dwLowDateTime; ++ if (since_1601 == 0) ++ return 0; ++ else ++ { ++ /* Between 1601-01-01 and 1970-01-01 there were 280 normal years and 89 ++ leap years, in total 134774 days. */ ++ unsigned long long since_1970 = ++ since_1601 - (unsigned long long) 134774 * (unsigned long long) 86400 * (unsigned long long) 10000000; ++ return since_1970 / (unsigned long long) 10000000; ++ } ++} ++#endif ++ ++/* Fill *BUF with information about the file designated by H. ++ PATH is the file name, if known, otherwise NULL. ++ Return 0 if successful, or -1 with errno set upon failure. */ ++int ++_gl_fstat_by_handle (HANDLE h, const char *path, struct stat *buf) ++{ ++ /* GetFileType ++ */ ++ DWORD type = GetFileType (h); ++ if (type == FILE_TYPE_DISK) ++ { ++ if (!initialized) ++ initialize (); ++ ++ /* st_mode can be determined through ++ GetFileAttributesEx ++ ++ ++ or through ++ GetFileInformationByHandle ++ ++ ++ or through ++ GetFileInformationByHandleEx with argument FileBasicInfo ++ ++ ++ The latter requires -D_WIN32_WINNT=_WIN32_WINNT_VISTA or higher. */ ++ BY_HANDLE_FILE_INFORMATION info; ++ if (! GetFileInformationByHandle (h, &info)) ++ goto failed; ++ ++ /* Test for error conditions before starting to fill *buf. */ ++ if (sizeof (buf->st_size) <= 4 && info.nFileSizeHigh > 0) ++ { ++ errno = EOVERFLOW; ++ return -1; ++ } ++ ++#if _GL_WINDOWS_STAT_INODES ++ /* st_ino can be determined through ++ GetFileInformationByHandle ++ ++ ++ as 64 bits, or through ++ GetFileInformationByHandleEx with argument FileIdInfo ++ ++ ++ as 128 bits. ++ The latter requires -D_WIN32_WINNT=_WIN32_WINNT_WIN8 or higher. */ ++ /* Experiments show that GetFileInformationByHandleEx does not provide ++ much more information than GetFileInformationByHandle: ++ * The dwVolumeSerialNumber from GetFileInformationByHandle is equal ++ to the low 32 bits of the 64-bit VolumeSerialNumber from ++ GetFileInformationByHandleEx, and is apparently sufficient for ++ identifying the device. ++ * The nFileIndex from GetFileInformationByHandle is equal to the low ++ 64 bits of the 128-bit FileId from GetFileInformationByHandleEx, ++ and the high 64 bits of this 128-bit FileId are zero. ++ * On a FAT file system, GetFileInformationByHandleEx fails with error ++ ERROR_INVALID_PARAMETER, whereas GetFileInformationByHandle ++ succeeds. ++ * On a CIFS/SMB file system, GetFileInformationByHandleEx fails with ++ error ERROR_INVALID_LEVEL, whereas GetFileInformationByHandle ++ succeeds. */ ++# if _GL_WINDOWS_STAT_INODES == 2 ++ if (GetFileInformationByHandleExFunc != NULL) ++ { ++ FILE_ID_INFO id; ++ if (GetFileInformationByHandleExFunc (h, FileIdInfo, &id, sizeof (id))) ++ { ++ buf->st_dev = id.VolumeSerialNumber; ++ verify (sizeof (ino_t) == sizeof (id.FileId)); ++ memcpy (&buf->st_ino, &id.FileId, sizeof (ino_t)); ++ goto ino_done; ++ } ++ else ++ { ++ switch (GetLastError ()) ++ { ++ case ERROR_INVALID_PARAMETER: /* older Windows version, or FAT */ ++ case ERROR_INVALID_LEVEL: /* CIFS/SMB file system */ ++ goto fallback; ++ default: ++ goto failed; ++ } ++ } ++ } ++ fallback: ; ++ /* Fallback for older Windows versions. */ ++ buf->st_dev = info.dwVolumeSerialNumber; ++ buf->st_ino._gl_ino[0] = ((ULONGLONG) info.nFileIndexHigh << 32) | (ULONGLONG) info.nFileIndexLow; ++ buf->st_ino._gl_ino[1] = 0; ++ ino_done: ; ++# else /* _GL_WINDOWS_STAT_INODES == 1 */ ++ buf->st_dev = info.dwVolumeSerialNumber; ++ buf->st_ino = ((ULONGLONG) info.nFileIndexHigh << 32) | (ULONGLONG) info.nFileIndexLow; ++# endif ++#else ++ /* st_ino is not wide enough for identifying a file on a device. ++ Without st_ino, st_dev is pointless. */ ++ buf->st_dev = 0; ++ buf->st_ino = 0; ++#endif ++ ++ /* st_mode. */ ++ unsigned int mode = ++ /* XXX How to handle FILE_ATTRIBUTE_REPARSE_POINT ? */ ++ ((info.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) ? _S_IFDIR | S_IEXEC_UGO : _S_IFREG) ++ | S_IREAD_UGO ++ | ((info.dwFileAttributes & FILE_ATTRIBUTE_READONLY) ? 0 : S_IWRITE_UGO); ++ if (!(info.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) ++ { ++ /* Determine whether the file is executable by looking at the file ++ name suffix. ++ If the file name is already known, use it. Otherwise, for ++ non-empty files, it can be determined through ++ GetFinalPathNameByHandle ++ ++ or through ++ GetFileInformationByHandleEx with argument FileNameInfo ++ ++ ++ Both require -D_WIN32_WINNT=_WIN32_WINNT_VISTA or higher. */ ++ if (info.nFileSizeHigh > 0 || info.nFileSizeLow > 0) ++ { ++ char fpath[PATH_MAX]; ++ if (path != NULL ++ || (GetFinalPathNameByHandleFunc != NULL ++ && GetFinalPathNameByHandleFunc (h, fpath, sizeof (fpath), VOLUME_NAME_NONE) ++ < sizeof (fpath) ++ && (path = fpath, 1))) ++ { ++ const char *last_dot = NULL; ++ const char *p; ++ for (p = path; *p != '\0'; p++) ++ if (*p == '.') ++ last_dot = p; ++ if (last_dot != NULL) ++ { ++ const char *suffix = last_dot + 1; ++ if (_stricmp (suffix, "exe") == 0 ++ || _stricmp (suffix, "bat") == 0 ++ || _stricmp (suffix, "cmd") == 0 ++ || _stricmp (suffix, "com") == 0) ++ mode |= S_IEXEC_UGO; ++ } ++ } ++ else ++ /* Cannot determine file name. Pretend that it is executable. */ ++ mode |= S_IEXEC_UGO; ++ } ++ } ++ buf->st_mode = mode; ++ ++ /* st_nlink can be determined through ++ GetFileInformationByHandle ++ ++ ++ or through ++ GetFileInformationByHandleEx with argument FileStandardInfo ++ ++ ++ The latter requires -D_WIN32_WINNT=_WIN32_WINNT_VISTA or higher. */ ++ buf->st_nlink = (info.nNumberOfLinks > SHRT_MAX ? SHRT_MAX : info.nNumberOfLinks); ++ ++ /* There's no easy way to map the Windows SID concept to an integer. */ ++ buf->st_uid = 0; ++ buf->st_gid = 0; ++ ++ /* st_rdev is irrelevant for normal files and directories. */ ++ buf->st_rdev = 0; ++ ++ /* st_size can be determined through ++ GetFileSizeEx ++ ++ or through ++ GetFileAttributesEx ++ ++ ++ or through ++ GetFileInformationByHandle ++ ++ ++ or through ++ GetFileInformationByHandleEx with argument FileStandardInfo ++ ++ ++ The latter requires -D_WIN32_WINNT=_WIN32_WINNT_VISTA or higher. */ ++ if (sizeof (buf->st_size) <= 4) ++ /* Range check already done above. */ ++ buf->st_size = info.nFileSizeLow; ++ else ++ buf->st_size = ((long long) info.nFileSizeHigh << 32) | (long long) info.nFileSizeLow; ++ ++ /* st_atime, st_mtime, st_ctime can be determined through ++ GetFileTime ++ ++ or through ++ GetFileAttributesEx ++ ++ ++ or through ++ GetFileInformationByHandle ++ ++ ++ or through ++ GetFileInformationByHandleEx with argument FileBasicInfo ++ ++ ++ The latter requires -D_WIN32_WINNT=_WIN32_WINNT_VISTA or higher. */ ++#if _GL_WINDOWS_STAT_TIMESPEC ++ buf->st_atim = _gl_convert_FILETIME_to_timespec (&info.ftLastAccessTime); ++ buf->st_mtim = _gl_convert_FILETIME_to_timespec (&info.ftLastWriteTime); ++ buf->st_ctim = _gl_convert_FILETIME_to_timespec (&info.ftCreationTime); ++#else ++ buf->st_atime = _gl_convert_FILETIME_to_POSIX (&info.ftLastAccessTime); ++ buf->st_mtime = _gl_convert_FILETIME_to_POSIX (&info.ftLastWriteTime); ++ buf->st_ctime = _gl_convert_FILETIME_to_POSIX (&info.ftCreationTime); ++#endif ++ ++ return 0; ++ } ++ else if (type == FILE_TYPE_CHAR || type == FILE_TYPE_PIPE) ++ { ++ buf->st_dev = 0; ++#if _GL_WINDOWS_STAT_INODES == 2 ++ buf->st_ino._gl_ino[0] = buf->st_ino._gl_ino[1] = 0; ++#else ++ buf->st_ino = 0; ++#endif ++ buf->st_mode = (type == FILE_TYPE_PIPE ? _S_IFIFO : _S_IFCHR); ++ buf->st_nlink = 1; ++ buf->st_uid = 0; ++ buf->st_gid = 0; ++ buf->st_rdev = 0; ++ if (type == FILE_TYPE_PIPE) ++ { ++ /* PeekNamedPipe ++ */ ++ DWORD bytes_available; ++ if (PeekNamedPipe (h, NULL, 0, NULL, &bytes_available, NULL)) ++ buf->st_size = bytes_available; ++ else ++ buf->st_size = 0; ++ } ++ else ++ buf->st_size = 0; ++#if _GL_WINDOWS_STAT_TIMESPEC ++ buf->st_atim.tv_sec = 0; buf->st_atim.tv_nsec = 0; ++ buf->st_mtim.tv_sec = 0; buf->st_mtim.tv_nsec = 0; ++ buf->st_ctim.tv_sec = 0; buf->st_ctim.tv_nsec = 0; ++#else ++ buf->st_atime = 0; ++ buf->st_mtime = 0; ++ buf->st_ctime = 0; ++#endif ++ return 0; ++ } ++ else ++ { ++ errno = ENOENT; ++ return -1; ++ } ++ ++ failed: ++ { ++ DWORD error = GetLastError (); ++ #if 0 ++ fprintf (stderr, "_gl_fstat_by_handle error 0x%x\n", (unsigned int) error); ++ #endif ++ switch (error) ++ { ++ case ERROR_ACCESS_DENIED: ++ case ERROR_SHARING_VIOLATION: ++ errno = EACCES; ++ break; ++ ++ case ERROR_OUTOFMEMORY: ++ errno = ENOMEM; ++ break; ++ ++ case ERROR_WRITE_FAULT: ++ case ERROR_READ_FAULT: ++ case ERROR_GEN_FAILURE: ++ errno = EIO; ++ break; ++ ++ default: ++ errno = EINVAL; ++ break; ++ } ++ return -1; ++ } ++} ++ ++#endif +diff -Naur libpipeline-1.5.0-orig/gnulib/lib/stat-w32.h libpipeline-1.5.0/gnulib/lib/stat-w32.h +--- libpipeline-1.5.0-orig/gnulib/lib/stat-w32.h 1970-01-01 03:00:00.000000000 +0300 ++++ libpipeline-1.5.0/gnulib/lib/stat-w32.h 2018-07-02 13:09:59.610436400 +0300 +@@ -0,0 +1,37 @@ ++/* Core of implementation of fstat and stat for native Windows. ++ Copyright (C) 2017 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 3 of the License, 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, see . */ ++ ++#ifndef _STAT_W32_H ++#define _STAT_W32_H 1 ++ ++/* Converts a FILETIME to GMT time since 1970-01-01 00:00:00. */ ++#if _GL_WINDOWS_STAT_TIMESPEC ++extern struct timespec _gl_convert_FILETIME_to_timespec (const FILETIME *ft); ++#else ++extern time_t _gl_convert_FILETIME_to_POSIX (const FILETIME *ft); ++#endif ++ ++/* Fill *BUF with information about the file designated by H. ++ PATH is the file name, if known, otherwise NULL. ++ Return 0 if successful, or -1 with errno set upon failure. */ ++extern int _gl_fstat_by_handle (HANDLE h, const char *path, struct stat *buf); ++ ++/* Bitmasks for st_mode. */ ++#define S_IREAD_UGO (_S_IREAD | (_S_IREAD >> 3) | (_S_IREAD >> 6)) ++#define S_IWRITE_UGO (_S_IWRITE | (_S_IWRITE >> 3) | (_S_IWRITE >> 6)) ++#define S_IEXEC_UGO (_S_IEXEC | (_S_IEXEC >> 3) | (_S_IEXEC >> 6)) ++ ++#endif /* _STAT_W32_H */ +diff -Naur libpipeline-1.5.0-orig/gnulib/lib/stdarg.in.h libpipeline-1.5.0/gnulib/lib/stdarg.in.h +--- libpipeline-1.5.0-orig/gnulib/lib/stdarg.in.h 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/lib/stdarg.in.h 2018-07-02 13:09:59.610436400 +0300 +@@ -1,5 +1,5 @@ + /* Substitute for and wrapper around . +- Copyright (C) 2008-2014 Free Software Foundation, Inc. ++ Copyright (C) 2008-2017 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 +diff -Naur libpipeline-1.5.0-orig/gnulib/lib/stdbool.in.h libpipeline-1.5.0/gnulib/lib/stdbool.in.h +--- libpipeline-1.5.0-orig/gnulib/lib/stdbool.in.h 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/lib/stdbool.in.h 2018-07-02 13:09:59.610436400 +0300 +@@ -1,4 +1,4 @@ +-/* Copyright (C) 2001-2003, 2006-2014 Free Software Foundation, Inc. ++/* Copyright (C) 2001-2003, 2006-2017 Free Software Foundation, Inc. + Written by Bruno Haible , 2001. + + This program is free software; you can redistribute it and/or modify +diff -Naur libpipeline-1.5.0-orig/gnulib/lib/stddef.in.h libpipeline-1.5.0/gnulib/lib/stddef.in.h +--- libpipeline-1.5.0-orig/gnulib/lib/stddef.in.h 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/lib/stddef.in.h 2018-07-02 13:09:59.610436400 +0300 +@@ -1,6 +1,6 @@ + /* A substitute for POSIX 2008 , for platforms that have issues. + +- Copyright (C) 2009-2014 Free Software Foundation, Inc. ++ Copyright (C) 2009-2017 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 +@@ -39,7 +39,6 @@ + + # if !(defined _@GUARD_PREFIX@_STDDEF_H && defined _GL_STDDEF_WINT_T) + # ifdef __need_wint_t +-# undef _@GUARD_PREFIX@_STDDEF_H + # define _GL_STDDEF_WINT_T + # endif + # @INCLUDE_NEXT@ @NEXT_STDDEF_H@ +@@ -54,33 +53,58 @@ + + # @INCLUDE_NEXT@ @NEXT_STDDEF_H@ + +-# ifndef _@GUARD_PREFIX@_STDDEF_H +-# define _@GUARD_PREFIX@_STDDEF_H +- + /* On NetBSD 5.0, the definition of NULL lacks proper parentheses. */ +-#if @REPLACE_NULL@ +-# undef NULL +-# ifdef __cplusplus ++# if (@REPLACE_NULL@ \ ++ && (!defined _@GUARD_PREFIX@_STDDEF_H || defined _GL_STDDEF_WINT_T)) ++# undef NULL ++# ifdef __cplusplus + /* ISO C++ says that the macro NULL must expand to an integer constant + expression, hence '((void *) 0)' is not allowed in C++. */ +-# if __GNUG__ >= 3 ++# if __GNUG__ >= 3 + /* GNU C++ has a __null macro that behaves like an integer ('int' or + 'long') but has the same size as a pointer. Use that, to avoid + warnings. */ +-# define NULL __null +-# else +-# define NULL 0L ++# define NULL __null ++# else ++# define NULL 0L ++# endif ++# else ++# define NULL ((void *) 0) ++# endif + # endif +-# else +-# define NULL ((void *) 0) +-# endif +-#endif ++ ++# ifndef _@GUARD_PREFIX@_STDDEF_H ++# define _@GUARD_PREFIX@_STDDEF_H + + /* Some platforms lack wchar_t. */ + #if !@HAVE_WCHAR_T@ + # define wchar_t int + #endif + ++/* Some platforms lack max_align_t. The check for _GCC_MAX_ALIGN_T is ++ a hack in case the configure-time test was done with g++ even though ++ we are currently compiling with gcc. */ ++#if ! (@HAVE_MAX_ALIGN_T@ || defined _GCC_MAX_ALIGN_T) ++/* On the x86, the maximum storage alignment of double, long, etc. is 4, ++ but GCC's C11 ABI for x86 says that max_align_t has an alignment of 8, ++ and the C11 standard allows this. Work around this problem by ++ using __alignof__ (which returns 8 for double) rather than _Alignof ++ (which returns 4), and align each union member accordingly. */ ++# ifdef __GNUC__ ++# define _GL_STDDEF_ALIGNAS(type) \ ++ __attribute__ ((__aligned__ (__alignof__ (type)))) ++# else ++# define _GL_STDDEF_ALIGNAS(type) /* */ ++# endif ++typedef union ++{ ++ char *__p _GL_STDDEF_ALIGNAS (char *); ++ double __d _GL_STDDEF_ALIGNAS (double); ++ long double __ld _GL_STDDEF_ALIGNAS (long double); ++ long int __i _GL_STDDEF_ALIGNAS (long int); ++} max_align_t; ++#endif ++ + # endif /* _@GUARD_PREFIX@_STDDEF_H */ + # endif /* _@GUARD_PREFIX@_STDDEF_H */ + #endif /* __need_XXX */ +diff -Naur libpipeline-1.5.0-orig/gnulib/lib/stdint.in.h libpipeline-1.5.0/gnulib/lib/stdint.in.h +--- libpipeline-1.5.0-orig/gnulib/lib/stdint.in.h 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/lib/stdint.in.h 2018-07-02 13:09:59.620436400 +0300 +@@ -1,4 +1,4 @@ +-/* Copyright (C) 2001-2002, 2004-2014 Free Software Foundation, Inc. ++/* Copyright (C) 2001-2002, 2004-2017 Free Software Foundation, Inc. + Written by Paul Eggert, Bruno Haible, Sam Steingold, Peter Burwood. + This file is part of gnulib. + +@@ -38,8 +38,7 @@ + other system header files; just include the system's . + Ideally we should test __BIONIC__ here, but it is only defined after + has been included; hence test __ANDROID__ instead. */ +-#if defined __ANDROID__ \ +- && defined _SYS_TYPES_H_ && !defined __need_size_t ++#if defined __ANDROID__ && defined _GL_INCLUDING_SYS_TYPES_H + # @INCLUDE_NEXT@ @NEXT_STDINT_H@ + #else + +@@ -80,54 +79,65 @@ + #if ! defined _@GUARD_PREFIX@_STDINT_H && ! defined _GL_JUST_INCLUDE_SYSTEM_STDINT_H + #define _@GUARD_PREFIX@_STDINT_H + ++/* Get SCHAR_MIN, SCHAR_MAX, UCHAR_MAX, INT_MIN, INT_MAX, ++ LONG_MIN, LONG_MAX, ULONG_MAX, _GL_INTEGER_WIDTH. */ ++#include ++ ++/* Override WINT_MIN and WINT_MAX if gnulib's or overrides ++ wint_t. */ ++#if @GNULIB_OVERRIDES_WINT_T@ ++# undef WINT_MIN ++# undef WINT_MAX ++# define WINT_MIN 0x0U ++# define WINT_MAX 0xffffffffU ++#endif ++ ++#if ! @HAVE_C99_STDINT_H@ ++ + /* defines some of the stdint.h types as well, on glibc, + IRIX 6.5, and OpenBSD 3.8 (via ). + AIX 5.2 isn't needed and causes troubles. + Mac OS X 10.4.6 includes (which is us), but + relies on the system definitions, so include + after @NEXT_STDINT_H@. */ +-#if @HAVE_SYS_TYPES_H@ && ! defined _AIX +-# include +-#endif +- +-/* Get SCHAR_MIN, SCHAR_MAX, UCHAR_MAX, INT_MIN, INT_MAX, +- LONG_MIN, LONG_MAX, ULONG_MAX. */ +-#include ++# if @HAVE_SYS_TYPES_H@ && ! defined _AIX ++# include ++# endif + +-#if @HAVE_INTTYPES_H@ ++# if @HAVE_INTTYPES_H@ + /* In OpenBSD 3.8, includes , which defines + int{8,16,32,64}_t, uint{8,16,32,64}_t and __BIT_TYPES_DEFINED__. + also defines intptr_t and uintptr_t. */ +-# include +-#elif @HAVE_SYS_INTTYPES_H@ ++# include ++# elif @HAVE_SYS_INTTYPES_H@ + /* Solaris 7 has the types except the *_fast*_t types, and + the macros except for *_FAST*_*, INTPTR_MIN, PTRDIFF_MIN, PTRDIFF_MAX. */ +-# include +-#endif ++# include ++# endif + +-#if @HAVE_SYS_BITYPES_H@ && ! defined __BIT_TYPES_DEFINED__ ++# if @HAVE_SYS_BITYPES_H@ && ! defined __BIT_TYPES_DEFINED__ + /* Linux libc4 >= 4.6.7 and libc5 have a that defines + int{8,16,32,64}_t and __BIT_TYPES_DEFINED__. In libc5 >= 5.2.2 it is + included by . */ +-# include +-#endif ++# include ++# endif + +-#undef _GL_JUST_INCLUDE_SYSTEM_INTTYPES_H ++# undef _GL_JUST_INCLUDE_SYSTEM_INTTYPES_H + + /* Minimum and maximum values for an integer type under the usual assumption. + Return an unspecified value if BITS == 0, adding a check to pacify + picky compilers. */ + +-#define _STDINT_MIN(signed, bits, zero) \ +- ((signed) ? (- ((zero) + 1) << ((bits) ? (bits) - 1 : 0)) : (zero)) ++/* These are separate macros, because if you try to merge these macros into ++ a single one, HP-UX cc rejects the resulting expression in constant ++ expressions. */ ++# define _STDINT_UNSIGNED_MIN(bits, zero) \ ++ (zero) ++# define _STDINT_SIGNED_MIN(bits, zero) \ ++ (~ _STDINT_MAX (1, bits, zero)) + +-#define _STDINT_MAX(signed, bits, zero) \ +- ((signed) \ +- ? ~ _STDINT_MIN (signed, bits, zero) \ +- : /* The expression for the unsigned case. The subtraction of (signed) \ +- is a nop in the unsigned case and avoids "signed integer overflow" \ +- warnings in the signed case. */ \ +- ((((zero) + 1) << ((bits) ? (bits) - 1 - (signed) : 0)) - 1) * 2 + 1) ++# define _STDINT_MAX(signed, bits, zero) \ ++ (((((zero) + 1) << ((bits) ? (bits) - 1 - (signed) : 0)) - 1) * 2 + 1) + + #if !GNULIB_defined_stdint_types + +@@ -136,26 +146,26 @@ + /* Here we assume a standard architecture where the hardware integer + types have 8, 16, 32, optionally 64 bits. */ + +-#undef int8_t +-#undef uint8_t ++# undef int8_t ++# undef uint8_t + typedef signed char gl_int8_t; + typedef unsigned char gl_uint8_t; +-#define int8_t gl_int8_t +-#define uint8_t gl_uint8_t ++# define int8_t gl_int8_t ++# define uint8_t gl_uint8_t + +-#undef int16_t +-#undef uint16_t ++# undef int16_t ++# undef uint16_t + typedef short int gl_int16_t; + typedef unsigned short int gl_uint16_t; +-#define int16_t gl_int16_t +-#define uint16_t gl_uint16_t ++# define int16_t gl_int16_t ++# define uint16_t gl_uint16_t + +-#undef int32_t +-#undef uint32_t ++# undef int32_t ++# undef uint32_t + typedef int gl_int32_t; + typedef unsigned int gl_uint32_t; +-#define int32_t gl_int32_t +-#define uint32_t gl_uint32_t ++# define int32_t gl_int32_t ++# define uint32_t gl_uint32_t + + /* If the system defines INT64_MAX, assume int64_t works. That way, + if the underlying platform defines int64_t to be a 64-bit long long +@@ -163,54 +173,54 @@ + int, which would mess up C++ name mangling. We must use #ifdef + rather than #if, to avoid an error with HP-UX 10.20 cc. */ + +-#ifdef INT64_MAX +-# define GL_INT64_T +-#else ++# ifdef INT64_MAX ++# define GL_INT64_T ++# else + /* Do not undefine int64_t if gnulib is not being used with 64-bit + types, since otherwise it breaks platforms like Tandem/NSK. */ +-# if LONG_MAX >> 31 >> 31 == 1 +-# undef int64_t ++# if LONG_MAX >> 31 >> 31 == 1 ++# undef int64_t + typedef long int gl_int64_t; +-# define int64_t gl_int64_t +-# define GL_INT64_T +-# elif defined _MSC_VER +-# undef int64_t ++# define int64_t gl_int64_t ++# define GL_INT64_T ++# elif defined _MSC_VER ++# undef int64_t + typedef __int64 gl_int64_t; +-# define int64_t gl_int64_t +-# define GL_INT64_T +-# elif @HAVE_LONG_LONG_INT@ +-# undef int64_t ++# define int64_t gl_int64_t ++# define GL_INT64_T ++# elif @HAVE_LONG_LONG_INT@ ++# undef int64_t + typedef long long int gl_int64_t; +-# define int64_t gl_int64_t +-# define GL_INT64_T ++# define int64_t gl_int64_t ++# define GL_INT64_T ++# endif + # endif +-#endif + +-#ifdef UINT64_MAX +-# define GL_UINT64_T +-#else +-# if ULONG_MAX >> 31 >> 31 >> 1 == 1 +-# undef uint64_t +-typedef unsigned long int gl_uint64_t; +-# define uint64_t gl_uint64_t ++# ifdef UINT64_MAX + # define GL_UINT64_T +-# elif defined _MSC_VER +-# undef uint64_t ++# else ++# if ULONG_MAX >> 31 >> 31 >> 1 == 1 ++# undef uint64_t ++typedef unsigned long int gl_uint64_t; ++# define uint64_t gl_uint64_t ++# define GL_UINT64_T ++# elif defined _MSC_VER ++# undef uint64_t + typedef unsigned __int64 gl_uint64_t; +-# define uint64_t gl_uint64_t +-# define GL_UINT64_T +-# elif @HAVE_UNSIGNED_LONG_LONG_INT@ +-# undef uint64_t ++# define uint64_t gl_uint64_t ++# define GL_UINT64_T ++# elif @HAVE_UNSIGNED_LONG_LONG_INT@ ++# undef uint64_t + typedef unsigned long long int gl_uint64_t; +-# define uint64_t gl_uint64_t +-# define GL_UINT64_T ++# define uint64_t gl_uint64_t ++# define GL_UINT64_T ++# endif + # endif +-#endif + + /* Avoid collision with Solaris 2.5.1 etc. */ +-#define _UINT8_T +-#define _UINT32_T +-#define _UINT64_T ++# define _UINT8_T ++# define _UINT32_T ++# define _UINT64_T + + + /* 7.18.1.2. Minimum-width integer types */ +@@ -219,26 +229,26 @@ + types have 8, 16, 32, optionally 64 bits. Therefore the leastN_t types + are the same as the corresponding N_t types. */ + +-#undef int_least8_t +-#undef uint_least8_t +-#undef int_least16_t +-#undef uint_least16_t +-#undef int_least32_t +-#undef uint_least32_t +-#undef int_least64_t +-#undef uint_least64_t +-#define int_least8_t int8_t +-#define uint_least8_t uint8_t +-#define int_least16_t int16_t +-#define uint_least16_t uint16_t +-#define int_least32_t int32_t +-#define uint_least32_t uint32_t +-#ifdef GL_INT64_T +-# define int_least64_t int64_t +-#endif +-#ifdef GL_UINT64_T +-# define uint_least64_t uint64_t +-#endif ++# undef int_least8_t ++# undef uint_least8_t ++# undef int_least16_t ++# undef uint_least16_t ++# undef int_least32_t ++# undef uint_least32_t ++# undef int_least64_t ++# undef uint_least64_t ++# define int_least8_t int8_t ++# define uint_least8_t uint8_t ++# define int_least16_t int16_t ++# define uint_least16_t uint16_t ++# define int_least32_t int32_t ++# define uint_least32_t uint32_t ++# ifdef GL_INT64_T ++# define int_least64_t int64_t ++# endif ++# ifdef GL_UINT64_T ++# define uint_least64_t uint64_t ++# endif + + /* 7.18.1.3. Fastest minimum-width integer types */ + +@@ -251,50 +261,55 @@ + uses types consistent with glibc, as that lessens the chance of + incompatibility with older GNU hosts. */ + +-#undef int_fast8_t +-#undef uint_fast8_t +-#undef int_fast16_t +-#undef uint_fast16_t +-#undef int_fast32_t +-#undef uint_fast32_t +-#undef int_fast64_t +-#undef uint_fast64_t ++# undef int_fast8_t ++# undef uint_fast8_t ++# undef int_fast16_t ++# undef uint_fast16_t ++# undef int_fast32_t ++# undef uint_fast32_t ++# undef int_fast64_t ++# undef uint_fast64_t + typedef signed char gl_int_fast8_t; + typedef unsigned char gl_uint_fast8_t; + +-#ifdef __sun ++# ifdef __sun + /* Define types compatible with SunOS 5.10, so that code compiled under + earlier SunOS versions works with code compiled under SunOS 5.10. */ + typedef int gl_int_fast32_t; + typedef unsigned int gl_uint_fast32_t; +-#else ++# else + typedef long int gl_int_fast32_t; + typedef unsigned long int gl_uint_fast32_t; +-#endif ++# endif + typedef gl_int_fast32_t gl_int_fast16_t; + typedef gl_uint_fast32_t gl_uint_fast16_t; + +-#define int_fast8_t gl_int_fast8_t +-#define uint_fast8_t gl_uint_fast8_t +-#define int_fast16_t gl_int_fast16_t +-#define uint_fast16_t gl_uint_fast16_t +-#define int_fast32_t gl_int_fast32_t +-#define uint_fast32_t gl_uint_fast32_t +-#ifdef GL_INT64_T +-# define int_fast64_t int64_t +-#endif +-#ifdef GL_UINT64_T +-# define uint_fast64_t uint64_t +-#endif ++# define int_fast8_t gl_int_fast8_t ++# define uint_fast8_t gl_uint_fast8_t ++# define int_fast16_t gl_int_fast16_t ++# define uint_fast16_t gl_uint_fast16_t ++# define int_fast32_t gl_int_fast32_t ++# define uint_fast32_t gl_uint_fast32_t ++# ifdef GL_INT64_T ++# define int_fast64_t int64_t ++# endif ++# ifdef GL_UINT64_T ++# define uint_fast64_t uint64_t ++# endif + + /* 7.18.1.4. Integer types capable of holding object pointers */ + +-#undef intptr_t +-#undef uintptr_t ++/* kLIBC's stdint.h defines _INTPTR_T_DECLARED and needs its own ++ definitions of intptr_t and uintptr_t (which use int and unsigned) ++ to avoid clashes with declarations of system functions like sbrk. */ ++# ifndef _INTPTR_T_DECLARED ++# undef intptr_t ++# undef uintptr_t + typedef long int gl_intptr_t; + typedef unsigned long int gl_uintptr_t; +-#define intptr_t gl_intptr_t +-#define uintptr_t gl_uintptr_t ++# define intptr_t gl_intptr_t ++# define uintptr_t gl_uintptr_t ++# endif + + /* 7.18.1.5. Greatest-width integer types */ + +@@ -305,33 +320,33 @@ + similarly for UINTMAX_MAX and uintmax_t. This avoids problems with + assuming one type where another is used by the system. */ + +-#ifndef INTMAX_MAX +-# undef INTMAX_C +-# undef intmax_t +-# if @HAVE_LONG_LONG_INT@ && LONG_MAX >> 30 == 1 ++# ifndef INTMAX_MAX ++# undef INTMAX_C ++# undef intmax_t ++# if @HAVE_LONG_LONG_INT@ && LONG_MAX >> 30 == 1 + typedef long long int gl_intmax_t; +-# define intmax_t gl_intmax_t +-# elif defined GL_INT64_T +-# define intmax_t int64_t +-# else ++# define intmax_t gl_intmax_t ++# elif defined GL_INT64_T ++# define intmax_t int64_t ++# else + typedef long int gl_intmax_t; +-# define intmax_t gl_intmax_t ++# define intmax_t gl_intmax_t ++# endif + # endif +-#endif + +-#ifndef UINTMAX_MAX +-# undef UINTMAX_C +-# undef uintmax_t +-# if @HAVE_UNSIGNED_LONG_LONG_INT@ && ULONG_MAX >> 31 == 1 ++# ifndef UINTMAX_MAX ++# undef UINTMAX_C ++# undef uintmax_t ++# if @HAVE_UNSIGNED_LONG_LONG_INT@ && ULONG_MAX >> 31 == 1 + typedef unsigned long long int gl_uintmax_t; +-# define uintmax_t gl_uintmax_t +-# elif defined GL_UINT64_T +-# define uintmax_t uint64_t +-# else ++# define uintmax_t gl_uintmax_t ++# elif defined GL_UINT64_T ++# define uintmax_t uint64_t ++# else + typedef unsigned long int gl_uintmax_t; +-# define uintmax_t gl_uintmax_t ++# define uintmax_t gl_uintmax_t ++# endif + # endif +-#endif + + /* Verify that intmax_t and uintmax_t have the same size. Too much code + breaks if this is not the case. If this check fails, the reason is likely +@@ -339,8 +354,8 @@ + typedef int _verify_intmax_size[sizeof (intmax_t) == sizeof (uintmax_t) + ? 1 : -1]; + +-#define GNULIB_defined_stdint_types 1 +-#endif /* !GNULIB_defined_stdint_types */ ++# define GNULIB_defined_stdint_types 1 ++# endif /* !GNULIB_defined_stdint_types */ + + /* 7.18.2. Limits of specified-width integer types */ + +@@ -349,37 +364,37 @@ + /* Here we assume a standard architecture where the hardware integer + types have 8, 16, 32, optionally 64 bits. */ + +-#undef INT8_MIN +-#undef INT8_MAX +-#undef UINT8_MAX +-#define INT8_MIN (~ INT8_MAX) +-#define INT8_MAX 127 +-#define UINT8_MAX 255 +- +-#undef INT16_MIN +-#undef INT16_MAX +-#undef UINT16_MAX +-#define INT16_MIN (~ INT16_MAX) +-#define INT16_MAX 32767 +-#define UINT16_MAX 65535 +- +-#undef INT32_MIN +-#undef INT32_MAX +-#undef UINT32_MAX +-#define INT32_MIN (~ INT32_MAX) +-#define INT32_MAX 2147483647 +-#define UINT32_MAX 4294967295U ++# undef INT8_MIN ++# undef INT8_MAX ++# undef UINT8_MAX ++# define INT8_MIN (~ INT8_MAX) ++# define INT8_MAX 127 ++# define UINT8_MAX 255 ++ ++# undef INT16_MIN ++# undef INT16_MAX ++# undef UINT16_MAX ++# define INT16_MIN (~ INT16_MAX) ++# define INT16_MAX 32767 ++# define UINT16_MAX 65535 ++ ++# undef INT32_MIN ++# undef INT32_MAX ++# undef UINT32_MAX ++# define INT32_MIN (~ INT32_MAX) ++# define INT32_MAX 2147483647 ++# define UINT32_MAX 4294967295U + +-#if defined GL_INT64_T && ! defined INT64_MAX ++# if defined GL_INT64_T && ! defined INT64_MAX + /* Prefer (- INTMAX_C (1) << 63) over (~ INT64_MAX) because SunPRO C 5.0 + evaluates the latter incorrectly in preprocessor expressions. */ +-# define INT64_MIN (- INTMAX_C (1) << 63) +-# define INT64_MAX INTMAX_C (9223372036854775807) +-#endif ++# define INT64_MIN (- INTMAX_C (1) << 63) ++# define INT64_MAX INTMAX_C (9223372036854775807) ++# endif + +-#if defined GL_UINT64_T && ! defined UINT64_MAX +-# define UINT64_MAX UINTMAX_C (18446744073709551615) +-#endif ++# if defined GL_UINT64_T && ! defined UINT64_MAX ++# define UINT64_MAX UINTMAX_C (18446744073709551615) ++# endif + + /* 7.18.2.2. Limits of minimum-width integer types */ + +@@ -387,38 +402,38 @@ + types have 8, 16, 32, optionally 64 bits. Therefore the leastN_t types + are the same as the corresponding N_t types. */ + +-#undef INT_LEAST8_MIN +-#undef INT_LEAST8_MAX +-#undef UINT_LEAST8_MAX +-#define INT_LEAST8_MIN INT8_MIN +-#define INT_LEAST8_MAX INT8_MAX +-#define UINT_LEAST8_MAX UINT8_MAX +- +-#undef INT_LEAST16_MIN +-#undef INT_LEAST16_MAX +-#undef UINT_LEAST16_MAX +-#define INT_LEAST16_MIN INT16_MIN +-#define INT_LEAST16_MAX INT16_MAX +-#define UINT_LEAST16_MAX UINT16_MAX +- +-#undef INT_LEAST32_MIN +-#undef INT_LEAST32_MAX +-#undef UINT_LEAST32_MAX +-#define INT_LEAST32_MIN INT32_MIN +-#define INT_LEAST32_MAX INT32_MAX +-#define UINT_LEAST32_MAX UINT32_MAX +- +-#undef INT_LEAST64_MIN +-#undef INT_LEAST64_MAX +-#ifdef GL_INT64_T +-# define INT_LEAST64_MIN INT64_MIN +-# define INT_LEAST64_MAX INT64_MAX +-#endif +- +-#undef UINT_LEAST64_MAX +-#ifdef GL_UINT64_T +-# define UINT_LEAST64_MAX UINT64_MAX +-#endif ++# undef INT_LEAST8_MIN ++# undef INT_LEAST8_MAX ++# undef UINT_LEAST8_MAX ++# define INT_LEAST8_MIN INT8_MIN ++# define INT_LEAST8_MAX INT8_MAX ++# define UINT_LEAST8_MAX UINT8_MAX ++ ++# undef INT_LEAST16_MIN ++# undef INT_LEAST16_MAX ++# undef UINT_LEAST16_MAX ++# define INT_LEAST16_MIN INT16_MIN ++# define INT_LEAST16_MAX INT16_MAX ++# define UINT_LEAST16_MAX UINT16_MAX ++ ++# undef INT_LEAST32_MIN ++# undef INT_LEAST32_MAX ++# undef UINT_LEAST32_MAX ++# define INT_LEAST32_MIN INT32_MIN ++# define INT_LEAST32_MAX INT32_MAX ++# define UINT_LEAST32_MAX UINT32_MAX ++ ++# undef INT_LEAST64_MIN ++# undef INT_LEAST64_MAX ++# ifdef GL_INT64_T ++# define INT_LEAST64_MIN INT64_MIN ++# define INT_LEAST64_MAX INT64_MAX ++# endif ++ ++# undef UINT_LEAST64_MAX ++# ifdef GL_UINT64_T ++# define UINT_LEAST64_MAX UINT64_MAX ++# endif + + /* 7.18.2.3. Limits of fastest minimum-width integer types */ + +@@ -426,117 +441,121 @@ + types have 8, 16, 32, optionally 64 bits. Therefore the fastN_t types + are taken from the same list of types. */ + +-#undef INT_FAST8_MIN +-#undef INT_FAST8_MAX +-#undef UINT_FAST8_MAX +-#define INT_FAST8_MIN SCHAR_MIN +-#define INT_FAST8_MAX SCHAR_MAX +-#define UINT_FAST8_MAX UCHAR_MAX +- +-#undef INT_FAST16_MIN +-#undef INT_FAST16_MAX +-#undef UINT_FAST16_MAX +-#define INT_FAST16_MIN INT_FAST32_MIN +-#define INT_FAST16_MAX INT_FAST32_MAX +-#define UINT_FAST16_MAX UINT_FAST32_MAX +- +-#undef INT_FAST32_MIN +-#undef INT_FAST32_MAX +-#undef UINT_FAST32_MAX +-#ifdef __sun +-# define INT_FAST32_MIN INT_MIN +-# define INT_FAST32_MAX INT_MAX +-# define UINT_FAST32_MAX UINT_MAX +-#else +-# define INT_FAST32_MIN LONG_MIN +-# define INT_FAST32_MAX LONG_MAX +-# define UINT_FAST32_MAX ULONG_MAX +-#endif ++# undef INT_FAST8_MIN ++# undef INT_FAST8_MAX ++# undef UINT_FAST8_MAX ++# define INT_FAST8_MIN SCHAR_MIN ++# define INT_FAST8_MAX SCHAR_MAX ++# define UINT_FAST8_MAX UCHAR_MAX ++ ++# undef INT_FAST16_MIN ++# undef INT_FAST16_MAX ++# undef UINT_FAST16_MAX ++# define INT_FAST16_MIN INT_FAST32_MIN ++# define INT_FAST16_MAX INT_FAST32_MAX ++# define UINT_FAST16_MAX UINT_FAST32_MAX ++ ++# undef INT_FAST32_MIN ++# undef INT_FAST32_MAX ++# undef UINT_FAST32_MAX ++# ifdef __sun ++# define INT_FAST32_MIN INT_MIN ++# define INT_FAST32_MAX INT_MAX ++# define UINT_FAST32_MAX UINT_MAX ++# else ++# define INT_FAST32_MIN LONG_MIN ++# define INT_FAST32_MAX LONG_MAX ++# define UINT_FAST32_MAX ULONG_MAX ++# endif + +-#undef INT_FAST64_MIN +-#undef INT_FAST64_MAX +-#ifdef GL_INT64_T +-# define INT_FAST64_MIN INT64_MIN +-# define INT_FAST64_MAX INT64_MAX +-#endif ++# undef INT_FAST64_MIN ++# undef INT_FAST64_MAX ++# ifdef GL_INT64_T ++# define INT_FAST64_MIN INT64_MIN ++# define INT_FAST64_MAX INT64_MAX ++# endif + +-#undef UINT_FAST64_MAX +-#ifdef GL_UINT64_T +-# define UINT_FAST64_MAX UINT64_MAX +-#endif ++# undef UINT_FAST64_MAX ++# ifdef GL_UINT64_T ++# define UINT_FAST64_MAX UINT64_MAX ++# endif + + /* 7.18.2.4. Limits of integer types capable of holding object pointers */ + +-#undef INTPTR_MIN +-#undef INTPTR_MAX +-#undef UINTPTR_MAX +-#define INTPTR_MIN LONG_MIN +-#define INTPTR_MAX LONG_MAX +-#define UINTPTR_MAX ULONG_MAX ++# undef INTPTR_MIN ++# undef INTPTR_MAX ++# undef UINTPTR_MAX ++# define INTPTR_MIN LONG_MIN ++# define INTPTR_MAX LONG_MAX ++# define UINTPTR_MAX ULONG_MAX + + /* 7.18.2.5. Limits of greatest-width integer types */ + +-#ifndef INTMAX_MAX +-# undef INTMAX_MIN +-# ifdef INT64_MAX +-# define INTMAX_MIN INT64_MIN +-# define INTMAX_MAX INT64_MAX +-# else +-# define INTMAX_MIN INT32_MIN +-# define INTMAX_MAX INT32_MAX ++# ifndef INTMAX_MAX ++# undef INTMAX_MIN ++# ifdef INT64_MAX ++# define INTMAX_MIN INT64_MIN ++# define INTMAX_MAX INT64_MAX ++# else ++# define INTMAX_MIN INT32_MIN ++# define INTMAX_MAX INT32_MAX ++# endif + # endif +-#endif + +-#ifndef UINTMAX_MAX +-# ifdef UINT64_MAX +-# define UINTMAX_MAX UINT64_MAX +-# else +-# define UINTMAX_MAX UINT32_MAX ++# ifndef UINTMAX_MAX ++# ifdef UINT64_MAX ++# define UINTMAX_MAX UINT64_MAX ++# else ++# define UINTMAX_MAX UINT32_MAX ++# endif + # endif +-#endif + + /* 7.18.3. Limits of other integer types */ + + /* ptrdiff_t limits */ +-#undef PTRDIFF_MIN +-#undef PTRDIFF_MAX +-#if @APPLE_UNIVERSAL_BUILD@ +-# ifdef _LP64 +-# define PTRDIFF_MIN _STDINT_MIN (1, 64, 0l) +-# define PTRDIFF_MAX _STDINT_MAX (1, 64, 0l) ++# undef PTRDIFF_MIN ++# undef PTRDIFF_MAX ++# if @APPLE_UNIVERSAL_BUILD@ ++# ifdef _LP64 ++# define PTRDIFF_MIN _STDINT_SIGNED_MIN (64, 0l) ++# define PTRDIFF_MAX _STDINT_MAX (1, 64, 0l) ++# else ++# define PTRDIFF_MIN _STDINT_SIGNED_MIN (32, 0) ++# define PTRDIFF_MAX _STDINT_MAX (1, 32, 0) ++# endif + # else +-# define PTRDIFF_MIN _STDINT_MIN (1, 32, 0) +-# define PTRDIFF_MAX _STDINT_MAX (1, 32, 0) +-# endif +-#else +-# define PTRDIFF_MIN \ +- _STDINT_MIN (1, @BITSIZEOF_PTRDIFF_T@, 0@PTRDIFF_T_SUFFIX@) +-# define PTRDIFF_MAX \ ++# define PTRDIFF_MIN \ ++ _STDINT_SIGNED_MIN (@BITSIZEOF_PTRDIFF_T@, 0@PTRDIFF_T_SUFFIX@) ++# define PTRDIFF_MAX \ + _STDINT_MAX (1, @BITSIZEOF_PTRDIFF_T@, 0@PTRDIFF_T_SUFFIX@) +-#endif ++# endif + + /* sig_atomic_t limits */ +-#undef SIG_ATOMIC_MIN +-#undef SIG_ATOMIC_MAX +-#define SIG_ATOMIC_MIN \ +- _STDINT_MIN (@HAVE_SIGNED_SIG_ATOMIC_T@, @BITSIZEOF_SIG_ATOMIC_T@, \ +- 0@SIG_ATOMIC_T_SUFFIX@) +-#define SIG_ATOMIC_MAX \ ++# undef SIG_ATOMIC_MIN ++# undef SIG_ATOMIC_MAX ++# if @HAVE_SIGNED_SIG_ATOMIC_T@ ++# define SIG_ATOMIC_MIN \ ++ _STDINT_SIGNED_MIN (@BITSIZEOF_SIG_ATOMIC_T@, 0@SIG_ATOMIC_T_SUFFIX@) ++# else ++# define SIG_ATOMIC_MIN \ ++ _STDINT_UNSIGNED_MIN (@BITSIZEOF_SIG_ATOMIC_T@, 0@SIG_ATOMIC_T_SUFFIX@) ++# endif ++# define SIG_ATOMIC_MAX \ + _STDINT_MAX (@HAVE_SIGNED_SIG_ATOMIC_T@, @BITSIZEOF_SIG_ATOMIC_T@, \ + 0@SIG_ATOMIC_T_SUFFIX@) + + + /* size_t limit */ +-#undef SIZE_MAX +-#if @APPLE_UNIVERSAL_BUILD@ +-# ifdef _LP64 +-# define SIZE_MAX _STDINT_MAX (0, 64, 0ul) ++# undef SIZE_MAX ++# if @APPLE_UNIVERSAL_BUILD@ ++# ifdef _LP64 ++# define SIZE_MAX _STDINT_MAX (0, 64, 0ul) ++# else ++# define SIZE_MAX _STDINT_MAX (0, 32, 0ul) ++# endif + # else +-# define SIZE_MAX _STDINT_MAX (0, 32, 0ul) ++# define SIZE_MAX _STDINT_MAX (0, @BITSIZEOF_SIZE_T@, 0@SIZE_T_SUFFIX@) + # endif +-#else +-# define SIZE_MAX _STDINT_MAX (0, @BITSIZEOF_SIZE_T@, 0@SIZE_T_SUFFIX@) +-#endif + + /* wchar_t limits */ + /* Get WCHAR_MIN, WCHAR_MAX. +@@ -544,29 +563,39 @@ + sequence of nested includes + -> -> -> , and the latter includes + and assumes its types are already defined. */ +-#if @HAVE_WCHAR_H@ && ! (defined WCHAR_MIN && defined WCHAR_MAX) ++# if @HAVE_WCHAR_H@ && ! (defined WCHAR_MIN && defined WCHAR_MAX) + /* BSD/OS 4.0.1 has a bug: , and must be + included before . */ +-# include +-# include +-# include +-# define _GL_JUST_INCLUDE_SYSTEM_WCHAR_H +-# include +-# undef _GL_JUST_INCLUDE_SYSTEM_WCHAR_H +-#endif +-#undef WCHAR_MIN +-#undef WCHAR_MAX +-#define WCHAR_MIN \ +- _STDINT_MIN (@HAVE_SIGNED_WCHAR_T@, @BITSIZEOF_WCHAR_T@, 0@WCHAR_T_SUFFIX@) +-#define WCHAR_MAX \ ++# include ++# include ++# include ++# define _GL_JUST_INCLUDE_SYSTEM_WCHAR_H ++# include ++# undef _GL_JUST_INCLUDE_SYSTEM_WCHAR_H ++# endif ++# undef WCHAR_MIN ++# undef WCHAR_MAX ++# if @HAVE_SIGNED_WCHAR_T@ ++# define WCHAR_MIN \ ++ _STDINT_SIGNED_MIN (@BITSIZEOF_WCHAR_T@, 0@WCHAR_T_SUFFIX@) ++# else ++# define WCHAR_MIN \ ++ _STDINT_UNSIGNED_MIN (@BITSIZEOF_WCHAR_T@, 0@WCHAR_T_SUFFIX@) ++# endif ++# define WCHAR_MAX \ + _STDINT_MAX (@HAVE_SIGNED_WCHAR_T@, @BITSIZEOF_WCHAR_T@, 0@WCHAR_T_SUFFIX@) + + /* wint_t limits */ +-#undef WINT_MIN +-#undef WINT_MAX +-#define WINT_MIN \ +- _STDINT_MIN (@HAVE_SIGNED_WINT_T@, @BITSIZEOF_WINT_T@, 0@WINT_T_SUFFIX@) +-#define WINT_MAX \ ++# undef WINT_MIN ++# undef WINT_MAX ++# if @HAVE_SIGNED_WINT_T@ ++# define WINT_MIN \ ++ _STDINT_SIGNED_MIN (@BITSIZEOF_WINT_T@, 0@WINT_T_SUFFIX@) ++# else ++# define WINT_MIN \ ++ _STDINT_UNSIGNED_MIN (@BITSIZEOF_WINT_T@, 0@WINT_T_SUFFIX@) ++# endif ++# define WINT_MAX \ + _STDINT_MAX (@HAVE_SIGNED_WINT_T@, @BITSIZEOF_WINT_T@, 0@WINT_T_SUFFIX@) + + /* 7.18.4. Macros for integer constants */ +@@ -577,59 +606,120 @@ + /* Here we assume a standard architecture where the hardware integer + types have 8, 16, 32, optionally 64 bits, and int is 32 bits. */ + +-#undef INT8_C +-#undef UINT8_C +-#define INT8_C(x) x +-#define UINT8_C(x) x +- +-#undef INT16_C +-#undef UINT16_C +-#define INT16_C(x) x +-#define UINT16_C(x) x +- +-#undef INT32_C +-#undef UINT32_C +-#define INT32_C(x) x +-#define UINT32_C(x) x ## U +- +-#undef INT64_C +-#undef UINT64_C +-#if LONG_MAX >> 31 >> 31 == 1 +-# define INT64_C(x) x##L +-#elif defined _MSC_VER +-# define INT64_C(x) x##i64 +-#elif @HAVE_LONG_LONG_INT@ +-# define INT64_C(x) x##LL +-#endif +-#if ULONG_MAX >> 31 >> 31 >> 1 == 1 +-# define UINT64_C(x) x##UL +-#elif defined _MSC_VER +-# define UINT64_C(x) x##ui64 +-#elif @HAVE_UNSIGNED_LONG_LONG_INT@ +-# define UINT64_C(x) x##ULL +-#endif ++# undef INT8_C ++# undef UINT8_C ++# define INT8_C(x) x ++# define UINT8_C(x) x ++ ++# undef INT16_C ++# undef UINT16_C ++# define INT16_C(x) x ++# define UINT16_C(x) x ++ ++# undef INT32_C ++# undef UINT32_C ++# define INT32_C(x) x ++# define UINT32_C(x) x ## U ++ ++# undef INT64_C ++# undef UINT64_C ++# if LONG_MAX >> 31 >> 31 == 1 ++# define INT64_C(x) x##L ++# elif defined _MSC_VER ++# define INT64_C(x) x##i64 ++# elif @HAVE_LONG_LONG_INT@ ++# define INT64_C(x) x##LL ++# endif ++# if ULONG_MAX >> 31 >> 31 >> 1 == 1 ++# define UINT64_C(x) x##UL ++# elif defined _MSC_VER ++# define UINT64_C(x) x##ui64 ++# elif @HAVE_UNSIGNED_LONG_LONG_INT@ ++# define UINT64_C(x) x##ULL ++# endif + + /* 7.18.4.2. Macros for greatest-width integer constants */ + +-#ifndef INTMAX_C +-# if @HAVE_LONG_LONG_INT@ && LONG_MAX >> 30 == 1 +-# define INTMAX_C(x) x##LL +-# elif defined GL_INT64_T +-# define INTMAX_C(x) INT64_C(x) +-# else +-# define INTMAX_C(x) x##L ++# ifndef INTMAX_C ++# if @HAVE_LONG_LONG_INT@ && LONG_MAX >> 30 == 1 ++# define INTMAX_C(x) x##LL ++# elif defined GL_INT64_T ++# define INTMAX_C(x) INT64_C(x) ++# else ++# define INTMAX_C(x) x##L ++# endif + # endif +-#endif + +-#ifndef UINTMAX_C +-# if @HAVE_UNSIGNED_LONG_LONG_INT@ && ULONG_MAX >> 31 == 1 +-# define UINTMAX_C(x) x##ULL +-# elif defined GL_UINT64_T +-# define UINTMAX_C(x) UINT64_C(x) +-# else +-# define UINTMAX_C(x) x##UL ++# ifndef UINTMAX_C ++# if @HAVE_UNSIGNED_LONG_LONG_INT@ && ULONG_MAX >> 31 == 1 ++# define UINTMAX_C(x) x##ULL ++# elif defined GL_UINT64_T ++# define UINTMAX_C(x) UINT64_C(x) ++# else ++# define UINTMAX_C(x) x##UL ++# endif + # endif +-#endif ++ ++#endif /* !@HAVE_C99_STDINT_H@ */ ++ ++/* Macros specified by ISO/IEC TS 18661-1:2014. */ ++ ++#if (!defined UINTMAX_WIDTH \ ++ && (defined _GNU_SOURCE || defined __STDC_WANT_IEC_60559_BFP_EXT__)) ++# ifdef INT8_MAX ++# define INT8_WIDTH _GL_INTEGER_WIDTH (INT8_MIN, INT8_MAX) ++# endif ++# ifdef UINT8_MAX ++# define UINT8_WIDTH _GL_INTEGER_WIDTH (0, UINT8_MAX) ++# endif ++# ifdef INT16_MAX ++# define INT16_WIDTH _GL_INTEGER_WIDTH (INT16_MIN, INT16_MAX) ++# endif ++# ifdef UINT16_MAX ++# define UINT16_WIDTH _GL_INTEGER_WIDTH (0, UINT16_MAX) ++# endif ++# ifdef INT32_MAX ++# define INT32_WIDTH _GL_INTEGER_WIDTH (INT32_MIN, INT32_MAX) ++# endif ++# ifdef UINT32_MAX ++# define UINT32_WIDTH _GL_INTEGER_WIDTH (0, UINT32_MAX) ++# endif ++# ifdef INT64_MAX ++# define INT64_WIDTH _GL_INTEGER_WIDTH (INT64_MIN, INT64_MAX) ++# endif ++# ifdef UINT64_MAX ++# define UINT64_WIDTH _GL_INTEGER_WIDTH (0, UINT64_MAX) ++# endif ++# define INT_LEAST8_WIDTH _GL_INTEGER_WIDTH (INT_LEAST8_MIN, INT_LEAST8_MAX) ++# define UINT_LEAST8_WIDTH _GL_INTEGER_WIDTH (0, UINT_LEAST8_MAX) ++# define INT_LEAST16_WIDTH _GL_INTEGER_WIDTH (INT_LEAST16_MIN, INT_LEAST16_MAX) ++# define UINT_LEAST16_WIDTH _GL_INTEGER_WIDTH (0, UINT_LEAST16_MAX) ++# define INT_LEAST32_WIDTH _GL_INTEGER_WIDTH (INT_LEAST32_MIN, INT_LEAST32_MAX) ++# define UINT_LEAST32_WIDTH _GL_INTEGER_WIDTH (0, UINT_LEAST32_MAX) ++# define INT_LEAST64_WIDTH _GL_INTEGER_WIDTH (INT_LEAST64_MIN, INT_LEAST64_MAX) ++# define UINT_LEAST64_WIDTH _GL_INTEGER_WIDTH (0, UINT_LEAST64_MAX) ++# define INT_FAST8_WIDTH _GL_INTEGER_WIDTH (INT_FAST8_MIN, INT_FAST8_MAX) ++# define UINT_FAST8_WIDTH _GL_INTEGER_WIDTH (0, UINT_FAST8_MAX) ++# define INT_FAST16_WIDTH _GL_INTEGER_WIDTH (INT_FAST16_MIN, INT_FAST16_MAX) ++# define UINT_FAST16_WIDTH _GL_INTEGER_WIDTH (0, UINT_FAST16_MAX) ++# define INT_FAST32_WIDTH _GL_INTEGER_WIDTH (INT_FAST32_MIN, INT_FAST32_MAX) ++# define UINT_FAST32_WIDTH _GL_INTEGER_WIDTH (0, UINT_FAST32_MAX) ++# define INT_FAST64_WIDTH _GL_INTEGER_WIDTH (INT_FAST64_MIN, INT_FAST64_MAX) ++# define UINT_FAST64_WIDTH _GL_INTEGER_WIDTH (0, UINT_FAST64_MAX) ++# define INTPTR_WIDTH _GL_INTEGER_WIDTH (INTPTR_MIN, INTPTR_MAX) ++# define UINTPTR_WIDTH _GL_INTEGER_WIDTH (0, UINTPTR_MAX) ++# define INTMAX_WIDTH _GL_INTEGER_WIDTH (INTMAX_MIN, INTMAX_MAX) ++# define UINTMAX_WIDTH _GL_INTEGER_WIDTH (0, UINTMAX_MAX) ++# define PTRDIFF_WIDTH _GL_INTEGER_WIDTH (PTRDIFF_MIN, PTRDIFF_MAX) ++# define SIZE_WIDTH _GL_INTEGER_WIDTH (0, SIZE_MAX) ++# define WCHAR_WIDTH _GL_INTEGER_WIDTH (WCHAR_MIN, WCHAR_MAX) ++# ifdef WINT_MAX ++# define WINT_WIDTH _GL_INTEGER_WIDTH (WINT_MIN, WINT_MAX) ++# endif ++# ifdef SIG_ATOMIC_MAX ++# define SIG_ATOMIC_WIDTH _GL_INTEGER_WIDTH (SIG_ATOMIC_MIN, SIG_ATOMIC_MAX) ++# endif ++#endif /* !WINT_WIDTH && (_GNU_SOURCE || __STDC_WANT_IEC_60559_BFP_EXT__) */ + + #endif /* _@GUARD_PREFIX@_STDINT_H */ + #endif /* !(defined __ANDROID__ && ...) */ +diff -Naur libpipeline-1.5.0-orig/gnulib/lib/stdio.in.h libpipeline-1.5.0/gnulib/lib/stdio.in.h +--- libpipeline-1.5.0-orig/gnulib/lib/stdio.in.h 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/lib/stdio.in.h 2018-07-02 13:09:59.620436400 +0300 +@@ -1,6 +1,6 @@ + /* A GNU-like . + +- Copyright (C) 2004, 2007-2014 Free Software Foundation, Inc. ++ Copyright (C) 2004, 2007-2017 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 +@@ -84,8 +84,13 @@ + except that it indicates to GCC that the supported format string directives + are the ones of the system printf(), rather than the ones standardized by + ISO C99 and POSIX. */ +-#define _GL_ATTRIBUTE_FORMAT_PRINTF_SYSTEM(formatstring_parameter, first_argument) \ ++#if GNULIB_PRINTF_ATTRIBUTE_FLAVOR_GNU ++# define _GL_ATTRIBUTE_FORMAT_PRINTF_SYSTEM(formatstring_parameter, first_argument) \ ++ _GL_ATTRIBUTE_FORMAT_PRINTF (formatstring_parameter, first_argument) ++#else ++# define _GL_ATTRIBUTE_FORMAT_PRINTF_SYSTEM(formatstring_parameter, first_argument) \ + _GL_ATTRIBUTE_FORMAT ((__printf__, formatstring_parameter, first_argument)) ++#endif + + /* _GL_ATTRIBUTE_FORMAT_SCANF + indicates to GCC that the function takes a format string and arguments, +@@ -113,6 +118,26 @@ + # include + #endif + ++/* MSVC declares 'perror' in , not in . We must include ++ it before we #define perror rpl_perror. */ ++/* But in any case avoid namespace pollution on glibc systems. */ ++#if (@GNULIB_PERROR@ || defined GNULIB_POSIXCHECK) \ ++ && ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__) \ ++ && ! defined __GLIBC__ ++# include ++#endif ++ ++/* MSVC declares 'remove' in , not in . We must include ++ it before we #define remove rpl_remove. */ ++/* MSVC declares 'rename' in , not in . We must include ++ it before we #define rename rpl_rename. */ ++/* But in any case avoid namespace pollution on glibc systems. */ ++#if (@GNULIB_REMOVE@ || @GNULIB_RENAME@ || defined GNULIB_POSIXCHECK) \ ++ && ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__) \ ++ && ! defined __GLIBC__ ++# include ++#endif ++ + + /* The definitions of _GL_FUNCDECL_RPL etc. are copied here. */ + +@@ -718,11 +743,10 @@ + so any use of gets warrants an unconditional warning; besides, C11 + removed it. */ + #undef gets +-#if HAVE_RAW_DECL_GETS ++#if HAVE_RAW_DECL_GETS && !defined __cplusplus + _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); + #endif + +- + #if @GNULIB_OBSTACK_PRINTF@ || @GNULIB_OBSTACK_PRINTF_POSIX@ + struct obstack; + /* Grow an obstack with formatted output. Return the number of +diff -Naur libpipeline-1.5.0-orig/gnulib/lib/stdlib.in.h libpipeline-1.5.0/gnulib/lib/stdlib.in.h +--- libpipeline-1.5.0-orig/gnulib/lib/stdlib.in.h 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/lib/stdlib.in.h 2018-07-02 13:09:59.630436400 +0300 +@@ -1,6 +1,6 @@ + /* A GNU-like . + +- Copyright (C) 1995, 2001-2004, 2006-2014 Free Software Foundation, Inc. ++ Copyright (C) 1995, 2001-2004, 2006-2017 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 +@@ -520,6 +520,44 @@ + _GL_CXXALIASWARN (putenv); + #endif + ++#if @GNULIB_QSORT_R@ ++/* Sort an array of NMEMB elements, starting at address BASE, each element ++ occupying SIZE bytes, in ascending order according to the comparison ++ function COMPARE. */ ++# if @REPLACE_QSORT_R@ ++# if !(defined __cplusplus && defined GNULIB_NAMESPACE) ++# undef qsort_r ++# define qsort_r rpl_qsort_r ++# endif ++_GL_FUNCDECL_RPL (qsort_r, void, (void *base, size_t nmemb, size_t size, ++ int (*compare) (void const *, void const *, ++ void *), ++ void *arg) _GL_ARG_NONNULL ((1, 4))); ++_GL_CXXALIAS_RPL (qsort_r, void, (void *base, size_t nmemb, size_t size, ++ int (*compare) (void const *, void const *, ++ void *), ++ void *arg)); ++# else ++# if !@HAVE_QSORT_R@ ++_GL_FUNCDECL_SYS (qsort_r, void, (void *base, size_t nmemb, size_t size, ++ int (*compare) (void const *, void const *, ++ void *), ++ void *arg) _GL_ARG_NONNULL ((1, 4))); ++# endif ++_GL_CXXALIAS_SYS (qsort_r, void, (void *base, size_t nmemb, size_t size, ++ int (*compare) (void const *, void const *, ++ void *), ++ void *arg)); ++# endif ++_GL_CXXALIASWARN (qsort_r); ++#elif defined GNULIB_POSIXCHECK ++# undef qsort_r ++# if HAVE_RAW_DECL_QSORT_R ++_GL_WARN_ON_USE (qsort_r, "qsort_r is not portable - " ++ "use gnulib module qsort_r for portability"); ++# endif ++#endif ++ + + #if @GNULIB_RANDOM_R@ + # if !@HAVE_RANDOM_R@ +diff -Naur libpipeline-1.5.0-orig/gnulib/lib/strerror.c libpipeline-1.5.0/gnulib/lib/strerror.c +--- libpipeline-1.5.0-orig/gnulib/lib/strerror.c 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/lib/strerror.c 2018-07-02 13:09:59.630436400 +0300 +@@ -1,6 +1,6 @@ + /* strerror.c --- POSIX compatible system error routine + +- Copyright (C) 2007-2014 Free Software Foundation, Inc. ++ Copyright (C) 2007-2017 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 +@@ -66,5 +66,6 @@ + if (sizeof buf <= len) + abort (); + +- return memcpy (buf, msg, len + 1); ++ memcpy (buf, msg, len + 1); ++ return buf; + } +diff -Naur libpipeline-1.5.0-orig/gnulib/lib/strerror-override.c libpipeline-1.5.0/gnulib/lib/strerror-override.c +--- libpipeline-1.5.0-orig/gnulib/lib/strerror-override.c 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/lib/strerror-override.c 2018-07-02 13:09:59.630436400 +0300 +@@ -1,6 +1,6 @@ + /* strerror-override.c --- POSIX compatible system error routine + +- Copyright (C) 2010-2014 Free Software Foundation, Inc. ++ Copyright (C) 2010-2017 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 +diff -Naur libpipeline-1.5.0-orig/gnulib/lib/strerror-override.h libpipeline-1.5.0/gnulib/lib/strerror-override.h +--- libpipeline-1.5.0-orig/gnulib/lib/strerror-override.h 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/lib/strerror-override.h 2018-07-02 13:09:59.630436400 +0300 +@@ -1,6 +1,6 @@ + /* strerror-override.h --- POSIX compatible system error routine + +- Copyright (C) 2010-2014 Free Software Foundation, Inc. ++ Copyright (C) 2010-2017 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 +diff -Naur libpipeline-1.5.0-orig/gnulib/lib/string.in.h libpipeline-1.5.0/gnulib/lib/string.in.h +--- libpipeline-1.5.0-orig/gnulib/lib/string.in.h 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/lib/string.in.h 2018-07-02 13:09:59.650436500 +0300 +@@ -1,6 +1,6 @@ + /* A GNU-like . + +- Copyright (C) 1995-1996, 2001-2014 Free Software Foundation, Inc. ++ Copyright (C) 1995-1996, 2001-2017 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 +@@ -15,16 +15,32 @@ + You should have received a copy of the GNU General Public License + along with this program; if not, see . */ + +-#ifndef _@GUARD_PREFIX@_STRING_H +- + #if __GNUC__ >= 3 + @PRAGMA_SYSTEM_HEADER@ + #endif + @PRAGMA_COLUMNS@ + ++#if defined _GL_ALREADY_INCLUDING_STRING_H ++/* Special invocation convention: ++ - On OS X/NetBSD we have a sequence of nested includes ++ -> -> "string.h" ++ In this situation system _chk variants due to -D_FORTIFY_SOURCE ++ might be used after any replacements defined here. */ ++ ++#@INCLUDE_NEXT@ @NEXT_STRING_H@ ++ ++#else ++/* Normal invocation convention. */ ++ ++#ifndef _@GUARD_PREFIX@_STRING_H ++ ++#define _GL_ALREADY_INCLUDING_STRING_H ++ + /* The include_next requires a split double-inclusion guard. */ + #@INCLUDE_NEXT@ @NEXT_STRING_H@ + ++#undef _GL_ALREADY_INCLUDING_STRING_H ++ + #ifndef _@GUARD_PREFIX@_STRING_H + #define _@GUARD_PREFIX@_STRING_H + +@@ -400,15 +416,15 @@ + # undef strndup + # define strndup rpl_strndup + # endif +-_GL_FUNCDECL_RPL (strndup, char *, (char const *__string, size_t __n) ++_GL_FUNCDECL_RPL (strndup, char *, (char const *__s, size_t __n) + _GL_ARG_NONNULL ((1))); +-_GL_CXXALIAS_RPL (strndup, char *, (char const *__string, size_t __n)); ++_GL_CXXALIAS_RPL (strndup, char *, (char const *__s, size_t __n)); + # else + # if ! @HAVE_DECL_STRNDUP@ +-_GL_FUNCDECL_SYS (strndup, char *, (char const *__string, size_t __n) ++_GL_FUNCDECL_SYS (strndup, char *, (char const *__s, size_t __n) + _GL_ARG_NONNULL ((1))); + # endif +-_GL_CXXALIAS_SYS (strndup, char *, (char const *__string, size_t __n)); ++_GL_CXXALIAS_SYS (strndup, char *, (char const *__s, size_t __n)); + # endif + _GL_CXXALIASWARN (strndup); + #elif defined GNULIB_POSIXCHECK +@@ -428,17 +444,17 @@ + # undef strnlen + # define strnlen rpl_strnlen + # endif +-_GL_FUNCDECL_RPL (strnlen, size_t, (char const *__string, size_t __maxlen) ++_GL_FUNCDECL_RPL (strnlen, size_t, (char const *__s, size_t __maxlen) + _GL_ATTRIBUTE_PURE + _GL_ARG_NONNULL ((1))); +-_GL_CXXALIAS_RPL (strnlen, size_t, (char const *__string, size_t __maxlen)); ++_GL_CXXALIAS_RPL (strnlen, size_t, (char const *__s, size_t __maxlen)); + # else + # if ! @HAVE_DECL_STRNLEN@ +-_GL_FUNCDECL_SYS (strnlen, size_t, (char const *__string, size_t __maxlen) ++_GL_FUNCDECL_SYS (strnlen, size_t, (char const *__s, size_t __maxlen) + _GL_ATTRIBUTE_PURE + _GL_ARG_NONNULL ((1))); + # endif +-_GL_CXXALIAS_SYS (strnlen, size_t, (char const *__string, size_t __maxlen)); ++_GL_CXXALIAS_SYS (strnlen, size_t, (char const *__s, size_t __maxlen)); + # endif + _GL_CXXALIASWARN (strnlen); + #elif defined GNULIB_POSIXCHECK +@@ -1027,3 +1043,4 @@ + + #endif /* _@GUARD_PREFIX@_STRING_H */ + #endif /* _@GUARD_PREFIX@_STRING_H */ ++#endif +diff -Naur libpipeline-1.5.0-orig/gnulib/lib/stripslash.c libpipeline-1.5.0/gnulib/lib/stripslash.c +--- libpipeline-1.5.0-orig/gnulib/lib/stripslash.c 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/lib/stripslash.c 2018-07-02 13:09:59.650436500 +0300 +@@ -1,6 +1,6 @@ + /* stripslash.c -- remove redundant trailing slashes from a file name + +- Copyright (C) 1990, 2001, 2003-2006, 2009-2014 Free Software Foundation, ++ Copyright (C) 1990, 2001, 2003-2006, 2009-2017 Free Software Foundation, + Inc. + + This program is free software: you can redistribute it and/or modify +diff -Naur libpipeline-1.5.0-orig/gnulib/lib/strndup.c libpipeline-1.5.0/gnulib/lib/strndup.c +--- libpipeline-1.5.0-orig/gnulib/lib/strndup.c 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/lib/strndup.c 2018-07-02 13:09:59.660436500 +0300 +@@ -1,6 +1,6 @@ + /* A replacement function, for systems that lack strndup. + +- Copyright (C) 1996-1998, 2001-2003, 2005-2007, 2009-2014 Free Software ++ Copyright (C) 1996-1998, 2001-2003, 2005-2007, 2009-2017 Free Software + Foundation, Inc. + + This program is free software; you can redistribute it and/or modify it +diff -Naur libpipeline-1.5.0-orig/gnulib/lib/strnlen.c libpipeline-1.5.0/gnulib/lib/strnlen.c +--- libpipeline-1.5.0-orig/gnulib/lib/strnlen.c 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/lib/strnlen.c 2018-07-02 13:09:59.660436500 +0300 +@@ -1,5 +1,5 @@ + /* Find the length of STRING, but scan at most MAXLEN characters. +- Copyright (C) 2005-2007, 2009-2014 Free Software Foundation, Inc. ++ Copyright (C) 2005-2007, 2009-2017 Free Software Foundation, Inc. + Written by Simon Josefsson. + + This program is free software; you can redistribute it and/or modify +diff -Naur libpipeline-1.5.0-orig/gnulib/lib/strsignal.c libpipeline-1.5.0/gnulib/lib/strsignal.c +--- libpipeline-1.5.0-orig/gnulib/lib/strsignal.c 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/lib/strsignal.c 2018-07-02 13:09:59.660436500 +0300 +@@ -1,4 +1,4 @@ +-/* Copyright (C) 1991, 1994-2002, 2005, 2008-2014 Free Software Foundation, ++/* Copyright (C) 1991, 1994-2002, 2005, 2008-2017 Free Software Foundation, + Inc. + This file is part of the GNU C Library. + +diff -Naur libpipeline-1.5.0-orig/gnulib/lib/sys_select.in.h libpipeline-1.5.0/gnulib/lib/sys_select.in.h +--- libpipeline-1.5.0-orig/gnulib/lib/sys_select.in.h 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/lib/sys_select.in.h 2018-07-02 13:09:59.660436500 +0300 +@@ -1,5 +1,5 @@ + /* Substitute for . +- Copyright (C) 2007-2014 Free Software Foundation, Inc. ++ Copyright (C) 2007-2017 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 +@@ -24,8 +24,8 @@ + On Cygwin, includes . + Simply delegate to the system's header in this case. */ + #if (@HAVE_SYS_SELECT_H@ \ ++ && !defined _GL_SYS_SELECT_H_REDIRECT_FROM_SYS_TYPES_H \ + && ((defined __osf__ && defined _SYS_TYPES_H_ \ +- && !defined _GL_SYS_SELECT_H_REDIRECT_FROM_SYS_TIME_H \ + && defined _OSF_SOURCE) \ + || (defined __sun && defined _SYS_TYPES_H \ + && (! (defined _XOPEN_SOURCE || defined _POSIX_C_SOURCE) \ +@@ -36,12 +36,13 @@ + + #elif (@HAVE_SYS_SELECT_H@ \ + && (defined _CYGWIN_SYS_TIME_H \ +- || (defined __osf__ && defined _SYS_TIME_H_ \ +- && !defined _GL_SYS_SELECT_H_REDIRECT_FROM_SYS_TIME_H \ +- && defined _OSF_SOURCE) \ +- || (defined __sun && defined _SYS_TIME_H \ +- && (! (defined _XOPEN_SOURCE || defined _POSIX_C_SOURCE) \ +- || defined __EXTENSIONS__)))) ++ || (!defined _GL_SYS_SELECT_H_REDIRECT_FROM_SYS_TIME_H \ ++ && ((defined __osf__ && defined _SYS_TIME_H_ \ ++ && defined _OSF_SOURCE) \ ++ || (defined __sun && defined _SYS_TIME_H \ ++ && (! (defined _XOPEN_SOURCE \ ++ || defined _POSIX_C_SOURCE) \ ++ || defined __EXTENSIONS__)))))) + + # define _GL_SYS_SELECT_H_REDIRECT_FROM_SYS_TIME_H + # @INCLUDE_NEXT@ @NEXT_SYS_SELECT_H@ +@@ -80,8 +81,9 @@ + of 'struct timeval', and no definition of this type. + Also, Mac OS X, AIX, HP-UX, IRIX, Solaris, Interix declare select() + in . +- But avoid namespace pollution on glibc systems. */ +-# ifndef __GLIBC__ ++ But avoid namespace pollution on glibc systems and "unknown type ++ name" problems on Cygwin. */ ++# if !(defined __GLIBC__ || defined __CYGWIN__) + # include + # endif + +@@ -99,10 +101,11 @@ + #endif + + /* Get definition of 'sigset_t'. +- But avoid namespace pollution on glibc systems. ++ But avoid namespace pollution on glibc systems and "unknown type ++ name" problems on Cygwin. + Do this after the include_next (for the sake of OpenBSD 5.0) but before + the split double-inclusion guard (for the sake of Solaris). */ +-#if !(defined __GLIBC__ && !defined __UCLIBC__) ++#if !((defined __GLIBC__ || defined __CYGWIN__) && !defined __UCLIBC__) + # include + #endif + +@@ -288,12 +291,15 @@ + # define select rpl_select + # endif + _GL_FUNCDECL_RPL (select, int, +- (int, fd_set *, fd_set *, fd_set *, struct timeval *)); ++ (int, fd_set *restrict, fd_set *restrict, fd_set *restrict, ++ struct timeval *restrict)); + _GL_CXXALIAS_RPL (select, int, +- (int, fd_set *, fd_set *, fd_set *, struct timeval *)); ++ (int, fd_set *restrict, fd_set *restrict, fd_set *restrict, ++ struct timeval *restrict)); + # else + _GL_CXXALIAS_SYS (select, int, +- (int, fd_set *, fd_set *, fd_set *, struct timeval *)); ++ (int, fd_set *restrict, fd_set *restrict, fd_set *restrict, ++ struct timeval *restrict)); + # endif + _GL_CXXALIASWARN (select); + #elif @HAVE_WINSOCK2_H@ +diff -Naur libpipeline-1.5.0-orig/gnulib/lib/sys_stat.in.h libpipeline-1.5.0/gnulib/lib/sys_stat.in.h +--- libpipeline-1.5.0-orig/gnulib/lib/sys_stat.in.h 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/lib/sys_stat.in.h 2018-07-02 13:09:59.670436500 +0300 +@@ -1,5 +1,5 @@ +-/* Provide a more complete sys/stat header file. +- Copyright (C) 2005-2014 Free Software Foundation, Inc. ++/* Provide a more complete sys/stat.h header file. ++ Copyright (C) 2005-2017 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 +@@ -72,6 +72,75 @@ + # define stat _stati64 + #endif + ++/* Optionally, override 'struct stat' on native Windows. */ ++#if @GNULIB_OVERRIDES_STRUCT_STAT@ ++ ++# undef stat ++# if @GNULIB_STAT@ ++# define stat rpl_stat ++# else ++ /* Provoke a clear link error if stat() is used as a function and ++ module 'stat' is not in use. */ ++# define stat stat_used_without_requesting_gnulib_module_stat ++# endif ++ ++# if !GNULIB_defined_struct_stat ++struct stat ++{ ++ dev_t st_dev; ++ ino_t st_ino; ++ mode_t st_mode; ++ nlink_t st_nlink; ++# if 0 ++ uid_t st_uid; ++# else /* uid_t is not defined by default on native Windows. */ ++ short st_uid; ++# endif ++# if 0 ++ gid_t st_gid; ++# else /* gid_t is not defined by default on native Windows. */ ++ short st_gid; ++# endif ++ dev_t st_rdev; ++ off_t st_size; ++# if 0 ++ blksize_t st_blksize; ++ blkcnt_t st_blocks; ++# endif ++ ++# if @WINDOWS_STAT_TIMESPEC@ ++ struct timespec st_atim; ++ struct timespec st_mtim; ++ struct timespec st_ctim; ++# else ++ time_t st_atime; ++ time_t st_mtime; ++ time_t st_ctime; ++# endif ++}; ++# if @WINDOWS_STAT_TIMESPEC@ ++# define st_atime st_atim.tv_sec ++# define st_mtime st_mtim.tv_sec ++# define st_ctime st_ctim.tv_sec ++ /* Indicator, for gnulib internal purposes. */ ++# define _GL_WINDOWS_STAT_TIMESPEC 1 ++# endif ++# define GNULIB_defined_struct_stat 1 ++# endif ++ ++/* Other possible values of st_mode. */ ++# if 0 ++# define _S_IFBLK 0x6000 ++# endif ++# if 0 ++# define _S_IFLNK 0xA000 ++# endif ++# if 0 ++# define _S_IFSOCK 0xC000 ++# endif ++ ++#endif ++ + #ifndef S_IFIFO + # ifdef _S_IFIFO + # define S_IFIFO _S_IFIFO +@@ -345,6 +414,9 @@ + _GL_CXXALIAS_SYS (fstat, int, (int fd, struct stat *buf)); + # endif + _GL_CXXALIASWARN (fstat); ++#elif @GNULIB_OVERRIDES_STRUCT_STAT@ ++# undef fstat ++# define fstat fstat_used_without_requesting_gnulib_module_fstat + #elif @WINDOWS_64_BIT_ST_SIZE@ + /* Above, we define stat to _stati64. */ + # define fstat _fstati64 +@@ -378,6 +450,9 @@ + (int fd, char const *name, struct stat *st, int flags)); + # endif + _GL_CXXALIASWARN (fstatat); ++#elif @GNULIB_OVERRIDES_STRUCT_STAT@ ++# undef fstatat ++# define fstatat fstatat_used_without_requesting_gnulib_module_fstatat + #elif defined GNULIB_POSIXCHECK + # undef fstatat + # if HAVE_RAW_DECL_FSTATAT +@@ -476,6 +551,9 @@ + # if @HAVE_LSTAT@ + _GL_CXXALIASWARN (lstat); + # endif ++#elif @GNULIB_OVERRIDES_STRUCT_STAT@ ++# undef lstat ++# define lstat lstat_used_without_requesting_gnulib_module_lstat + #elif defined GNULIB_POSIXCHECK + # undef lstat + # if HAVE_RAW_DECL_LSTAT +@@ -625,63 +703,69 @@ + + #if @GNULIB_STAT@ + # if @REPLACE_STAT@ +-/* We can't use the object-like #define stat rpl_stat, because of +- struct stat. This means that rpl_stat will not be used if the user +- does (stat)(a,b). Oh well. */ +-# if defined _AIX && defined stat && defined _LARGE_FILES +- /* With _LARGE_FILES defined, AIX (only) defines stat to stat64, +- so we have to replace stat64() instead of stat(). */ +-# undef stat64 +-# define stat64(name, st) rpl_stat (name, st) +-# elif @WINDOWS_64_BIT_ST_SIZE@ +- /* Above, we define stat to _stati64. */ +-# if defined __MINGW32__ && defined _stati64 +-# ifndef _USE_32BIT_TIME_T +- /* The system headers define _stati64 to _stat64. */ +-# undef _stat64 +-# define _stat64(name, st) rpl_stat (name, st) ++# if !@GNULIB_OVERRIDES_STRUCT_STAT@ ++ /* We can't use the object-like #define stat rpl_stat, because of ++ struct stat. This means that rpl_stat will not be used if the user ++ does (stat)(a,b). Oh well. */ ++# if defined _AIX && defined stat && defined _LARGE_FILES ++ /* With _LARGE_FILES defined, AIX (only) defines stat to stat64, ++ so we have to replace stat64() instead of stat(). */ ++# undef stat64 ++# define stat64(name, st) rpl_stat (name, st) ++# elif @WINDOWS_64_BIT_ST_SIZE@ ++ /* Above, we define stat to _stati64. */ ++# if defined __MINGW32__ && defined _stati64 ++# ifndef _USE_32BIT_TIME_T ++ /* The system headers define _stati64 to _stat64. */ ++# undef _stat64 ++# define _stat64(name, st) rpl_stat (name, st) ++# endif ++# elif defined _MSC_VER && defined _stati64 ++# ifdef _USE_32BIT_TIME_T ++ /* The system headers define _stati64 to _stat32i64. */ ++# undef _stat32i64 ++# define _stat32i64(name, st) rpl_stat (name, st) ++# else ++ /* The system headers define _stati64 to _stat64. */ ++# undef _stat64 ++# define _stat64(name, st) rpl_stat (name, st) ++# endif ++# else ++# undef _stati64 ++# define _stati64(name, st) rpl_stat (name, st) + # endif +-# elif defined _MSC_VER && defined _stati64 ++# elif defined __MINGW32__ && defined stat + # ifdef _USE_32BIT_TIME_T +- /* The system headers define _stati64 to _stat32i64. */ ++ /* The system headers define stat to _stat32i64. */ + # undef _stat32i64 + # define _stat32i64(name, st) rpl_stat (name, st) + # else +- /* The system headers define _stati64 to _stat64. */ ++ /* The system headers define stat to _stat64. */ + # undef _stat64 + # define _stat64(name, st) rpl_stat (name, st) + # endif +-# else +-# undef _stati64 +-# define _stati64(name, st) rpl_stat (name, st) +-# endif +-# elif defined __MINGW32__ && defined stat +-# ifdef _USE_32BIT_TIME_T +- /* The system headers define stat to _stat32i64. */ +-# undef _stat32i64 +-# define _stat32i64(name, st) rpl_stat (name, st) +-# else +- /* The system headers define stat to _stat64. */ +-# undef _stat64 +-# define _stat64(name, st) rpl_stat (name, st) +-# endif +-# elif defined _MSC_VER && defined stat +-# ifdef _USE_32BIT_TIME_T +- /* The system headers define stat to _stat32. */ +-# undef _stat32 +-# define _stat32(name, st) rpl_stat (name, st) +-# else +- /* The system headers define stat to _stat64i32. */ +-# undef _stat64i32 +-# define _stat64i32(name, st) rpl_stat (name, st) +-# endif +-# else /* !(_AIX ||__MINGW32__ || _MSC_VER) */ +-# undef stat +-# define stat(name, st) rpl_stat (name, st) +-# endif /* !_LARGE_FILES */ ++# elif defined _MSC_VER && defined stat ++# ifdef _USE_32BIT_TIME_T ++ /* The system headers define stat to _stat32. */ ++# undef _stat32 ++# define _stat32(name, st) rpl_stat (name, st) ++# else ++ /* The system headers define stat to _stat64i32. */ ++# undef _stat64i32 ++# define _stat64i32(name, st) rpl_stat (name, st) ++# endif ++# else /* !(_AIX || __MINGW32__ || _MSC_VER) */ ++# undef stat ++# define stat(name, st) rpl_stat (name, st) ++# endif /* !_LARGE_FILES */ ++# endif /* !@GNULIB_OVERRIDES_STRUCT_STAT@ */ + _GL_EXTERN_C int stat (const char *name, struct stat *buf) + _GL_ARG_NONNULL ((1, 2)); + # endif ++#elif @GNULIB_OVERRIDES_STRUCT_STAT@ ++/* see above: ++ #define stat stat_used_without_requesting_gnulib_module_stat ++ */ + #elif defined GNULIB_POSIXCHECK + # undef stat + # if HAVE_RAW_DECL_STAT +diff -Naur libpipeline-1.5.0-orig/gnulib/lib/sys_time.in.h libpipeline-1.5.0/gnulib/lib/sys_time.in.h +--- libpipeline-1.5.0-orig/gnulib/lib/sys_time.in.h 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/lib/sys_time.in.h 2018-07-02 13:09:59.670436500 +0300 +@@ -1,6 +1,6 @@ + /* Provide a more complete sys/time.h. + +- Copyright (C) 2007-2014 Free Software Foundation, Inc. ++ Copyright (C) 2007-2017 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 +@@ -109,6 +109,13 @@ + (struct timeval *restrict, void *restrict)); + # endif + _GL_CXXALIASWARN (gettimeofday); ++# if defined __cplusplus && defined GNULIB_NAMESPACE ++namespace GNULIB_NAMESPACE { ++ typedef ::timeval ++#undef timeval ++ timeval; ++} ++# endif + #elif defined GNULIB_POSIXCHECK + # undef gettimeofday + # if HAVE_RAW_DECL_GETTIMEOFDAY +diff -Naur libpipeline-1.5.0-orig/gnulib/lib/sys_types.in.h libpipeline-1.5.0/gnulib/lib/sys_types.in.h +--- libpipeline-1.5.0-orig/gnulib/lib/sys_types.in.h 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/lib/sys_types.in.h 2018-07-02 13:09:59.670436500 +0300 +@@ -1,6 +1,6 @@ + /* Provide a more complete sys/types.h. + +- Copyright (C) 2011-2014 Free Software Foundation, Inc. ++ Copyright (C) 2011-2017 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 +@@ -23,7 +23,9 @@ + #ifndef _@GUARD_PREFIX@_SYS_TYPES_H + + /* The include_next requires a split double-inclusion guard. */ ++# define _GL_INCLUDING_SYS_TYPES_H + #@INCLUDE_NEXT@ @NEXT_SYS_TYPES_H@ ++# undef _GL_INCLUDING_SYS_TYPES_H + + #ifndef _@GUARD_PREFIX@_SYS_TYPES_H + #define _@GUARD_PREFIX@_SYS_TYPES_H +@@ -40,6 +42,48 @@ + # define _GL_WINDOWS_64_BIT_OFF_T 1 + #endif + ++/* Override dev_t and ino_t if distinguishable inodes support is requested ++ on native Windows. */ ++#if @WINDOWS_STAT_INODES@ ++ ++# if @WINDOWS_STAT_INODES@ == 2 ++/* Experimental, not useful in Windows 10. */ ++ ++/* Define dev_t to a 64-bit type. */ ++# if !defined GNULIB_defined_dev_t ++typedef unsigned long long int rpl_dev_t; ++# undef dev_t ++# define dev_t rpl_dev_t ++# define GNULIB_defined_dev_t 1 ++# endif ++ ++/* Define ino_t to a 128-bit type. */ ++# if !defined GNULIB_defined_ino_t ++/* MSVC does not have a 128-bit integer type. ++ GCC has a 128-bit integer type __int128, but only on 64-bit targets. */ ++typedef struct { unsigned long long int _gl_ino[2]; } rpl_ino_t; ++# undef ino_t ++# define ino_t rpl_ino_t ++# define GNULIB_defined_ino_t 1 ++# endif ++ ++# else /* @WINDOWS_STAT_INODES@ == 1 */ ++ ++/* Define ino_t to a 64-bit type. */ ++# if !defined GNULIB_defined_ino_t ++typedef unsigned long long int rpl_ino_t; ++# undef ino_t ++# define ino_t rpl_ino_t ++# define GNULIB_defined_ino_t 1 ++# endif ++ ++# endif ++ ++/* Indicator, for gnulib internal purposes. */ ++# define _GL_WINDOWS_STAT_INODES @WINDOWS_STAT_INODES@ ++ ++#endif ++ + /* MSVC 9 defines size_t in , not in . */ + /* But avoid namespace pollution on glibc systems. */ + #if ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__) \ +diff -Naur libpipeline-1.5.0-orig/gnulib/lib/sys_wait.in.h libpipeline-1.5.0/gnulib/lib/sys_wait.in.h +--- libpipeline-1.5.0-orig/gnulib/lib/sys_wait.in.h 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/lib/sys_wait.in.h 2018-07-02 13:09:59.670436500 +0300 +@@ -1,5 +1,5 @@ + /* A POSIX-like . +- Copyright (C) 2001-2003, 2005-2014 Free Software Foundation, Inc. ++ Copyright (C) 2001-2003, 2005-2017 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 +diff -Naur libpipeline-1.5.0-orig/gnulib/lib/tempname.c libpipeline-1.5.0/gnulib/lib/tempname.c +--- libpipeline-1.5.0-orig/gnulib/lib/tempname.c 2014-11-08 16:53:37.000000000 +0300 ++++ libpipeline-1.5.0/gnulib/lib/tempname.c 2018-07-02 13:09:59.680436500 +0300 +@@ -1,6 +1,6 @@ + /* tempname.c - generate the name of a temporary file. + +- Copyright (C) 1991-2003, 2005-2007, 2009-2014 Free Software Foundation, Inc. ++ Copyright (C) 1991-2003, 2005-2007, 2009-2017 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 +@@ -62,6 +62,7 @@ + # define struct_stat64 struct stat64 + #else + # define struct_stat64 struct stat ++# define __try_tempname try_tempname + # define __gen_tempname gen_tempname + # define __getpid getpid + # define __gettimeofday gettimeofday +@@ -176,21 +177,9 @@ + static const char letters[] = + "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"; + +-/* Generate a temporary file name based on TMPL. TMPL must match the +- rules for mk[s]temp (i.e. end in "XXXXXX", possibly with a suffix). +- The name constructed does not exist at the time of the call to +- __gen_tempname. TMPL is overwritten with the result. +- +- KIND may be one of: +- __GT_NOCREATE: simply verify that the name does not exist +- at the time of the call. +- __GT_FILE: create the file using open(O_CREAT|O_EXCL) +- and return a read-write fd. The file is mode 0600. +- __GT_DIR: create a directory, which will be mode 0700. +- +- We use a clever algorithm to get hard-to-predict names. */ + int +-__gen_tempname (char *tmpl, int suffixlen, int flags, int kind) ++__try_tempname (char *tmpl, int suffixlen, void *args, ++ int (*tryfunc) (char *, void *)) + { + int len; + char *XXXXXX; +@@ -199,7 +188,6 @@ + unsigned int count; + int fd = -1; + int save_errno = errno; +- struct_stat64 st; + + /* A lower bound on the number of temporary files to attempt to + generate. The maximum total number of temporary file names that +@@ -256,41 +244,7 @@ + v /= 62; + XXXXXX[5] = letters[v % 62]; + +- switch (kind) +- { +- case __GT_FILE: +- fd = __open (tmpl, +- (flags & ~O_ACCMODE) +- | O_RDWR | O_CREAT | O_EXCL, S_IRUSR | S_IWUSR); +- break; +- +- case __GT_DIR: +- fd = __mkdir (tmpl, S_IRUSR | S_IWUSR | S_IXUSR); +- break; +- +- case __GT_NOCREATE: +- /* This case is backward from the other three. __gen_tempname +- succeeds if __xstat fails because the name does not exist. +- Note the continue to bypass the common logic at the bottom +- of the loop. */ +- if (__lxstat64 (_STAT_VER, tmpl, &st) < 0) +- { +- if (errno == ENOENT) +- { +- __set_errno (save_errno); +- return 0; +- } +- else +- /* Give up now. */ +- return -1; +- } +- continue; +- +- default: +- assert (! "invalid KIND in __gen_tempname"); +- abort (); +- } +- ++ fd = tryfunc (tmpl, args); + if (fd >= 0) + { + __set_errno (save_errno); +@@ -304,3 +258,67 @@ + __set_errno (EEXIST); + return -1; + } ++ ++static int ++try_file (char *tmpl, void *flags) ++{ ++ int *openflags = flags; ++ return __open (tmpl, ++ (*openflags & ~O_ACCMODE) ++ | O_RDWR | O_CREAT | O_EXCL, S_IRUSR | S_IWUSR); ++} ++ ++static int ++try_dir (char *tmpl, void *flags _GL_UNUSED) ++{ ++ return __mkdir (tmpl, S_IRUSR | S_IWUSR | S_IXUSR); ++} ++ ++static int ++try_nocreate (char *tmpl, void *flags _GL_UNUSED) ++{ ++ struct_stat64 st; ++ ++ if (__lxstat64 (_STAT_VER, tmpl, &st) == 0) ++ __set_errno (EEXIST); ++ return errno == ENOENT ? 0 : -1; ++} ++ ++/* Generate a temporary file name based on TMPL. TMPL must match the ++ rules for mk[s]temp (i.e. end in "XXXXXX", possibly with a suffix). ++ The name constructed does not exist at the time of the call to ++ __gen_tempname. TMPL is overwritten with the result. ++ ++ KIND may be one of: ++ __GT_NOCREATE: simply verify that the name does not exist ++ at the time of the call. ++ __GT_FILE: create the file using open(O_CREAT|O_EXCL) ++ and return a read-write fd. The file is mode 0600. ++ __GT_DIR: create a directory, which will be mode 0700. ++ ++ We use a clever algorithm to get hard-to-predict names. */ ++int ++__gen_tempname (char *tmpl, int suffixlen, int flags, int kind) ++{ ++ int (*tryfunc) (char *, void *); ++ ++ switch (kind) ++ { ++ case __GT_FILE: ++ tryfunc = try_file; ++ break; ++ ++ case __GT_DIR: ++ tryfunc = try_dir; ++ break; ++ ++ case __GT_NOCREATE: ++ tryfunc = try_nocreate; ++ break; ++ ++ default: ++ assert (! "invalid KIND in __gen_tempname"); ++ abort (); ++ } ++ return __try_tempname (tmpl, suffixlen, &flags, tryfunc); ++} +diff -Naur libpipeline-1.5.0-orig/gnulib/lib/tempname.h libpipeline-1.5.0/gnulib/lib/tempname.h +--- libpipeline-1.5.0-orig/gnulib/lib/tempname.h 2014-11-08 16:53:37.000000000 +0300 ++++ libpipeline-1.5.0/gnulib/lib/tempname.h 2018-07-02 13:09:59.680436500 +0300 +@@ -1,6 +1,6 @@ + /* Create a temporary file or directory. + +- Copyright (C) 2006, 2009-2014 Free Software Foundation, Inc. ++ Copyright (C) 2006, 2009-2017 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 +@@ -32,6 +32,10 @@ + # define GT_NOCREATE 2 + # endif + ++#ifdef __cplusplus ++extern "C" { ++#endif ++ + /* Generate a temporary file name based on TMPL. TMPL must match the + rules for mk[s]temp (i.e. end in "XXXXXX", possibly with a suffix). + The name constructed does not exist at the time of the call to +@@ -47,4 +51,15 @@ + We use a clever algorithm to get hard-to-predict names. */ + extern int gen_tempname (char *tmpl, int suffixlen, int flags, int kind); + ++/* Similar to gen_tempname, but TRYFUNC is called for each temporary ++ name to try. If TRYFUNC returns a non-negative number, TRY_GEN_TEMPNAME ++ returns with this value. Otherwise, if errno is set to EEXIST, another ++ name is tried, or else TRY_GEN_TEMPNAME returns -1. */ ++extern int try_tempname (char *tmpl, int suffixlen, void *args, ++ int (*tryfunc) (char *, void *)); ++ ++#ifdef __cplusplus ++} ++#endif ++ + #endif /* GL_TEMPNAME_H */ +diff -Naur libpipeline-1.5.0-orig/gnulib/lib/time.in.h libpipeline-1.5.0/gnulib/lib/time.in.h +--- libpipeline-1.5.0-orig/gnulib/lib/time.in.h 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/lib/time.in.h 2018-07-02 13:09:59.680436500 +0300 +@@ -1,6 +1,6 @@ + /* A more-standard . + +- Copyright (C) 2007-2014 Free Software Foundation, Inc. ++ Copyright (C) 2007-2017 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 +@@ -22,11 +22,13 @@ + + /* Don't get in the way of glibc when it includes time.h merely to + declare a few standard symbols, rather than to declare all the +- symbols. Also, Solaris 8 eventually includes itself ++ symbols. (However, skip this for MinGW as it treats __need_time_t ++ incompatibly.) Also, Solaris 8 eventually includes itself + recursively; if that is happening, just include the system + without adding our own declarations. */ +-#if (defined __need_time_t || defined __need_clock_t \ +- || defined __need_timespec \ ++#if (((defined __need_time_t || defined __need_clock_t \ ++ || defined __need_timespec) \ ++ && !defined __MINGW32__) \ + || defined _@GUARD_PREFIX@_TIME_H) + + # @INCLUDE_NEXT@ @NEXT_TIME_H@ +@@ -48,20 +50,15 @@ + + /* Some systems don't define struct timespec (e.g., AIX 4.1, Ultrix 4.3). + Or they define it with the wrong member names or define it in +- (e.g., FreeBSD circa 1997). Stock Mingw does not define it, but the +- pthreads-win32 library defines it in . */ ++ (e.g., FreeBSD circa 1997). Stock Mingw prior to 3.0 does not define it, ++ but the pthreads-win32 library defines it in . */ + # if ! @TIME_H_DEFINES_STRUCT_TIMESPEC@ + # if @SYS_TIME_H_DEFINES_STRUCT_TIMESPEC@ + # include + # elif @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@ + # include +-/* The pthreads-win32 also defines a couple of broken macros. */ +-# undef asctime_r +-# undef ctime_r +-# undef gmtime_r +-# undef localtime_r +-# undef rand_r +-# undef strtok_r ++# elif @UNISTD_H_DEFINES_STRUCT_TIMESPEC@ ++# include + # else + + # ifdef __cplusplus +@@ -123,6 +120,24 @@ + _GL_CXXALIASWARN (nanosleep); + # endif + ++/* Initialize time conversion information. */ ++# if @GNULIB_TZSET@ ++# if @REPLACE_TZSET@ ++# if !(defined __cplusplus && defined GNULIB_NAMESPACE) ++# undef tzset ++# define tzset rpl_tzset ++# endif ++_GL_FUNCDECL_RPL (tzset, void, (void)); ++_GL_CXXALIAS_RPL (tzset, void, (void)); ++# else ++# if ! @HAVE_TZSET@ ++_GL_FUNCDECL_SYS (tzset, void, (void)); ++# endif ++_GL_CXXALIAS_SYS (tzset, void, (void)); ++# endif ++_GL_CXXALIASWARN (tzset); ++# endif ++ + /* Return the 'time_t' representation of TP and normalize TP. */ + # if @GNULIB_MKTIME@ + # if @REPLACE_MKTIME@ +@@ -190,7 +205,7 @@ + /* Convert TIMER to RESULT, assuming local time and UTC respectively. See + and + . */ +-# if @GNULIB_GETTIMEOFDAY@ ++# if @GNULIB_LOCALTIME@ || @REPLACE_LOCALTIME@ + # if @REPLACE_LOCALTIME@ + # if !(defined __cplusplus && defined GNULIB_NAMESPACE) + # undef localtime +@@ -205,7 +220,7 @@ + _GL_CXXALIASWARN (localtime); + # endif + +-# if @GNULIB_GETTIMEOFDAY@ ++# if 0 || @REPLACE_GMTIME@ + # if @REPLACE_GMTIME@ + # if !(defined __cplusplus && defined GNULIB_NAMESPACE) + # undef gmtime +@@ -220,7 +235,7 @@ + _GL_CXXALIASWARN (gmtime); + # endif + +-/* Parse BUF as a time stamp, assuming FORMAT specifies its layout, and store ++/* Parse BUF as a timestamp, assuming FORMAT specifies its layout, and store + the resulting broken-down time into TM. See + . */ + # if @GNULIB_STRPTIME@ +@@ -236,6 +251,60 @@ + _GL_CXXALIASWARN (strptime); + # endif + ++/* Convert *TP to a date and time string. See ++ . */ ++# if @GNULIB_CTIME@ ++# if @REPLACE_CTIME@ ++# if !(defined __cplusplus && defined GNULIB_NAMESPACE) ++# define ctime rpl_ctime ++# endif ++_GL_FUNCDECL_RPL (ctime, char *, (time_t const *__tp) ++ _GL_ARG_NONNULL ((1))); ++_GL_CXXALIAS_RPL (ctime, char *, (time_t const *__tp)); ++# else ++_GL_CXXALIAS_SYS (ctime, char *, (time_t const *__tp)); ++# endif ++_GL_CXXALIASWARN (ctime); ++# endif ++ ++/* Convert *TP to a date and time string. See ++ . */ ++# if @GNULIB_STRFTIME@ ++# if @REPLACE_STRFTIME@ ++# if !(defined __cplusplus && defined GNULIB_NAMESPACE) ++# define strftime rpl_strftime ++# endif ++_GL_FUNCDECL_RPL (strftime, size_t, (char *__buf, size_t __bufsize, ++ const char *__fmt, const struct tm *__tp) ++ _GL_ARG_NONNULL ((1, 3, 4))); ++_GL_CXXALIAS_RPL (strftime, size_t, (char *__buf, size_t __bufsize, ++ const char *__fmt, const struct tm *__tp)); ++# else ++_GL_CXXALIAS_SYS (strftime, size_t, (char *__buf, size_t __bufsize, ++ const char *__fmt, const struct tm *__tp)); ++# endif ++_GL_CXXALIASWARN (strftime); ++# endif ++ ++# if defined _GNU_SOURCE && @GNULIB_TIME_RZ@ && ! @HAVE_TIMEZONE_T@ ++typedef struct tm_zone *timezone_t; ++_GL_FUNCDECL_SYS (tzalloc, timezone_t, (char const *__name)); ++_GL_CXXALIAS_SYS (tzalloc, timezone_t, (char const *__name)); ++_GL_FUNCDECL_SYS (tzfree, void, (timezone_t __tz)); ++_GL_CXXALIAS_SYS (tzfree, void, (timezone_t __tz)); ++_GL_FUNCDECL_SYS (localtime_rz, struct tm *, ++ (timezone_t __tz, time_t const *restrict __timer, ++ struct tm *restrict __result) _GL_ARG_NONNULL ((2, 3))); ++_GL_CXXALIAS_SYS (localtime_rz, struct tm *, ++ (timezone_t __tz, time_t const *restrict __timer, ++ struct tm *restrict __result)); ++_GL_FUNCDECL_SYS (mktime_z, time_t, ++ (timezone_t __tz, struct tm *restrict __result) ++ _GL_ARG_NONNULL ((2))); ++_GL_CXXALIAS_SYS (mktime_z, time_t, ++ (timezone_t __tz, struct tm *restrict __result)); ++# endif ++ + /* Convert TM to a time_t value, assuming UTC. */ + # if @GNULIB_TIMEGM@ + # if @REPLACE_TIMEGM@ +diff -Naur libpipeline-1.5.0-orig/gnulib/lib/unistd.c libpipeline-1.5.0/gnulib/lib/unistd.c +--- libpipeline-1.5.0-orig/gnulib/lib/unistd.c 2014-02-18 17:42:59.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/lib/unistd.c 2018-07-02 13:09:59.680436500 +0300 +@@ -1,3 +1,4 @@ + #include + #define _GL_UNISTD_INLINE _GL_EXTERN_INLINE + #include "unistd.h" ++typedef int dummy; +diff -Naur libpipeline-1.5.0-orig/gnulib/lib/unistd.in.h libpipeline-1.5.0/gnulib/lib/unistd.in.h +--- libpipeline-1.5.0-orig/gnulib/lib/unistd.in.h 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/lib/unistd.in.h 2018-07-02 13:09:59.690436500 +0300 +@@ -1,5 +1,5 @@ + /* Substitute for and wrapper around . +- Copyright (C) 2003-2014 Free Software Foundation, Inc. ++ Copyright (C) 2003-2017 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 +@@ -21,9 +21,23 @@ + #endif + @PRAGMA_COLUMNS@ + ++#ifdef _GL_INCLUDING_UNISTD_H ++/* Special invocation convention: ++ - On Mac OS X 10.3.9 we have a sequence of nested includes ++ -> -> -> ++ In this situation, the functions are not yet declared, therefore we cannot ++ provide the C++ aliases. */ ++ ++#@INCLUDE_NEXT@ @NEXT_UNISTD_H@ ++ ++#else ++/* Normal invocation convention. */ ++ + /* The include_next requires a split double-inclusion guard. */ + #if @HAVE_UNISTD_H@ ++# define _GL_INCLUDING_UNISTD_H + # @INCLUDE_NEXT@ @NEXT_UNISTD_H@ ++# undef _GL_INCLUDING_UNISTD_H + #endif + + /* Get all possible declarations of gethostname(). */ +@@ -41,9 +55,13 @@ + #include + + /* mingw doesn't define the SEEK_* or *_FILENO macros in . */ ++/* MSVC declares 'unlink' in , not in . We must include ++ it before we #define unlink rpl_unlink. */ + /* Cygwin 1.7.1 declares symlinkat in , not in . */ + /* But avoid namespace pollution on glibc systems. */ + #if (!(defined SEEK_CUR && defined SEEK_END && defined SEEK_SET) \ ++ || ((@GNULIB_UNLINK@ || defined GNULIB_POSIXCHECK) \ ++ && ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)) \ + || ((@GNULIB_SYMLINKAT@ || defined GNULIB_POSIXCHECK) \ + && defined __CYGWIN__)) \ + && ! defined __GLIBC__ +@@ -109,11 +127,18 @@ + # include + #endif + ++/* The definitions of _GL_FUNCDECL_RPL etc. are copied here. */ ++ ++/* The definition of _GL_ARG_NONNULL is copied here. */ ++ ++/* The definition of _GL_WARN_ON_USE is copied here. */ ++ ++ + /* Get getopt(), optarg, optind, opterr, optopt. + But avoid namespace pollution on glibc systems. */ + #if @GNULIB_UNISTD_H_GETOPT@ && !defined __GLIBC__ && !defined _GL_SYSTEM_GETOPT +-# define __need_getopt +-# include ++# include ++# include + #endif + + #ifndef _GL_INLINE_HEADER_BEGIN +@@ -124,13 +149,6 @@ + # define _GL_UNISTD_INLINE _GL_INLINE + #endif + +-/* The definitions of _GL_FUNCDECL_RPL etc. are copied here. */ +- +-/* The definition of _GL_ARG_NONNULL is copied here. */ +- +-/* The definition of _GL_WARN_ON_USE is copied here. */ +- +- + /* Hide some function declarations from . */ + + #if @GNULIB_GETHOSTNAME@ && @UNISTD_H_HAVE_WINSOCK2_H@ +@@ -387,6 +405,12 @@ + /* Set of environment variables and values. An array of strings of the form + "VARIABLE=VALUE", terminated with a NULL. */ + # if defined __APPLE__ && defined __MACH__ ++# include ++# if !TARGET_OS_IPHONE && !TARGET_IPHONE_SIMULATOR ++# define _GL_USE_CRT_EXTERNS ++# endif ++# endif ++# ifdef _GL_USE_CRT_EXTERNS + # include + # define environ (*_NSGetEnviron ()) + # else +@@ -756,7 +780,7 @@ + ${LOGNAME-$USER} on Unix platforms, + $USERNAME on native Windows platforms. + */ +-# if !@HAVE_GETLOGIN@ ++# if !@HAVE_DECL_GETLOGIN@ + _GL_FUNCDECL_SYS (getlogin, char *, (void)); + # endif + _GL_CXXALIAS_SYS (getlogin, char *, (void)); +@@ -1273,13 +1297,24 @@ + + + #if @GNULIB_READLINKAT@ +-# if !@HAVE_READLINKAT@ ++# if @REPLACE_READLINKAT@ ++# if !(defined __cplusplus && defined GNULIB_NAMESPACE) ++# define readlinkat rpl_readlinkat ++# endif ++_GL_FUNCDECL_RPL (readlinkat, ssize_t, ++ (int fd, char const *file, char *buf, size_t len) ++ _GL_ARG_NONNULL ((2, 3))); ++_GL_CXXALIAS_RPL (readlinkat, ssize_t, ++ (int fd, char const *file, char *buf, size_t len)); ++# else ++# if !@HAVE_READLINKAT@ + _GL_FUNCDECL_SYS (readlinkat, ssize_t, + (int fd, char const *file, char *buf, size_t len) + _GL_ARG_NONNULL ((2, 3))); +-# endif ++# endif + _GL_CXXALIAS_SYS (readlinkat, ssize_t, + (int fd, char const *file, char *buf, size_t len)); ++# endif + _GL_CXXALIASWARN (readlinkat); + #elif defined GNULIB_POSIXCHECK + # undef readlinkat +@@ -1393,13 +1428,25 @@ + + + #if @GNULIB_SYMLINKAT@ +-# if !@HAVE_SYMLINKAT@ ++# if @REPLACE_SYMLINKAT@ ++# if !(defined __cplusplus && defined GNULIB_NAMESPACE) ++# undef symlinkat ++# define symlinkat rpl_symlinkat ++# endif ++_GL_FUNCDECL_RPL (symlinkat, int, ++ (char const *contents, int fd, char const *file) ++ _GL_ARG_NONNULL ((1, 3))); ++_GL_CXXALIAS_RPL (symlinkat, int, ++ (char const *contents, int fd, char const *file)); ++# else ++# if !@HAVE_SYMLINKAT@ + _GL_FUNCDECL_SYS (symlinkat, int, + (char const *contents, int fd, char const *file) + _GL_ARG_NONNULL ((1, 3))); +-# endif ++# endif + _GL_CXXALIAS_SYS (symlinkat, int, + (char const *contents, int fd, char const *file)); ++# endif + _GL_CXXALIASWARN (symlinkat); + #elif defined GNULIB_POSIXCHECK + # undef symlinkat +@@ -1410,6 +1457,36 @@ + #endif + + ++#if @GNULIB_TRUNCATE@ ++/* Change the size of the file designated by FILENAME to become equal to LENGTH. ++ Return 0 if successful, otherwise -1 and errno set. ++ See the POSIX:2008 specification ++ . */ ++# if @REPLACE_TRUNCATE@ ++# if !(defined __cplusplus && defined GNULIB_NAMESPACE) ++# undef truncate ++# define truncate rpl_truncate ++# endif ++_GL_FUNCDECL_RPL (truncate, int, (const char *filename, off_t length) ++ _GL_ARG_NONNULL ((1))); ++_GL_CXXALIAS_RPL (truncate, int, (const char *filename, off_t length)); ++# else ++# if !@HAVE_TRUNCATE@ ++_GL_FUNCDECL_SYS (truncate, int, (const char *filename, off_t length) ++ _GL_ARG_NONNULL ((1))); ++# endif ++_GL_CXXALIAS_SYS (truncate, int, (const char *filename, off_t length)); ++# endif ++_GL_CXXALIASWARN (truncate); ++#elif defined GNULIB_POSIXCHECK ++# undef truncate ++# if HAVE_RAW_DECL_TRUNCATE ++_GL_WARN_ON_USE (truncate, "truncate is unportable - " ++ "use gnulib module truncate for portability"); ++# endif ++#endif ++ ++ + #if @GNULIB_TTYNAME_R@ + /* Store at most BUFLEN characters of the pathname of the terminal FD is + open on in BUF. Return 0 on success, otherwise an error number. */ +@@ -1539,4 +1616,5 @@ + _GL_INLINE_HEADER_END + + #endif /* _@GUARD_PREFIX@_UNISTD_H */ ++#endif /* _GL_INCLUDING_UNISTD_H */ + #endif /* _@GUARD_PREFIX@_UNISTD_H */ +diff -Naur libpipeline-1.5.0-orig/gnulib/lib/unsetenv.c libpipeline-1.5.0/gnulib/lib/unsetenv.c +--- libpipeline-1.5.0-orig/gnulib/lib/unsetenv.c 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/lib/unsetenv.c 2018-07-02 13:09:59.690436500 +0300 +@@ -1,4 +1,4 @@ +-/* Copyright (C) 1992, 1995-2002, 2005-2014 Free Software Foundation, Inc. ++/* Copyright (C) 1992, 1995-2002, 2005-2017 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + This program is free software: you can redistribute it and/or modify +diff -Naur libpipeline-1.5.0-orig/gnulib/lib/vasnprintf.c libpipeline-1.5.0/gnulib/lib/vasnprintf.c +--- libpipeline-1.5.0-orig/gnulib/lib/vasnprintf.c 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/lib/vasnprintf.c 2018-07-02 13:09:59.700436500 +0300 +@@ -1,5 +1,5 @@ + /* vsprintf with automatic memory allocation. +- Copyright (C) 1999, 2002-2014 Free Software Foundation, Inc. ++ Copyright (C) 1999, 2002-2017 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 +@@ -156,6 +156,7 @@ + # define SNPRINTF snwprintf + # else + # define SNPRINTF _snwprintf ++# define USE_MSVC__SNPRINTF 1 + # endif + # else + /* Unix. */ +@@ -181,7 +182,9 @@ + /* Here we need to call the native snprintf, not rpl_snprintf. */ + # undef snprintf + # else ++ /* MSVC versions < 14 did not have snprintf, only _snprintf. */ + # define SNPRINTF _snprintf ++# define USE_MSVC__SNPRINTF 1 + # endif + # else + /* Unix. */ +@@ -195,7 +198,7 @@ + + /* GCC >= 4.0 with -Wall emits unjustified "... may be used uninitialized" + warnings in this file. Use -Dlint to suppress them. */ +-#ifdef lint ++#if defined GCC_LINT || defined lint + # define IF_LINT(Code) Code + #else + # define IF_LINT(Code) /* empty */ +@@ -208,7 +211,7 @@ + #undef remainder + #define remainder rem + +-#if (!USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99) && !WIDE_CHAR_VERSION ++#if (!USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF) && !WIDE_CHAR_VERSION + # if (HAVE_STRNLEN && !defined _AIX) + # define local_strnlen strnlen + # else +@@ -224,7 +227,7 @@ + # endif + #endif + +-#if (((!USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99) && WIDE_CHAR_VERSION) || ((!USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99 || (NEED_PRINTF_DIRECTIVE_LS && !defined IN_LIBINTL)) && !WIDE_CHAR_VERSION && DCHAR_IS_TCHAR)) && HAVE_WCHAR_T ++#if (((!USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF) && WIDE_CHAR_VERSION) || ((!USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF || (NEED_PRINTF_DIRECTIVE_LS && !defined IN_LIBINTL)) && !WIDE_CHAR_VERSION && DCHAR_IS_TCHAR)) && HAVE_WCHAR_T + # if HAVE_WCSLEN + # define local_wcslen wcslen + # else +@@ -247,7 +250,7 @@ + # endif + #endif + +-#if (!USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99) && HAVE_WCHAR_T && WIDE_CHAR_VERSION ++#if (!USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF) && HAVE_WCHAR_T && WIDE_CHAR_VERSION + # if HAVE_WCSNLEN + # define local_wcsnlen wcsnlen + # else +@@ -1517,7 +1520,7 @@ + + #endif + +-#if !USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99 ++#if !USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF + + /* Use a different function name, to make it possible that the 'wchar_t' + parametrization and the 'char' parametrization get compiled in the same +@@ -1886,7 +1889,7 @@ + else + { + do +- result[length++] = (unsigned char) *cp++; ++ result[length++] = *cp++; + while (--n > 0); + } + } +@@ -1957,15 +1960,14 @@ + if (!(a.arg[dp->width_arg_index].type == TYPE_INT)) + abort (); + arg = a.arg[dp->width_arg_index].a.a_int; ++ width = arg; + if (arg < 0) + { + /* "A negative field width is taken as a '-' flag + followed by a positive field width." */ + flags |= FLAG_LEFT; +- width = (unsigned int) (-arg); ++ width = -width; + } +- else +- width = arg; + } + else + { +@@ -2073,8 +2075,7 @@ + characters = 0; + } + +- if (has_width && width > characters +- && !(dp->flags & FLAG_LEFT)) ++ if (characters < width && !(dp->flags & FLAG_LEFT)) + { + size_t n = width - characters; + ENSURE_ALLOCATION (xsum (length, n)); +@@ -2127,8 +2128,7 @@ + } + # endif + +- if (has_width && width > characters +- && (dp->flags & FLAG_LEFT)) ++ if (characters < width && (dp->flags & FLAG_LEFT)) + { + size_t n = width - characters; + ENSURE_ALLOCATION (xsum (length, n)); +@@ -2201,8 +2201,7 @@ + characters = 0; + } + +- if (has_width && width > characters +- && !(dp->flags & FLAG_LEFT)) ++ if (characters < width && !(dp->flags & FLAG_LEFT)) + { + size_t n = width - characters; + ENSURE_ALLOCATION (xsum (length, n)); +@@ -2255,8 +2254,7 @@ + } + # endif + +- if (has_width && width > characters +- && (dp->flags & FLAG_LEFT)) ++ if (characters < width && (dp->flags & FLAG_LEFT)) + { + size_t n = width - characters; + ENSURE_ALLOCATION (xsum (length, n)); +@@ -2329,8 +2327,7 @@ + characters = 0; + } + +- if (has_width && width > characters +- && !(dp->flags & FLAG_LEFT)) ++ if (characters < width && !(dp->flags & FLAG_LEFT)) + { + size_t n = width - characters; + ENSURE_ALLOCATION (xsum (length, n)); +@@ -2383,8 +2380,7 @@ + } + # endif + +- if (has_width && width > characters +- && (dp->flags & FLAG_LEFT)) ++ if (characters < width && (dp->flags & FLAG_LEFT)) + { + size_t n = width - characters; + ENSURE_ALLOCATION (xsum (length, n)); +@@ -2399,7 +2395,7 @@ + } + } + #endif +-#if (!USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99 || (NEED_PRINTF_DIRECTIVE_LS && !defined IN_LIBINTL)) && HAVE_WCHAR_T ++#if (!USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF || (NEED_PRINTF_DIRECTIVE_LS && !defined IN_LIBINTL)) && HAVE_WCHAR_T + else if (dp->conversion == 's' + # if WIDE_CHAR_VERSION + && a.arg[dp->arg_index].type != TYPE_WIDE_STRING +@@ -2435,15 +2431,14 @@ + if (!(a.arg[dp->width_arg_index].type == TYPE_INT)) + abort (); + arg = a.arg[dp->width_arg_index].a.a_int; ++ width = arg; + if (arg < 0) + { + /* "A negative field width is taken as a '-' flag + followed by a positive field width." */ + flags |= FLAG_LEFT; +- width = (unsigned int) (-arg); ++ width = -width; + } +- else +- width = arg; + } + else + { +@@ -2573,8 +2568,7 @@ + characters = 0; + } + +- if (has_width && width > characters +- && !(dp->flags & FLAG_LEFT)) ++ if (characters < width && !(dp->flags & FLAG_LEFT)) + { + size_t n = width - characters; + ENSURE_ALLOCATION (xsum (length, n)); +@@ -2635,8 +2629,7 @@ + } + } + +- if (has_width && width > characters +- && (dp->flags & FLAG_LEFT)) ++ if (characters < width && (dp->flags & FLAG_LEFT)) + { + size_t n = width - characters; + ENSURE_ALLOCATION (xsum (length, n)); +@@ -2827,8 +2820,7 @@ + /* w doesn't matter. */ + w = 0; + +- if (has_width && width > w +- && !(dp->flags & FLAG_LEFT)) ++ if (w < width && !(dp->flags & FLAG_LEFT)) + { + size_t n = width - w; + ENSURE_ALLOCATION (xsum (length, n)); +@@ -2911,8 +2903,7 @@ + length += tmpdst_len; + # endif + +- if (has_width && width > w +- && (dp->flags & FLAG_LEFT)) ++ if (w < width && (dp->flags & FLAG_LEFT)) + { + size_t n = width - w; + ENSURE_ALLOCATION (xsum (length, n)); +@@ -2939,17 +2930,16 @@ + { + arg_type type = a.arg[dp->arg_index].type; + int flags = dp->flags; +- int has_width; + size_t width; + int has_precision; + size_t precision; + size_t tmp_length; ++ size_t count; + DCHAR_T tmpbuf[700]; + DCHAR_T *tmp; + DCHAR_T *pad_ptr; + DCHAR_T *p; + +- has_width = 0; + width = 0; + if (dp->width_start != dp->width_end) + { +@@ -2960,15 +2950,14 @@ + if (!(a.arg[dp->width_arg_index].type == TYPE_INT)) + abort (); + arg = a.arg[dp->width_arg_index].a.a_int; ++ width = arg; + if (arg < 0) + { + /* "A negative field width is taken as a '-' flag + followed by a positive field width." */ + flags |= FLAG_LEFT; +- width = (unsigned int) (-arg); ++ width = -width; + } +- else +- width = arg; + } + else + { +@@ -2978,7 +2967,6 @@ + width = xsum (xtimes (width, 10), *digitp++ - '0'); + while (digitp != dp->width_end); + } +- has_width = 1; + } + + has_precision = 0; +@@ -3354,11 +3342,14 @@ + abort (); + # endif + } ++ + /* The generated string now extends from tmp to p, with the + zero padding insertion point being at pad_ptr. */ +- if (has_width && p - tmp < width) ++ count = p - tmp; ++ ++ if (count < width) + { +- size_t pad = width - (p - tmp); ++ size_t pad = width - count; + DCHAR_T *end = p + pad; + + if (flags & FLAG_LEFT) +@@ -3391,28 +3382,26 @@ + p = end; + } + +- { +- size_t count = p - tmp; ++ count = p - tmp; + +- if (count >= tmp_length) +- /* tmp_length was incorrectly calculated - fix the +- code above! */ +- abort (); ++ if (count >= tmp_length) ++ /* tmp_length was incorrectly calculated - fix the ++ code above! */ ++ abort (); + +- /* Make room for the result. */ +- if (count >= allocated - length) +- { +- size_t n = xsum (length, count); ++ /* Make room for the result. */ ++ if (count >= allocated - length) ++ { ++ size_t n = xsum (length, count); + +- ENSURE_ALLOCATION (n); +- } ++ ENSURE_ALLOCATION (n); ++ } + +- /* Append the result. */ +- memcpy (result + length, tmp, count * sizeof (DCHAR_T)); +- if (tmp != tmpbuf) +- free (tmp); +- length += count; +- } ++ /* Append the result. */ ++ memcpy (result + length, tmp, count * sizeof (DCHAR_T)); ++ if (tmp != tmpbuf) ++ free (tmp); ++ length += count; + } + #endif + #if (NEED_PRINTF_INFINITE_DOUBLE || NEED_PRINTF_DOUBLE || NEED_PRINTF_INFINITE_LONG_DOUBLE || NEED_PRINTF_LONG_DOUBLE) && !defined IN_LIBINTL +@@ -3446,8 +3435,8 @@ + arg_type type = a.arg[dp->arg_index].type; + # endif + int flags = dp->flags; +- int has_width; + size_t width; ++ size_t count; + int has_precision; + size_t precision; + size_t tmp_length; +@@ -3456,7 +3445,6 @@ + DCHAR_T *pad_ptr; + DCHAR_T *p; + +- has_width = 0; + width = 0; + if (dp->width_start != dp->width_end) + { +@@ -3467,15 +3455,14 @@ + if (!(a.arg[dp->width_arg_index].type == TYPE_INT)) + abort (); + arg = a.arg[dp->width_arg_index].a.a_int; ++ width = arg; + if (arg < 0) + { + /* "A negative field width is taken as a '-' flag + followed by a positive field width." */ + flags |= FLAG_LEFT; +- width = (unsigned int) (-arg); ++ width = -width; + } +- else +- width = arg; + } + else + { +@@ -3485,7 +3472,6 @@ + width = xsum (xtimes (width, 10), *digitp++ - '0'); + while (digitp != dp->width_end); + } +- has_width = 1; + } + + has_precision = 0; +@@ -3925,9 +3911,9 @@ + digits without trailing zeroes. */ + if (exponent >= 0) + { +- size_t count = exponent + 1; ++ size_t ecount = exponent + 1; + /* Note: count <= precision = ndigits. */ +- for (; count > 0; count--) ++ for (; ecount > 0; ecount--) + *p++ = digits[--ndigits]; + if ((flags & FLAG_ALT) || ndigits > nzeroes) + { +@@ -3941,10 +3927,10 @@ + } + else + { +- size_t count = -exponent - 1; ++ size_t ecount = -exponent - 1; + *p++ = '0'; + *p++ = decimal_point_char (); +- for (; count > 0; count--) ++ for (; ecount > 0; ecount--) + *p++ = '0'; + while (ndigits > nzeroes) + { +@@ -4395,9 +4381,9 @@ + digits without trailing zeroes. */ + if (exponent >= 0) + { +- size_t count = exponent + 1; +- /* Note: count <= precision = ndigits. */ +- for (; count > 0; count--) ++ size_t ecount = exponent + 1; ++ /* Note: ecount <= precision = ndigits. */ ++ for (; ecount > 0; ecount--) + *p++ = digits[--ndigits]; + if ((flags & FLAG_ALT) || ndigits > nzeroes) + { +@@ -4411,10 +4397,10 @@ + } + else + { +- size_t count = -exponent - 1; ++ size_t ecount = -exponent - 1; + *p++ = '0'; + *p++ = decimal_point_char (); +- for (; count > 0; count--) ++ for (; ecount > 0; ecount--) + *p++ = '0'; + while (ndigits > nzeroes) + { +@@ -4542,9 +4528,11 @@ + + /* The generated string now extends from tmp to p, with the + zero padding insertion point being at pad_ptr. */ +- if (has_width && p - tmp < width) ++ count = p - tmp; ++ ++ if (count < width) + { +- size_t pad = width - (p - tmp); ++ size_t pad = width - count; + DCHAR_T *end = p + pad; + + if (flags & FLAG_LEFT) +@@ -4577,39 +4565,39 @@ + p = end; + } + +- { +- size_t count = p - tmp; ++ count = p - tmp; + +- if (count >= tmp_length) +- /* tmp_length was incorrectly calculated - fix the +- code above! */ +- abort (); ++ if (count >= tmp_length) ++ /* tmp_length was incorrectly calculated - fix the ++ code above! */ ++ abort (); + +- /* Make room for the result. */ +- if (count >= allocated - length) +- { +- size_t n = xsum (length, count); ++ /* Make room for the result. */ ++ if (count >= allocated - length) ++ { ++ size_t n = xsum (length, count); + +- ENSURE_ALLOCATION (n); +- } ++ ENSURE_ALLOCATION (n); ++ } + +- /* Append the result. */ +- memcpy (result + length, tmp, count * sizeof (DCHAR_T)); +- if (tmp != tmpbuf) +- free (tmp); +- length += count; +- } ++ /* Append the result. */ ++ memcpy (result + length, tmp, count * sizeof (DCHAR_T)); ++ if (tmp != tmpbuf) ++ free (tmp); ++ length += count; + } + #endif + else + { + arg_type type = a.arg[dp->arg_index].type; + int flags = dp->flags; +-#if !USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99 || !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_LEFTADJUST || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION ++#if !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_LEFTADJUST || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION + int has_width; ++#endif ++#if !USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF || !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_LEFTADJUST || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION + size_t width; + #endif +-#if !USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99 || NEED_PRINTF_UNBOUNDED_PRECISION ++#if !USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF || NEED_PRINTF_UNBOUNDED_PRECISION + int has_precision; + size_t precision; + #endif +@@ -4635,8 +4623,10 @@ + TCHAR_T *tmp; + #endif + +-#if !USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99 || !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_LEFTADJUST || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION ++#if !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_LEFTADJUST || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION + has_width = 0; ++#endif ++#if !USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF || !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_LEFTADJUST || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION + width = 0; + if (dp->width_start != dp->width_end) + { +@@ -4647,15 +4637,14 @@ + if (!(a.arg[dp->width_arg_index].type == TYPE_INT)) + abort (); + arg = a.arg[dp->width_arg_index].a.a_int; ++ width = arg; + if (arg < 0) + { + /* "A negative field width is taken as a '-' flag + followed by a positive field width." */ + flags |= FLAG_LEFT; +- width = (unsigned int) (-arg); ++ width = -width; + } +- else +- width = arg; + } + else + { +@@ -4665,11 +4654,13 @@ + width = xsum (xtimes (width, 10), *digitp++ - '0'); + while (digitp != dp->width_end); + } ++#if !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_LEFTADJUST || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION + has_width = 1; ++#endif + } + #endif + +-#if !USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99 || NEED_PRINTF_UNBOUNDED_PRECISION ++#if !USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF || NEED_PRINTF_UNBOUNDED_PRECISION + has_precision = 0; + precision = 6; + if (dp->precision_start != dp->precision_end) +@@ -4805,7 +4796,7 @@ + { + const FCHAR_T *mp = dp->width_start; + do +- *fbp++ = (unsigned char) *mp++; ++ *fbp++ = *mp++; + while (--n > 0); + } + } +@@ -4826,7 +4817,7 @@ + { + const FCHAR_T *mp = dp->precision_start; + do +- *fbp++ = (unsigned char) *mp++; ++ *fbp++ = *mp++; + while (--n > 0); + } + } +@@ -4844,9 +4835,9 @@ + break; + # else + *fbp++ = 'l'; +- /*FALLTHROUGH*/ + # endif + #endif ++ /*FALLTHROUGH*/ + case TYPE_LONGINT: + case TYPE_ULONGINT: + #if HAVE_WINT_T +@@ -5139,7 +5130,7 @@ + /* Look at the snprintf() return value. */ + if (retcount < 0) + { +-# if !HAVE_SNPRINTF_RETVAL_C99 ++# if !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF + /* HP-UX 10.20 snprintf() is doubly deficient: + It doesn't understand the '%n' directive, + *and* it returns -1 (rather than the length +@@ -5153,7 +5144,7 @@ + size_t tmp_length = + MAX_ROOM_NEEDED (&a, dp->arg_index, + dp->conversion, type, flags, +- has_width ? width : 0, ++ width, + has_precision, + precision, pad_ourselves); + +@@ -5191,18 +5182,21 @@ + /* SNPRINTF or sprintf failed. Save and use the errno + that it has set, if any. */ + int saved_errno = errno; ++ if (saved_errno == 0) ++ { ++ if (dp->conversion == 'c' || dp->conversion == 's') ++ saved_errno = EILSEQ; ++ else ++ saved_errno = EINVAL; ++ } + + if (!(result == resultbuf || result == NULL)) + free (result); + if (buf_malloced != NULL) + free (buf_malloced); + CLEANUP (); +- errno = +- (saved_errno != 0 +- ? saved_errno +- : (dp->conversion == 'c' || dp->conversion == 's' +- ? EILSEQ +- : EINVAL)); ++ ++ errno = saved_errno; + return NULL; + } + +@@ -5391,7 +5385,7 @@ + tmpsrc += count; + tmpdst += count; + for (n = count; n > 0; n--) +- *--tmpdst = (unsigned char) *--tmpsrc; ++ *--tmpdst = *--tmpsrc; + } + } + #endif +diff -Naur libpipeline-1.5.0-orig/gnulib/lib/vasnprintf.h libpipeline-1.5.0/gnulib/lib/vasnprintf.h +--- libpipeline-1.5.0-orig/gnulib/lib/vasnprintf.h 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/lib/vasnprintf.h 2018-07-02 13:09:59.700436500 +0300 +@@ -1,5 +1,5 @@ + /* vsprintf with automatic memory allocation. +- Copyright (C) 2002-2004, 2007-2014 Free Software Foundation, Inc. ++ Copyright (C) 2002-2004, 2007-2017 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 +diff -Naur libpipeline-1.5.0-orig/gnulib/lib/vasprintf.c libpipeline-1.5.0/gnulib/lib/vasprintf.c +--- libpipeline-1.5.0-orig/gnulib/lib/vasprintf.c 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/lib/vasprintf.c 2018-07-02 13:09:59.700436500 +0300 +@@ -1,5 +1,5 @@ + /* Formatted output to strings. +- Copyright (C) 1999, 2002, 2006-2014 Free Software Foundation, Inc. ++ Copyright (C) 1999, 2002, 2006-2017 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 +diff -Naur libpipeline-1.5.0-orig/gnulib/lib/verify.h libpipeline-1.5.0/gnulib/lib/verify.h +--- libpipeline-1.5.0-orig/gnulib/lib/verify.h 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/lib/verify.h 2018-07-02 13:09:59.710436600 +0300 +@@ -1,6 +1,6 @@ + /* Compile-time assert-like macros. + +- Copyright (C) 2005-2006, 2009-2014 Free Software Foundation, Inc. ++ Copyright (C) 2005-2006, 2009-2017 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 +@@ -248,7 +248,12 @@ + /* Verify requirement R at compile-time, as a declaration without a + trailing ';'. */ + +-#define verify(R) _GL_VERIFY (R, "verify (" #R ")") ++#ifdef __GNUC__ ++# define verify(R) _GL_VERIFY (R, "verify (" #R ")") ++#else ++/* PGI barfs if R is long. Play it safe. */ ++# define verify(R) _GL_VERIFY (R, "verify (...)") ++#endif + + #ifndef __has_builtin + # define __has_builtin(x) 0 +@@ -263,7 +268,7 @@ + # define assume(R) ((R) ? (void) 0 : __builtin_unreachable ()) + #elif 1200 <= _MSC_VER + # define assume(R) __assume (R) +-#elif (defined lint \ ++#elif ((defined GCC_LINT || defined lint) \ + && (__has_builtin (__builtin_trap) \ + || 3 < __GNUC__ + (3 < __GNUC_MINOR__ + (4 <= __GNUC_PATCHLEVEL__)))) + /* Doing it this way helps various packages when configured with +diff -Naur libpipeline-1.5.0-orig/gnulib/lib/waitpid.c libpipeline-1.5.0/gnulib/lib/waitpid.c +--- libpipeline-1.5.0-orig/gnulib/lib/waitpid.c 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/lib/waitpid.c 2018-07-02 13:09:59.710436600 +0300 +@@ -1,5 +1,5 @@ + /* Wait for process state change. +- Copyright (C) 2001-2003, 2005-2014 Free Software Foundation, Inc. ++ Copyright (C) 2001-2003, 2005-2017 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 +diff -Naur libpipeline-1.5.0-orig/gnulib/lib/warn-on-use.h libpipeline-1.5.0/gnulib/lib/warn-on-use.h +--- libpipeline-1.5.0-orig/gnulib/lib/warn-on-use.h 1970-01-01 03:00:00.000000000 +0300 ++++ libpipeline-1.5.0/gnulib/lib/warn-on-use.h 2018-07-02 13:09:59.710436600 +0300 +@@ -0,0 +1,109 @@ ++/* A C macro for emitting warnings if a function is used. ++ Copyright (C) 2010-2017 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 3 of the License, 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, see . */ ++ ++/* _GL_WARN_ON_USE (function, "literal string") issues a declaration ++ for FUNCTION which will then trigger a compiler warning containing ++ the text of "literal string" anywhere that function is called, if ++ supported by the compiler. If the compiler does not support this ++ feature, the macro expands to an unused extern declaration. ++ ++ This macro is useful for marking a function as a potential ++ portability trap, with the intent that "literal string" include ++ instructions on the replacement function that should be used ++ instead. However, one of the reasons that a function is a ++ portability trap is if it has the wrong signature. Declaring ++ FUNCTION with a different signature in C is a compilation error, so ++ this macro must use the same type as any existing declaration so ++ that programs that avoid the problematic FUNCTION do not fail to ++ compile merely because they included a header that poisoned the ++ function. But this implies that _GL_WARN_ON_USE is only safe to ++ use if FUNCTION is known to already have a declaration. Use of ++ this macro implies that there must not be any other macro hiding ++ the declaration of FUNCTION; but undefining FUNCTION first is part ++ of the poisoning process anyway (although for symbols that are ++ provided only via a macro, the result is a compilation error rather ++ than a warning containing "literal string"). Also note that in ++ C++, it is only safe to use if FUNCTION has no overloads. ++ ++ For an example, it is possible to poison 'getline' by: ++ - adding a call to gl_WARN_ON_USE_PREPARE([[#include ]], ++ [getline]) in configure.ac, which potentially defines ++ HAVE_RAW_DECL_GETLINE ++ - adding this code to a header that wraps the system : ++ #undef getline ++ #if HAVE_RAW_DECL_GETLINE ++ _GL_WARN_ON_USE (getline, "getline is required by POSIX 2008, but" ++ "not universally present; use the gnulib module getline"); ++ #endif ++ ++ It is not possible to directly poison global variables. But it is ++ possible to write a wrapper accessor function, and poison that ++ (less common usage, like &environ, will cause a compilation error ++ rather than issue the nice warning, but the end result of informing ++ the developer about their portability problem is still achieved): ++ #if HAVE_RAW_DECL_ENVIRON ++ static char ***rpl_environ (void) { return &environ; } ++ _GL_WARN_ON_USE (rpl_environ, "environ is not always properly declared"); ++ # undef environ ++ # define environ (*rpl_environ ()) ++ #endif ++ */ ++#ifndef _GL_WARN_ON_USE ++ ++# if 4 < __GNUC__ || (__GNUC__ == 4 && 3 <= __GNUC_MINOR__) ++/* A compiler attribute is available in gcc versions 4.3.0 and later. */ ++# define _GL_WARN_ON_USE(function, message) \ ++extern __typeof__ (function) function __attribute__ ((__warning__ (message))) ++# elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING ++/* Verify the existence of the function. */ ++# define _GL_WARN_ON_USE(function, message) \ ++extern __typeof__ (function) function ++# else /* Unsupported. */ ++# define _GL_WARN_ON_USE(function, message) \ ++_GL_WARN_EXTERN_C int _gl_warn_on_use ++# endif ++#endif ++ ++/* _GL_WARN_ON_USE_CXX (function, rettype, parameters_and_attributes, "string") ++ is like _GL_WARN_ON_USE (function, "string"), except that the function is ++ declared with the given prototype, consisting of return type, parameters, ++ and attributes. ++ This variant is useful for overloaded functions in C++. _GL_WARN_ON_USE does ++ not work in this case. */ ++#ifndef _GL_WARN_ON_USE_CXX ++# if 4 < __GNUC__ || (__GNUC__ == 4 && 3 <= __GNUC_MINOR__) ++# define _GL_WARN_ON_USE_CXX(function,rettype,parameters_and_attributes,msg) \ ++extern rettype function parameters_and_attributes \ ++ __attribute__ ((__warning__ (msg))) ++# elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING ++/* Verify the existence of the function. */ ++# define _GL_WARN_ON_USE_CXX(function,rettype,parameters_and_attributes,msg) \ ++extern rettype function parameters_and_attributes ++# else /* Unsupported. */ ++# define _GL_WARN_ON_USE_CXX(function,rettype,parameters_and_attributes,msg) \ ++_GL_WARN_EXTERN_C int _gl_warn_on_use ++# endif ++#endif ++ ++/* _GL_WARN_EXTERN_C declaration; ++ performs the declaration with C linkage. */ ++#ifndef _GL_WARN_EXTERN_C ++# if defined __cplusplus ++# define _GL_WARN_EXTERN_C extern "C" ++# else ++# define _GL_WARN_EXTERN_C extern ++# endif ++#endif +diff -Naur libpipeline-1.5.0-orig/gnulib/lib/wchar.in.h libpipeline-1.5.0/gnulib/lib/wchar.in.h +--- libpipeline-1.5.0-orig/gnulib/lib/wchar.in.h 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/lib/wchar.in.h 2018-07-02 13:09:59.720436600 +0300 +@@ -1,6 +1,6 @@ + /* A substitute for ISO C99 , for platforms that have issues. + +- Copyright (C) 2007-2014 Free Software Foundation, Inc. ++ Copyright (C) 2007-2017 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 +@@ -30,15 +30,23 @@ + #endif + @PRAGMA_COLUMNS@ + +-#if defined __need_mbstate_t || defined __need_wint_t || (defined __hpux && ((defined _INTTYPES_INCLUDED && !defined strtoimax) || defined _GL_JUST_INCLUDE_SYSTEM_WCHAR_H)) || defined _GL_ALREADY_INCLUDING_WCHAR_H ++#if (((defined __need_mbstate_t || defined __need_wint_t) \ ++ && !defined __MINGW32__ && !defined __KLIBC__) \ ++ || (defined __hpux \ ++ && ((defined _INTTYPES_INCLUDED && !defined strtoimax) \ ++ || defined _GL_JUST_INCLUDE_SYSTEM_WCHAR_H)) \ ++ || (defined __MINGW32__ && defined __STRING_H_SOURCED__) \ ++ || defined _GL_ALREADY_INCLUDING_WCHAR_H) + /* Special invocation convention: +- - Inside glibc and uClibc header files. ++ - Inside glibc and uClibc header files, but not MinGW. + - On HP-UX 11.00 we have a sequence of nested includes + -> -> , and the latter includes , + once indirectly -> -> -> + and once directly. In both situations 'wint_t' is not yet defined, + therefore we cannot provide the function overrides; instead include only + the system's . ++ - With MinGW 3.22, when includes , only some part of ++ is actually processed, and that doesn't include 'mbstate_t'. + - On IRIX 6.5, similarly, we have an include -> , and + the latter includes . But here, we have no way to detect whether + is completely included or is still being included. */ +@@ -105,12 +113,16 @@ + # define WEOF -1 + # endif + #else +-/* MSVC defines wint_t as 'unsigned short' in . +- This is too small: ISO C 99 section 7.24.1.(2) says that wint_t must be +- "unchanged by default argument promotions". Override it. */ +-# if defined _MSC_VER ++/* mingw and MSVC define wint_t as 'unsigned short' in or ++ . This is too small: ISO C 99 section 7.24.1.(2) says that ++ wint_t must be "unchanged by default argument promotions". Override it. */ ++# if @GNULIB_OVERRIDES_WINT_T@ + # if !GNULIB_defined_wint_t +-# include ++# if @HAVE_CRTDEFS_H@ ++# include ++# else ++# include ++# endif + typedef unsigned int rpl_wint_t; + # undef wint_t + # define wint_t rpl_wint_t +@@ -440,6 +452,11 @@ + # if !@HAVE_DECL_WCWIDTH@ + /* wcwidth exists but is not declared. */ + _GL_FUNCDECL_SYS (wcwidth, int, (wchar_t) _GL_ATTRIBUTE_PURE); ++# elif defined __KLIBC__ ++/* On OS/2 kLIBC, wcwidth is a macro that expands to the name of a ++ static inline function. The implementation of wcwidth in wcwidth.c ++ causes a "conflicting types" error. */ ++# undef wcwidth + # endif + _GL_CXXALIAS_SYS (wcwidth, int, (wchar_t)); + # endif +@@ -1022,6 +1039,38 @@ + # endif + #endif + ++ ++/* Convert *TP to a date and time wide string. See ++ . */ ++#if @GNULIB_WCSFTIME@ ++# if @REPLACE_WCSFTIME@ ++# if !(defined __cplusplus && defined GNULIB_NAMESPACE) ++# undef wcsftime ++# define wcsftime rpl_wcsftime ++# endif ++_GL_FUNCDECL_RPL (wcsftime, size_t, (wchar_t *__buf, size_t __bufsize, ++ const wchar_t *__fmt, const struct tm *__tp) ++ _GL_ARG_NONNULL ((1, 3, 4))); ++_GL_CXXALIAS_RPL (wcsftime, size_t, (wchar_t *__buf, size_t __bufsize, ++ const wchar_t *__fmt, const struct tm *__tp)); ++# else ++# if !@HAVE_WCSFTIME@ ++_GL_FUNCDECL_SYS (wcsftime, size_t, (wchar_t *__buf, size_t __bufsize, ++ const wchar_t *__fmt, const struct tm *__tp) ++ _GL_ARG_NONNULL ((1, 3, 4))); ++# endif ++_GL_CXXALIAS_SYS (wcsftime, size_t, (wchar_t *__buf, size_t __bufsize, ++ const wchar_t *__fmt, const struct tm *__tp)); ++# endif ++_GL_CXXALIASWARN (wcsftime); ++#elif defined GNULIB_POSIXCHECK ++# undef wcsftime ++# if HAVE_RAW_DECL_WCSFTIME ++_GL_WARN_ON_USE (wcsftime, "wcsftime is unportable - " ++ "use gnulib module wcsftime for portability"); ++# endif ++#endif ++ + + #endif /* _@GUARD_PREFIX@_WCHAR_H */ + #endif /* _@GUARD_PREFIX@_WCHAR_H */ +diff -Naur libpipeline-1.5.0-orig/gnulib/lib/write.c libpipeline-1.5.0/gnulib/lib/write.c +--- libpipeline-1.5.0-orig/gnulib/lib/write.c 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/lib/write.c 2018-07-02 13:09:59.720436600 +0300 +@@ -1,5 +1,5 @@ + /* POSIX compatible write() function. +- Copyright (C) 2008-2014 Free Software Foundation, Inc. ++ Copyright (C) 2008-2017 Free Software Foundation, Inc. + Written by Bruno Haible , 2008. + + This program is free software: you can redistribute it and/or modify +@@ -34,8 +34,14 @@ + # define WIN32_LEAN_AND_MEAN /* avoid including junk */ + # include + +-# include "msvc-inval.h" +-# include "msvc-nothrow.h" ++# if HAVE_MSVC_INVALID_PARAMETER_HANDLER ++# include "msvc-inval.h" ++# endif ++# if GNULIB_MSVC_NOTHROW ++# include "msvc-nothrow.h" ++# else ++# include ++# endif + + # undef write + +diff -Naur libpipeline-1.5.0-orig/gnulib/lib/xalloc.h libpipeline-1.5.0/gnulib/lib/xalloc.h +--- libpipeline-1.5.0-orig/gnulib/lib/xalloc.h 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/lib/xalloc.h 2018-07-02 13:09:59.720436600 +0300 +@@ -1,6 +1,6 @@ + /* xalloc.h -- malloc with out-of-memory checking + +- Copyright (C) 1990-2000, 2003-2004, 2006-2014 Free Software Foundation, Inc. ++ Copyright (C) 1990-2000, 2003-2004, 2006-2017 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 +@@ -19,6 +19,7 @@ + #define XALLOC_H_ + + #include ++#include + + #include "xalloc-oversized.h" + +@@ -41,7 +42,8 @@ + # define _GL_ATTRIBUTE_MALLOC + #endif + +-#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3) ++#if ! defined __clang__ && \ ++ (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)) + # define _GL_ATTRIBUTE_ALLOC_SIZE(args) __attribute__ ((__alloc_size__ args)) + #else + # define _GL_ATTRIBUTE_ALLOC_SIZE(args) +@@ -64,7 +66,7 @@ + _GL_ATTRIBUTE_ALLOC_SIZE ((2)); + void *x2realloc (void *p, size_t *pn); + void *xmemdup (void const *p, size_t s) +- _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_ALLOC_SIZE ((2)); ++ _GL_ATTRIBUTE_ALLOC_SIZE ((2)); + char *xstrdup (char const *str) + _GL_ATTRIBUTE_MALLOC; + +@@ -122,10 +124,9 @@ + + /* If P is null, allocate a block of at least *PN such objects; + otherwise, reallocate P so that it contains more than *PN objects +- each of S bytes. *PN must be nonzero unless P is null, and S must +- be nonzero. Set *PN to the new number of objects, and return the +- pointer to the new block. *PN is never set to zero, and the +- returned pointer is never null. ++ each of S bytes. S must be nonzero. Set *PN to the new number of ++ objects, and return the pointer to the new block. *PN is never set ++ to zero, and the returned pointer is never null. + + Repeated reallocations are guaranteed to make progress, either by + allocating an initial block with a nonzero size, or by allocating a +@@ -193,16 +194,19 @@ + n = DEFAULT_MXFAST / s; + n += !n; + } ++ if (xalloc_oversized (n, s)) ++ xalloc_die (); + } + else + { +- /* Set N = ceil (1.5 * N) so that progress is made if N == 1. +- Check for overflow, so that N * S stays in size_t range. +- The check is slightly conservative, but an exact check isn't +- worth the trouble. */ +- if ((size_t) -1 / 3 * 2 / s <= n) ++ /* Set N = floor (1.5 * N) + 1 so that progress is made even if N == 0. ++ Check for overflow, so that N * S stays in both ptrdiff_t and ++ size_t range. The check may be slightly conservative, but an ++ exact check isn't worth the trouble. */ ++ if ((PTRDIFF_MAX < SIZE_MAX ? PTRDIFF_MAX : SIZE_MAX) / 3 * 2 / s ++ <= n) + xalloc_die (); +- n += (n + 1) / 2; ++ n += n / 2 + 1; + } + + *pn = n; +@@ -259,5 +263,6 @@ + + #endif + ++_GL_INLINE_HEADER_END + + #endif /* !XALLOC_H_ */ +diff -Naur libpipeline-1.5.0-orig/gnulib/lib/xalloc-die.c libpipeline-1.5.0/gnulib/lib/xalloc-die.c +--- libpipeline-1.5.0-orig/gnulib/lib/xalloc-die.c 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/lib/xalloc-die.c 2018-07-02 13:09:59.720436600 +0300 +@@ -1,6 +1,6 @@ + /* Report a memory allocation failure and exit. + +- Copyright (C) 1997-2000, 2002-2004, 2006, 2009-2014 Free Software ++ Copyright (C) 1997-2000, 2002-2004, 2006, 2009-2017 Free Software + Foundation, Inc. + + This program is free software: you can redistribute it and/or modify +diff -Naur libpipeline-1.5.0-orig/gnulib/lib/xalloc-oversized.h libpipeline-1.5.0/gnulib/lib/xalloc-oversized.h +--- libpipeline-1.5.0-orig/gnulib/lib/xalloc-oversized.h 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/lib/xalloc-oversized.h 2018-07-02 13:09:59.730436600 +0300 +@@ -1,6 +1,6 @@ + /* xalloc-oversized.h -- memory allocation size checking + +- Copyright (C) 1990-2000, 2003-2004, 2006-2014 Free Software Foundation, Inc. ++ Copyright (C) 1990-2000, 2003-2004, 2006-2017 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 +@@ -16,23 +16,45 @@ + along with this program. If not, see . */ + + #ifndef XALLOC_OVERSIZED_H_ +-# define XALLOC_OVERSIZED_H_ ++#define XALLOC_OVERSIZED_H_ + +-# include +- +-/* Return 1 if an array of N objects, each of size S, cannot exist due +- to size arithmetic overflow. S must be positive and N must be +- nonnegative. This is a macro, not a function, so that it +- works correctly even when SIZE_MAX < N. ++#include ++#include + ++/* True if N * S would overflow in a size_t calculation, ++ or would generate a value larger than PTRDIFF_MAX. ++ This expands to a constant expression if N and S are both constants. + By gnulib convention, SIZE_MAX represents overflow in size +- calculations, so the conservative dividend to use here is +- SIZE_MAX - 1, since SIZE_MAX might represent an overflowed value. +- However, malloc (SIZE_MAX) fails on all known hosts where +- sizeof (ptrdiff_t) <= sizeof (size_t), so do not bother to test for +- exactly-SIZE_MAX allocations on such hosts; this avoids a test and +- branch when S is known to be 1. */ ++ calculations, so the conservative size_t-based dividend to use here ++ is SIZE_MAX - 1. */ ++#define __xalloc_oversized(n, s) \ ++ ((size_t) (PTRDIFF_MAX < SIZE_MAX ? PTRDIFF_MAX : SIZE_MAX - 1) / (s) < (n)) ++ ++#if PTRDIFF_MAX < SIZE_MAX ++typedef ptrdiff_t __xalloc_count_type; ++#else ++typedef size_t __xalloc_count_type; ++#endif ++ ++/* Return 1 if an array of N objects, each of size S, cannot exist ++ reliably due to size or ptrdiff_t arithmetic overflow. S must be ++ positive and N must be nonnegative. This is a macro, not a ++ function, so that it works correctly even when SIZE_MAX < N. */ ++ ++#if 7 <= __GNUC__ ++# define xalloc_oversized(n, s) \ ++ __builtin_mul_overflow_p (n, s, (__xalloc_count_type) 1) ++#elif 5 <= __GNUC__ && !__STRICT_ANSI__ + # define xalloc_oversized(n, s) \ +- ((size_t) (sizeof (ptrdiff_t) <= sizeof (size_t) ? -1 : -2) / (s) < (n)) ++ (__builtin_constant_p (n) && __builtin_constant_p (s) \ ++ ? __xalloc_oversized (n, s) \ ++ : ({ __xalloc_count_type __xalloc_count; \ ++ __builtin_mul_overflow (n, s, &__xalloc_count); })) ++ ++/* Other compilers use integer division; this may be slower but is ++ more portable. */ ++#else ++# define xalloc_oversized(n, s) __xalloc_oversized (n, s) ++#endif + + #endif /* !XALLOC_OVERSIZED_H_ */ +diff -Naur libpipeline-1.5.0-orig/gnulib/lib/xasprintf.c libpipeline-1.5.0/gnulib/lib/xasprintf.c +--- libpipeline-1.5.0-orig/gnulib/lib/xasprintf.c 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/lib/xasprintf.c 2018-07-02 13:09:59.730436600 +0300 +@@ -1,5 +1,5 @@ + /* vasprintf and asprintf with out-of-memory checking. +- Copyright (C) 1999, 2002-2004, 2006, 2009-2014 Free Software Foundation, ++ Copyright (C) 1999, 2002-2004, 2006, 2009-2017 Free Software Foundation, + Inc. + + This program is free software: you can redistribute it and/or modify +diff -Naur libpipeline-1.5.0-orig/gnulib/lib/xmalloc.c libpipeline-1.5.0/gnulib/lib/xmalloc.c +--- libpipeline-1.5.0-orig/gnulib/lib/xmalloc.c 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/lib/xmalloc.c 2018-07-02 13:09:59.730436600 +0300 +@@ -1,6 +1,6 @@ + /* xmalloc.c -- malloc with out of memory checking + +- Copyright (C) 1990-2000, 2002-2006, 2008-2014 Free Software Foundation, Inc. ++ Copyright (C) 1990-2000, 2002-2006, 2008-2017 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 +@@ -93,11 +93,11 @@ + xcalloc (size_t n, size_t s) + { + void *p; +- /* Test for overflow, since some calloc implementations don't have +- proper overflow checks. But omit overflow and size-zero tests if +- HAVE_GNU_CALLOC, since GNU calloc catches overflow and never +- returns NULL if successful. */ +- if ((! HAVE_GNU_CALLOC && xalloc_oversized (n, s)) ++ /* Test for overflow, since objects with size greater than ++ PTRDIFF_MAX cause pointer subtraction to go awry. Omit size-zero ++ tests if HAVE_GNU_CALLOC, since GNU calloc never returns NULL if ++ successful. */ ++ if (xalloc_oversized (n, s) + || (! (p = calloc (n, s)) && (HAVE_GNU_CALLOC || n != 0))) + xalloc_die (); + return p; +diff -Naur libpipeline-1.5.0-orig/gnulib/lib/xsize.h libpipeline-1.5.0/gnulib/lib/xsize.h +--- libpipeline-1.5.0-orig/gnulib/lib/xsize.h 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/lib/xsize.h 2018-07-02 13:09:59.730436600 +0300 +@@ -1,6 +1,6 @@ + /* xsize.h -- Checked size_t computations. + +- Copyright (C) 2003, 2008-2014 Free Software Foundation, Inc. ++ Copyright (C) 2003, 2008-2017 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 +diff -Naur libpipeline-1.5.0-orig/gnulib/lib/xstrndup.c libpipeline-1.5.0/gnulib/lib/xstrndup.c +--- libpipeline-1.5.0-orig/gnulib/lib/xstrndup.c 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/lib/xstrndup.c 2018-07-02 13:09:59.740436600 +0300 +@@ -1,6 +1,6 @@ + /* Duplicate a bounded initial segment of a string, with out-of-memory + checking. +- Copyright (C) 2003, 2006-2007, 2009-2014 Free Software Foundation, Inc. ++ Copyright (C) 2003, 2006-2007, 2009-2017 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 +diff -Naur libpipeline-1.5.0-orig/gnulib/lib/xstrndup.h libpipeline-1.5.0/gnulib/lib/xstrndup.h +--- libpipeline-1.5.0-orig/gnulib/lib/xstrndup.h 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/lib/xstrndup.h 2018-07-02 13:09:59.740436600 +0300 +@@ -1,6 +1,6 @@ + /* Duplicate a bounded initial segment of a string, with out-of-memory + checking. +- Copyright (C) 2003, 2009-2014 Free Software Foundation, Inc. ++ Copyright (C) 2003, 2009-2017 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 +diff -Naur libpipeline-1.5.0-orig/gnulib/lib/xvasprintf.c libpipeline-1.5.0/gnulib/lib/xvasprintf.c +--- libpipeline-1.5.0-orig/gnulib/lib/xvasprintf.c 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/lib/xvasprintf.c 2018-07-02 13:09:59.740436600 +0300 +@@ -1,5 +1,5 @@ + /* vasprintf and asprintf with out-of-memory checking. +- Copyright (C) 1999, 2002-2004, 2006-2014 Free Software Foundation, Inc. ++ Copyright (C) 1999, 2002-2004, 2006-2017 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 +diff -Naur libpipeline-1.5.0-orig/gnulib/lib/xvasprintf.h libpipeline-1.5.0/gnulib/lib/xvasprintf.h +--- libpipeline-1.5.0-orig/gnulib/lib/xvasprintf.h 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/lib/xvasprintf.h 2018-07-02 13:09:59.750436600 +0300 +@@ -1,5 +1,5 @@ + /* vasprintf and asprintf with out-of-memory checking. +- Copyright (C) 2002-2004, 2006-2014 Free Software Foundation, Inc. ++ Copyright (C) 2002-2004, 2006-2017 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 +diff -Naur libpipeline-1.5.0-orig/gnulib/m4/00gnulib.m4 libpipeline-1.5.0/gnulib/m4/00gnulib.m4 +--- libpipeline-1.5.0-orig/gnulib/m4/00gnulib.m4 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/m4/00gnulib.m4 2018-07-02 13:09:59.750436600 +0300 +@@ -1,12 +1,28 @@ +-# 00gnulib.m4 serial 2 +-dnl Copyright (C) 2009-2014 Free Software Foundation, Inc. ++# 00gnulib.m4 serial 3 ++dnl Copyright (C) 2009-2017 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, + dnl with or without modifications, as long as this notice is preserved. + + dnl This file must be named something that sorts before all other + dnl gnulib-provided .m4 files. It is needed until such time as we can +-dnl assume Autoconf 2.64, with its improved AC_DEFUN_ONCE semantics. ++dnl assume Autoconf 2.64, with its improved AC_DEFUN_ONCE and ++dnl m4_divert semantics. ++ ++# Until autoconf 2.63, handling of the diversion stack required m4_init ++# to be called first; but this does not happen with aclocal. Wrapping ++# the entire execution in another layer of the diversion stack fixes this. ++# Worse, prior to autoconf 2.62, m4_wrap depended on the underlying m4 ++# for whether it was FIFO or LIFO; in order to properly balance with ++# m4_init, we need to undo our push just before anything wrapped within ++# the m4_init body. The way to ensure this is to wrap both sides of ++# m4_init with a one-shot macro that does the pop at the right time. ++m4_ifndef([_m4_divert_diversion], ++[m4_divert_push([KILL]) ++m4_define([gl_divert_fixup], [m4_divert_pop()m4_define([$0])]) ++m4_define([m4_init], ++ [gl_divert_fixup()]m4_defn([m4_init])[gl_divert_fixup()])]) ++ + + # AC_DEFUN_ONCE([NAME], VALUE) + # ---------------------------- +diff -Naur libpipeline-1.5.0-orig/gnulib/m4/absolute-header.m4 libpipeline-1.5.0/gnulib/m4/absolute-header.m4 +--- libpipeline-1.5.0-orig/gnulib/m4/absolute-header.m4 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/m4/absolute-header.m4 2018-07-02 13:09:59.750436600 +0300 +@@ -1,5 +1,5 @@ + # absolute-header.m4 serial 16 +-dnl Copyright (C) 2006-2014 Free Software Foundation, Inc. ++dnl Copyright (C) 2006-2017 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, + dnl with or without modifications, as long as this notice is preserved. +diff -Naur libpipeline-1.5.0-orig/gnulib/m4/alloca.m4 libpipeline-1.5.0/gnulib/m4/alloca.m4 +--- libpipeline-1.5.0-orig/gnulib/m4/alloca.m4 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/m4/alloca.m4 2018-07-02 13:09:59.760436600 +0300 +@@ -1,5 +1,5 @@ + # alloca.m4 serial 14 +-dnl Copyright (C) 2002-2004, 2006-2007, 2009-2014 Free Software Foundation, ++dnl Copyright (C) 2002-2004, 2006-2007, 2009-2017 Free Software Foundation, + dnl Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, +diff -Naur libpipeline-1.5.0-orig/gnulib/m4/dirname.m4 libpipeline-1.5.0/gnulib/m4/dirname.m4 +--- libpipeline-1.5.0-orig/gnulib/m4/dirname.m4 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/m4/dirname.m4 2018-07-02 13:09:59.760436600 +0300 +@@ -1,5 +1,5 @@ + #serial 10 -*- autoconf -*- +-dnl Copyright (C) 2002-2006, 2009-2014 Free Software Foundation, Inc. ++dnl Copyright (C) 2002-2006, 2009-2017 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, + dnl with or without modifications, as long as this notice is preserved. +diff -Naur libpipeline-1.5.0-orig/gnulib/m4/double-slash-root.m4 libpipeline-1.5.0/gnulib/m4/double-slash-root.m4 +--- libpipeline-1.5.0-orig/gnulib/m4/double-slash-root.m4 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/m4/double-slash-root.m4 2018-07-02 13:09:59.760436600 +0300 +@@ -1,5 +1,5 @@ + # double-slash-root.m4 serial 4 -*- Autoconf -*- +-dnl Copyright (C) 2006, 2008-2014 Free Software Foundation, Inc. ++dnl Copyright (C) 2006, 2008-2017 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, + dnl with or without modifications, as long as this notice is preserved. +diff -Naur libpipeline-1.5.0-orig/gnulib/m4/eealloc.m4 libpipeline-1.5.0/gnulib/m4/eealloc.m4 +--- libpipeline-1.5.0-orig/gnulib/m4/eealloc.m4 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/m4/eealloc.m4 2018-07-02 13:09:59.760436600 +0300 +@@ -1,5 +1,5 @@ + # eealloc.m4 serial 3 +-dnl Copyright (C) 2003, 2009-2014 Free Software Foundation, Inc. ++dnl Copyright (C) 2003, 2009-2017 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, + dnl with or without modifications, as long as this notice is preserved. +diff -Naur libpipeline-1.5.0-orig/gnulib/m4/environ.m4 libpipeline-1.5.0/gnulib/m4/environ.m4 +--- libpipeline-1.5.0-orig/gnulib/m4/environ.m4 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/m4/environ.m4 2018-07-02 13:09:59.770436600 +0300 +@@ -1,5 +1,5 @@ + # environ.m4 serial 6 +-dnl Copyright (C) 2001-2004, 2006-2014 Free Software Foundation, Inc. ++dnl Copyright (C) 2001-2004, 2006-2017 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, + dnl with or without modifications, as long as this notice is preserved. +diff -Naur libpipeline-1.5.0-orig/gnulib/m4/errno_h.m4 libpipeline-1.5.0/gnulib/m4/errno_h.m4 +--- libpipeline-1.5.0-orig/gnulib/m4/errno_h.m4 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/m4/errno_h.m4 2018-07-02 13:09:59.770436600 +0300 +@@ -1,5 +1,5 @@ + # errno_h.m4 serial 12 +-dnl Copyright (C) 2004, 2006, 2008-2014 Free Software Foundation, Inc. ++dnl Copyright (C) 2004, 2006, 2008-2017 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, + dnl with or without modifications, as long as this notice is preserved. +diff -Naur libpipeline-1.5.0-orig/gnulib/m4/error.m4 libpipeline-1.5.0/gnulib/m4/error.m4 +--- libpipeline-1.5.0-orig/gnulib/m4/error.m4 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/m4/error.m4 2018-07-02 13:09:59.770436600 +0300 +@@ -1,6 +1,6 @@ + #serial 14 + +-# Copyright (C) 1996-1998, 2001-2004, 2009-2014 Free Software Foundation, Inc. ++# Copyright (C) 1996-1998, 2001-2004, 2009-2017 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, +diff -Naur libpipeline-1.5.0-orig/gnulib/m4/exponentd.m4 libpipeline-1.5.0/gnulib/m4/exponentd.m4 +--- libpipeline-1.5.0-orig/gnulib/m4/exponentd.m4 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/m4/exponentd.m4 2018-07-02 13:09:59.770436600 +0300 +@@ -1,5 +1,5 @@ + # exponentd.m4 serial 3 +-dnl Copyright (C) 2007-2008, 2010-2014 Free Software Foundation, Inc. ++dnl Copyright (C) 2007-2008, 2010-2017 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, + dnl with or without modifications, as long as this notice is preserved. +diff -Naur libpipeline-1.5.0-orig/gnulib/m4/extensions.m4 libpipeline-1.5.0/gnulib/m4/extensions.m4 +--- libpipeline-1.5.0-orig/gnulib/m4/extensions.m4 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/m4/extensions.m4 2018-07-02 13:09:59.780436700 +0300 +@@ -1,7 +1,7 @@ +-# serial 13 -*- Autoconf -*- ++# serial 15 -*- Autoconf -*- + # Enable extensions on systems that normally disable them. + +-# Copyright (C) 2003, 2006-2014 Free Software Foundation, Inc. ++# Copyright (C) 2003, 2006-2017 Free Software Foundation, Inc. + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -60,7 +60,7 @@ + #ifndef _ALL_SOURCE + # undef _ALL_SOURCE + #endif +-/* Enable general extensions on OS X. */ ++/* Enable general extensions on macOS. */ + #ifndef _DARWIN_C_SOURCE + # undef _DARWIN_C_SOURCE + #endif +@@ -72,6 +72,34 @@ + #ifndef _POSIX_PTHREAD_SEMANTICS + # undef _POSIX_PTHREAD_SEMANTICS + #endif ++/* Enable extensions specified by ISO/IEC TS 18661-5:2014. */ ++#ifndef __STDC_WANT_IEC_60559_ATTRIBS_EXT__ ++# undef __STDC_WANT_IEC_60559_ATTRIBS_EXT__ ++#endif ++/* Enable extensions specified by ISO/IEC TS 18661-1:2014. */ ++#ifndef __STDC_WANT_IEC_60559_BFP_EXT__ ++# undef __STDC_WANT_IEC_60559_BFP_EXT__ ++#endif ++/* Enable extensions specified by ISO/IEC TS 18661-2:2015. */ ++#ifndef __STDC_WANT_IEC_60559_DFP_EXT__ ++# undef __STDC_WANT_IEC_60559_DFP_EXT__ ++#endif ++/* Enable extensions specified by ISO/IEC TS 18661-4:2015. */ ++#ifndef __STDC_WANT_IEC_60559_FUNCS_EXT__ ++# undef __STDC_WANT_IEC_60559_FUNCS_EXT__ ++#endif ++/* Enable extensions specified by ISO/IEC TS 18661-3:2015. */ ++#ifndef __STDC_WANT_IEC_60559_TYPES_EXT__ ++# undef __STDC_WANT_IEC_60559_TYPES_EXT__ ++#endif ++/* Enable extensions specified by ISO/IEC TR 24731-2:2010. */ ++#ifndef __STDC_WANT_LIB_EXT2__ ++# undef __STDC_WANT_LIB_EXT2__ ++#endif ++/* Enable extensions specified by ISO/IEC 24747:2009. */ ++#ifndef __STDC_WANT_MATH_SPEC_FUNCS__ ++# undef __STDC_WANT_MATH_SPEC_FUNCS__ ++#endif + /* Enable extensions on HP NonStop. */ + #ifndef _TANDEM_SOURCE + # undef _TANDEM_SOURCE +@@ -101,6 +129,13 @@ + AC_DEFINE([_DARWIN_C_SOURCE]) + AC_DEFINE([_GNU_SOURCE]) + AC_DEFINE([_POSIX_PTHREAD_SEMANTICS]) ++ AC_DEFINE([__STDC_WANT_IEC_60559_ATTRIBS_EXT__]) ++ AC_DEFINE([__STDC_WANT_IEC_60559_BFP_EXT__]) ++ AC_DEFINE([__STDC_WANT_IEC_60559_DFP_EXT__]) ++ AC_DEFINE([__STDC_WANT_IEC_60559_FUNCS_EXT__]) ++ AC_DEFINE([__STDC_WANT_IEC_60559_TYPES_EXT__]) ++ AC_DEFINE([__STDC_WANT_LIB_EXT2__]) ++ AC_DEFINE([__STDC_WANT_MATH_SPEC_FUNCS__]) + AC_DEFINE([_TANDEM_SOURCE]) + AC_CACHE_CHECK([whether _XOPEN_SOURCE should be defined], + [ac_cv_should_define__xopen_source], +diff -Naur libpipeline-1.5.0-orig/gnulib/m4/extern-inline.m4 libpipeline-1.5.0/gnulib/m4/extern-inline.m4 +--- libpipeline-1.5.0-orig/gnulib/m4/extern-inline.m4 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/m4/extern-inline.m4 2018-07-02 13:09:59.780436700 +0300 +@@ -1,6 +1,6 @@ + dnl 'extern inline' a la ISO C99. + +-dnl Copyright 2012-2014 Free Software Foundation, Inc. ++dnl Copyright 2012-2017 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, + dnl with or without modifications, as long as this notice is preserved. +@@ -19,13 +19,28 @@ + 'reference to static identifier "f" in extern inline function'. + This bug was observed with Sun C 5.12 SunOS_i386 2011/11/16. + +- Suppress the use of extern inline on problematic Apple configurations. +- OS X 10.8 and earlier mishandle it; see, e.g., +- . ++ Suppress extern inline (with or without __attribute__ ((__gnu_inline__))) ++ on configurations that mistakenly use 'static inline' to implement ++ functions or macros in standard C headers like . For example, ++ if isdigit is mistakenly implemented via a static inline function, ++ a program containing an extern inline function that calls isdigit ++ may not work since the C standard prohibits extern inline functions ++ from calling static functions. This bug is known to occur on: ++ ++ OS X 10.8 and earlier; see: ++ http://lists.gnu.org/archive/html/bug-gnulib/2012-12/msg00023.html ++ ++ DragonFly; see ++ http://muscles.dragonflybsd.org/bulk/bleeding-edge-potential/latest-per-pkg/ah-tty-0.3.12.log ++ ++ FreeBSD; see: ++ http://lists.gnu.org/archive/html/bug-gnulib/2014-07/msg00104.html ++ + OS X 10.9 has a macro __header_inline indicating the bug is fixed for C and + for clang but remains for g++; see . +- Perhaps Apple will fix this some day. */ +-#if (defined __APPLE__ \ ++ Assume DragonFly and FreeBSD will be similar. */ ++#if (((defined __APPLE__ && defined __MACH__) \ ++ || defined __DragonFly__ || defined __FreeBSD__) \ + && (defined __header_inline \ + ? (defined __cplusplus && defined __GNUC_STDC_INLINE__ \ + && ! defined __clang__) \ +@@ -33,19 +48,20 @@ + && (defined __GNUC__ || defined __cplusplus)) \ + || (defined _FORTIFY_SOURCE && 0 < _FORTIFY_SOURCE \ + && defined __GNUC__ && ! defined __cplusplus)))) +-# define _GL_EXTERN_INLINE_APPLE_BUG ++# define _GL_EXTERN_INLINE_STDHEADER_BUG + #endif + #if ((__GNUC__ \ + ? defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__ \ + : (199901L <= __STDC_VERSION__ \ + && !defined __HP_cc \ ++ && !defined __PGI \ + && !(defined __SUNPRO_C && __STDC__))) \ +- && !defined _GL_EXTERN_INLINE_APPLE_BUG) ++ && !defined _GL_EXTERN_INLINE_STDHEADER_BUG) + # define _GL_INLINE inline + # define _GL_EXTERN_INLINE extern inline + # define _GL_EXTERN_INLINE_IN_USE + #elif (2 < __GNUC__ + (7 <= __GNUC_MINOR__) && !defined __STRICT_ANSI__ \ +- && !defined _GL_EXTERN_INLINE_APPLE_BUG) ++ && !defined _GL_EXTERN_INLINE_STDHEADER_BUG) + # if defined __GNUC_GNU_INLINE__ && __GNUC_GNU_INLINE__ + /* __gnu_inline__ suppresses a GCC 4.2 diagnostic. */ + # define _GL_INLINE extern inline __attribute__ ((__gnu_inline__)) +@@ -59,17 +75,19 @@ + # define _GL_EXTERN_INLINE static _GL_UNUSED + #endif + +-#if 4 < __GNUC__ + (6 <= __GNUC_MINOR__) ++/* In GCC 4.6 (inclusive) to 5.1 (exclusive), ++ suppress bogus "no previous prototype for 'FOO'" ++ and "no previous declaration for 'FOO'" diagnostics, ++ when FOO is an inline function in the header; see ++ and ++ . */ ++#if __GNUC__ == 4 && 6 <= __GNUC_MINOR__ + # if defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__ + # define _GL_INLINE_HEADER_CONST_PRAGMA + # else + # define _GL_INLINE_HEADER_CONST_PRAGMA \ + _Pragma ("GCC diagnostic ignored \"-Wsuggest-attribute=const\"") + # endif +- /* Suppress GCC's bogus "no previous prototype for 'FOO'" +- and "no previous declaration for 'FOO'" diagnostics, +- when FOO is an inline function in the header; see +- . */ + # define _GL_INLINE_HEADER_BEGIN \ + _Pragma ("GCC diagnostic push") \ + _Pragma ("GCC diagnostic ignored \"-Wmissing-prototypes\"") \ +diff -Naur libpipeline-1.5.0-orig/gnulib/m4/fcntl_h.m4 libpipeline-1.5.0/gnulib/m4/fcntl_h.m4 +--- libpipeline-1.5.0-orig/gnulib/m4/fcntl_h.m4 2014-11-08 16:53:37.000000000 +0300 ++++ libpipeline-1.5.0/gnulib/m4/fcntl_h.m4 2018-07-02 13:09:59.780436700 +0300 +@@ -1,6 +1,6 @@ + # serial 15 + # Configure fcntl.h. +-dnl Copyright (C) 2006-2007, 2009-2014 Free Software Foundation, Inc. ++dnl Copyright (C) 2006-2007, 2009-2017 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, + dnl with or without modifications, as long as this notice is preserved. +diff -Naur libpipeline-1.5.0-orig/gnulib/m4/fcntl-o.m4 libpipeline-1.5.0/gnulib/m4/fcntl-o.m4 +--- libpipeline-1.5.0-orig/gnulib/m4/fcntl-o.m4 2014-11-08 16:53:37.000000000 +0300 ++++ libpipeline-1.5.0/gnulib/m4/fcntl-o.m4 2018-07-02 13:09:59.790436700 +0300 +@@ -1,5 +1,5 @@ + # fcntl-o.m4 serial 4 +-dnl Copyright (C) 2006, 2009-2014 Free Software Foundation, Inc. ++dnl Copyright (C) 2006, 2009-2017 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, + dnl with or without modifications, as long as this notice is preserved. +diff -Naur libpipeline-1.5.0-orig/gnulib/m4/float_h.m4 libpipeline-1.5.0/gnulib/m4/float_h.m4 +--- libpipeline-1.5.0-orig/gnulib/m4/float_h.m4 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/m4/float_h.m4 2018-07-02 13:09:59.790436700 +0300 +@@ -1,5 +1,5 @@ + # float_h.m4 serial 9 +-dnl Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc. ++dnl Copyright (C) 2007, 2009-2017 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, + dnl with or without modifications, as long as this notice is preserved. +diff -Naur libpipeline-1.5.0-orig/gnulib/m4/getprogname.m4 libpipeline-1.5.0/gnulib/m4/getprogname.m4 +--- libpipeline-1.5.0-orig/gnulib/m4/getprogname.m4 1970-01-01 03:00:00.000000000 +0300 ++++ libpipeline-1.5.0/gnulib/m4/getprogname.m4 2018-07-02 13:09:59.790436700 +0300 +@@ -0,0 +1,43 @@ ++# getprogname.m4 - check for getprogname or replacements for it ++ ++# Copyright (C) 2016-2017 Free Software Foundation, Inc. ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# serial 4 ++ ++AC_DEFUN([gl_FUNC_GETPROGNAME], ++[ ++ AC_CHECK_FUNCS_ONCE([getprogname getexecname]) ++ AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) ++ ac_found=0 ++ AC_CHECK_DECLS([program_invocation_name], [ac_found=1], [], ++ [#include ]) ++ AC_CHECK_DECLS([program_invocation_short_name], [ac_found=1], [], ++ [#include ]) ++ AC_CHECK_DECLS([__argv], [ac_found=1], [], [#include ]) ++ ++ # Incur the cost of this test only if none of the above worked. ++ if test $ac_found = 0; then ++ # On OpenBSD 5.1, using the global __progname variable appears to be ++ # the only way to implement getprogname. ++ AC_CACHE_CHECK([whether __progname is defined in default libraries], ++ [gl_cv_var___progname], ++ [ ++ gl_cv_var___progname= ++ AC_LINK_IFELSE( ++ [AC_LANG_PROGRAM( ++ [[extern char *__progname;]], ++ [[return *__progname;]] ++ )], ++ [gl_cv_var___progname=yes] ++ ) ++ ] ++ ) ++ if test "$gl_cv_var___progname" = yes; then ++ AC_DEFINE([HAVE_VAR___PROGNAME], 1, ++ [Define if you have a global __progname variable]) ++ fi ++ fi ++]) +diff -Naur libpipeline-1.5.0-orig/gnulib/m4/gettimeofday.m4 libpipeline-1.5.0/gnulib/m4/gettimeofday.m4 +--- libpipeline-1.5.0-orig/gnulib/m4/gettimeofday.m4 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/m4/gettimeofday.m4 2018-07-02 13:09:59.790436700 +0300 +@@ -1,6 +1,6 @@ +-# serial 21 ++# serial 23 + +-# Copyright (C) 2001-2003, 2005, 2007, 2009-2014 Free Software Foundation, Inc. ++# Copyright (C) 2001-2003, 2005, 2007, 2009-2017 Free Software Foundation, Inc. + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -9,9 +9,10 @@ + + AC_DEFUN([gl_FUNC_GETTIMEOFDAY], + [ ++ AC_REQUIRE([gl_HEADER_SYS_TIME_H_DEFAULTS]) + AC_REQUIRE([AC_C_RESTRICT]) ++ AC_REQUIRE([AC_CANONICAL_HOST]) + AC_REQUIRE([gl_HEADER_SYS_TIME_H]) +- AC_REQUIRE([gl_HEADER_SYS_TIME_H_DEFAULTS]) + AC_CHECK_FUNCS_ONCE([gettimeofday]) + + gl_gettimeofday_timezone=void +@@ -54,19 +55,11 @@ + if test $REPLACE_STRUCT_TIMEVAL = 1; then + REPLACE_GETTIMEOFDAY=1 + fi +- m4_ifdef([gl_FUNC_TZSET_CLOBBER], [ +- gl_FUNC_TZSET_CLOBBER +- case "$gl_cv_func_tzset_clobber" in +- *yes) +- REPLACE_GETTIMEOFDAY=1 +- gl_GETTIMEOFDAY_REPLACE_LOCALTIME +- AC_DEFINE([tzset], [rpl_tzset], +- [Define to rpl_tzset if the wrapper function should be used.]) +- AC_DEFINE([TZSET_CLOBBERS_LOCALTIME], [1], +- [Define if tzset clobbers localtime's static buffer.]) +- ;; +- esac +- ]) ++ dnl On mingw, the original gettimeofday has only a precision of 15.6 ++ dnl milliseconds. So override it. ++ case "$host_os" in ++ mingw*) REPLACE_GETTIMEOFDAY=1 ;; ++ esac + fi + AC_DEFINE_UNQUOTED([GETTIMEOFDAY_TIMEZONE], [$gl_gettimeofday_timezone], + [Define this to 'void' or 'struct timezone' to match the system's +@@ -85,6 +78,7 @@ + [ + AC_REQUIRE([gl_HEADER_SYS_TIME_H]) + AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles ++ AC_REQUIRE([gl_LOCALTIME_BUFFER_DEFAULTS]) + + AC_CACHE_CHECK([whether gettimeofday clobbers localtime buffer], + [gl_cv_func_gettimeofday_clobber], +@@ -119,20 +113,12 @@ + case "$gl_cv_func_gettimeofday_clobber" in + *yes) + REPLACE_GETTIMEOFDAY=1 +- gl_GETTIMEOFDAY_REPLACE_LOCALTIME + AC_DEFINE([GETTIMEOFDAY_CLOBBERS_LOCALTIME], [1], + [Define if gettimeofday clobbers the localtime buffer.]) ++ gl_LOCALTIME_BUFFER_NEEDED + ;; + esac + ]) + +-AC_DEFUN([gl_GETTIMEOFDAY_REPLACE_LOCALTIME], [ +- REPLACE_GMTIME=1 +- REPLACE_LOCALTIME=1 +-]) +- + # Prerequisites of lib/gettimeofday.c. +-AC_DEFUN([gl_PREREQ_GETTIMEOFDAY], [ +- AC_CHECK_HEADERS([sys/timeb.h]) +- AC_CHECK_FUNCS([_ftime]) +-]) ++AC_DEFUN([gl_PREREQ_GETTIMEOFDAY], [:]) +diff -Naur libpipeline-1.5.0-orig/gnulib/m4/gnulib-cache.m4 libpipeline-1.5.0/gnulib/m4/gnulib-cache.m4 +--- libpipeline-1.5.0-orig/gnulib/m4/gnulib-cache.m4 2017-07-10 13:29:08.000000000 +0300 ++++ libpipeline-1.5.0/gnulib/m4/gnulib-cache.m4 2018-07-02 13:09:59.800436700 +0300 +@@ -1,4 +1,4 @@ +-# Copyright (C) 2002-2014 Free Software Foundation, Inc. ++# Copyright (C) 2002-2017 Free Software Foundation, Inc. + # + # This file is free software; you can redistribute it and/or modify + # it under the terms of the GNU General Public License as published by +@@ -27,7 +27,7 @@ + + + # Specification in the form of a command-line invocation: +-# gnulib-tool --import --dir=. --lib=libgnu --source-base=gnulib/lib --m4-base=gnulib/m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --no-conditional-dependencies --libtool --macro-prefix=gl --no-vc-files dirname environ error full-write gitlog-to-changelog gnupload largefile lib-ignore mkdtemp safe-read safe-write setenv sigaction signal sigprocmask strerror strsignal sys_select sys_stat unsetenv waitpid warnings xalloc xstrndup xvasprintf ++# gnulib-tool --import --lib=libgnu --source-base=gnulib/lib --m4-base=gnulib/m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --no-conditional-dependencies --libtool --macro-prefix=gl --no-vc-files dirname environ error full-write gitlog-to-changelog gnupload largefile lib-ignore mkdtemp safe-read safe-write setenv sigaction signal sigprocmask strerror strsignal sys_select sys_stat unsetenv waitpid warnings xalloc xstrndup xvasprintf + + # Specification in the form of a few gnulib-tool.m4 macro invocations: + gl_LOCAL_DIR([]) +diff -Naur libpipeline-1.5.0-orig/gnulib/m4/gnulib-common.m4 libpipeline-1.5.0/gnulib/m4/gnulib-common.m4 +--- libpipeline-1.5.0-orig/gnulib/m4/gnulib-common.m4 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/m4/gnulib-common.m4 2018-07-02 13:09:59.800436700 +0300 +@@ -1,5 +1,5 @@ +-# gnulib-common.m4 serial 34 +-dnl Copyright (C) 2007-2014 Free Software Foundation, Inc. ++# gnulib-common.m4 serial 38 ++dnl Copyright (C) 2007-2017 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, + dnl with or without modifications, as long as this notice is preserved. +@@ -49,6 +49,16 @@ + is a misnomer outside of parameter lists. */ + #define _UNUSED_PARAMETER_ _GL_UNUSED + ++/* gcc supports the "unused" attribute on possibly unused labels, and ++ g++ has since version 4.5. Note to support C++ as well as C, ++ _GL_UNUSED_LABEL should be used with a trailing ; */ ++#if !defined __cplusplus || __GNUC__ > 4 \ ++ || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5) ++# define _GL_UNUSED_LABEL _GL_UNUSED ++#else ++# define _GL_UNUSED_LABEL ++#endif ++ + /* The __pure__ attribute was added in gcc 2.96. */ + #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96) + # define _GL_ATTRIBUTE_PURE __attribute__ ((__pure__)) +@@ -243,9 +253,11 @@ + [ + dnl Minix 3 comes with two toolchains: The Amsterdam Compiler Kit compiler + dnl as "cc", and GCC as "gcc". They have different object file formats and +- dnl library formats. In particular, the GNU binutils programs ar, ranlib ++ dnl library formats. In particular, the GNU binutils programs ar and ranlib + dnl produce libraries that work only with gcc, not with cc. + AC_REQUIRE([AC_PROG_CC]) ++ dnl The '][' hides this use from 'aclocal'. ++ AC_BEFORE([$0], [A][M_PROG_AR]) + AC_CACHE_CHECK([for Minix Amsterdam compiler], [gl_cv_c_amsterdam_compiler], + [ + AC_EGREP_CPP([Amsterdam], +@@ -257,25 +269,39 @@ + [gl_cv_c_amsterdam_compiler=yes], + [gl_cv_c_amsterdam_compiler=no]) + ]) +- if test -z "$AR"; then +- if test $gl_cv_c_amsterdam_compiler = yes; then ++ ++ dnl Don't compete with AM_PROG_AR's decision about AR/ARFLAGS if we are not ++ dnl building with __ACK__. ++ if test $gl_cv_c_amsterdam_compiler = yes; then ++ if test -z "$AR"; then + AR='cc -c.a' +- if test -z "$ARFLAGS"; then +- ARFLAGS='-o' +- fi +- else +- dnl Use the Automake-documented default values for AR and ARFLAGS, +- dnl but prefer ${host}-ar over ar (useful for cross-compiling). +- AC_CHECK_TOOL([AR], [ar], [ar]) +- if test -z "$ARFLAGS"; then +- ARFLAGS='cru' +- fi + fi +- else + if test -z "$ARFLAGS"; then +- ARFLAGS='cru' ++ ARFLAGS='-o' + fi ++ else ++ dnl AM_PROG_AR was added in automake v1.11.2. AM_PROG_AR does not AC_SUBST ++ dnl ARFLAGS variable (it is filed into Makefile.in directly by automake ++ dnl script on-demand, if not specified by ./configure of course). ++ dnl Don't AC_REQUIRE the AM_PROG_AR otherwise the code for __ACK__ above ++ dnl will be ignored. Also, pay attention to call AM_PROG_AR in else block ++ dnl because AM_PROG_AR is written so it could re-set AR variable even for ++ dnl __ACK__. It may seem like its easier to avoid calling the macro here, ++ dnl but we need to AC_SUBST both AR/ARFLAGS (thus those must have some good ++ dnl default value and automake should usually know them). ++ dnl ++ dnl The '][' hides this use from 'aclocal'. ++ m4_ifdef([A][M_PROG_AR], [A][M_PROG_AR], [:]) ++ fi ++ ++ dnl In case the code above has not helped with setting AR/ARFLAGS, use ++ dnl Automake-documented default values for AR and ARFLAGS, but prefer ++ dnl ${host}-ar over ar (useful for cross-compiling). ++ AC_CHECK_TOOL([AR], [ar], [ar]) ++ if test -z "$ARFLAGS"; then ++ ARFLAGS='cr' + fi ++ + AC_SUBST([AR]) + AC_SUBST([ARFLAGS]) + if test -z "$RANLIB"; then +@@ -309,26 +335,28 @@ + ]) + + # AC_C_RESTRICT +-# This definition overrides the AC_C_RESTRICT macro from autoconf 2.60..2.61, +-# so that mixed use of GNU C and GNU C++ and mixed use of Sun C and Sun C++ +-# works. +-# This definition can be removed once autoconf >= 2.62 can be assumed. +-# AC_AUTOCONF_VERSION was introduced in 2.62, so use that as the witness. +-m4_ifndef([AC_AUTOCONF_VERSION],[ ++# This definition is copied from post-2.69 Autoconf and overrides the ++# AC_C_RESTRICT macro from autoconf 2.60..2.69. It can be removed ++# once autoconf >= 2.70 can be assumed. It's painful to check version ++# numbers, and in practice this macro is more up-to-date than Autoconf ++# is, so override Autoconf unconditionally. + AC_DEFUN([AC_C_RESTRICT], + [AC_CACHE_CHECK([for C/C++ restrict keyword], [ac_cv_c_restrict], + [ac_cv_c_restrict=no + # The order here caters to the fact that C++ does not require restrict. + for ac_kw in __restrict __restrict__ _Restrict restrict; do +- AC_COMPILE_IFELSE([AC_LANG_PROGRAM( +- [[typedef int * int_ptr; +- int foo (int_ptr $ac_kw ip) { +- return ip[0]; +- }]], +- [[int s[1]; +- int * $ac_kw t = s; +- t[0] = 0; +- return foo(t)]])], ++ AC_COMPILE_IFELSE( ++ [AC_LANG_PROGRAM( ++ [[typedef int *int_ptr; ++ int foo (int_ptr $ac_kw ip) { return ip[0]; } ++ int bar (int [$ac_kw]); /* Catch GCC bug 14050. */ ++ int bar (int ip[$ac_kw]) { return ip[0]; } ++ ]], ++ [[int s[1]; ++ int *$ac_kw t = s; ++ t[0] = 0; ++ return foo (t) + bar (t); ++ ]])], + [ac_cv_c_restrict=$ac_kw]) + test "$ac_cv_c_restrict" != no && break + done +@@ -338,21 +366,21 @@ + nothing if this is not supported. Do not define if restrict is + supported directly. */ + #undef restrict +-/* Work around a bug in Sun C++: it does not support _Restrict, even +- though the corresponding Sun C compiler does, which causes +- "#define restrict _Restrict" in the previous line. Perhaps some future +- version of Sun C++ will work with _Restrict; if so, it'll probably +- define __RESTRICT, just as Sun C does. */ ++/* Work around a bug in Sun C++: it does not support _Restrict or ++ __restrict__, even though the corresponding Sun C compiler ends up with ++ "#define restrict _Restrict" or "#define restrict __restrict__" in the ++ previous line. Perhaps some future version of Sun C++ will work with ++ restrict; if so, hopefully it defines __RESTRICT like Sun C does. */ + #if defined __SUNPRO_CC && !defined __RESTRICT + # define _Restrict ++# define __restrict__ + #endif]) + case $ac_cv_c_restrict in + restrict) ;; + no) AC_DEFINE([restrict], []) ;; + *) AC_DEFINE_UNQUOTED([restrict], [$ac_cv_c_restrict]) ;; + esac +-]) +-]) ++])# AC_C_RESTRICT + + # gl_BIGENDIAN + # is like AC_C_BIGENDIAN, except that it can be AC_REQUIREd. +@@ -379,3 +407,61 @@ + # AS_VAR_COPY was added in autoconf 2.63b + m4_define_default([AS_VAR_COPY], + [AS_LITERAL_IF([$1[]$2], [$1=$$2], [eval $1=\$$2])]) ++ ++# AC_PROG_SED was added in autoconf 2.59b ++m4_ifndef([AC_PROG_SED], ++[AC_DEFUN([AC_PROG_SED], ++[AC_CACHE_CHECK([for a sed that does not truncate output], ac_cv_path_SED, ++ [dnl ac_script should not contain more than 99 commands (for HP-UX sed), ++ dnl but more than about 7000 bytes, to catch a limit in Solaris 8 /usr/ucb/sed. ++ ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ ++ for ac_i in 1 2 3 4 5 6 7; do ++ ac_script="$ac_script$as_nl$ac_script" ++ done ++ echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed ++ AS_UNSET([ac_script]) ++ if test -z "$SED"; then ++ ac_path_SED_found=false ++ _AS_PATH_WALK([], [ ++ for ac_prog in sed gsed; do ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" ++ AS_EXECUTABLE_P(["$ac_path_SED"]) || continue ++ case `"$ac_path_SED" --version 2>&1` in ++ *GNU*) ac_cv_path_SED=$ac_path_SED ac_path_SED_found=:;; ++ *) ++ ac_count=0 ++ _AS_ECHO_N([0123456789]) >conftest.in ++ while : ++ do ++ cat conftest.in conftest.in >conftest.tmp ++ mv conftest.tmp conftest.in ++ cp conftest.in conftest.nl ++ echo >> conftest.nl ++ "$ac_path_SED" -f conftest.sed conftest.out 2>/dev/null || break ++ diff conftest.out conftest.nl >/dev/null 2>&1 || break ++ ac_count=`expr $ac_count + 1` ++ if test $ac_count -gt ${ac_path_SED_max-0}; then ++ # Best so far, but keep looking for better ++ ac_cv_path_SED=$ac_path_SED ++ ac_path_SED_max=$ac_count ++ fi ++ test $ac_count -gt 10 && break ++ done ++ rm -f conftest.in conftest.tmp conftest.nl conftest.out;; ++ esac ++ $ac_path_SED_found && break 3 ++ done ++ done]) ++ if test -z "$ac_cv_path_SED"; then ++ AC_ERROR([no acceptable sed could be found in \$PATH]) ++ fi ++ else ++ ac_cv_path_SED=$SED ++ fi ++ ]) ++ SED="$ac_cv_path_SED" ++ AC_SUBST([SED])dnl ++ rm -f conftest.sed ++]) ++]) +diff -Naur libpipeline-1.5.0-orig/gnulib/m4/gnulib-comp.m4 libpipeline-1.5.0/gnulib/m4/gnulib-comp.m4 +--- libpipeline-1.5.0-orig/gnulib/m4/gnulib-comp.m4 2017-07-10 13:29:08.000000000 +0300 ++++ libpipeline-1.5.0/gnulib/m4/gnulib-comp.m4 2018-07-02 13:09:59.810436700 +0300 +@@ -1,5 +1,5 @@ + # DO NOT EDIT! GENERATED AUTOMATICALLY! +-# Copyright (C) 2002-2014 Free Software Foundation, Inc. ++# Copyright (C) 2002-2017 Free Software Foundation, Inc. + # + # This file is free software; you can redistribute it and/or modify + # it under the terms of the GNU General Public License as published by +@@ -37,7 +37,11 @@ + m4_pattern_allow([^gl_ES$])dnl a valid locale name + m4_pattern_allow([^gl_LIBOBJS$])dnl a variable + m4_pattern_allow([^gl_LTLIBOBJS$])dnl a variable ++ ++ # Pre-early section. ++ AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) + AC_REQUIRE([gl_PROG_AR_RANLIB]) ++ + AC_REQUIRE([AM_PROG_CC_C_O]) + # Code from module absolute-header: + # Code from module alloca-opt: +@@ -50,11 +54,12 @@ + # Code from module error: + # Code from module exitfail: + # Code from module extensions: +- AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) + # Code from module extern-inline: + # Code from module fcntl-h: ++ # Code from module filename: + # Code from module float: + # Code from module full-write: ++ # Code from module getprogname: + # Code from module gettext-h: + # Code from module gettimeofday: + # Code from module gitlog-to-changelog: +@@ -65,6 +70,8 @@ + # Code from module largefile: + AC_REQUIRE([AC_SYS_LARGEFILE]) + # Code from module lib-ignore: ++ # Code from module limits-h: ++ # Code from module localtime-buffer: + # Code from module lock: + # Code from module lstat: + # Code from module malloc-posix: +@@ -176,6 +183,7 @@ + if test $REPLACE_ITOLD = 1; then + AC_LIBOBJ([itold]) + fi ++ gl_FUNC_GETPROGNAME + AC_SUBST([LIBINTL]) + AC_SUBST([LTLIBINTL]) + gl_FUNC_GETTIMEOFDAY +@@ -186,6 +194,9 @@ + gl_SYS_TIME_MODULE_INDICATOR([gettimeofday]) + AC_REQUIRE([gl_LARGEFILE]) + gl_IGNORE_UNUSED_LIBRARIES ++ gl_LIMITS_H ++ AC_REQUIRE([gl_LOCALTIME_BUFFER_DEFAULTS]) ++ AC_LIBOBJ([localtime-buffer]) + gl_LOCK + gl_MODULE_INDICATOR([lock]) + gl_FUNC_LSTAT +@@ -212,14 +223,15 @@ + gl_PREREQ_MKDTEMP + fi + gl_STDLIB_MODULE_INDICATOR([mkdtemp]) +- gl_MSVC_INVAL ++ AC_REQUIRE([gl_MSVC_INVAL]) + if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then + AC_LIBOBJ([msvc-inval]) + fi +- gl_MSVC_NOTHROW ++ AC_REQUIRE([gl_MSVC_NOTHROW]) + if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then + AC_LIBOBJ([msvc-nothrow]) + fi ++ gl_MODULE_INDICATOR([msvc-nothrow]) + gl_MULTIARCH + gl_PATHMAX + gl_FUNC_RAISE +@@ -268,6 +280,7 @@ + gl_FUNC_STAT + if test $REPLACE_STAT = 1; then + AC_LIBOBJ([stat]) ++ AC_LIBOBJ([stat-w32]) + gl_PREREQ_STAT + fi + gl_SYS_STAT_MODULE_INDICATOR([stat]) +@@ -491,15 +504,14 @@ + build-aux/config.rpath + build-aux/gitlog-to-changelog + build-aux/gnupload +- build-aux/snippet/_Noreturn.h +- build-aux/snippet/arg-nonnull.h +- build-aux/snippet/c++defs.h +- build-aux/snippet/warn-on-use.h ++ lib/_Noreturn.h + lib/alloca.in.h ++ lib/arg-nonnull.h + lib/asnprintf.c + lib/asprintf.c + lib/basename-lgpl.c + lib/basename.c ++ lib/c++defs.h + lib/dirname-lgpl.c + lib/dirname.c + lib/dirname.h +@@ -510,11 +522,14 @@ + lib/exitfail.c + lib/exitfail.h + lib/fcntl.in.h ++ lib/filename.h + lib/float+.h + lib/float.c + lib/float.in.h + lib/full-write.c + lib/full-write.h ++ lib/getprogname.c ++ lib/getprogname.h + lib/gettext.h + lib/gettimeofday.c + lib/glthread/lock.c +@@ -524,6 +539,9 @@ + lib/glthread/tls.h + lib/intprops.h + lib/itold.c ++ lib/limits.in.h ++ lib/localtime-buffer.c ++ lib/localtime-buffer.h + lib/lstat.c + lib/malloc.c + lib/malloca.c +@@ -557,6 +575,8 @@ + lib/sigprocmask.c + lib/size_max.h + lib/snprintf.c ++ lib/stat-w32.c ++ lib/stat-w32.h + lib/stat.c + lib/stdarg.in.h + lib/stdbool.in.h +@@ -588,6 +608,7 @@ + lib/vasprintf.c + lib/verify.h + lib/waitpid.c ++ lib/warn-on-use.h + lib/wchar.in.h + lib/write.c + lib/xalloc-die.c +@@ -616,6 +637,7 @@ + m4/fcntl-o.m4 + m4/fcntl_h.m4 + m4/float_h.m4 ++ m4/getprogname.m4 + m4/gettimeofday.m4 + m4/gnulib-common.m4 + m4/include_next.m4 +@@ -626,6 +648,8 @@ + m4/lib-ld.m4 + m4/lib-link.m4 + m4/lib-prefix.m4 ++ m4/limits-h.m4 ++ m4/localtime-buffer.m4 + m4/lock.m4 + m4/longlong.m4 + m4/lstat.m4 +@@ -642,6 +666,7 @@ + m4/onceonly.m4 + m4/pathmax.m4 + m4/printf.m4 ++ m4/pthread_rwlock_rdlock.m4 + m4/raise.m4 + m4/read.m4 + m4/safe-read.m4 +diff -Naur libpipeline-1.5.0-orig/gnulib/m4/gnulib-tool.m4 libpipeline-1.5.0/gnulib/m4/gnulib-tool.m4 +--- libpipeline-1.5.0-orig/gnulib/m4/gnulib-tool.m4 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/m4/gnulib-tool.m4 2018-07-02 13:09:59.810436700 +0300 +@@ -1,5 +1,5 @@ + # gnulib-tool.m4 serial 2 +-dnl Copyright (C) 2004-2005, 2009-2014 Free Software Foundation, Inc. ++dnl Copyright (C) 2004-2005, 2009-2017 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, + dnl with or without modifications, as long as this notice is preserved. +diff -Naur libpipeline-1.5.0-orig/gnulib/m4/include_next.m4 libpipeline-1.5.0/gnulib/m4/include_next.m4 +--- libpipeline-1.5.0-orig/gnulib/m4/include_next.m4 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/m4/include_next.m4 2018-07-02 13:09:59.810436700 +0300 +@@ -1,12 +1,13 @@ +-# include_next.m4 serial 23 +-dnl Copyright (C) 2006-2014 Free Software Foundation, Inc. ++# include_next.m4 serial 24 ++dnl Copyright (C) 2006-2017 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, + dnl with or without modifications, as long as this notice is preserved. + + dnl From Paul Eggert and Derek Price. + +-dnl Sets INCLUDE_NEXT and PRAGMA_SYSTEM_HEADER. ++dnl Sets INCLUDE_NEXT, INCLUDE_NEXT_AS_FIRST_DIRECTIVE, PRAGMA_SYSTEM_HEADER, ++dnl and PRAGMA_COLUMNS. + dnl + dnl INCLUDE_NEXT expands to 'include_next' if the compiler supports it, or to + dnl 'include' otherwise. +diff -Naur libpipeline-1.5.0-orig/gnulib/m4/intmax_t.m4 libpipeline-1.5.0/gnulib/m4/intmax_t.m4 +--- libpipeline-1.5.0-orig/gnulib/m4/intmax_t.m4 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/m4/intmax_t.m4 2018-07-02 13:09:59.810436700 +0300 +@@ -1,5 +1,5 @@ + # intmax_t.m4 serial 8 +-dnl Copyright (C) 1997-2004, 2006-2007, 2009-2014 Free Software Foundation, ++dnl Copyright (C) 1997-2004, 2006-2007, 2009-2017 Free Software Foundation, + dnl Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, +diff -Naur libpipeline-1.5.0-orig/gnulib/m4/inttypes_h.m4 libpipeline-1.5.0/gnulib/m4/inttypes_h.m4 +--- libpipeline-1.5.0-orig/gnulib/m4/inttypes_h.m4 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/m4/inttypes_h.m4 2018-07-02 13:09:59.820436700 +0300 +@@ -1,5 +1,5 @@ + # inttypes_h.m4 serial 10 +-dnl Copyright (C) 1997-2004, 2006, 2008-2014 Free Software Foundation, Inc. ++dnl Copyright (C) 1997-2004, 2006, 2008-2017 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, + dnl with or without modifications, as long as this notice is preserved. +diff -Naur libpipeline-1.5.0-orig/gnulib/m4/largefile.m4 libpipeline-1.5.0/gnulib/m4/largefile.m4 +--- libpipeline-1.5.0-orig/gnulib/m4/largefile.m4 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/m4/largefile.m4 2018-07-02 13:09:59.820436700 +0300 +@@ -1,6 +1,6 @@ + # Enable large files on systems where this is not the default. + +-# Copyright 1992-1996, 1998-2014 Free Software Foundation, Inc. ++# Copyright 1992-1996, 1998-2017 Free Software Foundation, Inc. + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -126,9 +126,24 @@ + else + WINDOWS_64_BIT_OFF_T=0 + fi +- dnl But all native Windows platforms (including mingw64) have a 32-bit +- dnl st_size member in 'struct stat'. +- WINDOWS_64_BIT_ST_SIZE=1 ++ dnl Some mingw versions define, if _FILE_OFFSET_BITS=64, 'struct stat' ++ dnl to 'struct _stat32i64' or 'struct _stat64' (depending on ++ dnl _USE_32BIT_TIME_T), which has a 32-bit st_size member. ++ AC_CACHE_CHECK([for 64-bit st_size], [gl_cv_member_st_size_64], ++ [AC_COMPILE_IFELSE( ++ [AC_LANG_PROGRAM( ++ [[#include ++ struct stat buf; ++ int verify_st_size_size[sizeof (buf.st_size) >= 8 ? 1 : -1]; ++ ]], ++ [[]])], ++ [gl_cv_member_st_size_64=yes], [gl_cv_member_st_size_64=no]) ++ ]) ++ if test $gl_cv_member_st_size_64 = no; then ++ WINDOWS_64_BIT_ST_SIZE=1 ++ else ++ WINDOWS_64_BIT_ST_SIZE=0 ++ fi + ;; + *) + dnl Nothing to do on gnulib's side. +diff -Naur libpipeline-1.5.0-orig/gnulib/m4/lib-ignore.m4 libpipeline-1.5.0/gnulib/m4/lib-ignore.m4 +--- libpipeline-1.5.0-orig/gnulib/m4/lib-ignore.m4 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/m4/lib-ignore.m4 2018-07-02 13:09:59.820436700 +0300 +@@ -1,6 +1,6 @@ + # If possible, ignore libraries that are not depended on. + +-dnl Copyright (C) 2006, 2009-2014 Free Software Foundation, Inc. ++dnl Copyright (C) 2006, 2009-2017 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, + dnl with or without modifications, as long as this notice is preserved. +diff -Naur libpipeline-1.5.0-orig/gnulib/m4/lib-ld.m4 libpipeline-1.5.0/gnulib/m4/lib-ld.m4 +--- libpipeline-1.5.0-orig/gnulib/m4/lib-ld.m4 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/m4/lib-ld.m4 2018-07-02 13:09:59.820436700 +0300 +@@ -1,5 +1,5 @@ +-# lib-ld.m4 serial 6 +-dnl Copyright (C) 1996-2003, 2009-2014 Free Software Foundation, Inc. ++# lib-ld.m4 serial 7 ++dnl Copyright (C) 1996-2003, 2009-2017 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, + dnl with or without modifications, as long as this notice is preserved. +@@ -47,73 +47,101 @@ + } + fi + +-ac_prog=ld +-if test "$GCC" = yes; then +- # Check if gcc -print-prog-name=ld gives a path. ++if test -n "$LD"; then ++ AC_MSG_CHECKING([for ld]) ++elif test "$GCC" = yes; then + AC_MSG_CHECKING([for ld used by $CC]) +- case $host in +- *-*-mingw*) +- # gcc leaves a trailing carriage return which upsets mingw +- ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; +- *) +- ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; +- esac +- case $ac_prog in +- # Accept absolute paths. +- [[\\/]]* | ?:[[\\/]]*) +- re_direlt='/[[^/]][[^/]]*/\.\./' +- # Canonicalize the pathname of ld +- ac_prog=`echo "$ac_prog"| sed 's%\\\\%/%g'` +- while echo "$ac_prog" | grep "$re_direlt" > /dev/null 2>&1; do +- ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` +- done +- test -z "$LD" && LD="$ac_prog" +- ;; +- "") +- # If it fails, then pretend we aren't using GCC. +- ac_prog=ld +- ;; +- *) +- # If it is relative, then search for the first ld in PATH. +- with_gnu_ld=unknown +- ;; +- esac + elif test "$with_gnu_ld" = yes; then + AC_MSG_CHECKING([for GNU ld]) + else + AC_MSG_CHECKING([for non-GNU ld]) + fi +-AC_CACHE_VAL([acl_cv_path_LD], +-[if test -z "$LD"; then +- acl_save_ifs="$IFS"; IFS=$PATH_SEPARATOR +- for ac_dir in $PATH; do +- IFS="$acl_save_ifs" +- test -z "$ac_dir" && ac_dir=. +- if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then +- acl_cv_path_LD="$ac_dir/$ac_prog" +- # Check to see if the program is GNU ld. I'd rather use --version, +- # but apparently some variants of GNU ld only accept -v. +- # Break only if it was the GNU/non-GNU ld that we prefer. +- case `"$acl_cv_path_LD" -v 2>&1 &5 | tr -d '\015'` ;; ++ *) ++ acl_output=`($CC -print-prog-name=ld) 2>&5` ;; ++ esac ++ case $acl_output in ++ # Accept absolute paths. ++ [[\\/]]* | ?:[[\\/]]*) ++ re_direlt='/[[^/]][[^/]]*/\.\./' ++ # Canonicalize the pathname of ld ++ acl_output=`echo "$acl_output" | sed 's%\\\\%/%g'` ++ while echo "$acl_output" | grep "$re_direlt" > /dev/null 2>&1; do ++ acl_output=`echo $acl_output | sed "s%$re_direlt%/%"` ++ done ++ # Got the pathname. No search in PATH is needed. ++ acl_cv_path_LD="$acl_output" ++ ac_prog= ++ ;; ++ "") ++ # If it fails, then pretend we aren't using GCC. ++ ;; ++ *) ++ # If it is relative, then search for the first ld in PATH. ++ with_gnu_ld=unknown ++ ;; + esac + fi +- done +- IFS="$acl_save_ifs" +-else +- acl_cv_path_LD="$LD" # Let the user override the test with a path. +-fi]) +-LD="$acl_cv_path_LD" ++ if test -n "$ac_prog"; then ++ # Search for $ac_prog in $PATH. ++ acl_save_ifs="$IFS"; IFS=$PATH_SEPARATOR ++ for ac_dir in $PATH; do ++ IFS="$acl_save_ifs" ++ test -z "$ac_dir" && ac_dir=. ++ if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then ++ acl_cv_path_LD="$ac_dir/$ac_prog" ++ # Check to see if the program is GNU ld. I'd rather use --version, ++ # but apparently some variants of GNU ld only accept -v. ++ # Break only if it was the GNU/non-GNU ld that we prefer. ++ case `"$acl_cv_path_LD" -v 2>&1 Solaris 64-bit Developer's Guide > The Development Environment +- dnl . +- dnl "Portable Makefiles should refer to any library directories using the 64 symbolic link." +- dnl But we want to recognize the sparcv9 or amd64 subdirectory also if the +- dnl symlink is missing, so we set acl_libdirstem2 too. +- AC_CACHE_CHECK([for 64-bit host], [gl_cv_solaris_64bit], +- [AC_EGREP_CPP([sixtyfour bits], [ ++ dnl Allow the user to override the result by setting acl_cv_libdirstems. ++ AC_CACHE_CHECK([for the common suffixes of directories in the library search path], ++ [acl_cv_libdirstems], ++ [acl_libdirstem=lib ++ acl_libdirstem2= ++ case "$host_os" in ++ solaris*) ++ dnl See Solaris 10 Software Developer Collection > Solaris 64-bit Developer's Guide > The Development Environment ++ dnl . ++ dnl "Portable Makefiles should refer to any library directories using the 64 symbolic link." ++ dnl But we want to recognize the sparcv9 or amd64 subdirectory also if the ++ dnl symlink is missing, so we set acl_libdirstem2 too. ++ AC_CACHE_CHECK([for 64-bit host], [gl_cv_solaris_64bit], ++ [AC_EGREP_CPP([sixtyfour bits], [ + #ifdef _LP64 + sixtyfour bits + #endif +- ], [gl_cv_solaris_64bit=yes], [gl_cv_solaris_64bit=no]) +- ]) +- if test $gl_cv_solaris_64bit = yes; then +- acl_libdirstem=lib/64 +- case "$host_cpu" in +- sparc*) acl_libdirstem2=lib/sparcv9 ;; +- i*86 | x86_64) acl_libdirstem2=lib/amd64 ;; +- esac +- fi +- ;; +- *) +- searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'` +- if test -n "$searchpath"; then +- acl_save_IFS="${IFS= }"; IFS=":" +- for searchdir in $searchpath; do +- if test -d "$searchdir"; then +- case "$searchdir" in +- */lib64/ | */lib64 ) acl_libdirstem=lib64 ;; +- */../ | */.. ) +- # Better ignore directories of this form. They are misleading. +- ;; +- *) searchdir=`cd "$searchdir" && pwd` +- case "$searchdir" in +- */lib64 ) acl_libdirstem=lib64 ;; +- esac ;; +- esac +- fi +- done +- IFS="$acl_save_IFS" +- fi +- ;; +- esac +- test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem" ++ ], [gl_cv_solaris_64bit=yes], [gl_cv_solaris_64bit=no]) ++ ]) ++ if test $gl_cv_solaris_64bit = yes; then ++ acl_libdirstem=lib/64 ++ case "$host_cpu" in ++ sparc*) acl_libdirstem2=lib/sparcv9 ;; ++ i*86 | x86_64) acl_libdirstem2=lib/amd64 ;; ++ esac ++ fi ++ ;; ++ *) ++ dnl The result is a property of the system. However, non-system ++ dnl compilers sometimes have odd library search paths. Therefore ++ dnl prefer asking /usr/bin/gcc, if available, rather than $CC. ++ searchpath=`(if test -f /usr/bin/gcc \ ++ && LC_ALL=C /usr/bin/gcc -print-search-dirs >/dev/null 2>/dev/null; then \ ++ LC_ALL=C /usr/bin/gcc -print-search-dirs; \ ++ else \ ++ LC_ALL=C $CC -print-search-dirs; \ ++ fi) 2>/dev/null \ ++ | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'` ++ if test -n "$searchpath"; then ++ acl_save_IFS="${IFS= }"; IFS=":" ++ for searchdir in $searchpath; do ++ if test -d "$searchdir"; then ++ case "$searchdir" in ++ */lib64/ | */lib64 ) acl_libdirstem=lib64 ;; ++ */../ | */.. ) ++ # Better ignore directories of this form. They are misleading. ++ ;; ++ *) searchdir=`cd "$searchdir" && pwd` ++ case "$searchdir" in ++ */lib64 ) acl_libdirstem=lib64 ;; ++ esac ;; ++ esac ++ fi ++ done ++ IFS="$acl_save_IFS" ++ fi ++ ;; ++ esac ++ test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem" ++ acl_cv_libdirstems="$acl_libdirstem,$acl_libdirstem2" ++ ]) ++ # Decompose acl_cv_libdirstems into acl_libdirstem and acl_libdirstem2. ++ acl_libdirstem=`echo "$acl_cv_libdirstems" | sed -e 's/,.*//'` ++ acl_libdirstem2=`echo "$acl_cv_libdirstems" | sed -e '/,/s/.*,//'` + ]) +diff -Naur libpipeline-1.5.0-orig/gnulib/m4/limits-h.m4 libpipeline-1.5.0/gnulib/m4/limits-h.m4 +--- libpipeline-1.5.0-orig/gnulib/m4/limits-h.m4 1970-01-01 03:00:00.000000000 +0300 ++++ libpipeline-1.5.0/gnulib/m4/limits-h.m4 2018-07-02 13:10:01.300438800 +0300 +@@ -0,0 +1,31 @@ ++dnl Check whether limits.h has needed features. ++ ++dnl Copyright 2016-2017 Free Software Foundation, Inc. ++dnl This file is free software; the Free Software Foundation ++dnl gives unlimited permission to copy and/or distribute it, ++dnl with or without modifications, as long as this notice is preserved. ++ ++dnl From Paul Eggert. ++ ++AC_DEFUN_ONCE([gl_LIMITS_H], ++[ ++ gl_CHECK_NEXT_HEADERS([limits.h]) ++ ++ AC_CACHE_CHECK([whether limits.h has ULLONG_WIDTH etc.], ++ [gl_cv_header_limits_width], ++ [AC_COMPILE_IFELSE( ++ [AC_LANG_PROGRAM([[#ifndef __STDC_WANT_IEC_60559_BFP_EXT__ ++ #define __STDC_WANT_IEC_60559_BFP_EXT__ 1 ++ #endif ++ #include ++ int ullw = ULLONG_WIDTH;]])], ++ [gl_cv_header_limits_width=yes], ++ [gl_cv_header_limits_width=no])]) ++ if test "$gl_cv_header_limits_width" = yes; then ++ LIMITS_H= ++ else ++ LIMITS_H=limits.h ++ fi ++ AC_SUBST([LIMITS_H]) ++ AM_CONDITIONAL([GL_GENERATE_LIMITS_H], [test -n "$LIMITS_H"]) ++]) +diff -Naur libpipeline-1.5.0-orig/gnulib/m4/localtime-buffer.m4 libpipeline-1.5.0/gnulib/m4/localtime-buffer.m4 +--- libpipeline-1.5.0-orig/gnulib/m4/localtime-buffer.m4 1970-01-01 03:00:00.000000000 +0300 ++++ libpipeline-1.5.0/gnulib/m4/localtime-buffer.m4 2018-07-02 13:10:01.310438800 +0300 +@@ -0,0 +1,21 @@ ++# localtime-buffer.m4 serial 1 ++dnl Copyright (C) 2017 Free Software Foundation, Inc. ++dnl This file is free software; the Free Software Foundation ++dnl gives unlimited permission to copy and/or distribute it, ++dnl with or without modifications, as long as this notice is preserved. ++ ++AC_DEFUN([gl_LOCALTIME_BUFFER_DEFAULTS], ++[ ++ NEED_LOCALTIME_BUFFER=0 ++]) ++ ++dnl Macro invoked from other modules, to signal that the compilation of ++dnl module 'localtime-buffer' is needed. ++AC_DEFUN([gl_LOCALTIME_BUFFER_NEEDED], ++[ ++ AC_REQUIRE([gl_LOCALTIME_BUFFER_DEFAULTS]) ++ AC_REQUIRE([gl_HEADER_TIME_H_DEFAULTS]) ++ NEED_LOCALTIME_BUFFER=1 ++ REPLACE_GMTIME=1 ++ REPLACE_LOCALTIME=1 ++]) +diff -Naur libpipeline-1.5.0-orig/gnulib/m4/lock.m4 libpipeline-1.5.0/gnulib/m4/lock.m4 +--- libpipeline-1.5.0-orig/gnulib/m4/lock.m4 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/m4/lock.m4 2018-07-02 13:10:01.310438800 +0300 +@@ -1,5 +1,5 @@ +-# lock.m4 serial 13 (gettext-0.18.2) +-dnl Copyright (C) 2005-2014 Free Software Foundation, Inc. ++# lock.m4 serial 14 ++dnl Copyright (C) 2005-2017 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, + dnl with or without modifications, as long as this notice is preserved. +@@ -12,11 +12,16 @@ + if test "$gl_threads_api" = posix; then + # OSF/1 4.0 and Mac OS X 10.1 lack the pthread_rwlock_t type and the + # pthread_rwlock_* functions. ++ has_rwlock=false + AC_CHECK_TYPE([pthread_rwlock_t], +- [AC_DEFINE([HAVE_PTHREAD_RWLOCK], [1], ++ [has_rwlock=true ++ AC_DEFINE([HAVE_PTHREAD_RWLOCK], [1], + [Define if the POSIX multithreading library has read/write locks.])], + [], + [#include ]) ++ if $has_rwlock; then ++ gl_PTHREAD_RWLOCK_RDLOCK_PREFER_WRITER ++ fi + # glibc defines PTHREAD_MUTEX_RECURSIVE as enum, not as a macro. + AC_COMPILE_IFELSE([ + AC_LANG_PROGRAM( +diff -Naur libpipeline-1.5.0-orig/gnulib/m4/longlong.m4 libpipeline-1.5.0/gnulib/m4/longlong.m4 +--- libpipeline-1.5.0-orig/gnulib/m4/longlong.m4 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/m4/longlong.m4 2018-07-02 13:10:01.310438800 +0300 +@@ -1,5 +1,5 @@ + # longlong.m4 serial 17 +-dnl Copyright (C) 1999-2007, 2009-2014 Free Software Foundation, Inc. ++dnl Copyright (C) 1999-2007, 2009-2017 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, + dnl with or without modifications, as long as this notice is preserved. +diff -Naur libpipeline-1.5.0-orig/gnulib/m4/lstat.m4 libpipeline-1.5.0/gnulib/m4/lstat.m4 +--- libpipeline-1.5.0-orig/gnulib/m4/lstat.m4 2014-11-08 16:53:38.000000000 +0300 ++++ libpipeline-1.5.0/gnulib/m4/lstat.m4 2018-07-02 13:10:01.310438800 +0300 +@@ -1,6 +1,6 @@ +-# serial 26 ++# serial 27 + +-# Copyright (C) 1997-2001, 2003-2014 Free Software Foundation, Inc. ++# Copyright (C) 1997-2001, 2003-2017 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, +@@ -37,30 +37,28 @@ + [gl_cv_func_lstat_dereferences_slashed_symlink], + [rm -f conftest.sym conftest.file + echo >conftest.file +- if test "$as_ln_s" = "ln -s" && ln -s conftest.file conftest.sym; then +- AC_RUN_IFELSE( +- [AC_LANG_PROGRAM( +- [AC_INCLUDES_DEFAULT], +- [[struct stat sbuf; +- /* Linux will dereference the symlink and fail, as required by +- POSIX. That is better in the sense that it means we will not +- have to compile and use the lstat wrapper. */ +- return lstat ("conftest.sym/", &sbuf) == 0; +- ]])], +- [gl_cv_func_lstat_dereferences_slashed_symlink=yes], +- [gl_cv_func_lstat_dereferences_slashed_symlink=no], +- [case "$host_os" in +- # Guess yes on glibc systems. +- *-gnu*) gl_cv_func_lstat_dereferences_slashed_symlink="guessing yes" ;; +- # If we don't know, assume the worst. +- *) gl_cv_func_lstat_dereferences_slashed_symlink="guessing no" ;; +- esac +- ]) +- else +- # If the 'ln -s' command failed, then we probably don't even +- # have an lstat function. +- gl_cv_func_lstat_dereferences_slashed_symlink="guessing no" +- fi ++ AC_RUN_IFELSE( ++ [AC_LANG_PROGRAM( ++ [AC_INCLUDES_DEFAULT], ++ [[struct stat sbuf; ++ if (symlink ("conftest.file", "conftest.sym") != 0) ++ return 1; ++ /* Linux will dereference the symlink and fail, as required by ++ POSIX. That is better in the sense that it means we will not ++ have to compile and use the lstat wrapper. */ ++ return lstat ("conftest.sym/", &sbuf) == 0; ++ ]])], ++ [gl_cv_func_lstat_dereferences_slashed_symlink=yes], ++ [gl_cv_func_lstat_dereferences_slashed_symlink=no], ++ [case "$host_os" in ++ *-gnu*) ++ # Guess yes on glibc systems. ++ gl_cv_func_lstat_dereferences_slashed_symlink="guessing yes" ;; ++ *) ++ # If we don't know, assume the worst. ++ gl_cv_func_lstat_dereferences_slashed_symlink="guessing no" ;; ++ esac ++ ]) + rm -f conftest.sym conftest.file + ]) + case "$gl_cv_func_lstat_dereferences_slashed_symlink" in +diff -Naur libpipeline-1.5.0-orig/gnulib/m4/malloc.m4 libpipeline-1.5.0/gnulib/m4/malloc.m4 +--- libpipeline-1.5.0-orig/gnulib/m4/malloc.m4 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/m4/malloc.m4 2018-07-02 13:10:06.739643300 +0300 +@@ -1,13 +1,13 @@ +-# malloc.m4 serial 14 +-dnl Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc. ++# malloc.m4 serial 15 ++dnl Copyright (C) 2007, 2009-2017 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, + dnl with or without modifications, as long as this notice is preserved. + + m4_version_prereq([2.70], [] ,[ + +-# This is taken from the following Autoconf patch: +-# http://git.savannah.gnu.org/gitweb/?p=autoconf.git;a=commitdiff;h=7fbb553727ed7e0e689a17594b58559ecf3ea6e9 ++# This is adapted with modifications from upstream Autoconf here: ++# http://git.savannah.gnu.org/cgit/autoconf.git/commit/?id=04be2b7a29d65d9a08e64e8e56e594c91749598c + AC_DEFUN([_AC_FUNC_MALLOC_IF], + [ + AC_REQUIRE([AC_HEADER_STDC])dnl +@@ -23,7 +23,10 @@ + char *malloc (); + #endif + ]], +- [[return ! malloc (0);]]) ++ [[char *p = malloc (0); ++ int result = !p; ++ free (p); ++ return result;]]) + ], + [ac_cv_func_malloc_0_nonnull=yes], + [ac_cv_func_malloc_0_nonnull=no], +diff -Naur libpipeline-1.5.0-orig/gnulib/m4/malloca.m4 libpipeline-1.5.0/gnulib/m4/malloca.m4 +--- libpipeline-1.5.0-orig/gnulib/m4/malloca.m4 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/m4/malloca.m4 2018-07-02 13:10:06.741643400 +0300 +@@ -1,5 +1,5 @@ + # malloca.m4 serial 1 +-dnl Copyright (C) 2003-2004, 2006-2007, 2009-2014 Free Software Foundation, ++dnl Copyright (C) 2003-2004, 2006-2007, 2009-2017 Free Software Foundation, + dnl Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, +diff -Naur libpipeline-1.5.0-orig/gnulib/m4/math_h.m4 libpipeline-1.5.0/gnulib/m4/math_h.m4 +--- libpipeline-1.5.0-orig/gnulib/m4/math_h.m4 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/m4/math_h.m4 2018-07-02 13:10:06.744643600 +0300 +@@ -1,5 +1,5 @@ +-# math_h.m4 serial 114 +-dnl Copyright (C) 2007-2014 Free Software Foundation, Inc. ++# math_h.m4 serial 115 ++dnl Copyright (C) 2007-2017 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, + dnl with or without modifications, as long as this notice is preserved. +@@ -256,11 +256,18 @@ + HAVE_DECL_TRUNC=1; AC_SUBST([HAVE_DECL_TRUNC]) + HAVE_DECL_TRUNCF=1; AC_SUBST([HAVE_DECL_TRUNCF]) + HAVE_DECL_TRUNCL=1; AC_SUBST([HAVE_DECL_TRUNCL]) ++ REPLACE_ACOSF=0; AC_SUBST([REPLACE_ACOSF]) ++ REPLACE_ASINF=0; AC_SUBST([REPLACE_ASINF]) ++ REPLACE_ATANF=0; AC_SUBST([REPLACE_ATANF]) ++ REPLACE_ATAN2F=0; AC_SUBST([REPLACE_ATAN2F]) + REPLACE_CBRTF=0; AC_SUBST([REPLACE_CBRTF]) + REPLACE_CBRTL=0; AC_SUBST([REPLACE_CBRTL]) + REPLACE_CEIL=0; AC_SUBST([REPLACE_CEIL]) + REPLACE_CEILF=0; AC_SUBST([REPLACE_CEILF]) + REPLACE_CEILL=0; AC_SUBST([REPLACE_CEILL]) ++ REPLACE_COSF=0; AC_SUBST([REPLACE_COSF]) ++ REPLACE_COSHF=0; AC_SUBST([REPLACE_COSHF]) ++ REPLACE_EXPF=0; AC_SUBST([REPLACE_EXPF]) + REPLACE_EXPM1=0; AC_SUBST([REPLACE_EXPM1]) + REPLACE_EXPM1F=0; AC_SUBST([REPLACE_EXPM1F]) + REPLACE_EXP2=0; AC_SUBST([REPLACE_EXP2]) +@@ -315,7 +322,12 @@ + REPLACE_ROUNDL=0; AC_SUBST([REPLACE_ROUNDL]) + REPLACE_SIGNBIT=0; AC_SUBST([REPLACE_SIGNBIT]) + REPLACE_SIGNBIT_USING_GCC=0; AC_SUBST([REPLACE_SIGNBIT_USING_GCC]) ++ REPLACE_SINF=0; AC_SUBST([REPLACE_SINF]) ++ REPLACE_SINHF=0; AC_SUBST([REPLACE_SINHF]) ++ REPLACE_SQRTF=0; AC_SUBST([REPLACE_SQRTF]) + REPLACE_SQRTL=0; AC_SUBST([REPLACE_SQRTL]) ++ REPLACE_TANF=0; AC_SUBST([REPLACE_TANF]) ++ REPLACE_TANHF=0; AC_SUBST([REPLACE_TANHF]) + REPLACE_TRUNC=0; AC_SUBST([REPLACE_TRUNC]) + REPLACE_TRUNCF=0; AC_SUBST([REPLACE_TRUNCF]) + REPLACE_TRUNCL=0; AC_SUBST([REPLACE_TRUNCL]) +diff -Naur libpipeline-1.5.0-orig/gnulib/m4/memchr.m4 libpipeline-1.5.0/gnulib/m4/memchr.m4 +--- libpipeline-1.5.0-orig/gnulib/m4/memchr.m4 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/m4/memchr.m4 2018-07-02 13:10:06.747643800 +0300 +@@ -1,5 +1,5 @@ + # memchr.m4 serial 12 +-dnl Copyright (C) 2002-2004, 2009-2014 Free Software Foundation, Inc. ++dnl Copyright (C) 2002-2004, 2009-2017 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, + dnl with or without modifications, as long as this notice is preserved. +diff -Naur libpipeline-1.5.0-orig/gnulib/m4/mkdtemp.m4 libpipeline-1.5.0/gnulib/m4/mkdtemp.m4 +--- libpipeline-1.5.0-orig/gnulib/m4/mkdtemp.m4 2014-11-08 16:53:38.000000000 +0300 ++++ libpipeline-1.5.0/gnulib/m4/mkdtemp.m4 2018-07-02 13:10:06.750643900 +0300 +@@ -1,5 +1,5 @@ + # mkdtemp.m4 serial 8 +-dnl Copyright (C) 2001-2003, 2006-2007, 2009-2014 Free Software Foundation, ++dnl Copyright (C) 2001-2003, 2006-2007, 2009-2017 Free Software Foundation, + dnl Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, +diff -Naur libpipeline-1.5.0-orig/gnulib/m4/mmap-anon.m4 libpipeline-1.5.0/gnulib/m4/mmap-anon.m4 +--- libpipeline-1.5.0-orig/gnulib/m4/mmap-anon.m4 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/m4/mmap-anon.m4 2018-07-02 13:10:06.753644100 +0300 +@@ -1,5 +1,5 @@ + # mmap-anon.m4 serial 10 +-dnl Copyright (C) 2005, 2007, 2009-2014 Free Software Foundation, Inc. ++dnl Copyright (C) 2005, 2007, 2009-2017 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, + dnl with or without modifications, as long as this notice is preserved. +diff -Naur libpipeline-1.5.0-orig/gnulib/m4/msvc-inval.m4 libpipeline-1.5.0/gnulib/m4/msvc-inval.m4 +--- libpipeline-1.5.0-orig/gnulib/m4/msvc-inval.m4 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/m4/msvc-inval.m4 2018-07-02 13:10:06.755644200 +0300 +@@ -1,5 +1,5 @@ + # msvc-inval.m4 serial 1 +-dnl Copyright (C) 2011-2014 Free Software Foundation, Inc. ++dnl Copyright (C) 2011-2017 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, + dnl with or without modifications, as long as this notice is preserved. +diff -Naur libpipeline-1.5.0-orig/gnulib/m4/msvc-nothrow.m4 libpipeline-1.5.0/gnulib/m4/msvc-nothrow.m4 +--- libpipeline-1.5.0-orig/gnulib/m4/msvc-nothrow.m4 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/m4/msvc-nothrow.m4 2018-07-02 13:10:06.757644300 +0300 +@@ -1,5 +1,5 @@ + # msvc-nothrow.m4 serial 1 +-dnl Copyright (C) 2011-2014 Free Software Foundation, Inc. ++dnl Copyright (C) 2011-2017 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, + dnl with or without modifications, as long as this notice is preserved. +diff -Naur libpipeline-1.5.0-orig/gnulib/m4/multiarch.m4 libpipeline-1.5.0/gnulib/m4/multiarch.m4 +--- libpipeline-1.5.0-orig/gnulib/m4/multiarch.m4 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/m4/multiarch.m4 2018-07-02 13:10:06.760644500 +0300 +@@ -1,5 +1,5 @@ + # multiarch.m4 serial 7 +-dnl Copyright (C) 2008-2014 Free Software Foundation, Inc. ++dnl Copyright (C) 2008-2017 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, + dnl with or without modifications, as long as this notice is preserved. +diff -Naur libpipeline-1.5.0-orig/gnulib/m4/off_t.m4 libpipeline-1.5.0/gnulib/m4/off_t.m4 +--- libpipeline-1.5.0-orig/gnulib/m4/off_t.m4 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/m4/off_t.m4 2018-07-02 13:10:06.762644600 +0300 +@@ -1,5 +1,5 @@ + # off_t.m4 serial 1 +-dnl Copyright (C) 2012-2014 Free Software Foundation, Inc. ++dnl Copyright (C) 2012-2017 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, + dnl with or without modifications, as long as this notice is preserved. +diff -Naur libpipeline-1.5.0-orig/gnulib/m4/onceonly.m4 libpipeline-1.5.0/gnulib/m4/onceonly.m4 +--- libpipeline-1.5.0-orig/gnulib/m4/onceonly.m4 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/m4/onceonly.m4 2018-07-02 13:10:06.764644700 +0300 +@@ -1,5 +1,5 @@ + # onceonly.m4 serial 9 +-dnl Copyright (C) 2002-2003, 2005-2006, 2008-2014 Free Software Foundation, ++dnl Copyright (C) 2002-2003, 2005-2006, 2008-2017 Free Software Foundation, + dnl Inc. + dnl + dnl This file is free software; you can redistribute it and/or modify +diff -Naur libpipeline-1.5.0-orig/gnulib/m4/pathmax.m4 libpipeline-1.5.0/gnulib/m4/pathmax.m4 +--- libpipeline-1.5.0-orig/gnulib/m4/pathmax.m4 2014-11-08 16:53:38.000000000 +0300 ++++ libpipeline-1.5.0/gnulib/m4/pathmax.m4 2018-07-02 13:10:06.767644900 +0300 +@@ -1,5 +1,5 @@ + # pathmax.m4 serial 10 +-dnl Copyright (C) 2002-2003, 2005-2006, 2009-2014 Free Software Foundation, ++dnl Copyright (C) 2002-2003, 2005-2006, 2009-2017 Free Software Foundation, + dnl Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, +diff -Naur libpipeline-1.5.0-orig/gnulib/m4/printf.m4 libpipeline-1.5.0/gnulib/m4/printf.m4 +--- libpipeline-1.5.0-orig/gnulib/m4/printf.m4 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/m4/printf.m4 2018-07-02 13:10:06.771645100 +0300 +@@ -1,5 +1,5 @@ +-# printf.m4 serial 50 +-dnl Copyright (C) 2003, 2007-2014 Free Software Foundation, Inc. ++# printf.m4 serial 53 ++dnl Copyright (C) 2003, 2007-2017 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, + dnl with or without modifications, as long as this notice is preserved. +@@ -38,6 +38,8 @@ + if (sprintf (buf, "%ju %d", (uintmax_t) 12345671, 33, 44, 55) < 0 + || strcmp (buf, "12345671 33") != 0) + result |= 1; ++#else ++ result |= 1; + #endif + buf[0] = '\0'; + if (sprintf (buf, "%zu %d", (size_t) 12345672, 33, 44, 55) < 0 +@@ -61,7 +63,7 @@ + # Guess yes on glibc systems. + *-gnu*) gl_cv_func_printf_sizes_c99="guessing yes";; + # Guess yes on FreeBSD >= 5. +- freebsd[1-4]*) gl_cv_func_printf_sizes_c99="guessing no";; ++ freebsd[1-4].*) gl_cv_func_printf_sizes_c99="guessing no";; + freebsd* | kfreebsd*) gl_cv_func_printf_sizes_c99="guessing yes";; + # Guess yes on Mac OS X >= 10.3. + darwin[1-6].*) gl_cv_func_printf_sizes_c99="guessing no";; +@@ -220,7 +222,7 @@ + # Guess yes on glibc systems. + *-gnu*) gl_cv_func_printf_infinite="guessing yes";; + # Guess yes on FreeBSD >= 6. +- freebsd[1-5]*) gl_cv_func_printf_infinite="guessing no";; ++ freebsd[1-5].*) gl_cv_func_printf_infinite="guessing no";; + freebsd* | kfreebsd*) gl_cv_func_printf_infinite="guessing yes";; + # Guess yes on Mac OS X >= 10.3. + darwin[1-6].*) gl_cv_func_printf_infinite="guessing no";; +@@ -328,7 +330,7 @@ + # ifdef WORDS_BIGENDIAN + # define LDBL80_WORDS(exponent,manthi,mantlo) \ + { ((unsigned int) (exponent) << 16) | ((unsigned int) (manthi) >> 16), \ +- ((unsigned int) (manthi) << 16) | (unsigned int) (mantlo) >> 16), \ ++ ((unsigned int) (manthi) << 16) | ((unsigned int) (mantlo) >> 16), \ + (unsigned int) (mantlo) << 16 \ + } + # else +@@ -365,66 +367,51 @@ + { /* Pseudo-NaN. */ + static union { unsigned int word[4]; long double value; } x = + { LDBL80_WORDS (0xFFFF, 0x40000001, 0x00000000) }; +- if (sprintf (buf, "%Lf", x.value) < 0 +- || !strisnan (buf, 0, strlen (buf))) ++ if (sprintf (buf, "%Lf", x.value) <= 0) + result |= 4; +- if (sprintf (buf, "%Le", x.value) < 0 +- || !strisnan (buf, 0, strlen (buf))) ++ if (sprintf (buf, "%Le", x.value) <= 0) + result |= 4; +- if (sprintf (buf, "%Lg", x.value) < 0 +- || !strisnan (buf, 0, strlen (buf))) ++ if (sprintf (buf, "%Lg", x.value) <= 0) + result |= 4; + } + { /* Pseudo-Infinity. */ + static union { unsigned int word[4]; long double value; } x = + { LDBL80_WORDS (0xFFFF, 0x00000000, 0x00000000) }; +- if (sprintf (buf, "%Lf", x.value) < 0 +- || !strisnan (buf, 0, strlen (buf))) ++ if (sprintf (buf, "%Lf", x.value) <= 0) + result |= 8; +- if (sprintf (buf, "%Le", x.value) < 0 +- || !strisnan (buf, 0, strlen (buf))) ++ if (sprintf (buf, "%Le", x.value) <= 0) + result |= 8; +- if (sprintf (buf, "%Lg", x.value) < 0 +- || !strisnan (buf, 0, strlen (buf))) ++ if (sprintf (buf, "%Lg", x.value) <= 0) + result |= 8; + } + { /* Pseudo-Zero. */ + static union { unsigned int word[4]; long double value; } x = + { LDBL80_WORDS (0x4004, 0x00000000, 0x00000000) }; +- if (sprintf (buf, "%Lf", x.value) < 0 +- || !strisnan (buf, 0, strlen (buf))) ++ if (sprintf (buf, "%Lf", x.value) <= 0) + result |= 16; +- if (sprintf (buf, "%Le", x.value) < 0 +- || !strisnan (buf, 0, strlen (buf))) ++ if (sprintf (buf, "%Le", x.value) <= 0) + result |= 16; +- if (sprintf (buf, "%Lg", x.value) < 0 +- || !strisnan (buf, 0, strlen (buf))) ++ if (sprintf (buf, "%Lg", x.value) <= 0) + result |= 16; + } + { /* Unnormalized number. */ + static union { unsigned int word[4]; long double value; } x = + { LDBL80_WORDS (0x4000, 0x63333333, 0x00000000) }; +- if (sprintf (buf, "%Lf", x.value) < 0 +- || !strisnan (buf, 0, strlen (buf))) ++ if (sprintf (buf, "%Lf", x.value) <= 0) + result |= 32; +- if (sprintf (buf, "%Le", x.value) < 0 +- || !strisnan (buf, 0, strlen (buf))) ++ if (sprintf (buf, "%Le", x.value) <= 0) + result |= 32; +- if (sprintf (buf, "%Lg", x.value) < 0 +- || !strisnan (buf, 0, strlen (buf))) ++ if (sprintf (buf, "%Lg", x.value) <= 0) + result |= 32; + } + { /* Pseudo-Denormal. */ + static union { unsigned int word[4]; long double value; } x = + { LDBL80_WORDS (0x0000, 0x83333333, 0x00000000) }; +- if (sprintf (buf, "%Lf", x.value) < 0 +- || !strisnan (buf, 0, strlen (buf))) ++ if (sprintf (buf, "%Lf", x.value) <= 0) + result |= 64; +- if (sprintf (buf, "%Le", x.value) < 0 +- || !strisnan (buf, 0, strlen (buf))) ++ if (sprintf (buf, "%Le", x.value) <= 0) + result |= 64; +- if (sprintf (buf, "%Lg", x.value) < 0 +- || !strisnan (buf, 0, strlen (buf))) ++ if (sprintf (buf, "%Lg", x.value) <= 0) + result |= 64; + } + #endif +@@ -442,7 +429,7 @@ + # Guess yes on glibc systems. + *-gnu*) gl_cv_func_printf_infinite_long_double="guessing yes";; + # Guess yes on FreeBSD >= 6. +- freebsd[1-5]*) gl_cv_func_printf_infinite_long_double="guessing no";; ++ freebsd[1-5].*) gl_cv_func_printf_infinite_long_double="guessing no";; + freebsd* | kfreebsd*) gl_cv_func_printf_infinite_long_double="guessing yes";; + # Guess yes on HP-UX >= 11. + hpux[7-9]* | hpux10*) gl_cv_func_printf_infinite_long_double="guessing no";; +@@ -502,6 +489,13 @@ + && strcmp (buf, "0x6.0ap-2 33") != 0 + && strcmp (buf, "0xc.14p-3 33") != 0)) + result |= 4; ++ /* This catches a Mac OS X 10.12.4 (Darwin 16.5) bug: it doesn't round. */ ++ if (sprintf (buf, "%.0a %d", 1.51, 33, 44, 55) < 0 ++ || (strcmp (buf, "0x2p+0 33") != 0 ++ && strcmp (buf, "0x3p-1 33") != 0 ++ && strcmp (buf, "0x6p-2 33") != 0 ++ && strcmp (buf, "0xcp-3 33") != 0)) ++ result |= 4; + /* This catches a FreeBSD 6.1 bug. See + */ + if (sprintf (buf, "%010a %d", 1.0 / zero, 33, 44, 55) < 0 +@@ -588,7 +582,7 @@ + # Guess yes on glibc systems. + *-gnu*) gl_cv_func_printf_directive_f="guessing yes";; + # Guess yes on FreeBSD >= 6. +- freebsd[1-5]*) gl_cv_func_printf_directive_f="guessing no";; ++ freebsd[1-5].*) gl_cv_func_printf_directive_f="guessing no";; + freebsd* | kfreebsd*) gl_cv_func_printf_directive_f="guessing yes";; + # Guess yes on Mac OS X >= 10.3. + darwin[1-6].*) gl_cv_func_printf_directive_f="guessing no";; +@@ -1136,7 +1130,7 @@ + # Guess yes on glibc systems. + *-gnu*) gl_cv_func_snprintf_truncation_c99="guessing yes";; + # Guess yes on FreeBSD >= 5. +- freebsd[1-4]*) gl_cv_func_snprintf_truncation_c99="guessing no";; ++ freebsd[1-4].*) gl_cv_func_snprintf_truncation_c99="guessing no";; + freebsd* | kfreebsd*) gl_cv_func_snprintf_truncation_c99="guessing yes";; + # Guess yes on Mac OS X >= 10.3. + darwin[1-6].*) gl_cv_func_snprintf_truncation_c99="guessing no";; +@@ -1235,7 +1229,7 @@ + # Guess yes on glibc systems. + *-gnu*) gl_cv_func_snprintf_retval_c99="guessing yes";; + # Guess yes on FreeBSD >= 5. +- freebsd[1-4]*) gl_cv_func_snprintf_retval_c99="guessing no";; ++ freebsd[1-4].*) gl_cv_func_snprintf_retval_c99="guessing no";; + freebsd* | kfreebsd*) gl_cv_func_snprintf_retval_c99="guessing yes";; + # Guess yes on Mac OS X >= 10.3. + darwin[1-6].*) gl_cv_func_snprintf_retval_c99="guessing no";; +@@ -1316,7 +1310,7 @@ + # Guess yes on glibc systems. + *-gnu*) gl_cv_func_snprintf_directive_n="guessing yes";; + # Guess yes on FreeBSD >= 5. +- freebsd[1-4]*) gl_cv_func_snprintf_directive_n="guessing no";; ++ freebsd[1-4].*) gl_cv_func_snprintf_directive_n="guessing no";; + freebsd* | kfreebsd*) gl_cv_func_snprintf_directive_n="guessing yes";; + # Guess yes on Mac OS X >= 10.3. + darwin[1-6].*) gl_cv_func_snprintf_directive_n="guessing no";; +@@ -1458,7 +1452,7 @@ + # Guess yes on glibc systems. + *-gnu*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";; + # Guess yes on FreeBSD >= 5. +- freebsd[1-4]*) gl_cv_func_vsnprintf_zerosize_c99="guessing no";; ++ freebsd[1-4].*) gl_cv_func_vsnprintf_zerosize_c99="guessing no";; + freebsd* | kfreebsd*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";; + # Guess yes on Mac OS X >= 10.3. + darwin[1-6].*) gl_cv_func_vsnprintf_zerosize_c99="guessing no";; +diff -Naur libpipeline-1.5.0-orig/gnulib/m4/pthread_rwlock_rdlock.m4 libpipeline-1.5.0/gnulib/m4/pthread_rwlock_rdlock.m4 +--- libpipeline-1.5.0-orig/gnulib/m4/pthread_rwlock_rdlock.m4 1970-01-01 03:00:00.000000000 +0300 ++++ libpipeline-1.5.0/gnulib/m4/pthread_rwlock_rdlock.m4 2018-07-02 13:10:06.774645300 +0300 +@@ -0,0 +1,163 @@ ++# pthread_rwlock_rdlock.m4 serial 1 ++dnl Copyright (C) 2017 Free Software Foundation, Inc. ++dnl This file is free software; the Free Software Foundation ++dnl gives unlimited permission to copy and/or distribute it, ++dnl with or without modifications, as long as this notice is preserved. ++ ++dnl From Bruno Haible. ++dnl Inspired by ++dnl https://github.com/linux-test-project/ltp/blob/master/testcases/open_posix_testsuite/conformance/interfaces/pthread_rwlock_rdlock/2-2.c ++dnl by Intel Corporation. ++ ++dnl Test whether in a situation where ++dnl - an rwlock is taken by a reader and has a writer waiting, ++dnl - an additional reader requests the lock, ++dnl - the waiting writer and the requesting reader threads have the same ++dnl priority, ++dnl the requesting reader thread gets blocked, so that at some point the ++dnl waiting writer can acquire the lock. ++dnl Without such a guarantee, when there a N readers and each of the readers ++dnl spends more than 1/Nth of the time with the lock held, there is a high ++dnl probability that the waiting writer will not get the lock in a given finite ++dnl time, a phenomenon called "writer starvation". ++dnl Without such a guarantee, applications have a hard time avoiding writer ++dnl starvation. ++dnl ++dnl POSIX:2008 makes this requirement only for implementations that support TPS ++dnl (Thread Priority Scheduling) and only for the scheduling policies SCHED_FIFO ++dnl and SCHED_RR, see ++dnl http://pubs.opengroup.org/onlinepubs/9699919799/functions/pthread_rwlock_rdlock.html ++dnl but test verifies the guarantee regardless of TPS and regardless of ++dnl scheduling policy. ++AC_DEFUN([gl_PTHREAD_RWLOCK_RDLOCK_PREFER_WRITER], ++[ ++ AC_REQUIRE([gl_THREADLIB_EARLY]) ++ AC_CACHE_CHECK([whether pthread_rwlock_rdlock prefers a writer to a reader], ++ [gl_cv_pthread_rwlock_rdlock_prefer_writer], ++ [save_LIBS="$LIBS" ++ LIBS="$LIBS $LIBMULTITHREAD" ++ AC_RUN_IFELSE( ++ [AC_LANG_SOURCE([[ ++#include ++#include ++#include ++#include ++ ++#define SUCCEED() exit (0) ++#define FAILURE() exit (1) ++#define UNEXPECTED(n) (exit (10 + (n))) ++ ++/* The main thread creates the waiting writer and the requesting reader threads ++ in the default way; this guarantees that they have the same priority. ++ We can reuse the main thread as first reader thread. */ ++ ++static pthread_rwlock_t lock; ++static pthread_t reader1; ++static pthread_t writer; ++static pthread_t reader2; ++static pthread_t timer; ++/* Used to pass control from writer to reader2 and from reader2 to timer, ++ as in a relay race. ++ Passing control from one running thread to another running thread ++ is most likely faster than to create the second thread. */ ++static pthread_mutex_t baton; ++ ++static void * ++timer_func (void *ignored) ++{ ++ /* Step 13 (can be before or after step 12): ++ The timer thread takes the baton, then waits a moment to make sure ++ it can tell whether the second reader thread is blocked at step 12. */ ++ if (pthread_mutex_lock (&baton)) ++ UNEXPECTED (13); ++ usleep (100000); ++ /* By the time we get here, it's clear that the second reader thread is ++ blocked at step 12. This is the desired behaviour. */ ++ SUCCEED (); ++} ++ ++static void * ++reader2_func (void *ignored) ++{ ++ int err; ++ ++ /* Step 8 (can be before or after step 7): ++ The second reader thread takes the baton, then waits a moment to make sure ++ the writer thread has reached step 7. */ ++ if (pthread_mutex_lock (&baton)) ++ UNEXPECTED (8); ++ usleep (100000); ++ /* Step 9: The second reader thread requests the lock. */ ++ err = pthread_rwlock_tryrdlock (&lock); ++ if (err == 0) ++ FAILURE (); ++ else if (err != EBUSY) ++ UNEXPECTED (9); ++ /* Step 10: Launch a timer, to test whether the next call blocks. */ ++ if (pthread_create (&timer, NULL, timer_func, NULL)) ++ UNEXPECTED (10); ++ /* Step 11: Release the baton. */ ++ if (pthread_mutex_unlock (&baton)) ++ UNEXPECTED (11); ++ /* Step 12: The second reader thread requests the lock. */ ++ err = pthread_rwlock_rdlock (&lock); ++ if (err == 0) ++ FAILURE (); ++ else ++ UNEXPECTED (12); ++} ++ ++static void * ++writer_func (void *ignored) ++{ ++ /* Step 4: Take the baton, so that the second reader thread does not go ahead ++ too early. */ ++ if (pthread_mutex_lock (&baton)) ++ UNEXPECTED (4); ++ /* Step 5: Create the second reader thread. */ ++ if (pthread_create (&reader2, NULL, reader2_func, NULL)) ++ UNEXPECTED (5); ++ /* Step 6: Release the baton. */ ++ if (pthread_mutex_unlock (&baton)) ++ UNEXPECTED (6); ++ /* Step 7: The writer thread requests the lock. */ ++ if (pthread_rwlock_wrlock (&lock)) ++ UNEXPECTED (7); ++ return NULL; ++} ++ ++int ++main () ++{ ++ reader1 = pthread_self (); ++ ++ /* Step 1: The main thread initializes the lock and the baton. */ ++ if (pthread_rwlock_init (&lock, NULL)) ++ UNEXPECTED (1); ++ if (pthread_mutex_init (&baton, NULL)) ++ UNEXPECTED (1); ++ /* Step 2: The main thread acquires the lock as a reader. */ ++ if (pthread_rwlock_rdlock (&lock)) ++ UNEXPECTED (2); ++ /* Step 3: Create the writer thread. */ ++ if (pthread_create (&writer, NULL, writer_func, NULL)) ++ UNEXPECTED (3); ++ /* Job done. Go to sleep. */ ++ for (;;) ++ { ++ sleep (1); ++ } ++} ++]])], ++ [gl_cv_pthread_rwlock_rdlock_prefer_writer=yes], ++ [gl_cv_pthread_rwlock_rdlock_prefer_writer=no], ++ [gl_cv_pthread_rwlock_rdlock_prefer_writer="guessing yes"]) ++ LIBS="$save_LIBS" ++ ]) ++ case "$gl_cv_pthread_rwlock_rdlock_prefer_writer" in ++ *yes) ++ AC_DEFINE([HAVE_PTHREAD_RWLOCK_RDLOCK_PREFER_WRITER], [1], ++ [Define if the 'pthread_rwlock_rdlock' function prefers a writer to a reader.]) ++ ;; ++ esac ++]) +diff -Naur libpipeline-1.5.0-orig/gnulib/m4/raise.m4 libpipeline-1.5.0/gnulib/m4/raise.m4 +--- libpipeline-1.5.0-orig/gnulib/m4/raise.m4 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/m4/raise.m4 2018-07-02 13:10:06.777645500 +0300 +@@ -1,5 +1,5 @@ +-# raise.m4 serial 3 +-dnl Copyright (C) 2011-2014 Free Software Foundation, Inc. ++# raise.m4 serial 4 ++dnl Copyright (C) 2011-2017 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, + dnl with or without modifications, as long as this notice is preserved. +@@ -8,14 +8,16 @@ + [ + AC_REQUIRE([gl_SIGNAL_H_DEFAULTS]) + AC_REQUIRE([AC_CANONICAL_HOST]) +- AC_REQUIRE([gl_MSVC_INVAL]) + AC_CHECK_FUNCS([raise]) + if test $ac_cv_func_raise = no; then + HAVE_RAISE=0 + else +- if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then +- REPLACE_RAISE=1 +- fi ++ m4_ifdef([gl_MSVC_INVAL], [ ++ AC_REQUIRE([gl_MSVC_INVAL]) ++ if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then ++ REPLACE_RAISE=1 ++ fi ++ ]) + m4_ifdef([gl_SIGNALBLOCKING], [ + gl_SIGNALBLOCKING + if test $HAVE_POSIX_SIGNALBLOCKING = 0; then +diff -Naur libpipeline-1.5.0-orig/gnulib/m4/read.m4 libpipeline-1.5.0/gnulib/m4/read.m4 +--- libpipeline-1.5.0-orig/gnulib/m4/read.m4 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/m4/read.m4 2018-07-02 13:10:06.780645700 +0300 +@@ -1,5 +1,5 @@ +-# read.m4 serial 4 +-dnl Copyright (C) 2011-2014 Free Software Foundation, Inc. ++# read.m4 serial 5 ++dnl Copyright (C) 2011-2017 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, + dnl with or without modifications, as long as this notice is preserved. +@@ -7,10 +7,12 @@ + AC_DEFUN([gl_FUNC_READ], + [ + AC_REQUIRE([gl_UNISTD_H_DEFAULTS]) +- AC_REQUIRE([gl_MSVC_INVAL]) +- if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then +- REPLACE_READ=1 +- fi ++ m4_ifdef([gl_MSVC_INVAL], [ ++ AC_REQUIRE([gl_MSVC_INVAL]) ++ if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then ++ REPLACE_READ=1 ++ fi ++ ]) + dnl This ifdef is just an optimization, to avoid performing a configure + dnl check whose result is not used. It does not make the test of + dnl GNULIB_UNISTD_H_NONBLOCKING or GNULIB_NONBLOCKING redundant. +diff -Naur libpipeline-1.5.0-orig/gnulib/m4/safe-read.m4 libpipeline-1.5.0/gnulib/m4/safe-read.m4 +--- libpipeline-1.5.0-orig/gnulib/m4/safe-read.m4 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/m4/safe-read.m4 2018-07-02 13:10:06.782645800 +0300 +@@ -1,5 +1,5 @@ + # safe-read.m4 serial 6 +-dnl Copyright (C) 2002-2003, 2005-2006, 2009-2014 Free Software Foundation, ++dnl Copyright (C) 2002-2003, 2005-2006, 2009-2017 Free Software Foundation, + dnl Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, +diff -Naur libpipeline-1.5.0-orig/gnulib/m4/safe-write.m4 libpipeline-1.5.0/gnulib/m4/safe-write.m4 +--- libpipeline-1.5.0-orig/gnulib/m4/safe-write.m4 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/m4/safe-write.m4 2018-07-02 13:10:06.785646000 +0300 +@@ -1,5 +1,5 @@ + # safe-write.m4 serial 4 +-dnl Copyright (C) 2002, 2005-2006, 2009-2014 Free Software Foundation, Inc. ++dnl Copyright (C) 2002, 2005-2006, 2009-2017 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, + dnl with or without modifications, as long as this notice is preserved. +diff -Naur libpipeline-1.5.0-orig/gnulib/m4/secure_getenv.m4 libpipeline-1.5.0/gnulib/m4/secure_getenv.m4 +--- libpipeline-1.5.0-orig/gnulib/m4/secure_getenv.m4 2014-11-08 16:53:38.000000000 +0300 ++++ libpipeline-1.5.0/gnulib/m4/secure_getenv.m4 2018-07-02 13:10:06.787646100 +0300 +@@ -1,5 +1,5 @@ + # Look up an environment variable more securely. +-dnl Copyright 2013-2014 Free Software Foundation, Inc. ++dnl Copyright 2013-2017 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, + dnl with or without modifications, as long as this notice is preserved. +@@ -22,4 +22,5 @@ + if test $ac_cv_func___secure_getenv = no; then + AC_CHECK_FUNCS([issetugid]) + fi ++ AC_CHECK_FUNCS_ONCE([getuid geteuid getgid getegid]) + ]) +diff -Naur libpipeline-1.5.0-orig/gnulib/m4/setenv.m4 libpipeline-1.5.0/gnulib/m4/setenv.m4 +--- libpipeline-1.5.0-orig/gnulib/m4/setenv.m4 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/m4/setenv.m4 2018-07-02 13:10:06.789646200 +0300 +@@ -1,5 +1,5 @@ + # setenv.m4 serial 26 +-dnl Copyright (C) 2001-2004, 2006-2014 Free Software Foundation, Inc. ++dnl Copyright (C) 2001-2004, 2006-2017 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, + dnl with or without modifications, as long as this notice is preserved. +diff -Naur libpipeline-1.5.0-orig/gnulib/m4/sigaction.m4 libpipeline-1.5.0/gnulib/m4/sigaction.m4 +--- libpipeline-1.5.0-orig/gnulib/m4/sigaction.m4 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/m4/sigaction.m4 2018-07-02 13:10:06.792646400 +0300 +@@ -1,5 +1,5 @@ + # sigaction.m4 serial 7 +-dnl Copyright (C) 2008-2014 Free Software Foundation, Inc. ++dnl Copyright (C) 2008-2017 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, + dnl with or without modifications, as long as this notice is preserved. +diff -Naur libpipeline-1.5.0-orig/gnulib/m4/signal_h.m4 libpipeline-1.5.0/gnulib/m4/signal_h.m4 +--- libpipeline-1.5.0-orig/gnulib/m4/signal_h.m4 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/m4/signal_h.m4 2018-07-02 13:10:06.794646500 +0300 +@@ -1,5 +1,5 @@ + # signal_h.m4 serial 18 +-dnl Copyright (C) 2007-2014 Free Software Foundation, Inc. ++dnl Copyright (C) 2007-2017 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, + dnl with or without modifications, as long as this notice is preserved. +diff -Naur libpipeline-1.5.0-orig/gnulib/m4/signalblocking.m4 libpipeline-1.5.0/gnulib/m4/signalblocking.m4 +--- libpipeline-1.5.0-orig/gnulib/m4/signalblocking.m4 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/m4/signalblocking.m4 2018-07-02 13:10:06.797646600 +0300 +@@ -1,5 +1,5 @@ + # signalblocking.m4 serial 14 +-dnl Copyright (C) 2001-2002, 2006-2014 Free Software Foundation, Inc. ++dnl Copyright (C) 2001-2002, 2006-2017 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, + dnl with or without modifications, as long as this notice is preserved. +diff -Naur libpipeline-1.5.0-orig/gnulib/m4/size_max.m4 libpipeline-1.5.0/gnulib/m4/size_max.m4 +--- libpipeline-1.5.0-orig/gnulib/m4/size_max.m4 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/m4/size_max.m4 2018-07-02 13:10:06.800646800 +0300 +@@ -1,5 +1,5 @@ + # size_max.m4 serial 10 +-dnl Copyright (C) 2003, 2005-2006, 2008-2014 Free Software Foundation, Inc. ++dnl Copyright (C) 2003, 2005-2006, 2008-2017 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, + dnl with or without modifications, as long as this notice is preserved. +diff -Naur libpipeline-1.5.0-orig/gnulib/m4/snprintf.m4 libpipeline-1.5.0/gnulib/m4/snprintf.m4 +--- libpipeline-1.5.0-orig/gnulib/m4/snprintf.m4 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/m4/snprintf.m4 2018-07-02 13:10:06.802646900 +0300 +@@ -1,5 +1,5 @@ +-# snprintf.m4 serial 6 +-dnl Copyright (C) 2002-2004, 2007-2014 Free Software Foundation, Inc. ++# snprintf.m4 serial 7 ++dnl Copyright (C) 2002-2004, 2007-2017 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, + dnl with or without modifications, as long as this notice is preserved. +@@ -46,6 +46,14 @@ + AC_LIBOBJ([snprintf]) + if test $ac_cv_func_snprintf = yes; then + REPLACE_SNPRINTF=1 ++ else ++ AC_CHECK_DECLS_ONCE([snprintf]) ++ if test $ac_cv_have_decl_snprintf = yes; then ++ dnl If the function is declared but does not appear to exist, it may be ++ dnl defined as an inline function. In order to avoid a conflict, we have ++ dnl to define rpl_snprintf, not snprintf. ++ REPLACE_SNPRINTF=1 ++ fi + fi + gl_PREREQ_SNPRINTF + ]) +diff -Naur libpipeline-1.5.0-orig/gnulib/m4/ssize_t.m4 libpipeline-1.5.0/gnulib/m4/ssize_t.m4 +--- libpipeline-1.5.0-orig/gnulib/m4/ssize_t.m4 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/m4/ssize_t.m4 2018-07-02 13:10:06.804647000 +0300 +@@ -1,5 +1,5 @@ + # ssize_t.m4 serial 5 (gettext-0.18.2) +-dnl Copyright (C) 2001-2003, 2006, 2010-2014 Free Software Foundation, Inc. ++dnl Copyright (C) 2001-2003, 2006, 2010-2017 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, + dnl with or without modifications, as long as this notice is preserved. +diff -Naur libpipeline-1.5.0-orig/gnulib/m4/stat.m4 libpipeline-1.5.0/gnulib/m4/stat.m4 +--- libpipeline-1.5.0-orig/gnulib/m4/stat.m4 2014-11-08 16:53:38.000000000 +0300 ++++ libpipeline-1.5.0/gnulib/m4/stat.m4 2018-07-02 13:10:06.808647300 +0300 +@@ -1,6 +1,6 @@ +-# serial 11 ++# serial 12 + +-# Copyright (C) 2009-2014 Free Software Foundation, Inc. ++# Copyright (C) 2009-2017 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, +@@ -8,64 +8,60 @@ + + AC_DEFUN([gl_FUNC_STAT], + [ +- AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles ++ AC_REQUIRE([AC_CANONICAL_HOST]) + AC_REQUIRE([gl_SYS_STAT_H_DEFAULTS]) + AC_CHECK_FUNCS_ONCE([lstat]) +- dnl mingw is the only known platform where stat(".") and stat("./") differ +- AC_CACHE_CHECK([whether stat handles trailing slashes on directories], +- [gl_cv_func_stat_dir_slash], +- [AC_RUN_IFELSE( +- [AC_LANG_PROGRAM( +- [[#include +-]], [[struct stat st; return stat (".", &st) != stat ("./", &st);]])], +- [gl_cv_func_stat_dir_slash=yes], [gl_cv_func_stat_dir_slash=no], +- [case $host_os in +- mingw*) gl_cv_func_stat_dir_slash="guessing no";; +- *) gl_cv_func_stat_dir_slash="guessing yes";; +- esac])]) +- dnl AIX 7.1, Solaris 9, mingw64 mistakenly succeed on stat("file/"). +- dnl (For mingw, this is due to a broken stat() override in libmingwex.a.) +- dnl FreeBSD 7.2 mistakenly succeeds on stat("link-to-file/"). +- AC_CACHE_CHECK([whether stat handles trailing slashes on files], +- [gl_cv_func_stat_file_slash], +- [touch conftest.tmp +- # Assume that if we have lstat, we can also check symlinks. +- if test $ac_cv_func_lstat = yes; then +- ln -s conftest.tmp conftest.lnk +- fi +- AC_RUN_IFELSE( +- [AC_LANG_PROGRAM( +- [[#include ++ case "$host_os" in ++ mingw*) ++ dnl On this platform, the original stat() returns st_atime, st_mtime, ++ dnl st_ctime values that are affected by the time zone. ++ REPLACE_STAT=1 ++ ;; ++ *) ++ dnl AIX 7.1, Solaris 9, mingw64 mistakenly succeed on stat("file/"). ++ dnl (For mingw, this is due to a broken stat() override in libmingwex.a.) ++ dnl FreeBSD 7.2 mistakenly succeeds on stat("link-to-file/"). ++ AC_CACHE_CHECK([whether stat handles trailing slashes on files], ++ [gl_cv_func_stat_file_slash], ++ [touch conftest.tmp ++ # Assume that if we have lstat, we can also check symlinks. ++ if test $ac_cv_func_lstat = yes; then ++ ln -s conftest.tmp conftest.lnk ++ fi ++ AC_RUN_IFELSE( ++ [AC_LANG_PROGRAM( ++ [[#include + ]], [[int result = 0; +- struct stat st; +- if (!stat ("conftest.tmp/", &st)) +- result |= 1; ++ struct stat st; ++ if (!stat ("conftest.tmp/", &st)) ++ result |= 1; + #if HAVE_LSTAT +- if (!stat ("conftest.lnk/", &st)) +- result |= 2; ++ if (!stat ("conftest.lnk/", &st)) ++ result |= 2; + #endif +- return result; +- ]])], +- [gl_cv_func_stat_file_slash=yes], [gl_cv_func_stat_file_slash=no], +- [case "$host_os" in +- # Guess yes on glibc systems. +- *-gnu*) gl_cv_func_stat_file_slash="guessing yes" ;; +- # If we don't know, assume the worst. +- *) gl_cv_func_stat_file_slash="guessing no" ;; +- esac +- ]) +- rm -f conftest.tmp conftest.lnk]) +- case $gl_cv_func_stat_dir_slash in +- *no) REPLACE_STAT=1 +- AC_DEFINE([REPLACE_FUNC_STAT_DIR], [1], [Define to 1 if stat needs +- help when passed a directory name with a trailing slash]);; +- esac +- case $gl_cv_func_stat_file_slash in +- *no) REPLACE_STAT=1 +- AC_DEFINE([REPLACE_FUNC_STAT_FILE], [1], [Define to 1 if stat needs +- help when passed a file name with a trailing slash]);; ++ return result; ++ ]])], ++ [gl_cv_func_stat_file_slash=yes], [gl_cv_func_stat_file_slash=no], ++ [case "$host_os" in ++ # Guess yes on glibc systems. ++ *-gnu*) gl_cv_func_stat_file_slash="guessing yes" ;; ++ # If we don't know, assume the worst. ++ *) gl_cv_func_stat_file_slash="guessing no" ;; ++ esac ++ ]) ++ rm -f conftest.tmp conftest.lnk]) ++ case $gl_cv_func_stat_file_slash in ++ *no) ++ REPLACE_STAT=1 ++ AC_DEFINE([REPLACE_FUNC_STAT_FILE], [1], [Define to 1 if stat needs ++ help when passed a file name with a trailing slash]);; ++ esac ++ ;; + esac + ]) + +-# Prerequisites of lib/stat.c. +-AC_DEFUN([gl_PREREQ_STAT], [:]) ++# Prerequisites of lib/stat.c and lib/stat-w32.c. ++AC_DEFUN([gl_PREREQ_STAT], [ ++ AC_REQUIRE([gl_HEADER_SYS_STAT_H]) ++ : ++]) +diff -Naur libpipeline-1.5.0-orig/gnulib/m4/stdarg.m4 libpipeline-1.5.0/gnulib/m4/stdarg.m4 +--- libpipeline-1.5.0-orig/gnulib/m4/stdarg.m4 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/m4/stdarg.m4 2018-07-02 13:10:06.811647400 +0300 +@@ -1,5 +1,5 @@ + # stdarg.m4 serial 6 +-dnl Copyright (C) 2006, 2008-2014 Free Software Foundation, Inc. ++dnl Copyright (C) 2006, 2008-2017 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, + dnl with or without modifications, as long as this notice is preserved. +diff -Naur libpipeline-1.5.0-orig/gnulib/m4/stdbool.m4 libpipeline-1.5.0/gnulib/m4/stdbool.m4 +--- libpipeline-1.5.0-orig/gnulib/m4/stdbool.m4 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/m4/stdbool.m4 2018-07-02 13:10:06.814647600 +0300 +@@ -1,11 +1,11 @@ + # Check for stdbool.h that conforms to C99. + +-dnl Copyright (C) 2002-2006, 2009-2014 Free Software Foundation, Inc. ++dnl Copyright (C) 2002-2006, 2009-2017 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, + dnl with or without modifications, as long as this notice is preserved. + +-#serial 5 ++#serial 7 + + # Prepare for substituting if it is not supported. + +@@ -43,56 +43,64 @@ + [AC_LANG_PROGRAM( + [[ + #include +- #ifndef bool +- "error: bool is not defined" +- #endif +- #ifndef false +- "error: false is not defined" +- #endif +- #if false +- "error: false is not 0" +- #endif +- #ifndef true +- "error: true is not defined" +- #endif +- #if true != 1 +- "error: true is not 1" ++ ++ #ifdef __cplusplus ++ typedef bool Bool; ++ #else ++ typedef _Bool Bool; ++ #ifndef bool ++ "error: bool is not defined" ++ #endif ++ #ifndef false ++ "error: false is not defined" ++ #endif ++ #if false ++ "error: false is not 0" ++ #endif ++ #ifndef true ++ "error: true is not defined" ++ #endif ++ #if true != 1 ++ "error: true is not 1" ++ #endif + #endif ++ + #ifndef __bool_true_false_are_defined + "error: __bool_true_false_are_defined is not defined" + #endif + +- struct s { _Bool s: 1; _Bool t; } s; ++ struct s { Bool s: 1; Bool t; bool u: 1; bool v; } s; + + char a[true == 1 ? 1 : -1]; + char b[false == 0 ? 1 : -1]; + char c[__bool_true_false_are_defined == 1 ? 1 : -1]; + char d[(bool) 0.5 == true ? 1 : -1]; + /* See body of main program for 'e'. */ +- char f[(_Bool) 0.0 == false ? 1 : -1]; ++ char f[(Bool) 0.0 == false ? 1 : -1]; + char g[true]; +- char h[sizeof (_Bool)]; ++ char h[sizeof (Bool)]; + char i[sizeof s.t]; + enum { j = false, k = true, l = false * true, m = true * 256 }; + /* The following fails for + HP aC++/ANSI C B3910B A.05.55 [Dec 04 2003]. */ +- _Bool n[m]; ++ Bool n[m]; + char o[sizeof n == m * sizeof n[0] ? 1 : -1]; +- char p[-1 - (_Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1]; ++ char p[-1 - (Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1]; + /* Catch a bug in an HP-UX C compiler. See + http://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html + http://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html + */ +- _Bool q = true; +- _Bool *pq = &q; ++ Bool q = true; ++ Bool *pq = &q; ++ bool *qq = &q; + ]], + [[ + bool e = &s; +- *pq |= q; +- *pq |= ! q; ++ *pq |= q; *pq |= ! q; ++ *qq |= q; *qq |= ! q; + /* Refer to every declared value, to avoid compiler optimizations. */ + return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !!j + !k + !!l +- + !m + !n + !o + !p + !q + !pq); ++ + !m + !n + !o + !p + !q + !pq + !qq); + ]])], + [ac_cv_header_stdbool_h=yes], + [ac_cv_header_stdbool_h=no])]) +diff -Naur libpipeline-1.5.0-orig/gnulib/m4/stddef_h.m4 libpipeline-1.5.0/gnulib/m4/stddef_h.m4 +--- libpipeline-1.5.0-orig/gnulib/m4/stddef_h.m4 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/m4/stddef_h.m4 2018-07-02 13:10:06.818647800 +0300 +@@ -1,6 +1,6 @@ +-dnl A placeholder for POSIX 2008 , for platforms that have issues. +-# stddef_h.m4 serial 4 +-dnl Copyright (C) 2009-2014 Free Software Foundation, Inc. ++dnl A placeholder for , for platforms that have issues. ++# stddef_h.m4 serial 5 ++dnl Copyright (C) 2009-2017 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, + dnl with or without modifications, as long as this notice is preserved. +@@ -10,6 +10,9 @@ + AC_REQUIRE([gl_STDDEF_H_DEFAULTS]) + AC_REQUIRE([gt_TYPE_WCHAR_T]) + STDDEF_H= ++ AC_CHECK_TYPE([max_align_t], [], [HAVE_MAX_ALIGN_T=0; STDDEF_H=stddef.h], ++ [[#include ++ ]]) + if test $gt_cv_c_wchar_t = no; then + HAVE_WCHAR_T=0 + STDDEF_H=stddef.h +@@ -43,5 +46,6 @@ + [ + dnl Assume proper GNU behavior unless another module says otherwise. + REPLACE_NULL=0; AC_SUBST([REPLACE_NULL]) ++ HAVE_MAX_ALIGN_T=1; AC_SUBST([HAVE_MAX_ALIGN_T]) + HAVE_WCHAR_T=1; AC_SUBST([HAVE_WCHAR_T]) + ]) +diff -Naur libpipeline-1.5.0-orig/gnulib/m4/stdint.m4 libpipeline-1.5.0/gnulib/m4/stdint.m4 +--- libpipeline-1.5.0-orig/gnulib/m4/stdint.m4 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/m4/stdint.m4 2018-07-02 13:10:06.823648100 +0300 +@@ -1,5 +1,5 @@ +-# stdint.m4 serial 43 +-dnl Copyright (C) 2001-2014 Free Software Foundation, Inc. ++# stdint.m4 serial 50 ++dnl Copyright (C) 2001-2017 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, + dnl with or without modifications, as long as this notice is preserved. +@@ -11,6 +11,9 @@ + [ + AC_PREREQ([2.59])dnl + ++ AC_REQUIRE([gl_LIMITS_H]) ++ AC_REQUIRE([gt_TYPE_WINT_T]) ++ + dnl Check for long long int and unsigned long long int. + AC_REQUIRE([AC_TYPE_LONG_LONG_INT]) + if test $ac_cv_type_long_long_int = yes; then +@@ -70,6 +73,8 @@ + AC_COMPILE_IFELSE([ + AC_LANG_PROGRAM([[ + #define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 /* work if build isn't clean */ ++#define __STDC_CONSTANT_MACROS 1 ++#define __STDC_LIMIT_MACROS 1 + #include + /* Dragonfly defines WCHAR_MIN, WCHAR_MAX only in . */ + #if !(defined WCHAR_MIN && defined WCHAR_MAX) +@@ -150,6 +155,15 @@ + intmax_t i = INTMAX_MAX; + uintmax_t j = UINTMAX_MAX; + ++/* Check that SIZE_MAX has the correct type, if possible. */ ++#if 201112 <= __STDC_VERSION__ ++int k = _Generic (SIZE_MAX, size_t: 0); ++#elif (2 <= __GNUC__ || defined __IBM__TYPEOF__ \ ++ || (0x5110 <= __SUNPRO_C && !__STDC__)) ++extern size_t k; ++extern __typeof__ (SIZE_MAX) k; ++#endif ++ + #include /* for CHAR_BIT */ + #define TYPE_MINIMUM(t) \ + ((t) ((t) 0 < (t) -1 ? (t) 0 : ~ TYPE_MAXIMUM (t))) +@@ -218,6 +232,8 @@ + AC_RUN_IFELSE([ + AC_LANG_PROGRAM([[ + #define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 /* work if build isn't clean */ ++#define __STDC_CONSTANT_MACROS 1 ++#define __STDC_LIMIT_MACROS 1 + #include + ] + gl_STDINT_INCLUDES +@@ -278,28 +294,74 @@ + ]) + ]) + fi ++ ++ HAVE_C99_STDINT_H=0 ++ HAVE_SYS_BITYPES_H=0 ++ HAVE_SYS_INTTYPES_H=0 ++ STDINT_H=stdint.h + if test "$gl_cv_header_working_stdint_h" = yes; then +- STDINT_H= ++ HAVE_C99_STDINT_H=1 ++ dnl Now see whether the system works without ++ dnl __STDC_CONSTANT_MACROS/__STDC_LIMIT_MACROS defined. ++ AC_CACHE_CHECK([whether stdint.h predates C++11], ++ [gl_cv_header_stdint_predates_cxx11_h], ++ [gl_cv_header_stdint_predates_cxx11_h=yes ++ AC_COMPILE_IFELSE([ ++ AC_LANG_PROGRAM([[ ++#define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 /* work if build isn't clean */ ++#include ++] ++gl_STDINT_INCLUDES ++[ ++intmax_t im = INTMAX_MAX; ++int32_t i32 = INT32_C (0x7fffffff); ++ ]])], ++ [gl_cv_header_stdint_predates_cxx11_h=no])]) ++ ++ if test "$gl_cv_header_stdint_predates_cxx11_h" = yes; then ++ AC_DEFINE([__STDC_CONSTANT_MACROS], [1], ++ [Define to 1 if the system predates C++11.]) ++ AC_DEFINE([__STDC_LIMIT_MACROS], [1], ++ [Define to 1 if the system predates C++11.]) ++ fi ++ AC_CACHE_CHECK([whether stdint.h has UINTMAX_WIDTH etc.], ++ [gl_cv_header_stdint_width], ++ [gl_cv_header_stdint_width=no ++ AC_COMPILE_IFELSE( ++ [AC_LANG_PROGRAM([[ ++ /* Work if build is not clean. */ ++ #define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 ++ #ifndef __STDC_WANT_IEC_60559_BFP_EXT__ ++ #define __STDC_WANT_IEC_60559_BFP_EXT__ 1 ++ #endif ++ #include ++ ]gl_STDINT_INCLUDES[ ++ int iw = UINTMAX_WIDTH; ++ ]])], ++ [gl_cv_header_stdint_width=yes])]) ++ if test "$gl_cv_header_stdint_width" = yes; then ++ STDINT_H= ++ fi + else + dnl Check for , and for + dnl (used in Linux libc4 >= 4.6.7 and libc5). + AC_CHECK_HEADERS([sys/inttypes.h sys/bitypes.h]) + if test $ac_cv_header_sys_inttypes_h = yes; then + HAVE_SYS_INTTYPES_H=1 +- else +- HAVE_SYS_INTTYPES_H=0 + fi +- AC_SUBST([HAVE_SYS_INTTYPES_H]) + if test $ac_cv_header_sys_bitypes_h = yes; then + HAVE_SYS_BITYPES_H=1 +- else +- HAVE_SYS_BITYPES_H=0 + fi +- AC_SUBST([HAVE_SYS_BITYPES_H]) +- + gl_STDINT_TYPE_PROPERTIES +- STDINT_H=stdint.h + fi ++ ++ dnl The substitute stdint.h needs the substitute limit.h's _GL_INTEGER_WIDTH. ++ LIMITS_H=limits.h ++ AM_CONDITIONAL([GL_GENERATE_LIMITS_H], [test -n "$LIMITS_H"]) ++ ++ AC_SUBST([HAVE_C99_STDINT_H]) ++ AC_SUBST([HAVE_SYS_BITYPES_H]) ++ AC_SUBST([HAVE_SYS_INTTYPES_H]) + AC_SUBST([STDINT_H]) + AM_CONDITIONAL([GL_GENERATE_STDINT_H], [test -n "$STDINT_H"]) + ]) +@@ -467,7 +529,7 @@ + dnl requirement that wint_t is "unchanged by default argument promotions". + dnl In this case gnulib's and override wint_t. + dnl Set the variable BITSIZEOF_WINT_T accordingly. +- if test $BITSIZEOF_WINT_T -lt 32; then ++ if test $GNULIB_OVERRIDES_WINT_T = 1; then + BITSIZEOF_WINT_T=32 + fi + ]) +@@ -477,8 +539,3 @@ + m4_ifdef([AC_COMPUTE_INT], [], [ + AC_DEFUN([AC_COMPUTE_INT], [_AC_COMPUTE_INT([$2],[$1],[$3],[$4])]) + ]) +- +-# Hey Emacs! +-# Local Variables: +-# indent-tabs-mode: nil +-# End: +diff -Naur libpipeline-1.5.0-orig/gnulib/m4/stdint_h.m4 libpipeline-1.5.0/gnulib/m4/stdint_h.m4 +--- libpipeline-1.5.0-orig/gnulib/m4/stdint_h.m4 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/m4/stdint_h.m4 2018-07-02 13:10:06.826648300 +0300 +@@ -1,5 +1,5 @@ + # stdint_h.m4 serial 9 +-dnl Copyright (C) 1997-2004, 2006, 2008-2014 Free Software Foundation, Inc. ++dnl Copyright (C) 1997-2004, 2006, 2008-2017 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, + dnl with or without modifications, as long as this notice is preserved. +diff -Naur libpipeline-1.5.0-orig/gnulib/m4/stdio_h.m4 libpipeline-1.5.0/gnulib/m4/stdio_h.m4 +--- libpipeline-1.5.0-orig/gnulib/m4/stdio_h.m4 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/m4/stdio_h.m4 2018-07-02 13:10:06.830648500 +0300 +@@ -1,14 +1,45 @@ +-# stdio_h.m4 serial 43 +-dnl Copyright (C) 2007-2014 Free Software Foundation, Inc. ++# stdio_h.m4 serial 48 ++dnl Copyright (C) 2007-2017 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, + dnl with or without modifications, as long as this notice is preserved. + + AC_DEFUN([gl_STDIO_H], + [ ++ AH_VERBATIM([MINGW_ANSI_STDIO], ++[/* Use GNU style printf and scanf. */ ++#ifndef __USE_MINGW_ANSI_STDIO ++# undef __USE_MINGW_ANSI_STDIO ++#endif ++]) ++ AC_DEFINE([__USE_MINGW_ANSI_STDIO]) + AC_REQUIRE([gl_STDIO_H_DEFAULTS]) + gl_NEXT_HEADERS([stdio.h]) + ++ dnl Determine whether __USE_MINGW_ANSI_STDIO makes printf and ++ dnl inttypes.h behave like gnu instead of system; we must give our ++ dnl printf wrapper the right attribute to match. ++ AC_CACHE_CHECK([which flavor of printf attribute matches inttypes macros], ++ [gl_cv_func_printf_attribute_flavor], ++ [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ ++ #define __STDC_FORMAT_MACROS 1 ++ #include ++ #include ++ /* For non-mingw systems, compilation will trivially succeed. ++ For mingw, compilation will succeed for older mingw (system ++ printf, "I64d") and fail for newer mingw (gnu printf, "lld"). */ ++ #if ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__) && \ ++ (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)) ++ extern char PRIdMAX_probe[sizeof PRIdMAX == sizeof "I64d" ? 1 : -1]; ++ #endif ++ ]])], [gl_cv_func_printf_attribute_flavor=system], ++ [gl_cv_func_printf_attribute_flavor=gnu])]) ++ if test "$gl_cv_func_printf_attribute_flavor" = gnu; then ++ AC_DEFINE([GNULIB_PRINTF_ATTRIBUTE_FLAVOR_GNU], [1], ++ [Define to 1 if printf and friends should be labeled with ++ attribute "__gnu_printf__" instead of "__printf__"]) ++ fi ++ + dnl No need to create extra modules for these functions. Everyone who uses + dnl likely needs them. + GNULIB_FSCANF=1 +diff -Naur libpipeline-1.5.0-orig/gnulib/m4/stdlib_h.m4 libpipeline-1.5.0/gnulib/m4/stdlib_h.m4 +--- libpipeline-1.5.0-orig/gnulib/m4/stdlib_h.m4 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/m4/stdlib_h.m4 2018-07-02 13:10:06.834648800 +0300 +@@ -1,5 +1,5 @@ +-# stdlib_h.m4 serial 42 +-dnl Copyright (C) 2007-2014 Free Software Foundation, Inc. ++# stdlib_h.m4 serial 43 ++dnl Copyright (C) 2007-2017 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, + dnl with or without modifications, as long as this notice is preserved. +@@ -21,7 +21,7 @@ + #endif + ]], [_Exit atoll canonicalize_file_name getloadavg getsubopt grantpt + initstate initstate_r mkdtemp mkostemp mkostemps mkstemp mkstemps +- posix_openpt ptsname ptsname_r random random_r realpath rpmatch ++ posix_openpt ptsname ptsname_r qsort_r random random_r realpath rpmatch + secure_getenv setenv setstate setstate_r srandom srandom_r + strtod strtoll strtoull unlockpt unsetenv]) + ]) +@@ -55,6 +55,7 @@ + GNULIB_PTSNAME=0; AC_SUBST([GNULIB_PTSNAME]) + GNULIB_PTSNAME_R=0; AC_SUBST([GNULIB_PTSNAME_R]) + GNULIB_PUTENV=0; AC_SUBST([GNULIB_PUTENV]) ++ GNULIB_QSORT_R=0; AC_SUBST([GNULIB_QSORT_R]) + GNULIB_RANDOM=0; AC_SUBST([GNULIB_RANDOM]) + GNULIB_RANDOM_R=0; AC_SUBST([GNULIB_RANDOM_R]) + GNULIB_REALLOC_POSIX=0; AC_SUBST([GNULIB_REALLOC_POSIX]) +@@ -84,6 +85,7 @@ + HAVE_POSIX_OPENPT=1; AC_SUBST([HAVE_POSIX_OPENPT]) + HAVE_PTSNAME=1; AC_SUBST([HAVE_PTSNAME]) + HAVE_PTSNAME_R=1; AC_SUBST([HAVE_PTSNAME_R]) ++ HAVE_QSORT_R=1; AC_SUBST([HAVE_QSORT_R]) + HAVE_RANDOM=1; AC_SUBST([HAVE_RANDOM]) + HAVE_RANDOM_H=1; AC_SUBST([HAVE_RANDOM_H]) + HAVE_RANDOM_R=1; AC_SUBST([HAVE_RANDOM_R]) +@@ -107,6 +109,7 @@ + REPLACE_PTSNAME=0; AC_SUBST([REPLACE_PTSNAME]) + REPLACE_PTSNAME_R=0; AC_SUBST([REPLACE_PTSNAME_R]) + REPLACE_PUTENV=0; AC_SUBST([REPLACE_PUTENV]) ++ REPLACE_QSORT_R=0; AC_SUBST([REPLACE_QSORT_R]) + REPLACE_RANDOM_R=0; AC_SUBST([REPLACE_RANDOM_R]) + REPLACE_REALLOC=0; AC_SUBST([REPLACE_REALLOC]) + REPLACE_REALPATH=0; AC_SUBST([REPLACE_REALPATH]) +diff -Naur libpipeline-1.5.0-orig/gnulib/m4/strerror.m4 libpipeline-1.5.0/gnulib/m4/strerror.m4 +--- libpipeline-1.5.0-orig/gnulib/m4/strerror.m4 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/m4/strerror.m4 2018-07-02 13:10:06.837648900 +0300 +@@ -1,5 +1,5 @@ + # strerror.m4 serial 17 +-dnl Copyright (C) 2002, 2007-2014 Free Software Foundation, Inc. ++dnl Copyright (C) 2002, 2007-2017 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, + dnl with or without modifications, as long as this notice is preserved. +diff -Naur libpipeline-1.5.0-orig/gnulib/m4/string_h.m4 libpipeline-1.5.0/gnulib/m4/string_h.m4 +--- libpipeline-1.5.0-orig/gnulib/m4/string_h.m4 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/m4/string_h.m4 2018-07-02 13:10:06.840649100 +0300 +@@ -1,6 +1,6 @@ + # Configure a GNU-like replacement for . + +-# Copyright (C) 2007-2014 Free Software Foundation, Inc. ++# Copyright (C) 2007-2017 Free Software Foundation, Inc. + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +diff -Naur libpipeline-1.5.0-orig/gnulib/m4/strndup.m4 libpipeline-1.5.0/gnulib/m4/strndup.m4 +--- libpipeline-1.5.0-orig/gnulib/m4/strndup.m4 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/m4/strndup.m4 2018-07-02 13:10:06.843649300 +0300 +@@ -1,5 +1,5 @@ +-# strndup.m4 serial 21 +-dnl Copyright (C) 2002-2003, 2005-2014 Free Software Foundation, Inc. ++# strndup.m4 serial 22 ++dnl Copyright (C) 2002-2003, 2005-2017 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, + dnl with or without modifications, as long as this notice is preserved. +@@ -31,11 +31,14 @@ + #endif + char *strndup (const char *, size_t); + #endif ++ int result; + char *s; + s = strndup ("some longer string", 15); + free (s); + s = strndup ("shorter string", 13); +- return s[13] != '\0';]])], ++ result = s[13] != '\0'; ++ free (s); ++ return result;]])], + [gl_cv_func_strndup_works=yes], + [gl_cv_func_strndup_works=no], + [ +diff -Naur libpipeline-1.5.0-orig/gnulib/m4/strnlen.m4 libpipeline-1.5.0/gnulib/m4/strnlen.m4 +--- libpipeline-1.5.0-orig/gnulib/m4/strnlen.m4 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/m4/strnlen.m4 2018-07-02 13:10:06.846649400 +0300 +@@ -1,5 +1,5 @@ + # strnlen.m4 serial 13 +-dnl Copyright (C) 2002-2003, 2005-2007, 2009-2014 Free Software Foundation, ++dnl Copyright (C) 2002-2003, 2005-2007, 2009-2017 Free Software Foundation, + dnl Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, +diff -Naur libpipeline-1.5.0-orig/gnulib/m4/strsignal.m4 libpipeline-1.5.0/gnulib/m4/strsignal.m4 +--- libpipeline-1.5.0-orig/gnulib/m4/strsignal.m4 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/m4/strsignal.m4 2018-07-02 13:10:06.852649800 +0300 +@@ -1,5 +1,5 @@ + # strsignal.m4 serial 8 +-dnl Copyright (C) 2008-2014 Free Software Foundation, Inc. ++dnl Copyright (C) 2008-2017 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, + dnl with or without modifications, as long as this notice is preserved. +diff -Naur libpipeline-1.5.0-orig/gnulib/m4/sys_select_h.m4 libpipeline-1.5.0/gnulib/m4/sys_select_h.m4 +--- libpipeline-1.5.0-orig/gnulib/m4/sys_select_h.m4 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/m4/sys_select_h.m4 2018-07-02 13:10:06.856650000 +0300 +@@ -1,5 +1,5 @@ + # sys_select_h.m4 serial 20 +-dnl Copyright (C) 2006-2014 Free Software Foundation, Inc. ++dnl Copyright (C) 2006-2017 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, + dnl with or without modifications, as long as this notice is preserved. +diff -Naur libpipeline-1.5.0-orig/gnulib/m4/sys_socket_h.m4 libpipeline-1.5.0/gnulib/m4/sys_socket_h.m4 +--- libpipeline-1.5.0-orig/gnulib/m4/sys_socket_h.m4 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/m4/sys_socket_h.m4 2018-07-02 13:10:06.859650200 +0300 +@@ -1,5 +1,5 @@ + # sys_socket_h.m4 serial 23 +-dnl Copyright (C) 2005-2014 Free Software Foundation, Inc. ++dnl Copyright (C) 2005-2017 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, + dnl with or without modifications, as long as this notice is preserved. +diff -Naur libpipeline-1.5.0-orig/gnulib/m4/sys_stat_h.m4 libpipeline-1.5.0/gnulib/m4/sys_stat_h.m4 +--- libpipeline-1.5.0-orig/gnulib/m4/sys_stat_h.m4 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/m4/sys_stat_h.m4 2018-07-02 13:10:06.863650400 +0300 +@@ -1,5 +1,5 @@ +-# sys_stat_h.m4 serial 28 -*- Autoconf -*- +-dnl Copyright (C) 2006-2014 Free Software Foundation, Inc. ++# sys_stat_h.m4 serial 31 -*- Autoconf -*- ++dnl Copyright (C) 2006-2017 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, + dnl with or without modifications, as long as this notice is preserved. +@@ -19,18 +19,21 @@ + dnl Ensure the type mode_t gets defined. + AC_REQUIRE([AC_TYPE_MODE_T]) + +- dnl Whether to override 'struct stat'. ++ dnl Whether to enable precise timestamps in 'struct stat'. ++ m4_ifdef([gl_WINDOWS_STAT_TIMESPEC], [ ++ AC_REQUIRE([gl_WINDOWS_STAT_TIMESPEC]) ++ ], [ ++ WINDOWS_STAT_TIMESPEC=0 ++ ]) ++ AC_SUBST([WINDOWS_STAT_TIMESPEC]) ++ ++ dnl Whether to ensure that struct stat.st_size is 64-bit wide. + m4_ifdef([gl_LARGEFILE], [ + AC_REQUIRE([gl_LARGEFILE]) + ], [ + WINDOWS_64_BIT_ST_SIZE=0 + ]) + AC_SUBST([WINDOWS_64_BIT_ST_SIZE]) +- if test $WINDOWS_64_BIT_ST_SIZE = 1; then +- AC_DEFINE([_GL_WINDOWS_64_BIT_ST_SIZE], [1], +- [Define to 1 if Gnulib overrides 'struct stat' on Windows so that +- struct stat.st_size becomes 64-bit.]) +- fi + + dnl Define types that are supposed to be defined in or + dnl . +@@ -72,6 +75,7 @@ + GNULIB_MKNODAT=0; AC_SUBST([GNULIB_MKNODAT]) + GNULIB_STAT=0; AC_SUBST([GNULIB_STAT]) + GNULIB_UTIMENSAT=0; AC_SUBST([GNULIB_UTIMENSAT]) ++ GNULIB_OVERRIDES_STRUCT_STAT=0; AC_SUBST([GNULIB_OVERRIDES_STRUCT_STAT]) + dnl Assume proper GNU behavior unless another module says otherwise. + HAVE_FCHMODAT=1; AC_SUBST([HAVE_FCHMODAT]) + HAVE_FSTATAT=1; AC_SUBST([HAVE_FSTATAT]) +diff -Naur libpipeline-1.5.0-orig/gnulib/m4/sys_time_h.m4 libpipeline-1.5.0/gnulib/m4/sys_time_h.m4 +--- libpipeline-1.5.0-orig/gnulib/m4/sys_time_h.m4 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/m4/sys_time_h.m4 2018-07-02 13:10:06.867650600 +0300 +@@ -1,7 +1,7 @@ + # Configure a replacement for . +-# serial 8 ++# serial 9 + +-# Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc. ++# Copyright (C) 2007, 2009-2017 Free Software Foundation, Inc. + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +diff -Naur libpipeline-1.5.0-orig/gnulib/m4/sys_types_h.m4 libpipeline-1.5.0/gnulib/m4/sys_types_h.m4 +--- libpipeline-1.5.0-orig/gnulib/m4/sys_types_h.m4 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/m4/sys_types_h.m4 2018-07-02 13:10:06.871650900 +0300 +@@ -1,5 +1,5 @@ +-# sys_types_h.m4 serial 5 +-dnl Copyright (C) 2011-2014 Free Software Foundation, Inc. ++# sys_types_h.m4 serial 7 ++dnl Copyright (C) 2011-2017 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, + dnl with or without modifications, as long as this notice is preserved. +@@ -17,8 +17,41 @@ + + dnl Whether to override the 'off_t' type. + AC_REQUIRE([gl_TYPE_OFF_T]) ++ ++ dnl Whether to override the 'dev_t' and 'ino_t' types. ++ m4_ifdef([gl_WINDOWS_STAT_INODES], [ ++ AC_REQUIRE([gl_WINDOWS_STAT_INODES]) ++ ], [ ++ WINDOWS_STAT_INODES=0 ++ ]) ++ AC_SUBST([WINDOWS_STAT_INODES]) + ]) + + AC_DEFUN([gl_SYS_TYPES_H_DEFAULTS], + [ + ]) ++ ++# This works around a buggy version in autoconf <= 2.69. ++# See ++ ++m4_version_prereq([2.70], [], [ ++ ++# This is taken from the following Autoconf patch: ++# http://git.sv.gnu.org/cgit/autoconf.git/commit/?id=e17a30e98 ++ ++m4_undefine([AC_HEADER_MAJOR]) ++AC_DEFUN([AC_HEADER_MAJOR], ++[AC_CHECK_HEADERS_ONCE([sys/types.h]) ++AC_CHECK_HEADER([sys/mkdev.h], ++ [AC_DEFINE([MAJOR_IN_MKDEV], [1], ++ [Define to 1 if `major', `minor', and `makedev' are declared in ++ .])]) ++if test $ac_cv_header_sys_mkdev_h = no; then ++ AC_CHECK_HEADER([sys/sysmacros.h], ++ [AC_DEFINE([MAJOR_IN_SYSMACROS], [1], ++ [Define to 1 if `major', `minor', and `makedev' are declared in ++ .])]) ++fi ++]) ++ ++]) +diff -Naur libpipeline-1.5.0-orig/gnulib/m4/sys_wait_h.m4 libpipeline-1.5.0/gnulib/m4/sys_wait_h.m4 +--- libpipeline-1.5.0-orig/gnulib/m4/sys_wait_h.m4 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/m4/sys_wait_h.m4 2018-07-02 13:10:06.874651000 +0300 +@@ -1,5 +1,5 @@ + # sys_wait_h.m4 serial 6 +-dnl Copyright (C) 2008-2014 Free Software Foundation, Inc. ++dnl Copyright (C) 2008-2017 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, + dnl with or without modifications, as long as this notice is preserved. +diff -Naur libpipeline-1.5.0-orig/gnulib/m4/tempname.m4 libpipeline-1.5.0/gnulib/m4/tempname.m4 +--- libpipeline-1.5.0-orig/gnulib/m4/tempname.m4 2014-11-08 16:53:38.000000000 +0300 ++++ libpipeline-1.5.0/gnulib/m4/tempname.m4 2018-07-02 13:10:06.876651200 +0300 +@@ -1,6 +1,6 @@ + #serial 5 + +-# Copyright (C) 2006-2007, 2009-2014 Free Software Foundation, Inc. ++# Copyright (C) 2006-2007, 2009-2017 Free Software Foundation, Inc. + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +diff -Naur libpipeline-1.5.0-orig/gnulib/m4/threadlib.m4 libpipeline-1.5.0/gnulib/m4/threadlib.m4 +--- libpipeline-1.5.0-orig/gnulib/m4/threadlib.m4 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/m4/threadlib.m4 2018-07-02 13:10:06.879651300 +0300 +@@ -1,5 +1,5 @@ +-# threadlib.m4 serial 10 (gettext-0.18.2) +-dnl Copyright (C) 2005-2014 Free Software Foundation, Inc. ++# threadlib.m4 serial 12 ++dnl Copyright (C) 2005-2017 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, + dnl with or without modifications, as long as this notice is preserved. +@@ -22,7 +22,7 @@ + dnl Sets the variables LIBMULTITHREAD and LTLIBMULTITHREAD similarly, for + dnl programs that really need multithread functionality. The difference + dnl between LIBTHREAD and LIBMULTITHREAD is that on platforms supporting weak +-dnl symbols, typically LIBTHREAD="" whereas LIBMULTITHREAD="-lpthread". ++dnl symbols, typically LIBTHREAD is empty whereas LIBMULTITHREAD is not. + dnl Adds to CPPFLAGS the flag -D_REENTRANT or -D_THREAD_SAFE if needed for + dnl multithread-safe programs. + +@@ -162,15 +162,31 @@ + # Test whether both pthread_mutex_lock and pthread_mutexattr_init exist + # in libc. IRIX 6.5 has the first one in both libc and libpthread, but + # the second one only in libpthread, and lock.c needs it. +- AC_LINK_IFELSE( +- [AC_LANG_PROGRAM( +- [[#include ]], +- [[pthread_mutex_lock((pthread_mutex_t*)0); +- pthread_mutexattr_init((pthread_mutexattr_t*)0);]])], +- [gl_have_pthread=yes]) ++ # ++ # If -pthread works, prefer it to -lpthread, since Ubuntu 14.04 ++ # needs -pthread for some reason. See: ++ # http://lists.gnu.org/archive/html/bug-gnulib/2014-09/msg00023.html ++ save_LIBS=$LIBS ++ for gl_pthread in '' '-pthread'; do ++ LIBS="$LIBS $gl_pthread" ++ AC_LINK_IFELSE( ++ [AC_LANG_PROGRAM( ++ [[#include ++ pthread_mutex_t m; ++ pthread_mutexattr_t ma; ++ ]], ++ [[pthread_mutex_lock (&m); ++ pthread_mutexattr_init (&ma);]])], ++ [gl_have_pthread=yes ++ LIBTHREAD=$gl_pthread LTLIBTHREAD=$gl_pthread ++ LIBMULTITHREAD=$gl_pthread LTLIBMULTITHREAD=$gl_pthread]) ++ LIBS=$save_LIBS ++ test -n "$gl_have_pthread" && break ++ done ++ + # Test for libpthread by looking for pthread_kill. (Not pthread_self, + # since it is defined as a macro on OSF/1.) +- if test -n "$gl_have_pthread"; then ++ if test -n "$gl_have_pthread" && test -z "$LIBTHREAD"; then + # The program links fine without libpthread. But it may actually + # need to link with libpthread in order to create multiple threads. + AC_CHECK_LIB([pthread], [pthread_kill], +@@ -179,13 +195,15 @@ + # Therefore pthread_in_use() needs to actually try to create a + # thread: pthread_create from libc will fail, whereas + # pthread_create will actually create a thread. ++ # On Solaris 10 or newer, this test is no longer needed, because ++ # libc contains the fully functional pthread functions. + case "$host_os" in +- solaris* | hpux*) ++ solaris | solaris2.[1-9] | solaris2.[1-9].* | hpux*) + AC_DEFINE([PTHREAD_IN_USE_DETECTION_HARD], [1], + [Define if the pthread_in_use() detection is hard.]) + esac + ]) +- else ++ elif test -z "$gl_have_pthread"; then + # Some library is needed. Try libpthread and libc_r. + AC_CHECK_LIB([pthread], [pthread_kill], + [gl_have_pthread=yes +@@ -326,6 +344,8 @@ + dnl + dnl GNU Hurd/glibc posix + dnl ++dnl Ubuntu 14.04 posix -pthread Y OK ++dnl + dnl FreeBSD 5.3 posix -lc_r Y + dnl posix -lkse ? Y + dnl posix -lpthread ? Y +diff -Naur libpipeline-1.5.0-orig/gnulib/m4/time_h.m4 libpipeline-1.5.0/gnulib/m4/time_h.m4 +--- libpipeline-1.5.0-orig/gnulib/m4/time_h.m4 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/m4/time_h.m4 2018-07-02 13:10:06.882651500 +0300 +@@ -1,8 +1,8 @@ + # Configure a more-standard replacement for . + +-# Copyright (C) 2000-2001, 2003-2007, 2009-2014 Free Software Foundation, Inc. ++# Copyright (C) 2000-2001, 2003-2007, 2009-2017 Free Software Foundation, Inc. + +-# serial 8 ++# serial 11 + + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, +@@ -26,7 +26,7 @@ + ]) + + dnl Check whether 'struct timespec' is declared +-dnl in time.h, sys/time.h, or pthread.h. ++dnl in time.h, sys/time.h, pthread.h, or unistd.h. + + AC_DEFUN([gl_CHECK_TYPE_STRUCT_TIMESPEC], + [ +@@ -44,6 +44,7 @@ + TIME_H_DEFINES_STRUCT_TIMESPEC=0 + SYS_TIME_H_DEFINES_STRUCT_TIMESPEC=0 + PTHREAD_H_DEFINES_STRUCT_TIMESPEC=0 ++ UNISTD_H_DEFINES_STRUCT_TIMESPEC=0 + if test $gl_cv_sys_struct_timespec_in_time_h = yes; then + TIME_H_DEFINES_STRUCT_TIMESPEC=1 + else +@@ -70,12 +71,26 @@ + [gl_cv_sys_struct_timespec_in_pthread_h=no])]) + if test $gl_cv_sys_struct_timespec_in_pthread_h = yes; then + PTHREAD_H_DEFINES_STRUCT_TIMESPEC=1 ++ else ++ AC_CACHE_CHECK([for struct timespec in ], ++ [gl_cv_sys_struct_timespec_in_unistd_h], ++ [AC_COMPILE_IFELSE( ++ [AC_LANG_PROGRAM( ++ [[#include ++ ]], ++ [[static struct timespec x; x.tv_sec = x.tv_nsec;]])], ++ [gl_cv_sys_struct_timespec_in_unistd_h=yes], ++ [gl_cv_sys_struct_timespec_in_unistd_h=no])]) ++ if test $gl_cv_sys_struct_timespec_in_unistd_h = yes; then ++ UNISTD_H_DEFINES_STRUCT_TIMESPEC=1 ++ fi + fi + fi + fi + AC_SUBST([TIME_H_DEFINES_STRUCT_TIMESPEC]) + AC_SUBST([SYS_TIME_H_DEFINES_STRUCT_TIMESPEC]) + AC_SUBST([PTHREAD_H_DEFINES_STRUCT_TIMESPEC]) ++ AC_SUBST([UNISTD_H_DEFINES_STRUCT_TIMESPEC]) + ]) + + AC_DEFUN([gl_TIME_MODULE_INDICATOR], +@@ -89,23 +104,34 @@ + + AC_DEFUN([gl_HEADER_TIME_H_DEFAULTS], + [ ++ GNULIB_CTIME=0; AC_SUBST([GNULIB_CTIME]) + GNULIB_MKTIME=0; AC_SUBST([GNULIB_MKTIME]) ++ GNULIB_LOCALTIME=0; AC_SUBST([GNULIB_LOCALTIME]) + GNULIB_NANOSLEEP=0; AC_SUBST([GNULIB_NANOSLEEP]) ++ GNULIB_STRFTIME=0; AC_SUBST([GNULIB_STRFTIME]) + GNULIB_STRPTIME=0; AC_SUBST([GNULIB_STRPTIME]) + GNULIB_TIMEGM=0; AC_SUBST([GNULIB_TIMEGM]) + GNULIB_TIME_R=0; AC_SUBST([GNULIB_TIME_R]) ++ GNULIB_TIME_RZ=0; AC_SUBST([GNULIB_TIME_RZ]) ++ GNULIB_TZSET=0; AC_SUBST([GNULIB_TZSET]) + dnl Assume proper GNU behavior unless another module says otherwise. + HAVE_DECL_LOCALTIME_R=1; AC_SUBST([HAVE_DECL_LOCALTIME_R]) + HAVE_NANOSLEEP=1; AC_SUBST([HAVE_NANOSLEEP]) + HAVE_STRPTIME=1; AC_SUBST([HAVE_STRPTIME]) + HAVE_TIMEGM=1; AC_SUBST([HAVE_TIMEGM]) ++ HAVE_TZSET=1; AC_SUBST([HAVE_TZSET]) ++ dnl Even GNU libc does not have timezone_t yet. ++ HAVE_TIMEZONE_T=0; AC_SUBST([HAVE_TIMEZONE_T]) + dnl If another module says to replace or to not replace, do that. + dnl Otherwise, replace only if someone compiles with -DGNULIB_PORTCHECK; + dnl this lets maintainers check for portability. ++ REPLACE_CTIME=GNULIB_PORTCHECK; AC_SUBST([REPLACE_CTIME]) + REPLACE_LOCALTIME_R=GNULIB_PORTCHECK; AC_SUBST([REPLACE_LOCALTIME_R]) + REPLACE_MKTIME=GNULIB_PORTCHECK; AC_SUBST([REPLACE_MKTIME]) + REPLACE_NANOSLEEP=GNULIB_PORTCHECK; AC_SUBST([REPLACE_NANOSLEEP]) ++ REPLACE_STRFTIME=GNULIB_PORTCHECK; AC_SUBST([REPLACE_STRFTIME]) + REPLACE_TIMEGM=GNULIB_PORTCHECK; AC_SUBST([REPLACE_TIMEGM]) ++ REPLACE_TZSET=GNULIB_PORTCHECK; AC_SUBST([REPLACE_TZSET]) + + dnl Hack so that the time module doesn't depend on the sys_time module. + dnl First, default GNULIB_GETTIMEOFDAY to 0 if sys_time is absent. +diff -Naur libpipeline-1.5.0-orig/gnulib/m4/tls.m4 libpipeline-1.5.0/gnulib/m4/tls.m4 +--- libpipeline-1.5.0-orig/gnulib/m4/tls.m4 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/m4/tls.m4 2018-07-02 13:10:06.885651700 +0300 +@@ -1,5 +1,5 @@ + # tls.m4 serial 2 (gettext-0.18) +-dnl Copyright (C) 2005, 2008-2014 Free Software Foundation, Inc. ++dnl Copyright (C) 2005, 2008-2017 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, + dnl with or without modifications, as long as this notice is preserved. +diff -Naur libpipeline-1.5.0-orig/gnulib/m4/unistd_h.m4 libpipeline-1.5.0/gnulib/m4/unistd_h.m4 +--- libpipeline-1.5.0-orig/gnulib/m4/unistd_h.m4 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/m4/unistd_h.m4 2018-07-02 13:10:06.887651800 +0300 +@@ -1,5 +1,5 @@ +-# unistd_h.m4 serial 67 +-dnl Copyright (C) 2006-2014 Free Software Foundation, Inc. ++# unistd_h.m4 serial 70 ++dnl Copyright (C) 2006-2017 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, + dnl with or without modifications, as long as this notice is preserved. +@@ -46,8 +46,8 @@ + gethostname getlogin getlogin_r getpagesize + getusershell setusershell endusershell + group_member isatty lchown link linkat lseek pipe pipe2 pread pwrite +- readlink readlinkat rmdir sethostname sleep symlink symlinkat ttyname_r +- unlink unlinkat usleep]) ++ readlink readlinkat rmdir sethostname sleep symlink symlinkat ++ truncate ttyname_r unlink unlinkat usleep]) + ]) + + AC_DEFUN([gl_UNISTD_MODULE_INDICATOR], +@@ -102,6 +102,7 @@ + GNULIB_SLEEP=0; AC_SUBST([GNULIB_SLEEP]) + GNULIB_SYMLINK=0; AC_SUBST([GNULIB_SYMLINK]) + GNULIB_SYMLINKAT=0; AC_SUBST([GNULIB_SYMLINKAT]) ++ GNULIB_TRUNCATE=0; AC_SUBST([GNULIB_TRUNCATE]) + GNULIB_TTYNAME_R=0; AC_SUBST([GNULIB_TTYNAME_R]) + GNULIB_UNISTD_H_NONBLOCKING=0; AC_SUBST([GNULIB_UNISTD_H_NONBLOCKING]) + GNULIB_UNISTD_H_SIGPIPE=0; AC_SUBST([GNULIB_UNISTD_H_SIGPIPE]) +@@ -139,12 +140,14 @@ + HAVE_SLEEP=1; AC_SUBST([HAVE_SLEEP]) + HAVE_SYMLINK=1; AC_SUBST([HAVE_SYMLINK]) + HAVE_SYMLINKAT=1; AC_SUBST([HAVE_SYMLINKAT]) ++ HAVE_TRUNCATE=1; AC_SUBST([HAVE_TRUNCATE]) + HAVE_UNLINKAT=1; AC_SUBST([HAVE_UNLINKAT]) + HAVE_USLEEP=1; AC_SUBST([HAVE_USLEEP]) + HAVE_DECL_ENVIRON=1; AC_SUBST([HAVE_DECL_ENVIRON]) + HAVE_DECL_FCHDIR=1; AC_SUBST([HAVE_DECL_FCHDIR]) + HAVE_DECL_FDATASYNC=1; AC_SUBST([HAVE_DECL_FDATASYNC]) + HAVE_DECL_GETDOMAINNAME=1; AC_SUBST([HAVE_DECL_GETDOMAINNAME]) ++ HAVE_DECL_GETLOGIN=1; AC_SUBST([HAVE_DECL_GETLOGIN]) + HAVE_DECL_GETLOGIN_R=1; AC_SUBST([HAVE_DECL_GETLOGIN_R]) + HAVE_DECL_GETPAGESIZE=1; AC_SUBST([HAVE_DECL_GETPAGESIZE]) + HAVE_DECL_GETUSERSHELL=1; AC_SUBST([HAVE_DECL_GETUSERSHELL]) +@@ -173,9 +176,12 @@ + REPLACE_PWRITE=0; AC_SUBST([REPLACE_PWRITE]) + REPLACE_READ=0; AC_SUBST([REPLACE_READ]) + REPLACE_READLINK=0; AC_SUBST([REPLACE_READLINK]) ++ REPLACE_READLINKAT=0; AC_SUBST([REPLACE_READLINKAT]) + REPLACE_RMDIR=0; AC_SUBST([REPLACE_RMDIR]) + REPLACE_SLEEP=0; AC_SUBST([REPLACE_SLEEP]) + REPLACE_SYMLINK=0; AC_SUBST([REPLACE_SYMLINK]) ++ REPLACE_SYMLINKAT=0; AC_SUBST([REPLACE_SYMLINKAT]) ++ REPLACE_TRUNCATE=0; AC_SUBST([REPLACE_TRUNCATE]) + REPLACE_TTYNAME_R=0; AC_SUBST([REPLACE_TTYNAME_R]) + REPLACE_UNLINK=0; AC_SUBST([REPLACE_UNLINK]) + REPLACE_UNLINKAT=0; AC_SUBST([REPLACE_UNLINKAT]) +diff -Naur libpipeline-1.5.0-orig/gnulib/m4/vasnprintf.m4 libpipeline-1.5.0/gnulib/m4/vasnprintf.m4 +--- libpipeline-1.5.0-orig/gnulib/m4/vasnprintf.m4 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/m4/vasnprintf.m4 2018-07-02 13:10:06.889651900 +0300 +@@ -1,5 +1,5 @@ + # vasnprintf.m4 serial 36 +-dnl Copyright (C) 2002-2004, 2006-2014 Free Software Foundation, Inc. ++dnl Copyright (C) 2002-2004, 2006-2017 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, + dnl with or without modifications, as long as this notice is preserved. +diff -Naur libpipeline-1.5.0-orig/gnulib/m4/vasprintf.m4 libpipeline-1.5.0/gnulib/m4/vasprintf.m4 +--- libpipeline-1.5.0-orig/gnulib/m4/vasprintf.m4 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/m4/vasprintf.m4 2018-07-02 13:10:06.892652100 +0300 +@@ -1,5 +1,5 @@ + # vasprintf.m4 serial 6 +-dnl Copyright (C) 2002-2003, 2006-2007, 2009-2014 Free Software Foundation, ++dnl Copyright (C) 2002-2003, 2006-2007, 2009-2017 Free Software Foundation, + dnl Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, +diff -Naur libpipeline-1.5.0-orig/gnulib/m4/waitpid.m4 libpipeline-1.5.0/gnulib/m4/waitpid.m4 +--- libpipeline-1.5.0-orig/gnulib/m4/waitpid.m4 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/m4/waitpid.m4 2018-07-02 13:10:06.895652200 +0300 +@@ -1,5 +1,5 @@ + # waitpid.m4 serial 2 +-dnl Copyright (C) 2010-2014 Free Software Foundation, Inc. ++dnl Copyright (C) 2010-2017 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, + dnl with or without modifications, as long as this notice is preserved. +diff -Naur libpipeline-1.5.0-orig/gnulib/m4/warnings.m4 libpipeline-1.5.0/gnulib/m4/warnings.m4 +--- libpipeline-1.5.0-orig/gnulib/m4/warnings.m4 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/m4/warnings.m4 2018-07-02 13:10:06.898652400 +0300 +@@ -1,5 +1,5 @@ + # warnings.m4 serial 11 +-dnl Copyright (C) 2008-2014 Free Software Foundation, Inc. ++dnl Copyright (C) 2008-2017 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, + dnl with or without modifications, as long as this notice is preserved. +diff -Naur libpipeline-1.5.0-orig/gnulib/m4/warn-on-use.m4 libpipeline-1.5.0/gnulib/m4/warn-on-use.m4 +--- libpipeline-1.5.0-orig/gnulib/m4/warn-on-use.m4 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/m4/warn-on-use.m4 2018-07-02 13:10:06.900652500 +0300 +@@ -1,5 +1,5 @@ + # warn-on-use.m4 serial 5 +-dnl Copyright (C) 2010-2014 Free Software Foundation, Inc. ++dnl Copyright (C) 2010-2017 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, + dnl with or without modifications, as long as this notice is preserved. +diff -Naur libpipeline-1.5.0-orig/gnulib/m4/wchar_h.m4 libpipeline-1.5.0/gnulib/m4/wchar_h.m4 +--- libpipeline-1.5.0-orig/gnulib/m4/wchar_h.m4 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/m4/wchar_h.m4 2018-07-02 13:10:06.903652700 +0300 +@@ -1,13 +1,13 @@ + dnl A placeholder for ISO C99 , for platforms that have issues. + +-dnl Copyright (C) 2007-2014 Free Software Foundation, Inc. ++dnl Copyright (C) 2007-2017 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, + dnl with or without modifications, as long as this notice is preserved. + + dnl Written by Eric Blake. + +-# wchar_h.m4 serial 39 ++# wchar_h.m4 serial 42 + + AC_DEFUN([gl_WCHAR_H], + [ +@@ -35,6 +35,8 @@ + fi + AC_SUBST([HAVE_WINT_T]) + ++ AC_REQUIRE([gl_TYPE_WINT_T_PREREQ]) ++ + dnl Check for declarations of anything we want to poison if the + dnl corresponding gnulib module is not in use. + gl_WARN_ON_USE_PREPARE([[ +@@ -53,7 +55,7 @@ + wcsrtombs wcsnrtombs wcwidth wmemchr wmemcmp wmemcpy wmemmove wmemset + wcslen wcsnlen wcscpy wcpcpy wcsncpy wcpncpy wcscat wcsncat wcscmp + wcsncmp wcscasecmp wcsncasecmp wcscoll wcsxfrm wcsdup wcschr wcsrchr +- wcscspn wcsspn wcspbrk wcsstr wcstok wcswidth ++ wcscspn wcsspn wcspbrk wcsstr wcstok wcswidth wcsftime + ]) + ]) + +@@ -81,8 +83,14 @@ + extern int zero (void); + int main () { return zero(); } + ]])]) ++ dnl Do not rename the object file from conftest.$ac_objext to ++ dnl conftest1.$ac_objext, as this will cause the link to fail on ++ dnl z/OS when using the XPLINK object format (due to duplicate ++ dnl CSECT names). Instead, temporarily redefine $ac_compile so ++ dnl that the object file has the latter name from the start. ++ save_ac_compile="$ac_compile" ++ ac_compile=`echo "$save_ac_compile" | sed s/conftest/conftest1/` + if AC_TRY_EVAL([ac_compile]); then +- mv conftest.$ac_objext conftest1.$ac_objext + AC_LANG_CONFTEST([ + AC_LANG_SOURCE([[#define wcstod renamed_wcstod + /* Tru64 with Desktop Toolkit C has a bug: must be included before +@@ -95,8 +103,9 @@ + #include + int zero (void) { return 0; } + ]])]) ++ dnl See note above about renaming object files. ++ ac_compile=`echo "$save_ac_compile" | sed s/conftest/conftest2/` + if AC_TRY_EVAL([ac_compile]); then +- mv conftest.$ac_objext conftest2.$ac_objext + if $CC -o conftest$ac_exeext $CFLAGS $LDFLAGS conftest1.$ac_objext conftest2.$ac_objext $LIBS >&AS_MESSAGE_LOG_FD 2>&1; then + : + else +@@ -104,6 +113,7 @@ + fi + fi + fi ++ ac_compile="$save_ac_compile" + rm -f conftest1.$ac_objext conftest2.$ac_objext conftest$ac_exeext + ]) + if test $gl_cv_header_wchar_h_correct_inline = no; then +@@ -169,6 +179,7 @@ + GNULIB_WCSSTR=0; AC_SUBST([GNULIB_WCSSTR]) + GNULIB_WCSTOK=0; AC_SUBST([GNULIB_WCSTOK]) + GNULIB_WCSWIDTH=0; AC_SUBST([GNULIB_WCSWIDTH]) ++ GNULIB_WCSFTIME=0; AC_SUBST([GNULIB_WCSFTIME]) + dnl Assume proper GNU behavior unless another module says otherwise. + HAVE_BTOWC=1; AC_SUBST([HAVE_BTOWC]) + HAVE_MBSINIT=1; AC_SUBST([HAVE_MBSINIT]) +@@ -207,6 +218,7 @@ + HAVE_WCSSTR=1; AC_SUBST([HAVE_WCSSTR]) + HAVE_WCSTOK=1; AC_SUBST([HAVE_WCSTOK]) + HAVE_WCSWIDTH=1; AC_SUBST([HAVE_WCSWIDTH]) ++ HAVE_WCSFTIME=1; AC_SUBST([HAVE_WCSFTIME]) + HAVE_DECL_WCTOB=1; AC_SUBST([HAVE_DECL_WCTOB]) + HAVE_DECL_WCWIDTH=1; AC_SUBST([HAVE_DECL_WCWIDTH]) + REPLACE_MBSTATE_T=0; AC_SUBST([REPLACE_MBSTATE_T]) +@@ -222,4 +234,5 @@ + REPLACE_WCSNRTOMBS=0; AC_SUBST([REPLACE_WCSNRTOMBS]) + REPLACE_WCWIDTH=0; AC_SUBST([REPLACE_WCWIDTH]) + REPLACE_WCSWIDTH=0; AC_SUBST([REPLACE_WCSWIDTH]) ++ REPLACE_WCSFTIME=0; AC_SUBST([REPLACE_WCSFTIME]) + ]) +diff -Naur libpipeline-1.5.0-orig/gnulib/m4/wchar_t.m4 libpipeline-1.5.0/gnulib/m4/wchar_t.m4 +--- libpipeline-1.5.0-orig/gnulib/m4/wchar_t.m4 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/m4/wchar_t.m4 2018-07-02 13:10:06.905652800 +0300 +@@ -1,5 +1,5 @@ + # wchar_t.m4 serial 4 (gettext-0.18.2) +-dnl Copyright (C) 2002-2003, 2008-2014 Free Software Foundation, Inc. ++dnl Copyright (C) 2002-2003, 2008-2017 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, + dnl with or without modifications, as long as this notice is preserved. +diff -Naur libpipeline-1.5.0-orig/gnulib/m4/wint_t.m4 libpipeline-1.5.0/gnulib/m4/wint_t.m4 +--- libpipeline-1.5.0-orig/gnulib/m4/wint_t.m4 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/m4/wint_t.m4 2018-07-02 13:10:06.907652900 +0300 +@@ -1,11 +1,12 @@ +-# wint_t.m4 serial 5 (gettext-0.18.2) +-dnl Copyright (C) 2003, 2007-2014 Free Software Foundation, Inc. ++# wint_t.m4 serial 7 ++dnl Copyright (C) 2003, 2007-2017 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, + dnl with or without modifications, as long as this notice is preserved. + + dnl From Bruno Haible. +-dnl Test whether has the 'wint_t' type. ++dnl Test whether has the 'wint_t' type and whether gnulib's ++dnl or would, if present, override 'wint_t'. + dnl Prerequisite: AC_PROG_CC + + AC_DEFUN([gt_TYPE_WINT_T], +@@ -28,5 +29,46 @@ + [gt_cv_c_wint_t=no])]) + if test $gt_cv_c_wint_t = yes; then + AC_DEFINE([HAVE_WINT_T], [1], [Define if you have the 'wint_t' type.]) ++ ++ dnl Determine whether gnulib's or would, if present, ++ dnl override 'wint_t'. ++ AC_CACHE_CHECK([whether wint_t is too small], ++ [gl_cv_type_wint_t_too_small], ++ [AC_COMPILE_IFELSE( ++ [AC_LANG_PROGRAM([[ ++/* Tru64 with Desktop Toolkit C has a bug: must be included before ++ . ++ BSD/OS 4.0.1 has a bug: , and must be ++ included before . */ ++#if !(defined __GLIBC__ && !defined __UCLIBC__) ++# include ++# include ++# include ++#endif ++#include ++ int verify[sizeof (wint_t) < sizeof (int) ? -1 : 1]; ++ ]])], ++ [gl_cv_type_wint_t_too_small=no], ++ [gl_cv_type_wint_t_too_small=yes])]) ++ if test $gl_cv_type_wint_t_too_small = yes; then ++ GNULIB_OVERRIDES_WINT_T=1 ++ else ++ GNULIB_OVERRIDES_WINT_T=0 ++ fi ++ else ++ GNULIB_OVERRIDES_WINT_T=0 ++ fi ++ AC_SUBST([GNULIB_OVERRIDES_WINT_T]) ++]) ++ ++dnl Prerequisites of the 'wint_t' override. ++AC_DEFUN([gl_TYPE_WINT_T_PREREQ], ++[ ++ AC_CHECK_HEADERS_ONCE([crtdefs.h]) ++ if test $ac_cv_header_crtdefs_h = yes; then ++ HAVE_CRTDEFS_H=1 ++ else ++ HAVE_CRTDEFS_H=0 + fi ++ AC_SUBST([HAVE_CRTDEFS_H]) + ]) +diff -Naur libpipeline-1.5.0-orig/gnulib/m4/write.m4 libpipeline-1.5.0/gnulib/m4/write.m4 +--- libpipeline-1.5.0-orig/gnulib/m4/write.m4 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/m4/write.m4 2018-07-02 13:10:06.910653100 +0300 +@@ -1,5 +1,5 @@ +-# write.m4 serial 5 +-dnl Copyright (C) 2008-2014 Free Software Foundation, Inc. ++# write.m4 serial 6 ++dnl Copyright (C) 2008-2017 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, + dnl with or without modifications, as long as this notice is preserved. +@@ -7,10 +7,12 @@ + AC_DEFUN([gl_FUNC_WRITE], + [ + AC_REQUIRE([gl_UNISTD_H_DEFAULTS]) +- AC_REQUIRE([gl_MSVC_INVAL]) +- if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then +- REPLACE_WRITE=1 +- fi ++ m4_ifdef([gl_MSVC_INVAL], [ ++ AC_REQUIRE([gl_MSVC_INVAL]) ++ if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then ++ REPLACE_WRITE=1 ++ fi ++ ]) + dnl This ifdef is just an optimization, to avoid performing a configure + dnl check whose result is not used. It does not make the test of + dnl GNULIB_UNISTD_H_SIGPIPE or GNULIB_SIGPIPE redundant. +diff -Naur libpipeline-1.5.0-orig/gnulib/m4/xalloc.m4 libpipeline-1.5.0/gnulib/m4/xalloc.m4 +--- libpipeline-1.5.0-orig/gnulib/m4/xalloc.m4 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/m4/xalloc.m4 2018-07-02 13:10:06.913653300 +0300 +@@ -1,5 +1,5 @@ + # xalloc.m4 serial 18 +-dnl Copyright (C) 2002-2006, 2009-2014 Free Software Foundation, Inc. ++dnl Copyright (C) 2002-2006, 2009-2017 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, + dnl with or without modifications, as long as this notice is preserved. +diff -Naur libpipeline-1.5.0-orig/gnulib/m4/xsize.m4 libpipeline-1.5.0/gnulib/m4/xsize.m4 +--- libpipeline-1.5.0-orig/gnulib/m4/xsize.m4 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/m4/xsize.m4 2018-07-02 13:10:06.915653400 +0300 +@@ -1,5 +1,5 @@ + # xsize.m4 serial 5 +-dnl Copyright (C) 2003-2004, 2008-2014 Free Software Foundation, Inc. ++dnl Copyright (C) 2003-2004, 2008-2017 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, + dnl with or without modifications, as long as this notice is preserved. +diff -Naur libpipeline-1.5.0-orig/gnulib/m4/xstrndup.m4 libpipeline-1.5.0/gnulib/m4/xstrndup.m4 +--- libpipeline-1.5.0-orig/gnulib/m4/xstrndup.m4 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/m4/xstrndup.m4 2018-07-02 13:10:06.917653500 +0300 +@@ -1,5 +1,5 @@ + # xstrndup.m4 serial 2 +-dnl Copyright (C) 2003, 2009-2014 Free Software Foundation, Inc. ++dnl Copyright (C) 2003, 2009-2017 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, + dnl with or without modifications, as long as this notice is preserved. +diff -Naur libpipeline-1.5.0-orig/gnulib/m4/xvasprintf.m4 libpipeline-1.5.0/gnulib/m4/xvasprintf.m4 +--- libpipeline-1.5.0-orig/gnulib/m4/xvasprintf.m4 2014-08-03 17:31:22.000000000 +0400 ++++ libpipeline-1.5.0/gnulib/m4/xvasprintf.m4 2018-07-02 13:10:06.919653600 +0300 +@@ -1,5 +1,5 @@ + # xvasprintf.m4 serial 2 +-dnl Copyright (C) 2006, 2009-2014 Free Software Foundation, Inc. ++dnl Copyright (C) 2006, 2009-2017 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, + dnl with or without modifications, as long as this notice is preserved. +diff -Naur libpipeline-1.5.0-orig/lib/Makefile.in libpipeline-1.5.0/lib/Makefile.in +--- libpipeline-1.5.0-orig/lib/Makefile.in 2017-11-14 13:51:02.000000000 +0300 ++++ libpipeline-1.5.0/lib/Makefile.in 2018-07-02 13:10:06.922653800 +0300 +@@ -108,6 +108,7 @@ + $(top_srcdir)/gnulib/m4/fcntl-o.m4 \ + $(top_srcdir)/gnulib/m4/fcntl_h.m4 \ + $(top_srcdir)/gnulib/m4/float_h.m4 \ ++ $(top_srcdir)/gnulib/m4/getprogname.m4 \ + $(top_srcdir)/gnulib/m4/gettimeofday.m4 \ + $(top_srcdir)/gnulib/m4/gnulib-common.m4 \ + $(top_srcdir)/gnulib/m4/gnulib-comp.m4 \ +@@ -120,6 +121,8 @@ + $(top_srcdir)/gnulib/m4/lib-link.m4 \ + $(top_srcdir)/gnulib/m4/lib-prefix.m4 \ + $(top_srcdir)/gnulib/m4/libtool.m4 \ ++ $(top_srcdir)/gnulib/m4/limits-h.m4 \ ++ $(top_srcdir)/gnulib/m4/localtime-buffer.m4 \ + $(top_srcdir)/gnulib/m4/lock.m4 \ + $(top_srcdir)/gnulib/m4/longlong.m4 \ + $(top_srcdir)/gnulib/m4/lstat.m4 \ +@@ -139,6 +142,7 @@ + $(top_srcdir)/gnulib/m4/onceonly.m4 \ + $(top_srcdir)/gnulib/m4/pathmax.m4 \ + $(top_srcdir)/gnulib/m4/printf.m4 \ ++ $(top_srcdir)/gnulib/m4/pthread_rwlock_rdlock.m4 \ + $(top_srcdir)/gnulib/m4/raise.m4 \ + $(top_srcdir)/gnulib/m4/read.m4 \ + $(top_srcdir)/gnulib/m4/safe-read.m4 \ +@@ -355,6 +359,7 @@ + GNULIB_CHDIR = @GNULIB_CHDIR@ + GNULIB_CHOWN = @GNULIB_CHOWN@ + GNULIB_CLOSE = @GNULIB_CLOSE@ ++GNULIB_CTIME = @GNULIB_CTIME@ + GNULIB_DPRINTF = @GNULIB_DPRINTF@ + GNULIB_DUP = @GNULIB_DUP@ + GNULIB_DUP2 = @GNULIB_DUP2@ +@@ -416,6 +421,7 @@ + GNULIB_LCHOWN = @GNULIB_LCHOWN@ + GNULIB_LINK = @GNULIB_LINK@ + GNULIB_LINKAT = @GNULIB_LINKAT@ ++GNULIB_LOCALTIME = @GNULIB_LOCALTIME@ + GNULIB_LSEEK = @GNULIB_LSEEK@ + GNULIB_LSTAT = @GNULIB_LSTAT@ + GNULIB_MALLOC_POSIX = @GNULIB_MALLOC_POSIX@ +@@ -460,6 +466,8 @@ + GNULIB_OBSTACK_PRINTF_POSIX = @GNULIB_OBSTACK_PRINTF_POSIX@ + GNULIB_OPEN = @GNULIB_OPEN@ + GNULIB_OPENAT = @GNULIB_OPENAT@ ++GNULIB_OVERRIDES_STRUCT_STAT = @GNULIB_OVERRIDES_STRUCT_STAT@ ++GNULIB_OVERRIDES_WINT_T = @GNULIB_OVERRIDES_WINT_T@ + GNULIB_PCLOSE = @GNULIB_PCLOSE@ + GNULIB_PERROR = @GNULIB_PERROR@ + GNULIB_PIPE = @GNULIB_PIPE@ +@@ -478,6 +486,7 @@ + GNULIB_PUTENV = @GNULIB_PUTENV@ + GNULIB_PUTS = @GNULIB_PUTS@ + GNULIB_PWRITE = @GNULIB_PWRITE@ ++GNULIB_QSORT_R = @GNULIB_QSORT_R@ + GNULIB_RAISE = @GNULIB_RAISE@ + GNULIB_RANDOM = @GNULIB_RANDOM@ + GNULIB_RANDOM_R = @GNULIB_RANDOM_R@ +@@ -513,6 +522,7 @@ + GNULIB_STRDUP = @GNULIB_STRDUP@ + GNULIB_STRERROR = @GNULIB_STRERROR@ + GNULIB_STRERROR_R = @GNULIB_STRERROR_R@ ++GNULIB_STRFTIME = @GNULIB_STRFTIME@ + GNULIB_STRNCAT = @GNULIB_STRNCAT@ + GNULIB_STRNDUP = @GNULIB_STRNDUP@ + GNULIB_STRNLEN = @GNULIB_STRNLEN@ +@@ -531,8 +541,11 @@ + GNULIB_SYSTEM_POSIX = @GNULIB_SYSTEM_POSIX@ + GNULIB_TIMEGM = @GNULIB_TIMEGM@ + GNULIB_TIME_R = @GNULIB_TIME_R@ ++GNULIB_TIME_RZ = @GNULIB_TIME_RZ@ + GNULIB_TMPFILE = @GNULIB_TMPFILE@ ++GNULIB_TRUNCATE = @GNULIB_TRUNCATE@ + GNULIB_TTYNAME_R = @GNULIB_TTYNAME_R@ ++GNULIB_TZSET = @GNULIB_TZSET@ + GNULIB_UNISTD_H_NONBLOCKING = @GNULIB_UNISTD_H_NONBLOCKING@ + GNULIB_UNISTD_H_SIGPIPE = @GNULIB_UNISTD_H_SIGPIPE@ + GNULIB_UNLINK = @GNULIB_UNLINK@ +@@ -563,6 +576,7 @@ + GNULIB_WCSCPY = @GNULIB_WCSCPY@ + GNULIB_WCSCSPN = @GNULIB_WCSCSPN@ + GNULIB_WCSDUP = @GNULIB_WCSDUP@ ++GNULIB_WCSFTIME = @GNULIB_WCSFTIME@ + GNULIB_WCSLEN = @GNULIB_WCSLEN@ + GNULIB_WCSNCASECMP = @GNULIB_WCSNCASECMP@ + GNULIB_WCSNCAT = @GNULIB_WCSNCAT@ +@@ -591,8 +605,10 @@ + GREP = @GREP@ + HAVE_ATOLL = @HAVE_ATOLL@ + HAVE_BTOWC = @HAVE_BTOWC@ ++HAVE_C99_STDINT_H = @HAVE_C99_STDINT_H@ + HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@ + HAVE_CHOWN = @HAVE_CHOWN@ ++HAVE_CRTDEFS_H = @HAVE_CRTDEFS_H@ + HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@ + HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@ + HAVE_DECL_FDATASYNC = @HAVE_DECL_FDATASYNC@ +@@ -603,6 +619,7 @@ + HAVE_DECL_GETDOMAINNAME = @HAVE_DECL_GETDOMAINNAME@ + HAVE_DECL_GETLINE = @HAVE_DECL_GETLINE@ + HAVE_DECL_GETLOADAVG = @HAVE_DECL_GETLOADAVG@ ++HAVE_DECL_GETLOGIN = @HAVE_DECL_GETLOGIN@ + HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@ + HAVE_DECL_GETPAGESIZE = @HAVE_DECL_GETPAGESIZE@ + HAVE_DECL_GETUSERSHELL = @HAVE_DECL_GETUSERSHELL@ +@@ -659,6 +676,7 @@ + HAVE_LINKAT = @HAVE_LINKAT@ + HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@ + HAVE_LSTAT = @HAVE_LSTAT@ ++HAVE_MAX_ALIGN_T = @HAVE_MAX_ALIGN_T@ + HAVE_MBRLEN = @HAVE_MBRLEN@ + HAVE_MBRTOWC = @HAVE_MBRTOWC@ + HAVE_MBSINIT = @HAVE_MBSINIT@ +@@ -693,6 +711,7 @@ + HAVE_PTSNAME = @HAVE_PTSNAME@ + HAVE_PTSNAME_R = @HAVE_PTSNAME_R@ + HAVE_PWRITE = @HAVE_PWRITE@ ++HAVE_QSORT_R = @HAVE_QSORT_R@ + HAVE_RAISE = @HAVE_RAISE@ + HAVE_RANDOM = @HAVE_RANDOM@ + HAVE_RANDOM_H = @HAVE_RANDOM_H@ +@@ -739,7 +758,10 @@ + HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@ + HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@ + HAVE_TIMEGM = @HAVE_TIMEGM@ ++HAVE_TIMEZONE_T = @HAVE_TIMEZONE_T@ ++HAVE_TRUNCATE = @HAVE_TRUNCATE@ + HAVE_TYPE_VOLATILE_SIG_ATOMIC_T = @HAVE_TYPE_VOLATILE_SIG_ATOMIC_T@ ++HAVE_TZSET = @HAVE_TZSET@ + HAVE_UNISTD_H = @HAVE_UNISTD_H@ + HAVE_UNLINKAT = @HAVE_UNLINKAT@ + HAVE_UNLOCKPT = @HAVE_UNLOCKPT@ +@@ -761,6 +783,7 @@ + HAVE_WCSCPY = @HAVE_WCSCPY@ + HAVE_WCSCSPN = @HAVE_WCSCSPN@ + HAVE_WCSDUP = @HAVE_WCSDUP@ ++HAVE_WCSFTIME = @HAVE_WCSFTIME@ + HAVE_WCSLEN = @HAVE_WCSLEN@ + HAVE_WCSNCASECMP = @HAVE_WCSNCASECMP@ + HAVE_WCSNCAT = @HAVE_WCSNCAT@ +@@ -803,6 +826,7 @@ + LIBS = @LIBS@ + LIBTHREAD = @LIBTHREAD@ + LIBTOOL = @LIBTOOL@ ++LIMITS_H = @LIMITS_H@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBINTL = @LTLIBINTL@ +@@ -818,6 +842,7 @@ + NEXT_AS_FIRST_DIRECTIVE_ERRNO_H = @NEXT_AS_FIRST_DIRECTIVE_ERRNO_H@ + NEXT_AS_FIRST_DIRECTIVE_FCNTL_H = @NEXT_AS_FIRST_DIRECTIVE_FCNTL_H@ + NEXT_AS_FIRST_DIRECTIVE_FLOAT_H = @NEXT_AS_FIRST_DIRECTIVE_FLOAT_H@ ++NEXT_AS_FIRST_DIRECTIVE_LIMITS_H = @NEXT_AS_FIRST_DIRECTIVE_LIMITS_H@ + NEXT_AS_FIRST_DIRECTIVE_SIGNAL_H = @NEXT_AS_FIRST_DIRECTIVE_SIGNAL_H@ + NEXT_AS_FIRST_DIRECTIVE_STDARG_H = @NEXT_AS_FIRST_DIRECTIVE_STDARG_H@ + NEXT_AS_FIRST_DIRECTIVE_STDDEF_H = @NEXT_AS_FIRST_DIRECTIVE_STDDEF_H@ +@@ -836,6 +861,7 @@ + NEXT_ERRNO_H = @NEXT_ERRNO_H@ + NEXT_FCNTL_H = @NEXT_FCNTL_H@ + NEXT_FLOAT_H = @NEXT_FLOAT_H@ ++NEXT_LIMITS_H = @NEXT_LIMITS_H@ + NEXT_SIGNAL_H = @NEXT_SIGNAL_H@ + NEXT_STDARG_H = @NEXT_STDARG_H@ + NEXT_STDDEF_H = @NEXT_STDDEF_H@ +@@ -878,6 +904,7 @@ + REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@ + REPLACE_CHOWN = @REPLACE_CHOWN@ + REPLACE_CLOSE = @REPLACE_CLOSE@ ++REPLACE_CTIME = @REPLACE_CTIME@ + REPLACE_DPRINTF = @REPLACE_DPRINTF@ + REPLACE_DUP = @REPLACE_DUP@ + REPLACE_DUP2 = @REPLACE_DUP2@ +@@ -947,10 +974,12 @@ + REPLACE_PTSNAME_R = @REPLACE_PTSNAME_R@ + REPLACE_PUTENV = @REPLACE_PUTENV@ + REPLACE_PWRITE = @REPLACE_PWRITE@ ++REPLACE_QSORT_R = @REPLACE_QSORT_R@ + REPLACE_RAISE = @REPLACE_RAISE@ + REPLACE_RANDOM_R = @REPLACE_RANDOM_R@ + REPLACE_READ = @REPLACE_READ@ + REPLACE_READLINK = @REPLACE_READLINK@ ++REPLACE_READLINKAT = @REPLACE_READLINKAT@ + REPLACE_REALLOC = @REPLACE_REALLOC@ + REPLACE_REALPATH = @REPLACE_REALPATH@ + REPLACE_REMOVE = @REPLACE_REMOVE@ +@@ -971,6 +1000,7 @@ + REPLACE_STRDUP = @REPLACE_STRDUP@ + REPLACE_STRERROR = @REPLACE_STRERROR@ + REPLACE_STRERROR_R = @REPLACE_STRERROR_R@ ++REPLACE_STRFTIME = @REPLACE_STRFTIME@ + REPLACE_STRNCAT = @REPLACE_STRNCAT@ + REPLACE_STRNDUP = @REPLACE_STRNDUP@ + REPLACE_STRNLEN = @REPLACE_STRNLEN@ +@@ -980,9 +1010,12 @@ + REPLACE_STRTOK_R = @REPLACE_STRTOK_R@ + REPLACE_STRUCT_TIMEVAL = @REPLACE_STRUCT_TIMEVAL@ + REPLACE_SYMLINK = @REPLACE_SYMLINK@ ++REPLACE_SYMLINKAT = @REPLACE_SYMLINKAT@ + REPLACE_TIMEGM = @REPLACE_TIMEGM@ + REPLACE_TMPFILE = @REPLACE_TMPFILE@ ++REPLACE_TRUNCATE = @REPLACE_TRUNCATE@ + REPLACE_TTYNAME_R = @REPLACE_TTYNAME_R@ ++REPLACE_TZSET = @REPLACE_TZSET@ + REPLACE_UNLINK = @REPLACE_UNLINK@ + REPLACE_UNLINKAT = @REPLACE_UNLINKAT@ + REPLACE_UNSETENV = @REPLACE_UNSETENV@ +@@ -995,6 +1028,7 @@ + REPLACE_VSNPRINTF = @REPLACE_VSNPRINTF@ + REPLACE_VSPRINTF = @REPLACE_VSPRINTF@ + REPLACE_WCRTOMB = @REPLACE_WCRTOMB@ ++REPLACE_WCSFTIME = @REPLACE_WCSFTIME@ + REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@ + REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@ + REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@ +@@ -1015,6 +1049,7 @@ + SYS_TIME_H_DEFINES_STRUCT_TIMESPEC = @SYS_TIME_H_DEFINES_STRUCT_TIMESPEC@ + TIME_H_DEFINES_STRUCT_TIMESPEC = @TIME_H_DEFINES_STRUCT_TIMESPEC@ + UNDEFINE_STRTOK_R = @UNDEFINE_STRTOK_R@ ++UNISTD_H_DEFINES_STRUCT_TIMESPEC = @UNISTD_H_DEFINES_STRUCT_TIMESPEC@ + UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@ + UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS = @UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS@ + VERSION = @VERSION@ +@@ -1022,6 +1057,8 @@ + WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@ + WINDOWS_64_BIT_OFF_T = @WINDOWS_64_BIT_OFF_T@ + WINDOWS_64_BIT_ST_SIZE = @WINDOWS_64_BIT_ST_SIZE@ ++WINDOWS_STAT_INODES = @WINDOWS_STAT_INODES@ ++WINDOWS_STAT_TIMESPEC = @WINDOWS_STAT_TIMESPEC@ + WINT_T_SUFFIX = @WINT_T_SUFFIX@ + abs_builddir = @abs_builddir@ + abs_srcdir = @abs_srcdir@ +diff -Naur libpipeline-1.5.0-orig/Makefile.in libpipeline-1.5.0/Makefile.in +--- libpipeline-1.5.0-orig/Makefile.in 2017-11-14 13:51:01.000000000 +0300 ++++ libpipeline-1.5.0/Makefile.in 2018-07-02 13:12:02.022386700 +0300 +@@ -107,6 +107,7 @@ + $(top_srcdir)/gnulib/m4/fcntl-o.m4 \ + $(top_srcdir)/gnulib/m4/fcntl_h.m4 \ + $(top_srcdir)/gnulib/m4/float_h.m4 \ ++ $(top_srcdir)/gnulib/m4/getprogname.m4 \ + $(top_srcdir)/gnulib/m4/gettimeofday.m4 \ + $(top_srcdir)/gnulib/m4/gnulib-common.m4 \ + $(top_srcdir)/gnulib/m4/gnulib-comp.m4 \ +@@ -119,6 +120,8 @@ + $(top_srcdir)/gnulib/m4/lib-link.m4 \ + $(top_srcdir)/gnulib/m4/lib-prefix.m4 \ + $(top_srcdir)/gnulib/m4/libtool.m4 \ ++ $(top_srcdir)/gnulib/m4/limits-h.m4 \ ++ $(top_srcdir)/gnulib/m4/localtime-buffer.m4 \ + $(top_srcdir)/gnulib/m4/lock.m4 \ + $(top_srcdir)/gnulib/m4/longlong.m4 \ + $(top_srcdir)/gnulib/m4/lstat.m4 \ +@@ -138,6 +141,7 @@ + $(top_srcdir)/gnulib/m4/onceonly.m4 \ + $(top_srcdir)/gnulib/m4/pathmax.m4 \ + $(top_srcdir)/gnulib/m4/printf.m4 \ ++ $(top_srcdir)/gnulib/m4/pthread_rwlock_rdlock.m4 \ + $(top_srcdir)/gnulib/m4/raise.m4 \ + $(top_srcdir)/gnulib/m4/read.m4 \ + $(top_srcdir)/gnulib/m4/safe-read.m4 \ +@@ -263,8 +267,8 @@ + $(top_srcdir)/build-aux/config.sub \ + $(top_srcdir)/build-aux/install-sh \ + $(top_srcdir)/build-aux/ltmain.sh \ +- $(top_srcdir)/build-aux/missing COPYING INSTALL NEWS README \ +- TODO build-aux/ar-lib build-aux/compile build-aux/config.guess \ ++ $(top_srcdir)/build-aux/missing COPYING ChangeLog INSTALL NEWS README \ ++ README TODO build-aux/ar-lib build-aux/compile build-aux/config.guess \ + build-aux/config.rpath build-aux/config.sub \ + build-aux/install-sh build-aux/ltmain.sh build-aux/missing + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +@@ -360,6 +364,7 @@ + GNULIB_CHDIR = @GNULIB_CHDIR@ + GNULIB_CHOWN = @GNULIB_CHOWN@ + GNULIB_CLOSE = @GNULIB_CLOSE@ ++GNULIB_CTIME = @GNULIB_CTIME@ + GNULIB_DPRINTF = @GNULIB_DPRINTF@ + GNULIB_DUP = @GNULIB_DUP@ + GNULIB_DUP2 = @GNULIB_DUP2@ +@@ -421,6 +426,7 @@ + GNULIB_LCHOWN = @GNULIB_LCHOWN@ + GNULIB_LINK = @GNULIB_LINK@ + GNULIB_LINKAT = @GNULIB_LINKAT@ ++GNULIB_LOCALTIME = @GNULIB_LOCALTIME@ + GNULIB_LSEEK = @GNULIB_LSEEK@ + GNULIB_LSTAT = @GNULIB_LSTAT@ + GNULIB_MALLOC_POSIX = @GNULIB_MALLOC_POSIX@ +@@ -465,6 +471,8 @@ + GNULIB_OBSTACK_PRINTF_POSIX = @GNULIB_OBSTACK_PRINTF_POSIX@ + GNULIB_OPEN = @GNULIB_OPEN@ + GNULIB_OPENAT = @GNULIB_OPENAT@ ++GNULIB_OVERRIDES_STRUCT_STAT = @GNULIB_OVERRIDES_STRUCT_STAT@ ++GNULIB_OVERRIDES_WINT_T = @GNULIB_OVERRIDES_WINT_T@ + GNULIB_PCLOSE = @GNULIB_PCLOSE@ + GNULIB_PERROR = @GNULIB_PERROR@ + GNULIB_PIPE = @GNULIB_PIPE@ +@@ -483,6 +491,7 @@ + GNULIB_PUTENV = @GNULIB_PUTENV@ + GNULIB_PUTS = @GNULIB_PUTS@ + GNULIB_PWRITE = @GNULIB_PWRITE@ ++GNULIB_QSORT_R = @GNULIB_QSORT_R@ + GNULIB_RAISE = @GNULIB_RAISE@ + GNULIB_RANDOM = @GNULIB_RANDOM@ + GNULIB_RANDOM_R = @GNULIB_RANDOM_R@ +@@ -518,6 +527,7 @@ + GNULIB_STRDUP = @GNULIB_STRDUP@ + GNULIB_STRERROR = @GNULIB_STRERROR@ + GNULIB_STRERROR_R = @GNULIB_STRERROR_R@ ++GNULIB_STRFTIME = @GNULIB_STRFTIME@ + GNULIB_STRNCAT = @GNULIB_STRNCAT@ + GNULIB_STRNDUP = @GNULIB_STRNDUP@ + GNULIB_STRNLEN = @GNULIB_STRNLEN@ +@@ -536,8 +546,11 @@ + GNULIB_SYSTEM_POSIX = @GNULIB_SYSTEM_POSIX@ + GNULIB_TIMEGM = @GNULIB_TIMEGM@ + GNULIB_TIME_R = @GNULIB_TIME_R@ ++GNULIB_TIME_RZ = @GNULIB_TIME_RZ@ + GNULIB_TMPFILE = @GNULIB_TMPFILE@ ++GNULIB_TRUNCATE = @GNULIB_TRUNCATE@ + GNULIB_TTYNAME_R = @GNULIB_TTYNAME_R@ ++GNULIB_TZSET = @GNULIB_TZSET@ + GNULIB_UNISTD_H_NONBLOCKING = @GNULIB_UNISTD_H_NONBLOCKING@ + GNULIB_UNISTD_H_SIGPIPE = @GNULIB_UNISTD_H_SIGPIPE@ + GNULIB_UNLINK = @GNULIB_UNLINK@ +@@ -568,6 +581,7 @@ + GNULIB_WCSCPY = @GNULIB_WCSCPY@ + GNULIB_WCSCSPN = @GNULIB_WCSCSPN@ + GNULIB_WCSDUP = @GNULIB_WCSDUP@ ++GNULIB_WCSFTIME = @GNULIB_WCSFTIME@ + GNULIB_WCSLEN = @GNULIB_WCSLEN@ + GNULIB_WCSNCASECMP = @GNULIB_WCSNCASECMP@ + GNULIB_WCSNCAT = @GNULIB_WCSNCAT@ +@@ -596,8 +610,10 @@ + GREP = @GREP@ + HAVE_ATOLL = @HAVE_ATOLL@ + HAVE_BTOWC = @HAVE_BTOWC@ ++HAVE_C99_STDINT_H = @HAVE_C99_STDINT_H@ + HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@ + HAVE_CHOWN = @HAVE_CHOWN@ ++HAVE_CRTDEFS_H = @HAVE_CRTDEFS_H@ + HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@ + HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@ + HAVE_DECL_FDATASYNC = @HAVE_DECL_FDATASYNC@ +@@ -608,6 +624,7 @@ + HAVE_DECL_GETDOMAINNAME = @HAVE_DECL_GETDOMAINNAME@ + HAVE_DECL_GETLINE = @HAVE_DECL_GETLINE@ + HAVE_DECL_GETLOADAVG = @HAVE_DECL_GETLOADAVG@ ++HAVE_DECL_GETLOGIN = @HAVE_DECL_GETLOGIN@ + HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@ + HAVE_DECL_GETPAGESIZE = @HAVE_DECL_GETPAGESIZE@ + HAVE_DECL_GETUSERSHELL = @HAVE_DECL_GETUSERSHELL@ +@@ -664,6 +681,7 @@ + HAVE_LINKAT = @HAVE_LINKAT@ + HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@ + HAVE_LSTAT = @HAVE_LSTAT@ ++HAVE_MAX_ALIGN_T = @HAVE_MAX_ALIGN_T@ + HAVE_MBRLEN = @HAVE_MBRLEN@ + HAVE_MBRTOWC = @HAVE_MBRTOWC@ + HAVE_MBSINIT = @HAVE_MBSINIT@ +@@ -698,6 +716,7 @@ + HAVE_PTSNAME = @HAVE_PTSNAME@ + HAVE_PTSNAME_R = @HAVE_PTSNAME_R@ + HAVE_PWRITE = @HAVE_PWRITE@ ++HAVE_QSORT_R = @HAVE_QSORT_R@ + HAVE_RAISE = @HAVE_RAISE@ + HAVE_RANDOM = @HAVE_RANDOM@ + HAVE_RANDOM_H = @HAVE_RANDOM_H@ +@@ -744,7 +763,10 @@ + HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@ + HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@ + HAVE_TIMEGM = @HAVE_TIMEGM@ ++HAVE_TIMEZONE_T = @HAVE_TIMEZONE_T@ ++HAVE_TRUNCATE = @HAVE_TRUNCATE@ + HAVE_TYPE_VOLATILE_SIG_ATOMIC_T = @HAVE_TYPE_VOLATILE_SIG_ATOMIC_T@ ++HAVE_TZSET = @HAVE_TZSET@ + HAVE_UNISTD_H = @HAVE_UNISTD_H@ + HAVE_UNLINKAT = @HAVE_UNLINKAT@ + HAVE_UNLOCKPT = @HAVE_UNLOCKPT@ +@@ -766,6 +788,7 @@ + HAVE_WCSCPY = @HAVE_WCSCPY@ + HAVE_WCSCSPN = @HAVE_WCSCSPN@ + HAVE_WCSDUP = @HAVE_WCSDUP@ ++HAVE_WCSFTIME = @HAVE_WCSFTIME@ + HAVE_WCSLEN = @HAVE_WCSLEN@ + HAVE_WCSNCASECMP = @HAVE_WCSNCASECMP@ + HAVE_WCSNCAT = @HAVE_WCSNCAT@ +@@ -808,6 +831,7 @@ + LIBS = @LIBS@ + LIBTHREAD = @LIBTHREAD@ + LIBTOOL = @LIBTOOL@ ++LIMITS_H = @LIMITS_H@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBINTL = @LTLIBINTL@ +@@ -823,6 +847,7 @@ + NEXT_AS_FIRST_DIRECTIVE_ERRNO_H = @NEXT_AS_FIRST_DIRECTIVE_ERRNO_H@ + NEXT_AS_FIRST_DIRECTIVE_FCNTL_H = @NEXT_AS_FIRST_DIRECTIVE_FCNTL_H@ + NEXT_AS_FIRST_DIRECTIVE_FLOAT_H = @NEXT_AS_FIRST_DIRECTIVE_FLOAT_H@ ++NEXT_AS_FIRST_DIRECTIVE_LIMITS_H = @NEXT_AS_FIRST_DIRECTIVE_LIMITS_H@ + NEXT_AS_FIRST_DIRECTIVE_SIGNAL_H = @NEXT_AS_FIRST_DIRECTIVE_SIGNAL_H@ + NEXT_AS_FIRST_DIRECTIVE_STDARG_H = @NEXT_AS_FIRST_DIRECTIVE_STDARG_H@ + NEXT_AS_FIRST_DIRECTIVE_STDDEF_H = @NEXT_AS_FIRST_DIRECTIVE_STDDEF_H@ +@@ -841,6 +866,7 @@ + NEXT_ERRNO_H = @NEXT_ERRNO_H@ + NEXT_FCNTL_H = @NEXT_FCNTL_H@ + NEXT_FLOAT_H = @NEXT_FLOAT_H@ ++NEXT_LIMITS_H = @NEXT_LIMITS_H@ + NEXT_SIGNAL_H = @NEXT_SIGNAL_H@ + NEXT_STDARG_H = @NEXT_STDARG_H@ + NEXT_STDDEF_H = @NEXT_STDDEF_H@ +@@ -883,6 +909,7 @@ + REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@ + REPLACE_CHOWN = @REPLACE_CHOWN@ + REPLACE_CLOSE = @REPLACE_CLOSE@ ++REPLACE_CTIME = @REPLACE_CTIME@ + REPLACE_DPRINTF = @REPLACE_DPRINTF@ + REPLACE_DUP = @REPLACE_DUP@ + REPLACE_DUP2 = @REPLACE_DUP2@ +@@ -952,10 +979,12 @@ + REPLACE_PTSNAME_R = @REPLACE_PTSNAME_R@ + REPLACE_PUTENV = @REPLACE_PUTENV@ + REPLACE_PWRITE = @REPLACE_PWRITE@ ++REPLACE_QSORT_R = @REPLACE_QSORT_R@ + REPLACE_RAISE = @REPLACE_RAISE@ + REPLACE_RANDOM_R = @REPLACE_RANDOM_R@ + REPLACE_READ = @REPLACE_READ@ + REPLACE_READLINK = @REPLACE_READLINK@ ++REPLACE_READLINKAT = @REPLACE_READLINKAT@ + REPLACE_REALLOC = @REPLACE_REALLOC@ + REPLACE_REALPATH = @REPLACE_REALPATH@ + REPLACE_REMOVE = @REPLACE_REMOVE@ +@@ -976,6 +1005,7 @@ + REPLACE_STRDUP = @REPLACE_STRDUP@ + REPLACE_STRERROR = @REPLACE_STRERROR@ + REPLACE_STRERROR_R = @REPLACE_STRERROR_R@ ++REPLACE_STRFTIME = @REPLACE_STRFTIME@ + REPLACE_STRNCAT = @REPLACE_STRNCAT@ + REPLACE_STRNDUP = @REPLACE_STRNDUP@ + REPLACE_STRNLEN = @REPLACE_STRNLEN@ +@@ -985,9 +1015,12 @@ + REPLACE_STRTOK_R = @REPLACE_STRTOK_R@ + REPLACE_STRUCT_TIMEVAL = @REPLACE_STRUCT_TIMEVAL@ + REPLACE_SYMLINK = @REPLACE_SYMLINK@ ++REPLACE_SYMLINKAT = @REPLACE_SYMLINKAT@ + REPLACE_TIMEGM = @REPLACE_TIMEGM@ + REPLACE_TMPFILE = @REPLACE_TMPFILE@ ++REPLACE_TRUNCATE = @REPLACE_TRUNCATE@ + REPLACE_TTYNAME_R = @REPLACE_TTYNAME_R@ ++REPLACE_TZSET = @REPLACE_TZSET@ + REPLACE_UNLINK = @REPLACE_UNLINK@ + REPLACE_UNLINKAT = @REPLACE_UNLINKAT@ + REPLACE_UNSETENV = @REPLACE_UNSETENV@ +@@ -1000,6 +1033,7 @@ + REPLACE_VSNPRINTF = @REPLACE_VSNPRINTF@ + REPLACE_VSPRINTF = @REPLACE_VSPRINTF@ + REPLACE_WCRTOMB = @REPLACE_WCRTOMB@ ++REPLACE_WCSFTIME = @REPLACE_WCSFTIME@ + REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@ + REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@ + REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@ +@@ -1020,6 +1054,7 @@ + SYS_TIME_H_DEFINES_STRUCT_TIMESPEC = @SYS_TIME_H_DEFINES_STRUCT_TIMESPEC@ + TIME_H_DEFINES_STRUCT_TIMESPEC = @TIME_H_DEFINES_STRUCT_TIMESPEC@ + UNDEFINE_STRTOK_R = @UNDEFINE_STRTOK_R@ ++UNISTD_H_DEFINES_STRUCT_TIMESPEC = @UNISTD_H_DEFINES_STRUCT_TIMESPEC@ + UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@ + UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS = @UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS@ + VERSION = @VERSION@ +@@ -1027,6 +1062,8 @@ + WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@ + WINDOWS_64_BIT_OFF_T = @WINDOWS_64_BIT_OFF_T@ + WINDOWS_64_BIT_ST_SIZE = @WINDOWS_64_BIT_ST_SIZE@ ++WINDOWS_STAT_INODES = @WINDOWS_STAT_INODES@ ++WINDOWS_STAT_TIMESPEC = @WINDOWS_STAT_TIMESPEC@ + WINT_T_SUFFIX = @WINT_T_SUFFIX@ + abs_builddir = @abs_builddir@ + abs_srcdir = @abs_srcdir@ +diff -Naur libpipeline-1.5.0-orig/man/Makefile.in libpipeline-1.5.0/man/Makefile.in +--- libpipeline-1.5.0-orig/man/Makefile.in 2017-11-14 13:51:02.000000000 +0300 ++++ libpipeline-1.5.0/man/Makefile.in 2018-07-02 13:10:06.936654600 +0300 +@@ -105,6 +105,7 @@ + $(top_srcdir)/gnulib/m4/fcntl-o.m4 \ + $(top_srcdir)/gnulib/m4/fcntl_h.m4 \ + $(top_srcdir)/gnulib/m4/float_h.m4 \ ++ $(top_srcdir)/gnulib/m4/getprogname.m4 \ + $(top_srcdir)/gnulib/m4/gettimeofday.m4 \ + $(top_srcdir)/gnulib/m4/gnulib-common.m4 \ + $(top_srcdir)/gnulib/m4/gnulib-comp.m4 \ +@@ -117,6 +118,8 @@ + $(top_srcdir)/gnulib/m4/lib-link.m4 \ + $(top_srcdir)/gnulib/m4/lib-prefix.m4 \ + $(top_srcdir)/gnulib/m4/libtool.m4 \ ++ $(top_srcdir)/gnulib/m4/limits-h.m4 \ ++ $(top_srcdir)/gnulib/m4/localtime-buffer.m4 \ + $(top_srcdir)/gnulib/m4/lock.m4 \ + $(top_srcdir)/gnulib/m4/longlong.m4 \ + $(top_srcdir)/gnulib/m4/lstat.m4 \ +@@ -136,6 +139,7 @@ + $(top_srcdir)/gnulib/m4/onceonly.m4 \ + $(top_srcdir)/gnulib/m4/pathmax.m4 \ + $(top_srcdir)/gnulib/m4/printf.m4 \ ++ $(top_srcdir)/gnulib/m4/pthread_rwlock_rdlock.m4 \ + $(top_srcdir)/gnulib/m4/raise.m4 \ + $(top_srcdir)/gnulib/m4/read.m4 \ + $(top_srcdir)/gnulib/m4/safe-read.m4 \ +@@ -297,6 +301,7 @@ + GNULIB_CHDIR = @GNULIB_CHDIR@ + GNULIB_CHOWN = @GNULIB_CHOWN@ + GNULIB_CLOSE = @GNULIB_CLOSE@ ++GNULIB_CTIME = @GNULIB_CTIME@ + GNULIB_DPRINTF = @GNULIB_DPRINTF@ + GNULIB_DUP = @GNULIB_DUP@ + GNULIB_DUP2 = @GNULIB_DUP2@ +@@ -358,6 +363,7 @@ + GNULIB_LCHOWN = @GNULIB_LCHOWN@ + GNULIB_LINK = @GNULIB_LINK@ + GNULIB_LINKAT = @GNULIB_LINKAT@ ++GNULIB_LOCALTIME = @GNULIB_LOCALTIME@ + GNULIB_LSEEK = @GNULIB_LSEEK@ + GNULIB_LSTAT = @GNULIB_LSTAT@ + GNULIB_MALLOC_POSIX = @GNULIB_MALLOC_POSIX@ +@@ -402,6 +408,8 @@ + GNULIB_OBSTACK_PRINTF_POSIX = @GNULIB_OBSTACK_PRINTF_POSIX@ + GNULIB_OPEN = @GNULIB_OPEN@ + GNULIB_OPENAT = @GNULIB_OPENAT@ ++GNULIB_OVERRIDES_STRUCT_STAT = @GNULIB_OVERRIDES_STRUCT_STAT@ ++GNULIB_OVERRIDES_WINT_T = @GNULIB_OVERRIDES_WINT_T@ + GNULIB_PCLOSE = @GNULIB_PCLOSE@ + GNULIB_PERROR = @GNULIB_PERROR@ + GNULIB_PIPE = @GNULIB_PIPE@ +@@ -420,6 +428,7 @@ + GNULIB_PUTENV = @GNULIB_PUTENV@ + GNULIB_PUTS = @GNULIB_PUTS@ + GNULIB_PWRITE = @GNULIB_PWRITE@ ++GNULIB_QSORT_R = @GNULIB_QSORT_R@ + GNULIB_RAISE = @GNULIB_RAISE@ + GNULIB_RANDOM = @GNULIB_RANDOM@ + GNULIB_RANDOM_R = @GNULIB_RANDOM_R@ +@@ -455,6 +464,7 @@ + GNULIB_STRDUP = @GNULIB_STRDUP@ + GNULIB_STRERROR = @GNULIB_STRERROR@ + GNULIB_STRERROR_R = @GNULIB_STRERROR_R@ ++GNULIB_STRFTIME = @GNULIB_STRFTIME@ + GNULIB_STRNCAT = @GNULIB_STRNCAT@ + GNULIB_STRNDUP = @GNULIB_STRNDUP@ + GNULIB_STRNLEN = @GNULIB_STRNLEN@ +@@ -473,8 +483,11 @@ + GNULIB_SYSTEM_POSIX = @GNULIB_SYSTEM_POSIX@ + GNULIB_TIMEGM = @GNULIB_TIMEGM@ + GNULIB_TIME_R = @GNULIB_TIME_R@ ++GNULIB_TIME_RZ = @GNULIB_TIME_RZ@ + GNULIB_TMPFILE = @GNULIB_TMPFILE@ ++GNULIB_TRUNCATE = @GNULIB_TRUNCATE@ + GNULIB_TTYNAME_R = @GNULIB_TTYNAME_R@ ++GNULIB_TZSET = @GNULIB_TZSET@ + GNULIB_UNISTD_H_NONBLOCKING = @GNULIB_UNISTD_H_NONBLOCKING@ + GNULIB_UNISTD_H_SIGPIPE = @GNULIB_UNISTD_H_SIGPIPE@ + GNULIB_UNLINK = @GNULIB_UNLINK@ +@@ -505,6 +518,7 @@ + GNULIB_WCSCPY = @GNULIB_WCSCPY@ + GNULIB_WCSCSPN = @GNULIB_WCSCSPN@ + GNULIB_WCSDUP = @GNULIB_WCSDUP@ ++GNULIB_WCSFTIME = @GNULIB_WCSFTIME@ + GNULIB_WCSLEN = @GNULIB_WCSLEN@ + GNULIB_WCSNCASECMP = @GNULIB_WCSNCASECMP@ + GNULIB_WCSNCAT = @GNULIB_WCSNCAT@ +@@ -533,8 +547,10 @@ + GREP = @GREP@ + HAVE_ATOLL = @HAVE_ATOLL@ + HAVE_BTOWC = @HAVE_BTOWC@ ++HAVE_C99_STDINT_H = @HAVE_C99_STDINT_H@ + HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@ + HAVE_CHOWN = @HAVE_CHOWN@ ++HAVE_CRTDEFS_H = @HAVE_CRTDEFS_H@ + HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@ + HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@ + HAVE_DECL_FDATASYNC = @HAVE_DECL_FDATASYNC@ +@@ -545,6 +561,7 @@ + HAVE_DECL_GETDOMAINNAME = @HAVE_DECL_GETDOMAINNAME@ + HAVE_DECL_GETLINE = @HAVE_DECL_GETLINE@ + HAVE_DECL_GETLOADAVG = @HAVE_DECL_GETLOADAVG@ ++HAVE_DECL_GETLOGIN = @HAVE_DECL_GETLOGIN@ + HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@ + HAVE_DECL_GETPAGESIZE = @HAVE_DECL_GETPAGESIZE@ + HAVE_DECL_GETUSERSHELL = @HAVE_DECL_GETUSERSHELL@ +@@ -601,6 +618,7 @@ + HAVE_LINKAT = @HAVE_LINKAT@ + HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@ + HAVE_LSTAT = @HAVE_LSTAT@ ++HAVE_MAX_ALIGN_T = @HAVE_MAX_ALIGN_T@ + HAVE_MBRLEN = @HAVE_MBRLEN@ + HAVE_MBRTOWC = @HAVE_MBRTOWC@ + HAVE_MBSINIT = @HAVE_MBSINIT@ +@@ -635,6 +653,7 @@ + HAVE_PTSNAME = @HAVE_PTSNAME@ + HAVE_PTSNAME_R = @HAVE_PTSNAME_R@ + HAVE_PWRITE = @HAVE_PWRITE@ ++HAVE_QSORT_R = @HAVE_QSORT_R@ + HAVE_RAISE = @HAVE_RAISE@ + HAVE_RANDOM = @HAVE_RANDOM@ + HAVE_RANDOM_H = @HAVE_RANDOM_H@ +@@ -681,7 +700,10 @@ + HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@ + HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@ + HAVE_TIMEGM = @HAVE_TIMEGM@ ++HAVE_TIMEZONE_T = @HAVE_TIMEZONE_T@ ++HAVE_TRUNCATE = @HAVE_TRUNCATE@ + HAVE_TYPE_VOLATILE_SIG_ATOMIC_T = @HAVE_TYPE_VOLATILE_SIG_ATOMIC_T@ ++HAVE_TZSET = @HAVE_TZSET@ + HAVE_UNISTD_H = @HAVE_UNISTD_H@ + HAVE_UNLINKAT = @HAVE_UNLINKAT@ + HAVE_UNLOCKPT = @HAVE_UNLOCKPT@ +@@ -703,6 +725,7 @@ + HAVE_WCSCPY = @HAVE_WCSCPY@ + HAVE_WCSCSPN = @HAVE_WCSCSPN@ + HAVE_WCSDUP = @HAVE_WCSDUP@ ++HAVE_WCSFTIME = @HAVE_WCSFTIME@ + HAVE_WCSLEN = @HAVE_WCSLEN@ + HAVE_WCSNCASECMP = @HAVE_WCSNCASECMP@ + HAVE_WCSNCAT = @HAVE_WCSNCAT@ +@@ -745,6 +768,7 @@ + LIBS = @LIBS@ + LIBTHREAD = @LIBTHREAD@ + LIBTOOL = @LIBTOOL@ ++LIMITS_H = @LIMITS_H@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBINTL = @LTLIBINTL@ +@@ -760,6 +784,7 @@ + NEXT_AS_FIRST_DIRECTIVE_ERRNO_H = @NEXT_AS_FIRST_DIRECTIVE_ERRNO_H@ + NEXT_AS_FIRST_DIRECTIVE_FCNTL_H = @NEXT_AS_FIRST_DIRECTIVE_FCNTL_H@ + NEXT_AS_FIRST_DIRECTIVE_FLOAT_H = @NEXT_AS_FIRST_DIRECTIVE_FLOAT_H@ ++NEXT_AS_FIRST_DIRECTIVE_LIMITS_H = @NEXT_AS_FIRST_DIRECTIVE_LIMITS_H@ + NEXT_AS_FIRST_DIRECTIVE_SIGNAL_H = @NEXT_AS_FIRST_DIRECTIVE_SIGNAL_H@ + NEXT_AS_FIRST_DIRECTIVE_STDARG_H = @NEXT_AS_FIRST_DIRECTIVE_STDARG_H@ + NEXT_AS_FIRST_DIRECTIVE_STDDEF_H = @NEXT_AS_FIRST_DIRECTIVE_STDDEF_H@ +@@ -778,6 +803,7 @@ + NEXT_ERRNO_H = @NEXT_ERRNO_H@ + NEXT_FCNTL_H = @NEXT_FCNTL_H@ + NEXT_FLOAT_H = @NEXT_FLOAT_H@ ++NEXT_LIMITS_H = @NEXT_LIMITS_H@ + NEXT_SIGNAL_H = @NEXT_SIGNAL_H@ + NEXT_STDARG_H = @NEXT_STDARG_H@ + NEXT_STDDEF_H = @NEXT_STDDEF_H@ +@@ -820,6 +846,7 @@ + REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@ + REPLACE_CHOWN = @REPLACE_CHOWN@ + REPLACE_CLOSE = @REPLACE_CLOSE@ ++REPLACE_CTIME = @REPLACE_CTIME@ + REPLACE_DPRINTF = @REPLACE_DPRINTF@ + REPLACE_DUP = @REPLACE_DUP@ + REPLACE_DUP2 = @REPLACE_DUP2@ +@@ -889,10 +916,12 @@ + REPLACE_PTSNAME_R = @REPLACE_PTSNAME_R@ + REPLACE_PUTENV = @REPLACE_PUTENV@ + REPLACE_PWRITE = @REPLACE_PWRITE@ ++REPLACE_QSORT_R = @REPLACE_QSORT_R@ + REPLACE_RAISE = @REPLACE_RAISE@ + REPLACE_RANDOM_R = @REPLACE_RANDOM_R@ + REPLACE_READ = @REPLACE_READ@ + REPLACE_READLINK = @REPLACE_READLINK@ ++REPLACE_READLINKAT = @REPLACE_READLINKAT@ + REPLACE_REALLOC = @REPLACE_REALLOC@ + REPLACE_REALPATH = @REPLACE_REALPATH@ + REPLACE_REMOVE = @REPLACE_REMOVE@ +@@ -913,6 +942,7 @@ + REPLACE_STRDUP = @REPLACE_STRDUP@ + REPLACE_STRERROR = @REPLACE_STRERROR@ + REPLACE_STRERROR_R = @REPLACE_STRERROR_R@ ++REPLACE_STRFTIME = @REPLACE_STRFTIME@ + REPLACE_STRNCAT = @REPLACE_STRNCAT@ + REPLACE_STRNDUP = @REPLACE_STRNDUP@ + REPLACE_STRNLEN = @REPLACE_STRNLEN@ +@@ -922,9 +952,12 @@ + REPLACE_STRTOK_R = @REPLACE_STRTOK_R@ + REPLACE_STRUCT_TIMEVAL = @REPLACE_STRUCT_TIMEVAL@ + REPLACE_SYMLINK = @REPLACE_SYMLINK@ ++REPLACE_SYMLINKAT = @REPLACE_SYMLINKAT@ + REPLACE_TIMEGM = @REPLACE_TIMEGM@ + REPLACE_TMPFILE = @REPLACE_TMPFILE@ ++REPLACE_TRUNCATE = @REPLACE_TRUNCATE@ + REPLACE_TTYNAME_R = @REPLACE_TTYNAME_R@ ++REPLACE_TZSET = @REPLACE_TZSET@ + REPLACE_UNLINK = @REPLACE_UNLINK@ + REPLACE_UNLINKAT = @REPLACE_UNLINKAT@ + REPLACE_UNSETENV = @REPLACE_UNSETENV@ +@@ -937,6 +970,7 @@ + REPLACE_VSNPRINTF = @REPLACE_VSNPRINTF@ + REPLACE_VSPRINTF = @REPLACE_VSPRINTF@ + REPLACE_WCRTOMB = @REPLACE_WCRTOMB@ ++REPLACE_WCSFTIME = @REPLACE_WCSFTIME@ + REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@ + REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@ + REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@ +@@ -957,6 +991,7 @@ + SYS_TIME_H_DEFINES_STRUCT_TIMESPEC = @SYS_TIME_H_DEFINES_STRUCT_TIMESPEC@ + TIME_H_DEFINES_STRUCT_TIMESPEC = @TIME_H_DEFINES_STRUCT_TIMESPEC@ + UNDEFINE_STRTOK_R = @UNDEFINE_STRTOK_R@ ++UNISTD_H_DEFINES_STRUCT_TIMESPEC = @UNISTD_H_DEFINES_STRUCT_TIMESPEC@ + UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@ + UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS = @UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS@ + VERSION = @VERSION@ +@@ -964,6 +999,8 @@ + WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@ + WINDOWS_64_BIT_OFF_T = @WINDOWS_64_BIT_OFF_T@ + WINDOWS_64_BIT_ST_SIZE = @WINDOWS_64_BIT_ST_SIZE@ ++WINDOWS_STAT_INODES = @WINDOWS_STAT_INODES@ ++WINDOWS_STAT_TIMESPEC = @WINDOWS_STAT_TIMESPEC@ + WINT_T_SUFFIX = @WINT_T_SUFFIX@ + abs_builddir = @abs_builddir@ + abs_srcdir = @abs_srcdir@ +diff -Naur libpipeline-1.5.0-orig/tests/Makefile.in libpipeline-1.5.0/tests/Makefile.in +--- libpipeline-1.5.0-orig/tests/Makefile.in 2017-11-14 13:51:02.000000000 +0300 ++++ libpipeline-1.5.0/tests/Makefile.in 2018-07-02 13:10:06.944655000 +0300 +@@ -108,6 +108,7 @@ + $(top_srcdir)/gnulib/m4/fcntl-o.m4 \ + $(top_srcdir)/gnulib/m4/fcntl_h.m4 \ + $(top_srcdir)/gnulib/m4/float_h.m4 \ ++ $(top_srcdir)/gnulib/m4/getprogname.m4 \ + $(top_srcdir)/gnulib/m4/gettimeofday.m4 \ + $(top_srcdir)/gnulib/m4/gnulib-common.m4 \ + $(top_srcdir)/gnulib/m4/gnulib-comp.m4 \ +@@ -120,6 +121,8 @@ + $(top_srcdir)/gnulib/m4/lib-link.m4 \ + $(top_srcdir)/gnulib/m4/lib-prefix.m4 \ + $(top_srcdir)/gnulib/m4/libtool.m4 \ ++ $(top_srcdir)/gnulib/m4/limits-h.m4 \ ++ $(top_srcdir)/gnulib/m4/localtime-buffer.m4 \ + $(top_srcdir)/gnulib/m4/lock.m4 \ + $(top_srcdir)/gnulib/m4/longlong.m4 \ + $(top_srcdir)/gnulib/m4/lstat.m4 \ +@@ -139,6 +142,7 @@ + $(top_srcdir)/gnulib/m4/onceonly.m4 \ + $(top_srcdir)/gnulib/m4/pathmax.m4 \ + $(top_srcdir)/gnulib/m4/printf.m4 \ ++ $(top_srcdir)/gnulib/m4/pthread_rwlock_rdlock.m4 \ + $(top_srcdir)/gnulib/m4/raise.m4 \ + $(top_srcdir)/gnulib/m4/read.m4 \ + $(top_srcdir)/gnulib/m4/safe-read.m4 \ +@@ -546,6 +550,7 @@ + GNULIB_CHDIR = @GNULIB_CHDIR@ + GNULIB_CHOWN = @GNULIB_CHOWN@ + GNULIB_CLOSE = @GNULIB_CLOSE@ ++GNULIB_CTIME = @GNULIB_CTIME@ + GNULIB_DPRINTF = @GNULIB_DPRINTF@ + GNULIB_DUP = @GNULIB_DUP@ + GNULIB_DUP2 = @GNULIB_DUP2@ +@@ -607,6 +612,7 @@ + GNULIB_LCHOWN = @GNULIB_LCHOWN@ + GNULIB_LINK = @GNULIB_LINK@ + GNULIB_LINKAT = @GNULIB_LINKAT@ ++GNULIB_LOCALTIME = @GNULIB_LOCALTIME@ + GNULIB_LSEEK = @GNULIB_LSEEK@ + GNULIB_LSTAT = @GNULIB_LSTAT@ + GNULIB_MALLOC_POSIX = @GNULIB_MALLOC_POSIX@ +@@ -651,6 +657,8 @@ + GNULIB_OBSTACK_PRINTF_POSIX = @GNULIB_OBSTACK_PRINTF_POSIX@ + GNULIB_OPEN = @GNULIB_OPEN@ + GNULIB_OPENAT = @GNULIB_OPENAT@ ++GNULIB_OVERRIDES_STRUCT_STAT = @GNULIB_OVERRIDES_STRUCT_STAT@ ++GNULIB_OVERRIDES_WINT_T = @GNULIB_OVERRIDES_WINT_T@ + GNULIB_PCLOSE = @GNULIB_PCLOSE@ + GNULIB_PERROR = @GNULIB_PERROR@ + GNULIB_PIPE = @GNULIB_PIPE@ +@@ -669,6 +677,7 @@ + GNULIB_PUTENV = @GNULIB_PUTENV@ + GNULIB_PUTS = @GNULIB_PUTS@ + GNULIB_PWRITE = @GNULIB_PWRITE@ ++GNULIB_QSORT_R = @GNULIB_QSORT_R@ + GNULIB_RAISE = @GNULIB_RAISE@ + GNULIB_RANDOM = @GNULIB_RANDOM@ + GNULIB_RANDOM_R = @GNULIB_RANDOM_R@ +@@ -704,6 +713,7 @@ + GNULIB_STRDUP = @GNULIB_STRDUP@ + GNULIB_STRERROR = @GNULIB_STRERROR@ + GNULIB_STRERROR_R = @GNULIB_STRERROR_R@ ++GNULIB_STRFTIME = @GNULIB_STRFTIME@ + GNULIB_STRNCAT = @GNULIB_STRNCAT@ + GNULIB_STRNDUP = @GNULIB_STRNDUP@ + GNULIB_STRNLEN = @GNULIB_STRNLEN@ +@@ -722,8 +732,11 @@ + GNULIB_SYSTEM_POSIX = @GNULIB_SYSTEM_POSIX@ + GNULIB_TIMEGM = @GNULIB_TIMEGM@ + GNULIB_TIME_R = @GNULIB_TIME_R@ ++GNULIB_TIME_RZ = @GNULIB_TIME_RZ@ + GNULIB_TMPFILE = @GNULIB_TMPFILE@ ++GNULIB_TRUNCATE = @GNULIB_TRUNCATE@ + GNULIB_TTYNAME_R = @GNULIB_TTYNAME_R@ ++GNULIB_TZSET = @GNULIB_TZSET@ + GNULIB_UNISTD_H_NONBLOCKING = @GNULIB_UNISTD_H_NONBLOCKING@ + GNULIB_UNISTD_H_SIGPIPE = @GNULIB_UNISTD_H_SIGPIPE@ + GNULIB_UNLINK = @GNULIB_UNLINK@ +@@ -754,6 +767,7 @@ + GNULIB_WCSCPY = @GNULIB_WCSCPY@ + GNULIB_WCSCSPN = @GNULIB_WCSCSPN@ + GNULIB_WCSDUP = @GNULIB_WCSDUP@ ++GNULIB_WCSFTIME = @GNULIB_WCSFTIME@ + GNULIB_WCSLEN = @GNULIB_WCSLEN@ + GNULIB_WCSNCASECMP = @GNULIB_WCSNCASECMP@ + GNULIB_WCSNCAT = @GNULIB_WCSNCAT@ +@@ -782,8 +796,10 @@ + GREP = @GREP@ + HAVE_ATOLL = @HAVE_ATOLL@ + HAVE_BTOWC = @HAVE_BTOWC@ ++HAVE_C99_STDINT_H = @HAVE_C99_STDINT_H@ + HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@ + HAVE_CHOWN = @HAVE_CHOWN@ ++HAVE_CRTDEFS_H = @HAVE_CRTDEFS_H@ + HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@ + HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@ + HAVE_DECL_FDATASYNC = @HAVE_DECL_FDATASYNC@ +@@ -794,6 +810,7 @@ + HAVE_DECL_GETDOMAINNAME = @HAVE_DECL_GETDOMAINNAME@ + HAVE_DECL_GETLINE = @HAVE_DECL_GETLINE@ + HAVE_DECL_GETLOADAVG = @HAVE_DECL_GETLOADAVG@ ++HAVE_DECL_GETLOGIN = @HAVE_DECL_GETLOGIN@ + HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@ + HAVE_DECL_GETPAGESIZE = @HAVE_DECL_GETPAGESIZE@ + HAVE_DECL_GETUSERSHELL = @HAVE_DECL_GETUSERSHELL@ +@@ -850,6 +867,7 @@ + HAVE_LINKAT = @HAVE_LINKAT@ + HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@ + HAVE_LSTAT = @HAVE_LSTAT@ ++HAVE_MAX_ALIGN_T = @HAVE_MAX_ALIGN_T@ + HAVE_MBRLEN = @HAVE_MBRLEN@ + HAVE_MBRTOWC = @HAVE_MBRTOWC@ + HAVE_MBSINIT = @HAVE_MBSINIT@ +@@ -884,6 +902,7 @@ + HAVE_PTSNAME = @HAVE_PTSNAME@ + HAVE_PTSNAME_R = @HAVE_PTSNAME_R@ + HAVE_PWRITE = @HAVE_PWRITE@ ++HAVE_QSORT_R = @HAVE_QSORT_R@ + HAVE_RAISE = @HAVE_RAISE@ + HAVE_RANDOM = @HAVE_RANDOM@ + HAVE_RANDOM_H = @HAVE_RANDOM_H@ +@@ -930,7 +949,10 @@ + HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@ + HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@ + HAVE_TIMEGM = @HAVE_TIMEGM@ ++HAVE_TIMEZONE_T = @HAVE_TIMEZONE_T@ ++HAVE_TRUNCATE = @HAVE_TRUNCATE@ + HAVE_TYPE_VOLATILE_SIG_ATOMIC_T = @HAVE_TYPE_VOLATILE_SIG_ATOMIC_T@ ++HAVE_TZSET = @HAVE_TZSET@ + HAVE_UNISTD_H = @HAVE_UNISTD_H@ + HAVE_UNLINKAT = @HAVE_UNLINKAT@ + HAVE_UNLOCKPT = @HAVE_UNLOCKPT@ +@@ -952,6 +974,7 @@ + HAVE_WCSCPY = @HAVE_WCSCPY@ + HAVE_WCSCSPN = @HAVE_WCSCSPN@ + HAVE_WCSDUP = @HAVE_WCSDUP@ ++HAVE_WCSFTIME = @HAVE_WCSFTIME@ + HAVE_WCSLEN = @HAVE_WCSLEN@ + HAVE_WCSNCASECMP = @HAVE_WCSNCASECMP@ + HAVE_WCSNCAT = @HAVE_WCSNCAT@ +@@ -994,6 +1017,7 @@ + LIBS = ../gnulib/lib/libgnu.la $(LTLIBOBJS) $(top_builddir)/lib/libpipeline.la + LIBTHREAD = @LIBTHREAD@ + LIBTOOL = @LIBTOOL@ ++LIMITS_H = @LIMITS_H@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBINTL = @LTLIBINTL@ +@@ -1009,6 +1033,7 @@ + NEXT_AS_FIRST_DIRECTIVE_ERRNO_H = @NEXT_AS_FIRST_DIRECTIVE_ERRNO_H@ + NEXT_AS_FIRST_DIRECTIVE_FCNTL_H = @NEXT_AS_FIRST_DIRECTIVE_FCNTL_H@ + NEXT_AS_FIRST_DIRECTIVE_FLOAT_H = @NEXT_AS_FIRST_DIRECTIVE_FLOAT_H@ ++NEXT_AS_FIRST_DIRECTIVE_LIMITS_H = @NEXT_AS_FIRST_DIRECTIVE_LIMITS_H@ + NEXT_AS_FIRST_DIRECTIVE_SIGNAL_H = @NEXT_AS_FIRST_DIRECTIVE_SIGNAL_H@ + NEXT_AS_FIRST_DIRECTIVE_STDARG_H = @NEXT_AS_FIRST_DIRECTIVE_STDARG_H@ + NEXT_AS_FIRST_DIRECTIVE_STDDEF_H = @NEXT_AS_FIRST_DIRECTIVE_STDDEF_H@ +@@ -1027,6 +1052,7 @@ + NEXT_ERRNO_H = @NEXT_ERRNO_H@ + NEXT_FCNTL_H = @NEXT_FCNTL_H@ + NEXT_FLOAT_H = @NEXT_FLOAT_H@ ++NEXT_LIMITS_H = @NEXT_LIMITS_H@ + NEXT_SIGNAL_H = @NEXT_SIGNAL_H@ + NEXT_STDARG_H = @NEXT_STDARG_H@ + NEXT_STDDEF_H = @NEXT_STDDEF_H@ +@@ -1069,6 +1095,7 @@ + REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@ + REPLACE_CHOWN = @REPLACE_CHOWN@ + REPLACE_CLOSE = @REPLACE_CLOSE@ ++REPLACE_CTIME = @REPLACE_CTIME@ + REPLACE_DPRINTF = @REPLACE_DPRINTF@ + REPLACE_DUP = @REPLACE_DUP@ + REPLACE_DUP2 = @REPLACE_DUP2@ +@@ -1138,10 +1165,12 @@ + REPLACE_PTSNAME_R = @REPLACE_PTSNAME_R@ + REPLACE_PUTENV = @REPLACE_PUTENV@ + REPLACE_PWRITE = @REPLACE_PWRITE@ ++REPLACE_QSORT_R = @REPLACE_QSORT_R@ + REPLACE_RAISE = @REPLACE_RAISE@ + REPLACE_RANDOM_R = @REPLACE_RANDOM_R@ + REPLACE_READ = @REPLACE_READ@ + REPLACE_READLINK = @REPLACE_READLINK@ ++REPLACE_READLINKAT = @REPLACE_READLINKAT@ + REPLACE_REALLOC = @REPLACE_REALLOC@ + REPLACE_REALPATH = @REPLACE_REALPATH@ + REPLACE_REMOVE = @REPLACE_REMOVE@ +@@ -1162,6 +1191,7 @@ + REPLACE_STRDUP = @REPLACE_STRDUP@ + REPLACE_STRERROR = @REPLACE_STRERROR@ + REPLACE_STRERROR_R = @REPLACE_STRERROR_R@ ++REPLACE_STRFTIME = @REPLACE_STRFTIME@ + REPLACE_STRNCAT = @REPLACE_STRNCAT@ + REPLACE_STRNDUP = @REPLACE_STRNDUP@ + REPLACE_STRNLEN = @REPLACE_STRNLEN@ +@@ -1171,9 +1201,12 @@ + REPLACE_STRTOK_R = @REPLACE_STRTOK_R@ + REPLACE_STRUCT_TIMEVAL = @REPLACE_STRUCT_TIMEVAL@ + REPLACE_SYMLINK = @REPLACE_SYMLINK@ ++REPLACE_SYMLINKAT = @REPLACE_SYMLINKAT@ + REPLACE_TIMEGM = @REPLACE_TIMEGM@ + REPLACE_TMPFILE = @REPLACE_TMPFILE@ ++REPLACE_TRUNCATE = @REPLACE_TRUNCATE@ + REPLACE_TTYNAME_R = @REPLACE_TTYNAME_R@ ++REPLACE_TZSET = @REPLACE_TZSET@ + REPLACE_UNLINK = @REPLACE_UNLINK@ + REPLACE_UNLINKAT = @REPLACE_UNLINKAT@ + REPLACE_UNSETENV = @REPLACE_UNSETENV@ +@@ -1186,6 +1219,7 @@ + REPLACE_VSNPRINTF = @REPLACE_VSNPRINTF@ + REPLACE_VSPRINTF = @REPLACE_VSPRINTF@ + REPLACE_WCRTOMB = @REPLACE_WCRTOMB@ ++REPLACE_WCSFTIME = @REPLACE_WCSFTIME@ + REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@ + REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@ + REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@ +@@ -1206,6 +1240,7 @@ + SYS_TIME_H_DEFINES_STRUCT_TIMESPEC = @SYS_TIME_H_DEFINES_STRUCT_TIMESPEC@ + TIME_H_DEFINES_STRUCT_TIMESPEC = @TIME_H_DEFINES_STRUCT_TIMESPEC@ + UNDEFINE_STRTOK_R = @UNDEFINE_STRTOK_R@ ++UNISTD_H_DEFINES_STRUCT_TIMESPEC = @UNISTD_H_DEFINES_STRUCT_TIMESPEC@ + UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@ + UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS = @UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS@ + VERSION = @VERSION@ +@@ -1213,6 +1248,8 @@ + WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@ + WINDOWS_64_BIT_OFF_T = @WINDOWS_64_BIT_OFF_T@ + WINDOWS_64_BIT_ST_SIZE = @WINDOWS_64_BIT_ST_SIZE@ ++WINDOWS_STAT_INODES = @WINDOWS_STAT_INODES@ ++WINDOWS_STAT_TIMESPEC = @WINDOWS_STAT_TIMESPEC@ + WINT_T_SUFFIX = @WINT_T_SUFFIX@ + abs_builddir = @abs_builddir@ + abs_srcdir = @abs_srcdir@