summaryrefslogtreecommitdiff
path: root/libetonyek
diff options
context:
space:
mode:
authorTim Biermann <tbier@posteo.de>2022-05-27 13:50:54 +0200
committerTim Biermann <tbier@posteo.de>2022-05-27 14:04:27 +0200
commit08d43ca9a67f575970af224465a5728a2469d9b7 (patch)
tree94930c6954dd9fe48a6217ab6ff96bd5f24fa498 /libetonyek
parent40f1f46b995eea7ce5b9b921e7bc210596e1b5aa (diff)
downloadcontrib-08d43ca9a67f575970af224465a5728a2469d9b7.tar.gz
contrib-08d43ca9a67f575970af224465a5728a2469d9b7.tar.xz
libetonyek: cleaning up
Diffstat (limited to 'libetonyek')
-rw-r--r--libetonyek/libetonyek-0.1.9-boost-1.73.patch12
-rw-r--r--libetonyek/libetonyek.patch4659
2 files changed, 0 insertions, 4671 deletions
diff --git a/libetonyek/libetonyek-0.1.9-boost-1.73.patch b/libetonyek/libetonyek-0.1.9-boost-1.73.patch
deleted file mode 100644
index 2992f9f1a..000000000
--- a/libetonyek/libetonyek-0.1.9-boost-1.73.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/lib/NUM3Parser.cpp b/src/lib/NUM3Parser.cpp
-index 6dc0e9a..6f8e79e 100644
---- a/src/lib/NUM3Parser.cpp
-+++ b/src/lib/NUM3Parser.cpp
-@@ -7,6 +7,7 @@
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-+#include <algorithm>
- #include <functional>
-
- #include "NUM3Parser.h" \ No newline at end of file
diff --git a/libetonyek/libetonyek.patch b/libetonyek/libetonyek.patch
deleted file mode 100644
index 60ba229aa..000000000
--- a/libetonyek/libetonyek.patch
+++ /dev/null
@@ -1,4659 +0,0 @@
-From c4621d41fda90a735b670a63622aa8b7bc03a9c5 Mon Sep 17 00:00:00 2001
-From: Rene Engelhard <rene@debian.org>
-Date: Wed, 25 Dec 2019 17:55:29 +0100
-Subject: [PATCH] support mdds 1.5 in rules and bump mdds build-dep to >= 1.4
-
----
- Makefile.in | 5 +-
- aclocal.m4 | 114 +----
- ar-lib | 4 +-
- build/Makefile.in | 1 +
- build/win32/Makefile.in | 1 +
- config.guess | 893 +++++++++++++++++--------------------
- config.sub | 359 +++++++--------
- configure | 89 ++--
- docs/Makefile.in | 1 +
- docs/doxygen/Makefile.in | 1 +
- inc/Makefile.in | 1 +
- inc/libetonyek/Makefile.in | 1 +
- install-sh | 397 ++++++++---------
- ltmain.sh | 246 +++++++---
- m4/libtool.m4 | 54 ++-
- src/Makefile.in | 1 +
- src/conv/Makefile.in | 1 +
- src/conv/csv/Makefile.in | 1 +
- src/conv/html/Makefile.in | 1 +
- src/conv/raw/Makefile.in | 1 +
- src/conv/svg/Makefile.in | 1 +
- src/conv/text/Makefile.in | 1 +
- src/fuzz/Makefile.in | 1 +
- src/lib/Makefile.in | 1 +
- src/test/Makefile.in | 1 +
- test-driver | 41 +-
- 29 files changed, 1138 insertions(+), 1091 deletions(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index 24cd1fb..03c0834 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -194,8 +194,8 @@ CTAGS = ctags
- CSCOPE = cscope
- DIST_SUBDIRS = $(SUBDIRS)
- am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \
-- $(srcdir)/libetonyek.pc.in AUTHORS COPYING NEWS README TODO \
-- ar-lib compile config.guess config.sub depcomp install-sh \
-+ $(srcdir)/libetonyek.pc.in AUTHORS COPYING ChangeLog NEWS \
-+ README TODO ar-lib compile config.guess config.sub install-sh \
- ltmain.sh missing
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- distdir = $(PACKAGE)-$(VERSION)
-@@ -395,6 +395,7 @@ pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
- psdir = @psdir@
-+runstatedir = @runstatedir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
-diff --git a/aclocal.m4 b/aclocal.m4
-index e5191ba..be7ff61 100644
---- a/aclocal.m4
-+++ b/aclocal.m4
-@@ -20,47 +20,9 @@ You have another version of autoconf. It may work, but is not guaranteed to.
- If you have problems, you may need to regenerate the build system entirely.
- To do so, use the procedure documented by the package, typically 'autoreconf'.])])
-
--# ===========================================================================
--# https://www.gnu.org/software/autoconf-archive/ax_require_defined.html
--# ===========================================================================
--#
--# SYNOPSIS
--#
--# AX_REQUIRE_DEFINED(MACRO)
--#
--# DESCRIPTION
--#
--# AX_REQUIRE_DEFINED is a simple helper for making sure other macros have
--# been defined and thus are available for use. This avoids random issues
--# where a macro isn't expanded. Instead the configure script emits a
--# non-fatal:
--#
--# ./configure: line 1673: AX_CFLAGS_WARN_ALL: command not found
--#
--# It's like AC_REQUIRE except it doesn't expand the required macro.
--#
--# Here's an example:
--#
--# AX_REQUIRE_DEFINED([AX_CHECK_LINK_FLAG])
--#
--# LICENSE
--#
--# Copyright (c) 2014 Mike Frysinger <vapier@gentoo.org>
--#
--# Copying and distribution of this file, with or without modification, are
--# permitted in any medium without royalty provided the copyright notice
--# and this notice are preserved. This file is offered as-is, without any
--# warranty.
--
--#serial 2
--
--AC_DEFUN([AX_REQUIRE_DEFINED], [dnl
-- m4_ifndef([$1], [m4_fatal([macro ]$1[ is not defined; is a m4 file missing?])])
--])dnl AX_REQUIRE_DEFINED
--
--# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
--# serial 11 (pkg-config-0.29.1)
--
-+dnl pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
-+dnl serial 11 (pkg-config-0.29)
-+dnl
- dnl Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
- dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists@gmail.com>
- dnl
-@@ -101,7 +63,7 @@ dnl
- dnl See the "Since" comment for each macro you use to see what version
- dnl of the macros you require.
- m4_defun([PKG_PREREQ],
--[m4_define([PKG_MACROS_VERSION], [0.29.1])
-+[m4_define([PKG_MACROS_VERSION], [0.29])
- m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1,
- [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])])
- ])dnl PKG_PREREQ
-@@ -334,74 +296,6 @@ AS_VAR_COPY([$1], [pkg_cv_][$1])
- AS_VAR_IF([$1], [""], [$5], [$4])dnl
- ])dnl PKG_CHECK_VAR
-
--dnl PKG_WITH_MODULES(VARIABLE-PREFIX, MODULES,
--dnl [ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND],
--dnl [DESCRIPTION], [DEFAULT])
--dnl ------------------------------------------
--dnl
--dnl Prepare a "--with-" configure option using the lowercase
--dnl [VARIABLE-PREFIX] name, merging the behaviour of AC_ARG_WITH and
--dnl 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
--
--dnl PKG_HAVE_WITH_MODULES(VARIABLE-PREFIX, MODULES,
--dnl [DESCRIPTION], [DEFAULT])
--dnl -----------------------------------------------
--dnl
--dnl Convenience macro to trigger AM_CONDITIONAL after PKG_WITH_MODULES
--dnl check._[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"])
--])dnl PKG_HAVE_WITH_MODULES
--
--dnl PKG_HAVE_DEFINE_WITH_MODULES(VARIABLE-PREFIX, MODULES,
--dnl [DESCRIPTION], [DEFAULT])
--dnl ------------------------------------------------------
--dnl
--dnl Convenience macro to run AM_CONDITIONAL and AC_DEFINE after
--dnl PKG_WITH_MODULES check. HAVE_[VARIABLE-PREFIX] is exported as make
--dnl 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])])
--])dnl PKG_HAVE_DEFINE_WITH_MODULES
--
- # Copyright (C) 2002-2018 Free Software Foundation, Inc.
- #
- # This file is free software; the Free Software Foundation
-diff --git a/ar-lib b/ar-lib
-index fe2301e..0baa4f6 100755
---- a/ar-lib
-+++ b/ar-lib
-@@ -4,7 +4,7 @@
- me=ar-lib
- scriptversion=2012-03-01.08; # UTC
-
--# Copyright (C) 2010-2013 Free Software Foundation, Inc.
-+# Copyright (C) 2010-2018 Free Software Foundation, Inc.
- # Written by Peter Rosin <peda@lysator.liu.se>.
- #
- # This program is free software; you can redistribute it and/or modify
-@@ -18,7 +18,7 @@ scriptversion=2012-03-01.08; # UTC
- # 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 <http://www.gnu.org/licenses/>.
-+# along with this program. If not, see <https://www.gnu.org/licenses/>.
-
- # As a special exception to the GNU General Public License, if you
- # distribute this file as part of a program that contains a
-diff --git a/build/Makefile.in b/build/Makefile.in
-index 1789b05..de51487 100644
---- a/build/Makefile.in
-+++ b/build/Makefile.in
-@@ -341,6 +341,7 @@ pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
- psdir = @psdir@
-+runstatedir = @runstatedir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
-diff --git a/build/win32/Makefile.in b/build/win32/Makefile.in
-index 59aa3a0..d7190da 100644
---- a/build/win32/Makefile.in
-+++ b/build/win32/Makefile.in
-@@ -281,6 +281,7 @@ pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
- psdir = @psdir@
-+runstatedir = @runstatedir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
-diff --git a/config.guess b/config.guess
-index 1804e9f..f50dcdb 100755
---- a/config.guess
-+++ b/config.guess
-@@ -1,10 +1,8 @@
- #! /bin/sh
- # Attempt to guess a canonical system name.
--# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
--# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
--# 2011, 2012, 2013 Free Software Foundation, Inc.
-+# Copyright 1992-2018 Free Software Foundation, Inc.
-
--timestamp='2012-12-29'
-+timestamp='2018-02-24'
-
- # 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
-@@ -17,7 +15,7 @@ timestamp='2012-12-29'
- # 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 <http://www.gnu.org/licenses/>.
-+# along with this program; if not, see <https://www.gnu.org/licenses/>.
- #
- # As a special exception to the GNU General Public License, if you
- # distribute this file as part of a program that contains a
-@@ -26,12 +24,12 @@ timestamp='2012-12-29'
- # 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
-+# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
- #
--# Please send patches with a ChangeLog entry to config-patches@gnu.org.
-+# Please send patches to <config-patches@gnu.org>.
-
-
- me=`echo "$0" | sed -e 's,.*/,,'`
-@@ -41,7 +39,7 @@ Usage: $0 [OPTION]
-
- Output the configuration name of the system \`$me' is run on.
-
--Operation modes:
-+Options:
- -h, --help print this help, then exit
- -t, --time-stamp print date of last modification, then exit
- -v, --version print version number, then exit
-@@ -52,9 +50,7 @@ version="\
- GNU config.guess ($timestamp)
-
- Originally written by Per Bothner.
--Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
--2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
--2012, 2013 Free Software Foundation, Inc.
-+Copyright 1992-2018 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."
-@@ -111,9 +107,9 @@ trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
- dummy=$tmp/dummy ;
- tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
- case $CC_FOR_BUILD,$HOST_CC,$CC in
-- ,,) echo "int x;" > $dummy.c ;
-+ ,,) echo "int x;" > "$dummy.c" ;
- for c in cc gcc c89 c99 ; do
-- if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
-+ if ($c -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then
- CC_FOR_BUILD="$c"; break ;
- fi ;
- done ;
-@@ -136,9 +132,37 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
- UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
- UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
-
-+case "$UNAME_SYSTEM" in
-+Linux|GNU|GNU/*)
-+ # If the system lacks a compiler, then just pick glibc.
-+ # We could probably try harder.
-+ LIBC=gnu
-+
-+ eval "$set_cc_for_build"
-+ cat <<-EOF > "$dummy.c"
-+ #include <features.h>
-+ #if defined(__UCLIBC__)
-+ LIBC=uclibc
-+ #elif defined(__dietlibc__)
-+ LIBC=dietlibc
-+ #else
-+ LIBC=gnu
-+ #endif
-+ EOF
-+ eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`"
-+
-+ # If ldd exists, use it to detect musl libc.
-+ if command -v ldd >/dev/null && \
-+ ldd --version 2>&1 | grep -q ^musl
-+ then
-+ LIBC=musl
-+ fi
-+ ;;
-+esac
-+
- # Note: order is significant - the case branches are not exclusive.
-
--case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
-+case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
- *:NetBSD:*:*)
- # NetBSD (nbsd) targets should (where applicable) match one or
- # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
-@@ -151,21 +175,31 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
- # Note: NetBSD doesn't particularly care about the vendor
- # portion of the name. We always set it to "unknown".
- sysctl="sysctl -n hw.machine_arch"
-- UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
-- /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
-- case "${UNAME_MACHINE_ARCH}" in
-+ UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \
-+ "/sbin/$sysctl" 2>/dev/null || \
-+ "/usr/sbin/$sysctl" 2>/dev/null || \
-+ echo unknown)`
-+ case "$UNAME_MACHINE_ARCH" in
- armeb) machine=armeb-unknown ;;
- arm*) machine=arm-unknown ;;
- sh3el) machine=shl-unknown ;;
- sh3eb) machine=sh-unknown ;;
- sh5el) machine=sh5le-unknown ;;
-- *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
-+ earmv*)
-+ arch=`echo "$UNAME_MACHINE_ARCH" | sed -e 's,^e\(armv[0-9]\).*$,\1,'`
-+ endian=`echo "$UNAME_MACHINE_ARCH" | sed -ne 's,^.*\(eb\)$,\1,p'`
-+ machine="${arch}${endian}"-unknown
-+ ;;
-+ *) machine="$UNAME_MACHINE_ARCH"-unknown ;;
- esac
- # The Operating System including object format, if it has switched
-- # to ELF recently, or will in the future.
-- case "${UNAME_MACHINE_ARCH}" in
-+ # to ELF recently (or will in the future) and ABI.
-+ case "$UNAME_MACHINE_ARCH" in
-+ earm*)
-+ os=netbsdelf
-+ ;;
- arm*|i386|m68k|ns32k|sh3*|sparc|vax)
-- eval $set_cc_for_build
-+ eval "$set_cc_for_build"
- if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
- | grep -q __ELF__
- then
-@@ -180,44 +214,67 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
- os=netbsd
- ;;
- esac
-+ # Determine ABI tags.
-+ case "$UNAME_MACHINE_ARCH" in
-+ earm*)
-+ expr='s/^earmv[0-9]/-eabi/;s/eb$//'
-+ abi=`echo "$UNAME_MACHINE_ARCH" | sed -e "$expr"`
-+ ;;
-+ esac
- # The OS release
- # Debian GNU/NetBSD machines have a different userland, and
- # thus, need a distinct triplet. However, they do not need
- # kernel version information, so it can be replaced with a
- # suitable tag, in the style of linux-gnu.
-- case "${UNAME_VERSION}" in
-+ case "$UNAME_VERSION" in
- Debian*)
- release='-gnu'
- ;;
- *)
-- release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-+ release=`echo "$UNAME_RELEASE" | sed -e 's/[-_].*//' | cut -d. -f1,2`
- ;;
- esac
- # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
- # contains redundant information, the shorter form:
- # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
-- echo "${machine}-${os}${release}"
-+ echo "$machine-${os}${release}${abi}"
- exit ;;
- *:Bitrig:*:*)
- UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
-- echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
-+ echo "$UNAME_MACHINE_ARCH"-unknown-bitrig"$UNAME_RELEASE"
- exit ;;
- *:OpenBSD:*:*)
- UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
-- echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
-+ echo "$UNAME_MACHINE_ARCH"-unknown-openbsd"$UNAME_RELEASE"
-+ exit ;;
-+ *:LibertyBSD:*:*)
-+ UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'`
-+ echo "$UNAME_MACHINE_ARCH"-unknown-libertybsd"$UNAME_RELEASE"
-+ exit ;;
-+ *:MidnightBSD:*:*)
-+ echo "$UNAME_MACHINE"-unknown-midnightbsd"$UNAME_RELEASE"
- exit ;;
- *:ekkoBSD:*:*)
-- echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
-+ echo "$UNAME_MACHINE"-unknown-ekkobsd"$UNAME_RELEASE"
- exit ;;
- *:SolidBSD:*:*)
-- echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
-+ echo "$UNAME_MACHINE"-unknown-solidbsd"$UNAME_RELEASE"
- exit ;;
- macppc:MirBSD:*:*)
-- echo powerpc-unknown-mirbsd${UNAME_RELEASE}
-+ echo powerpc-unknown-mirbsd"$UNAME_RELEASE"
- exit ;;
- *:MirBSD:*:*)
-- echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
-+ echo "$UNAME_MACHINE"-unknown-mirbsd"$UNAME_RELEASE"
-+ exit ;;
-+ *:Sortix:*:*)
-+ echo "$UNAME_MACHINE"-unknown-sortix
- exit ;;
-+ *:Redox:*:*)
-+ echo "$UNAME_MACHINE"-unknown-redox
-+ exit ;;
-+ mips:OSF1:*.*)
-+ echo mips-dec-osf1
-+ exit ;;
- alpha:OSF1:*:*)
- case $UNAME_RELEASE in
- *4.0)
-@@ -234,63 +291,54 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
- ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1`
- case "$ALPHA_CPU_TYPE" in
- "EV4 (21064)")
-- UNAME_MACHINE="alpha" ;;
-+ UNAME_MACHINE=alpha ;;
- "EV4.5 (21064)")
-- UNAME_MACHINE="alpha" ;;
-+ UNAME_MACHINE=alpha ;;
- "LCA4 (21066/21068)")
-- UNAME_MACHINE="alpha" ;;
-+ UNAME_MACHINE=alpha ;;
- "EV5 (21164)")
-- UNAME_MACHINE="alphaev5" ;;
-+ UNAME_MACHINE=alphaev5 ;;
- "EV5.6 (21164A)")
-- UNAME_MACHINE="alphaev56" ;;
-+ UNAME_MACHINE=alphaev56 ;;
- "EV5.6 (21164PC)")
-- UNAME_MACHINE="alphapca56" ;;
-+ UNAME_MACHINE=alphapca56 ;;
- "EV5.7 (21164PC)")
-- UNAME_MACHINE="alphapca57" ;;
-+ UNAME_MACHINE=alphapca57 ;;
- "EV6 (21264)")
-- UNAME_MACHINE="alphaev6" ;;
-+ UNAME_MACHINE=alphaev6 ;;
- "EV6.7 (21264A)")
-- UNAME_MACHINE="alphaev67" ;;
-+ UNAME_MACHINE=alphaev67 ;;
- "EV6.8CB (21264C)")
-- UNAME_MACHINE="alphaev68" ;;
-+ UNAME_MACHINE=alphaev68 ;;
- "EV6.8AL (21264B)")
-- UNAME_MACHINE="alphaev68" ;;
-+ UNAME_MACHINE=alphaev68 ;;
- "EV6.8CX (21264D)")
-- UNAME_MACHINE="alphaev68" ;;
-+ UNAME_MACHINE=alphaev68 ;;
- "EV6.9A (21264/EV69A)")
-- UNAME_MACHINE="alphaev69" ;;
-+ UNAME_MACHINE=alphaev69 ;;
- "EV7 (21364)")
-- UNAME_MACHINE="alphaev7" ;;
-+ UNAME_MACHINE=alphaev7 ;;
- "EV7.9 (21364A)")
-- UNAME_MACHINE="alphaev79" ;;
-+ UNAME_MACHINE=alphaev79 ;;
- esac
- # A Pn.n version is a patched version.
- # A Vn.n version is a released version.
- # A Tn.n version is a released field test version.
- # A Xn.n version is an unreleased experimental baselevel.
- # 1.2 uses "1.2" for uname -r.
-- echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-+ echo "$UNAME_MACHINE"-dec-osf"`echo "$UNAME_RELEASE" | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`"
- # Reset EXIT trap before exiting to avoid spurious non-zero exit code.
- exitcode=$?
- trap '' 0
- exit $exitcode ;;
-- Alpha\ *:Windows_NT*:*)
-- # How do we know it's Interix rather than the generic POSIX subsystem?
-- # Should we change UNAME_MACHINE based on the output of uname instead
-- # of the specific Alpha model?
-- echo alpha-pc-interix
-- exit ;;
-- 21064:Windows_NT:50:3)
-- echo alpha-dec-winnt3.5
-- exit ;;
- Amiga*:UNIX_System_V:4.0:*)
- echo m68k-unknown-sysv4
- exit ;;
- *:[Aa]miga[Oo][Ss]:*:*)
-- echo ${UNAME_MACHINE}-unknown-amigaos
-+ echo "$UNAME_MACHINE"-unknown-amigaos
- exit ;;
- *:[Mm]orph[Oo][Ss]:*:*)
-- echo ${UNAME_MACHINE}-unknown-morphos
-+ echo "$UNAME_MACHINE"-unknown-morphos
- exit ;;
- *:OS/390:*:*)
- echo i370-ibm-openedition
-@@ -302,7 +350,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
- echo powerpc-ibm-os400
- exit ;;
- arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
-- echo arm-acorn-riscix${UNAME_RELEASE}
-+ echo arm-acorn-riscix"$UNAME_RELEASE"
- exit ;;
- arm*:riscos:*:*|arm*:RISCOS:*:*)
- echo arm-unknown-riscos
-@@ -329,38 +377,38 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
- sparc) echo sparc-icl-nx7; exit ;;
- esac ;;
- s390x:SunOS:*:*)
-- echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-+ echo "$UNAME_MACHINE"-ibm-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`"
- exit ;;
- sun4H:SunOS:5.*:*)
-- echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-+ echo sparc-hal-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
- exit ;;
- sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
-- echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-+ echo sparc-sun-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`"
- exit ;;
- i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
-- echo i386-pc-auroraux${UNAME_RELEASE}
-+ echo i386-pc-auroraux"$UNAME_RELEASE"
- exit ;;
- i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
-- eval $set_cc_for_build
-- SUN_ARCH="i386"
-+ eval "$set_cc_for_build"
-+ SUN_ARCH=i386
- # If there is a compiler, see if it is configured for 64-bit objects.
- # Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
- # This test works for both compilers.
-- if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
-+ if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
- if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
-- (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
-+ (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
- grep IS_64BIT_ARCH >/dev/null
- then
-- SUN_ARCH="x86_64"
-+ SUN_ARCH=x86_64
- fi
- fi
-- echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-+ echo "$SUN_ARCH"-pc-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
- exit ;;
- sun4*:SunOS:6*:*)
- # According to config.sub, this is the proper way to canonicalize
- # SunOS6. Hard to guess exactly what SunOS6 will be like, but
- # it's likely to be more like Solaris than SunOS4.
-- echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-+ echo sparc-sun-solaris3"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
- exit ;;
- sun4*:SunOS:*:*)
- case "`/usr/bin/arch -k`" in
-@@ -369,25 +417,25 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
- ;;
- esac
- # Japanese Language versions have a version number like `4.1.3-JL'.
-- echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
-+ echo sparc-sun-sunos"`echo "$UNAME_RELEASE"|sed -e 's/-/_/'`"
- exit ;;
- sun3*:SunOS:*:*)
-- echo m68k-sun-sunos${UNAME_RELEASE}
-+ echo m68k-sun-sunos"$UNAME_RELEASE"
- exit ;;
- sun*:*:4.2BSD:*)
- UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
-- test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
-+ test "x$UNAME_RELEASE" = x && UNAME_RELEASE=3
- case "`/bin/arch`" in
- sun3)
-- echo m68k-sun-sunos${UNAME_RELEASE}
-+ echo m68k-sun-sunos"$UNAME_RELEASE"
- ;;
- sun4)
-- echo sparc-sun-sunos${UNAME_RELEASE}
-+ echo sparc-sun-sunos"$UNAME_RELEASE"
- ;;
- esac
- exit ;;
- aushp:SunOS:*:*)
-- echo sparc-auspex-sunos${UNAME_RELEASE}
-+ echo sparc-auspex-sunos"$UNAME_RELEASE"
- exit ;;
- # The situation for MiNT is a little confusing. The machine name
- # can be virtually everything (everything which is not
-@@ -398,44 +446,44 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
- # MiNT. But MiNT is downward compatible to TOS, so this should
- # be no problem.
- atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-- echo m68k-atari-mint${UNAME_RELEASE}
-+ echo m68k-atari-mint"$UNAME_RELEASE"
- exit ;;
- atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
-- echo m68k-atari-mint${UNAME_RELEASE}
-+ echo m68k-atari-mint"$UNAME_RELEASE"
- exit ;;
- *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-- echo m68k-atari-mint${UNAME_RELEASE}
-+ echo m68k-atari-mint"$UNAME_RELEASE"
- exit ;;
- milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-- echo m68k-milan-mint${UNAME_RELEASE}
-+ echo m68k-milan-mint"$UNAME_RELEASE"
- exit ;;
- hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-- echo m68k-hades-mint${UNAME_RELEASE}
-+ echo m68k-hades-mint"$UNAME_RELEASE"
- exit ;;
- *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-- echo m68k-unknown-mint${UNAME_RELEASE}
-+ echo m68k-unknown-mint"$UNAME_RELEASE"
- exit ;;
- m68k:machten:*:*)
-- echo m68k-apple-machten${UNAME_RELEASE}
-+ echo m68k-apple-machten"$UNAME_RELEASE"
- exit ;;
- powerpc:machten:*:*)
-- echo powerpc-apple-machten${UNAME_RELEASE}
-+ echo powerpc-apple-machten"$UNAME_RELEASE"
- exit ;;
- RISC*:Mach:*:*)
- echo mips-dec-mach_bsd4.3
- exit ;;
- RISC*:ULTRIX:*:*)
-- echo mips-dec-ultrix${UNAME_RELEASE}
-+ echo mips-dec-ultrix"$UNAME_RELEASE"
- exit ;;
- VAX*:ULTRIX*:*:*)
-- echo vax-dec-ultrix${UNAME_RELEASE}
-+ echo vax-dec-ultrix"$UNAME_RELEASE"
- exit ;;
- 2020:CLIX:*:* | 2430:CLIX:*:*)
-- echo clipper-intergraph-clix${UNAME_RELEASE}
-+ echo clipper-intergraph-clix"$UNAME_RELEASE"
- exit ;;
- mips:*:*:UMIPS | mips:*:*:RISCos)
-- eval $set_cc_for_build
-- sed 's/^ //' << EOF >$dummy.c
-+ eval "$set_cc_for_build"
-+ sed 's/^ //' << EOF > "$dummy.c"
- #ifdef __cplusplus
- #include <stdio.h> /* for printf() prototype */
- int main (int argc, char *argv[]) {
-@@ -444,23 +492,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
- #endif
- #if defined (host_mips) && defined (MIPSEB)
- #if defined (SYSTYPE_SYSV)
-- printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
-+ printf ("mips-mips-riscos%ssysv\\n", argv[1]); exit (0);
- #endif
- #if defined (SYSTYPE_SVR4)
-- printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
-+ printf ("mips-mips-riscos%ssvr4\\n", argv[1]); exit (0);
- #endif
- #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
-- printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
-+ printf ("mips-mips-riscos%sbsd\\n", argv[1]); exit (0);
- #endif
- #endif
- exit (-1);
- }
- EOF
-- $CC_FOR_BUILD -o $dummy $dummy.c &&
-- dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
-- SYSTEM_NAME=`$dummy $dummyarg` &&
-+ $CC_FOR_BUILD -o "$dummy" "$dummy.c" &&
-+ dummyarg=`echo "$UNAME_RELEASE" | sed -n 's/\([0-9]*\).*/\1/p'` &&
-+ SYSTEM_NAME=`"$dummy" "$dummyarg"` &&
- { echo "$SYSTEM_NAME"; exit; }
-- echo mips-mips-riscos${UNAME_RELEASE}
-+ echo mips-mips-riscos"$UNAME_RELEASE"
- exit ;;
- Motorola:PowerMAX_OS:*:*)
- echo powerpc-motorola-powermax
-@@ -486,17 +534,17 @@ EOF
- AViiON:dgux:*:*)
- # DG/UX returns AViiON for all architectures
- UNAME_PROCESSOR=`/usr/bin/uname -p`
-- if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
-+ if [ "$UNAME_PROCESSOR" = mc88100 ] || [ "$UNAME_PROCESSOR" = mc88110 ]
- then
-- if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
-- [ ${TARGET_BINARY_INTERFACE}x = x ]
-+ if [ "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx ] || \
-+ [ "$TARGET_BINARY_INTERFACE"x = x ]
- then
-- echo m88k-dg-dgux${UNAME_RELEASE}
-+ echo m88k-dg-dgux"$UNAME_RELEASE"
- else
-- echo m88k-dg-dguxbcs${UNAME_RELEASE}
-+ echo m88k-dg-dguxbcs"$UNAME_RELEASE"
- fi
- else
-- echo i586-dg-dgux${UNAME_RELEASE}
-+ echo i586-dg-dgux"$UNAME_RELEASE"
- fi
- exit ;;
- M88*:DolphinOS:*:*) # DolphinOS (SVR3)
-@@ -513,7 +561,7 @@ EOF
- echo m68k-tektronix-bsd
- exit ;;
- *:IRIX*:*:*)
-- echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
-+ echo mips-sgi-irix"`echo "$UNAME_RELEASE"|sed -e 's/-/_/g'`"
- exit ;;
- ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
- echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id
-@@ -525,14 +573,14 @@ EOF
- if [ -x /usr/bin/oslevel ] ; then
- IBM_REV=`/usr/bin/oslevel`
- else
-- IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-+ IBM_REV="$UNAME_VERSION.$UNAME_RELEASE"
- fi
-- echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
-+ echo "$UNAME_MACHINE"-ibm-aix"$IBM_REV"
- exit ;;
- *:AIX:2:3)
- if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
-- eval $set_cc_for_build
-- sed 's/^ //' << EOF >$dummy.c
-+ eval "$set_cc_for_build"
-+ sed 's/^ //' << EOF > "$dummy.c"
- #include <sys/systemcfg.h>
-
- main()
-@@ -543,7 +591,7 @@ EOF
- exit(0);
- }
- EOF
-- if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
-+ if $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"`
- then
- echo "$SYSTEM_NAME"
- else
-@@ -557,26 +605,27 @@ EOF
- exit ;;
- *:AIX:*:[4567])
- IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
-- if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
-+ if /usr/sbin/lsattr -El "$IBM_CPU_ID" | grep ' POWER' >/dev/null 2>&1; then
- IBM_ARCH=rs6000
- 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}
-+ IBM_REV="$UNAME_VERSION.$UNAME_RELEASE"
- fi
-- echo ${IBM_ARCH}-ibm-aix${IBM_REV}
-+ echo "$IBM_ARCH"-ibm-aix"$IBM_REV"
- exit ;;
- *:AIX:*:*)
- echo rs6000-ibm-aix
- exit ;;
-- ibmrt:4.4BSD:*|romp-ibm:BSD:*)
-+ ibmrt:4.4BSD:*|romp-ibm:4.4BSD:*)
- echo romp-ibm-bsd4.4
- exit ;;
- ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and
-- echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to
-+ echo romp-ibm-bsd"$UNAME_RELEASE" # 4.3 with uname added to
- exit ;; # report: romp-ibm BSD 4.3
- *:BOSX:*:*)
- echo rs6000-bull-bosx
-@@ -591,28 +640,28 @@ EOF
- echo m68k-hp-bsd4.4
- exit ;;
- 9000/[34678]??:HP-UX:*:*)
-- HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-- case "${UNAME_MACHINE}" in
-- 9000/31? ) HP_ARCH=m68000 ;;
-- 9000/[34]?? ) HP_ARCH=m68k ;;
-+ HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'`
-+ case "$UNAME_MACHINE" in
-+ 9000/31?) HP_ARCH=m68000 ;;
-+ 9000/[34]??) HP_ARCH=m68k ;;
- 9000/[678][0-9][0-9])
- if [ -x /usr/bin/getconf ]; then
- sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
- sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-- case "${sc_cpu_version}" in
-- 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-- 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
-+ case "$sc_cpu_version" in
-+ 523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0
-+ 528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1
- 532) # CPU_PA_RISC2_0
-- case "${sc_kernel_bits}" in
-- 32) HP_ARCH="hppa2.0n" ;;
-- 64) HP_ARCH="hppa2.0w" ;;
-- '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20
-+ case "$sc_kernel_bits" in
-+ 32) HP_ARCH=hppa2.0n ;;
-+ 64) HP_ARCH=hppa2.0w ;;
-+ '') HP_ARCH=hppa2.0 ;; # HP-UX 10.20
- esac ;;
- esac
- fi
-- if [ "${HP_ARCH}" = "" ]; then
-- eval $set_cc_for_build
-- sed 's/^ //' << EOF >$dummy.c
-+ if [ "$HP_ARCH" = "" ]; then
-+ eval "$set_cc_for_build"
-+ sed 's/^ //' << EOF > "$dummy.c"
-
- #define _HPUX_SOURCE
- #include <stdlib.h>
-@@ -645,13 +694,13 @@ EOF
- exit (0);
- }
- EOF
-- (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
-+ (CCOPTS="" $CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null) && HP_ARCH=`"$dummy"`
- test -z "$HP_ARCH" && HP_ARCH=hppa
- fi ;;
- esac
-- if [ ${HP_ARCH} = "hppa2.0w" ]
-+ if [ "$HP_ARCH" = hppa2.0w ]
- then
-- eval $set_cc_for_build
-+ eval "$set_cc_for_build"
-
- # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
- # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler
-@@ -662,23 +711,23 @@ EOF
- # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
- # => hppa64-hp-hpux11.23
-
-- if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
-+ if echo __LP64__ | (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) |
- grep -q __LP64__
- then
-- HP_ARCH="hppa2.0w"
-+ HP_ARCH=hppa2.0w
- else
-- HP_ARCH="hppa64"
-+ HP_ARCH=hppa64
- fi
- fi
-- echo ${HP_ARCH}-hp-hpux${HPUX_REV}
-+ echo "$HP_ARCH"-hp-hpux"$HPUX_REV"
- exit ;;
- ia64:HP-UX:*:*)
-- HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-- echo ia64-hp-hpux${HPUX_REV}
-+ HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'`
-+ echo ia64-hp-hpux"$HPUX_REV"
- exit ;;
- 3050*:HI-UX:*:*)
-- eval $set_cc_for_build
-- sed 's/^ //' << EOF >$dummy.c
-+ eval "$set_cc_for_build"
-+ sed 's/^ //' << EOF > "$dummy.c"
- #include <unistd.h>
- int
- main ()
-@@ -703,11 +752,11 @@ EOF
- exit (0);
- }
- EOF
-- $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
-+ $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` &&
- { echo "$SYSTEM_NAME"; exit; }
- echo unknown-hitachi-hiuxwe2
- exit ;;
-- 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
-+ 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:*)
- echo hppa1.1-hp-bsd
- exit ;;
- 9000/8??:4.3bsd:*:*)
-@@ -716,7 +765,7 @@ EOF
- *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
- echo hppa1.0-hp-mpeix
- exit ;;
-- hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
-+ hp7??:OSF1:*:* | hp8?[79]:OSF1:*:*)
- echo hppa1.1-hp-osf
- exit ;;
- hp8??:OSF1:*:*)
-@@ -724,9 +773,9 @@ EOF
- exit ;;
- i*86:OSF1:*:*)
- if [ -x /usr/sbin/sysversion ] ; then
-- echo ${UNAME_MACHINE}-unknown-osf1mk
-+ echo "$UNAME_MACHINE"-unknown-osf1mk
- else
-- echo ${UNAME_MACHINE}-unknown-osf1
-+ echo "$UNAME_MACHINE"-unknown-osf1
- fi
- exit ;;
- parisc*:Lites*:*:*)
-@@ -751,127 +800,109 @@ EOF
- echo c4-convex-bsd
- exit ;;
- CRAY*Y-MP:*:*:*)
-- echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-+ echo ymp-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
- exit ;;
- CRAY*[A-Z]90:*:*:*)
-- echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
-+ echo "$UNAME_MACHINE"-cray-unicos"$UNAME_RELEASE" \
- | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
- -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
- -e 's/\.[^.]*$/.X/'
- exit ;;
- CRAY*TS:*:*:*)
-- echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-+ echo t90-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
- exit ;;
- CRAY*T3E:*:*:*)
-- echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-+ echo alphaev5-cray-unicosmk"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
- exit ;;
- CRAY*SV1:*:*:*)
-- echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-+ echo sv1-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
- exit ;;
- *:UNICOS/mp:*:*)
-- echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-+ echo craynv-cray-unicosmp"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
- exit ;;
- F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
-- FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-- FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-+ FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
-+ FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
-+ FUJITSU_REL=`echo "$UNAME_RELEASE" | sed -e 's/ /_/'`
- echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
- exit ;;
- 5000:UNIX_System_V:4.*:*)
-- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-- FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
-+ FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
-+ FUJITSU_REL=`echo "$UNAME_RELEASE" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'`
- echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
- exit ;;
- i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
-- echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
-+ echo "$UNAME_MACHINE"-pc-bsdi"$UNAME_RELEASE"
- exit ;;
- sparc*:BSD/OS:*:*)
-- echo sparc-unknown-bsdi${UNAME_RELEASE}
-+ echo sparc-unknown-bsdi"$UNAME_RELEASE"
- exit ;;
- *:BSD/OS:*:*)
-- echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
-+ echo "$UNAME_MACHINE"-unknown-bsdi"$UNAME_RELEASE"
- exit ;;
- *:FreeBSD:*:*)
- UNAME_PROCESSOR=`/usr/bin/uname -p`
-- case ${UNAME_PROCESSOR} in
-+ case "$UNAME_PROCESSOR" in
- amd64)
-- echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-- *)
-- echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-+ UNAME_PROCESSOR=x86_64 ;;
-+ i386)
-+ UNAME_PROCESSOR=i586 ;;
- esac
-+ echo "$UNAME_PROCESSOR"-unknown-freebsd"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`"
- exit ;;
- i*:CYGWIN*:*)
-- echo ${UNAME_MACHINE}-pc-cygwin
-+ echo "$UNAME_MACHINE"-pc-cygwin
- exit ;;
- *:MINGW64*:*)
-- echo ${UNAME_MACHINE}-pc-mingw64
-+ echo "$UNAME_MACHINE"-pc-mingw64
- exit ;;
- *:MINGW*:*)
-- echo ${UNAME_MACHINE}-pc-mingw32
-+ echo "$UNAME_MACHINE"-pc-mingw32
- exit ;;
-- i*:MSYS*:*)
-- echo ${UNAME_MACHINE}-pc-msys
-- exit ;;
-- i*:windows32*:*)
-- # uname -m includes "-pc" on this system.
-- echo ${UNAME_MACHINE}-mingw32
-+ *:MSYS*:*)
-+ echo "$UNAME_MACHINE"-pc-msys
- exit ;;
- i*:PW*:*)
-- echo ${UNAME_MACHINE}-pc-pw32
-+ echo "$UNAME_MACHINE"-pc-pw32
- exit ;;
- *:Interix*:*)
-- case ${UNAME_MACHINE} in
-+ case "$UNAME_MACHINE" in
- x86)
-- echo i586-pc-interix${UNAME_RELEASE}
-+ echo i586-pc-interix"$UNAME_RELEASE"
- exit ;;
- authenticamd | genuineintel | EM64T)
-- echo x86_64-unknown-interix${UNAME_RELEASE}
-+ echo x86_64-unknown-interix"$UNAME_RELEASE"
- exit ;;
- IA64)
-- echo ia64-unknown-interix${UNAME_RELEASE}
-+ echo ia64-unknown-interix"$UNAME_RELEASE"
- exit ;;
- esac ;;
-- [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
-- echo i${UNAME_MACHINE}-pc-mks
-- exit ;;
-- 8664:Windows_NT:*)
-- echo x86_64-pc-mks
-- exit ;;
-- i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
-- # How do we know it's Interix rather than the generic POSIX subsystem?
-- # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
-- # UNAME_MACHINE based on the output of uname instead of i386?
-- echo i586-pc-interix
-- exit ;;
- i*:UWIN*:*)
-- echo ${UNAME_MACHINE}-pc-uwin
-+ echo "$UNAME_MACHINE"-pc-uwin
- exit ;;
- amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
- echo x86_64-unknown-cygwin
- exit ;;
-- p*:CYGWIN*:*)
-- echo powerpcle-unknown-cygwin
-- exit ;;
- prep*:SunOS:5.*:*)
-- echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-+ echo powerpcle-unknown-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
- exit ;;
- *:GNU:*:*)
- # the GNU system
-- echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
-+ echo "`echo "$UNAME_MACHINE"|sed -e 's,[-/].*$,,'`-unknown-$LIBC`echo "$UNAME_RELEASE"|sed -e 's,/.*$,,'`"
- exit ;;
- *:GNU/*:*:*)
- # other systems with GNU libc and userland
-- echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
-+ echo "$UNAME_MACHINE-unknown-`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`-$LIBC"
- exit ;;
- i*86:Minix:*:*)
-- echo ${UNAME_MACHINE}-pc-minix
-+ echo "$UNAME_MACHINE"-pc-minix
- exit ;;
- aarch64:Linux:*:*)
-- echo ${UNAME_MACHINE}-unknown-linux-gnu
-+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
- exit ;;
- aarch64_be:Linux:*:*)
- UNAME_MACHINE=aarch64_be
-- echo ${UNAME_MACHINE}-unknown-linux-gnu
-+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
- exit ;;
- alpha:Linux:*:*)
- case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-@@ -884,63 +915,64 @@ EOF
- EV68*) UNAME_MACHINE=alphaev68 ;;
- esac
- objdump --private-headers /bin/sh | grep -q ld.so.1
-- if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-+ if test "$?" = 0 ; then LIBC=gnulibc1 ; fi
-+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-+ exit ;;
-+ arc:Linux:*:* | arceb:Linux:*:*)
-+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
- exit ;;
- arm*:Linux:*:*)
-- eval $set_cc_for_build
-+ eval "$set_cc_for_build"
- if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
- | grep -q __ARM_EABI__
- then
-- echo ${UNAME_MACHINE}-unknown-linux-gnu
-+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
- else
- if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
- | grep -q __ARM_PCS_VFP
- then
-- echo ${UNAME_MACHINE}-unknown-linux-gnueabi
-+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabi
- else
-- echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
-+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabihf
- fi
- fi
- exit ;;
- avr32*:Linux:*:*)
-- echo ${UNAME_MACHINE}-unknown-linux-gnu
-+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
- exit ;;
- cris:Linux:*:*)
-- echo ${UNAME_MACHINE}-axis-linux-gnu
-+ echo "$UNAME_MACHINE"-axis-linux-"$LIBC"
- exit ;;
- crisv32:Linux:*:*)
-- echo ${UNAME_MACHINE}-axis-linux-gnu
-+ echo "$UNAME_MACHINE"-axis-linux-"$LIBC"
-+ exit ;;
-+ e2k:Linux:*:*)
-+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
- exit ;;
- frv:Linux:*:*)
-- echo ${UNAME_MACHINE}-unknown-linux-gnu
-+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
- exit ;;
- hexagon:Linux:*:*)
-- echo ${UNAME_MACHINE}-unknown-linux-gnu
-+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
- exit ;;
- i*86:Linux:*:*)
-- LIBC=gnu
-- eval $set_cc_for_build
-- sed 's/^ //' << EOF >$dummy.c
-- #ifdef __dietlibc__
-- LIBC=dietlibc
-- #endif
--EOF
-- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
-- echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
-+ echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
- exit ;;
- ia64:Linux:*:*)
-- echo ${UNAME_MACHINE}-unknown-linux-gnu
-+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-+ exit ;;
-+ k1om:Linux:*:*)
-+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
- exit ;;
- m32r*:Linux:*:*)
-- echo ${UNAME_MACHINE}-unknown-linux-gnu
-+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
- exit ;;
- m68*:Linux:*:*)
-- echo ${UNAME_MACHINE}-unknown-linux-gnu
-+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
- exit ;;
- mips:Linux:*:* | mips64:Linux:*:*)
-- eval $set_cc_for_build
-- sed 's/^ //' << EOF >$dummy.c
-+ eval "$set_cc_for_build"
-+ sed 's/^ //' << EOF > "$dummy.c"
- #undef CPU
- #undef ${UNAME_MACHINE}
- #undef ${UNAME_MACHINE}el
-@@ -954,55 +986,74 @@ EOF
- #endif
- #endif
- EOF
-- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
-- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
-+ eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU'`"
-+ test "x$CPU" != x && { echo "$CPU-unknown-linux-$LIBC"; exit; }
- ;;
-- or32:Linux:*:*)
-- echo ${UNAME_MACHINE}-unknown-linux-gnu
-+ mips64el:Linux:*:*)
-+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-+ exit ;;
-+ openrisc*:Linux:*:*)
-+ echo or1k-unknown-linux-"$LIBC"
-+ exit ;;
-+ or32:Linux:*:* | or1k*:Linux:*:*)
-+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
- exit ;;
- padre:Linux:*:*)
-- echo sparc-unknown-linux-gnu
-+ echo sparc-unknown-linux-"$LIBC"
- exit ;;
- parisc64:Linux:*:* | hppa64:Linux:*:*)
-- echo hppa64-unknown-linux-gnu
-+ echo hppa64-unknown-linux-"$LIBC"
- exit ;;
- parisc:Linux:*:* | hppa:Linux:*:*)
- # Look for CPU level
- case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-- PA7*) echo hppa1.1-unknown-linux-gnu ;;
-- PA8*) echo hppa2.0-unknown-linux-gnu ;;
-- *) echo hppa-unknown-linux-gnu ;;
-+ PA7*) echo hppa1.1-unknown-linux-"$LIBC" ;;
-+ PA8*) echo hppa2.0-unknown-linux-"$LIBC" ;;
-+ *) echo hppa-unknown-linux-"$LIBC" ;;
- esac
- exit ;;
- ppc64:Linux:*:*)
-- echo powerpc64-unknown-linux-gnu
-+ echo powerpc64-unknown-linux-"$LIBC"
- exit ;;
- ppc:Linux:*:*)
-- echo powerpc-unknown-linux-gnu
-+ echo powerpc-unknown-linux-"$LIBC"
-+ exit ;;
-+ ppc64le:Linux:*:*)
-+ echo powerpc64le-unknown-linux-"$LIBC"
-+ exit ;;
-+ ppcle:Linux:*:*)
-+ echo powerpcle-unknown-linux-"$LIBC"
-+ exit ;;
-+ riscv32:Linux:*:* | riscv64:Linux:*:*)
-+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
- exit ;;
- s390:Linux:*:* | s390x:Linux:*:*)
-- echo ${UNAME_MACHINE}-ibm-linux
-+ echo "$UNAME_MACHINE"-ibm-linux-"$LIBC"
- exit ;;
- sh64*:Linux:*:*)
-- echo ${UNAME_MACHINE}-unknown-linux-gnu
-+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
- exit ;;
- sh*:Linux:*:*)
-- echo ${UNAME_MACHINE}-unknown-linux-gnu
-+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
- exit ;;
- sparc:Linux:*:* | sparc64:Linux:*:*)
-- echo ${UNAME_MACHINE}-unknown-linux-gnu
-+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
- exit ;;
- tile*:Linux:*:*)
-- echo ${UNAME_MACHINE}-unknown-linux-gnu
-+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
- exit ;;
- vax:Linux:*:*)
-- echo ${UNAME_MACHINE}-dec-linux-gnu
-+ echo "$UNAME_MACHINE"-dec-linux-"$LIBC"
- exit ;;
- x86_64:Linux:*:*)
-- echo ${UNAME_MACHINE}-unknown-linux-gnu
-+ if objdump -f /bin/sh | grep -q elf32-x86-64; then
-+ echo "$UNAME_MACHINE"-pc-linux-"$LIBC"x32
-+ else
-+ echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
-+ fi
- exit ;;
- xtensa*:Linux:*:*)
-- echo ${UNAME_MACHINE}-unknown-linux-gnu
-+ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
- exit ;;
- i*86:DYNIX/ptx:4*:*)
- # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
-@@ -1016,34 +1067,34 @@ EOF
- # I am not positive that other SVR4 systems won't match this,
- # I just have to hope. -- rms.
- # Use sysv4.2uw... so that sysv4* matches it.
-- echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
-+ echo "$UNAME_MACHINE"-pc-sysv4.2uw"$UNAME_VERSION"
- exit ;;
- i*86:OS/2:*:*)
- # If we were able to find `uname', then EMX Unix compatibility
- # is probably installed.
-- echo ${UNAME_MACHINE}-pc-os2-emx
-+ echo "$UNAME_MACHINE"-pc-os2-emx
- exit ;;
- i*86:XTS-300:*:STOP)
-- echo ${UNAME_MACHINE}-unknown-stop
-+ echo "$UNAME_MACHINE"-unknown-stop
- exit ;;
- i*86:atheos:*:*)
-- echo ${UNAME_MACHINE}-unknown-atheos
-+ echo "$UNAME_MACHINE"-unknown-atheos
- exit ;;
- i*86:syllable:*:*)
-- echo ${UNAME_MACHINE}-pc-syllable
-+ echo "$UNAME_MACHINE"-pc-syllable
- exit ;;
- i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
-- echo i386-unknown-lynxos${UNAME_RELEASE}
-+ echo i386-unknown-lynxos"$UNAME_RELEASE"
- exit ;;
- i*86:*DOS:*:*)
-- echo ${UNAME_MACHINE}-pc-msdosdjgpp
-+ echo "$UNAME_MACHINE"-pc-msdosdjgpp
- exit ;;
-- i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
-- UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
-+ i*86:*:4.*:*)
-+ UNAME_REL=`echo "$UNAME_RELEASE" | sed 's/\/MP$//'`
- if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
-- echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
-+ echo "$UNAME_MACHINE"-univel-sysv"$UNAME_REL"
- else
-- echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
-+ echo "$UNAME_MACHINE"-pc-sysv"$UNAME_REL"
- fi
- exit ;;
- i*86:*:5:[678]*)
-@@ -1053,12 +1104,12 @@ EOF
- *Pentium) UNAME_MACHINE=i586 ;;
- *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
- esac
-- echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
-+ echo "$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}{$UNAME_VERSION}"
- exit ;;
- i*86:*:3.2:*)
- if test -f /usr/options/cb.name; then
- UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
-- echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
-+ echo "$UNAME_MACHINE"-pc-isc"$UNAME_REL"
- elif /bin/uname -X 2>/dev/null >/dev/null ; then
- UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
- (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
-@@ -1068,9 +1119,9 @@ EOF
- && UNAME_MACHINE=i686
- (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
- && UNAME_MACHINE=i686
-- echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
-+ echo "$UNAME_MACHINE"-pc-sco"$UNAME_REL"
- else
-- echo ${UNAME_MACHINE}-pc-sysv32
-+ echo "$UNAME_MACHINE"-pc-sysv32
- fi
- exit ;;
- pc:*:*:*)
-@@ -1078,7 +1129,7 @@ EOF
- # uname -m prints for DJGPP always 'pc', but it prints nothing about
- # the processor, so we play safe by assuming i586.
- # Note: whatever this is, it MUST be the same as what config.sub
-- # prints for the "djgpp" host, or else GDB configury will decide that
-+ # prints for the "djgpp" host, or else GDB configure will decide that
- # this is a cross-build.
- echo i586-pc-msdosdjgpp
- exit ;;
-@@ -1090,9 +1141,9 @@ EOF
- exit ;;
- i860:*:4.*:*) # i860-SVR4
- if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
-- echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
-+ echo i860-stardent-sysv"$UNAME_RELEASE" # Stardent Vistra i860-SVR4
- else # Add other i860-SVR4 vendors below as they are discovered.
-- echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4
-+ echo i860-unknown-sysv"$UNAME_RELEASE" # Unknown i860-SVR4
- fi
- exit ;;
- mini*:CTIX:SYS*5:*)
-@@ -1112,9 +1163,9 @@ EOF
- test -r /etc/.relid \
- && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
- /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-- && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
-+ && { echo i486-ncr-sysv4.3"$OS_REL"; exit; }
- /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-- && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
-+ && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;;
- 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
- /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
- && { echo i486-ncr-sysv4; exit; } ;;
-@@ -1123,28 +1174,28 @@ EOF
- test -r /etc/.relid \
- && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
- /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-- && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
-+ && { echo i486-ncr-sysv4.3"$OS_REL"; exit; }
- /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-- && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
-+ && { echo i586-ncr-sysv4.3"$OS_REL"; exit; }
- /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
-- && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
-+ && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;;
- m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
-- echo m68k-unknown-lynxos${UNAME_RELEASE}
-+ echo m68k-unknown-lynxos"$UNAME_RELEASE"
- exit ;;
- mc68030:UNIX_System_V:4.*:*)
- echo m68k-atari-sysv4
- exit ;;
- TSUNAMI:LynxOS:2.*:*)
-- echo sparc-unknown-lynxos${UNAME_RELEASE}
-+ echo sparc-unknown-lynxos"$UNAME_RELEASE"
- exit ;;
- rs6000:LynxOS:2.*:*)
-- echo rs6000-unknown-lynxos${UNAME_RELEASE}
-+ echo rs6000-unknown-lynxos"$UNAME_RELEASE"
- exit ;;
- PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
-- echo powerpc-unknown-lynxos${UNAME_RELEASE}
-+ echo powerpc-unknown-lynxos"$UNAME_RELEASE"
- exit ;;
- SM[BE]S:UNIX_SV:*:*)
-- echo mips-dde-sysv${UNAME_RELEASE}
-+ echo mips-dde-sysv"$UNAME_RELEASE"
- exit ;;
- RM*:ReliantUNIX-*:*:*)
- echo mips-sni-sysv4
-@@ -1155,7 +1206,7 @@ EOF
- *:SINIX-*:*:*)
- if uname -p 2>/dev/null >/dev/null ; then
- UNAME_MACHINE=`(uname -p) 2>/dev/null`
-- echo ${UNAME_MACHINE}-sni-sysv4
-+ echo "$UNAME_MACHINE"-sni-sysv4
- else
- echo ns32k-sni-sysv
- fi
-@@ -1175,23 +1226,23 @@ EOF
- exit ;;
- i*86:VOS:*:*)
- # From Paul.Green@stratus.com.
-- echo ${UNAME_MACHINE}-stratus-vos
-+ echo "$UNAME_MACHINE"-stratus-vos
- exit ;;
- *:VOS:*:*)
- # From Paul.Green@stratus.com.
- echo hppa1.1-stratus-vos
- exit ;;
- mc68*:A/UX:*:*)
-- echo m68k-apple-aux${UNAME_RELEASE}
-+ echo m68k-apple-aux"$UNAME_RELEASE"
- exit ;;
- news*:NEWS-OS:6*:*)
- echo mips-sony-newsos6
- exit ;;
- R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
- if [ -d /usr/nec ]; then
-- echo mips-nec-sysv${UNAME_RELEASE}
-+ echo mips-nec-sysv"$UNAME_RELEASE"
- else
-- echo mips-unknown-sysv${UNAME_RELEASE}
-+ echo mips-unknown-sysv"$UNAME_RELEASE"
- fi
- exit ;;
- BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.
-@@ -1210,65 +1261,93 @@ EOF
- echo x86_64-unknown-haiku
- exit ;;
- SX-4:SUPER-UX:*:*)
-- echo sx4-nec-superux${UNAME_RELEASE}
-+ echo sx4-nec-superux"$UNAME_RELEASE"
- exit ;;
- SX-5:SUPER-UX:*:*)
-- echo sx5-nec-superux${UNAME_RELEASE}
-+ echo sx5-nec-superux"$UNAME_RELEASE"
- exit ;;
- SX-6:SUPER-UX:*:*)
-- echo sx6-nec-superux${UNAME_RELEASE}
-+ echo sx6-nec-superux"$UNAME_RELEASE"
- exit ;;
- SX-7:SUPER-UX:*:*)
-- echo sx7-nec-superux${UNAME_RELEASE}
-+ echo sx7-nec-superux"$UNAME_RELEASE"
- exit ;;
- SX-8:SUPER-UX:*:*)
-- echo sx8-nec-superux${UNAME_RELEASE}
-+ echo sx8-nec-superux"$UNAME_RELEASE"
- exit ;;
- SX-8R:SUPER-UX:*:*)
-- echo sx8r-nec-superux${UNAME_RELEASE}
-+ echo sx8r-nec-superux"$UNAME_RELEASE"
-+ exit ;;
-+ SX-ACE:SUPER-UX:*:*)
-+ echo sxace-nec-superux"$UNAME_RELEASE"
- exit ;;
- Power*:Rhapsody:*:*)
-- echo powerpc-apple-rhapsody${UNAME_RELEASE}
-+ echo powerpc-apple-rhapsody"$UNAME_RELEASE"
- exit ;;
- *:Rhapsody:*:*)
-- echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
-+ echo "$UNAME_MACHINE"-apple-rhapsody"$UNAME_RELEASE"
- exit ;;
- *:Darwin:*:*)
- UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-- case $UNAME_PROCESSOR in
-- i386)
-- eval $set_cc_for_build
-- if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
-- if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
-- (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
-- grep IS_64BIT_ARCH >/dev/null
-- then
-- UNAME_PROCESSOR="x86_64"
-- fi
-- fi ;;
-- unknown) UNAME_PROCESSOR=powerpc ;;
-- esac
-- echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
-+ eval "$set_cc_for_build"
-+ if test "$UNAME_PROCESSOR" = unknown ; then
-+ UNAME_PROCESSOR=powerpc
-+ fi
-+ if test "`echo "$UNAME_RELEASE" | sed -e 's/\..*//'`" -le 10 ; then
-+ if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
-+ if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
-+ (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
-+ grep IS_64BIT_ARCH >/dev/null
-+ then
-+ case $UNAME_PROCESSOR in
-+ i386) UNAME_PROCESSOR=x86_64 ;;
-+ powerpc) UNAME_PROCESSOR=powerpc64 ;;
-+ esac
-+ fi
-+ # On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc
-+ if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') | \
-+ (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
-+ grep IS_PPC >/dev/null
-+ then
-+ UNAME_PROCESSOR=powerpc
-+ fi
-+ fi
-+ elif test "$UNAME_PROCESSOR" = i386 ; then
-+ # Avoid executing cc on OS X 10.9, as it ships with a stub
-+ # that puts up a graphical alert prompting to install
-+ # developer tools. Any system running Mac OS X 10.7 or
-+ # later (Darwin 11 and later) is required to have a 64-bit
-+ # processor. This is not true of the ARM version of Darwin
-+ # that Apple uses in portable devices.
-+ UNAME_PROCESSOR=x86_64
-+ fi
-+ echo "$UNAME_PROCESSOR"-apple-darwin"$UNAME_RELEASE"
- exit ;;
- *:procnto*:*:* | *:QNX:[0123456789]*:*)
- UNAME_PROCESSOR=`uname -p`
-- if test "$UNAME_PROCESSOR" = "x86"; then
-+ if test "$UNAME_PROCESSOR" = x86; then
- UNAME_PROCESSOR=i386
- UNAME_MACHINE=pc
- fi
-- echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
-+ echo "$UNAME_PROCESSOR"-"$UNAME_MACHINE"-nto-qnx"$UNAME_RELEASE"
- exit ;;
- *:QNX:*:4*)
- echo i386-pc-qnx
- exit ;;
-- NEO-?:NONSTOP_KERNEL:*:*)
-- echo neo-tandem-nsk${UNAME_RELEASE}
-+ NEO-*:NONSTOP_KERNEL:*:*)
-+ echo neo-tandem-nsk"$UNAME_RELEASE"
- exit ;;
- NSE-*:NONSTOP_KERNEL:*:*)
-- echo nse-tandem-nsk${UNAME_RELEASE}
-+ echo nse-tandem-nsk"$UNAME_RELEASE"
- exit ;;
-- NSR-?:NONSTOP_KERNEL:*:*)
-- echo nsr-tandem-nsk${UNAME_RELEASE}
-+ NSR-*:NONSTOP_KERNEL:*:*)
-+ echo nsr-tandem-nsk"$UNAME_RELEASE"
-+ exit ;;
-+ NSV-*:NONSTOP_KERNEL:*:*)
-+ echo nsv-tandem-nsk"$UNAME_RELEASE"
-+ exit ;;
-+ NSX-*:NONSTOP_KERNEL:*:*)
-+ echo nsx-tandem-nsk"$UNAME_RELEASE"
- exit ;;
- *:NonStop-UX:*:*)
- echo mips-compaq-nonstopux
-@@ -1277,18 +1356,18 @@ EOF
- echo bs2000-siemens-sysv
- exit ;;
- DS/*:UNIX_System_V:*:*)
-- echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
-+ echo "$UNAME_MACHINE"-"$UNAME_SYSTEM"-"$UNAME_RELEASE"
- exit ;;
- *:Plan9:*:*)
- # "uname -m" is not consistent, so use $cputype instead. 386
- # is converted to i386 for consistency with other x86
- # operating systems.
-- if test "$cputype" = "386"; then
-+ if test "$cputype" = 386; then
- UNAME_MACHINE=i386
- else
- UNAME_MACHINE="$cputype"
- fi
-- echo ${UNAME_MACHINE}-unknown-plan9
-+ echo "$UNAME_MACHINE"-unknown-plan9
- exit ;;
- *:TOPS-10:*:*)
- echo pdp10-unknown-tops10
-@@ -1309,14 +1388,14 @@ EOF
- echo pdp10-unknown-its
- exit ;;
- SEI:*:*:SEIUX)
-- echo mips-sei-seiux${UNAME_RELEASE}
-+ echo mips-sei-seiux"$UNAME_RELEASE"
- exit ;;
- *:DragonFly:*:*)
-- echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-+ echo "$UNAME_MACHINE"-unknown-dragonfly"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`"
- exit ;;
- *:*VMS:*:*)
- UNAME_MACHINE=`(uname -p) 2>/dev/null`
-- case "${UNAME_MACHINE}" in
-+ case "$UNAME_MACHINE" in
- A*) echo alpha-dec-vms ; exit ;;
- I*) echo ia64-dec-vms ; exit ;;
- V*) echo vax-dec-vms ; exit ;;
-@@ -1325,182 +1404,48 @@ EOF
- echo i386-pc-xenix
- exit ;;
- i*86:skyos:*:*)
-- echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
-+ echo "$UNAME_MACHINE"-pc-skyos"`echo "$UNAME_RELEASE" | sed -e 's/ .*$//'`"
- exit ;;
- i*86:rdos:*:*)
-- echo ${UNAME_MACHINE}-pc-rdos
-+ echo "$UNAME_MACHINE"-pc-rdos
- exit ;;
- i*86:AROS:*:*)
-- echo ${UNAME_MACHINE}-pc-aros
-+ echo "$UNAME_MACHINE"-pc-aros
- exit ;;
- x86_64:VMkernel:*:*)
-- echo ${UNAME_MACHINE}-unknown-esx
-+ echo "$UNAME_MACHINE"-unknown-esx
-+ exit ;;
-+ amd64:Isilon\ OneFS:*:*)
-+ echo x86_64-unknown-onefs
- exit ;;
- esac
-
--eval $set_cc_for_build
--cat >$dummy.c <<EOF
--#ifdef _SEQUENT_
--# include <sys/types.h>
--# include <sys/utsname.h>
--#endif
--main ()
--{
--#if defined (sony)
--#if defined (MIPSEB)
-- /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed,
-- I don't know.... */
-- printf ("mips-sony-bsd\n"); exit (0);
--#else
--#include <sys/param.h>
-- printf ("m68k-sony-newsos%s\n",
--#ifdef NEWSOS4
-- "4"
--#else
-- ""
--#endif
-- ); exit (0);
--#endif
--#endif
--
--#if defined (__arm) && defined (__acorn) && defined (__unix)
-- printf ("arm-acorn-riscix\n"); exit (0);
--#endif
--
--#if defined (hp300) && !defined (hpux)
-- printf ("m68k-hp-bsd\n"); exit (0);
--#endif
--
--#if defined (NeXT)
--#if !defined (__ARCHITECTURE__)
--#define __ARCHITECTURE__ "m68k"
--#endif
-- int version;
-- version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
-- if (version < 4)
-- printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
-- else
-- printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
-- exit (0);
--#endif
--
--#if defined (MULTIMAX) || defined (n16)
--#if defined (UMAXV)
-- printf ("ns32k-encore-sysv\n"); exit (0);
--#else
--#if defined (CMU)
-- printf ("ns32k-encore-mach\n"); exit (0);
--#else
-- printf ("ns32k-encore-bsd\n"); exit (0);
--#endif
--#endif
--#endif
--
--#if defined (__386BSD__)
-- printf ("i386-pc-bsd\n"); exit (0);
--#endif
--
--#if defined (sequent)
--#if defined (i386)
-- printf ("i386-sequent-dynix\n"); exit (0);
--#endif
--#if defined (ns32000)
-- printf ("ns32k-sequent-dynix\n"); exit (0);
--#endif
--#endif
--
--#if defined (_SEQUENT_)
-- struct utsname un;
-+echo "$0: unable to guess system type" >&2
-
-- uname(&un);
-+case "$UNAME_MACHINE:$UNAME_SYSTEM" in
-+ mips:Linux | mips64:Linux)
-+ # If we got here on MIPS GNU/Linux, output extra information.
-+ cat >&2 <<EOF
-
-- if (strncmp(un.version, "V2", 2) == 0) {
-- printf ("i386-sequent-ptx2\n"); exit (0);
-- }
-- if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
-- printf ("i386-sequent-ptx1\n"); exit (0);
-- }
-- printf ("i386-sequent-ptx\n"); exit (0);
--
--#endif
--
--#if defined (vax)
--# if !defined (ultrix)
--# include <sys/param.h>
--# if defined (BSD)
--# if BSD == 43
-- printf ("vax-dec-bsd4.3\n"); exit (0);
--# else
--# if BSD == 199006
-- printf ("vax-dec-bsd4.3reno\n"); exit (0);
--# else
-- printf ("vax-dec-bsd\n"); exit (0);
--# endif
--# endif
--# else
-- printf ("vax-dec-bsd\n"); exit (0);
--# endif
--# else
-- printf ("vax-dec-ultrix\n"); exit (0);
--# endif
--#endif
--
--#if defined (alliant) && defined (i860)
-- printf ("i860-alliant-bsd\n"); exit (0);
--#endif
--
-- exit (1);
--}
-+NOTE: MIPS GNU/Linux systems require a C compiler to fully recognize
-+the system type. Please install a C compiler and try again.
- EOF
--
--$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
-- { echo "$SYSTEM_NAME"; exit; }
--
--# Apollos put the system type in the environment.
--
--test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
--
--# Convex versions that predate uname can use getsysinfo(1)
--
--if [ -x /usr/convex/getsysinfo ]
--then
-- case `getsysinfo -f cpu_type` in
-- c1*)
-- echo c1-convex-bsd
-- exit ;;
-- c2*)
-- if getsysinfo -f scalar_acc
-- then echo c32-convex-bsd
-- else echo c2-convex-bsd
-- fi
-- exit ;;
-- c34*)
-- echo c34-convex-bsd
-- exit ;;
-- c38*)
-- echo c38-convex-bsd
-- exit ;;
-- c4*)
-- echo c4-convex-bsd
-- exit ;;
-- esac
--fi
-+ ;;
-+esac
-
- cat >&2 <<EOF
--$0: unable to guess system type
-
--This script, last modified $timestamp, has failed to recognize
--the operating system you are using. It is advised that you
--download the most up to date version of the config scripts from
-+This script (version $timestamp), has failed to recognize the
-+operating system you are using. If your script is old, overwrite *all*
-+copies of config.guess and config.sub with the latest versions from:
-
-- http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
-+ https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
- and
-- http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
-+ https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
-
--If the version you run ($0) is already up to date, please
--send the following data and any information you think might be
--pertinent to <config-patches@gnu.org> in order to provide the needed
--information to handle your system.
-+If $0 has already been updated, send the following data and any
-+information you think might be pertinent to config-patches@gnu.org to
-+provide the necessary information to handle your system.
-
- config.guess timestamp = $timestamp
-
-@@ -1519,16 +1464,16 @@ hostinfo = `(hostinfo) 2>/dev/null`
- /usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null`
- /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
-
--UNAME_MACHINE = ${UNAME_MACHINE}
--UNAME_RELEASE = ${UNAME_RELEASE}
--UNAME_SYSTEM = ${UNAME_SYSTEM}
--UNAME_VERSION = ${UNAME_VERSION}
-+UNAME_MACHINE = "$UNAME_MACHINE"
-+UNAME_RELEASE = "$UNAME_RELEASE"
-+UNAME_SYSTEM = "$UNAME_SYSTEM"
-+UNAME_VERSION = "$UNAME_VERSION"
- EOF
-
- exit 1
-
- # Local variables:
--# eval: (add-hook 'write-file-hooks 'time-stamp)
-+# eval: (add-hook 'write-file-functions 'time-stamp)
- # time-stamp-start: "timestamp='"
- # time-stamp-format: "%:y-%02m-%02d"
- # time-stamp-end: "'"
-diff --git a/config.sub b/config.sub
-index 52f04bc..1d8e98b 100755
---- a/config.sub
-+++ b/config.sub
-@@ -1,10 +1,8 @@
- #! /bin/sh
- # Configuration validation subroutine script.
--# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
--# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
--# 2011, 2012, 2013 Free Software Foundation, Inc.
-+# Copyright 1992-2018 Free Software Foundation, Inc.
-
--timestamp='2012-12-29'
-+timestamp='2018-02-22'
-
- # 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
-@@ -17,7 +15,7 @@ timestamp='2012-12-29'
- # 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 <http://www.gnu.org/licenses/>.
-+# along with this program; if not, see <https://www.gnu.org/licenses/>.
- #
- # As a special exception to the GNU General Public License, if you
- # distribute this file as part of a program that contains a
-@@ -27,7 +25,7 @@ timestamp='2012-12-29'
- # 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 <config-patches@gnu.org>.
- #
- # Configuration subroutine to validate and canonicalize a configuration type.
- # Supply the specified configuration type as an argument.
-@@ -35,7 +33,7 @@ timestamp='2012-12-29'
- # Otherwise, we print the canonical config type on stdout and succeed.
-
- # You can get the latest version of this script from:
--# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
-+# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
-
- # This file is supposed to be the same for all GNU packages
- # and recognize all the CPU types, system types and aliases
-@@ -55,12 +53,11 @@ timestamp='2012-12-29'
- me=`echo "$0" | sed -e 's,.*/,,'`
-
- usage="\
--Usage: $0 [OPTION] CPU-MFR-OPSYS
-- $0 [OPTION] ALIAS
-+Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS
-
- Canonicalize a configuration name.
-
--Operation modes:
-+Options:
- -h, --help print this help, then exit
- -t, --time-stamp print date of last modification, then exit
- -v, --version print version number, then exit
-@@ -70,9 +67,7 @@ Report bugs and patches to <config-patches@gnu.org>."
- version="\
- GNU config.sub ($timestamp)
-
--Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
--2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
--2012, 2013 Free Software Foundation, Inc.
-+Copyright 1992-2018 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."
-@@ -99,7 +94,7 @@ while test $# -gt 0 ; do
-
- *local*)
- # First pass through any local machine types.
-- echo $1
-+ echo "$1"
- exit ;;
-
- * )
-@@ -117,24 +112,24 @@ esac
-
- # Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
- # Here we must recognize all the valid KERNEL-OS combinations.
--maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
-+maybe_os=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
- case $maybe_os in
- nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
- linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
-- knetbsd*-gnu* | netbsd*-gnu* | \
-- kopensolaris*-gnu* | \
-+ knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \
-+ kopensolaris*-gnu* | cloudabi*-eabi* | \
- storm-chaos* | os2-emx* | rtmk-nova*)
- os=-$maybe_os
-- basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
-+ basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
- ;;
- android-linux)
- os=-linux-android
-- basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
-+ basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
- ;;
- *)
-- basic_machine=`echo $1 | sed 's/-[^-]*$//'`
-- if [ $basic_machine != $1 ]
-- then os=`echo $1 | sed 's/.*-/-/'`
-+ basic_machine=`echo "$1" | sed 's/-[^-]*$//'`
-+ if [ "$basic_machine" != "$1" ]
-+ then os=`echo "$1" | sed 's/.*-/-/'`
- else os=; fi
- ;;
- esac
-@@ -183,44 +178,44 @@ case $os in
- ;;
- -sco6)
- os=-sco5v6
-- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-+ basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
- ;;
- -sco5)
- os=-sco3.2v5
-- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-+ basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
- ;;
- -sco4)
- os=-sco3.2v4
-- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-+ basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
- ;;
- -sco3.2.[4-9]*)
- os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
-- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-+ basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
- ;;
- -sco3.2v[4-9]*)
- # Don't forget version if it is 3.2v4 or newer.
-- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-+ basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
- ;;
- -sco5v6*)
- # Don't forget version if it is 3.2v4 or newer.
-- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-+ basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
- ;;
- -sco*)
- os=-sco3.2v2
-- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-+ basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
- ;;
- -udk*)
-- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-+ basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
- ;;
- -isc)
- os=-isc2.2
-- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-+ basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
- ;;
- -clix*)
- basic_machine=clipper-intergraph
- ;;
- -isc*)
-- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-+ basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
- ;;
- -lynx*178)
- os=-lynxos178
-@@ -232,10 +227,7 @@ case $os in
- os=-lynxos
- ;;
- -ptx*)
-- basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
-- ;;
-- -windowsnt*)
-- os=`echo $os | sed -e 's/windowsnt/winnt/'`
-+ basic_machine=`echo "$1" | sed -e 's/86-.*/86-sequent/'`
- ;;
- -psos*)
- os=-psos
-@@ -256,19 +248,21 @@ case $basic_machine in
- | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
- | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
- | am33_2.0 \
-- | arc \
-+ | arc | arceb \
- | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
- | avr | avr32 \
-+ | ba \
- | be32 | be64 \
- | bfin \
-- | c4x | clipper \
-+ | c4x | c8051 | clipper \
- | d10v | d30v | dlx | dsp16xx \
-- | epiphany \
-- | fido | fr30 | frv \
-+ | e2k | epiphany \
-+ | fido | fr30 | frv | ft32 \
- | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
- | hexagon \
-- | i370 | i860 | i960 | ia64 \
-+ | i370 | i860 | i960 | ia16 | ia64 \
- | ip2k | iq2000 \
-+ | k1om \
- | le32 | le64 \
- | lm32 \
- | m32c | m32r | m32rle | m68000 | m68k | m88k \
-@@ -286,26 +280,30 @@ case $basic_machine in
- | mips64vr5900 | mips64vr5900el \
- | mipsisa32 | mipsisa32el \
- | mipsisa32r2 | mipsisa32r2el \
-+ | mipsisa32r6 | mipsisa32r6el \
- | mipsisa64 | mipsisa64el \
- | mipsisa64r2 | mipsisa64r2el \
-+ | mipsisa64r6 | mipsisa64r6el \
- | mipsisa64sb1 | mipsisa64sb1el \
- | mipsisa64sr71k | mipsisa64sr71kel \
-+ | mipsr5900 | mipsr5900el \
- | mipstx39 | mipstx39el \
- | mn10200 | mn10300 \
- | moxie \
- | mt \
- | msp430 \
- | nds32 | nds32le | nds32be \
-- | nios | nios2 \
-+ | nios | nios2 | nios2eb | nios2el \
- | ns16k | ns32k \
-- | open8 \
-- | or32 \
-- | pdp10 | pdp11 | pj | pjl \
-+ | open8 | or1k | or1knd | or32 \
-+ | pdp10 | pj | pjl \
- | powerpc | powerpc64 | powerpc64le | powerpcle \
-+ | pru \
- | pyramid \
-+ | riscv32 | riscv64 \
- | rl78 | rx \
- | score \
-- | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
-+ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
- | sh64 | sh64le \
- | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
- | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
-@@ -313,7 +311,8 @@ case $basic_machine in
- | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
- | ubicom32 \
- | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
-- | we32k \
-+ | visium \
-+ | wasm32 \
- | x86 | xc16x | xstormy16 | xtensa \
- | z8k | z80)
- basic_machine=$basic_machine-unknown
-@@ -327,11 +326,14 @@ case $basic_machine in
- c6x)
- basic_machine=tic6x-unknown
- ;;
-- m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
-+ leon|leon[3-9])
-+ basic_machine=sparc-$basic_machine
-+ ;;
-+ m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
- basic_machine=$basic_machine-unknown
- os=-none
- ;;
-- m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
-+ m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65)
- ;;
- ms1)
- basic_machine=mt-unknown
-@@ -360,7 +362,7 @@ case $basic_machine in
- ;;
- # Object if more than one company name word.
- *-*-*)
-- echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-+ echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2
- exit 1
- ;;
- # Recognize the basic CPU types with company name.
-@@ -369,21 +371,23 @@ case $basic_machine in
- | aarch64-* | aarch64_be-* \
- | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
- | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-- | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
-+ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
- | arm-* | armbe-* | armle-* | armeb-* | armv*-* \
- | avr-* | avr32-* \
-+ | ba-* \
- | be32-* | be64-* \
- | bfin-* | bs2000-* \
- | c[123]* | c30-* | [cjt]90-* | c4x-* \
-- | clipper-* | craynv-* | cydra-* \
-+ | c8051-* | clipper-* | craynv-* | cydra-* \
- | d10v-* | d30v-* | dlx-* \
-- | elxsi-* \
-+ | e2k-* | elxsi-* \
- | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
- | h8300-* | h8500-* \
- | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
- | hexagon-* \
-- | i*86-* | i860-* | i960-* | ia64-* \
-+ | i*86-* | i860-* | i960-* | ia16-* | ia64-* \
- | ip2k-* | iq2000-* \
-+ | k1om-* \
- | le32-* | le64-* \
- | lm32-* \
- | m32c-* | m32r-* | m32rle-* \
-@@ -403,28 +407,34 @@ case $basic_machine in
- | mips64vr5900-* | mips64vr5900el-* \
- | mipsisa32-* | mipsisa32el-* \
- | mipsisa32r2-* | mipsisa32r2el-* \
-+ | mipsisa32r6-* | mipsisa32r6el-* \
- | mipsisa64-* | mipsisa64el-* \
- | mipsisa64r2-* | mipsisa64r2el-* \
-+ | mipsisa64r6-* | mipsisa64r6el-* \
- | mipsisa64sb1-* | mipsisa64sb1el-* \
- | mipsisa64sr71k-* | mipsisa64sr71kel-* \
-+ | mipsr5900-* | mipsr5900el-* \
- | mipstx39-* | mipstx39el-* \
- | mmix-* \
- | mt-* \
- | msp430-* \
- | nds32-* | nds32le-* | nds32be-* \
-- | nios-* | nios2-* \
-+ | nios-* | nios2-* | nios2eb-* | nios2el-* \
- | none-* | np1-* | ns16k-* | ns32k-* \
- | open8-* \
-+ | or1k*-* \
- | orion-* \
- | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
- | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
-+ | pru-* \
- | pyramid-* \
-+ | riscv32-* | riscv64-* \
- | rl78-* | romp-* | rs6000-* | rx-* \
- | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
- | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
- | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
- | sparclite-* \
-- | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
-+ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \
- | tahoe-* \
- | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
- | tile*-* \
-@@ -432,6 +442,8 @@ case $basic_machine in
- | ubicom32-* \
- | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
- | vax-* \
-+ | visium-* \
-+ | wasm32-* \
- | we32k-* \
- | x86-* | x86_64-* | xc16x-* | xps100-* \
- | xstormy16-* | xtensa*-* \
-@@ -445,7 +457,7 @@ case $basic_machine in
- # Recognize the various machine names and aliases which stand
- # for a CPU type and a company and sometimes even an OS.
- 386bsd)
-- basic_machine=i386-unknown
-+ basic_machine=i386-pc
- os=-bsd
- ;;
- 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
-@@ -479,7 +491,7 @@ case $basic_machine in
- basic_machine=x86_64-pc
- ;;
- amd64-*)
-- basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
-+ basic_machine=x86_64-`echo "$basic_machine" | sed 's/^[^-]*-//'`
- ;;
- amdahl)
- basic_machine=580-amdahl
-@@ -508,6 +520,9 @@ case $basic_machine in
- basic_machine=i386-pc
- os=-aros
- ;;
-+ asmjs)
-+ basic_machine=asmjs-unknown
-+ ;;
- aux)
- basic_machine=m68k-apple
- os=-aux
-@@ -521,7 +536,7 @@ case $basic_machine in
- os=-linux
- ;;
- blackfin-*)
-- basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
-+ basic_machine=bfin-`echo "$basic_machine" | sed 's/^[^-]*-//'`
- os=-linux
- ;;
- bluegene*)
-@@ -529,13 +544,13 @@ case $basic_machine in
- os=-cnk
- ;;
- c54x-*)
-- basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
-+ basic_machine=tic54x-`echo "$basic_machine" | sed 's/^[^-]*-//'`
- ;;
- c55x-*)
-- basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
-+ basic_machine=tic55x-`echo "$basic_machine" | sed 's/^[^-]*-//'`
- ;;
- c6x-*)
-- basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
-+ basic_machine=tic6x-`echo "$basic_machine" | sed 's/^[^-]*-//'`
- ;;
- c90)
- basic_machine=c90-cray
-@@ -624,10 +639,18 @@ case $basic_machine in
- basic_machine=rs6000-bull
- os=-bosx
- ;;
-- dpx2* | dpx2*-bull)
-+ dpx2*)
- basic_machine=m68k-bull
- os=-sysv3
- ;;
-+ e500v[12])
-+ basic_machine=powerpc-unknown
-+ os=$os"spe"
-+ ;;
-+ e500v[12]-*)
-+ basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'`
-+ os=$os"spe"
-+ ;;
- ebmon29k)
- basic_machine=a29k-amd
- os=-ebmon
-@@ -717,9 +740,6 @@ case $basic_machine in
- hp9k8[0-9][0-9] | hp8[0-9][0-9])
- basic_machine=hppa1.0-hp
- ;;
-- hppa-next)
-- os=-nextstep3
-- ;;
- hppaosf)
- basic_machine=hppa1.1-hp
- os=-osf
-@@ -732,26 +752,26 @@ case $basic_machine in
- basic_machine=i370-ibm
- ;;
- i*86v32)
-- basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-+ basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
- os=-sysv32
- ;;
- i*86v4*)
-- basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-+ basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
- os=-sysv4
- ;;
- i*86v)
-- basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-+ basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
- os=-sysv
- ;;
- i*86sol2)
-- basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-+ basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
- os=-solaris2
- ;;
- i386mach)
- basic_machine=i386-mach
- os=-mach
- ;;
-- i386-vsta | vsta)
-+ vsta)
- basic_machine=i386-unknown
- os=-vsta
- ;;
-@@ -769,17 +789,17 @@ case $basic_machine in
- 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
- ;;
- m68knommu-*)
-- basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
-+ basic_machine=m68k-`echo "$basic_machine" | sed 's/^[^-]*-//'`
- os=-linux
- ;;
-- m88k-omron*)
-- basic_machine=m88k-omron
-- ;;
- magnum | m3230)
- basic_machine=mips-mips
- os=-sysv
-@@ -796,7 +816,7 @@ case $basic_machine in
- os=-mingw64
- ;;
- mingw32)
-- basic_machine=i386-pc
-+ basic_machine=i686-pc
- os=-mingw32
- ;;
- mingw32ce)
-@@ -811,10 +831,10 @@ case $basic_machine in
- os=-mint
- ;;
- mips3*-*)
-- basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
-+ basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'`
- ;;
- mips3*)
-- basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
-+ basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'`-unknown
- ;;
- monitor)
- basic_machine=m68k-rom68k
-@@ -824,15 +844,19 @@ case $basic_machine in
- basic_machine=powerpc-unknown
- os=-morphos
- ;;
-+ moxiebox)
-+ basic_machine=moxie-unknown
-+ os=-moxiebox
-+ ;;
- msdos)
- basic_machine=i386-pc
- os=-msdos
- ;;
- ms1-*)
-- basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
-+ basic_machine=`echo "$basic_machine" | sed -e 's/ms1-/mt-/'`
- ;;
- msys)
-- basic_machine=i386-pc
-+ basic_machine=i686-pc
- os=-msys
- ;;
- mvs)
-@@ -871,7 +895,7 @@ case $basic_machine in
- basic_machine=v70-nec
- os=-sysv
- ;;
-- next | m*-next )
-+ next | m*-next)
- basic_machine=m68k-next
- case $os in
- -nextstep* )
-@@ -916,6 +940,12 @@ case $basic_machine in
- nsr-tandem)
- basic_machine=nsr-tandem
- ;;
-+ nsv-tandem)
-+ basic_machine=nsv-tandem
-+ ;;
-+ nsx-tandem)
-+ basic_machine=nsx-tandem
-+ ;;
- op50n-* | op60c-*)
- basic_machine=hppa1.1-oki
- os=-proelf
-@@ -948,7 +978,7 @@ case $basic_machine in
- os=-linux
- ;;
- parisc-*)
-- basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
-+ basic_machine=hppa-`echo "$basic_machine" | sed 's/^[^-]*-//'`
- os=-linux
- ;;
- pbd)
-@@ -964,7 +994,7 @@ case $basic_machine in
- basic_machine=i386-pc
- ;;
- pc98-*)
-- basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
-+ basic_machine=i386-`echo "$basic_machine" | sed 's/^[^-]*-//'`
- ;;
- pentium | p5 | k5 | k6 | nexgen | viac3)
- basic_machine=i586-pc
-@@ -979,16 +1009,16 @@ case $basic_machine in
- basic_machine=i786-pc
- ;;
- pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
-- basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
-+ basic_machine=i586-`echo "$basic_machine" | sed 's/^[^-]*-//'`
- ;;
- pentiumpro-* | p6-* | 6x86-* | athlon-*)
-- basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-+ basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'`
- ;;
- pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
-- basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-+ basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'`
- ;;
- pentium4-*)
-- basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
-+ basic_machine=i786-`echo "$basic_machine" | sed 's/^[^-]*-//'`
- ;;
- pn)
- basic_machine=pn-gould
-@@ -998,23 +1028,23 @@ case $basic_machine in
- ppc | ppcbe) basic_machine=powerpc-unknown
- ;;
- ppc-* | ppcbe-*)
-- basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
-+ basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'`
- ;;
-- ppcle | powerpclittle | ppc-le | powerpc-little)
-+ ppcle | powerpclittle)
- basic_machine=powerpcle-unknown
- ;;
- ppcle-* | powerpclittle-*)
-- basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
-+ basic_machine=powerpcle-`echo "$basic_machine" | sed 's/^[^-]*-//'`
- ;;
- ppc64) basic_machine=powerpc64-unknown
- ;;
-- ppc64-* | ppc64p7-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
-+ ppc64-*) basic_machine=powerpc64-`echo "$basic_machine" | sed 's/^[^-]*-//'`
- ;;
-- ppc64le | powerpc64little | ppc64-le | powerpc64-little)
-+ ppc64le | powerpc64little)
- basic_machine=powerpc64le-unknown
- ;;
- ppc64le-* | powerpc64little-*)
-- basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
-+ basic_machine=powerpc64le-`echo "$basic_machine" | sed 's/^[^-]*-//'`
- ;;
- ps2)
- basic_machine=i386-ibm
-@@ -1068,17 +1098,10 @@ case $basic_machine in
- sequent)
- basic_machine=i386-sequent
- ;;
-- sh)
-- basic_machine=sh-hitachi
-- os=-hms
-- ;;
- sh5el)
- basic_machine=sh5le-unknown
- ;;
-- sh64)
-- basic_machine=sh64-unknown
-- ;;
-- sparclite-wrs | simso-wrs)
-+ simso-wrs)
- basic_machine=sparclite-wrs
- os=-vxworks
- ;;
-@@ -1097,7 +1120,7 @@ case $basic_machine in
- os=-sysv4
- ;;
- strongarm-* | thumb-*)
-- basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
-+ basic_machine=arm-`echo "$basic_machine" | sed 's/^[^-]*-//'`
- ;;
- sun2)
- basic_machine=m68000-sun
-@@ -1219,6 +1242,9 @@ case $basic_machine in
- basic_machine=hppa1.1-winbond
- os=-proelf
- ;;
-+ x64)
-+ basic_machine=x86_64-pc
-+ ;;
- xbox)
- basic_machine=i686-pc
- os=-mingw32
-@@ -1227,20 +1253,12 @@ case $basic_machine in
- basic_machine=xps100-honeywell
- ;;
- xscale-* | xscalee[bl]-*)
-- basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
-+ basic_machine=`echo "$basic_machine" | sed 's/^xscale/arm/'`
- ;;
- ymp)
- basic_machine=ymp-cray
- os=-unicos
- ;;
-- z8k-*-coff)
-- basic_machine=z8k-unknown
-- os=-sim
-- ;;
-- z80-*-coff)
-- basic_machine=z80-unknown
-- os=-sim
-- ;;
- none)
- basic_machine=none-none
- os=-none
-@@ -1269,10 +1287,6 @@ case $basic_machine in
- vax)
- basic_machine=vax-dec
- ;;
-- pdp10)
-- # there are many clones, so DEC is not a safe bet
-- basic_machine=pdp10-unknown
-- ;;
- pdp11)
- basic_machine=pdp11-dec
- ;;
-@@ -1282,9 +1296,6 @@ case $basic_machine in
- sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
- basic_machine=sh-unknown
- ;;
-- sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
-- basic_machine=sparc-sun
-- ;;
- cydra)
- basic_machine=cydra-cydrome
- ;;
-@@ -1304,7 +1315,7 @@ case $basic_machine in
- # Make sure to match an already-canonicalized machine name.
- ;;
- *)
-- echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-+ echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2
- exit 1
- ;;
- esac
-@@ -1312,10 +1323,10 @@ esac
- # Here we canonicalize certain aliases for manufacturers.
- case $basic_machine in
- *-digital*)
-- basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
-+ basic_machine=`echo "$basic_machine" | sed 's/digital.*/dec/'`
- ;;
- *-commodore*)
-- basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
-+ basic_machine=`echo "$basic_machine" | sed 's/commodore.*/cbm/'`
- ;;
- *)
- ;;
-@@ -1326,8 +1337,8 @@ esac
- if [ x"$os" != x"" ]
- then
- case $os in
-- # First match some system type aliases
-- # that might get confused with valid system types.
-+ # First match some system type aliases that might get confused
-+ # with valid system types.
- # -solaris* is a basic system type, with this one exception.
- -auroraux)
- os=-auroraux
-@@ -1338,45 +1349,48 @@ case $os in
- -solaris)
- os=-solaris2
- ;;
-- -svr4*)
-- os=-sysv4
-- ;;
- -unixware*)
- os=-sysv4.2uw
- ;;
- -gnu/linux*)
- os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
- ;;
-- # First accept the basic system types.
-+ # es1800 is here to avoid being matched by es* (a different OS)
-+ -es1800*)
-+ os=-ose
-+ ;;
-+ # Now accept the basic system types.
- # The portable systems comes first.
-- # Each alternative MUST END IN A *, to match a version number.
-+ # Each alternative MUST end in a * to match a version number.
- # -sysv* is not here because it comes later, after sysvr4.
- -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
- | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
- | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
-- | -sym* | -kopensolaris* \
-+ | -sym* | -kopensolaris* | -plan9* \
- | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-- | -aos* | -aros* \
-+ | -aos* | -aros* | -cloudabi* | -sortix* \
- | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
- | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-- | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-- | -bitrig* | -openbsd* | -solidbsd* \
-+ | -hiux* | -knetbsd* | -mirbsd* | -netbsd* \
-+ | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \
- | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
- | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
- | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
- | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-- | -chorusos* | -chorusrdb* | -cegcc* \
-+ | -chorusos* | -chorusrdb* | -cegcc* | -glidix* \
- | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-- | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
-+ | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
- | -linux-newlib* | -linux-musl* | -linux-uclibc* \
-- | -uxpv* | -beos* | -mpeix* | -udk* \
-- | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
-+ | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
-+ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* \
- | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
- | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
- | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
-- | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-+ | -morphos* | -superux* | -rtmk* | -windiss* \
- | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-- | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
-+ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
-+ | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox* | -bme* \
-+ | -midnightbsd*)
- # Remember, each alternative MUST END IN *, to match a version number.
- ;;
- -qnx*)
-@@ -1393,12 +1407,12 @@ case $os in
- -nto*)
- os=`echo $os | sed -e 's|nto|nto-qnx|'`
- ;;
-- -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-- | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
-+ -sim | -xray | -os68k* | -v88r* \
-+ | -windows* | -osx | -abug | -netware* | -os9* \
- | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
- ;;
- -mac*)
-- os=`echo $os | sed -e 's|mac|macos|'`
-+ os=`echo "$os" | sed -e 's|mac|macos|'`
- ;;
- -linux-dietlibc)
- os=-linux-dietlibc
-@@ -1407,10 +1421,10 @@ case $os in
- os=`echo $os | sed -e 's|linux|linux-gnu|'`
- ;;
- -sunos5*)
-- os=`echo $os | sed -e 's|sunos5|solaris2|'`
-+ os=`echo "$os" | sed -e 's|sunos5|solaris2|'`
- ;;
- -sunos6*)
-- os=`echo $os | sed -e 's|sunos6|solaris3|'`
-+ os=`echo "$os" | sed -e 's|sunos6|solaris3|'`
- ;;
- -opened*)
- os=-openedition
-@@ -1421,12 +1435,6 @@ case $os in
- -wince*)
- os=-wince
- ;;
-- -osfrose*)
-- os=-osfrose
-- ;;
-- -osf*)
-- os=-osf
-- ;;
- -utek*)
- os=-bsd
- ;;
-@@ -1451,7 +1459,7 @@ case $os in
- -nova*)
- os=-rtmk-nova
- ;;
-- -ns2 )
-+ -ns2)
- os=-nextstep2
- ;;
- -nsk*)
-@@ -1473,7 +1481,7 @@ case $os in
- -oss*)
- os=-sysv3
- ;;
-- -svr4)
-+ -svr4*)
- os=-sysv4
- ;;
- -svr3)
-@@ -1488,35 +1496,38 @@ case $os in
- -ose*)
- os=-ose
- ;;
-- -es1800*)
-- os=-ose
-- ;;
-- -xenix)
-- os=-xenix
-- ;;
- -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
- os=-mint
- ;;
-- -aros*)
-- os=-aros
-- ;;
-- -kaos*)
-- os=-kaos
-- ;;
- -zvmoe)
- os=-zvmoe
- ;;
- -dicos*)
- os=-dicos
- ;;
-+ -pikeos*)
-+ # Until real need of OS specific support for
-+ # particular features comes up, bare metal
-+ # configurations are quite functional.
-+ case $basic_machine in
-+ arm*)
-+ os=-eabi
-+ ;;
-+ *)
-+ os=-elf
-+ ;;
-+ esac
-+ ;;
- -nacl*)
- ;;
-+ -ios)
-+ ;;
- -none)
- ;;
- *)
- # Get rid of the `-' at the beginning of $os.
- os=`echo $os | sed 's/[^-]*-//'`
-- echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
-+ echo Invalid configuration \`"$1"\': system \`"$os"\' not recognized 1>&2
- exit 1
- ;;
- esac
-@@ -1551,6 +1562,9 @@ case $basic_machine in
- c4x-* | tic4x-*)
- os=-coff
- ;;
-+ c8051-*)
-+ os=-elf
-+ ;;
- hexagon-*)
- os=-elf
- ;;
-@@ -1603,12 +1617,12 @@ case $basic_machine in
- sparc-* | *-sun)
- os=-sunos4.1.1
- ;;
-+ pru-*)
-+ os=-elf
-+ ;;
- *-be)
- os=-beos
- ;;
-- *-haiku)
-- os=-haiku
-- ;;
- *-ibm)
- os=-aix
- ;;
-@@ -1648,7 +1662,7 @@ case $basic_machine in
- m88k-omron*)
- os=-luna
- ;;
-- *-next )
-+ *-next)
- os=-nextstep
- ;;
- *-sequent)
-@@ -1663,9 +1677,6 @@ case $basic_machine in
- i370-*)
- os=-mvs
- ;;
-- *-next)
-- os=-nextstep3
-- ;;
- *-gould)
- os=-sysv
- ;;
-@@ -1775,15 +1786,15 @@ case $basic_machine in
- vendor=stratus
- ;;
- esac
-- basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
-+ basic_machine=`echo "$basic_machine" | sed "s/unknown/$vendor/"`
- ;;
- esac
-
--echo $basic_machine$os
-+echo "$basic_machine$os"
- exit
-
- # Local variables:
--# eval: (add-hook 'write-file-hooks 'time-stamp)
-+# eval: (add-hook 'write-file-functions 'time-stamp)
- # time-stamp-start: "timestamp='"
- # time-stamp-format: "%:y-%02m-%02d"
- # time-stamp-end: "'"
-diff --git a/configure b/configure
-index c5e55b7..0ac7657 100755
---- a/configure
-+++ b/configure
-@@ -792,6 +792,7 @@ infodir
- docdir
- oldincludedir
- includedir
-+runstatedir
- localstatedir
- sharedstatedir
- sysconfdir
-@@ -907,6 +908,7 @@ datadir='${datarootdir}'
- sysconfdir='${prefix}/etc'
- sharedstatedir='${prefix}/com'
- localstatedir='${prefix}/var'
-+runstatedir='${localstatedir}/run'
- includedir='${prefix}/include'
- oldincludedir='/usr/include'
- docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
-@@ -1159,6 +1161,15 @@ do
- | -silent | --silent | --silen | --sile | --sil)
- silent=yes ;;
-
-+ -runstatedir | --runstatedir | --runstatedi | --runstated \
-+ | --runstate | --runstat | --runsta | --runst | --runs \
-+ | --run | --ru | --r)
-+ ac_prev=runstatedir ;;
-+ -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
-+ | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
-+ | --run=* | --ru=* | --r=*)
-+ runstatedir=$ac_optarg ;;
-+
- -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
- ac_prev=sbindir ;;
- -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-@@ -1296,7 +1307,7 @@ fi
- for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
- datadir sysconfdir sharedstatedir localstatedir includedir \
- oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-- libdir localedir mandir
-+ libdir localedir mandir runstatedir
- do
- eval ac_val=\$$ac_var
- # Remove trailing slashes.
-@@ -1449,6 +1460,7 @@ Fine tuning of the installation directories:
- --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
- --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
- --localstatedir=DIR modifiable single-machine data [PREFIX/var]
-+ --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
- --libdir=DIR object code libraries [EPREFIX/lib]
- --includedir=DIR C header files [PREFIX/include]
- --oldincludedir=DIR C header files for non-gcc [/usr/include]
-@@ -6970,7 +6982,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
--netbsd*)
-+netbsd* | netbsdelf*-gnu)
- 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
-@@ -7831,11 +7843,8 @@ _LT_EOF
- test $ac_status = 0; }; then
- # Now try to grab the symbols.
- nlist=conftest.nm
-- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5
-- (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5
-- ac_status=$?
-- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-- test $ac_status = 0; } && test -s "$nlist"; then
-+ $ECHO "$as_me:$LINENO: $NM conftest.$ac_objext | $lt_cv_sys_global_symbol_pipe > $nlist" >&5
-+ if eval "$NM" conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist 2>&5 && test -s "$nlist"; then
- # Try sorting and uniquifying the output.
- if sort "$nlist" | uniq > "$nlist"T; then
- mv -f "$nlist"T "$nlist"
-@@ -10353,6 +10362,12 @@ lt_prog_compiler_static=
- lt_prog_compiler_pic='-KPIC'
- lt_prog_compiler_static='-static'
- ;;
-+ # flang / f18. f95 an alias for gfortran or flang on Debian
-+ flang* | f18* | f95*)
-+ lt_prog_compiler_wl='-Wl,'
-+ lt_prog_compiler_pic='-fPIC'
-+ lt_prog_compiler_static='-static'
-+ ;;
- # icc used to be incompatible with GCC.
- # ICC 10 doesn't accept -KPIC any more.
- icc* | ifort*)
-@@ -10829,6 +10844,9 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
- openbsd* | bitrig*)
- with_gnu_ld=no
- ;;
-+ linux* | k*bsd*-gnu | gnu*)
-+ link_all_deplibs=no
-+ ;;
- esac
-
- ld_shlibs=yes
-@@ -11083,7 +11101,7 @@ _LT_EOF
- fi
- ;;
-
-- netbsd*)
-+ netbsd* | netbsdelf*-gnu)
- if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
- archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
- wlarc=
-@@ -11753,6 +11771,7 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
- 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
-+ link_all_deplibs=no
- 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'
-@@ -11774,7 +11793,7 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
- esac
- ;;
-
-- netbsd*)
-+ netbsd* | netbsdelf*-gnu)
- if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
- else
-@@ -12869,9 +12888,6 @@ fi
- # before this can be enabled.
- hardcode_into_libs=yes
-
-- # Add ABI-specific directories to the system library path.
-- sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
--
- # 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
-@@ -12880,7 +12896,7 @@ fi
- # 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="$sys_lib_dlsearch_path_spec $lt_ld_extra"
-+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
- fi
-
- # We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -12892,6 +12908,18 @@ fi
- 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
-@@ -14282,7 +14310,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
- # 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"'
-+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"'
-
- else
- GXX=no
-@@ -14774,7 +14802,7 @@ fi
- # 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 yes = "$GXX"; then
-@@ -14839,7 +14867,7 @@ fi
- # 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 yes = "$GXX"; then
-@@ -15178,7 +15206,7 @@ fi
- # 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"'
-+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"'
-
- else
- # FIXME: insert proper C++ library support
-@@ -15262,7 +15290,7 @@ fi
- # 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"'
-+ 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
- # platform.
-@@ -15273,7 +15301,7 @@ fi
- # 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 -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
-+ output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"'
- fi
-
- hardcode_libdir_flag_spec_CXX='$wl-R $wl$libdir'
-@@ -15786,7 +15814,7 @@ lt_prog_compiler_static_CXX=
- ;;
- esac
- ;;
-- netbsd*)
-+ netbsd* | netbsdelf*-gnu)
- ;;
- *qnx* | *nto*)
- # QNX uses GNU C++, but need to define -shared option too, otherwise
-@@ -16161,6 +16189,9 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
- ;;
- esac
- ;;
-+ linux* | k*bsd*-gnu | gnu*)
-+ link_all_deplibs_CXX=no
-+ ;;
- *)
- export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
- ;;
-@@ -16834,9 +16865,6 @@ fi
- # before this can be enabled.
- hardcode_into_libs=yes
-
-- # Add ABI-specific directories to the system library path.
-- sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
--
- # 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
-@@ -16845,7 +16873,7 @@ fi
- # 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="$sys_lib_dlsearch_path_spec $lt_ld_extra"
-+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
- fi
-
- # We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -16857,6 +16885,18 @@ fi
- 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
-@@ -22133,7 +22173,6 @@ See \`config.log' for more details" "$LINENO" 5; }
- cat <<_LT_EOF >> "$cfgfile"
- #! $SHELL
- # 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.
-diff --git a/docs/Makefile.in b/docs/Makefile.in
-index d66bc19..4601752 100644
---- a/docs/Makefile.in
-+++ b/docs/Makefile.in
-@@ -341,6 +341,7 @@ pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
- psdir = @psdir@
-+runstatedir = @runstatedir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
-diff --git a/docs/doxygen/Makefile.in b/docs/doxygen/Makefile.in
-index 14aa78e..17f41d4 100644
---- a/docs/doxygen/Makefile.in
-+++ b/docs/doxygen/Makefile.in
-@@ -281,6 +281,7 @@ pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
- psdir = @psdir@
-+runstatedir = @runstatedir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
-diff --git a/inc/Makefile.in b/inc/Makefile.in
-index 3181c9d..bb92038 100644
---- a/inc/Makefile.in
-+++ b/inc/Makefile.in
-@@ -341,6 +341,7 @@ pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
- psdir = @psdir@
-+runstatedir = @runstatedir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
-diff --git a/inc/libetonyek/Makefile.in b/inc/libetonyek/Makefile.in
-index 8a619cc..d854b52 100644
---- a/inc/libetonyek/Makefile.in
-+++ b/inc/libetonyek/Makefile.in
-@@ -330,6 +330,7 @@ pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
- psdir = @psdir@
-+runstatedir = @runstatedir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
-diff --git a/install-sh b/install-sh
-index 377bb86..8175c64 100755
---- a/install-sh
-+++ b/install-sh
-@@ -1,7 +1,7 @@
- #!/bin/sh
- # install - install a program, script, or datafile
-
--scriptversion=2011-11-20.07; # UTC
-+scriptversion=2018-03-11.20; # UTC
-
- # This originates from X11R5 (mit/util/scripts/install.sh), which was
- # later released in X11R6 (xc/config/util/install.sh) with the
-@@ -41,19 +41,15 @@ scriptversion=2011-11-20.07; # UTC
- # This script is compatible with the BSD install script, but was written
- # from scratch.
-
-+tab=' '
- nl='
- '
--IFS=" "" $nl"
-+IFS=" $tab$nl"
-
--# set DOITPROG to echo to test this script
-+# Set DOITPROG to "echo" to test this script.
-
--# Don't use :- since 4.3BSD and earlier shells don't like it.
- doit=${DOITPROG-}
--if test -z "$doit"; then
-- doit_exec=exec
--else
-- doit_exec=$doit
--fi
-+doit_exec=${doit:-exec}
-
- # Put in absolute file names if you don't have them in your path;
- # or use environment vars.
-@@ -68,17 +64,6 @@ mvprog=${MVPROG-mv}
- rmprog=${RMPROG-rm}
- stripprog=${STRIPPROG-strip}
-
--posix_glob='?'
--initialize_posix_glob='
-- test "$posix_glob" != "?" || {
-- if (set -f) 2>/dev/null; then
-- posix_glob=
-- else
-- posix_glob=:
-- fi
-- }
--'
--
- posix_mkdir=
-
- # Desired mode of installed file.
-@@ -97,7 +82,7 @@ dir_arg=
- dst_arg=
-
- copy_on_change=false
--no_target_directory=
-+is_target_a_directory=possibly
-
- usage="\
- Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
-@@ -137,46 +122,57 @@ while test $# -ne 0; do
- -d) dir_arg=true;;
-
- -g) chgrpcmd="$chgrpprog $2"
-- shift;;
-+ shift;;
-
- --help) echo "$usage"; exit $?;;
-
- -m) mode=$2
-- case $mode in
-- *' '* | *' '* | *'
--'* | *'*'* | *'?'* | *'['*)
-- echo "$0: invalid mode: $mode" >&2
-- exit 1;;
-- esac
-- shift;;
-+ case $mode in
-+ *' '* | *"$tab"* | *"$nl"* | *'*'* | *'?'* | *'['*)
-+ echo "$0: invalid mode: $mode" >&2
-+ exit 1;;
-+ esac
-+ shift;;
-
- -o) chowncmd="$chownprog $2"
-- shift;;
-+ shift;;
-
- -s) stripcmd=$stripprog;;
-
-- -t) dst_arg=$2
-- # Protect names problematic for 'test' and other utilities.
-- case $dst_arg in
-- -* | [=\(\)!]) dst_arg=./$dst_arg;;
-- esac
-- shift;;
-+ -t)
-+ is_target_a_directory=always
-+ dst_arg=$2
-+ # Protect names problematic for 'test' and other utilities.
-+ case $dst_arg in
-+ -* | [=\(\)!]) dst_arg=./$dst_arg;;
-+ esac
-+ shift;;
-
-- -T) no_target_directory=true;;
-+ -T) is_target_a_directory=never;;
-
- --version) echo "$0 $scriptversion"; exit $?;;
-
-- --) shift
-- break;;
-+ --) shift
-+ break;;
-
-- -*) echo "$0: invalid option: $1" >&2
-- exit 1;;
-+ -*) echo "$0: invalid option: $1" >&2
-+ exit 1;;
-
- *) break;;
- esac
- shift
- done
-
-+# We allow the use of options -d and -T together, by making -d
-+# take the precedence; this is for compatibility with GNU install.
-+
-+if test -n "$dir_arg"; then
-+ if test -n "$dst_arg"; then
-+ echo "$0: target directory not allowed when installing a directory." >&2
-+ exit 1
-+ fi
-+fi
-+
- if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
- # When -d is used, all remaining arguments are directories to create.
- # When -t is used, the destination is already specified.
-@@ -207,6 +203,15 @@ if test $# -eq 0; then
- exit 0
- fi
-
-+if test -z "$dir_arg"; then
-+ if test $# -gt 1 || test "$is_target_a_directory" = always; then
-+ if test ! -d "$dst_arg"; then
-+ echo "$0: $dst_arg: Is not a directory." >&2
-+ exit 1
-+ fi
-+ fi
-+fi
-+
- if test -z "$dir_arg"; then
- do_exit='(exit $ret); exit $ret'
- trap "ret=129; $do_exit" 1
-@@ -223,16 +228,16 @@ if test -z "$dir_arg"; then
-
- *[0-7])
- if test -z "$stripcmd"; then
-- u_plus_rw=
-+ u_plus_rw=
- else
-- u_plus_rw='% 200'
-+ u_plus_rw='% 200'
- fi
- cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
- *)
- if test -z "$stripcmd"; then
-- u_plus_rw=
-+ u_plus_rw=
- else
-- u_plus_rw=,u+rw
-+ u_plus_rw=,u+rw
- fi
- cp_umask=$mode$u_plus_rw;;
- esac
-@@ -266,122 +271,113 @@ do
- fi
- dst=$dst_arg
-
-- # If destination is a directory, append the input filename; won't work
-- # if double slashes aren't ignored.
-+ # If destination is a directory, append the input filename.
- if test -d "$dst"; then
-- if test -n "$no_target_directory"; then
-- echo "$0: $dst_arg: Is a directory" >&2
-- exit 1
-+ if test "$is_target_a_directory" = never; then
-+ echo "$0: $dst_arg: Is a directory" >&2
-+ exit 1
- fi
- dstdir=$dst
-- dst=$dstdir/`basename "$src"`
-+ dstbase=`basename "$src"`
-+ case $dst in
-+ */) dst=$dst$dstbase;;
-+ *) dst=$dst/$dstbase;;
-+ esac
- dstdir_status=0
- else
-- # Prefer dirname, but fall back on a substitute if dirname fails.
-- dstdir=`
-- (dirname "$dst") 2>/dev/null ||
-- expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-- X"$dst" : 'X\(//\)[^/]' \| \
-- X"$dst" : 'X\(//\)$' \| \
-- X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
-- echo X"$dst" |
-- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-- s//\1/
-- q
-- }
-- /^X\(\/\/\)[^/].*/{
-- s//\1/
-- q
-- }
-- /^X\(\/\/\)$/{
-- s//\1/
-- q
-- }
-- /^X\(\/\).*/{
-- s//\1/
-- q
-- }
-- s/.*/./; q'
-- `
--
-+ dstdir=`dirname "$dst"`
- test -d "$dstdir"
- dstdir_status=$?
- fi
- fi
-
-+ case $dstdir in
-+ */) dstdirslash=$dstdir;;
-+ *) dstdirslash=$dstdir/;;
-+ esac
-+
- obsolete_mkdir_used=false
-
- if test $dstdir_status != 0; then
- case $posix_mkdir in
- '')
-- # Create intermediate dirs using mode 755 as modified by the umask.
-- # This is like FreeBSD 'install' as of 1997-10-28.
-- umask=`umask`
-- case $stripcmd.$umask in
-- # Optimize common cases.
-- *[2367][2367]) mkdir_umask=$umask;;
-- .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
--
-- *[0-7])
-- mkdir_umask=`expr $umask + 22 \
-- - $umask % 100 % 40 + $umask % 20 \
-- - $umask % 10 % 4 + $umask % 2
-- `;;
-- *) mkdir_umask=$umask,go-w;;
-- esac
--
-- # With -d, create the new directory with the user-specified mode.
-- # Otherwise, rely on $mkdir_umask.
-- if test -n "$dir_arg"; then
-- mkdir_mode=-m$mode
-- else
-- mkdir_mode=
-- fi
--
-- posix_mkdir=false
-- case $umask in
-- *[123567][0-7][0-7])
-- # POSIX mkdir -p sets u+wx bits regardless of umask, which
-- # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
-- ;;
-- *)
-- tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
-- trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
--
-- if (umask $mkdir_umask &&
-- 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.
-- 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 -- "$tmpdir" && {
-- ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
-- test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
-- }
-- }
-- then posix_mkdir=:
-- fi
-- rmdir "$tmpdir/d" "$tmpdir"
-- else
-- # Remove any dirs left behind by ancient mkdir implementations.
-- rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
-- fi
-- trap '' 0;;
-- esac;;
-+ # Create intermediate dirs using mode 755 as modified by the umask.
-+ # This is like FreeBSD 'install' as of 1997-10-28.
-+ umask=`umask`
-+ case $stripcmd.$umask in
-+ # Optimize common cases.
-+ *[2367][2367]) mkdir_umask=$umask;;
-+ .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
-+
-+ *[0-7])
-+ mkdir_umask=`expr $umask + 22 \
-+ - $umask % 100 % 40 + $umask % 20 \
-+ - $umask % 10 % 4 + $umask % 2
-+ `;;
-+ *) mkdir_umask=$umask,go-w;;
-+ esac
-+
-+ # With -d, create the new directory with the user-specified mode.
-+ # Otherwise, rely on $mkdir_umask.
-+ if test -n "$dir_arg"; then
-+ mkdir_mode=-m$mode
-+ else
-+ mkdir_mode=
-+ fi
-+
-+ posix_mkdir=false
-+ case $umask in
-+ *[123567][0-7][0-7])
-+ # POSIX mkdir -p sets u+wx bits regardless of umask, which
-+ # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
-+ ;;
-+ *)
-+ # Note that $RANDOM variable is not portable (e.g. dash); Use it
-+ # here however when possible just to lower collision chance.
-+ tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
-+
-+ trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null; exit $ret' 0
-+
-+ # Because "mkdir -p" follows existing symlinks and we likely work
-+ # directly in world-writeable /tmp, make sure that the '$tmpdir'
-+ # directory is successfully created first before we actually test
-+ # 'mkdir -p' feature.
-+ if (umask $mkdir_umask &&
-+ $mkdirprog $mkdir_mode "$tmpdir" &&
-+ exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/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"`
-+ 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"`
-+ test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
-+ }
-+ }
-+ then posix_mkdir=:
-+ fi
-+ rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir"
-+ else
-+ # Remove any dirs left behind by ancient mkdir implementations.
-+ rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null
-+ fi
-+ trap '' 0;;
-+ esac;;
- esac
-
- if
- $posix_mkdir && (
-- umask $mkdir_umask &&
-- $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
-+ umask $mkdir_umask &&
-+ $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
- )
- then :
- else
-@@ -391,53 +387,51 @@ do
- # directory the slow way, step by step, checking for races as we go.
-
- case $dstdir in
-- /*) prefix='/';;
-- [-=\(\)!]*) prefix='./';;
-- *) prefix='';;
-+ /*) prefix='/';;
-+ [-=\(\)!]*) prefix='./';;
-+ *) prefix='';;
- esac
-
-- eval "$initialize_posix_glob"
--
- oIFS=$IFS
- IFS=/
-- $posix_glob set -f
-+ set -f
- set fnord $dstdir
- shift
-- $posix_glob set +f
-+ set +f
- IFS=$oIFS
-
- prefixes=
-
- for d
- do
-- test X"$d" = X && continue
--
-- prefix=$prefix$d
-- if test -d "$prefix"; then
-- prefixes=
-- else
-- if $posix_mkdir; then
-- (umask=$mkdir_umask &&
-- $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
-- # Don't fail if two instances are running concurrently.
-- test -d "$prefix" || exit 1
-- else
-- case $prefix in
-- *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
-- *) qprefix=$prefix;;
-- esac
-- prefixes="$prefixes '$qprefix'"
-- fi
-- fi
-- prefix=$prefix/
-+ test X"$d" = X && continue
-+
-+ prefix=$prefix$d
-+ if test -d "$prefix"; then
-+ prefixes=
-+ else
-+ if $posix_mkdir; then
-+ (umask=$mkdir_umask &&
-+ $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
-+ # Don't fail if two instances are running concurrently.
-+ test -d "$prefix" || exit 1
-+ else
-+ case $prefix in
-+ *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
-+ *) qprefix=$prefix;;
-+ esac
-+ prefixes="$prefixes '$qprefix'"
-+ fi
-+ fi
-+ prefix=$prefix/
- done
-
- if test -n "$prefixes"; then
-- # Don't fail if two instances are running concurrently.
-- (umask $mkdir_umask &&
-- eval "\$doit_exec \$mkdirprog $prefixes") ||
-- test -d "$dstdir" || exit 1
-- obsolete_mkdir_used=true
-+ # Don't fail if two instances are running concurrently.
-+ (umask $mkdir_umask &&
-+ eval "\$doit_exec \$mkdirprog $prefixes") ||
-+ test -d "$dstdir" || exit 1
-+ obsolete_mkdir_used=true
- fi
- fi
- fi
-@@ -450,8 +444,8 @@ do
- else
-
- # Make a couple of temp file names in the proper directory.
-- dsttmp=$dstdir/_inst.$$_
-- rmtmp=$dstdir/_rm.$$_
-+ dsttmp=${dstdirslash}_inst.$$_
-+ rmtmp=${dstdirslash}_rm.$$_
-
- # Trap to clean up those temp files at exit.
- trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
-@@ -472,15 +466,12 @@ do
-
- # If -C, don't bother to copy if it wouldn't change the file.
- if $copy_on_change &&
-- old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` &&
-- new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` &&
--
-- eval "$initialize_posix_glob" &&
-- $posix_glob set -f &&
-+ old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` &&
-+ new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` &&
-+ set -f &&
- set X $old && old=:$2:$4:$5:$6 &&
- set X $new && new=:$2:$4:$5:$6 &&
-- $posix_glob set +f &&
--
-+ set +f &&
- test "$old" = "$new" &&
- $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
- then
-@@ -493,24 +484,24 @@ do
- # to itself, or perhaps because mv is so ancient that it does not
- # support -f.
- {
-- # Now remove or move aside any old file at destination location.
-- # We try this two ways since rm can't unlink itself on some
-- # systems and the destination file might be busy for other
-- # reasons. In this case, the final cleanup might fail but the new
-- # file should still install successfully.
-- {
-- test ! -f "$dst" ||
-- $doit $rmcmd -f "$dst" 2>/dev/null ||
-- { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
-- { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
-- } ||
-- { echo "$0: cannot unlink or rename $dst" >&2
-- (exit 1); exit 1
-- }
-- } &&
--
-- # Now rename the file to the real destination.
-- $doit $mvcmd "$dsttmp" "$dst"
-+ # Now remove or move aside any old file at destination location.
-+ # We try this two ways since rm can't unlink itself on some
-+ # systems and the destination file might be busy for other
-+ # reasons. In this case, the final cleanup might fail but the new
-+ # file should still install successfully.
-+ {
-+ test ! -f "$dst" ||
-+ $doit $rmcmd -f "$dst" 2>/dev/null ||
-+ { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
-+ { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
-+ } ||
-+ { echo "$0: cannot unlink or rename $dst" >&2
-+ (exit 1); exit 1
-+ }
-+ } &&
-+
-+ # Now rename the file to the real destination.
-+ $doit $mvcmd "$dsttmp" "$dst"
- }
- fi || exit 1
-
-@@ -519,9 +510,9 @@ do
- done
-
- # Local variables:
--# eval: (add-hook 'write-file-hooks 'time-stamp)
-+# eval: (add-hook 'before-save-hook '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 --git a/ltmain.sh b/ltmain.sh
-index 7f3523d..d11f1e0 100644
---- a/ltmain.sh
-+++ b/ltmain.sh
-@@ -31,7 +31,7 @@
-
- PROGRAM=libtool
- PACKAGE=libtool
--VERSION=2.4.6
-+VERSION="2.4.6 Debian-2.4.6-11"
- package_revision=2.4.6
-
-
-@@ -1370,7 +1370,7 @@ func_lt_ver ()
- #! /bin/sh
-
- # Set a version string for this script.
--scriptversion=2014-01-07.03; # UTC
-+scriptversion=2015-10-07.11; # UTC
-
- # A portable, pluggable option parser for Bourne shell.
- # Written by Gary V. Vaughan, 2010
-@@ -1530,6 +1530,8 @@ func_run_hooks ()
- {
- $debug_cmd
-
-+ _G_rc_run_hooks=false
-+
- case " $hookable_fns " in
- *" $1 "*) ;;
- *) func_fatal_error "'$1' does not support hook funcions.n" ;;
-@@ -1538,16 +1540,16 @@ func_run_hooks ()
- 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
-+ if eval $_G_hook '"$@"'; then
-+ # 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
-+ _G_rc_run_hooks=:
-+ fi
- done
-
-- func_quote_for_eval ${1+"$@"}
-- func_run_hooks_result=$func_quote_for_eval_result
-+ $_G_rc_run_hooks && func_run_hooks_result=$_G_hook_result
- }
-
-
-@@ -1557,10 +1559,16 @@ func_run_hooks ()
- ## --------------- ##
-
- # 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
-+# full positional parameter list in your hook function, you may remove/edit
-+# any options that you action, and then pass back the remaining unprocessed
- # options in '<hooked_function_name>_result', escaped suitably for
--# 'eval'. Like this:
-+# 'eval'. In this case you also must return $EXIT_SUCCESS to let the
-+# hook's caller know that it should pay attention to
-+# '<hooked_function_name>_result'. Returning $EXIT_FAILURE signalizes that
-+# arguments are left untouched by the hook and therefore caller will ignore the
-+# result variable.
-+#
-+# Like this:
- #
- # my_options_prep ()
- # {
-@@ -1570,9 +1578,11 @@ func_run_hooks ()
- # 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
-+# # No change in '$@' (ignored completely by this hook). There is
-+# # no need to do the equivalent (but slower) action:
-+# # func_quote_for_eval ${1+"$@"}
-+# # my_options_prep_result=$func_quote_for_eval_result
-+# false
- # }
- # func_add_hook func_options_prep my_options_prep
- #
-@@ -1581,25 +1591,37 @@ func_run_hooks ()
- # {
- # $debug_cmd
- #
-+# args_changed=false
-+#
- # # 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=: ;;
-+# --silent|-s) opt_silent=:
-+# args_changed=:
-+# ;;
- # # 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
-+# args_changed=:
- # ;;
--# *) set dummy "$_G_opt" "$*"; shift; break ;;
-+# *) # Make sure the first unrecognised option "$_G_opt"
-+# # is added back to "$@", we could need that later
-+# # if $args_changed is true.
-+# set dummy "$_G_opt" ${1+"$@"}; shift; break ;;
- # esac
- # done
- #
--# func_quote_for_eval ${1+"$@"}
--# my_silent_option_result=$func_quote_for_eval_result
-+# if $args_changed; then
-+# func_quote_for_eval ${1+"$@"}
-+# my_silent_option_result=$func_quote_for_eval_result
-+# fi
-+#
-+# $args_changed
- # }
- # func_add_hook func_parse_options my_silent_option
- #
-@@ -1611,16 +1633,32 @@ func_run_hooks ()
- # $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
-+# false
- # }
- # func_add_hook func_validate_options my_option_validation
- #
--# You'll alse need to manually amend $usage_message to reflect the extra
-+# You'll also 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_finish [ARG]...
-+# ----------------------------
-+# Finishing the option parse loop (call 'func_options' hooks ATM).
-+func_options_finish ()
-+{
-+ $debug_cmd
-+
-+ _G_func_options_finish_exit=false
-+ if func_run_hooks func_options ${1+"$@"}; then
-+ func_options_finish_result=$func_run_hooks_result
-+ _G_func_options_finish_exit=:
-+ fi
-+
-+ $_G_func_options_finish_exit
-+}
-+
-+
- # func_options [ARG]...
- # ---------------------
- # All the functions called inside func_options are hookable. See the
-@@ -1630,17 +1668,28 @@ 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"}
-+ _G_rc_options=false
-+
-+ for my_func in options_prep parse_options validate_options options_finish
-+ do
-+ if eval func_$my_func '${1+"$@"}'; then
-+ eval _G_res_var='$'"func_${my_func}_result"
-+ eval set dummy "$_G_res_var" ; shift
-+ _G_rc_options=:
-+ fi
-+ done
-
-- eval func_run_hooks func_options \
-- ${func_validate_options_result+"$func_validate_options_result"}
-+ # Save modified positional parameters for caller. As a top-level
-+ # options-parser function we always need to set the 'func_options_result'
-+ # variable (regardless the $_G_rc_options value).
-+ if $_G_rc_options; then
-+ func_options_result=$_G_res_var
-+ else
-+ func_quote_for_eval ${1+"$@"}
-+ func_options_result=$func_quote_for_eval_result
-+ fi
-
-- # save modified positional parameters for caller
-- func_options_result=$func_run_hooks_result
-+ $_G_rc_options
- }
-
-
-@@ -1649,9 +1698,9 @@ func_options ()
- # 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
-+# needs to propagate that back to rest of this script, then the complete
- # modified list must be put in 'func_run_hooks_result' before
--# returning.
-+# returning $EXIT_SUCCESS (otherwise $EXIT_FAILURE is returned).
- func_hookable func_options_prep
- func_options_prep ()
- {
-@@ -1661,10 +1710,14 @@ func_options_prep ()
- opt_verbose=false
- opt_warning_types=
-
-- func_run_hooks func_options_prep ${1+"$@"}
-+ _G_rc_options_prep=false
-+ if func_run_hooks func_options_prep ${1+"$@"}; then
-+ _G_rc_options_prep=:
-+ # save modified positional parameters for caller
-+ func_options_prep_result=$func_run_hooks_result
-+ fi
-
-- # save modified positional parameters for caller
-- func_options_prep_result=$func_run_hooks_result
-+ $_G_rc_options_prep
- }
-
-
-@@ -1678,18 +1731,20 @@ func_parse_options ()
-
- func_parse_options_result=
-
-+ _G_rc_parse_options=false
- # 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
-+ if func_run_hooks func_parse_options ${1+"$@"}; then
-+ eval set dummy "$func_run_hooks_result"; shift
-+ _G_rc_parse_options=:
-+ fi
-
- # Break out of the loop if we already parsed every option.
- test $# -gt 0 || break
-
-+ _G_match_parse_options=:
- _G_opt=$1
- shift
- case $_G_opt in
-@@ -1704,7 +1759,10 @@ func_parse_options ()
- ;;
-
- --warnings|--warning|-W)
-- test $# = 0 && func_missing_arg $_G_opt && break
-+ if test $# = 0 && func_missing_arg $_G_opt; then
-+ _G_rc_parse_options=:
-+ break
-+ fi
- case " $warning_categories $1" in
- *" $1 "*)
- # trailing space prevents matching last $1 above
-@@ -1757,15 +1815,25 @@ func_parse_options ()
- shift
- ;;
-
-- --) break ;;
-+ --) _G_rc_parse_options=: ; break ;;
- -*) func_fatal_help "unrecognised option: '$_G_opt'" ;;
-- *) set dummy "$_G_opt" ${1+"$@"}; shift; break ;;
-+ *) set dummy "$_G_opt" ${1+"$@"}; shift
-+ _G_match_parse_options=false
-+ break
-+ ;;
- esac
-+
-+ $_G_match_parse_options && _G_rc_parse_options=:
- done
-
-- # save modified positional parameters for caller
-- func_quote_for_eval ${1+"$@"}
-- func_parse_options_result=$func_quote_for_eval_result
-+
-+ if $_G_rc_parse_options; then
-+ # save modified positional parameters for caller
-+ func_quote_for_eval ${1+"$@"}
-+ func_parse_options_result=$func_quote_for_eval_result
-+ fi
-+
-+ $_G_rc_parse_options
- }
-
-
-@@ -1778,16 +1846,21 @@ func_validate_options ()
- {
- $debug_cmd
-
-+ _G_rc_validate_options=false
-+
- # 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+"$@"}
-+ if func_run_hooks func_validate_options ${1+"$@"}; then
-+ # save modified positional parameters for caller
-+ func_validate_options_result=$func_run_hooks_result
-+ _G_rc_validate_options=:
-+ fi
-
- # Bail if the options were screwed!
- $exit_cmd $EXIT_FAILURE
-
-- # save modified positional parameters for caller
-- func_validate_options_result=$func_run_hooks_result
-+ $_G_rc_validate_options
- }
-
-
-@@ -2068,12 +2141,12 @@ include the following information:
- compiler: $LTCC
- compiler flags: $LTCFLAGS
- linker: $LD (gnu? $with_gnu_ld)
-- version: $progname (GNU libtool) 2.4.6
-+ version: $progname $scriptversion Debian-2.4.6-11
- automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q`
- autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q`
-
- Report bugs to <bug-libtool@gnu.org>.
--GNU libtool home page: <http://www.gnu.org/software/libtool/>.
-+GNU libtool home page: <http://www.gnu.org/s/libtool/>.
- General help using GNU software: <http://www.gnu.org/gethelp/>."
- exit 0
- }
-@@ -2124,7 +2197,7 @@ fi
- # a configuration failure hint, and exit.
- func_fatal_configuration ()
- {
-- func_fatal_error ${1+"$@"} \
-+ func__fatal_error ${1+"$@"} \
- "See the $PACKAGE documentation for more information." \
- "Fatal configuration error."
- }
-@@ -2270,6 +2343,8 @@ libtool_options_prep ()
- nonopt=
- preserve_args=
-
-+ _G_rc_lt_options_prep=:
-+
- # Shorthand for --mode=foo, only valid as the first argument
- case $1 in
- clean|clea|cle|cl)
-@@ -2293,11 +2368,18 @@ libtool_options_prep ()
- uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
- shift; set dummy --mode uninstall ${1+"$@"}; shift
- ;;
-+ *)
-+ _G_rc_lt_options_prep=false
-+ ;;
- esac
-
-- # Pass back the list of options.
-- func_quote_for_eval ${1+"$@"}
-- libtool_options_prep_result=$func_quote_for_eval_result
-+ if $_G_rc_lt_options_prep; then
-+ # Pass back the list of options.
-+ func_quote_for_eval ${1+"$@"}
-+ libtool_options_prep_result=$func_quote_for_eval_result
-+ fi
-+
-+ $_G_rc_lt_options_prep
- }
- func_add_hook func_options_prep libtool_options_prep
-
-@@ -2309,9 +2391,12 @@ libtool_parse_options ()
- {
- $debug_cmd
-
-+ _G_rc_lt_parse_options=false
-+
- # Perform our own loop to consume as many options as possible in
- # each iteration.
- while test $# -gt 0; do
-+ _G_match_lt_parse_options=:
- _G_opt=$1
- shift
- case $_G_opt in
-@@ -2386,15 +2471,22 @@ libtool_parse_options ()
- func_append preserve_args " $_G_opt"
- ;;
-
-- # An option not handled by this hook function:
-- *) set dummy "$_G_opt" ${1+"$@"}; shift; break ;;
-+ # An option not handled by this hook function:
-+ *) set dummy "$_G_opt" ${1+"$@"} ; shift
-+ _G_match_lt_parse_options=false
-+ break
-+ ;;
- esac
-+ $_G_match_lt_parse_options && _G_rc_lt_parse_options=:
- done
-
-+ if $_G_rc_lt_parse_options; then
-+ # save modified positional parameters for caller
-+ func_quote_for_eval ${1+"$@"}
-+ libtool_parse_options_result=$func_quote_for_eval_result
-+ fi
-
-- # save modified positional parameters for caller
-- func_quote_for_eval ${1+"$@"}
-- libtool_parse_options_result=$func_quote_for_eval_result
-+ $_G_rc_lt_parse_options
- }
- func_add_hook func_parse_options libtool_parse_options
-
-@@ -7274,10 +7366,12 @@ func_mode_link ()
- # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
- # -specs=* GCC specs files
- # -stdlib=* select c++ std lib with clang
-+ # -fsanitize=* Clang/GCC memory and address sanitizer
-+ # -fuse-ld=* Linker select flags for GCC
- -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*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \
-- -specs=*)
-+ -specs=*|-fsanitize=*|-fuse-ld=*)
- func_quote_for_eval "$arg"
- arg=$func_quote_for_eval_result
- func_append compile_command " $arg"
-@@ -7570,7 +7664,10 @@ func_mode_link ()
- case $pass in
- dlopen) libs=$dlfiles ;;
- dlpreopen) libs=$dlprefiles ;;
-- link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
-+ link)
-+ libs="$deplibs %DEPLIBS%"
-+ test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
-+ ;;
- esac
- fi
- if test lib,dlpreopen = "$linkmode,$pass"; then
-@@ -7889,19 +7986,19 @@ func_mode_link ()
- # 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 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
-
-@@ -8825,6 +8922,9 @@ func_mode_link ()
- revision=$number_minor
- lt_irix_increment=no
- ;;
-+ *)
-+ func_fatal_configuration "$modename: unknown library version type '$version_type'"
-+ ;;
- esac
- ;;
- no)
-diff --git a/m4/libtool.m4 b/m4/libtool.m4
-index a644432..9d6dd9f 100644
---- a/m4/libtool.m4
-+++ b/m4/libtool.m4
-@@ -728,7 +728,6 @@ _LT_CONFIG_SAVE_COMMANDS([
- cat <<_LT_EOF >> "$cfgfile"
- #! $SHELL
- # 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.
-@@ -2867,9 +2866,6 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
- # before this can be enabled.
- hardcode_into_libs=yes
-
-- # Add ABI-specific directories to the system library path.
-- sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
--
- # 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
-@@ -2878,7 +2874,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
- # 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="$sys_lib_dlsearch_path_spec $lt_ld_extra"
-+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
- fi
-
- # We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -2890,6 +2886,18 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
- 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
-@@ -3549,7 +3557,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
--netbsd*)
-+netbsd* | netbsdelf*-gnu)
- 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
-@@ -4055,7 +4063,8 @@ _LT_EOF
- if AC_TRY_EVAL(ac_compile); then
- # Now try to grab the symbols.
- nlist=conftest.nm
-- if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then
-+ $ECHO "$as_me:$LINENO: $NM conftest.$ac_objext | $lt_cv_sys_global_symbol_pipe > $nlist" >&AS_MESSAGE_LOG_FD
-+ if eval "$NM" conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist 2>&AS_MESSAGE_LOG_FD && test -s "$nlist"; then
- # Try sorting and uniquifying the output.
- if sort "$nlist" | uniq > "$nlist"T; then
- mv -f "$nlist"T "$nlist"
-@@ -4427,7 +4436,7 @@ m4_if([$1], [CXX], [
- ;;
- esac
- ;;
-- netbsd*)
-+ netbsd* | netbsdelf*-gnu)
- ;;
- *qnx* | *nto*)
- # QNX uses GNU C++, but need to define -shared option too, otherwise
-@@ -4695,6 +4704,12 @@ m4_if([$1], [CXX], [
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
- ;;
-+ # flang / f18. f95 an alias for gfortran or flang on Debian
-+ flang* | f18* | f95*)
-+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-+ ;;
- # icc used to be incompatible with GCC.
- # ICC 10 doesn't accept -KPIC any more.
- icc* | ifort*)
-@@ -4939,6 +4954,9 @@ m4_if([$1], [CXX], [
- ;;
- 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'
- ;;
-@@ -5001,6 +5019,9 @@ dnl Note also adjust exclude_expsyms for C++ above.
- 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
-@@ -5255,7 +5276,7 @@ _LT_EOF
- fi
- ;;
-
-- netbsd*)
-+ netbsd* | netbsdelf*-gnu)
- if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
- _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
- wlarc=
-@@ -5776,6 +5797,7 @@ _LT_EOF
- 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
-+ _LT_TAGVAR(link_all_deplibs, $1)=no
- 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'
-@@ -5797,7 +5819,7 @@ _LT_EOF
- esac
- ;;
-
-- netbsd*)
-+ netbsd* | netbsdelf*-gnu)
- 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
-@@ -6423,7 +6445,7 @@ if test yes != "$_lt_caught_CXX_error"; then
- # 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"'
-+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"'
-
- else
- GXX=no
-@@ -6798,7 +6820,7 @@ if test yes != "$_lt_caught_CXX_error"; then
- # 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 yes = "$GXX"; then
-@@ -6863,7 +6885,7 @@ if test yes != "$_lt_caught_CXX_error"; then
- # 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 yes = "$GXX"; then
-@@ -7202,7 +7224,7 @@ if test yes != "$_lt_caught_CXX_error"; then
- # 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"'
-+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"'
-
- else
- # FIXME: insert proper C++ library support
-@@ -7286,7 +7308,7 @@ if test yes != "$_lt_caught_CXX_error"; then
- # 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"'
-+ 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
- # platform.
-@@ -7297,7 +7319,7 @@ if test yes != "$_lt_caught_CXX_error"; then
- # 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 -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
-+ 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'
-diff --git a/src/Makefile.in b/src/Makefile.in
-index 3d84797..3e4ac59 100644
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -343,6 +343,7 @@ pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
- psdir = @psdir@
-+runstatedir = @runstatedir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
-diff --git a/src/conv/Makefile.in b/src/conv/Makefile.in
-index 9a88e9d..d0d9593 100644
---- a/src/conv/Makefile.in
-+++ b/src/conv/Makefile.in
-@@ -341,6 +341,7 @@ pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
- psdir = @psdir@
-+runstatedir = @runstatedir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
-diff --git a/src/conv/csv/Makefile.in b/src/conv/csv/Makefile.in
-index 5358d0a..9c7d432 100644
---- a/src/conv/csv/Makefile.in
-+++ b/src/conv/csv/Makefile.in
-@@ -337,6 +337,7 @@ pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
- psdir = @psdir@
-+runstatedir = @runstatedir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
-diff --git a/src/conv/html/Makefile.in b/src/conv/html/Makefile.in
-index e40de75..85113f9 100644
---- a/src/conv/html/Makefile.in
-+++ b/src/conv/html/Makefile.in
-@@ -337,6 +337,7 @@ pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
- psdir = @psdir@
-+runstatedir = @runstatedir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
-diff --git a/src/conv/raw/Makefile.in b/src/conv/raw/Makefile.in
-index 3f57903..e21b931 100644
---- a/src/conv/raw/Makefile.in
-+++ b/src/conv/raw/Makefile.in
-@@ -352,6 +352,7 @@ pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
- psdir = @psdir@
-+runstatedir = @runstatedir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
-diff --git a/src/conv/svg/Makefile.in b/src/conv/svg/Makefile.in
-index 1700464..05cda30 100644
---- a/src/conv/svg/Makefile.in
-+++ b/src/conv/svg/Makefile.in
-@@ -337,6 +337,7 @@ pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
- psdir = @psdir@
-+runstatedir = @runstatedir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
-diff --git a/src/conv/text/Makefile.in b/src/conv/text/Makefile.in
-index 70861dd..ad6ce80 100644
---- a/src/conv/text/Makefile.in
-+++ b/src/conv/text/Makefile.in
-@@ -352,6 +352,7 @@ pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
- psdir = @psdir@
-+runstatedir = @runstatedir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
-diff --git a/src/fuzz/Makefile.in b/src/fuzz/Makefile.in
-index 25faf69..e32687b 100644
---- a/src/fuzz/Makefile.in
-+++ b/src/fuzz/Makefile.in
-@@ -335,6 +335,7 @@ pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
- psdir = @psdir@
-+runstatedir = @runstatedir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
-diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in
-index 07f103c..40d9b8a 100644
---- a/src/lib/Makefile.in
-+++ b/src/lib/Makefile.in
-@@ -683,6 +683,7 @@ pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
- psdir = @psdir@
-+runstatedir = @runstatedir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
-diff --git a/src/test/Makefile.in b/src/test/Makefile.in
-index 9d6a7ba..e3f984c 100644
---- a/src/test/Makefile.in
-+++ b/src/test/Makefile.in
-@@ -633,6 +633,7 @@ pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
- psdir = @psdir@
-+runstatedir = @runstatedir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
-diff --git a/test-driver b/test-driver
-index 32bf39e..b8521a4 100755
---- a/test-driver
-+++ b/test-driver
-@@ -1,9 +1,9 @@
- #! /bin/sh
- # test-driver - basic testsuite driver script.
-
--scriptversion=2012-06-27.10; # UTC
-+scriptversion=2018-03-07.03; # UTC
-
--# Copyright (C) 2011-2013 Free Software Foundation, Inc.
-+# Copyright (C) 2011-2018 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,7 +16,7 @@ scriptversion=2012-06-27.10; # UTC
- # 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 <http://www.gnu.org/licenses/>.
-+# along with this program. If not, see <https://www.gnu.org/licenses/>.
-
- # As a special exception to the GNU General Public License, if you
- # distribute this file as part of a program that contains a
-@@ -44,13 +44,12 @@ print_usage ()
- Usage:
- test-driver --test-name=NAME --log-file=PATH --trs-file=PATH
- [--expect-failure={yes|no}] [--color-tests={yes|no}]
-- [--enable-hard-errors={yes|no}] [--] TEST-SCRIPT
-+ [--enable-hard-errors={yes|no}] [--]
-+ TEST-SCRIPT [TEST-SCRIPT-ARGUMENTS]
- The '--test-name', '--log-file' and '--trs-file' options are mandatory.
- END
- }
-
--# TODO: better error handling in option parsing (in particular, ensure
--# TODO: $log_file, $trs_file and $test_name are defined).
- test_name= # Used for reporting.
- log_file= # Where to save the output of the test script.
- trs_file= # Where to save the metadata of the test run.
-@@ -69,10 +68,23 @@ while test $# -gt 0; do
- --enable-hard-errors) enable_hard_errors=$2; shift;;
- --) shift; break;;
- -*) usage_error "invalid option: '$1'";;
-+ *) break;;
- esac
- shift
- done
-
-+missing_opts=
-+test x"$test_name" = x && missing_opts="$missing_opts --test-name"
-+test x"$log_file" = x && missing_opts="$missing_opts --log-file"
-+test x"$trs_file" = x && missing_opts="$missing_opts --trs-file"
-+if test x"$missing_opts" != x; then
-+ usage_error "the following mandatory options are missing:$missing_opts"
-+fi
-+
-+if test $# -eq 0; then
-+ usage_error "missing argument"
-+fi
-+
- if test $color_tests = yes; then
- # Keep this in sync with 'lib/am/check.am:$(am__tty_colors)'.
- red='[0;31m' # Red.
-@@ -94,11 +106,14 @@ trap "st=143; $do_exit" 15
- # Test script is run here.
- "$@" >$log_file 2>&1
- estatus=$?
-+
- if test $enable_hard_errors = no && test $estatus -eq 99; then
-- estatus=1
-+ tweaked_estatus=1
-+else
-+ tweaked_estatus=$estatus
- fi
-
--case $estatus:$expect_failure in
-+case $tweaked_estatus:$expect_failure in
- 0:yes) col=$red res=XPASS recheck=yes gcopy=yes;;
- 0:*) col=$grn res=PASS recheck=no gcopy=no;;
- 77:*) col=$blu res=SKIP recheck=no gcopy=yes;;
-@@ -107,6 +122,12 @@ case $estatus:$expect_failure in
- *:*) col=$red res=FAIL recheck=yes gcopy=yes;;
- esac
-
-+# Report the test outcome and exit status in the logs, so that one can
-+# know whether the test passed or failed simply by looking at the '.log'
-+# file, without the need of also peaking into the corresponding '.trs'
-+# file (automake bug#11814).
-+echo "$res $test_name (exit status: $estatus)" >>$log_file
-+
- # Report outcome to console.
- echo "${col}${res}${std}: $test_name"
-
-@@ -119,9 +140,9 @@ echo ":copy-in-global-log: $gcopy" >> $trs_file
- # Local Variables:
- # mode: shell-script
- # sh-indentation: 2
--# eval: (add-hook 'write-file-hooks 'time-stamp)
-+# eval: (add-hook 'before-save-hook '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:
---
-2.20.1
-
-

Generated by cgit