external libs, libvorbisidec: use autoconf WORDS_BIGENDIAN checks,
authorOzkan Sezer <sezeroz@gmail.com>
Sun, 01 Dec 2019 20:20:02 +0300
changeset 10525500d13631b4
parent 1051 54ace9af9480
child 1053 a7d2efcbc36c
external libs, libvorbisidec: use autoconf WORDS_BIGENDIAN checks,

because BYTE_ORDER, LITTLE_ENDIAN, and BIG_ENDIAN are not very portable.
As for the previous Android patch: no issues, because Android is always
little-endian: https://developer.android.com/ndk/guides/abis

Regenerated autofoo files.
external/libvorbisidec-1.2.1.patch
external/libvorbisidec-1.2.1/0007-os.h-include-config.h.patch
external/libvorbisidec-1.2.1/0018-use-AC_C_BIGENDIAN.patch
external/libvorbisidec-1.2.1/CHANGELOG
external/libvorbisidec-1.2.1/Makefile.in
external/libvorbisidec-1.2.1/aclocal.m4
external/libvorbisidec-1.2.1/autogen.sh
external/libvorbisidec-1.2.1/compile
external/libvorbisidec-1.2.1/config.guess
external/libvorbisidec-1.2.1/config.h.in
external/libvorbisidec-1.2.1/config.sub
external/libvorbisidec-1.2.1/configure
external/libvorbisidec-1.2.1/configure.in
external/libvorbisidec-1.2.1/depcomp
external/libvorbisidec-1.2.1/doc/style.css
external/libvorbisidec-1.2.1/install-sh
external/libvorbisidec-1.2.1/iseeking_example.c
external/libvorbisidec-1.2.1/ltmain.sh
external/libvorbisidec-1.2.1/m4/libtool.m4
external/libvorbisidec-1.2.1/m4/ltoptions.m4
external/libvorbisidec-1.2.1/m4/ltsugar.m4
external/libvorbisidec-1.2.1/m4/ltversion.m4
external/libvorbisidec-1.2.1/m4/lt~obsolete.m4
external/libvorbisidec-1.2.1/mdct.c
external/libvorbisidec-1.2.1/misc.h
external/libvorbisidec-1.2.1/missing
external/libvorbisidec-1.2.1/os.h
external/libvorbisidec-1.2.1/vorbisfile.c
external/libvorbisidec-1.2.1/win32/VS2005/libogg.vsprops
external/libvorbisidec-1.2.1/win32/VS2008/libogg.vsprops
     1.1 --- a/external/libvorbisidec-1.2.1.patch	Sun Dec 01 18:50:02 2019 +0300
     1.2 +++ b/external/libvorbisidec-1.2.1.patch	Sun Dec 01 20:20:02 2019 +0300
     1.3 @@ -34,14 +34,3 @@
     1.4  +LOCAL_SHARED_LIBRARIES := ogg
     1.5  +
     1.6  +include $(BUILD_STATIC_LIBRARY)
     1.7 -diff -u libvorbisidec-1.2.1/misc.h~ libvorbisidec-1.2.1/misc.h
     1.8 ---- libvorbisidec-1.2.1/misc.h~
     1.9 -+++ libvorbisidec-1.2.1/misc.h
    1.10 -@@ -30,6 +30,7 @@
    1.11 - 
    1.12 - #include "asm_arm.h"
    1.13 - #include <stdlib.h> /* for abs() */
    1.14 -+#include <endian.h>
    1.15 -   
    1.16 - #ifndef _V_WIDE_MATH
    1.17 - #define _V_WIDE_MATH
     2.1 --- a/external/libvorbisidec-1.2.1/0007-os.h-include-config.h.patch	Sun Dec 01 18:50:02 2019 +0300
     2.2 +++ b/external/libvorbisidec-1.2.1/0007-os.h-include-config.h.patch	Sun Dec 01 20:20:02 2019 +0300
     2.3 @@ -16,7 +16,7 @@
     2.4    ********************************************************************/
     2.5   
     2.6  +#ifdef HAVE_CONFIG_H
     2.7 -+#include "config.h"
     2.8 ++#  include "config.h"
     2.9  +#endif
    2.10  +
    2.11   #include <math.h>
     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/external/libvorbisidec-1.2.1/0018-use-AC_C_BIGENDIAN.patch	Sun Dec 01 20:20:02 2019 +0300
     3.3 @@ -0,0 +1,78 @@
     3.4 +From 5d48fcab6d955a2f8b41c460d6cec3b858894ec7 Mon Sep 17 00:00:00 2001
     3.5 +From: sezero <sezero@users.sourceforge.net>
     3.6 +Date: Tue, 20 Mar 2018 11:50:50 +0300
     3.7 +Subject: [PATCH] use autoconf AC_C_BIGENDIAN / WORDS_BIGENDIAN checks
     3.8 +
     3.9 +because BYTE_ORDER, LITTLE_ENDIAN and BIG_ENDIAN are
    3.10 +not very portable..
    3.11 +---
    3.12 + configure.in |    3 +++
    3.13 + misc.h       |   17 +++++------------
    3.14 + os.h         |    2 --
    3.15 + 3 files changed, 8 insertions(+), 14 deletions(-)
    3.16 +
    3.17 +diff --git a/configure.in b/configure.in
    3.18 +index 4e853dc..ade6f21 100644
    3.19 +--- a/configure.in
    3.20 ++++ b/configure.in
    3.21 +@@ -80,6 +80,9 @@ LDFLAGS="$LDFLAGS $ldflags_save"
    3.22 + AC_PROG_LD
    3.23 + AC_PROG_LD_GNU
    3.24 + 
    3.25 ++# check endianism
    3.26 ++AC_C_BIGENDIAN
    3.27 ++
    3.28 + dnl --------------------------------------------------
    3.29 + dnl Options 
    3.30 + dnl --------------------------------------------------
    3.31 +diff --git a/misc.h b/misc.h
    3.32 +index ee5660d..77cb2e2 100644
    3.33 +--- a/misc.h
    3.34 ++++ b/misc.h
    3.35 +@@ -41,25 +41,18 @@
    3.36 + #include <sys/types.h>
    3.37 + #endif
    3.38 + 
    3.39 +-#if BYTE_ORDER==LITTLE_ENDIAN
    3.40 +-union magic {
    3.41 +-  struct {
    3.42 +-    ogg_int32_t lo;
    3.43 +-    ogg_int32_t hi;
    3.44 +-  } halves;
    3.45 +-  ogg_int64_t whole;
    3.46 +-};
    3.47 +-#endif 
    3.48 +-
    3.49 +-#if BYTE_ORDER==BIG_ENDIAN
    3.50 + union magic {
    3.51 +   struct {
    3.52 ++#ifdef WORDS_BIGENDIAN
    3.53 +     ogg_int32_t hi;
    3.54 +     ogg_int32_t lo;
    3.55 ++#else /* little endian */
    3.56 ++    ogg_int32_t lo;
    3.57 ++    ogg_int32_t hi;
    3.58 ++#endif
    3.59 +   } halves;
    3.60 +   ogg_int64_t whole;
    3.61 + };
    3.62 +-#endif
    3.63 + 
    3.64 + STIN ogg_int32_t MULT32(ogg_int32_t x, ogg_int32_t y) {
    3.65 +   union magic magic;
    3.66 +diff --git a/os.h b/os.h
    3.67 +index 31400de..329c5d0 100644
    3.68 +--- a/os.h
    3.69 ++++ b/os.h
    3.70 +@@ -42,8 +42,6 @@
    3.71 + 
    3.72 + #ifdef _WIN32
    3.73 + #  include <malloc.h>
    3.74 +-#  define LITTLE_ENDIAN 1
    3.75 +-#  define BYTE_ORDER LITTLE_ENDIAN
    3.76 + #endif
    3.77 + 
    3.78 + #if defined HAVE_ALLOCA
    3.79 +-- 
    3.80 +1.7.1
    3.81 +
     4.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.2 +++ b/external/libvorbisidec-1.2.1/CHANGELOG	Sun Dec 01 20:20:02 2019 +0300
     4.3 @@ -0,0 +1,19 @@
     4.4 +*** 20020517: 1.0.2 ***
     4.5 +
     4.6 +  Playback bugfix to floor1; mode mistakenly used for sizing instead
     4.7 +  of blockflag
     4.8 +
     4.9 +*** 20020515: 1.0.1 ***
    4.10 +
    4.11 +  Added complete API documentation to source tarball.  No code
    4.12 +  changes.
    4.13 +
    4.14 +*** 20020412: 1.0.1 ***
    4.15 +
    4.16 +  Fixed a clipping bug that affected ARM processors; negative
    4.17 +  overflows were being properly clipped, but then clobbered to
    4.18 +  positive by the positive overflow chec (asm_arm.h:CLIP_TO_15)
    4.19 +
    4.20 +*** 20020403: 1.0.0 ***
    4.21 +
    4.22 +  Initial version
    4.23 \ No newline at end of file
     5.1 --- a/external/libvorbisidec-1.2.1/Makefile.in	Sun Dec 01 18:50:02 2019 +0300
     5.2 +++ b/external/libvorbisidec-1.2.1/Makefile.in	Sun Dec 01 20:20:02 2019 +0300
     5.3 @@ -1,7 +1,7 @@
     5.4 -# Makefile.in generated by automake 1.13.1 from Makefile.am.
     5.5 +# Makefile.in generated by automake 1.16.1 from Makefile.am.
     5.6  # @configure_input@
     5.7  
     5.8 -# Copyright (C) 1994-2012 Free Software Foundation, Inc.
     5.9 +# Copyright (C) 1994-2018 Free Software Foundation, Inc.
    5.10  
    5.11  # This Makefile.in is free software; the Free Software Foundation
    5.12  # gives unlimited permission to copy and/or distribute it,
    5.13 @@ -17,23 +17,61 @@
    5.14  
    5.15  
    5.16  VPATH = @srcdir@
    5.17 -am__make_dryrun = \
    5.18 -  { \
    5.19 -    am__dry=no; \
    5.20 +am__is_gnu_make = { \
    5.21 +  if test -z '$(MAKELEVEL)'; then \
    5.22 +    false; \
    5.23 +  elif test -n '$(MAKE_HOST)'; then \
    5.24 +    true; \
    5.25 +  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
    5.26 +    true; \
    5.27 +  else \
    5.28 +    false; \
    5.29 +  fi; \
    5.30 +}
    5.31 +am__make_running_with_option = \
    5.32 +  case $${target_option-} in \
    5.33 +      ?) ;; \
    5.34 +      *) echo "am__make_running_with_option: internal error: invalid" \
    5.35 +              "target option '$${target_option-}' specified" >&2; \
    5.36 +         exit 1;; \
    5.37 +  esac; \
    5.38 +  has_opt=no; \
    5.39 +  sane_makeflags=$$MAKEFLAGS; \
    5.40 +  if $(am__is_gnu_make); then \
    5.41 +    sane_makeflags=$$MFLAGS; \
    5.42 +  else \
    5.43      case $$MAKEFLAGS in \
    5.44        *\\[\ \	]*) \
    5.45 -        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
    5.46 -          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
    5.47 -      *) \
    5.48 -        for am__flg in $$MAKEFLAGS; do \
    5.49 -          case $$am__flg in \
    5.50 -            *=*|--*) ;; \
    5.51 -            *n*) am__dry=yes; break;; \
    5.52 -          esac; \
    5.53 -        done;; \
    5.54 +        bs=\\; \
    5.55 +        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
    5.56 +          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
    5.57      esac; \
    5.58 -    test $$am__dry = yes; \
    5.59 -  }
    5.60 +  fi; \
    5.61 +  skip_next=no; \
    5.62 +  strip_trailopt () \
    5.63 +  { \
    5.64 +    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
    5.65 +  }; \
    5.66 +  for flg in $$sane_makeflags; do \
    5.67 +    test $$skip_next = yes && { skip_next=no; continue; }; \
    5.68 +    case $$flg in \
    5.69 +      *=*|--*) continue;; \
    5.70 +        -*I) strip_trailopt 'I'; skip_next=yes;; \
    5.71 +      -*I?*) strip_trailopt 'I';; \
    5.72 +        -*O) strip_trailopt 'O'; skip_next=yes;; \
    5.73 +      -*O?*) strip_trailopt 'O';; \
    5.74 +        -*l) strip_trailopt 'l'; skip_next=yes;; \
    5.75 +      -*l?*) strip_trailopt 'l';; \
    5.76 +      -[dEDm]) skip_next=yes;; \
    5.77 +      -[JT]) skip_next=yes;; \
    5.78 +    esac; \
    5.79 +    case $$flg in \
    5.80 +      *$$target_option*) has_opt=yes; break;; \
    5.81 +    esac; \
    5.82 +  done; \
    5.83 +  test $$has_opt = yes
    5.84 +am__make_dryrun = (target_option=n; $(am__make_running_with_option))
    5.85 +am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
    5.86  pkgdatadir = $(datadir)/@PACKAGE@
    5.87  pkgincludedir = $(includedir)/@PACKAGE@
    5.88  pkglibdir = $(libdir)/@PACKAGE@
    5.89 @@ -56,11 +94,6 @@
    5.90  EXTRA_PROGRAMS = ivorbisfile_example$(EXEEXT) \
    5.91  	iseeking_example$(EXEEXT)
    5.92  subdir = .
    5.93 -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
    5.94 -	$(top_srcdir)/configure $(am__configure_deps) \
    5.95 -	$(srcdir)/config.h.in $(srcdir)/Version_script.in \
    5.96 -	$(srcdir)/vorbisidec.pc.in depcomp $(include_HEADERS) COPYING \
    5.97 -	README config.guess config.sub install-sh missing ltmain.sh
    5.98  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
    5.99  am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
   5.100  	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
   5.101 @@ -69,6 +102,8 @@
   5.102  	$(top_srcdir)/configure.in
   5.103  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
   5.104  	$(ACLOCAL_M4)
   5.105 +DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
   5.106 +	$(am__configure_deps) $(include_HEADERS) $(am__DIST_COMMON)
   5.107  am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
   5.108   configure.lineno config.status.lineno
   5.109  mkinstalldirs = $(install_sh) -d
   5.110 @@ -146,7 +181,15 @@
   5.111  am__v_at_1 = 
   5.112  DEFAULT_INCLUDES = -I.@am__isrc@
   5.113  depcomp = $(SHELL) $(top_srcdir)/depcomp
   5.114 -am__depfiles_maybe = depfiles
   5.115 +am__maybe_remake_depfiles = depfiles
   5.116 +am__depfiles_remade = ./$(DEPDIR)/block.Plo ./$(DEPDIR)/codebook.Plo \
   5.117 +	./$(DEPDIR)/floor0.Plo ./$(DEPDIR)/floor1.Plo \
   5.118 +	./$(DEPDIR)/info.Plo ./$(DEPDIR)/iseeking_example.Po \
   5.119 +	./$(DEPDIR)/ivorbisfile_example.Po ./$(DEPDIR)/mapping0.Plo \
   5.120 +	./$(DEPDIR)/mdct.Plo ./$(DEPDIR)/registry.Plo \
   5.121 +	./$(DEPDIR)/res012.Plo ./$(DEPDIR)/sharedbook.Plo \
   5.122 +	./$(DEPDIR)/synthesis.Plo ./$(DEPDIR)/vorbisfile.Plo \
   5.123 +	./$(DEPDIR)/window.Plo
   5.124  am__mv = mv -f
   5.125  COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
   5.126  	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
   5.127 @@ -199,6 +242,10 @@
   5.128  CTAGS = ctags
   5.129  CSCOPE = cscope
   5.130  AM_RECURSIVE_TARGETS = cscope
   5.131 +am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Version_script.in \
   5.132 +	$(srcdir)/config.h.in $(srcdir)/vorbisidec.pc.in COPYING \
   5.133 +	README compile config.guess config.sub depcomp install-sh \
   5.134 +	ltmain.sh missing
   5.135  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
   5.136  distdir = $(PACKAGE)-$(VERSION)
   5.137  top_distdir = $(distdir)
   5.138 @@ -258,6 +305,7 @@
   5.139  LIPO = @LIPO@
   5.140  LN_S = @LN_S@
   5.141  LTLIBOBJS = @LTLIBOBJS@
   5.142 +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
   5.143  MAINT = @MAINT@
   5.144  MAKEINFO = @MAKEINFO@
   5.145  MANIFEST_TOOL = @MANIFEST_TOOL@
   5.146 @@ -335,6 +383,7 @@
   5.147  prefix = @prefix@
   5.148  program_transform_name = @program_transform_name@
   5.149  psdir = @psdir@
   5.150 +runstatedir = @runstatedir@
   5.151  sbindir = @sbindir@
   5.152  sharedstatedir = @sharedstatedir@
   5.153  srcdir = @srcdir@
   5.154 @@ -397,15 +446,14 @@
   5.155  	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
   5.156  	$(am__cd) $(top_srcdir) && \
   5.157  	  $(AUTOMAKE) --foreign Makefile
   5.158 -.PRECIOUS: Makefile
   5.159  Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
   5.160  	@case '$?' in \
   5.161  	  *config.status*) \
   5.162  	    echo ' $(SHELL) ./config.status'; \
   5.163  	    $(SHELL) ./config.status;; \
   5.164  	  *) \
   5.165 -	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
   5.166 -	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
   5.167 +	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \
   5.168 +	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \
   5.169  	esac;
   5.170  
   5.171  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
   5.172 @@ -418,8 +466,8 @@
   5.173  $(am__aclocal_m4_deps):
   5.174  
   5.175  config.h: stamp-h1
   5.176 -	@if test ! -f $@; then rm -f stamp-h1; else :; fi
   5.177 -	@if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi
   5.178 +	@test -f $@ || rm -f stamp-h1
   5.179 +	@test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1
   5.180  
   5.181  stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
   5.182  	@rm -f stamp-h1
   5.183 @@ -470,11 +518,14 @@
   5.184  	  echo rm -f $${locs}; \
   5.185  	  rm -f $${locs}; \
   5.186  	}
   5.187 +
   5.188  libvorbisidec.la: $(libvorbisidec_la_OBJECTS) $(libvorbisidec_la_DEPENDENCIES) $(EXTRA_libvorbisidec_la_DEPENDENCIES) 
   5.189  	$(AM_V_CCLD)$(libvorbisidec_la_LINK) -rpath $(libdir) $(libvorbisidec_la_OBJECTS) $(libvorbisidec_la_LIBADD) $(LIBS)
   5.190 +
   5.191  iseeking_example$(EXEEXT): $(iseeking_example_OBJECTS) $(iseeking_example_DEPENDENCIES) $(EXTRA_iseeking_example_DEPENDENCIES) 
   5.192  	@rm -f iseeking_example$(EXEEXT)
   5.193  	$(AM_V_CCLD)$(iseeking_example_LINK) $(iseeking_example_OBJECTS) $(iseeking_example_LDADD) $(LIBS)
   5.194 +
   5.195  ivorbisfile_example$(EXEEXT): $(ivorbisfile_example_OBJECTS) $(ivorbisfile_example_DEPENDENCIES) $(EXTRA_ivorbisfile_example_DEPENDENCIES) 
   5.196  	@rm -f ivorbisfile_example$(EXEEXT)
   5.197  	$(AM_V_CCLD)$(ivorbisfile_example_LINK) $(ivorbisfile_example_OBJECTS) $(ivorbisfile_example_LDADD) $(LIBS)
   5.198 @@ -485,35 +536,41 @@
   5.199  distclean-compile:
   5.200  	-rm -f *.tab.c
   5.201  
   5.202 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/block.Plo@am__quote@
   5.203 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/codebook.Plo@am__quote@
   5.204 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/floor0.Plo@am__quote@
   5.205 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/floor1.Plo@am__quote@
   5.206 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/info.Plo@am__quote@
   5.207 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/iseeking_example.Po@am__quote@
   5.208 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ivorbisfile_example.Po@am__quote@
   5.209 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mapping0.Plo@am__quote@
   5.210 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mdct.Plo@am__quote@
   5.211 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/registry.Plo@am__quote@
   5.212 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/res012.Plo@am__quote@
   5.213 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sharedbook.Plo@am__quote@
   5.214 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/synthesis.Plo@am__quote@
   5.215 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vorbisfile.Plo@am__quote@
   5.216 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/window.Plo@am__quote@
   5.217 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/block.Plo@am__quote@ # am--include-marker
   5.218 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/codebook.Plo@am__quote@ # am--include-marker
   5.219 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/floor0.Plo@am__quote@ # am--include-marker
   5.220 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/floor1.Plo@am__quote@ # am--include-marker
   5.221 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/info.Plo@am__quote@ # am--include-marker
   5.222 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/iseeking_example.Po@am__quote@ # am--include-marker
   5.223 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ivorbisfile_example.Po@am__quote@ # am--include-marker
   5.224 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mapping0.Plo@am__quote@ # am--include-marker
   5.225 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mdct.Plo@am__quote@ # am--include-marker
   5.226 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/registry.Plo@am__quote@ # am--include-marker
   5.227 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/res012.Plo@am__quote@ # am--include-marker
   5.228 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sharedbook.Plo@am__quote@ # am--include-marker
   5.229 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/synthesis.Plo@am__quote@ # am--include-marker
   5.230 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vorbisfile.Plo@am__quote@ # am--include-marker
   5.231 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/window.Plo@am__quote@ # am--include-marker
   5.232 +
   5.233 +$(am__depfiles_remade):
   5.234 +	@$(MKDIR_P) $(@D)
   5.235 +	@echo '# dummy' >$@-t && $(am__mv) $@-t $@
   5.236 +
   5.237 +am--depfiles: $(am__depfiles_remade)
   5.238  
   5.239  .c.o:
   5.240  @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
   5.241  @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
   5.242  @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
   5.243  @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
   5.244 -@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
   5.245 +@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
   5.246  
   5.247  .c.obj:
   5.248  @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
   5.249  @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
   5.250  @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
   5.251  @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
   5.252 -@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
   5.253 +@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
   5.254  
   5.255  .c.lo:
   5.256  @am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
   5.257 @@ -632,7 +689,10 @@
   5.258  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
   5.259  	-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
   5.260  
   5.261 -distdir: $(DISTFILES)
   5.262 +distdir: $(BUILT_SOURCES)
   5.263 +	$(MAKE) $(AM_MAKEFLAGS) distdir-am
   5.264 +
   5.265 +distdir-am: $(DISTFILES)
   5.266  	$(am__remove_distdir)
   5.267  	test -d "$(distdir)" || mkdir "$(distdir)"
   5.268  	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
   5.269 @@ -672,7 +732,7 @@
   5.270  	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
   5.271  	|| chmod -R a+r "$(distdir)"
   5.272  dist-gzip: distdir
   5.273 -	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
   5.274 +	tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz
   5.275  	$(am__post_remove_distdir)
   5.276  
   5.277  dist-bzip2: distdir
   5.278 @@ -688,11 +748,17 @@
   5.279  	$(am__post_remove_distdir)
   5.280  
   5.281  dist-tarZ: distdir
   5.282 +	@echo WARNING: "Support for distribution archives compressed with" \
   5.283 +		       "legacy program 'compress' is deprecated." >&2
   5.284 +	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
   5.285  	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
   5.286  	$(am__post_remove_distdir)
   5.287  
   5.288  dist-shar: distdir
   5.289 -	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
   5.290 +	@echo WARNING: "Support for shar distribution archives is" \
   5.291 +	               "deprecated." >&2
   5.292 +	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
   5.293 +	shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz
   5.294  	$(am__post_remove_distdir)
   5.295  
   5.296  dist-zip: distdir
   5.297 @@ -710,7 +776,7 @@
   5.298  distcheck: dist
   5.299  	case '$(DIST_ARCHIVES)' in \
   5.300  	*.tar.gz*) \
   5.301 -	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
   5.302 +	  eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\
   5.303  	*.tar.bz2*) \
   5.304  	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
   5.305  	*.tar.lz*) \
   5.306 @@ -720,22 +786,23 @@
   5.307  	*.tar.Z*) \
   5.308  	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
   5.309  	*.shar.gz*) \
   5.310 -	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
   5.311 +	  eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
   5.312  	*.zip*) \
   5.313  	  unzip $(distdir).zip ;;\
   5.314  	esac
   5.315  	chmod -R a-w $(distdir)
   5.316  	chmod u+w $(distdir)
   5.317 -	mkdir $(distdir)/_build $(distdir)/_inst
   5.318 +	mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst
   5.319  	chmod a-w $(distdir)
   5.320  	test -d $(distdir)/_build || exit 0; \
   5.321  	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
   5.322  	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
   5.323  	  && am__cwd=`pwd` \
   5.324 -	  && $(am__cd) $(distdir)/_build \
   5.325 -	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
   5.326 +	  && $(am__cd) $(distdir)/_build/sub \
   5.327 +	  && ../../configure \
   5.328  	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \
   5.329  	    $(DISTCHECK_CONFIGURE_FLAGS) \
   5.330 +	    --srcdir=../.. --prefix="$$dc_install_base" \
   5.331  	  && $(MAKE) $(AM_MAKEFLAGS) \
   5.332  	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
   5.333  	  && $(MAKE) $(AM_MAKEFLAGS) check \
   5.334 @@ -833,7 +900,21 @@
   5.335  
   5.336  distclean: distclean-am
   5.337  	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
   5.338 -	-rm -rf ./$(DEPDIR)
   5.339 +		-rm -f ./$(DEPDIR)/block.Plo
   5.340 +	-rm -f ./$(DEPDIR)/codebook.Plo
   5.341 +	-rm -f ./$(DEPDIR)/floor0.Plo
   5.342 +	-rm -f ./$(DEPDIR)/floor1.Plo
   5.343 +	-rm -f ./$(DEPDIR)/info.Plo
   5.344 +	-rm -f ./$(DEPDIR)/iseeking_example.Po
   5.345 +	-rm -f ./$(DEPDIR)/ivorbisfile_example.Po
   5.346 +	-rm -f ./$(DEPDIR)/mapping0.Plo
   5.347 +	-rm -f ./$(DEPDIR)/mdct.Plo
   5.348 +	-rm -f ./$(DEPDIR)/registry.Plo
   5.349 +	-rm -f ./$(DEPDIR)/res012.Plo
   5.350 +	-rm -f ./$(DEPDIR)/sharedbook.Plo
   5.351 +	-rm -f ./$(DEPDIR)/synthesis.Plo
   5.352 +	-rm -f ./$(DEPDIR)/vorbisfile.Plo
   5.353 +	-rm -f ./$(DEPDIR)/window.Plo
   5.354  	-rm -f Makefile
   5.355  distclean-am: clean-am distclean-compile distclean-generic \
   5.356  	distclean-hdr distclean-libtool distclean-tags
   5.357 @@ -881,7 +962,21 @@
   5.358  maintainer-clean: maintainer-clean-am
   5.359  	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
   5.360  	-rm -rf $(top_srcdir)/autom4te.cache
   5.361 -	-rm -rf ./$(DEPDIR)
   5.362 +		-rm -f ./$(DEPDIR)/block.Plo
   5.363 +	-rm -f ./$(DEPDIR)/codebook.Plo
   5.364 +	-rm -f ./$(DEPDIR)/floor0.Plo
   5.365 +	-rm -f ./$(DEPDIR)/floor1.Plo
   5.366 +	-rm -f ./$(DEPDIR)/info.Plo
   5.367 +	-rm -f ./$(DEPDIR)/iseeking_example.Po
   5.368 +	-rm -f ./$(DEPDIR)/ivorbisfile_example.Po
   5.369 +	-rm -f ./$(DEPDIR)/mapping0.Plo
   5.370 +	-rm -f ./$(DEPDIR)/mdct.Plo
   5.371 +	-rm -f ./$(DEPDIR)/registry.Plo
   5.372 +	-rm -f ./$(DEPDIR)/res012.Plo
   5.373 +	-rm -f ./$(DEPDIR)/sharedbook.Plo
   5.374 +	-rm -f ./$(DEPDIR)/synthesis.Plo
   5.375 +	-rm -f ./$(DEPDIR)/vorbisfile.Plo
   5.376 +	-rm -f ./$(DEPDIR)/window.Plo
   5.377  	-rm -f Makefile
   5.378  maintainer-clean-am: distclean-am maintainer-clean-generic
   5.379  
   5.380 @@ -903,25 +998,27 @@
   5.381  
   5.382  .MAKE: all install-am install-strip
   5.383  
   5.384 -.PHONY: CTAGS GTAGS TAGS all all-am am--refresh check check-am clean \
   5.385 -	clean-cscope clean-generic clean-libLTLIBRARIES clean-libtool \
   5.386 -	cscope cscopelist-am ctags ctags-am dist dist-all dist-bzip2 \
   5.387 -	dist-gzip dist-lzip dist-shar dist-tarZ dist-xz dist-zip \
   5.388 -	distcheck distclean distclean-compile distclean-generic \
   5.389 -	distclean-hdr distclean-libtool distclean-tags distcleancheck \
   5.390 -	distdir distuninstallcheck dvi dvi-am html html-am info \
   5.391 -	info-am install install-am install-data install-data-am \
   5.392 -	install-dvi install-dvi-am install-exec install-exec-am \
   5.393 -	install-html install-html-am install-includeHEADERS \
   5.394 -	install-info install-info-am install-libLTLIBRARIES \
   5.395 -	install-man install-pdf install-pdf-am install-pkgconfigDATA \
   5.396 -	install-ps install-ps-am install-strip installcheck \
   5.397 -	installcheck-am installdirs maintainer-clean \
   5.398 +.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles am--refresh check \
   5.399 +	check-am clean clean-cscope clean-generic clean-libLTLIBRARIES \
   5.400 +	clean-libtool cscope cscopelist-am ctags ctags-am dist \
   5.401 +	dist-all dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ \
   5.402 +	dist-xz dist-zip distcheck distclean distclean-compile \
   5.403 +	distclean-generic distclean-hdr distclean-libtool \
   5.404 +	distclean-tags distcleancheck distdir distuninstallcheck dvi \
   5.405 +	dvi-am html html-am info info-am install install-am \
   5.406 +	install-data install-data-am install-dvi install-dvi-am \
   5.407 +	install-exec install-exec-am install-html install-html-am \
   5.408 +	install-includeHEADERS install-info install-info-am \
   5.409 +	install-libLTLIBRARIES install-man install-pdf install-pdf-am \
   5.410 +	install-pkgconfigDATA install-ps install-ps-am install-strip \
   5.411 +	installcheck installcheck-am installdirs maintainer-clean \
   5.412  	maintainer-clean-generic mostlyclean mostlyclean-compile \
   5.413  	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
   5.414  	tags tags-am uninstall uninstall-am uninstall-includeHEADERS \
   5.415  	uninstall-libLTLIBRARIES uninstall-pkgconfigDATA
   5.416  
   5.417 +.PRECIOUS: Makefile
   5.418 +
   5.419  
   5.420  example:
   5.421  	-ln -fs . vorbis
     6.1 --- a/external/libvorbisidec-1.2.1/aclocal.m4	Sun Dec 01 18:50:02 2019 +0300
     6.2 +++ b/external/libvorbisidec-1.2.1/aclocal.m4	Sun Dec 01 20:20:02 2019 +0300
     6.3 @@ -1,6 +1,6 @@
     6.4 -# generated automatically by aclocal 1.13.1 -*- Autoconf -*-
     6.5 +# generated automatically by aclocal 1.16.1 -*- Autoconf -*-
     6.6  
     6.7 -# Copyright (C) 1996-2012 Free Software Foundation, Inc.
     6.8 +# Copyright (C) 1996-2018 Free Software Foundation, Inc.
     6.9  
    6.10  # This file is free software; the Free Software Foundation
    6.11  # gives unlimited permission to copy and/or distribute it,
    6.12 @@ -20,7 +20,7 @@
    6.13  If you have problems, you may need to regenerate the build system entirely.
    6.14  To do so, use the procedure documented by the package, typically 'autoreconf'.])])
    6.15  
    6.16 -# Copyright (C) 2002-2013 Free Software Foundation, Inc.
    6.17 +# Copyright (C) 2002-2018 Free Software Foundation, Inc.
    6.18  #
    6.19  # This file is free software; the Free Software Foundation
    6.20  # gives unlimited permission to copy and/or distribute it,
    6.21 @@ -32,10 +32,10 @@
    6.22  # generated from the m4 files accompanying Automake X.Y.
    6.23  # (This private macro should not be called outside this file.)
    6.24  AC_DEFUN([AM_AUTOMAKE_VERSION],
    6.25 -[am__api_version='1.13'
    6.26 +[am__api_version='1.16'
    6.27  dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
    6.28  dnl require some minimum version.  Point them to the right macro.
    6.29 -m4_if([$1], [1.13.1], [],
    6.30 +m4_if([$1], [1.16.1], [],
    6.31        [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
    6.32  ])
    6.33  
    6.34 @@ -51,14 +51,14 @@
    6.35  # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
    6.36  # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
    6.37  AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
    6.38 -[AM_AUTOMAKE_VERSION([1.13.1])dnl
    6.39 +[AM_AUTOMAKE_VERSION([1.16.1])dnl
    6.40  m4_ifndef([AC_AUTOCONF_VERSION],
    6.41    [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
    6.42  _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
    6.43  
    6.44  # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
    6.45  
    6.46 -# Copyright (C) 2001-2013 Free Software Foundation, Inc.
    6.47 +# Copyright (C) 2001-2018 Free Software Foundation, Inc.
    6.48  #
    6.49  # This file is free software; the Free Software Foundation
    6.50  # gives unlimited permission to copy and/or distribute it,
    6.51 @@ -103,15 +103,14 @@
    6.52  # configured tree to be moved without reconfiguration.
    6.53  
    6.54  AC_DEFUN([AM_AUX_DIR_EXPAND],
    6.55 -[dnl Rely on autoconf to set up CDPATH properly.
    6.56 -AC_PREREQ([2.50])dnl
    6.57 -# expand $ac_aux_dir to an absolute path
    6.58 -am_aux_dir=`cd $ac_aux_dir && pwd`
    6.59 +[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
    6.60 +# Expand $ac_aux_dir to an absolute path.
    6.61 +am_aux_dir=`cd "$ac_aux_dir" && pwd`
    6.62  ])
    6.63  
    6.64  # AM_CONDITIONAL                                            -*- Autoconf -*-
    6.65  
    6.66 -# Copyright (C) 1997-2013 Free Software Foundation, Inc.
    6.67 +# Copyright (C) 1997-2018 Free Software Foundation, Inc.
    6.68  #
    6.69  # This file is free software; the Free Software Foundation
    6.70  # gives unlimited permission to copy and/or distribute it,
    6.71 @@ -142,7 +141,7 @@
    6.72  Usually this means the macro was only invoked conditionally.]])
    6.73  fi])])
    6.74  
    6.75 -# Copyright (C) 1999-2013 Free Software Foundation, Inc.
    6.76 +# Copyright (C) 1999-2018 Free Software Foundation, Inc.
    6.77  #
    6.78  # This file is free software; the Free Software Foundation
    6.79  # gives unlimited permission to copy and/or distribute it,
    6.80 @@ -333,13 +332,12 @@
    6.81  
    6.82  # Generate code to set up dependency tracking.              -*- Autoconf -*-
    6.83  
    6.84 -# Copyright (C) 1999-2013 Free Software Foundation, Inc.
    6.85 +# Copyright (C) 1999-2018 Free Software Foundation, Inc.
    6.86  #
    6.87  # This file is free software; the Free Software Foundation
    6.88  # gives unlimited permission to copy and/or distribute it,
    6.89  # with or without modifications, as long as this notice is preserved.
    6.90  
    6.91 -
    6.92  # _AM_OUTPUT_DEPENDENCY_COMMANDS
    6.93  # ------------------------------
    6.94  AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
    6.95 @@ -347,49 +345,41 @@
    6.96    # Older Autoconf quotes --file arguments for eval, but not when files
    6.97    # are listed without --file.  Let's play safe and only enable the eval
    6.98    # if we detect the quoting.
    6.99 -  case $CONFIG_FILES in
   6.100 -  *\'*) eval set x "$CONFIG_FILES" ;;
   6.101 -  *)   set x $CONFIG_FILES ;;
   6.102 -  esac
   6.103 +  # TODO: see whether this extra hack can be removed once we start
   6.104 +  # requiring Autoconf 2.70 or later.
   6.105 +  AS_CASE([$CONFIG_FILES],
   6.106 +          [*\'*], [eval set x "$CONFIG_FILES"],
   6.107 +          [*], [set x $CONFIG_FILES])
   6.108    shift
   6.109 -  for mf
   6.110 +  # Used to flag and report bootstrapping failures.
   6.111 +  am_rc=0
   6.112 +  for am_mf
   6.113    do
   6.114      # Strip MF so we end up with the name of the file.
   6.115 -    mf=`echo "$mf" | sed -e 's/:.*$//'`
   6.116 -    # Check whether this is an Automake generated Makefile or not.
   6.117 -    # We used to match only the files named 'Makefile.in', but
   6.118 -    # some people rename them; so instead we look at the file content.
   6.119 -    # Grep'ing the first line is not enough: some people post-process
   6.120 -    # each Makefile.in and add a new line on top of each file to say so.
   6.121 -    # Grep'ing the whole file is not good either: AIX grep has a line
   6.122 +    am_mf=`AS_ECHO(["$am_mf"]) | sed -e 's/:.*$//'`
   6.123 +    # Check whether this is an Automake generated Makefile which includes
   6.124 +    # dependency-tracking related rules and includes.
   6.125 +    # Grep'ing the whole file directly is not great: AIX grep has a line
   6.126      # limit of 2048, but all sed's we know have understand at least 4000.
   6.127 -    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
   6.128 -      dirpart=`AS_DIRNAME("$mf")`
   6.129 -    else
   6.130 -      continue
   6.131 -    fi
   6.132 -    # Extract the definition of DEPDIR, am__include, and am__quote
   6.133 -    # from the Makefile without running 'make'.
   6.134 -    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
   6.135 -    test -z "$DEPDIR" && continue
   6.136 -    am__include=`sed -n 's/^am__include = //p' < "$mf"`
   6.137 -    test -z "am__include" && continue
   6.138 -    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
   6.139 -    # Find all dependency output files, they are included files with
   6.140 -    # $(DEPDIR) in their names.  We invoke sed twice because it is the
   6.141 -    # simplest approach to changing $(DEPDIR) to its actual value in the
   6.142 -    # expansion.
   6.143 -    for file in `sed -n "
   6.144 -      s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
   6.145 -	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
   6.146 -      # Make sure the directory exists.
   6.147 -      test -f "$dirpart/$file" && continue
   6.148 -      fdir=`AS_DIRNAME(["$file"])`
   6.149 -      AS_MKDIR_P([$dirpart/$fdir])
   6.150 -      # echo "creating $dirpart/$file"
   6.151 -      echo '# dummy' > "$dirpart/$file"
   6.152 -    done
   6.153 +    sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \
   6.154 +      || continue
   6.155 +    am_dirpart=`AS_DIRNAME(["$am_mf"])`
   6.156 +    am_filepart=`AS_BASENAME(["$am_mf"])`
   6.157 +    AM_RUN_LOG([cd "$am_dirpart" \
   6.158 +      && sed -e '/# am--include-marker/d' "$am_filepart" \
   6.159 +        | $MAKE -f - am--depfiles]) || am_rc=$?
   6.160    done
   6.161 +  if test $am_rc -ne 0; then
   6.162 +    AC_MSG_FAILURE([Something went wrong bootstrapping makefile fragments
   6.163 +    for automatic dependency tracking.  Try re-running configure with the
   6.164 +    '--disable-dependency-tracking' option to at least be able to build
   6.165 +    the package (albeit without support for automatic dependency tracking).])
   6.166 +  fi
   6.167 +  AS_UNSET([am_dirpart])
   6.168 +  AS_UNSET([am_filepart])
   6.169 +  AS_UNSET([am_mf])
   6.170 +  AS_UNSET([am_rc])
   6.171 +  rm -f conftest-deps.mk
   6.172  }
   6.173  ])# _AM_OUTPUT_DEPENDENCY_COMMANDS
   6.174  
   6.175 @@ -398,18 +388,17 @@
   6.176  # -----------------------------
   6.177  # This macro should only be invoked once -- use via AC_REQUIRE.
   6.178  #
   6.179 -# This code is only required when automatic dependency tracking
   6.180 -# is enabled.  FIXME.  This creates each '.P' file that we will
   6.181 -# need in order to bootstrap the dependency handling code.
   6.182 +# This code is only required when automatic dependency tracking is enabled.
   6.183 +# This creates each '.Po' and '.Plo' makefile fragment that we'll need in
   6.184 +# order to bootstrap the dependency handling code.
   6.185  AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
   6.186  [AC_CONFIG_COMMANDS([depfiles],
   6.187       [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
   6.188 -     [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
   6.189 -])
   6.190 +     [AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"])])
   6.191  
   6.192  # Do all the work for Automake.                             -*- Autoconf -*-
   6.193  
   6.194 -# Copyright (C) 1996-2013 Free Software Foundation, Inc.
   6.195 +# Copyright (C) 1996-2018 Free Software Foundation, Inc.
   6.196  #
   6.197  # This file is free software; the Free Software Foundation
   6.198  # gives unlimited permission to copy and/or distribute it,
   6.199 @@ -418,6 +407,12 @@
   6.200  # This macro actually does too much.  Some checks are only needed if
   6.201  # your package does certain things.  But this isn't really a big deal.
   6.202  
   6.203 +dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O.
   6.204 +m4_define([AC_PROG_CC],
   6.205 +m4_defn([AC_PROG_CC])
   6.206 +[_AM_PROG_CC_C_O
   6.207 +])
   6.208 +
   6.209  # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
   6.210  # AM_INIT_AUTOMAKE([OPTIONS])
   6.211  # -----------------------------------------------
   6.212 @@ -490,11 +485,11 @@
   6.213  AC_REQUIRE([AC_PROG_MKDIR_P])dnl
   6.214  # For better backward compatibility.  To be removed once Automake 1.9.x
   6.215  # dies out for good.  For more background, see:
   6.216 -# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
   6.217 -# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
   6.218 +# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
   6.219 +# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
   6.220  AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
   6.221 -# We need awk for the "check" target.  The system "awk" is bad on
   6.222 -# some platforms.
   6.223 +# We need awk for the "check" target (and possibly the TAP driver).  The
   6.224 +# system "awk" is bad on some platforms.
   6.225  AC_REQUIRE([AC_PROG_AWK])dnl
   6.226  AC_REQUIRE([AC_PROG_MAKE_SET])dnl
   6.227  AC_REQUIRE([AM_SET_LEADING_DOT])dnl
   6.228 @@ -526,6 +521,51 @@
   6.229  AC_CONFIG_COMMANDS_PRE(dnl
   6.230  [m4_provide_if([_AM_COMPILER_EXEEXT],
   6.231    [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
   6.232 +
   6.233 +# POSIX will say in a future version that running "rm -f" with no argument
   6.234 +# is OK; and we want to be able to make that assumption in our Makefile
   6.235 +# recipes.  So use an aggressive probe to check that the usage we want is
   6.236 +# actually supported "in the wild" to an acceptable degree.
   6.237 +# See automake bug#10828.
   6.238 +# To make any issue more visible, cause the running configure to be aborted
   6.239 +# by default if the 'rm' program in use doesn't match our expectations; the
   6.240 +# user can still override this though.
   6.241 +if rm -f && rm -fr && rm -rf; then : OK; else
   6.242 +  cat >&2 <<'END'
   6.243 +Oops!
   6.244 +
   6.245 +Your 'rm' program seems unable to run without file operands specified
   6.246 +on the command line, even when the '-f' option is present.  This is contrary
   6.247 +to the behaviour of most rm programs out there, and not conforming with
   6.248 +the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
   6.249 +
   6.250 +Please tell bug-automake@gnu.org about your system, including the value
   6.251 +of your $PATH and any error possibly output before this message.  This
   6.252 +can help us improve future automake versions.
   6.253 +
   6.254 +END
   6.255 +  if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
   6.256 +    echo 'Configuration will proceed anyway, since you have set the' >&2
   6.257 +    echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
   6.258 +    echo >&2
   6.259 +  else
   6.260 +    cat >&2 <<'END'
   6.261 +Aborting the configuration process, to ensure you take notice of the issue.
   6.262 +
   6.263 +You can download and install GNU coreutils to get an 'rm' implementation
   6.264 +that behaves properly: <https://www.gnu.org/software/coreutils/>.
   6.265 +
   6.266 +If you want to complete the configuration process using your problematic
   6.267 +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
   6.268 +to "yes", and re-run configure.
   6.269 +
   6.270 +END
   6.271 +    AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
   6.272 +  fi
   6.273 +fi
   6.274 +dnl The trailing newline in this macro's definition is deliberate, for
   6.275 +dnl backward compatibility and to allow trailing 'dnl'-style comments
   6.276 +dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841.
   6.277  ])
   6.278  
   6.279  dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
   6.280 @@ -534,7 +574,6 @@
   6.281  m4_define([_AC_COMPILER_EXEEXT],
   6.282  m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
   6.283  
   6.284 -
   6.285  # When config.status generates a header, we must update the stamp-h file.
   6.286  # This file resides in the same directory as the config header
   6.287  # that is generated.  The stamp files are numbered to have different names.
   6.288 @@ -556,7 +595,7 @@
   6.289  done
   6.290  echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
   6.291  
   6.292 -# Copyright (C) 2001-2013 Free Software Foundation, Inc.
   6.293 +# Copyright (C) 2001-2018 Free Software Foundation, Inc.
   6.294  #
   6.295  # This file is free software; the Free Software Foundation
   6.296  # gives unlimited permission to copy and/or distribute it,
   6.297 @@ -567,7 +606,7 @@
   6.298  # Define $install_sh.
   6.299  AC_DEFUN([AM_PROG_INSTALL_SH],
   6.300  [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
   6.301 -if test x"${install_sh}" != xset; then
   6.302 +if test x"${install_sh+set}" != xset; then
   6.303    case $am_aux_dir in
   6.304    *\ * | *\	*)
   6.305      install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
   6.306 @@ -577,7 +616,7 @@
   6.307  fi
   6.308  AC_SUBST([install_sh])])
   6.309  
   6.310 -# Copyright (C) 2003-2013 Free Software Foundation, Inc.
   6.311 +# Copyright (C) 2003-2018 Free Software Foundation, Inc.
   6.312  #
   6.313  # This file is free software; the Free Software Foundation
   6.314  # gives unlimited permission to copy and/or distribute it,
   6.315 @@ -599,7 +638,7 @@
   6.316  # Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
   6.317  # From Jim Meyering
   6.318  
   6.319 -# Copyright (C) 1996-2013 Free Software Foundation, Inc.
   6.320 +# Copyright (C) 1996-2018 Free Software Foundation, Inc.
   6.321  #
   6.322  # This file is free software; the Free Software Foundation
   6.323  # gives unlimited permission to copy and/or distribute it,
   6.324 @@ -634,7 +673,7 @@
   6.325  
   6.326  # Check to see how 'make' treats includes.	            -*- Autoconf -*-
   6.327  
   6.328 -# Copyright (C) 2001-2013 Free Software Foundation, Inc.
   6.329 +# Copyright (C) 2001-2018 Free Software Foundation, Inc.
   6.330  #
   6.331  # This file is free software; the Free Software Foundation
   6.332  # gives unlimited permission to copy and/or distribute it,
   6.333 @@ -642,49 +681,42 @@
   6.334  
   6.335  # AM_MAKE_INCLUDE()
   6.336  # -----------------
   6.337 -# Check to see how make treats includes.
   6.338 +# Check whether make has an 'include' directive that can support all
   6.339 +# the idioms we need for our automatic dependency tracking code.
   6.340  AC_DEFUN([AM_MAKE_INCLUDE],
   6.341 -[am_make=${MAKE-make}
   6.342 -cat > confinc << 'END'
   6.343 +[AC_MSG_CHECKING([whether ${MAKE-make} supports the include directive])
   6.344 +cat > confinc.mk << 'END'
   6.345  am__doit:
   6.346 -	@echo this is the am__doit target
   6.347 +	@echo this is the am__doit target >confinc.out
   6.348  .PHONY: am__doit
   6.349  END
   6.350 -# If we don't find an include directive, just comment out the code.
   6.351 -AC_MSG_CHECKING([for style of include used by $am_make])
   6.352  am__include="#"
   6.353  am__quote=
   6.354 -_am_result=none
   6.355 -# First try GNU make style include.
   6.356 -echo "include confinc" > confmf
   6.357 -# Ignore all kinds of additional output from 'make'.
   6.358 -case `$am_make -s -f confmf 2> /dev/null` in #(
   6.359 -*the\ am__doit\ target*)
   6.360 -  am__include=include
   6.361 -  am__quote=
   6.362 -  _am_result=GNU
   6.363 -  ;;
   6.364 -esac
   6.365 -# Now try BSD make style include.
   6.366 -if test "$am__include" = "#"; then
   6.367 -   echo '.include "confinc"' > confmf
   6.368 -   case `$am_make -s -f confmf 2> /dev/null` in #(
   6.369 -   *the\ am__doit\ target*)
   6.370 -     am__include=.include
   6.371 -     am__quote="\""
   6.372 -     _am_result=BSD
   6.373 -     ;;
   6.374 -   esac
   6.375 -fi
   6.376 -AC_SUBST([am__include])
   6.377 -AC_SUBST([am__quote])
   6.378 -AC_MSG_RESULT([$_am_result])
   6.379 -rm -f confinc confmf
   6.380 -])
   6.381 +# BSD make does it like this.
   6.382 +echo '.include "confinc.mk" # ignored' > confmf.BSD
   6.383 +# Other make implementations (GNU, Solaris 10, AIX) do it like this.
   6.384 +echo 'include confinc.mk # ignored' > confmf.GNU
   6.385 +_am_result=no
   6.386 +for s in GNU BSD; do
   6.387 +  AM_RUN_LOG([${MAKE-make} -f confmf.$s && cat confinc.out])
   6.388 +  AS_CASE([$?:`cat confinc.out 2>/dev/null`],
   6.389 +      ['0:this is the am__doit target'],
   6.390 +      [AS_CASE([$s],
   6.391 +          [BSD], [am__include='.include' am__quote='"'],
   6.392 +          [am__include='include' am__quote=''])])
   6.393 +  if test "$am__include" != "#"; then
   6.394 +    _am_result="yes ($s style)"
   6.395 +    break
   6.396 +  fi
   6.397 +done
   6.398 +rm -f confinc.* confmf.*
   6.399 +AC_MSG_RESULT([${_am_result}])
   6.400 +AC_SUBST([am__include])])
   6.401 +AC_SUBST([am__quote])])
   6.402  
   6.403  # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
   6.404  
   6.405 -# Copyright (C) 1997-2013 Free Software Foundation, Inc.
   6.406 +# Copyright (C) 1997-2018 Free Software Foundation, Inc.
   6.407  #
   6.408  # This file is free software; the Free Software Foundation
   6.409  # gives unlimited permission to copy and/or distribute it,
   6.410 @@ -723,7 +755,7 @@
   6.411  
   6.412  # Helper functions for option handling.                     -*- Autoconf -*-
   6.413  
   6.414 -# Copyright (C) 2001-2013 Free Software Foundation, Inc.
   6.415 +# Copyright (C) 2001-2018 Free Software Foundation, Inc.
   6.416  #
   6.417  # This file is free software; the Free Software Foundation
   6.418  # gives unlimited permission to copy and/or distribute it,
   6.419 @@ -752,9 +784,73 @@
   6.420  AC_DEFUN([_AM_IF_OPTION],
   6.421  [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
   6.422  
   6.423 +# Copyright (C) 1999-2018 Free Software Foundation, Inc.
   6.424 +#
   6.425 +# This file is free software; the Free Software Foundation
   6.426 +# gives unlimited permission to copy and/or distribute it,
   6.427 +# with or without modifications, as long as this notice is preserved.
   6.428 +
   6.429 +# _AM_PROG_CC_C_O
   6.430 +# ---------------
   6.431 +# Like AC_PROG_CC_C_O, but changed for automake.  We rewrite AC_PROG_CC
   6.432 +# to automatically call this.
   6.433 +AC_DEFUN([_AM_PROG_CC_C_O],
   6.434 +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
   6.435 +AC_REQUIRE_AUX_FILE([compile])dnl
   6.436 +AC_LANG_PUSH([C])dnl
   6.437 +AC_CACHE_CHECK(
   6.438 +  [whether $CC understands -c and -o together],
   6.439 +  [am_cv_prog_cc_c_o],
   6.440 +  [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])])
   6.441 +  # Make sure it works both with $CC and with simple cc.
   6.442 +  # Following AC_PROG_CC_C_O, we do the test twice because some
   6.443 +  # compilers refuse to overwrite an existing .o file with -o,
   6.444 +  # though they will create one.
   6.445 +  am_cv_prog_cc_c_o=yes
   6.446 +  for am_i in 1 2; do
   6.447 +    if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \
   6.448 +         && test -f conftest2.$ac_objext; then
   6.449 +      : OK
   6.450 +    else
   6.451 +      am_cv_prog_cc_c_o=no
   6.452 +      break
   6.453 +    fi
   6.454 +  done
   6.455 +  rm -f core conftest*
   6.456 +  unset am_i])
   6.457 +if test "$am_cv_prog_cc_c_o" != yes; then
   6.458 +   # Losing compiler, so override with the script.
   6.459 +   # FIXME: It is wrong to rewrite CC.
   6.460 +   # But if we don't then we get into trouble of one sort or another.
   6.461 +   # A longer-term fix would be to have automake use am__CC in this case,
   6.462 +   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
   6.463 +   CC="$am_aux_dir/compile $CC"
   6.464 +fi
   6.465 +AC_LANG_POP([C])])
   6.466 +
   6.467 +# For backward compatibility.
   6.468 +AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
   6.469 +
   6.470 +# Copyright (C) 2001-2018 Free Software Foundation, Inc.
   6.471 +#
   6.472 +# This file is free software; the Free Software Foundation
   6.473 +# gives unlimited permission to copy and/or distribute it,
   6.474 +# with or without modifications, as long as this notice is preserved.
   6.475 +
   6.476 +# AM_RUN_LOG(COMMAND)
   6.477 +# -------------------
   6.478 +# Run COMMAND, save the exit status in ac_status, and log it.
   6.479 +# (This has been adapted from Autoconf's _AC_RUN_LOG macro.)
   6.480 +AC_DEFUN([AM_RUN_LOG],
   6.481 +[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD
   6.482 +   ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD
   6.483 +   ac_status=$?
   6.484 +   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
   6.485 +   (exit $ac_status); }])
   6.486 +
   6.487  # Check to make sure that the build environment is sane.    -*- Autoconf -*-
   6.488  
   6.489 -# Copyright (C) 1996-2013 Free Software Foundation, Inc.
   6.490 +# Copyright (C) 1996-2018 Free Software Foundation, Inc.
   6.491  #
   6.492  # This file is free software; the Free Software Foundation
   6.493  # gives unlimited permission to copy and/or distribute it,
   6.494 @@ -835,7 +931,7 @@
   6.495  rm -f conftest.file
   6.496  ])
   6.497  
   6.498 -# Copyright (C) 2009-2013 Free Software Foundation, Inc.
   6.499 +# Copyright (C) 2009-2018 Free Software Foundation, Inc.
   6.500  #
   6.501  # This file is free software; the Free Software Foundation
   6.502  # gives unlimited permission to copy and/or distribute it,
   6.503 @@ -895,7 +991,7 @@
   6.504  _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
   6.505  ])
   6.506  
   6.507 -# Copyright (C) 2001-2013 Free Software Foundation, Inc.
   6.508 +# Copyright (C) 2001-2018 Free Software Foundation, Inc.
   6.509  #
   6.510  # This file is free software; the Free Software Foundation
   6.511  # gives unlimited permission to copy and/or distribute it,
   6.512 @@ -923,7 +1019,7 @@
   6.513  INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
   6.514  AC_SUBST([INSTALL_STRIP_PROGRAM])])
   6.515  
   6.516 -# Copyright (C) 2006-2013 Free Software Foundation, Inc.
   6.517 +# Copyright (C) 2006-2018 Free Software Foundation, Inc.
   6.518  #
   6.519  # This file is free software; the Free Software Foundation
   6.520  # gives unlimited permission to copy and/or distribute it,
   6.521 @@ -942,7 +1038,7 @@
   6.522  
   6.523  # Check how to create a tarball.                            -*- Autoconf -*-
   6.524  
   6.525 -# Copyright (C) 2004-2013 Free Software Foundation, Inc.
   6.526 +# Copyright (C) 2004-2018 Free Software Foundation, Inc.
   6.527  #
   6.528  # This file is free software; the Free Software Foundation
   6.529  # gives unlimited permission to copy and/or distribute it,
   6.530 @@ -961,76 +1057,114 @@
   6.531  # Substitute a variable $(am__untar) that extract such
   6.532  # a tarball read from stdin.
   6.533  #     $(am__untar) < result.tar
   6.534 +#
   6.535  AC_DEFUN([_AM_PROG_TAR],
   6.536  [# Always define AMTAR for backward compatibility.  Yes, it's still used
   6.537  # in the wild :-(  We should find a proper way to deprecate it ...
   6.538  AC_SUBST([AMTAR], ['$${TAR-tar}'])
   6.539 +
   6.540 +# We'll loop over all known methods to create a tar archive until one works.
   6.541 +_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
   6.542 +
   6.543  m4_if([$1], [v7],
   6.544 -     [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
   6.545 -     [m4_case([$1], [ustar],, [pax],,
   6.546 -              [m4_fatal([Unknown tar format])])
   6.547 -AC_MSG_CHECKING([how to create a $1 tar archive])
   6.548 -# Loop over all known methods to create a tar archive until one works.
   6.549 -_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
   6.550 -_am_tools=${am_cv_prog_tar_$1-$_am_tools}
   6.551 -# Do not fold the above two line into one, because Tru64 sh and
   6.552 -# Solaris sh will not grok spaces in the rhs of '-'.
   6.553 -for _am_tool in $_am_tools
   6.554 -do
   6.555 -  case $_am_tool in
   6.556 -  gnutar)
   6.557 -    for _am_tar in tar gnutar gtar;
   6.558 -    do
   6.559 -      AM_RUN_LOG([$_am_tar --version]) && break
   6.560 -    done
   6.561 -    am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
   6.562 -    am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
   6.563 -    am__untar="$_am_tar -xf -"
   6.564 -    ;;
   6.565 -  plaintar)
   6.566 -    # Must skip GNU tar: if it does not support --format= it doesn't create
   6.567 -    # ustar tarball either.
   6.568 -    (tar --version) >/dev/null 2>&1 && continue
   6.569 -    am__tar='tar chf - "$$tardir"'
   6.570 -    am__tar_='tar chf - "$tardir"'
   6.571 -    am__untar='tar xf -'
   6.572 -    ;;
   6.573 -  pax)
   6.574 -    am__tar='pax -L -x $1 -w "$$tardir"'
   6.575 -    am__tar_='pax -L -x $1 -w "$tardir"'
   6.576 -    am__untar='pax -r'
   6.577 -    ;;
   6.578 -  cpio)
   6.579 -    am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
   6.580 -    am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
   6.581 -    am__untar='cpio -i -H $1 -d'
   6.582 -    ;;
   6.583 -  none)
   6.584 -    am__tar=false
   6.585 -    am__tar_=false
   6.586 -    am__untar=false
   6.587 -    ;;
   6.588 -  esac
   6.589 +  [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
   6.590  
   6.591 -  # If the value was cached, stop now.  We just wanted to have am__tar
   6.592 -  # and am__untar set.
   6.593 -  test -n "${am_cv_prog_tar_$1}" && break
   6.594 +  [m4_case([$1],
   6.595 +    [ustar],
   6.596 +     [# The POSIX 1988 'ustar' format is defined with fixed-size fields.
   6.597 +      # There is notably a 21 bits limit for the UID and the GID.  In fact,
   6.598 +      # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343
   6.599 +      # and bug#13588).
   6.600 +      am_max_uid=2097151 # 2^21 - 1
   6.601 +      am_max_gid=$am_max_uid
   6.602 +      # The $UID and $GID variables are not portable, so we need to resort
   6.603 +      # to the POSIX-mandated id(1) utility.  Errors in the 'id' calls
   6.604 +      # below are definitely unexpected, so allow the users to see them
   6.605 +      # (that is, avoid stderr redirection).
   6.606 +      am_uid=`id -u || echo unknown`
   6.607 +      am_gid=`id -g || echo unknown`
   6.608 +      AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format])
   6.609 +      if test $am_uid -le $am_max_uid; then
   6.610 +         AC_MSG_RESULT([yes])
   6.611 +      else
   6.612 +         AC_MSG_RESULT([no])
   6.613 +         _am_tools=none
   6.614 +      fi
   6.615 +      AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format])
   6.616 +      if test $am_gid -le $am_max_gid; then
   6.617 +         AC_MSG_RESULT([yes])
   6.618 +      else
   6.619 +        AC_MSG_RESULT([no])
   6.620 +        _am_tools=none
   6.621 +      fi],
   6.622  
   6.623 -  # tar/untar a dummy directory, and stop if the command works
   6.624 +  [pax],
   6.625 +    [],
   6.626 +
   6.627 +  [m4_fatal([Unknown tar format])])
   6.628 +
   6.629 +  AC_MSG_CHECKING([how to create a $1 tar archive])
   6.630 +
   6.631 +  # Go ahead even if we have the value already cached.  We do so because we
   6.632 +  # need to set the values for the 'am__tar' and 'am__untar' variables.
   6.633 +  _am_tools=${am_cv_prog_tar_$1-$_am_tools}
   6.634 +
   6.635 +  for _am_tool in $_am_tools; do
   6.636 +    case $_am_tool in
   6.637 +    gnutar)
   6.638 +      for _am_tar in tar gnutar gtar; do
   6.639 +        AM_RUN_LOG([$_am_tar --version]) && break
   6.640 +      done
   6.641 +      am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
   6.642 +      am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
   6.643 +      am__untar="$_am_tar -xf -"
   6.644 +      ;;
   6.645 +    plaintar)
   6.646 +      # Must skip GNU tar: if it does not support --format= it doesn't create
   6.647 +      # ustar tarball either.
   6.648 +      (tar --version) >/dev/null 2>&1 && continue
   6.649 +      am__tar='tar chf - "$$tardir"'
   6.650 +      am__tar_='tar chf - "$tardir"'
   6.651 +      am__untar='tar xf -'
   6.652 +      ;;
   6.653 +    pax)
   6.654 +      am__tar='pax -L -x $1 -w "$$tardir"'
   6.655 +      am__tar_='pax -L -x $1 -w "$tardir"'
   6.656 +      am__untar='pax -r'
   6.657 +      ;;
   6.658 +    cpio)
   6.659 +      am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
   6.660 +      am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
   6.661 +      am__untar='cpio -i -H $1 -d'
   6.662 +      ;;
   6.663 +    none)
   6.664 +      am__tar=false
   6.665 +      am__tar_=false
   6.666 +      am__untar=false
   6.667 +      ;;
   6.668 +    esac
   6.669 +
   6.670 +    # If the value was cached, stop now.  We just wanted to have am__tar
   6.671 +    # and am__untar set.
   6.672 +    test -n "${am_cv_prog_tar_$1}" && break
   6.673 +
   6.674 +    # tar/untar a dummy directory, and stop if the command works.
   6.675 +    rm -rf conftest.dir
   6.676 +    mkdir conftest.dir
   6.677 +    echo GrepMe > conftest.dir/file
   6.678 +    AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
   6.679 +    rm -rf conftest.dir
   6.680 +    if test -s conftest.tar; then
   6.681 +      AM_RUN_LOG([$am__untar <conftest.tar])
   6.682 +      AM_RUN_LOG([cat conftest.dir/file])
   6.683 +      grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
   6.684 +    fi
   6.685 +  done
   6.686    rm -rf conftest.dir
   6.687 -  mkdir conftest.dir
   6.688 -  echo GrepMe > conftest.dir/file
   6.689 -  AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
   6.690 -  rm -rf conftest.dir
   6.691 -  if test -s conftest.tar; then
   6.692 -    AM_RUN_LOG([$am__untar <conftest.tar])
   6.693 -    grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
   6.694 -  fi
   6.695 -done
   6.696 -rm -rf conftest.dir
   6.697  
   6.698 -AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
   6.699 -AC_MSG_RESULT([$am_cv_prog_tar_$1])])
   6.700 +  AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
   6.701 +  AC_MSG_RESULT([$am_cv_prog_tar_$1])])
   6.702 +
   6.703  AC_SUBST([am__tar])
   6.704  AC_SUBST([am__untar])
   6.705  ]) # _AM_PROG_TAR
     7.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     7.2 +++ b/external/libvorbisidec-1.2.1/autogen.sh	Sun Dec 01 20:20:02 2019 +0300
     7.3 @@ -0,0 +1,12 @@
     7.4 +#!/bin/sh
     7.5 +# Run this to set up the build system: configure, makefiles, etc.
     7.6 +set -e
     7.7 +
     7.8 +package="vorbisidec"
     7.9 +
    7.10 +srcdir=`dirname $0`
    7.11 +test -n "$srcdir" && cd "$srcdir"
    7.12 +
    7.13 +echo "Updating build configuration files for $package, please wait.."
    7.14 +
    7.15 +autoreconf -if
     8.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     8.2 +++ b/external/libvorbisidec-1.2.1/compile	Sun Dec 01 20:20:02 2019 +0300
     8.3 @@ -0,0 +1,348 @@
     8.4 +#! /bin/sh
     8.5 +# Wrapper for compilers which do not understand '-c -o'.
     8.6 +
     8.7 +scriptversion=2018-03-07.03; # UTC
     8.8 +
     8.9 +# Copyright (C) 1999-2018 Free Software Foundation, Inc.
    8.10 +# Written by Tom Tromey <tromey@cygnus.com>.
    8.11 +#
    8.12 +# This program is free software; you can redistribute it and/or modify
    8.13 +# it under the terms of the GNU General Public License as published by
    8.14 +# the Free Software Foundation; either version 2, or (at your option)
    8.15 +# any later version.
    8.16 +#
    8.17 +# This program is distributed in the hope that it will be useful,
    8.18 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
    8.19 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    8.20 +# GNU General Public License for more details.
    8.21 +#
    8.22 +# You should have received a copy of the GNU General Public License
    8.23 +# along with this program.  If not, see <https://www.gnu.org/licenses/>.
    8.24 +
    8.25 +# As a special exception to the GNU General Public License, if you
    8.26 +# distribute this file as part of a program that contains a
    8.27 +# configuration script generated by Autoconf, you may include it under
    8.28 +# the same distribution terms that you use for the rest of that program.
    8.29 +
    8.30 +# This file is maintained in Automake, please report
    8.31 +# bugs to <bug-automake@gnu.org> or send patches to
    8.32 +# <automake-patches@gnu.org>.
    8.33 +
    8.34 +nl='
    8.35 +'
    8.36 +
    8.37 +# We need space, tab and new line, in precisely that order.  Quoting is
    8.38 +# there to prevent tools from complaining about whitespace usage.
    8.39 +IFS=" ""	$nl"
    8.40 +
    8.41 +file_conv=
    8.42 +
    8.43 +# func_file_conv build_file lazy
    8.44 +# Convert a $build file to $host form and store it in $file
    8.45 +# Currently only supports Windows hosts. If the determined conversion
    8.46 +# type is listed in (the comma separated) LAZY, no conversion will
    8.47 +# take place.
    8.48 +func_file_conv ()
    8.49 +{
    8.50 +  file=$1
    8.51 +  case $file in
    8.52 +    / | /[!/]*) # absolute file, and not a UNC file
    8.53 +      if test -z "$file_conv"; then
    8.54 +	# lazily determine how to convert abs files
    8.55 +	case `uname -s` in
    8.56 +	  MINGW*)
    8.57 +	    file_conv=mingw
    8.58 +	    ;;
    8.59 +	  CYGWIN*)
    8.60 +	    file_conv=cygwin
    8.61 +	    ;;
    8.62 +	  *)
    8.63 +	    file_conv=wine
    8.64 +	    ;;
    8.65 +	esac
    8.66 +      fi
    8.67 +      case $file_conv/,$2, in
    8.68 +	*,$file_conv,*)
    8.69 +	  ;;
    8.70 +	mingw/*)
    8.71 +	  file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
    8.72 +	  ;;
    8.73 +	cygwin/*)
    8.74 +	  file=`cygpath -m "$file" || echo "$file"`
    8.75 +	  ;;
    8.76 +	wine/*)
    8.77 +	  file=`winepath -w "$file" || echo "$file"`
    8.78 +	  ;;
    8.79 +      esac
    8.80 +      ;;
    8.81 +  esac
    8.82 +}
    8.83 +
    8.84 +# func_cl_dashL linkdir
    8.85 +# Make cl look for libraries in LINKDIR
    8.86 +func_cl_dashL ()
    8.87 +{
    8.88 +  func_file_conv "$1"
    8.89 +  if test -z "$lib_path"; then
    8.90 +    lib_path=$file
    8.91 +  else
    8.92 +    lib_path="$lib_path;$file"
    8.93 +  fi
    8.94 +  linker_opts="$linker_opts -LIBPATH:$file"
    8.95 +}
    8.96 +
    8.97 +# func_cl_dashl library
    8.98 +# Do a library search-path lookup for cl
    8.99 +func_cl_dashl ()
   8.100 +{
   8.101 +  lib=$1
   8.102 +  found=no
   8.103 +  save_IFS=$IFS
   8.104 +  IFS=';'
   8.105 +  for dir in $lib_path $LIB
   8.106 +  do
   8.107 +    IFS=$save_IFS
   8.108 +    if $shared && test -f "$dir/$lib.dll.lib"; then
   8.109 +      found=yes
   8.110 +      lib=$dir/$lib.dll.lib
   8.111 +      break
   8.112 +    fi
   8.113 +    if test -f "$dir/$lib.lib"; then
   8.114 +      found=yes
   8.115 +      lib=$dir/$lib.lib
   8.116 +      break
   8.117 +    fi
   8.118 +    if test -f "$dir/lib$lib.a"; then
   8.119 +      found=yes
   8.120 +      lib=$dir/lib$lib.a
   8.121 +      break
   8.122 +    fi
   8.123 +  done
   8.124 +  IFS=$save_IFS
   8.125 +
   8.126 +  if test "$found" != yes; then
   8.127 +    lib=$lib.lib
   8.128 +  fi
   8.129 +}
   8.130 +
   8.131 +# func_cl_wrapper cl arg...
   8.132 +# Adjust compile command to suit cl
   8.133 +func_cl_wrapper ()
   8.134 +{
   8.135 +  # Assume a capable shell
   8.136 +  lib_path=
   8.137 +  shared=:
   8.138 +  linker_opts=
   8.139 +  for arg
   8.140 +  do
   8.141 +    if test -n "$eat"; then
   8.142 +      eat=
   8.143 +    else
   8.144 +      case $1 in
   8.145 +	-o)
   8.146 +	  # configure might choose to run compile as 'compile cc -o foo foo.c'.
   8.147 +	  eat=1
   8.148 +	  case $2 in
   8.149 +	    *.o | *.[oO][bB][jJ])
   8.150 +	      func_file_conv "$2"
   8.151 +	      set x "$@" -Fo"$file"
   8.152 +	      shift
   8.153 +	      ;;
   8.154 +	    *)
   8.155 +	      func_file_conv "$2"
   8.156 +	      set x "$@" -Fe"$file"
   8.157 +	      shift
   8.158 +	      ;;
   8.159 +	  esac
   8.160 +	  ;;
   8.161 +	-I)
   8.162 +	  eat=1
   8.163 +	  func_file_conv "$2" mingw
   8.164 +	  set x "$@" -I"$file"
   8.165 +	  shift
   8.166 +	  ;;
   8.167 +	-I*)
   8.168 +	  func_file_conv "${1#-I}" mingw
   8.169 +	  set x "$@" -I"$file"
   8.170 +	  shift
   8.171 +	  ;;
   8.172 +	-l)
   8.173 +	  eat=1
   8.174 +	  func_cl_dashl "$2"
   8.175 +	  set x "$@" "$lib"
   8.176 +	  shift
   8.177 +	  ;;
   8.178 +	-l*)
   8.179 +	  func_cl_dashl "${1#-l}"
   8.180 +	  set x "$@" "$lib"
   8.181 +	  shift
   8.182 +	  ;;
   8.183 +	-L)
   8.184 +	  eat=1
   8.185 +	  func_cl_dashL "$2"
   8.186 +	  ;;
   8.187 +	-L*)
   8.188 +	  func_cl_dashL "${1#-L}"
   8.189 +	  ;;
   8.190 +	-static)
   8.191 +	  shared=false
   8.192 +	  ;;
   8.193 +	-Wl,*)
   8.194 +	  arg=${1#-Wl,}
   8.195 +	  save_ifs="$IFS"; IFS=','
   8.196 +	  for flag in $arg; do
   8.197 +	    IFS="$save_ifs"
   8.198 +	    linker_opts="$linker_opts $flag"
   8.199 +	  done
   8.200 +	  IFS="$save_ifs"
   8.201 +	  ;;
   8.202 +	-Xlinker)
   8.203 +	  eat=1
   8.204 +	  linker_opts="$linker_opts $2"
   8.205 +	  ;;
   8.206 +	-*)
   8.207 +	  set x "$@" "$1"
   8.208 +	  shift
   8.209 +	  ;;
   8.210 +	*.cc | *.CC | *.cxx | *.CXX | *.[cC]++)
   8.211 +	  func_file_conv "$1"
   8.212 +	  set x "$@" -Tp"$file"
   8.213 +	  shift
   8.214 +	  ;;
   8.215 +	*.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO])
   8.216 +	  func_file_conv "$1" mingw
   8.217 +	  set x "$@" "$file"
   8.218 +	  shift
   8.219 +	  ;;
   8.220 +	*)
   8.221 +	  set x "$@" "$1"
   8.222 +	  shift
   8.223 +	  ;;
   8.224 +      esac
   8.225 +    fi
   8.226 +    shift
   8.227 +  done
   8.228 +  if test -n "$linker_opts"; then
   8.229 +    linker_opts="-link$linker_opts"
   8.230 +  fi
   8.231 +  exec "$@" $linker_opts
   8.232 +  exit 1
   8.233 +}
   8.234 +
   8.235 +eat=
   8.236 +
   8.237 +case $1 in
   8.238 +  '')
   8.239 +     echo "$0: No command.  Try '$0 --help' for more information." 1>&2
   8.240 +     exit 1;
   8.241 +     ;;
   8.242 +  -h | --h*)
   8.243 +    cat <<\EOF
   8.244 +Usage: compile [--help] [--version] PROGRAM [ARGS]
   8.245 +
   8.246 +Wrapper for compilers which do not understand '-c -o'.
   8.247 +Remove '-o dest.o' from ARGS, run PROGRAM with the remaining
   8.248 +arguments, and rename the output as expected.
   8.249 +
   8.250 +If you are trying to build a whole package this is not the
   8.251 +right script to run: please start by reading the file 'INSTALL'.
   8.252 +
   8.253 +Report bugs to <bug-automake@gnu.org>.
   8.254 +EOF
   8.255 +    exit $?
   8.256 +    ;;
   8.257 +  -v | --v*)
   8.258 +    echo "compile $scriptversion"
   8.259 +    exit $?
   8.260 +    ;;
   8.261 +  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \
   8.262 +  icl | *[/\\]icl | icl.exe | *[/\\]icl.exe )
   8.263 +    func_cl_wrapper "$@"      # Doesn't return...
   8.264 +    ;;
   8.265 +esac
   8.266 +
   8.267 +ofile=
   8.268 +cfile=
   8.269 +
   8.270 +for arg
   8.271 +do
   8.272 +  if test -n "$eat"; then
   8.273 +    eat=
   8.274 +  else
   8.275 +    case $1 in
   8.276 +      -o)
   8.277 +	# configure might choose to run compile as 'compile cc -o foo foo.c'.
   8.278 +	# So we strip '-o arg' only if arg is an object.
   8.279 +	eat=1
   8.280 +	case $2 in
   8.281 +	  *.o | *.obj)
   8.282 +	    ofile=$2
   8.283 +	    ;;
   8.284 +	  *)
   8.285 +	    set x "$@" -o "$2"
   8.286 +	    shift
   8.287 +	    ;;
   8.288 +	esac
   8.289 +	;;
   8.290 +      *.c)
   8.291 +	cfile=$1
   8.292 +	set x "$@" "$1"
   8.293 +	shift
   8.294 +	;;
   8.295 +      *)
   8.296 +	set x "$@" "$1"
   8.297 +	shift
   8.298 +	;;
   8.299 +    esac
   8.300 +  fi
   8.301 +  shift
   8.302 +done
   8.303 +
   8.304 +if test -z "$ofile" || test -z "$cfile"; then
   8.305 +  # If no '-o' option was seen then we might have been invoked from a
   8.306 +  # pattern rule where we don't need one.  That is ok -- this is a
   8.307 +  # normal compilation that the losing compiler can handle.  If no
   8.308 +  # '.c' file was seen then we are probably linking.  That is also
   8.309 +  # ok.
   8.310 +  exec "$@"
   8.311 +fi
   8.312 +
   8.313 +# Name of file we expect compiler to create.
   8.314 +cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`
   8.315 +
   8.316 +# Create the lock directory.
   8.317 +# Note: use '[/\\:.-]' here to ensure that we don't use the same name
   8.318 +# that we are using for the .o file.  Also, base the name on the expected
   8.319 +# object file name, since that is what matters with a parallel build.
   8.320 +lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d
   8.321 +while true; do
   8.322 +  if mkdir "$lockdir" >/dev/null 2>&1; then
   8.323 +    break
   8.324 +  fi
   8.325 +  sleep 1
   8.326 +done
   8.327 +# FIXME: race condition here if user kills between mkdir and trap.
   8.328 +trap "rmdir '$lockdir'; exit 1" 1 2 15
   8.329 +
   8.330 +# Run the compile.
   8.331 +"$@"
   8.332 +ret=$?
   8.333 +
   8.334 +if test -f "$cofile"; then
   8.335 +  test "$cofile" = "$ofile" || mv "$cofile" "$ofile"
   8.336 +elif test -f "${cofile}bj"; then
   8.337 +  test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile"
   8.338 +fi
   8.339 +
   8.340 +rmdir "$lockdir"
   8.341 +exit $ret
   8.342 +
   8.343 +# Local Variables:
   8.344 +# mode: shell-script
   8.345 +# sh-indentation: 2
   8.346 +# eval: (add-hook 'before-save-hook 'time-stamp)
   8.347 +# time-stamp-start: "scriptversion="
   8.348 +# time-stamp-format: "%:y-%02m-%02d.%02H"
   8.349 +# time-stamp-time-zone: "UTC0"
   8.350 +# time-stamp-end: "; # UTC"
   8.351 +# End:
     9.1 --- a/external/libvorbisidec-1.2.1/config.guess	Sun Dec 01 18:50:02 2019 +0300
     9.2 +++ b/external/libvorbisidec-1.2.1/config.guess	Sun Dec 01 20:20:02 2019 +0300
     9.3 @@ -1,10 +1,8 @@
     9.4  #! /bin/sh
     9.5  # Attempt to guess a canonical system name.
     9.6 -#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
     9.7 -#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
     9.8 -#   2011, 2012, 2013 Free Software Foundation, Inc.
     9.9 +#   Copyright 1992-2019 Free Software Foundation, Inc.
    9.10  
    9.11 -timestamp='2012-12-29'
    9.12 +timestamp='2019-02-19'
    9.13  
    9.14  # This file is free software; you can redistribute it and/or modify it
    9.15  # under the terms of the GNU General Public License as published by
    9.16 @@ -17,7 +15,7 @@
    9.17  # General Public License for more details.
    9.18  #
    9.19  # You should have received a copy of the GNU General Public License
    9.20 -# along with this program; if not, see <http://www.gnu.org/licenses/>.
    9.21 +# along with this program; if not, see <https://www.gnu.org/licenses/>.
    9.22  #
    9.23  # As a special exception to the GNU General Public License, if you
    9.24  # distribute this file as part of a program that contains a
    9.25 @@ -26,12 +24,12 @@
    9.26  # program.  This Exception is an additional permission under section 7
    9.27  # of the GNU General Public License, version 3 ("GPLv3").
    9.28  #
    9.29 -# Originally written by Per Bothner. 
    9.30 +# Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
    9.31  #
    9.32  # You can get the latest version of this script from:
    9.33 -# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
    9.34 +# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
    9.35  #
    9.36 -# Please send patches with a ChangeLog entry to config-patches@gnu.org.
    9.37 +# Please send patches to <config-patches@gnu.org>.
    9.38  
    9.39  
    9.40  me=`echo "$0" | sed -e 's,.*/,,'`
    9.41 @@ -41,7 +39,7 @@
    9.42  
    9.43  Output the configuration name of the system \`$me' is run on.
    9.44  
    9.45 -Operation modes:
    9.46 +Options:
    9.47    -h, --help         print this help, then exit
    9.48    -t, --time-stamp   print date of last modification, then exit
    9.49    -v, --version      print version number, then exit
    9.50 @@ -52,9 +50,7 @@
    9.51  GNU config.guess ($timestamp)
    9.52  
    9.53  Originally written by Per Bothner.
    9.54 -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
    9.55 -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
    9.56 -2012, 2013 Free Software Foundation, Inc.
    9.57 +Copyright 1992-2019 Free Software Foundation, Inc.
    9.58  
    9.59  This is free software; see the source for copying conditions.  There is NO
    9.60  warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
    9.61 @@ -88,8 +84,6 @@
    9.62    exit 1
    9.63  fi
    9.64  
    9.65 -trap 'exit 1' 1 2 15
    9.66 -
    9.67  # CC_FOR_BUILD -- compiler used by this script. Note that the use of a
    9.68  # compiler to aid in system detection is discouraged as it requires
    9.69  # temporary files to be created and, as you can see below, it is a
    9.70 @@ -100,34 +94,38 @@
    9.71  
    9.72  # Portable tmp directory creation inspired by the Autoconf team.
    9.73  
    9.74 -set_cc_for_build='
    9.75 -trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
    9.76 -trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
    9.77 -: ${TMPDIR=/tmp} ;
    9.78 - { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
    9.79 - { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
    9.80 - { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
    9.81 - { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
    9.82 -dummy=$tmp/dummy ;
    9.83 -tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
    9.84 -case $CC_FOR_BUILD,$HOST_CC,$CC in
    9.85 - ,,)    echo "int x;" > $dummy.c ;
    9.86 -	for c in cc gcc c89 c99 ; do
    9.87 -	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
    9.88 -	     CC_FOR_BUILD="$c"; break ;
    9.89 -	  fi ;
    9.90 -	done ;
    9.91 -	if test x"$CC_FOR_BUILD" = x ; then
    9.92 -	  CC_FOR_BUILD=no_compiler_found ;
    9.93 -	fi
    9.94 -	;;
    9.95 - ,,*)   CC_FOR_BUILD=$CC ;;
    9.96 - ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
    9.97 -esac ; set_cc_for_build= ;'
    9.98 +tmp=
    9.99 +# shellcheck disable=SC2172
   9.100 +trap 'test -z "$tmp" || rm -fr "$tmp"' 0 1 2 13 15
   9.101 +
   9.102 +set_cc_for_build() {
   9.103 +    : "${TMPDIR=/tmp}"
   9.104 +    # shellcheck disable=SC2039
   9.105 +    { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
   9.106 +	{ test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir "$tmp" 2>/dev/null) ; } ||
   9.107 +	{ tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir "$tmp" 2>/dev/null) && echo "Warning: creating insecure temp directory" >&2 ; } ||
   9.108 +	{ echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; }
   9.109 +    dummy=$tmp/dummy
   9.110 +    case ${CC_FOR_BUILD-},${HOST_CC-},${CC-} in
   9.111 +	,,)    echo "int x;" > "$dummy.c"
   9.112 +	       for driver in cc gcc c89 c99 ; do
   9.113 +		   if ($driver -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then
   9.114 +		       CC_FOR_BUILD="$driver"
   9.115 +		       break
   9.116 +		   fi
   9.117 +	       done
   9.118 +	       if test x"$CC_FOR_BUILD" = x ; then
   9.119 +		   CC_FOR_BUILD=no_compiler_found
   9.120 +	       fi
   9.121 +	       ;;
   9.122 +	,,*)   CC_FOR_BUILD=$CC ;;
   9.123 +	,*,*)  CC_FOR_BUILD=$HOST_CC ;;
   9.124 +    esac
   9.125 +}
   9.126  
   9.127  # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
   9.128  # (ghazi@noc.rutgers.edu 1994-08-24)
   9.129 -if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
   9.130 +if test -f /.attbin/uname ; then
   9.131  	PATH=$PATH:/.attbin ; export PATH
   9.132  fi
   9.133  
   9.134 @@ -136,9 +134,37 @@
   9.135  UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
   9.136  UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
   9.137  
   9.138 +case "$UNAME_SYSTEM" in
   9.139 +Linux|GNU|GNU/*)
   9.140 +	# If the system lacks a compiler, then just pick glibc.
   9.141 +	# We could probably try harder.
   9.142 +	LIBC=gnu
   9.143 +
   9.144 +	set_cc_for_build
   9.145 +	cat <<-EOF > "$dummy.c"
   9.146 +	#include <features.h>
   9.147 +	#if defined(__UCLIBC__)
   9.148 +	LIBC=uclibc
   9.149 +	#elif defined(__dietlibc__)
   9.150 +	LIBC=dietlibc
   9.151 +	#else
   9.152 +	LIBC=gnu
   9.153 +	#endif
   9.154 +	EOF
   9.155 +	eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`"
   9.156 +
   9.157 +	# If ldd exists, use it to detect musl libc.
   9.158 +	if command -v ldd >/dev/null && \
   9.159 +		ldd --version 2>&1 | grep -q ^musl
   9.160 +	then
   9.161 +	    LIBC=musl
   9.162 +	fi
   9.163 +	;;
   9.164 +esac
   9.165 +
   9.166  # Note: order is significant - the case branches are not exclusive.
   9.167  
   9.168 -case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
   9.169 +case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
   9.170      *:NetBSD:*:*)
   9.171  	# NetBSD (nbsd) targets should (where applicable) match one or
   9.172  	# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
   9.173 @@ -151,21 +177,31 @@
   9.174  	# Note: NetBSD doesn't particularly care about the vendor
   9.175  	# portion of the name.  We always set it to "unknown".
   9.176  	sysctl="sysctl -n hw.machine_arch"
   9.177 -	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
   9.178 -	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
   9.179 -	case "${UNAME_MACHINE_ARCH}" in
   9.180 +	UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \
   9.181 +	    "/sbin/$sysctl" 2>/dev/null || \
   9.182 +	    "/usr/sbin/$sysctl" 2>/dev/null || \
   9.183 +	    echo unknown)`
   9.184 +	case "$UNAME_MACHINE_ARCH" in
   9.185  	    armeb) machine=armeb-unknown ;;
   9.186  	    arm*) machine=arm-unknown ;;
   9.187  	    sh3el) machine=shl-unknown ;;
   9.188  	    sh3eb) machine=sh-unknown ;;
   9.189  	    sh5el) machine=sh5le-unknown ;;
   9.190 -	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
   9.191 +	    earmv*)
   9.192 +		arch=`echo "$UNAME_MACHINE_ARCH" | sed -e 's,^e\(armv[0-9]\).*$,\1,'`
   9.193 +		endian=`echo "$UNAME_MACHINE_ARCH" | sed -ne 's,^.*\(eb\)$,\1,p'`
   9.194 +		machine="${arch}${endian}"-unknown
   9.195 +		;;
   9.196 +	    *) machine="$UNAME_MACHINE_ARCH"-unknown ;;
   9.197  	esac
   9.198  	# The Operating System including object format, if it has switched
   9.199 -	# to ELF recently, or will in the future.
   9.200 -	case "${UNAME_MACHINE_ARCH}" in
   9.201 +	# to ELF recently (or will in the future) and ABI.
   9.202 +	case "$UNAME_MACHINE_ARCH" in
   9.203 +	    earm*)
   9.204 +		os=netbsdelf
   9.205 +		;;
   9.206  	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
   9.207 -		eval $set_cc_for_build
   9.208 +		set_cc_for_build
   9.209  		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
   9.210  			| grep -q __ELF__
   9.211  		then
   9.212 @@ -180,44 +216,67 @@
   9.213  		os=netbsd
   9.214  		;;
   9.215  	esac
   9.216 +	# Determine ABI tags.
   9.217 +	case "$UNAME_MACHINE_ARCH" in
   9.218 +	    earm*)
   9.219 +		expr='s/^earmv[0-9]/-eabi/;s/eb$//'
   9.220 +		abi=`echo "$UNAME_MACHINE_ARCH" | sed -e "$expr"`
   9.221 +		;;
   9.222 +	esac
   9.223  	# The OS release
   9.224  	# Debian GNU/NetBSD machines have a different userland, and
   9.225  	# thus, need a distinct triplet. However, they do not need
   9.226  	# kernel version information, so it can be replaced with a
   9.227  	# suitable tag, in the style of linux-gnu.
   9.228 -	case "${UNAME_VERSION}" in
   9.229 +	case "$UNAME_VERSION" in
   9.230  	    Debian*)
   9.231  		release='-gnu'
   9.232  		;;
   9.233  	    *)
   9.234 -		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
   9.235 +		release=`echo "$UNAME_RELEASE" | sed -e 's/[-_].*//' | cut -d. -f1,2`
   9.236  		;;
   9.237  	esac
   9.238  	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
   9.239  	# contains redundant information, the shorter form:
   9.240  	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
   9.241 -	echo "${machine}-${os}${release}"
   9.242 +	echo "$machine-${os}${release}${abi-}"
   9.243  	exit ;;
   9.244      *:Bitrig:*:*)
   9.245  	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
   9.246 -	echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
   9.247 +	echo "$UNAME_MACHINE_ARCH"-unknown-bitrig"$UNAME_RELEASE"
   9.248  	exit ;;
   9.249      *:OpenBSD:*:*)
   9.250  	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
   9.251 -	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
   9.252 +	echo "$UNAME_MACHINE_ARCH"-unknown-openbsd"$UNAME_RELEASE"
   9.253 +	exit ;;
   9.254 +    *:LibertyBSD:*:*)
   9.255 +	UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'`
   9.256 +	echo "$UNAME_MACHINE_ARCH"-unknown-libertybsd"$UNAME_RELEASE"
   9.257 +	exit ;;
   9.258 +    *:MidnightBSD:*:*)
   9.259 +	echo "$UNAME_MACHINE"-unknown-midnightbsd"$UNAME_RELEASE"
   9.260  	exit ;;
   9.261      *:ekkoBSD:*:*)
   9.262 -	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
   9.263 +	echo "$UNAME_MACHINE"-unknown-ekkobsd"$UNAME_RELEASE"
   9.264  	exit ;;
   9.265      *:SolidBSD:*:*)
   9.266 -	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
   9.267 +	echo "$UNAME_MACHINE"-unknown-solidbsd"$UNAME_RELEASE"
   9.268  	exit ;;
   9.269      macppc:MirBSD:*:*)
   9.270 -	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
   9.271 +	echo powerpc-unknown-mirbsd"$UNAME_RELEASE"
   9.272  	exit ;;
   9.273      *:MirBSD:*:*)
   9.274 -	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
   9.275 +	echo "$UNAME_MACHINE"-unknown-mirbsd"$UNAME_RELEASE"
   9.276  	exit ;;
   9.277 +    *:Sortix:*:*)
   9.278 +	echo "$UNAME_MACHINE"-unknown-sortix
   9.279 +	exit ;;
   9.280 +    *:Redox:*:*)
   9.281 +	echo "$UNAME_MACHINE"-unknown-redox
   9.282 +	exit ;;
   9.283 +    mips:OSF1:*.*)
   9.284 +        echo mips-dec-osf1
   9.285 +        exit ;;
   9.286      alpha:OSF1:*:*)
   9.287  	case $UNAME_RELEASE in
   9.288  	*4.0)
   9.289 @@ -234,63 +293,54 @@
   9.290  	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
   9.291  	case "$ALPHA_CPU_TYPE" in
   9.292  	    "EV4 (21064)")
   9.293 -		UNAME_MACHINE="alpha" ;;
   9.294 +		UNAME_MACHINE=alpha ;;
   9.295  	    "EV4.5 (21064)")
   9.296 -		UNAME_MACHINE="alpha" ;;
   9.297 +		UNAME_MACHINE=alpha ;;
   9.298  	    "LCA4 (21066/21068)")
   9.299 -		UNAME_MACHINE="alpha" ;;
   9.300 +		UNAME_MACHINE=alpha ;;
   9.301  	    "EV5 (21164)")
   9.302 -		UNAME_MACHINE="alphaev5" ;;
   9.303 +		UNAME_MACHINE=alphaev5 ;;
   9.304  	    "EV5.6 (21164A)")
   9.305 -		UNAME_MACHINE="alphaev56" ;;
   9.306 +		UNAME_MACHINE=alphaev56 ;;
   9.307  	    "EV5.6 (21164PC)")
   9.308 -		UNAME_MACHINE="alphapca56" ;;
   9.309 +		UNAME_MACHINE=alphapca56 ;;
   9.310  	    "EV5.7 (21164PC)")
   9.311 -		UNAME_MACHINE="alphapca57" ;;
   9.312 +		UNAME_MACHINE=alphapca57 ;;
   9.313  	    "EV6 (21264)")
   9.314 -		UNAME_MACHINE="alphaev6" ;;
   9.315 +		UNAME_MACHINE=alphaev6 ;;
   9.316  	    "EV6.7 (21264A)")
   9.317 -		UNAME_MACHINE="alphaev67" ;;
   9.318 +		UNAME_MACHINE=alphaev67 ;;
   9.319  	    "EV6.8CB (21264C)")
   9.320 -		UNAME_MACHINE="alphaev68" ;;
   9.321 +		UNAME_MACHINE=alphaev68 ;;
   9.322  	    "EV6.8AL (21264B)")
   9.323 -		UNAME_MACHINE="alphaev68" ;;
   9.324 +		UNAME_MACHINE=alphaev68 ;;
   9.325  	    "EV6.8CX (21264D)")
   9.326 -		UNAME_MACHINE="alphaev68" ;;
   9.327 +		UNAME_MACHINE=alphaev68 ;;
   9.328  	    "EV6.9A (21264/EV69A)")
   9.329 -		UNAME_MACHINE="alphaev69" ;;
   9.330 +		UNAME_MACHINE=alphaev69 ;;
   9.331  	    "EV7 (21364)")
   9.332 -		UNAME_MACHINE="alphaev7" ;;
   9.333 +		UNAME_MACHINE=alphaev7 ;;
   9.334  	    "EV7.9 (21364A)")
   9.335 -		UNAME_MACHINE="alphaev79" ;;
   9.336 +		UNAME_MACHINE=alphaev79 ;;
   9.337  	esac
   9.338  	# A Pn.n version is a patched version.
   9.339  	# A Vn.n version is a released version.
   9.340  	# A Tn.n version is a released field test version.
   9.341  	# A Xn.n version is an unreleased experimental baselevel.
   9.342  	# 1.2 uses "1.2" for uname -r.
   9.343 -	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
   9.344 +	echo "$UNAME_MACHINE"-dec-osf"`echo "$UNAME_RELEASE" | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`"
   9.345  	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
   9.346  	exitcode=$?
   9.347  	trap '' 0
   9.348  	exit $exitcode ;;
   9.349 -    Alpha\ *:Windows_NT*:*)
   9.350 -	# How do we know it's Interix rather than the generic POSIX subsystem?
   9.351 -	# Should we change UNAME_MACHINE based on the output of uname instead
   9.352 -	# of the specific Alpha model?
   9.353 -	echo alpha-pc-interix
   9.354 -	exit ;;
   9.355 -    21064:Windows_NT:50:3)
   9.356 -	echo alpha-dec-winnt3.5
   9.357 -	exit ;;
   9.358      Amiga*:UNIX_System_V:4.0:*)
   9.359  	echo m68k-unknown-sysv4
   9.360  	exit ;;
   9.361      *:[Aa]miga[Oo][Ss]:*:*)
   9.362 -	echo ${UNAME_MACHINE}-unknown-amigaos
   9.363 +	echo "$UNAME_MACHINE"-unknown-amigaos
   9.364  	exit ;;
   9.365      *:[Mm]orph[Oo][Ss]:*:*)
   9.366 -	echo ${UNAME_MACHINE}-unknown-morphos
   9.367 +	echo "$UNAME_MACHINE"-unknown-morphos
   9.368  	exit ;;
   9.369      *:OS/390:*:*)
   9.370  	echo i370-ibm-openedition
   9.371 @@ -302,7 +352,7 @@
   9.372  	echo powerpc-ibm-os400
   9.373  	exit ;;
   9.374      arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
   9.375 -	echo arm-acorn-riscix${UNAME_RELEASE}
   9.376 +	echo arm-acorn-riscix"$UNAME_RELEASE"
   9.377  	exit ;;
   9.378      arm*:riscos:*:*|arm*:RISCOS:*:*)
   9.379  	echo arm-unknown-riscos
   9.380 @@ -329,38 +379,38 @@
   9.381  	    sparc) echo sparc-icl-nx7; exit ;;
   9.382  	esac ;;
   9.383      s390x:SunOS:*:*)
   9.384 -	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
   9.385 +	echo "$UNAME_MACHINE"-ibm-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`"
   9.386  	exit ;;
   9.387      sun4H:SunOS:5.*:*)
   9.388 -	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
   9.389 +	echo sparc-hal-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
   9.390  	exit ;;
   9.391      sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
   9.392 -	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
   9.393 +	echo sparc-sun-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`"
   9.394  	exit ;;
   9.395      i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
   9.396 -	echo i386-pc-auroraux${UNAME_RELEASE}
   9.397 +	echo i386-pc-auroraux"$UNAME_RELEASE"
   9.398  	exit ;;
   9.399      i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
   9.400 -	eval $set_cc_for_build
   9.401 -	SUN_ARCH="i386"
   9.402 +	set_cc_for_build
   9.403 +	SUN_ARCH=i386
   9.404  	# If there is a compiler, see if it is configured for 64-bit objects.
   9.405  	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
   9.406  	# This test works for both compilers.
   9.407 -	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
   9.408 +	if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
   9.409  	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
   9.410 -		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
   9.411 +		(CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
   9.412  		grep IS_64BIT_ARCH >/dev/null
   9.413  	    then
   9.414 -		SUN_ARCH="x86_64"
   9.415 +		SUN_ARCH=x86_64
   9.416  	    fi
   9.417  	fi
   9.418 -	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
   9.419 +	echo "$SUN_ARCH"-pc-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
   9.420  	exit ;;
   9.421      sun4*:SunOS:6*:*)
   9.422  	# According to config.sub, this is the proper way to canonicalize
   9.423  	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
   9.424  	# it's likely to be more like Solaris than SunOS4.
   9.425 -	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
   9.426 +	echo sparc-sun-solaris3"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
   9.427  	exit ;;
   9.428      sun4*:SunOS:*:*)
   9.429  	case "`/usr/bin/arch -k`" in
   9.430 @@ -369,25 +419,25 @@
   9.431  		;;
   9.432  	esac
   9.433  	# Japanese Language versions have a version number like `4.1.3-JL'.
   9.434 -	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
   9.435 +	echo sparc-sun-sunos"`echo "$UNAME_RELEASE"|sed -e 's/-/_/'`"
   9.436  	exit ;;
   9.437      sun3*:SunOS:*:*)
   9.438 -	echo m68k-sun-sunos${UNAME_RELEASE}
   9.439 +	echo m68k-sun-sunos"$UNAME_RELEASE"
   9.440  	exit ;;
   9.441      sun*:*:4.2BSD:*)
   9.442  	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
   9.443 -	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
   9.444 +	test "x$UNAME_RELEASE" = x && UNAME_RELEASE=3
   9.445  	case "`/bin/arch`" in
   9.446  	    sun3)
   9.447 -		echo m68k-sun-sunos${UNAME_RELEASE}
   9.448 +		echo m68k-sun-sunos"$UNAME_RELEASE"
   9.449  		;;
   9.450  	    sun4)
   9.451 -		echo sparc-sun-sunos${UNAME_RELEASE}
   9.452 +		echo sparc-sun-sunos"$UNAME_RELEASE"
   9.453  		;;
   9.454  	esac
   9.455  	exit ;;
   9.456      aushp:SunOS:*:*)
   9.457 -	echo sparc-auspex-sunos${UNAME_RELEASE}
   9.458 +	echo sparc-auspex-sunos"$UNAME_RELEASE"
   9.459  	exit ;;
   9.460      # The situation for MiNT is a little confusing.  The machine name
   9.461      # can be virtually everything (everything which is not
   9.462 @@ -398,44 +448,44 @@
   9.463      # MiNT.  But MiNT is downward compatible to TOS, so this should
   9.464      # be no problem.
   9.465      atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
   9.466 -	echo m68k-atari-mint${UNAME_RELEASE}
   9.467 +	echo m68k-atari-mint"$UNAME_RELEASE"
   9.468  	exit ;;
   9.469      atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
   9.470 -	echo m68k-atari-mint${UNAME_RELEASE}
   9.471 +	echo m68k-atari-mint"$UNAME_RELEASE"
   9.472  	exit ;;
   9.473      *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
   9.474 -	echo m68k-atari-mint${UNAME_RELEASE}
   9.475 +	echo m68k-atari-mint"$UNAME_RELEASE"
   9.476  	exit ;;
   9.477      milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
   9.478 -	echo m68k-milan-mint${UNAME_RELEASE}
   9.479 +	echo m68k-milan-mint"$UNAME_RELEASE"
   9.480  	exit ;;
   9.481      hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
   9.482 -	echo m68k-hades-mint${UNAME_RELEASE}
   9.483 +	echo m68k-hades-mint"$UNAME_RELEASE"
   9.484  	exit ;;
   9.485      *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
   9.486 -	echo m68k-unknown-mint${UNAME_RELEASE}
   9.487 +	echo m68k-unknown-mint"$UNAME_RELEASE"
   9.488  	exit ;;
   9.489      m68k:machten:*:*)
   9.490 -	echo m68k-apple-machten${UNAME_RELEASE}
   9.491 +	echo m68k-apple-machten"$UNAME_RELEASE"
   9.492  	exit ;;
   9.493      powerpc:machten:*:*)
   9.494 -	echo powerpc-apple-machten${UNAME_RELEASE}
   9.495 +	echo powerpc-apple-machten"$UNAME_RELEASE"
   9.496  	exit ;;
   9.497      RISC*:Mach:*:*)
   9.498  	echo mips-dec-mach_bsd4.3
   9.499  	exit ;;
   9.500      RISC*:ULTRIX:*:*)
   9.501 -	echo mips-dec-ultrix${UNAME_RELEASE}
   9.502 +	echo mips-dec-ultrix"$UNAME_RELEASE"
   9.503  	exit ;;
   9.504      VAX*:ULTRIX*:*:*)
   9.505 -	echo vax-dec-ultrix${UNAME_RELEASE}
   9.506 +	echo vax-dec-ultrix"$UNAME_RELEASE"
   9.507  	exit ;;
   9.508      2020:CLIX:*:* | 2430:CLIX:*:*)
   9.509 -	echo clipper-intergraph-clix${UNAME_RELEASE}
   9.510 +	echo clipper-intergraph-clix"$UNAME_RELEASE"
   9.511  	exit ;;
   9.512      mips:*:*:UMIPS | mips:*:*:RISCos)
   9.513 -	eval $set_cc_for_build
   9.514 -	sed 's/^	//' << EOF >$dummy.c
   9.515 +	set_cc_for_build
   9.516 +	sed 's/^	//' << EOF > "$dummy.c"
   9.517  #ifdef __cplusplus
   9.518  #include <stdio.h>  /* for printf() prototype */
   9.519  	int main (int argc, char *argv[]) {
   9.520 @@ -444,23 +494,23 @@
   9.521  #endif
   9.522  	#if defined (host_mips) && defined (MIPSEB)
   9.523  	#if defined (SYSTYPE_SYSV)
   9.524 -	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
   9.525 +	  printf ("mips-mips-riscos%ssysv\\n", argv[1]); exit (0);
   9.526  	#endif
   9.527  	#if defined (SYSTYPE_SVR4)
   9.528 -	  printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
   9.529 +	  printf ("mips-mips-riscos%ssvr4\\n", argv[1]); exit (0);
   9.530  	#endif
   9.531  	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
   9.532 -	  printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
   9.533 +	  printf ("mips-mips-riscos%sbsd\\n", argv[1]); exit (0);
   9.534  	#endif
   9.535  	#endif
   9.536  	  exit (-1);
   9.537  	}
   9.538  EOF
   9.539 -	$CC_FOR_BUILD -o $dummy $dummy.c &&
   9.540 -	  dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
   9.541 -	  SYSTEM_NAME=`$dummy $dummyarg` &&
   9.542 +	$CC_FOR_BUILD -o "$dummy" "$dummy.c" &&
   9.543 +	  dummyarg=`echo "$UNAME_RELEASE" | sed -n 's/\([0-9]*\).*/\1/p'` &&
   9.544 +	  SYSTEM_NAME=`"$dummy" "$dummyarg"` &&
   9.545  	    { echo "$SYSTEM_NAME"; exit; }
   9.546 -	echo mips-mips-riscos${UNAME_RELEASE}
   9.547 +	echo mips-mips-riscos"$UNAME_RELEASE"
   9.548  	exit ;;
   9.549      Motorola:PowerMAX_OS:*:*)
   9.550  	echo powerpc-motorola-powermax
   9.551 @@ -486,17 +536,17 @@
   9.552      AViiON:dgux:*:*)
   9.553  	# DG/UX returns AViiON for all architectures
   9.554  	UNAME_PROCESSOR=`/usr/bin/uname -p`
   9.555 -	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
   9.556 +	if [ "$UNAME_PROCESSOR" = mc88100 ] || [ "$UNAME_PROCESSOR" = mc88110 ]
   9.557  	then
   9.558 -	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
   9.559 -	       [ ${TARGET_BINARY_INTERFACE}x = x ]
   9.560 +	    if [ "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx ] || \
   9.561 +	       [ "$TARGET_BINARY_INTERFACE"x = x ]
   9.562  	    then
   9.563 -		echo m88k-dg-dgux${UNAME_RELEASE}
   9.564 +		echo m88k-dg-dgux"$UNAME_RELEASE"
   9.565  	    else
   9.566 -		echo m88k-dg-dguxbcs${UNAME_RELEASE}
   9.567 +		echo m88k-dg-dguxbcs"$UNAME_RELEASE"
   9.568  	    fi
   9.569  	else
   9.570 -	    echo i586-dg-dgux${UNAME_RELEASE}
   9.571 +	    echo i586-dg-dgux"$UNAME_RELEASE"
   9.572  	fi
   9.573  	exit ;;
   9.574      M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
   9.575 @@ -513,7 +563,7 @@
   9.576  	echo m68k-tektronix-bsd
   9.577  	exit ;;
   9.578      *:IRIX*:*:*)
   9.579 -	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
   9.580 +	echo mips-sgi-irix"`echo "$UNAME_RELEASE"|sed -e 's/-/_/g'`"
   9.581  	exit ;;
   9.582      ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
   9.583  	echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
   9.584 @@ -525,14 +575,14 @@
   9.585  	if [ -x /usr/bin/oslevel ] ; then
   9.586  		IBM_REV=`/usr/bin/oslevel`
   9.587  	else
   9.588 -		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
   9.589 +		IBM_REV="$UNAME_VERSION.$UNAME_RELEASE"
   9.590  	fi
   9.591 -	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
   9.592 +	echo "$UNAME_MACHINE"-ibm-aix"$IBM_REV"
   9.593  	exit ;;
   9.594      *:AIX:2:3)
   9.595  	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
   9.596 -		eval $set_cc_for_build
   9.597 -		sed 's/^		//' << EOF >$dummy.c
   9.598 +		set_cc_for_build
   9.599 +		sed 's/^		//' << EOF > "$dummy.c"
   9.600  		#include <sys/systemcfg.h>
   9.601  
   9.602  		main()
   9.603 @@ -543,7 +593,7 @@
   9.604  			exit(0);
   9.605  			}
   9.606  EOF
   9.607 -		if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
   9.608 +		if $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"`
   9.609  		then
   9.610  			echo "$SYSTEM_NAME"
   9.611  		else
   9.612 @@ -557,26 +607,27 @@
   9.613  	exit ;;
   9.614      *:AIX:*:[4567])
   9.615  	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
   9.616 -	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
   9.617 +	if /usr/sbin/lsattr -El "$IBM_CPU_ID" | grep ' POWER' >/dev/null 2>&1; then
   9.618  		IBM_ARCH=rs6000
   9.619  	else
   9.620  		IBM_ARCH=powerpc
   9.621  	fi
   9.622 -	if [ -x /usr/bin/oslevel ] ; then
   9.623 -		IBM_REV=`/usr/bin/oslevel`
   9.624 +	if [ -x /usr/bin/lslpp ] ; then
   9.625 +		IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc |
   9.626 +			   awk -F: '{ print $3 }' | sed s/[0-9]*$/0/`
   9.627  	else
   9.628 -		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
   9.629 +		IBM_REV="$UNAME_VERSION.$UNAME_RELEASE"
   9.630  	fi
   9.631 -	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
   9.632 +	echo "$IBM_ARCH"-ibm-aix"$IBM_REV"
   9.633  	exit ;;
   9.634      *:AIX:*:*)
   9.635  	echo rs6000-ibm-aix
   9.636  	exit ;;
   9.637 -    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
   9.638 +    ibmrt:4.4BSD:*|romp-ibm:4.4BSD:*)
   9.639  	echo romp-ibm-bsd4.4
   9.640  	exit ;;
   9.641      ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
   9.642 -	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
   9.643 +	echo romp-ibm-bsd"$UNAME_RELEASE"   # 4.3 with uname added to
   9.644  	exit ;;                             # report: romp-ibm BSD 4.3
   9.645      *:BOSX:*:*)
   9.646  	echo rs6000-bull-bosx
   9.647 @@ -591,28 +642,28 @@
   9.648  	echo m68k-hp-bsd4.4
   9.649  	exit ;;
   9.650      9000/[34678]??:HP-UX:*:*)
   9.651 -	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
   9.652 -	case "${UNAME_MACHINE}" in
   9.653 -	    9000/31? )            HP_ARCH=m68000 ;;
   9.654 -	    9000/[34]?? )         HP_ARCH=m68k ;;
   9.655 +	HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'`
   9.656 +	case "$UNAME_MACHINE" in
   9.657 +	    9000/31?)            HP_ARCH=m68000 ;;
   9.658 +	    9000/[34]??)         HP_ARCH=m68k ;;
   9.659  	    9000/[678][0-9][0-9])
   9.660  		if [ -x /usr/bin/getconf ]; then
   9.661  		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
   9.662  		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
   9.663 -		    case "${sc_cpu_version}" in
   9.664 -		      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
   9.665 -		      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
   9.666 +		    case "$sc_cpu_version" in
   9.667 +		      523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0
   9.668 +		      528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1
   9.669  		      532)                      # CPU_PA_RISC2_0
   9.670 -			case "${sc_kernel_bits}" in
   9.671 -			  32) HP_ARCH="hppa2.0n" ;;
   9.672 -			  64) HP_ARCH="hppa2.0w" ;;
   9.673 -			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
   9.674 +			case "$sc_kernel_bits" in
   9.675 +			  32) HP_ARCH=hppa2.0n ;;
   9.676 +			  64) HP_ARCH=hppa2.0w ;;
   9.677 +			  '') HP_ARCH=hppa2.0 ;;   # HP-UX 10.20
   9.678  			esac ;;
   9.679  		    esac
   9.680  		fi
   9.681 -		if [ "${HP_ARCH}" = "" ]; then
   9.682 -		    eval $set_cc_for_build
   9.683 -		    sed 's/^		//' << EOF >$dummy.c
   9.684 +		if [ "$HP_ARCH" = "" ]; then
   9.685 +		    set_cc_for_build
   9.686 +		    sed 's/^		//' << EOF > "$dummy.c"
   9.687  
   9.688  		#define _HPUX_SOURCE
   9.689  		#include <stdlib.h>
   9.690 @@ -645,13 +696,13 @@
   9.691  		    exit (0);
   9.692  		}
   9.693  EOF
   9.694 -		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
   9.695 +		    (CCOPTS="" $CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null) && HP_ARCH=`"$dummy"`
   9.696  		    test -z "$HP_ARCH" && HP_ARCH=hppa
   9.697  		fi ;;
   9.698  	esac
   9.699 -	if [ ${HP_ARCH} = "hppa2.0w" ]
   9.700 +	if [ "$HP_ARCH" = hppa2.0w ]
   9.701  	then
   9.702 -	    eval $set_cc_for_build
   9.703 +	    set_cc_for_build
   9.704  
   9.705  	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
   9.706  	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
   9.707 @@ -662,23 +713,23 @@
   9.708  	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
   9.709  	    # => hppa64-hp-hpux11.23
   9.710  
   9.711 -	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
   9.712 +	    if echo __LP64__ | (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) |
   9.713  		grep -q __LP64__
   9.714  	    then
   9.715 -		HP_ARCH="hppa2.0w"
   9.716 +		HP_ARCH=hppa2.0w
   9.717  	    else
   9.718 -		HP_ARCH="hppa64"
   9.719 +		HP_ARCH=hppa64
   9.720  	    fi
   9.721  	fi
   9.722 -	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
   9.723 +	echo "$HP_ARCH"-hp-hpux"$HPUX_REV"
   9.724  	exit ;;
   9.725      ia64:HP-UX:*:*)
   9.726 -	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
   9.727 -	echo ia64-hp-hpux${HPUX_REV}
   9.728 +	HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'`
   9.729 +	echo ia64-hp-hpux"$HPUX_REV"
   9.730  	exit ;;
   9.731      3050*:HI-UX:*:*)
   9.732 -	eval $set_cc_for_build
   9.733 -	sed 's/^	//' << EOF >$dummy.c
   9.734 +	set_cc_for_build
   9.735 +	sed 's/^	//' << EOF > "$dummy.c"
   9.736  	#include <unistd.h>
   9.737  	int
   9.738  	main ()
   9.739 @@ -703,11 +754,11 @@
   9.740  	  exit (0);
   9.741  	}
   9.742  EOF
   9.743 -	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
   9.744 +	$CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` &&
   9.745  		{ echo "$SYSTEM_NAME"; exit; }
   9.746  	echo unknown-hitachi-hiuxwe2
   9.747  	exit ;;
   9.748 -    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
   9.749 +    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:*)
   9.750  	echo hppa1.1-hp-bsd
   9.751  	exit ;;
   9.752      9000/8??:4.3bsd:*:*)
   9.753 @@ -716,7 +767,7 @@
   9.754      *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
   9.755  	echo hppa1.0-hp-mpeix
   9.756  	exit ;;
   9.757 -    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
   9.758 +    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:*)
   9.759  	echo hppa1.1-hp-osf
   9.760  	exit ;;
   9.761      hp8??:OSF1:*:*)
   9.762 @@ -724,9 +775,9 @@
   9.763  	exit ;;
   9.764      i*86:OSF1:*:*)
   9.765  	if [ -x /usr/sbin/sysversion ] ; then
   9.766 -	    echo ${UNAME_MACHINE}-unknown-osf1mk
   9.767 +	    echo "$UNAME_MACHINE"-unknown-osf1mk
   9.768  	else
   9.769 -	    echo ${UNAME_MACHINE}-unknown-osf1
   9.770 +	    echo "$UNAME_MACHINE"-unknown-osf1
   9.771  	fi
   9.772  	exit ;;
   9.773      parisc*:Lites*:*:*)
   9.774 @@ -751,127 +802,120 @@
   9.775  	echo c4-convex-bsd
   9.776  	exit ;;
   9.777      CRAY*Y-MP:*:*:*)
   9.778 -	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
   9.779 +	echo ymp-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
   9.780  	exit ;;
   9.781      CRAY*[A-Z]90:*:*:*)
   9.782 -	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
   9.783 +	echo "$UNAME_MACHINE"-cray-unicos"$UNAME_RELEASE" \
   9.784  	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
   9.785  	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
   9.786  	      -e 's/\.[^.]*$/.X/'
   9.787  	exit ;;
   9.788      CRAY*TS:*:*:*)
   9.789 -	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
   9.790 +	echo t90-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
   9.791  	exit ;;
   9.792      CRAY*T3E:*:*:*)
   9.793 -	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
   9.794 +	echo alphaev5-cray-unicosmk"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
   9.795  	exit ;;
   9.796      CRAY*SV1:*:*:*)
   9.797 -	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
   9.798 +	echo sv1-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
   9.799  	exit ;;
   9.800      *:UNICOS/mp:*:*)
   9.801 -	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
   9.802 +	echo craynv-cray-unicosmp"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
   9.803  	exit ;;
   9.804      F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
   9.805 -	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
   9.806 -	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
   9.807 -	FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
   9.808 +	FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
   9.809 +	FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
   9.810 +	FUJITSU_REL=`echo "$UNAME_RELEASE" | sed -e 's/ /_/'`
   9.811  	echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
   9.812  	exit ;;
   9.813      5000:UNIX_System_V:4.*:*)
   9.814 -	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
   9.815 -	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
   9.816 +	FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
   9.817 +	FUJITSU_REL=`echo "$UNAME_RELEASE" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'`
   9.818  	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
   9.819  	exit ;;
   9.820      i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
   9.821 -	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
   9.822 +	echo "$UNAME_MACHINE"-pc-bsdi"$UNAME_RELEASE"
   9.823  	exit ;;
   9.824      sparc*:BSD/OS:*:*)
   9.825 -	echo sparc-unknown-bsdi${UNAME_RELEASE}
   9.826 +	echo sparc-unknown-bsdi"$UNAME_RELEASE"
   9.827  	exit ;;
   9.828      *:BSD/OS:*:*)
   9.829 -	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
   9.830 +	echo "$UNAME_MACHINE"-unknown-bsdi"$UNAME_RELEASE"
   9.831 +	exit ;;
   9.832 +    arm:FreeBSD:*:*)
   9.833 +	UNAME_PROCESSOR=`uname -p`
   9.834 +	set_cc_for_build
   9.835 +	if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
   9.836 +	    | grep -q __ARM_PCS_VFP
   9.837 +	then
   9.838 +	    echo "${UNAME_PROCESSOR}"-unknown-freebsd"`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`"-gnueabi
   9.839 +	else
   9.840 +	    echo "${UNAME_PROCESSOR}"-unknown-freebsd"`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`"-gnueabihf
   9.841 +	fi
   9.842  	exit ;;
   9.843      *:FreeBSD:*:*)
   9.844  	UNAME_PROCESSOR=`/usr/bin/uname -p`
   9.845 -	case ${UNAME_PROCESSOR} in
   9.846 +	case "$UNAME_PROCESSOR" in
   9.847  	    amd64)
   9.848 -		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
   9.849 -	    *)
   9.850 -		echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
   9.851 +		UNAME_PROCESSOR=x86_64 ;;
   9.852 +	    i386)
   9.853 +		UNAME_PROCESSOR=i586 ;;
   9.854  	esac
   9.855 +	echo "$UNAME_PROCESSOR"-unknown-freebsd"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`"
   9.856  	exit ;;
   9.857      i*:CYGWIN*:*)
   9.858 -	echo ${UNAME_MACHINE}-pc-cygwin
   9.859 +	echo "$UNAME_MACHINE"-pc-cygwin
   9.860  	exit ;;
   9.861      *:MINGW64*:*)
   9.862 -	echo ${UNAME_MACHINE}-pc-mingw64
   9.863 +	echo "$UNAME_MACHINE"-pc-mingw64
   9.864  	exit ;;
   9.865      *:MINGW*:*)
   9.866 -	echo ${UNAME_MACHINE}-pc-mingw32
   9.867 +	echo "$UNAME_MACHINE"-pc-mingw32
   9.868  	exit ;;
   9.869 -    i*:MSYS*:*)
   9.870 -	echo ${UNAME_MACHINE}-pc-msys
   9.871 -	exit ;;
   9.872 -    i*:windows32*:*)
   9.873 -	# uname -m includes "-pc" on this system.
   9.874 -	echo ${UNAME_MACHINE}-mingw32
   9.875 +    *:MSYS*:*)
   9.876 +	echo "$UNAME_MACHINE"-pc-msys
   9.877  	exit ;;
   9.878      i*:PW*:*)
   9.879 -	echo ${UNAME_MACHINE}-pc-pw32
   9.880 +	echo "$UNAME_MACHINE"-pc-pw32
   9.881  	exit ;;
   9.882      *:Interix*:*)
   9.883 -	case ${UNAME_MACHINE} in
   9.884 +	case "$UNAME_MACHINE" in
   9.885  	    x86)
   9.886 -		echo i586-pc-interix${UNAME_RELEASE}
   9.887 +		echo i586-pc-interix"$UNAME_RELEASE"
   9.888  		exit ;;
   9.889  	    authenticamd | genuineintel | EM64T)
   9.890 -		echo x86_64-unknown-interix${UNAME_RELEASE}
   9.891 +		echo x86_64-unknown-interix"$UNAME_RELEASE"
   9.892  		exit ;;
   9.893  	    IA64)
   9.894 -		echo ia64-unknown-interix${UNAME_RELEASE}
   9.895 +		echo ia64-unknown-interix"$UNAME_RELEASE"
   9.896  		exit ;;
   9.897  	esac ;;
   9.898 -    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
   9.899 -	echo i${UNAME_MACHINE}-pc-mks
   9.900 -	exit ;;
   9.901 -    8664:Windows_NT:*)
   9.902 -	echo x86_64-pc-mks
   9.903 -	exit ;;
   9.904 -    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
   9.905 -	# How do we know it's Interix rather than the generic POSIX subsystem?
   9.906 -	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
   9.907 -	# UNAME_MACHINE based on the output of uname instead of i386?
   9.908 -	echo i586-pc-interix
   9.909 -	exit ;;
   9.910      i*:UWIN*:*)
   9.911 -	echo ${UNAME_MACHINE}-pc-uwin
   9.912 +	echo "$UNAME_MACHINE"-pc-uwin
   9.913  	exit ;;
   9.914      amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
   9.915 -	echo x86_64-unknown-cygwin
   9.916 -	exit ;;
   9.917 -    p*:CYGWIN*:*)
   9.918 -	echo powerpcle-unknown-cygwin
   9.919 +	echo x86_64-pc-cygwin
   9.920  	exit ;;
   9.921      prep*:SunOS:5.*:*)
   9.922 -	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
   9.923 +	echo powerpcle-unknown-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
   9.924  	exit ;;
   9.925      *:GNU:*:*)
   9.926  	# the GNU system
   9.927 -	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
   9.928 +	echo "`echo "$UNAME_MACHINE"|sed -e 's,[-/].*$,,'`-unknown-$LIBC`echo "$UNAME_RELEASE"|sed -e 's,/.*$,,'`"
   9.929  	exit ;;
   9.930      *:GNU/*:*:*)
   9.931  	# other systems with GNU libc and userland
   9.932 -	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
   9.933 +	echo "$UNAME_MACHINE-unknown-`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`-$LIBC"
   9.934  	exit ;;
   9.935 -    i*86:Minix:*:*)
   9.936 -	echo ${UNAME_MACHINE}-pc-minix
   9.937 +    *:Minix:*:*)
   9.938 +	echo "$UNAME_MACHINE"-unknown-minix
   9.939  	exit ;;
   9.940      aarch64:Linux:*:*)
   9.941 -	echo ${UNAME_MACHINE}-unknown-linux-gnu
   9.942 +	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
   9.943  	exit ;;
   9.944      aarch64_be:Linux:*:*)
   9.945  	UNAME_MACHINE=aarch64_be
   9.946 -	echo ${UNAME_MACHINE}-unknown-linux-gnu
   9.947 +	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
   9.948  	exit ;;
   9.949      alpha:Linux:*:*)
   9.950  	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
   9.951 @@ -884,63 +928,64 @@
   9.952  	  EV68*) UNAME_MACHINE=alphaev68 ;;
   9.953  	esac
   9.954  	objdump --private-headers /bin/sh | grep -q ld.so.1
   9.955 -	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
   9.956 -	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
   9.957 +	if test "$?" = 0 ; then LIBC=gnulibc1 ; fi
   9.958 +	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
   9.959 +	exit ;;
   9.960 +    arc:Linux:*:* | arceb:Linux:*:*)
   9.961 +	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
   9.962  	exit ;;
   9.963      arm*:Linux:*:*)
   9.964 -	eval $set_cc_for_build
   9.965 +	set_cc_for_build
   9.966  	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
   9.967  	    | grep -q __ARM_EABI__
   9.968  	then
   9.969 -	    echo ${UNAME_MACHINE}-unknown-linux-gnu
   9.970 +	    echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
   9.971  	else
   9.972  	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
   9.973  		| grep -q __ARM_PCS_VFP
   9.974  	    then
   9.975 -		echo ${UNAME_MACHINE}-unknown-linux-gnueabi
   9.976 +		echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabi
   9.977  	    else
   9.978 -		echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
   9.979 +		echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabihf
   9.980  	    fi
   9.981  	fi
   9.982  	exit ;;
   9.983      avr32*:Linux:*:*)
   9.984 -	echo ${UNAME_MACHINE}-unknown-linux-gnu
   9.985 +	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
   9.986  	exit ;;
   9.987      cris:Linux:*:*)
   9.988 -	echo ${UNAME_MACHINE}-axis-linux-gnu
   9.989 +	echo "$UNAME_MACHINE"-axis-linux-"$LIBC"
   9.990  	exit ;;
   9.991      crisv32:Linux:*:*)
   9.992 -	echo ${UNAME_MACHINE}-axis-linux-gnu
   9.993 +	echo "$UNAME_MACHINE"-axis-linux-"$LIBC"
   9.994 +	exit ;;
   9.995 +    e2k:Linux:*:*)
   9.996 +	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
   9.997  	exit ;;
   9.998      frv:Linux:*:*)
   9.999 -	echo ${UNAME_MACHINE}-unknown-linux-gnu
  9.1000 +	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
  9.1001  	exit ;;
  9.1002      hexagon:Linux:*:*)
  9.1003 -	echo ${UNAME_MACHINE}-unknown-linux-gnu
  9.1004 +	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
  9.1005  	exit ;;
  9.1006      i*86:Linux:*:*)
  9.1007 -	LIBC=gnu
  9.1008 -	eval $set_cc_for_build
  9.1009 -	sed 's/^	//' << EOF >$dummy.c
  9.1010 -	#ifdef __dietlibc__
  9.1011 -	LIBC=dietlibc
  9.1012 -	#endif
  9.1013 -EOF
  9.1014 -	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
  9.1015 -	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
  9.1016 +	echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
  9.1017  	exit ;;
  9.1018      ia64:Linux:*:*)
  9.1019 -	echo ${UNAME_MACHINE}-unknown-linux-gnu
  9.1020 +	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
  9.1021 +	exit ;;
  9.1022 +    k1om:Linux:*:*)
  9.1023 +	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
  9.1024  	exit ;;
  9.1025      m32r*:Linux:*:*)
  9.1026 -	echo ${UNAME_MACHINE}-unknown-linux-gnu
  9.1027 +	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
  9.1028  	exit ;;
  9.1029      m68*:Linux:*:*)
  9.1030 -	echo ${UNAME_MACHINE}-unknown-linux-gnu
  9.1031 +	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
  9.1032  	exit ;;
  9.1033      mips:Linux:*:* | mips64:Linux:*:*)
  9.1034 -	eval $set_cc_for_build
  9.1035 -	sed 's/^	//' << EOF >$dummy.c
  9.1036 +	set_cc_for_build
  9.1037 +	sed 's/^	//' << EOF > "$dummy.c"
  9.1038  	#undef CPU
  9.1039  	#undef ${UNAME_MACHINE}
  9.1040  	#undef ${UNAME_MACHINE}el
  9.1041 @@ -954,55 +999,70 @@
  9.1042  	#endif
  9.1043  	#endif
  9.1044  EOF
  9.1045 -	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
  9.1046 -	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
  9.1047 +	eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU'`"
  9.1048 +	test "x$CPU" != x && { echo "$CPU-unknown-linux-$LIBC"; exit; }
  9.1049  	;;
  9.1050 -    or32:Linux:*:*)
  9.1051 -	echo ${UNAME_MACHINE}-unknown-linux-gnu
  9.1052 +    mips64el:Linux:*:*)
  9.1053 +	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
  9.1054 +	exit ;;
  9.1055 +    openrisc*:Linux:*:*)
  9.1056 +	echo or1k-unknown-linux-"$LIBC"
  9.1057 +	exit ;;
  9.1058 +    or32:Linux:*:* | or1k*:Linux:*:*)
  9.1059 +	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
  9.1060  	exit ;;
  9.1061      padre:Linux:*:*)
  9.1062 -	echo sparc-unknown-linux-gnu
  9.1063 +	echo sparc-unknown-linux-"$LIBC"
  9.1064  	exit ;;
  9.1065      parisc64:Linux:*:* | hppa64:Linux:*:*)
  9.1066 -	echo hppa64-unknown-linux-gnu
  9.1067 +	echo hppa64-unknown-linux-"$LIBC"
  9.1068  	exit ;;
  9.1069      parisc:Linux:*:* | hppa:Linux:*:*)
  9.1070  	# Look for CPU level
  9.1071  	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
  9.1072 -	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
  9.1073 -	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
  9.1074 -	  *)    echo hppa-unknown-linux-gnu ;;
  9.1075 +	  PA7*) echo hppa1.1-unknown-linux-"$LIBC" ;;
  9.1076 +	  PA8*) echo hppa2.0-unknown-linux-"$LIBC" ;;
  9.1077 +	  *)    echo hppa-unknown-linux-"$LIBC" ;;
  9.1078  	esac
  9.1079  	exit ;;
  9.1080      ppc64:Linux:*:*)
  9.1081 -	echo powerpc64-unknown-linux-gnu
  9.1082 +	echo powerpc64-unknown-linux-"$LIBC"
  9.1083  	exit ;;
  9.1084      ppc:Linux:*:*)
  9.1085 -	echo powerpc-unknown-linux-gnu
  9.1086 +	echo powerpc-unknown-linux-"$LIBC"
  9.1087 +	exit ;;
  9.1088 +    ppc64le:Linux:*:*)
  9.1089 +	echo powerpc64le-unknown-linux-"$LIBC"
  9.1090 +	exit ;;
  9.1091 +    ppcle:Linux:*:*)
  9.1092 +	echo powerpcle-unknown-linux-"$LIBC"
  9.1093 +	exit ;;
  9.1094 +    riscv32:Linux:*:* | riscv64:Linux:*:*)
  9.1095 +	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
  9.1096  	exit ;;
  9.1097      s390:Linux:*:* | s390x:Linux:*:*)
  9.1098 -	echo ${UNAME_MACHINE}-ibm-linux
  9.1099 +	echo "$UNAME_MACHINE"-ibm-linux-"$LIBC"
  9.1100  	exit ;;
  9.1101      sh64*:Linux:*:*)
  9.1102 -	echo ${UNAME_MACHINE}-unknown-linux-gnu
  9.1103 +	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
  9.1104  	exit ;;
  9.1105      sh*:Linux:*:*)
  9.1106 -	echo ${UNAME_MACHINE}-unknown-linux-gnu
  9.1107 +	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
  9.1108  	exit ;;
  9.1109      sparc:Linux:*:* | sparc64:Linux:*:*)
  9.1110 -	echo ${UNAME_MACHINE}-unknown-linux-gnu
  9.1111 +	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
  9.1112  	exit ;;
  9.1113      tile*:Linux:*:*)
  9.1114 -	echo ${UNAME_MACHINE}-unknown-linux-gnu
  9.1115 +	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
  9.1116  	exit ;;
  9.1117      vax:Linux:*:*)
  9.1118 -	echo ${UNAME_MACHINE}-dec-linux-gnu
  9.1119 +	echo "$UNAME_MACHINE"-dec-linux-"$LIBC"
  9.1120  	exit ;;
  9.1121      x86_64:Linux:*:*)
  9.1122 -	echo ${UNAME_MACHINE}-unknown-linux-gnu
  9.1123 +	echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
  9.1124  	exit ;;
  9.1125      xtensa*:Linux:*:*)
  9.1126 -	echo ${UNAME_MACHINE}-unknown-linux-gnu
  9.1127 +	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
  9.1128  	exit ;;
  9.1129      i*86:DYNIX/ptx:4*:*)
  9.1130  	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
  9.1131 @@ -1016,34 +1076,34 @@
  9.1132  	# I am not positive that other SVR4 systems won't match this,
  9.1133  	# I just have to hope.  -- rms.
  9.1134  	# Use sysv4.2uw... so that sysv4* matches it.
  9.1135 -	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
  9.1136 +	echo "$UNAME_MACHINE"-pc-sysv4.2uw"$UNAME_VERSION"
  9.1137  	exit ;;
  9.1138      i*86:OS/2:*:*)
  9.1139  	# If we were able to find `uname', then EMX Unix compatibility
  9.1140  	# is probably installed.
  9.1141 -	echo ${UNAME_MACHINE}-pc-os2-emx
  9.1142 +	echo "$UNAME_MACHINE"-pc-os2-emx
  9.1143  	exit ;;
  9.1144      i*86:XTS-300:*:STOP)
  9.1145 -	echo ${UNAME_MACHINE}-unknown-stop
  9.1146 +	echo "$UNAME_MACHINE"-unknown-stop
  9.1147  	exit ;;
  9.1148      i*86:atheos:*:*)
  9.1149 -	echo ${UNAME_MACHINE}-unknown-atheos
  9.1150 +	echo "$UNAME_MACHINE"-unknown-atheos
  9.1151  	exit ;;
  9.1152      i*86:syllable:*:*)
  9.1153 -	echo ${UNAME_MACHINE}-pc-syllable
  9.1154 +	echo "$UNAME_MACHINE"-pc-syllable
  9.1155  	exit ;;
  9.1156      i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
  9.1157 -	echo i386-unknown-lynxos${UNAME_RELEASE}
  9.1158 +	echo i386-unknown-lynxos"$UNAME_RELEASE"
  9.1159  	exit ;;
  9.1160      i*86:*DOS:*:*)
  9.1161 -	echo ${UNAME_MACHINE}-pc-msdosdjgpp
  9.1162 +	echo "$UNAME_MACHINE"-pc-msdosdjgpp
  9.1163  	exit ;;
  9.1164 -    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
  9.1165 -	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
  9.1166 +    i*86:*:4.*:*)
  9.1167 +	UNAME_REL=`echo "$UNAME_RELEASE" | sed 's/\/MP$//'`
  9.1168  	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
  9.1169 -		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
  9.1170 +		echo "$UNAME_MACHINE"-univel-sysv"$UNAME_REL"
  9.1171  	else
  9.1172 -		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
  9.1173 +		echo "$UNAME_MACHINE"-pc-sysv"$UNAME_REL"
  9.1174  	fi
  9.1175  	exit ;;
  9.1176      i*86:*:5:[678]*)
  9.1177 @@ -1053,12 +1113,12 @@
  9.1178  	    *Pentium)	     UNAME_MACHINE=i586 ;;
  9.1179  	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
  9.1180  	esac
  9.1181 -	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
  9.1182 +	echo "$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}"
  9.1183  	exit ;;
  9.1184      i*86:*:3.2:*)
  9.1185  	if test -f /usr/options/cb.name; then
  9.1186  		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
  9.1187 -		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
  9.1188 +		echo "$UNAME_MACHINE"-pc-isc"$UNAME_REL"
  9.1189  	elif /bin/uname -X 2>/dev/null >/dev/null ; then
  9.1190  		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
  9.1191  		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
  9.1192 @@ -1068,9 +1128,9 @@
  9.1193  			&& UNAME_MACHINE=i686
  9.1194  		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
  9.1195  			&& UNAME_MACHINE=i686
  9.1196 -		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
  9.1197 +		echo "$UNAME_MACHINE"-pc-sco"$UNAME_REL"
  9.1198  	else
  9.1199 -		echo ${UNAME_MACHINE}-pc-sysv32
  9.1200 +		echo "$UNAME_MACHINE"-pc-sysv32
  9.1201  	fi
  9.1202  	exit ;;
  9.1203      pc:*:*:*)
  9.1204 @@ -1078,7 +1138,7 @@
  9.1205  	# uname -m prints for DJGPP always 'pc', but it prints nothing about
  9.1206  	# the processor, so we play safe by assuming i586.
  9.1207  	# Note: whatever this is, it MUST be the same as what config.sub
  9.1208 -	# prints for the "djgpp" host, or else GDB configury will decide that
  9.1209 +	# prints for the "djgpp" host, or else GDB configure will decide that
  9.1210  	# this is a cross-build.
  9.1211  	echo i586-pc-msdosdjgpp
  9.1212  	exit ;;
  9.1213 @@ -1090,9 +1150,9 @@
  9.1214  	exit ;;
  9.1215      i860:*:4.*:*) # i860-SVR4
  9.1216  	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
  9.1217 -	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
  9.1218 +	  echo i860-stardent-sysv"$UNAME_RELEASE" # Stardent Vistra i860-SVR4
  9.1219  	else # Add other i860-SVR4 vendors below as they are discovered.
  9.1220 -	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
  9.1221 +	  echo i860-unknown-sysv"$UNAME_RELEASE"  # Unknown i860-SVR4
  9.1222  	fi
  9.1223  	exit ;;
  9.1224      mini*:CTIX:SYS*5:*)
  9.1225 @@ -1112,9 +1172,9 @@
  9.1226  	test -r /etc/.relid \
  9.1227  	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
  9.1228  	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
  9.1229 -	  && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
  9.1230 +	  && { echo i486-ncr-sysv4.3"$OS_REL"; exit; }
  9.1231  	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
  9.1232 -	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
  9.1233 +	  && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;;
  9.1234      3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
  9.1235  	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
  9.1236  	  && { echo i486-ncr-sysv4; exit; } ;;
  9.1237 @@ -1123,28 +1183,28 @@
  9.1238  	test -r /etc/.relid \
  9.1239  	    && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
  9.1240  	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
  9.1241 -	    && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
  9.1242 +	    && { echo i486-ncr-sysv4.3"$OS_REL"; exit; }
  9.1243  	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
  9.1244 -	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
  9.1245 +	    && { echo i586-ncr-sysv4.3"$OS_REL"; exit; }
  9.1246  	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
  9.1247 -	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
  9.1248 +	    && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;;
  9.1249      m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
  9.1250 -	echo m68k-unknown-lynxos${UNAME_RELEASE}
  9.1251 +	echo m68k-unknown-lynxos"$UNAME_RELEASE"
  9.1252  	exit ;;
  9.1253      mc68030:UNIX_System_V:4.*:*)
  9.1254  	echo m68k-atari-sysv4
  9.1255  	exit ;;
  9.1256      TSUNAMI:LynxOS:2.*:*)
  9.1257 -	echo sparc-unknown-lynxos${UNAME_RELEASE}
  9.1258 +	echo sparc-unknown-lynxos"$UNAME_RELEASE"
  9.1259  	exit ;;
  9.1260      rs6000:LynxOS:2.*:*)
  9.1261 -	echo rs6000-unknown-lynxos${UNAME_RELEASE}
  9.1262 +	echo rs6000-unknown-lynxos"$UNAME_RELEASE"
  9.1263  	exit ;;
  9.1264      PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
  9.1265 -	echo powerpc-unknown-lynxos${UNAME_RELEASE}
  9.1266 +	echo powerpc-unknown-lynxos"$UNAME_RELEASE"
  9.1267  	exit ;;
  9.1268      SM[BE]S:UNIX_SV:*:*)
  9.1269 -	echo mips-dde-sysv${UNAME_RELEASE}
  9.1270 +	echo mips-dde-sysv"$UNAME_RELEASE"
  9.1271  	exit ;;
  9.1272      RM*:ReliantUNIX-*:*:*)
  9.1273  	echo mips-sni-sysv4
  9.1274 @@ -1155,7 +1215,7 @@
  9.1275      *:SINIX-*:*:*)
  9.1276  	if uname -p 2>/dev/null >/dev/null ; then
  9.1277  		UNAME_MACHINE=`(uname -p) 2>/dev/null`
  9.1278 -		echo ${UNAME_MACHINE}-sni-sysv4
  9.1279 +		echo "$UNAME_MACHINE"-sni-sysv4
  9.1280  	else
  9.1281  		echo ns32k-sni-sysv
  9.1282  	fi
  9.1283 @@ -1175,23 +1235,23 @@
  9.1284  	exit ;;
  9.1285      i*86:VOS:*:*)
  9.1286  	# From Paul.Green@stratus.com.
  9.1287 -	echo ${UNAME_MACHINE}-stratus-vos
  9.1288 +	echo "$UNAME_MACHINE"-stratus-vos
  9.1289  	exit ;;
  9.1290      *:VOS:*:*)
  9.1291  	# From Paul.Green@stratus.com.
  9.1292  	echo hppa1.1-stratus-vos
  9.1293  	exit ;;
  9.1294      mc68*:A/UX:*:*)
  9.1295 -	echo m68k-apple-aux${UNAME_RELEASE}
  9.1296 +	echo m68k-apple-aux"$UNAME_RELEASE"
  9.1297  	exit ;;
  9.1298      news*:NEWS-OS:6*:*)
  9.1299  	echo mips-sony-newsos6
  9.1300  	exit ;;
  9.1301      R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
  9.1302  	if [ -d /usr/nec ]; then
  9.1303 -		echo mips-nec-sysv${UNAME_RELEASE}
  9.1304 +		echo mips-nec-sysv"$UNAME_RELEASE"
  9.1305  	else
  9.1306 -		echo mips-unknown-sysv${UNAME_RELEASE}
  9.1307 +		echo mips-unknown-sysv"$UNAME_RELEASE"
  9.1308  	fi
  9.1309  	exit ;;
  9.1310      BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
  9.1311 @@ -1210,65 +1270,93 @@
  9.1312  	echo x86_64-unknown-haiku
  9.1313  	exit ;;
  9.1314      SX-4:SUPER-UX:*:*)
  9.1315 -	echo sx4-nec-superux${UNAME_RELEASE}
  9.1316 +	echo sx4-nec-superux"$UNAME_RELEASE"
  9.1317  	exit ;;
  9.1318      SX-5:SUPER-UX:*:*)
  9.1319 -	echo sx5-nec-superux${UNAME_RELEASE}
  9.1320 +	echo sx5-nec-superux"$UNAME_RELEASE"
  9.1321  	exit ;;
  9.1322      SX-6:SUPER-UX:*:*)
  9.1323 -	echo sx6-nec-superux${UNAME_RELEASE}
  9.1324 +	echo sx6-nec-superux"$UNAME_RELEASE"
  9.1325  	exit ;;
  9.1326      SX-7:SUPER-UX:*:*)
  9.1327 -	echo sx7-nec-superux${UNAME_RELEASE}
  9.1328 +	echo sx7-nec-superux"$UNAME_RELEASE"
  9.1329  	exit ;;
  9.1330      SX-8:SUPER-UX:*:*)
  9.1331 -	echo sx8-nec-superux${UNAME_RELEASE}
  9.1332 +	echo sx8-nec-superux"$UNAME_RELEASE"
  9.1333  	exit ;;
  9.1334      SX-8R:SUPER-UX:*:*)
  9.1335 -	echo sx8r-nec-superux${UNAME_RELEASE}
  9.1336 +	echo sx8r-nec-superux"$UNAME_RELEASE"
  9.1337 +	exit ;;
  9.1338 +    SX-ACE:SUPER-UX:*:*)
  9.1339 +	echo sxace-nec-superux"$UNAME_RELEASE"
  9.1340  	exit ;;
  9.1341      Power*:Rhapsody:*:*)
  9.1342 -	echo powerpc-apple-rhapsody${UNAME_RELEASE}
  9.1343 +	echo powerpc-apple-rhapsody"$UNAME_RELEASE"
  9.1344  	exit ;;
  9.1345      *:Rhapsody:*:*)
  9.1346 -	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
  9.1347 +	echo "$UNAME_MACHINE"-apple-rhapsody"$UNAME_RELEASE"
  9.1348  	exit ;;
  9.1349      *:Darwin:*:*)
  9.1350  	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
  9.1351 -	case $UNAME_PROCESSOR in
  9.1352 -	    i386)
  9.1353 -		eval $set_cc_for_build
  9.1354 -		if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
  9.1355 -		  if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
  9.1356 -		      (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
  9.1357 -		      grep IS_64BIT_ARCH >/dev/null
  9.1358 -		  then
  9.1359 -		      UNAME_PROCESSOR="x86_64"
  9.1360 -		  fi
  9.1361 -		fi ;;
  9.1362 -	    unknown) UNAME_PROCESSOR=powerpc ;;
  9.1363 -	esac
  9.1364 -	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
  9.1365 +	set_cc_for_build
  9.1366 +	if test "$UNAME_PROCESSOR" = unknown ; then
  9.1367 +	    UNAME_PROCESSOR=powerpc
  9.1368 +	fi
  9.1369 +	if test "`echo "$UNAME_RELEASE" | sed -e 's/\..*//'`" -le 10 ; then
  9.1370 +	    if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
  9.1371 +		if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
  9.1372 +		       (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
  9.1373 +		       grep IS_64BIT_ARCH >/dev/null
  9.1374 +		then
  9.1375 +		    case $UNAME_PROCESSOR in
  9.1376 +			i386) UNAME_PROCESSOR=x86_64 ;;
  9.1377 +			powerpc) UNAME_PROCESSOR=powerpc64 ;;
  9.1378 +		    esac
  9.1379 +		fi
  9.1380 +		# On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc
  9.1381 +		if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') | \
  9.1382 +		       (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
  9.1383 +		       grep IS_PPC >/dev/null
  9.1384 +		then
  9.1385 +		    UNAME_PROCESSOR=powerpc
  9.1386 +		fi
  9.1387 +	    fi
  9.1388 +	elif test "$UNAME_PROCESSOR" = i386 ; then
  9.1389 +	    # Avoid executing cc on OS X 10.9, as it ships with a stub
  9.1390 +	    # that puts up a graphical alert prompting to install
  9.1391 +	    # developer tools.  Any system running Mac OS X 10.7 or
  9.1392 +	    # later (Darwin 11 and later) is required to have a 64-bit
  9.1393 +	    # processor. This is not true of the ARM version of Darwin
  9.1394 +	    # that Apple uses in portable devices.
  9.1395 +	    UNAME_PROCESSOR=x86_64
  9.1396 +	fi
  9.1397 +	echo "$UNAME_PROCESSOR"-apple-darwin"$UNAME_RELEASE"
  9.1398  	exit ;;
  9.1399      *:procnto*:*:* | *:QNX:[0123456789]*:*)
  9.1400  	UNAME_PROCESSOR=`uname -p`
  9.1401 -	if test "$UNAME_PROCESSOR" = "x86"; then
  9.1402 +	if test "$UNAME_PROCESSOR" = x86; then
  9.1403  		UNAME_PROCESSOR=i386
  9.1404  		UNAME_MACHINE=pc
  9.1405  	fi
  9.1406 -	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
  9.1407 +	echo "$UNAME_PROCESSOR"-"$UNAME_MACHINE"-nto-qnx"$UNAME_RELEASE"
  9.1408  	exit ;;
  9.1409      *:QNX:*:4*)
  9.1410  	echo i386-pc-qnx
  9.1411  	exit ;;
  9.1412 -    NEO-?:NONSTOP_KERNEL:*:*)
  9.1413 -	echo neo-tandem-nsk${UNAME_RELEASE}
  9.1414 +    NEO-*:NONSTOP_KERNEL:*:*)
  9.1415 +	echo neo-tandem-nsk"$UNAME_RELEASE"
  9.1416  	exit ;;
  9.1417      NSE-*:NONSTOP_KERNEL:*:*)
  9.1418 -	echo nse-tandem-nsk${UNAME_RELEASE}
  9.1419 +	echo nse-tandem-nsk"$UNAME_RELEASE"
  9.1420  	exit ;;
  9.1421 -    NSR-?:NONSTOP_KERNEL:*:*)
  9.1422 -	echo nsr-tandem-nsk${UNAME_RELEASE}
  9.1423 +    NSR-*:NONSTOP_KERNEL:*:*)
  9.1424 +	echo nsr-tandem-nsk"$UNAME_RELEASE"
  9.1425 +	exit ;;
  9.1426 +    NSV-*:NONSTOP_KERNEL:*:*)
  9.1427 +	echo nsv-tandem-nsk"$UNAME_RELEASE"
  9.1428 +	exit ;;
  9.1429 +    NSX-*:NONSTOP_KERNEL:*:*)
  9.1430 +	echo nsx-tandem-nsk"$UNAME_RELEASE"
  9.1431  	exit ;;
  9.1432      *:NonStop-UX:*:*)
  9.1433  	echo mips-compaq-nonstopux
  9.1434 @@ -1277,18 +1365,19 @@
  9.1435  	echo bs2000-siemens-sysv
  9.1436  	exit ;;
  9.1437      DS/*:UNIX_System_V:*:*)
  9.1438 -	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
  9.1439 +	echo "$UNAME_MACHINE"-"$UNAME_SYSTEM"-"$UNAME_RELEASE"
  9.1440  	exit ;;
  9.1441      *:Plan9:*:*)
  9.1442  	# "uname -m" is not consistent, so use $cputype instead. 386
  9.1443  	# is converted to i386 for consistency with other x86
  9.1444  	# operating systems.
  9.1445 -	if test "$cputype" = "386"; then
  9.1446 +	# shellcheck disable=SC2154
  9.1447 +	if test "$cputype" = 386; then
  9.1448  	    UNAME_MACHINE=i386
  9.1449  	else
  9.1450  	    UNAME_MACHINE="$cputype"
  9.1451  	fi
  9.1452 -	echo ${UNAME_MACHINE}-unknown-plan9
  9.1453 +	echo "$UNAME_MACHINE"-unknown-plan9
  9.1454  	exit ;;
  9.1455      *:TOPS-10:*:*)
  9.1456  	echo pdp10-unknown-tops10
  9.1457 @@ -1309,14 +1398,14 @@
  9.1458  	echo pdp10-unknown-its
  9.1459  	exit ;;
  9.1460      SEI:*:*:SEIUX)
  9.1461 -	echo mips-sei-seiux${UNAME_RELEASE}
  9.1462 +	echo mips-sei-seiux"$UNAME_RELEASE"
  9.1463  	exit ;;
  9.1464      *:DragonFly:*:*)
  9.1465 -	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
  9.1466 +	echo "$UNAME_MACHINE"-unknown-dragonfly"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`"
  9.1467  	exit ;;
  9.1468      *:*VMS:*:*)
  9.1469  	UNAME_MACHINE=`(uname -p) 2>/dev/null`
  9.1470 -	case "${UNAME_MACHINE}" in
  9.1471 +	case "$UNAME_MACHINE" in
  9.1472  	    A*) echo alpha-dec-vms ; exit ;;
  9.1473  	    I*) echo ia64-dec-vms ; exit ;;
  9.1474  	    V*) echo vax-dec-vms ; exit ;;
  9.1475 @@ -1325,182 +1414,51 @@
  9.1476  	echo i386-pc-xenix
  9.1477  	exit ;;
  9.1478      i*86:skyos:*:*)
  9.1479 -	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
  9.1480 +	echo "$UNAME_MACHINE"-pc-skyos"`echo "$UNAME_RELEASE" | sed -e 's/ .*$//'`"
  9.1481  	exit ;;
  9.1482      i*86:rdos:*:*)
  9.1483 -	echo ${UNAME_MACHINE}-pc-rdos
  9.1484 +	echo "$UNAME_MACHINE"-pc-rdos
  9.1485  	exit ;;
  9.1486      i*86:AROS:*:*)
  9.1487 -	echo ${UNAME_MACHINE}-pc-aros
  9.1488 +	echo "$UNAME_MACHINE"-pc-aros
  9.1489  	exit ;;
  9.1490      x86_64:VMkernel:*:*)
  9.1491 -	echo ${UNAME_MACHINE}-unknown-esx
  9.1492 +	echo "$UNAME_MACHINE"-unknown-esx
  9.1493 +	exit ;;
  9.1494 +    amd64:Isilon\ OneFS:*:*)
  9.1495 +	echo x86_64-unknown-onefs
  9.1496 +	exit ;;
  9.1497 +    *:Unleashed:*:*)
  9.1498 +	echo "$UNAME_MACHINE"-unknown-unleashed"$UNAME_RELEASE"
  9.1499  	exit ;;
  9.1500  esac
  9.1501  
  9.1502 -eval $set_cc_for_build
  9.1503 -cat >$dummy.c <<EOF
  9.1504 -#ifdef _SEQUENT_
  9.1505 -# include <sys/types.h>
  9.1506 -# include <sys/utsname.h>
  9.1507 -#endif
  9.1508 -main ()
  9.1509 -{
  9.1510 -#if defined (sony)
  9.1511 -#if defined (MIPSEB)
  9.1512 -  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
  9.1513 -     I don't know....  */
  9.1514 -  printf ("mips-sony-bsd\n"); exit (0);
  9.1515 -#else
  9.1516 -#include <sys/param.h>
  9.1517 -  printf ("m68k-sony-newsos%s\n",
  9.1518 -#ifdef NEWSOS4
  9.1519 -	"4"
  9.1520 -#else
  9.1521 -	""
  9.1522 -#endif
  9.1523 -	); exit (0);
  9.1524 -#endif
  9.1525 -#endif
  9.1526 +echo "$0: unable to guess system type" >&2
  9.1527  
  9.1528 -#if defined (__arm) && defined (__acorn) && defined (__unix)
  9.1529 -  printf ("arm-acorn-riscix\n"); exit (0);
  9.1530 -#endif
  9.1531 +case "$UNAME_MACHINE:$UNAME_SYSTEM" in
  9.1532 +    mips:Linux | mips64:Linux)
  9.1533 +	# If we got here on MIPS GNU/Linux, output extra information.
  9.1534 +	cat >&2 <<EOF
  9.1535  
  9.1536 -#if defined (hp300) && !defined (hpux)
  9.1537 -  printf ("m68k-hp-bsd\n"); exit (0);
  9.1538 -#endif
  9.1539 -
  9.1540 -#if defined (NeXT)
  9.1541 -#if !defined (__ARCHITECTURE__)
  9.1542 -#define __ARCHITECTURE__ "m68k"
  9.1543 -#endif
  9.1544 -  int version;
  9.1545 -  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
  9.1546 -  if (version < 4)
  9.1547 -    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
  9.1548 -  else
  9.1549 -    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
  9.1550 -  exit (0);
  9.1551 -#endif
  9.1552 -
  9.1553 -#if defined (MULTIMAX) || defined (n16)
  9.1554 -#if defined (UMAXV)
  9.1555 -  printf ("ns32k-encore-sysv\n"); exit (0);
  9.1556 -#else
  9.1557 -#if defined (CMU)
  9.1558 -  printf ("ns32k-encore-mach\n"); exit (0);
  9.1559 -#else
  9.1560 -  printf ("ns32k-encore-bsd\n"); exit (0);
  9.1561 -#endif
  9.1562 -#endif
  9.1563 -#endif
  9.1564 -
  9.1565 -#if defined (__386BSD__)
  9.1566 -  printf ("i386-pc-bsd\n"); exit (0);
  9.1567 -#endif
  9.1568 -
  9.1569 -#if defined (sequent)
  9.1570 -#if defined (i386)
  9.1571 -  printf ("i386-sequent-dynix\n"); exit (0);
  9.1572 -#endif
  9.1573 -#if defined (ns32000)
  9.1574 -  printf ("ns32k-sequent-dynix\n"); exit (0);
  9.1575 -#endif
  9.1576 -#endif
  9.1577 -
  9.1578 -#if defined (_SEQUENT_)
  9.1579 -    struct utsname un;
  9.1580 -
  9.1581 -    uname(&un);
  9.1582 -
  9.1583 -    if (strncmp(un.version, "V2", 2) == 0) {
  9.1584 -	printf ("i386-sequent-ptx2\n"); exit (0);
  9.1585 -    }
  9.1586 -    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
  9.1587 -	printf ("i386-sequent-ptx1\n"); exit (0);
  9.1588 -    }
  9.1589 -    printf ("i386-sequent-ptx\n"); exit (0);
  9.1590 -
  9.1591 -#endif
  9.1592 -
  9.1593 -#if defined (vax)
  9.1594 -# if !defined (ultrix)
  9.1595 -#  include <sys/param.h>
  9.1596 -#  if defined (BSD)
  9.1597 -#   if BSD == 43
  9.1598 -      printf ("vax-dec-bsd4.3\n"); exit (0);
  9.1599 -#   else
  9.1600 -#    if BSD == 199006
  9.1601 -      printf ("vax-dec-bsd4.3reno\n"); exit (0);
  9.1602 -#    else
  9.1603 -      printf ("vax-dec-bsd\n"); exit (0);
  9.1604 -#    endif
  9.1605 -#   endif
  9.1606 -#  else
  9.1607 -    printf ("vax-dec-bsd\n"); exit (0);
  9.1608 -#  endif
  9.1609 -# else
  9.1610 -    printf ("vax-dec-ultrix\n"); exit (0);
  9.1611 -# endif
  9.1612 -#endif
  9.1613 -
  9.1614 -#if defined (alliant) && defined (i860)
  9.1615 -  printf ("i860-alliant-bsd\n"); exit (0);
  9.1616 -#endif
  9.1617 -
  9.1618 -  exit (1);
  9.1619 -}
  9.1620 +NOTE: MIPS GNU/Linux systems require a C compiler to fully recognize
  9.1621 +the system type. Please install a C compiler and try again.
  9.1622  EOF
  9.1623 -
  9.1624 -$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
  9.1625 -	{ echo "$SYSTEM_NAME"; exit; }
  9.1626 -
  9.1627 -# Apollos put the system type in the environment.
  9.1628 -
  9.1629 -test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
  9.1630 -
  9.1631 -# Convex versions that predate uname can use getsysinfo(1)
  9.1632 -
  9.1633 -if [ -x /usr/convex/getsysinfo ]
  9.1634 -then
  9.1635 -    case `getsysinfo -f cpu_type` in
  9.1636 -    c1*)
  9.1637 -	echo c1-convex-bsd
  9.1638 -	exit ;;
  9.1639 -    c2*)
  9.1640 -	if getsysinfo -f scalar_acc
  9.1641 -	then echo c32-convex-bsd
  9.1642 -	else echo c2-convex-bsd
  9.1643 -	fi
  9.1644 -	exit ;;
  9.1645 -    c34*)
  9.1646 -	echo c34-convex-bsd
  9.1647 -	exit ;;
  9.1648 -    c38*)
  9.1649 -	echo c38-convex-bsd
  9.1650 -	exit ;;
  9.1651 -    c4*)
  9.1652 -	echo c4-convex-bsd
  9.1653 -	exit ;;
  9.1654 -    esac
  9.1655 -fi
  9.1656 +	;;
  9.1657 +esac
  9.1658  
  9.1659  cat >&2 <<EOF
  9.1660 -$0: unable to guess system type
  9.1661  
  9.1662 -This script, last modified $timestamp, has failed to recognize
  9.1663 -the operating system you are using. It is advised that you
  9.1664 -download the most up to date version of the config scripts from
  9.1665 +This script (version $timestamp), has failed to recognize the
  9.1666 +operating system you are using. If your script is old, overwrite *all*
  9.1667 +copies of config.guess and config.sub with the latest versions from:
  9.1668  
  9.1669 -  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
  9.1670 +  https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
  9.1671  and
  9.1672 -  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
  9.1673 +  https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
  9.1674  
  9.1675 -If the version you run ($0) is already up to date, please
  9.1676 -send the following data and any information you think might be
  9.1677 -pertinent to <config-patches@gnu.org> in order to provide the needed
  9.1678 -information to handle your system.
  9.1679 +If $0 has already been updated, send the following data and any
  9.1680 +information you think might be pertinent to config-patches@gnu.org to
  9.1681 +provide the necessary information to handle your system.
  9.1682  
  9.1683  config.guess timestamp = $timestamp
  9.1684  
  9.1685 @@ -1519,16 +1477,16 @@
  9.1686  /usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
  9.1687  /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
  9.1688  
  9.1689 -UNAME_MACHINE = ${UNAME_MACHINE}
  9.1690 -UNAME_RELEASE = ${UNAME_RELEASE}
  9.1691 -UNAME_SYSTEM  = ${UNAME_SYSTEM}
  9.1692 -UNAME_VERSION = ${UNAME_VERSION}
  9.1693 +UNAME_MACHINE = "$UNAME_MACHINE"
  9.1694 +UNAME_RELEASE = "$UNAME_RELEASE"
  9.1695 +UNAME_SYSTEM  = "$UNAME_SYSTEM"
  9.1696 +UNAME_VERSION = "$UNAME_VERSION"
  9.1697  EOF
  9.1698  
  9.1699  exit 1
  9.1700  
  9.1701  # Local variables:
  9.1702 -# eval: (add-hook 'write-file-hooks 'time-stamp)
  9.1703 +# eval: (add-hook 'before-save-hook 'time-stamp)
  9.1704  # time-stamp-start: "timestamp='"
  9.1705  # time-stamp-format: "%:y-%02m-%02d"
  9.1706  # time-stamp-end: "'"
    10.1 --- a/external/libvorbisidec-1.2.1/config.h.in	Sun Dec 01 18:50:02 2019 +0300
    10.2 +++ b/external/libvorbisidec-1.2.1/config.h.in	Sun Dec 01 20:20:02 2019 +0300
    10.3 @@ -1,5 +1,8 @@
    10.4  /* config.h.in.  Generated from configure.in by autoheader.  */
    10.5  
    10.6 +/* Define if building universal (internal helper macro) */
    10.7 +#undef AC_APPLE_UNIVERSAL_BUILD
    10.8 +
    10.9  /* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
   10.10     systems. This function is required for `alloca.c' support on those systems.
   10.11     */
   10.12 @@ -44,8 +47,7 @@
   10.13  /* Define to 1 if you have the <unistd.h> header file. */
   10.14  #undef HAVE_UNISTD_H
   10.15  
   10.16 -/* Define to the sub-directory in which libtool stores uninstalled libraries.
   10.17 -   */
   10.18 +/* Define to the sub-directory where libtool stores uninstalled libraries. */
   10.19  #undef LT_OBJDIR
   10.20  
   10.21  /* Name of package */
   10.22 @@ -86,5 +88,17 @@
   10.23  /* Version number of package */
   10.24  #undef VERSION
   10.25  
   10.26 +/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
   10.27 +   significant byte first (like Motorola and SPARC, unlike Intel). */
   10.28 +#if defined AC_APPLE_UNIVERSAL_BUILD
   10.29 +# if defined __BIG_ENDIAN__
   10.30 +#  define WORDS_BIGENDIAN 1
   10.31 +# endif
   10.32 +#else
   10.33 +# ifndef WORDS_BIGENDIAN
   10.34 +#  undef WORDS_BIGENDIAN
   10.35 +# endif
   10.36 +#endif
   10.37 +
   10.38  /* Define to `unsigned int' if <sys/types.h> does not define. */
   10.39  #undef size_t
    11.1 --- a/external/libvorbisidec-1.2.1/config.sub	Sun Dec 01 18:50:02 2019 +0300
    11.2 +++ b/external/libvorbisidec-1.2.1/config.sub	Sun Dec 01 20:20:02 2019 +0300
    11.3 @@ -1,10 +1,8 @@
    11.4  #! /bin/sh
    11.5  # Configuration validation subroutine script.
    11.6 -#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
    11.7 -#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
    11.8 -#   2011, 2012, 2013 Free Software Foundation, Inc.
    11.9 +#   Copyright 1992-2019 Free Software Foundation, Inc.
   11.10  
   11.11 -timestamp='2012-12-29'
   11.12 +timestamp='2019-01-05'
   11.13  
   11.14  # This file is free software; you can redistribute it and/or modify it
   11.15  # under the terms of the GNU General Public License as published by
   11.16 @@ -17,7 +15,7 @@
   11.17  # General Public License for more details.
   11.18  #
   11.19  # You should have received a copy of the GNU General Public License
   11.20 -# along with this program; if not, see <http://www.gnu.org/licenses/>.
   11.21 +# along with this program; if not, see <https://www.gnu.org/licenses/>.
   11.22  #
   11.23  # As a special exception to the GNU General Public License, if you
   11.24  # distribute this file as part of a program that contains a
   11.25 @@ -27,7 +25,7 @@
   11.26  # of the GNU General Public License, version 3 ("GPLv3").
   11.27  
   11.28  
   11.29 -# Please send patches with a ChangeLog entry to config-patches@gnu.org.
   11.30 +# Please send patches to <config-patches@gnu.org>.
   11.31  #
   11.32  # Configuration subroutine to validate and canonicalize a configuration type.
   11.33  # Supply the specified configuration type as an argument.
   11.34 @@ -35,7 +33,7 @@
   11.35  # Otherwise, we print the canonical config type on stdout and succeed.
   11.36  
   11.37  # You can get the latest version of this script from:
   11.38 -# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
   11.39 +# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
   11.40  
   11.41  # This file is supposed to be the same for all GNU packages
   11.42  # and recognize all the CPU types, system types and aliases
   11.43 @@ -55,12 +53,11 @@
   11.44  me=`echo "$0" | sed -e 's,.*/,,'`
   11.45  
   11.46  usage="\
   11.47 -Usage: $0 [OPTION] CPU-MFR-OPSYS
   11.48 -       $0 [OPTION] ALIAS
   11.49 +Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS
   11.50  
   11.51  Canonicalize a configuration name.
   11.52  
   11.53 -Operation modes:
   11.54 +Options:
   11.55    -h, --help         print this help, then exit
   11.56    -t, --time-stamp   print date of last modification, then exit
   11.57    -v, --version      print version number, then exit
   11.58 @@ -70,9 +67,7 @@
   11.59  version="\
   11.60  GNU config.sub ($timestamp)
   11.61  
   11.62 -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
   11.63 -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
   11.64 -2012, 2013 Free Software Foundation, Inc.
   11.65 +Copyright 1992-2019 Free Software Foundation, Inc.
   11.66  
   11.67  This is free software; see the source for copying conditions.  There is NO
   11.68  warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
   11.69 @@ -94,12 +89,12 @@
   11.70      - )	# Use stdin as input.
   11.71         break ;;
   11.72      -* )
   11.73 -       echo "$me: invalid option $1$help"
   11.74 +       echo "$me: invalid option $1$help" >&2
   11.75         exit 1 ;;
   11.76  
   11.77      *local*)
   11.78         # First pass through any local machine types.
   11.79 -       echo $1
   11.80 +       echo "$1"
   11.81         exit ;;
   11.82  
   11.83      * )
   11.84 @@ -115,1207 +110,1164 @@
   11.85      exit 1;;
   11.86  esac
   11.87  
   11.88 -# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
   11.89 -# Here we must recognize all the valid KERNEL-OS combinations.
   11.90 -maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
   11.91 -case $maybe_os in
   11.92 -  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
   11.93 -  linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
   11.94 -  knetbsd*-gnu* | netbsd*-gnu* | \
   11.95 -  kopensolaris*-gnu* | \
   11.96 -  storm-chaos* | os2-emx* | rtmk-nova*)
   11.97 -    os=-$maybe_os
   11.98 -    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
   11.99 -    ;;
  11.100 -  android-linux)
  11.101 -    os=-linux-android
  11.102 -    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
  11.103 -    ;;
  11.104 -  *)
  11.105 -    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
  11.106 -    if [ $basic_machine != $1 ]
  11.107 -    then os=`echo $1 | sed 's/.*-/-/'`
  11.108 -    else os=; fi
  11.109 -    ;;
  11.110 -esac
  11.111 +# Split fields of configuration type
  11.112 +# shellcheck disable=SC2162
  11.113 +IFS="-" read field1 field2 field3 field4 <<EOF
  11.114 +$1
  11.115 +EOF
  11.116  
  11.117 -### Let's recognize common machines as not being operating systems so
  11.118 -### that things like config.sub decstation-3100 work.  We also
  11.119 -### recognize some manufacturers as not being operating systems, so we
  11.120 -### can provide default operating systems below.
  11.121 -case $os in
  11.122 -	-sun*os*)
  11.123 -		# Prevent following clause from handling this invalid input.
  11.124 +# Separate into logical components for further validation
  11.125 +case $1 in
  11.126 +	*-*-*-*-*)
  11.127 +		echo Invalid configuration \`"$1"\': more than four components >&2
  11.128 +		exit 1
  11.129  		;;
  11.130 -	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
  11.131 -	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
  11.132 -	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
  11.133 -	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
  11.134 -	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
  11.135 -	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
  11.136 -	-apple | -axis | -knuth | -cray | -microblaze*)
  11.137 -		os=
  11.138 -		basic_machine=$1
  11.139 +	*-*-*-*)
  11.140 +		basic_machine=$field1-$field2
  11.141 +		os=$field3-$field4
  11.142  		;;
  11.143 -	-bluegene*)
  11.144 -		os=-cnk
  11.145 +	*-*-*)
  11.146 +		# Ambiguous whether COMPANY is present, or skipped and KERNEL-OS is two
  11.147 +		# parts
  11.148 +		maybe_os=$field2-$field3
  11.149 +		case $maybe_os in
  11.150 +			nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc \
  11.151 +			| linux-newlib* | linux-musl* | linux-uclibc* | uclinux-uclibc* \
  11.152 +			| uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* \
  11.153 +			| netbsd*-eabi* | kopensolaris*-gnu* | cloudabi*-eabi* \
  11.154 +			| storm-chaos* | os2-emx* | rtmk-nova*)
  11.155 +				basic_machine=$field1
  11.156 +				os=$maybe_os
  11.157 +				;;
  11.158 +			android-linux)
  11.159 +				basic_machine=$field1-unknown
  11.160 +				os=linux-android
  11.161 +				;;
  11.162 +			*)
  11.163 +				basic_machine=$field1-$field2
  11.164 +				os=$field3
  11.165 +				;;
  11.166 +		esac
  11.167  		;;
  11.168 -	-sim | -cisco | -oki | -wec | -winbond)
  11.169 -		os=
  11.170 -		basic_machine=$1
  11.171 +	*-*)
  11.172 +		# A lone config we happen to match not fitting any pattern
  11.173 +		case $field1-$field2 in
  11.174 +			decstation-3100)
  11.175 +				basic_machine=mips-dec
  11.176 +				os=
  11.177 +				;;
  11.178 +			*-*)
  11.179 +				# Second component is usually, but not always the OS
  11.180 +				case $field2 in
  11.181 +					# Prevent following clause from handling this valid os
  11.182 +					sun*os*)
  11.183 +						basic_machine=$field1
  11.184 +						os=$field2
  11.185 +						;;
  11.186 +					# Manufacturers
  11.187 +					dec* | mips* | sequent* | encore* | pc533* | sgi* | sony* \
  11.188 +					| att* | 7300* | 3300* | delta* | motorola* | sun[234]* \
  11.189 +					| unicom* | ibm* | next | hp | isi* | apollo | altos* \
  11.190 +					| convergent* | ncr* | news | 32* | 3600* | 3100* \
  11.191 +					| hitachi* | c[123]* | convex* | sun | crds | omron* | dg \
  11.192 +					| ultra | tti* | harris | dolphin | highlevel | gould \
  11.193 +					| cbm | ns | masscomp | apple | axis | knuth | cray \
  11.194 +					| microblaze* | sim | cisco \
  11.195 +					| oki | wec | wrs | winbond)
  11.196 +						basic_machine=$field1-$field2
  11.197 +						os=
  11.198 +						;;
  11.199 +					*)
  11.200 +						basic_machine=$field1
  11.201 +						os=$field2
  11.202 +						;;
  11.203 +				esac
  11.204 +			;;
  11.205 +		esac
  11.206  		;;
  11.207 -	-scout)
  11.208 -		;;
  11.209 -	-wrs)
  11.210 -		os=-vxworks
  11.211 -		basic_machine=$1
  11.212 -		;;
  11.213 -	-chorusos*)
  11.214 -		os=-chorusos
  11.215 -		basic_machine=$1
  11.216 -		;;
  11.217 -	-chorusrdb)
  11.218 -		os=-chorusrdb
  11.219 -		basic_machine=$1
  11.220 -		;;
  11.221 -	-hiux*)
  11.222 -		os=-hiuxwe2
  11.223 -		;;
  11.224 -	-sco6)
  11.225 -		os=-sco5v6
  11.226 -		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
  11.227 -		;;
  11.228 -	-sco5)
  11.229 -		os=-sco3.2v5
  11.230 -		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
  11.231 -		;;
  11.232 -	-sco4)
  11.233 -		os=-sco3.2v4
  11.234 -		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
  11.235 -		;;
  11.236 -	-sco3.2.[4-9]*)
  11.237 -		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
  11.238 -		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
  11.239 -		;;
  11.240 -	-sco3.2v[4-9]*)
  11.241 -		# Don't forget version if it is 3.2v4 or newer.
  11.242 -		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
  11.243 -		;;
  11.244 -	-sco5v6*)
  11.245 -		# Don't forget version if it is 3.2v4 or newer.
  11.246 -		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
  11.247 -		;;
  11.248 -	-sco*)
  11.249 -		os=-sco3.2v2
  11.250 -		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
  11.251 -		;;
  11.252 -	-udk*)
  11.253 -		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
  11.254 -		;;
  11.255 -	-isc)
  11.256 -		os=-isc2.2
  11.257 -		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
  11.258 -		;;
  11.259 -	-clix*)
  11.260 -		basic_machine=clipper-intergraph
  11.261 -		;;
  11.262 -	-isc*)
  11.263 -		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
  11.264 -		;;
  11.265 -	-lynx*178)
  11.266 -		os=-lynxos178
  11.267 -		;;
  11.268 -	-lynx*5)
  11.269 -		os=-lynxos5
  11.270 -		;;
  11.271 -	-lynx*)
  11.272 -		os=-lynxos
  11.273 -		;;
  11.274 -	-ptx*)
  11.275 -		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
  11.276 -		;;
  11.277 -	-windowsnt*)
  11.278 -		os=`echo $os | sed -e 's/windowsnt/winnt/'`
  11.279 -		;;
  11.280 -	-psos*)
  11.281 -		os=-psos
  11.282 -		;;
  11.283 -	-mint | -mint[0-9]*)
  11.284 -		basic_machine=m68k-atari
  11.285 -		os=-mint
  11.286 +	*)
  11.287 +		# Convert single-component short-hands not valid as part of
  11.288 +		# multi-component configurations.
  11.289 +		case $field1 in
  11.290 +			386bsd)
  11.291 +				basic_machine=i386-pc
  11.292 +				os=bsd
  11.293 +				;;
  11.294 +			a29khif)
  11.295 +				basic_machine=a29k-amd
  11.296 +				os=udi
  11.297 +				;;
  11.298 +			adobe68k)
  11.299 +				basic_machine=m68010-adobe
  11.300 +				os=scout
  11.301 +				;;
  11.302 +			alliant)
  11.303 +				basic_machine=fx80-alliant
  11.304 +				os=
  11.305 +				;;
  11.306 +			altos | altos3068)
  11.307 +				basic_machine=m68k-altos
  11.308 +				os=
  11.309 +				;;
  11.310 +			am29k)
  11.311 +				basic_machine=a29k-none
  11.312 +				os=bsd
  11.313 +				;;
  11.314 +			amdahl)
  11.315 +				basic_machine=580-amdahl
  11.316 +				os=sysv
  11.317 +				;;
  11.318 +			amiga)
  11.319 +				basic_machine=m68k-unknown
  11.320 +				os=
  11.321 +				;;
  11.322 +			amigaos | amigados)
  11.323 +				basic_machine=m68k-unknown
  11.324 +				os=amigaos
  11.325 +				;;
  11.326 +			amigaunix | amix)
  11.327 +				basic_machine=m68k-unknown
  11.328 +				os=sysv4
  11.329 +				;;
  11.330 +			apollo68)
  11.331 +				basic_machine=m68k-apollo
  11.332 +				os=sysv
  11.333 +				;;
  11.334 +			apollo68bsd)
  11.335 +				basic_machine=m68k-apollo
  11.336 +				os=bsd
  11.337 +				;;
  11.338 +			aros)
  11.339 +				basic_machine=i386-pc
  11.340 +				os=aros
  11.341 +				;;
  11.342 +			aux)
  11.343 +				basic_machine=m68k-apple
  11.344 +				os=aux
  11.345 +				;;
  11.346 +			balance)
  11.347 +				basic_machine=ns32k-sequent
  11.348 +				os=dynix
  11.349 +				;;
  11.350 +			blackfin)
  11.351 +				basic_machine=bfin-unknown
  11.352 +				os=linux
  11.353 +				;;
  11.354 +			cegcc)
  11.355 +				basic_machine=arm-unknown
  11.356 +				os=cegcc
  11.357 +				;;
  11.358 +			convex-c1)
  11.359 +				basic_machine=c1-convex
  11.360 +				os=bsd
  11.361 +				;;
  11.362 +			convex-c2)
  11.363 +				basic_machine=c2-convex
  11.364 +				os=bsd
  11.365 +				;;
  11.366 +			convex-c32)
  11.367 +				basic_machine=c32-convex
  11.368 +				os=bsd
  11.369 +				;;
  11.370 +			convex-c34)
  11.371 +				basic_machine=c34-convex
  11.372 +				os=bsd
  11.373 +				;;
  11.374 +			convex-c38)
  11.375 +				basic_machine=c38-convex
  11.376 +				os=bsd
  11.377 +				;;
  11.378 +			cray)
  11.379 +				basic_machine=j90-cray
  11.380 +				os=unicos
  11.381 +				;;
  11.382 +			crds | unos)
  11.383 +				basic_machine=m68k-crds
  11.384 +				os=
  11.385 +				;;
  11.386 +			da30)
  11.387 +				basic_machine=m68k-da30
  11.388 +				os=
  11.389 +				;;
  11.390 +			decstation | pmax | pmin | dec3100 | decstatn)
  11.391 +				basic_machine=mips-dec
  11.392 +				os=
  11.393 +				;;
  11.394 +			delta88)
  11.395 +				basic_machine=m88k-motorola
  11.396 +				os=sysv3
  11.397 +				;;
  11.398 +			dicos)
  11.399 +				basic_machine=i686-pc
  11.400 +				os=dicos
  11.401 +				;;
  11.402 +			djgpp)
  11.403 +				basic_machine=i586-pc
  11.404 +				os=msdosdjgpp
  11.405 +				;;
  11.406 +			ebmon29k)
  11.407 +				basic_machine=a29k-amd
  11.408 +				os=ebmon
  11.409 +				;;
  11.410 +			es1800 | OSE68k | ose68k | ose | OSE)
  11.411 +				basic_machine=m68k-ericsson
  11.412 +				os=ose
  11.413 +				;;
  11.414 +			gmicro)
  11.415 +				basic_machine=tron-gmicro
  11.416 +				os=sysv
  11.417 +				;;
  11.418 +			go32)
  11.419 +				basic_machine=i386-pc
  11.420 +				os=go32
  11.421 +				;;
  11.422 +			h8300hms)
  11.423 +				basic_machine=h8300-hitachi
  11.424 +				os=hms
  11.425 +				;;
  11.426 +			h8300xray)
  11.427 +				basic_machine=h8300-hitachi
  11.428 +				os=xray
  11.429 +				;;
  11.430 +			h8500hms)
  11.431 +				basic_machine=h8500-hitachi
  11.432 +				os=hms
  11.433 +				;;
  11.434 +			harris)
  11.435 +				basic_machine=m88k-harris
  11.436 +				os=sysv3
  11.437 +				;;
  11.438 +			hp300)
  11.439 +				basic_machine=m68k-hp
  11.440 +				;;
  11.441 +			hp300bsd)
  11.442 +				basic_machine=m68k-hp
  11.443 +				os=bsd
  11.444 +				;;
  11.445 +			hp300hpux)
  11.446 +				basic_machine=m68k-hp
  11.447 +				os=hpux
  11.448 +				;;
  11.449 +			hppaosf)
  11.450 +				basic_machine=hppa1.1-hp
  11.451 +				os=osf
  11.452 +				;;
  11.453 +			hppro)
  11.454 +				basic_machine=hppa1.1-hp
  11.455 +				os=proelf
  11.456 +				;;
  11.457 +			i386mach)
  11.458 +				basic_machine=i386-mach
  11.459 +				os=mach
  11.460 +				;;
  11.461 +			vsta)
  11.462 +				basic_machine=i386-pc
  11.463 +				os=vsta
  11.464 +				;;
  11.465 +			isi68 | isi)
  11.466 +				basic_machine=m68k-isi
  11.467 +				os=sysv
  11.468 +				;;
  11.469 +			m68knommu)
  11.470 +				basic_machine=m68k-unknown
  11.471 +				os=linux
  11.472 +				;;
  11.473 +			magnum | m3230)
  11.474 +				basic_machine=mips-mips
  11.475 +				os=sysv
  11.476 +				;;
  11.477 +			merlin)
  11.478 +				basic_machine=ns32k-utek
  11.479 +				os=sysv
  11.480 +				;;
  11.481 +			mingw64)
  11.482 +				basic_machine=x86_64-pc
  11.483 +				os=mingw64
  11.484 +				;;
  11.485 +			mingw32)
  11.486 +				basic_machine=i686-pc
  11.487 +				os=mingw32
  11.488 +				;;
  11.489 +			mingw32ce)
  11.490 +				basic_machine=arm-unknown
  11.491 +				os=mingw32ce
  11.492 +				;;
  11.493 +			monitor)
  11.494 +				basic_machine=m68k-rom68k
  11.495 +				os=coff
  11.496 +				;;
  11.497 +			morphos)
  11.498 +				basic_machine=powerpc-unknown
  11.499 +				os=morphos
  11.500 +				;;
  11.501 +			moxiebox)
  11.502 +				basic_machine=moxie-unknown
  11.503 +				os=moxiebox
  11.504 +				;;
  11.505 +			msdos)
  11.506 +				basic_machine=i386-pc
  11.507 +				os=msdos
  11.508 +				;;
  11.509 +			msys)
  11.510 +				basic_machine=i686-pc
  11.511 +				os=msys
  11.512 +				;;
  11.513 +			mvs)
  11.514 +				basic_machine=i370-ibm
  11.515 +				os=mvs
  11.516 +				;;
  11.517 +			nacl)
  11.518 +				basic_machine=le32-unknown
  11.519 +				os=nacl
  11.520 +				;;
  11.521 +			ncr3000)
  11.522 +				basic_machine=i486-ncr
  11.523 +				os=sysv4
  11.524 +				;;
  11.525 +			netbsd386)
  11.526 +				basic_machine=i386-pc
  11.527 +				os=netbsd
  11.528 +				;;
  11.529 +			netwinder)
  11.530 +				basic_machine=armv4l-rebel
  11.531 +				os=linux
  11.532 +				;;
  11.533 +			news | news700 | news800 | news900)
  11.534 +				basic_machine=m68k-sony
  11.535 +				os=newsos
  11.536 +				;;
  11.537 +			news1000)
  11.538 +				basic_machine=m68030-sony
  11.539 +				os=newsos
  11.540 +				;;
  11.541 +			necv70)
  11.542 +				basic_machine=v70-nec
  11.543 +				os=sysv
  11.544 +				;;
  11.545 +			nh3000)
  11.546 +				basic_machine=m68k-harris
  11.547 +				os=cxux
  11.548 +				;;
  11.549 +			nh[45]000)
  11.550 +				basic_machine=m88k-harris
  11.551 +				os=cxux
  11.552 +				;;
  11.553 +			nindy960)
  11.554 +				basic_machine=i960-intel
  11.555 +				os=nindy
  11.556 +				;;
  11.557 +			mon960)
  11.558 +				basic_machine=i960-intel
  11.559 +				os=mon960
  11.560 +				;;
  11.561 +			nonstopux)
  11.562 +				basic_machine=mips-compaq
  11.563 +				os=nonstopux
  11.564 +				;;
  11.565 +			os400)
  11.566 +				basic_machine=powerpc-ibm
  11.567 +				os=os400
  11.568 +				;;
  11.569 +			OSE68000 | ose68000)
  11.570 +				basic_machine=m68000-ericsson
  11.571 +				os=ose
  11.572 +				;;
  11.573 +			os68k)
  11.574 +				basic_machine=m68k-none
  11.575 +				os=os68k
  11.576 +				;;
  11.577 +			paragon)
  11.578 +				basic_machine=i860-intel
  11.579 +				os=osf
  11.580 +				;;
  11.581 +			parisc)
  11.582 +				basic_machine=hppa-unknown
  11.583 +				os=linux
  11.584 +				;;
  11.585 +			pw32)
  11.586 +				basic_machine=i586-unknown
  11.587 +				os=pw32
  11.588 +				;;
  11.589 +			rdos | rdos64)
  11.590 +				basic_machine=x86_64-pc
  11.591 +				os=rdos
  11.592 +				;;
  11.593 +			rdos32)
  11.594 +				basic_machine=i386-pc
  11.595 +				os=rdos
  11.596 +				;;
  11.597 +			rom68k)
  11.598 +				basic_machine=m68k-rom68k
  11.599 +				os=coff
  11.600 +				;;
  11.601 +			sa29200)
  11.602 +				basic_machine=a29k-amd
  11.603 +				os=udi
  11.604 +				;;
  11.605 +			sei)
  11.606 +				basic_machine=mips-sei
  11.607 +				os=seiux
  11.608 +				;;
  11.609 +			sequent)
  11.610 +				basic_machine=i386-sequent
  11.611 +				os=
  11.612 +				;;
  11.613 +			sps7)
  11.614 +				basic_machine=m68k-bull
  11.615 +				os=sysv2
  11.616 +				;;
  11.617 +			st2000)
  11.618 +				basic_machine=m68k-tandem
  11.619 +				os=
  11.620 +				;;
  11.621 +			stratus)
  11.622 +				basic_machine=i860-stratus
  11.623 +				os=sysv4
  11.624 +				;;
  11.625 +			sun2)
  11.626 +				basic_machine=m68000-sun
  11.627 +				os=
  11.628 +				;;
  11.629 +			sun2os3)
  11.630 +				basic_machine=m68000-sun
  11.631 +				os=sunos3
  11.632 +				;;
  11.633 +			sun2os4)
  11.634 +				basic_machine=m68000-sun
  11.635 +				os=sunos4
  11.636 +				;;
  11.637 +			sun3)
  11.638 +				basic_machine=m68k-sun
  11.639 +				os=
  11.640 +				;;
  11.641 +			sun3os3)
  11.642 +				basic_machine=m68k-sun
  11.643 +				os=sunos3
  11.644 +				;;
  11.645 +			sun3os4)
  11.646 +				basic_machine=m68k-sun
  11.647 +				os=sunos4
  11.648 +				;;
  11.649 +			sun4)
  11.650 +				basic_machine=sparc-sun
  11.651 +				os=
  11.652 +				;;
  11.653 +			sun4os3)
  11.654 +				basic_machine=sparc-sun
  11.655 +				os=sunos3
  11.656 +				;;
  11.657 +			sun4os4)
  11.658 +				basic_machine=sparc-sun
  11.659 +				os=sunos4
  11.660 +				;;
  11.661 +			sun4sol2)
  11.662 +				basic_machine=sparc-sun
  11.663 +				os=solaris2
  11.664 +				;;
  11.665 +			sun386 | sun386i | roadrunner)
  11.666 +				basic_machine=i386-sun
  11.667 +				os=
  11.668 +				;;
  11.669 +			sv1)
  11.670 +				basic_machine=sv1-cray
  11.671 +				os=unicos
  11.672 +				;;
  11.673 +			symmetry)
  11.674 +				basic_machine=i386-sequent
  11.675 +				os=dynix
  11.676 +				;;
  11.677 +			t3e)
  11.678 +				basic_machine=alphaev5-cray
  11.679 +				os=unicos
  11.680 +				;;
  11.681 +			t90)
  11.682 +				basic_machine=t90-cray
  11.683 +				os=unicos
  11.684 +				;;
  11.685 +			toad1)
  11.686 +				basic_machine=pdp10-xkl
  11.687 +				os=tops20
  11.688 +				;;
  11.689 +			tpf)
  11.690 +				basic_machine=s390x-ibm
  11.691 +				os=tpf
  11.692 +				;;
  11.693 +			udi29k)
  11.694 +				basic_machine=a29k-amd
  11.695 +				os=udi
  11.696 +				;;
  11.697 +			ultra3)
  11.698 +				basic_machine=a29k-nyu
  11.699 +				os=sym1
  11.700 +				;;
  11.701 +			v810 | necv810)
  11.702 +				basic_machine=v810-nec
  11.703 +				os=none
  11.704 +				;;
  11.705 +			vaxv)
  11.706 +				basic_machine=vax-dec
  11.707 +				os=sysv
  11.708 +				;;
  11.709 +			vms)
  11.710 +				basic_machine=vax-dec
  11.711 +				os=vms
  11.712 +				;;
  11.713 +			vxworks960)
  11.714 +				basic_machine=i960-wrs
  11.715 +				os=vxworks
  11.716 +				;;
  11.717 +			vxworks68)
  11.718 +				basic_machine=m68k-wrs
  11.719 +				os=vxworks
  11.720 +				;;
  11.721 +			vxworks29k)
  11.722 +				basic_machine=a29k-wrs
  11.723 +				os=vxworks
  11.724 +				;;
  11.725 +			xbox)
  11.726 +				basic_machine=i686-pc
  11.727 +				os=mingw32
  11.728 +				;;
  11.729 +			ymp)
  11.730 +				basic_machine=ymp-cray
  11.731 +				os=unicos
  11.732 +				;;
  11.733 +			*)
  11.734 +				basic_machine=$1
  11.735 +				os=
  11.736 +				;;
  11.737 +		esac
  11.738  		;;
  11.739  esac
  11.740  
  11.741 -# Decode aliases for certain CPU-COMPANY combinations.
  11.742 +# Decode 1-component or ad-hoc basic machines
  11.743  case $basic_machine in
  11.744 -	# Recognize the basic CPU types without company name.
  11.745 -	# Some are omitted here because they have special meanings below.
  11.746 -	1750a | 580 \
  11.747 -	| a29k \
  11.748 -	| aarch64 | aarch64_be \
  11.749 -	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
  11.750 -	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
  11.751 -	| am33_2.0 \
  11.752 -	| arc \
  11.753 -	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
  11.754 -	| avr | avr32 \
  11.755 -	| be32 | be64 \
  11.756 -	| bfin \
  11.757 -	| c4x | clipper \
  11.758 -	| d10v | d30v | dlx | dsp16xx \
  11.759 -	| epiphany \
  11.760 -	| fido | fr30 | frv \
  11.761 -	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
  11.762 -	| hexagon \
  11.763 -	| i370 | i860 | i960 | ia64 \
  11.764 -	| ip2k | iq2000 \
  11.765 -	| le32 | le64 \
  11.766 -	| lm32 \
  11.767 -	| m32c | m32r | m32rle | m68000 | m68k | m88k \
  11.768 -	| maxq | mb | microblaze | microblazeel | mcore | mep | metag \
  11.769 -	| mips | mipsbe | mipseb | mipsel | mipsle \
  11.770 -	| mips16 \
  11.771 -	| mips64 | mips64el \
  11.772 -	| mips64octeon | mips64octeonel \
  11.773 -	| mips64orion | mips64orionel \
  11.774 -	| mips64r5900 | mips64r5900el \
  11.775 -	| mips64vr | mips64vrel \
  11.776 -	| mips64vr4100 | mips64vr4100el \
  11.777 -	| mips64vr4300 | mips64vr4300el \
  11.778 -	| mips64vr5000 | mips64vr5000el \
  11.779 -	| mips64vr5900 | mips64vr5900el \
  11.780 -	| mipsisa32 | mipsisa32el \
  11.781 -	| mipsisa32r2 | mipsisa32r2el \
  11.782 -	| mipsisa64 | mipsisa64el \
  11.783 -	| mipsisa64r2 | mipsisa64r2el \
  11.784 -	| mipsisa64sb1 | mipsisa64sb1el \
  11.785 -	| mipsisa64sr71k | mipsisa64sr71kel \
  11.786 -	| mipstx39 | mipstx39el \
  11.787 -	| mn10200 | mn10300 \
  11.788 -	| moxie \
  11.789 -	| mt \
  11.790 -	| msp430 \
  11.791 -	| nds32 | nds32le | nds32be \
  11.792 -	| nios | nios2 \
  11.793 -	| ns16k | ns32k \
  11.794 -	| open8 \
  11.795 -	| or32 \
  11.796 -	| pdp10 | pdp11 | pj | pjl \
  11.797 -	| powerpc | powerpc64 | powerpc64le | powerpcle \
  11.798 -	| pyramid \
  11.799 -	| rl78 | rx \
  11.800 -	| score \
  11.801 -	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
  11.802 -	| sh64 | sh64le \
  11.803 -	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
  11.804 -	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
  11.805 -	| spu \
  11.806 -	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
  11.807 -	| ubicom32 \
  11.808 -	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
  11.809 -	| we32k \
  11.810 -	| x86 | xc16x | xstormy16 | xtensa \
  11.811 -	| z8k | z80)
  11.812 -		basic_machine=$basic_machine-unknown
  11.813 +	# Here we handle the default manufacturer of certain CPU types.  It is in
  11.814 +	# some cases the only manufacturer, in others, it is the most popular.
  11.815 +	w89k)
  11.816 +		cpu=hppa1.1
  11.817 +		vendor=winbond
  11.818  		;;
  11.819 -	c54x)
  11.820 -		basic_machine=tic54x-unknown
  11.821 +	op50n)
  11.822 +		cpu=hppa1.1
  11.823 +		vendor=oki
  11.824  		;;
  11.825 -	c55x)
  11.826 -		basic_machine=tic55x-unknown
  11.827 +	op60c)
  11.828 +		cpu=hppa1.1
  11.829 +		vendor=oki
  11.830  		;;
  11.831 -	c6x)
  11.832 -		basic_machine=tic6x-unknown
  11.833 +	ibm*)
  11.834 +		cpu=i370
  11.835 +		vendor=ibm
  11.836  		;;
  11.837 -	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
  11.838 -		basic_machine=$basic_machine-unknown
  11.839 -		os=-none
  11.840 +	orion105)
  11.841 +		cpu=clipper
  11.842 +		vendor=highlevel
  11.843  		;;
  11.844 -	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
  11.845 +	mac | mpw | mac-mpw)
  11.846 +		cpu=m68k
  11.847 +		vendor=apple
  11.848  		;;
  11.849 -	ms1)
  11.850 -		basic_machine=mt-unknown
  11.851 +	pmac | pmac-mpw)
  11.852 +		cpu=powerpc
  11.853 +		vendor=apple
  11.854  		;;
  11.855  
  11.856 -	strongarm | thumb | xscale)
  11.857 -		basic_machine=arm-unknown
  11.858 +	# Recognize the various machine names and aliases which stand
  11.859 +	# for a CPU type and a company and sometimes even an OS.
  11.860 +	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
  11.861 +		cpu=m68000
  11.862 +		vendor=att
  11.863  		;;
  11.864 -	xgate)
  11.865 -		basic_machine=$basic_machine-unknown
  11.866 -		os=-none
  11.867 +	3b*)
  11.868 +		cpu=we32k
  11.869 +		vendor=att
  11.870  		;;
  11.871 -	xscaleeb)
  11.872 -		basic_machine=armeb-unknown
  11.873 +	bluegene*)
  11.874 +		cpu=powerpc
  11.875 +		vendor=ibm
  11.876 +		os=cnk
  11.877 +		;;
  11.878 +	decsystem10* | dec10*)
  11.879 +		cpu=pdp10
  11.880 +		vendor=dec
  11.881 +		os=tops10
  11.882 +		;;
  11.883 +	decsystem20* | dec20*)
  11.884 +		cpu=pdp10
  11.885 +		vendor=dec
  11.886 +		os=tops20
  11.887 +		;;
  11.888 +	delta | 3300 | motorola-3300 | motorola-delta \
  11.889 +	      | 3300-motorola | delta-motorola)
  11.890 +		cpu=m68k
  11.891 +		vendor=motorola
  11.892 +		;;
  11.893 +	dpx2*)
  11.894 +		cpu=m68k
  11.895 +		vendor=bull
  11.896 +		os=sysv3
  11.897 +		;;
  11.898 +	encore | umax | mmax)
  11.899 +		cpu=ns32k
  11.900 +		vendor=encore
  11.901 +		;;
  11.902 +	elxsi)
  11.903 +		cpu=elxsi
  11.904 +		vendor=elxsi
  11.905 +		os=${os:-bsd}
  11.906 +		;;
  11.907 +	fx2800)
  11.908 +		cpu=i860
  11.909 +		vendor=alliant
  11.910 +		;;
  11.911 +	genix)
  11.912 +		cpu=ns32k
  11.913 +		vendor=ns
  11.914 +		;;
  11.915 +	h3050r* | hiux*)
  11.916 +		cpu=hppa1.1
  11.917 +		vendor=hitachi
  11.918 +		os=hiuxwe2
  11.919 +		;;
  11.920 +	hp3k9[0-9][0-9] | hp9[0-9][0-9])
  11.921 +		cpu=hppa1.0
  11.922 +		vendor=hp
  11.923 +		;;
  11.924 +	hp9k2[0-9][0-9] | hp9k31[0-9])
  11.925 +		cpu=m68000
  11.926 +		vendor=hp
  11.927 +		;;
  11.928 +	hp9k3[2-9][0-9])
  11.929 +		cpu=m68k
  11.930 +		vendor=hp
  11.931 +		;;
  11.932 +	hp9k6[0-9][0-9] | hp6[0-9][0-9])
  11.933 +		cpu=hppa1.0
  11.934 +		vendor=hp
  11.935 +		;;
  11.936 +	hp9k7[0-79][0-9] | hp7[0-79][0-9])
  11.937 +		cpu=hppa1.1
  11.938 +		vendor=hp
  11.939 +		;;
  11.940 +	hp9k78[0-9] | hp78[0-9])
  11.941 +		# FIXME: really hppa2.0-hp
  11.942 +		cpu=hppa1.1
  11.943 +		vendor=hp
  11.944 +		;;
  11.945 +	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
  11.946 +		# FIXME: really hppa2.0-hp
  11.947 +		cpu=hppa1.1
  11.948 +		vendor=hp
  11.949 +		;;
  11.950 +	hp9k8[0-9][13679] | hp8[0-9][13679])
  11.951 +		cpu=hppa1.1
  11.952 +		vendor=hp
  11.953 +		;;
  11.954 +	hp9k8[0-9][0-9] | hp8[0-9][0-9])
  11.955 +		cpu=hppa1.0
  11.956 +		vendor=hp
  11.957 +		;;
  11.958 +	i*86v32)
  11.959 +		cpu=`echo "$1" | sed -e 's/86.*/86/'`
  11.960 +		vendor=pc
  11.961 +		os=sysv32
  11.962 +		;;
  11.963 +	i*86v4*)
  11.964 +		cpu=`echo "$1" | sed -e 's/86.*/86/'`
  11.965 +		vendor=pc
  11.966 +		os=sysv4
  11.967 +		;;
  11.968 +	i*86v)
  11.969 +		cpu=`echo "$1" | sed -e 's/86.*/86/'`
  11.970 +		vendor=pc
  11.971 +		os=sysv
  11.972 +		;;
  11.973 +	i*86sol2)
  11.974 +		cpu=`echo "$1" | sed -e 's/86.*/86/'`
  11.975 +		vendor=pc
  11.976 +		os=solaris2
  11.977 +		;;
  11.978 +	j90 | j90-cray)
  11.979 +		cpu=j90
  11.980 +		vendor=cray
  11.981 +		os=${os:-unicos}
  11.982 +		;;
  11.983 +	iris | iris4d)
  11.984 +		cpu=mips
  11.985 +		vendor=sgi
  11.986 +		case $os in
  11.987 +		    irix*)
  11.988 +			;;
  11.989 +		    *)
  11.990 +			os=irix4
  11.991 +			;;
  11.992 +		esac
  11.993 +		;;
  11.994 +	miniframe)
  11.995 +		cpu=m68000
  11.996 +		vendor=convergent
  11.997 +		;;
  11.998 +	*mint | mint[0-9]* | *MiNT | *MiNT[0-9]*)
  11.999 +		cpu=m68k
 11.1000 +		vendor=atari
 11.1001 +		os=mint
 11.1002 +		;;
 11.1003 +	news-3600 | risc-news)
 11.1004 +		cpu=mips
 11.1005 +		vendor=sony
 11.1006 +		os=newsos
 11.1007 +		;;
 11.1008 +	next | m*-next)
 11.1009 +		cpu=m68k
 11.1010 +		vendor=next
 11.1011 +		case $os in
 11.1012 +		    nextstep* )
 11.1013 +			;;
 11.1014 +		    ns2*)
 11.1015 +		      os=nextstep2
 11.1016 +			;;
 11.1017 +		    *)
 11.1018 +		      os=nextstep3
 11.1019 +			;;
 11.1020 +		esac
 11.1021 +		;;
 11.1022 +	np1)
 11.1023 +		cpu=np1
 11.1024 +		vendor=gould
 11.1025 +		;;
 11.1026 +	op50n-* | op60c-*)
 11.1027 +		cpu=hppa1.1
 11.1028 +		vendor=oki
 11.1029 +		os=proelf
 11.1030 +		;;
 11.1031 +	pa-hitachi)
 11.1032 +		cpu=hppa1.1
 11.1033 +		vendor=hitachi
 11.1034 +		os=hiuxwe2
 11.1035 +		;;
 11.1036 +	pbd)
 11.1037 +		cpu=sparc
 11.1038 +		vendor=tti
 11.1039 +		;;
 11.1040 +	pbb)
 11.1041 +		cpu=m68k
 11.1042 +		vendor=tti
 11.1043 +		;;
 11.1044 +	pc532)
 11.1045 +		cpu=ns32k
 11.1046 +		vendor=pc532
 11.1047 +		;;
 11.1048 +	pn)
 11.1049 +		cpu=pn
 11.1050 +		vendor=gould
 11.1051 +		;;
 11.1052 +	power)
 11.1053 +		cpu=power
 11.1054 +		vendor=ibm
 11.1055 +		;;
 11.1056 +	ps2)
 11.1057 +		cpu=i386
 11.1058 +		vendor=ibm
 11.1059 +		;;
 11.1060 +	rm[46]00)
 11.1061 +		cpu=mips
 11.1062 +		vendor=siemens
 11.1063 +		;;
 11.1064 +	rtpc | rtpc-*)
 11.1065 +		cpu=romp
 11.1066 +		vendor=ibm
 11.1067 +		;;
 11.1068 +	sde)
 11.1069 +		cpu=mipsisa32
 11.1070 +		vendor=sde
 11.1071 +		os=${os:-elf}
 11.1072 +		;;
 11.1073 +	simso-wrs)
 11.1074 +		cpu=sparclite
 11.1075 +		vendor=wrs
 11.1076 +		os=vxworks
 11.1077 +		;;
 11.1078 +	tower | tower-32)
 11.1079 +		cpu=m68k
 11.1080 +		vendor=ncr
 11.1081 +		;;
 11.1082 +	vpp*|vx|vx-*)
 11.1083 +		cpu=f301
 11.1084 +		vendor=fujitsu
 11.1085 +		;;
 11.1086 +	w65)
 11.1087 +		cpu=w65
 11.1088 +		vendor=wdc
 11.1089 +		;;
 11.1090 +	w89k-*)
 11.1091 +		cpu=hppa1.1
 11.1092 +		vendor=winbond
 11.1093 +		os=proelf
 11.1094 +		;;
 11.1095 +	none)
 11.1096 +		cpu=none
 11.1097 +		vendor=none
 11.1098 +		;;
 11.1099 +	leon|leon[3-9])
 11.1100 +		cpu=sparc
 11.1101 +		vendor=$basic_machine
 11.1102 +		;;
 11.1103 +	leon-*|leon[3-9]-*)
 11.1104 +		cpu=sparc
 11.1105 +		vendor=`echo "$basic_machine" | sed 's/-.*//'`
 11.1106  		;;
 11.1107  
 11.1108 -	xscaleel)
 11.1109 -		basic_machine=armel-unknown
 11.1110 +	*-*)
 11.1111 +		# shellcheck disable=SC2162
 11.1112 +		IFS="-" read cpu vendor <<EOF
 11.1113 +$basic_machine
 11.1114 +EOF
 11.1115  		;;
 11.1116 -
 11.1117  	# We use `pc' rather than `unknown'
 11.1118  	# because (1) that's what they normally are, and
 11.1119  	# (2) the word "unknown" tends to confuse beginning users.
 11.1120  	i*86 | x86_64)
 11.1121 -	  basic_machine=$basic_machine-pc
 11.1122 -	  ;;
 11.1123 -	# Object if more than one company name word.
 11.1124 -	*-*-*)
 11.1125 -		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
 11.1126 -		exit 1
 11.1127 +		cpu=$basic_machine
 11.1128 +		vendor=pc
 11.1129  		;;
 11.1130 -	# Recognize the basic CPU types with company name.
 11.1131 -	580-* \
 11.1132 -	| a29k-* \
 11.1133 -	| aarch64-* | aarch64_be-* \
 11.1134 -	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
 11.1135 -	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
 11.1136 -	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
 11.1137 -	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
 11.1138 -	| avr-* | avr32-* \
 11.1139 -	| be32-* | be64-* \
 11.1140 -	| bfin-* | bs2000-* \
 11.1141 -	| c[123]* | c30-* | [cjt]90-* | c4x-* \
 11.1142 -	| clipper-* | craynv-* | cydra-* \
 11.1143 -	| d10v-* | d30v-* | dlx-* \
 11.1144 -	| elxsi-* \
 11.1145 -	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
 11.1146 -	| h8300-* | h8500-* \
 11.1147 -	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
 11.1148 -	| hexagon-* \
 11.1149 -	| i*86-* | i860-* | i960-* | ia64-* \
 11.1150 -	| ip2k-* | iq2000-* \
 11.1151 -	| le32-* | le64-* \
 11.1152 -	| lm32-* \
 11.1153 -	| m32c-* | m32r-* | m32rle-* \
 11.1154 -	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
 11.1155 -	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
 11.1156 -	| microblaze-* | microblazeel-* \
 11.1157 -	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
 11.1158 -	| mips16-* \
 11.1159 -	| mips64-* | mips64el-* \
 11.1160 -	| mips64octeon-* | mips64octeonel-* \
 11.1161 -	| mips64orion-* | mips64orionel-* \
 11.1162 -	| mips64r5900-* | mips64r5900el-* \
 11.1163 -	| mips64vr-* | mips64vrel-* \
 11.1164 -	| mips64vr4100-* | mips64vr4100el-* \
 11.1165 -	| mips64vr4300-* | mips64vr4300el-* \
 11.1166 -	| mips64vr5000-* | mips64vr5000el-* \
 11.1167 -	| mips64vr5900-* | mips64vr5900el-* \
 11.1168 -	| mipsisa32-* | mipsisa32el-* \
 11.1169 -	| mipsisa32r2-* | mipsisa32r2el-* \
 11.1170 -	| mipsisa64-* | mipsisa64el-* \
 11.1171 -	| mipsisa64r2-* | mipsisa64r2el-* \
 11.1172 -	| mipsisa64sb1-* | mipsisa64sb1el-* \
 11.1173 -	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
 11.1174 -	| mipstx39-* | mipstx39el-* \
 11.1175 -	| mmix-* \
 11.1176 -	| mt-* \
 11.1177 -	| msp430-* \
 11.1178 -	| nds32-* | nds32le-* | nds32be-* \
 11.1179 -	| nios-* | nios2-* \
 11.1180 -	| none-* | np1-* | ns16k-* | ns32k-* \
 11.1181 -	| open8-* \
 11.1182 -	| orion-* \
 11.1183 -	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 11.1184 -	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
 11.1185 -	| pyramid-* \
 11.1186 -	| rl78-* | romp-* | rs6000-* | rx-* \
 11.1187 -	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
 11.1188 -	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
 11.1189 -	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
 11.1190 -	| sparclite-* \
 11.1191 -	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
 11.1192 -	| tahoe-* \
 11.1193 -	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
 11.1194 -	| tile*-* \
 11.1195 -	| tron-* \
 11.1196 -	| ubicom32-* \
 11.1197 -	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
 11.1198 -	| vax-* \
 11.1199 -	| we32k-* \
 11.1200 -	| x86-* | x86_64-* | xc16x-* | xps100-* \
 11.1201 -	| xstormy16-* | xtensa*-* \
 11.1202 -	| ymp-* \
 11.1203 -	| z8k-* | z80-*)
 11.1204 +	# These rules are duplicated from below for sake of the special case above;
 11.1205 +	# i.e. things that normalized to x86 arches should also default to "pc"
 11.1206 +	pc98)
 11.1207 +		cpu=i386
 11.1208 +		vendor=pc
 11.1209  		;;
 11.1210 -	# Recognize the basic CPU types without company name, with glob match.
 11.1211 -	xtensa*)
 11.1212 -		basic_machine=$basic_machine-unknown
 11.1213 +	x64 | amd64)
 11.1214 +		cpu=x86_64
 11.1215 +		vendor=pc
 11.1216  		;;
 11.1217 -	# Recognize the various machine names and aliases which stand
 11.1218 -	# for a CPU type and a company and sometimes even an OS.
 11.1219 -	386bsd)
 11.1220 -		basic_machine=i386-unknown
 11.1221 -		os=-bsd
 11.1222 +	# Recognize the basic CPU types without company name.
 11.1223 +	*)
 11.1224 +		cpu=$basic_machine
 11.1225 +		vendor=unknown
 11.1226  		;;
 11.1227 -	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
 11.1228 -		basic_machine=m68000-att
 11.1229 +esac
 11.1230 +
 11.1231 +unset -v basic_machine
 11.1232 +
 11.1233 +# Decode basic machines in the full and proper CPU-Company form.
 11.1234 +case $cpu-$vendor in
 11.1235 +	# Here we handle the default manufacturer of certain CPU types in canonical form. It is in
 11.1236 +	# some cases the only manufacturer, in others, it is the most popular.
 11.1237 +	craynv-unknown)
 11.1238 +		vendor=cray
 11.1239 +		os=${os:-unicosmp}
 11.1240  		;;
 11.1241 -	3b*)
 11.1242 -		basic_machine=we32k-att
 11.1243 +	c90-unknown | c90-cray)
 11.1244 +		vendor=cray
 11.1245 +		os=${os:-unicos}
 11.1246  		;;
 11.1247 -	a29khif)
 11.1248 -		basic_machine=a29k-amd
 11.1249 -		os=-udi
 11.1250 +	fx80-unknown)
 11.1251 +		vendor=alliant
 11.1252  		;;
 11.1253 -	abacus)
 11.1254 -		basic_machine=abacus-unknown
 11.1255 +	romp-unknown)
 11.1256 +		vendor=ibm
 11.1257  		;;
 11.1258 -	adobe68k)
 11.1259 -		basic_machine=m68010-adobe
 11.1260 -		os=-scout
 11.1261 +	mmix-unknown)
 11.1262 +		vendor=knuth
 11.1263  		;;
 11.1264 -	alliant | fx80)
 11.1265 -		basic_machine=fx80-alliant
 11.1266 +	microblaze-unknown | microblazeel-unknown)
 11.1267 +		vendor=xilinx
 11.1268  		;;
 11.1269 -	altos | altos3068)
 11.1270 -		basic_machine=m68k-altos
 11.1271 +	rs6000-unknown)
 11.1272 +		vendor=ibm
 11.1273  		;;
 11.1274 -	am29k)
 11.1275 -		basic_machine=a29k-none
 11.1276 -		os=-bsd
 11.1277 +	vax-unknown)
 11.1278 +		vendor=dec
 11.1279  		;;
 11.1280 -	amd64)
 11.1281 -		basic_machine=x86_64-pc
 11.1282 +	pdp11-unknown)
 11.1283 +		vendor=dec
 11.1284  		;;
 11.1285 +	we32k-unknown)
 11.1286 +		vendor=att
 11.1287 +		;;
 11.1288 +	cydra-unknown)
 11.1289 +		vendor=cydrome
 11.1290 +		;;
 11.1291 +	i370-ibm*)
 11.1292 +		vendor=ibm
 11.1293 +		;;
 11.1294 +	orion-unknown)
 11.1295 +		vendor=highlevel
 11.1296 +		;;
 11.1297 +	xps-unknown | xps100-unknown)
 11.1298 +		cpu=xps100
 11.1299 +		vendor=honeywell
 11.1300 +		;;
 11.1301 +
 11.1302 +	# Here we normalize CPU types with a missing or matching vendor
 11.1303 +	dpx20-unknown | dpx20-bull)
 11.1304 +		cpu=rs6000
 11.1305 +		vendor=bull
 11.1306 +		os=${os:-bosx}
 11.1307 +		;;
 11.1308 +
 11.1309 +	# Here we normalize CPU types irrespective of the vendor
 11.1310  	amd64-*)
 11.1311 -		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
 11.1312 -		;;
 11.1313 -	amdahl)
 11.1314 -		basic_machine=580-amdahl
 11.1315 -		os=-sysv
 11.1316 -		;;
 11.1317 -	amiga | amiga-*)
 11.1318 -		basic_machine=m68k-unknown
 11.1319 -		;;
 11.1320 -	amigaos | amigados)
 11.1321 -		basic_machine=m68k-unknown
 11.1322 -		os=-amigaos
 11.1323 -		;;
 11.1324 -	amigaunix | amix)
 11.1325 -		basic_machine=m68k-unknown
 11.1326 -		os=-sysv4
 11.1327 -		;;
 11.1328 -	apollo68)
 11.1329 -		basic_machine=m68k-apollo
 11.1330 -		os=-sysv
 11.1331 -		;;
 11.1332 -	apollo68bsd)
 11.1333 -		basic_machine=m68k-apollo
 11.1334 -		os=-bsd
 11.1335 -		;;
 11.1336 -	aros)
 11.1337 -		basic_machine=i386-pc
 11.1338 -		os=-aros
 11.1339 -		;;
 11.1340 -	aux)
 11.1341 -		basic_machine=m68k-apple
 11.1342 -		os=-aux
 11.1343 -		;;
 11.1344 -	balance)
 11.1345 -		basic_machine=ns32k-sequent
 11.1346 -		os=-dynix
 11.1347 -		;;
 11.1348 -	blackfin)
 11.1349 -		basic_machine=bfin-unknown
 11.1350 -		os=-linux
 11.1351 +		cpu=x86_64
 11.1352  		;;
 11.1353  	blackfin-*)
 11.1354 -		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
 11.1355 -		os=-linux
 11.1356 -		;;
 11.1357 -	bluegene*)
 11.1358 -		basic_machine=powerpc-ibm
 11.1359 -		os=-cnk
 11.1360 +		cpu=bfin
 11.1361 +		os=linux
 11.1362  		;;
 11.1363  	c54x-*)
 11.1364 -		basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
 11.1365 +		cpu=tic54x
 11.1366  		;;
 11.1367  	c55x-*)
 11.1368 -		basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
 11.1369 +		cpu=tic55x
 11.1370  		;;
 11.1371  	c6x-*)
 11.1372 -		basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
 11.1373 +		cpu=tic6x
 11.1374  		;;
 11.1375 -	c90)
 11.1376 -		basic_machine=c90-cray
 11.1377 -		os=-unicos
 11.1378 +	e500v[12]-*)
 11.1379 +		cpu=powerpc
 11.1380 +		os=$os"spe"
 11.1381  		;;
 11.1382 -	cegcc)
 11.1383 -		basic_machine=arm-unknown
 11.1384 -		os=-cegcc
 11.1385 +	mips3*-*)
 11.1386 +		cpu=mips64
 11.1387  		;;
 11.1388 -	convex-c1)
 11.1389 -		basic_machine=c1-convex
 11.1390 -		os=-bsd
 11.1391 -		;;
 11.1392 -	convex-c2)
 11.1393 -		basic_machine=c2-convex
 11.1394 -		os=-bsd
 11.1395 -		;;
 11.1396 -	convex-c32)
 11.1397 -		basic_machine=c32-convex
 11.1398 -		os=-bsd
 11.1399 -		;;
 11.1400 -	convex-c34)
 11.1401 -		basic_machine=c34-convex
 11.1402 -		os=-bsd
 11.1403 -		;;
 11.1404 -	convex-c38)
 11.1405 -		basic_machine=c38-convex
 11.1406 -		os=-bsd
 11.1407 -		;;
 11.1408 -	cray | j90)
 11.1409 -		basic_machine=j90-cray
 11.1410 -		os=-unicos
 11.1411 -		;;
 11.1412 -	craynv)
 11.1413 -		basic_machine=craynv-cray
 11.1414 -		os=-unicosmp
 11.1415 -		;;
 11.1416 -	cr16 | cr16-*)
 11.1417 -		basic_machine=cr16-unknown
 11.1418 -		os=-elf
 11.1419 -		;;
 11.1420 -	crds | unos)
 11.1421 -		basic_machine=m68k-crds
 11.1422 -		;;
 11.1423 -	crisv32 | crisv32-* | etraxfs*)
 11.1424 -		basic_machine=crisv32-axis
 11.1425 -		;;
 11.1426 -	cris | cris-* | etrax*)
 11.1427 -		basic_machine=cris-axis
 11.1428 -		;;
 11.1429 -	crx)
 11.1430 -		basic_machine=crx-unknown
 11.1431 -		os=-elf
 11.1432 -		;;
 11.1433 -	da30 | da30-*)
 11.1434 -		basic_machine=m68k-da30
 11.1435 -		;;
 11.1436 -	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
 11.1437 -		basic_machine=mips-dec
 11.1438 -		;;
 11.1439 -	decsystem10* | dec10*)
 11.1440 -		basic_machine=pdp10-dec
 11.1441 -		os=-tops10
 11.1442 -		;;
 11.1443 -	decsystem20* | dec20*)
 11.1444 -		basic_machine=pdp10-dec
 11.1445 -		os=-tops20
 11.1446 -		;;
 11.1447 -	delta | 3300 | motorola-3300 | motorola-delta \
 11.1448 -	      | 3300-motorola | delta-motorola)
 11.1449 -		basic_machine=m68k-motorola
 11.1450 -		;;
 11.1451 -	delta88)
 11.1452 -		basic_machine=m88k-motorola
 11.1453 -		os=-sysv3
 11.1454 -		;;
 11.1455 -	dicos)
 11.1456 -		basic_machine=i686-pc
 11.1457 -		os=-dicos
 11.1458 -		;;
 11.1459 -	djgpp)
 11.1460 -		basic_machine=i586-pc
 11.1461 -		os=-msdosdjgpp
 11.1462 -		;;
 11.1463 -	dpx20 | dpx20-*)
 11.1464 -		basic_machine=rs6000-bull
 11.1465 -		os=-bosx
 11.1466 -		;;
 11.1467 -	dpx2* | dpx2*-bull)
 11.1468 -		basic_machine=m68k-bull
 11.1469 -		os=-sysv3
 11.1470 -		;;
 11.1471 -	ebmon29k)
 11.1472 -		basic_machine=a29k-amd
 11.1473 -		os=-ebmon
 11.1474 -		;;
 11.1475 -	elxsi)
 11.1476 -		basic_machine=elxsi-elxsi
 11.1477 -		os=-bsd
 11.1478 -		;;
 11.1479 -	encore | umax | mmax)
 11.1480 -		basic_machine=ns32k-encore
 11.1481 -		;;
 11.1482 -	es1800 | OSE68k | ose68k | ose | OSE)
 11.1483 -		basic_machine=m68k-ericsson
 11.1484 -		os=-ose
 11.1485 -		;;
 11.1486 -	fx2800)
 11.1487 -		basic_machine=i860-alliant
 11.1488 -		;;
 11.1489 -	genix)
 11.1490 -		basic_machine=ns32k-ns
 11.1491 -		;;
 11.1492 -	gmicro)
 11.1493 -		basic_machine=tron-gmicro
 11.1494 -		os=-sysv
 11.1495 -		;;
 11.1496 -	go32)
 11.1497 -		basic_machine=i386-pc
 11.1498 -		os=-go32
 11.1499 -		;;
 11.1500 -	h3050r* | hiux*)
 11.1501 -		basic_machine=hppa1.1-hitachi
 11.1502 -		os=-hiuxwe2
 11.1503 -		;;
 11.1504 -	h8300hms)
 11.1505 -		basic_machine=h8300-hitachi
 11.1506 -		os=-hms
 11.1507 -		;;
 11.1508 -	h8300xray)
 11.1509 -		basic_machine=h8300-hitachi
 11.1510 -		os=-xray
 11.1511 -		;;
 11.1512 -	h8500hms)
 11.1513 -		basic_machine=h8500-hitachi
 11.1514 -		os=-hms
 11.1515 -		;;
 11.1516 -	harris)
 11.1517 -		basic_machine=m88k-harris
 11.1518 -		os=-sysv3
 11.1519 -		;;
 11.1520 -	hp300-*)
 11.1521 -		basic_machine=m68k-hp
 11.1522 -		;;
 11.1523 -	hp300bsd)
 11.1524 -		basic_machine=m68k-hp
 11.1525 -		os=-bsd
 11.1526 -		;;
 11.1527 -	hp300hpux)
 11.1528 -		basic_machine=m68k-hp
 11.1529 -		os=-hpux
 11.1530 -		;;
 11.1531 -	hp3k9[0-9][0-9] | hp9[0-9][0-9])
 11.1532 -		basic_machine=hppa1.0-hp
 11.1533 -		;;
 11.1534 -	hp9k2[0-9][0-9] | hp9k31[0-9])
 11.1535 -		basic_machine=m68000-hp
 11.1536 -		;;
 11.1537 -	hp9k3[2-9][0-9])
 11.1538 -		basic_machine=m68k-hp
 11.1539 -		;;
 11.1540 -	hp9k6[0-9][0-9] | hp6[0-9][0-9])
 11.1541 -		basic_machine=hppa1.0-hp
 11.1542 -		;;
 11.1543 -	hp9k7[0-79][0-9] | hp7[0-79][0-9])
 11.1544 -		basic_machine=hppa1.1-hp
 11.1545 -		;;
 11.1546 -	hp9k78[0-9] | hp78[0-9])
 11.1547 -		# FIXME: really hppa2.0-hp
 11.1548 -		basic_machine=hppa1.1-hp
 11.1549 -		;;
 11.1550 -	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
 11.1551 -		# FIXME: really hppa2.0-hp
 11.1552 -		basic_machine=hppa1.1-hp
 11.1553 -		;;
 11.1554 -	hp9k8[0-9][13679] | hp8[0-9][13679])
 11.1555 -		basic_machine=hppa1.1-hp
 11.1556 -		;;
 11.1557 -	hp9k8[0-9][0-9] | hp8[0-9][0-9])
 11.1558 -		basic_machine=hppa1.0-hp
 11.1559 -		;;
 11.1560 -	hppa-next)
 11.1561 -		os=-nextstep3
 11.1562 -		;;
 11.1563 -	hppaosf)
 11.1564 -		basic_machine=hppa1.1-hp
 11.1565 -		os=-osf
 11.1566 -		;;
 11.1567 -	hppro)
 11.1568 -		basic_machine=hppa1.1-hp
 11.1569 -		os=-proelf
 11.1570 -		;;
 11.1571 -	i370-ibm* | ibm*)
 11.1572 -		basic_machine=i370-ibm
 11.1573 -		;;
 11.1574 -	i*86v32)
 11.1575 -		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 11.1576 -		os=-sysv32
 11.1577 -		;;
 11.1578 -	i*86v4*)
 11.1579 -		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 11.1580 -		os=-sysv4
 11.1581 -		;;
 11.1582 -	i*86v)
 11.1583 -		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 11.1584 -		os=-sysv
 11.1585 -		;;
 11.1586 -	i*86sol2)
 11.1587 -		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 11.1588 -		os=-solaris2
 11.1589 -		;;
 11.1590 -	i386mach)
 11.1591 -		basic_machine=i386-mach
 11.1592 -		os=-mach
 11.1593 -		;;
 11.1594 -	i386-vsta | vsta)
 11.1595 -		basic_machine=i386-unknown
 11.1596 -		os=-vsta
 11.1597 -		;;
 11.1598 -	iris | iris4d)
 11.1599 -		basic_machine=mips-sgi
 11.1600 -		case $os in
 11.1601 -		    -irix*)
 11.1602 -			;;
 11.1603 -		    *)
 11.1604 -			os=-irix4
 11.1605 -			;;
 11.1606 -		esac
 11.1607 -		;;
 11.1608 -	isi68 | isi)
 11.1609 -		basic_machine=m68k-isi
 11.1610 -		os=-sysv
 11.1611 -		;;
 11.1612 -	m68knommu)
 11.1613 -		basic_machine=m68k-unknown
 11.1614 -		os=-linux
 11.1615 +	ms1-*)
 11.1616 +		cpu=mt
 11.1617  		;;
 11.1618  	m68knommu-*)
 11.1619 -		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
 11.1620 -		os=-linux
 11.1621 +		cpu=m68k
 11.1622 +		os=linux
 11.1623  		;;
 11.1624 -	m88k-omron*)
 11.1625 -		basic_machine=m88k-omron
 11.1626 +	m9s12z-* | m68hcs12z-* | hcs12z-* | s12z-*)
 11.1627 +		cpu=s12z
 11.1628  		;;
 11.1629 -	magnum | m3230)
 11.1630 -		basic_machine=mips-mips
 11.1631 -		os=-sysv
 11.1632 +	openrisc-*)
 11.1633 +		cpu=or32
 11.1634  		;;
 11.1635 -	merlin)
 11.1636 -		basic_machine=ns32k-utek
 11.1637 -		os=-sysv
 11.1638 +	parisc-*)
 11.1639 +		cpu=hppa
 11.1640 +		os=linux
 11.1641  		;;
 11.1642 -	microblaze*)
 11.1643 -		basic_machine=microblaze-xilinx
 11.1644 +	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
 11.1645 +		cpu=i586
 11.1646  		;;
 11.1647 -	mingw64)
 11.1648 -		basic_machine=x86_64-pc
 11.1649 -		os=-mingw64
 11.1650 +	pentiumpro-* | p6-* | 6x86-* | athlon-* | athalon_*-*)
 11.1651 +		cpu=i686
 11.1652  		;;
 11.1653 -	mingw32)
 11.1654 -		basic_machine=i386-pc
 11.1655 -		os=-mingw32
 11.1656 +	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
 11.1657 +		cpu=i686
 11.1658  		;;
 11.1659 -	mingw32ce)
 11.1660 -		basic_machine=arm-unknown
 11.1661 -		os=-mingw32ce
 11.1662 +	pentium4-*)
 11.1663 +		cpu=i786
 11.1664  		;;
 11.1665 -	miniframe)
 11.1666 -		basic_machine=m68000-convergent
 11.1667 +	pc98-*)
 11.1668 +		cpu=i386
 11.1669  		;;
 11.1670 -	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
 11.1671 -		basic_machine=m68k-atari
 11.1672 -		os=-mint
 11.1673 +	ppc-* | ppcbe-*)
 11.1674 +		cpu=powerpc
 11.1675  		;;
 11.1676 -	mips3*-*)
 11.1677 -		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
 11.1678 +	ppcle-* | powerpclittle-*)
 11.1679 +		cpu=powerpcle
 11.1680  		;;
 11.1681 -	mips3*)
 11.1682 -		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
 11.1683 +	ppc64-*)
 11.1684 +		cpu=powerpc64
 11.1685  		;;
 11.1686 -	monitor)
 11.1687 -		basic_machine=m68k-rom68k
 11.1688 -		os=-coff
 11.1689 +	ppc64le-* | powerpc64little-*)
 11.1690 +		cpu=powerpc64le
 11.1691  		;;
 11.1692 -	morphos)
 11.1693 -		basic_machine=powerpc-unknown
 11.1694 -		os=-morphos
 11.1695 +	sb1-*)
 11.1696 +		cpu=mipsisa64sb1
 11.1697  		;;
 11.1698 -	msdos)
 11.1699 -		basic_machine=i386-pc
 11.1700 -		os=-msdos
 11.1701 +	sb1el-*)
 11.1702 +		cpu=mipsisa64sb1el
 11.1703  		;;
 11.1704 -	ms1-*)
 11.1705 -		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
 11.1706 +	sh5e[lb]-*)
 11.1707 +		cpu=`echo "$cpu" | sed 's/^\(sh.\)e\(.\)$/\1\2e/'`
 11.1708  		;;
 11.1709 -	msys)
 11.1710 -		basic_machine=i386-pc
 11.1711 -		os=-msys
 11.1712 +	spur-*)
 11.1713 +		cpu=spur
 11.1714  		;;
 11.1715 -	mvs)
 11.1716 -		basic_machine=i370-ibm
 11.1717 -		os=-mvs
 11.1718 +	strongarm-* | thumb-*)
 11.1719 +		cpu=arm
 11.1720  		;;
 11.1721 -	nacl)
 11.1722 -		basic_machine=le32-unknown
 11.1723 -		os=-nacl
 11.1724 +	tx39-*)
 11.1725 +		cpu=mipstx39
 11.1726  		;;
 11.1727 -	ncr3000)
 11.1728 -		basic_machine=i486-ncr
 11.1729 -		os=-sysv4
 11.1730 +	tx39el-*)
 11.1731 +		cpu=mipstx39el
 11.1732  		;;
 11.1733 -	netbsd386)
 11.1734 -		basic_machine=i386-unknown
 11.1735 -		os=-netbsd
 11.1736 +	x64-*)
 11.1737 +		cpu=x86_64
 11.1738  		;;
 11.1739 -	netwinder)
 11.1740 -		basic_machine=armv4l-rebel
 11.1741 -		os=-linux
 11.1742 +	xscale-* | xscalee[bl]-*)
 11.1743 +		cpu=`echo "$cpu" | sed 's/^xscale/arm/'`
 11.1744  		;;
 11.1745 -	news | news700 | news800 | news900)
 11.1746 -		basic_machine=m68k-sony
 11.1747 -		os=-newsos
 11.1748 +
 11.1749 +	# Recognize the canonical CPU Types that limit and/or modify the
 11.1750 +	# company names they are paired with.
 11.1751 +	cr16-*)
 11.1752 +		os=${os:-elf}
 11.1753  		;;
 11.1754 -	news1000)
 11.1755 -		basic_machine=m68030-sony
 11.1756 -		os=-newsos
 11.1757 +	crisv32-* | etraxfs*-*)
 11.1758 +		cpu=crisv32
 11.1759 +		vendor=axis
 11.1760  		;;
 11.1761 -	news-3600 | risc-news)
 11.1762 -		basic_machine=mips-sony
 11.1763 -		os=-newsos
 11.1764 +	cris-* | etrax*-*)
 11.1765 +		cpu=cris
 11.1766 +		vendor=axis
 11.1767  		;;
 11.1768 -	necv70)
 11.1769 -		basic_machine=v70-nec
 11.1770 -		os=-sysv
 11.1771 -		;;
 11.1772 -	next | m*-next )
 11.1773 -		basic_machine=m68k-next
 11.1774 -		case $os in
 11.1775 -		    -nextstep* )
 11.1776 -			;;
 11.1777 -		    -ns2*)
 11.1778 -		      os=-nextstep2
 11.1779 -			;;
 11.1780 -		    *)
 11.1781 -		      os=-nextstep3
 11.1782 -			;;
 11.1783 -		esac
 11.1784 -		;;
 11.1785 -	nh3000)
 11.1786 -		basic_machine=m68k-harris
 11.1787 -		os=-cxux
 11.1788 -		;;
 11.1789 -	nh[45]000)
 11.1790 -		basic_machine=m88k-harris
 11.1791 -		os=-cxux
 11.1792 -		;;
 11.1793 -	nindy960)
 11.1794 -		basic_machine=i960-intel
 11.1795 -		os=-nindy
 11.1796 -		;;
 11.1797 -	mon960)
 11.1798 -		basic_machine=i960-intel
 11.1799 -		os=-mon960
 11.1800 -		;;
 11.1801 -	nonstopux)
 11.1802 -		basic_machine=mips-compaq
 11.1803 -		os=-nonstopux
 11.1804 -		;;
 11.1805 -	np1)
 11.1806 -		basic_machine=np1-gould
 11.1807 +	crx-*)
 11.1808 +		os=${os:-elf}
 11.1809  		;;
 11.1810  	neo-tandem)
 11.1811 -		basic_machine=neo-tandem
 11.1812 +		cpu=neo
 11.1813 +		vendor=tandem
 11.1814  		;;
 11.1815  	nse-tandem)
 11.1816 -		basic_machine=nse-tandem
 11.1817 +		cpu=nse
 11.1818 +		vendor=tandem
 11.1819  		;;
 11.1820  	nsr-tandem)
 11.1821 -		basic_machine=nsr-tandem
 11.1822 +		cpu=nsr
 11.1823 +		vendor=tandem
 11.1824  		;;
 11.1825 -	op50n-* | op60c-*)
 11.1826 -		basic_machine=hppa1.1-oki
 11.1827 -		os=-proelf
 11.1828 +	nsv-tandem)
 11.1829 +		cpu=nsv
 11.1830 +		vendor=tandem
 11.1831  		;;
 11.1832 -	openrisc | openrisc-*)
 11.1833 -		basic_machine=or32-unknown
 11.1834 +	nsx-tandem)
 11.1835 +		cpu=nsx
 11.1836 +		vendor=tandem
 11.1837  		;;
 11.1838 -	os400)
 11.1839 -		basic_machine=powerpc-ibm
 11.1840 -		os=-os400
 11.1841 +	s390-*)
 11.1842 +		cpu=s390
 11.1843 +		vendor=ibm
 11.1844  		;;
 11.1845 -	OSE68000 | ose68000)
 11.1846 -		basic_machine=m68000-ericsson
 11.1847 -		os=-ose
 11.1848 +	s390x-*)
 11.1849 +		cpu=s390x
 11.1850 +		vendor=ibm
 11.1851  		;;
 11.1852 -	os68k)
 11.1853 -		basic_machine=m68k-none
 11.1854 -		os=-os68k
 11.1855 -		;;
 11.1856 -	pa-hitachi)
 11.1857 -		basic_machine=hppa1.1-hitachi
 11.1858 -		os=-hiuxwe2
 11.1859 -		;;
 11.1860 -	paragon)
 11.1861 -		basic_machine=i860-intel
 11.1862 -		os=-osf
 11.1863 -		;;
 11.1864 -	parisc)
 11.1865 -		basic_machine=hppa-unknown
 11.1866 -		os=-linux
 11.1867 -		;;
 11.1868 -	parisc-*)
 11.1869 -		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
 11.1870 -		os=-linux
 11.1871 -		;;
 11.1872 -	pbd)
 11.1873 -		basic_machine=sparc-tti
 11.1874 -		;;
 11.1875 -	pbb)
 11.1876 -		basic_machine=m68k-tti
 11.1877 -		;;
 11.1878 -	pc532 | pc532-*)
 11.1879 -		basic_machine=ns32k-pc532
 11.1880 -		;;
 11.1881 -	pc98)
 11.1882 -		basic_machine=i386-pc
 11.1883 -		;;
 11.1884 -	pc98-*)
 11.1885 -		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
 11.1886 -		;;
 11.1887 -	pentium | p5 | k5 | k6 | nexgen | viac3)
 11.1888 -		basic_machine=i586-pc
 11.1889 -		;;
 11.1890 -	pentiumpro | p6 | 6x86 | athlon | athlon_*)
 11.1891 -		basic_machine=i686-pc
 11.1892 -		;;
 11.1893 -	pentiumii | pentium2 | pentiumiii | pentium3)
 11.1894 -		basic_machine=i686-pc
 11.1895 -		;;
 11.1896 -	pentium4)
 11.1897 -		basic_machine=i786-pc
 11.1898 -		;;
 11.1899 -	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
 11.1900 -		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
 11.1901 -		;;
 11.1902 -	pentiumpro-* | p6-* | 6x86-* | athlon-*)
 11.1903 -		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
 11.1904 -		;;
 11.1905 -	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
 11.1906 -		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
 11.1907 -		;;
 11.1908 -	pentium4-*)
 11.1909 -		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
 11.1910 -		;;
 11.1911 -	pn)
 11.1912 -		basic_machine=pn-gould
 11.1913 -		;;
 11.1914 -	power)	basic_machine=power-ibm
 11.1915 -		;;
 11.1916 -	ppc | ppcbe)	basic_machine=powerpc-unknown
 11.1917 -		;;
 11.1918 -	ppc-* | ppcbe-*)
 11.1919 -		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
 11.1920 -		;;
 11.1921 -	ppcle | powerpclittle | ppc-le | powerpc-little)
 11.1922 -		basic_machine=powerpcle-unknown
 11.1923 -		;;
 11.1924 -	ppcle-* | powerpclittle-*)
 11.1925 -		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
 11.1926 -		;;
 11.1927 -	ppc64)	basic_machine=powerpc64-unknown
 11.1928 -		;;
 11.1929 -	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
 11.1930 -		;;
 11.1931 -	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
 11.1932 -		basic_machine=powerpc64le-unknown
 11.1933 -		;;
 11.1934 -	ppc64le-* | powerpc64little-*)
 11.1935 -		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
 11.1936 -		;;
 11.1937 -	ps2)
 11.1938 -		basic_machine=i386-ibm
 11.1939 -		;;
 11.1940 -	pw32)
 11.1941 -		basic_machine=i586-unknown
 11.1942 -		os=-pw32
 11.1943 -		;;
 11.1944 -	rdos | rdos64)
 11.1945 -		basic_machine=x86_64-pc
 11.1946 -		os=-rdos
 11.1947 -		;;
 11.1948 -	rdos32)
 11.1949 -		basic_machine=i386-pc
 11.1950 -		os=-rdos
 11.1951 -		;;
 11.1952 -	rom68k)
 11.1953 -		basic_machine=m68k-rom68k
 11.1954 -		os=-coff
 11.1955 -		;;
 11.1956 -	rm[46]00)
 11.1957 -		basic_machine=mips-siemens
 11.1958 -		;;
 11.1959 -	rtpc | rtpc-*)
 11.1960 -		basic_machine=romp-ibm
 11.1961 -		;;
 11.1962 -	s390 | s390-*)
 11.1963 -		basic_machine=s390-ibm
 11.1964 -		;;
 11.1965 -	s390x | s390x-*)
 11.1966 -		basic_machine=s390x-ibm
 11.1967 -		;;
 11.1968 -	sa29200)
 11.1969 -		basic_machine=a29k-amd
 11.1970 -		os=-udi
 11.1971 -		;;
 11.1972 -	sb1)
 11.1973 -		basic_machine=mipsisa64sb1-unknown
 11.1974 -		;;
 11.1975 -	sb1el)
 11.1976 -		basic_machine=mipsisa64sb1el-unknown
 11.1977 -		;;
 11.1978 -	sde)
 11.1979 -		basic_machine=mipsisa32-sde
 11.1980 -		os=-elf
 11.1981 -		;;
 11.1982 -	sei)
 11.1983 -		basic_machine=mips-sei
 11.1984 -		os=-seiux
 11.1985 -		;;
 11.1986 -	sequent)
 11.1987 -		basic_machine=i386-sequent
 11.1988 -		;;
 11.1989 -	sh)
 11.1990 -		basic_machine=sh-hitachi
 11.1991 -		os=-hms
 11.1992 -		;;
 11.1993 -	sh5el)
 11.1994 -		basic_machine=sh5le-unknown
 11.1995 -		;;
 11.1996 -	sh64)
 11.1997 -		basic_machine=sh64-unknown
 11.1998 -		;;
 11.1999 -	sparclite-wrs | simso-wrs)
 11.2000 -		basic_machine=sparclite-wrs
 11.2001 -		os=-vxworks
 11.2002 -		;;
 11.2003 -	sps7)
 11.2004 -		basic_machine=m68k-bull
 11.2005 -		os=-sysv2
 11.2006 -		;;
 11.2007 -	spur)
 11.2008 -		basic_machine=spur-unknown
 11.2009 -		;;
 11.2010 -	st2000)
 11.2011 -		basic_machine=m68k-tandem
 11.2012 -		;;
 11.2013 -	stratus)
 11.2014 -		basic_machine=i860-stratus
 11.2015 -		os=-sysv4
 11.2016 -		;;
 11.2017 -	strongarm-* | thumb-*)
 11.2018 -		basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
 11.2019 -		;;
 11.2020 -	sun2)
 11.2021 -		basic_machine=m68000-sun
 11.2022 -		;;
 11.2023 -	sun2os3)
 11.2024 -		basic_machine=m68000-sun
 11.2025 -		os=-sunos3
 11.2026 -		;;
 11.2027 -	sun2os4)
 11.2028 -		basic_machine=m68000-sun
 11.2029 -		os=-sunos4
 11.2030 -		;;
 11.2031 -	sun3os3)
 11.2032 -		basic_machine=m68k-sun
 11.2033 -		os=-sunos3
 11.2034 -		;;
 11.2035 -	sun3os4)
 11.2036 -		basic_machine=m68k-sun
 11.2037 -		os=-sunos4
 11.2038 -		;;
 11.2039 -	sun4os3)
 11.2040 -		basic_machine=sparc-sun
 11.2041 -		os=-sunos3
 11.2042 -		;;
 11.2043 -	sun4os4)
 11.2044 -		basic_machine=sparc-sun
 11.2045 -		os=-sunos4
 11.2046 -		;;
 11.2047 -	sun4sol2)
 11.2048 -		basic_machine=sparc-sun
 11.2049 -		os=-solaris2
 11.2050 -		;;
 11.2051 -	sun3 | sun3-*)
 11.2052 -		basic_machine=m68k-sun
 11.2053 -		;;
 11.2054 -	sun4)
 11.2055 -		basic_machine=sparc-sun
 11.2056 -		;;
 11.2057 -	sun386 | sun386i | roadrunner)
 11.2058 -		basic_machine=i386-sun
 11.2059 -		;;
 11.2060 -	sv1)
 11.2061 -		basic_machine=sv1-cray
 11.2062 -		os=-unicos
 11.2063 -		;;
 11.2064 -	symmetry)
 11.2065 -		basic_machine=i386-sequent
 11.2066 -		os=-dynix
 11.2067 -		;;
 11.2068 -	t3e)
 11.2069 -		basic_machine=alphaev5-cray
 11.2070 -		os=-unicos
 11.2071 -		;;
 11.2072 -	t90)
 11.2073 -		basic_machine=t90-cray
 11.2074 -		os=-unicos
 11.2075 -		;;
 11.2076 -	tile*)
 11.2077 -		basic_machine=$basic_machine-unknown
 11.2078 -		os=-linux-gnu
 11.2079 -		;;
 11.2080 -	tx39)
 11.2081 -		basic_machine=mipstx39-unknown
 11.2082 -		;;
 11.2083 -	tx39el)
 11.2084 -		basic_machine=mipstx39el-unknown
 11.2085 -		;;
 11.2086 -	toad1)
 11.2087 -		basic_machine=pdp10-xkl
 11.2088 -		os=-tops20
 11.2089 -		;;
 11.2090 -	tower | tower-32)
 11.2091 -		basic_machine=m68k-ncr
 11.2092 -		;;
 11.2093 -	tpf)
 11.2094 -		basic_machine=s390x-ibm
 11.2095 -		os=-tpf
 11.2096 -		;;
 11.2097 -	udi29k)
 11.2098 -		basic_machine=a29k-amd
 11.2099 -		os=-udi
 11.2100 -		;;
 11.2101 -	ultra3)
 11.2102 -		basic_machine=a29k-nyu
 11.2103 -		os=-sym1
 11.2104 -		;;
 11.2105 -	v810 | necv810)
 11.2106 -		basic_machine=v810-nec
 11.2107 -		os=-none
 11.2108 -		;;
 11.2109 -	vaxv)
 11.2110 -		basic_machine=vax-dec
 11.2111 -		os=-sysv
 11.2112 -		;;
 11.2113 -	vms)
 11.2114 -		basic_machine=vax-dec
 11.2115 -		os=-vms
 11.2116 -		;;
 11.2117 -	vpp*|vx|vx-*)
 11.2118 -		basic_machine=f301-fujitsu
 11.2119 -		;;
 11.2120 -	vxworks960)
 11.2121 -		basic_machine=i960-wrs
 11.2122 -		os=-vxworks
 11.2123 -		;;
 11.2124 -	vxworks68)
 11.2125 -		basic_machine=m68k-wrs
 11.2126 -		os=-vxworks
 11.2127 -		;;
 11.2128 -	vxworks29k)
 11.2129 -		basic_machine=a29k-wrs
 11.2130 -		os=-vxworks
 11.2131 -		;;
 11.2132 -	w65*)
 11.2133 -		basic_machine=w65-wdc
 11.2134 -		os=-none
 11.2135 -		;;
 11.2136 -	w89k-*)
 11.2137 -		basic_machine=hppa1.1-winbond
 11.2138 -		os=-proelf
 11.2139 -		;;
 11.2140 -	xbox)
 11.2141 -		basic_machine=i686-pc
 11.2142 -		os=-mingw32
 11.2143 -		;;
 11.2144 -	xps | xps100)
 11.2145 -		basic_machine=xps100-honeywell
 11.2146 -		;;
 11.2147 -	xscale-* | xscalee[bl]-*)
 11.2148 -		basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
 11.2149 -		;;
 11.2150 -	ymp)
 11.2151 -		basic_machine=ymp-cray
 11.2152 -		os=-unicos
 11.2153 -		;;
 11.2154 -	z8k-*-coff)
 11.2155 -		basic_machine=z8k-unknown
 11.2156 -		os=-sim
 11.2157 -		;;
 11.2158 -	z80-*-coff)
 11.2159 -		basic_machine=z80-unknown
 11.2160 -		os=-sim
 11.2161 -		;;
 11.2162 -	none)
 11.2163 -		basic_machine=none-none
 11.2164 -		os=-none
 11.2165 +	tile*-*)
 11.2166 +		os=${os:-linux-gnu}
 11.2167  		;;
 11.2168  
 11.2169 -# Here we handle the default manufacturer of certain CPU types.  It is in
 11.2170 -# some cases the only manufacturer, in others, it is the most popular.
 11.2171 -	w89k)
 11.2172 -		basic_machine=hppa1.1-winbond
 11.2173 -		;;
 11.2174 -	op50n)
 11.2175 -		basic_machine=hppa1.1-oki
 11.2176 -		;;
 11.2177 -	op60c)
 11.2178 -		basic_machine=hppa1.1-oki
 11.2179 -		;;
 11.2180 -	romp)
 11.2181 -		basic_machine=romp-ibm
 11.2182 -		;;
 11.2183 -	mmix)
 11.2184 -		basic_machine=mmix-knuth
 11.2185 -		;;
 11.2186 -	rs6000)
 11.2187 -		basic_machine=rs6000-ibm
 11.2188 -		;;
 11.2189 -	vax)
 11.2190 -		basic_machine=vax-dec
 11.2191 -		;;
 11.2192 -	pdp10)
 11.2193 -		# there are many clones, so DEC is not a safe bet
 11.2194 -		basic_machine=pdp10-unknown
 11.2195 -		;;
 11.2196 -	pdp11)
 11.2197 -		basic_machine=pdp11-dec
 11.2198 -		;;
 11.2199 -	we32k)
 11.2200 -		basic_machine=we32k-att
 11.2201 -		;;
 11.2202 -	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
 11.2203 -		basic_machine=sh-unknown
 11.2204 -		;;
 11.2205 -	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
 11.2206 -		basic_machine=sparc-sun
 11.2207 -		;;
 11.2208 -	cydra)
 11.2209 -		basic_machine=cydra-cydrome
 11.2210 -		;;
 11.2211 -	orion)
 11.2212 -		basic_machine=orion-highlevel
 11.2213 -		;;
 11.2214 -	orion105)
 11.2215 -		basic_machine=clipper-highlevel
 11.2216 -		;;
 11.2217 -	mac | mpw | mac-mpw)
 11.2218 -		basic_machine=m68k-apple
 11.2219 -		;;
 11.2220 -	pmac | pmac-mpw)
 11.2221 -		basic_machine=powerpc-apple
 11.2222 -		;;
 11.2223 -	*-unknown)
 11.2224 -		# Make sure to match an already-canonicalized machine name.
 11.2225 -		;;
 11.2226  	*)
 11.2227 -		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
 11.2228 -		exit 1
 11.2229 +		# Recognize the canonical CPU types that are allowed with any
 11.2230 +		# company name.
 11.2231 +		case $cpu in
 11.2232 +			1750a | 580 \
 11.2233 +			| a29k \
 11.2234 +			| aarch64 | aarch64_be \
 11.2235 +			| abacus \
 11.2236 +			| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] \
 11.2237 +			| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] \
 11.2238 +			| alphapca5[67] | alpha64pca5[67] \
 11.2239 +			| am33_2.0 \
 11.2240 +			| amdgcn \
 11.2241 +			| arc | arceb \
 11.2242 +			| arm  | arm[lb]e | arme[lb] | armv* \
 11.2243 +			| avr | avr32 \
 11.2244 +			| asmjs \
 11.2245 +			| ba \
 11.2246 +			| be32 | be64 \
 11.2247 +			| bfin | bs2000 \
 11.2248 +			| c[123]* | c30 | [cjt]90 | c4x \
 11.2249 +			| c8051 | clipper | craynv | csky | cydra \
 11.2250 +			| d10v | d30v | dlx | dsp16xx \
 11.2251 +			| e2k | elxsi | epiphany \
 11.2252 +			| f30[01] | f700 | fido | fr30 | frv | ft32 | fx80 \
 11.2253 +			| h8300 | h8500 \
 11.2254 +			| hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 11.2255 +			| hexagon \
 11.2256 +			| i370 | i*86 | i860 | i960 | ia16 | ia64 \
 11.2257 +			| ip2k | iq2000 \
 11.2258 +			| k1om \
 11.2259 +			| le32 | le64 \
 11.2260 +			| lm32 \
 11.2261 +			| m32c | m32r | m32rle \
 11.2262 +			| m5200 | m68000 | m680[012346]0 | m68360 | m683?2 | m68k \
 11.2263 +			| m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x \
 11.2264 +			| m88110 | m88k | maxq | mb | mcore | mep | metag \
 11.2265 +			| microblaze | microblazeel \
 11.2266 +			| mips | mipsbe | mipseb | mipsel | mipsle \
 11.2267 +			| mips16 \
 11.2268 +			| mips64 | mips64eb | mips64el \
 11.2269 +			| mips64octeon | mips64octeonel \
 11.2270 +			| mips64orion | mips64orionel \
 11.2271 +			| mips64r5900 | mips64r5900el \
 11.2272 +			| mips64vr | mips64vrel \
 11.2273 +			| mips64vr4100 | mips64vr4100el \
 11.2274 +			| mips64vr4300 | mips64vr4300el \
 11.2275 +			| mips64vr5000 | mips64vr5000el \
 11.2276 +			| mips64vr5900 | mips64vr5900el \
 11.2277 +			| mipsisa32 | mipsisa32el \
 11.2278 +			| mipsisa32r2 | mipsisa32r2el \
 11.2279 +			| mipsisa32r6 | mipsisa32r6el \
 11.2280 +			| mipsisa64 | mipsisa64el \
 11.2281 +			| mipsisa64r2 | mipsisa64r2el \
 11.2282 +			| mipsisa64r6 | mipsisa64r6el \
 11.2283 +			| mipsisa64sb1 | mipsisa64sb1el \
 11.2284 +			| mipsisa64sr71k | mipsisa64sr71kel \
 11.2285 +			| mipsr5900 | mipsr5900el \
 11.2286 +			| mipstx39 | mipstx39el \
 11.2287 +			| mmix \
 11.2288 +			| mn10200 | mn10300 \
 11.2289 +			| moxie \
 11.2290 +			| mt \
 11.2291 +			| msp430 \
 11.2292 +			| nds32 | nds32le | nds32be \
 11.2293 +			| nfp \
 11.2294 +			| nios | nios2 | nios2eb | nios2el \
 11.2295 +			| none | np1 | ns16k | ns32k | nvptx \
 11.2296 +			| open8 \
 11.2297 +			| or1k* \
 11.2298 +			| or32 \
 11.2299 +			| orion \
 11.2300 +			| picochip \
 11.2301 +			| pdp10 | pdp11 | pj | pjl | pn | power \
 11.2302 +			| powerpc | powerpc64 | powerpc64le | powerpcle | powerpcspe \
 11.2303 +			| pru \
 11.2304 +			| pyramid \
 11.2305 +			| riscv | riscv32 | riscv64 \
 11.2306 +			| rl78 | romp | rs6000 | rx \
 11.2307 +			| score \
 11.2308 +			| sh | shl \
 11.2309 +			| sh[1234] | sh[24]a | sh[24]ae[lb] | sh[23]e | she[lb] | sh[lb]e \
 11.2310 +			| sh[1234]e[lb] |  sh[12345][lb]e | sh[23]ele | sh64 | sh64le \
 11.2311 +			| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet \
 11.2312 +			| sparclite \
 11.2313 +			| sparcv8 | sparcv9 | sparcv9b | sparcv9v | sv1 | sx* \
 11.2314 +			| spu \
 11.2315 +			| tahoe \
 11.2316 +			| tic30 | tic4x | tic54x | tic55x | tic6x | tic80 \
 11.2317 +			| tron \
 11.2318 +			| ubicom32 \
 11.2319 +			| v70 | v850 | v850e | v850e1 | v850es | v850e2 | v850e2v3 \
 11.2320 +			| vax \
 11.2321 +			| visium \
 11.2322 +			| w65 | wasm32 \
 11.2323 +			| we32k \
 11.2324 +			| x86 | x86_64 | xc16x | xgate | xps100 \
 11.2325 +			| xstormy16 | xtensa* \
 11.2326 +			| ymp \
 11.2327 +			| z8k | z80)
 11.2328 +				;;
 11.2329 +
 11.2330 +			*)
 11.2331 +				echo Invalid configuration \`"$1"\': machine \`"$cpu-$vendor"\' not recognized 1>&2
 11.2332 +				exit 1
 11.2333 +				;;
 11.2334 +		esac
 11.2335  		;;
 11.2336  esac
 11.2337  
 11.2338  # Here we canonicalize certain aliases for manufacturers.
 11.2339 -case $basic_machine in
 11.2340 -	*-digital*)
 11.2341 -		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
 11.2342 +case $vendor in
 11.2343 +	digital*)
 11.2344 +		vendor=dec
 11.2345  		;;
 11.2346 -	*-commodore*)
 11.2347 -		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
 11.2348 +	commodore*)
 11.2349 +		vendor=cbm
 11.2350  		;;
 11.2351  	*)
 11.2352  		;;
 11.2353 @@ -1323,200 +1275,246 @@
 11.2354  
 11.2355  # Decode manufacturer-specific aliases for certain operating systems.
 11.2356  
 11.2357 -if [ x"$os" != x"" ]
 11.2358 +if [ x$os != x ]
 11.2359  then
 11.2360  case $os in
 11.2361 -	# First match some system type aliases
 11.2362 -	# that might get confused with valid system types.
 11.2363 -	# -solaris* is a basic system type, with this one exception.
 11.2364 -	-auroraux)
 11.2365 -		os=-auroraux
 11.2366 +	# First match some system type aliases that might get confused
 11.2367 +	# with valid system types.
 11.2368 +	# solaris* is a basic system type, with this one exception.
 11.2369 +	auroraux)
 11.2370 +		os=auroraux
 11.2371  		;;
 11.2372 -	-solaris1 | -solaris1.*)
 11.2373 +	bluegene*)
 11.2374 +		os=cnk
 11.2375 +		;;
 11.2376 +	solaris1 | solaris1.*)
 11.2377  		os=`echo $os | sed -e 's|solaris1|sunos4|'`
 11.2378  		;;
 11.2379 -	-solaris)
 11.2380 -		os=-solaris2
 11.2381 +	solaris)
 11.2382 +		os=solaris2
 11.2383  		;;
 11.2384 -	-svr4*)
 11.2385 -		os=-sysv4
 11.2386 +	unixware*)
 11.2387 +		os=sysv4.2uw
 11.2388  		;;
 11.2389 -	-unixware*)
 11.2390 -		os=-sysv4.2uw
 11.2391 -		;;
 11.2392 -	-gnu/linux*)
 11.2393 +	gnu/linux*)
 11.2394  		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
 11.2395  		;;
 11.2396 -	# First accept the basic system types.
 11.2397 +	# es1800 is here to avoid being matched by es* (a different OS)
 11.2398 +	es1800*)
 11.2399 +		os=ose
 11.2400 +		;;
 11.2401 +	# Some version numbers need modification
 11.2402 +	chorusos*)
 11.2403 +		os=chorusos
 11.2404 +		;;
 11.2405 +	isc)
 11.2406 +		os=isc2.2
 11.2407 +		;;
 11.2408 +	sco6)
 11.2409 +		os=sco5v6
 11.2410 +		;;
 11.2411 +	sco5)
 11.2412 +		os=sco3.2v5
 11.2413 +		;;
 11.2414 +	sco4)
 11.2415 +		os=sco3.2v4
 11.2416 +		;;
 11.2417 +	sco3.2.[4-9]*)
 11.2418 +		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
 11.2419 +		;;
 11.2420 +	sco3.2v[4-9]* | sco5v6*)
 11.2421 +		# Don't forget version if it is 3.2v4 or newer.
 11.2422 +		;;
 11.2423 +	scout)
 11.2424 +		# Don't match below
 11.2425 +		;;
 11.2426 +	sco*)
 11.2427 +		os=sco3.2v2
 11.2428 +		;;
 11.2429 +	psos*)
 11.2430 +		os=psos
 11.2431 +		;;
 11.2432 +	# Now accept the basic system types.
 11.2433  	# The portable systems comes first.
 11.2434 -	# Each alternative MUST END IN A *, to match a version number.
 11.2435 -	# -sysv* is not here because it comes later, after sysvr4.
 11.2436 -	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
 11.2437 -	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
 11.2438 -	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
 11.2439 -	      | -sym* | -kopensolaris* \
 11.2440 -	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
 11.2441 -	      | -aos* | -aros* \
 11.2442 -	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 11.2443 -	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
 11.2444 -	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
 11.2445 -	      | -bitrig* | -openbsd* | -solidbsd* \
 11.2446 -	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
 11.2447 -	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 11.2448 -	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 11.2449 -	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 11.2450 -	      | -chorusos* | -chorusrdb* | -cegcc* \
 11.2451 -	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
 11.2452 -	      | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
 11.2453 -	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
 11.2454 -	      | -uxpv* | -beos* | -mpeix* | -udk* \
 11.2455 -	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
 11.2456 -	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
 11.2457 -	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
 11.2458 -	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 11.2459 -	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
 11.2460 -	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
 11.2461 -	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
 11.2462 +	# Each alternative MUST end in a * to match a version number.
 11.2463 +	# sysv* is not here because it comes later, after sysvr4.
 11.2464 +	gnu* | bsd* | mach* | minix* | genix* | ultrix* | irix* \
 11.2465 +	     | *vms* | esix* | aix* | cnk* | sunos | sunos[34]*\
 11.2466 +	     | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \
 11.2467 +	     | sym* | kopensolaris* | plan9* \
 11.2468 +	     | amigaos* | amigados* | msdos* | newsos* | unicos* | aof* \
 11.2469 +	     | aos* | aros* | cloudabi* | sortix* \
 11.2470 +	     | nindy* | vxsim* | vxworks* | ebmon* | hms* | mvs* \
 11.2471 +	     | clix* | riscos* | uniplus* | iris* | isc* | rtu* | xenix* \
 11.2472 +	     | knetbsd* | mirbsd* | netbsd* \
 11.2473 +	     | bitrig* | openbsd* | solidbsd* | libertybsd* \
 11.2474 +	     | ekkobsd* | kfreebsd* | freebsd* | riscix* | lynxos* \
 11.2475 +	     | bosx* | nextstep* | cxux* | aout* | elf* | oabi* \
 11.2476 +	     | ptx* | coff* | ecoff* | winnt* | domain* | vsta* \
 11.2477 +	     | udi* | eabi* | lites* | ieee* | go32* | aux* | hcos* \
 11.2478 +	     | chorusrdb* | cegcc* | glidix* \
 11.2479 +	     | cygwin* | msys* | pe* | moss* | proelf* | rtems* \
 11.2480 +	     | midipix* | mingw32* | mingw64* | linux-gnu* | linux-android* \
 11.2481 +	     | linux-newlib* | linux-musl* | linux-uclibc* \
 11.2482 +	     | uxpv* | beos* | mpeix* | udk* | moxiebox* \
 11.2483 +	     | interix* | uwin* | mks* | rhapsody* | darwin* \
 11.2484 +	     | openstep* | oskit* | conix* | pw32* | nonstopux* \
 11.2485 +	     | storm-chaos* | tops10* | tenex* | tops20* | its* \
 11.2486 +	     | os2* | vos* | palmos* | uclinux* | nucleus* \
 11.2487 +	     | morphos* | superux* | rtmk* | windiss* \
 11.2488 +	     | powermax* | dnix* | nx6 | nx7 | sei* | dragonfly* \
 11.2489 +	     | skyos* | haiku* | rdos* | toppers* | drops* | es* \
 11.2490 +	     | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \
 11.2491 +	     | midnightbsd* | amdhsa* | unleashed* | emscripten*)
 11.2492  	# Remember, each alternative MUST END IN *, to match a version number.
 11.2493  		;;
 11.2494 -	-qnx*)
 11.2495 -		case $basic_machine in
 11.2496 -		    x86-* | i*86-*)
 11.2497 +	qnx*)
 11.2498 +		case $cpu in
 11.2499 +		    x86 | i*86)
 11.2500  			;;
 11.2501  		    *)
 11.2502 -			os=-nto$os
 11.2503 +			os=nto-$os
 11.2504  			;;
 11.2505  		esac
 11.2506  		;;
 11.2507 -	-nto-qnx*)
 11.2508 +	hiux*)
 11.2509 +		os=hiuxwe2
 11.2510  		;;
 11.2511 -	-nto*)
 11.2512 +	nto-qnx*)
 11.2513 +		;;
 11.2514 +	nto*)
 11.2515  		os=`echo $os | sed -e 's|nto|nto-qnx|'`
 11.2516  		;;
 11.2517 -	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
 11.2518 -	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
 11.2519 -	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
 11.2520 +	sim | xray | os68k* | v88r* \
 11.2521 +	    | windows* | osx | abug | netware* | os9* \
 11.2522 +	    | macos* | mpw* | magic* | mmixware* | mon960* | lnews*)
 11.2523  		;;
 11.2524 -	-mac*)
 11.2525 -		os=`echo $os | sed -e 's|mac|macos|'`
 11.2526 +	linux-dietlibc)
 11.2527 +		os=linux-dietlibc
 11.2528  		;;
 11.2529 -	-linux-dietlibc)
 11.2530 -		os=-linux-dietlibc
 11.2531 -		;;
 11.2532 -	-linux*)
 11.2533 +	linux*)
 11.2534  		os=`echo $os | sed -e 's|linux|linux-gnu|'`
 11.2535  		;;
 11.2536 -	-sunos5*)
 11.2537 -		os=`echo $os | sed -e 's|sunos5|solaris2|'`
 11.2538 +	lynx*178)
 11.2539 +		os=lynxos178
 11.2540  		;;
 11.2541 -	-sunos6*)
 11.2542 -		os=`echo $os | sed -e 's|sunos6|solaris3|'`
 11.2543 +	lynx*5)
 11.2544 +		os=lynxos5
 11.2545  		;;
 11.2546 -	-opened*)
 11.2547 -		os=-openedition
 11.2548 +	lynx*)
 11.2549 +		os=lynxos
 11.2550  		;;
 11.2551 -	-os400*)
 11.2552 -		os=-os400
 11.2553 +	mac*)
 11.2554 +		os=`echo "$os" | sed -e 's|mac|macos|'`
 11.2555  		;;
 11.2556 -	-wince*)
 11.2557 -		os=-wince
 11.2558 +	opened*)
 11.2559 +		os=openedition
 11.2560  		;;
 11.2561 -	-osfrose*)
 11.2562 -		os=-osfrose
 11.2563 +	os400*)
 11.2564 +		os=os400
 11.2565  		;;
 11.2566 -	-osf*)
 11.2567 -		os=-osf
 11.2568 +	sunos5*)
 11.2569 +		os=`echo "$os" | sed -e 's|sunos5|solaris2|'`
 11.2570  		;;
 11.2571 -	-utek*)
 11.2572 -		os=-bsd
 11.2573 +	sunos6*)
 11.2574 +		os=`echo "$os" | sed -e 's|sunos6|solaris3|'`
 11.2575  		;;
 11.2576 -	-dynix*)
 11.2577 -		os=-bsd
 11.2578 +	wince*)
 11.2579 +		os=wince
 11.2580  		;;
 11.2581 -	-acis*)
 11.2582 -		os=-aos
 11.2583 +	utek*)
 11.2584 +		os=bsd
 11.2585  		;;
 11.2586 -	-atheos*)
 11.2587 -		os=-atheos
 11.2588 +	dynix*)
 11.2589 +		os=bsd
 11.2590  		;;
 11.2591 -	-syllable*)
 11.2592 -		os=-syllable
 11.2593 +	acis*)
 11.2594 +		os=aos
 11.2595  		;;
 11.2596 -	-386bsd)
 11.2597 -		os=-bsd
 11.2598 +	atheos*)
 11.2599 +		os=atheos
 11.2600  		;;
 11.2601 -	-ctix* | -uts*)
 11.2602 -		os=-sysv
 11.2603 +	syllable*)
 11.2604 +		os=syllable
 11.2605  		;;
 11.2606 -	-nova*)
 11.2607 -		os=-rtmk-nova
 11.2608 +	386bsd)
 11.2609 +		os=bsd
 11.2610  		;;
 11.2611 -	-ns2 )
 11.2612 -		os=-nextstep2
 11.2613 +	ctix* | uts*)
 11.2614 +		os=sysv
 11.2615  		;;
 11.2616 -	-nsk*)
 11.2617 -		os=-nsk
 11.2618 +	nova*)
 11.2619 +		os=rtmk-nova
 11.2620 +		;;
 11.2621 +	ns2)
 11.2622 +		os=nextstep2
 11.2623 +		;;
 11.2624 +	nsk*)
 11.2625 +		os=nsk
 11.2626  		;;
 11.2627  	# Preserve the version number of sinix5.
 11.2628 -	-sinix5.*)
 11.2629 +	sinix5.*)
 11.2630  		os=`echo $os | sed -e 's|sinix|sysv|'`
 11.2631  		;;
 11.2632 -	-sinix*)
 11.2633 -		os=-sysv4
 11.2634 +	sinix*)
 11.2635 +		os=sysv4
 11.2636  		;;
 11.2637 -	-tpf*)
 11.2638 -		os=-tpf
 11.2639 +	tpf*)
 11.2640 +		os=tpf
 11.2641  		;;
 11.2642 -	-triton*)
 11.2643 -		os=-sysv3
 11.2644 +	triton*)
 11.2645 +		os=sysv3
 11.2646  		;;
 11.2647 -	-oss*)
 11.2648 -		os=-sysv3
 11.2649 +	oss*)
 11.2650 +		os=sysv3
 11.2651  		;;
 11.2652 -	-svr4)
 11.2653 -		os=-sysv4
 11.2654 +	svr4*)
 11.2655 +		os=sysv4
 11.2656  		;;
 11.2657 -	-svr3)
 11.2658 -		os=-sysv3
 11.2659 +	svr3)
 11.2660 +		os=sysv3
 11.2661  		;;
 11.2662 -	-sysvr4)
 11.2663 -		os=-sysv4
 11.2664 +	sysvr4)
 11.2665 +		os=sysv4
 11.2666  		;;
 11.2667 -	# This must come after -sysvr4.
 11.2668 -	-sysv*)
 11.2669 +	# This must come after sysvr4.
 11.2670 +	sysv*)
 11.2671  		;;
 11.2672 -	-ose*)
 11.2673 -		os=-ose
 11.2674 +	ose*)
 11.2675 +		os=ose
 11.2676  		;;
 11.2677 -	-es1800*)
 11.2678 -		os=-ose
 11.2679 +	*mint | mint[0-9]* | *MiNT | MiNT[0-9]*)
 11.2680 +		os=mint
 11.2681  		;;
 11.2682 -	-xenix)
 11.2683 -		os=-xenix
 11.2684 +	zvmoe)
 11.2685 +		os=zvmoe
 11.2686  		;;
 11.2687 -	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
 11.2688 -		os=-mint
 11.2689 +	dicos*)
 11.2690 +		os=dicos
 11.2691  		;;
 11.2692 -	-aros*)
 11.2693 -		os=-aros
 11.2694 +	pikeos*)
 11.2695 +		# Until real need of OS specific support for
 11.2696 +		# particular features comes up, bare metal
 11.2697 +		# configurations are quite functional.
 11.2698 +		case $cpu in
 11.2699 +		    arm*)
 11.2700 +			os=eabi
 11.2701 +			;;
 11.2702 +		    *)
 11.2703 +			os=elf
 11.2704 +			;;
 11.2705 +		esac
 11.2706  		;;
 11.2707 -	-kaos*)
 11.2708 -		os=-kaos
 11.2709 +	nacl*)
 11.2710  		;;
 11.2711 -	-zvmoe)
 11.2712 -		os=-zvmoe
 11.2713 +	ios)
 11.2714  		;;
 11.2715 -	-dicos*)
 11.2716 -		os=-dicos
 11.2717 +	none)
 11.2718  		;;
 11.2719 -	-nacl*)
 11.2720 -		;;
 11.2721 -	-none)
 11.2722 +	*-eabi)
 11.2723  		;;
 11.2724  	*)
 11.2725 -		# Get rid of the `-' at the beginning of $os.
 11.2726 -		os=`echo $os | sed 's/[^-]*-//'`
 11.2727 -		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
 11.2728 +		echo Invalid configuration \`"$1"\': system \`"$os"\' not recognized 1>&2
 11.2729  		exit 1
 11.2730  		;;
 11.2731  esac
 11.2732 @@ -1532,258 +1530,265 @@
 11.2733  # will signal an error saying that MANUFACTURER isn't an operating
 11.2734  # system, and we'll never get to this point.
 11.2735  
 11.2736 -case $basic_machine in
 11.2737 +case $cpu-$vendor in
 11.2738  	score-*)
 11.2739 -		os=-elf
 11.2740 +		os=elf
 11.2741  		;;
 11.2742  	spu-*)
 11.2743 -		os=-elf
 11.2744 +		os=elf
 11.2745  		;;
 11.2746  	*-acorn)
 11.2747 -		os=-riscix1.2
 11.2748 +		os=riscix1.2
 11.2749  		;;
 11.2750  	arm*-rebel)
 11.2751 -		os=-linux
 11.2752 +		os=linux
 11.2753  		;;
 11.2754  	arm*-semi)
 11.2755 -		os=-aout
 11.2756 +		os=aout
 11.2757  		;;
 11.2758  	c4x-* | tic4x-*)
 11.2759 -		os=-coff
 11.2760 +		os=coff
 11.2761 +		;;
 11.2762 +	c8051-*)
 11.2763 +		os=elf
 11.2764 +		;;
 11.2765 +	clipper-intergraph)
 11.2766 +		os=clix
 11.2767  		;;
 11.2768  	hexagon-*)
 11.2769 -		os=-elf
 11.2770 +		os=elf
 11.2771  		;;
 11.2772  	tic54x-*)
 11.2773 -		os=-coff
 11.2774 +		os=coff
 11.2775  		;;
 11.2776  	tic55x-*)
 11.2777 -		os=-coff
 11.2778 +		os=coff
 11.2779  		;;
 11.2780  	tic6x-*)
 11.2781 -		os=-coff
 11.2782 +		os=coff
 11.2783  		;;
 11.2784  	# This must come before the *-dec entry.
 11.2785  	pdp10-*)
 11.2786 -		os=-tops20
 11.2787 +		os=tops20
 11.2788  		;;
 11.2789  	pdp11-*)
 11.2790 -		os=-none
 11.2791 +		os=none
 11.2792  		;;
 11.2793  	*-dec | vax-*)
 11.2794 -		os=-ultrix4.2
 11.2795 +		os=ultrix4.2
 11.2796  		;;
 11.2797  	m68*-apollo)
 11.2798 -		os=-domain
 11.2799 +		os=domain
 11.2800  		;;
 11.2801  	i386-sun)
 11.2802 -		os=-sunos4.0.2
 11.2803 +		os=sunos4.0.2
 11.2804  		;;
 11.2805  	m68000-sun)
 11.2806 -		os=-sunos3
 11.2807 +		os=sunos3
 11.2808  		;;
 11.2809  	m68*-cisco)
 11.2810 -		os=-aout
 11.2811 +		os=aout
 11.2812  		;;
 11.2813  	mep-*)
 11.2814 -		os=-elf
 11.2815 +		os=elf
 11.2816  		;;
 11.2817  	mips*-cisco)
 11.2818 -		os=-elf
 11.2819 +		os=elf
 11.2820  		;;
 11.2821  	mips*-*)
 11.2822 -		os=-elf
 11.2823 +		os=elf
 11.2824  		;;
 11.2825  	or32-*)
 11.2826 -		os=-coff
 11.2827 +		os=coff
 11.2828  		;;
 11.2829  	*-tti)	# must be before sparc entry or we get the wrong os.
 11.2830 -		os=-sysv3
 11.2831 +		os=sysv3
 11.2832  		;;
 11.2833  	sparc-* | *-sun)
 11.2834 -		os=-sunos4.1.1
 11.2835 +		os=sunos4.1.1
 11.2836 +		;;
 11.2837 +	pru-*)
 11.2838 +		os=elf
 11.2839  		;;
 11.2840  	*-be)
 11.2841 -		os=-beos
 11.2842 -		;;
 11.2843 -	*-haiku)
 11.2844 -		os=-haiku
 11.2845 +		os=beos
 11.2846  		;;
 11.2847  	*-ibm)
 11.2848 -		os=-aix
 11.2849 +		os=aix
 11.2850  		;;
 11.2851  	*-knuth)
 11.2852 -		os=-mmixware
 11.2853 +		os=mmixware
 11.2854  		;;
 11.2855  	*-wec)
 11.2856 -		os=-proelf
 11.2857 +		os=proelf
 11.2858  		;;
 11.2859  	*-winbond)
 11.2860 -		os=-proelf
 11.2861 +		os=proelf
 11.2862  		;;
 11.2863  	*-oki)
 11.2864 -		os=-proelf
 11.2865 +		os=proelf
 11.2866  		;;
 11.2867  	*-hp)
 11.2868 -		os=-hpux
 11.2869 +		os=hpux
 11.2870  		;;
 11.2871  	*-hitachi)
 11.2872 -		os=-hiux
 11.2873 +		os=hiux
 11.2874  		;;
 11.2875  	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
 11.2876 -		os=-sysv
 11.2877 +		os=sysv
 11.2878  		;;
 11.2879  	*-cbm)
 11.2880 -		os=-amigaos
 11.2881 +		os=amigaos
 11.2882  		;;
 11.2883  	*-dg)
 11.2884 -		os=-dgux
 11.2885 +		os=dgux
 11.2886  		;;
 11.2887  	*-dolphin)
 11.2888 -		os=-sysv3
 11.2889 +		os=sysv3
 11.2890  		;;
 11.2891  	m68k-ccur)
 11.2892 -		os=-rtu
 11.2893 +		os=rtu
 11.2894  		;;
 11.2895  	m88k-omron*)
 11.2896 -		os=-luna
 11.2897 +		os=luna
 11.2898  		;;
 11.2899 -	*-next )
 11.2900 -		os=-nextstep
 11.2901 +	*-next)
 11.2902 +		os=nextstep
 11.2903  		;;
 11.2904  	*-sequent)
 11.2905 -		os=-ptx
 11.2906 +		os=ptx
 11.2907  		;;
 11.2908  	*-crds)
 11.2909 -		os=-unos
 11.2910 +		os=unos
 11.2911  		;;
 11.2912  	*-ns)
 11.2913 -		os=-genix
 11.2914 +		os=genix
 11.2915  		;;
 11.2916  	i370-*)
 11.2917 -		os=-mvs
 11.2918 -		;;
 11.2919 -	*-next)
 11.2920 -		os=-nextstep3
 11.2921 +		os=mvs
 11.2922  		;;
 11.2923  	*-gould)
 11.2924 -		os=-sysv
 11.2925 +		os=sysv
 11.2926  		;;
 11.2927  	*-highlevel)
 11.2928 -		os=-bsd
 11.2929 +		os=bsd
 11.2930  		;;
 11.2931  	*-encore)
 11.2932 -		os=-bsd
 11.2933 +		os=bsd
 11.2934  		;;
 11.2935  	*-sgi)
 11.2936 -		os=-irix
 11.2937 +		os=irix
 11.2938  		;;
 11.2939  	*-siemens)
 11.2940 -		os=-sysv4
 11.2941 +		os=sysv4
 11.2942  		;;
 11.2943  	*-masscomp)
 11.2944 -		os=-rtu
 11.2945 +		os=rtu
 11.2946  		;;
 11.2947  	f30[01]-fujitsu | f700-fujitsu)
 11.2948 -		os=-uxpv
 11.2949 +		os=uxpv
 11.2950  		;;
 11.2951  	*-rom68k)
 11.2952 -		os=-coff
 11.2953 +		os=coff
 11.2954  		;;
 11.2955  	*-*bug)
 11.2956 -		os=-coff
 11.2957 +		os=coff
 11.2958  		;;
 11.2959  	*-apple)
 11.2960 -		os=-macos
 11.2961 +		os=macos
 11.2962  		;;
 11.2963  	*-atari*)
 11.2964 -		os=-mint
 11.2965 +		os=mint
 11.2966 +		;;
 11.2967 +	*-wrs)
 11.2968 +		os=vxworks
 11.2969  		;;
 11.2970  	*)
 11.2971 -		os=-none
 11.2972 +		os=none
 11.2973  		;;
 11.2974  esac
 11.2975  fi
 11.2976  
 11.2977  # Here we handle the case where we know the os, and the CPU type, but not the
 11.2978  # manufacturer.  We pick the logical manufacturer.
 11.2979 -vendor=unknown
 11.2980 -case $basic_machine in
 11.2981 -	*-unknown)
 11.2982 +case $vendor in
 11.2983 +	unknown)
 11.2984  		case $os in
 11.2985 -			-riscix*)
 11.2986 +			riscix*)
 11.2987  				vendor=acorn
 11.2988  				;;
 11.2989 -			-sunos*)
 11.2990 +			sunos*)
 11.2991  				vendor=sun
 11.2992  				;;
 11.2993 -			-cnk*|-aix*)
 11.2994 +			cnk*|-aix*)
 11.2995  				vendor=ibm
 11.2996  				;;
 11.2997 -			-beos*)
 11.2998 +			beos*)
 11.2999  				vendor=be
 11.3000  				;;
 11.3001 -			-hpux*)
 11.3002 +			hpux*)
 11.3003  				vendor=hp
 11.3004  				;;
 11.3005 -			-mpeix*)
 11.3006 +			mpeix*)
 11.3007  				vendor=hp
 11.3008  				;;
 11.3009 -			-hiux*)
 11.3010 +			hiux*)
 11.3011  				vendor=hitachi
 11.3012  				;;
 11.3013 -			-unos*)
 11.3014 +			unos*)
 11.3015  				vendor=crds
 11.3016  				;;
 11.3017 -			-dgux*)
 11.3018 +			dgux*)
 11.3019  				vendor=dg
 11.3020  				;;
 11.3021 -			-luna*)
 11.3022 +			luna*)
 11.3023  				vendor=omron
 11.3024  				;;
 11.3025 -			-genix*)
 11.3026 +			genix*)
 11.3027  				vendor=ns
 11.3028  				;;
 11.3029 -			-mvs* | -opened*)
 11.3030 +			clix*)
 11.3031 +				vendor=intergraph
 11.3032 +				;;
 11.3033 +			mvs* | opened*)
 11.3034  				vendor=ibm
 11.3035  				;;
 11.3036 -			-os400*)
 11.3037 +			os400*)
 11.3038  				vendor=ibm
 11.3039  				;;
 11.3040 -			-ptx*)
 11.3041 +			ptx*)
 11.3042  				vendor=sequent
 11.3043  				;;
 11.3044 -			-tpf*)
 11.3045 +			tpf*)
 11.3046  				vendor=ibm
 11.3047  				;;
 11.3048 -			-vxsim* | -vxworks* | -windiss*)
 11.3049 +			vxsim* | vxworks* | windiss*)
 11.3050  				vendor=wrs
 11.3051  				;;
 11.3052 -			-aux*)
 11.3053 +			aux*)
 11.3054  				vendor=apple
 11.3055  				;;
 11.3056 -			-hms*)
 11.3057 +			hms*)
 11.3058  				vendor=hitachi
 11.3059  				;;
 11.3060 -			-mpw* | -macos*)
 11.3061 +			mpw* | macos*)
 11.3062  				vendor=apple
 11.3063  				;;
 11.3064 -			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
 11.3065 +			*mint | mint[0-9]* | *MiNT | MiNT[0-9]*)
 11.3066  				vendor=atari
 11.3067  				;;
 11.3068 -			-vos*)
 11.3069 +			vos*)
 11.3070  				vendor=stratus
 11.3071  				;;
 11.3072  		esac
 11.3073 -		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
 11.3074  		;;
 11.3075  esac
 11.3076  
 11.3077 -echo $basic_machine$os
 11.3078 +echo "$cpu-$vendor-$os"
 11.3079  exit
 11.3080  
 11.3081  # Local variables:
 11.3082 -# eval: (add-hook 'write-file-hooks 'time-stamp)
 11.3083 +# eval: (add-hook 'before-save-hook 'time-stamp)
 11.3084  # time-stamp-start: "timestamp='"
 11.3085  # time-stamp-format: "%:y-%02m-%02d"
 11.3086  # time-stamp-end: "'"
    12.1 --- a/external/libvorbisidec-1.2.1/configure	Sun Dec 01 18:50:02 2019 +0300
    12.2 +++ b/external/libvorbisidec-1.2.1/configure	Sun Dec 01 20:20:02 2019 +0300
    12.3 @@ -641,6 +641,7 @@
    12.4  PKG_CONFIG_LIBDIR
    12.5  PKG_CONFIG_PATH
    12.6  PKG_CONFIG
    12.7 +LT_SYS_LIBRARY_PATH
    12.8  OTOOL64
    12.9  OTOOL
   12.10  LIPO
   12.11 @@ -671,7 +672,6 @@
   12.12  AMDEPBACKSLASH
   12.13  AMDEP_FALSE
   12.14  AMDEP_TRUE
   12.15 -am__quote
   12.16  am__include
   12.17  DEPDIR
   12.18  OBJEXT
   12.19 @@ -745,6 +745,7 @@
   12.20  docdir
   12.21  oldincludedir
   12.22  includedir
   12.23 +runstatedir
   12.24  localstatedir
   12.25  sharedstatedir
   12.26  sysconfdir
   12.27 @@ -763,7 +764,8 @@
   12.28  PACKAGE_TARNAME
   12.29  PACKAGE_NAME
   12.30  PATH_SEPARATOR
   12.31 -SHELL'
   12.32 +SHELL
   12.33 +am__quote'
   12.34  ac_subst_files=''
   12.35  ac_user_opts='
   12.36  enable_option_checking
   12.37 @@ -774,6 +776,7 @@
   12.38  enable_static
   12.39  with_pic
   12.40  enable_fast_install
   12.41 +with_aix_soname
   12.42  with_gnu_ld
   12.43  with_sysroot
   12.44  enable_libtool_lock
   12.45 @@ -792,6 +795,7 @@
   12.46  LIBS
   12.47  CPPFLAGS
   12.48  CPP
   12.49 +LT_SYS_LIBRARY_PATH
   12.50  PKG_CONFIG
   12.51  PKG_CONFIG_PATH
   12.52  PKG_CONFIG_LIBDIR
   12.53 @@ -835,6 +839,7 @@
   12.54  sysconfdir='${prefix}/etc'
   12.55  sharedstatedir='${prefix}/com'
   12.56  localstatedir='${prefix}/var'
   12.57 +runstatedir='${localstatedir}/run'
   12.58  includedir='${prefix}/include'
   12.59  oldincludedir='/usr/include'
   12.60  docdir='${datarootdir}/doc/${PACKAGE}'
   12.61 @@ -1087,6 +1092,15 @@
   12.62    | -silent | --silent | --silen | --sile | --sil)
   12.63      silent=yes ;;
   12.64  
   12.65 +  -runstatedir | --runstatedir | --runstatedi | --runstated \
   12.66 +  | --runstate | --runstat | --runsta | --runst | --runs \
   12.67 +  | --run | --ru | --r)
   12.68 +    ac_prev=runstatedir ;;
   12.69 +  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
   12.70 +  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
   12.71 +  | --run=* | --ru=* | --r=*)
   12.72 +    runstatedir=$ac_optarg ;;
   12.73 +
   12.74    -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
   12.75      ac_prev=sbindir ;;
   12.76    -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
   12.77 @@ -1224,7 +1238,7 @@
   12.78  for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
   12.79  		datadir sysconfdir sharedstatedir localstatedir includedir \
   12.80  		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
   12.81 -		libdir localedir mandir
   12.82 +		libdir localedir mandir runstatedir
   12.83  do
   12.84    eval ac_val=\$$ac_var
   12.85    # Remove trailing slashes.
   12.86 @@ -1377,6 +1391,7 @@
   12.87    --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
   12.88    --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
   12.89    --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
   12.90 +  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
   12.91    --libdir=DIR            object code libraries [EPREFIX/lib]
   12.92    --includedir=DIR        C header files [PREFIX/include]
   12.93    --oldincludedir=DIR     C header files for non-gcc [/usr/include]
   12.94 @@ -1436,9 +1451,12 @@
   12.95    --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
   12.96    --with-pic[=PKGS]       try to use only PIC/non-PIC objects [default=use
   12.97                            both]
   12.98 +  --with-aix-soname=aix|svr4|both
   12.99 +                          shared library versioning (aka "SONAME") variant to
  12.100 +                          provide on AIX, [default=aix].
  12.101    --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
  12.102 -  --with-sysroot=DIR Search for dependent libraries within DIR
  12.103 -                        (or the compiler's sysroot if not specified).
  12.104 +  --with-sysroot[=DIR]    Search for dependent libraries within DIR (or the
  12.105 +                          compiler's sysroot if not specified).
  12.106    --with-ogg=PFX          Prefix where libogg is installed (optional)
  12.107    --with-ogg-libraries=DIR
  12.108                            Directory where libogg library is installed
  12.109 @@ -1455,6 +1473,8 @@
  12.110    CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
  12.111                you have headers in a nonstandard directory <include dir>
  12.112    CPP         C preprocessor
  12.113 +  LT_SYS_LIBRARY_PATH
  12.114 +              User-defined run-time library search path.
  12.115    PKG_CONFIG  path to pkg-config utility
  12.116    PKG_CONFIG_PATH
  12.117                directories to add to pkg-config's search path
  12.118 @@ -2443,7 +2463,7 @@
  12.119  ac_config_headers="$ac_config_headers config.h"
  12.120  
  12.121  
  12.122 -am__api_version='1.13'
  12.123 +am__api_version='1.16'
  12.124  
  12.125  # Find a good install program.  We prefer a C program (faster),
  12.126  # so one script is as good as another.  But avoid the broken or
  12.127 @@ -2615,8 +2635,8 @@
  12.128  ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
  12.129  program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
  12.130  
  12.131 -# expand $ac_aux_dir to an absolute path
  12.132 -am_aux_dir=`cd $ac_aux_dir && pwd`
  12.133 +# Expand $ac_aux_dir to an absolute path.
  12.134 +am_aux_dir=`cd "$ac_aux_dir" && pwd`
  12.135  
  12.136  if test x"${MISSING+set}" != xset; then
  12.137    case $am_aux_dir in
  12.138 @@ -2635,7 +2655,7 @@
  12.139  $as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
  12.140  fi
  12.141  
  12.142 -if test x"${install_sh}" != xset; then
  12.143 +if test x"${install_sh+set}" != xset; then
  12.144    case $am_aux_dir in
  12.145    *\ * | *\	*)
  12.146      install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
  12.147 @@ -2960,16 +2980,20 @@
  12.148  
  12.149  # For better backward compatibility.  To be removed once Automake 1.9.x
  12.150  # dies out for good.  For more background, see:
  12.151 -# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
  12.152 -# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
  12.153 +# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
  12.154 +# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
  12.155  mkdir_p='$(MKDIR_P)'
  12.156  
  12.157 -# We need awk for the "check" target.  The system "awk" is bad on
  12.158 -# some platforms.
  12.159 +# We need awk for the "check" target (and possibly the TAP driver).  The
  12.160 +# system "awk" is bad on some platforms.
  12.161  # Always define AMTAR for backward compatibility.  Yes, it's still used
  12.162  # in the wild :-(  We should find a proper way to deprecate it ...
  12.163  AMTAR='$${TAR-tar}'
  12.164  
  12.165 +
  12.166 +# We'll loop over all known methods to create a tar archive until one works.
  12.167 +_am_tools='gnutar  pax cpio none'
  12.168 +
  12.169  am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
  12.170  
  12.171  
  12.172 @@ -2977,6 +3001,49 @@
  12.173  
  12.174  
  12.175  
  12.176 +# POSIX will say in a future version that running "rm -f" with no argument
  12.177 +# is OK; and we want to be able to make that assumption in our Makefile
  12.178 +# recipes.  So use an aggressive probe to check that the usage we want is
  12.179 +# actually supported "in the wild" to an acceptable degree.
  12.180 +# See automake bug#10828.
  12.181 +# To make any issue more visible, cause the running configure to be aborted
  12.182 +# by default if the 'rm' program in use doesn't match our expectations; the
  12.183 +# user can still override this though.
  12.184 +if rm -f && rm -fr && rm -rf; then : OK; else
  12.185 +  cat >&2 <<'END'
  12.186 +Oops!
  12.187 +
  12.188 +Your 'rm' program seems unable to run without file operands specified
  12.189 +on the command line, even when the '-f' option is present.  This is contrary
  12.190 +to the behaviour of most rm programs out there, and not conforming with
  12.191 +the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
  12.192 +
  12.193 +Please tell bug-automake@gnu.org about your system, including the value
  12.194 +of your $PATH and any error possibly output before this message.  This
  12.195 +can help us improve future automake versions.
  12.196 +
  12.197 +END
  12.198 +  if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
  12.199 +    echo 'Configuration will proceed anyway, since you have set the' >&2
  12.200 +    echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
  12.201 +    echo >&2
  12.202 +  else
  12.203 +    cat >&2 <<'END'
  12.204 +Aborting the configuration process, to ensure you take notice of the issue.
  12.205 +
  12.206 +You can download and install GNU coreutils to get an 'rm' implementation
  12.207 +that behaves properly: <https://www.gnu.org/software/coreutils/>.
  12.208 +
  12.209 +If you want to complete the configuration process using your problematic
  12.210 +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
  12.211 +to "yes", and re-run configure.
  12.212 +
  12.213 +END
  12.214 +    as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
  12.215 +  fi
  12.216 +fi
  12.217 +
  12.218 +
  12.219  
  12.220  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
  12.221  $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
  12.222 @@ -3801,49 +3868,108 @@
  12.223  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  12.224  ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  12.225  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  12.226 +
  12.227 +ac_ext=c
  12.228 +ac_cpp='$CPP $CPPFLAGS'
  12.229 +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  12.230 +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  12.231 +ac_compiler_gnu=$ac_cv_c_compiler_gnu
  12.232 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
  12.233 +$as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
  12.234 +if ${am_cv_prog_cc_c_o+:} false; then :
  12.235 +  $as_echo_n "(cached) " >&6
  12.236 +else
  12.237 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  12.238 +/* end confdefs.h.  */
  12.239 +
  12.240 +int
  12.241 +main (void)
  12.242 +{
  12.243 +
  12.244 +  ;
  12.245 +  return 0;
  12.246 +}
  12.247 +_ACEOF
  12.248 +  # Make sure it works both with $CC and with simple cc.
  12.249 +  # Following AC_PROG_CC_C_O, we do the test twice because some
  12.250 +  # compilers refuse to overwrite an existing .o file with -o,
  12.251 +  # though they will create one.
  12.252 +  am_cv_prog_cc_c_o=yes
  12.253 +  for am_i in 1 2; do
  12.254 +    if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
  12.255 +   ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
  12.256 +   ac_status=$?
  12.257 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
  12.258 +   (exit $ac_status); } \
  12.259 +         && test -f conftest2.$ac_objext; then
  12.260 +      : OK
  12.261 +    else
  12.262 +      am_cv_prog_cc_c_o=no
  12.263 +      break
  12.264 +    fi
  12.265 +  done
  12.266 +  rm -f core conftest*
  12.267 +  unset am_i
  12.268 +fi
  12.269 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
  12.270 +$as_echo "$am_cv_prog_cc_c_o" >&6; }
  12.271 +if test "$am_cv_prog_cc_c_o" != yes; then
  12.272 +   # Losing compiler, so override with the script.
  12.273 +   # FIXME: It is wrong to rewrite CC.
  12.274 +   # But if we don't then we get into trouble of one sort or another.
  12.275 +   # A longer-term fix would be to have automake use am__CC in this case,
  12.276 +   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
  12.277 +   CC="$am_aux_dir/compile $CC"
  12.278 +fi
  12.279 +ac_ext=c
  12.280 +ac_cpp='$CPP $CPPFLAGS'
  12.281 +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  12.282 +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  12.283 +ac_compiler_gnu=$ac_cv_c_compiler_gnu
  12.284 +
  12.285  DEPDIR="${am__leading_dot}deps"
  12.286  
  12.287  ac_config_commands="$ac_config_commands depfiles"
  12.288  
  12.289 -
  12.290 -am_make=${MAKE-make}
  12.291 -cat > confinc << 'END'
  12.292 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} supports the include directive" >&5
  12.293 +$as_echo_n "checking whether ${MAKE-make} supports the include directive... " >&6; }
  12.294 +cat > confinc.mk << 'END'
  12.295  am__doit:
  12.296 -	@echo this is the am__doit target
  12.297 +	@echo this is the am__doit target >confinc.out
  12.298  .PHONY: am__doit
  12.299  END
  12.300 -# If we don't find an include directive, just comment out the code.
  12.301 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
  12.302 -$as_echo_n "checking for style of include used by $am_make... " >&6; }
  12.303  am__include="#"
  12.304  am__quote=
  12.305 -_am_result=none
  12.306 -# First try GNU make style include.
  12.307 -echo "include confinc" > confmf
  12.308 -# Ignore all kinds of additional output from 'make'.
  12.309 -case `$am_make -s -f confmf 2> /dev/null` in #(
  12.310 -*the\ am__doit\ target*)
  12.311 -  am__include=include
  12.312 -  am__quote=
  12.313 -  _am_result=GNU
  12.314 -  ;;
  12.315 -esac
  12.316 -# Now try BSD make style include.
  12.317 -if test "$am__include" = "#"; then
  12.318 -   echo '.include "confinc"' > confmf
  12.319 -   case `$am_make -s -f confmf 2> /dev/null` in #(
  12.320 -   *the\ am__doit\ target*)
  12.321 -     am__include=.include
  12.322 -     am__quote="\""
  12.323 -     _am_result=BSD
  12.324 +# BSD make does it like this.
  12.325 +echo '.include "confinc.mk" # ignored' > confmf.BSD
  12.326 +# Other make implementations (GNU, Solaris 10, AIX) do it like this.
  12.327 +echo 'include confinc.mk # ignored' > confmf.GNU
  12.328 +_am_result=no
  12.329 +for s in GNU BSD; do
  12.330 +  { echo "$as_me:$LINENO: ${MAKE-make} -f confmf.$s && cat confinc.out" >&5
  12.331 +   (${MAKE-make} -f confmf.$s && cat confinc.out) >&5 2>&5
  12.332 +   ac_status=$?
  12.333 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
  12.334 +   (exit $ac_status); }
  12.335 +  case $?:`cat confinc.out 2>/dev/null` in #(
  12.336 +  '0:this is the am__doit target') :
  12.337 +    case $s in #(
  12.338 +  BSD) :
  12.339 +    am__include='.include' am__quote='"' ;; #(
  12.340 +  *) :
  12.341 +    am__include='include' am__quote='' ;;
  12.342 +esac ;; #(
  12.343 +  *) :
  12.344       ;;
  12.345 -   esac
  12.346 -fi
  12.347 -
  12.348 -
  12.349 -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
  12.350 -$as_echo "$_am_result" >&6; }
  12.351 -rm -f confinc confmf
  12.352 +esac
  12.353 +  if test "$am__include" != "#"; then
  12.354 +    _am_result="yes ($s style)"
  12.355 +    break
  12.356 +  fi
  12.357 +done
  12.358 +rm -f confinc.* confmf.*
  12.359 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${_am_result}" >&5
  12.360 +$as_echo "${_am_result}" >&6; }
  12.361  
  12.362  # Check whether --enable-dependency-tracking was given.
  12.363  if test "${enable_dependency_tracking+set}" = set; then :
  12.364 @@ -4443,22 +4569,22 @@
  12.365  
  12.366  
  12.367  
  12.368 -macro_version='2.4.2'
  12.369 -macro_revision='1.3337'
  12.370 -
  12.371 -
  12.372 -
  12.373 -
  12.374 -
  12.375 -
  12.376 -
  12.377 -
  12.378 -
  12.379 -
  12.380 -
  12.381 -
  12.382 -
  12.383 -ltmain="$ac_aux_dir/ltmain.sh"
  12.384 +macro_version='2.4.6'
  12.385 +macro_revision='2.4.6'
  12.386 +
  12.387 +
  12.388 +
  12.389 +
  12.390 +
  12.391 +
  12.392 +
  12.393 +
  12.394 +
  12.395 +
  12.396 +
  12.397 +
  12.398 +
  12.399 +ltmain=$ac_aux_dir/ltmain.sh
  12.400  
  12.401  # Backslashify metacharacters that are still active within
  12.402  # double-quoted strings.
  12.403 @@ -4507,7 +4633,7 @@
  12.404      $ECHO ""
  12.405  }
  12.406  
  12.407 -case "$ECHO" in
  12.408 +case $ECHO in
  12.409    printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5
  12.410  $as_echo "printf" >&6; } ;;
  12.411    print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5
  12.412 @@ -4830,19 +4956,19 @@
  12.413  
  12.414  # Check whether --with-gnu-ld was given.
  12.415  if test "${with_gnu_ld+set}" = set; then :
  12.416 -  withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
  12.417 +  withval=$with_gnu_ld; test no = "$withval" || with_gnu_ld=yes
  12.418  else
  12.419    with_gnu_ld=no
  12.420  fi
  12.421  
  12.422  ac_prog=ld
  12.423 -if test "$GCC" = yes; then
  12.424 +if test yes = "$GCC"; then
  12.425    # Check if gcc -print-prog-name=ld gives a path.
  12.426    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
  12.427  $as_echo_n "checking for ld used by $CC... " >&6; }
  12.428    case $host in
  12.429    *-*-mingw*)
  12.430 -    # gcc leaves a trailing carriage return which upsets mingw
  12.431 +    # gcc leaves a trailing carriage return, which upsets mingw
  12.432      ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
  12.433    *)
  12.434      ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
  12.435 @@ -4856,7 +4982,7 @@
  12.436        while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
  12.437  	ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
  12.438        done
  12.439 -      test -z "$LD" && LD="$ac_prog"
  12.440 +      test -z "$LD" && LD=$ac_prog
  12.441        ;;
  12.442    "")
  12.443      # If it fails, then pretend we aren't using GCC.
  12.444 @@ -4867,7 +4993,7 @@
  12.445      with_gnu_ld=unknown
  12.446      ;;
  12.447    esac
  12.448 -elif test "$with_gnu_ld" = yes; then
  12.449 +elif test yes = "$with_gnu_ld"; then
  12.450    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
  12.451  $as_echo_n "checking for GNU ld... " >&6; }
  12.452  else
  12.453 @@ -4878,32 +5004,32 @@
  12.454    $as_echo_n "(cached) " >&6
  12.455  else
  12.456    if test -z "$LD"; then
  12.457 -  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
  12.458 +  lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
  12.459    for ac_dir in $PATH; do
  12.460 -    IFS="$lt_save_ifs"
  12.461 +    IFS=$lt_save_ifs
  12.462      test -z "$ac_dir" && ac_dir=.
  12.463      if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
  12.464 -      lt_cv_path_LD="$ac_dir/$ac_prog"
  12.465 +      lt_cv_path_LD=$ac_dir/$ac_prog
  12.466        # Check to see if the program is GNU ld.  I'd rather use --version,
  12.467        # but apparently some variants of GNU ld only accept -v.
  12.468        # Break only if it was the GNU/non-GNU ld that we prefer.
  12.469        case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
  12.470        *GNU* | *'with BFD'*)
  12.471 -	test "$with_gnu_ld" != no && break
  12.472 +	test no != "$with_gnu_ld" && break
  12.473  	;;
  12.474        *)
  12.475 -	test "$with_gnu_ld" != yes && break
  12.476 +	test yes != "$with_gnu_ld" && break
  12.477  	;;
  12.478        esac
  12.479      fi
  12.480    done
  12.481 -  IFS="$lt_save_ifs"
  12.482 -else
  12.483 -  lt_cv_path_LD="$LD" # Let the user override the test with a path.
  12.484 -fi
  12.485 -fi
  12.486 -
  12.487 -LD="$lt_cv_path_LD"
  12.488 +  IFS=$lt_save_ifs
  12.489 +else
  12.490 +  lt_cv_path_LD=$LD # Let the user override the test with a path.
  12.491 +fi
  12.492 +fi
  12.493 +
  12.494 +LD=$lt_cv_path_LD
  12.495  if test -n "$LD"; then
  12.496    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
  12.497  $as_echo "$LD" >&6; }
  12.498 @@ -4946,33 +5072,38 @@
  12.499  else
  12.500    if test -n "$NM"; then
  12.501    # Let the user override the test.
  12.502 -  lt_cv_path_NM="$NM"
  12.503 -else
  12.504 -  lt_nm_to_check="${ac_tool_prefix}nm"
  12.505 +  lt_cv_path_NM=$NM
  12.506 +else
  12.507 +  lt_nm_to_check=${ac_tool_prefix}nm
  12.508    if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
  12.509      lt_nm_to_check="$lt_nm_to_check nm"
  12.510    fi
  12.511    for lt_tmp_nm in $lt_nm_to_check; do
  12.512 -    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
  12.513 +    lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
  12.514      for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
  12.515 -      IFS="$lt_save_ifs"
  12.516 +      IFS=$lt_save_ifs
  12.517        test -z "$ac_dir" && ac_dir=.
  12.518 -      tmp_nm="$ac_dir/$lt_tmp_nm"
  12.519 -      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
  12.520 +      tmp_nm=$ac_dir/$lt_tmp_nm
  12.521 +      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext"; then
  12.522  	# Check to see if the nm accepts a BSD-compat flag.
  12.523 -	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
  12.524 +	# Adding the 'sed 1q' prevents false positives on HP-UX, which says:
  12.525  	#   nm: unknown option "B" ignored
  12.526  	# Tru64's nm complains that /dev/null is an invalid object file
  12.527 -	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
  12.528 -	*/dev/null* | *'Invalid file or object type'*)
  12.529 +	# MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty
  12.530 +	case $build_os in
  12.531 +	mingw*) lt_bad_file=conftest.nm/nofile ;;
  12.532 +	*) lt_bad_file=/dev/null ;;
  12.533 +	esac
  12.534 +	case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in
  12.535 +	*$lt_bad_file* | *'Invalid file or object type'*)
  12.536  	  lt_cv_path_NM="$tmp_nm -B"
  12.537 -	  break
  12.538 +	  break 2
  12.539  	  ;;
  12.540  	*)
  12.541  	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
  12.542  	  */dev/null*)
  12.543  	    lt_cv_path_NM="$tmp_nm -p"
  12.544 -	    break
  12.545 +	    break 2
  12.546  	    ;;
  12.547  	  *)
  12.548  	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
  12.549 @@ -4983,15 +5114,15 @@
  12.550  	esac
  12.551        fi
  12.552      done
  12.553 -    IFS="$lt_save_ifs"
  12.554 +    IFS=$lt_save_ifs
  12.555    done
  12.556    : ${lt_cv_path_NM=no}
  12.557  fi
  12.558  fi
  12.559  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
  12.560  $as_echo "$lt_cv_path_NM" >&6; }
  12.561 -if test "$lt_cv_path_NM" != "no"; then
  12.562 -  NM="$lt_cv_path_NM"
  12.563 +if test no != "$lt_cv_path_NM"; then
  12.564 +  NM=$lt_cv_path_NM
  12.565  else
  12.566    # Didn't find any BSD compatible name lister, look for dumpbin.
  12.567    if test -n "$DUMPBIN"; then :
  12.568 @@ -5097,9 +5228,9 @@
  12.569    fi
  12.570  fi
  12.571  
  12.572 -    case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
  12.573 +    case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in
  12.574      *COFF*)
  12.575 -      DUMPBIN="$DUMPBIN -symbols"
  12.576 +      DUMPBIN="$DUMPBIN -symbols -headers"
  12.577        ;;
  12.578      *)
  12.579        DUMPBIN=:
  12.580 @@ -5107,8 +5238,8 @@
  12.581      esac
  12.582    fi
  12.583  
  12.584 -  if test "$DUMPBIN" != ":"; then
  12.585 -    NM="$DUMPBIN"
  12.586 +  if test : != "$DUMPBIN"; then
  12.587 +    NM=$DUMPBIN
  12.588    fi
  12.589  fi
  12.590  test -z "$NM" && NM=nm
  12.591 @@ -5159,7 +5290,7 @@
  12.592    $as_echo_n "(cached) " >&6
  12.593  else
  12.594      i=0
  12.595 -  teststring="ABCD"
  12.596 +  teststring=ABCD
  12.597  
  12.598    case $build_os in
  12.599    msdosdjgpp*)
  12.600 @@ -5199,7 +5330,7 @@
  12.601      lt_cv_sys_max_cmd_len=8192;
  12.602      ;;
  12.603  
  12.604 -  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
  12.605 +  bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*)
  12.606      # This has been around since 386BSD, at least.  Likely further.
  12.607      if test -x /sbin/sysctl; then
  12.608        lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
  12.609 @@ -5249,22 +5380,23 @@
  12.610      ;;
  12.611    *)
  12.612      lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
  12.613 -    if test -n "$lt_cv_sys_max_cmd_len"; then
  12.614 +    if test -n "$lt_cv_sys_max_cmd_len" && \
  12.615 +       test undefined != "$lt_cv_sys_max_cmd_len"; then
  12.616        lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
  12.617        lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
  12.618      else
  12.619        # Make teststring a little bigger before we do anything with it.
  12.620        # a 1K string should be a reasonable start.
  12.621 -      for i in 1 2 3 4 5 6 7 8 ; do
  12.622 +      for i in 1 2 3 4 5 6 7 8; do
  12.623          teststring=$teststring$teststring
  12.624        done
  12.625        SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
  12.626        # If test is not a shell built-in, we'll probably end up computing a
  12.627        # maximum length that is only half of the actual maximum length, but
  12.628        # we can't tell.
  12.629 -      while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
  12.630 +      while { test X`env echo "$teststring$teststring" 2>/dev/null` \
  12.631  	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
  12.632 -	      test $i != 17 # 1/2 MB should be enough
  12.633 +	      test 17 != "$i" # 1/2 MB should be enough
  12.634        do
  12.635          i=`expr $i + 1`
  12.636          teststring=$teststring$teststring
  12.637 @@ -5282,7 +5414,7 @@
  12.638  
  12.639  fi
  12.640  
  12.641 -if test -n $lt_cv_sys_max_cmd_len ; then
  12.642 +if test -n "$lt_cv_sys_max_cmd_len"; then
  12.643    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5
  12.644  $as_echo "$lt_cv_sys_max_cmd_len" >&6; }
  12.645  else
  12.646 @@ -5300,30 +5432,6 @@
  12.647  : ${MV="mv -f"}
  12.648  : ${RM="rm -f"}
  12.649  
  12.650 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5
  12.651 -$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }
  12.652 -# Try some XSI features
  12.653 -xsi_shell=no
  12.654 -( _lt_dummy="a/b/c"
  12.655 -  test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
  12.656 -      = c,a/b,b/c, \
  12.657 -    && eval 'test $(( 1 + 1 )) -eq 2 \
  12.658 -    && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
  12.659 -  && xsi_shell=yes
  12.660 -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5
  12.661 -$as_echo "$xsi_shell" >&6; }
  12.662 -
  12.663 -
  12.664 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5
  12.665 -$as_echo_n "checking whether the shell understands \"+=\"... " >&6; }
  12.666 -lt_shell_append=no
  12.667 -( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \
  12.668 -    >/dev/null 2>&1 \
  12.669 -  && lt_shell_append=yes
  12.670 -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5
  12.671 -$as_echo "$lt_shell_append" >&6; }
  12.672 -
  12.673 -
  12.674  if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
  12.675    lt_unset=unset
  12.676  else
  12.677 @@ -5446,13 +5554,13 @@
  12.678  reload_cmds='$LD$reload_flag -o $output$reload_objs'
  12.679  case $host_os in
  12.680    cygwin* | mingw* | pw32* | cegcc*)
  12.681 -    if test "$GCC" != yes; then
  12.682 +    if test yes != "$GCC"; then
  12.683        reload_cmds=false
  12.684      fi
  12.685      ;;
  12.686    darwin*)
  12.687 -    if test "$GCC" = yes; then
  12.688 -      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
  12.689 +    if test yes = "$GCC"; then
  12.690 +      reload_cmds='$LTCC $LTCFLAGS -nostdlib $wl-r -o $output$reload_objs'
  12.691      else
  12.692        reload_cmds='$LD$reload_flag -o $output$reload_objs'
  12.693      fi
  12.694 @@ -5577,13 +5685,13 @@
  12.695  # Need to set the preceding variable on all platforms that support
  12.696  # interlibrary dependencies.
  12.697  # 'none' -- dependencies not supported.
  12.698 -# `unknown' -- same as none, but documents that we really don't know.
  12.699 +# 'unknown' -- same as none, but documents that we really don't know.
  12.700  # 'pass_all' -- all dependencies passed with no checks.
  12.701  # 'test_compile' -- check by making test program.
  12.702  # 'file_magic [[regex]]' -- check by looking for files in library path
  12.703 -# which responds to the $file_magic_cmd with a given extended regex.
  12.704 -# If you have `file' or equivalent on your system and you're not sure
  12.705 -# whether `pass_all' will *always* work, you probably want this one.
  12.706 +# that responds to the $file_magic_cmd with a given extended regex.
  12.707 +# If you have 'file' or equivalent on your system and you're not sure
  12.708 +# whether 'pass_all' will *always* work, you probably want this one.
  12.709  
  12.710  case $host_os in
  12.711  aix[4-9]*)
  12.712 @@ -5610,8 +5718,7 @@
  12.713    # Base MSYS/MinGW do not provide the 'file' command needed by
  12.714    # func_win32_libid shell function, so use a weaker test based on 'objdump',
  12.715    # unless we find 'file', for example because we are cross-compiling.
  12.716 -  # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
  12.717 -  if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
  12.718 +  if ( file / ) >/dev/null 2>&1; then
  12.719      lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
  12.720      lt_cv_file_magic_cmd='func_win32_libid'
  12.721    else
  12.722 @@ -5647,10 +5754,6 @@
  12.723    fi
  12.724    ;;
  12.725  
  12.726 -gnu*)
  12.727 -  lt_cv_deplibs_check_method=pass_all
  12.728 -  ;;
  12.729 -
  12.730  haiku*)
  12.731    lt_cv_deplibs_check_method=pass_all
  12.732    ;;
  12.733 @@ -5689,7 +5792,7 @@
  12.734    ;;
  12.735  
  12.736  # This must be glibc/ELF.
  12.737 -linux* | k*bsd*-gnu | kopensolaris*-gnu)
  12.738 +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
  12.739    lt_cv_deplibs_check_method=pass_all
  12.740    ;;
  12.741  
  12.742 @@ -5711,8 +5814,8 @@
  12.743    lt_cv_deplibs_check_method=pass_all
  12.744    ;;
  12.745  
  12.746 -openbsd*)
  12.747 -  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
  12.748 +openbsd* | bitrig*)
  12.749 +  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
  12.750      lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$'
  12.751    else
  12.752      lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
  12.753 @@ -5765,6 +5868,9 @@
  12.754  tpf*)
  12.755    lt_cv_deplibs_check_method=pass_all
  12.756    ;;
  12.757 +os2*)
  12.758 +  lt_cv_deplibs_check_method=pass_all
  12.759 +  ;;
  12.760  esac
  12.761  
  12.762  fi
  12.763 @@ -5919,8 +6025,8 @@
  12.764  
  12.765  case $host_os in
  12.766  cygwin* | mingw* | pw32* | cegcc*)
  12.767 -  # two different shell functions defined in ltmain.sh
  12.768 -  # decide which to use based on capabilities of $DLLTOOL
  12.769 +  # two different shell functions defined in ltmain.sh;
  12.770 +  # decide which one to use based on capabilities of $DLLTOOL
  12.771    case `$DLLTOOL --help 2>&1` in
  12.772    *--identify-strict*)
  12.773      lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
  12.774 @@ -5932,7 +6038,7 @@
  12.775    ;;
  12.776  *)
  12.777    # fallback: assume linklib IS sharedlib
  12.778 -  lt_cv_sharedlib_from_linklib_cmd="$ECHO"
  12.779 +  lt_cv_sharedlib_from_linklib_cmd=$ECHO
  12.780    ;;
  12.781  esac
  12.782  
  12.783 @@ -6087,7 +6193,7 @@
  12.784    ac_status=$?
  12.785    $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  12.786    test $ac_status = 0; }
  12.787 -      if test "$ac_status" -eq 0; then
  12.788 +      if test 0 -eq "$ac_status"; then
  12.789  	# Ensure the archiver fails upon bogus file names.
  12.790  	rm -f conftest.$ac_objext libconftest.a
  12.791  	{ { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
  12.792 @@ -6095,7 +6201,7 @@
  12.793    ac_status=$?
  12.794    $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  12.795    test $ac_status = 0; }
  12.796 -	if test "$ac_status" -ne 0; then
  12.797 +	if test 0 -ne "$ac_status"; then
  12.798            lt_cv_ar_at_file=@
  12.799          fi
  12.800        fi
  12.801 @@ -6108,7 +6214,7 @@
  12.802  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
  12.803  $as_echo "$lt_cv_ar_at_file" >&6; }
  12.804  
  12.805 -if test "x$lt_cv_ar_at_file" = xno; then
  12.806 +if test no = "$lt_cv_ar_at_file"; then
  12.807    archiver_list_spec=
  12.808  else
  12.809    archiver_list_spec=$lt_cv_ar_at_file
  12.810 @@ -6325,7 +6431,7 @@
  12.811  
  12.812  if test -n "$RANLIB"; then
  12.813    case $host_os in
  12.814 -  openbsd*)
  12.815 +  bitrig* | openbsd*)
  12.816      old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
  12.817      ;;
  12.818    *)
  12.819 @@ -6415,7 +6521,7 @@
  12.820    symcode='[ABCDGISTW]'
  12.821    ;;
  12.822  hpux*)
  12.823 -  if test "$host_cpu" = ia64; then
  12.824 +  if test ia64 = "$host_cpu"; then
  12.825      symcode='[ABCDEGRST]'
  12.826    fi
  12.827    ;;
  12.828 @@ -6426,7 +6532,7 @@
  12.829    symcode='[BCDEGQRST]'
  12.830    ;;
  12.831  solaris*)
  12.832 -  symcode='[BDRT]'
  12.833 +  symcode='[BCDRT]'
  12.834    ;;
  12.835  sco3.2v5*)
  12.836    symcode='[DT]'
  12.837 @@ -6448,14 +6554,44 @@
  12.838    symcode='[ABCDGIRSTW]' ;;
  12.839  esac
  12.840  
  12.841 +if test "$lt_cv_nm_interface" = "MS dumpbin"; then
  12.842 +  # Gets list of data symbols to import.
  12.843 +  lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* \(.*\)$/\1/p'"
  12.844 +  # Adjust the below global symbol transforms to fixup imported variables.
  12.845 +  lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'"
  12.846 +  lt_c_name_hook=" -e 's/^I .* \(.*\)$/  {\"\1\", (void *) 0},/p'"
  12.847 +  lt_c_name_lib_hook="\
  12.848 +  -e 's/^I .* \(lib.*\)$/  {\"\1\", (void *) 0},/p'\
  12.849 +  -e 's/^I .* \(.*\)$/  {\"lib\1\", (void *) 0},/p'"
  12.850 +else
  12.851 +  # Disable hooks by default.
  12.852 +  lt_cv_sys_global_symbol_to_import=
  12.853 +  lt_cdecl_hook=
  12.854 +  lt_c_name_hook=
  12.855 +  lt_c_name_lib_hook=
  12.856 +fi
  12.857 +
  12.858  # Transform an extracted symbol line into a proper C declaration.
  12.859  # Some systems (esp. on ia64) link data and code symbols differently,
  12.860  # so use this general approach.
  12.861 -lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
  12.862 +lt_cv_sys_global_symbol_to_cdecl="sed -n"\
  12.863 +$lt_cdecl_hook\
  12.864 +" -e 's/^T .* \(.*\)$/extern int \1();/p'"\
  12.865 +" -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'"
  12.866  
  12.867  # Transform an extracted symbol line into symbol name and symbol address
  12.868 -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (void *) \&\2},/p'"
  12.869 -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/  {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"lib\2\", (void *) \&\2},/p'"
  12.870 +lt_cv_sys_global_symbol_to_c_name_address="sed -n"\
  12.871 +$lt_c_name_hook\
  12.872 +" -e 's/^: \(.*\) .*$/  {\"\1\", (void *) 0},/p'"\
  12.873 +" -e 's/^$symcode$symcode* .* \(.*\)$/  {\"\1\", (void *) \&\1},/p'"
  12.874 +
  12.875 +# Transform an extracted symbol line into symbol name with lib prefix and
  12.876 +# symbol address.
  12.877 +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\
  12.878 +$lt_c_name_lib_hook\
  12.879 +" -e 's/^: \(.*\) .*$/  {\"\1\", (void *) 0},/p'"\
  12.880 +" -e 's/^$symcode$symcode* .* \(lib.*\)$/  {\"\1\", (void *) \&\1},/p'"\
  12.881 +" -e 's/^$symcode$symcode* .* \(.*\)$/  {\"lib\1\", (void *) \&\1},/p'"
  12.882  
  12.883  # Handle CRLF in mingw tool chain
  12.884  opt_cr=
  12.885 @@ -6473,21 +6609,24 @@
  12.886  
  12.887    # Write the raw and C identifiers.
  12.888    if test "$lt_cv_nm_interface" = "MS dumpbin"; then
  12.889 -    # Fake it for dumpbin and say T for any non-static function
  12.890 -    # and D for any global variable.
  12.891 +    # Fake it for dumpbin and say T for any non-static function,
  12.892 +    # D for any global variable and I for any imported variable.
  12.893      # Also find C++ and __fastcall symbols from MSVC++,
  12.894      # which start with @ or ?.
  12.895      lt_cv_sys_global_symbol_pipe="$AWK '"\
  12.896  "     {last_section=section; section=\$ 3};"\
  12.897  "     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
  12.898  "     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
  12.899 +"     /^ *Symbol name *: /{split(\$ 0,sn,\":\"); si=substr(sn[2],2)};"\
  12.900 +"     /^ *Type *: code/{print \"T\",si,substr(si,length(prfx))};"\
  12.901 +"     /^ *Type *: data/{print \"I\",si,substr(si,length(prfx))};"\
  12.902  "     \$ 0!~/External *\|/{next};"\
  12.903  "     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
  12.904  "     {if(hide[section]) next};"\
  12.905 -"     {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\
  12.906 -"     {split(\$ 0, a, /\||\r/); split(a[2], s)};"\
  12.907 -"     s[1]~/^[@?]/{print s[1], s[1]; next};"\
  12.908 -"     s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\
  12.909 +"     {f=\"D\"}; \$ 0~/\(\).*\|/{f=\"T\"};"\
  12.910 +"     {split(\$ 0,a,/\||\r/); split(a[2],s)};"\
  12.911 +"     s[1]~/^[@?]/{print f,s[1],s[1]; next};"\
  12.912 +"     s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\
  12.913  "     ' prfx=^$ac_symprfx"
  12.914    else
  12.915      lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[	 ]\($symcode$symcode*\)[	 ][	 ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
  12.916 @@ -6535,11 +6674,11 @@
  12.917  	if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
  12.918  	  cat <<_LT_EOF > conftest.$ac_ext
  12.919  /* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
  12.920 -#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
  12.921 -/* DATA imports from DLLs on WIN32 con't be const, because runtime
  12.922 +#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE
  12.923 +/* DATA imports from DLLs on WIN32 can't be const, because runtime
  12.924     relocations are performed -- see ld's documentation on pseudo-relocs.  */
  12.925  # define LT_DLSYM_CONST
  12.926 -#elif defined(__osf__)
  12.927 +#elif defined __osf__
  12.928  /* This system does not cope well with relocations in const data.  */
  12.929  # define LT_DLSYM_CONST
  12.930  #else
  12.931 @@ -6565,7 +6704,7 @@
  12.932  {
  12.933    { "@PROGRAM@", (void *) 0 },
  12.934  _LT_EOF
  12.935 -	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
  12.936 +	  $SED "s/^$symcode$symcode* .* \(.*\)$/  {\"\1\", (void *) \&\1},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
  12.937  	  cat <<\_LT_EOF >> conftest.$ac_ext
  12.938    {0, (void *) 0}
  12.939  };
  12.940 @@ -6585,13 +6724,13 @@
  12.941  	  mv conftest.$ac_objext conftstm.$ac_objext
  12.942  	  lt_globsym_save_LIBS=$LIBS
  12.943  	  lt_globsym_save_CFLAGS=$CFLAGS
  12.944 -	  LIBS="conftstm.$ac_objext"
  12.945 +	  LIBS=conftstm.$ac_objext
  12.946  	  CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
  12.947  	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
  12.948    (eval $ac_link) 2>&5
  12.949    ac_status=$?
  12.950    $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  12.951 -  test $ac_status = 0; } && test -s conftest${ac_exeext}; then
  12.952 +  test $ac_status = 0; } && test -s conftest$ac_exeext; then
  12.953  	    pipe_works=yes
  12.954  	  fi
  12.955  	  LIBS=$lt_globsym_save_LIBS
  12.956 @@ -6612,7 +6751,7 @@
  12.957    rm -rf conftest* conftst*
  12.958  
  12.959    # Do not use the global_symbol_pipe unless it works.
  12.960 -  if test "$pipe_works" = yes; then
  12.961 +  if test yes = "$pipe_works"; then
  12.962      break
  12.963    else
  12.964      lt_cv_sys_global_symbol_pipe=
  12.965 @@ -6665,6 +6804,16 @@
  12.966  
  12.967  
  12.968  
  12.969 +
  12.970 +
  12.971 +
  12.972 +
  12.973 +
  12.974 +
  12.975 +
  12.976 +
  12.977 +
  12.978 +
  12.979  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
  12.980  $as_echo_n "checking for sysroot... " >&6; }
  12.981  
  12.982 @@ -6677,9 +6826,9 @@
  12.983  
  12.984  
  12.985  lt_sysroot=
  12.986 -case ${with_sysroot} in #(
  12.987 +case $with_sysroot in #(
  12.988   yes)
  12.989 -   if test "$GCC" = yes; then
  12.990 +   if test yes = "$GCC"; then
  12.991       lt_sysroot=`$CC --print-sysroot 2>/dev/null`
  12.992     fi
  12.993     ;; #(
  12.994 @@ -6689,8 +6838,8 @@
  12.995   no|'')
  12.996     ;; #(
  12.997   *)
  12.998 -   { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5
  12.999 -$as_echo "${with_sysroot}" >&6; }
 12.1000 +   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_sysroot" >&5
 12.1001 +$as_echo "$with_sysroot" >&6; }
 12.1002     as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
 12.1003     ;;
 12.1004  esac
 12.1005 @@ -6702,18 +6851,99 @@
 12.1006  
 12.1007  
 12.1008  
 12.1009 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a working dd" >&5
 12.1010 +$as_echo_n "checking for a working dd... " >&6; }
 12.1011 +if ${ac_cv_path_lt_DD+:} false; then :
 12.1012 +  $as_echo_n "(cached) " >&6
 12.1013 +else
 12.1014 +  printf 0123456789abcdef0123456789abcdef >conftest.i
 12.1015 +cat conftest.i conftest.i >conftest2.i
 12.1016 +: ${lt_DD:=$DD}
 12.1017 +if test -z "$lt_DD"; then
 12.1018 +  ac_path_lt_DD_found=false
 12.1019 +  # Loop through the user's path and test for each of PROGNAME-LIST
 12.1020 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 12.1021 +for as_dir in $PATH
 12.1022 +do
 12.1023 +  IFS=$as_save_IFS
 12.1024 +  test -z "$as_dir" && as_dir=.
 12.1025 +    for ac_prog in dd; do
 12.1026 +    for ac_exec_ext in '' $ac_executable_extensions; do
 12.1027 +      ac_path_lt_DD="$as_dir/$ac_prog$ac_exec_ext"
 12.1028 +      as_fn_executable_p "$ac_path_lt_DD" || continue
 12.1029 +if "$ac_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
 12.1030 +  cmp -s conftest.i conftest.out \
 12.1031 +  && ac_cv_path_lt_DD="$ac_path_lt_DD" ac_path_lt_DD_found=:
 12.1032 +fi
 12.1033 +      $ac_path_lt_DD_found && break 3
 12.1034 +    done
 12.1035 +  done
 12.1036 +  done
 12.1037 +IFS=$as_save_IFS
 12.1038 +  if test -z "$ac_cv_path_lt_DD"; then
 12.1039 +    :
 12.1040 +  fi
 12.1041 +else
 12.1042 +  ac_cv_path_lt_DD=$lt_DD
 12.1043 +fi
 12.1044 +
 12.1045 +rm -f conftest.i conftest2.i conftest.out
 12.1046 +fi
 12.1047 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_lt_DD" >&5
 12.1048 +$as_echo "$ac_cv_path_lt_DD" >&6; }
 12.1049 +
 12.1050 +
 12.1051 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to truncate binary pipes" >&5
 12.1052 +$as_echo_n "checking how to truncate binary pipes... " >&6; }
 12.1053 +if ${lt_cv_truncate_bin+:} false; then :
 12.1054 +  $as_echo_n "(cached) " >&6
 12.1055 +else
 12.1056 +  printf 0123456789abcdef0123456789abcdef >conftest.i
 12.1057 +cat conftest.i conftest.i >conftest2.i
 12.1058 +lt_cv_truncate_bin=
 12.1059 +if "$ac_cv_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
 12.1060 +  cmp -s conftest.i conftest.out \
 12.1061 +  && lt_cv_truncate_bin="$ac_cv_path_lt_DD bs=4096 count=1"
 12.1062 +fi
 12.1063 +rm -f conftest.i conftest2.i conftest.out
 12.1064 +test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q"
 12.1065 +fi
 12.1066 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_truncate_bin" >&5
 12.1067 +$as_echo "$lt_cv_truncate_bin" >&6; }
 12.1068 +
 12.1069 +
 12.1070 +
 12.1071 +
 12.1072 +
 12.1073 +
 12.1074 +
 12.1075 +# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
 12.1076 +func_cc_basename ()
 12.1077 +{
 12.1078 +    for cc_temp in $*""; do
 12.1079 +      case $cc_temp in
 12.1080 +        compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
 12.1081 +        distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
 12.1082 +        \-*) ;;
 12.1083 +        *) break;;
 12.1084 +      esac
 12.1085 +    done
 12.1086 +    func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
 12.1087 +}
 12.1088 +
 12.1089  # Check whether --enable-libtool-lock was given.
 12.1090  if test "${enable_libtool_lock+set}" = set; then :
 12.1091    enableval=$enable_libtool_lock;
 12.1092  fi
 12.1093  
 12.1094 -test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
 12.1095 +test no = "$enable_libtool_lock" || enable_libtool_lock=yes
 12.1096  
 12.1097  # Some flags need to be propagated to the compiler or linker for good
 12.1098  # libtool support.
 12.1099  case $host in
 12.1100  ia64-*-hpux*)
 12.1101 -  # Find out which ABI we are using.
 12.1102 +  # Find out what ABI is being produced by ac_compile, and set mode
 12.1103 +  # options accordingly.
 12.1104    echo 'int i;' > conftest.$ac_ext
 12.1105    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
 12.1106    (eval $ac_compile) 2>&5
 12.1107 @@ -6722,24 +6952,25 @@
 12.1108    test $ac_status = 0; }; then
 12.1109      case `/usr/bin/file conftest.$ac_objext` in
 12.1110        *ELF-32*)
 12.1111 -	HPUX_IA64_MODE="32"
 12.1112 +	HPUX_IA64_MODE=32
 12.1113  	;;
 12.1114        *ELF-64*)
 12.1115 -	HPUX_IA64_MODE="64"
 12.1116 +	HPUX_IA64_MODE=64
 12.1117  	;;
 12.1118      esac
 12.1119    fi
 12.1120    rm -rf conftest*
 12.1121    ;;
 12.1122  *-*-irix6*)
 12.1123 -  # Find out which ABI we are using.
 12.1124 +  # Find out what ABI is being produced by ac_compile, and set linker
 12.1125 +  # options accordingly.
 12.1126    echo '#line '$LINENO' "configure"' > conftest.$ac_ext
 12.1127    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
 12.1128    (eval $ac_compile) 2>&5
 12.1129    ac_status=$?
 12.1130    $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 12.1131    test $ac_status = 0; }; then
 12.1132 -    if test "$lt_cv_prog_gnu_ld" = yes; then
 12.1133 +    if test yes = "$lt_cv_prog_gnu_ld"; then
 12.1134        case `/usr/bin/file conftest.$ac_objext` in
 12.1135  	*32-bit*)
 12.1136  	  LD="${LD-ld} -melf32bsmip"
 12.1137 @@ -6768,9 +6999,50 @@
 12.1138    rm -rf conftest*
 12.1139    ;;
 12.1140  
 12.1141 -x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
 12.1142 +mips64*-*linux*)
 12.1143 +  # Find out what ABI is being produced by ac_compile, and set linker
 12.1144 +  # options accordingly.
 12.1145 +  echo '#line '$LINENO' "configure"' > conftest.$ac_ext
 12.1146 +  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
 12.1147 +  (eval $ac_compile) 2>&5
 12.1148 +  ac_status=$?
 12.1149 +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 12.1150 +  test $ac_status = 0; }; then
 12.1151 +    emul=elf
 12.1152 +    case `/usr/bin/file conftest.$ac_objext` in
 12.1153 +      *32-bit*)
 12.1154 +	emul="${emul}32"
 12.1155 +	;;
 12.1156 +      *64-bit*)
 12.1157 +	emul="${emul}64"
 12.1158 +	;;
 12.1159 +    esac
 12.1160 +    case `/usr/bin/file conftest.$ac_objext` in
 12.1161 +      *MSB*)
 12.1162 +	emul="${emul}btsmip"
 12.1163 +	;;
 12.1164 +      *LSB*)
 12.1165 +	emul="${emul}ltsmip"
 12.1166 +	;;
 12.1167 +    esac
 12.1168 +    case `/usr/bin/file conftest.$ac_objext` in
 12.1169 +      *N32*)
 12.1170 +	emul="${emul}n32"
 12.1171 +	;;
 12.1172 +    esac
 12.1173 +    LD="${LD-ld} -m $emul"
 12.1174 +  fi
 12.1175 +  rm -rf conftest*
 12.1176 +  ;;
 12.1177 +
 12.1178 +x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
 12.1179  s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
 12.1180 -  # Find out which ABI we are using.
 12.1181 +  # Find out what ABI is being produced by ac_compile, and set linker
 12.1182 +  # options accordingly.  Note that the listed cases only cover the
 12.1183 +  # situations where additional linker options are needed (such as when
 12.1184 +  # doing 32-bit compilation for a host where ld defaults to 64-bit, or
 12.1185 +  # vice versa); the common cases where no linker options are needed do
 12.1186 +  # not appear in the list.
 12.1187    echo 'int i;' > conftest.$ac_ext
 12.1188    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
 12.1189    (eval $ac_compile) 2>&5
 12.1190 @@ -6784,9 +7056,19 @@
 12.1191  	    LD="${LD-ld} -m elf_i386_fbsd"
 12.1192  	    ;;
 12.1193  	  x86_64-*linux*)
 12.1194 -	    LD="${LD-ld} -m elf_i386"
 12.1195 +	    case `/usr/bin/file conftest.o` in
 12.1196 +	      *x86-64*)
 12.1197 +		LD="${LD-ld} -m elf32_x86_64"
 12.1198 +		;;
 12.1199 +	      *)
 12.1200 +		LD="${LD-ld} -m elf_i386"
 12.1201 +		;;
 12.1202 +	    esac
 12.1203  	    ;;
 12.1204 -	  ppc64-*linux*|powerpc64-*linux*)
 12.1205 +	  powerpc64le-*linux*)
 12.1206 +	    LD="${LD-ld} -m elf32lppclinux"
 12.1207 +	    ;;
 12.1208 +	  powerpc64-*linux*)
 12.1209  	    LD="${LD-ld} -m elf32ppclinux"
 12.1210  	    ;;
 12.1211  	  s390x-*linux*)
 12.1212 @@ -6805,7 +7087,10 @@
 12.1213  	  x86_64-*linux*)
 12.1214  	    LD="${LD-ld} -m elf_x86_64"
 12.1215  	    ;;
 12.1216 -	  ppc*-*linux*|powerpc*-*linux*)
 12.1217 +	  powerpcle-*linux*|powerpc64le-*linux*)
 12.1218 +	    LD="${LD-ld} -m elf64lppc"
 12.1219 +	    ;;
 12.1220 +	  powerpc-*linux*|powerpc64-*linux*)
 12.1221  	    LD="${LD-ld} -m elf64ppc"
 12.1222  	    ;;
 12.1223  	  s390*-*linux*|s390*-*tpf*)
 12.1224 @@ -6823,7 +7108,7 @@
 12.1225  
 12.1226  *-*-sco3.2v5*)
 12.1227    # On SCO OpenServer 5, we need -belf to get full-featured binaries.
 12.1228 -  SAVE_CFLAGS="$CFLAGS"
 12.1229 +  SAVE_CFLAGS=$CFLAGS
 12.1230    CFLAGS="$CFLAGS -belf"
 12.1231    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
 12.1232  $as_echo_n "checking whether the C compiler needs -belf... " >&6; }
 12.1233 @@ -6863,13 +7148,14 @@
 12.1234  fi
 12.1235  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
 12.1236  $as_echo "$lt_cv_cc_needs_belf" >&6; }
 12.1237 -  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
 12.1238 +  if test yes != "$lt_cv_cc_needs_belf"; then
 12.1239      # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
 12.1240 -    CFLAGS="$SAVE_CFLAGS"
 12.1241 +    CFLAGS=$SAVE_CFLAGS
 12.1242    fi
 12.1243    ;;
 12.1244  *-*solaris*)
 12.1245 -  # Find out which ABI we are using.
 12.1246 +  # Find out what ABI is being produced by ac_compile, and set linker
 12.1247 +  # options accordingly.
 12.1248    echo 'int i;' > conftest.$ac_ext
 12.1249    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
 12.1250    (eval $ac_compile) 2>&5
 12.1251 @@ -6881,7 +7167,7 @@
 12.1252        case $lt_cv_prog_gnu_ld in
 12.1253        yes*)
 12.1254          case $host in
 12.1255 -        i?86-*-solaris*)
 12.1256 +        i?86-*-solaris*|x86_64-*-solaris*)
 12.1257            LD="${LD-ld} -m elf_x86_64"
 12.1258            ;;
 12.1259          sparc*-*-solaris*)
 12.1260 @@ -6890,7 +7176,7 @@
 12.1261          esac
 12.1262          # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.
 12.1263          if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
 12.1264 -          LD="${LD-ld}_sol2"
 12.1265 +          LD=${LD-ld}_sol2
 12.1266          fi
 12.1267          ;;
 12.1268        *)
 12.1269 @@ -6906,7 +7192,7 @@
 12.1270    ;;
 12.1271  esac
 12.1272  
 12.1273 -need_locks="$enable_libtool_lock"
 12.1274 +need_locks=$enable_libtool_lock
 12.1275  
 12.1276  if test -n "$ac_tool_prefix"; then
 12.1277    # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
 12.1278 @@ -7017,7 +7303,7 @@
 12.1279  fi
 12.1280  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
 12.1281  $as_echo "$lt_cv_path_mainfest_tool" >&6; }
 12.1282 -if test "x$lt_cv_path_mainfest_tool" != xyes; then
 12.1283 +if test yes != "$lt_cv_path_mainfest_tool"; then
 12.1284    MANIFEST_TOOL=:
 12.1285  fi
 12.1286  
 12.1287 @@ -7520,7 +7806,7 @@
 12.1288    $as_echo_n "(cached) " >&6
 12.1289  else
 12.1290    lt_cv_apple_cc_single_mod=no
 12.1291 -      if test -z "${LT_MULTI_MODULE}"; then
 12.1292 +      if test -z "$LT_MULTI_MODULE"; then
 12.1293  	# By default we will add the -single_module flag. You can override
 12.1294  	# by either setting the environment variable LT_MULTI_MODULE
 12.1295  	# non-empty at configure time, or by adding -multi_module to the
 12.1296 @@ -7538,7 +7824,7 @@
 12.1297  	  cat conftest.err >&5
 12.1298  	# Otherwise, if the output was created with a 0 exit code from
 12.1299  	# the compiler, it worked.
 12.1300 -	elif test -f libconftest.dylib && test $_lt_result -eq 0; then
 12.1301 +	elif test -f libconftest.dylib && test 0 = "$_lt_result"; then
 12.1302  	  lt_cv_apple_cc_single_mod=yes
 12.1303  	else
 12.1304  	  cat conftest.err >&5
 12.1305 @@ -7577,7 +7863,7 @@
 12.1306  fi
 12.1307  rm -f core conftest.err conftest.$ac_objext \
 12.1308      conftest$ac_exeext conftest.$ac_ext
 12.1309 -	LDFLAGS="$save_LDFLAGS"
 12.1310 +	LDFLAGS=$save_LDFLAGS
 12.1311  
 12.1312  fi
 12.1313  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
 12.1314 @@ -7606,7 +7892,7 @@
 12.1315        _lt_result=$?
 12.1316        if test -s conftest.err && $GREP force_load conftest.err; then
 12.1317  	cat conftest.err >&5
 12.1318 -      elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
 12.1319 +      elif test -f conftest && test 0 = "$_lt_result" && $GREP forced_load conftest >/dev/null 2>&1; then
 12.1320  	lt_cv_ld_force_load=yes
 12.1321        else
 12.1322  	cat conftest.err >&5
 12.1323 @@ -7619,32 +7905,32 @@
 12.1324  $as_echo "$lt_cv_ld_force_load" >&6; }
 12.1325      case $host_os in
 12.1326      rhapsody* | darwin1.[012])
 12.1327 -      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
 12.1328 +      _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;;
 12.1329      darwin1.*)
 12.1330 -      _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
 12.1331 +      _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
 12.1332      darwin*) # darwin 5.x on
 12.1333        # if running on 10.5 or later, the deployment target defaults
 12.1334        # to the OS version, if on x86, and 10.4, the deployment
 12.1335        # target defaults to 10.4. Don't you love it?
 12.1336        case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
 12.1337  	10.0,*86*-darwin8*|10.0,*-darwin[91]*)
 12.1338 -	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
 12.1339 -	10.[012]*)
 12.1340 -	  _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
 12.1341 +	  _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
 12.1342 +	10.[012][,.]*)
 12.1343 +	  _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
 12.1344  	10.*)
 12.1345 -	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
 12.1346 +	  _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
 12.1347        esac
 12.1348      ;;
 12.1349    esac
 12.1350 -    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
 12.1351 +    if test yes = "$lt_cv_apple_cc_single_mod"; then
 12.1352        _lt_dar_single_mod='$single_module'
 12.1353      fi
 12.1354 -    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
 12.1355 -      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
 12.1356 +    if test yes = "$lt_cv_ld_exported_symbols_list"; then
 12.1357 +      _lt_dar_export_syms=' $wl-exported_symbols_list,$output_objdir/$libname-symbols.expsym'
 12.1358      else
 12.1359 -      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
 12.1360 +      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/$libname-symbols.expsym $lib'
 12.1361      fi
 12.1362 -    if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
 12.1363 +    if test : != "$DSYMUTIL" && test no = "$lt_cv_ld_force_load"; then
 12.1364        _lt_dsymutil='~$DSYMUTIL $lib || :'
 12.1365      else
 12.1366        _lt_dsymutil=
 12.1367 @@ -7652,6 +7938,41 @@
 12.1368      ;;
 12.1369    esac
 12.1370  
 12.1371 +# func_munge_path_list VARIABLE PATH
 12.1372 +# -----------------------------------
 12.1373 +# VARIABLE is name of variable containing _space_ separated list of
 12.1374 +# directories to be munged by the contents of PATH, which is string
 12.1375 +# having a format:
 12.1376 +# "DIR[:DIR]:"
 12.1377 +#       string "DIR[ DIR]" will be prepended to VARIABLE
 12.1378 +# ":DIR[:DIR]"
 12.1379 +#       string "DIR[ DIR]" will be appended to VARIABLE
 12.1380 +# "DIRP[:DIRP]::[DIRA:]DIRA"
 12.1381 +#       string "DIRP[ DIRP]" will be prepended to VARIABLE and string
 12.1382 +#       "DIRA[ DIRA]" will be appended to VARIABLE
 12.1383 +# "DIR[:DIR]"
 12.1384 +#       VARIABLE will be replaced by "DIR[ DIR]"
 12.1385 +func_munge_path_list ()
 12.1386 +{
 12.1387 +    case x$2 in
 12.1388 +    x)
 12.1389 +        ;;
 12.1390 +    *:)
 12.1391 +        eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\"
 12.1392 +        ;;
 12.1393 +    x:*)
 12.1394 +        eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\"
 12.1395 +        ;;
 12.1396 +    *::*)
 12.1397 +        eval $1=\"\$$1\ `$ECHO $2 | $SED -e 's/.*:://' -e 's/:/ /g'`\"
 12.1398 +        eval $1=\"`$ECHO $2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \$$1\"
 12.1399 +        ;;
 12.1400 +    *)
 12.1401 +        eval $1=\"`$ECHO $2 | $SED 's/:/ /g'`\"
 12.1402 +        ;;
 12.1403 +    esac
 12.1404 +}
 12.1405 +
 12.1406  
 12.1407  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
 12.1408  $as_echo_n "checking for ANSI C header files... " >&6; }
 12.1409 @@ -7816,14 +8137,14 @@
 12.1410      *)
 12.1411        enable_shared=no
 12.1412        # Look at the argument we got.  We use all the common list separators.
 12.1413 -      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
 12.1414 +      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
 12.1415        for pkg in $enableval; do
 12.1416 -	IFS="$lt_save_ifs"
 12.1417 +	IFS=$lt_save_ifs
 12.1418  	if test "X$pkg" = "X$p"; then
 12.1419  	  enable_shared=yes
 12.1420  	fi
 12.1421        done
 12.1422 -      IFS="$lt_save_ifs"
 12.1423 +      IFS=$lt_save_ifs
 12.1424        ;;
 12.1425      esac
 12.1426  else
 12.1427 @@ -7847,14 +8168,14 @@
 12.1428      *)
 12.1429       enable_static=no
 12.1430        # Look at the argument we got.  We use all the common list separators.
 12.1431 -      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
 12.1432 +      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
 12.1433        for pkg in $enableval; do
 12.1434 -	IFS="$lt_save_ifs"
 12.1435 +	IFS=$lt_save_ifs
 12.1436  	if test "X$pkg" = "X$p"; then
 12.1437  	  enable_static=yes
 12.1438  	fi
 12.1439        done
 12.1440 -      IFS="$lt_save_ifs"
 12.1441 +      IFS=$lt_save_ifs
 12.1442        ;;
 12.1443      esac
 12.1444  else
 12.1445 @@ -7878,14 +8199,14 @@
 12.1446      *)
 12.1447        pic_mode=default
 12.1448        # Look at the argument we got.  We use all the common list separators.
 12.1449 -      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
 12.1450 +      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
 12.1451        for lt_pkg in $withval; do
 12.1452 -	IFS="$lt_save_ifs"
 12.1453 +	IFS=$lt_save_ifs
 12.1454  	if test "X$lt_pkg" = "X$lt_p"; then
 12.1455  	  pic_mode=yes
 12.1456  	fi
 12.1457        done
 12.1458 -      IFS="$lt_save_ifs"
 12.1459 +      IFS=$lt_save_ifs
 12.1460        ;;
 12.1461      esac
 12.1462  else
 12.1463 @@ -7893,8 +8214,6 @@
 12.1464  fi
 12.1465  
 12.1466  
 12.1467 -test -z "$pic_mode" && pic_mode=default
 12.1468 -
 12.1469  
 12.1470  
 12.1471  
 12.1472 @@ -7910,14 +8229,14 @@
 12.1473      *)
 12.1474        enable_fast_install=no
 12.1475        # Look at the argument we got.  We use all the common list separators.
 12.1476 -      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
 12.1477 +      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
 12.1478        for pkg in $enableval; do
 12.1479 -	IFS="$lt_save_ifs"
 12.1480 +	IFS=$lt_save_ifs
 12.1481  	if test "X$pkg" = "X$p"; then
 12.1482  	  enable_fast_install=yes
 12.1483  	fi
 12.1484        done
 12.1485 -      IFS="$lt_save_ifs"
 12.1486 +      IFS=$lt_save_ifs
 12.1487        ;;
 12.1488      esac
 12.1489  else
 12.1490 @@ -7931,11 +8250,63 @@
 12.1491  
 12.1492  
 12.1493  
 12.1494 +  shared_archive_member_spec=
 12.1495 +case $host,$enable_shared in
 12.1496 +power*-*-aix[5-9]*,yes)
 12.1497 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking which variant of shared library versioning to provide" >&5
 12.1498 +$as_echo_n "checking which variant of shared library versioning to provide... " >&6; }
 12.1499 +
 12.1500 +# Check whether --with-aix-soname was given.
 12.1501 +if test "${with_aix_soname+set}" = set; then :
 12.1502 +  withval=$with_aix_soname; case $withval in
 12.1503 +    aix|svr4|both)
 12.1504 +      ;;
 12.1505 +    *)
 12.1506 +      as_fn_error $? "Unknown argument to --with-aix-soname" "$LINENO" 5
 12.1507 +      ;;
 12.1508 +    esac
 12.1509 +    lt_cv_with_aix_soname=$with_aix_soname
 12.1510 +else
 12.1511 +  if ${lt_cv_with_aix_soname+:} false; then :
 12.1512 +  $as_echo_n "(cached) " >&6
 12.1513 +else
 12.1514 +  lt_cv_with_aix_soname=aix
 12.1515 +fi
 12.1516 +
 12.1517 +    with_aix_soname=$lt_cv_with_aix_soname
 12.1518 +fi
 12.1519 +
 12.1520 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_aix_soname" >&5
 12.1521 +$as_echo "$with_aix_soname" >&6; }
 12.1522 +  if test aix != "$with_aix_soname"; then
 12.1523 +    # For the AIX way of multilib, we name the shared archive member
 12.1524 +    # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o',
 12.1525 +    # and 'shr.imp' or 'shr_64.imp', respectively, for the Import File.
 12.1526 +    # Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag,
 12.1527 +    # the AIX toolchain works better with OBJECT_MODE set (default 32).
 12.1528 +    if test 64 = "${OBJECT_MODE-32}"; then
 12.1529 +      shared_archive_member_spec=shr_64
 12.1530 +    else
 12.1531 +      shared_archive_member_spec=shr
 12.1532 +    fi
 12.1533 +  fi
 12.1534 +  ;;
 12.1535 +*)
 12.1536 +  with_aix_soname=aix
 12.1537 +  ;;
 12.1538 +esac
 12.1539 +
 12.1540 +
 12.1541 +
 12.1542 +
 12.1543 +
 12.1544 +
 12.1545 +
 12.1546  
 12.1547  
 12.1548  
 12.1549  # This can be used to rebuild libtool when needed
 12.1550 -LIBTOOL_DEPS="$ltmain"
 12.1551 +LIBTOOL_DEPS=$ltmain
 12.1552  
 12.1553  # Always use our own libtool.
 12.1554  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
 12.1555 @@ -7984,7 +8355,7 @@
 12.1556  
 12.1557  
 12.1558  
 12.1559 -if test -n "${ZSH_VERSION+set}" ; then
 12.1560 +if test -n "${ZSH_VERSION+set}"; then
 12.1561     setopt NO_GLOB_SUBST
 12.1562  fi
 12.1563  
 12.1564 @@ -8023,7 +8394,7 @@
 12.1565    # AIX sometimes has problems with the GCC collect2 program.  For some
 12.1566    # reason, if we set the COLLECT_NAMES environment variable, the problems
 12.1567    # vanish in a puff of smoke.
 12.1568 -  if test "X${COLLECT_NAMES+set}" != Xset; then
 12.1569 +  if test set != "${COLLECT_NAMES+set}"; then
 12.1570      COLLECT_NAMES=
 12.1571      export COLLECT_NAMES
 12.1572    fi
 12.1573 @@ -8034,14 +8405,14 @@
 12.1574  ofile=libtool
 12.1575  can_build_shared=yes
 12.1576  
 12.1577 -# All known linkers require a `.a' archive for static linking (except MSVC,
 12.1578 +# All known linkers require a '.a' archive for static linking (except MSVC,
 12.1579  # which needs '.lib').
 12.1580  libext=a
 12.1581  
 12.1582 -with_gnu_ld="$lt_cv_prog_gnu_ld"
 12.1583 -
 12.1584 -old_CC="$CC"
 12.1585 -old_CFLAGS="$CFLAGS"
 12.1586 +with_gnu_ld=$lt_cv_prog_gnu_ld
 12.1587 +
 12.1588 +old_CC=$CC
 12.1589 +old_CFLAGS=$CFLAGS
 12.1590  
 12.1591  # Set sane defaults for various variables
 12.1592  test -z "$CC" && CC=cc
 12.1593 @@ -8050,15 +8421,8 @@
 12.1594  test -z "$LD" && LD=ld
 12.1595  test -z "$ac_objext" && ac_objext=o
 12.1596  
 12.1597 -for cc_temp in $compiler""; do
 12.1598 -  case $cc_temp in
 12.1599 -    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
 12.1600 -    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
 12.1601 -    \-*) ;;
 12.1602 -    *) break;;
 12.1603 -  esac
 12.1604 -done
 12.1605 -cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
 12.1606 +func_cc_basename $compiler
 12.1607 +cc_basename=$func_cc_basename_result
 12.1608  
 12.1609  
 12.1610  # Only perform the check for file, if the check method requires it
 12.1611 @@ -8073,22 +8437,22 @@
 12.1612  else
 12.1613    case $MAGIC_CMD in
 12.1614  [\\/*] |  ?:[\\/]*)
 12.1615 -  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
 12.1616 +  lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path.
 12.1617    ;;
 12.1618  *)
 12.1619 -  lt_save_MAGIC_CMD="$MAGIC_CMD"
 12.1620 -  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
 12.1621 +  lt_save_MAGIC_CMD=$MAGIC_CMD
 12.1622 +  lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
 12.1623    ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
 12.1624    for ac_dir in $ac_dummy; do
 12.1625 -    IFS="$lt_save_ifs"
 12.1626 +    IFS=$lt_save_ifs
 12.1627      test -z "$ac_dir" && ac_dir=.
 12.1628 -    if test -f $ac_dir/${ac_tool_prefix}file; then
 12.1629 -      lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file"
 12.1630 +    if test -f "$ac_dir/${ac_tool_prefix}file"; then
 12.1631 +      lt_cv_path_MAGIC_CMD=$ac_dir/"${ac_tool_prefix}file"
 12.1632        if test -n "$file_magic_test_file"; then
 12.1633  	case $deplibs_check_method in
 12.1634  	"file_magic "*)
 12.1635  	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
 12.1636 -	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
 12.1637 +	  MAGIC_CMD=$lt_cv_path_MAGIC_CMD
 12.1638  	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
 12.1639  	    $EGREP "$file_magic_regex" > /dev/null; then
 12.1640  	    :
 12.1641 @@ -8111,13 +8475,13 @@
 12.1642        break
 12.1643      fi
 12.1644    done
 12.1645 -  IFS="$lt_save_ifs"
 12.1646 -  MAGIC_CMD="$lt_save_MAGIC_CMD"
 12.1647 -  ;;
 12.1648 -esac
 12.1649 -fi
 12.1650 -
 12.1651 -MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
 12.1652 +  IFS=$lt_save_ifs
 12.1653 +  MAGIC_CMD=$lt_save_MAGIC_CMD
 12.1654 +  ;;
 12.1655 +esac
 12.1656 +fi
 12.1657 +
 12.1658 +MAGIC_CMD=$lt_cv_path_MAGIC_CMD
 12.1659  if test -n "$MAGIC_CMD"; then
 12.1660    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
 12.1661  $as_echo "$MAGIC_CMD" >&6; }
 12.1662 @@ -8139,22 +8503,22 @@
 12.1663  else
 12.1664    case $MAGIC_CMD in
 12.1665  [\\/*] |  ?:[\\/]*)
 12.1666 -  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
 12.1667 +  lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path.
 12.1668    ;;
 12.1669  *)
 12.1670 -  lt_save_MAGIC_CMD="$MAGIC_CMD"
 12.1671 -  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
 12.1672 +  lt_save_MAGIC_CMD=$MAGIC_CMD
 12.1673 +  lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
 12.1674    ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
 12.1675    for ac_dir in $ac_dummy; do
 12.1676 -    IFS="$lt_save_ifs"
 12.1677 +    IFS=$lt_save_ifs
 12.1678      test -z "$ac_dir" && ac_dir=.
 12.1679 -    if test -f $ac_dir/file; then
 12.1680 -      lt_cv_path_MAGIC_CMD="$ac_dir/file"
 12.1681 +    if test -f "$ac_dir/file"; then
 12.1682 +      lt_cv_path_MAGIC_CMD=$ac_dir/"file"
 12.1683        if test -n "$file_magic_test_file"; then
 12.1684  	case $deplibs_check_method in
 12.1685  	"file_magic "*)
 12.1686  	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
 12.1687 -	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
 12.1688 +	  MAGIC_CMD=$lt_cv_path_MAGIC_CMD
 12.1689  	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
 12.1690  	    $EGREP "$file_magic_regex" > /dev/null; then
 12.1691  	    :
 12.1692 @@ -8177,13 +8541,13 @@
 12.1693        break
 12.1694      fi
 12.1695    done
 12.1696 -  IFS="$lt_save_ifs"
 12.1697 -  MAGIC_CMD="$lt_save_MAGIC_CMD"
 12.1698 -  ;;
 12.1699 -esac
 12.1700 -fi
 12.1701 -
 12.1702 -MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
 12.1703 +  IFS=$lt_save_ifs
 12.1704 +  MAGIC_CMD=$lt_save_MAGIC_CMD
 12.1705 +  ;;
 12.1706 +esac
 12.1707 +fi
 12.1708 +
 12.1709 +MAGIC_CMD=$lt_cv_path_MAGIC_CMD
 12.1710  if test -n "$MAGIC_CMD"; then
 12.1711    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
 12.1712  $as_echo "$MAGIC_CMD" >&6; }
 12.1713 @@ -8204,7 +8568,7 @@
 12.1714  
 12.1715  # Use C for the default configuration in the libtool script
 12.1716  
 12.1717 -lt_save_CC="$CC"
 12.1718 +lt_save_CC=$CC
 12.1719  ac_ext=c
 12.1720  ac_cpp='$CPP $CPPFLAGS'
 12.1721  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 12.1722 @@ -8266,7 +8630,7 @@
 12.1723  
 12.1724  lt_prog_compiler_no_builtin_flag=
 12.1725  
 12.1726 -if test "$GCC" = yes; then
 12.1727 +if test yes = "$GCC"; then
 12.1728    case $cc_basename in
 12.1729    nvcc*)
 12.1730      lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;;
 12.1731 @@ -8282,7 +8646,7 @@
 12.1732    lt_cv_prog_compiler_rtti_exceptions=no
 12.1733     ac_outfile=conftest.$ac_objext
 12.1734     echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 12.1735 -   lt_compiler_flag="-fno-rtti -fno-exceptions"
 12.1736 +   lt_compiler_flag="-fno-rtti -fno-exceptions"  ## exclude from sc_useless_quotes_in_assignment
 12.1737     # Insert the option either (1) after the last *FLAGS variable, or
 12.1738     # (2) before a word containing "conftest.", or (3) at the end.
 12.1739     # Note that $ac_compile itself does not contain backslashes and begins
 12.1740 @@ -8312,7 +8676,7 @@
 12.1741  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
 12.1742  $as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
 12.1743  
 12.1744 -if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
 12.1745 +if test yes = "$lt_cv_prog_compiler_rtti_exceptions"; then
 12.1746      lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
 12.1747  else
 12.1748      :
 12.1749 @@ -8330,17 +8694,18 @@
 12.1750  lt_prog_compiler_static=
 12.1751  
 12.1752  
 12.1753 -  if test "$GCC" = yes; then
 12.1754 +  if test yes = "$GCC"; then
 12.1755      lt_prog_compiler_wl='-Wl,'
 12.1756      lt_prog_compiler_static='-static'
 12.1757  
 12.1758      case $host_os in
 12.1759        aix*)
 12.1760        # All AIX code is PIC.
 12.1761 -      if test "$host_cpu" = ia64; then
 12.1762 +      if test ia64 = "$host_cpu"; then
 12.1763  	# AIX 5 now supports IA64 processor
 12.1764  	lt_prog_compiler_static='-Bstatic'
 12.1765        fi
 12.1766 +      lt_prog_compiler_pic='-fPIC'
 12.1767        ;;
 12.1768  
 12.1769      amigaos*)
 12.1770 @@ -8351,8 +8716,8 @@
 12.1771          ;;
 12.1772        m68k)
 12.1773              # FIXME: we need at least 68020 code to build shared libraries, but
 12.1774 -            # adding the `-m68020' flag to GCC prevents building anything better,
 12.1775 -            # like `-m68040'.
 12.1776 +            # adding the '-m68020' flag to GCC prevents building anything better,
 12.1777 +            # like '-m68040'.
 12.1778              lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
 12.1779          ;;
 12.1780        esac
 12.1781 @@ -8368,6 +8733,11 @@
 12.1782        # Although the cygwin gcc ignores -fPIC, still need this for old-style
 12.1783        # (--disable-auto-import) libraries
 12.1784        lt_prog_compiler_pic='-DDLL_EXPORT'
 12.1785 +      case $host_os in
 12.1786 +      os2*)
 12.1787 +	lt_prog_compiler_static='$wl-static'
 12.1788 +	;;
 12.1789 +      esac
 12.1790        ;;
 12.1791  
 12.1792      darwin* | rhapsody*)
 12.1793 @@ -8438,7 +8808,7 @@
 12.1794      case $host_os in
 12.1795      aix*)
 12.1796        lt_prog_compiler_wl='-Wl,'
 12.1797 -      if test "$host_cpu" = ia64; then
 12.1798 +      if test ia64 = "$host_cpu"; then
 12.1799  	# AIX 5 now supports IA64 processor
 12.1800  	lt_prog_compiler_static='-Bstatic'
 12.1801        else
 12.1802 @@ -8446,10 +8816,29 @@
 12.1803        fi
 12.1804        ;;
 12.1805  
 12.1806 +    darwin* | rhapsody*)
 12.1807 +      # PIC is the default on this platform
 12.1808 +      # Common symbols not allowed in MH_DYLIB files
 12.1809 +      lt_prog_compiler_pic='-fno-common'
 12.1810 +      case $cc_basename in
 12.1811 +      nagfor*)
 12.1812 +        # NAG Fortran compiler
 12.1813 +        lt_prog_compiler_wl='-Wl,-Wl,,'
 12.1814 +        lt_prog_compiler_pic='-PIC'
 12.1815 +        lt_prog_compiler_static='-Bstatic'
 12.1816 +        ;;
 12.1817 +      esac
 12.1818 +      ;;
 12.1819 +
 12.1820      mingw* | cygwin* | pw32* | os2* | cegcc*)
 12.1821        # This hack is so that the source file can tell whether it is being
 12.1822        # built for inclusion in a dll (and should export symbols for example).
 12.1823        lt_prog_compiler_pic='-DDLL_EXPORT'
 12.1824 +      case $host_os in
 12.1825 +      os2*)
 12.1826 +	lt_prog_compiler_static='$wl-static'
 12.1827 +	;;
 12.1828 +      esac
 12.1829        ;;
 12.1830  
 12.1831      hpux9* | hpux10* | hpux11*)
 12.1832 @@ -8465,7 +8854,7 @@
 12.1833  	;;
 12.1834        esac
 12.1835        # Is there a better lt_prog_compiler_static that works with the bundled CC?
 12.1836 -      lt_prog_compiler_static='${wl}-a ${wl}archive'
 12.1837 +      lt_prog_compiler_static='$wl-a ${wl}archive'
 12.1838        ;;
 12.1839  
 12.1840      irix5* | irix6* | nonstopux*)
 12.1841 @@ -8474,9 +8863,9 @@
 12.1842        lt_prog_compiler_static='-non_shared'
 12.1843        ;;
 12.1844  
 12.1845 -    linux* | k*bsd*-gnu | kopensolaris*-gnu)
 12.1846 +    linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
 12.1847        case $cc_basename in
 12.1848 -      # old Intel for x86_64 which still supported -KPIC.
 12.1849 +      # old Intel for x86_64, which still supported -KPIC.
 12.1850        ecc*)
 12.1851  	lt_prog_compiler_wl='-Wl,'
 12.1852  	lt_prog_compiler_pic='-KPIC'
 12.1853 @@ -8501,6 +8890,12 @@
 12.1854  	lt_prog_compiler_pic='-PIC'
 12.1855  	lt_prog_compiler_static='-Bstatic'
 12.1856  	;;
 12.1857 +      tcc*)
 12.1858 +	# Fabrice Bellard et al's Tiny C Compiler
 12.1859 +	lt_prog_compiler_wl='-Wl,'
 12.1860 +	lt_prog_compiler_pic='-fPIC'
 12.1861 +	lt_prog_compiler_static='-static'
 12.1862 +	;;
 12.1863        pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
 12.1864          # Portland Group compilers (*not* the Pentium gcc compiler,
 12.1865  	# which looks to be a dead project)
 12.1866 @@ -8598,7 +8993,7 @@
 12.1867        ;;
 12.1868  
 12.1869      sysv4*MP*)
 12.1870 -      if test -d /usr/nec ;then
 12.1871 +      if test -d /usr/nec; then
 12.1872  	lt_prog_compiler_pic='-Kconform_pic'
 12.1873  	lt_prog_compiler_static='-Bstatic'
 12.1874        fi
 12.1875 @@ -8627,7 +9022,7 @@
 12.1876    fi
 12.1877  
 12.1878  case $host_os in
 12.1879 -  # For platforms which do not support PIC, -DPIC is meaningless:
 12.1880 +  # For platforms that do not support PIC, -DPIC is meaningless:
 12.1881    *djgpp*)
 12.1882      lt_prog_compiler_pic=
 12.1883      ;;
 12.1884 @@ -8659,7 +9054,7 @@
 12.1885    lt_cv_prog_compiler_pic_works=no
 12.1886     ac_outfile=conftest.$ac_objext
 12.1887     echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 12.1888 -   lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
 12.1889 +   lt_compiler_flag="$lt_prog_compiler_pic -DPIC"  ## exclude from sc_useless_quotes_in_assignment
 12.1890     # Insert the option either (1) after the last *FLAGS variable, or
 12.1891     # (2) before a word containing "conftest.", or (3) at the end.
 12.1892     # Note that $ac_compile itself does not contain backslashes and begins
 12.1893 @@ -8689,7 +9084,7 @@
 12.1894  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
 12.1895  $as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
 12.1896  
 12.1897 -if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
 12.1898 +if test yes = "$lt_cv_prog_compiler_pic_works"; then
 12.1899      case $lt_prog_compiler_pic in
 12.1900       "" | " "*) ;;
 12.1901       *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
 12.1902 @@ -8721,7 +9116,7 @@
 12.1903    $as_echo_n "(cached) " >&6
 12.1904  else
 12.1905    lt_cv_prog_compiler_static_works=no
 12.1906 -   save_LDFLAGS="$LDFLAGS"
 12.1907 +   save_LDFLAGS=$LDFLAGS
 12.1908     LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
 12.1909     echo "$lt_simple_link_test_code" > conftest.$ac_ext
 12.1910     if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
 12.1911 @@ -8740,13 +9135,13 @@
 12.1912       fi
 12.1913     fi
 12.1914     $RM -r conftest*
 12.1915 -   LDFLAGS="$save_LDFLAGS"
 12.1916 +   LDFLAGS=$save_LDFLAGS
 12.1917  
 12.1918  fi
 12.1919  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
 12.1920  $as_echo "$lt_cv_prog_compiler_static_works" >&6; }
 12.1921  
 12.1922 -if test x"$lt_cv_prog_compiler_static_works" = xyes; then
 12.1923 +if test yes = "$lt_cv_prog_compiler_static_works"; then
 12.1924      :
 12.1925  else
 12.1926      lt_prog_compiler_static=
 12.1927 @@ -8866,8 +9261,8 @@
 12.1928  
 12.1929  
 12.1930  
 12.1931 -hard_links="nottested"
 12.1932 -if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
 12.1933 +hard_links=nottested
 12.1934 +if test no = "$lt_cv_prog_compiler_c_o" && test no != "$need_locks"; then
 12.1935    # do not overwrite the value of need_locks provided by the user
 12.1936    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
 12.1937  $as_echo_n "checking if we can lock with hard links... " >&6; }
 12.1938 @@ -8879,9 +9274,9 @@
 12.1939    ln conftest.a conftest.b 2>/dev/null && hard_links=no
 12.1940    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
 12.1941  $as_echo "$hard_links" >&6; }
 12.1942 -  if test "$hard_links" = no; then
 12.1943 -    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
 12.1944 -$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
 12.1945 +  if test no = "$hard_links"; then
 12.1946 +    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5
 12.1947 +$as_echo "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;}
 12.1948      need_locks=warn
 12.1949    fi
 12.1950  else
 12.1951 @@ -8924,9 +9319,9 @@
 12.1952    # included in the symbol list
 12.1953    include_expsyms=
 12.1954    # exclude_expsyms can be an extended regexp of symbols to exclude
 12.1955 -  # it will be wrapped by ` (' and `)$', so one must not match beginning or
 12.1956 -  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
 12.1957 -  # as well as any symbol that contains `d'.
 12.1958 +  # it will be wrapped by ' (' and ')$', so one must not match beginning or
 12.1959 +  # end of line.  Example: 'a|bc|.*d.*' will exclude the symbols 'a' and 'bc',
 12.1960 +  # as well as any symbol that contains 'd'.
 12.1961    exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
 12.1962    # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
 12.1963    # platforms (ab)use it in PIC code, but their linkers get confused if
 12.1964 @@ -8941,7 +9336,7 @@
 12.1965      # FIXME: the MSVC++ port hasn't been tested in a loooong time
 12.1966      # When not using gcc, we currently assume that we are using
 12.1967      # Microsoft Visual C++.
 12.1968 -    if test "$GCC" != yes; then
 12.1969 +    if test yes != "$GCC"; then
 12.1970        with_gnu_ld=no
 12.1971      fi
 12.1972      ;;
 12.1973 @@ -8949,7 +9344,7 @@
 12.1974      # we just hope/assume this is gcc and not c89 (= MSVC++)
 12.1975      with_gnu_ld=yes
 12.1976      ;;
 12.1977 -  openbsd*)
 12.1978 +  openbsd* | bitrig*)
 12.1979      with_gnu_ld=no
 12.1980      ;;
 12.1981    esac
 12.1982 @@ -8959,7 +9354,7 @@
 12.1983    # On some targets, GNU ld is compatible enough with the native linker
 12.1984    # that we're better off using the native interface for both.
 12.1985    lt_use_gnu_ld_interface=no
 12.1986 -  if test "$with_gnu_ld" = yes; then
 12.1987 +  if test yes = "$with_gnu_ld"; then
 12.1988      case $host_os in
 12.1989        aix*)
 12.1990  	# The AIX port of GNU ld has always aspired to compatibility
 12.1991 @@ -8981,24 +9376,24 @@
 12.1992      esac
 12.1993    fi
 12.1994  
 12.1995 -  if test "$lt_use_gnu_ld_interface" = yes; then
 12.1996 +  if test yes = "$lt_use_gnu_ld_interface"; then
 12.1997      # If archive_cmds runs LD, not CC, wlarc should be empty
 12.1998 -    wlarc='${wl}'
 12.1999 +    wlarc='$wl'
 12.2000  
 12.2001      # Set some defaults for GNU ld with shared library support. These
 12.2002      # are reset later if shared libraries are not supported. Putting them
 12.2003      # here allows them to be overridden if necessary.
 12.2004      runpath_var=LD_RUN_PATH
 12.2005 -    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
 12.2006 -    export_dynamic_flag_spec='${wl}--export-dynamic'
 12.2007 +    hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
 12.2008 +    export_dynamic_flag_spec='$wl--export-dynamic'
 12.2009      # ancient GNU ld didn't support --whole-archive et. al.
 12.2010      if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
 12.2011 -      whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
 12.2012 +      whole_archive_flag_spec=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
 12.2013      else
 12.2014        whole_archive_flag_spec=
 12.2015      fi
 12.2016      supports_anon_versioning=no
 12.2017 -    case `$LD -v 2>&1` in
 12.2018 +    case `$LD -v | $SED -e 's/(^)\+)\s\+//' 2>&1` in
 12.2019        *GNU\ gold*) supports_anon_versioning=yes ;;
 12.2020        *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
 12.2021        *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
 12.2022 @@ -9011,7 +9406,7 @@
 12.2023      case $host_os in
 12.2024      aix[3-9]*)
 12.2025        # On AIX/PPC, the GNU linker is very broken
 12.2026 -      if test "$host_cpu" != ia64; then
 12.2027 +      if test ia64 != "$host_cpu"; then
 12.2028  	ld_shlibs=no
 12.2029  	cat <<_LT_EOF 1>&2
 12.2030  
 12.2031 @@ -9030,7 +9425,7 @@
 12.2032        case $host_cpu in
 12.2033        powerpc)
 12.2034              # see comment about AmigaOS4 .so support
 12.2035 -            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 12.2036 +            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
 12.2037              archive_expsym_cmds=''
 12.2038          ;;
 12.2039        m68k)
 12.2040 @@ -9046,7 +9441,7 @@
 12.2041  	allow_undefined_flag=unsupported
 12.2042  	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
 12.2043  	# support --undefined.  This deserves some investigation.  FIXME
 12.2044 -	archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 12.2045 +	archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
 12.2046        else
 12.2047  	ld_shlibs=no
 12.2048        fi
 12.2049 @@ -9056,7 +9451,7 @@
 12.2050        # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
 12.2051        # as there is no search path for DLLs.
 12.2052        hardcode_libdir_flag_spec='-L$libdir'
 12.2053 -      export_dynamic_flag_spec='${wl}--export-all-symbols'
 12.2054 +      export_dynamic_flag_spec='$wl--export-all-symbols'
 12.2055        allow_undefined_flag=unsupported
 12.2056        always_export_symbols=no
 12.2057        enable_shared_with_static_runtimes=yes
 12.2058 @@ -9064,61 +9459,90 @@
 12.2059        exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
 12.2060  
 12.2061        if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
 12.2062 -        archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
 12.2063 -	# If the export-symbols file already is a .def file (1st line
 12.2064 -	# is EXPORTS), use it as is; otherwise, prepend...
 12.2065 -	archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
 12.2066 -	  cp $export_symbols $output_objdir/$soname.def;
 12.2067 -	else
 12.2068 -	  echo EXPORTS > $output_objdir/$soname.def;
 12.2069 -	  cat $export_symbols >> $output_objdir/$soname.def;
 12.2070 -	fi~
 12.2071 -	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
 12.2072 +        archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
 12.2073 +	# If the export-symbols file already is a .def file, use it as
 12.2074 +	# is; otherwise, prepend EXPORTS...
 12.2075 +	archive_expsym_cmds='if   test DEF = "`$SED -n     -e '\''s/^[	 ]*//'\''     -e '\''/^\(;.*\)*$/d'\''     -e '\''s/^\(EXPORTS\|LIBRARY\)\([	 ].*\)*$/DEF/p'\''     -e q     $export_symbols`" ; then
 12.2076 +          cp $export_symbols $output_objdir/$soname.def;
 12.2077 +        else
 12.2078 +          echo EXPORTS > $output_objdir/$soname.def;
 12.2079 +          cat $export_symbols >> $output_objdir/$soname.def;
 12.2080 +        fi~
 12.2081 +        $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
 12.2082        else
 12.2083  	ld_shlibs=no
 12.2084        fi
 12.2085        ;;
 12.2086  
 12.2087      haiku*)
 12.2088 -      a