OSDN > Find Software > Communications > Chat > simphone > SCM > hg > simphone > Commit

simphone
Fork

simphone: Commit

Commit MetaInfo

Revision	aa3c2b5fd105ec958c6c3b4432ca21f8e884ef5f (tree)
Time	2022-12-28 20:28:31
Author	simphone
Commiter	simphone

Log Message

speexdsp 1.2.1

Change Summary

modified: speexdsp/COPYING (diff)
modified: speexdsp/Makefile.in (diff)
modified: speexdsp/aclocal.m4 (diff)
modified: speexdsp/compile (diff)
modified: speexdsp/config.guess (diff)
modified: speexdsp/config.h.in (diff)
modified: speexdsp/config.sub (diff)
modified: speexdsp/configure (diff)
modified: speexdsp/configure.ac (diff)
modified: speexdsp/depcomp (diff)
modified: speexdsp/doc/Makefile.in (diff)
modified: speexdsp/include/Makefile.in (diff)
modified: speexdsp/include/speex/Makefile.in (diff)
modified: speexdsp/install-sh (diff)
modified: speexdsp/libspeexdsp/Makefile.am (diff)
modified: speexdsp/libspeexdsp/Makefile.in (diff)
modified: speexdsp/libspeexdsp/arch.h (diff)
modified: speexdsp/libspeexdsp/fixed_arm4.h (diff)
modified: speexdsp/libspeexdsp/fixed_arm5e.h (diff)
modified: speexdsp/libspeexdsp/fixed_bfin.h (diff)
modified: speexdsp/libspeexdsp/fixed_debug.h (diff)
modified: speexdsp/libspeexdsp/fixed_generic.h (diff)
modified: speexdsp/libspeexdsp/resample.c (diff)
modified: speexdsp/ltmain.sh (diff)
modified: speexdsp/m4/libtool.m4 (diff)
modified: speexdsp/missing (diff)
modified: speexdsp/symbian/Makefile.in (diff)
modified: speexdsp/ti/Makefile.in (diff)
modified: speexdsp/ti/speex_C54_test/Makefile.in (diff)
modified: speexdsp/ti/speex_C55_test/Makefile.in (diff)
modified: speexdsp/ti/speex_C64_test/Makefile.in (diff)
modified: speexdsp/win32/Makefile.in (diff)
modified: speexdsp/win32/VS2003/Makefile.in (diff)
modified: speexdsp/win32/VS2003/libspeexdsp/Makefile.in (diff)
modified: speexdsp/win32/VS2003/tests/Makefile.in (diff)
modified: speexdsp/win32/VS2005/Makefile.in (diff)
modified: speexdsp/win32/VS2005/libspeexdsp/Makefile.in (diff)
modified: speexdsp/win32/VS2005/tests/Makefile.in (diff)
modified: speexdsp/win32/VS2008/Makefile.in (diff)
modified: speexdsp/win32/VS2008/libspeexdsp/Makefile.in (diff)
modified: speexdsp/win32/VS2008/tests/Makefile.in (diff)
modified: speexdsp/win32/libspeexdsp/Makefile.in (diff)
add: speexdsp/SpeexDSP.spec (diff)
delete: speexdsp/libspeexdsp/stack_alloc.h

Incremental Difference

diff -r bd2d082702f1 -r aa3c2b5fd105 speexdsp/COPYING

--- a/speexdsp/COPYING Wed Dec 28 06:26:56 2022 -0500

+++ b/speexdsp/COPYING Wed Dec 28 06:28:31 2022 -0500

		@@ -1,7 +1,7 @@
1	1	Copyright 2002-2008 Xiph.org Foundation
2	2	Copyright 2002-2008 Jean-Marc Valin
3	3	Copyright 2005-2007 Analog Devices Inc.
4		-Copyright 2005-2008 Commonwealth Scientific and Industrial Research
	4	+Copyright 2005-2008 Commonwealth Scientific and Industrial Research
5	5	Organisation (CSIRO)
6	6	Copyright 1993, 2002, 2006 David Rowe
7	7	Copyright 2003 EpicGames

diff -r bd2d082702f1 -r aa3c2b5fd105 speexdsp/Makefile.in

--- a/speexdsp/Makefile.in Wed Dec 28 06:26:56 2022 -0500

+++ b/speexdsp/Makefile.in Wed Dec 28 06:28:31 2022 -0500

		@@ -1,7 +1,7 @@
1		-# Makefile.in generated by automake 1.16.1 from Makefile.am.
	1	+# Makefile.in generated by automake 1.16.5 from Makefile.am.
2	2	# @configure_input@
3	3
4		-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
	4	+# Copyright (C) 1994-2021 Free Software Foundation, Inc.
5	5
6	6	# This Makefile.in is free software; the Free Software Foundation
7	7	# gives unlimited permission to copy and/or distribute it,

		@@ -168,8 +168,8 @@
168	168	$(am__extra_recursive_targets)
169	169	AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
170	170	cscope distdir distdir-am dist dist-all distcheck
171		-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
172		- $(LISP)config.h.in
	171	+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) \
	172	+ config.h.in
173	173	# Read a list of newline-separated strings from the standard input,
174	174	# and print each of them once, without duplicates. Input order is
175	175	# not preserved.

		@@ -186,13 +186,10 @@
186	186	unique=`for i in $$list; do \
187	187	if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
188	188	done \| $(am__uniquify_input)`
189		-ETAGS = etags
190		-CTAGS = ctags
191		-CSCOPE = cscope
192	189	am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/SpeexDSP.spec.in \
193	190	$(srcdir)/config.h.in $(srcdir)/speexdsp.pc.in AUTHORS COPYING \
194	191	ChangeLog INSTALL NEWS README TODO compile config.guess \
195		- config.sub depcomp install-sh ltmain.sh missing
	192	+ config.sub install-sh ltmain.sh missing
196	193	DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
197	194	distdir = $(PACKAGE)-$(VERSION)
198	195	top_distdir = $(distdir)

		@@ -231,6 +228,8 @@
231	228	DIST_ARCHIVES = $(distdir).tar.gz
232	229	GZIP_ENV = --best
233	230	DIST_TARGETS = dist-gzip
	231	+# Exists only to be overridden by the user if desired.
	232	+AM_DISTCHECK_DVI_TARGET = dvi
234	233	distuninstallcheck_listfiles = find . -type f -print
235	234	am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
236	235	\| sed 's\|^\./\|$(prefix)/\|' \| grep -v '$(infodir)/dir$$'

		@@ -247,8 +246,9 @@
247	246	CC = @CC@
248	247	CCDEPMODE = @CCDEPMODE@
249	248	CFLAGS = @CFLAGS@
250		-CPP = @CPP@
251	249	CPPFLAGS = @CPPFLAGS@
	250	+CSCOPE = @CSCOPE@
	251	+CTAGS = @CTAGS@
252	252	CYGPATH_W = @CYGPATH_W@
253	253	DEFS = @DEFS@
254	254	DEPDIR = @DEPDIR@

		@@ -259,6 +259,7 @@
259	259	ECHO_N = @ECHO_N@
260	260	ECHO_T = @ECHO_T@
261	261	EGREP = @EGREP@
	262	+ETAGS = @ETAGS@
262	263	EXEEXT = @EXEEXT@
263	264	FFT_CFLAGS = @FFT_CFLAGS@
264	265	FFT_LIBS = @FFT_LIBS@

		@@ -573,7 +574,6 @@
573	574	distclean-tags:
574	575	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
575	576	-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
576		-
577	577	distdir: $(BUILT_SOURCES)
578	578	$(MAKE) $(AM_MAKEFLAGS) distdir-am
579	579

		@@ -657,6 +657,10 @@
657	657	tardir=$(distdir) && $(am__tar) \| XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
658	658	$(am__post_remove_distdir)
659	659
	660	+dist-zstd: distdir
	661	+ tardir=$(distdir) && $(am__tar) \| zstd -c $${ZSTD_CLEVEL-$${ZSTD_OPT--19}} >$(distdir).tar.zst
	662	+ $(am__post_remove_distdir)
	663	+
660	664	dist-tarZ: distdir
661	665	@echo WARNING: "Support for distribution archives compressed with" \
662	666	"legacy program 'compress' is deprecated." >&2

		@@ -699,6 +703,8 @@
699	703	eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz \| unshar ;;\
700	704	.zip) \
701	705	unzip $(distdir).zip ;;\
	706	+ .tar.zst) \
	707	+ zstd -dc $(distdir).tar.zst \| $(am__untar) ;;\
702	708	esac
703	709	chmod -R a-w $(distdir)
704	710	chmod u+w $(distdir)

		@@ -714,7 +720,7 @@
714	720	$(DISTCHECK_CONFIGURE_FLAGS) \
715	721	--srcdir=../.. --prefix="$$dc_install_base" \
716	722	&& $(MAKE) $(AM_MAKEFLAGS) \
717		- && $(MAKE) $(AM_MAKEFLAGS) dvi \
	723	+ && $(MAKE) $(AM_MAKEFLAGS) $(AM_DISTCHECK_DVI_TARGET) \
718	724	&& $(MAKE) $(AM_MAKEFLAGS) check \
719	725	&& $(MAKE) $(AM_MAKEFLAGS) install \
720	726	&& $(MAKE) $(AM_MAKEFLAGS) installcheck \

		@@ -879,18 +885,19 @@
879	885	am--refresh check check-am clean clean-cscope clean-generic \
880	886	clean-libtool cscope cscopelist-am ctags ctags-am dist \
881	887	dist-all dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ \
882		- dist-xz dist-zip distcheck distclean distclean-generic \
883		- distclean-hdr distclean-libtool distclean-tags distcleancheck \
884		- distdir distuninstallcheck dvi dvi-am html html-am info \
885		- info-am install install-am install-data install-data-am \
886		- install-dvi install-dvi-am install-exec install-exec-am \
887		- install-html install-html-am install-info install-info-am \
888		- install-man install-pdf install-pdf-am install-pkgconfigDATA \
889		- install-ps install-ps-am install-strip installcheck \
890		- installcheck-am installdirs installdirs-am maintainer-clean \
891		- maintainer-clean-generic mostlyclean mostlyclean-generic \
892		- mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
893		- uninstall-am uninstall-pkgconfigDATA
	888	+ dist-xz dist-zip dist-zstd distcheck distclean \
	889	+ distclean-generic distclean-hdr distclean-libtool \
	890	+ distclean-tags distcleancheck distdir distuninstallcheck dvi \
	891	+ dvi-am html html-am info info-am install install-am \
	892	+ install-data install-data-am install-dvi install-dvi-am \
	893	+ install-exec install-exec-am install-html install-html-am \
	894	+ install-info install-info-am install-man install-pdf \
	895	+ install-pdf-am install-pkgconfigDATA install-ps install-ps-am \
	896	+ install-strip installcheck installcheck-am installdirs \
	897	+ installdirs-am maintainer-clean maintainer-clean-generic \
	898	+ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
	899	+ ps ps-am tags tags-am uninstall uninstall-am \
	900	+ uninstall-pkgconfigDATA
894	901
895	902	.PRECIOUS: Makefile
896	903

diff -r bd2d082702f1 -r aa3c2b5fd105 speexdsp/SpeexDSP.spec

--- /dev/null Thu Jan 01 00:00:00 1970 +0000

+++ b/speexdsp/SpeexDSP.spec Wed Dec 28 06:28:31 2022 -0500

		@@ -0,0 +1,67 @@
	1	+%define name speexdsp
	2	+%define ver 1.2.1
	3	+%define rel 1
	4	+
	5	+Summary: An open-source, patent-free speech codec
	6	+Name: %name
	7	+Version: %ver
	8	+Release: %rel
	9	+License: BSD
	10	+Group: Application/Devel
	11	+Source: http://www.speex.org/download/%{name}-%{ver}.tar.gz
	12	+URL: http://www.speex.org/
	13	+Vendor: Speex
	14	+Packager: Jean-Marc Valin (jean-marc.valin@usherbrooke.ca)
	15	+BuildRoot: /var/tmp/%{name}-build-root
	16	+Docdir: /usr/share/doc
	17	+
	18	+%description
	19	+Speex is a patent-free audio codec designed especially for voice (unlike
	20	+Vorbis which targets general audio) signals and providing good narrowband
	21	+and wideband quality. This project aims to be complementary to the Vorbis
	22	+codec.
	23	+
	24	+%package devel
	25	+Summary: Speex development files
	26	+Group: Development/Libraries
	27	+Requires: %{name} = %{version}
	28	+
	29	+%description devel
	30	+Speex development files.
	31	+
	32	+%changelog
	33	+* Thu Oct 03 2002 Jean-Marc Valin
	34	+- Added devel package inspired from PLD spec file
	35	+
	36	+* Tue Jul 30 2002 Fredrik Rambris <boost@users.sourceforge.net> 0.5.2
	37	+- Added buildroot and docdir and ldconfig. Makes it builadble by non-roots
	38	+ and also doesn't write to actual library paths when building.
	39	+
	40	+%prep
	41	+%setup
	42	+
	43	+%build
	44	+export CFLAGS='-O3'
	45	+./configure --prefix=/usr --enable-shared --enable-static
	46	+make
	47	+
	48	+%install
	49	+rm -rf $RPM_BUILD_ROOT
	50	+make DESTDIR=$RPM_BUILD_ROOT install
	51	+
	52	+%post -p /sbin/ldconfig
	53	+%postun -p /sbin/ldconfig
	54	+
	55	+%files
	56	+%defattr(644,root,root,755)
	57	+%doc COPYING AUTHORS ChangeLog NEWS README
	58	+%doc doc/manual.pdf
	59	+%attr(755,root,root) %{_bindir}/speex*
	60	+%attr(755,root,root) %{_libdir}/libspeex.so
	61	+
	62	+%files devel
	63	+%defattr(644,root,root,755)
	64	+%attr(755,root,root) %{_libdir}/libspeex*.la
	65	+%{_includedir}/speex/speex*.h
	66	+%{_libdir}/pkgconfig/speexdsp.pc
	67	+%{_libdir}/libspeex*.a

diff -r bd2d082702f1 -r aa3c2b5fd105 speexdsp/aclocal.m4

--- a/speexdsp/aclocal.m4 Wed Dec 28 06:26:56 2022 -0500

+++ b/speexdsp/aclocal.m4 Wed Dec 28 06:28:31 2022 -0500

		@@ -1,6 +1,6 @@
1		-# generated automatically by aclocal 1.16.1 -- Autoconf --
	1	+# generated automatically by aclocal 1.16.5 -- Autoconf --
2	2
3		-# Copyright (C) 1996-2018 Free Software Foundation, Inc.
	3	+# Copyright (C) 1996-2021 Free Software Foundation, Inc.
4	4
5	5	# This file is free software; the Free Software Foundation
6	6	# gives unlimited permission to copy and/or distribute it,

		@@ -14,15 +14,15 @@
14	14	m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
15	15	m4_ifndef([AC_AUTOCONF_VERSION],
16	16	[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
17		-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
18		-[m4_warning([this file was generated for autoconf 2.69.
	17	+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.71],,
	18	+[m4_warning([this file was generated for autoconf 2.71.
19	19	You have another version of autoconf. It may work, but is not guaranteed to.
20	20	If you have problems, you may need to regenerate the build system entirely.
21	21	To do so, use the procedure documented by the package, typically 'autoreconf'.])])
22	22
23		-dnl pkg.m4 - Macros to locate and utilise pkg-config. -- Autoconf --
24		-dnl serial 11 (pkg-config-0.29.1)
25		-dnl
	23	+# pkg.m4 - Macros to locate and utilise pkg-config. -- Autoconf --
	24	+# serial 12 (pkg-config-0.29.2)
	25	+
26	26	dnl Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
27	27	dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists@gmail.com>
28	28	dnl

		@@ -63,7 +63,7 @@
63	63	dnl See the "Since" comment for each macro you use to see what version
64	64	dnl of the macros you require.
65	65	m4_defun([PKG_PREREQ],
66		-[m4_define([PKG_MACROS_VERSION], [0.29.1])
	66	+[m4_define([PKG_MACROS_VERSION], [0.29.2])
67	67	m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1,
68	68	[m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])])
69	69	])dnl PKG_PREREQ

		@@ -164,7 +164,7 @@
164	164	AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
165	165
166	166	pkg_failed=no
167		-AC_MSG_CHECKING([for $1])
	167	+AC_MSG_CHECKING([for $2])
168	168
169	169	_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
170	170	_PKG_CONFIG([$1][_LIBS], [libs], [$2])

		@@ -174,11 +174,11 @@
174	174	See the pkg-config man page for more details.])
175	175
176	176	if test $pkg_failed = yes; then
177		- AC_MSG_RESULT([no])
	177	+ AC_MSG_RESULT([no])
178	178	_PKG_SHORT_ERRORS_SUPPORTED
179	179	if test $_pkg_short_errors_supported = yes; then
180	180	$1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
181		- else
	181	+ else
182	182	$1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
183	183	fi
184	184	# Put the nasty error message in config.log where it belongs

		@@ -195,7 +195,7 @@
195	195	_PKG_TEXT])[]dnl
196	196	])
197	197	elif test $pkg_failed = untried; then
198		- AC_MSG_RESULT([no])
	198	+ AC_MSG_RESULT([no])
199	199	m4_default([$4], [AC_MSG_FAILURE(
200	200	[The pkg-config script could not be found or is too old. Make sure it
201	201	is in your PATH or set the PKG_CONFIG environment variable to the full

		@@ -296,7 +296,7 @@
296	296	AS_VAR_IF([$1], [""], [$5], [$4])dnl
297	297	])dnl PKG_CHECK_VAR
298	298
299		-# Copyright (C) 2002-2018 Free Software Foundation, Inc.
	299	+# Copyright (C) 2002-2021 Free Software Foundation, Inc.
300	300	#
301	301	# This file is free software; the Free Software Foundation
302	302	# gives unlimited permission to copy and/or distribute it,

		@@ -311,7 +311,7 @@
311	311	[am__api_version='1.16'
312	312	dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
313	313	dnl require some minimum version. Point them to the right macro.
314		-m4_if([$1], [1.16.1], [],
	314	+m4_if([$1], [1.16.5], [],
315	315	[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
316	316	])
317	317

		@@ -327,14 +327,14 @@
327	327	# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
328	328	# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
329	329	AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
330		-[AM_AUTOMAKE_VERSION([1.16.1])dnl
	330	+[AM_AUTOMAKE_VERSION([1.16.5])dnl
331	331	m4_ifndef([AC_AUTOCONF_VERSION],
332	332	[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
333	333	_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
334	334
335	335	# AM_AUX_DIR_EXPAND -- Autoconf --
336	336
337		-# Copyright (C) 2001-2018 Free Software Foundation, Inc.
	337	+# Copyright (C) 2001-2021 Free Software Foundation, Inc.
338	338	#
339	339	# This file is free software; the Free Software Foundation
340	340	# gives unlimited permission to copy and/or distribute it,

		@@ -386,7 +386,7 @@
386	386
387	387	# AM_CONDITIONAL -- Autoconf --
388	388
389		-# Copyright (C) 1997-2018 Free Software Foundation, Inc.
	389	+# Copyright (C) 1997-2021 Free Software Foundation, Inc.
390	390	#
391	391	# This file is free software; the Free Software Foundation
392	392	# gives unlimited permission to copy and/or distribute it,

		@@ -417,7 +417,7 @@
417	417	Usually this means the macro was only invoked conditionally.]])
418	418	fi])])
419	419
420		-# Copyright (C) 1999-2018 Free Software Foundation, Inc.
	420	+# Copyright (C) 1999-2021 Free Software Foundation, Inc.
421	421	#
422	422	# This file is free software; the Free Software Foundation
423	423	# gives unlimited permission to copy and/or distribute it,

		@@ -608,7 +608,7 @@
608	608
609	609	# Generate code to set up dependency tracking. -- Autoconf --
610	610
611		-# Copyright (C) 1999-2018 Free Software Foundation, Inc.
	611	+# Copyright (C) 1999-2021 Free Software Foundation, Inc.
612	612	#
613	613	# This file is free software; the Free Software Foundation
614	614	# gives unlimited permission to copy and/or distribute it,

		@@ -647,7 +647,9 @@
647	647	done
648	648	if test $am_rc -ne 0; then
649	649	AC_MSG_FAILURE([Something went wrong bootstrapping makefile fragments
650		- for automatic dependency tracking. Try re-running configure with the
	650	+ for automatic dependency tracking. If GNU make was not used, consider
	651	+ re-running the configure script with MAKE="gmake" (or whatever is
	652	+ necessary). You can also try re-running configure with the
651	653	'--disable-dependency-tracking' option to at least be able to build
652	654	the package (albeit without support for automatic dependency tracking).])
653	655	fi

		@@ -674,7 +676,7 @@
674	676
675	677	# Do all the work for Automake. -- Autoconf --
676	678
677		-# Copyright (C) 1996-2018 Free Software Foundation, Inc.
	679	+# Copyright (C) 1996-2021 Free Software Foundation, Inc.
678	680	#
679	681	# This file is free software; the Free Software Foundation
680	682	# gives unlimited permission to copy and/or distribute it,

		@@ -702,6 +704,10 @@
702	704	# release and drop the old call support.
703	705	AC_DEFUN([AM_INIT_AUTOMAKE],
704	706	[AC_PREREQ([2.65])dnl
	707	+m4_ifdef([_$0_ALREADY_INIT],
	708	+ [m4_fatal([$0 expanded multiple times
	709	+]m4_defn([_$0_ALREADY_INIT]))],
	710	+ [m4_define([_$0_ALREADY_INIT], m4_expansion_stack)])dnl
705	711	dnl Autoconf wants to disallow AM_ names. We explicitly allow
706	712	dnl the ones we care about.
707	713	m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl

		@@ -738,7 +744,7 @@
738	744	[_AM_SET_OPTIONS([$1])dnl
739	745	dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
740	746	m4_if(
741		- m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]),
	747	+ m4_ifset([AC_PACKAGE_NAME], [ok]):m4_ifset([AC_PACKAGE_VERSION], [ok]),
742	748	[ok:ok],,
743	749	[m4_fatal([AC_INIT should be called with package and version arguments])])dnl
744	750	AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl

		@@ -790,6 +796,20 @@
790	796	[m4_define([AC_PROG_OBJCXX],
791	797	m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl
792	798	])
	799	+# Variables for tags utilities; see am/tags.am
	800	+if test -z "$CTAGS"; then
	801	+ CTAGS=ctags
	802	+fi
	803	+AC_SUBST([CTAGS])
	804	+if test -z "$ETAGS"; then
	805	+ ETAGS=etags
	806	+fi
	807	+AC_SUBST([ETAGS])
	808	+if test -z "$CSCOPE"; then
	809	+ CSCOPE=cscope
	810	+fi
	811	+AC_SUBST([CSCOPE])
	812	+
793	813	AC_REQUIRE([AM_SILENT_RULES])dnl
794	814	dnl The testsuite driver may need to know about EXEEXT, so add the
795	815	dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This

		@@ -871,7 +891,7 @@
871	891	done
872	892	echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
873	893
874		-# Copyright (C) 2001-2018 Free Software Foundation, Inc.
	894	+# Copyright (C) 2001-2021 Free Software Foundation, Inc.
875	895	#
876	896	# This file is free software; the Free Software Foundation
877	897	# gives unlimited permission to copy and/or distribute it,

		@@ -892,7 +912,7 @@
892	912	fi
893	913	AC_SUBST([install_sh])])
894	914
895		-# Copyright (C) 2003-2018 Free Software Foundation, Inc.
	915	+# Copyright (C) 2003-2021 Free Software Foundation, Inc.
896	916	#
897	917	# This file is free software; the Free Software Foundation
898	918	# gives unlimited permission to copy and/or distribute it,

		@@ -914,7 +934,7 @@
914	934	# Add --enable-maintainer-mode option to configure. -- Autoconf --
915	935	# From Jim Meyering
916	936
917		-# Copyright (C) 1996-2018 Free Software Foundation, Inc.
	937	+# Copyright (C) 1996-2021 Free Software Foundation, Inc.
918	938	#
919	939	# This file is free software; the Free Software Foundation
920	940	# gives unlimited permission to copy and/or distribute it,

		@@ -949,7 +969,7 @@
949	969
950	970	# Check to see how 'make' treats includes. -- Autoconf --
951	971
952		-# Copyright (C) 2001-2018 Free Software Foundation, Inc.
	972	+# Copyright (C) 2001-2021 Free Software Foundation, Inc.
953	973	#
954	974	# This file is free software; the Free Software Foundation
955	975	# gives unlimited permission to copy and/or distribute it,

		@@ -992,7 +1012,7 @@
992	1012
993	1013	# Fake the existence of programs that GNU maintainers use. -- Autoconf --
994	1014
995		-# Copyright (C) 1997-2018 Free Software Foundation, Inc.
	1015	+# Copyright (C) 1997-2021 Free Software Foundation, Inc.
996	1016	#
997	1017	# This file is free software; the Free Software Foundation
998	1018	# gives unlimited permission to copy and/or distribute it,

		@@ -1013,12 +1033,7 @@
1013	1033	[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
1014	1034	AC_REQUIRE_AUX_FILE([missing])dnl
1015	1035	if test x"${MISSING+set}" != xset; then
1016		- case $am_aux_dir in
1017		- \ \| \ )
1018		- MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
1019		- *)
1020		- MISSING="\${SHELL} $am_aux_dir/missing" ;;
1021		- esac
	1036	+ MISSING="\${SHELL} '$am_aux_dir/missing'"
1022	1037	fi
1023	1038	# Use eval to expand $SHELL
1024	1039	if eval "$MISSING --is-lightweight"; then

		@@ -1031,7 +1046,7 @@
1031	1046
1032	1047	# Helper functions for option handling. -- Autoconf --
1033	1048
1034		-# Copyright (C) 2001-2018 Free Software Foundation, Inc.
	1049	+# Copyright (C) 2001-2021 Free Software Foundation, Inc.
1035	1050	#
1036	1051	# This file is free software; the Free Software Foundation
1037	1052	# gives unlimited permission to copy and/or distribute it,

		@@ -1060,7 +1075,7 @@
1060	1075	AC_DEFUN([_AM_IF_OPTION],
1061	1076	[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
1062	1077
1063		-# Copyright (C) 1999-2018 Free Software Foundation, Inc.
	1078	+# Copyright (C) 1999-2021 Free Software Foundation, Inc.
1064	1079	#
1065	1080	# This file is free software; the Free Software Foundation
1066	1081	# gives unlimited permission to copy and/or distribute it,

		@@ -1107,7 +1122,7 @@
1107	1122	# For backward compatibility.
1108	1123	AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
1109	1124
1110		-# Copyright (C) 2001-2018 Free Software Foundation, Inc.
	1125	+# Copyright (C) 2001-2021 Free Software Foundation, Inc.
1111	1126	#
1112	1127	# This file is free software; the Free Software Foundation
1113	1128	# gives unlimited permission to copy and/or distribute it,

		@@ -1126,7 +1141,7 @@
1126	1141
1127	1142	# Check to make sure that the build environment is sane. -- Autoconf --
1128	1143
1129		-# Copyright (C) 1996-2018 Free Software Foundation, Inc.
	1144	+# Copyright (C) 1996-2021 Free Software Foundation, Inc.
1130	1145	#
1131	1146	# This file is free software; the Free Software Foundation
1132	1147	# gives unlimited permission to copy and/or distribute it,

		@@ -1207,7 +1222,7 @@
1207	1222	rm -f conftest.file
1208	1223	])
1209	1224
1210		-# Copyright (C) 2009-2018 Free Software Foundation, Inc.
	1225	+# Copyright (C) 2009-2021 Free Software Foundation, Inc.
1211	1226	#
1212	1227	# This file is free software; the Free Software Foundation
1213	1228	# gives unlimited permission to copy and/or distribute it,

		@@ -1267,7 +1282,7 @@
1267	1282	_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
1268	1283	])
1269	1284
1270		-# Copyright (C) 2001-2018 Free Software Foundation, Inc.
	1285	+# Copyright (C) 2001-2021 Free Software Foundation, Inc.
1271	1286	#
1272	1287	# This file is free software; the Free Software Foundation
1273	1288	# gives unlimited permission to copy and/or distribute it,

		@@ -1295,7 +1310,7 @@
1295	1310	INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
1296	1311	AC_SUBST([INSTALL_STRIP_PROGRAM])])
1297	1312
1298		-# Copyright (C) 2006-2018 Free Software Foundation, Inc.
	1313	+# Copyright (C) 2006-2021 Free Software Foundation, Inc.
1299	1314	#
1300	1315	# This file is free software; the Free Software Foundation
1301	1316	# gives unlimited permission to copy and/or distribute it,

		@@ -1314,7 +1329,7 @@
1314	1329
1315	1330	# Check how to create a tarball. -- Autoconf --
1316	1331
1317		-# Copyright (C) 2004-2018 Free Software Foundation, Inc.
	1332	+# Copyright (C) 2004-2021 Free Software Foundation, Inc.
1318	1333	#
1319	1334	# This file is free software; the Free Software Foundation
1320	1335	# gives unlimited permission to copy and/or distribute it,

diff -r bd2d082702f1 -r aa3c2b5fd105 speexdsp/compile

--- a/speexdsp/compile Wed Dec 28 06:26:56 2022 -0500

+++ b/speexdsp/compile Wed Dec 28 06:28:31 2022 -0500

		@@ -3,7 +3,7 @@
3	3
4	4	scriptversion=2018-03-07.03; # UTC
5	5
6		-# Copyright (C) 1999-2018 Free Software Foundation, Inc.
	6	+# Copyright (C) 1999-2021 Free Software Foundation, Inc.
7	7	# Written by Tom Tromey <tromey@cygnus.com>.
8	8	#
9	9	# This program is free software; you can redistribute it and/or modify

		@@ -53,7 +53,7 @@
53	53	MINGW*)
54	54	file_conv=mingw
55	55	;;
56		- CYGWIN*)
	56	+ CYGWIN* \| MSYS*)
57	57	file_conv=cygwin
58	58	;;
59	59	*)

		@@ -67,7 +67,7 @@
67	67	mingw/*)
68	68	file=`cmd //C echo "$file " \| sed -e 's/"$.$ " $/\1/'`
69	69	;;
70		- cygwin/*)
	70	+ cygwin/* \| msys/*)
71	71	file=`cygpath -m "$file" \|\| echo "$file"`
72	72	;;
73	73	wine/*)

diff -r bd2d082702f1 -r aa3c2b5fd105 speexdsp/config.guess

--- a/speexdsp/config.guess Wed Dec 28 06:26:56 2022 -0500

+++ b/speexdsp/config.guess Wed Dec 28 06:28:31 2022 -0500

		@@ -1,12 +1,14 @@
1	1	#! /bin/sh
2	2	# Attempt to guess a canonical system name.
3		-# Copyright 1992-2018 Free Software Foundation, Inc.
	3	+# Copyright 1992-2022 Free Software Foundation, Inc.
4	4
5		-timestamp='2018-02-24'
	5	+# shellcheck disable=SC2006,SC2268 # see below for rationale
	6	+
	7	+timestamp='2022-01-09'
6	8
7	9	# This file is free software; you can redistribute it and/or modify it
8	10	# under the terms of the GNU General Public License as published by
9		-# the Free Software Foundation; either version 3 of the License, or
	11	+# the Free Software Foundation, either version 3 of the License, or
10	12	# (at your option) any later version.
11	13	#
12	14	# This program is distributed in the hope that it will be useful, but

		@@ -27,11 +29,19 @@
27	29	# Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
28	30	#
29	31	# You can get the latest version of this script from:
30		-# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
	32	+# https://git.savannah.gnu.org/cgit/config.git/plain/config.guess
31	33	#
32	34	# Please send patches to <config-patches@gnu.org>.
33	35
34	36
	37	+# The "shellcheck disable" line above the timestamp inhibits complaints
	38	+# about features and limitations of the classic Bourne shell that were
	39	+# superseded or lifted in POSIX. However, this script identifies a wide
	40	+# variety of pre-POSIX systems that do not have POSIX shells at all, and
	41	+# even some reasonably current systems (Solaris 10 as case-in-point) still
	42	+# have a pre-POSIX /bin/sh.
	43	+
	44	+
35	45	me=`echo "$0" \| sed -e 's,.*/,,'`
36	46
37	47	usage="\

		@@ -50,7 +60,7 @@
50	60	GNU config.guess ($timestamp)
51	61
52	62	Originally written by Per Bothner.
53		-Copyright 1992-2018 Free Software Foundation, Inc.
	63	+Copyright 1992-2022 Free Software Foundation, Inc.
54	64
55	65	This is free software; see the source for copying conditions. There is NO
56	66	warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."

		@@ -84,7 +94,8 @@
84	94	exit 1
85	95	fi
86	96
87		-trap 'exit 1' 1 2 15
	97	+# Just in case it came from the environment.
	98	+GUESS=
88	99
89	100	# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
90	101	# compiler to aid in system detection is discouraged as it requires

		@@ -96,73 +107,90 @@
96	107
97	108	# Portable tmp directory creation inspired by the Autoconf team.
98	109
99		-set_cc_for_build='
100		-trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
101		-trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
102		-: ${TMPDIR=/tmp} ;
103		- { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } \|\|
104		- { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } \|\|
105		- { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } \|\|
106		- { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
107		-dummy=$tmp/dummy ;
108		-tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
109		-case $CC_FOR_BUILD,$HOST_CC,$CC in
110		- ,,) echo "int x;" > "$dummy.c" ;
111		- for c in cc gcc c89 c99 ; do
112		- if ($c -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then
113		- CC_FOR_BUILD="$c"; break ;
114		- fi ;
115		- done ;
116		- if test x"$CC_FOR_BUILD" = x ; then
117		- CC_FOR_BUILD=no_compiler_found ;
118		- fi
119		- ;;
120		- ,,*) CC_FOR_BUILD=$CC ;;
121		- ,,) CC_FOR_BUILD=$HOST_CC ;;
122		-esac ; set_cc_for_build= ;'
	110	+tmp=
	111	+# shellcheck disable=SC2172
	112	+trap 'test -z "$tmp" \|\| rm -fr "$tmp"' 0 1 2 13 15
	113	+
	114	+set_cc_for_build() {
	115	+ # prevent multiple calls if $tmp is already set
	116	+ test "$tmp" && return 0
	117	+ : "${TMPDIR=/tmp}"
	118	+ # shellcheck disable=SC2039,SC3028
	119	+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } \|\|
	120	+ { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir "$tmp" 2>/dev/null) ; } \|\|
	121	+ { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir "$tmp" 2>/dev/null) && echo "Warning: creating insecure temp directory" >&2 ; } \|\|
	122	+ { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; }
	123	+ dummy=$tmp/dummy
	124	+ case ${CC_FOR_BUILD-},${HOST_CC-},${CC-} in
	125	+ ,,) echo "int x;" > "$dummy.c"
	126	+ for driver in cc gcc c89 c99 ; do
	127	+ if ($driver -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then
	128	+ CC_FOR_BUILD=$driver
	129	+ break
	130	+ fi
	131	+ done
	132	+ if test x"$CC_FOR_BUILD" = x ; then
	133	+ CC_FOR_BUILD=no_compiler_found
	134	+ fi
	135	+ ;;
	136	+ ,,*) CC_FOR_BUILD=$CC ;;
	137	+ ,,) CC_FOR_BUILD=$HOST_CC ;;
	138	+ esac
	139	+}
123	140
124	141	# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
125	142	# (ghazi@noc.rutgers.edu 1994-08-24)
126		-if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
	143	+if test -f /.attbin/uname ; then
127	144	PATH=$PATH:/.attbin ; export PATH
128	145	fi
129	146
130	147	UNAME_MACHINE=`(uname -m) 2>/dev/null` \|\| UNAME_MACHINE=unknown
131	148	UNAME_RELEASE=`(uname -r) 2>/dev/null` \|\| UNAME_RELEASE=unknown
132		-UNAME_SYSTEM=`(uname -s) 2>/dev/null` \|\| UNAME_SYSTEM=unknown
	149	+UNAME_SYSTEM=`(uname -s) 2>/dev/null` \|\| UNAME_SYSTEM=unknown
133	150	UNAME_VERSION=`(uname -v) 2>/dev/null` \|\| UNAME_VERSION=unknown
134	151
135		-case "$UNAME_SYSTEM" in
	152	+case $UNAME_SYSTEM in
136	153	Linux\|GNU\|GNU/*)
137		- # If the system lacks a compiler, then just pick glibc.
138		- # We could probably try harder.
139		- LIBC=gnu
	154	+ LIBC=unknown
140	155
141		- eval "$set_cc_for_build"
	156	+ set_cc_for_build
142	157	cat <<-EOF > "$dummy.c"
143	158	#include <features.h>
144	159	#if defined(__UCLIBC__)
145	160	LIBC=uclibc
146	161	#elif defined(__dietlibc__)
147	162	LIBC=dietlibc
	163	+ #elif defined(__GLIBC__)
	164	+ LIBC=gnu
148	165	#else
149		- LIBC=gnu
	166	+ #include <stdarg.h>
	167	+ /* First heuristic to detect musl libc. */
	168	+ #ifdef __DEFINED_va_list
	169	+ LIBC=musl
	170	+ #endif
150	171	#endif
151	172	EOF
152		- eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null \| grep '^LIBC' \| sed 's, ,,g'`"
	173	+ cc_set_libc=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null \| grep '^LIBC' \| sed 's, ,,g'`
	174	+ eval "$cc_set_libc"
153	175
154		- # If ldd exists, use it to detect musl libc.
155		- if command -v ldd >/dev/null && \
156		- ldd --version 2>&1 \| grep -q ^musl
157		- then
158		- LIBC=musl
	176	+ # Second heuristic to detect musl libc.
	177	+ if [ "$LIBC" = unknown ] &&
	178	+ command -v ldd >/dev/null &&
	179	+ ldd --version 2>&1 \| grep -q ^musl; then
	180	+ LIBC=musl
	181	+ fi
	182	+
	183	+ # If the system lacks a compiler, then just pick glibc.
	184	+ # We could probably try harder.
	185	+ if [ "$LIBC" = unknown ]; then
	186	+ LIBC=gnu
159	187	fi
160	188	;;
161	189	esac
162	190
163	191	# Note: order is significant - the case branches are not exclusive.
164	192
165		-case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
	193	+case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION in
166	194	:NetBSD::*)
167	195	# NetBSD (nbsd) targets should (where applicable) match one or
168	196	# more of the tuples: --netbsdelf, --netbsdaout,

		@@ -174,12 +202,12 @@
174	202	#
175	203	# Note: NetBSD doesn't particularly care about the vendor
176	204	# portion of the name. We always set it to "unknown".
177		- sysctl="sysctl -n hw.machine_arch"
178	205	UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null \|\| \
179		- "/sbin/$sysctl" 2>/dev/null \|\| \
180		- "/usr/sbin/$sysctl" 2>/dev/null \|\| \
	206	+ /sbin/sysctl -n hw.machine_arch 2>/dev/null \|\| \
	207	+ /usr/sbin/sysctl -n hw.machine_arch 2>/dev/null \|\| \
181	208	echo unknown)`
182		- case "$UNAME_MACHINE_ARCH" in
	209	+ case $UNAME_MACHINE_ARCH in
	210	+ aarch64eb) machine=aarch64_be-unknown ;;
183	211	armeb) machine=armeb-unknown ;;
184	212	arm*) machine=arm-unknown ;;
185	213	sh3el) machine=shl-unknown ;;

		@@ -188,18 +216,18 @@
188	216	earmv*)
189	217	arch=`echo "$UNAME_MACHINE_ARCH" \| sed -e 's,^e$armv[0-9]$.*$,\1,'`
190	218	endian=`echo "$UNAME_MACHINE_ARCH" \| sed -ne 's,^.*$eb$$,\1,p'`
191		- machine="${arch}${endian}"-unknown
	219	+ machine=${arch}${endian}-unknown
192	220	;;
193		- *) machine="$UNAME_MACHINE_ARCH"-unknown ;;
	221	+ *) machine=$UNAME_MACHINE_ARCH-unknown ;;
194	222	esac
195	223	# The Operating System including object format, if it has switched
196	224	# to ELF recently (or will in the future) and ABI.
197		- case "$UNAME_MACHINE_ARCH" in
	225	+ case $UNAME_MACHINE_ARCH in
198	226	earm*)
199	227	os=netbsdelf
200	228	;;
201	229	arm\|i386\|m68k\|ns32k\|sh3\|sparc\|vax)
202		- eval "$set_cc_for_build"
	230	+ set_cc_for_build
203	231	if echo __ELF__ \| $CC_FOR_BUILD -E - 2>/dev/null \
204	232	\| grep -q __ELF__
205	233	then

		@@ -215,7 +243,7 @@
215	243	;;
216	244	esac
217	245	# Determine ABI tags.
218		- case "$UNAME_MACHINE_ARCH" in
	246	+ case $UNAME_MACHINE_ARCH in
219	247	earm*)
220	248	expr='s/^earmv[0-9]/-eabi/;s/eb$//'
221	249	abi=`echo "$UNAME_MACHINE_ARCH" \| sed -e "$expr"`

		@@ -226,7 +254,7 @@
226	254	# thus, need a distinct triplet. However, they do not need
227	255	# kernel version information, so it can be replaced with a
228	256	# suitable tag, in the style of linux-gnu.
229		- case "$UNAME_VERSION" in
	257	+ case $UNAME_VERSION in
230	258	Debian*)
231	259	release='-gnu'
232	260	;;

		@@ -237,45 +265,57 @@
237	265	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
238	266	# contains redundant information, the shorter form:
239	267	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
240		- echo "$machine-${os}${release}${abi}"
241		- exit ;;
	268	+ GUESS=$machine-${os}${release}${abi-}
	269	+ ;;
242	270	:Bitrig::*)
243	271	UNAME_MACHINE_ARCH=`arch \| sed 's/Bitrig.//'`
244		- echo "$UNAME_MACHINE_ARCH"-unknown-bitrig"$UNAME_RELEASE"
245		- exit ;;
	272	+ GUESS=$UNAME_MACHINE_ARCH-unknown-bitrig$UNAME_RELEASE
	273	+ ;;
246	274	:OpenBSD::*)
247	275	UNAME_MACHINE_ARCH=`arch \| sed 's/OpenBSD.//'`
248		- echo "$UNAME_MACHINE_ARCH"-unknown-openbsd"$UNAME_RELEASE"
249		- exit ;;
	276	+ GUESS=$UNAME_MACHINE_ARCH-unknown-openbsd$UNAME_RELEASE
	277	+ ;;
	278	+ :SecBSD::*)
	279	+ UNAME_MACHINE_ARCH=`arch \| sed 's/SecBSD.//'`
	280	+ GUESS=$UNAME_MACHINE_ARCH-unknown-secbsd$UNAME_RELEASE
	281	+ ;;
250	282	:LibertyBSD::*)
251	283	UNAME_MACHINE_ARCH=`arch \| sed 's/^.*BSD\.//'`
252		- echo "$UNAME_MACHINE_ARCH"-unknown-libertybsd"$UNAME_RELEASE"
253		- exit ;;
	284	+ GUESS=$UNAME_MACHINE_ARCH-unknown-libertybsd$UNAME_RELEASE
	285	+ ;;
254	286	:MidnightBSD::*)
255		- echo "$UNAME_MACHINE"-unknown-midnightbsd"$UNAME_RELEASE"
256		- exit ;;
	287	+ GUESS=$UNAME_MACHINE-unknown-midnightbsd$UNAME_RELEASE
	288	+ ;;
257	289	:ekkoBSD::*)
258		- echo "$UNAME_MACHINE"-unknown-ekkobsd"$UNAME_RELEASE"
259		- exit ;;
	290	+ GUESS=$UNAME_MACHINE-unknown-ekkobsd$UNAME_RELEASE
	291	+ ;;
260	292	:SolidBSD::*)
261		- echo "$UNAME_MACHINE"-unknown-solidbsd"$UNAME_RELEASE"
262		- exit ;;
	293	+ GUESS=$UNAME_MACHINE-unknown-solidbsd$UNAME_RELEASE
	294	+ ;;
	295	+ :OS108::*)
	296	+ GUESS=$UNAME_MACHINE-unknown-os108_$UNAME_RELEASE
	297	+ ;;
263	298	macppc:MirBSD::)
264		- echo powerpc-unknown-mirbsd"$UNAME_RELEASE"
265		- exit ;;
	299	+ GUESS=powerpc-unknown-mirbsd$UNAME_RELEASE
	300	+ ;;
266	301	:MirBSD::*)
267		- echo "$UNAME_MACHINE"-unknown-mirbsd"$UNAME_RELEASE"
268		- exit ;;
	302	+ GUESS=$UNAME_MACHINE-unknown-mirbsd$UNAME_RELEASE
	303	+ ;;
269	304	:Sortix::*)
270		- echo "$UNAME_MACHINE"-unknown-sortix
271		- exit ;;
	305	+ GUESS=$UNAME_MACHINE-unknown-sortix
	306	+ ;;
	307	+ :Twizzler::*)
	308	+ GUESS=$UNAME_MACHINE-unknown-twizzler
	309	+ ;;
272	310	:Redox::*)
273		- echo "$UNAME_MACHINE"-unknown-redox
274		- exit ;;
	311	+ GUESS=$UNAME_MACHINE-unknown-redox
	312	+ ;;
275	313	mips:OSF1:.)
276		- echo mips-dec-osf1
277		- exit ;;
	314	+ GUESS=mips-dec-osf1
	315	+ ;;
278	316	alpha:OSF1::)
	317	+ # Reset EXIT trap before exiting to avoid spurious non-zero exit code.
	318	+ trap '' 0
279	319	case $UNAME_RELEASE in
280	320	*4.0)
281	321	UNAME_RELEASE=`/usr/sbin/sizer -v \| awk '{print $3}'`

		@@ -289,7 +329,7 @@
289	329	# covers most systems running today. This code pipes the CPU
290	330	# types through head -n 1, so we only detect the type of CPU 0.
291	331	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v \| sed -n -e 's/^ The alpha $.$ processor.$/\1/p' \| head -n 1`
292		- case "$ALPHA_CPU_TYPE" in
	332	+ case $ALPHA_CPU_TYPE in
293	333	"EV4 (21064)")
294	334	UNAME_MACHINE=alpha ;;
295	335	"EV4.5 (21064)")

		@@ -326,117 +366,121 @@
326	366	# A Tn.n version is a released field test version.
327	367	# A Xn.n version is an unreleased experimental baselevel.
328	368	# 1.2 uses "1.2" for uname -r.
329		- echo "$UNAME_MACHINE"-dec-osf"`echo "$UNAME_RELEASE" \| sed -e 's/^[PVTX]//' \| tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`"
330		- # Reset EXIT trap before exiting to avoid spurious non-zero exit code.
331		- exitcode=$?
332		- trap '' 0
333		- exit $exitcode ;;
	369	+ OSF_REL=`echo "$UNAME_RELEASE" \| sed -e 's/^[PVTX]//' \| tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
	370	+ GUESS=$UNAME_MACHINE-dec-osf$OSF_REL
	371	+ ;;
334	372	Amiga:UNIX_System_V:4.0:)
335		- echo m68k-unknown-sysv4
336		- exit ;;
	373	+ GUESS=m68k-unknown-sysv4
	374	+ ;;
337	375	:[Aa]miga[Oo][Ss]::*)
338		- echo "$UNAME_MACHINE"-unknown-amigaos
339		- exit ;;
	376	+ GUESS=$UNAME_MACHINE-unknown-amigaos
	377	+ ;;
340	378	:[Mm]orph[Oo][Ss]::*)
341		- echo "$UNAME_MACHINE"-unknown-morphos
342		- exit ;;
	379	+ GUESS=$UNAME_MACHINE-unknown-morphos
	380	+ ;;
343	381	:OS/390::*)
344		- echo i370-ibm-openedition
345		- exit ;;
	382	+ GUESS=i370-ibm-openedition
	383	+ ;;
346	384	:z/VM::*)
347		- echo s390-ibm-zvmoe
348		- exit ;;
	385	+ GUESS=s390-ibm-zvmoe
	386	+ ;;
349	387	:OS400::*)
350		- echo powerpc-ibm-os400
351		- exit ;;
	388	+ GUESS=powerpc-ibm-os400
	389	+ ;;
352	390	arm:RISC:1.[012]:\|arm:riscix:1.[012]:*)
353		- echo arm-acorn-riscix"$UNAME_RELEASE"
354		- exit ;;
	391	+ GUESS=arm-acorn-riscix$UNAME_RELEASE
	392	+ ;;
355	393	arm:riscos::\|arm:RISCOS::)
356		- echo arm-unknown-riscos
357		- exit ;;
	394	+ GUESS=arm-unknown-riscos
	395	+ ;;
358	396	SR2?01:HI-UX/MPP:: \| SR8000:HI-UX/MPP::)
359		- echo hppa1.1-hitachi-hiuxmpp
360		- exit ;;
	397	+ GUESS=hppa1.1-hitachi-hiuxmpp
	398	+ ;;
361	399	Pyramid:OSx:: \| MIS:OSx:: \| MIS:SMP_DC-OSx::)
362	400	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
363		- if test "`(/bin/universe) 2>/dev/null`" = att ; then
364		- echo pyramid-pyramid-sysv3
365		- else
366		- echo pyramid-pyramid-bsd
367		- fi
368		- exit ;;
	401	+ case `(/bin/universe) 2>/dev/null` in
	402	+ att) GUESS=pyramid-pyramid-sysv3 ;;
	403	+ *) GUESS=pyramid-pyramid-bsd ;;
	404	+ esac
	405	+ ;;
369	406	NILE::*:dcosx)
370		- echo pyramid-pyramid-svr4
371		- exit ;;
	407	+ GUESS=pyramid-pyramid-svr4
	408	+ ;;
372	409	DRS?6000:unix:4.0:6*)
373		- echo sparc-icl-nx6
374		- exit ;;
	410	+ GUESS=sparc-icl-nx6
	411	+ ;;
375	412	DRS?6000:UNIX_SV:4.2:7 \| DRS?6000:isis:4.2:7)
376	413	case `/usr/bin/uname -p` in
377		- sparc) echo sparc-icl-nx7; exit ;;
378		- esac ;;
	414	+ sparc) GUESS=sparc-icl-nx7 ;;
	415	+ esac
	416	+ ;;
379	417	s390x:SunOS::)
380		- echo "$UNAME_MACHINE"-ibm-solaris2"`echo "$UNAME_RELEASE" \| sed -e 's/[^.]*//'`"
381		- exit ;;
	418	+ SUN_REL=`echo "$UNAME_RELEASE" \| sed -e 's/[^.]*//'`
	419	+ GUESS=$UNAME_MACHINE-ibm-solaris2$SUN_REL
	420	+ ;;
382	421	sun4H:SunOS:5.:)
383		- echo sparc-hal-solaris2"`echo "$UNAME_RELEASE"\|sed -e 's/[^.]*//'`"
384		- exit ;;
	422	+ SUN_REL=`echo "$UNAME_RELEASE" \| sed -e 's/[^.]*//'`
	423	+ GUESS=sparc-hal-solaris2$SUN_REL
	424	+ ;;
385	425	sun4:SunOS:5.:* \| tadpole:SunOS:5.:*)
386		- echo sparc-sun-solaris2"`echo "$UNAME_RELEASE" \| sed -e 's/[^.]*//'`"
387		- exit ;;
	426	+ SUN_REL=`echo "$UNAME_RELEASE" \| sed -e 's/[^.]*//'`
	427	+ GUESS=sparc-sun-solaris2$SUN_REL
	428	+ ;;
388	429	i86pc:AuroraUX:5.: \| i86xen:AuroraUX:5.:)
389		- echo i386-pc-auroraux"$UNAME_RELEASE"
390		- exit ;;
	430	+ GUESS=i386-pc-auroraux$UNAME_RELEASE
	431	+ ;;
391	432	i86pc:SunOS:5.: \| i86xen:SunOS:5.:)
392		- eval "$set_cc_for_build"
	433	+ set_cc_for_build
393	434	SUN_ARCH=i386
394	435	# If there is a compiler, see if it is configured for 64-bit objects.
395	436	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
396	437	# This test works for both compilers.
397		- if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
	438	+ if test "$CC_FOR_BUILD" != no_compiler_found; then
398	439	if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') \| \
399		- (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) \| \
	440	+ (CCOPTS="" $CC_FOR_BUILD -m64 -E - 2>/dev/null) \| \
400	441	grep IS_64BIT_ARCH >/dev/null
401	442	then
402	443	SUN_ARCH=x86_64
403	444	fi
404	445	fi
405		- echo "$SUN_ARCH"-pc-solaris2"`echo "$UNAME_RELEASE"\|sed -e 's/[^.]*//'`"
406		- exit ;;
	446	+ SUN_REL=`echo "$UNAME_RELEASE" \| sed -e 's/[^.]*//'`
	447	+ GUESS=$SUN_ARCH-pc-solaris2$SUN_REL
	448	+ ;;
407	449	sun4:SunOS:6:*)
408	450	# According to config.sub, this is the proper way to canonicalize
409	451	# SunOS6. Hard to guess exactly what SunOS6 will be like, but
410	452	# it's likely to be more like Solaris than SunOS4.
411		- echo sparc-sun-solaris3"`echo "$UNAME_RELEASE"\|sed -e 's/[^.]*//'`"
412		- exit ;;
	453	+ SUN_REL=`echo "$UNAME_RELEASE" \| sed -e 's/[^.]*//'`
	454	+ GUESS=sparc-sun-solaris3$SUN_REL
	455	+ ;;
413	456	sun4:SunOS::*)
414		- case "`/usr/bin/arch -k`" in
	457	+ case `/usr/bin/arch -k` in
415	458	Series\|S4)
416	459	UNAME_RELEASE=`uname -v`
417	460	;;
418	461	esac
419	462	# Japanese Language versions have a version number like `4.1.3-JL'.
420		- echo sparc-sun-sunos"`echo "$UNAME_RELEASE"\|sed -e 's/-/_/'`"
421		- exit ;;
	463	+ SUN_REL=`echo "$UNAME_RELEASE" \| sed -e 's/-/_/'`
	464	+ GUESS=sparc-sun-sunos$SUN_REL
	465	+ ;;
422	466	sun3:SunOS::*)
423		- echo m68k-sun-sunos"$UNAME_RELEASE"
424		- exit ;;
	467	+ GUESS=m68k-sun-sunos$UNAME_RELEASE
	468	+ ;;
425	469	sun::4.2BSD:*)
426	470	UNAME_RELEASE=`(sed 1q /etc/motd \| awk '{print substr($5,1,3)}') 2>/dev/null`
427	471	test "x$UNAME_RELEASE" = x && UNAME_RELEASE=3
428		- case "`/bin/arch`" in
	472	+ case `/bin/arch` in
429	473	sun3)
430		- echo m68k-sun-sunos"$UNAME_RELEASE"
	474	+ GUESS=m68k-sun-sunos$UNAME_RELEASE
431	475	;;
432	476	sun4)
433		- echo sparc-sun-sunos"$UNAME_RELEASE"
	477	+ GUESS=sparc-sun-sunos$UNAME_RELEASE
434	478	;;
435	479	esac
436		- exit ;;
	480	+ ;;
437	481	aushp:SunOS::)
438		- echo sparc-auspex-sunos"$UNAME_RELEASE"
439		- exit ;;
	482	+ GUESS=sparc-auspex-sunos$UNAME_RELEASE
	483	+ ;;
440	484	# The situation for MiNT is a little confusing. The machine name
441	485	# can be virtually everything (everything which is not
442	486	# "atarist" or "atariste" at least should have a processor

		@@ -446,43 +490,43 @@
446	490	# MiNT. But MiNT is downward compatible to TOS, so this should
447	491	# be no problem.
448	492	atarist[e]:MiNT::* \| atarist[e]:mint::* \| atarist[e]:TOS::*)
449		- echo m68k-atari-mint"$UNAME_RELEASE"
450		- exit ;;
	493	+ GUESS=m68k-atari-mint$UNAME_RELEASE
	494	+ ;;
451	495	atari:MiNT:: \| atari:mint:: \| atarist[e]:TOS::*)
452		- echo m68k-atari-mint"$UNAME_RELEASE"
453		- exit ;;
	496	+ GUESS=m68k-atari-mint$UNAME_RELEASE
	497	+ ;;
454	498	falcon:MiNT::* \| falcon:mint::* \| falcon:TOS::*)
455		- echo m68k-atari-mint"$UNAME_RELEASE"
456		- exit ;;
	499	+ GUESS=m68k-atari-mint$UNAME_RELEASE
	500	+ ;;
457	501	milan:MiNT:: \| milan:mint:: \| milan:TOS::*)
458		- echo m68k-milan-mint"$UNAME_RELEASE"
459		- exit ;;
	502	+ GUESS=m68k-milan-mint$UNAME_RELEASE
	503	+ ;;
460	504	hades:MiNT:: \| hades:mint:: \| hades:TOS::*)
461		- echo m68k-hades-mint"$UNAME_RELEASE"
462		- exit ;;
	505	+ GUESS=m68k-hades-mint$UNAME_RELEASE
	506	+ ;;
463	507	:MiNT:: \| :mint:: \| :TOS::)
464		- echo m68k-unknown-mint"$UNAME_RELEASE"
465		- exit ;;
	508	+ GUESS=m68k-unknown-mint$UNAME_RELEASE
	509	+ ;;
466	510	m68k:machten::)
467		- echo m68k-apple-machten"$UNAME_RELEASE"
468		- exit ;;
	511	+ GUESS=m68k-apple-machten$UNAME_RELEASE
	512	+ ;;
469	513	powerpc:machten::)
470		- echo powerpc-apple-machten"$UNAME_RELEASE"
471		- exit ;;
	514	+ GUESS=powerpc-apple-machten$UNAME_RELEASE
	515	+ ;;
472	516	RISC:Mach::*)
473		- echo mips-dec-mach_bsd4.3
474		- exit ;;
	517	+ GUESS=mips-dec-mach_bsd4.3
	518	+ ;;
475	519	RISC:ULTRIX::*)
476		- echo mips-dec-ultrix"$UNAME_RELEASE"
477		- exit ;;
	520	+ GUESS=mips-dec-ultrix$UNAME_RELEASE
	521	+ ;;
478	522	VAX:ULTRIX::)
479		- echo vax-dec-ultrix"$UNAME_RELEASE"
480		- exit ;;
	523	+ GUESS=vax-dec-ultrix$UNAME_RELEASE
	524	+ ;;
481	525	2020:CLIX:: \| 2430:CLIX::)
482		- echo clipper-intergraph-clix"$UNAME_RELEASE"
483		- exit ;;
	526	+ GUESS=clipper-intergraph-clix$UNAME_RELEASE
	527	+ ;;
484	528	mips:::UMIPS \| mips:::RISCos)
485		- eval "$set_cc_for_build"
	529	+ set_cc_for_build
486	530	sed 's/^ //' << EOF > "$dummy.c"
487	531	#ifdef __cplusplus
488	532	#include <stdio.h> /* for printf() prototype */

		@@ -508,78 +552,79 @@
508	552	dummyarg=`echo "$UNAME_RELEASE" \| sed -n 's/$[0-9]$./\1/p'` &&
509	553	SYSTEM_NAME=`"$dummy" "$dummyarg"` &&
510	554	{ echo "$SYSTEM_NAME"; exit; }
511		- echo mips-mips-riscos"$UNAME_RELEASE"
512		- exit ;;
	555	+ GUESS=mips-mips-riscos$UNAME_RELEASE
	556	+ ;;
513	557	Motorola:PowerMAX_OS::)
514		- echo powerpc-motorola-powermax
515		- exit ;;
	558	+ GUESS=powerpc-motorola-powermax
	559	+ ;;
516	560	Motorola::4.3:PL8-)
517		- echo powerpc-harris-powermax
518		- exit ;;
	561	+ GUESS=powerpc-harris-powermax
	562	+ ;;
519	563	Night_Hawk:::PowerMAX_OS \| Synergy:PowerMAX_OS::)
520		- echo powerpc-harris-powermax
521		- exit ;;
	564	+ GUESS=powerpc-harris-powermax
	565	+ ;;
522	566	Night_Hawk:Power_UNIX::)
523		- echo powerpc-harris-powerunix
524		- exit ;;
	567	+ GUESS=powerpc-harris-powerunix
	568	+ ;;
525	569	m88k:CX/UX:7:)
526		- echo m88k-harris-cxux7
527		- exit ;;
	570	+ GUESS=m88k-harris-cxux7
	571	+ ;;
528	572	m88k::4:R4*)
529		- echo m88k-motorola-sysv4
530		- exit ;;
	573	+ GUESS=m88k-motorola-sysv4
	574	+ ;;
531	575	m88k::3:R3*)
532		- echo m88k-motorola-sysv3
533		- exit ;;
	576	+ GUESS=m88k-motorola-sysv3
	577	+ ;;
534	578	AViiON:dgux::)
535	579	# DG/UX returns AViiON for all architectures
536	580	UNAME_PROCESSOR=`/usr/bin/uname -p`
537		- if [ "$UNAME_PROCESSOR" = mc88100 ] \|\| [ "$UNAME_PROCESSOR" = mc88110 ]
	581	+ if test "$UNAME_PROCESSOR" = mc88100 \|\| test "$UNAME_PROCESSOR" = mc88110
538	582	then
539		- if [ "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx ] \|\| \
540		- [ "$TARGET_BINARY_INTERFACE"x = x ]
	583	+ if test "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx \|\| \
	584	+ test "$TARGET_BINARY_INTERFACE"x = x
541	585	then
542		- echo m88k-dg-dgux"$UNAME_RELEASE"
	586	+ GUESS=m88k-dg-dgux$UNAME_RELEASE
543	587	else
544		- echo m88k-dg-dguxbcs"$UNAME_RELEASE"
	588	+ GUESS=m88k-dg-dguxbcs$UNAME_RELEASE
545	589	fi
546	590	else
547		- echo i586-dg-dgux"$UNAME_RELEASE"
	591	+ GUESS=i586-dg-dgux$UNAME_RELEASE
548	592	fi
549		- exit ;;
	593	+ ;;
550	594	M88:DolphinOS::*) # DolphinOS (SVR3)
551		- echo m88k-dolphin-sysv3
552		- exit ;;
	595	+ GUESS=m88k-dolphin-sysv3
	596	+ ;;
553	597	M88::R3:)
554	598	# Delta 88k system running SVR3
555		- echo m88k-motorola-sysv3
556		- exit ;;
	599	+ GUESS=m88k-motorola-sysv3
	600	+ ;;
557	601	XD88:::) # Tektronix XD88 system running UTekV (SVR3)
558		- echo m88k-tektronix-sysv3
559		- exit ;;
	602	+ GUESS=m88k-tektronix-sysv3
	603	+ ;;
560	604	Tek43[0-9][0-9]:UTek::) # Tektronix 4300 system running UTek (BSD)
561		- echo m68k-tektronix-bsd
562		- exit ;;
	605	+ GUESS=m68k-tektronix-bsd
	606	+ ;;
563	607	:IRIX::)
564		- echo mips-sgi-irix"`echo "$UNAME_RELEASE"\|sed -e 's/-/_/g'`"
565		- exit ;;
	608	+ IRIX_REL=`echo "$UNAME_RELEASE" \| sed -e 's/-/_/g'`
	609	+ GUESS=mips-sgi-irix$IRIX_REL
	610	+ ;;
566	611	????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
567		- echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id
568		- exit ;; # Note that: echo "'`uname -s`'" gives 'AIX '
	612	+ GUESS=romp-ibm-aix # uname -m gives an 8 hex-code CPU id
	613	+ ;; # Note that: echo "'`uname -s`'" gives 'AIX '
569	614	i86:AIX::*)
570		- echo i386-ibm-aix
571		- exit ;;
	615	+ GUESS=i386-ibm-aix
	616	+ ;;
572	617	ia64:AIX::)
573		- if [ -x /usr/bin/oslevel ] ; then
	618	+ if test -x /usr/bin/oslevel ; then
574	619	IBM_REV=`/usr/bin/oslevel`
575	620	else
576		- IBM_REV="$UNAME_VERSION.$UNAME_RELEASE"
	621	+ IBM_REV=$UNAME_VERSION.$UNAME_RELEASE
577	622	fi
578		- echo "$UNAME_MACHINE"-ibm-aix"$IBM_REV"
579		- exit ;;
	623	+ GUESS=$UNAME_MACHINE-ibm-aix$IBM_REV
	624	+ ;;
580	625	*:AIX:2:3)
581	626	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
582		- eval "$set_cc_for_build"
	627	+ set_cc_for_build
583	628	sed 's/^ //' << EOF > "$dummy.c"
584	629	#include <sys/systemcfg.h>
585	630

		@@ -593,16 +638,16 @@
593	638	EOF
594	639	if $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"`
595	640	then
596		- echo "$SYSTEM_NAME"
	641	+ GUESS=$SYSTEM_NAME
597	642	else
598		- echo rs6000-ibm-aix3.2.5
	643	+ GUESS=rs6000-ibm-aix3.2.5
599	644	fi
600	645	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
601		- echo rs6000-ibm-aix3.2.4
	646	+ GUESS=rs6000-ibm-aix3.2.4
602	647	else
603		- echo rs6000-ibm-aix3.2
	648	+ GUESS=rs6000-ibm-aix3.2
604	649	fi
605		- exit ;;
	650	+ ;;
606	651	:AIX::[4567])
607	652	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available \| sed 1q \| awk '{ print $1 }'`
608	653	if /usr/sbin/lsattr -El "$IBM_CPU_ID" \| grep ' POWER' >/dev/null 2>&1; then

		@@ -610,57 +655,57 @@
610	655	else
611	656	IBM_ARCH=powerpc
612	657	fi
613		- if [ -x /usr/bin/lslpp ] ; then
614		- IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc \|
	658	+ if test -x /usr/bin/lslpp ; then
	659	+ IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc \| \
615	660	awk -F: '{ print $3 }' \| sed s/[0-9]*$/0/`
616	661	else
617		- IBM_REV="$UNAME_VERSION.$UNAME_RELEASE"
	662	+ IBM_REV=$UNAME_VERSION.$UNAME_RELEASE
618	663	fi
619		- echo "$IBM_ARCH"-ibm-aix"$IBM_REV"
620		- exit ;;
	664	+ GUESS=$IBM_ARCH-ibm-aix$IBM_REV
	665	+ ;;
621	666	:AIX::*)
622		- echo rs6000-ibm-aix
623		- exit ;;
	667	+ GUESS=rs6000-ibm-aix
	668	+ ;;
624	669	ibmrt:4.4BSD:\|romp-ibm:4.4BSD:)
625		- echo romp-ibm-bsd4.4
626		- exit ;;
	670	+ GUESS=romp-ibm-bsd4.4
	671	+ ;;
627	672	ibmrt:BSD:\|romp-ibm:BSD:*) # covers RT/PC BSD and
628		- echo romp-ibm-bsd"$UNAME_RELEASE" # 4.3 with uname added to
629		- exit ;; # report: romp-ibm BSD 4.3
	673	+ GUESS=romp-ibm-bsd$UNAME_RELEASE # 4.3 with uname added to
	674	+ ;; # report: romp-ibm BSD 4.3
630	675	:BOSX::*)
631		- echo rs6000-bull-bosx
632		- exit ;;
	676	+ GUESS=rs6000-bull-bosx
	677	+ ;;
633	678	DPX/2?00:B.O.S.::)
634		- echo m68k-bull-sysv3
635		- exit ;;
	679	+ GUESS=m68k-bull-sysv3
	680	+ ;;
636	681	9000/[34]??:4.3bsd:1.:)
637		- echo m68k-hp-bsd
638		- exit ;;
	682	+ GUESS=m68k-hp-bsd
	683	+ ;;
639	684	hp300:4.4BSD:: \| 9000/[34]??:4.3bsd:2.:)
640		- echo m68k-hp-bsd4.4
641		- exit ;;
	685	+ GUESS=m68k-hp-bsd4.4
	686	+ ;;
642	687	9000/[34678]??:HP-UX::)
643		- HPUX_REV=`echo "$UNAME_RELEASE"\|sed -e 's/[^.].[0B]//'`
644		- case "$UNAME_MACHINE" in
	688	+ HPUX_REV=`echo "$UNAME_RELEASE" \| sed -e 's/[^.].[0B]//'`
	689	+ case $UNAME_MACHINE in
645	690	9000/31?) HP_ARCH=m68000 ;;
646	691	9000/[34]??) HP_ARCH=m68k ;;
647	692	9000/[678][0-9][0-9])
648		- if [ -x /usr/bin/getconf ]; then
	693	+ if test -x /usr/bin/getconf; then
649	694	sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
650	695	sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
651		- case "$sc_cpu_version" in
	696	+ case $sc_cpu_version in
652	697	523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0
653	698	528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1
654	699	532) # CPU_PA_RISC2_0
655		- case "$sc_kernel_bits" in
	700	+ case $sc_kernel_bits in
656	701	32) HP_ARCH=hppa2.0n ;;
657	702	64) HP_ARCH=hppa2.0w ;;
658	703	'') HP_ARCH=hppa2.0 ;; # HP-UX 10.20
659	704	esac ;;
660	705	esac
661	706	fi
662		- if [ "$HP_ARCH" = "" ]; then
663		- eval "$set_cc_for_build"
	707	+ if test "$HP_ARCH" = ""; then
	708	+ set_cc_for_build
664	709	sed 's/^ //' << EOF > "$dummy.c"
665	710
666	711	#define _HPUX_SOURCE

		@@ -698,9 +743,9 @@
698	743	test -z "$HP_ARCH" && HP_ARCH=hppa
699	744	fi ;;
700	745	esac
701		- if [ "$HP_ARCH" = hppa2.0w ]
	746	+ if test "$HP_ARCH" = hppa2.0w
702	747	then
703		- eval "$set_cc_for_build"
	748	+ set_cc_for_build
704	749
705	750	# hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
706	751	# 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler

		@@ -719,14 +764,14 @@
719	764	HP_ARCH=hppa64
720	765	fi
721	766	fi
722		- echo "$HP_ARCH"-hp-hpux"$HPUX_REV"
723		- exit ;;
	767	+ GUESS=$HP_ARCH-hp-hpux$HPUX_REV
	768	+ ;;
724	769	ia64:HP-UX::)
725		- HPUX_REV=`echo "$UNAME_RELEASE"\|sed -e 's/[^.].[0B]//'`
726		- echo ia64-hp-hpux"$HPUX_REV"
727		- exit ;;
	770	+ HPUX_REV=`echo "$UNAME_RELEASE" \| sed -e 's/[^.].[0B]//'`
	771	+ GUESS=ia64-hp-hpux$HPUX_REV
	772	+ ;;
728	773	3050:HI-UX::*)
729		- eval "$set_cc_for_build"
	774	+ set_cc_for_build
730	775	sed 's/^ //' << EOF > "$dummy.c"
731	776	#include <unistd.h>
732	777	int

		@@ -754,36 +799,36 @@
754	799	EOF
755	800	$CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` &&
756	801	{ echo "$SYSTEM_NAME"; exit; }
757		- echo unknown-hitachi-hiuxwe2
758		- exit ;;
	802	+ GUESS=unknown-hitachi-hiuxwe2
	803	+ ;;
759	804	9000/7??:4.3bsd:: \| 9000/8?[79]:4.3bsd::)
760		- echo hppa1.1-hp-bsd
761		- exit ;;
	805	+ GUESS=hppa1.1-hp-bsd
	806	+ ;;
762	807	9000/8??:4.3bsd::)
763		- echo hppa1.0-hp-bsd
764		- exit ;;
	808	+ GUESS=hppa1.0-hp-bsd
	809	+ ;;
765	810	9??:MPE/iX:: \| 3000:MPE/iX::)
766		- echo hppa1.0-hp-mpeix
767		- exit ;;
	811	+ GUESS=hppa1.0-hp-mpeix
	812	+ ;;
768	813	hp7??:OSF1:: \| hp8?[79]:OSF1::)
769		- echo hppa1.1-hp-osf
770		- exit ;;
	814	+ GUESS=hppa1.1-hp-osf
	815	+ ;;
771	816	hp8??:OSF1::)
772		- echo hppa1.0-hp-osf
773		- exit ;;
	817	+ GUESS=hppa1.0-hp-osf
	818	+ ;;
774	819	i86:OSF1::*)
775		- if [ -x /usr/sbin/sysversion ] ; then
776		- echo "$UNAME_MACHINE"-unknown-osf1mk
	820	+ if test -x /usr/sbin/sysversion ; then
	821	+ GUESS=$UNAME_MACHINE-unknown-osf1mk
777	822	else
778		- echo "$UNAME_MACHINE"-unknown-osf1
	823	+ GUESS=$UNAME_MACHINE-unknown-osf1
779	824	fi
780		- exit ;;
	825	+ ;;
781	826	parisc:Lites::)
782		- echo hppa1.1-hp-lites
783		- exit ;;
	827	+ GUESS=hppa1.1-hp-lites
	828	+ ;;
784	829	C1:ConvexOS::* \| convex:ConvexOS:C1:)
785		- echo c1-convex-bsd
786		- exit ;;
	830	+ GUESS=c1-convex-bsd
	831	+ ;;
787	832	C2:ConvexOS::* \| convex:ConvexOS:C2:)
788	833	if getsysinfo -f scalar_acc
789	834	then echo c32-convex-bsd

		@@ -791,17 +836,18 @@
791	836	fi
792	837	exit ;;
793	838	C34:ConvexOS::* \| convex:ConvexOS:C34:)
794		- echo c34-convex-bsd
795		- exit ;;
	839	+ GUESS=c34-convex-bsd
	840	+ ;;
796	841	C38:ConvexOS::* \| convex:ConvexOS:C38:)
797		- echo c38-convex-bsd
798		- exit ;;
	842	+ GUESS=c38-convex-bsd
	843	+ ;;
799	844	C4:ConvexOS::* \| convex:ConvexOS:C4:)
800		- echo c4-convex-bsd
801		- exit ;;
	845	+ GUESS=c4-convex-bsd
	846	+ ;;
802	847	CRAYY-MP:::)
803		- echo ymp-cray-unicos"$UNAME_RELEASE" \| sed -e 's/\.[^.]*$/.X/'
804		- exit ;;
	848	+ CRAY_REL=`echo "$UNAME_RELEASE" \| sed -e 's/\.[^.]*$/.X/'`
	849	+ GUESS=ymp-cray-unicos$CRAY_REL
	850	+ ;;
805	851	CRAY[A-Z]90:::)
806	852	echo "$UNAME_MACHINE"-cray-unicos"$UNAME_RELEASE" \
807	853	\| sed -e 's/CRAY.*$[A-Z]90$/\1/' \

		@@ -809,103 +855,129 @@
809	855	-e 's/\.[^.]*$/.X/'
810	856	exit ;;
811	857	CRAYTS:::)
812		- echo t90-cray-unicos"$UNAME_RELEASE" \| sed -e 's/\.[^.]*$/.X/'
813		- exit ;;
	858	+ CRAY_REL=`echo "$UNAME_RELEASE" \| sed -e 's/\.[^.]*$/.X/'`
	859	+ GUESS=t90-cray-unicos$CRAY_REL
	860	+ ;;
814	861	CRAYT3E:::)
815		- echo alphaev5-cray-unicosmk"$UNAME_RELEASE" \| sed -e 's/\.[^.]*$/.X/'
816		- exit ;;
	862	+ CRAY_REL=`echo "$UNAME_RELEASE" \| sed -e 's/\.[^.]*$/.X/'`
	863	+ GUESS=alphaev5-cray-unicosmk$CRAY_REL
	864	+ ;;
817	865	CRAYSV1:::)
818		- echo sv1-cray-unicos"$UNAME_RELEASE" \| sed -e 's/\.[^.]*$/.X/'
819		- exit ;;
	866	+ CRAY_REL=`echo "$UNAME_RELEASE" \| sed -e 's/\.[^.]*$/.X/'`
	867	+ GUESS=sv1-cray-unicos$CRAY_REL
	868	+ ;;
820	869	:UNICOS/mp::*)
821		- echo craynv-cray-unicosmp"$UNAME_RELEASE" \| sed -e 's/\.[^.]*$/.X/'
822		- exit ;;
	870	+ CRAY_REL=`echo "$UNAME_RELEASE" \| sed -e 's/\.[^.]*$/.X/'`
	871	+ GUESS=craynv-cray-unicosmp$CRAY_REL
	872	+ ;;
823	873	F30[01]:UNIX_System_V:: \| F700:UNIX_System_V::)
824	874	FUJITSU_PROC=`uname -m \| tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
825	875	FUJITSU_SYS=`uname -p \| tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz \| sed -e 's/\///'`
826	876	FUJITSU_REL=`echo "$UNAME_RELEASE" \| sed -e 's/ /_/'`
827		- echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
828		- exit ;;
	877	+ GUESS=${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}
	878	+ ;;
829	879	5000:UNIX_System_V:4.:)
830	880	FUJITSU_SYS=`uname -p \| tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz \| sed -e 's/\///'`
831	881	FUJITSU_REL=`echo "$UNAME_RELEASE" \| tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz \| sed -e 's/ /_/'`
832		- echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
833		- exit ;;
	882	+ GUESS=sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}
	883	+ ;;
834	884	i86:BSD/386::* \| i86:BSD/OS::* \| :Ascend\ Embedded/OS::*)
835		- echo "$UNAME_MACHINE"-pc-bsdi"$UNAME_RELEASE"
836		- exit ;;
	885	+ GUESS=$UNAME_MACHINE-pc-bsdi$UNAME_RELEASE
	886	+ ;;
837	887	sparc:BSD/OS::*)
838		- echo sparc-unknown-bsdi"$UNAME_RELEASE"
839		- exit ;;
	888	+ GUESS=sparc-unknown-bsdi$UNAME_RELEASE
	889	+ ;;
840	890	:BSD/OS::*)
841		- echo "$UNAME_MACHINE"-unknown-bsdi"$UNAME_RELEASE"
842		- exit ;;
	891	+ GUESS=$UNAME_MACHINE-unknown-bsdi$UNAME_RELEASE
	892	+ ;;
	893	+ arm:FreeBSD::)
	894	+ UNAME_PROCESSOR=`uname -p`
	895	+ set_cc_for_build
	896	+ if echo __ARM_PCS_VFP \| $CC_FOR_BUILD -E - 2>/dev/null \
	897	+ \| grep -q __ARM_PCS_VFP
	898	+ then
	899	+ FREEBSD_REL=`echo "$UNAME_RELEASE" \| sed -e 's/[-(].*//'`
	900	+ GUESS=$UNAME_PROCESSOR-unknown-freebsd$FREEBSD_REL-gnueabi
	901	+ else
	902	+ FREEBSD_REL=`echo "$UNAME_RELEASE" \| sed -e 's/[-(].*//'`
	903	+ GUESS=$UNAME_PROCESSOR-unknown-freebsd$FREEBSD_REL-gnueabihf
	904	+ fi
	905	+ ;;
843	906	:FreeBSD::*)
844	907	UNAME_PROCESSOR=`/usr/bin/uname -p`
845		- case "$UNAME_PROCESSOR" in
	908	+ case $UNAME_PROCESSOR in
846	909	amd64)
847	910	UNAME_PROCESSOR=x86_64 ;;
848	911	i386)
849	912	UNAME_PROCESSOR=i586 ;;
850	913	esac
851		- echo "$UNAME_PROCESSOR"-unknown-freebsd"`echo "$UNAME_RELEASE"\|sed -e 's/[-(].*//'`"
852		- exit ;;
	914	+ FREEBSD_REL=`echo "$UNAME_RELEASE" \| sed -e 's/[-(].*//'`
	915	+ GUESS=$UNAME_PROCESSOR-unknown-freebsd$FREEBSD_REL
	916	+ ;;
853	917	i:CYGWIN:*)
854		- echo "$UNAME_MACHINE"-pc-cygwin
855		- exit ;;
	918	+ GUESS=$UNAME_MACHINE-pc-cygwin
	919	+ ;;
856	920	:MINGW64:*)
857		- echo "$UNAME_MACHINE"-pc-mingw64
858		- exit ;;
	921	+ GUESS=$UNAME_MACHINE-pc-mingw64
	922	+ ;;
859	923	:MINGW:*)
860		- echo "$UNAME_MACHINE"-pc-mingw32
861		- exit ;;
	924	+ GUESS=$UNAME_MACHINE-pc-mingw32
	925	+ ;;
862	926	:MSYS:*)
863		- echo "$UNAME_MACHINE"-pc-msys
864		- exit ;;
	927	+ GUESS=$UNAME_MACHINE-pc-msys
	928	+ ;;
865	929	i:PW:*)
866		- echo "$UNAME_MACHINE"-pc-pw32
867		- exit ;;
	930	+ GUESS=$UNAME_MACHINE-pc-pw32
	931	+ ;;
	932	+ :SerenityOS::*)
	933	+ GUESS=$UNAME_MACHINE-pc-serenity
	934	+ ;;
868	935	:Interix:*)
869		- case "$UNAME_MACHINE" in
	936	+ case $UNAME_MACHINE in
870	937	x86)
871		- echo i586-pc-interix"$UNAME_RELEASE"
872		- exit ;;
	938	+ GUESS=i586-pc-interix$UNAME_RELEASE
	939	+ ;;
873	940	authenticamd \| genuineintel \| EM64T)
874		- echo x86_64-unknown-interix"$UNAME_RELEASE"
875		- exit ;;
	941	+ GUESS=x86_64-unknown-interix$UNAME_RELEASE
	942	+ ;;
876	943	IA64)
877		- echo ia64-unknown-interix"$UNAME_RELEASE"
878		- exit ;;
	944	+ GUESS=ia64-unknown-interix$UNAME_RELEASE
	945	+ ;;
879	946	esac ;;
880	947	i:UWIN:*)
881		- echo "$UNAME_MACHINE"-pc-uwin
882		- exit ;;
	948	+ GUESS=$UNAME_MACHINE-pc-uwin
	949	+ ;;
883	950	amd64:CYGWIN::* \| x86_64:CYGWIN::*)
884		- echo x86_64-unknown-cygwin
885		- exit ;;
	951	+ GUESS=x86_64-pc-cygwin
	952	+ ;;
886	953	prep:SunOS:5.:*)
887		- echo powerpcle-unknown-solaris2"`echo "$UNAME_RELEASE"\|sed -e 's/[^.]*//'`"
888		- exit ;;
	954	+ SUN_REL=`echo "$UNAME_RELEASE" \| sed -e 's/[^.]*//'`
	955	+ GUESS=powerpcle-unknown-solaris2$SUN_REL
	956	+ ;;
889	957	:GNU::*)
890	958	# the GNU system
891		- echo "`echo "$UNAME_MACHINE"\|sed -e 's,[-/].$,,'`-unknown-$LIBC`echo "$UNAME_RELEASE"\|sed -e 's,/.$,,'`"
892		- exit ;;
	959	+ GNU_ARCH=`echo "$UNAME_MACHINE" \| sed -e 's,[-/].*$,,'`
	960	+ GNU_REL=`echo "$UNAME_RELEASE" \| sed -e 's,/.*$,,'`
	961	+ GUESS=$GNU_ARCH-unknown-$LIBC$GNU_REL
	962	+ ;;
893	963	:GNU/::)
894	964	# other systems with GNU libc and userland
895		- echo "$UNAME_MACHINE-unknown-`echo "$UNAME_SYSTEM" \| sed 's,^[^/]/,,' \| tr "[:upper:]" "[:lower:]"``echo "$UNAME_RELEASE"\|sed -e 's/[-(].//'`-$LIBC"
896		- exit ;;
897		- i86:Minix::*)
898		- echo "$UNAME_MACHINE"-pc-minix
899		- exit ;;
	965	+ GNU_SYS=`echo "$UNAME_SYSTEM" \| sed 's,^[^/]*/,,' \| tr "[:upper:]" "[:lower:]"`
	966	+ GNU_REL=`echo "$UNAME_RELEASE" \| sed -e 's/[-(].*//'`
	967	+ GUESS=$UNAME_MACHINE-unknown-$GNU_SYS$GNU_REL-$LIBC
	968	+ ;;
	969	+ :Minix::*)
	970	+ GUESS=$UNAME_MACHINE-unknown-minix
	971	+ ;;
900	972	aarch64:Linux::)
901		- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
902		- exit ;;
	973	+ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
	974	+ ;;
903	975	aarch64_be:Linux::)
904	976	UNAME_MACHINE=aarch64_be
905		- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
906		- exit ;;
	977	+ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
	978	+ ;;
907	979	alpha:Linux::)
908		- case `sed -n '/^cpu model/s/^.: $.$/\1/p' < /proc/cpuinfo` in
	980	+ case `sed -n '/^cpu model/s/^.: $.$/\1/p' /proc/cpuinfo 2>/dev/null` in
909	981	EV5) UNAME_MACHINE=alphaev5 ;;
910	982	EV56) UNAME_MACHINE=alphaev56 ;;
911	983	PCA56) UNAME_MACHINE=alphapca56 ;;

		@@ -916,187 +988,225 @@
916	988	esac
917	989	objdump --private-headers /bin/sh \| grep -q ld.so.1
918	990	if test "$?" = 0 ; then LIBC=gnulibc1 ; fi
919		- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
920		- exit ;;
921		- arc:Linux:: \| arceb:Linux::)
922		- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
923		- exit ;;
	991	+ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
	992	+ ;;
	993	+ arc:Linux:: \| arceb:Linux:: \| arc32:Linux:: \| arc64:Linux::)
	994	+ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
	995	+ ;;
924	996	arm:Linux::*)
925		- eval "$set_cc_for_build"
	997	+ set_cc_for_build
926	998	if echo __ARM_EABI__ \| $CC_FOR_BUILD -E - 2>/dev/null \
927	999	\| grep -q __ARM_EABI__
928	1000	then
929		- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
	1001	+ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
930	1002	else
931	1003	if echo __ARM_PCS_VFP \| $CC_FOR_BUILD -E - 2>/dev/null \
932	1004	\| grep -q __ARM_PCS_VFP
933	1005	then
934		- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabi
	1006	+ GUESS=$UNAME_MACHINE-unknown-linux-${LIBC}eabi
935	1007	else
936		- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabihf
	1008	+ GUESS=$UNAME_MACHINE-unknown-linux-${LIBC}eabihf
937	1009	fi
938	1010	fi
939		- exit ;;
	1011	+ ;;
940	1012	avr32:Linux::*)
941		- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
942		- exit ;;
	1013	+ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
	1014	+ ;;
943	1015	cris:Linux::)
944		- echo "$UNAME_MACHINE"-axis-linux-"$LIBC"
945		- exit ;;
	1016	+ GUESS=$UNAME_MACHINE-axis-linux-$LIBC
	1017	+ ;;
946	1018	crisv32:Linux::)
947		- echo "$UNAME_MACHINE"-axis-linux-"$LIBC"
948		- exit ;;
	1019	+ GUESS=$UNAME_MACHINE-axis-linux-$LIBC
	1020	+ ;;
949	1021	e2k:Linux::)
950		- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
951		- exit ;;
	1022	+ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
	1023	+ ;;
952	1024	frv:Linux::)
953		- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
954		- exit ;;
	1025	+ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
	1026	+ ;;
955	1027	hexagon:Linux::)
956		- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
957		- exit ;;
	1028	+ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
	1029	+ ;;
958	1030	i86:Linux::*)
959		- echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
960		- exit ;;
	1031	+ GUESS=$UNAME_MACHINE-pc-linux-$LIBC
	1032	+ ;;
961	1033	ia64:Linux::)
962		- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
963		- exit ;;
	1034	+ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
	1035	+ ;;
964	1036	k1om:Linux::)
965		- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
966		- exit ;;
	1037	+ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
	1038	+ ;;
	1039	+ loongarch32:Linux:: \| loongarch64:Linux:: \| loongarchx32:Linux::)
	1040	+ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
	1041	+ ;;
967	1042	m32r:Linux::*)
968		- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
969		- exit ;;
	1043	+ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
	1044	+ ;;
970	1045	m68:Linux::*)
971		- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
972		- exit ;;
	1046	+ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
	1047	+ ;;
973	1048	mips:Linux:: \| mips64:Linux::)
974		- eval "$set_cc_for_build"
	1049	+ set_cc_for_build
	1050	+ IS_GLIBC=0
	1051	+ test x"${LIBC}" = xgnu && IS_GLIBC=1
975	1052	sed 's/^ //' << EOF > "$dummy.c"
976	1053	#undef CPU
977		- #undef ${UNAME_MACHINE}
978		- #undef ${UNAME_MACHINE}el
	1054	+ #undef mips
	1055	+ #undef mipsel
	1056	+ #undef mips64
	1057	+ #undef mips64el
	1058	+ #if ${IS_GLIBC} && defined(_ABI64)
	1059	+ LIBCABI=gnuabi64
	1060	+ #else
	1061	+ #if ${IS_GLIBC} && defined(_ABIN32)
	1062	+ LIBCABI=gnuabin32
	1063	+ #else
	1064	+ LIBCABI=${LIBC}
	1065	+ #endif
	1066	+ #endif
	1067	+
	1068	+ #if ${IS_GLIBC} && defined(__mips64) && defined(__mips_isa_rev) && __mips_isa_rev>=6
	1069	+ CPU=mipsisa64r6
	1070	+ #else
	1071	+ #if ${IS_GLIBC} && !defined(__mips64) && defined(__mips_isa_rev) && __mips_isa_rev>=6
	1072	+ CPU=mipsisa32r6
	1073	+ #else
	1074	+ #if defined(__mips64)
	1075	+ CPU=mips64
	1076	+ #else
	1077	+ CPU=mips
	1078	+ #endif
	1079	+ #endif
	1080	+ #endif
	1081	+
979	1082	#if defined(__MIPSEL__) \|\| defined(__MIPSEL) \|\| defined(_MIPSEL) \|\| defined(MIPSEL)
980		- CPU=${UNAME_MACHINE}el
	1083	+ MIPS_ENDIAN=el
981	1084	#else
982	1085	#if defined(__MIPSEB__) \|\| defined(__MIPSEB) \|\| defined(_MIPSEB) \|\| defined(MIPSEB)
983		- CPU=${UNAME_MACHINE}
	1086	+ MIPS_ENDIAN=
984	1087	#else
985		- CPU=
	1088	+ MIPS_ENDIAN=
986	1089	#endif
987	1090	#endif
988	1091	EOF
989		- eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null \| grep '^CPU'`"
990		- test "x$CPU" != x && { echo "$CPU-unknown-linux-$LIBC"; exit; }
	1092	+ cc_set_vars=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null \| grep '^CPU\\|^MIPS_ENDIAN\\|^LIBCABI'`
	1093	+ eval "$cc_set_vars"
	1094	+ test "x$CPU" != x && { echo "$CPU${MIPS_ENDIAN}-unknown-linux-$LIBCABI"; exit; }
991	1095	;;
992	1096	mips64el:Linux::)
993		- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
994		- exit ;;
	1097	+ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
	1098	+ ;;
995	1099	openrisc:Linux::*)
996		- echo or1k-unknown-linux-"$LIBC"
997		- exit ;;
	1100	+ GUESS=or1k-unknown-linux-$LIBC
	1101	+ ;;
998	1102	or32:Linux:: \| or1k:Linux::*)
999		- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
1000		- exit ;;
	1103	+ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
	1104	+ ;;
1001	1105	padre:Linux::)
1002		- echo sparc-unknown-linux-"$LIBC"
1003		- exit ;;
	1106	+ GUESS=sparc-unknown-linux-$LIBC
	1107	+ ;;
1004	1108	parisc64:Linux:: \| hppa64:Linux::)
1005		- echo hppa64-unknown-linux-"$LIBC"
1006		- exit ;;
	1109	+ GUESS=hppa64-unknown-linux-$LIBC
	1110	+ ;;
1007	1111	parisc:Linux:: \| hppa:Linux::)
1008	1112	# Look for CPU level
1009	1113	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null \| cut -d' ' -f2` in
1010		- PA7*) echo hppa1.1-unknown-linux-"$LIBC" ;;
1011		- PA8*) echo hppa2.0-unknown-linux-"$LIBC" ;;
1012		- *) echo hppa-unknown-linux-"$LIBC" ;;
	1114	+ PA7*) GUESS=hppa1.1-unknown-linux-$LIBC ;;
	1115	+ PA8*) GUESS=hppa2.0-unknown-linux-$LIBC ;;
	1116	+ *) GUESS=hppa-unknown-linux-$LIBC ;;
1013	1117	esac
1014		- exit ;;
	1118	+ ;;
1015	1119	ppc64:Linux::)
1016		- echo powerpc64-unknown-linux-"$LIBC"
1017		- exit ;;
	1120	+ GUESS=powerpc64-unknown-linux-$LIBC
	1121	+ ;;
1018	1122	ppc:Linux::)
1019		- echo powerpc-unknown-linux-"$LIBC"
1020		- exit ;;
	1123	+ GUESS=powerpc-unknown-linux-$LIBC
	1124	+ ;;
1021	1125	ppc64le:Linux::)
1022		- echo powerpc64le-unknown-linux-"$LIBC"
1023		- exit ;;
	1126	+ GUESS=powerpc64le-unknown-linux-$LIBC
	1127	+ ;;
1024	1128	ppcle:Linux::)
1025		- echo powerpcle-unknown-linux-"$LIBC"
1026		- exit ;;
1027		- riscv32:Linux:: \| riscv64:Linux::)
1028		- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
1029		- exit ;;
	1129	+ GUESS=powerpcle-unknown-linux-$LIBC
	1130	+ ;;
	1131	+ riscv32:Linux:: \| riscv32be:Linux:: \| riscv64:Linux:: \| riscv64be:Linux::)
	1132	+ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
	1133	+ ;;
1030	1134	s390:Linux:: \| s390x:Linux::)
1031		- echo "$UNAME_MACHINE"-ibm-linux-"$LIBC"
1032		- exit ;;
	1135	+ GUESS=$UNAME_MACHINE-ibm-linux-$LIBC
	1136	+ ;;
1033	1137	sh64:Linux::*)
1034		- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
1035		- exit ;;
	1138	+ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
	1139	+ ;;
1036	1140	sh:Linux::*)
1037		- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
1038		- exit ;;
	1141	+ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
	1142	+ ;;
1039	1143	sparc:Linux:: \| sparc64:Linux::)
1040		- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
1041		- exit ;;
	1144	+ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
	1145	+ ;;
1042	1146	tile:Linux::*)
1043		- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
1044		- exit ;;
	1147	+ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
	1148	+ ;;
1045	1149	vax:Linux::)
1046		- echo "$UNAME_MACHINE"-dec-linux-"$LIBC"
1047		- exit ;;
	1150	+ GUESS=$UNAME_MACHINE-dec-linux-$LIBC
	1151	+ ;;
1048	1152	x86_64:Linux::)
1049		- if objdump -f /bin/sh \| grep -q elf32-x86-64; then
1050		- echo "$UNAME_MACHINE"-pc-linux-"$LIBC"x32
1051		- else
1052		- echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
	1153	+ set_cc_for_build
	1154	+ LIBCABI=$LIBC
	1155	+ if test "$CC_FOR_BUILD" != no_compiler_found; then
	1156	+ if (echo '#ifdef __ILP32__'; echo IS_X32; echo '#endif') \| \
	1157	+ (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) \| \
	1158	+ grep IS_X32 >/dev/null
	1159	+ then
	1160	+ LIBCABI=${LIBC}x32
	1161	+ fi
1053	1162	fi
1054		- exit ;;
	1163	+ GUESS=$UNAME_MACHINE-pc-linux-$LIBCABI
	1164	+ ;;
1055	1165	xtensa:Linux::*)
1056		- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
1057		- exit ;;
	1166	+ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
	1167	+ ;;
1058	1168	i86:DYNIX/ptx:4:*)
1059	1169	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
1060	1170	# earlier versions are messed up and put the nodename in both
1061	1171	# sysname and nodename.
1062		- echo i386-sequent-sysv4
1063		- exit ;;
	1172	+ GUESS=i386-sequent-sysv4
	1173	+ ;;
1064	1174	i86:UNIX_SV:4.2MP:2.)
1065	1175	# Unixware is an offshoot of SVR4, but it has its own version
1066	1176	# number series starting with 2...
1067	1177	# I am not positive that other SVR4 systems won't match this,
1068	1178	# I just have to hope. -- rms.
1069	1179	# Use sysv4.2uw... so that sysv4* matches it.
1070		- echo "$UNAME_MACHINE"-pc-sysv4.2uw"$UNAME_VERSION"
1071		- exit ;;
	1180	+ GUESS=$UNAME_MACHINE-pc-sysv4.2uw$UNAME_VERSION
	1181	+ ;;
1072	1182	i86:OS/2::*)
1073	1183	# If we were able to find `uname', then EMX Unix compatibility
1074	1184	# is probably installed.
1075		- echo "$UNAME_MACHINE"-pc-os2-emx
1076		- exit ;;
	1185	+ GUESS=$UNAME_MACHINE-pc-os2-emx
	1186	+ ;;
1077	1187	i86:XTS-300::STOP)
1078		- echo "$UNAME_MACHINE"-unknown-stop
1079		- exit ;;
	1188	+ GUESS=$UNAME_MACHINE-unknown-stop
	1189	+ ;;
1080	1190	i86:atheos::*)
1081		- echo "$UNAME_MACHINE"-unknown-atheos
1082		- exit ;;
	1191	+ GUESS=$UNAME_MACHINE-unknown-atheos
	1192	+ ;;
1083	1193	i86:syllable::*)
1084		- echo "$UNAME_MACHINE"-pc-syllable
1085		- exit ;;
	1194	+ GUESS=$UNAME_MACHINE-pc-syllable
	1195	+ ;;
1086	1196	i86:LynxOS:2.:* \| i86:LynxOS:3.[01]:* \| i86:LynxOS:4.[02]:*)
1087		- echo i386-unknown-lynxos"$UNAME_RELEASE"
1088		- exit ;;
	1197	+ GUESS=i386-unknown-lynxos$UNAME_RELEASE
	1198	+ ;;
1089	1199	i86:DOS::)
1090		- echo "$UNAME_MACHINE"-pc-msdosdjgpp
1091		- exit ;;
	1200	+ GUESS=$UNAME_MACHINE-pc-msdosdjgpp
	1201	+ ;;
1092	1202	i86::4.:)
1093	1203	UNAME_REL=`echo "$UNAME_RELEASE" \| sed 's/\/MP$//'`
1094	1204	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
1095		- echo "$UNAME_MACHINE"-univel-sysv"$UNAME_REL"
	1205	+ GUESS=$UNAME_MACHINE-univel-sysv$UNAME_REL
1096	1206	else
1097		- echo "$UNAME_MACHINE"-pc-sysv"$UNAME_REL"
	1207	+ GUESS=$UNAME_MACHINE-pc-sysv$UNAME_REL
1098	1208	fi
1099		- exit ;;
	1209	+ ;;
1100	1210	i86::5:[678]*)
1101	1211	# UnixWare 7.x, OpenUNIX and OpenServer 6.
1102	1212	case `/bin/uname -X \| grep "^Machine"` in

		@@ -1104,12 +1214,12 @@
1104	1214	*Pentium) UNAME_MACHINE=i586 ;;
1105	1215	Pent\|*Celeron) UNAME_MACHINE=i686 ;;
1106	1216	esac
1107		- echo "$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}{$UNAME_VERSION}"
1108		- exit ;;
	1217	+ GUESS=$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
	1218	+ ;;
1109	1219	i86::3.2:*)
1110	1220	if test -f /usr/options/cb.name; then
1111	1221	UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
1112		- echo "$UNAME_MACHINE"-pc-isc"$UNAME_REL"
	1222	+ GUESS=$UNAME_MACHINE-pc-isc$UNAME_REL
1113	1223	elif /bin/uname -X 2>/dev/null >/dev/null ; then
1114	1224	UNAME_REL=`(/bin/uname -X\|grep Release\|sed -e 's/.*= //')`
1115	1225	(/bin/uname -X\|grep i80486 >/dev/null) && UNAME_MACHINE=i486

		@@ -1119,11 +1229,11 @@
1119	1229	&& UNAME_MACHINE=i686
1120	1230	(/bin/uname -X\|grep '^Machine.*Pentium Pro' >/dev/null) \
1121	1231	&& UNAME_MACHINE=i686
1122		- echo "$UNAME_MACHINE"-pc-sco"$UNAME_REL"
	1232	+ GUESS=$UNAME_MACHINE-pc-sco$UNAME_REL
1123	1233	else
1124		- echo "$UNAME_MACHINE"-pc-sysv32
	1234	+ GUESS=$UNAME_MACHINE-pc-sysv32
1125	1235	fi
1126		- exit ;;
	1236	+ ;;
1127	1237	pc:::*)
1128	1238	# Left here for compatibility:
1129	1239	# uname -m prints for DJGPP always 'pc', but it prints nothing about

		@@ -1131,31 +1241,31 @@
1131	1241	# Note: whatever this is, it MUST be the same as what config.sub
1132	1242	# prints for the "djgpp" host, or else GDB configure will decide that
1133	1243	# this is a cross-build.
1134		- echo i586-pc-msdosdjgpp
1135		- exit ;;
	1244	+ GUESS=i586-pc-msdosdjgpp
	1245	+ ;;
1136	1246	Intel:Mach:3:)
1137		- echo i386-pc-mach3
1138		- exit ;;
	1247	+ GUESS=i386-pc-mach3
	1248	+ ;;
1139	1249	paragon:::*)
1140		- echo i860-intel-osf1
1141		- exit ;;
	1250	+ GUESS=i860-intel-osf1
	1251	+ ;;
1142	1252	i860::4.:*) # i860-SVR4
1143	1253	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
1144		- echo i860-stardent-sysv"$UNAME_RELEASE" # Stardent Vistra i860-SVR4
	1254	+ GUESS=i860-stardent-sysv$UNAME_RELEASE # Stardent Vistra i860-SVR4
1145	1255	else # Add other i860-SVR4 vendors below as they are discovered.
1146		- echo i860-unknown-sysv"$UNAME_RELEASE" # Unknown i860-SVR4
	1256	+ GUESS=i860-unknown-sysv$UNAME_RELEASE # Unknown i860-SVR4
1147	1257	fi
1148		- exit ;;
	1258	+ ;;
1149	1259	mini:CTIX:SYS5:*)
1150	1260	# "miniframe"
1151		- echo m68010-convergent-sysv
1152		- exit ;;
	1261	+ GUESS=m68010-convergent-sysv
	1262	+ ;;
1153	1263	mc68k:UNIX:SYSTEM5:3.51m)
1154		- echo m68k-convergent-sysv
1155		- exit ;;
	1264	+ GUESS=m68k-convergent-sysv
	1265	+ ;;
1156	1266	M680?0:D-NIX:5.3:*)
1157		- echo m68k-diab-dnix
1158		- exit ;;
	1267	+ GUESS=m68k-diab-dnix
	1268	+ ;;
1159	1269	M68::R3V[5678]:)
1160	1270	test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
1161	1271	3[345]??::4.0:3.0 \| 3[34]??A::4.0:3.0 \| 3[34]??,::4.0:3.0 \| 3[34]??/::4.0:3.0 \| 4400::4.0:3.0 \| 4850::4.0:3.0 \| SKA40::4.0:3.0 \| SDS2::4.0:3.0 \| SHG2::4.0:3.0 \| S7501:*:4.0:3.0)

		@@ -1180,249 +1290,404 @@
1180	1290	/bin/uname -p 2>/dev/null \| /bin/grep pteron >/dev/null \
1181	1291	&& { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;;
1182	1292	m68:LynxOS:2.:* \| m68:LynxOS:3.0:*)
1183		- echo m68k-unknown-lynxos"$UNAME_RELEASE"
1184		- exit ;;
	1293	+ GUESS=m68k-unknown-lynxos$UNAME_RELEASE
	1294	+ ;;
1185	1295	mc68030:UNIX_System_V:4.:)
1186		- echo m68k-atari-sysv4
1187		- exit ;;
	1296	+ GUESS=m68k-atari-sysv4
	1297	+ ;;
1188	1298	TSUNAMI:LynxOS:2.:)
1189		- echo sparc-unknown-lynxos"$UNAME_RELEASE"
1190		- exit ;;
	1299	+ GUESS=sparc-unknown-lynxos$UNAME_RELEASE
	1300	+ ;;
1191	1301	rs6000:LynxOS:2.:)
1192		- echo rs6000-unknown-lynxos"$UNAME_RELEASE"
1193		- exit ;;
	1302	+ GUESS=rs6000-unknown-lynxos$UNAME_RELEASE
	1303	+ ;;
1194	1304	PowerPC:LynxOS:2.: \| PowerPC:LynxOS:3.[01]: \| PowerPC:LynxOS:4.[02]:)
1195		- echo powerpc-unknown-lynxos"$UNAME_RELEASE"
1196		- exit ;;
	1305	+ GUESS=powerpc-unknown-lynxos$UNAME_RELEASE
	1306	+ ;;
1197	1307	SM[BE]S:UNIX_SV::)
1198		- echo mips-dde-sysv"$UNAME_RELEASE"
1199		- exit ;;
	1308	+ GUESS=mips-dde-sysv$UNAME_RELEASE
	1309	+ ;;
1200	1310	RM:ReliantUNIX-::)
1201		- echo mips-sni-sysv4
1202		- exit ;;
	1311	+ GUESS=mips-sni-sysv4
	1312	+ ;;
1203	1313	RM:SINIX-::)
1204		- echo mips-sni-sysv4
1205		- exit ;;
	1314	+ GUESS=mips-sni-sysv4
	1315	+ ;;
1206	1316	:SINIX-::)
1207	1317	if uname -p 2>/dev/null >/dev/null ; then
1208	1318	UNAME_MACHINE=`(uname -p) 2>/dev/null`
1209		- echo "$UNAME_MACHINE"-sni-sysv4
	1319	+ GUESS=$UNAME_MACHINE-sni-sysv4
1210	1320	else
1211		- echo ns32k-sni-sysv
	1321	+ GUESS=ns32k-sni-sysv
1212	1322	fi
1213		- exit ;;
	1323	+ ;;
1214	1324	PENTIUM::4.0:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
1215	1325	# says <Richard.M.Bartel@ccMail.Census.GOV>
1216		- echo i586-unisys-sysv4
1217		- exit ;;
	1326	+ GUESS=i586-unisys-sysv4
	1327	+ ;;
1218	1328	:UNIX_System_V:4:FTX*)
1219	1329	# From Gerald Hewes <hewes@openmarket.com>.
1220	1330	# How about differentiating between stratus architectures? -djm
1221		- echo hppa1.1-stratus-sysv4
1222		- exit ;;
	1331	+ GUESS=hppa1.1-stratus-sysv4
	1332	+ ;;
1223	1333	:::FTX)
1224	1334	# From seanf@swdc.stratus.com.
1225		- echo i860-stratus-sysv4
1226		- exit ;;
	1335	+ GUESS=i860-stratus-sysv4
	1336	+ ;;
1227	1337	i86:VOS::*)
1228	1338	# From Paul.Green@stratus.com.
1229		- echo "$UNAME_MACHINE"-stratus-vos
1230		- exit ;;
	1339	+ GUESS=$UNAME_MACHINE-stratus-vos
	1340	+ ;;
1231	1341	:VOS::*)
1232	1342	# From Paul.Green@stratus.com.
1233		- echo hppa1.1-stratus-vos
1234		- exit ;;
	1343	+ GUESS=hppa1.1-stratus-vos
	1344	+ ;;
1235	1345	mc68:A/UX::*)
1236		- echo m68k-apple-aux"$UNAME_RELEASE"
1237		- exit ;;
	1346	+ GUESS=m68k-apple-aux$UNAME_RELEASE
	1347	+ ;;
1238	1348	news:NEWS-OS:6:*)
1239		- echo mips-sony-newsos6
1240		- exit ;;
	1349	+ GUESS=mips-sony-newsos6
	1350	+ ;;
1241	1351	R[34]000:System_V:: \| R4000:UNIX_SYSV:: \| R000:UNIX_SV::*)
1242		- if [ -d /usr/nec ]; then
1243		- echo mips-nec-sysv"$UNAME_RELEASE"
	1352	+ if test -d /usr/nec; then
	1353	+ GUESS=mips-nec-sysv$UNAME_RELEASE
1244	1354	else
1245		- echo mips-unknown-sysv"$UNAME_RELEASE"
	1355	+ GUESS=mips-unknown-sysv$UNAME_RELEASE
1246	1356	fi
1247		- exit ;;
	1357	+ ;;
1248	1358	BeBox:BeOS::) # BeOS running on hardware made by Be, PPC only.
1249		- echo powerpc-be-beos
1250		- exit ;;
	1359	+ GUESS=powerpc-be-beos
	1360	+ ;;
1251	1361	BeMac:BeOS::) # BeOS running on Mac or Mac clone, PPC only.
1252		- echo powerpc-apple-beos
1253		- exit ;;
	1362	+ GUESS=powerpc-apple-beos
	1363	+ ;;
1254	1364	BePC:BeOS::) # BeOS running on Intel PC compatible.
1255		- echo i586-pc-beos
1256		- exit ;;
	1365	+ GUESS=i586-pc-beos
	1366	+ ;;
1257	1367	BePC:Haiku::) # Haiku running on Intel PC compatible.
1258		- echo i586-pc-haiku
1259		- exit ;;
	1368	+ GUESS=i586-pc-haiku
	1369	+ ;;
1260	1370	x86_64:Haiku::)
1261		- echo x86_64-unknown-haiku
1262		- exit ;;
	1371	+ GUESS=x86_64-unknown-haiku
	1372	+ ;;
1263	1373	SX-4:SUPER-UX::)
1264		- echo sx4-nec-superux"$UNAME_RELEASE"
1265		- exit ;;
	1374	+ GUESS=sx4-nec-superux$UNAME_RELEASE
	1375	+ ;;
1266	1376	SX-5:SUPER-UX::)
1267		- echo sx5-nec-superux"$UNAME_RELEASE"
1268		- exit ;;
	1377	+ GUESS=sx5-nec-superux$UNAME_RELEASE
	1378	+ ;;
1269	1379	SX-6:SUPER-UX::)
1270		- echo sx6-nec-superux"$UNAME_RELEASE"
1271		- exit ;;
	1380	+ GUESS=sx6-nec-superux$UNAME_RELEASE
	1381	+ ;;
1272	1382	SX-7:SUPER-UX::)
1273		- echo sx7-nec-superux"$UNAME_RELEASE"
1274		- exit ;;
	1383	+ GUESS=sx7-nec-superux$UNAME_RELEASE
	1384	+ ;;
1275	1385	SX-8:SUPER-UX::)
1276		- echo sx8-nec-superux"$UNAME_RELEASE"
1277		- exit ;;
	1386	+ GUESS=sx8-nec-superux$UNAME_RELEASE
	1387	+ ;;
1278	1388	SX-8R:SUPER-UX::)
1279		- echo sx8r-nec-superux"$UNAME_RELEASE"
1280		- exit ;;
	1389	+ GUESS=sx8r-nec-superux$UNAME_RELEASE
	1390	+ ;;
1281	1391	SX-ACE:SUPER-UX::)
1282		- echo sxace-nec-superux"$UNAME_RELEASE"
1283		- exit ;;
	1392	+ GUESS=sxace-nec-superux$UNAME_RELEASE
	1393	+ ;;
1284	1394	Power:Rhapsody::*)
1285		- echo powerpc-apple-rhapsody"$UNAME_RELEASE"
1286		- exit ;;
	1395	+ GUESS=powerpc-apple-rhapsody$UNAME_RELEASE
	1396	+ ;;
1287	1397	:Rhapsody::*)
1288		- echo "$UNAME_MACHINE"-apple-rhapsody"$UNAME_RELEASE"
1289		- exit ;;
	1398	+ GUESS=$UNAME_MACHINE-apple-rhapsody$UNAME_RELEASE
	1399	+ ;;
	1400	+ arm64:Darwin::)
	1401	+ GUESS=aarch64-apple-darwin$UNAME_RELEASE
	1402	+ ;;
1290	1403	:Darwin::*)
1291		- UNAME_PROCESSOR=`uname -p` \|\| UNAME_PROCESSOR=unknown
1292		- eval "$set_cc_for_build"
1293		- if test "$UNAME_PROCESSOR" = unknown ; then
1294		- UNAME_PROCESSOR=powerpc
	1404	+ UNAME_PROCESSOR=`uname -p`
	1405	+ case $UNAME_PROCESSOR in
	1406	+ unknown) UNAME_PROCESSOR=powerpc ;;
	1407	+ esac
	1408	+ if command -v xcode-select > /dev/null 2> /dev/null && \
	1409	+ ! xcode-select --print-path > /dev/null 2> /dev/null ; then
	1410	+ # Avoid executing cc if there is no toolchain installed as
	1411	+ # cc will be a stub that puts up a graphical alert
	1412	+ # prompting the user to install developer tools.
	1413	+ CC_FOR_BUILD=no_compiler_found
	1414	+ else
	1415	+ set_cc_for_build
1295	1416	fi
1296		- if test "`echo "$UNAME_RELEASE" \| sed -e 's/\..*//'`" -le 10 ; then
1297		- if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
1298		- if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') \| \
1299		- (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) \| \
1300		- grep IS_64BIT_ARCH >/dev/null
1301		- then
1302		- case $UNAME_PROCESSOR in
1303		- i386) UNAME_PROCESSOR=x86_64 ;;
1304		- powerpc) UNAME_PROCESSOR=powerpc64 ;;
1305		- esac
1306		- fi
1307		- # On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc
1308		- if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') \| \
1309		- (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) \| \
1310		- grep IS_PPC >/dev/null
1311		- then
1312		- UNAME_PROCESSOR=powerpc
1313		- fi
	1417	+ if test "$CC_FOR_BUILD" != no_compiler_found; then
	1418	+ if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') \| \
	1419	+ (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) \| \
	1420	+ grep IS_64BIT_ARCH >/dev/null
	1421	+ then
	1422	+ case $UNAME_PROCESSOR in
	1423	+ i386) UNAME_PROCESSOR=x86_64 ;;
	1424	+ powerpc) UNAME_PROCESSOR=powerpc64 ;;
	1425	+ esac
	1426	+ fi
	1427	+ # On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc
	1428	+ if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') \| \
	1429	+ (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) \| \
	1430	+ grep IS_PPC >/dev/null
	1431	+ then
	1432	+ UNAME_PROCESSOR=powerpc
1314	1433	fi
1315	1434	elif test "$UNAME_PROCESSOR" = i386 ; then
1316		- # Avoid executing cc on OS X 10.9, as it ships with a stub
1317		- # that puts up a graphical alert prompting to install
1318		- # developer tools. Any system running Mac OS X 10.7 or
1319		- # later (Darwin 11 and later) is required to have a 64-bit
1320		- # processor. This is not true of the ARM version of Darwin
1321		- # that Apple uses in portable devices.
1322		- UNAME_PROCESSOR=x86_64
	1435	+ # uname -m returns i386 or x86_64
	1436	+ UNAME_PROCESSOR=$UNAME_MACHINE
1323	1437	fi
1324		- echo "$UNAME_PROCESSOR"-apple-darwin"$UNAME_RELEASE"
1325		- exit ;;
	1438	+ GUESS=$UNAME_PROCESSOR-apple-darwin$UNAME_RELEASE
	1439	+ ;;
1326	1440	:procnto:: \| :QNX:[0123456789]:*)
1327	1441	UNAME_PROCESSOR=`uname -p`
1328	1442	if test "$UNAME_PROCESSOR" = x86; then
1329	1443	UNAME_PROCESSOR=i386
1330	1444	UNAME_MACHINE=pc
1331	1445	fi
1332		- echo "$UNAME_PROCESSOR"-"$UNAME_MACHINE"-nto-qnx"$UNAME_RELEASE"
1333		- exit ;;
	1446	+ GUESS=$UNAME_PROCESSOR-$UNAME_MACHINE-nto-qnx$UNAME_RELEASE
	1447	+ ;;
1334	1448	:QNX::4*)
1335		- echo i386-pc-qnx
1336		- exit ;;
	1449	+ GUESS=i386-pc-qnx
	1450	+ ;;
1337	1451	NEO-:NONSTOP_KERNEL::*)
1338		- echo neo-tandem-nsk"$UNAME_RELEASE"
1339		- exit ;;
	1452	+ GUESS=neo-tandem-nsk$UNAME_RELEASE
	1453	+ ;;
1340	1454	NSE-:NONSTOP_KERNEL::*)
1341		- echo nse-tandem-nsk"$UNAME_RELEASE"
1342		- exit ;;
	1455	+ GUESS=nse-tandem-nsk$UNAME_RELEASE
	1456	+ ;;
1343	1457	NSR-:NONSTOP_KERNEL::*)
1344		- echo nsr-tandem-nsk"$UNAME_RELEASE"
1345		- exit ;;
	1458	+ GUESS=nsr-tandem-nsk$UNAME_RELEASE
	1459	+ ;;
1346	1460	NSV-:NONSTOP_KERNEL::*)
1347		- echo nsv-tandem-nsk"$UNAME_RELEASE"
1348		- exit ;;
	1461	+ GUESS=nsv-tandem-nsk$UNAME_RELEASE
	1462	+ ;;
1349	1463	NSX-:NONSTOP_KERNEL::*)
1350		- echo nsx-tandem-nsk"$UNAME_RELEASE"
1351		- exit ;;
	1464	+ GUESS=nsx-tandem-nsk$UNAME_RELEASE
	1465	+ ;;
1352	1466	:NonStop-UX::*)
1353		- echo mips-compaq-nonstopux
1354		- exit ;;
	1467	+ GUESS=mips-compaq-nonstopux
	1468	+ ;;
1355	1469	BS2000:POSIX::*)
1356		- echo bs2000-siemens-sysv
1357		- exit ;;
	1470	+ GUESS=bs2000-siemens-sysv
	1471	+ ;;
1358	1472	DS/:UNIX_System_V::*)
1359		- echo "$UNAME_MACHINE"-"$UNAME_SYSTEM"-"$UNAME_RELEASE"
1360		- exit ;;
	1473	+ GUESS=$UNAME_MACHINE-$UNAME_SYSTEM-$UNAME_RELEASE
	1474	+ ;;
1361	1475	:Plan9::*)
1362	1476	# "uname -m" is not consistent, so use $cputype instead. 386
1363	1477	# is converted to i386 for consistency with other x86
1364	1478	# operating systems.
1365		- if test "$cputype" = 386; then
	1479	+ if test "${cputype-}" = 386; then
1366	1480	UNAME_MACHINE=i386
1367		- else
1368		- UNAME_MACHINE="$cputype"
	1481	+ elif test "x${cputype-}" != x; then
	1482	+ UNAME_MACHINE=$cputype
1369	1483	fi
1370		- echo "$UNAME_MACHINE"-unknown-plan9
1371		- exit ;;
	1484	+ GUESS=$UNAME_MACHINE-unknown-plan9
	1485	+ ;;
1372	1486	:TOPS-10::*)
1373		- echo pdp10-unknown-tops10
1374		- exit ;;
	1487	+ GUESS=pdp10-unknown-tops10
	1488	+ ;;
1375	1489	:TENEX::*)
1376		- echo pdp10-unknown-tenex
1377		- exit ;;
	1490	+ GUESS=pdp10-unknown-tenex
	1491	+ ;;
1378	1492	KS10:TOPS-20:: \| KL10:TOPS-20:: \| TYPE4:TOPS-20::)
1379		- echo pdp10-dec-tops20
1380		- exit ;;
	1493	+ GUESS=pdp10-dec-tops20
	1494	+ ;;
1381	1495	XKL-1:TOPS-20:: \| TYPE5:TOPS-20::)
1382		- echo pdp10-xkl-tops20
1383		- exit ;;
	1496	+ GUESS=pdp10-xkl-tops20
	1497	+ ;;
1384	1498	:TOPS-20::*)
1385		- echo pdp10-unknown-tops20
1386		- exit ;;
	1499	+ GUESS=pdp10-unknown-tops20
	1500	+ ;;
1387	1501	:ITS::*)
1388		- echo pdp10-unknown-its
1389		- exit ;;
	1502	+ GUESS=pdp10-unknown-its
	1503	+ ;;
1390	1504	SEI:::SEIUX)
1391		- echo mips-sei-seiux"$UNAME_RELEASE"
1392		- exit ;;
	1505	+ GUESS=mips-sei-seiux$UNAME_RELEASE
	1506	+ ;;
1393	1507	:DragonFly::*)
1394		- echo "$UNAME_MACHINE"-unknown-dragonfly"`echo "$UNAME_RELEASE"\|sed -e 's/[-(].*//'`"
1395		- exit ;;
	1508	+ DRAGONFLY_REL=`echo "$UNAME_RELEASE" \| sed -e 's/[-(].*//'`
	1509	+ GUESS=$UNAME_MACHINE-unknown-dragonfly$DRAGONFLY_REL
	1510	+ ;;
1396	1511	:VMS::)
1397	1512	UNAME_MACHINE=`(uname -p) 2>/dev/null`
1398		- case "$UNAME_MACHINE" in
1399		- A*) echo alpha-dec-vms ; exit ;;
1400		- I*) echo ia64-dec-vms ; exit ;;
1401		- V*) echo vax-dec-vms ; exit ;;
	1513	+ case $UNAME_MACHINE in
	1514	+ A*) GUESS=alpha-dec-vms ;;
	1515	+ I*) GUESS=ia64-dec-vms ;;
	1516	+ V*) GUESS=vax-dec-vms ;;
1402	1517	esac ;;
1403	1518	:XENIX::SysV)
1404		- echo i386-pc-xenix
1405		- exit ;;
	1519	+ GUESS=i386-pc-xenix
	1520	+ ;;
1406	1521	i86:skyos::*)
1407		- echo "$UNAME_MACHINE"-pc-skyos"`echo "$UNAME_RELEASE" \| sed -e 's/ .*$//'`"
1408		- exit ;;
	1522	+ SKYOS_REL=`echo "$UNAME_RELEASE" \| sed -e 's/ .*$//'`
	1523	+ GUESS=$UNAME_MACHINE-pc-skyos$SKYOS_REL
	1524	+ ;;
1409	1525	i86:rdos::*)
1410		- echo "$UNAME_MACHINE"-pc-rdos
1411		- exit ;;
1412		- i86:AROS::*)
1413		- echo "$UNAME_MACHINE"-pc-aros
1414		- exit ;;
	1526	+ GUESS=$UNAME_MACHINE-pc-rdos
	1527	+ ;;
	1528	+ i86:Fiwix::*)
	1529	+ GUESS=$UNAME_MACHINE-pc-fiwix
	1530	+ ;;
	1531	+ :AROS::*)
	1532	+ GUESS=$UNAME_MACHINE-unknown-aros
	1533	+ ;;
1415	1534	x86_64:VMkernel::)
1416		- echo "$UNAME_MACHINE"-unknown-esx
1417		- exit ;;
	1535	+ GUESS=$UNAME_MACHINE-unknown-esx
	1536	+ ;;
1418	1537	amd64:Isilon\ OneFS::)
1419		- echo x86_64-unknown-onefs
1420		- exit ;;
	1538	+ GUESS=x86_64-unknown-onefs
	1539	+ ;;
	1540	+ :Unleashed::*)
	1541	+ GUESS=$UNAME_MACHINE-unknown-unleashed$UNAME_RELEASE
	1542	+ ;;
1421	1543	esac
1422	1544
	1545	+# Do we have a guess based on uname results?
	1546	+if test "x$GUESS" != x; then
	1547	+ echo "$GUESS"
	1548	+ exit
	1549	+fi
	1550	+
	1551	+# No uname command or uname output not recognized.
	1552	+set_cc_for_build
	1553	+cat > "$dummy.c" <<EOF
	1554	+#ifdef _SEQUENT_
	1555	+#include <sys/types.h>
	1556	+#include <sys/utsname.h>
	1557	+#endif
	1558	+#if defined(ultrix) \|\| defined(_ultrix) \|\| defined(__ultrix) \|\| defined(__ultrix__)
	1559	+#if defined (vax) \|\| defined (__vax) \|\| defined (__vax__) \|\| defined(mips) \|\| defined(__mips) \|\| defined(__mips__) \|\| defined(MIPS) \|\| defined(__MIPS__)
	1560	+#include <signal.h>
	1561	+#if defined(_SIZE_T_) \|\| defined(SIGLOST)
	1562	+#include <sys/utsname.h>
	1563	+#endif
	1564	+#endif
	1565	+#endif
	1566	+main ()
	1567	+{
	1568	+#if defined (sony)
	1569	+#if defined (MIPSEB)
	1570	+ /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed,
	1571	+ I don't know.... */
	1572	+ printf ("mips-sony-bsd\n"); exit (0);
	1573	+#else
	1574	+#include <sys/param.h>
	1575	+ printf ("m68k-sony-newsos%s\n",
	1576	+#ifdef NEWSOS4
	1577	+ "4"
	1578	+#else
	1579	+ ""
	1580	+#endif
	1581	+ ); exit (0);
	1582	+#endif
	1583	+#endif
	1584	+
	1585	+#if defined (NeXT)
	1586	+#if !defined (__ARCHITECTURE__)
	1587	+#define __ARCHITECTURE__ "m68k"
	1588	+#endif
	1589	+ int version;
	1590	+ version=`(hostinfo \| sed -n 's/.NeXT Mach $[0-9]$.*/\1/p') 2>/dev/null`;
	1591	+ if (version < 4)
	1592	+ printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
	1593	+ else
	1594	+ printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
	1595	+ exit (0);
	1596	+#endif
	1597	+
	1598	+#if defined (MULTIMAX) \|\| defined (n16)
	1599	+#if defined (UMAXV)
	1600	+ printf ("ns32k-encore-sysv\n"); exit (0);
	1601	+#else
	1602	+#if defined (CMU)
	1603	+ printf ("ns32k-encore-mach\n"); exit (0);
	1604	+#else
	1605	+ printf ("ns32k-encore-bsd\n"); exit (0);
	1606	+#endif
	1607	+#endif
	1608	+#endif
	1609	+
	1610	+#if defined (__386BSD__)
	1611	+ printf ("i386-pc-bsd\n"); exit (0);
	1612	+#endif
	1613	+
	1614	+#if defined (sequent)
	1615	+#if defined (i386)
	1616	+ printf ("i386-sequent-dynix\n"); exit (0);
	1617	+#endif
	1618	+#if defined (ns32000)
	1619	+ printf ("ns32k-sequent-dynix\n"); exit (0);
	1620	+#endif
	1621	+#endif
	1622	+
	1623	+#if defined (_SEQUENT_)
	1624	+ struct utsname un;
	1625	+
	1626	+ uname(&un);
	1627	+ if (strncmp(un.version, "V2", 2) == 0) {
	1628	+ printf ("i386-sequent-ptx2\n"); exit (0);
	1629	+ }
	1630	+ if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
	1631	+ printf ("i386-sequent-ptx1\n"); exit (0);
	1632	+ }
	1633	+ printf ("i386-sequent-ptx\n"); exit (0);
	1634	+#endif
	1635	+
	1636	+#if defined (vax)
	1637	+#if !defined (ultrix)
	1638	+#include <sys/param.h>
	1639	+#if defined (BSD)
	1640	+#if BSD == 43
	1641	+ printf ("vax-dec-bsd4.3\n"); exit (0);
	1642	+#else
	1643	+#if BSD == 199006
	1644	+ printf ("vax-dec-bsd4.3reno\n"); exit (0);
	1645	+#else
	1646	+ printf ("vax-dec-bsd\n"); exit (0);
	1647	+#endif
	1648	+#endif
	1649	+#else
	1650	+ printf ("vax-dec-bsd\n"); exit (0);
	1651	+#endif
	1652	+#else
	1653	+#if defined(_SIZE_T_) \|\| defined(SIGLOST)
	1654	+ struct utsname un;
	1655	+ uname (&un);
	1656	+ printf ("vax-dec-ultrix%s\n", un.release); exit (0);
	1657	+#else
	1658	+ printf ("vax-dec-ultrix\n"); exit (0);
	1659	+#endif
	1660	+#endif
	1661	+#endif
	1662	+#if defined(ultrix) \|\| defined(_ultrix) \|\| defined(__ultrix) \|\| defined(__ultrix__)
	1663	+#if defined(mips) \|\| defined(__mips) \|\| defined(__mips__) \|\| defined(MIPS) \|\| defined(__MIPS__)
	1664	+#if defined(_SIZE_T_) \|\| defined(SIGLOST)
	1665	+ struct utsname *un;
	1666	+ uname (&un);
	1667	+ printf ("mips-dec-ultrix%s\n", un.release); exit (0);
	1668	+#else
	1669	+ printf ("mips-dec-ultrix\n"); exit (0);
	1670	+#endif
	1671	+#endif
	1672	+#endif
	1673	+
	1674	+#if defined (alliant) && defined (i860)
	1675	+ printf ("i860-alliant-bsd\n"); exit (0);
	1676	+#endif
	1677	+
	1678	+ exit (1);
	1679	+}
	1680	+EOF
	1681	+
	1682	+$CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null && SYSTEM_NAME=`"$dummy"` &&
	1683	+ { echo "$SYSTEM_NAME"; exit; }
	1684	+
	1685	+# Apollos put the system type in the environment.
	1686	+test -d /usr/apollo && { echo "$ISP-apollo-$SYSTYPE"; exit; }
	1687	+
1423	1688	echo "$0: unable to guess system type" >&2
1424	1689
1425		-case "$UNAME_MACHINE:$UNAME_SYSTEM" in
	1690	+case $UNAME_MACHINE:$UNAME_SYSTEM in
1426	1691	mips:Linux \| mips64:Linux)
1427	1692	# If we got here on MIPS GNU/Linux, output extra information.
1428	1693	cat >&2 <<EOF

		@@ -1439,9 +1704,17 @@
1439	1704	operating system you are using. If your script is old, overwrite all
1440	1705	copies of config.guess and config.sub with the latest versions from:
1441	1706
1442		- https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
	1707	+ https://git.savannah.gnu.org/cgit/config.git/plain/config.guess
1443	1708	and
1444		- https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
	1709	+ https://git.savannah.gnu.org/cgit/config.git/plain/config.sub
	1710	+EOF
	1711	+
	1712	+our_year=`echo $timestamp \| sed 's,-.*,,'`
	1713	+thisyear=`date +%Y`
	1714	+# shellcheck disable=SC2003
	1715	+script_age=`expr "$thisyear" - "$our_year"`
	1716	+if test "$script_age" -lt 3 ; then
	1717	+ cat >&2 <<EOF
1445	1718
1446	1719	If $0 has already been updated, send the following data and any
1447	1720	information you think might be pertinent to config-patches@gnu.org to

		@@ -1469,11 +1742,12 @@
1469	1742	UNAME_SYSTEM = "$UNAME_SYSTEM"
1470	1743	UNAME_VERSION = "$UNAME_VERSION"
1471	1744	EOF
	1745	+fi
1472	1746
1473	1747	exit 1
1474	1748
1475	1749	# Local variables:
1476		-# eval: (add-hook 'write-file-functions 'time-stamp)
	1750	+# eval: (add-hook 'before-save-hook 'time-stamp)
1477	1751	# time-stamp-start: "timestamp='"
1478	1752	# time-stamp-format: "%:y-%02m-%02d"
1479	1753	# time-stamp-end: "'"

diff -r bd2d082702f1 -r aa3c2b5fd105 speexdsp/config.h.in

--- a/speexdsp/config.h.in Wed Dec 28 06:26:56 2022 -0500

+++ b/speexdsp/config.h.in Wed Dec 28 06:28:31 2022 -0500

		@@ -15,9 +15,6 @@
15	15	/* Disable all parts of the API that are using floats */
16	16	#undef DISABLE_FLOAT_API
17	17
18		-/* Enable valgrind extra checks */
19		-#undef ENABLE_VALGRIND
20		-
21	18	/* Symbol visibility prefix */
22	19	#undef EXPORT
23	20

		@@ -30,24 +27,18 @@
30	27	/* Compile as floating-point */
31	28	#undef FLOATING_POINT
32	29
33		-/* Define to 1 if you have the <alloca.h> header file. */
34		-#undef HAVE_ALLOCA_H
35		-
36	30	/* Define to 1 if you have the <dlfcn.h> header file. */
37	31	#undef HAVE_DLFCN_H
38	32
39		-/* Define to 1 if you have the <getopt.h> header file. */
40		-#undef HAVE_GETOPT_H
41		-
42	33	/* Define to 1 if you have the <inttypes.h> header file. */
43	34	#undef HAVE_INTTYPES_H
44	35
45		-/* Define to 1 if you have the <memory.h> header file. */
46		-#undef HAVE_MEMORY_H
47		-
48	36	/* Define to 1 if you have the <stdint.h> header file. */
49	37	#undef HAVE_STDINT_H
50	38
	39	+/* Define to 1 if you have the <stdio.h> header file. */
	40	+#undef HAVE_STDIO_H
	41	+
51	42	/* Define to 1 if you have the <stdlib.h> header file. */
52	43	#undef HAVE_STDLIB_H
53	44

		@@ -123,15 +114,14 @@
123	114	/* The size of `u_int32_t', as computed by sizeof. */
124	115	#undef SIZEOF_U_INT32_T
125	116
126		-/* Define to 1 if you have the ANSI C header files. */
	117	+/* Define to 1 if all of the C90 standard headers exist (not just the ones
	118	+ required in a freestanding environment). This macro is provided for
	119	+ backward compatibility; new code need not use it. */
127	120	#undef STDC_HEADERS
128	121
129	122	/* Enable support for TI C55X DSP */
130	123	#undef TI_C55X
131	124
132		-/* Make use of alloca */
133		-#undef USE_ALLOCA
134		-
135	125	/* Use FFTW3 for FFT */
136	126	#undef USE_GPL_FFTW3
137	127

		@@ -179,14 +169,15 @@
179	169
180	170	/* Define to the equivalent of the C99 'restrict' keyword, or to
181	171	nothing if this is not supported. Do not define if restrict is
182		- supported directly. */
	172	+ supported only directly. */
183	173	#undef restrict
184		-/* Work around a bug in Sun C++: it does not support _Restrict or
185		- __restrict__, even though the corresponding Sun C compiler ends up with
186		- "#define restrict _Restrict" or "#define restrict __restrict__" in the
187		- previous line. Perhaps some future version of Sun C++ will work with
188		- restrict; if so, hopefully it defines __RESTRICT like Sun C does. */
189		-#if defined __SUNPRO_CC && !defined __RESTRICT
	174	+/* Work around a bug in older versions of Sun C++, which did not
	175	+ #define __restrict__ or support _Restrict or __restrict__
	176	+ even though the corresponding Sun C compiler ended up with
	177	+ "#define restrict _Restrict" or "#define restrict __restrict__"
	178	+ in the previous line. This workaround can be removed once
	179	+ we assume Oracle Developer Studio 12.5 (2016) or later. */
	180	+#if defined __SUNPRO_CC && !defined __RESTRICT && !defined __restrict__
190	181	# define _Restrict
191	182	# define __restrict__
192	183	#endif

diff -r bd2d082702f1 -r aa3c2b5fd105 speexdsp/config.sub

--- a/speexdsp/config.sub Wed Dec 28 06:26:56 2022 -0500

+++ b/speexdsp/config.sub Wed Dec 28 06:28:31 2022 -0500

		@@ -1,12 +1,14 @@
1	1	#! /bin/sh
2	2	# Configuration validation subroutine script.
3		-# Copyright 1992-2018 Free Software Foundation, Inc.
	3	+# Copyright 1992-2022 Free Software Foundation, Inc.
4	4
5		-timestamp='2018-02-22'
	5	+# shellcheck disable=SC2006,SC2268 # see below for rationale
	6	+
	7	+timestamp='2022-01-03'
6	8
7	9	# This file is free software; you can redistribute it and/or modify it
8	10	# under the terms of the GNU General Public License as published by
9		-# the Free Software Foundation; either version 3 of the License, or
	11	+# the Free Software Foundation, either version 3 of the License, or
10	12	# (at your option) any later version.
11	13	#
12	14	# This program is distributed in the hope that it will be useful, but

		@@ -33,7 +35,7 @@
33	35	# Otherwise, we print the canonical config type on stdout and succeed.
34	36
35	37	# You can get the latest version of this script from:
36		-# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
	38	+# https://git.savannah.gnu.org/cgit/config.git/plain/config.sub
37	39
38	40	# This file is supposed to be the same for all GNU packages
39	41	# and recognize all the CPU types, system types and aliases

		@@ -50,6 +52,13 @@
50	52	# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
51	53	# It is wrong to echo any other type of specification.
52	54
	55	+# The "shellcheck disable" line above the timestamp inhibits complaints
	56	+# about features and limitations of the classic Bourne shell that were
	57	+# superseded or lifted in POSIX. However, this script identifies a wide
	58	+# variety of pre-POSIX systems that do not have POSIX shells at all, and
	59	+# even some reasonably current systems (Solaris 10 as case-in-point) still
	60	+# have a pre-POSIX /bin/sh.
	61	+
53	62	me=`echo "$0" \| sed -e 's,.*/,,'`
54	63
55	64	usage="\

		@@ -67,7 +76,7 @@
67	76	version="\
68	77	GNU config.sub ($timestamp)
69	78
70		-Copyright 1992-2018 Free Software Foundation, Inc.
	79	+Copyright 1992-2022 Free Software Foundation, Inc.
71	80
72	81	This is free software; see the source for copying conditions. There is NO
73	82	warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."

		@@ -89,7 +98,7 @@
89	98	- ) # Use stdin as input.
90	99	break ;;
91	100	-* )
92		- echo "$me: invalid option $1$help"
	101	+ echo "$me: invalid option $1$help" >&2
93	102	exit 1 ;;
94	103
95	104	local)

		@@ -110,1223 +119,1186 @@
110	119	exit 1;;
111	120	esac
112	121
113		-# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
114		-# Here we must recognize all the valid KERNEL-OS combinations.
115		-maybe_os=`echo "$1" \| sed 's/^$.$-$[^-]-[^-]*$$/\2/'`
116		-case $maybe_os in
117		- nto-qnx* \| linux-gnu* \| linux-android* \| linux-dietlibc \| linux-newlib* \| \
118		- linux-musl* \| linux-uclibc* \| uclinux-uclibc* \| uclinux-gnu* \| kfreebsd-gnu \| \
119		- knetbsd-gnu \| netbsd-gnu \| netbsd-eabi \| \
120		- kopensolaris-gnu \| cloudabi-eabi \| \
121		- storm-chaos* \| os2-emx* \| rtmk-nova*)
122		- os=-$maybe_os
123		- basic_machine=`echo "$1" \| sed 's/^$.$-$[^-]-[^-]*$$/\1/'`
124		- ;;
125		- android-linux)
126		- os=-linux-android
127		- basic_machine=`echo "$1" \| sed 's/^$.$-$[^-]-[^-]*$$/\1/'`-unknown
128		- ;;
129		- *)
130		- basic_machine=`echo "$1" \| sed 's/-[^-]*$//'`
131		- if [ "$basic_machine" != "$1" ]
132		- then os=`echo "$1" \| sed 's/.*-/-/'`
133		- else os=; fi
134		- ;;
135		-esac
	122	+# Split fields of configuration type
	123	+# shellcheck disable=SC2162
	124	+saved_IFS=$IFS
	125	+IFS="-" read field1 field2 field3 field4 <<EOF
	126	+$1
	127	+EOF
	128	+IFS=$saved_IFS
136	129
137		-### Let's recognize common machines as not being operating systems so
138		-### that things like config.sub decstation-3100 work. We also
139		-### recognize some manufacturers as not being operating systems, so we
140		-### can provide default operating systems below.
141		-case $os in
142		- -sunos)
143		- # Prevent following clause from handling this invalid input.
144		- ;;
145		- -dec* \| -mips* \| -sequent* \| -encore* \| -pc532* \| -sgi* \| -sony* \| \
146		- -att* \| -7300* \| -3300* \| -delta* \| -motorola* \| -sun[234]* \| \
147		- -unicom* \| -ibm* \| -next \| -hp \| -isi* \| -apollo \| -altos* \| \
148		- -convergent* \| -ncr* \| -news \| -32* \| -3600* \| -3100* \| -hitachi* \|\
149		- -c[123]* \| -convex* \| -sun \| -crds \| -omron* \| -dg \| -ultra \| -tti* \| \
150		- -harris \| -dolphin \| -highlevel \| -gould \| -cbm \| -ns \| -masscomp \| \
151		- -apple \| -axis \| -knuth \| -cray \| -microblaze*)
152		- os=
153		- basic_machine=$1
154		- ;;
155		- -bluegene*)
156		- os=-cnk
157		- ;;
158		- -sim \| -cisco \| -oki \| -wec \| -winbond)
159		- os=
160		- basic_machine=$1
161		- ;;
162		- -scout)
163		- ;;
164		- -wrs)
165		- os=-vxworks
166		- basic_machine=$1
167		- ;;
168		- -chorusos*)
169		- os=-chorusos
170		- basic_machine=$1
	130	+# Separate into logical components for further validation
	131	+case $1 in
	132	+ ----*)
	133	+ echo Invalid configuration \`"$1"\': more than four components >&2
	134	+ exit 1
171	135	;;
172		- -chorusrdb)
173		- os=-chorusrdb
174		- basic_machine=$1
175		- ;;
176		- -hiux*)
177		- os=-hiuxwe2
178		- ;;
179		- -sco6)
180		- os=-sco5v6
181		- basic_machine=`echo "$1" \| sed -e 's/86-.*/86-pc/'`
182		- ;;
183		- -sco5)
184		- os=-sco3.2v5
185		- basic_machine=`echo "$1" \| sed -e 's/86-.*/86-pc/'`
186		- ;;
187		- -sco4)
188		- os=-sco3.2v4
189		- basic_machine=`echo "$1" \| sed -e 's/86-.*/86-pc/'`
190		- ;;
191		- -sco3.2.[4-9]*)
192		- os=`echo $os \| sed -e 's/sco3.2./sco3.2v/'`
193		- basic_machine=`echo "$1" \| sed -e 's/86-.*/86-pc/'`
194		- ;;
195		- -sco3.2v[4-9]*)
196		- # Don't forget version if it is 3.2v4 or newer.
197		- basic_machine=`echo "$1" \| sed -e 's/86-.*/86-pc/'`
198		- ;;
199		- -sco5v6*)
200		- # Don't forget version if it is 3.2v4 or newer.
201		- basic_machine=`echo "$1" \| sed -e 's/86-.*/86-pc/'`
	136	+ ---)
	137	+ basic_machine=$field1-$field2
	138	+ basic_os=$field3-$field4
202	139	;;
203		- -sco*)
204		- os=-sco3.2v2
205		- basic_machine=`echo "$1" \| sed -e 's/86-.*/86-pc/'`
206		- ;;
207		- -udk*)
208		- basic_machine=`echo "$1" \| sed -e 's/86-.*/86-pc/'`
209		- ;;
210		- -isc)
211		- os=-isc2.2
212		- basic_machine=`echo "$1" \| sed -e 's/86-.*/86-pc/'`
213		- ;;
214		- -clix*)
215		- basic_machine=clipper-intergraph
216		- ;;
217		- -isc*)
218		- basic_machine=`echo "$1" \| sed -e 's/86-.*/86-pc/'`
	140	+ --*)
	141	+ # Ambiguous whether COMPANY is present, or skipped and KERNEL-OS is two
	142	+ # parts
	143	+ maybe_os=$field2-$field3
	144	+ case $maybe_os in
	145	+ nto-qnx* \| linux-* \| uclinux-uclibc* \
	146	+ \| uclinux-gnu* \| kfreebsd-gnu \| knetbsd-gnu \| netbsd-gnu \
	147	+ \| netbsd-eabi \| kopensolaris-gnu \| cloudabi-eabi \
	148	+ \| storm-chaos* \| os2-emx* \| rtmk-nova*)
	149	+ basic_machine=$field1
	150	+ basic_os=$maybe_os
	151	+ ;;
	152	+ android-linux)
	153	+ basic_machine=$field1-unknown
	154	+ basic_os=linux-android
	155	+ ;;
	156	+ *)
	157	+ basic_machine=$field1-$field2
	158	+ basic_os=$field3
	159	+ ;;
	160	+ esac
219	161	;;
220		- -lynx*178)
221		- os=-lynxos178
222		- ;;
223		- -lynx*5)
224		- os=-lynxos5
225		- ;;
226		- -lynx*)
227		- os=-lynxos
	162	+ -)
	163	+ # A lone config we happen to match not fitting any pattern
	164	+ case $field1-$field2 in
	165	+ decstation-3100)
	166	+ basic_machine=mips-dec
	167	+ basic_os=
	168	+ ;;
	169	+ -)
	170	+ # Second component is usually, but not always the OS
	171	+ case $field2 in
	172	+ # Prevent following clause from handling this valid os
	173	+ sunos)
	174	+ basic_machine=$field1
	175	+ basic_os=$field2
	176	+ ;;
	177	+ zephyr*)
	178	+ basic_machine=$field1-unknown
	179	+ basic_os=$field2
	180	+ ;;
	181	+ # Manufacturers
	182	+ dec* \| mips* \| sequent* \| encore* \| pc533* \| sgi* \| sony* \
	183	+ \| att* \| 7300* \| 3300* \| delta* \| motorola* \| sun[234]* \
	184	+ \| unicom* \| ibm* \| next \| hp \| isi* \| apollo \| altos* \
	185	+ \| convergent* \| ncr* \| news \| 32* \| 3600* \| 3100* \
	186	+ \| hitachi* \| c[123]* \| convex* \| sun \| crds \| omron* \| dg \
	187	+ \| ultra \| tti* \| harris \| dolphin \| highlevel \| gould \
	188	+ \| cbm \| ns \| masscomp \| apple \| axis \| knuth \| cray \
	189	+ \| microblaze* \| sim \| cisco \
	190	+ \| oki \| wec \| wrs \| winbond)
	191	+ basic_machine=$field1-$field2
	192	+ basic_os=
	193	+ ;;
	194	+ *)
	195	+ basic_machine=$field1
	196	+ basic_os=$field2
	197	+ ;;
	198	+ esac
	199	+ ;;
	200	+ esac
228	201	;;
229		- -ptx*)
230		- basic_machine=`echo "$1" \| sed -e 's/86-.*/86-sequent/'`
231		- ;;
232		- -psos*)
233		- os=-psos
234		- ;;
235		- -mint \| -mint[0-9]*)
236		- basic_machine=m68k-atari
237		- os=-mint
	202	+ *)
	203	+ # Convert single-component short-hands not valid as part of
	204	+ # multi-component configurations.
	205	+ case $field1 in
	206	+ 386bsd)
	207	+ basic_machine=i386-pc
	208	+ basic_os=bsd
	209	+ ;;
	210	+ a29khif)
	211	+ basic_machine=a29k-amd
	212	+ basic_os=udi
	213	+ ;;
	214	+ adobe68k)
	215	+ basic_machine=m68010-adobe
	216	+ basic_os=scout
	217	+ ;;
	218	+ alliant)
	219	+ basic_machine=fx80-alliant
	220	+ basic_os=
	221	+ ;;
	222	+ altos \| altos3068)
	223	+ basic_machine=m68k-altos
	224	+ basic_os=
	225	+ ;;
	226	+ am29k)
	227	+ basic_machine=a29k-none
	228	+ basic_os=bsd
	229	+ ;;
	230	+ amdahl)
	231	+ basic_machine=580-amdahl
	232	+ basic_os=sysv
	233	+ ;;
	234	+ amiga)
	235	+ basic_machine=m68k-unknown
	236	+ basic_os=
	237	+ ;;
	238	+ amigaos \| amigados)
	239	+ basic_machine=m68k-unknown
	240	+ basic_os=amigaos
	241	+ ;;
	242	+ amigaunix \| amix)
	243	+ basic_machine=m68k-unknown
	244	+ basic_os=sysv4
	245	+ ;;
	246	+ apollo68)
	247	+ basic_machine=m68k-apollo
	248	+ basic_os=sysv
	249	+ ;;
	250	+ apollo68bsd)
	251	+ basic_machine=m68k-apollo
	252	+ basic_os=bsd
	253	+ ;;
	254	+ aros)
	255	+ basic_machine=i386-pc
	256	+ basic_os=aros
	257	+ ;;
	258	+ aux)
	259	+ basic_machine=m68k-apple
	260	+ basic_os=aux
	261	+ ;;
	262	+ balance)
	263	+ basic_machine=ns32k-sequent
	264	+ basic_os=dynix
	265	+ ;;
	266	+ blackfin)
	267	+ basic_machine=bfin-unknown
	268	+ basic_os=linux
	269	+ ;;
	270	+ cegcc)
	271	+ basic_machine=arm-unknown
	272	+ basic_os=cegcc
	273	+ ;;
	274	+ convex-c1)
	275	+ basic_machine=c1-convex
	276	+ basic_os=bsd
	277	+ ;;
	278	+ convex-c2)
	279	+ basic_machine=c2-convex
	280	+ basic_os=bsd
	281	+ ;;
	282	+ convex-c32)
	283	+ basic_machine=c32-convex
	284	+ basic_os=bsd
	285	+ ;;
	286	+ convex-c34)
	287	+ basic_machine=c34-convex
	288	+ basic_os=bsd
	289	+ ;;
	290	+ convex-c38)
	291	+ basic_machine=c38-convex
	292	+ basic_os=bsd
	293	+ ;;
	294	+ cray)
	295	+ basic_machine=j90-cray
	296	+ basic_os=unicos
	297	+ ;;
	298	+ crds \| unos)
	299	+ basic_machine=m68k-crds
	300	+ basic_os=
	301	+ ;;
	302	+ da30)
	303	+ basic_machine=m68k-da30
	304	+ basic_os=
	305	+ ;;
	306	+ decstation \| pmax \| pmin \| dec3100 \| decstatn)
	307	+ basic_machine=mips-dec
	308	+ basic_os=
	309	+ ;;
	310	+ delta88)
	311	+ basic_machine=m88k-motorola
	312	+ basic_os=sysv3
	313	+ ;;
	314	+ dicos)
	315	+ basic_machine=i686-pc
	316	+ basic_os=dicos
	317	+ ;;
	318	+ djgpp)
	319	+ basic_machine=i586-pc
	320	+ basic_os=msdosdjgpp
	321	+ ;;
	322	+ ebmon29k)
	323	+ basic_machine=a29k-amd
	324	+ basic_os=ebmon
	325	+ ;;
	326	+ es1800 \| OSE68k \| ose68k \| ose \| OSE)
	327	+ basic_machine=m68k-ericsson
	328	+ basic_os=ose
	329	+ ;;
	330	+ gmicro)
	331	+ basic_machine=tron-gmicro
	332	+ basic_os=sysv
	333	+ ;;
	334	+ go32)
	335	+ basic_machine=i386-pc
	336	+ basic_os=go32
	337	+ ;;
	338	+ h8300hms)
	339	+ basic_machine=h8300-hitachi
	340	+ basic_os=hms
	341	+ ;;
	342	+ h8300xray)
	343	+ basic_machine=h8300-hitachi
	344	+ basic_os=xray
	345	+ ;;
	346	+ h8500hms)
	347	+ basic_machine=h8500-hitachi
	348	+ basic_os=hms
	349	+ ;;
	350	+ harris)
	351	+ basic_machine=m88k-harris
	352	+ basic_os=sysv3
	353	+ ;;
	354	+ hp300 \| hp300hpux)
	355	+ basic_machine=m68k-hp
	356	+ basic_os=hpux
	357	+ ;;
	358	+ hp300bsd)
	359	+ basic_machine=m68k-hp
	360	+ basic_os=bsd
	361	+ ;;
	362	+ hppaosf)
	363	+ basic_machine=hppa1.1-hp
	364	+ basic_os=osf
	365	+ ;;
	366	+ hppro)
	367	+ basic_machine=hppa1.1-hp
	368	+ basic_os=proelf
	369	+ ;;
	370	+ i386mach)
	371	+ basic_machine=i386-mach
	372	+ basic_os=mach
	373	+ ;;
	374	+ isi68 \| isi)
	375	+ basic_machine=m68k-isi
	376	+ basic_os=sysv
	377	+ ;;
	378	+ m68knommu)
	379	+ basic_machine=m68k-unknown
	380	+ basic_os=linux
	381	+ ;;
	382	+ magnum \| m3230)
	383	+ basic_machine=mips-mips
	384	+ basic_os=sysv
	385	+ ;;
	386	+ merlin)
	387	+ basic_machine=ns32k-utek
	388	+ basic_os=sysv
	389	+ ;;
	390	+ mingw64)
	391	+ basic_machine=x86_64-pc
	392	+ basic_os=mingw64
	393	+ ;;
	394	+ mingw32)
	395	+ basic_machine=i686-pc
	396	+ basic_os=mingw32
	397	+ ;;
	398	+ mingw32ce)
	399	+ basic_machine=arm-unknown
	400	+ basic_os=mingw32ce
	401	+ ;;
	402	+ monitor)
	403	+ basic_machine=m68k-rom68k
	404	+ basic_os=coff
	405	+ ;;
	406	+ morphos)
	407	+ basic_machine=powerpc-unknown
	408	+ basic_os=morphos
	409	+ ;;
	410	+ moxiebox)
	411	+ basic_machine=moxie-unknown
	412	+ basic_os=moxiebox
	413	+ ;;
	414	+ msdos)
	415	+ basic_machine=i386-pc
	416	+ basic_os=msdos
	417	+ ;;
	418	+ msys)
	419	+ basic_machine=i686-pc
	420	+ basic_os=msys
	421	+ ;;
	422	+ mvs)
	423	+ basic_machine=i370-ibm
	424	+ basic_os=mvs
	425	+ ;;
	426	+ nacl)
	427	+ basic_machine=le32-unknown
	428	+ basic_os=nacl
	429	+ ;;
	430	+ ncr3000)
	431	+ basic_machine=i486-ncr
	432	+ basic_os=sysv4
	433	+ ;;
	434	+ netbsd386)
	435	+ basic_machine=i386-pc
	436	+ basic_os=netbsd
	437	+ ;;
	438	+ netwinder)
	439	+ basic_machine=armv4l-rebel
	440	+ basic_os=linux
	441	+ ;;
	442	+ news \| news700 \| news800 \| news900)
	443	+ basic_machine=m68k-sony
	444	+ basic_os=newsos
	445	+ ;;
	446	+ news1000)
	447	+ basic_machine=m68030-sony
	448	+ basic_os=newsos
	449	+ ;;
	450	+ necv70)
	451	+ basic_machine=v70-nec
	452	+ basic_os=sysv
	453	+ ;;
	454	+ nh3000)
	455	+ basic_machine=m68k-harris
	456	+ basic_os=cxux
	457	+ ;;
	458	+ nh[45]000)
	459	+ basic_machine=m88k-harris
	460	+ basic_os=cxux
	461	+ ;;
	462	+ nindy960)
	463	+ basic_machine=i960-intel
	464	+ basic_os=nindy
	465	+ ;;
	466	+ mon960)
	467	+ basic_machine=i960-intel
	468	+ basic_os=mon960
	469	+ ;;
	470	+ nonstopux)
	471	+ basic_machine=mips-compaq
	472	+ basic_os=nonstopux
	473	+ ;;
	474	+ os400)
	475	+ basic_machine=powerpc-ibm
	476	+ basic_os=os400
	477	+ ;;
	478	+ OSE68000 \| ose68000)
	479	+ basic_machine=m68000-ericsson
	480	+ basic_os=ose
	481	+ ;;
	482	+ os68k)
	483	+ basic_machine=m68k-none
	484	+ basic_os=os68k
	485	+ ;;
	486	+ paragon)
	487	+ basic_machine=i860-intel
	488	+ basic_os=osf
	489	+ ;;
	490	+ parisc)
	491	+ basic_machine=hppa-unknown
	492	+ basic_os=linux
	493	+ ;;
	494	+ psp)
	495	+ basic_machine=mipsallegrexel-sony
	496	+ basic_os=psp
	497	+ ;;
	498	+ pw32)
	499	+ basic_machine=i586-unknown
	500	+ basic_os=pw32
	501	+ ;;
	502	+ rdos \| rdos64)
	503	+ basic_machine=x86_64-pc
	504	+ basic_os=rdos
	505	+ ;;
	506	+ rdos32)
	507	+ basic_machine=i386-pc
	508	+ basic_os=rdos
	509	+ ;;
	510	+ rom68k)
	511	+ basic_machine=m68k-rom68k
	512	+ basic_os=coff
	513	+ ;;
	514	+ sa29200)
	515	+ basic_machine=a29k-amd
	516	+ basic_os=udi
	517	+ ;;
	518	+ sei)
	519	+ basic_machine=mips-sei
	520	+ basic_os=seiux
	521	+ ;;
	522	+ sequent)
	523	+ basic_machine=i386-sequent
	524	+ basic_os=
	525	+ ;;
	526	+ sps7)
	527	+ basic_machine=m68k-bull
	528	+ basic_os=sysv2
	529	+ ;;
	530	+ st2000)
	531	+ basic_machine=m68k-tandem
	532	+ basic_os=
	533	+ ;;
	534	+ stratus)
	535	+ basic_machine=i860-stratus
	536	+ basic_os=sysv4
	537	+ ;;
	538	+ sun2)
	539	+ basic_machine=m68000-sun
	540	+ basic_os=
	541	+ ;;
	542	+ sun2os3)
	543	+ basic_machine=m68000-sun
	544	+ basic_os=sunos3
	545	+ ;;
	546	+ sun2os4)
	547	+ basic_machine=m68000-sun
	548	+ basic_os=sunos4
	549	+ ;;
	550	+ sun3)
	551	+ basic_machine=m68k-sun
	552	+ basic_os=
	553	+ ;;
	554	+ sun3os3)
	555	+ basic_machine=m68k-sun
	556	+ basic_os=sunos3
	557	+ ;;
	558	+ sun3os4)
	559	+ basic_machine=m68k-sun
	560	+ basic_os=sunos4
	561	+ ;;
	562	+ sun4)
	563	+ basic_machine=sparc-sun
	564	+ basic_os=
	565	+ ;;
	566	+ sun4os3)
	567	+ basic_machine=sparc-sun
	568	+ basic_os=sunos3
	569	+ ;;
	570	+ sun4os4)
	571	+ basic_machine=sparc-sun
	572	+ basic_os=sunos4
	573	+ ;;
	574	+ sun4sol2)
	575	+ basic_machine=sparc-sun
	576	+ basic_os=solaris2
	577	+ ;;
	578	+ sun386 \| sun386i \| roadrunner)
	579	+ basic_machine=i386-sun
	580	+ basic_os=
	581	+ ;;
	582	+ sv1)
	583	+ basic_machine=sv1-cray
	584	+ basic_os=unicos
	585	+ ;;
	586	+ symmetry)
	587	+ basic_machine=i386-sequent
	588	+ basic_os=dynix
	589	+ ;;
	590	+ t3e)
	591	+ basic_machine=alphaev5-cray
	592	+ basic_os=unicos
	593	+ ;;
	594	+ t90)
	595	+ basic_machine=t90-cray
	596	+ basic_os=unicos
	597	+ ;;
	598	+ toad1)
	599	+ basic_machine=pdp10-xkl
	600	+ basic_os=tops20
	601	+ ;;
	602	+ tpf)
	603	+ basic_machine=s390x-ibm
	604	+ basic_os=tpf
	605	+ ;;
	606	+ udi29k)
	607	+ basic_machine=a29k-amd
	608	+ basic_os=udi
	609	+ ;;
	610	+ ultra3)
	611	+ basic_machine=a29k-nyu
	612	+ basic_os=sym1
	613	+ ;;
	614	+ v810 \| necv810)
	615	+ basic_machine=v810-nec
	616	+ basic_os=none
	617	+ ;;
	618	+ vaxv)
	619	+ basic_machine=vax-dec
	620	+ basic_os=sysv
	621	+ ;;
	622	+ vms)
	623	+ basic_machine=vax-dec
	624	+ basic_os=vms
	625	+ ;;
	626	+ vsta)
	627	+ basic_machine=i386-pc
	628	+ basic_os=vsta
	629	+ ;;
	630	+ vxworks960)
	631	+ basic_machine=i960-wrs
	632	+ basic_os=vxworks
	633	+ ;;
	634	+ vxworks68)
	635	+ basic_machine=m68k-wrs
	636	+ basic_os=vxworks
	637	+ ;;
	638	+ vxworks29k)
	639	+ basic_machine=a29k-wrs
	640	+ basic_os=vxworks
	641	+ ;;
	642	+ xbox)
	643	+ basic_machine=i686-pc
	644	+ basic_os=mingw32
	645	+ ;;
	646	+ ymp)
	647	+ basic_machine=ymp-cray
	648	+ basic_os=unicos
	649	+ ;;
	650	+ *)
	651	+ basic_machine=$1
	652	+ basic_os=
	653	+ ;;
	654	+ esac
238	655	;;
239	656	esac
240	657
241		-# Decode aliases for certain CPU-COMPANY combinations.
	658	+# Decode 1-component or ad-hoc basic machines
242	659	case $basic_machine in
243		- # Recognize the basic CPU types without company name.
244		- # Some are omitted here because they have special meanings below.
245		- 1750a \| 580 \
246		- \| a29k \
247		- \| aarch64 \| aarch64_be \
248		- \| alpha \| alphaev[4-8] \| alphaev56 \| alphaev6[78] \| alphapca5[67] \
249		- \| alpha64 \| alpha64ev[4-8] \| alpha64ev56 \| alpha64ev6[78] \| alpha64pca5[67] \
250		- \| am33_2.0 \
251		- \| arc \| arceb \
252		- \| arm \| arm[bl]e \| arme[lb] \| armv[2-8] \| armv[3-8][lb] \| armv7[arm] \
253		- \| avr \| avr32 \
254		- \| ba \
255		- \| be32 \| be64 \
256		- \| bfin \
257		- \| c4x \| c8051 \| clipper \
258		- \| d10v \| d30v \| dlx \| dsp16xx \
259		- \| e2k \| epiphany \
260		- \| fido \| fr30 \| frv \| ft32 \
261		- \| h8300 \| h8500 \| hppa \| hppa1.[01] \| hppa2.0 \| hppa2.0[nw] \| hppa64 \
262		- \| hexagon \
263		- \| i370 \| i860 \| i960 \| ia16 \| ia64 \
264		- \| ip2k \| iq2000 \
265		- \| k1om \
266		- \| le32 \| le64 \
267		- \| lm32 \
268		- \| m32c \| m32r \| m32rle \| m68000 \| m68k \| m88k \
269		- \| maxq \| mb \| microblaze \| microblazeel \| mcore \| mep \| metag \
270		- \| mips \| mipsbe \| mipseb \| mipsel \| mipsle \
271		- \| mips16 \
272		- \| mips64 \| mips64el \
273		- \| mips64octeon \| mips64octeonel \
274		- \| mips64orion \| mips64orionel \
275		- \| mips64r5900 \| mips64r5900el \
276		- \| mips64vr \| mips64vrel \
277		- \| mips64vr4100 \| mips64vr4100el \
278		- \| mips64vr4300 \| mips64vr4300el \
279		- \| mips64vr5000 \| mips64vr5000el \
280		- \| mips64vr5900 \| mips64vr5900el \
281		- \| mipsisa32 \| mipsisa32el \
282		- \| mipsisa32r2 \| mipsisa32r2el \
283		- \| mipsisa32r6 \| mipsisa32r6el \
284		- \| mipsisa64 \| mipsisa64el \
285		- \| mipsisa64r2 \| mipsisa64r2el \
286		- \| mipsisa64r6 \| mipsisa64r6el \
287		- \| mipsisa64sb1 \| mipsisa64sb1el \
288		- \| mipsisa64sr71k \| mipsisa64sr71kel \
289		- \| mipsr5900 \| mipsr5900el \
290		- \| mipstx39 \| mipstx39el \
291		- \| mn10200 \| mn10300 \
292		- \| moxie \
293		- \| mt \
294		- \| msp430 \
295		- \| nds32 \| nds32le \| nds32be \
296		- \| nios \| nios2 \| nios2eb \| nios2el \
297		- \| ns16k \| ns32k \
298		- \| open8 \| or1k \| or1knd \| or32 \
299		- \| pdp10 \| pj \| pjl \
300		- \| powerpc \| powerpc64 \| powerpc64le \| powerpcle \
301		- \| pru \
302		- \| pyramid \
303		- \| riscv32 \| riscv64 \
304		- \| rl78 \| rx \
305		- \| score \
306		- \| sh \| sh[1234] \| sh[24]a \| sh[24]aeb \| sh[23]e \| sh[234]eb \| sheb \| shbe \| shle \| sh[1234]le \| sh3ele \
307		- \| sh64 \| sh64le \
308		- \| sparc \| sparc64 \| sparc64b \| sparc64v \| sparc86x \| sparclet \| sparclite \
309		- \| sparcv8 \| sparcv9 \| sparcv9b \| sparcv9v \
310		- \| spu \
311		- \| tahoe \| tic4x \| tic54x \| tic55x \| tic6x \| tic80 \| tron \
312		- \| ubicom32 \
313		- \| v850 \| v850e \| v850e1 \| v850e2 \| v850es \| v850e2v3 \
314		- \| visium \
315		- \| wasm32 \
316		- \| x86 \| xc16x \| xstormy16 \| xtensa \
317		- \| z8k \| z80)
318		- basic_machine=$basic_machine-unknown
	660	+ # Here we handle the default manufacturer of certain CPU types. It is in
	661	+ # some cases the only manufacturer, in others, it is the most popular.
	662	+ w89k)
	663	+ cpu=hppa1.1
	664	+ vendor=winbond
319	665	;;
320		- c54x)
321		- basic_machine=tic54x-unknown
	666	+ op50n)
	667	+ cpu=hppa1.1
	668	+ vendor=oki
322	669	;;
323		- c55x)
324		- basic_machine=tic55x-unknown
	670	+ op60c)
	671	+ cpu=hppa1.1
	672	+ vendor=oki
325	673	;;
326		- c6x)
327		- basic_machine=tic6x-unknown
	674	+ ibm*)
	675	+ cpu=i370
	676	+ vendor=ibm
	677	+ ;;
	678	+ orion105)
	679	+ cpu=clipper
	680	+ vendor=highlevel
	681	+ ;;
	682	+ mac \| mpw \| mac-mpw)
	683	+ cpu=m68k
	684	+ vendor=apple
	685	+ ;;
	686	+ pmac \| pmac-mpw)
	687	+ cpu=powerpc
	688	+ vendor=apple
	689	+ ;;
	690	+
	691	+ # Recognize the various machine names and aliases which stand
	692	+ # for a CPU type and a company and sometimes even an OS.
	693	+ 3b1 \| 7300 \| 7300-att \| att-7300 \| pc7300 \| safari \| unixpc)
	694	+ cpu=m68000
	695	+ vendor=att
	696	+ ;;
	697	+ 3b*)
	698	+ cpu=we32k
	699	+ vendor=att
	700	+ ;;
	701	+ bluegene*)
	702	+ cpu=powerpc
	703	+ vendor=ibm
	704	+ basic_os=cnk
	705	+ ;;
	706	+ decsystem10* \| dec10*)
	707	+ cpu=pdp10
	708	+ vendor=dec
	709	+ basic_os=tops10
	710	+ ;;
	711	+ decsystem20* \| dec20*)
	712	+ cpu=pdp10
	713	+ vendor=dec
	714	+ basic_os=tops20
	715	+ ;;
	716	+ delta \| 3300 \| motorola-3300 \| motorola-delta \
	717	+ \| 3300-motorola \| delta-motorola)
	718	+ cpu=m68k
	719	+ vendor=motorola
	720	+ ;;
	721	+ dpx2*)
	722	+ cpu=m68k
	723	+ vendor=bull
	724	+ basic_os=sysv3
	725	+ ;;
	726	+ encore \| umax \| mmax)
	727	+ cpu=ns32k
	728	+ vendor=encore
	729	+ ;;
	730	+ elxsi)
	731	+ cpu=elxsi
	732	+ vendor=elxsi
	733	+ basic_os=${basic_os:-bsd}
	734	+ ;;
	735	+ fx2800)
	736	+ cpu=i860
	737	+ vendor=alliant
	738	+ ;;
	739	+ genix)
	740	+ cpu=ns32k
	741	+ vendor=ns
	742	+ ;;
	743	+ h3050r* \| hiux*)
	744	+ cpu=hppa1.1
	745	+ vendor=hitachi
	746	+ basic_os=hiuxwe2
	747	+ ;;
	748	+ hp3k9[0-9][0-9] \| hp9[0-9][0-9])
	749	+ cpu=hppa1.0
	750	+ vendor=hp
	751	+ ;;
	752	+ hp9k2[0-9][0-9] \| hp9k31[0-9])
	753	+ cpu=m68000
	754	+ vendor=hp
	755	+ ;;
	756	+ hp9k3[2-9][0-9])
	757	+ cpu=m68k
	758	+ vendor=hp
	759	+ ;;
	760	+ hp9k6[0-9][0-9] \| hp6[0-9][0-9])
	761	+ cpu=hppa1.0
	762	+ vendor=hp
	763	+ ;;
	764	+ hp9k7[0-79][0-9] \| hp7[0-79][0-9])
	765	+ cpu=hppa1.1
	766	+ vendor=hp
	767	+ ;;
	768	+ hp9k78[0-9] \| hp78[0-9])
	769	+ # FIXME: really hppa2.0-hp
	770	+ cpu=hppa1.1
	771	+ vendor=hp
	772	+ ;;
	773	+ hp9k8[67]1 \| hp8[67]1 \| hp9k80[24] \| hp80[24] \| hp9k8[78]9 \| hp8[78]9 \| hp9k893 \| hp893)
	774	+ # FIXME: really hppa2.0-hp
	775	+ cpu=hppa1.1
	776	+ vendor=hp
	777	+ ;;
	778	+ hp9k8[0-9][13679] \| hp8[0-9][13679])
	779	+ cpu=hppa1.1
	780	+ vendor=hp
	781	+ ;;
	782	+ hp9k8[0-9][0-9] \| hp8[0-9][0-9])
	783	+ cpu=hppa1.0
	784	+ vendor=hp
	785	+ ;;
	786	+ i*86v32)
	787	+ cpu=`echo "$1" \| sed -e 's/86.*/86/'`
	788	+ vendor=pc
	789	+ basic_os=sysv32
	790	+ ;;
	791	+ i86v4)
	792	+ cpu=`echo "$1" \| sed -e 's/86.*/86/'`
	793	+ vendor=pc
	794	+ basic_os=sysv4
	795	+ ;;
	796	+ i*86v)
	797	+ cpu=`echo "$1" \| sed -e 's/86.*/86/'`
	798	+ vendor=pc
	799	+ basic_os=sysv
	800	+ ;;
	801	+ i*86sol2)
	802	+ cpu=`echo "$1" \| sed -e 's/86.*/86/'`
	803	+ vendor=pc
	804	+ basic_os=solaris2
	805	+ ;;
	806	+ j90 \| j90-cray)
	807	+ cpu=j90
	808	+ vendor=cray
	809	+ basic_os=${basic_os:-unicos}
	810	+ ;;
	811	+ iris \| iris4d)
	812	+ cpu=mips
	813	+ vendor=sgi
	814	+ case $basic_os in
	815	+ irix*)
	816	+ ;;
	817	+ *)
	818	+ basic_os=irix4
	819	+ ;;
	820	+ esac
	821	+ ;;
	822	+ miniframe)
	823	+ cpu=m68000
	824	+ vendor=convergent
	825	+ ;;
	826	+ mint \| mint[0-9] \| MiNT \| MiNT[0-9]*)
	827	+ cpu=m68k
	828	+ vendor=atari
	829	+ basic_os=mint
	830	+ ;;
	831	+ news-3600 \| risc-news)
	832	+ cpu=mips
	833	+ vendor=sony
	834	+ basic_os=newsos
	835	+ ;;
	836	+ next \| m*-next)
	837	+ cpu=m68k
	838	+ vendor=next
	839	+ case $basic_os in
	840	+ openstep*)
	841	+ ;;
	842	+ nextstep*)
	843	+ ;;
	844	+ ns2*)
	845	+ basic_os=nextstep2
	846	+ ;;
	847	+ *)
	848	+ basic_os=nextstep3
	849	+ ;;
	850	+ esac
	851	+ ;;
	852	+ np1)
	853	+ cpu=np1
	854	+ vendor=gould
	855	+ ;;
	856	+ op50n-* \| op60c-*)
	857	+ cpu=hppa1.1
	858	+ vendor=oki
	859	+ basic_os=proelf
	860	+ ;;
	861	+ pa-hitachi)
	862	+ cpu=hppa1.1
	863	+ vendor=hitachi
	864	+ basic_os=hiuxwe2
	865	+ ;;
	866	+ pbd)
	867	+ cpu=sparc
	868	+ vendor=tti
	869	+ ;;
	870	+ pbb)
	871	+ cpu=m68k
	872	+ vendor=tti
	873	+ ;;
	874	+ pc532)
	875	+ cpu=ns32k
	876	+ vendor=pc532
	877	+ ;;
	878	+ pn)
	879	+ cpu=pn
	880	+ vendor=gould
	881	+ ;;
	882	+ power)
	883	+ cpu=power
	884	+ vendor=ibm
	885	+ ;;
	886	+ ps2)
	887	+ cpu=i386
	888	+ vendor=ibm
	889	+ ;;
	890	+ rm[46]00)
	891	+ cpu=mips
	892	+ vendor=siemens
	893	+ ;;
	894	+ rtpc \| rtpc-*)
	895	+ cpu=romp
	896	+ vendor=ibm
	897	+ ;;
	898	+ sde)
	899	+ cpu=mipsisa32
	900	+ vendor=sde
	901	+ basic_os=${basic_os:-elf}
	902	+ ;;
	903	+ simso-wrs)
	904	+ cpu=sparclite
	905	+ vendor=wrs
	906	+ basic_os=vxworks
	907	+ ;;
	908	+ tower \| tower-32)
	909	+ cpu=m68k
	910	+ vendor=ncr
	911	+ ;;
	912	+ vpp\|vx\|vx-)
	913	+ cpu=f301
	914	+ vendor=fujitsu
	915	+ ;;
	916	+ w65)
	917	+ cpu=w65
	918	+ vendor=wdc
	919	+ ;;
	920	+ w89k-*)
	921	+ cpu=hppa1.1
	922	+ vendor=winbond
	923	+ basic_os=proelf
	924	+ ;;
	925	+ none)
	926	+ cpu=none
	927	+ vendor=none
328	928	;;
329	929	leon\|leon[3-9])
330		- basic_machine=sparc-$basic_machine
	930	+ cpu=sparc
	931	+ vendor=$basic_machine
331	932	;;
332		- m6811 \| m68hc11 \| m6812 \| m68hc12 \| m68hcs12x \| nvptx \| picochip)
333		- basic_machine=$basic_machine-unknown
334		- os=-none
335		- ;;
336		- m88110 \| m680[12346]0 \| m683?2 \| m68360 \| m5200 \| v70 \| w65)
337		- ;;
338		- ms1)
339		- basic_machine=mt-unknown
	933	+ leon-\|leon[3-9]-)
	934	+ cpu=sparc
	935	+ vendor=`echo "$basic_machine" \| sed 's/-.*//'`
340	936	;;
341	937
342		- strongarm \| thumb \| xscale)
343		- basic_machine=arm-unknown
344		- ;;
345		- xgate)
346		- basic_machine=$basic_machine-unknown
347		- os=-none
	938	+ -)
	939	+ # shellcheck disable=SC2162
	940	+ saved_IFS=$IFS
	941	+ IFS="-" read cpu vendor <<EOF
	942	+$basic_machine
	943	+EOF
	944	+ IFS=$saved_IFS
348	945	;;
349		- xscaleeb)
350		- basic_machine=armeb-unknown
351		- ;;
352		-
353		- xscaleel)
354		- basic_machine=armel-unknown
355		- ;;
356		-
357	946	# We use `pc' rather than `unknown'
358	947	# because (1) that's what they normally are, and
359	948	# (2) the word "unknown" tends to confuse beginning users.
360	949	i*86 \| x86_64)
361		- basic_machine=$basic_machine-pc
362		- ;;
363		- # Object if more than one company name word.
364		- --*)
365		- echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2
366		- exit 1
	950	+ cpu=$basic_machine
	951	+ vendor=pc
367	952	;;
368		- # Recognize the basic CPU types with company name.
369		- 580-* \
370		- \| a29k-* \
371		- \| aarch64-* \| aarch64_be-* \
372		- \| alpha-* \| alphaev[4-8]-* \| alphaev56-* \| alphaev6[78]-* \
373		- \| alpha64-* \| alpha64ev[4-8]-* \| alpha64ev56-* \| alpha64ev6[78]-* \
374		- \| alphapca5[67]-* \| alpha64pca5[67]-* \| arc-* \| arceb-* \
375		- \| arm-* \| armbe-* \| armle-* \| armeb-* \| armv- \
376		- \| avr-* \| avr32-* \
377		- \| ba-* \
378		- \| be32-* \| be64-* \
379		- \| bfin-* \| bs2000-* \
380		- \| c[123]* \| c30-* \| [cjt]90-* \| c4x-* \
381		- \| c8051-* \| clipper-* \| craynv-* \| cydra-* \
382		- \| d10v-* \| d30v-* \| dlx-* \
383		- \| e2k-* \| elxsi-* \
384		- \| f30[01]-* \| f700-* \| fido-* \| fr30-* \| frv-* \| fx80-* \
385		- \| h8300-* \| h8500-* \
386		- \| hppa-* \| hppa1.[01]-* \| hppa2.0-* \| hppa2.0[nw]-* \| hppa64-* \
387		- \| hexagon-* \
388		- \| i86- \| i860-* \| i960-* \| ia16-* \| ia64-* \
389		- \| ip2k-* \| iq2000-* \
390		- \| k1om-* \
391		- \| le32-* \| le64-* \
392		- \| lm32-* \
393		- \| m32c-* \| m32r-* \| m32rle-* \
394		- \| m68000-* \| m680[012346]0-* \| m68360-* \| m683?2-* \| m68k-* \
395		- \| m88110-* \| m88k-* \| maxq-* \| mcore-* \| metag-* \
396		- \| microblaze-* \| microblazeel-* \
397		- \| mips-* \| mipsbe-* \| mipseb-* \| mipsel-* \| mipsle-* \
398		- \| mips16-* \
399		- \| mips64-* \| mips64el-* \
400		- \| mips64octeon-* \| mips64octeonel-* \
401		- \| mips64orion-* \| mips64orionel-* \
402		- \| mips64r5900-* \| mips64r5900el-* \
403		- \| mips64vr-* \| mips64vrel-* \
404		- \| mips64vr4100-* \| mips64vr4100el-* \
405		- \| mips64vr4300-* \| mips64vr4300el-* \
406		- \| mips64vr5000-* \| mips64vr5000el-* \
407		- \| mips64vr5900-* \| mips64vr5900el-* \
408		- \| mipsisa32-* \| mipsisa32el-* \
409		- \| mipsisa32r2-* \| mipsisa32r2el-* \
410		- \| mipsisa32r6-* \| mipsisa32r6el-* \
411		- \| mipsisa64-* \| mipsisa64el-* \
412		- \| mipsisa64r2-* \| mipsisa64r2el-* \
413		- \| mipsisa64r6-* \| mipsisa64r6el-* \
414		- \| mipsisa64sb1-* \| mipsisa64sb1el-* \
415		- \| mipsisa64sr71k-* \| mipsisa64sr71kel-* \
416		- \| mipsr5900-* \| mipsr5900el-* \
417		- \| mipstx39-* \| mipstx39el-* \
418		- \| mmix-* \
419		- \| mt-* \
420		- \| msp430-* \
421		- \| nds32-* \| nds32le-* \| nds32be-* \
422		- \| nios-* \| nios2-* \| nios2eb-* \| nios2el-* \
423		- \| none-* \| np1-* \| ns16k-* \| ns32k-* \
424		- \| open8-* \
425		- \| or1k- \
426		- \| orion-* \
427		- \| pdp10-* \| pdp11-* \| pj-* \| pjl-* \| pn-* \| power-* \
428		- \| powerpc-* \| powerpc64-* \| powerpc64le-* \| powerpcle-* \
429		- \| pru-* \
430		- \| pyramid-* \
431		- \| riscv32-* \| riscv64-* \
432		- \| rl78-* \| romp-* \| rs6000-* \| rx-* \
433		- \| sh-* \| sh[1234]-* \| sh[24]a-* \| sh[24]aeb-* \| sh[23]e-* \| sh[34]eb-* \| sheb-* \| shbe-* \
434		- \| shle-* \| sh[1234]le-* \| sh3ele-* \| sh64-* \| sh64le-* \
435		- \| sparc-* \| sparc64-* \| sparc64b-* \| sparc64v-* \| sparc86x-* \| sparclet-* \
436		- \| sparclite-* \
437		- \| sparcv8-* \| sparcv9-* \| sparcv9b-* \| sparcv9v-* \| sv1-* \| sx- \
438		- \| tahoe-* \
439		- \| tic30-* \| tic4x-* \| tic54x-* \| tic55x-* \| tic6x-* \| tic80-* \
440		- \| tile- \
441		- \| tron-* \
442		- \| ubicom32-* \
443		- \| v850-* \| v850e-* \| v850e1-* \| v850es-* \| v850e2-* \| v850e2v3-* \
444		- \| vax-* \
445		- \| visium-* \
446		- \| wasm32-* \
447		- \| we32k-* \
448		- \| x86-* \| x86_64-* \| xc16x-* \| xps100-* \
449		- \| xstormy16-* \| xtensa- \
450		- \| ymp-* \
451		- \| z8k-* \| z80-*)
	953	+ # These rules are duplicated from below for sake of the special case above;
	954	+ # i.e. things that normalized to x86 arches should also default to "pc"
	955	+ pc98)
	956	+ cpu=i386
	957	+ vendor=pc
452	958	;;
453		- # Recognize the basic CPU types without company name, with glob match.
454		- xtensa*)
455		- basic_machine=$basic_machine-unknown
456		- ;;
457		- # Recognize the various machine names and aliases which stand
458		- # for a CPU type and a company and sometimes even an OS.
459		- 386bsd)
460		- basic_machine=i386-pc
461		- os=-bsd
462		- ;;
463		- 3b1 \| 7300 \| 7300-att \| att-7300 \| pc7300 \| safari \| unixpc)
464		- basic_machine=m68000-att
465		- ;;
466		- 3b*)
467		- basic_machine=we32k-att
468		- ;;
469		- a29khif)
470		- basic_machine=a29k-amd
471		- os=-udi
	959	+ x64 \| amd64)
	960	+ cpu=x86_64
	961	+ vendor=pc
472	962	;;
473		- abacus)
474		- basic_machine=abacus-unknown
475		- ;;
476		- adobe68k)
477		- basic_machine=m68010-adobe
478		- os=-scout
479		- ;;
480		- alliant \| fx80)
481		- basic_machine=fx80-alliant
	963	+ # Recognize the basic CPU types without company name.
	964	+ *)
	965	+ cpu=$basic_machine
	966	+ vendor=unknown
482	967	;;
483		- altos \| altos3068)
484		- basic_machine=m68k-altos
	968	+esac
	969	+
	970	+unset -v basic_machine
	971	+
	972	+# Decode basic machines in the full and proper CPU-Company form.
	973	+case $cpu-$vendor in
	974	+ # Here we handle the default manufacturer of certain CPU types in canonical form. It is in
	975	+ # some cases the only manufacturer, in others, it is the most popular.
	976	+ craynv-unknown)
	977	+ vendor=cray
	978	+ basic_os=${basic_os:-unicosmp}
485	979	;;
486		- am29k)
487		- basic_machine=a29k-none
488		- os=-bsd
	980	+ c90-unknown \| c90-cray)
	981	+ vendor=cray
	982	+ basic_os=${Basic_os:-unicos}
489	983	;;
490		- amd64)
491		- basic_machine=x86_64-pc
	984	+ fx80-unknown)
	985	+ vendor=alliant
492	986	;;
	987	+ romp-unknown)
	988	+ vendor=ibm
	989	+ ;;
	990	+ mmix-unknown)
	991	+ vendor=knuth
	992	+ ;;
	993	+ microblaze-unknown \| microblazeel-unknown)
	994	+ vendor=xilinx
	995	+ ;;
	996	+ rs6000-unknown)
	997	+ vendor=ibm
	998	+ ;;
	999	+ vax-unknown)
	1000	+ vendor=dec
	1001	+ ;;
	1002	+ pdp11-unknown)
	1003	+ vendor=dec
	1004	+ ;;
	1005	+ we32k-unknown)
	1006	+ vendor=att
	1007	+ ;;
	1008	+ cydra-unknown)
	1009	+ vendor=cydrome
	1010	+ ;;
	1011	+ i370-ibm*)
	1012	+ vendor=ibm
	1013	+ ;;
	1014	+ orion-unknown)
	1015	+ vendor=highlevel
	1016	+ ;;
	1017	+ xps-unknown \| xps100-unknown)
	1018	+ cpu=xps100
	1019	+ vendor=honeywell
	1020	+ ;;
	1021	+
	1022	+ # Here we normalize CPU types with a missing or matching vendor
	1023	+ armh-unknown \| armh-alt)
	1024	+ cpu=armv7l
	1025	+ vendor=alt
	1026	+ basic_os=${basic_os:-linux-gnueabihf}
	1027	+ ;;
	1028	+ dpx20-unknown \| dpx20-bull)
	1029	+ cpu=rs6000
	1030	+ vendor=bull
	1031	+ basic_os=${basic_os:-bosx}
	1032	+ ;;
	1033	+
	1034	+ # Here we normalize CPU types irrespective of the vendor
493	1035	amd64-*)
494		- basic_machine=x86_64-`echo "$basic_machine" \| sed 's/^[^-]*-//'`
495		- ;;
496		- amdahl)
497		- basic_machine=580-amdahl
498		- os=-sysv
499		- ;;
500		- amiga \| amiga-*)
501		- basic_machine=m68k-unknown
502		- ;;
503		- amigaos \| amigados)
504		- basic_machine=m68k-unknown
505		- os=-amigaos
506		- ;;
507		- amigaunix \| amix)
508		- basic_machine=m68k-unknown
509		- os=-sysv4
510		- ;;
511		- apollo68)
512		- basic_machine=m68k-apollo
513		- os=-sysv
514		- ;;
515		- apollo68bsd)
516		- basic_machine=m68k-apollo
517		- os=-bsd
518		- ;;
519		- aros)
520		- basic_machine=i386-pc
521		- os=-aros
522		- ;;
523		- asmjs)
524		- basic_machine=asmjs-unknown
525		- ;;
526		- aux)
527		- basic_machine=m68k-apple
528		- os=-aux
529		- ;;
530		- balance)
531		- basic_machine=ns32k-sequent
532		- os=-dynix
533		- ;;
534		- blackfin)
535		- basic_machine=bfin-unknown
536		- os=-linux
	1036	+ cpu=x86_64
537	1037	;;
538	1038	blackfin-*)
539		- basic_machine=bfin-`echo "$basic_machine" \| sed 's/^[^-]*-//'`
540		- os=-linux
541		- ;;
542		- bluegene*)
543		- basic_machine=powerpc-ibm
544		- os=-cnk
	1039	+ cpu=bfin
	1040	+ basic_os=linux
545	1041	;;
546	1042	c54x-*)
547		- basic_machine=tic54x-`echo "$basic_machine" \| sed 's/^[^-]*-//'`
	1043	+ cpu=tic54x
548	1044	;;
549	1045	c55x-*)
550		- basic_machine=tic55x-`echo "$basic_machine" \| sed 's/^[^-]*-//'`
	1046	+ cpu=tic55x
551	1047	;;
552	1048	c6x-*)
553		- basic_machine=tic6x-`echo "$basic_machine" \| sed 's/^[^-]*-//'`
554		- ;;
555		- c90)
556		- basic_machine=c90-cray
557		- os=-unicos
558		- ;;
559		- cegcc)
560		- basic_machine=arm-unknown
561		- os=-cegcc
562		- ;;
563		- convex-c1)
564		- basic_machine=c1-convex
565		- os=-bsd
566		- ;;
567		- convex-c2)
568		- basic_machine=c2-convex
569		- os=-bsd
570		- ;;
571		- convex-c32)
572		- basic_machine=c32-convex
573		- os=-bsd
574		- ;;
575		- convex-c34)
576		- basic_machine=c34-convex
577		- os=-bsd
578		- ;;
579		- convex-c38)
580		- basic_machine=c38-convex
581		- os=-bsd
582		- ;;
583		- cray \| j90)
584		- basic_machine=j90-cray
585		- os=-unicos
586		- ;;
587		- craynv)
588		- basic_machine=craynv-cray
589		- os=-unicosmp
590		- ;;
591		- cr16 \| cr16-*)
592		- basic_machine=cr16-unknown
593		- os=-elf
594		- ;;
595		- crds \| unos)
596		- basic_machine=m68k-crds
597		- ;;
598		- crisv32 \| crisv32-* \| etraxfs*)
599		- basic_machine=crisv32-axis
600		- ;;
601		- cris \| cris-* \| etrax*)
602		- basic_machine=cris-axis
603		- ;;
604		- crx)
605		- basic_machine=crx-unknown
606		- os=-elf
607		- ;;
608		- da30 \| da30-*)
609		- basic_machine=m68k-da30
610		- ;;
611		- decstation \| decstation-3100 \| pmax \| pmax-* \| pmin \| dec3100 \| decstatn)
612		- basic_machine=mips-dec
613		- ;;
614		- decsystem10* \| dec10*)
615		- basic_machine=pdp10-dec
616		- os=-tops10
617		- ;;
618		- decsystem20* \| dec20*)
619		- basic_machine=pdp10-dec
620		- os=-tops20
621		- ;;
622		- delta \| 3300 \| motorola-3300 \| motorola-delta \
623		- \| 3300-motorola \| delta-motorola)
624		- basic_machine=m68k-motorola
625		- ;;
626		- delta88)
627		- basic_machine=m88k-motorola
628		- os=-sysv3
629		- ;;
630		- dicos)
631		- basic_machine=i686-pc
632		- os=-dicos
633		- ;;
634		- djgpp)
635		- basic_machine=i586-pc
636		- os=-msdosdjgpp
637		- ;;
638		- dpx20 \| dpx20-*)
639		- basic_machine=rs6000-bull
640		- os=-bosx
641		- ;;
642		- dpx2*)
643		- basic_machine=m68k-bull
644		- os=-sysv3
645		- ;;
646		- e500v[12])
647		- basic_machine=powerpc-unknown
648		- os=$os"spe"
	1049	+ cpu=tic6x
649	1050	;;
650	1051	e500v[12]-*)
651		- basic_machine=powerpc-`echo "$basic_machine" \| sed 's/^[^-]*-//'`
652		- os=$os"spe"
653		- ;;
654		- ebmon29k)
655		- basic_machine=a29k-amd
656		- os=-ebmon
657		- ;;
658		- elxsi)
659		- basic_machine=elxsi-elxsi
660		- os=-bsd
661		- ;;
662		- encore \| umax \| mmax)
663		- basic_machine=ns32k-encore
664		- ;;
665		- es1800 \| OSE68k \| ose68k \| ose \| OSE)
666		- basic_machine=m68k-ericsson
667		- os=-ose
668		- ;;
669		- fx2800)
670		- basic_machine=i860-alliant
671		- ;;
672		- genix)
673		- basic_machine=ns32k-ns
674		- ;;
675		- gmicro)
676		- basic_machine=tron-gmicro
677		- os=-sysv
678		- ;;
679		- go32)
680		- basic_machine=i386-pc
681		- os=-go32
682		- ;;
683		- h3050r* \| hiux*)
684		- basic_machine=hppa1.1-hitachi
685		- os=-hiuxwe2
686		- ;;
687		- h8300hms)
688		- basic_machine=h8300-hitachi
689		- os=-hms
690		- ;;
691		- h8300xray)
692		- basic_machine=h8300-hitachi
693		- os=-xray
694		- ;;
695		- h8500hms)
696		- basic_machine=h8500-hitachi
697		- os=-hms
698		- ;;
699		- harris)
700		- basic_machine=m88k-harris
701		- os=-sysv3
702		- ;;
703		- hp300-*)
704		- basic_machine=m68k-hp
705		- ;;
706		- hp300bsd)
707		- basic_machine=m68k-hp
708		- os=-bsd
709		- ;;
710		- hp300hpux)
711		- basic_machine=m68k-hp
712		- os=-hpux
713		- ;;
714		- hp3k9[0-9][0-9] \| hp9[0-9][0-9])
715		- basic_machine=hppa1.0-hp
716		- ;;
717		- hp9k2[0-9][0-9] \| hp9k31[0-9])
718		- basic_machine=m68000-hp
719		- ;;
720		- hp9k3[2-9][0-9])
721		- basic_machine=m68k-hp
722		- ;;
723		- hp9k6[0-9][0-9] \| hp6[0-9][0-9])
724		- basic_machine=hppa1.0-hp
725		- ;;
726		- hp9k7[0-79][0-9] \| hp7[0-79][0-9])
727		- basic_machine=hppa1.1-hp
728		- ;;
729		- hp9k78[0-9] \| hp78[0-9])
730		- # FIXME: really hppa2.0-hp
731		- basic_machine=hppa1.1-hp
732		- ;;
733		- hp9k8[67]1 \| hp8[67]1 \| hp9k80[24] \| hp80[24] \| hp9k8[78]9 \| hp8[78]9 \| hp9k893 \| hp893)
734		- # FIXME: really hppa2.0-hp
735		- basic_machine=hppa1.1-hp
736		- ;;
737		- hp9k8[0-9][13679] \| hp8[0-9][13679])
738		- basic_machine=hppa1.1-hp
739		- ;;
740		- hp9k8[0-9][0-9] \| hp8[0-9][0-9])
741		- basic_machine=hppa1.0-hp
742		- ;;
743		- hppaosf)
744		- basic_machine=hppa1.1-hp
745		- os=-osf
746		- ;;
747		- hppro)
748		- basic_machine=hppa1.1-hp
749		- os=-proelf
750		- ;;
751		- i370-ibm* \| ibm*)
752		- basic_machine=i370-ibm
753		- ;;
754		- i*86v32)
755		- basic_machine=`echo "$1" \| sed -e 's/86.*/86-pc/'`
756		- os=-sysv32
757		- ;;
758		- i86v4)
759		- basic_machine=`echo "$1" \| sed -e 's/86.*/86-pc/'`
760		- os=-sysv4
761		- ;;
762		- i*86v)
763		- basic_machine=`echo "$1" \| sed -e 's/86.*/86-pc/'`
764		- os=-sysv
765		- ;;
766		- i*86sol2)
767		- basic_machine=`echo "$1" \| sed -e 's/86.*/86-pc/'`
768		- os=-solaris2
769		- ;;
770		- i386mach)
771		- basic_machine=i386-mach
772		- os=-mach
773		- ;;
774		- vsta)
775		- basic_machine=i386-unknown
776		- os=-vsta
777		- ;;
778		- iris \| iris4d)
779		- basic_machine=mips-sgi
780		- case $os in
781		- -irix*)
782		- ;;
783		- *)
784		- os=-irix4
785		- ;;
786		- esac
787		- ;;
788		- isi68 \| isi)
789		- basic_machine=m68k-isi
790		- os=-sysv
791		- ;;
792		- leon-\|leon[3-9]-)
793		- basic_machine=sparc-`echo "$basic_machine" \| sed 's/-.*//'`
794		- ;;
795		- m68knommu)
796		- basic_machine=m68k-unknown
797		- os=-linux
798		- ;;
799		- m68knommu-*)
800		- basic_machine=m68k-`echo "$basic_machine" \| sed 's/^[^-]*-//'`
801		- os=-linux
802		- ;;
803		- magnum \| m3230)
804		- basic_machine=mips-mips
805		- os=-sysv
806		- ;;
807		- merlin)
808		- basic_machine=ns32k-utek
809		- os=-sysv
810		- ;;
811		- microblaze*)
812		- basic_machine=microblaze-xilinx
813		- ;;
814		- mingw64)
815		- basic_machine=x86_64-pc
816		- os=-mingw64
817		- ;;
818		- mingw32)
819		- basic_machine=i686-pc
820		- os=-mingw32
821		- ;;
822		- mingw32ce)
823		- basic_machine=arm-unknown
824		- os=-mingw32ce
825		- ;;
826		- miniframe)
827		- basic_machine=m68000-convergent
828		- ;;
829		- mint \| -mint[0-9] \| MiNT \| MiNT[0-9]*)
830		- basic_machine=m68k-atari
831		- os=-mint
	1052	+ cpu=powerpc
	1053	+ basic_os=${basic_os}"spe"
832	1054	;;
833	1055	mips3-)
834		- basic_machine=`echo "$basic_machine" \| sed -e 's/mips3/mips64/'`
835		- ;;
836		- mips3*)
837		- basic_machine=`echo "$basic_machine" \| sed -e 's/mips3/mips64/'`-unknown
838		- ;;
839		- monitor)
840		- basic_machine=m68k-rom68k
841		- os=-coff
842		- ;;
843		- morphos)
844		- basic_machine=powerpc-unknown
845		- os=-morphos
846		- ;;
847		- moxiebox)
848		- basic_machine=moxie-unknown
849		- os=-moxiebox
850		- ;;
851		- msdos)
852		- basic_machine=i386-pc
853		- os=-msdos
	1056	+ cpu=mips64
854	1057	;;
855	1058	ms1-*)
856		- basic_machine=`echo "$basic_machine" \| sed -e 's/ms1-/mt-/'`
857		- ;;
858		- msys)
859		- basic_machine=i686-pc
860		- os=-msys
861		- ;;
862		- mvs)
863		- basic_machine=i370-ibm
864		- os=-mvs
865		- ;;
866		- nacl)
867		- basic_machine=le32-unknown
868		- os=-nacl
869		- ;;
870		- ncr3000)
871		- basic_machine=i486-ncr
872		- os=-sysv4
873		- ;;
874		- netbsd386)
875		- basic_machine=i386-unknown
876		- os=-netbsd
877		- ;;
878		- netwinder)
879		- basic_machine=armv4l-rebel
880		- os=-linux
881		- ;;
882		- news \| news700 \| news800 \| news900)
883		- basic_machine=m68k-sony
884		- os=-newsos
885		- ;;
886		- news1000)
887		- basic_machine=m68030-sony
888		- os=-newsos
889		- ;;
890		- news-3600 \| risc-news)
891		- basic_machine=mips-sony
892		- os=-newsos
893		- ;;
894		- necv70)
895		- basic_machine=v70-nec
896		- os=-sysv
897		- ;;
898		- next \| m*-next)
899		- basic_machine=m68k-next
900		- case $os in
901		- -nextstep* )
902		- ;;
903		- -ns2*)
904		- os=-nextstep2
905		- ;;
906		- *)
907		- os=-nextstep3
908		- ;;
909		- esac
910		- ;;
911		- nh3000)
912		- basic_machine=m68k-harris
913		- os=-cxux
	1059	+ cpu=mt
914	1060	;;
915		- nh[45]000)
916		- basic_machine=m88k-harris
917		- os=-cxux
918		- ;;
919		- nindy960)
920		- basic_machine=i960-intel
921		- os=-nindy
922		- ;;
923		- mon960)
924		- basic_machine=i960-intel
925		- os=-mon960
926		- ;;
927		- nonstopux)
928		- basic_machine=mips-compaq
929		- os=-nonstopux
930		- ;;
931		- np1)
932		- basic_machine=np1-gould
933		- ;;
934		- neo-tandem)
935		- basic_machine=neo-tandem
936		- ;;
937		- nse-tandem)
938		- basic_machine=nse-tandem
939		- ;;
940		- nsr-tandem)
941		- basic_machine=nsr-tandem
942		- ;;
943		- nsv-tandem)
944		- basic_machine=nsv-tandem
	1061	+ m68knommu-*)
	1062	+ cpu=m68k
	1063	+ basic_os=linux
945	1064	;;
946		- nsx-tandem)
947		- basic_machine=nsx-tandem
948		- ;;
949		- op50n-* \| op60c-*)
950		- basic_machine=hppa1.1-oki
951		- os=-proelf
952		- ;;
953		- openrisc \| openrisc-*)
954		- basic_machine=or32-unknown
955		- ;;
956		- os400)
957		- basic_machine=powerpc-ibm
958		- os=-os400
	1065	+ m9s12z-* \| m68hcs12z-* \| hcs12z-* \| s12z-*)
	1066	+ cpu=s12z
959	1067	;;
960		- OSE68000 \| ose68000)
961		- basic_machine=m68000-ericsson
962		- os=-ose
963		- ;;
964		- os68k)
965		- basic_machine=m68k-none
966		- os=-os68k
967		- ;;
968		- pa-hitachi)
969		- basic_machine=hppa1.1-hitachi
970		- os=-hiuxwe2
971		- ;;
972		- paragon)
973		- basic_machine=i860-intel
974		- os=-osf
975		- ;;
976		- parisc)
977		- basic_machine=hppa-unknown
978		- os=-linux
	1068	+ openrisc-*)
	1069	+ cpu=or32
979	1070	;;
980	1071	parisc-*)
981		- basic_machine=hppa-`echo "$basic_machine" \| sed 's/^[^-]*-//'`
982		- os=-linux
983		- ;;
984		- pbd)
985		- basic_machine=sparc-tti
986		- ;;
987		- pbb)
988		- basic_machine=m68k-tti
989		- ;;
990		- pc532 \| pc532-*)
991		- basic_machine=ns32k-pc532
992		- ;;
993		- pc98)
994		- basic_machine=i386-pc
995		- ;;
996		- pc98-*)
997		- basic_machine=i386-`echo "$basic_machine" \| sed 's/^[^-]*-//'`
998		- ;;
999		- pentium \| p5 \| k5 \| k6 \| nexgen \| viac3)
1000		- basic_machine=i586-pc
1001		- ;;
1002		- pentiumpro \| p6 \| 6x86 \| athlon \| athlon_*)
1003		- basic_machine=i686-pc
1004		- ;;
1005		- pentiumii \| pentium2 \| pentiumiii \| pentium3)
1006		- basic_machine=i686-pc
1007		- ;;
1008		- pentium4)
1009		- basic_machine=i786-pc
	1072	+ cpu=hppa
	1073	+ basic_os=linux
1010	1074	;;
1011	1075	pentium-* \| p5-* \| k5-* \| k6-* \| nexgen-* \| viac3-*)
1012		- basic_machine=i586-`echo "$basic_machine" \| sed 's/^[^-]*-//'`
	1076	+ cpu=i586
1013	1077	;;
1014		- pentiumpro-* \| p6-* \| 6x86-* \| athlon-*)
1015		- basic_machine=i686-`echo "$basic_machine" \| sed 's/^[^-]*-//'`
	1078	+ pentiumpro-* \| p6-* \| 6x86-* \| athlon-* \| athalon_-)
	1079	+ cpu=i686
1016	1080	;;
1017	1081	pentiumii-* \| pentium2-* \| pentiumiii-* \| pentium3-*)
1018		- basic_machine=i686-`echo "$basic_machine" \| sed 's/^[^-]*-//'`
	1082	+ cpu=i686
1019	1083	;;
1020	1084	pentium4-*)
1021		- basic_machine=i786-`echo "$basic_machine" \| sed 's/^[^-]*-//'`
	1085	+ cpu=i786
1022	1086	;;
1023		- pn)
1024		- basic_machine=pn-gould
1025		- ;;
1026		- power) basic_machine=power-ibm
1027		- ;;
1028		- ppc \| ppcbe) basic_machine=powerpc-unknown
	1087	+ pc98-*)
	1088	+ cpu=i386
1029	1089	;;
1030	1090	ppc-* \| ppcbe-*)
1031		- basic_machine=powerpc-`echo "$basic_machine" \| sed 's/^[^-]*-//'`
1032		- ;;
1033		- ppcle \| powerpclittle)
1034		- basic_machine=powerpcle-unknown
	1091	+ cpu=powerpc
1035	1092	;;
1036	1093	ppcle-* \| powerpclittle-*)
1037		- basic_machine=powerpcle-`echo "$basic_machine" \| sed 's/^[^-]*-//'`
1038		- ;;
1039		- ppc64) basic_machine=powerpc64-unknown
	1094	+ cpu=powerpcle
1040	1095	;;
1041		- ppc64-) basic_machine=powerpc64-`echo "$basic_machine" \| sed 's/^[^-]-//'`
1042		- ;;
1043		- ppc64le \| powerpc64little)
1044		- basic_machine=powerpc64le-unknown
	1096	+ ppc64-*)
	1097	+ cpu=powerpc64
1045	1098	;;
1046	1099	ppc64le-* \| powerpc64little-*)
1047		- basic_machine=powerpc64le-`echo "$basic_machine" \| sed 's/^[^-]*-//'`
1048		- ;;
1049		- ps2)
1050		- basic_machine=i386-ibm
1051		- ;;
1052		- pw32)
1053		- basic_machine=i586-unknown
1054		- os=-pw32
1055		- ;;
1056		- rdos \| rdos64)
1057		- basic_machine=x86_64-pc
1058		- os=-rdos
1059		- ;;
1060		- rdos32)
1061		- basic_machine=i386-pc
1062		- os=-rdos
1063		- ;;
1064		- rom68k)
1065		- basic_machine=m68k-rom68k
1066		- os=-coff
1067		- ;;
1068		- rm[46]00)
1069		- basic_machine=mips-siemens
1070		- ;;
1071		- rtpc \| rtpc-*)
1072		- basic_machine=romp-ibm
1073		- ;;
1074		- s390 \| s390-*)
1075		- basic_machine=s390-ibm
1076		- ;;
1077		- s390x \| s390x-*)
1078		- basic_machine=s390x-ibm
1079		- ;;
1080		- sa29200)
1081		- basic_machine=a29k-amd
1082		- os=-udi
	1100	+ cpu=powerpc64le
1083	1101	;;
1084		- sb1)
1085		- basic_machine=mipsisa64sb1-unknown
1086		- ;;
1087		- sb1el)
1088		- basic_machine=mipsisa64sb1el-unknown
1089		- ;;
1090		- sde)
1091		- basic_machine=mipsisa32-sde
1092		- os=-elf
1093		- ;;
1094		- sei)
1095		- basic_machine=mips-sei
1096		- os=-seiux
1097		- ;;
1098		- sequent)
1099		- basic_machine=i386-sequent
	1102	+ sb1-*)
	1103	+ cpu=mipsisa64sb1
1100	1104	;;
1101		- sh5el)
1102		- basic_machine=sh5le-unknown
1103		- ;;
1104		- simso-wrs)
1105		- basic_machine=sparclite-wrs
1106		- os=-vxworks
	1105	+ sb1el-*)
	1106	+ cpu=mipsisa64sb1el
1107	1107	;;
1108		- sps7)
1109		- basic_machine=m68k-bull
1110		- os=-sysv2
	1108	+ sh5e[lb]-*)
	1109	+ cpu=`echo "$cpu" \| sed 's/^$sh.$e$.$$/\1\2e/'`
1111	1110	;;
1112		- spur)
1113		- basic_machine=spur-unknown
1114		- ;;
1115		- st2000)
1116		- basic_machine=m68k-tandem
1117		- ;;
1118		- stratus)
1119		- basic_machine=i860-stratus
1120		- os=-sysv4
	1111	+ spur-*)
	1112	+ cpu=spur
1121	1113	;;
1122	1114	strongarm-* \| thumb-*)
1123		- basic_machine=arm-`echo "$basic_machine" \| sed 's/^[^-]*-//'`
1124		- ;;
1125		- sun2)
1126		- basic_machine=m68000-sun
1127		- ;;
1128		- sun2os3)
1129		- basic_machine=m68000-sun
1130		- os=-sunos3
1131		- ;;
1132		- sun2os4)
1133		- basic_machine=m68000-sun
1134		- os=-sunos4
1135		- ;;
1136		- sun3os3)
1137		- basic_machine=m68k-sun
1138		- os=-sunos3
1139		- ;;
1140		- sun3os4)
1141		- basic_machine=m68k-sun
1142		- os=-sunos4
1143		- ;;
1144		- sun4os3)
1145		- basic_machine=sparc-sun
1146		- os=-sunos3
1147		- ;;
1148		- sun4os4)
1149		- basic_machine=sparc-sun
1150		- os=-sunos4
1151		- ;;
1152		- sun4sol2)
1153		- basic_machine=sparc-sun
1154		- os=-solaris2
1155		- ;;
1156		- sun3 \| sun3-*)
1157		- basic_machine=m68k-sun
1158		- ;;
1159		- sun4)
1160		- basic_machine=sparc-sun
1161		- ;;
1162		- sun386 \| sun386i \| roadrunner)
1163		- basic_machine=i386-sun
1164		- ;;
1165		- sv1)
1166		- basic_machine=sv1-cray
1167		- os=-unicos
1168		- ;;
1169		- symmetry)
1170		- basic_machine=i386-sequent
1171		- os=-dynix
1172		- ;;
1173		- t3e)
1174		- basic_machine=alphaev5-cray
1175		- os=-unicos
1176		- ;;
1177		- t90)
1178		- basic_machine=t90-cray
1179		- os=-unicos
1180		- ;;
1181		- tile*)
1182		- basic_machine=$basic_machine-unknown
1183		- os=-linux-gnu
1184		- ;;
1185		- tx39)
1186		- basic_machine=mipstx39-unknown
	1115	+ cpu=arm
1187	1116	;;
1188		- tx39el)
1189		- basic_machine=mipstx39el-unknown
1190		- ;;
1191		- toad1)
1192		- basic_machine=pdp10-xkl
1193		- os=-tops20
1194		- ;;
1195		- tower \| tower-32)
1196		- basic_machine=m68k-ncr
1197		- ;;
1198		- tpf)
1199		- basic_machine=s390x-ibm
1200		- os=-tpf
1201		- ;;
1202		- udi29k)
1203		- basic_machine=a29k-amd
1204		- os=-udi
1205		- ;;
1206		- ultra3)
1207		- basic_machine=a29k-nyu
1208		- os=-sym1
1209		- ;;
1210		- v810 \| necv810)
1211		- basic_machine=v810-nec
1212		- os=-none
1213		- ;;
1214		- vaxv)
1215		- basic_machine=vax-dec
1216		- os=-sysv
	1117	+ tx39-*)
	1118	+ cpu=mipstx39
1217	1119	;;
1218		- vms)
1219		- basic_machine=vax-dec
1220		- os=-vms
1221		- ;;
1222		- vpp\|vx\|vx-)
1223		- basic_machine=f301-fujitsu
1224		- ;;
1225		- vxworks960)
1226		- basic_machine=i960-wrs
1227		- os=-vxworks
1228		- ;;
1229		- vxworks68)
1230		- basic_machine=m68k-wrs
1231		- os=-vxworks
	1120	+ tx39el-*)
	1121	+ cpu=mipstx39el
1232	1122	;;
1233		- vxworks29k)
1234		- basic_machine=a29k-wrs
1235		- os=-vxworks
1236		- ;;
1237		- w65*)
1238		- basic_machine=w65-wdc
1239		- os=-none
1240		- ;;
1241		- w89k-*)
1242		- basic_machine=hppa1.1-winbond
1243		- os=-proelf
1244		- ;;
1245		- x64)
1246		- basic_machine=x86_64-pc
1247		- ;;
1248		- xbox)
1249		- basic_machine=i686-pc
1250		- os=-mingw32
1251		- ;;
1252		- xps \| xps100)
1253		- basic_machine=xps100-honeywell
	1123	+ x64-*)
	1124	+ cpu=x86_64
1254	1125	;;
1255	1126	xscale-* \| xscalee[bl]-*)
1256		- basic_machine=`echo "$basic_machine" \| sed 's/^xscale/arm/'`
	1127	+ cpu=`echo "$cpu" \| sed 's/^xscale/arm/'`
1257	1128	;;
1258		- ymp)
1259		- basic_machine=ymp-cray
1260		- os=-unicos
1261		- ;;
1262		- none)
1263		- basic_machine=none-none
1264		- os=-none
	1129	+ arm64-* \| aarch64le-*)
	1130	+ cpu=aarch64
1265	1131	;;
1266	1132
1267		-# Here we handle the default manufacturer of certain CPU types. It is in
1268		-# some cases the only manufacturer, in others, it is the most popular.
1269		- w89k)
1270		- basic_machine=hppa1.1-winbond
1271		- ;;
1272		- op50n)
1273		- basic_machine=hppa1.1-oki
1274		- ;;
1275		- op60c)
1276		- basic_machine=hppa1.1-oki
1277		- ;;
1278		- romp)
1279		- basic_machine=romp-ibm
1280		- ;;
1281		- mmix)
1282		- basic_machine=mmix-knuth
1283		- ;;
1284		- rs6000)
1285		- basic_machine=rs6000-ibm
1286		- ;;
1287		- vax)
1288		- basic_machine=vax-dec
1289		- ;;
1290		- pdp11)
1291		- basic_machine=pdp11-dec
	1133	+ # Recognize the canonical CPU Types that limit and/or modify the
	1134	+ # company names they are paired with.
	1135	+ cr16-*)
	1136	+ basic_os=${basic_os:-elf}
1292	1137	;;
1293		- we32k)
1294		- basic_machine=we32k-att
1295		- ;;
1296		- sh[1234] \| sh[24]a \| sh[24]aeb \| sh[34]eb \| sh[1234]le \| sh[23]ele)
1297		- basic_machine=sh-unknown
1298		- ;;
1299		- cydra)
1300		- basic_machine=cydra-cydrome
1301		- ;;
1302		- orion)
1303		- basic_machine=orion-highlevel
	1138	+ crisv32-* \| etraxfs-)
	1139	+ cpu=crisv32
	1140	+ vendor=axis
1304	1141	;;
1305		- orion105)
1306		- basic_machine=clipper-highlevel
1307		- ;;
1308		- mac \| mpw \| mac-mpw)
1309		- basic_machine=m68k-apple
	1142	+ cris-* \| etrax-)
	1143	+ cpu=cris
	1144	+ vendor=axis
1310	1145	;;
1311		- pmac \| pmac-mpw)
1312		- basic_machine=powerpc-apple
	1146	+ crx-*)
	1147	+ basic_os=${basic_os:-elf}
1313	1148	;;
1314		- *-unknown)
1315		- # Make sure to match an already-canonicalized machine name.
	1149	+ neo-tandem)
	1150	+ cpu=neo
	1151	+ vendor=tandem
1316	1152	;;
	1153	+ nse-tandem)
	1154	+ cpu=nse
	1155	+ vendor=tandem
	1156	+ ;;
	1157	+ nsr-tandem)
	1158	+ cpu=nsr
	1159	+ vendor=tandem
	1160	+ ;;
	1161	+ nsv-tandem)
	1162	+ cpu=nsv
	1163	+ vendor=tandem
	1164	+ ;;
	1165	+ nsx-tandem)
	1166	+ cpu=nsx
	1167	+ vendor=tandem
	1168	+ ;;
	1169	+ mipsallegrexel-sony)
	1170	+ cpu=mipsallegrexel
	1171	+ vendor=sony
	1172	+ ;;
	1173	+ tile-)
	1174	+ basic_os=${basic_os:-linux-gnu}
	1175	+ ;;
	1176	+
1317	1177	*)
1318		- echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2
1319		- exit 1
	1178	+ # Recognize the canonical CPU types that are allowed with any
	1179	+ # company name.
	1180	+ case $cpu in
	1181	+ 1750a \| 580 \
	1182	+ \| a29k \
	1183	+ \| aarch64 \| aarch64_be \
	1184	+ \| abacus \
	1185	+ \| alpha \| alphaev[4-8] \| alphaev56 \| alphaev6[78] \
	1186	+ \| alpha64 \| alpha64ev[4-8] \| alpha64ev56 \| alpha64ev6[78] \
	1187	+ \| alphapca5[67] \| alpha64pca5[67] \
	1188	+ \| am33_2.0 \
	1189	+ \| amdgcn \
	1190	+ \| arc \| arceb \| arc32 \| arc64 \
	1191	+ \| arm \| arm[lb]e \| arme[lb] \| armv* \
	1192	+ \| avr \| avr32 \
	1193	+ \| asmjs \
	1194	+ \| ba \
	1195	+ \| be32 \| be64 \
	1196	+ \| bfin \| bpf \| bs2000 \
	1197	+ \| c[123]* \| c30 \| [cjt]90 \| c4x \
	1198	+ \| c8051 \| clipper \| craynv \| csky \| cydra \
	1199	+ \| d10v \| d30v \| dlx \| dsp16xx \
	1200	+ \| e2k \| elxsi \| epiphany \
	1201	+ \| f30[01] \| f700 \| fido \| fr30 \| frv \| ft32 \| fx80 \
	1202	+ \| h8300 \| h8500 \
	1203	+ \| hppa \| hppa1.[01] \| hppa2.0 \| hppa2.0[nw] \| hppa64 \
	1204	+ \| hexagon \
	1205	+ \| i370 \| i*86 \| i860 \| i960 \| ia16 \| ia64 \
	1206	+ \| ip2k \| iq2000 \
	1207	+ \| k1om \
	1208	+ \| le32 \| le64 \
	1209	+ \| lm32 \
	1210	+ \| loongarch32 \| loongarch64 \| loongarchx32 \
	1211	+ \| m32c \| m32r \| m32rle \
	1212	+ \| m5200 \| m68000 \| m680[012346]0 \| m68360 \| m683?2 \| m68k \
	1213	+ \| m6811 \| m68hc11 \| m6812 \| m68hc12 \| m68hcs12x \
	1214	+ \| m88110 \| m88k \| maxq \| mb \| mcore \| mep \| metag \
	1215	+ \| microblaze \| microblazeel \
	1216	+ \| mips \| mipsbe \| mipseb \| mipsel \| mipsle \
	1217	+ \| mips16 \
	1218	+ \| mips64 \| mips64eb \| mips64el \
	1219	+ \| mips64octeon \| mips64octeonel \
	1220	+ \| mips64orion \| mips64orionel \
	1221	+ \| mips64r5900 \| mips64r5900el \
	1222	+ \| mips64vr \| mips64vrel \
	1223	+ \| mips64vr4100 \| mips64vr4100el \
	1224	+ \| mips64vr4300 \| mips64vr4300el \
	1225	+ \| mips64vr5000 \| mips64vr5000el \
	1226	+ \| mips64vr5900 \| mips64vr5900el \
	1227	+ \| mipsisa32 \| mipsisa32el \
	1228	+ \| mipsisa32r2 \| mipsisa32r2el \
	1229	+ \| mipsisa32r3 \| mipsisa32r3el \
	1230	+ \| mipsisa32r5 \| mipsisa32r5el \
	1231	+ \| mipsisa32r6 \| mipsisa32r6el \
	1232	+ \| mipsisa64 \| mipsisa64el \
	1233	+ \| mipsisa64r2 \| mipsisa64r2el \
	1234	+ \| mipsisa64r3 \| mipsisa64r3el \
	1235	+ \| mipsisa64r5 \| mipsisa64r5el \
	1236	+ \| mipsisa64r6 \| mipsisa64r6el \
	1237	+ \| mipsisa64sb1 \| mipsisa64sb1el \
	1238	+ \| mipsisa64sr71k \| mipsisa64sr71kel \
	1239	+ \| mipsr5900 \| mipsr5900el \
	1240	+ \| mipstx39 \| mipstx39el \
	1241	+ \| mmix \
	1242	+ \| mn10200 \| mn10300 \
	1243	+ \| moxie \
	1244	+ \| mt \
	1245	+ \| msp430 \
	1246	+ \| nds32 \| nds32le \| nds32be \
	1247	+ \| nfp \
	1248	+ \| nios \| nios2 \| nios2eb \| nios2el \
	1249	+ \| none \| np1 \| ns16k \| ns32k \| nvptx \
	1250	+ \| open8 \
	1251	+ \| or1k* \
	1252	+ \| or32 \
	1253	+ \| orion \
	1254	+ \| picochip \
	1255	+ \| pdp10 \| pdp11 \| pj \| pjl \| pn \| power \
	1256	+ \| powerpc \| powerpc64 \| powerpc64le \| powerpcle \| powerpcspe \
	1257	+ \| pru \
	1258	+ \| pyramid \
	1259	+ \| riscv \| riscv32 \| riscv32be \| riscv64 \| riscv64be \
	1260	+ \| rl78 \| romp \| rs6000 \| rx \
	1261	+ \| s390 \| s390x \
	1262	+ \| score \
	1263	+ \| sh \| shl \
	1264	+ \| sh[1234] \| sh[24]a \| sh[24]ae[lb] \| sh[23]e \| she[lb] \| sh[lb]e \
	1265	+ \| sh[1234]e[lb] \| sh[12345][lb]e \| sh[23]ele \| sh64 \| sh64le \
	1266	+ \| sparc \| sparc64 \| sparc64b \| sparc64v \| sparc86x \| sparclet \
	1267	+ \| sparclite \
	1268	+ \| sparcv8 \| sparcv9 \| sparcv9b \| sparcv9v \| sv1 \| sx* \
	1269	+ \| spu \
	1270	+ \| tahoe \
	1271	+ \| thumbv7* \
	1272	+ \| tic30 \| tic4x \| tic54x \| tic55x \| tic6x \| tic80 \
	1273	+ \| tron \
	1274	+ \| ubicom32 \
	1275	+ \| v70 \| v850 \| v850e \| v850e1 \| v850es \| v850e2 \| v850e2v3 \
	1276	+ \| vax \
	1277	+ \| visium \
	1278	+ \| w65 \
	1279	+ \| wasm32 \| wasm64 \
	1280	+ \| we32k \
	1281	+ \| x86 \| x86_64 \| xc16x \| xgate \| xps100 \
	1282	+ \| xstormy16 \| xtensa* \
	1283	+ \| ymp \
	1284	+ \| z8k \| z80)
	1285	+ ;;
	1286	+
	1287	+ *)
	1288	+ echo Invalid configuration \`"$1"\': machine \`"$cpu-$vendor"\' not recognized 1>&2
	1289	+ exit 1
	1290	+ ;;
	1291	+ esac
1320	1292	;;
1321	1293	esac
1322	1294
1323	1295	# Here we canonicalize certain aliases for manufacturers.
1324		-case $basic_machine in
1325		- -digital)
1326		- basic_machine=`echo "$basic_machine" \| sed 's/digital.*/dec/'`
	1296	+case $vendor in
	1297	+ digital*)
	1298	+ vendor=dec
1327	1299	;;
1328		- -commodore)
1329		- basic_machine=`echo "$basic_machine" \| sed 's/commodore.*/cbm/'`
	1300	+ commodore*)
	1301	+ vendor=cbm
1330	1302	;;
1331	1303	*)
1332	1304	;;

		@@ -1334,203 +1306,215 @@
1334	1306
1335	1307	# Decode manufacturer-specific aliases for certain operating systems.
1336	1308
1337		-if [ x"$os" != x"" ]
	1309	+if test x$basic_os != x
1338	1310	then
	1311	+
	1312	+# First recognize some ad-hoc cases, or perhaps split kernel-os, or else just
	1313	+# set os.
	1314	+case $basic_os in
	1315	+ gnu/linux*)
	1316	+ kernel=linux
	1317	+ os=`echo "$basic_os" \| sed -e 's\|gnu/linux\|gnu\|'`
	1318	+ ;;
	1319	+ os2-emx)
	1320	+ kernel=os2
	1321	+ os=`echo "$basic_os" \| sed -e 's\|os2-emx\|emx\|'`
	1322	+ ;;
	1323	+ nto-qnx*)
	1324	+ kernel=nto
	1325	+ os=`echo "$basic_os" \| sed -e 's\|nto-qnx\|qnx\|'`
	1326	+ ;;
	1327	+ -)
	1328	+ # shellcheck disable=SC2162
	1329	+ saved_IFS=$IFS
	1330	+ IFS="-" read kernel os <<EOF
	1331	+$basic_os
	1332	+EOF
	1333	+ IFS=$saved_IFS
	1334	+ ;;
	1335	+ # Default OS when just kernel was specified
	1336	+ nto*)
	1337	+ kernel=nto
	1338	+ os=`echo "$basic_os" \| sed -e 's\|nto\|qnx\|'`
	1339	+ ;;
	1340	+ linux*)
	1341	+ kernel=linux
	1342	+ os=`echo "$basic_os" \| sed -e 's\|linux\|gnu\|'`
	1343	+ ;;
	1344	+ *)
	1345	+ kernel=
	1346	+ os=$basic_os
	1347	+ ;;
	1348	+esac
	1349	+
	1350	+# Now, normalize the OS (knowing we just have one component, it's not a kernel,
	1351	+# etc.)
1339	1352	case $os in
1340	1353	# First match some system type aliases that might get confused
1341	1354	# with valid system types.
1342		- # -solaris* is a basic system type, with this one exception.
1343		- -auroraux)
1344		- os=-auroraux
1345		- ;;
1346		- -solaris1 \| -solaris1.*)
1347		- os=`echo $os \| sed -e 's\|solaris1\|sunos4\|'`
	1355	+ # solaris* is a basic system type, with this one exception.
	1356	+ auroraux)
	1357	+ os=auroraux
1348	1358	;;
1349		- -solaris)
1350		- os=-solaris2
	1359	+ bluegene*)
	1360	+ os=cnk
1351	1361	;;
1352		- -unixware*)
1353		- os=-sysv4.2uw
	1362	+ solaris1 \| solaris1.*)
	1363	+ os=`echo "$os" \| sed -e 's\|solaris1\|sunos4\|'`
1354	1364	;;
1355		- -gnu/linux*)
1356		- os=`echo $os \| sed -e 's\|gnu/linux\|linux-gnu\|'`
	1365	+ solaris)
	1366	+ os=solaris2
	1367	+ ;;
	1368	+ unixware*)
	1369	+ os=sysv4.2uw
1357	1370	;;
1358	1371	# es1800 is here to avoid being matched by es* (a different OS)
1359		- -es1800*)
1360		- os=-ose
	1372	+ es1800*)
	1373	+ os=ose
1361	1374	;;
1362		- # Now accept the basic system types.
1363		- # The portable systems comes first.
1364		- # Each alternative MUST end in a * to match a version number.
1365		- # -sysv* is not here because it comes later, after sysvr4.
1366		- -gnu* \| -bsd* \| -mach* \| -minix* \| -genix* \| -ultrix* \| -irix* \
1367		- \| -vms \| -sco* \| -esix* \| -isc* \| -aix* \| -cnk* \| -sunos \| -sunos[34]*\
1368		- \| -hpux* \| -unos* \| -osf* \| -luna* \| -dgux* \| -auroraux* \| -solaris* \
1369		- \| -sym* \| -kopensolaris* \| -plan9* \
1370		- \| -amigaos* \| -amigados* \| -msdos* \| -newsos* \| -unicos* \| -aof* \
1371		- \| -aos* \| -aros* \| -cloudabi* \| -sortix* \
1372		- \| -nindy* \| -vxsim* \| -vxworks* \| -ebmon* \| -hms* \| -mvs* \
1373		- \| -clix* \| -riscos* \| -uniplus* \| -iris* \| -rtu* \| -xenix* \
1374		- \| -hiux* \| -knetbsd* \| -mirbsd* \| -netbsd* \
1375		- \| -bitrig* \| -openbsd* \| -solidbsd* \| -libertybsd* \
1376		- \| -ekkobsd* \| -kfreebsd* \| -freebsd* \| -riscix* \| -lynxos* \
1377		- \| -bosx* \| -nextstep* \| -cxux* \| -aout* \| -elf* \| -oabi* \
1378		- \| -ptx* \| -coff* \| -ecoff* \| -winnt* \| -domain* \| -vsta* \
1379		- \| -udi* \| -eabi* \| -lites* \| -ieee* \| -go32* \| -aux* \
1380		- \| -chorusos* \| -chorusrdb* \| -cegcc* \| -glidix* \
1381		- \| -cygwin* \| -msys* \| -pe* \| -psos* \| -moss* \| -proelf* \| -rtems* \
1382		- \| -midipix* \| -mingw32* \| -mingw64* \| -linux-gnu* \| -linux-android* \
1383		- \| -linux-newlib* \| -linux-musl* \| -linux-uclibc* \
1384		- \| -uxpv* \| -beos* \| -mpeix* \| -udk* \| -moxiebox* \
1385		- \| -interix* \| -uwin* \| -mks* \| -rhapsody* \| -darwin* \
1386		- \| -openstep* \| -oskit* \| -conix* \| -pw32* \| -nonstopux* \
1387		- \| -storm-chaos* \| -tops10* \| -tenex* \| -tops20* \| -its* \
1388		- \| -os2* \| -vos* \| -palmos* \| -uclinux* \| -nucleus* \
1389		- \| -morphos* \| -superux* \| -rtmk* \| -windiss* \
1390		- \| -powermax* \| -dnix* \| -nx6 \| -nx7 \| -sei* \| -dragonfly* \
1391		- \| -skyos* \| -haiku* \| -rdos* \| -toppers* \| -drops* \| -es* \
1392		- \| -onefs* \| -tirtos* \| -phoenix* \| -fuchsia* \| -redox* \| -bme* \
1393		- \| -midnightbsd*)
1394		- # Remember, each alternative MUST END IN *, to match a version number.
	1375	+ # Some version numbers need modification
	1376	+ chorusos*)
	1377	+ os=chorusos
1395	1378	;;
1396		- -qnx*)
1397		- case $basic_machine in
1398		- x86-* \| i86-)
	1379	+ isc)
	1380	+ os=isc2.2
	1381	+ ;;
	1382	+ sco6)
	1383	+ os=sco5v6
	1384	+ ;;
	1385	+ sco5)
	1386	+ os=sco3.2v5
	1387	+ ;;
	1388	+ sco4)
	1389	+ os=sco3.2v4
	1390	+ ;;
	1391	+ sco3.2.[4-9]*)
	1392	+ os=`echo "$os" \| sed -e 's/sco3.2./sco3.2v/'`
	1393	+ ;;
	1394	+ scov \| scout)
	1395	+ # Don't match below
	1396	+ ;;
	1397	+ sco*)
	1398	+ os=sco3.2v2
	1399	+ ;;
	1400	+ psos*)
	1401	+ os=psos
	1402	+ ;;
	1403	+ qnx*)
	1404	+ os=qnx
	1405	+ ;;
	1406	+ hiux*)
	1407	+ os=hiuxwe2
	1408	+ ;;
	1409	+ lynx*178)
	1410	+ os=lynxos178
	1411	+ ;;
	1412	+ lynx*5)
	1413	+ os=lynxos5
	1414	+ ;;
	1415	+ lynxos*)
	1416	+ # don't get caught up in next wildcard
	1417	+ ;;
	1418	+ lynx*)
	1419	+ os=lynxos
	1420	+ ;;
	1421	+ mac[0-9]*)
	1422	+ os=`echo "$os" \| sed -e 's\|mac\|macos\|'`
	1423	+ ;;
	1424	+ opened*)
	1425	+ os=openedition
	1426	+ ;;
	1427	+ os400*)
	1428	+ os=os400
	1429	+ ;;
	1430	+ sunos5*)
	1431	+ os=`echo "$os" \| sed -e 's\|sunos5\|solaris2\|'`
	1432	+ ;;
	1433	+ sunos6*)
	1434	+ os=`echo "$os" \| sed -e 's\|sunos6\|solaris3\|'`
	1435	+ ;;
	1436	+ wince*)
	1437	+ os=wince
	1438	+ ;;
	1439	+ utek*)
	1440	+ os=bsd
	1441	+ ;;
	1442	+ dynix*)
	1443	+ os=bsd
	1444	+ ;;
	1445	+ acis*)
	1446	+ os=aos
	1447	+ ;;
	1448	+ atheos*)
	1449	+ os=atheos
	1450	+ ;;
	1451	+ syllable*)
	1452	+ os=syllable
	1453	+ ;;
	1454	+ 386bsd)
	1455	+ os=bsd
	1456	+ ;;
	1457	+ ctix* \| uts*)
	1458	+ os=sysv
	1459	+ ;;
	1460	+ nova*)
	1461	+ os=rtmk-nova
	1462	+ ;;
	1463	+ ns2)
	1464	+ os=nextstep2
	1465	+ ;;
	1466	+ # Preserve the version number of sinix5.
	1467	+ sinix5.*)
	1468	+ os=`echo "$os" \| sed -e 's\|sinix\|sysv\|'`
	1469	+ ;;
	1470	+ sinix*)
	1471	+ os=sysv4
	1472	+ ;;
	1473	+ tpf*)
	1474	+ os=tpf
	1475	+ ;;
	1476	+ triton*)
	1477	+ os=sysv3
	1478	+ ;;
	1479	+ oss*)
	1480	+ os=sysv3
	1481	+ ;;
	1482	+ svr4*)
	1483	+ os=sysv4
	1484	+ ;;
	1485	+ svr3)
	1486	+ os=sysv3
	1487	+ ;;
	1488	+ sysvr4)
	1489	+ os=sysv4
	1490	+ ;;
	1491	+ ose*)
	1492	+ os=ose
	1493	+ ;;
	1494	+ mint \| mint[0-9] \| MiNT \| MiNT[0-9])
	1495	+ os=mint
	1496	+ ;;
	1497	+ dicos*)
	1498	+ os=dicos
	1499	+ ;;
	1500	+ pikeos*)
	1501	+ # Until real need of OS specific support for
	1502	+ # particular features comes up, bare metal
	1503	+ # configurations are quite functional.
	1504	+ case $cpu in
	1505	+ arm*)
	1506	+ os=eabi
1399	1507	;;
1400	1508	*)
1401		- os=-nto$os
	1509	+ os=elf
1402	1510	;;
1403	1511	esac
1404	1512	;;
1405		- -nto-qnx*)
1406		- ;;
1407		- -nto*)
1408		- os=`echo $os \| sed -e 's\|nto\|nto-qnx\|'`
1409		- ;;
1410		- -sim \| -xray \| -os68k* \| -v88r* \
1411		- \| -windows* \| -osx \| -abug \| -netware* \| -os9* \
1412		- \| -macos* \| -mpw* \| -magic* \| -mmixware* \| -mon960* \| -lnews*)
1413		- ;;
1414		- -mac*)
1415		- os=`echo "$os" \| sed -e 's\|mac\|macos\|'`
1416		- ;;
1417		- -linux-dietlibc)
1418		- os=-linux-dietlibc
1419		- ;;
1420		- -linux*)
1421		- os=`echo $os \| sed -e 's\|linux\|linux-gnu\|'`
1422		- ;;
1423		- -sunos5*)
1424		- os=`echo "$os" \| sed -e 's\|sunos5\|solaris2\|'`
1425		- ;;
1426		- -sunos6*)
1427		- os=`echo "$os" \| sed -e 's\|sunos6\|solaris3\|'`
1428		- ;;
1429		- -opened*)
1430		- os=-openedition
1431		- ;;
1432		- -os400*)
1433		- os=-os400
1434		- ;;
1435		- -wince*)
1436		- os=-wince
1437		- ;;
1438		- -utek*)
1439		- os=-bsd
1440		- ;;
1441		- -dynix*)
1442		- os=-bsd
1443		- ;;
1444		- -acis*)
1445		- os=-aos
1446		- ;;
1447		- -atheos*)
1448		- os=-atheos
1449		- ;;
1450		- -syllable*)
1451		- os=-syllable
1452		- ;;
1453		- -386bsd)
1454		- os=-bsd
1455		- ;;
1456		- -ctix* \| -uts*)
1457		- os=-sysv
1458		- ;;
1459		- -nova*)
1460		- os=-rtmk-nova
1461		- ;;
1462		- -ns2)
1463		- os=-nextstep2
1464		- ;;
1465		- -nsk*)
1466		- os=-nsk
1467		- ;;
1468		- # Preserve the version number of sinix5.
1469		- -sinix5.*)
1470		- os=`echo $os \| sed -e 's\|sinix\|sysv\|'`
1471		- ;;
1472		- -sinix*)
1473		- os=-sysv4
1474		- ;;
1475		- -tpf*)
1476		- os=-tpf
1477		- ;;
1478		- -triton*)
1479		- os=-sysv3
1480		- ;;
1481		- -oss*)
1482		- os=-sysv3
1483		- ;;
1484		- -svr4*)
1485		- os=-sysv4
1486		- ;;
1487		- -svr3)
1488		- os=-sysv3
1489		- ;;
1490		- -sysvr4)
1491		- os=-sysv4
1492		- ;;
1493		- # This must come after -sysvr4.
1494		- -sysv*)
1495		- ;;
1496		- -ose*)
1497		- os=-ose
1498		- ;;
1499		- -mint \| -mint[0-9] \| -MiNT \| -MiNT[0-9])
1500		- os=-mint
1501		- ;;
1502		- -zvmoe)
1503		- os=-zvmoe
1504		- ;;
1505		- -dicos*)
1506		- os=-dicos
1507		- ;;
1508		- -pikeos*)
1509		- # Until real need of OS specific support for
1510		- # particular features comes up, bare metal
1511		- # configurations are quite functional.
1512		- case $basic_machine in
1513		- arm*)
1514		- os=-eabi
1515		- ;;
1516		- *)
1517		- os=-elf
1518		- ;;
1519		- esac
1520		- ;;
1521		- -nacl*)
1522		- ;;
1523		- -ios)
1524		- ;;
1525		- -none)
1526		- ;;
1527	1513	*)
1528		- # Get rid of the `-' at the beginning of $os.
1529		- os=`echo $os \| sed 's/[^-]*-//'`
1530		- echo Invalid configuration \`"$1"\': system \`"$os"\' not recognized 1>&2
1531		- exit 1
	1514	+ # No normalization, but not necessarily accepted, that comes below.
1532	1515	;;
1533	1516	esac
	1517	+
1534	1518	else
1535	1519
1536	1520	# Here we handle the default operating systems that come with various machines.

		@@ -1543,258 +1527,363 @@
1543	1527	# will signal an error saying that MANUFACTURER isn't an operating
1544	1528	# system, and we'll never get to this point.
1545	1529
1546		-case $basic_machine in
	1530	+kernel=
	1531	+case $cpu-$vendor in
1547	1532	score-*)
1548		- os=-elf
	1533	+ os=elf
1549	1534	;;
1550	1535	spu-*)
1551		- os=-elf
	1536	+ os=elf
1552	1537	;;
1553	1538	*-acorn)
1554		- os=-riscix1.2
	1539	+ os=riscix1.2
1555	1540	;;
1556	1541	arm*-rebel)
1557		- os=-linux
	1542	+ kernel=linux
	1543	+ os=gnu
1558	1544	;;
1559	1545	arm*-semi)
1560		- os=-aout
	1546	+ os=aout
1561	1547	;;
1562	1548	c4x-* \| tic4x-*)
1563		- os=-coff
	1549	+ os=coff
1564	1550	;;
1565	1551	c8051-*)
1566		- os=-elf
	1552	+ os=elf
	1553	+ ;;
	1554	+ clipper-intergraph)
	1555	+ os=clix
1567	1556	;;
1568	1557	hexagon-*)
1569		- os=-elf
	1558	+ os=elf
1570	1559	;;
1571	1560	tic54x-*)
1572		- os=-coff
	1561	+ os=coff
1573	1562	;;
1574	1563	tic55x-*)
1575		- os=-coff
	1564	+ os=coff
1576	1565	;;
1577	1566	tic6x-*)
1578		- os=-coff
	1567	+ os=coff
1579	1568	;;
1580	1569	# This must come before the *-dec entry.
1581	1570	pdp10-*)
1582		- os=-tops20
	1571	+ os=tops20
1583	1572	;;
1584	1573	pdp11-*)
1585		- os=-none
	1574	+ os=none
1586	1575	;;
1587	1576	-dec \| vax-)
1588		- os=-ultrix4.2
	1577	+ os=ultrix4.2
1589	1578	;;
1590	1579	m68*-apollo)
1591		- os=-domain
	1580	+ os=domain
1592	1581	;;
1593	1582	i386-sun)
1594		- os=-sunos4.0.2
	1583	+ os=sunos4.0.2
1595	1584	;;
1596	1585	m68000-sun)
1597		- os=-sunos3
	1586	+ os=sunos3
1598	1587	;;
1599	1588	m68*-cisco)
1600		- os=-aout
	1589	+ os=aout
1601	1590	;;
1602	1591	mep-*)
1603		- os=-elf
	1592	+ os=elf
1604	1593	;;
1605	1594	mips*-cisco)
1606		- os=-elf
	1595	+ os=elf
1607	1596	;;
1608	1597	mips-)
1609		- os=-elf
	1598	+ os=elf
1610	1599	;;
1611	1600	or32-*)
1612		- os=-coff
	1601	+ os=coff
1613	1602	;;
1614	1603	*-tti) # must be before sparc entry or we get the wrong os.
1615		- os=-sysv3
	1604	+ os=sysv3
1616	1605	;;
1617	1606	sparc-* \| *-sun)
1618		- os=-sunos4.1.1
	1607	+ os=sunos4.1.1
1619	1608	;;
1620	1609	pru-*)
1621		- os=-elf
	1610	+ os=elf
1622	1611	;;
1623	1612	*-be)
1624		- os=-beos
	1613	+ os=beos
1625	1614	;;
1626	1615	*-ibm)
1627		- os=-aix
	1616	+ os=aix
1628	1617	;;
1629	1618	*-knuth)
1630		- os=-mmixware
	1619	+ os=mmixware
1631	1620	;;
1632	1621	*-wec)
1633		- os=-proelf
	1622	+ os=proelf
1634	1623	;;
1635	1624	*-winbond)
1636		- os=-proelf
	1625	+ os=proelf
1637	1626	;;
1638	1627	*-oki)
1639		- os=-proelf
	1628	+ os=proelf
1640	1629	;;
1641	1630	*-hp)
1642		- os=-hpux
	1631	+ os=hpux
1643	1632	;;
1644	1633	*-hitachi)
1645		- os=-hiux
	1634	+ os=hiux
1646	1635	;;
1647	1636	i860-* \| -att \| -ncr \| -altos \| -motorola \| *-convergent)
1648		- os=-sysv
	1637	+ os=sysv
1649	1638	;;
1650	1639	*-cbm)
1651		- os=-amigaos
	1640	+ os=amigaos
1652	1641	;;
1653	1642	*-dg)
1654		- os=-dgux
	1643	+ os=dgux
1655	1644	;;
1656	1645	*-dolphin)
1657		- os=-sysv3
	1646	+ os=sysv3
1658	1647	;;
1659	1648	m68k-ccur)
1660		- os=-rtu
	1649	+ os=rtu
1661	1650	;;
1662	1651	m88k-omron*)
1663		- os=-luna
	1652	+ os=luna
1664	1653	;;
1665	1654	*-next)
1666		- os=-nextstep
	1655	+ os=nextstep
1667	1656	;;
1668	1657	*-sequent)
1669		- os=-ptx
	1658	+ os=ptx
1670	1659	;;
1671	1660	*-crds)
1672		- os=-unos
	1661	+ os=unos
1673	1662	;;
1674	1663	*-ns)
1675		- os=-genix
	1664	+ os=genix
1676	1665	;;
1677	1666	i370-*)
1678		- os=-mvs
	1667	+ os=mvs
1679	1668	;;
1680	1669	*-gould)
1681		- os=-sysv
	1670	+ os=sysv
1682	1671	;;
1683	1672	*-highlevel)
1684		- os=-bsd
	1673	+ os=bsd
1685	1674	;;
1686	1675	*-encore)
1687		- os=-bsd
	1676	+ os=bsd
1688	1677	;;
1689	1678	*-sgi)
1690		- os=-irix
	1679	+ os=irix
1691	1680	;;
1692	1681	*-siemens)
1693		- os=-sysv4
	1682	+ os=sysv4
1694	1683	;;
1695	1684	*-masscomp)
1696		- os=-rtu
	1685	+ os=rtu
1697	1686	;;
1698	1687	f30[01]-fujitsu \| f700-fujitsu)
1699		- os=-uxpv
	1688	+ os=uxpv
1700	1689	;;
1701	1690	*-rom68k)
1702		- os=-coff
	1691	+ os=coff
1703	1692	;;
1704	1693	-bug)
1705		- os=-coff
	1694	+ os=coff
1706	1695	;;
1707	1696	*-apple)
1708		- os=-macos
	1697	+ os=macos
1709	1698	;;
1710	1699	-atari)
1711		- os=-mint
	1700	+ os=mint
	1701	+ ;;
	1702	+ *-wrs)
	1703	+ os=vxworks
1712	1704	;;
1713	1705	*)
1714		- os=-none
	1706	+ os=none
1715	1707	;;
1716	1708	esac
	1709	+
1717	1710	fi
1718	1711
	1712	+# Now, validate our (potentially fixed-up) OS.
	1713	+case $os in
	1714	+ # Sometimes we do "kernel-libc", so those need to count as OSes.
	1715	+ musl* \| newlib* \| relibc* \| uclibc*)
	1716	+ ;;
	1717	+ # Likewise for "kernel-abi"
	1718	+ eabi* \| gnueabi*)
	1719	+ ;;
	1720	+ # VxWorks passes extra cpu info in the 4th filed.
	1721	+ simlinux \| simwindows \| spe)
	1722	+ ;;
	1723	+ # Now accept the basic system types.
	1724	+ # The portable systems comes first.
	1725	+ # Each alternative MUST end in a * to match a version number.
	1726	+ gnu* \| android* \| bsd* \| mach* \| minix* \| genix* \| ultrix* \| irix* \
	1727	+ \| vms \| esix* \| aix* \| cnk* \| sunos \| sunos[34]* \
	1728	+ \| hpux* \| unos* \| osf* \| luna* \| dgux* \| auroraux* \| solaris* \
	1729	+ \| sym* \| plan9* \| psp* \| sim* \| xray* \| os68k* \| v88r* \
	1730	+ \| hiux* \| abug \| nacl* \| netware* \| windows* \
	1731	+ \| os9* \| macos* \| osx* \| ios* \
	1732	+ \| mpw* \| magic* \| mmixware* \| mon960* \| lnews* \
	1733	+ \| amigaos* \| amigados* \| msdos* \| newsos* \| unicos* \| aof* \
	1734	+ \| aos* \| aros* \| cloudabi* \| sortix* \| twizzler* \
	1735	+ \| nindy* \| vxsim* \| vxworks* \| ebmon* \| hms* \| mvs* \
	1736	+ \| clix* \| riscos* \| uniplus* \| iris* \| isc* \| rtu* \| xenix* \
	1737	+ \| mirbsd* \| netbsd* \| dicos* \| openedition* \| ose* \
	1738	+ \| bitrig* \| openbsd* \| secbsd* \| solidbsd* \| libertybsd* \| os108* \
	1739	+ \| ekkobsd* \| freebsd* \| riscix* \| lynxos* \| os400* \
	1740	+ \| bosx* \| nextstep* \| cxux* \| aout* \| elf* \| oabi* \
	1741	+ \| ptx* \| coff* \| ecoff* \| winnt* \| domain* \| vsta* \
	1742	+ \| udi* \| lites* \| ieee* \| go32* \| aux* \| hcos* \
	1743	+ \| chorusrdb* \| cegcc* \| glidix* \| serenity* \
	1744	+ \| cygwin* \| msys* \| pe* \| moss* \| proelf* \| rtems* \
	1745	+ \| midipix* \| mingw32* \| mingw64* \| mint* \
	1746	+ \| uxpv* \| beos* \| mpeix* \| udk* \| moxiebox* \
	1747	+ \| interix* \| uwin* \| mks* \| rhapsody* \| darwin* \
	1748	+ \| openstep* \| oskit* \| conix* \| pw32* \| nonstopux* \
	1749	+ \| storm-chaos* \| tops10* \| tenex* \| tops20* \| its* \
	1750	+ \| os2* \| vos* \| palmos* \| uclinux* \| nucleus* \| morphos* \
	1751	+ \| scout* \| superux* \| sysv* \| rtmk* \| tpf* \| windiss* \
	1752	+ \| powermax* \| dnix* \| nx6 \| nx7 \| sei* \| dragonfly* \
	1753	+ \| skyos* \| haiku* \| rdos* \| toppers* \| drops* \| es* \
	1754	+ \| onefs* \| tirtos* \| phoenix* \| fuchsia* \| redox* \| bme* \
	1755	+ \| midnightbsd* \| amdhsa* \| unleashed* \| emscripten* \| wasi* \
	1756	+ \| nsk* \| powerunix* \| genode* \| zvmoe* \| qnx* \| emx* \| zephyr* \
	1757	+ \| fiwix* )
	1758	+ ;;
	1759	+ # This one is extra strict with allowed versions
	1760	+ sco3.2v2 \| sco3.2v[4-9]* \| sco5v6*)
	1761	+ # Don't forget version if it is 3.2v4 or newer.
	1762	+ ;;
	1763	+ none)
	1764	+ ;;
	1765	+ *)
	1766	+ echo Invalid configuration \`"$1"\': OS \`"$os"\' not recognized 1>&2
	1767	+ exit 1
	1768	+ ;;
	1769	+esac
	1770	+
	1771	+# As a final step for OS-related things, validate the OS-kernel combination
	1772	+# (given a valid OS), if there is a kernel.
	1773	+case $kernel-$os in
	1774	+ linux-gnu* \| linux-dietlibc* \| linux-android* \| linux-newlib* \
	1775	+ \| linux-musl* \| linux-relibc* \| linux-uclibc* )
	1776	+ ;;
	1777	+ uclinux-uclibc* )
	1778	+ ;;
	1779	+ -dietlibc* \| -newlib* \| -musl* \| -relibc* \| -uclibc* )
	1780	+ # These are just libc implementations, not actual OSes, and thus
	1781	+ # require a kernel.
	1782	+ echo "Invalid configuration \`$1': libc \`$os' needs explicit kernel." 1>&2
	1783	+ exit 1
	1784	+ ;;
	1785	+ kfreebsd-gnu \| kopensolaris-gnu)
	1786	+ ;;
	1787	+ vxworks-simlinux \| vxworks-simwindows \| vxworks-spe)
	1788	+ ;;
	1789	+ nto-qnx*)
	1790	+ ;;
	1791	+ os2-emx)
	1792	+ ;;
	1793	+ -eabi \| -gnueabi)
	1794	+ ;;
	1795	+ -*)
	1796	+ # Blank kernel with real OS is always fine.
	1797	+ ;;
	1798	+ -)
	1799	+ echo "Invalid configuration \`$1': Kernel \`$kernel' not known to work with OS \`$os'." 1>&2
	1800	+ exit 1
	1801	+ ;;
	1802	+esac
	1803	+
1719	1804	# Here we handle the case where we know the os, and the CPU type, but not the
1720	1805	# manufacturer. We pick the logical manufacturer.
1721		-vendor=unknown
1722		-case $basic_machine in
1723		- *-unknown)
1724		- case $os in
1725		- -riscix*)
	1806	+case $vendor in
	1807	+ unknown)
	1808	+ case $cpu-$os in
	1809	+ -riscix)
1726	1810	vendor=acorn
1727	1811	;;
1728		- -sunos*)
	1812	+ -sunos)
1729	1813	vendor=sun
1730	1814	;;
1731		- -cnk\|-aix)
	1815	+ -cnk \| -aix)
1732	1816	vendor=ibm
1733	1817	;;
1734		- -beos*)
	1818	+ -beos)
1735	1819	vendor=be
1736	1820	;;
1737		- -hpux*)
	1821	+ -hpux)
1738	1822	vendor=hp
1739	1823	;;
1740		- -mpeix*)
	1824	+ -mpeix)
1741	1825	vendor=hp
1742	1826	;;
1743		- -hiux*)
	1827	+ -hiux)
1744	1828	vendor=hitachi
1745	1829	;;
1746		- -unos*)
	1830	+ -unos)
1747	1831	vendor=crds
1748	1832	;;
1749		- -dgux*)
	1833	+ -dgux)
1750	1834	vendor=dg
1751	1835	;;
1752		- -luna*)
	1836	+ -luna)
1753	1837	vendor=omron
1754	1838	;;
1755		- -genix*)
	1839	+ -genix)
1756	1840	vendor=ns
1757	1841	;;
1758		- -mvs* \| -opened*)
	1842	+ -clix)
	1843	+ vendor=intergraph
	1844	+ ;;
	1845	+ -mvs \| -opened)
1759	1846	vendor=ibm
1760	1847	;;
1761		- -os400*)
	1848	+ -os400)
1762	1849	vendor=ibm
1763	1850	;;
1764		- -ptx*)
	1851	+ s390-* \| s390x-*)
	1852	+ vendor=ibm
	1853	+ ;;
	1854	+ -ptx)
1765	1855	vendor=sequent
1766	1856	;;
1767		- -tpf*)
	1857	+ -tpf)
1768	1858	vendor=ibm
1769	1859	;;
1770		- -vxsim* \| -vxworks* \| -windiss*)
	1860	+ -vxsim \| -vxworks \| -windiss)
1771	1861	vendor=wrs
1772	1862	;;
1773		- -aux*)
	1863	+ -aux)
1774	1864	vendor=apple
1775	1865	;;
1776		- -hms*)
	1866	+ -hms)
1777	1867	vendor=hitachi
1778	1868	;;
1779		- -mpw* \| -macos*)
	1869	+ -mpw \| -macos)
1780	1870	vendor=apple
1781	1871	;;
1782		- -mint \| -mint[0-9] \| -MiNT \| -MiNT[0-9])
	1872	+ -mint \| -mint[0-9] \| -MiNT \| -MiNT[0-9])
1783	1873	vendor=atari
1784	1874	;;
1785		- -vos*)
	1875	+ -vos)
1786	1876	vendor=stratus
1787	1877	;;
1788	1878	esac
1789		- basic_machine=`echo "$basic_machine" \| sed "s/unknown/$vendor/"`
1790	1879	;;
1791	1880	esac
1792	1881
1793		-echo "$basic_machine$os"
	1882	+echo "$cpu-$vendor-${kernel:+$kernel-}$os"
1794	1883	exit
1795	1884
1796	1885	# Local variables:
1797		-# eval: (add-hook 'write-file-functions 'time-stamp)
	1886	+# eval: (add-hook 'before-save-hook 'time-stamp)
1798	1887	# time-stamp-start: "timestamp='"
1799	1888	# time-stamp-format: "%:y-%02m-%02d"
1800	1889	# time-stamp-end: "'"

diff -r bd2d082702f1 -r aa3c2b5fd105 speexdsp/configure

--- a/speexdsp/configure Wed Dec 28 06:26:56 2022 -0500

+++ b/speexdsp/configure Wed Dec 28 06:28:31 2022 -0500

		@@ -1,11 +1,12 @@
1	1	#! /bin/sh
2	2	# Guess values for system-dependent variables and create Makefiles.
3		-# Generated by GNU Autoconf 2.69 for speexdsp 1.2.0.
	3	+# Generated by GNU Autoconf 2.71 for speexdsp 1.2.1.
4	4	#
5	5	# Report bugs to <speex-dev@xiph.org>.
6	6	#
7	7	#
8		-# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
	8	+# Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation,
	9	+# Inc.
9	10	#
10	11	#
11	12	# This configure script is free software; the Free Software Foundation

		@@ -16,14 +17,16 @@
16	17
17	18	# Be more Bourne compatible
18	19	DUALCASE=1; export DUALCASE # for MKS sh
19		-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
	20	+as_nop=:
	21	+if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1
	22	+then :
20	23	emulate sh
21	24	NULLCMD=:
22	25	# Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
23	26	# is contrary to our usage. Disable this feature.
24	27	alias -g '${1+"$@"}'='"$@"'
25	28	setopt NO_GLOB_SUBST
26		-else
	29	+else $as_nop
27	30	case `(set -o) 2>/dev/null` in #(
28	31	posix) :
29	32	set -o posix ;; #(

		@@ -33,46 +36,46 @@
33	36	fi
34	37
35	38
	39	+
	40	+# Reset variables that may have inherited troublesome values from
	41	+# the environment.
	42	+
	43	+# IFS needs to be set, to space, tab, and newline, in precisely that order.
	44	+# (If _AS_PATH_WALK were called with IFS unset, it would have the
	45	+# side effect of setting IFS to empty, thus disabling word splitting.)
	46	+# Quoting is to prevent editors from complaining about space-tab.
36	47	as_nl='
37	48	'
38	49	export as_nl
39		-# Printing a long string crashes Solaris 7 /usr/bin/printf.
40		-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
41		-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
42		-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
43		-# Prefer a ksh shell builtin over an external printf program on Solaris,
44		-# but without wasting forks for bash or zsh.
45		-if test -z "$BASH_VERSION$ZSH_VERSION" \
46		- && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
47		- as_echo='print -r --'
48		- as_echo_n='print -rn --'
49		-elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
50		- as_echo='printf %s\n'
51		- as_echo_n='printf %s'
52		-else
53		- if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
54		- as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
55		- as_echo_n='/usr/ucb/echo -n'
56		- else
57		- as_echo_body='eval expr "X$1" : "X\$.*\$"'
58		- as_echo_n_body='eval
59		- arg=$1;
60		- case $arg in #(
61		- "$as_nl")
62		- expr "X$arg" : "X\$.*\$$as_nl";
63		- arg=`expr "X$arg" : ".$as_nl\$.\$"`;;
64		- esac;
65		- expr "X$arg" : "X\$.*\$" \| tr -d "$as_nl"
66		- '
67		- export as_echo_n_body
68		- as_echo_n='sh -c $as_echo_n_body as_echo'
69		- fi
70		- export as_echo_body
71		- as_echo='sh -c $as_echo_body as_echo'
72		-fi
	50	+IFS=" "" $as_nl"
	51	+
	52	+PS1='$ '
	53	+PS2='> '
	54	+PS4='+ '
	55	+
	56	+# Ensure predictable behavior from utilities with locale-dependent output.
	57	+LC_ALL=C
	58	+export LC_ALL
	59	+LANGUAGE=C
	60	+export LANGUAGE
	61	+
	62	+# We cannot yet rely on "unset" to work, but we need these variables
	63	+# to be unset--not just set to an empty or harmless value--now, to
	64	+# avoid bugs in old shells (e.g. pre-3.0 UWIN ksh). This construct
	65	+# also avoids known problems related to "unset" and subshell syntax
	66	+# in other old shells (e.g. bash 2.01 and pdksh 5.2.14).
	67	+for as_var in BASH_ENV ENV MAIL MAILPATH CDPATH
	68	+do eval test \${$as_var+y} \
	69	+ && ( (unset $as_var) \|\| exit 1) >/dev/null 2>&1 && unset $as_var \|\| :
	70	+done
	71	+
	72	+# Ensure that fds 0, 1, and 2 are open.
	73	+if (exec 3>&0) 2>/dev/null; then :; else exec 0</dev/null; fi
	74	+if (exec 3>&1) 2>/dev/null; then :; else exec 1>/dev/null; fi
	75	+if (exec 3>&2) ; then :; else exec 2>/dev/null; fi
73	76
74	77	# The user is always right.
75		-if test "${PATH_SEPARATOR+set}" != set; then
	78	+if ${PATH_SEPARATOR+false} :; then
76	79	PATH_SEPARATOR=:
77	80	(PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
78	81	(PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \|\|

		@@ -81,13 +84,6 @@
81	84	fi
82	85
83	86
84		-# IFS
85		-# We need space, tab and new line, in precisely that order. Quoting is
86		-# there to prevent editors from complaining about space-tab.
87		-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
88		-# splitting by setting IFS to empty value.)
89		-IFS=" "" $as_nl"
90		-
91	87	# Find who we are. Look in the path if we contain no directory separator.
92	88	as_myself=
93	89	case $0 in #((

		@@ -96,8 +92,12 @@
96	92	for as_dir in $PATH
97	93	do
98	94	IFS=$as_save_IFS
99		- test -z "$as_dir" && as_dir=.
100		- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
	95	+ case $as_dir in #(((
	96	+ '') as_dir=./ ;;
	97	+ */) ;;
	98	+ *) as_dir=$as_dir/ ;;
	99	+ esac
	100	+ test -r "$as_dir$0" && as_myself=$as_dir$0 && break
101	101	done
102	102	IFS=$as_save_IFS
103	103

		@@ -109,30 +109,10 @@
109	109	as_myself=$0
110	110	fi
111	111	if test ! -f "$as_myself"; then
112		- $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
	112	+ printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
113	113	exit 1
114	114	fi
115	115
116		-# Unset variables that we do not need and which cause bugs (e.g. in
117		-# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "\|\| exit 1"
118		-# suppresses any "Segmentation fault" message there. '((' could
119		-# trigger a bug in pdksh 5.2.14.
120		-for as_var in BASH_ENV ENV MAIL MAILPATH
121		-do eval test x\${$as_var+set} = xset \
122		- && ( (unset $as_var) \|\| exit 1) >/dev/null 2>&1 && unset $as_var \|\| :
123		-done
124		-PS1='$ '
125		-PS2='> '
126		-PS4='+ '
127		-
128		-# NLS nuisances.
129		-LC_ALL=C
130		-export LC_ALL
131		-LANGUAGE=C
132		-export LANGUAGE
133		-
134		-# CDPATH.
135		-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
136	116
137	117	# Use a proper internal environment variable to ensure we don't fall
138	118	# into an infinite loop, continuously re-executing ourselves.

		@@ -154,20 +134,22 @@
154	134	exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
155	135	# Admittedly, this is quite paranoid, since all the known shells bail
156	136	# out after a failed `exec'.
157		-$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
158		-as_fn_exit 255
	137	+printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2
	138	+exit 255
159	139	fi
160	140	# We don't want this to propagate to other subprocesses.
161	141	{ _as_can_reexec=; unset _as_can_reexec;}
162	142	if test "x$CONFIG_SHELL" = x; then
163		- as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
	143	+ as_bourne_compatible="as_nop=:
	144	+if test \${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1
	145	+then :
164	146	emulate sh
165	147	NULLCMD=:
166	148	# Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
167	149	# is contrary to our usage. Disable this feature.
168	150	alias -g '\${1+\"\$@\"}'='\"\$@\"'
169	151	setopt NO_GLOB_SUBST
170		-else
	152	+else \$as_nop
171	153	case \`(set -o) 2>/dev/null\` in #(
172	154	posix) :
173	155	set -o posix ;; #(

		@@ -187,12 +169,15 @@
187	169	as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
188	170	as_fn_ret_success \|\| { exitcode=1; echo as_fn_ret_success failed.; }
189	171	as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
190		-if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
191		-
192		-else
	172	+if ( set x; as_fn_ret_success y && test x = \"\$1\" )
	173	+then :
	174	+
	175	+else \$as_nop
193	176	exitcode=1; echo positional parameters were not saved.
194	177	fi
195	178	test x\$exitcode = x0 \|\| exit 1
	179	+blah=\$(echo \$(echo blah))
	180	+test x\"\$blah\" = xblah \|\| exit 1
196	181	test -x / \|\| exit 1"
197	182	as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
198	183	as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO

		@@ -207,30 +192,38 @@
207	192	test \"X\`printf %s \$ECHO\`\" = \"X\$ECHO\" \\
208	193	\|\| test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) \|\| exit 1
209	194	test \$(( 1 + 1 )) = 2 \|\| exit 1"
210		- if (eval "$as_required") 2>/dev/null; then :
	195	+ if (eval "$as_required") 2>/dev/null
	196	+then :
211	197	as_have_required=yes
212		-else
	198	+else $as_nop
213	199	as_have_required=no
214	200	fi
215		- if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
216		-
217		-else
	201	+ if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null
	202	+then :
	203	+
	204	+else $as_nop
218	205	as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
219	206	as_found=false
220	207	for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
221	208	do
222	209	IFS=$as_save_IFS
223		- test -z "$as_dir" && as_dir=.
	210	+ case $as_dir in #(((
	211	+ '') as_dir=./ ;;
	212	+ */) ;;
	213	+ *) as_dir=$as_dir/ ;;
	214	+ esac
224	215	as_found=:
225	216	case $as_dir in #(
226	217	/*)
227	218	for as_base in sh bash ksh sh5; do
228	219	# Try only shells that exist, to save several forks.
229		- as_shell=$as_dir/$as_base
	220	+ as_shell=$as_dir$as_base
230	221	if { test -f "$as_shell" \|\| test -f "$as_shell.exe"; } &&
231		- { $as_echo "$as_bourne_compatible""$as_required" \| as_run=a "$as_shell"; } 2>/dev/null; then :
	222	+ as_run=a "$as_shell" -c "$as_bourne_compatible""$as_required" 2>/dev/null
	223	+then :
232	224	CONFIG_SHELL=$as_shell as_have_required=yes
233		- if { $as_echo "$as_bourne_compatible""$as_suggested" \| as_run=a "$as_shell"; } 2>/dev/null; then :
	225	+ if as_run=a "$as_shell" -c "$as_bourne_compatible""$as_suggested" 2>/dev/null
	226	+then :
234	227	break 2
235	228	fi
236	229	fi

		@@ -238,14 +231,21 @@
238	231	esac
239	232	as_found=false
240	233	done
241		-$as_found \|\| { if { test -f "$SHELL" \|\| test -f "$SHELL.exe"; } &&
242		- { $as_echo "$as_bourne_compatible""$as_required" \| as_run=a "$SHELL"; } 2>/dev/null; then :
	234	+IFS=$as_save_IFS
	235	+if $as_found
	236	+then :
	237	+
	238	+else $as_nop
	239	+ if { test -f "$SHELL" \|\| test -f "$SHELL.exe"; } &&
	240	+ as_run=a "$SHELL" -c "$as_bourne_compatible""$as_required" 2>/dev/null
	241	+then :
243	242	CONFIG_SHELL=$SHELL as_have_required=yes
244		-fi; }
245		-IFS=$as_save_IFS
246		-
247		-
248		- if test "x$CONFIG_SHELL" != x; then :
	243	+fi
	244	+fi
	245	+
	246	+
	247	+ if test "x$CONFIG_SHELL" != x
	248	+then :
249	249	export CONFIG_SHELL
250	250	# We cannot yet assume a decent shell, so we have to provide a
251	251	# neutralization value for shells without unset; and this also

		@@ -263,18 +263,19 @@
263	263	exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
264	264	# Admittedly, this is quite paranoid, since all the known shells bail
265	265	# out after a failed `exec'.
266		-$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
	266	+printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2
267	267	exit 255
268	268	fi
269	269
270		- if test x$as_have_required = xno; then :
271		- $as_echo "$0: This script requires a shell more modern than all"
272		- $as_echo "$0: the shells that I found on your system."
273		- if test x${ZSH_VERSION+set} = xset ; then
274		- $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
275		- $as_echo "$0: be upgraded to zsh 4.3.4 or later."
276		- else
277		- $as_echo "$0: Please tell bug-autoconf@gnu.org and speex-dev@xiph.org
	270	+ if test x$as_have_required = xno
	271	+then :
	272	+ printf "%s\n" "$0: This script requires a shell more modern than all"
	273	+ printf "%s\n" "$0: the shells that I found on your system."
	274	+ if test ${ZSH_VERSION+y} ; then
	275	+ printf "%s\n" "$0: In particular, zsh $ZSH_VERSION has bugs and should"
	276	+ printf "%s\n" "$0: be upgraded to zsh 4.3.4 or later."
	277	+ else
	278	+ printf "%s\n" "$0: Please tell bug-autoconf@gnu.org and speex-dev@xiph.org
278	279	$0: about your system, including any error possibly output
279	280	$0: before this message. Then install a modern shell, or
280	281	$0: manually run the script under such a shell if you do

		@@ -302,6 +303,7 @@
302	303	}
303	304	as_unset=as_fn_unset
304	305
	306	+
305	307	# as_fn_set_status STATUS
306	308	# -----------------------
307	309	# Set $? to STATUS, without forking.

		@@ -319,6 +321,14 @@
319	321	as_fn_set_status $1
320	322	exit $1
321	323	} # as_fn_exit
	324	+# as_fn_nop
	325	+# ---------
	326	+# Do nothing but, unlike ":", preserve the value of $?.
	327	+as_fn_nop ()
	328	+{
	329	+ return $?
	330	+}
	331	+as_nop=as_fn_nop
322	332
323	333	# as_fn_mkdir_p
324	334	# -------------

		@@ -333,7 +343,7 @@
333	343	as_dirs=
334	344	while :; do
335	345	case $as_dir in #(
336		- \') as_qdir=`$as_echo "$as_dir" \| sed "s/'/'\\\\\\\\''/g"`;; #'(
	346	+ \') as_qdir=`printf "%s\n" "$as_dir" \| sed "s/'/'\\\\\\\\''/g"`;; #'(
337	347	*) as_qdir=$as_dir;;
338	348	esac
339	349	as_dirs="'$as_qdir' $as_dirs"

		@@ -342,7 +352,7 @@
342	352	X"$as_dir" : 'X$//$[^/]' \\| \
343	353	X"$as_dir" : 'X$//$$' \\| \
344	354	X"$as_dir" : 'X$/$' \\| . 2>/dev/null \|\|
345		-$as_echo X"$as_dir" \|
	355	+printf "%s\n" X"$as_dir" \|
346	356	sed '/^X$.[^/]$\/\/[^/][^/]\/$/{
347	357	s//\1/
348	358	q

		@@ -381,12 +391,13 @@
381	391	# advantage of any shell optimizations that allow amortized linear growth over
382	392	# repeated appends, instead of the typical quadratic growth present in naive
383	393	# implementations.
384		-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
	394	+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null
	395	+then :
385	396	eval 'as_fn_append ()
386	397	{
387	398	eval $1+=\$2
388	399	}'
389		-else
	400	+else $as_nop
390	401	as_fn_append ()
391	402	{
392	403	eval $1=\$$1\$2

		@@ -398,18 +409,27 @@
398	409	# Perform arithmetic evaluation on the ARGs, and store the result in the
399	410	# global $as_val. Take advantage of shells that can avoid forks. The arguments
400	411	# must be portable across $(()) and expr.
401		-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
	412	+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null
	413	+then :
402	414	eval 'as_fn_arith ()
403	415	{
404	416	as_val=$(( $* ))
405	417	}'
406		-else
	418	+else $as_nop
407	419	as_fn_arith ()
408	420	{
409	421	as_val=`expr "$@" \|\| test $? -eq 1`
410	422	}
411	423	fi # as_fn_arith
412	424
	425	+# as_fn_nop
	426	+# ---------
	427	+# Do nothing but, unlike ":", preserve the value of $?.
	428	+as_fn_nop ()
	429	+{
	430	+ return $?
	431	+}
	432	+as_nop=as_fn_nop
413	433
414	434	# as_fn_error STATUS ERROR [LINENO LOG_FD]
415	435	# ----------------------------------------

		@@ -421,9 +441,9 @@
421	441	as_status=$1; test $as_status -eq 0 && as_status=1
422	442	if test "$4"; then
423	443	as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
424		- $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
425		- fi
426		- $as_echo "$as_me: error: $2" >&2
	444	+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
	445	+ fi
	446	+ printf "%s\n" "$as_me: error: $2" >&2
427	447	as_fn_exit $as_status
428	448	} # as_fn_error
429	449

		@@ -450,7 +470,7 @@
450	470	$as_expr X/"$0" : './$[^/][^/]$/*$' \\| \
451	471	X"$0" : 'X$//$$' \\| \
452	472	X"$0" : 'X$/$' \\| . 2>/dev/null \|\|
453		-$as_echo X/"$0" \|
	473	+printf "%s\n" X/"$0" \|
454	474	sed '/^.\/$[^/][^/]$\/*$/{
455	475	s//\1/
456	476	q

		@@ -494,7 +514,7 @@
494	514	s/-\n.*//
495	515	' >$as_me.lineno &&
496	516	chmod +x "$as_me.lineno" \|\|
497		- { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
	517	+ { printf "%s\n" "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
498	518
499	519	# If we had to re-execute with $CONFIG_SHELL, we're ensured to have
500	520	# already done that, so ensure we don't try to do so again and fall

		@@ -508,6 +528,10 @@
508	528	exit
509	529	}
510	530
	531	+
	532	+# Determine whether it's possible to make 'echo' print without a newline.
	533	+# These variables are no longer used directly by Autoconf, but are AC_SUBSTed
	534	+# for compatibility with existing Makefiles.
511	535	ECHO_C= ECHO_N= ECHO_T=
512	536	case `echo -n x` in #(((((
513	537	-n*)

		@@ -521,6 +545,13 @@
521	545	ECHO_N='-n';;
522	546	esac
523	547
	548	+# For backward compatibility with old third-party macros, we provide
	549	+# the shell variables $as_echo and $as_echo_n. New code should use
	550	+# AS_ECHO(["message"]) and AS_ECHO_N(["message"]), respectively.
	551	+as_echo='printf %s\n'
	552	+as_echo_n='printf %s'
	553	+
	554	+
524	555	rm -f conf$$ conf$$.exe conf$$.file
525	556	if test -d conf$$.dir; then
526	557	rm -f conf$$.dir/conf$$.file

		@@ -590,48 +621,44 @@
590	621	# Identity of this package.
591	622	PACKAGE_NAME='speexdsp'
592	623	PACKAGE_TARNAME='speexdsp'
593		-PACKAGE_VERSION='1.2.0'
594		-PACKAGE_STRING='speexdsp 1.2.0'
	624	+PACKAGE_VERSION='1.2.1'
	625	+PACKAGE_STRING='speexdsp 1.2.1'
595	626	PACKAGE_BUGREPORT='speex-dev@xiph.org'
596	627	PACKAGE_URL=''
597	628
598	629	ac_unique_file="libspeexdsp/preprocess.c"
599	630	# Factoring default headers for most tests.
600	631	ac_includes_default="\
601		-#include <stdio.h>
602		-#ifdef HAVE_SYS_TYPES_H
603		-# include <sys/types.h>
604		-#endif
605		-#ifdef HAVE_SYS_STAT_H
606		-# include <sys/stat.h>
	632	+#include <stddef.h>
	633	+#ifdef HAVE_STDIO_H
	634	+# include <stdio.h>
607	635	#endif
608		-#ifdef STDC_HEADERS
	636	+#ifdef HAVE_STDLIB_H
609	637	# include <stdlib.h>
610		-# include <stddef.h>
611		-#else
612		-# ifdef HAVE_STDLIB_H
613		-# include <stdlib.h>
614		-# endif
615	638	#endif
616	639	#ifdef HAVE_STRING_H
617		-# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
618		-# include <memory.h>
619		-# endif
620	640	# include <string.h>
621	641	#endif
622		-#ifdef HAVE_STRINGS_H
623		-# include <strings.h>
624		-#endif
625	642	#ifdef HAVE_INTTYPES_H
626	643	# include <inttypes.h>
627	644	#endif
628	645	#ifdef HAVE_STDINT_H
629	646	# include <stdint.h>
630	647	#endif
	648	+#ifdef HAVE_STRINGS_H
	649	+# include <strings.h>
	650	+#endif
	651	+#ifdef HAVE_SYS_TYPES_H
	652	+# include <sys/types.h>
	653	+#endif
	654	+#ifdef HAVE_SYS_STAT_H
	655	+# include <sys/stat.h>
	656	+#endif
631	657	#ifdef HAVE_UNISTD_H
632	658	# include <unistd.h>
633	659	#endif"
634	660
	661	+ac_header_c_list=
635	662	ac_subst_vars='am__EXEEXT_FALSE
636	663	am__EXEEXT_TRUE
637	664	LTLIBOBJS

		@@ -655,7 +682,6 @@
655	682	BUILD_EXAMPLES_TRUE
656	683	LIBM
657	684	src
658		-CPP
659	685	LT_SYS_LIBRARY_PATH
660	686	OTOOL64
661	687	OTOOL

		@@ -706,6 +732,9 @@
706	732	MAINT
707	733	MAINTAINER_MODE_FALSE
708	734	MAINTAINER_MODE_TRUE
	735	+CSCOPE
	736	+ETAGS
	737	+CTAGS
709	738	am__untar
710	739	am__tar
711	740	AMTAR

		@@ -790,7 +819,6 @@
790	819	with_gnu_ld
791	820	with_sysroot
792	821	enable_libtool_lock
793		-enable_valgrind
794	822	enable_sse
795	823	enable_neon
796	824	enable_fixed_point

		@@ -813,7 +841,6 @@
813	841	LIBS
814	842	CPPFLAGS
815	843	LT_SYS_LIBRARY_PATH
816		-CPP
817	844	PKG_CONFIG
818	845	PKG_CONFIG_PATH
819	846	PKG_CONFIG_LIBDIR

		@@ -887,8 +914,6 @@
887	914	*) ac_optarg=yes ;;
888	915	esac
889	916
890		- # Accept the important Cygnus configure options, so we can diagnose typos.
891		-
892	917	case $ac_dashdash$ac_option in
893	918	--)
894	919	ac_dashdash=yes ;;

		@@ -929,9 +954,9 @@
929	954	ac_useropt=`expr "x$ac_option" : 'x-disable-$.$'`
930	955	# Reject names that are not valid shell variable names.
931	956	expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
932		- as_fn_error $? "invalid feature name: $ac_useropt"
	957	+ as_fn_error $? "invalid feature name: \`$ac_useropt'"
933	958	ac_useropt_orig=$ac_useropt
934		- ac_useropt=`$as_echo "$ac_useropt" \| sed 's/[-+.]/_/g'`
	959	+ ac_useropt=`printf "%s\n" "$ac_useropt" \| sed 's/[-+.]/_/g'`
935	960	case $ac_user_opts in
936	961	*"
937	962	"enable_$ac_useropt"

		@@ -955,9 +980,9 @@
955	980	ac_useropt=`expr "x$ac_option" : 'x-enable-$[^=]$'`
956	981	# Reject names that are not valid shell variable names.
957	982	expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
958		- as_fn_error $? "invalid feature name: $ac_useropt"
	983	+ as_fn_error $? "invalid feature name: \`$ac_useropt'"
959	984	ac_useropt_orig=$ac_useropt
960		- ac_useropt=`$as_echo "$ac_useropt" \| sed 's/[-+.]/_/g'`
	985	+ ac_useropt=`printf "%s\n" "$ac_useropt" \| sed 's/[-+.]/_/g'`
961	986	case $ac_user_opts in
962	987	*"
963	988	"enable_$ac_useropt"

		@@ -1168,9 +1193,9 @@
1168	1193	ac_useropt=`expr "x$ac_option" : 'x-with-$[^=]$'`
1169	1194	# Reject names that are not valid shell variable names.
1170	1195	expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
1171		- as_fn_error $? "invalid package name: $ac_useropt"
	1196	+ as_fn_error $? "invalid package name: \`$ac_useropt'"
1172	1197	ac_useropt_orig=$ac_useropt
1173		- ac_useropt=`$as_echo "$ac_useropt" \| sed 's/[-+.]/_/g'`
	1198	+ ac_useropt=`printf "%s\n" "$ac_useropt" \| sed 's/[-+.]/_/g'`
1174	1199	case $ac_user_opts in
1175	1200	*"
1176	1201	"with_$ac_useropt"

		@@ -1184,9 +1209,9 @@
1184	1209	ac_useropt=`expr "x$ac_option" : 'x-without-$.$'`
1185	1210	# Reject names that are not valid shell variable names.
1186	1211	expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
1187		- as_fn_error $? "invalid package name: $ac_useropt"
	1212	+ as_fn_error $? "invalid package name: \`$ac_useropt'"
1188	1213	ac_useropt_orig=$ac_useropt
1189		- ac_useropt=`$as_echo "$ac_useropt" \| sed 's/[-+.]/_/g'`
	1214	+ ac_useropt=`printf "%s\n" "$ac_useropt" \| sed 's/[-+.]/_/g'`
1190	1215	case $ac_user_opts in
1191	1216	*"
1192	1217	"with_$ac_useropt"

		@@ -1230,9 +1255,9 @@
1230	1255
1231	1256	*)
1232	1257	# FIXME: should be removed in autoconf 3.0.
1233		- $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
	1258	+ printf "%s\n" "$as_me: WARNING: you should use --build, --host, --target" >&2
1234	1259	expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
1235		- $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
	1260	+ printf "%s\n" "$as_me: WARNING: invalid host type: $ac_option" >&2
1236	1261	: "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
1237	1262	;;
1238	1263

		@@ -1248,7 +1273,7 @@
1248	1273	case $enable_option_checking in
1249	1274	no) ;;
1250	1275	fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
1251		- *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
	1276	+ *) printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
1252	1277	esac
1253	1278	fi
1254	1279

		@@ -1312,7 +1337,7 @@
1312	1337	X"$as_myself" : 'X$//$[^/]' \\| \
1313	1338	X"$as_myself" : 'X$//$$' \\| \
1314	1339	X"$as_myself" : 'X$/$' \\| . 2>/dev/null \|\|
1315		-$as_echo X"$as_myself" \|
	1340	+printf "%s\n" X"$as_myself" \|
1316	1341	sed '/^X$.[^/]$\/\/[^/][^/]\/$/{
1317	1342	s//\1/
1318	1343	q

		@@ -1369,7 +1394,7 @@
1369	1394	# Omit some internal or obsolete options to make the list less imposing.
1370	1395	# This message is too long to be a string in the A/UX 3.1 sh.
1371	1396	cat <<_ACEOF
1372		-\`configure' configures speexdsp 1.2.0 to adapt to many kinds of systems.
	1397	+\`configure' configures speexdsp 1.2.1 to adapt to many kinds of systems.
1373	1398
1374	1399	Usage: $0 [OPTION]... [VAR=VALUE]...
1375	1400

		@@ -1440,7 +1465,7 @@
1440	1465
1441	1466	if test -n "$ac_init_help"; then
1442	1467	case $ac_init_help in
1443		- short \| recursive ) echo "Configuration of speexdsp 1.2.0:";;
	1468	+ short \| recursive ) echo "Configuration of speexdsp 1.2.1:";;
1444	1469	esac
1445	1470	cat <<\_ACEOF
1446	1471

		@@ -1462,7 +1487,6 @@
1462	1487	--disable-dependency-tracking
1463	1488	speeds up one-time build
1464	1489	--disable-libtool-lock avoid locking (might break parallel builds)
1465		- --enable-valgrind Enable valgrind extra checks
1466	1490	--enable-sse Enable SSE support
1467	1491	--enable-neon Enable NEON support
1468	1492	--enable-fixed-point Compile as fixed-point

		@@ -1501,7 +1525,6 @@
1501	1525	you have headers in a nonstandard directory <include dir>
1502	1526	LT_SYS_LIBRARY_PATH
1503	1527	User-defined run-time library search path.
1504		- CPP C preprocessor
1505	1528	PKG_CONFIG path to pkg-config utility
1506	1529	PKG_CONFIG_PATH
1507	1530	directories to add to pkg-config's search path

		@@ -1529,9 +1552,9 @@
1529	1552	case "$ac_dir" in
1530	1553	.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
1531	1554	*)
1532		- ac_dir_suffix=/`$as_echo "$ac_dir" \| sed 's\|^\.[\\/]\|\|'`
	1555	+ ac_dir_suffix=/`printf "%s\n" "$ac_dir" \| sed 's\|^\.[\\/]\|\|'`
1533	1556	# A ".." for each directory in $ac_dir_suffix.
1534		- ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" \| sed 's\|/[^\\/]*\|/..\|g;s\|/\|\|'`
	1557	+ ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" \| sed 's\|/[^\\/]*\|/..\|g;s\|/\|\|'`
1535	1558	case $ac_top_builddir_sub in
1536	1559	"") ac_top_builddir_sub=. ac_top_build_prefix= ;;
1537	1560	*) ac_top_build_prefix=$ac_top_builddir_sub/ ;;

		@@ -1559,7 +1582,8 @@
1559	1582	ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
1560	1583
1561	1584	cd "$ac_dir" \|\| { ac_status=$?; continue; }
1562		- # Check for guested configure.
	1585	+ # Check for configure.gnu first; this name is used for a wrapper for
	1586	+ # Metaconfig's "Configure" on case-insensitive file systems.
1563	1587	if test -f "$ac_srcdir/configure.gnu"; then
1564	1588	echo &&
1565	1589	$SHELL "$ac_srcdir/configure.gnu" --help=recursive

		@@ -1567,7 +1591,7 @@
1567	1591	echo &&
1568	1592	$SHELL "$ac_srcdir/configure" --help=recursive
1569	1593	else
1570		- $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
	1594	+ printf "%s\n" "$as_me: WARNING: no configuration information is in $ac_dir" >&2
1571	1595	fi \|\| ac_status=$?
1572	1596	cd "$ac_pwd" \|\| { ac_status=$?; break; }
1573	1597	done

		@@ -1576,10 +1600,10 @@
1576	1600	test -n "$ac_init_help" && exit $ac_status
1577	1601	if $ac_init_version; then
1578	1602	cat <<\_ACEOF
1579		-speexdsp configure 1.2.0
1580		-generated by GNU Autoconf 2.69
1581		-
1582		-Copyright (C) 2012 Free Software Foundation, Inc.
	1603	+speexdsp configure 1.2.1
	1604	+generated by GNU Autoconf 2.71
	1605	+
	1606	+Copyright (C) 2021 Free Software Foundation, Inc.
1583	1607	This configure script is free software; the Free Software Foundation
1584	1608	gives unlimited permission to copy, distribute and modify it.
1585	1609	_ACEOF

		@@ -1596,14 +1620,14 @@
1596	1620	ac_fn_c_try_compile ()
1597	1621	{
1598	1622	as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
1599		- rm -f conftest.$ac_objext
	1623	+ rm -f conftest.$ac_objext conftest.beam
1600	1624	if { { ac_try="$ac_compile"
1601	1625	case "(($ac_try" in
1602	1626	\" \| \` \| \\) ac_try_echo=\$ac_try;;
1603	1627	*) ac_try_echo=$ac_try;;
1604	1628	esac
1605	1629	eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
1606		-$as_echo "$ac_try_echo"; } >&5
	1630	+printf "%s\n" "$ac_try_echo"; } >&5
1607	1631	(eval "$ac_compile") 2>conftest.err
1608	1632	ac_status=$?
1609	1633	if test -s conftest.err; then

		@@ -1611,14 +1635,15 @@
1611	1635	cat conftest.er1 >&5
1612	1636	mv -f conftest.er1 conftest.err
1613	1637	fi
1614		- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
	1638	+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
1615	1639	test $ac_status = 0; } && {
1616	1640	test -z "$ac_c_werror_flag" \|\|
1617	1641	test ! -s conftest.err
1618		- } && test -s conftest.$ac_objext; then :
	1642	+ } && test -s conftest.$ac_objext
	1643	+then :
1619	1644	ac_retval=0
1620		-else
1621		- $as_echo "$as_me: failed program was:" >&5
	1645	+else $as_nop
	1646	+ printf "%s\n" "$as_me: failed program was:" >&5
1622	1647	sed 's/^/\| /' conftest.$ac_ext >&5
1623	1648
1624	1649	ac_retval=1

		@@ -1634,14 +1659,14 @@
1634	1659	ac_fn_c_try_link ()
1635	1660	{
1636	1661	as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
1637		- rm -f conftest.$ac_objext conftest$ac_exeext
	1662	+ rm -f conftest.$ac_objext conftest.beam conftest$ac_exeext
1638	1663	if { { ac_try="$ac_link"
1639	1664	case "(($ac_try" in
1640	1665	\" \| \` \| \\) ac_try_echo=\$ac_try;;
1641	1666	*) ac_try_echo=$ac_try;;
1642	1667	esac
1643	1668	eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
1644		-$as_echo "$ac_try_echo"; } >&5
	1669	+printf "%s\n" "$ac_try_echo"; } >&5
1645	1670	(eval "$ac_link") 2>conftest.err
1646	1671	ac_status=$?
1647	1672	if test -s conftest.err; then

		@@ -1649,17 +1674,18 @@
1649	1674	cat conftest.er1 >&5
1650	1675	mv -f conftest.er1 conftest.err
1651	1676	fi
1652		- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
	1677	+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
1653	1678	test $ac_status = 0; } && {
1654	1679	test -z "$ac_c_werror_flag" \|\|
1655	1680	test ! -s conftest.err
1656	1681	} && test -s conftest$ac_exeext && {
1657	1682	test "$cross_compiling" = yes \|\|
1658	1683	test -x conftest$ac_exeext
1659		- }; then :
	1684	+ }
	1685	+then :
1660	1686	ac_retval=0
1661		-else
1662		- $as_echo "$as_me: failed program was:" >&5
	1687	+else $as_nop
	1688	+ printf "%s\n" "$as_me: failed program was:" >&5
1663	1689	sed 's/^/\| /' conftest.$ac_ext >&5
1664	1690
1665	1691	ac_retval=1

		@@ -1681,120 +1707,44 @@
1681	1707	ac_fn_c_check_header_compile ()
1682	1708	{
1683	1709	as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
1684		- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
1685		-$as_echo_n "checking for $2... " >&6; }
1686		-if eval \${$3+:} false; then :
1687		- $as_echo_n "(cached) " >&6
1688		-else
	1710	+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
	1711	+printf %s "checking for $2... " >&6; }
	1712	+if eval test \${$3+y}
	1713	+then :
	1714	+ printf %s "(cached) " >&6
	1715	+else $as_nop
1689	1716	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1690	1717	/* end confdefs.h. */
1691	1718	$4
1692	1719	#include <$2>
1693	1720	_ACEOF
1694		-if ac_fn_c_try_compile "$LINENO"; then :
	1721	+if ac_fn_c_try_compile "$LINENO"
	1722	+then :
1695	1723	eval "$3=yes"
1696		-else
	1724	+else $as_nop
1697	1725	eval "$3=no"
1698	1726	fi
1699		-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
	1727	+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
1700	1728	fi
1701	1729	eval ac_res=\$$3
1702		- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
1703		-$as_echo "$ac_res" >&6; }
	1730	+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
	1731	+printf "%s\n" "$ac_res" >&6; }
1704	1732	eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
1705	1733
1706	1734	} # ac_fn_c_check_header_compile
1707	1735
1708		-# ac_fn_c_try_cpp LINENO
1709		-# ----------------------
1710		-# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
1711		-ac_fn_c_try_cpp ()
1712		-{
1713		- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
1714		- if { { ac_try="$ac_cpp conftest.$ac_ext"
1715		-case "(($ac_try" in
1716		- \" \| \` \| \\) ac_try_echo=\$ac_try;;
1717		- *) ac_try_echo=$ac_try;;
1718		-esac
1719		-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
1720		-$as_echo "$ac_try_echo"; } >&5
1721		- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
1722		- ac_status=$?
1723		- if test -s conftest.err; then
1724		- grep -v '^ *+' conftest.err >conftest.er1
1725		- cat conftest.er1 >&5
1726		- mv -f conftest.er1 conftest.err
1727		- fi
1728		- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
1729		- test $ac_status = 0; } > conftest.i && {
1730		- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" \|\|
1731		- test ! -s conftest.err
1732		- }; then :
1733		- ac_retval=0
1734		-else
1735		- $as_echo "$as_me: failed program was:" >&5
1736		-sed 's/^/\| /' conftest.$ac_ext >&5
1737		-
1738		- ac_retval=1
1739		-fi
1740		- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
1741		- as_fn_set_status $ac_retval
1742		-
1743		-} # ac_fn_c_try_cpp
1744		-
1745		-# ac_fn_c_try_run LINENO
1746		-# ----------------------
1747		-# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
1748		-# that executables can be run.
1749		-ac_fn_c_try_run ()
1750		-{
1751		- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
1752		- if { { ac_try="$ac_link"
1753		-case "(($ac_try" in
1754		- \" \| \` \| \\) ac_try_echo=\$ac_try;;
1755		- *) ac_try_echo=$ac_try;;
1756		-esac
1757		-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
1758		-$as_echo "$ac_try_echo"; } >&5
1759		- (eval "$ac_link") 2>&5
1760		- ac_status=$?
1761		- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
1762		- test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
1763		- { { case "(($ac_try" in
1764		- \" \| \` \| \\) ac_try_echo=\$ac_try;;
1765		- *) ac_try_echo=$ac_try;;
1766		-esac
1767		-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
1768		-$as_echo "$ac_try_echo"; } >&5
1769		- (eval "$ac_try") 2>&5
1770		- ac_status=$?
1771		- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
1772		- test $ac_status = 0; }; }; then :
1773		- ac_retval=0
1774		-else
1775		- $as_echo "$as_me: program exited with status $ac_status" >&5
1776		- $as_echo "$as_me: failed program was:" >&5
1777		-sed 's/^/\| /' conftest.$ac_ext >&5
1778		-
1779		- ac_retval=$ac_status
1780		-fi
1781		- rm -rf conftest.dSYM conftest_ipa8_conftest.oo
1782		- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
1783		- as_fn_set_status $ac_retval
1784		-
1785		-} # ac_fn_c_try_run
1786		-
1787	1736	# ac_fn_c_check_func LINENO FUNC VAR
1788	1737	# ----------------------------------
1789	1738	# Tests whether FUNC exists, setting the cache variable VAR accordingly
1790	1739	ac_fn_c_check_func ()
1791	1740	{
1792	1741	as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
1793		- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
1794		-$as_echo_n "checking for $2... " >&6; }
1795		-if eval \${$3+:} false; then :
1796		- $as_echo_n "(cached) " >&6
1797		-else
	1742	+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
	1743	+printf %s "checking for $2... " >&6; }
	1744	+if eval test \${$3+y}
	1745	+then :
	1746	+ printf %s "(cached) " >&6
	1747	+else $as_nop
1798	1748	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1799	1749	/* end confdefs.h. */
1800	1750	/* Define $2 to an innocuous variant, in case <limits.h> declares $2.

		@@ -1802,16 +1752,9 @@
1802	1752	#define $2 innocuous_$2
1803	1753
1804	1754	/* System header to define __stub macros and hopefully few prototypes,
1805		- which can conflict with char $2 (); below.
1806		- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
1807		- <limits.h> exists even on freestanding compilers. */
1808		-
1809		-#ifdef __STDC__
1810		-# include <limits.h>
1811		-#else
1812		-# include <assert.h>
1813		-#endif
1814		-
	1755	+ which can conflict with char $2 (); below. */
	1756	+
	1757	+#include <limits.h>
1815	1758	#undef $2
1816	1759
1817	1760	/* Override any GCC internal prototype to avoid an error.

		@@ -1829,118 +1772,71 @@
1829	1772	#endif
1830	1773
1831	1774	int
1832		-main ()
	1775	+main (void)
1833	1776	{
1834	1777	return $2 ();
1835	1778	;
1836	1779	return 0;
1837	1780	}
1838	1781	_ACEOF
1839		-if ac_fn_c_try_link "$LINENO"; then :
	1782	+if ac_fn_c_try_link "$LINENO"
	1783	+then :
1840	1784	eval "$3=yes"
1841		-else
	1785	+else $as_nop
1842	1786	eval "$3=no"
1843	1787	fi
1844		-rm -f core conftest.err conftest.$ac_objext \
	1788	+rm -f core conftest.err conftest.$ac_objext conftest.beam \
1845	1789	conftest$ac_exeext conftest.$ac_ext
1846	1790	fi
1847	1791	eval ac_res=\$$3
1848		- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
1849		-$as_echo "$ac_res" >&6; }
	1792	+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
	1793	+printf "%s\n" "$ac_res" >&6; }
1850	1794	eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
1851	1795
1852	1796	} # ac_fn_c_check_func
1853	1797
1854		-# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
1855		-# -------------------------------------------------------
1856		-# Tests whether HEADER exists, giving a warning if it cannot be compiled using
1857		-# the include files in INCLUDES and setting the cache variable VAR
1858		-# accordingly.
1859		-ac_fn_c_check_header_mongrel ()
	1798	+# ac_fn_c_try_run LINENO
	1799	+# ----------------------
	1800	+# Try to run conftest.$ac_ext, and return whether this succeeded. Assumes that
	1801	+# executables can be run.
	1802	+ac_fn_c_try_run ()
1860	1803	{
1861	1804	as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
1862		- if eval \${$3+:} false; then :
1863		- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
1864		-$as_echo_n "checking for $2... " >&6; }
1865		-if eval \${$3+:} false; then :
1866		- $as_echo_n "(cached) " >&6
1867		-fi
1868		-eval ac_res=\$$3
1869		- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
1870		-$as_echo "$ac_res" >&6; }
1871		-else
1872		- # Is the header compilable?
1873		-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
1874		-$as_echo_n "checking $2 usability... " >&6; }
1875		-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1876		-/* end confdefs.h. */
1877		-$4
1878		-#include <$2>
1879		-_ACEOF
1880		-if ac_fn_c_try_compile "$LINENO"; then :
1881		- ac_header_compiler=yes
1882		-else
1883		- ac_header_compiler=no
1884		-fi
1885		-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
1886		-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
1887		-$as_echo "$ac_header_compiler" >&6; }
1888		-
1889		-# Is the header present?
1890		-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
1891		-$as_echo_n "checking $2 presence... " >&6; }
1892		-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1893		-/* end confdefs.h. */
1894		-#include <$2>
1895		-_ACEOF
1896		-if ac_fn_c_try_cpp "$LINENO"; then :
1897		- ac_header_preproc=yes
1898		-else
1899		- ac_header_preproc=no
1900		-fi
1901		-rm -f conftest.err conftest.i conftest.$ac_ext
1902		-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
1903		-$as_echo "$ac_header_preproc" >&6; }
1904		-
1905		-# So? What about this header?
1906		-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
1907		- yes:no: )
1908		- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
1909		-$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
1910		- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
1911		-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
1912		- ;;
1913		- no:yes:* )
1914		- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
1915		-$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
1916		- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5
1917		-$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;}
1918		- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
1919		-$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
1920		- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5
1921		-$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;}
1922		- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
1923		-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
1924		-( $as_echo "## --------------------------------- ##
1925		-## Report this to speex-dev@xiph.org ##
1926		-## --------------------------------- ##"
1927		- ) \| sed "s/^/$as_me: WARNING: /" >&2
1928		- ;;
1929		-esac
1930		- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
1931		-$as_echo_n "checking for $2... " >&6; }
1932		-if eval \${$3+:} false; then :
1933		- $as_echo_n "(cached) " >&6
1934		-else
1935		- eval "$3=\$ac_header_compiler"
1936		-fi
1937		-eval ac_res=\$$3
1938		- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
1939		-$as_echo "$ac_res" >&6; }
1940		-fi
	1805	+ if { { ac_try="$ac_link"
	1806	+case "(($ac_try" in
	1807	+ \" \| \` \| \\) ac_try_echo=\$ac_try;;
	1808	+ *) ac_try_echo=$ac_try;;
	1809	+esac
	1810	+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
	1811	+printf "%s\n" "$ac_try_echo"; } >&5
	1812	+ (eval "$ac_link") 2>&5
	1813	+ ac_status=$?
	1814	+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
	1815	+ test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
	1816	+ { { case "(($ac_try" in
	1817	+ \" \| \` \| \\) ac_try_echo=\$ac_try;;
	1818	+ *) ac_try_echo=$ac_try;;
	1819	+esac
	1820	+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
	1821	+printf "%s\n" "$ac_try_echo"; } >&5
	1822	+ (eval "$ac_try") 2>&5
	1823	+ ac_status=$?
	1824	+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
	1825	+ test $ac_status = 0; }; }
	1826	+then :
	1827	+ ac_retval=0
	1828	+else $as_nop
	1829	+ printf "%s\n" "$as_me: program exited with status $ac_status" >&5
	1830	+ printf "%s\n" "$as_me: failed program was:" >&5
	1831	+sed 's/^/\| /' conftest.$ac_ext >&5
	1832	+
	1833	+ ac_retval=$ac_status
	1834	+fi
	1835	+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo
1941	1836	eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
1942		-
1943		-} # ac_fn_c_check_header_mongrel
	1837	+ as_fn_set_status $ac_retval
	1838	+
	1839	+} # ac_fn_c_try_run
1944	1840
1945	1841	# ac_fn_c_compute_int LINENO EXPR VAR INCLUDES
1946	1842	# --------------------------------------------

		@@ -1956,7 +1852,7 @@
1956	1852	/* end confdefs.h. */
1957	1853	$4
1958	1854	int
1959		-main ()
	1855	+main (void)
1960	1856	{
1961	1857	static int test_array [1 - 2 * !(($2) >= 0)];
1962	1858	test_array [0] = 0;

		@@ -1966,14 +1862,15 @@
1966	1862	return 0;
1967	1863	}
1968	1864	_ACEOF
1969		-if ac_fn_c_try_compile "$LINENO"; then :
	1865	+if ac_fn_c_try_compile "$LINENO"
	1866	+then :
1970	1867	ac_lo=0 ac_mid=0
1971	1868	while :; do
1972	1869	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1973	1870	/* end confdefs.h. */
1974	1871	$4
1975	1872	int
1976		-main ()
	1873	+main (void)
1977	1874	{
1978	1875	static int test_array [1 - 2 * !(($2) <= $ac_mid)];
1979	1876	test_array [0] = 0;

		@@ -1983,9 +1880,10 @@
1983	1880	return 0;
1984	1881	}
1985	1882	_ACEOF
1986		-if ac_fn_c_try_compile "$LINENO"; then :
	1883	+if ac_fn_c_try_compile "$LINENO"
	1884	+then :
1987	1885	ac_hi=$ac_mid; break
1988		-else
	1886	+else $as_nop
1989	1887	as_fn_arith $ac_mid + 1 && ac_lo=$as_val
1990	1888	if test $ac_lo -le $ac_mid; then
1991	1889	ac_lo= ac_hi=

		@@ -1993,14 +1891,14 @@
1993	1891	fi
1994	1892	as_fn_arith 2 '*' $ac_mid + 1 && ac_mid=$as_val
1995	1893	fi
1996		-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
1997		- done
1998		-else
	1894	+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
	1895	+ done
	1896	+else $as_nop
1999	1897	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
2000	1898	/* end confdefs.h. */
2001	1899	$4
2002	1900	int
2003		-main ()
	1901	+main (void)
2004	1902	{
2005	1903	static int test_array [1 - 2 * !(($2) < 0)];
2006	1904	test_array [0] = 0;

		@@ -2010,14 +1908,15 @@
2010	1908	return 0;
2011	1909	}
2012	1910	_ACEOF
2013		-if ac_fn_c_try_compile "$LINENO"; then :
	1911	+if ac_fn_c_try_compile "$LINENO"
	1912	+then :
2014	1913	ac_hi=-1 ac_mid=-1
2015	1914	while :; do
2016	1915	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
2017	1916	/* end confdefs.h. */
2018	1917	$4
2019	1918	int
2020		-main ()
	1919	+main (void)
2021	1920	{
2022	1921	static int test_array [1 - 2 * !(($2) >= $ac_mid)];
2023	1922	test_array [0] = 0;

		@@ -2027,9 +1926,10 @@
2027	1926	return 0;
2028	1927	}
2029	1928	_ACEOF
2030		-if ac_fn_c_try_compile "$LINENO"; then :
	1929	+if ac_fn_c_try_compile "$LINENO"
	1930	+then :
2031	1931	ac_lo=$ac_mid; break
2032		-else
	1932	+else $as_nop
2033	1933	as_fn_arith '(' $ac_mid ')' - 1 && ac_hi=$as_val
2034	1934	if test $ac_mid -le $ac_hi; then
2035	1935	ac_lo= ac_hi=

		@@ -2037,14 +1937,14 @@
2037	1937	fi
2038	1938	as_fn_arith 2 '*' $ac_mid && ac_mid=$as_val
2039	1939	fi
2040		-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
2041		- done
2042		-else
	1940	+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
	1941	+ done
	1942	+else $as_nop
2043	1943	ac_lo= ac_hi=
2044	1944	fi
2045		-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
2046		-fi
2047		-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
	1945	+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
	1946	+fi
	1947	+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
2048	1948	# Binary search between lo and hi bounds.
2049	1949	while test "x$ac_lo" != "x$ac_hi"; do
2050	1950	as_fn_arith '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo && ac_mid=$as_val

		@@ -2052,7 +1952,7 @@
2052	1952	/* end confdefs.h. */
2053	1953	$4
2054	1954	int
2055		-main ()
	1955	+main (void)
2056	1956	{
2057	1957	static int test_array [1 - 2 * !(($2) <= $ac_mid)];
2058	1958	test_array [0] = 0;

		@@ -2062,12 +1962,13 @@
2062	1962	return 0;
2063	1963	}
2064	1964	_ACEOF
2065		-if ac_fn_c_try_compile "$LINENO"; then :
	1965	+if ac_fn_c_try_compile "$LINENO"
	1966	+then :
2066	1967	ac_hi=$ac_mid
2067		-else
	1968	+else $as_nop
2068	1969	as_fn_arith '(' $ac_mid ')' + 1 && ac_lo=$as_val
2069	1970	fi
2070		-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
	1971	+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
2071	1972	done
2072	1973	case $ac_lo in #((
2073	1974	?*) eval "$3=\$ac_lo"; ac_retval=0 ;;

		@@ -2077,12 +1978,12 @@
2077	1978	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
2078	1979	/* end confdefs.h. */
2079	1980	$4
2080		-static long int longval () { return $2; }
2081		-static unsigned long int ulongval () { return $2; }
	1981	+static long int longval (void) { return $2; }
	1982	+static unsigned long int ulongval (void) { return $2; }
2082	1983	#include <stdio.h>
2083	1984	#include <stdlib.h>
2084	1985	int
2085		-main ()
	1986	+main (void)
2086	1987	{
2087	1988
2088	1989	FILE *f = fopen ("conftest.val", "w");

		@@ -2110,9 +2011,10 @@
2110	2011	return 0;
2111	2012	}
2112	2013	_ACEOF
2113		-if ac_fn_c_try_run "$LINENO"; then :
	2014	+if ac_fn_c_try_run "$LINENO"
	2015	+then :
2114	2016	echo >>conftest.val; read $3 <conftest.val; ac_retval=0
2115		-else
	2017	+else $as_nop
2116	2018	ac_retval=1
2117	2019	fi
2118	2020	rm -f core .core core.conftest. gmon.out bb.out conftest$ac_exeext \

		@@ -2124,14 +2026,34 @@
2124	2026	as_fn_set_status $ac_retval
2125	2027
2126	2028	} # ac_fn_c_compute_int
	2029	+ac_configure_args_raw=
	2030	+for ac_arg
	2031	+do
	2032	+ case $ac_arg in
	2033	+ \')
	2034	+ ac_arg=`printf "%s\n" "$ac_arg" \| sed "s/'/'\\\\\\\\''/g"` ;;
	2035	+ esac
	2036	+ as_fn_append ac_configure_args_raw " '$ac_arg'"
	2037	+done
	2038	+
	2039	+case $ac_configure_args_raw in
	2040	+ $as_nl)
	2041	+ ac_safe_unquote= ;;
	2042	+ *)
	2043	+ ac_unsafe_z='\|&;<>()$`\\"*?[ '' ' # This string ends in space, tab.
	2044	+ ac_unsafe_a="$ac_unsafe_z#~"
	2045	+ ac_safe_unquote="s/ '\$[^$ac_unsafe_a][^$ac_unsafe_z]*\$'/ \\1/g"
	2046	+ ac_configure_args_raw=` printf "%s\n" "$ac_configure_args_raw" \| sed "$ac_safe_unquote"`;;
	2047	+esac
	2048	+
2127	2049	cat >config.log <<_ACEOF
2128	2050	This file contains any messages produced by compilers while
2129	2051	running configure, to aid debugging if configure makes a mistake.
2130	2052
2131		-It was created by speexdsp $as_me 1.2.0, which was
2132		-generated by GNU Autoconf 2.69. Invocation command line was
2133		-
2134		- $ $0 $@
	2053	+It was created by speexdsp $as_me 1.2.1, which was
	2054	+generated by GNU Autoconf 2.71. Invocation command line was
	2055	+
	2056	+ $ $0$ac_configure_args_raw
2135	2057
2136	2058	_ACEOF
2137	2059	exec 5>>config.log

		@@ -2164,8 +2086,12 @@
2164	2086	for as_dir in $PATH
2165	2087	do
2166	2088	IFS=$as_save_IFS
2167		- test -z "$as_dir" && as_dir=.
2168		- $as_echo "PATH: $as_dir"
	2089	+ case $as_dir in #(((
	2090	+ '') as_dir=./ ;;
	2091	+ */) ;;
	2092	+ *) as_dir=$as_dir/ ;;
	2093	+ esac
	2094	+ printf "%s\n" "PATH: $as_dir"
2169	2095	done
2170	2096	IFS=$as_save_IFS
2171	2097

		@@ -2200,7 +2126,7 @@
2200	2126	\| -silent \| --silent \| --silen \| --sile \| --sil)
2201	2127	continue ;;
2202	2128	\')
2203		- ac_arg=`$as_echo "$ac_arg" \| sed "s/'/'\\\\\\\\''/g"` ;;
	2129	+ ac_arg=`printf "%s\n" "$ac_arg" \| sed "s/'/'\\\\\\\\''/g"` ;;
2204	2130	esac
2205	2131	case $ac_pass in
2206	2132	1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;

		@@ -2235,11 +2161,13 @@
2235	2161	# WARNING: Use '\'' to represent an apostrophe within the trap.
2236	2162	# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
2237	2163	trap 'exit_status=$?
	2164	+ # Sanitize IFS.
	2165	+ IFS=" "" $as_nl"
2238	2166	# Save into config.log some information that might help in debugging.
2239	2167	{
2240	2168	echo
2241	2169
2242		- $as_echo "## ---------------- ##
	2170	+ printf "%s\n" "## ---------------- ##
2243	2171	## Cache variables. ##
2244	2172	## ---------------- ##"
2245	2173	echo

		@@ -2250,8 +2178,8 @@
2250	2178	case $ac_val in #(
2251	2179	${as_nl})
2252	2180	case $ac_var in #(
2253		- _cv_) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
2254		-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
	2181	+ _cv_) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
	2182	+printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
2255	2183	esac
2256	2184	case $ac_var in #(
2257	2185	_ \| IFS \| as_nl) ;; #(

		@@ -2275,7 +2203,7 @@
2275	2203	)
2276	2204	echo
2277	2205
2278		- $as_echo "## ----------------- ##
	2206	+ printf "%s\n" "## ----------------- ##
2279	2207	## Output variables. ##
2280	2208	## ----------------- ##"
2281	2209	echo

		@@ -2283,14 +2211,14 @@
2283	2211	do
2284	2212	eval ac_val=\$$ac_var
2285	2213	case $ac_val in
2286		- \'\'') ac_val=`$as_echo "$ac_val" \| sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
	2214	+ \'\'') ac_val=`printf "%s\n" "$ac_val" \| sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
2287	2215	esac
2288		- $as_echo "$ac_var='\''$ac_val'\''"
	2216	+ printf "%s\n" "$ac_var='\''$ac_val'\''"
2289	2217	done \| sort
2290	2218	echo
2291	2219
2292	2220	if test -n "$ac_subst_files"; then
2293		- $as_echo "## ------------------- ##
	2221	+ printf "%s\n" "## ------------------- ##
2294	2222	## File substitutions. ##
2295	2223	## ------------------- ##"
2296	2224	echo

		@@ -2298,15 +2226,15 @@
2298	2226	do
2299	2227	eval ac_val=\$$ac_var
2300	2228	case $ac_val in
2301		- \'\'') ac_val=`$as_echo "$ac_val" \| sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
	2229	+ \'\'') ac_val=`printf "%s\n" "$ac_val" \| sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
2302	2230	esac
2303		- $as_echo "$ac_var='\''$ac_val'\''"
	2231	+ printf "%s\n" "$ac_var='\''$ac_val'\''"
2304	2232	done \| sort
2305	2233	echo
2306	2234	fi
2307	2235
2308	2236	if test -s confdefs.h; then
2309		- $as_echo "## ----------- ##
	2237	+ printf "%s\n" "## ----------- ##
2310	2238	## confdefs.h. ##
2311	2239	## ----------- ##"
2312	2240	echo

		@@ -2314,8 +2242,8 @@
2314	2242	echo
2315	2243	fi
2316	2244	test "$ac_signal" != 0 &&
2317		- $as_echo "$as_me: caught signal $ac_signal"
2318		- $as_echo "$as_me: exit $exit_status"
	2245	+ printf "%s\n" "$as_me: caught signal $ac_signal"
	2246	+ printf "%s\n" "$as_me: exit $exit_status"
2319	2247	} >&5
2320	2248	rm -f core .core core.conftest. &&
2321	2249	rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&

		@@ -2329,63 +2257,48 @@
2329	2257	# confdefs.h avoids OS command line length limits that DEFS can exceed.
2330	2258	rm -f -r conftest* confdefs.h
2331	2259
2332		-$as_echo "/* confdefs.h */" > confdefs.h
	2260	+printf "%s\n" "/* confdefs.h */" > confdefs.h
2333	2261
2334	2262	# Predefined preprocessor variables.
2335	2263
2336		-cat >>confdefs.h <<_ACEOF
2337		-#define PACKAGE_NAME "$PACKAGE_NAME"
2338		-_ACEOF
2339		-
2340		-cat >>confdefs.h <<_ACEOF
2341		-#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
2342		-_ACEOF
2343		-
2344		-cat >>confdefs.h <<_ACEOF
2345		-#define PACKAGE_VERSION "$PACKAGE_VERSION"
2346		-_ACEOF
2347		-
2348		-cat >>confdefs.h <<_ACEOF
2349		-#define PACKAGE_STRING "$PACKAGE_STRING"
2350		-_ACEOF
2351		-
2352		-cat >>confdefs.h <<_ACEOF
2353		-#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
2354		-_ACEOF
2355		-
2356		-cat >>confdefs.h <<_ACEOF
2357		-#define PACKAGE_URL "$PACKAGE_URL"
2358		-_ACEOF
	2264	+printf "%s\n" "#define PACKAGE_NAME \"$PACKAGE_NAME\"" >>confdefs.h
	2265	+
	2266	+printf "%s\n" "#define PACKAGE_TARNAME \"$PACKAGE_TARNAME\"" >>confdefs.h
	2267	+
	2268	+printf "%s\n" "#define PACKAGE_VERSION \"$PACKAGE_VERSION\"" >>confdefs.h
	2269	+
	2270	+printf "%s\n" "#define PACKAGE_STRING \"$PACKAGE_STRING\"" >>confdefs.h
	2271	+
	2272	+printf "%s\n" "#define PACKAGE_BUGREPORT \"$PACKAGE_BUGREPORT\"" >>confdefs.h
	2273	+
	2274	+printf "%s\n" "#define PACKAGE_URL \"$PACKAGE_URL\"" >>confdefs.h
2359	2275
2360	2276
2361	2277	# Let the site file select an alternate cache file if it wants to.
2362	2278	# Prefer an explicitly selected file to automatically selected ones.
2363		-ac_site_file1=NONE
2364		-ac_site_file2=NONE
2365	2279	if test -n "$CONFIG_SITE"; then
2366		- # We do not want a PATH search for config.site.
2367		- case $CONFIG_SITE in #((
2368		- -*) ac_site_file1=./$CONFIG_SITE;;
2369		- /) ac_site_file1=$CONFIG_SITE;;
2370		- *) ac_site_file1=./$CONFIG_SITE;;
2371		- esac
	2280	+ ac_site_files="$CONFIG_SITE"
2372	2281	elif test "x$prefix" != xNONE; then
2373		- ac_site_file1=$prefix/share/config.site
2374		- ac_site_file2=$prefix/etc/config.site
2375		-else
2376		- ac_site_file1=$ac_default_prefix/share/config.site
2377		- ac_site_file2=$ac_default_prefix/etc/config.site
2378		-fi
2379		-for ac_site_file in "$ac_site_file1" "$ac_site_file2"
2380		-do
2381		- test "x$ac_site_file" = xNONE && continue
2382		- if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
2383		- { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
2384		-$as_echo "$as_me: loading site script $ac_site_file" >&6;}
	2282	+ ac_site_files="$prefix/share/config.site $prefix/etc/config.site"
	2283	+else
	2284	+ ac_site_files="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
	2285	+fi
	2286	+
	2287	+for ac_site_file in $ac_site_files
	2288	+do
	2289	+ case $ac_site_file in #(
	2290	+ /) :
	2291	+ ;; #(
	2292	+ *) :
	2293	+ ac_site_file=./$ac_site_file ;;
	2294	+esac
	2295	+ if test -f "$ac_site_file" && test -r "$ac_site_file"; then
	2296	+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
	2297	+printf "%s\n" "$as_me: loading site script $ac_site_file" >&6;}
2385	2298	sed 's/^/\| /' "$ac_site_file" >&5
2386	2299	. "$ac_site_file" \
2387		- \|\| { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
2388		-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
	2300	+ \|\| { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
	2301	+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
2389	2302	as_fn_error $? "failed to load site script $ac_site_file
2390	2303	See \`config.log' for more details" "$LINENO" 5; }
2391	2304	fi

		@@ -2395,19 +2308,434 @@
2395	2308	# Some versions of bash will fail to source /dev/null (special files
2396	2309	# actually), so we avoid doing that. DJGPP emulates it as a regular file.
2397	2310	if test /dev/null != "$cache_file" && test -f "$cache_file"; then
2398		- { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
2399		-$as_echo "$as_me: loading cache $cache_file" >&6;}
	2311	+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
	2312	+printf "%s\n" "$as_me: loading cache $cache_file" >&6;}
2400	2313	case $cache_file in
2401	2314	[\\/]* \| ?:[\\/]* ) . "$cache_file";;
2402	2315	*) . "./$cache_file";;
2403	2316	esac
2404	2317	fi
2405	2318	else
2406		- { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
2407		-$as_echo "$as_me: creating cache $cache_file" >&6;}
	2319	+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
	2320	+printf "%s\n" "$as_me: creating cache $cache_file" >&6;}
2408	2321	>$cache_file
2409	2322	fi
2410	2323
	2324	+# Test code for whether the C compiler supports C89 (global declarations)
	2325	+ac_c_conftest_c89_globals='
	2326	+/* Does the compiler advertise C89 conformance?
	2327	+ Do not test the value of __STDC__, because some compilers set it to 0
	2328	+ while being otherwise adequately conformant. */
	2329	+#if !defined __STDC__
	2330	+# error "Compiler does not advertise C89 conformance"
	2331	+#endif
	2332	+
	2333	+#include <stddef.h>
	2334	+#include <stdarg.h>
	2335	+struct stat;
	2336	+/* Most of the following tests are stolen from RCS 5.7 src/conf.sh. */
	2337	+struct buf { int x; };
	2338	+struct buf * (rcsopen) (struct buf , struct stat *, int);
	2339	+static char *e (p, i)
	2340	+ char **p;
	2341	+ int i;
	2342	+{
	2343	+ return p[i];
	2344	+}
	2345	+static char f (char (g) (char , int), char *p, ...)
	2346	+{
	2347	+ char *s;
	2348	+ va_list v;
	2349	+ va_start (v,p);
	2350	+ s = g (p, va_arg (v,int));
	2351	+ va_end (v);
	2352	+ return s;
	2353	+}
	2354	+
	2355	+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
	2356	+ function prototypes and stuff, but not \xHH hex character constants.
	2357	+ These do not provoke an error unfortunately, instead are silently treated
	2358	+ as an "x". The following induces an error, until -std is added to get
	2359	+ proper ANSI mode. Curiously \x00 != x always comes out true, for an
	2360	+ array size at least. It is necessary to write \x00 == 0 to get something
	2361	+ that is true only with -std. */
	2362	+int osf4_cc_array ['\''\x00'\'' == 0 ? 1 : -1];
	2363	+
	2364	+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
	2365	+ inside strings and character constants. */
	2366	+#define FOO(x) '\''x'\''
	2367	+int xlc6_cc_array[FOO(a) == '\''x'\'' ? 1 : -1];
	2368	+
	2369	+int test (int i, double x);
	2370	+struct s1 {int (*f) (int a);};
	2371	+struct s2 {int (*f) (double a);};
	2372	+int pairnames (int, char *, int ()(struct buf , struct stat *, int),
	2373	+ int, int);'
	2374	+
	2375	+# Test code for whether the C compiler supports C89 (body of main).
	2376	+ac_c_conftest_c89_main='
	2377	+ok \|= (argc == 0 \|\| f (e, argv, 0) != argv[0] \|\| f (e, argv, 1) != argv[1]);
	2378	+'
	2379	+
	2380	+# Test code for whether the C compiler supports C99 (global declarations)
	2381	+ac_c_conftest_c99_globals='
	2382	+// Does the compiler advertise C99 conformance?
	2383	+#if !defined __STDC_VERSION__ \|\| __STDC_VERSION__ < 199901L
	2384	+# error "Compiler does not advertise C99 conformance"
	2385	+#endif
	2386	+
	2387	+#include <stdbool.h>
	2388	+extern int puts (const char *);
	2389	+extern int printf (const char *, ...);
	2390	+extern int dprintf (int, const char *, ...);
	2391	+extern void *malloc (size_t);
	2392	+
	2393	+// Check varargs macros. These examples are taken from C99 6.10.3.5.
	2394	+// dprintf is used instead of fprintf to avoid needing to declare
	2395	+// FILE and stderr.
	2396	+#define debug(...) dprintf (2, __VA_ARGS__)
	2397	+#define showlist(...) puts (#__VA_ARGS__)
	2398	+#define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__))
	2399	+static void
	2400	+test_varargs_macros (void)
	2401	+{
	2402	+ int x = 1234;
	2403	+ int y = 5678;
	2404	+ debug ("Flag");
	2405	+ debug ("X = %d\n", x);
	2406	+ showlist (The first, second, and third items.);
	2407	+ report (x>y, "x is %d but y is %d", x, y);
	2408	+}
	2409	+
	2410	+// Check long long types.
	2411	+#define BIG64 18446744073709551615ull
	2412	+#define BIG32 4294967295ul
	2413	+#define BIG_OK (BIG64 / BIG32 == 4294967297ull && BIG64 % BIG32 == 0)
	2414	+#if !BIG_OK
	2415	+ #error "your preprocessor is broken"
	2416	+#endif
	2417	+#if BIG_OK
	2418	+#else
	2419	+ #error "your preprocessor is broken"
	2420	+#endif
	2421	+static long long int bignum = -9223372036854775807LL;
	2422	+static unsigned long long int ubignum = BIG64;
	2423	+
	2424	+struct incomplete_array
	2425	+{
	2426	+ int datasize;
	2427	+ double data[];
	2428	+};
	2429	+
	2430	+struct named_init {
	2431	+ int number;
	2432	+ const wchar_t *name;
	2433	+ double average;
	2434	+};
	2435	+
	2436	+typedef const char *ccp;
	2437	+
	2438	+static inline int
	2439	+test_restrict (ccp restrict text)
	2440	+{
	2441	+ // See if C++-style comments work.
	2442	+ // Iterate through items via the restricted pointer.
	2443	+ // Also check for declarations in for loops.
	2444	+ for (unsigned int i = 0; *(text+i) != '\''\0'\''; ++i)
	2445	+ continue;
	2446	+ return 0;
	2447	+}
	2448	+
	2449	+// Check varargs and va_copy.
	2450	+static bool
	2451	+test_varargs (const char *format, ...)
	2452	+{
	2453	+ va_list args;
	2454	+ va_start (args, format);
	2455	+ va_list args_copy;
	2456	+ va_copy (args_copy, args);
	2457	+
	2458	+ const char *str = "";
	2459	+ int number = 0;
	2460	+ float fnumber = 0;
	2461	+
	2462	+ while (*format)
	2463	+ {
	2464	+ switch (*format++)
	2465	+ {
	2466	+ case '\''s'\'': // string
	2467	+ str = va_arg (args_copy, const char *);
	2468	+ break;
	2469	+ case '\''d'\'': // int
	2470	+ number = va_arg (args_copy, int);
	2471	+ break;
	2472	+ case '\''f'\'': // float
	2473	+ fnumber = va_arg (args_copy, double);
	2474	+ break;
	2475	+ default:
	2476	+ break;
	2477	+ }
	2478	+ }
	2479	+ va_end (args_copy);
	2480	+ va_end (args);
	2481	+
	2482	+ return *str && number && fnumber;
	2483	+}
	2484	+'
	2485	+
	2486	+# Test code for whether the C compiler supports C99 (body of main).
	2487	+ac_c_conftest_c99_main='
	2488	+ // Check bool.
	2489	+ _Bool success = false;
	2490	+ success \|= (argc != 0);
	2491	+
	2492	+ // Check restrict.
	2493	+ if (test_restrict ("String literal") == 0)
	2494	+ success = true;
	2495	+ char *restrict newvar = "Another string";
	2496	+
	2497	+ // Check varargs.
	2498	+ success &= test_varargs ("s, d'\'' f .", "string", 65, 34.234);
	2499	+ test_varargs_macros ();
	2500	+
	2501	+ // Check flexible array members.
	2502	+ struct incomplete_array *ia =
	2503	+ malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10));
	2504	+ ia->datasize = 10;
	2505	+ for (int i = 0; i < ia->datasize; ++i)
	2506	+ ia->data[i] = i * 1.234;
	2507	+
	2508	+ // Check named initializers.
	2509	+ struct named_init ni = {
	2510	+ .number = 34,
	2511	+ .name = L"Test wide string",
	2512	+ .average = 543.34343,
	2513	+ };
	2514	+
	2515	+ ni.number = 58;
	2516	+
	2517	+ int dynamic_array[ni.number];
	2518	+ dynamic_array[0] = argv[0][0];
	2519	+ dynamic_array[ni.number - 1] = 543;
	2520	+
	2521	+ // work around unused variable warnings
	2522	+ ok \|= (!success \|\| bignum == 0LL \|\| ubignum == 0uLL \|\| newvar[0] == '\''x'\''
	2523	+ \|\| dynamic_array[ni.number - 1] != 543);
	2524	+'
	2525	+
	2526	+# Test code for whether the C compiler supports C11 (global declarations)
	2527	+ac_c_conftest_c11_globals='
	2528	+// Does the compiler advertise C11 conformance?
	2529	+#if !defined __STDC_VERSION__ \|\| __STDC_VERSION__ < 201112L
	2530	+# error "Compiler does not advertise C11 conformance"
	2531	+#endif
	2532	+
	2533	+// Check _Alignas.
	2534	+char _Alignas (double) aligned_as_double;
	2535	+char _Alignas (0) no_special_alignment;
	2536	+extern char aligned_as_int;
	2537	+char _Alignas (0) _Alignas (int) aligned_as_int;
	2538	+
	2539	+// Check _Alignof.
	2540	+enum
	2541	+{
	2542	+ int_alignment = _Alignof (int),
	2543	+ int_array_alignment = _Alignof (int[100]),
	2544	+ char_alignment = _Alignof (char)
	2545	+};
	2546	+_Static_assert (0 < -_Alignof (int), "_Alignof is signed");
	2547	+
	2548	+// Check _Noreturn.
	2549	+int _Noreturn does_not_return (void) { for (;;) continue; }
	2550	+
	2551	+// Check _Static_assert.
	2552	+struct test_static_assert
	2553	+{
	2554	+ int x;
	2555	+ _Static_assert (sizeof (int) <= sizeof (long int),
	2556	+ "_Static_assert does not work in struct");
	2557	+ long int y;
	2558	+};
	2559	+
	2560	+// Check UTF-8 literals.
	2561	+#define u8 syntax error!
	2562	+char const utf8_literal[] = u8"happens to be ASCII" "another string";
	2563	+
	2564	+// Check duplicate typedefs.
	2565	+typedef long *long_ptr;
	2566	+typedef long int *long_ptr;
	2567	+typedef long_ptr long_ptr;
	2568	+
	2569	+// Anonymous structures and unions -- taken from C11 6.7.2.1 Example 1.
	2570	+struct anonymous
	2571	+{
	2572	+ union {
	2573	+ struct { int i; int j; };
	2574	+ struct { int k; long int l; } w;
	2575	+ };
	2576	+ int m;
	2577	+} v1;
	2578	+'
	2579	+
	2580	+# Test code for whether the C compiler supports C11 (body of main).
	2581	+ac_c_conftest_c11_main='
	2582	+ _Static_assert ((offsetof (struct anonymous, i)
	2583	+ == offsetof (struct anonymous, w.k)),
	2584	+ "Anonymous union alignment botch");
	2585	+ v1.i = 2;
	2586	+ v1.w.k = 5;
	2587	+ ok \|= v1.i != 5;
	2588	+'
	2589	+
	2590	+# Test code for whether the C compiler supports C11 (complete).
	2591	+ac_c_conftest_c11_program="${ac_c_conftest_c89_globals}
	2592	+${ac_c_conftest_c99_globals}
	2593	+${ac_c_conftest_c11_globals}
	2594	+
	2595	+int
	2596	+main (int argc, char **argv)
	2597	+{
	2598	+ int ok = 0;
	2599	+ ${ac_c_conftest_c89_main}
	2600	+ ${ac_c_conftest_c99_main}
	2601	+ ${ac_c_conftest_c11_main}
	2602	+ return ok;
	2603	+}
	2604	+"
	2605	+
	2606	+# Test code for whether the C compiler supports C99 (complete).
	2607	+ac_c_conftest_c99_program="${ac_c_conftest_c89_globals}
	2608	+${ac_c_conftest_c99_globals}
	2609	+
	2610	+int
	2611	+main (int argc, char **argv)
	2612	+{
	2613	+ int ok = 0;
	2614	+ ${ac_c_conftest_c89_main}
	2615	+ ${ac_c_conftest_c99_main}
	2616	+ return ok;
	2617	+}
	2618	+"
	2619	+
	2620	+# Test code for whether the C compiler supports C89 (complete).
	2621	+ac_c_conftest_c89_program="${ac_c_conftest_c89_globals}
	2622	+
	2623	+int
	2624	+main (int argc, char **argv)
	2625	+{
	2626	+ int ok = 0;
	2627	+ ${ac_c_conftest_c89_main}
	2628	+ return ok;
	2629	+}
	2630	+"
	2631	+
	2632	+as_fn_append ac_header_c_list " stdio.h stdio_h HAVE_STDIO_H"
	2633	+as_fn_append ac_header_c_list " stdlib.h stdlib_h HAVE_STDLIB_H"
	2634	+as_fn_append ac_header_c_list " string.h string_h HAVE_STRING_H"
	2635	+as_fn_append ac_header_c_list " inttypes.h inttypes_h HAVE_INTTYPES_H"
	2636	+as_fn_append ac_header_c_list " stdint.h stdint_h HAVE_STDINT_H"
	2637	+as_fn_append ac_header_c_list " strings.h strings_h HAVE_STRINGS_H"
	2638	+as_fn_append ac_header_c_list " sys/stat.h sys_stat_h HAVE_SYS_STAT_H"
	2639	+as_fn_append ac_header_c_list " sys/types.h sys_types_h HAVE_SYS_TYPES_H"
	2640	+as_fn_append ac_header_c_list " unistd.h unistd_h HAVE_UNISTD_H"
	2641	+
	2642	+# Auxiliary files required by this configure script.
	2643	+ac_aux_files="compile ltmain.sh config.guess config.sub missing install-sh"
	2644	+
	2645	+# Locations in which to look for auxiliary files.
	2646	+ac_aux_dir_candidates="${srcdir}${PATH_SEPARATOR}${srcdir}/..${PATH_SEPARATOR}${srcdir}/../.."
	2647	+
	2648	+# Search for a directory containing all of the required auxiliary files,
	2649	+# $ac_aux_files, from the $PATH-style list $ac_aux_dir_candidates.
	2650	+# If we don't find one directory that contains all the files we need,
	2651	+# we report the set of missing files from the first directory in
	2652	+# $ac_aux_dir_candidates and give up.
	2653	+ac_missing_aux_files=""
	2654	+ac_first_candidate=:
	2655	+printf "%s\n" "$as_me:${as_lineno-$LINENO}: looking for aux files: $ac_aux_files" >&5
	2656	+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
	2657	+as_found=false
	2658	+for as_dir in $ac_aux_dir_candidates
	2659	+do
	2660	+ IFS=$as_save_IFS
	2661	+ case $as_dir in #(((
	2662	+ '') as_dir=./ ;;
	2663	+ */) ;;
	2664	+ *) as_dir=$as_dir/ ;;
	2665	+ esac
	2666	+ as_found=:
	2667	+
	2668	+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: trying $as_dir" >&5
	2669	+ ac_aux_dir_found=yes
	2670	+ ac_install_sh=
	2671	+ for ac_aux in $ac_aux_files
	2672	+ do
	2673	+ # As a special case, if "install-sh" is required, that requirement
	2674	+ # can be satisfied by any of "install-sh", "install.sh", or "shtool",
	2675	+ # and $ac_install_sh is set appropriately for whichever one is found.
	2676	+ if test x"$ac_aux" = x"install-sh"
	2677	+ then
	2678	+ if test -f "${as_dir}install-sh"; then
	2679	+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}install-sh found" >&5
	2680	+ ac_install_sh="${as_dir}install-sh -c"
	2681	+ elif test -f "${as_dir}install.sh"; then
	2682	+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}install.sh found" >&5
	2683	+ ac_install_sh="${as_dir}install.sh -c"
	2684	+ elif test -f "${as_dir}shtool"; then
	2685	+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}shtool found" >&5
	2686	+ ac_install_sh="${as_dir}shtool install -c"
	2687	+ else
	2688	+ ac_aux_dir_found=no
	2689	+ if $ac_first_candidate; then
	2690	+ ac_missing_aux_files="${ac_missing_aux_files} install-sh"
	2691	+ else
	2692	+ break
	2693	+ fi
	2694	+ fi
	2695	+ else
	2696	+ if test -f "${as_dir}${ac_aux}"; then
	2697	+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}${ac_aux} found" >&5
	2698	+ else
	2699	+ ac_aux_dir_found=no
	2700	+ if $ac_first_candidate; then
	2701	+ ac_missing_aux_files="${ac_missing_aux_files} ${ac_aux}"
	2702	+ else
	2703	+ break
	2704	+ fi
	2705	+ fi
	2706	+ fi
	2707	+ done
	2708	+ if test "$ac_aux_dir_found" = yes; then
	2709	+ ac_aux_dir="$as_dir"
	2710	+ break
	2711	+ fi
	2712	+ ac_first_candidate=false
	2713	+
	2714	+ as_found=false
	2715	+done
	2716	+IFS=$as_save_IFS
	2717	+if $as_found
	2718	+then :
	2719	+
	2720	+else $as_nop
	2721	+ as_fn_error $? "cannot find required auxiliary files:$ac_missing_aux_files" "$LINENO" 5
	2722	+fi
	2723	+
	2724	+
	2725	+# These three variables are undocumented and unsupported,
	2726	+# and are intended to be withdrawn in a future Autoconf release.
	2727	+# They can cause serious problems if a builder's source tree is in a directory
	2728	+# whose full name contains unusual characters.
	2729	+if test -f "${ac_aux_dir}config.guess"; then
	2730	+ ac_config_guess="$SHELL ${ac_aux_dir}config.guess"
	2731	+fi
	2732	+if test -f "${ac_aux_dir}config.sub"; then
	2733	+ ac_config_sub="$SHELL ${ac_aux_dir}config.sub"
	2734	+fi
	2735	+if test -f "$ac_aux_dir/configure"; then
	2736	+ ac_configure="$SHELL ${ac_aux_dir}configure"
	2737	+fi
	2738	+
2411	2739	# Check that the precious variables saved in the cache have kept the same
2412	2740	# value.
2413	2741	ac_cache_corrupted=false

		@@ -2418,12 +2746,12 @@
2418	2746	eval ac_new_val=\$ac_env_${ac_var}_value
2419	2747	case $ac_old_set,$ac_new_set in
2420	2748	set,)
2421		- { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
2422		-$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
	2749	+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
	2750	+printf "%s\n" "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
2423	2751	ac_cache_corrupted=: ;;
2424	2752	,set)
2425		- { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
2426		-$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
	2753	+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
	2754	+printf "%s\n" "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
2427	2755	ac_cache_corrupted=: ;;
2428	2756	,);;
2429	2757	*)

		@@ -2432,24 +2760,24 @@
2432	2760	ac_old_val_w=`echo x $ac_old_val`
2433	2761	ac_new_val_w=`echo x $ac_new_val`
2434	2762	if test "$ac_old_val_w" != "$ac_new_val_w"; then
2435		- { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
2436		-$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
	2763	+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
	2764	+printf "%s\n" "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
2437	2765	ac_cache_corrupted=:
2438	2766	else
2439		- { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
2440		-$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
	2767	+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
	2768	+printf "%s\n" "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
2441	2769	eval $ac_var=\$ac_old_val
2442	2770	fi
2443		- { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5
2444		-$as_echo "$as_me: former value: \`$ac_old_val'" >&2;}
2445		- { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5
2446		-$as_echo "$as_me: current value: \`$ac_new_val'" >&2;}
	2771	+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5
	2772	+printf "%s\n" "$as_me: former value: \`$ac_old_val'" >&2;}
	2773	+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5
	2774	+printf "%s\n" "$as_me: current value: \`$ac_new_val'" >&2;}
2447	2775	fi;;
2448	2776	esac
2449	2777	# Pass precious variables to config.status.
2450	2778	if test "$ac_new_set" = set; then
2451	2779	case $ac_new_val in
2452		- \') ac_arg=$ac_var=`$as_echo "$ac_new_val" \| sed "s/'/'\\\\\\\\''/g"` ;;
	2780	+ \') ac_arg=$ac_var=`printf "%s\n" "$ac_new_val" \| sed "s/'/'\\\\\\\\''/g"` ;;
2453	2781	*) ac_arg=$ac_var=$ac_new_val ;;
2454	2782	esac
2455	2783	case " $ac_configure_args " in

		@@ -2459,11 +2787,12 @@
2459	2787	fi
2460	2788	done
2461	2789	if $ac_cache_corrupted; then
2462		- { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
2463		-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
2464		- { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
2465		-$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
2466		- as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
	2790	+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
	2791	+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
	2792	+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
	2793	+printf "%s\n" "$as_me: error: changes in the environment can compromise the build" >&2;}
	2794	+ as_fn_error $? "run \`${MAKE-make} distclean' and/or \`rm $cache_file'
	2795	+ and start over" "$LINENO" 5
2467	2796	fi
2468	2797	## -------------------- ##
2469	2798	## Main body of script. ##

		@@ -2481,7 +2810,8 @@
2481	2810
2482	2811
2483	2812	# Check whether --enable-silent-rules was given.
2484		-if test "${enable_silent_rules+set}" = set; then :
	2813	+if test ${enable_silent_rules+y}
	2814	+then :
2485	2815	enableval=$enable_silent_rules;
2486	2816	fi
2487	2817

		@@ -2491,12 +2821,13 @@
2491	2821	*) AM_DEFAULT_VERBOSITY=0;;
2492	2822	esac
2493	2823	am_make=${MAKE-make}
2494		-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
2495		-$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
2496		-if ${am_cv_make_support_nested_variables+:} false; then :
2497		- $as_echo_n "(cached) " >&6
2498		-else
2499		- if $as_echo 'TRUE=$(BAR$(V))
	2824	+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
	2825	+printf %s "checking whether $am_make supports nested variables... " >&6; }
	2826	+if test ${am_cv_make_support_nested_variables+y}
	2827	+then :
	2828	+ printf %s "(cached) " >&6
	2829	+else $as_nop
	2830	+ if printf "%s\n" 'TRUE=$(BAR$(V))
2500	2831	BAR0=false
2501	2832	BAR1=true
2502	2833	V=1

		@@ -2508,8 +2839,8 @@
2508	2839	am_cv_make_support_nested_variables=no
2509	2840	fi
2510	2841	fi
2511		-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
2512		-$as_echo "$am_cv_make_support_nested_variables" >&6; }
	2842	+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
	2843	+printf "%s\n" "$am_cv_make_support_nested_variables" >&6; }
2513	2844	if test $am_cv_make_support_nested_variables = yes; then
2514	2845	AM_V='$(V)'
2515	2846	AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'

		@@ -2522,7 +2853,7 @@
2522	2853
2523	2854
2524	2855	SPEEXDSP_LT_CURRENT=6
2525		-SPEEXDSP_LT_REVISION=1
	2856	+SPEEXDSP_LT_REVISION=2
2526	2857	SPEEXDSP_LT_AGE=5
2527	2858
2528	2859

		@@ -2532,36 +2863,9 @@
2532	2863
2533	2864	am__api_version='1.16'
2534	2865
2535		-ac_aux_dir=
2536		-for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
2537		- if test -f "$ac_dir/install-sh"; then
2538		- ac_aux_dir=$ac_dir
2539		- ac_install_sh="$ac_aux_dir/install-sh -c"
2540		- break
2541		- elif test -f "$ac_dir/install.sh"; then
2542		- ac_aux_dir=$ac_dir
2543		- ac_install_sh="$ac_aux_dir/install.sh -c"
2544		- break
2545		- elif test -f "$ac_dir/shtool"; then
2546		- ac_aux_dir=$ac_dir
2547		- ac_install_sh="$ac_aux_dir/shtool install -c"
2548		- break
2549		- fi
2550		-done
2551		-if test -z "$ac_aux_dir"; then
2552		- as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
2553		-fi
2554		-
2555		-# These three variables are undocumented and unsupported,
2556		-# and are intended to be withdrawn in a future Autoconf release.
2557		-# They can cause serious problems if a builder's source tree is in a directory
2558		-# whose full name contains unusual characters.
2559		-ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var.
2560		-ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var.
2561		-ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
2562		-
2563		-
2564		-# Find a good install program. We prefer a C program (faster),
	2866	+
	2867	+
	2868	+ # Find a good install program. We prefer a C program (faster),
2565	2869	# so one script is as good as another. But avoid the broken or
2566	2870	# incompatible versions:
2567	2871	# SysV /etc/install, /usr/sbin/install

		@@ -2575,20 +2879,25 @@
2575	2879	# OS/2's system install, which has a completely different semantic
2576	2880	# ./install, which can be erroneously created by make from ./install.sh.
2577	2881	# Reject install programs that cannot install multiple files.
2578		-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
2579		-$as_echo_n "checking for a BSD-compatible install... " >&6; }
	2882	+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
	2883	+printf %s "checking for a BSD-compatible install... " >&6; }
2580	2884	if test -z "$INSTALL"; then
2581		-if ${ac_cv_path_install+:} false; then :
2582		- $as_echo_n "(cached) " >&6
2583		-else
	2885	+if test ${ac_cv_path_install+y}
	2886	+then :
	2887	+ printf %s "(cached) " >&6
	2888	+else $as_nop
2584	2889	as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
2585	2890	for as_dir in $PATH
2586	2891	do
2587	2892	IFS=$as_save_IFS
2588		- test -z "$as_dir" && as_dir=.
2589		- # Account for people who put trailing slashes in PATH elements.
2590		-case $as_dir/ in #((
2591		- ./ \| .// \| /[cC]/* \| \
	2893	+ case $as_dir in #(((
	2894	+ '') as_dir=./ ;;
	2895	+ */) ;;
	2896	+ *) as_dir=$as_dir/ ;;
	2897	+ esac
	2898	+ # Account for fact that we put trailing slashes in our PATH walk.
	2899	+case $as_dir in #((
	2900	+ ./ \| /[cC]/* \| \
2592	2901	/etc/* \| /usr/sbin/* \| /usr/etc/* \| /sbin/* \| /usr/afsws/bin/* \| \
2593	2902	?:[\\/]os2[\\/]install[\\/]* \| ?:[\\/]OS2[\\/]INSTALL[\\/]* \| \
2594	2903	/usr/ucb/* ) ;;

		@@ -2598,13 +2907,13 @@
2598	2907	# by default.
2599	2908	for ac_prog in ginstall scoinst install; do
2600	2909	for ac_exec_ext in '' $ac_executable_extensions; do
2601		- if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
	2910	+ if as_fn_executable_p "$as_dir$ac_prog$ac_exec_ext"; then
2602	2911	if test $ac_prog = install &&
2603		- grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
	2912	+ grep dspmsg "$as_dir$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
2604	2913	# AIX install. It has an incompatible calling convention.
2605	2914	:
2606	2915	elif test $ac_prog = install &&
2607		- grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
	2916	+ grep pwplus "$as_dir$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
2608	2917	# program-specific install script used by HP pwplus--don't use.
2609	2918	:
2610	2919	else

		@@ -2612,12 +2921,12 @@
2612	2921	echo one > conftest.one
2613	2922	echo two > conftest.two
2614	2923	mkdir conftest.dir
2615		- if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
	2924	+ if "$as_dir$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir/" &&
2616	2925	test -s conftest.one && test -s conftest.two &&
2617	2926	test -s conftest.dir/conftest.one &&
2618	2927	test -s conftest.dir/conftest.two
2619	2928	then
2620		- ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
	2929	+ ac_cv_path_install="$as_dir$ac_prog$ac_exec_ext -c"
2621	2930	break 3
2622	2931	fi
2623	2932	fi

		@@ -2633,7 +2942,7 @@
2633	2942	rm -rf conftest.one conftest.two conftest.dir
2634	2943
2635	2944	fi
2636		- if test "${ac_cv_path_install+set}" = set; then
	2945	+ if test ${ac_cv_path_install+y}; then
2637	2946	INSTALL=$ac_cv_path_install
2638	2947	else
2639	2948	# As a last resort, use the slow shell script. Don't cache a

		@@ -2643,8 +2952,8 @@
2643	2952	INSTALL=$ac_install_sh
2644	2953	fi
2645	2954	fi
2646		-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
2647		-$as_echo "$INSTALL" >&6; }
	2955	+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
	2956	+printf "%s\n" "$INSTALL" >&6; }
2648	2957
2649	2958	# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
2650	2959	# It thinks the first close brace ends the variable substitution.

		@@ -2654,8 +2963,8 @@
2654	2963
2655	2964	test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
2656	2965
2657		-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
2658		-$as_echo_n "checking whether build environment is sane... " >&6; }
	2966	+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
	2967	+printf %s "checking whether build environment is sane... " >&6; }
2659	2968	# Reject unsafe characters in $srcdir or the absolute working directory
2660	2969	# name. Accept space and tab only in the latter.
2661	2970	am_lf='

		@@ -2709,8 +3018,8 @@
2709	3018	as_fn_error $? "newly created file is older than distributed files!
2710	3019	Check your system clock" "$LINENO" 5
2711	3020	fi
2712		-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
2713		-$as_echo "yes" >&6; }
	3021	+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
	3022	+printf "%s\n" "yes" >&6; }
2714	3023	# If we didn't sleep, we still need to ensure time stamps of config.status and
2715	3024	# generated files are strictly newer.
2716	3025	am_sleep_pid=

		@@ -2729,26 +3038,23 @@
2729	3038	# Double any \ or $.
2730	3039	# By default was `s,x,x', remove it if useless.
2731	3040	ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
2732		-program_transform_name=`$as_echo "$program_transform_name" \| sed "$ac_script"`
	3041	+program_transform_name=`printf "%s\n" "$program_transform_name" \| sed "$ac_script"`
	3042	+
2733	3043
2734	3044	# Expand $ac_aux_dir to an absolute path.
2735	3045	am_aux_dir=`cd "$ac_aux_dir" && pwd`
2736	3046
2737		-if test x"${MISSING+set}" != xset; then
2738		- case $am_aux_dir in
2739		- \ \| \ )
2740		- MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
2741		- *)
2742		- MISSING="\${SHELL} $am_aux_dir/missing" ;;
2743		- esac
	3047	+
	3048	+ if test x"${MISSING+set}" != xset; then
	3049	+ MISSING="\${SHELL} '$am_aux_dir/missing'"
2744	3050	fi
2745	3051	# Use eval to expand $SHELL
2746	3052	if eval "$MISSING --is-lightweight"; then
2747	3053	am_missing_run="$MISSING "
2748	3054	else
2749	3055	am_missing_run=
2750		- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
2751		-$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
	3056	+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
	3057	+printf "%s\n" "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
2752	3058	fi
2753	3059
2754	3060	if test x"${install_sh+set}" != xset; then

		@@ -2768,11 +3074,12 @@
2768	3074	if test -n "$ac_tool_prefix"; then
2769	3075	# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
2770	3076	set dummy ${ac_tool_prefix}strip; ac_word=$2
2771		-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2772		-$as_echo_n "checking for $ac_word... " >&6; }
2773		-if ${ac_cv_prog_STRIP+:} false; then :
2774		- $as_echo_n "(cached) " >&6
2775		-else
	3077	+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
	3078	+printf %s "checking for $ac_word... " >&6; }
	3079	+if test ${ac_cv_prog_STRIP+y}
	3080	+then :
	3081	+ printf %s "(cached) " >&6
	3082	+else $as_nop
2776	3083	if test -n "$STRIP"; then
2777	3084	ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
2778	3085	else

		@@ -2780,11 +3087,15 @@
2780	3087	for as_dir in $PATH
2781	3088	do
2782	3089	IFS=$as_save_IFS
2783		- test -z "$as_dir" && as_dir=.
	3090	+ case $as_dir in #(((
	3091	+ '') as_dir=./ ;;
	3092	+ */) ;;
	3093	+ *) as_dir=$as_dir/ ;;
	3094	+ esac
2784	3095	for ac_exec_ext in '' $ac_executable_extensions; do
2785		- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
	3096	+ if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
2786	3097	ac_cv_prog_STRIP="${ac_tool_prefix}strip"
2787		- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
	3098	+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
2788	3099	break 2
2789	3100	fi
2790	3101	done

		@@ -2795,11 +3106,11 @@
2795	3106	fi
2796	3107	STRIP=$ac_cv_prog_STRIP
2797	3108	if test -n "$STRIP"; then
2798		- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
2799		-$as_echo "$STRIP" >&6; }
2800		-else
2801		- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
2802		-$as_echo "no" >&6; }
	3109	+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
	3110	+printf "%s\n" "$STRIP" >&6; }
	3111	+else
	3112	+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
	3113	+printf "%s\n" "no" >&6; }
2803	3114	fi
2804	3115
2805	3116

		@@ -2808,11 +3119,12 @@
2808	3119	ac_ct_STRIP=$STRIP
2809	3120	# Extract the first word of "strip", so it can be a program name with args.
2810	3121	set dummy strip; ac_word=$2
2811		-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2812		-$as_echo_n "checking for $ac_word... " >&6; }
2813		-if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
2814		- $as_echo_n "(cached) " >&6
2815		-else
	3122	+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
	3123	+printf %s "checking for $ac_word... " >&6; }
	3124	+if test ${ac_cv_prog_ac_ct_STRIP+y}
	3125	+then :
	3126	+ printf %s "(cached) " >&6
	3127	+else $as_nop
2816	3128	if test -n "$ac_ct_STRIP"; then
2817	3129	ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
2818	3130	else

		@@ -2820,11 +3132,15 @@
2820	3132	for as_dir in $PATH
2821	3133	do
2822	3134	IFS=$as_save_IFS
2823		- test -z "$as_dir" && as_dir=.
	3135	+ case $as_dir in #(((
	3136	+ '') as_dir=./ ;;
	3137	+ */) ;;
	3138	+ *) as_dir=$as_dir/ ;;
	3139	+ esac
2824	3140	for ac_exec_ext in '' $ac_executable_extensions; do
2825		- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
	3141	+ if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
2826	3142	ac_cv_prog_ac_ct_STRIP="strip"
2827		- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
	3143	+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
2828	3144	break 2
2829	3145	fi
2830	3146	done

		@@ -2835,11 +3151,11 @@
2835	3151	fi
2836	3152	ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
2837	3153	if test -n "$ac_ct_STRIP"; then
2838		- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
2839		-$as_echo "$ac_ct_STRIP" >&6; }
2840		-else
2841		- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
2842		-$as_echo "no" >&6; }
	3154	+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
	3155	+printf "%s\n" "$ac_ct_STRIP" >&6; }
	3156	+else
	3157	+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
	3158	+printf "%s\n" "no" >&6; }
2843	3159	fi
2844	3160
2845	3161	if test "x$ac_ct_STRIP" = x; then

		@@ -2847,8 +3163,8 @@
2847	3163	else
2848	3164	case $cross_compiling:$ac_tool_warned in
2849	3165	yes:)
2850		-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
2851		-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
	3166	+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
	3167	+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
2852	3168	ac_tool_warned=yes ;;
2853	3169	esac
2854	3170	STRIP=$ac_ct_STRIP

		@@ -2860,25 +3176,31 @@
2860	3176	fi
2861	3177	INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
2862	3178
2863		-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
2864		-$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
	3179	+
	3180	+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a race-free mkdir -p" >&5
	3181	+printf %s "checking for a race-free mkdir -p... " >&6; }
2865	3182	if test -z "$MKDIR_P"; then
2866		- if ${ac_cv_path_mkdir+:} false; then :
2867		- $as_echo_n "(cached) " >&6
2868		-else
	3183	+ if test ${ac_cv_path_mkdir+y}
	3184	+then :
	3185	+ printf %s "(cached) " >&6
	3186	+else $as_nop
2869	3187	as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
2870	3188	for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
2871	3189	do
2872	3190	IFS=$as_save_IFS
2873		- test -z "$as_dir" && as_dir=.
	3191	+ case $as_dir in #(((
	3192	+ '') as_dir=./ ;;
	3193	+ */) ;;
	3194	+ *) as_dir=$as_dir/ ;;
	3195	+ esac
2874	3196	for ac_prog in mkdir gmkdir; do
2875	3197	for ac_exec_ext in '' $ac_executable_extensions; do
2876		- as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" \|\| continue
2877		- case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
2878		- 'mkdir (GNU coreutils) '* \| \
2879		- 'mkdir (coreutils) '* \| \
	3198	+ as_fn_executable_p "$as_dir$ac_prog$ac_exec_ext" \|\| continue
	3199	+ case `"$as_dir$ac_prog$ac_exec_ext" --version 2>&1` in #(
	3200	+ 'mkdir (''coreutils) ' \| \
	3201	+ 'BusyBox '* \| \
2880	3202	'mkdir (fileutils) '4.1*)
2881		- ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
	3203	+ ac_cv_path_mkdir=$as_dir$ac_prog$ac_exec_ext
2882	3204	break 3;;
2883	3205	esac
2884	3206	done

		@@ -2889,7 +3211,7 @@
2889	3211	fi
2890	3212
2891	3213	test -d ./--version && rmdir ./--version
2892		- if test "${ac_cv_path_mkdir+set}" = set; then
	3214	+ if test ${ac_cv_path_mkdir+y}; then
2893	3215	MKDIR_P="$ac_cv_path_mkdir -p"
2894	3216	else
2895	3217	# As a last resort, use the slow shell script. Don't cache a

		@@ -2899,18 +3221,19 @@
2899	3221	MKDIR_P="$ac_install_sh -d"
2900	3222	fi
2901	3223	fi
2902		-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
2903		-$as_echo "$MKDIR_P" >&6; }
	3224	+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
	3225	+printf "%s\n" "$MKDIR_P" >&6; }
2904	3226
2905	3227	for ac_prog in gawk mawk nawk awk
2906	3228	do
2907	3229	# Extract the first word of "$ac_prog", so it can be a program name with args.
2908	3230	set dummy $ac_prog; ac_word=$2
2909		-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2910		-$as_echo_n "checking for $ac_word... " >&6; }
2911		-if ${ac_cv_prog_AWK+:} false; then :
2912		- $as_echo_n "(cached) " >&6
2913		-else
	3231	+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
	3232	+printf %s "checking for $ac_word... " >&6; }
	3233	+if test ${ac_cv_prog_AWK+y}
	3234	+then :
	3235	+ printf %s "(cached) " >&6
	3236	+else $as_nop
2914	3237	if test -n "$AWK"; then
2915	3238	ac_cv_prog_AWK="$AWK" # Let the user override the test.
2916	3239	else

		@@ -2918,11 +3241,15 @@
2918	3241	for as_dir in $PATH
2919	3242	do
2920	3243	IFS=$as_save_IFS
2921		- test -z "$as_dir" && as_dir=.
	3244	+ case $as_dir in #(((
	3245	+ '') as_dir=./ ;;
	3246	+ */) ;;
	3247	+ *) as_dir=$as_dir/ ;;
	3248	+ esac
2922	3249	for ac_exec_ext in '' $ac_executable_extensions; do
2923		- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
	3250	+ if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
2924	3251	ac_cv_prog_AWK="$ac_prog"
2925		- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
	3252	+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
2926	3253	break 2
2927	3254	fi
2928	3255	done

		@@ -2933,24 +3260,25 @@
2933	3260	fi
2934	3261	AWK=$ac_cv_prog_AWK
2935	3262	if test -n "$AWK"; then
2936		- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
2937		-$as_echo "$AWK" >&6; }
2938		-else
2939		- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
2940		-$as_echo "no" >&6; }
	3263	+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
	3264	+printf "%s\n" "$AWK" >&6; }
	3265	+else
	3266	+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
	3267	+printf "%s\n" "no" >&6; }
2941	3268	fi
2942	3269
2943	3270
2944	3271	test -n "$AWK" && break
2945	3272	done
2946	3273
2947		-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
2948		-$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
	3274	+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
	3275	+printf %s "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
2949	3276	set x ${MAKE-make}
2950		-ac_make=`$as_echo "$2" \| sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
2951		-if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
2952		- $as_echo_n "(cached) " >&6
2953		-else
	3277	+ac_make=`printf "%s\n" "$2" \| sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
	3278	+if eval test \${ac_cv_prog_make_${ac_make}_set+y}
	3279	+then :
	3280	+ printf %s "(cached) " >&6
	3281	+else $as_nop
2954	3282	cat >conftest.make <<\_ACEOF
2955	3283	SHELL = /bin/sh
2956	3284	all:

		@@ -2966,12 +3294,12 @@
2966	3294	rm -f conftest.make
2967	3295	fi
2968	3296	if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
2969		- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
2970		-$as_echo "yes" >&6; }
	3297	+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
	3298	+printf "%s\n" "yes" >&6; }
2971	3299	SET_MAKE=
2972	3300	else
2973		- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
2974		-$as_echo "no" >&6; }
	3301	+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
	3302	+printf "%s\n" "no" >&6; }
2975	3303	SET_MAKE="MAKE=${MAKE-make}"
2976	3304	fi
2977	3305

		@@ -3006,7 +3334,7 @@
3006	3334
3007	3335	# Define the identity of the package.
3008	3336	PACKAGE='speexdsp'
3009		- VERSION='1.2.0'
	3337	+ VERSION='1.2.1'
3010	3338
3011	3339
3012	3340	# Some tools Automake needs.

		@@ -3047,6 +3375,20 @@
3047	3375
3048	3376
3049	3377
	3378	+# Variables for tags utilities; see am/tags.am
	3379	+if test -z "$CTAGS"; then
	3380	+ CTAGS=ctags
	3381	+fi
	3382	+
	3383	+if test -z "$ETAGS"; then
	3384	+ ETAGS=etags
	3385	+fi
	3386	+
	3387	+if test -z "$CSCOPE"; then
	3388	+ CSCOPE=cscope
	3389	+fi
	3390	+
	3391	+
3050	3392
3051	3393	# POSIX will say in a future version that running "rm -f" with no argument
3052	3394	# is OK; and we want to be able to make that assumption in our Makefile

		@@ -3091,17 +3433,18 @@
3091	3433	fi
3092	3434
3093	3435
3094		-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
3095		-$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
	3436	+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
	3437	+printf %s "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
3096	3438	# Check whether --enable-maintainer-mode was given.
3097		-if test "${enable_maintainer_mode+set}" = set; then :
	3439	+if test ${enable_maintainer_mode+y}
	3440	+then :
3098	3441	enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
3099		-else
	3442	+else $as_nop
3100	3443	USE_MAINTAINER_MODE=yes
3101	3444	fi
3102	3445
3103		- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5
3104		-$as_echo "$USE_MAINTAINER_MODE" >&6; }
	3446	+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5
	3447	+printf "%s\n" "$USE_MAINTAINER_MODE" >&6; }
3105	3448	if test $USE_MAINTAINER_MODE = yes; then
3106	3449	MAINTAINER_MODE_TRUE=
3107	3450	MAINTAINER_MODE_FALSE='#'

		@@ -3114,26 +3457,29 @@
3114	3457
3115	3458
3116	3459
3117		-# Make sure we can run config.sub.
3118		-$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 \|\|
3119		- as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
3120		-
3121		-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
3122		-$as_echo_n "checking build system type... " >&6; }
3123		-if ${ac_cv_build+:} false; then :
3124		- $as_echo_n "(cached) " >&6
3125		-else
	3460	+
	3461	+
	3462	+ # Make sure we can run config.sub.
	3463	+$SHELL "${ac_aux_dir}config.sub" sun4 >/dev/null 2>&1 \|\|
	3464	+ as_fn_error $? "cannot run $SHELL ${ac_aux_dir}config.sub" "$LINENO" 5
	3465	+
	3466	+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
	3467	+printf %s "checking build system type... " >&6; }
	3468	+if test ${ac_cv_build+y}
	3469	+then :
	3470	+ printf %s "(cached) " >&6
	3471	+else $as_nop
3126	3472	ac_build_alias=$build_alias
3127	3473	test "x$ac_build_alias" = x &&
3128		- ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
	3474	+ ac_build_alias=`$SHELL "${ac_aux_dir}config.guess"`
3129	3475	test "x$ac_build_alias" = x &&
3130	3476	as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
3131		-ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` \|\|
3132		- as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
3133		-
3134		-fi
3135		-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
3136		-$as_echo "$ac_cv_build" >&6; }
	3477	+ac_cv_build=`$SHELL "${ac_aux_dir}config.sub" $ac_build_alias` \|\|
	3478	+ as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $ac_build_alias failed" "$LINENO" 5
	3479	+
	3480	+fi
	3481	+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
	3482	+printf "%s\n" "$ac_cv_build" >&6; }
3137	3483	case $ac_cv_build in
3138	3484	--*) ;;
3139	3485	*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;

		@@ -3152,21 +3498,22 @@
3152	3498	case $build_os in \ ) build_os=`echo "$build_os" \| sed 's/ /-/g'`;; esac
3153	3499
3154	3500
3155		-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
3156		-$as_echo_n "checking host system type... " >&6; }
3157		-if ${ac_cv_host+:} false; then :
3158		- $as_echo_n "(cached) " >&6
3159		-else
	3501	+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
	3502	+printf %s "checking host system type... " >&6; }
	3503	+if test ${ac_cv_host+y}
	3504	+then :
	3505	+ printf %s "(cached) " >&6
	3506	+else $as_nop
3160	3507	if test "x$host_alias" = x; then
3161	3508	ac_cv_host=$ac_cv_build
3162	3509	else
3163		- ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` \|\|
3164		- as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
3165		-fi
3166		-
3167		-fi
3168		-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
3169		-$as_echo "$ac_cv_host" >&6; }
	3510	+ ac_cv_host=`$SHELL "${ac_aux_dir}config.sub" $host_alias` \|\|
	3511	+ as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $host_alias failed" "$LINENO" 5
	3512	+fi
	3513	+
	3514	+fi
	3515	+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
	3516	+printf "%s\n" "$ac_cv_host" >&6; }
3170	3517	case $ac_cv_host in
3171	3518	--*) ;;
3172	3519	*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;

		@@ -3192,11 +3539,12 @@
3192	3539	if test -n "$ac_tool_prefix"; then
3193	3540	# Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
3194	3541	set dummy ${ac_tool_prefix}as; ac_word=$2
3195		-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
3196		-$as_echo_n "checking for $ac_word... " >&6; }
3197		-if ${ac_cv_prog_AS+:} false; then :
3198		- $as_echo_n "(cached) " >&6
3199		-else
	3542	+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
	3543	+printf %s "checking for $ac_word... " >&6; }
	3544	+if test ${ac_cv_prog_AS+y}
	3545	+then :
	3546	+ printf %s "(cached) " >&6
	3547	+else $as_nop
3200	3548	if test -n "$AS"; then
3201	3549	ac_cv_prog_AS="$AS" # Let the user override the test.
3202	3550	else

		@@ -3204,11 +3552,15 @@
3204	3552	for as_dir in $PATH
3205	3553	do
3206	3554	IFS=$as_save_IFS
3207		- test -z "$as_dir" && as_dir=.
	3555	+ case $as_dir in #(((
	3556	+ '') as_dir=./ ;;
	3557<