开源软件构建与测试

_service:tar_scm:libX11.spec Changed

@@ -1,5 +1,5 @@
 Name:		libX11
-Version:	1.8.1
+Version:	1.8.4
 Release:	1
 Summary:	Core X11 protocol client library
 License:	MIT
@@ -7,6 +7,7 @@
 Source0:	https://xorg.freedesktop.org/archive/individual/lib/%{name}-%{version}.tar.xz
 
 Patch1: dont-forward-keycode-0.patch
+#Patch6001:	backport-CVE-2022-3554.patch
 
 BuildRequires:	xorg-x11-util-macros >= 1.11 xorg-x11-proto-devel perl-Pod-Usage libXau-devel
 BuildRequires: libxcb-devel >= 1.2 libXdmcp-devel xorg-x11-xtrans-devel >= 1.0.3-4 make
@@ -34,7 +35,11 @@
 
 %build
 autoreconf -ivf
-%configure --disable-silent-rules
+%if 0%{?build_cross} == 1
+%configure --disable-silent-rules --enable-malloc0returnsnull --disable-static
+%else
+%configure --disable-silent-rules --disable-static
+%endif
 %make_build
 
 %install
@@ -61,7 +66,6 @@
 
 %files devel
 %defattr(-,root,root)
-%{_libdir}/*.a
 %{_libdir}/*.so
 %{_includedir}/X11/*.h
 %{_libdir}/pkgconfig/*.pc
@@ -69,10 +73,22 @@
 
 %files help
 %defattr(-,root,root)
-%doc README.md NEWS ChangeLog
+%doc README.md ChangeLog
 %{_mandir}/*/*
 
 %changelog
+* Wed Apr 12 2023 liweiganga <liweiganga@uniontech.com> - 1.8.4-1
+- update to 1.8.4
+
+* Tue Apr 11 2023 zhangpan <zhangpan103@h-partners.com> - 1.8.1-4
+- add build options for i686
+
+* Fri Nov 04 2022 wangkerong <wangkerong@h-partners.com> - 1.8.1-3
+- disable static library
+
+* Mon Oct 24 2022 zhouwenpei <zhouwenpei1@h-partners.com> - 1.8.1-2
+- fix CVE-2022-3554
+
 * Mon Jun 20 2022 lin zhang <lin.zhang@turbolinux.com.cn> - 1.8.1-1
 - update to 1.8.1

_service:tar_scm:dont-forward-keycode-0.patch Changed

@@ -1,6 +1,17 @@
-diff -up libX11-1.6.3/modules/im/ximcp/imDefFlt.c.jx libX11-1.6.3/modules/im/ximcp/imDefFlt.c
---- libX11-1.6.3/modules/im/ximcp/imDefFlt.c.jx	2015-03-09 18:28:45.000000000 -0400
-+++ libX11-1.6.3/modules/im/ximcp/imDefFlt.c	2015-03-10 12:32:31.912149644 -0400
+From f8b0946c5594728ce7e1cd04552acce05571cd4e Mon Sep 17 00:00:00 2001
+From: leeffo <leeffo@yeah.net>
+Date: Wed, 12 Apr 2023 10:40:48 +0800
+Subject: PATCH dont forward keycode 0
+
+---
+ modules/im/ximcp/imDefFlt.c | 2 +-
+ modules/im/ximcp/imDefLkup.c | 24 ++++++++++++++++++++++++
+ 2 files changed, 25 insertions(+), 1 deletion(-)
+
+diff --git a/modules/im/ximcp/imDefFlt.c b/modules/im/ximcp/imDefFlt.c
+index 44cc688..f89d2cb 100644
+--- a/modules/im/ximcp/imDefFlt.c
++++ b/modules/im/ximcp/imDefFlt.c
 @@ -142,7 +142,7 @@ _XimProtoKeypressFilter(
 {
 Xim		im = (Xim)ic->core.im;
@@ -10,10 +21,11 @@
 	_XimPendingFilter(ic);
 	UNMARK_FABRICATED(im);
 	return NOTFILTERD;
-diff -up libX11-1.6.3/modules/im/ximcp/imDefLkup.c.jx libX11-1.6.3/modules/im/ximcp/imDefLkup.c
---- libX11-1.6.3/modules/im/ximcp/imDefLkup.c.jx	2015-03-09 18:28:45.000000000 -0400
-+++ libX11-1.6.3/modules/im/ximcp/imDefLkup.c	2015-03-10 12:32:31.911149637 -0400
-@@ -332,6 +332,17 @@ _XimForwardEvent(
+diff --git a/modules/im/ximcp/imDefLkup.c b/modules/im/ximcp/imDefLkup.c
+index dd1adf5..61f9c95 100644
+--- a/modules/im/ximcp/imDefLkup.c
++++ b/modules/im/ximcp/imDefLkup.c
+@@ -333,6 +333,17 @@ _XimForwardEvent(
 XEvent	*ev,
 Bool	 sync)
 {
@@ -31,7 +43,7 @@
 #ifdef EXT_FORWARD
 if (((ev->type == KeyPress) || (ev->type == KeyRelease)))
 	if (_XimExtForwardKeyEvent(ic, (XKeyEvent *)ev, sync))
-@@ -604,6 +615,19 @@ _XimUnregCommitInfo(
+@@ -605,6 +616,19 @@ _XimUnregCommitInfo(
 Xfree(info->keysym);
 ic->private.proto.commit_info = info->next;
 Xfree(info);
@@ -51,3 +63,6 @@
 return;
 }
 
+-- 
+2.20.1
+

_service Changed

_service:tar_scm:libX11-1.8.1.tar.xz/. Deleted

_service:tar_scm:libX11-1.8.1.tar.xz/NEWS Deleted

@@ -1,185 +0,0 @@
-Version 1.1.2 - 2007-06-03
-
-* Security fixes:
- * Fix CVE-2007-1667: Multiple integer overflows in the XGetPixel() and
- XInitImage() functions.
- * Bug #9279: Fixed a file descriptor leak.
-
-* Xlib/XCB: Ensure _XReadEvents reads at least one new event and blocks for
- exactly one event. Large performance improvement for XIfEvent and similar.
-
-* Hold XCB's Xlib lock even when only the user lock (XLockDisplay) is held.
- An Xlib client can query Display state, such as with NextRequest, while it
- holds only the Xlib user lock (between XLockDisplay and XUnlockDisplay), so
- XCB requests in other threads should be blocked when the Xlib user lock is
- held. We acquire the lock even when XInitThreads was not called, so that
- pure XCB code can use multiple threads even in an otherwise single-threaded
- Xlib application.
-
-* Allow re-entrant Xlib calls from _XIOError.
- Some libraries try to clean up X resources from atexit handlers, _fini, or
- C++ destructors. To make these work, downgrade the Display lock to a user
- lock (as in XLockDisplay) before calling exit(3). This blocks Xlib calls
- from threads other than the one calling exit(3) while still allowing the
- exit handlers to call Xlib.
-
-* Xlib/XCB: Avoid re-crashing after _XIOError.
-
-* Xlib/XCB: Only remove pending_requests when there are provably no more responses.
-
-* For NetBSD, define XTHREADLIB and XTHREAD_CFLAGS.
-
-* Bug #7703: Fixed XSetSizeHints() et al wrt use of uninitialized data.
- Now only those fields of the respective hint struct are set that
- are actually valid in the input data.
-
-* Bug #10292: Fixed a memory leak related to XOpenDisplay() in the XCB code.
-
-* Bug #7713: Initialize all of the event's fields before sending it.
-
-* Bug #10562: Define _GNU_SOURCE on glibc systems.
-
-* Use unistd.h to get getresuid() and friends, now that we have _GNU_SOURCE
- defined.
-
-* Switched function definitions from K&R to ANSI style.
-
-* Many constness fixes.
-
-* Fixed a few warnings.
-
-* Fix 64bit issues with reallocation.
-
-* Manpage fixes:
- * Add man pages for XKB APIs.
- (Volunteer needed to convert prototypes in man pages to ANSI C style...)
- * Protect C comments and #defines in XKB man pages from being mangled by cpp
- * Fix typo in nroff macro in XkbAddGeomOverlayKey.man
- * Bug #9695: Fixed a few argument types in the XOpenIM manpage.
- * Markup tweak for XOpenIM.
- * Bug #9696: refer to XDefineCursor() instead of XDefineCusor().
- * Bug #9697: Fixed documentation of XVisualInfo struct. The "depth" member
- was said to be unsigned int, but it's signed.
-
-* nls fixes:
- * Update el_GR.UTF-8/Compose.pre to match changes in xkeyboard-config cvs.
- * For nls/*.pre, allow people to comment lines by starting them with '##'.
-
-* Build system fixes:
- * Add autogen.sh to EXTRA_DIST.
- * Makefile.am: make ChangeLog hook safer
- * Don't distribute the configure-generated XlibConf.h in tarballs.
-
-Version 1.1.1 - 2006-11-30
-
-The "xcompmgr is hard, let's go releasing" release
-
-* Fix Bug #9154 and friends, to unbreak xcompmgr:
- Always process an event for _XReadEvents, even if an error occurs.
- Previously, process_responses (in the wait_for_first_event case called
- from _XReadEvents) considered any return from xcb_wait_for_event
- sufficient to think it had processed an event. If xcb_wait_for_event
- returned an error, and no more events occurred before process_responses
- called xcb_poll_for_event, process_responses would try to return with
- dpy->head NULL, and would fail an assertion for the _XReadEvents
- postcondition. Now, process_responses continues using xcb_wait_for_event
- until it gets an event.
-
-* Bug #9153: Fix access to freed memory.
- The fix for bug #8622 introduced a smaller bug where _XReply would
- read memory shortly after freeing it. This patch caches the needed
- value in a stack-allocated variable before the heap-allocated memory
- is freed.
-
-* libx11 doesn't use inputproto in public headers; don't require it in x11.pc.
- Based on a Debian patch.
-
-* Debian bug #354315: Clarify return value in XGetWindowAttributes man page.
- Patch by Debian user Ross Combs.
-
-
-Version 1.1 - 2006-11-23
-
-* Add note in man-page that XListFontsWithInfo is not thread-safe. _XReply
- drops the Display lock, so the value of dpy->request may change before
- _XReply is called again. Jamey Sharp discovered this by inspection a few
- years ago.
-
-* Fix Bug #8622, by fixing the response processing order for threaded apps.
- process_responses (the common code for _XReply, _XReadEvents, and
- _XEventsQueued) now handles responses in order, by adding condition variables
- to the list of outstanding requests in dpy->xcb->pending_requests, and
- blocking on them when those requests should get processed, to allow _XReply
- to process them; if actually called from _XReply, it returns when _XReply's
- request should get processed. _XReply broadcasts on its condition variable
- after it has read its reply and re-acquired the display lock.
-
-* Don't hold the display lock around callbacks to the application. This avoids
- recursive locking of the display lock (which triggers an XCB locking
- assertion), particularly with emacs.
-
-* Add xcb-xlib dependency to x11.pc when built against XCB.
-
-* Allocate the right amount of memory for dpy->lock_fns. Fixes a crash on
- startup with gdk.
-
-
-Version 1.1 RC2 - 2006-11-02
-
-Benno Schulenberg:
- nls: remove duplicate compose entries (bug #2286)
- nls: remove shadowed compose entries (bug #2286)
- nls (en_US): remove long compositions that override shorter (bug #2286)
-
-Caolan McNamara:
- XKB geometry: fix leaks in GetKeyboardByName (bug #8099)
-
-David Nusinow:
- Dynamically generate internal manpage section using __libmanpagesuffix__ so that it actually matches the section if you don't use 3X11
-
-Jamey Sharp:
- Add correct Display locking to XKB functions.
- XKB bugfix: SyncHandle must be called after UnlockDisplay, not before.
- XCB: check for and handle I/O errors in _XGetXCBBuffer.
-
-Matthias Hopf:
- Fix double open of compose file.
-
-
-Version 1.1 RC1 - 2006-10-06
-
-This release includes the Xlib/XCB work, which uses XCB as the Xlib transport
-layer, and allows a client to use both Xlib and XCB on the same connection.
-This allows clients to transition from Xlib to XCB incrementally.
-
-Clients which link only to libX11, and do not use XCB, should not notice any
-differences in this release. Clients desiring XCB interoperability should
-additionally #include <X11/Xlib-xcb.h>, link to libX11-xcb, use
-XGetXCBConnection(dpy) to obtain the underlying XCB connection, and then use
-XCB functions directly on that connection.
-
-Note that while a client can issue requests and handle their replies or errors
-with either Xlib or XCB, only one can own and handle the event queue. By
-default, Xlib must own the event queue, for compatibility with legacy Xlib
-clients. Clients can use the function XSetEventQueueOwner immediately after
-XOpenDisplay to let XCB own the event queue instead. Clients may not call
-this function after processing any responses, as this will potentially lose
-responses.
-
-We expect to have an RC2 release corresponding to the Xorg RC2 schedule, which
-should include additional internal architecture enhancements, but no
-user-visible changes. 1.0 final should match RC2.
-
-Other smaller changes in this release:
-* correct ChangeLog generation
-* support running lint and sparse
-* Autoconf 2.60
-* fix man page for XUrgencyHint
-* improve man pages for XGrabButton, XGrabKey, XGetWindowProperty
-* new locales: as_IN.UTF-8, kn_IN.UTF-8, ml_IN.UTF-8, or_IN.UTF-8,
- te_IN.UTF-8, ur_IN.UTF-8
-* on systems with both UNIXCONN and LOCALCONN, try unix if local fails
-* fix sparse warnings
-* ansify static functions
-
--- Josh Triplett <josh@freedesktop.org>, Jamey Sharp <jamey@minilop.net>

_service:tar_scm:libX11-1.8.1.tar.xz/include Deleted

_service:tar_scm:libX11-1.8.1.tar.xz/include/X11 Deleted

_service:tar_scm:libX11-1.8.1.tar.xz/include/X11/extensions Deleted

_service:tar_scm:libX11-1.8.1.tar.xz/m4 Deleted

_service:tar_scm:libX11-1.8.1.tar.xz/man Deleted

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb Deleted

_service:tar_scm:libX11-1.8.1.tar.xz/modules Deleted

_service:tar_scm:libX11-1.8.1.tar.xz/modules/im Deleted

_service:tar_scm:libX11-1.8.1.tar.xz/modules/im/ximcp Deleted

_service:tar_scm:libX11-1.8.1.tar.xz/modules/lc Deleted

_service:tar_scm:libX11-1.8.1.tar.xz/modules/lc/Utf8 Deleted

_service:tar_scm:libX11-1.8.1.tar.xz/modules/lc/def Deleted

_service:tar_scm:libX11-1.8.1.tar.xz/modules/lc/gen Deleted

_service:tar_scm:libX11-1.8.1.tar.xz/modules/om Deleted

_service:tar_scm:libX11-1.8.1.tar.xz/modules/om/generic Deleted

_service:tar_scm:libX11-1.8.1.tar.xz/nls Deleted

_service:tar_scm:libX11-1.8.1.tar.xz/nls/C Deleted

_service:tar_scm:libX11-1.8.1.tar.xz/nls/am_ET.UTF-8 Deleted

_service:tar_scm:libX11-1.8.1.tar.xz/nls/armscii-8 Deleted

_service:tar_scm:libX11-1.8.1.tar.xz/nls/cs_CZ.UTF-8 Deleted

_service:tar_scm:libX11-1.8.1.tar.xz/nls/el_GR.UTF-8 Deleted

_service:tar_scm:libX11-1.8.1.tar.xz/nls/en_US.UTF-8 Deleted

_service:tar_scm:libX11-1.8.1.tar.xz/nls/fi_FI.UTF-8 Deleted

_service:tar_scm:libX11-1.8.1.tar.xz/nls/georgian-academy Deleted

_service:tar_scm:libX11-1.8.1.tar.xz/nls/georgian-ps Deleted

_service:tar_scm:libX11-1.8.1.tar.xz/nls/ibm-cp1133 Deleted

_service:tar_scm:libX11-1.8.1.tar.xz/nls/iscii-dev Deleted

_service:tar_scm:libX11-1.8.1.tar.xz/nls/isiri-3342 Deleted

_service:tar_scm:libX11-1.8.1.tar.xz/nls/iso8859-1 Deleted

_service:tar_scm:libX11-1.8.1.tar.xz/nls/iso8859-10 Deleted

_service:tar_scm:libX11-1.8.1.tar.xz/nls/iso8859-11 Deleted

_service:tar_scm:libX11-1.8.1.tar.xz/nls/iso8859-13 Deleted

_service:tar_scm:libX11-1.8.1.tar.xz/nls/iso8859-14 Deleted

_service:tar_scm:libX11-1.8.1.tar.xz/nls/iso8859-15 Deleted

_service:tar_scm:libX11-1.8.1.tar.xz/nls/iso8859-2 Deleted

_service:tar_scm:libX11-1.8.1.tar.xz/nls/iso8859-3 Deleted

_service:tar_scm:libX11-1.8.1.tar.xz/nls/iso8859-4 Deleted

_service:tar_scm:libX11-1.8.1.tar.xz/nls/iso8859-5 Deleted

_service:tar_scm:libX11-1.8.1.tar.xz/nls/iso8859-6 Deleted

_service:tar_scm:libX11-1.8.1.tar.xz/nls/iso8859-7 Deleted

_service:tar_scm:libX11-1.8.1.tar.xz/nls/iso8859-8 Deleted

_service:tar_scm:libX11-1.8.1.tar.xz/nls/iso8859-9 Deleted

_service:tar_scm:libX11-1.8.1.tar.xz/nls/iso8859-9e Deleted

_service:tar_scm:libX11-1.8.1.tar.xz/nls/ja Deleted

_service:tar_scm:libX11-1.8.1.tar.xz/nls/ja.JIS Deleted

_service:tar_scm:libX11-1.8.1.tar.xz/nls/ja.SJIS Deleted

_service:tar_scm:libX11-1.8.1.tar.xz/nls/ja_JP.UTF-8 Deleted

_service:tar_scm:libX11-1.8.1.tar.xz/nls/km_KH.UTF-8 Deleted

_service:tar_scm:libX11-1.8.1.tar.xz/nls/ko Deleted

_service:tar_scm:libX11-1.8.1.tar.xz/nls/ko_KR.UTF-8 Deleted

_service:tar_scm:libX11-1.8.1.tar.xz/nls/koi8-c Deleted

_service:tar_scm:libX11-1.8.1.tar.xz/nls/koi8-r Deleted

_service:tar_scm:libX11-1.8.1.tar.xz/nls/koi8-u Deleted

_service:tar_scm:libX11-1.8.1.tar.xz/nls/microsoft-cp1251 Deleted

_service:tar_scm:libX11-1.8.1.tar.xz/nls/microsoft-cp1255 Deleted

_service:tar_scm:libX11-1.8.1.tar.xz/nls/microsoft-cp1256 Deleted

_service:tar_scm:libX11-1.8.1.tar.xz/nls/mulelao-1 Deleted

_service:tar_scm:libX11-1.8.1.tar.xz/nls/nokhchi-1 Deleted

_service:tar_scm:libX11-1.8.1.tar.xz/nls/pt_BR.UTF-8 Deleted

_service:tar_scm:libX11-1.8.1.tar.xz/nls/pt_PT.UTF-8 Deleted

_service:tar_scm:libX11-1.8.1.tar.xz/nls/ru_RU.UTF-8 Deleted

_service:tar_scm:libX11-1.8.1.tar.xz/nls/sr_RS.UTF-8 Deleted

_service:tar_scm:libX11-1.8.1.tar.xz/nls/tatar-cyr Deleted

_service:tar_scm:libX11-1.8.1.tar.xz/nls/th_TH Deleted

_service:tar_scm:libX11-1.8.1.tar.xz/nls/th_TH.UTF-8 Deleted

_service:tar_scm:libX11-1.8.1.tar.xz/nls/tscii-0 Deleted

_service:tar_scm:libX11-1.8.1.tar.xz/nls/vi_VN.tcvn Deleted

_service:tar_scm:libX11-1.8.1.tar.xz/nls/vi_VN.viscii Deleted

_service:tar_scm:libX11-1.8.1.tar.xz/nls/zh_CN Deleted

_service:tar_scm:libX11-1.8.1.tar.xz/nls/zh_CN.UTF-8 Deleted

_service:tar_scm:libX11-1.8.1.tar.xz/nls/zh_CN.gb18030 Deleted

_service:tar_scm:libX11-1.8.1.tar.xz/nls/zh_CN.gbk Deleted

_service:tar_scm:libX11-1.8.1.tar.xz/nls/zh_HK.UTF-8 Deleted

_service:tar_scm:libX11-1.8.1.tar.xz/nls/zh_HK.big5 Deleted

_service:tar_scm:libX11-1.8.1.tar.xz/nls/zh_HK.big5hkscs Deleted

_service:tar_scm:libX11-1.8.1.tar.xz/nls/zh_TW Deleted

_service:tar_scm:libX11-1.8.1.tar.xz/nls/zh_TW.UTF-8 Deleted

_service:tar_scm:libX11-1.8.1.tar.xz/nls/zh_TW.big5 Deleted

_service:tar_scm:libX11-1.8.1.tar.xz/specs Deleted

_service:tar_scm:libX11-1.8.1.tar.xz/specs/XIM Deleted

_service:tar_scm:libX11-1.8.1.tar.xz/specs/XKB Deleted

_service:tar_scm:libX11-1.8.1.tar.xz/specs/i18n Deleted

_service:tar_scm:libX11-1.8.1.tar.xz/specs/i18n/compose Deleted

_service:tar_scm:libX11-1.8.1.tar.xz/specs/i18n/framework Deleted

_service:tar_scm:libX11-1.8.1.tar.xz/specs/i18n/localedb Deleted

_service:tar_scm:libX11-1.8.1.tar.xz/specs/i18n/trans Deleted

_service:tar_scm:libX11-1.8.1.tar.xz/specs/libX11 Deleted

_service:tar_scm:libX11-1.8.1.tar.xz/src Deleted

_service:tar_scm:libX11-1.8.1.tar.xz/src/UIThrStubs.c Deleted

@@ -1,157 +0,0 @@
-/*
- *
- * Copyright (c) 1995 David E. Wexelblat. All rights reserved
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL DAVID E. WEXELBLAT BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- *
- * Except as contained in this notice, the name of David E. Wexelblat shall
- * not be used in advertising or otherwise to promote the sale, use or
- * other dealings in this Software without prior written authorization
- * from David E. Wexelblat.
- *
- */
-
-/*
- * Stubs for thread functions needed by the X library. Supports
- * UnixWare 2.x threads; may support Solaris 2 threads as well, but not
- * tested. Defining things this way removes the dependency of the X
- * library on the threads library, but still supports threads if the user
- * specificies the thread library on the link line.
- */
-
-/*
- * Modifications by Carlos A M dos Santos, XFree86 Project, November 1999.
- *
- * Explanation from <X11/Xos_r.h>:
- * The structure below is complicated, mostly because P1003.1c (the
- * IEEE POSIX Threads spec) went through lots of drafts, and some
- * vendors shipped systems based on draft API that were changed later.
- * Unfortunately POSIX did not provide a feature-test macro for
- * distinguishing each of the drafts.
- */
-
-#ifdef CTHREADS
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include <cthreads.h>
-typedef cthread_t xthread_t;
-#define xthread_self cthread_self
-#pragma weak cthread_self = _Xthr_self_stub_
-#define xmutex_init mutex_init
-#pragma weak mutex_init = _Xthr_zero_stub_
-#pragma weak mutex_clear = _Xthr_zero_stub_
-#pragma weak mutex_lock = _Xthr_zero_stub_
-#pragma weak mutex_unlock = _Xthr_zero_stub_
-#pragma weak condition_init = _Xthr_zero_stub_
-#pragma weak condition_clear = _Xthr_zero_stub_
-#pragma weak condition_wait = _Xthr_zero_stub_
-#pragma weak condition_signal = _Xthr_zero_stub_
-#pragma weak condition_broadcast = _Xthr_zero_stub_
-#else /* !CTHREADS */
-#if defined(SVR4) && !defined(__sgi)
-#include <thread.h>
-typedef thread_t xthread_t;
-#pragma weak thr_self = _Xthr_self_stub_
-#pragma weak mutex_init = _Xthr_zero_stub_
-#pragma weak mutex_destroy = _Xthr_zero_stub_
-#pragma weak mutex_lock = _Xthr_zero_stub_
-#pragma weak mutex_unlock = _Xthr_zero_stub_
-#pragma weak cond_init = _Xthr_zero_stub_
-#pragma weak cond_destroy = _Xthr_zero_stub_
-#pragma weak cond_wait = _Xthr_zero_stub_
-#pragma weak cond_signal = _Xthr_zero_stub_
-#pragma weak cond_broadcast = _Xthr_zero_stub_
-#else /* !SVR4 */
-#ifdef WIN32
-#include <X11/Xthreads.h>
-#else /* !WIN32 */
-#ifdef USE_TIS_SUPPORT
-#include <tis.h>
-typedef pthread_t xthread_t;
-#pragma weak tis_self = _Xthr_self_stub_
-#pragma weak tis_mutex_init = _Xthr_zero_stub_
-#pragma weak tis_mutex_destroy = _Xthr_zero_stub_
-#pragma weak tis_mutex_lock = _Xthr_zero_stub_
-#pragma weak tis_mutex_unlock = _Xthr_zero_stub_
-#pragma weak tis_cond_init = _Xthr_zero_stub_
-#pragma weak tis_cond_destroy = _Xthr_zero_stub_
-#pragma weak tis_cond_wait = _Xthr_zero_stub_
-#pragma weak tis_cond_signal = _Xthr_zero_stub_
-#pragma weak tis_cond_broadcast = _Xthr_zero_stub_
-#else
-#include <pthread.h>
-typedef pthread_t xthread_t;
-#if __GNUC__ >= 3 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95)
-xthread_t pthread_self() __attribute__ ((weak, alias ("_Xthr_self_stub_")));
-int pthread_mutex_init() __attribute__ ((weak, alias ("_Xthr_zero_stub_")));
-int pthread_mutex_destroy() __attribute__ ((weak, alias ("_Xthr_zero_stub_")));
-int pthread_mutex_lock() __attribute__ ((weak, alias ("_Xthr_zero_stub_")));
-int pthread_mutex_unlock() __attribute__ ((weak, alias ("_Xthr_zero_stub_")));
-int pthread_cond_init() __attribute__ ((weak, alias ("_Xthr_zero_stub_")));
-int pthread_cond_destroy() __attribute__ ((weak, alias ("_Xthr_zero_stub_")));
-int pthread_cond_wait() __attribute__ ((weak, alias ("_Xthr_zero_stub_")));
-int pthread_cond_signal() __attribute__ ((weak, alias ("_Xthr_zero_stub_")));
-int pthread_cond_broadcast() __attribute__ ((weak, alias ("_Xthr_zero_stub_")));
-int pthread_key_create() __attribute__ ((weak, alias ("_Xthr_zero_stub_")));
-void *pthread_getspecific() __attribute__ ((weak, alias ("_Xthr_zero_stub_")));
-int pthread_setspecific() __attribute__ ((weak, alias ("_Xthr_zero_stub_")));
-#else	/* __GNUC__ */
-#pragma weak pthread_self = _Xthr_self_stub_
-#pragma weak pthread_mutex_init = _Xthr_zero_stub_
-#pragma weak pthread_mutex_destroy = _Xthr_zero_stub_
-#pragma weak pthread_mutex_lock = _Xthr_zero_stub_
-#pragma weak pthread_mutex_unlock = _Xthr_zero_stub_
-#pragma weak pthread_cond_init = _Xthr_zero_stub_
-#pragma weak pthread_cond_destroy = _Xthr_zero_stub_
-#pragma weak pthread_cond_wait = _Xthr_zero_stub_
-#pragma weak pthread_cond_signal = _Xthr_zero_stub_
-#pragma weak pthread_cond_broadcast = _Xthr_zero_stub_
-/* These are added for libGL */
-#pragma weak pthread_key_create = _Xthr_zero_stub_
-#pragma weak pthread_getspecific = _Xthr_zero_stub_
-#pragma weak pthread_setspecific = _Xthr_zero_stub_
-#endif	/* __GNUC__ */
-#if defined(_DECTHREADS_) || defined(linux)
-#pragma weak pthread_equal = _Xthr_equal_stub_	/* See Xthreads.h! */
-int
-_Xthr_equal_stub_()
-{
- return(1);
-}
-#endif /* _DECTHREADS_ || linux */
-#endif /* USE_TIS_SUPPORT */
-#endif /* WIN32 */
-#endif /* SVR4 */
-#endif /* CTHREADS */
-
-static xthread_t
-_Xthr_self_stub_()
-{
- static xthread_t _X_no_thread_id;
-
- return(_X_no_thread_id);	/* defined by <X11/Xthreads.h> */
-}
-
-static int
-_Xthr_zero_stub_()
-{
- return(0);
-}

_service:tar_scm:libX11-1.8.1.tar.xz/src/util Deleted

_service:tar_scm:libX11-1.8.1.tar.xz/src/xcms Deleted

_service:tar_scm:libX11-1.8.1.tar.xz/src/xkb Deleted

_service:tar_scm:libX11-1.8.1.tar.xz/src/xlibi18n Deleted

_service:tar_scm:libX11-1.8.1.tar.xz/src/xlibi18n/lcUniConv Deleted

_service:tar_scm:libX11-1.8.1.tar.xz/COPYING -> _service:tar_scm:libX11-1.8.4.tar.xz/COPYING Changed

@@ -13,8 +13,7 @@
 
 Copyright (C) 2003-2006,2008 Jamey Sharp, Josh Triplett
 Copyright © 2009 Red Hat, Inc.
-Copyright 1990-1992,1999,2000,2004,2009,2010 Oracle and/or its affiliates.
-All rights reserved.
+Copyright (c) 1990-1992, 1999, 2000, 2004, 2009, 2010, 2015, 2017, Oracle and/or its affiliates.
 
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the "Software"),
@@ -228,35 +227,6 @@
 
 		----------------------------------------
 
-
-Copyright (c) 1995 David E. Wexelblat. All rights reserved
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL DAVID E. WEXELBLAT BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of David E. Wexelblat shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from David E. Wexelblat.
-
-		----------------------------------------
-
 Copyright 1990, 1991 by OMRON Corporation
 
 Permission to use, copy, modify, distribute, and sell this software and its
@@ -940,3 +910,19 @@
 ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
+		----------------------------------------
+
+Copyright (c) 2008 Otto Moerbeek <otto@drijf.net>
+
+Permission to use, copy, modify, and distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+

_service:tar_scm:libX11-1.8.1.tar.xz/ChangeLog -> _service:tar_scm:libX11-1.8.4.tar.xz/ChangeLog Changed

@@ -1,3 +1,717 @@
+commit fc5ec8edda1efdf5d66db4e76796e3c407527b3b
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sat Feb 4 12:02:29 2023 -0800
+
+ libX11 1.8.4
+ 
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit ba548ed1688d4d5a83913218155d0ddf616ff176
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sun Jan 15 11:39:20 2023 -0800
+
+ configure: options summary should say "libX11", not just "X11"
+ 
+ We're not configuring the entire window system here, just one library
+ 
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit eb1c272ab5230d548077b9f59aca4b3457c3a8f8
+Author: GaryOderNichts <garyodernichts@gmail.com>
+Date: Sat Dec 17 16:28:40 2022 +0100
+
+ Fix a9e845 and 797755 Allow X*IfEvent() to reenter libX11
+
+commit 0c7c4ce875ea65160705180ebb68a2c88afb678e
+Author: Benno Schulenberg <bensberg@telfort.nl>
+Date: Thu Nov 3 17:25:29 2022 +0100
+
+ nls: add two compose sequences for capital B with stroke, for consistency
+ 
+ Two compose sequences (with plain ASCII characters) existed for
+ the lowercase b with stroke (ƀ) but not for the capital one (Ƀ).
+ 
+ This addresses part of issue #166.
+ 
+ Reported-by: J. McWilliams
+ 
+ Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
+
+commit a80ef097e713aba0330b9cf9f3c1e309084b926f
+Author: Benno Schulenberg <bensberg@telfort.nl>
+Date: Thu Nov 3 16:48:03 2022 +0100
+
+ nls: delete twelve compose sequences that cannot be typed
+ 
+ There is not any keyboard layout (in xkeyboard-config) that contains
+ `obelowdot` or `ubelowdot`, so having compose sequences that use these
+ symbols is pointless.
+ 
+ There are some layouts that contain `otilde` (and one that contains
+ `utilde`), but those layouts then do not contain `dead_horn`, so
+ the compose sequences that combine the two symbols are pointless.
+ 
+ There are a few layouts that contain U+0256, U+025C, U+025F or U+0279,
+ but those layouts do not contain `dead_hook`, so the compose sequences
+ that combine the latter with one of the former are pointless.
+ 
+ Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
+
+commit 078cc39f05ddfd6166762f3166129258ddd07dd3
+Author: Benno Schulenberg <bensberg@telfort.nl>
+Date: Thu Nov 3 16:31:04 2022 +0100
+
+ nls: delete 88 compose sequences that have the accents in the wrong order
+ 
+ The various compose sequences with the accents in their proper order
+ (the highest placed accent first) continue to exist.
+ 
+ Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
+
+commit aa5ef0ba80558f946871f574d38a15673e66221e
+Author: Benno Schulenberg <bensberg@telfort.nl>
+Date: Thu Nov 3 16:27:51 2022 +0100
+
+ nls: move the compose sequences for Ș and Ț to the fitting Unicode block
+ 
+ This addresses a side note of issue #166.
+ 
+ Reported-by: J. McWilliams
+ 
+ Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
+
+commit 82c25879b72f1ba7e9abe00e7bad55add33135cf
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Wed Jan 4 11:25:48 2023 -0800
+
+ xlibi18n: Update Imake instructions to autoconf equivalent in comments
+ 
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 88399e01be679bfcc9a5e8922ffe2c47f0e56dee
+Author: Yuxuan Shui <yshuiv7@gmail.com>
+Date: Tue Jan 3 15:09:28 2023 +0000
+
+ Revert "Update XPutBackEvent() to support clients that put back unpadded events"
+ 
+ This reverts commit d6d6cba90215d323567fef13d6565756c9956f60.
+ 
+ The reverted commit intended to fix the problem where an unpadded X
+ event struct is passed into XPutBackEvent, by creating a padded struct
+ with _XEventToWire and _XWireToEvent. However, _XWireToEvent updates the
+ last sequence number in Display, which may cause xlib to complain about
+ lost sequence numbers.
+ 
+ IMO, the problem that commit tried to solve is a bug in the client
+ library, and workaround it inside Xlib is bad practice, especially given
+ the problem it caused. Plus, the offender cited in the original commit
+ message, freeglut, has already fixed this problem.
+ 
+ Fixes: #176 #174
+ 
+ Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
+
+commit 48487c4b9028e9eec5371742f51e1d64c2e17296
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Thu Dec 15 14:52:20 2022 -0800
+
+ libX11 1.8.3
+ 
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit d6d6cba90215d323567fef13d6565756c9956f60
+Author: Keith Packard <keithp@keithp.com>
+Date: Sun Dec 11 10:32:26 2022 -0800
+
+ Update XPutBackEvent() to support clients that put back unpadded events
+ 
+ It seems to be common practice of some X11 clients to pass specific event
+ types into APIs that take XEvent*. For example, freeglut does:
+ 
+ XConfigureEvent fakeEvent = {0};
+ ...
+ XPutBackEvent(fgDisplay.Display, (XEvent*)&fakeEvent);
+ 
+ This can result in reads overflowing the input event when libX11 does:
+ 
+ XEvent store = *event;
+ 
+ =================================================================
+ ==75304==ERROR: AddressSanitizer: stack-buffer-overflow on address 0x00016ee4a8e8 at pc 0x000101c54d14 bp 0x00016ee4a0d0 sp 0x00016ee49888
+ READ of size 192 at 0x00016ee4a8e8 thread T0
+ #0 0x101c54d10 in __asan_memcpy+0x1a4 (libclang_rt.asan_osx_dynamic.dylib:arm64e+0x3cd10)
+ #1 0x102848a18 in _XPutBackEvent PutBEvent.c:41
+ #2 0x1028490a4 in XPutBackEvent PutBEvent.c:84
+ #3 0x1013295c8 in fgOpenWindow freeglut_window.c:1178
+ #4 0x101321984 in fgCreateWindow freeglut_structure.c:108
+ #5 0x10132b138 in glutCreateWindow freeglut_window.c:1551
+ #6 0x100fb7d94 in main+0x78 (checkeredTriangles:arm64+0x100003d94)
+ #7 0x197de3e4c (<unknown module>)
+ 
+ Address 0x00016ee4a8e8 is located in stack of thread T0 at offset 840 in frame
+ #0 0x1013282f8 in fgOpenWindow freeglut_window.c:1063
+ 
+ This frame has 8 object(s):
+ 32, 40) 'title.addr'
+ 64, 176) 'winAttr' (line 1066)
+ 208, 240) 'textProperty' (line 1067)
+ 272, 352) 'sizeHints' (line 1068)
+ 384, 440) 'wmHints' (line 1069)
+ 480, 672) 'eventReturnBuffer' (line 1070)
+ 736, 740) 'num_FBConfigs' (line 1072)
+ 752, 840) 'fakeEvent' (line 1074) <== Memory access at offset 840 overflows this variable
+ 
+ This change allows XPutBackEvent() to support such clients without
+ risk of memory read overflow.
+ 
+ Reviewed-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+ Tested-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+
+commit 496d9bfeedda89a2211ec665f9214c2693c022f4
+Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+Date: Sat Dec 3 16:26:47 2022 -0800
+
+ ximcp: Address warning found by UBSan when growing an empty tree
+ 
+ imLcPrs.c:681:52: runtime error: applying zero offset to null pointer
+ 
+ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+
+commit 7f7bcd7b6f569e9f70e3ddd134924f178e2596b1
+Author: Takao Fujiwara <tfujiwar@redhat.com>
+Date: Tue Dec 6 16:59:56 2022 +0000
+
+ nls: consecutive cs number in en_US.UTF-8/XLC_LOCALE
+
+commit ba095967349dff583bd0989d0ba78aa334e9bedf
+Author: Ulrich Sibiller <uli42@gmx.de>
+Date: Wed Nov 30 23:47:29 2022 +0100
+
+ ChkIfEv.c: fix wrong handling of dpy->in_ifevent
+ 
+ Is no longer a bool but a counter.
+ 
+ Signed-off-by: Ulrich Sibiller <uli42@gmx.de>
+
+commit 70eaf1174e2809d1a6c43868d53f8cd844ef636a
+Author: Ulrich Sibiller <uli42@gmx.de>
+Date: Wed Nov 30 23:42:02 2022 +0100
+
+ Indentation fixes around recent dpy->in_ifevent changes
+ 
+ Use the same indentation as the surrounding code.
+ 
+ Signed-off-by: Ulrich Sibiller <uli42@gmx.de>
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit a9e845809bcaae22496bc8aa3ca252b410d5f39b
+Author: Matthieu Herrb <matthieu@herrb.eu>
+Date: Fri Nov 11 18:55:23 2022 +0100
+
+ Fix 797755 Allow X*IfEvent() to reenter libX11
+ 
+ - the activation logic is reversed
+ - there is also _XInternalLockDisplay() that needs protection
+ - I've found cases (in fvwm2) where the callback calls XCheckIfEvent()
+ recursively. So the flag needs to be a counter.
+ 
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+
+commit bccd787a565d3a88673bfc06574c1939f98d8d72
+Author: Nia Alarie <nia@NetBSD.org>
+Date: Thu Nov 10 22:31:47 2022 +0100
+
+ Don't use pragma inside a function, it breaks compiling with older GCCs.
+ 
+ XKBBind.c:230: error: #pragma GCC diagnostic not allowed inside functions
+ 
+ Signed-off-by: Thomas Klausner <wiz@gatalith.at>
+
+commit 696d19d5db7bcb1c1f582c2b1846520e7e0870cb
+Author: Oliver <halting@riseup.net>
+Date: Fri Nov 11 17:04:00 2022 +0000
+
+ Add XFreeThreads function.
+
+commit b4f24b272c6ef888b6fcfcf80670c196b2e8f755
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Thu Nov 10 12:18:17 2022 -0800
+
+ libX11 1.8.2
+ 
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 77629ea5e79fa9b1596438bc36cfc7e0c631af43
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Thu Nov 3 13:00:50 2022 -0700
+
+ README.md: Add 1.8.2 changes
+ 
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit d1baf2ec4869dea3732d6fe13ba4935cb6caad01
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Thu Nov 3 11:22:37 2022 -0700
+
+ Remove NEWS file which only covered 2006 & 2007 releases
+ 
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 1294bfa487bdecfd32621822922fec03203ee188
+Author: Po Lu <luangruo@yahoo.com>
+Date: Mon Oct 3 08:44:59 2022 +0800
+
+ specs: document change in XIMPreeditCallbacks
+ 
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 1a7e54609ce4dc0f2d3b933502437a413cf3dea8
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Thu Nov 3 14:44:22 2022 -0700
+
+ man pages: document XCloseIM frees its argument
+ 
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit a04b84f0f7bb3a78088756759f4b9b8bb363251e
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Thu Nov 3 20:31:31 2022 +0000
+
+ Copyright & license cleanup
+
+commit 5e41119d9611504ff7e61c6aa4da1df708096801
+Author: Benno Schulenberg <bensberg@telfort.nl>
+Date: Mon Oct 31 12:42:51 2022 +0100
+
+ nls: reshuffle a few compose sequences, to have similar ones together
+ 
+ It makes more sense to have similar sequences grouped together
+ than to rigidly follow the order of ascending Unicode codes.
+
+commit 65d89342f59cfc2eac9bf8010076b937f22554e8
+Author: Benno Schulenberg <bensberg@telfort.nl>
+Date: Mon Oct 31 12:50:11 2022 +0100
+
+ nls: remove two compose sequences that use deprecated symbols
+ 
+ The last few occurrences of `leftcaret` and `rightcaret` were replaced
+ with `less` and `greater` in xkeyboard-config half a year ago.
+
+commit 6baccbae5324e7342cb5176cae82f463a6b34eae
+Author: Benno Schulenberg <bensberg@telfort.nl>
+Date: Mon Oct 31 12:40:12 2022 +0100
+
+ nls: let `<Multi_key> <minus> <underscore>` compose U+2212 (MINUS SIGN)
+ 
+ There was not yet any way to compose the Unicode minus sign, U+2212.
+
+commit 79775575418fd6f8ee1c5e5bbe403df4606fb5b6
+Author: Adam Jackson <ajax@redhat.com>
+Date: Fri Aug 5 15:19:08 2022 -0400
+
+ Allow X*IfEvent() to reenter libX11
+ 
+ The documentation for this family of functions very clearly says not to
+ call into xlib in your predicate function, but historically single
+ threaded apps could get away with it just fine, and now that we've
+ forced thread-safety on the world such apps will now deadlock instead.
+ That's not an acceptable regression even if the app is technically
+ broken. This has been reported with XFCE and FVWM, and Motif's
+ cut-and-paste code has the same bug by inspection, so this does need to
+ be addressed.
+ 
+ This change nerfs LockDisplay/UnlockDisplay while inside the critical
+ bit of an IfEvent function. This is still safe in the sense that the
+ display remains locked and no other thread should be able to change it
+ from under us, but the loop that scans the event queue might not be
+ robust against it being modified as a side effect of protocol emitted by
+ the predicate callback. But that's not new, non-XInitThreads'd xlib
+ would have the same caveat.
+ 
+ Closes: xorg/lib/libx11#157
+
+commit 0d1d65bdd98966f52bcac4077f94827b20b229dd
+Author: Benno Schulenberg <bensberg@telfort.nl>
+Date: Fri Oct 21 12:18:25 2022 +0200
+
+ nls: change <Compose> <^> <-> to mean superscript minus instead of macron
+ 
+ Several other `<Multi_key> <asciicircum> <symbol>` sequences
+ produce the superscript equivalent of the given symbol. So,
+ let `<Multi_key> <asciicircum> <minus>` do the same.
+ 
+ Also, add two other sequences for producing a plain macron,
+ to compensate a bit the loss of the above sequence.
+ 
+ Additionally, make `<Multi_key> <underscore> <minus>` produce
+ a subscript minus, for consistency.
+ 
+ This fixes issue #165.
+ 
+ Requested-by: J. McWilliams
+ 
+ Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
+
+commit 310898270787c1a3a6ab50221324f8654dddce8e
+Author: Jan Tojnar <jtojnar@gmail.com>
+Date: Thu Oct 20 07:10:58 2022 +0000
+
+ nls: Map sr locales to sr_RS compose files
+ 
+ Serbian used sr_YU (Yugoslavia) code in the past.
+ Then it was succeeded by sr_CS (Serbia and Montenegro).
+ Finally, it was split into sr_RS (Serbia) and sr_ME (Montenegro).
+ 
+ https://gitlab.freedesktop.org/xorg/lib/libx11/-/commit/da95ecbbdcacc483cd0b5fd7db1fb2e2543341bd
+ introduced the modern sr_RS and sr_ME codes.
+ 
+ Next, https://gitlab.freedesktop.org/xorg/lib/libx11/-/commit/40761898692e5063957bfa2518cca3d35b2e354a
+ added the Serbian compose table but only for the legacy sr_CS entry.
+ 
+ https://gitlab.freedesktop.org/xorg/lib/libx11/-/commit/5cd60398b7787297008b13a848ed3cfbd7ef178d
+ removed the legacy sr_CS entry, the only one pointing to the correct compose file.
+ It also renamed the file to sr_RS, but did not update the compose mapping.
+ 
+ Let’s point all Serbian locales to the Compose file again.
+
+commit a35d706cd8dc7b498bca2a3fc4a3732047439ed7
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Fri Oct 14 13:40:37 2022 -0700
+
+ COPYING: remove notice for the removed UIThrStubs.c
+ 
+ Fixes: 701e9e9a ("Use same pthread-stubs as libxcb")
+ 
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 3b1750e982fedce0d61bface68aadcd5b1ea1fae
+Author: Benno Schulenberg <bensberg@telfort.nl>
+Date: Fri Oct 14 09:28:42 2022 +0200
+
+ nls: delete two compose sequences with an anomalous post-fixed breve
+ 
+ Two years ago, commit b126bfd7fe allowed using also a lowercase `u`
+ wherever an uppercase `U` was used to represent a breve. But the
+ commit should have limited itself to only the prefixed uses of `U`,
+ as that is how most letters with a breve are composed.
+ 
+ Also, group the two compose sequences with an uppercase post-fixed `U`
+ together with the corresponding other post-fixed sequences.
+ 
+ Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
+
+commit 701e9e9afb88bdc68c84a4611adc533400a3df36
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Tue Oct 4 11:24:57 2022 -0700
+
+ Use same pthread-stubs as libxcb
+ 
+ Avoid conflicts when libX11 calls libxcb and gets its pthread functions
+ overriding our ancient stubs.
+ 
+ v2: Keep linking with real threads libraries when thread safety
+ constructor is enabled.
+ 
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 1d11822601fd24a396b354fa616b04ed3df8b4ef
+Author: Thomas E. Dickey <dickey@invisible-island.net>
+Date: Tue Oct 4 18:26:17 2022 -0400
+
+ fix a memory leak in XRegisterIMInstantiateCallback
+ 
+ Analysis:
+ 
+ _XimRegisterIMInstantiateCallback() opens an XIM and closes it using
+ the internal function pointers, but the internal close function does
+ not free the pointer to the XIM (this would be done in XCloseIM()).
+ 
+ Report/patch:
+ 
+ Date: Mon, 03 Oct 2022 18:47:32 +0800
+ From: Po Lu <luangruo@yahoo.com>
+ To: xorg-devel@lists.x.org
+ Subject: Re: Yet another leak in Xlib
+ 
+ For reference, here's how I'm calling XRegisterIMInstantiateCallback:
+ 
+ XSetLocaleModifiers ("");
+ XRegisterIMInstantiateCallback (compositor.display,
+ XrmGetDatabase (compositor.display),
+ (char *) compositor.resource_name,
+ (char *) compositor.app_name,
+ IMInstantiateCallback, NULL);
+ 
+ and XMODIFIERS is:
+ 
+ @im=ibus
+ 
+ Signed-off-by: Thomas E. Dickey <dickey@invisible-island.net>
+
+commit 1f8fd7ff1cf688ec1d3b34397c6d58110bb0cae5
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Mon Sep 26 16:01:40 2022 -0700
+
+ If thread-safety-constructor is enabled, link against pthreads not stubs
+ 
+ Only really makes a difference if pthreads is not in libc.
+ 
+ Fixes: #162
+ 
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+
+commit bfe5d2dd98f705438b0cdddbbf9c12882da89bae
+Author: Thomas E. Dickey <dickey@invisible-island.net>
+Date: Sun Sep 11 11:44:41 2022 -0400
+
+ reduce compiler warnings with casts (no object change)
+ 
+ Signed-off-by: Thomas E. Dickey <dickey@invisible-island.net>
+
+commit 926f2454bca9a7a7d1f4cf0648b0c193f5cef644
+Author: Thomas E. Dickey <dickey@invisible-island.net>
+Date: Sun Sep 11 10:35:31 2022 -0400
+
+ use casts to reduce compiler warnings (no object change)
+ 
+ Signed-off-by: Thomas E. Dickey <dickey@invisible-island.net>
+
+commit dc553ff908f10832c71dc2b5ba5af7e68589218e
+Author: Mike FABIAN <mfabian@redhat.com>
+Date: Fri Jul 22 11:39:01 2022 +0200
+
+ Remove KOI8-R character set from en_US.UTF-8/XLC_LOCALE
+ 
+ https://gitlab.freedesktop.org/xorg/lib/libx11/-/blob/master/src/xlibi18n/lcCT.c#L58
+ has no escape sequence for KOI8-R.
+ That makes Xutf8TextListToTextProperty() sometimes fail when trying to
+ convert to COMPOUND_TEXT and when the KOI8-R charset is tried.
+ 
+ This is the cause for this bug:
+ 
+ https://github.com/ibus/ibus/issues/2422
+ 
+ Removing the KOI8-R charset entry fixes the problem.
+ 
+ This commit also fixes a few wrong texts in comments.
+ 
+ Signed-off-by: Mike FABIAN <mfabian@redhat.com>
+
+commit 1c04ac514196db5e2255d99635fb6e3c36be330d
+Author: Adam Sampson <ats@offog.org>
+Date: Sun Jul 4 23:02:04 2021 +0100
+
+ xkb: Fix off-by-one error in XKeycodeToKeysym
+ 
+ The code here that made indexes greater than 3 refer to XKB symbol
+ groups had an off-by-one error, so it would always leave out the symbol
+ that should have been at index 4. Rewrite the code to fix this and
+ simplify the logic a bit.
+ 
+ Signed-off-by: Adam Sampson <ats@offog.org>
+
+commit ddaacd219609104f138006db6a8f708226db3874
+Author: Thomas E. Dickey <dickey@invisible-island.net>
+Date: Fri Sep 9 20:17:35 2022 -0400
+
+ reduce compiler warnings for macros BufAlloc, Data and Data32 using casts
+ 
+ Signed-off-by: Thomas E. Dickey <dickey@invisible-island.net>
+
+commit 62c3337d89d31e0d3ed807004e73ad711fad3342
+Author: Kirill Chibisov <contact@kchibisov.com>
+Date: Thu Sep 8 22:50:30 2022 +0000
+
+ ximcp/imRm.c: allow XNSpotLocation with OnTheSpot
+
+commit 1272879074ad9612314858a75cf844783c1963b2
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Thu Jul 28 17:30:21 2022 -0700
+
+ gitlab CI: stop requiring Signed-off-by in commits
+ 
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 38033b073f393564acf6a04501927002b2b4aa86
+Author: David H. Gutteridge <david@gutteridge.ca>
+Date: Mon Jul 25 19:30:19 2022 -0400
+
+ configure.ac: report thread safety constructor build status
+ 
+ Signed-off-by: David H. Gutteridge <david@gutteridge.ca>
+
+commit 9a90b3a63d02da92dc8692ed3f6269d3e0c7c8cc
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sun Jul 10 11:55:11 2022 -0700
+
+ doc: Document possible return values for XkbGetKeyboard()
+ 
+ Fixes: #160
+ 
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 0beb0cf46ae48b0d4322ff8a0221f47bdb7d2296
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sun Jul 10 11:42:19 2022 -0700
+
+ xkb: set num_keys when filling in keys in _XkbReadGetNamesReply()
+ 
+ Fixes: #160
+ 
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 487e9489d1e086cc62c53045206ab6d6d9d02031
+Author: Jon Turney <jon.turney@dronecode.org.uk>
+Date: Wed Jun 22 16:15:37 2022 +0100
+
+ Fix Win32 build with -fno-common
+ 
+ /work/xorg/lib/libX11/src/XlibInt.c:1968: multiple definition of `_Xdebug_p'; .libs/globals.o:globals.c:(.bss+0xc): first defined here
+ 
+ Avoid redundant definition of _Xdebug_p in globals.c (which is under the
+ influence of _Xdebug being #defined to _Xdebug_p.
+ 
+ This appears to be an ancient hack to work around data exports resolving
+ to the address of the import stub, not the import. (See 1).
+ 
+ (This is probably no longer needed or can be done in a better way, as
+ per the discussion under --enable-auto-import in the ld manpage.)
+ 
+ 1 https://cygwin.com/pipermail/cygwin-xfree/2001-May/004606.html
+ 
+ Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
+
+commit 35ad99fad2f65ec2c69bd84bdeb8138329092b57
+Author: Benno Schulenberg <bensberg@telfort.nl>
+Date: Fri Jul 15 11:29:46 2022 +0200
+
+ nls: add four sequences for the Samogitian E with dot above and macron
+ 
+ These sequences each produce two code points: the E-with-dot-above and
+ a combining macron. The XIM input method is required for this to work.
+ 
+ (Also add a missing comment for a Unicode block.)
+ 
+ This fixes issue #54.
+ 
+ Requested-by: Arns Udovīčė
+ 
+ Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
+
+commit 2732dd20cc2694dd5c32fef292e1f48626011032
+Author: Benno Schulenberg <bensberg@telfort.nl>
+Date: Wed Jul 6 16:44:50 2022 +0200
+
+ nls: delete eight sequences that pointlessly mix upper and lower case
+ 
+ Typing a compose sequence requires some care -- surely the user is able
+ to either keep holding the Shift key or not touch it at all while typing
+ the sequence. Also, compose sequences are not an infinite resource AND
+ take up space and time -- defining redundant ones is a waste.
+ 
+ Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
+
+commit ea3cc474e1acfed47b9fb856ea151008fa6cfd30
+Author: Benno Schulenberg <bensberg@telfort.nl>
+Date: Wed Jul 6 16:36:48 2022 +0200
+
+ nls: add compose sequences for the double-struck capitals ℕ ℤ ℚ ℝ ℂ
+ 
+ This allows the user to type the symbols for the five number systems.
+ 
+ This fixes the reasonable part of issue #159.
+ 
+ Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
+
+commit 95a03cde434c447fdb41d8cccbbdd41f20750f32
+Author: Benno Schulenberg <bensberg@telfort.nl>
+Date: Thu Jul 14 12:00:45 2022 +0200
+
+ nls: delete some pointless and wrong compose sequences meant for Bépo
+ 
+ Fourteen years ago, commit 7302984642 added some four hundred compose
+ sequences for the benefit of the French Bépo layout. But among these
+ four hundred there are several that use symbols that are not available
+ in the Bépo layout and are thus impossible to type. Some of the used
+ symbols, like Ahook, Ehook and Ohook, are not even present in *any*
+ layout, making these sequences a dead weight in the Compose file.
+ 
+ The Amacron and Omacron are available only in the Latvian, Hawaiian,
+ and Maori layouts, and the Omacron also in the Silesian layout. But
+ the Latvian layouts and the Hawaiian do not contain any dead keys.
+ Only in the Maori and Silesian layouts these sequences with Amacron
+ and Omacron could be typed, but that was not why they were added.
+ 
+ More importantly, as James Cloos noted in issue #54, sequences like
+ `<dead_abovedot> <amacron>` for generating `ǡ` (that is: the macron
+ above the dot) are questionable, as in compose sequences generally
+ the first accent typed is the uppermost in the composed character.
+ 
+ Reference:
+ https://gitlab.freedesktop.org/xorg/lib/libx11/-/issues/54#note_17321
+ 
+ Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
+
+commit 9702b836862da6838d725f555e7a1d83faf51740
+Author: Matthieu Herrb <matthieu@herrb.eu>
+Date: Fri Jul 1 11:13:13 2022 +0200
+
+ Mention that the predicate function is called with the display lock
+ 
+ Signed-off-by: Matthieu Herrb <matthieu@herrb.eu>
+
+commit a5d00f889fadad3f5b11e53fd5c04cf5343fa8a2
+Author: Benno Schulenberg <bensberg@telfort.nl>
+Date: Fri Jun 24 16:20:52 2022 +0200
+
+ docs: replace three placeholders with something that makes sense
+ 
+ Also, uncapitalize two arguments, to match the style of all others.
+ 
+ Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
+
+commit 9ff8502040e94cb172426d59df722cefa752a401
+Author: Benno Schulenberg <bensberg@telfort.nl>
+Date: Fri Jun 24 16:07:22 2022 +0200
+
+ docs: remove the unsightly dashes from the overviews of arguments
+ 
+ Seventeen months ago, commits 78027fdb7a and 4f15cfc645 removed
+ these dashes from two of the man pages. Now, remove them all.
+ They are unhelpful and just make one wonder why they are there
+ (probably to function as improvised bullet points).
+ 
+ Also remove four leading spaces and a trailing comma.
+ 
+ Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
+
+commit a7968c47e35703446d67d070234fd9adf07f34b0
+Author: Benno Schulenberg <bensberg@telfort.nl>
+Date: Thu Jun 23 15:48:05 2022 +0200
+
+ docs: hard-wrap some items so that Table 2 fits within 80 characters
+ 
+ (Table 1 hard-wraps the first-column items in the same way.)
+ 
+ Also, correct the formatting of the subsequent paragraph.
+ 
+ Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
+
+commit c601c779ca8f46dc4335180ec2829851fb8bbc13
+Author: Benno Schulenberg <bensberg@telfort.nl>
+Date: Wed Jun 15 10:55:38 2022 +0200
+
+ nls: delete compose sequences that mix top-row digits with numpad digits
+ 
+ Compose sequences for circled numbers, like ⑫ or ㉑, are nice to have,
+ but allowing them to be composed by typing one digit on the top row and
+ the other on the numerical keypad (or the other way around) is over the
+ top. Remove these absurd sequences. Keep only the sequences where both
+ digits are either on the top row or on the numerical keypad.
+ 
+ Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
+
 commit 3a30ada60c5217ada37b143b541c8e6f6284c7fa
 Author: Alan Coopersmith <alan.coopersmith@oracle.com>
 Date: Wed Jun 8 17:30:14 2022 -0700

_service:tar_scm:libX11-1.8.1.tar.xz/Makefile.in -> _service:tar_scm:libX11-1.8.4.tar.xz/Makefile.in Changed

@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.5 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2021 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -169,7 +169,7 @@
   $(RECURSIVE_CLEAN_TARGETS) \
   $(am__extra_recursive_targets)
 AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
-	cscope distdir distdir-am dist dist-all distcheck
+	cscope distdir dist dist-all distcheck
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 # Read a list of newline-separated strings from the standard input,
 # and print each of them once, without duplicates.  Input order is
@@ -187,11 +187,14 @@
   unique=`for i in $$list; do \
     if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
   done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+CSCOPE = cscope
 DIST_SUBDIRS = include modules src nls man specs
 am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/x11-xcb.pc.in \
 	$(srcdir)/x11.pc.in $(top_srcdir)/include/X11/XlibConf.h.in \
-	AUTHORS COPYING ChangeLog INSTALL NEWS README.md compile \
-	config.guess config.sub install-sh ltmain.sh missing
+	AUTHORS COPYING ChangeLog INSTALL compile config.guess \
+	config.sub install-sh ltmain.sh missing
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
@@ -230,8 +233,6 @@
 DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.xz
 GZIP_ENV = --best
 DIST_TARGETS = dist-xz dist-gzip
-# Exists only to be overridden by the user if desired.
-AM_DISTCHECK_DVI_TARGET = dvi
 distuninstallcheck_listfiles = find . -type f -print
 am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
   | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
@@ -260,8 +261,6 @@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
-CSCOPE = @CSCOPE@
-CTAGS = @CTAGS@
 CWARNFLAGS = @CWARNFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
@@ -275,11 +274,9 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ETAGS = @ETAGS@
 EXEEXT = @EXEEXT@
 EXEEXT_FOR_BUILD = @EXEEXT_FOR_BUILD@
 FGREP = @FGREP@
-FILECMD = @FILECMD@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 FOP = @FOP@
@@ -343,6 +340,7 @@
 STRIP = @STRIP@
 STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@
 TRADITIONALCPPFLAGS = @TRADITIONALCPPFLAGS@
+USE_THREAD_LIBS = @USE_THREAD_LIBS@
 VERSION = @VERSION@
 WCHAR32 = @WCHAR32@
 X11_CFLAGS = @X11_CFLAGS@
@@ -413,7 +411,6 @@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
-runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -458,8 +455,8 @@
 	    echo ' $(SHELL) ./config.status'; \
 	    $(SHELL) ./config.status;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
 	esac;
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -621,10 +618,8 @@
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 	-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
-distdir: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) distdir-am
 
-distdir-am: $(DISTFILES)
+distdir: $(DISTFILES)
 	$(am__remove_distdir)
 	test -d "$(distdir)" || mkdir "$(distdir)"
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
@@ -692,7 +687,7 @@
 	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
 	|| chmod -R a+r "$(distdir)"
 dist-gzip: distdir
-	tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz
+	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
 	$(am__post_remove_distdir)
 
 dist-bzip2: distdir
@@ -706,10 +701,6 @@
 	tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
 	$(am__post_remove_distdir)
 
-dist-zstd: distdir
-	tardir=$(distdir) && $(am__tar) | zstd -c $${ZSTD_CLEVEL-$${ZSTD_OPT--19}} >$(distdir).tar.zst
-	$(am__post_remove_distdir)
-
 dist-tarZ: distdir
 	@echo WARNING: "Support for distribution archives compressed with" \
 		       "legacy program 'compress' is deprecated." >&2
@@ -721,7 +712,7 @@
 	@echo WARNING: "Support for shar distribution archives is" \
 	               "deprecated." >&2
 	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
-	shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz
+	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
 	$(am__post_remove_distdir)
 
 dist-zip: distdir
@@ -739,7 +730,7 @@
 distcheck: dist
 	case '$(DIST_ARCHIVES)' in \
 	*.tar.gz*) \
-	  eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\
+	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
 	*.tar.bz2*) \
 	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
 	*.tar.lz*) \
@@ -749,11 +740,9 @@
 	*.tar.Z*) \
 	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
 	*.shar.gz*) \
-	  eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
+	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
 	*.zip*) \
 	  unzip $(distdir).zip ;;\
-	*.tar.zst*) \
-	  zstd -dc $(distdir).tar.zst | $(am__untar) ;;\
 	esac
 	chmod -R a-w $(distdir)
 	chmod u+w $(distdir)
@@ -769,7 +758,7 @@
 	    $(DISTCHECK_CONFIGURE_FLAGS) \
 	    --srcdir=../.. --prefix="$$dc_install_base" \
 	  && $(MAKE) $(AM_MAKEFLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) $(AM_DISTCHECK_DVI_TARGET) \
+	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
 	  && $(MAKE) $(AM_MAKEFLAGS) check \
 	  && $(MAKE) $(AM_MAKEFLAGS) install \
 	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
@@ -935,7 +924,7 @@
 	am--refresh check check-am clean clean-cscope clean-generic \
 	clean-libtool cscope cscopelist-am ctags ctags-am dist \
 	dist-all dist-bzip2 dist-gzip dist-hook dist-lzip dist-shar \
-	dist-tarZ dist-xz dist-zip dist-zstd distcheck distclean \
+	dist-tarZ dist-xz dist-zip distcheck distclean \
 	distclean-generic distclean-hdr distclean-libtool \
 	distclean-tags distcleancheck distdir distuninstallcheck dvi \
 	dvi-am html html-am info info-am install install-am \

_service:tar_scm:libX11-1.8.1.tar.xz/README.md -> _service:tar_scm:libX11-1.8.4.tar.xz/README.md Changed

@@ -31,6 +31,36 @@
 
 https://www.x.org/wiki/Development/Documentation/SubmittingPatches
 
+## Release 1.8.3
+
+ * Improved handling of reentering libX11 via X*IfEvent() calls (!171, !173)
+ * Fix loading of en_US.UTF-8/XLC_LOCALE (#167, !174)
+ * Add XFreeThreads() and automatic call from a destructor function when
+ thread-safety-constructor is enabled (!167).
+ * Address issues found by UBSan and AddressSanitizer
+ * Fix build with older gcc versions (!169)
+
+## Release 1.8.2
+
+ * Allow X*IfEvent() to reenter libX11 to avoid deadlock from unsafe
+ calls when thread-safety-constructor is enabled (!150).
+ * Remove Xlib's pthread function stubs - instead use system provided
+ threads functions, including linking against any needed pthread
+ libraries if thread-safety-constructor is enabled (!155, !156).
+ * Fix off-by-one error in XKeycodeToKeysym for indexes > 3 (!78).
+ * Allow XNSpotLocation with OnTheSpot (!127).
+ * Fix Win32 build when -fno-common is in effect (!140).
+ * Fix memory leak in XRegisterIMInstantiateCallback (!158).
+ * Add compose sequences for the double-struck capitals ℕ ℤ ℚ ℝ ℂ (!144),
+ the Samogitian E with dot above and macron (!147), Unicode minus sign (!163).
+ * Change <Compose> <^> <-> to mean superscript minus instead of macron (!162).
+ * Delete compose sequences that mix top-row digits with numpad digits (!139)
+ or mix upper & lower case letters (!144).
+ * Delete some unuseful compose sequences meant for Bépo layout (!146).
+ * Delete compose sequences using leftcaret & rightcaret keysyms (!163).
+ * Remove KOI8-R character set from en_US.UTF-8/XLC_LOCALE (!148).
+ * Map sr locales to sr_RS compose files (!161).
+
 ## Release 1.8.1
 
 * Fix --enable-thread-safety-constructor configure option

_service:tar_scm:libX11-1.8.1.tar.xz/aclocal.m4 -> _service:tar_scm:libX11-1.8.4.tar.xz/aclocal.m4 Changed

@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.16.5 -*- Autoconf -*-
+# generated automatically by aclocal 1.15 -*- Autoconf -*-
 
-# Copyright (C) 1996-2021 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
 
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -14,1140 +14,12 @@
 m4_ifndef(AC_CONFIG_MACRO_DIRS, m4_defun(_AM_CONFIG_MACRO_DIRS, )m4_defun(AC_CONFIG_MACRO_DIRS, _AM_CONFIG_MACRO_DIRS($@)))
 m4_ifndef(AC_AUTOCONF_VERSION,
 m4_copy(m4_PACKAGE_VERSION, AC_AUTOCONF_VERSION))dnl
-m4_if(m4_defn(AC_AUTOCONF_VERSION), 2.71,,
-m4_warning(this file was generated for autoconf 2.71.
+m4_if(m4_defn(AC_AUTOCONF_VERSION), 2.69,,
+m4_warning(this file was generated for autoconf 2.69.
 You have another version of autoconf. It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically 'autoreconf'.))
 
-# Copyright (C) 2002-2021 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-# (This private macro should not be called outside this file.)
-AC_DEFUN(AM_AUTOMAKE_VERSION,
-am__api_version='1.16'
-dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
-dnl require some minimum version. Point them to the right macro.
-m4_if($1, 1.16.5, ,
- AC_FATAL(Do not call $0, use AM_INIT_AUTOMAKE($1).))dnl
-)
-
-# _AM_AUTOCONF_VERSION(VERSION)
-# -----------------------------
-# aclocal traces this macro to find the Autoconf version.
-# This is a private macro too. Using m4_define simplifies
-# the logic in aclocal, which can simply ignore this definition.
-m4_define(_AM_AUTOCONF_VERSION, )
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
-# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
-AC_DEFUN(AM_SET_CURRENT_AUTOMAKE_VERSION,
-AM_AUTOMAKE_VERSION(1.16.5)dnl
-m4_ifndef(AC_AUTOCONF_VERSION,
- m4_copy(m4_PACKAGE_VERSION, AC_AUTOCONF_VERSION))dnl
-_AM_AUTOCONF_VERSION(m4_defn(AC_AUTOCONF_VERSION)))
-
-# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-
-# Copyright (C) 2001-2021 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# For projects using AC_CONFIG_AUX_DIR(foo), Autoconf sets
-# $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to
-# '$srcdir', '$srcdir/..', or '$srcdir/../..'.
-#
-# Of course, Automake must honor this variable whenever it calls a
-# tool from the auxiliary directory. The problem is that $srcdir (and
-# therefore $ac_aux_dir as well) can be either absolute or relative,
-# depending on how configure is run. This is pretty annoying, since
-# it makes $ac_aux_dir quite unusable in subdirectories: in the top
-# source directory, any form will work fine, but in subdirectories a
-# relative path needs to be adjusted first.
-#
-# $ac_aux_dir/missing
-# fails when called from a subdirectory if $ac_aux_dir is relative
-# $top_srcdir/$ac_aux_dir/missing
-# fails if $ac_aux_dir is absolute,
-# fails when called from a subdirectory in a VPATH build with
-# a relative $ac_aux_dir
-#
-# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
-# are both prefixed by $srcdir. In an in-source build this is usually
-# harmless because $srcdir is '.', but things will broke when you
-# start a VPATH build or use an absolute $srcdir.
-#
-# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
-# iff we strip the leading $srcdir from $ac_aux_dir. That would be:
-# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*$.*$"`
-# and then we would define $MISSING as
-# MISSING="\${SHELL} $am_aux_dir/missing"
-# This will work as long as MISSING is not called from configure, because
-# unfortunately $(top_srcdir) has no meaning in configure.
-# However there are other variables, like CC, which are often used in
-# configure, and could therefore not use this "fixed" $ac_aux_dir.
-#
-# Another solution, used here, is to always expand $ac_aux_dir to an
-# absolute PATH. The drawback is that using absolute paths prevent a
-# configured tree to be moved without reconfiguration.
-
-AC_DEFUN(AM_AUX_DIR_EXPAND,
-AC_REQUIRE(AC_CONFIG_AUX_DIR_DEFAULT)dnl
-# Expand $ac_aux_dir to an absolute path.
-am_aux_dir=`cd "$ac_aux_dir" && pwd`
-)
-
-# AM_CONDITIONAL -*- Autoconf -*-
-
-# Copyright (C) 1997-2021 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_CONDITIONAL(NAME, SHELL-CONDITION)
-# -------------------------------------
-# Define a conditional.
-AC_DEFUN(AM_CONDITIONAL,
-AC_PREREQ(2.52)dnl
- m4_if($1, TRUE, AC_FATAL($0: invalid condition: $1),
- $1, FALSE, AC_FATAL($0: invalid condition: $1))dnl
-AC_SUBST($1_TRUE)dnl
-AC_SUBST($1_FALSE)dnl
-_AM_SUBST_NOTMAKE($1_TRUE)dnl
-_AM_SUBST_NOTMAKE($1_FALSE)dnl
-m4_define(_AM_COND_VALUE_$1, $2)dnl
-if $2; then
- $1_TRUE=
- $1_FALSE='#'
-else
- $1_TRUE='#'
- $1_FALSE=
-fi
-AC_CONFIG_COMMANDS_PRE(
-if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
- AC_MSG_ERROR(conditional "$1" was never defined.
-Usually this means the macro was only invoked conditionally.)
-fi))
-
-# Copyright (C) 1999-2021 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-
-# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be
-# written in clear, in which case automake, when reading aclocal.m4,
-# will think it sees a *use*, and therefore will trigger all it's
-# C support machinery. Also note that it means that autoscan, seeing
-# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
-
-
-# _AM_DEPENDENCIES(NAME)
-# ----------------------
-# See how the compiler implements dependency checking.
-# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC".
-# We try a few techniques and use that to set a single cache variable.
-#
-# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
-# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
-# dependency, and given that the user is not expected to run this macro,
-# just rely on AC_PROG_CC.
-AC_DEFUN(_AM_DEPENDENCIES,
-AC_REQUIRE(AM_SET_DEPDIR)dnl
-AC_REQUIRE(AM_OUTPUT_DEPENDENCY_COMMANDS)dnl
-AC_REQUIRE(AM_MAKE_INCLUDE)dnl
-AC_REQUIRE(AM_DEP_TRACK)dnl
-
-m4_if($1, CC, depcc="$CC" am_compiler_list=,
- $1, CXX, depcc="$CXX" am_compiler_list=,
- $1, OBJC, depcc="$OBJC" am_compiler_list='gcc3 gcc',
- $1, OBJCXX, depcc="$OBJCXX" am_compiler_list='gcc3 gcc',
- $1, UPC, depcc="$UPC" am_compiler_list=,
- $1, GCJ, depcc="$GCJ" am_compiler_list='gcc3 gcc',
- depcc="$$1" am_compiler_list=)
-
-AC_CACHE_CHECK(dependency style of $depcc,
- am_cv_$1_dependencies_compiler_type,
-if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
- # We make a subdir and do the tests there. Otherwise we can end up
- # making bogus files that we don't know about and never remove. For
- # instance it was reported that on HP-UX the gcc test will end up
- # making a dummy file named 'D' -- because '-MD' means "put the output
- # in D".
- rm -rf conftest.dir
- mkdir conftest.dir
- # Copy depcomp to subdir because otherwise we won't find it if we're
- # using a relative directory.
- cp "$am_depcomp" conftest.dir
- cd conftest.dir
- # We will build objects and dependencies in a subdirectory because
- # it helps to detect inapplicable dependency modes. For instance
- # both Tru64's cc and ICC support -MD to output dependencies as a
- # side effect of compilation, but ICC will put the dependencies in
- # the current directory while Tru64 will put them in the object
- # directory.
- mkdir sub
-
- am_cv_$1_dependencies_compiler_type=none
- if test "$am_compiler_list" = ""; then
- am_compiler_list=`sed -n 's/^#*$a-zA-Z0-9*$)$/\1/p' < ./depcomp`
- fi
- am__universal=false
- m4_case($1, CC,
- case " $depcc " in #(
- *\ -arch\ *\ -arch\ *) am__universal=true ;;
- esac,
- CXX,
- case " $depcc " in #(
- *\ -arch\ *\ -arch\ *) am__universal=true ;;
- esac)
-
- for depmode in $am_compiler_list; do
- # Setup a source with many dependencies, because some compilers
- # like to wrap large dependency lists on column 80 (with \), and
- # we should not choose a depcomp mode which is confused by this.
- #
- # We need to recreate these files for each test, as the compiler may
- # overwrite some of them when testing with obscure command lines.
- # This happens at least with the AIX C compiler.
- : > sub/conftest.c
- for i in 1 2 3 4 5 6; do
- echo '#include "conftst'$i'.h"' >> sub/conftest.c
- # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
- # Solaris 10 /bin/sh.
- echo '/* dummy */' > sub/conftst$i.h
- done
- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
- # We check with '-c' and '-o' for the sake of the "dashmstdout"
- # mode. It turns out that the SunPro C++ compiler does not properly
- # handle '-M -o', and we need to detect this. Also, some Intel
- # versions had trouble with output in subdirs.
- am__obj=sub/conftest.${OBJEXT-o}
- am__minus_obj="-o $am__obj"
- case $depmode in
- gcc)
- # This depmode causes a compiler race in universal mode.
- test "$am__universal" = false || continue
- ;;
- nosideeffect)
- # After this tag, mechanisms are not by side-effect, so they'll
- # only be used when explicitly requested.
- if test "x$enable_dependency_tracking" = xyes; then
-	continue
- else
-	break
- fi
- ;;
- msvc7 | msvc7msys | msvisualcpp | msvcmsys)
- # This compiler won't grok '-c -o', but also, the minuso test has
- # not run yet. These depmodes are late enough in the game, and
- # so weak that their functioning should not be impacted.
- am__obj=conftest.${OBJEXT-o}
- am__minus_obj=
- ;;
- none) break ;;
- esac
- if depmode=$depmode \
- source=sub/conftest.c object=$am__obj \
- depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
- $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
- >/dev/null 2>conftest.err &&
- grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
- grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
- grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
- ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
- # icc doesn't choke on unknown options, it will just issue warnings
- # or remarks (even with -Werror). So we grep stderr for any message
- # that says an option was ignored or not supported.
- # When given -MP, icc 7.0 and 7.1 complain thusly:
- # icc: Command line warning: ignoring option '-M'; no argument required
- # The diagnosis changed in icc 8.0:
- # icc: Command line remark: option '-MP' not supported
- if (grep 'ignoring option' conftest.err ||
- grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
- am_cv_$1_dependencies_compiler_type=$depmode
- break
- fi
- fi
- done
-
- cd ..
- rm -rf conftest.dir
-else
- am_cv_$1_dependencies_compiler_type=none
-fi
-)
-AC_SUBST($1DEPMODE, depmode=$am_cv_$1_dependencies_compiler_type)
-AM_CONDITIONAL(am__fastdep$1, 
- test "x$enable_dependency_tracking" != xno \
- && test "$am_cv_$1_dependencies_compiler_type" = gcc3)
-)
-
-
-# AM_SET_DEPDIR
-# -------------
-# Choose a directory name for dependency files.
-# This macro is AC_REQUIREd in _AM_DEPENDENCIES.
-AC_DEFUN(AM_SET_DEPDIR,
-AC_REQUIRE(AM_SET_LEADING_DOT)dnl
-AC_SUBST(DEPDIR, "${am__leading_dot}deps")dnl
-)
-
-
-# AM_DEP_TRACK
-# ------------
-AC_DEFUN(AM_DEP_TRACK,
-AC_ARG_ENABLE(dependency-tracking, dnl
-AS_HELP_STRING(
- --enable-dependency-tracking,
- do not reject slow dependency extractors)
-AS_HELP_STRING(
- --disable-dependency-tracking,
- speeds up one-time build))
-if test "x$enable_dependency_tracking" != xno; then
- am_depcomp="$ac_aux_dir/depcomp"
- AMDEPBACKSLASH='\'
- am__nodep='_no'
-fi
-AM_CONDITIONAL(AMDEP, test "x$enable_dependency_tracking" != xno)
-AC_SUBST(AMDEPBACKSLASH)dnl
-_AM_SUBST_NOTMAKE(AMDEPBACKSLASH)dnl
-AC_SUBST(am__nodep)dnl
-_AM_SUBST_NOTMAKE(am__nodep)dnl
-)
-
-# Generate code to set up dependency tracking. -*- Autoconf -*-
-
-# Copyright (C) 1999-2021 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# _AM_OUTPUT_DEPENDENCY_COMMANDS
-# ------------------------------
-AC_DEFUN(_AM_OUTPUT_DEPENDENCY_COMMANDS,
-{
- # Older Autoconf quotes --file arguments for eval, but not when files
- # are listed without --file. Let's play safe and only enable the eval
- # if we detect the quoting.
- # TODO: see whether this extra hack can be removed once we start
- # requiring Autoconf 2.70 or later.
- AS_CASE($CONFIG_FILES,
- *\'*, eval set x "$CONFIG_FILES",
- *, set x $CONFIG_FILES)
- shift
- # Used to flag and report bootstrapping failures.
- am_rc=0
- for am_mf
- do
- # Strip MF so we end up with the name of the file.
- am_mf=`AS_ECHO("$am_mf") | sed -e 's/:.*$//'`
- # Check whether this is an Automake generated Makefile which includes
- # dependency-tracking related rules and includes.
- # Grep'ing the whole file directly is not great: AIX grep has a line
- # limit of 2048, but all sed's we know have understand at least 4000.
- sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \
- || continue
- am_dirpart=`AS_DIRNAME("$am_mf")`
- am_filepart=`AS_BASENAME("$am_mf")`
- AM_RUN_LOG(cd "$am_dirpart" \
- && sed -e '/# am--include-marker/d' "$am_filepart" \
- | $MAKE -f - am--depfiles) || am_rc=$?
- done
- if test $am_rc -ne 0; then
- AC_MSG_FAILURE(Something went wrong bootstrapping makefile fragments
- for automatic dependency tracking. If GNU make was not used, consider
- re-running the configure script with MAKE="gmake" (or whatever is
- necessary). You can also try re-running configure with the
- '--disable-dependency-tracking' option to at least be able to build
- the package (albeit without support for automatic dependency tracking).)
- fi
- AS_UNSET(am_dirpart)
- AS_UNSET(am_filepart)
- AS_UNSET(am_mf)
- AS_UNSET(am_rc)
- rm -f conftest-deps.mk
-}
-)# _AM_OUTPUT_DEPENDENCY_COMMANDS
-
-
-# AM_OUTPUT_DEPENDENCY_COMMANDS
-# -----------------------------
-# This macro should only be invoked once -- use via AC_REQUIRE.
-#
-# This code is only required when automatic dependency tracking is enabled.
-# This creates each '.Po' and '.Plo' makefile fragment that we'll need in
-# order to bootstrap the dependency handling code.
-AC_DEFUN(AM_OUTPUT_DEPENDENCY_COMMANDS,
-AC_CONFIG_COMMANDS(depfiles,
- test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS,
- AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"))
-
-# Do all the work for Automake. -*- Autoconf -*-
-
-# Copyright (C) 1996-2021 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This macro actually does too much. Some checks are only needed if
-# your package does certain things. But this isn't really a big deal.
-
-dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O.
-m4_define(AC_PROG_CC,
-m4_defn(AC_PROG_CC)
-_AM_PROG_CC_C_O
-)
-
-# AM_INIT_AUTOMAKE(PACKAGE, VERSION, NO-DEFINE)
-# AM_INIT_AUTOMAKE(OPTIONS)
-# -----------------------------------------------
-# The call with PACKAGE and VERSION arguments is the old style
-# call (pre autoconf-2.50), which is being phased out. PACKAGE
-# and VERSION should now be passed to AC_INIT and removed from
-# the call to AM_INIT_AUTOMAKE.
-# We support both call styles for the transition. After
-# the next Automake release, Autoconf can make the AC_INIT
-# arguments mandatory, and then we can depend on a new Autoconf
-# release and drop the old call support.
-AC_DEFUN(AM_INIT_AUTOMAKE,
-AC_PREREQ(2.65)dnl
-m4_ifdef(_$0_ALREADY_INIT,
- m4_fatal($0 expanded multiple times
-m4_defn(_$0_ALREADY_INIT)),
- m4_define(_$0_ALREADY_INIT, m4_expansion_stack))dnl
-dnl Autoconf wants to disallow AM_ names. We explicitly allow
-dnl the ones we care about.
-m4_pattern_allow(^AM_A-Z+FLAGS$)dnl
-AC_REQUIRE(AM_SET_CURRENT_AUTOMAKE_VERSION)dnl
-AC_REQUIRE(AC_PROG_INSTALL)dnl
-if test "`cd $srcdir && pwd`" != "`pwd`"; then
- # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
- # is not polluted with repeated "-I."
- AC_SUBST(am__isrc, ' -I$(srcdir)')_AM_SUBST_NOTMAKE(am__isrc)dnl
- # test to see if srcdir already configured
- if test -f $srcdir/config.status; then
- AC_MSG_ERROR(source directory already configured; run "make distclean" there first)
- fi
-fi
-
-# test whether we have cygpath
-if test -z "$CYGPATH_W"; then
- if (cygpath --version) >/dev/null 2>/dev/null; then
- CYGPATH_W='cygpath -w'
- else
- CYGPATH_W=echo
- fi
-fi
-AC_SUBST(CYGPATH_W)
-
-# Define the identity of the package.
-dnl Distinguish between old-style and new-style calls.
-m4_ifval($2,
-AC_DIAGNOSE(obsolete,
- $0: two- and three-arguments forms are deprecated.)
-m4_ifval($3, _AM_SET_OPTION(no-define))dnl
- AC_SUBST(PACKAGE, $1)dnl
- AC_SUBST(VERSION, $2),
-_AM_SET_OPTIONS($1)dnl
-dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
-m4_if(
- m4_ifset(AC_PACKAGE_NAME, ok):m4_ifset(AC_PACKAGE_VERSION, ok),
- ok:ok,,
- m4_fatal(AC_INIT should be called with package and version arguments))dnl
- AC_SUBST(PACKAGE, 'AC_PACKAGE_TARNAME')dnl
- AC_SUBST(VERSION, 'AC_PACKAGE_VERSION'))dnl
-
-_AM_IF_OPTION(no-define,,
-AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", Name of package)
- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", Version number of package))dnl
-
-# Some tools Automake needs.
-AC_REQUIRE(AM_SANITY_CHECK)dnl
-AC_REQUIRE(AC_ARG_PROGRAM)dnl
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
-AM_MISSING_PROG(AUTOCONF, autoconf)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
-AM_MISSING_PROG(AUTOHEADER, autoheader)
-AM_MISSING_PROG(MAKEINFO, makeinfo)
-AC_REQUIRE(AM_PROG_INSTALL_SH)dnl
-AC_REQUIRE(AM_PROG_INSTALL_STRIP)dnl
-AC_REQUIRE(AC_PROG_MKDIR_P)dnl
-# For better backward compatibility. To be removed once Automake 1.9.x
-# dies out for good. For more background, see:
-# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
-# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
-AC_SUBST(mkdir_p, '$(MKDIR_P)')
-# We need awk for the "check" target (and possibly the TAP driver). The
-# system "awk" is bad on some platforms.
-AC_REQUIRE(AC_PROG_AWK)dnl
-AC_REQUIRE(AC_PROG_MAKE_SET)dnl
-AC_REQUIRE(AM_SET_LEADING_DOT)dnl
-_AM_IF_OPTION(tar-ustar, _AM_PROG_TAR(ustar),
-	 _AM_IF_OPTION(tar-pax, _AM_PROG_TAR(pax),
-			 _AM_PROG_TAR(v7)))
-_AM_IF_OPTION(no-dependencies,,
-AC_PROVIDE_IFELSE(AC_PROG_CC,
-		 _AM_DEPENDENCIES(CC),
-		 m4_define(AC_PROG_CC,
-			 m4_defn(AC_PROG_CC)_AM_DEPENDENCIES(CC)))dnl
-AC_PROVIDE_IFELSE(AC_PROG_CXX,
-		 _AM_DEPENDENCIES(CXX),
-		 m4_define(AC_PROG_CXX,
-			 m4_defn(AC_PROG_CXX)_AM_DEPENDENCIES(CXX)))dnl
-AC_PROVIDE_IFELSE(AC_PROG_OBJC,
-		 _AM_DEPENDENCIES(OBJC),
-		 m4_define(AC_PROG_OBJC,
-			 m4_defn(AC_PROG_OBJC)_AM_DEPENDENCIES(OBJC)))dnl
-AC_PROVIDE_IFELSE(AC_PROG_OBJCXX,
-		 _AM_DEPENDENCIES(OBJCXX),
-		 m4_define(AC_PROG_OBJCXX,
-			 m4_defn(AC_PROG_OBJCXX)_AM_DEPENDENCIES(OBJCXX)))dnl
-)
-# Variables for tags utilities; see am/tags.am
-if test -z "$CTAGS"; then
- CTAGS=ctags
-fi
-AC_SUBST(CTAGS)
-if test -z "$ETAGS"; then
- ETAGS=etags
-fi
-AC_SUBST(ETAGS)
-if test -z "$CSCOPE"; then
- CSCOPE=cscope
-fi
-AC_SUBST(CSCOPE)
-
-AC_REQUIRE(AM_SILENT_RULES)dnl
-dnl The testsuite driver may need to know about EXEEXT, so add the
-dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This
-dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below.
-AC_CONFIG_COMMANDS_PRE(dnl
-m4_provide_if(_AM_COMPILER_EXEEXT,
- AM_CONDITIONAL(am__EXEEXT, test -n "$EXEEXT")))dnl
-
-# POSIX will say in a future version that running "rm -f" with no argument
-# is OK; and we want to be able to make that assumption in our Makefile
-# recipes. So use an aggressive probe to check that the usage we want is
-# actually supported "in the wild" to an acceptable degree.
-# See automake bug#10828.
-# To make any issue more visible, cause the running configure to be aborted
-# by default if the 'rm' program in use doesn't match our expectations; the
-# user can still override this though.
-if rm -f && rm -fr && rm -rf; then : OK; else
- cat >&2 <<'END'
-Oops!
-
-Your 'rm' program seems unable to run without file operands specified
-on the command line, even when the '-f' option is present. This is contrary
-to the behaviour of most rm programs out there, and not conforming with
-the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
-
-Please tell bug-automake@gnu.org about your system, including the value
-of your $PATH and any error possibly output before this message. This
-can help us improve future automake versions.
-
-END
- if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
- echo 'Configuration will proceed anyway, since you have set the' >&2
- echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
- echo >&2
- else
- cat >&2 <<'END'
-Aborting the configuration process, to ensure you take notice of the issue.
-
-You can download and install GNU coreutils to get an 'rm' implementation
-that behaves properly: <https://www.gnu.org/software/coreutils/>.
-
-If you want to complete the configuration process using your problematic
-'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
-to "yes", and re-run configure.
-
-END
- AC_MSG_ERROR(Your 'rm' program is bad, sorry.)
- fi
-fi
-dnl The trailing newline in this macro's definition is deliberate, for
-dnl backward compatibility and to allow trailing 'dnl'-style comments
-dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841.
-)
-
-dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
-dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
-dnl mangled by Autoconf and run in a shell conditional statement.
-m4_define(_AC_COMPILER_EXEEXT,
-m4_defn(_AC_COMPILER_EXEEXT)m4_provide(_AM_COMPILER_EXEEXT))
-
-# When config.status generates a header, we must update the stamp-h file.
-# This file resides in the same directory as the config header
-# that is generated. The stamp files are numbered to have different names.
-
-# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
-# loop where config.status creates the headers, so we can generate
-# our stamp files there.
-AC_DEFUN(_AC_AM_CONFIG_HEADER_HOOK,
-# Compute $1's index in $config_headers.
-_am_arg=$1
-_am_stamp_count=1
-for _am_header in $config_headers :; do
- case $_am_header in
- $_am_arg | $_am_arg:* )
- break ;;
- * )
- _am_stamp_count=`expr $_am_stamp_count + 1` ;;
- esac
-done
-echo "timestamp for $_am_arg" >`AS_DIRNAME("$_am_arg")`/stamp-h$_am_stamp_count)
-
-# Copyright (C) 2001-2021 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_PROG_INSTALL_SH
-# ------------------
-# Define $install_sh.
-AC_DEFUN(AM_PROG_INSTALL_SH,
-AC_REQUIRE(AM_AUX_DIR_EXPAND)dnl
-if test x"${install_sh+set}" != xset; then
- case $am_aux_dir in
- *\ * | *\	*)
- install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
- *)
- install_sh="\${SHELL} $am_aux_dir/install-sh"
- esac
-fi
-AC_SUBST(install_sh))
-
-# Copyright (C) 2003-2021 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# Check whether the underlying file-system supports filenames
-# with a leading dot. For instance MS-DOS doesn't.
-AC_DEFUN(AM_SET_LEADING_DOT,
-rm -rf .tst 2>/dev/null
-mkdir .tst 2>/dev/null
-if test -d .tst; then
- am__leading_dot=.
-else
- am__leading_dot=_
-fi
-rmdir .tst 2>/dev/null
-AC_SUBST(am__leading_dot))
-
-# Check to see how 'make' treats includes.	 -*- Autoconf -*-
-
-# Copyright (C) 2001-2021 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_MAKE_INCLUDE()
-# -----------------
-# Check whether make has an 'include' directive that can support all
-# the idioms we need for our automatic dependency tracking code.
-AC_DEFUN(AM_MAKE_INCLUDE,
-AC_MSG_CHECKING(whether ${MAKE-make} supports the include directive)
-cat > confinc.mk << 'END'
-am__doit:
-	@echo this is the am__doit target >confinc.out
-.PHONY: am__doit
-END
-am__include="#"
-am__quote=
-# BSD make does it like this.
-echo '.include "confinc.mk" # ignored' > confmf.BSD
-# Other make implementations (GNU, Solaris 10, AIX) do it like this.
-echo 'include confinc.mk # ignored' > confmf.GNU
-_am_result=no
-for s in GNU BSD; do
- AM_RUN_LOG(${MAKE-make} -f confmf.$s && cat confinc.out)
- AS_CASE($?:`cat confinc.out 2>/dev/null`,
- '0:this is the am__doit target',
- AS_CASE($s,
- BSD, am__include='.include' am__quote='"',
- am__include='include' am__quote=''))
- if test "$am__include" != "#"; then
- _am_result="yes ($s style)"
- break
- fi
-done
-rm -f confinc.* confmf.*
-AC_MSG_RESULT(${_am_result})
-AC_SUBST(am__include))
-AC_SUBST(am__quote))
-
-# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-
-# Copyright (C) 1997-2021 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_MISSING_PROG(NAME, PROGRAM)
-# ------------------------------
-AC_DEFUN(AM_MISSING_PROG,
-AC_REQUIRE(AM_MISSING_HAS_RUN)
-$1=${$1-"${am_missing_run}$2"}
-AC_SUBST($1))
-
-# AM_MISSING_HAS_RUN
-# ------------------
-# Define MISSING if not defined so far and test if it is modern enough.
-# If it is, set am_missing_run to use it, otherwise, to nothing.
-AC_DEFUN(AM_MISSING_HAS_RUN,
-AC_REQUIRE(AM_AUX_DIR_EXPAND)dnl
-AC_REQUIRE_AUX_FILE(missing)dnl
-if test x"${MISSING+set}" != xset; then
- MISSING="\${SHELL} '$am_aux_dir/missing'"
-fi
-# Use eval to expand $SHELL
-if eval "$MISSING --is-lightweight"; then
- am_missing_run="$MISSING "
-else
- am_missing_run=
- AC_MSG_WARN('missing' script is too old or missing)
-fi
-)
-
-# Helper functions for option handling. -*- Autoconf -*-
-
-# Copyright (C) 2001-2021 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# _AM_MANGLE_OPTION(NAME)
-# -----------------------
-AC_DEFUN(_AM_MANGLE_OPTION,
-_AM_OPTION_m4_bpatsubst($1, ^a-zA-Z0-9_, _))
-
-# _AM_SET_OPTION(NAME)
-# --------------------
-# Set option NAME. Presently that only means defining a flag for this option.
-AC_DEFUN(_AM_SET_OPTION,
-m4_define(_AM_MANGLE_OPTION($1), 1))
-
-# _AM_SET_OPTIONS(OPTIONS)
-# ------------------------
-# OPTIONS is a space-separated list of Automake options.
-AC_DEFUN(_AM_SET_OPTIONS,
-m4_foreach_w(_AM_Option, $1, _AM_SET_OPTION(_AM_Option)))
-
-# _AM_IF_OPTION(OPTION, IF-SET, IF-NOT-SET)
-# -------------------------------------------
-# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
-AC_DEFUN(_AM_IF_OPTION,
-m4_ifset(_AM_MANGLE_OPTION($1), $2, $3))
-
-# Copyright (C) 1999-2021 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# _AM_PROG_CC_C_O
-# ---------------
-# Like AC_PROG_CC_C_O, but changed for automake. We rewrite AC_PROG_CC
-# to automatically call this.
-AC_DEFUN(_AM_PROG_CC_C_O,
-AC_REQUIRE(AM_AUX_DIR_EXPAND)dnl
-AC_REQUIRE_AUX_FILE(compile)dnl
-AC_LANG_PUSH(C)dnl
-AC_CACHE_CHECK(
- whether $CC understands -c and -o together,
- am_cv_prog_cc_c_o,
- AC_LANG_CONFTEST(AC_LANG_PROGRAM())
- # Make sure it works both with $CC and with simple cc.
- # Following AC_PROG_CC_C_O, we do the test twice because some
- # compilers refuse to overwrite an existing .o file with -o,
- # though they will create one.
- am_cv_prog_cc_c_o=yes
- for am_i in 1 2; do
- if AM_RUN_LOG($CC -c conftest.$ac_ext -o conftest2.$ac_objext) \
- && test -f conftest2.$ac_objext; then
- : OK
- else
- am_cv_prog_cc_c_o=no
- break
- fi
- done
- rm -f core conftest*
- unset am_i)
-if test "$am_cv_prog_cc_c_o" != yes; then
- # Losing compiler, so override with the script.
- # FIXME: It is wrong to rewrite CC.
- # But if we don't then we get into trouble of one sort or another.
- # A longer-term fix would be to have automake use am__CC in this case,
- # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
- CC="$am_aux_dir/compile $CC"
-fi
-AC_LANG_POP(C))
-
-# For backward compatibility.
-AC_DEFUN_ONCE(AM_PROG_CC_C_O, AC_REQUIRE(AC_PROG_CC))
-
-# Copyright (C) 2001-2021 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_RUN_LOG(COMMAND)
-# -------------------
-# Run COMMAND, save the exit status in ac_status, and log it.
-# (This has been adapted from Autoconf's _AC_RUN_LOG macro.)
-AC_DEFUN(AM_RUN_LOG,
-{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD
- ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
- (exit $ac_status); })
-
-# Check to make sure that the build environment is sane. -*- Autoconf -*-
-
-# Copyright (C) 1996-2021 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_SANITY_CHECK
-# ---------------
-AC_DEFUN(AM_SANITY_CHECK,
-AC_MSG_CHECKING(whether build environment is sane)
-# Reject unsafe characters in $srcdir or the absolute working directory
-# name. Accept space and tab only in the latter.
-am_lf='
-'
-case `pwd` in
- *\\\"\#\$\&\'\`$am_lf*)
- AC_MSG_ERROR(unsafe absolute working directory name);;
-esac
-case $srcdir in
- *\\\"\#\$\&\'\`$am_lf\ \	*)
- AC_MSG_ERROR(unsafe srcdir value: '$srcdir');;
-esac
-
-# Do 'set' in a subshell so we don't clobber the current shell's
-# arguments. Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
- am_has_slept=no
- for am_try in 1 2; do
- echo "timestamp, slept: $am_has_slept" > conftest.file
- set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
- if test "$*" = "X"; then
-	# -L didn't work.
-	set X `ls -t "$srcdir/configure" conftest.file`
- fi
- if test "$*" != "X $srcdir/configure conftest.file" \
-	&& test "$*" != "X conftest.file $srcdir/configure"; then
-
-	# If neither matched, then we have a broken ls. This can happen
-	# if, for instance, CONFIG_SHELL is bash and it inherits a
-	# broken ls alias from the environment. This has actually
-	# happened. Such a system could not be considered "sane".
-	AC_MSG_ERROR(ls -t appears to fail. Make sure there is not a broken
- alias in your environment)
- fi
- if test "$2" = conftest.file || test $am_try -eq 2; then
- break
- fi
- # Just in case.
- sleep 1
- am_has_slept=yes
- done
- test "$2" = conftest.file
- )
-then
- # Ok.
- :
-else
- AC_MSG_ERROR(newly created file is older than distributed files!
-Check your system clock)
-fi
-AC_MSG_RESULT(yes)
-# If we didn't sleep, we still need to ensure time stamps of config.status and
-# generated files are strictly newer.
-am_sleep_pid=
-if grep 'slept: no' conftest.file >/dev/null 2>&1; then
- ( sleep 1 ) &
- am_sleep_pid=$!
-fi
-AC_CONFIG_COMMANDS_PRE(
- AC_MSG_CHECKING(that generated files are newer than configure)
- if test -n "$am_sleep_pid"; then
- # Hide warnings about reused PIDs.
- wait $am_sleep_pid 2>/dev/null
- fi
- AC_MSG_RESULT(done))
-rm -f conftest.file
-)
-
-# Copyright (C) 2009-2021 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_SILENT_RULES(DEFAULT)
-# --------------------------
-# Enable less verbose build rules; with the default set to DEFAULT
-# ("yes" being less verbose, "no" or empty being verbose).
-AC_DEFUN(AM_SILENT_RULES,
-AC_ARG_ENABLE(silent-rules, dnl
-AS_HELP_STRING(
- --enable-silent-rules,
- less verbose build output (undo: "make V=1"))
-AS_HELP_STRING(
- --disable-silent-rules,
- verbose build output (undo: "make V=0"))dnl
-)
-case $enable_silent_rules in @%:@ (((
- yes) AM_DEFAULT_VERBOSITY=0;;
- no) AM_DEFAULT_VERBOSITY=1;;
- *) AM_DEFAULT_VERBOSITY=m4_if($1, yes, 0, 1);;
-esac
-dnl
-dnl A few 'make' implementations (e.g., NonStop OS and NextStep)
-dnl do not support nested variable expansions.
-dnl See automake bug#9928 and bug#10237.
-am_make=${MAKE-make}
-AC_CACHE_CHECK(whether $am_make supports nested variables,
- am_cv_make_support_nested_variables,
- if AS_ECHO('TRUE=$(BAR$(V))
-BAR0=false
-BAR1=true
-V=1
-am__doit:
-	@$(TRUE)
-.PHONY: am__doit') | $am_make -f - >/dev/null 2>&1; then
- am_cv_make_support_nested_variables=yes
-else
- am_cv_make_support_nested_variables=no
-fi)
-if test $am_cv_make_support_nested_variables = yes; then
- dnl Using '$V' instead of '$(V)' breaks IRIX make.
- AM_V='$(V)'
- AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
-else
- AM_V=$AM_DEFAULT_VERBOSITY
- AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
-fi
-AC_SUBST(AM_V)dnl
-AM_SUBST_NOTMAKE(AM_V)dnl
-AC_SUBST(AM_DEFAULT_V)dnl
-AM_SUBST_NOTMAKE(AM_DEFAULT_V)dnl
-AC_SUBST(AM_DEFAULT_VERBOSITY)dnl
-AM_BACKSLASH='\'
-AC_SUBST(AM_BACKSLASH)dnl
-_AM_SUBST_NOTMAKE(AM_BACKSLASH)dnl
-)
-
-# Copyright (C) 2001-2021 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_PROG_INSTALL_STRIP
-# ---------------------
-# One issue with vendor 'install' (even GNU) is that you can't
-# specify the program used to strip binaries. This is especially
-# annoying in cross-compiling environments, where the build's strip
-# is unlikely to handle the host's binaries.
-# Fortunately install-sh will honor a STRIPPROG variable, so we
-# always use install-sh in "make install-strip", and initialize
-# STRIPPROG with the value of the STRIP variable (set by the user).
-AC_DEFUN(AM_PROG_INSTALL_STRIP,
-AC_REQUIRE(AM_PROG_INSTALL_SH)dnl
-# Installed binaries are usually stripped using 'strip' when the user
-# run "make install-strip". However 'strip' might not be the right
-# tool to use in cross-compilation environments, therefore Automake
-# will honor the 'STRIP' environment variable to overrule this program.
-dnl Don't test for $cross_compiling = yes, because it might be 'maybe'.
-if test "$cross_compiling" != no; then
- AC_CHECK_TOOL(STRIP, strip, :)
-fi
-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
-AC_SUBST(INSTALL_STRIP_PROGRAM))
-
-# Copyright (C) 2006-2021 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# _AM_SUBST_NOTMAKE(VARIABLE)
-# ---------------------------
-# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
-# This macro is traced by Automake.
-AC_DEFUN(_AM_SUBST_NOTMAKE)
-
-# AM_SUBST_NOTMAKE(VARIABLE)
-# --------------------------
-# Public sister of _AM_SUBST_NOTMAKE.
-AC_DEFUN(AM_SUBST_NOTMAKE, _AM_SUBST_NOTMAKE($@))
-
-# Check how to create a tarball. -*- Autoconf -*-
-
-# Copyright (C) 2004-2021 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# _AM_PROG_TAR(FORMAT)
-# --------------------
-# Check how to create a tarball in format FORMAT.
-# FORMAT should be one of 'v7', 'ustar', or 'pax'.
-#
-# Substitute a variable $(am__tar) that is a command
-# writing to stdout a FORMAT-tarball containing the directory
-# $tardir.
-# tardir=directory && $(am__tar) > result.tar
-#
-# Substitute a variable $(am__untar) that extract such
-# a tarball read from stdin.
-# $(am__untar) < result.tar
-#
-AC_DEFUN(_AM_PROG_TAR,
-# Always define AMTAR for backward compatibility. Yes, it's still used
-# in the wild :-( We should find a proper way to deprecate it ...
-AC_SUBST(AMTAR, '$${TAR-tar}')
-
-# We'll loop over all known methods to create a tar archive until one works.
-_am_tools='gnutar m4_if($1, ustar, plaintar) pax cpio none'
-
-m4_if($1, v7,
- am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -',
-
- m4_case($1,
- ustar,
- # The POSIX 1988 'ustar' format is defined with fixed-size fields.
- # There is notably a 21 bits limit for the UID and the GID. In fact,
- # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343
- # and bug#13588).
- am_max_uid=2097151 # 2^21 - 1
- am_max_gid=$am_max_uid
- # The $UID and $GID variables are not portable, so we need to resort
- # to the POSIX-mandated id(1) utility. Errors in the 'id' calls
- # below are definitely unexpected, so allow the users to see them
- # (that is, avoid stderr redirection).
- am_uid=`id -u || echo unknown`
- am_gid=`id -g || echo unknown`
- AC_MSG_CHECKING(whether UID '$am_uid' is supported by ustar format)
- if test $am_uid -le $am_max_uid; then
- AC_MSG_RESULT(yes)
- else
- AC_MSG_RESULT(no)
- _am_tools=none
- fi
- AC_MSG_CHECKING(whether GID '$am_gid' is supported by ustar format)
- if test $am_gid -le $am_max_gid; then
- AC_MSG_RESULT(yes)
- else
- AC_MSG_RESULT(no)
- _am_tools=none
- fi,
-
- pax,
- ,
-
- m4_fatal(Unknown tar format))
-
- AC_MSG_CHECKING(how to create a $1 tar archive)
-
- # Go ahead even if we have the value already cached. We do so because we
- # need to set the values for the 'am__tar' and 'am__untar' variables.
- _am_tools=${am_cv_prog_tar_$1-$_am_tools}
-
- for _am_tool in $_am_tools; do
- case $_am_tool in
- gnutar)
- for _am_tar in tar gnutar gtar; do
- AM_RUN_LOG($_am_tar --version) && break
- done
- am__tar="$_am_tar --format=m4_if($1, pax, posix, $1) -chf - "'"$$tardir"'
- am__tar_="$_am_tar --format=m4_if($1, pax, posix, $1) -chf - "'"$tardir"'
- am__untar="$_am_tar -xf -"
- ;;
- plaintar)
- # Must skip GNU tar: if it does not support --format= it doesn't create
- # ustar tarball either.
- (tar --version) >/dev/null 2>&1 && continue
- am__tar='tar chf - "$$tardir"'
- am__tar_='tar chf - "$tardir"'
- am__untar='tar xf -'
- ;;
- pax)
- am__tar='pax -L -x $1 -w "$$tardir"'
- am__tar_='pax -L -x $1 -w "$tardir"'
- am__untar='pax -r'
- ;;
- cpio)
- am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
- am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
- am__untar='cpio -i -H $1 -d'
- ;;
- none)
- am__tar=false
- am__tar_=false
- am__untar=false
- ;;
- esac
-
- # If the value was cached, stop now. We just wanted to have am__tar
- # and am__untar set.
- test -n "${am_cv_prog_tar_$1}" && break
-
- # tar/untar a dummy directory, and stop if the command works.
- rm -rf conftest.dir
- mkdir conftest.dir
- echo GrepMe > conftest.dir/file
- AM_RUN_LOG(tardir=conftest.dir && eval $am__tar_ >conftest.tar)
- rm -rf conftest.dir
- if test -s conftest.tar; then
- AM_RUN_LOG($am__untar <conftest.tar)
- AM_RUN_LOG(cat conftest.dir/file)
- grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
- fi
- done
- rm -rf conftest.dir
-
- AC_CACHE_VAL(am_cv_prog_tar_$1, am_cv_prog_tar_$1=$_am_tool)
- AC_MSG_RESULT($am_cv_prog_tar_$1))
-
-AC_SUBST(am__tar)
-AC_SUBST(am__untar)
-) # _AM_PROG_TAR
-
 dnl pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
 dnl serial 11 (pkg-config-0.29)
 dnl
@@ -1463,7 +335,7 @@
 # See the "minimum version" comment for each macro you use to see what
 # version you require.
 m4_defun(XORG_MACROS_VERSION,
-m4_define(vers_have, 1.19.3)
+m4_define(vers_have, 1.19.0)
 m4_define(maj_have, m4_substr(vers_have, 0, m4_index(vers_have, .)))
 m4_define(maj_needed, m4_substr($1, 0, m4_index($1, .)))
 m4_if(m4_cmp(maj_have, maj_needed), 0,,
@@ -1483,7 +355,7 @@
 # such as man pages and config files
 AC_DEFUN(XORG_PROG_RAWCPP,
 AC_REQUIRE(AC_PROG_CPP)
-AC_PATH_TOOL(RAWCPP, cpp, ${CPP},
+AC_PATH_PROGS(RAWCPP, cpp, ${CPP},
 $PATH:/bin:/usr/bin:/usr/lib:/usr/libexec:/usr/ccs/lib:/usr/ccs/lbin:/lib)
 
 # Check for flag to avoid builtin definitions - assumes unix is predefined,
@@ -1540,17 +412,6 @@
 AC_REQUIRE(AC_CANONICAL_HOST)
 AC_REQUIRE(AC_PROG_SED)
 
-case $host_os in
- solaris*)
- # Solaris 2.0 - 11.3 use SysV man page section numbers, so we
- # check for a man page file found in later versions that use
- # traditional section numbers instead
- AC_CHECK_FILE(/usr/share/man/man7/attributes.7,
- SYSV_MAN_SECTIONS=false, SYSV_MAN_SECTIONS=true)
- ;;
- *) SYSV_MAN_SECTIONS=false ;;
-esac
-
 if test x$APP_MAN_SUFFIX = x ; then
 APP_MAN_SUFFIX=1
 fi
@@ -1566,8 +427,9 @@
 fi
 
 if test x$FILE_MAN_SUFFIX = x ; then
- case $SYSV_MAN_SECTIONS in
-	true)				FILE_MAN_SUFFIX=4 ;;
+ case $host_os in
+	# Solaris 2.0 - 11 use SysV man page sections
+	solaris2.?|solaris2.101)	FILE_MAN_SUFFIX=4 ;;
 	*)				FILE_MAN_SUFFIX=5 ;;
 esac
 fi
@@ -1576,8 +438,9 @@
 fi
 
 if test x$MISC_MAN_SUFFIX = x ; then
- case $SYSV_MAN_SECTIONS in
-	true)				MISC_MAN_SUFFIX=5 ;;
+ case $host_os in
+	# Solaris 2.0 - 11 use SysV man page sections
+	solaris2.?|solaris2.101)	MISC_MAN_SUFFIX=5 ;;
 	*)				MISC_MAN_SUFFIX=7 ;;
 esac
 fi
@@ -1586,8 +449,9 @@
 fi
 
 if test x$DRIVER_MAN_SUFFIX = x ; then
- case $SYSV_MAN_SECTIONS in
-	true)				DRIVER_MAN_SUFFIX=7 ;;
+ case $host_os in
+	# Solaris 2.0 - 11 use SysV man page sections
+	solaris2.?|solaris2.101)	DRIVER_MAN_SUFFIX=7 ;;
 	*)				DRIVER_MAN_SUFFIX=4 ;;
 esac
 fi
@@ -1596,8 +460,9 @@
 fi
 
 if test x$ADMIN_MAN_SUFFIX = x ; then
- case $SYSV_MAN_SECTIONS in
-	true)				ADMIN_MAN_SUFFIX=1m ;;
+ case $host_os in
+	# Solaris 2.0 - 11 use SysV man page sections
+	solaris2.?|solaris2.101)	ADMIN_MAN_SUFFIX=1m ;;
 	*)				ADMIN_MAN_SUFFIX=8 ;;
 esac
 fi
@@ -3272,9 +2137,8 @@
 macros_datadir=`$PKG_CONFIG --print-errors --variable=pkgdatadir xorg-macros`
 INSTALL_CMD="(cp -f "$macros_datadir/INSTALL" \$(top_srcdir)/.INSTALL.tmp && \
 mv \$(top_srcdir)/.INSTALL.tmp \$(top_srcdir)/INSTALL) \
-|| (rm -f \$(top_srcdir)/.INSTALL.tmp; test -e \$(top_srcdir)/INSTALL || ( \
-touch \$(top_srcdir)/INSTALL; \
-echo 'failed to copy INSTALL from util-macros: installing empty INSTALL.' >&2))"
+|| (rm -f \$(top_srcdir)/.INSTALL.tmp; touch \$(top_srcdir)/INSTALL; \
+echo 'util-macros \"pkgdatadir\" from xorg-macros.pc not found: installing possibly empty INSTALL.' >&2)"
 AC_SUBST(INSTALL_CMD)
 ) # XORG_INSTALL
 dnl Copyright 2005 Red Hat, Inc
@@ -3335,11 +2199,10 @@
 #
 #
 AC_DEFUN(XORG_CHANGELOG, 
-CHANGELOG_CMD="((GIT_DIR=\$(top_srcdir)/.git git log > \$(top_srcdir)/.changelog.tmp) 2>/dev/null && \
+CHANGELOG_CMD="(GIT_DIR=\$(top_srcdir)/.git git log > \$(top_srcdir)/.changelog.tmp && \
 mv \$(top_srcdir)/.changelog.tmp \$(top_srcdir)/ChangeLog) \
-|| (rm -f \$(top_srcdir)/.changelog.tmp; test -e \$(top_srcdir)/ChangeLog || ( \
-touch \$(top_srcdir)/ChangeLog; \
-echo 'git failed to create ChangeLog: installing empty ChangeLog.' >&2))"
+|| (rm -f \$(top_srcdir)/.changelog.tmp; touch \$(top_srcdir)/ChangeLog; \
+echo 'git directory not found: installing possibly empty changelog.' >&2)"
 AC_SUBST(CHANGELOG_CMD)
 ) # XORG_CHANGELOG
 
@@ -3467,7 +2330,7 @@
 	XTRANS_TCP_FLAGS
 fi
 case $host_os in
-	solaris*)		localdef="yes" ;;
+	solaris*|sco*|sysv4*)	localdef="yes" ;;
 	*)			localdef="no" ;;
 esac
 AC_ARG_ENABLE(local-transport,
@@ -3479,9 +2342,6 @@
 	AC_DEFINE(LOCALCONN,1,Support os-specific local connections)
 fi
 
- # Other functions Xtrans may need
- AC_CHECK_FUNCS(strcasecmp strlcpy)
-
 ) # XTRANS_CONNECTION_FLAGS
 
 
@@ -3518,6 +2378,1136 @@
 ) # XTRANS_SECURE_RPC_FLAGS
 
 
+# Copyright (C) 2002-2014 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_AUTOMAKE_VERSION(VERSION)
+# ----------------------------
+# Automake X.Y traces this macro to ensure aclocal.m4 has been
+# generated from the m4 files accompanying Automake X.Y.
+# (This private macro should not be called outside this file.)
+AC_DEFUN(AM_AUTOMAKE_VERSION,
+am__api_version='1.15'
+dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
+dnl require some minimum version. Point them to the right macro.
+m4_if($1, 1.15, ,
+ AC_FATAL(Do not call $0, use AM_INIT_AUTOMAKE($1).))dnl
+)
+
+# _AM_AUTOCONF_VERSION(VERSION)
+# -----------------------------
+# aclocal traces this macro to find the Autoconf version.
+# This is a private macro too. Using m4_define simplifies
+# the logic in aclocal, which can simply ignore this definition.
+m4_define(_AM_AUTOCONF_VERSION, )
+
+# AM_SET_CURRENT_AUTOMAKE_VERSION
+# -------------------------------
+# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
+# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
+AC_DEFUN(AM_SET_CURRENT_AUTOMAKE_VERSION,
+AM_AUTOMAKE_VERSION(1.15)dnl
+m4_ifndef(AC_AUTOCONF_VERSION,
+ m4_copy(m4_PACKAGE_VERSION, AC_AUTOCONF_VERSION))dnl
+_AM_AUTOCONF_VERSION(m4_defn(AC_AUTOCONF_VERSION)))
+
+# AM_AUX_DIR_EXPAND -*- Autoconf -*-
+
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# For projects using AC_CONFIG_AUX_DIR(foo), Autoconf sets
+# $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to
+# '$srcdir', '$srcdir/..', or '$srcdir/../..'.
+#
+# Of course, Automake must honor this variable whenever it calls a
+# tool from the auxiliary directory. The problem is that $srcdir (and
+# therefore $ac_aux_dir as well) can be either absolute or relative,
+# depending on how configure is run. This is pretty annoying, since
+# it makes $ac_aux_dir quite unusable in subdirectories: in the top
+# source directory, any form will work fine, but in subdirectories a
+# relative path needs to be adjusted first.
+#
+# $ac_aux_dir/missing
+# fails when called from a subdirectory if $ac_aux_dir is relative
+# $top_srcdir/$ac_aux_dir/missing
+# fails if $ac_aux_dir is absolute,
+# fails when called from a subdirectory in a VPATH build with
+# a relative $ac_aux_dir
+#
+# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
+# are both prefixed by $srcdir. In an in-source build this is usually
+# harmless because $srcdir is '.', but things will broke when you
+# start a VPATH build or use an absolute $srcdir.
+#
+# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
+# iff we strip the leading $srcdir from $ac_aux_dir. That would be:
+# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*$.*$"`
+# and then we would define $MISSING as
+# MISSING="\${SHELL} $am_aux_dir/missing"
+# This will work as long as MISSING is not called from configure, because
+# unfortunately $(top_srcdir) has no meaning in configure.
+# However there are other variables, like CC, which are often used in
+# configure, and could therefore not use this "fixed" $ac_aux_dir.
+#
+# Another solution, used here, is to always expand $ac_aux_dir to an
+# absolute PATH. The drawback is that using absolute paths prevent a
+# configured tree to be moved without reconfiguration.
+
+AC_DEFUN(AM_AUX_DIR_EXPAND,
+AC_REQUIRE(AC_CONFIG_AUX_DIR_DEFAULT)dnl
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
+)
+
+# AM_CONDITIONAL -*- Autoconf -*-
+
+# Copyright (C) 1997-2014 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_CONDITIONAL(NAME, SHELL-CONDITION)
+# -------------------------------------
+# Define a conditional.
+AC_DEFUN(AM_CONDITIONAL,
+AC_PREREQ(2.52)dnl
+ m4_if($1, TRUE, AC_FATAL($0: invalid condition: $1),
+ $1, FALSE, AC_FATAL($0: invalid condition: $1))dnl
+AC_SUBST($1_TRUE)dnl
+AC_SUBST($1_FALSE)dnl
+_AM_SUBST_NOTMAKE($1_TRUE)dnl
+_AM_SUBST_NOTMAKE($1_FALSE)dnl
+m4_define(_AM_COND_VALUE_$1, $2)dnl
+if $2; then
+ $1_TRUE=
+ $1_FALSE='#'
+else
+ $1_TRUE='#'
+ $1_FALSE=
+fi
+AC_CONFIG_COMMANDS_PRE(
+if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
+ AC_MSG_ERROR(conditional "$1" was never defined.
+Usually this means the macro was only invoked conditionally.)
+fi))
+
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+
+# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be
+# written in clear, in which case automake, when reading aclocal.m4,
+# will think it sees a *use*, and therefore will trigger all it's
+# C support machinery. Also note that it means that autoscan, seeing
+# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
+
+
+# _AM_DEPENDENCIES(NAME)
+# ----------------------
+# See how the compiler implements dependency checking.
+# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC".
+# We try a few techniques and use that to set a single cache variable.
+#
+# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
+# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
+# dependency, and given that the user is not expected to run this macro,
+# just rely on AC_PROG_CC.
+AC_DEFUN(_AM_DEPENDENCIES,
+AC_REQUIRE(AM_SET_DEPDIR)dnl
+AC_REQUIRE(AM_OUTPUT_DEPENDENCY_COMMANDS)dnl
+AC_REQUIRE(AM_MAKE_INCLUDE)dnl
+AC_REQUIRE(AM_DEP_TRACK)dnl
+
+m4_if($1, CC, depcc="$CC" am_compiler_list=,
+ $1, CXX, depcc="$CXX" am_compiler_list=,
+ $1, OBJC, depcc="$OBJC" am_compiler_list='gcc3 gcc',
+ $1, OBJCXX, depcc="$OBJCXX" am_compiler_list='gcc3 gcc',
+ $1, UPC, depcc="$UPC" am_compiler_list=,
+ $1, GCJ, depcc="$GCJ" am_compiler_list='gcc3 gcc',
+ depcc="$$1" am_compiler_list=)
+
+AC_CACHE_CHECK(dependency style of $depcc,
+ am_cv_$1_dependencies_compiler_type,
+if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+ # We make a subdir and do the tests there. Otherwise we can end up
+ # making bogus files that we don't know about and never remove. For
+ # instance it was reported that on HP-UX the gcc test will end up
+ # making a dummy file named 'D' -- because '-MD' means "put the output
+ # in D".
+ rm -rf conftest.dir
+ mkdir conftest.dir
+ # Copy depcomp to subdir because otherwise we won't find it if we're
+ # using a relative directory.
+ cp "$am_depcomp" conftest.dir
+ cd conftest.dir
+ # We will build objects and dependencies in a subdirectory because
+ # it helps to detect inapplicable dependency modes. For instance
+ # both Tru64's cc and ICC support -MD to output dependencies as a
+ # side effect of compilation, but ICC will put the dependencies in
+ # the current directory while Tru64 will put them in the object
+ # directory.
+ mkdir sub
+
+ am_cv_$1_dependencies_compiler_type=none
+ if test "$am_compiler_list" = ""; then
+ am_compiler_list=`sed -n 's/^#*$a-zA-Z0-9*$)$/\1/p' < ./depcomp`
+ fi
+ am__universal=false
+ m4_case($1, CC,
+ case " $depcc " in #(
+ *\ -arch\ *\ -arch\ *) am__universal=true ;;
+ esac,
+ CXX,
+ case " $depcc " in #(
+ *\ -arch\ *\ -arch\ *) am__universal=true ;;
+ esac)
+
+ for depmode in $am_compiler_list; do
+ # Setup a source with many dependencies, because some compilers
+ # like to wrap large dependency lists on column 80 (with \), and
+ # we should not choose a depcomp mode which is confused by this.
+ #
+ # We need to recreate these files for each test, as the compiler may
+ # overwrite some of them when testing with obscure command lines.
+ # This happens at least with the AIX C compiler.
+ : > sub/conftest.c
+ for i in 1 2 3 4 5 6; do
+ echo '#include "conftst'$i'.h"' >> sub/conftest.c
+ # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+ # Solaris 10 /bin/sh.
+ echo '/* dummy */' > sub/conftst$i.h
+ done
+ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+
+ # We check with '-c' and '-o' for the sake of the "dashmstdout"
+ # mode. It turns out that the SunPro C++ compiler does not properly
+ # handle '-M -o', and we need to detect this. Also, some Intel
+ # versions had trouble with output in subdirs.
+ am__obj=sub/conftest.${OBJEXT-o}
+ am__minus_obj="-o $am__obj"
+ case $depmode in
+ gcc)
+ # This depmode causes a compiler race in universal mode.
+ test "$am__universal" = false || continue
+ ;;
+ nosideeffect)
+ # After this tag, mechanisms are not by side-effect, so they'll
+ # only be used when explicitly requested.
+ if test "x$enable_dependency_tracking" = xyes; then
+	continue
+ else
+	break
+ fi
+ ;;
+ msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+ # This compiler won't grok '-c -o', but also, the minuso test has
+ # not run yet. These depmodes are late enough in the game, and
+ # so weak that their functioning should not be impacted.
+ am__obj=conftest.${OBJEXT-o}
+ am__minus_obj=
+ ;;
+ none) break ;;
+ esac
+ if depmode=$depmode \
+ source=sub/conftest.c object=$am__obj \
+ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+ $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
+ >/dev/null 2>conftest.err &&
+ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+ grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
+ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+ # icc doesn't choke on unknown options, it will just issue warnings
+ # or remarks (even with -Werror). So we grep stderr for any message
+ # that says an option was ignored or not supported.
+ # When given -MP, icc 7.0 and 7.1 complain thusly:
+ # icc: Command line warning: ignoring option '-M'; no argument required
+ # The diagnosis changed in icc 8.0:
+ # icc: Command line remark: option '-MP' not supported
+ if (grep 'ignoring option' conftest.err ||
+ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+ am_cv_$1_dependencies_compiler_type=$depmode
+ break
+ fi
+ fi
+ done
+
+ cd ..
+ rm -rf conftest.dir
+else
+ am_cv_$1_dependencies_compiler_type=none
+fi
+)
+AC_SUBST($1DEPMODE, depmode=$am_cv_$1_dependencies_compiler_type)
+AM_CONDITIONAL(am__fastdep$1, 
+ test "x$enable_dependency_tracking" != xno \
+ && test "$am_cv_$1_dependencies_compiler_type" = gcc3)
+)
+
+
+# AM_SET_DEPDIR
+# -------------
+# Choose a directory name for dependency files.
+# This macro is AC_REQUIREd in _AM_DEPENDENCIES.
+AC_DEFUN(AM_SET_DEPDIR,
+AC_REQUIRE(AM_SET_LEADING_DOT)dnl
+AC_SUBST(DEPDIR, "${am__leading_dot}deps")dnl
+)
+
+
+# AM_DEP_TRACK
+# ------------
+AC_DEFUN(AM_DEP_TRACK,
+AC_ARG_ENABLE(dependency-tracking, dnl
+AS_HELP_STRING(
+ --enable-dependency-tracking,
+ do not reject slow dependency extractors)
+AS_HELP_STRING(
+ --disable-dependency-tracking,
+ speeds up one-time build))
+if test "x$enable_dependency_tracking" != xno; then
+ am_depcomp="$ac_aux_dir/depcomp"
+ AMDEPBACKSLASH='\'
+ am__nodep='_no'
+fi
+AM_CONDITIONAL(AMDEP, test "x$enable_dependency_tracking" != xno)
+AC_SUBST(AMDEPBACKSLASH)dnl
+_AM_SUBST_NOTMAKE(AMDEPBACKSLASH)dnl
+AC_SUBST(am__nodep)dnl
+_AM_SUBST_NOTMAKE(am__nodep)dnl
+)
+
+# Generate code to set up dependency tracking. -*- Autoconf -*-
+
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+
+# _AM_OUTPUT_DEPENDENCY_COMMANDS
+# ------------------------------
+AC_DEFUN(_AM_OUTPUT_DEPENDENCY_COMMANDS,
+{
+ # Older Autoconf quotes --file arguments for eval, but not when files
+ # are listed without --file. Let's play safe and only enable the eval
+ # if we detect the quoting.
+ case $CONFIG_FILES in
+ *\'*) eval set x "$CONFIG_FILES" ;;
+ *) set x $CONFIG_FILES ;;
+ esac
+ shift
+ for mf
+ do
+ # Strip MF so we end up with the name of the file.
+ mf=`echo "$mf" | sed -e 's/:.*$//'`
+ # Check whether this is an Automake generated Makefile or not.
+ # We used to match only the files named 'Makefile.in', but
+ # some people rename them; so instead we look at the file content.
+ # Grep'ing the first line is not enough: some people post-process
+ # each Makefile.in and add a new line on top of each file to say so.
+ # Grep'ing the whole file is not good either: AIX grep has a line
+ # limit of 2048, but all sed's we know have understand at least 4000.
+ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+ dirpart=`AS_DIRNAME("$mf")`
+ else
+ continue
+ fi
+ # Extract the definition of DEPDIR, am__include, and am__quote
+ # from the Makefile without running 'make'.
+ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+ test -z "$DEPDIR" && continue
+ am__include=`sed -n 's/^am__include = //p' < "$mf"`
+ test -z "$am__include" && continue
+ am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+ # Find all dependency output files, they are included files with
+ # $(DEPDIR) in their names. We invoke sed twice because it is the
+ # simplest approach to changing $(DEPDIR) to its actual value in the
+ # expansion.
+ for file in `sed -n "
+ s/^$am__include $am__quote$.*(DEPDIR).*$$am__quote"'$/\1/p' <"$mf" | \
+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
+ # Make sure the directory exists.
+ test -f "$dirpart/$file" && continue
+ fdir=`AS_DIRNAME("$file")`
+ AS_MKDIR_P($dirpart/$fdir)
+ # echo "creating $dirpart/$file"
+ echo '# dummy' > "$dirpart/$file"
+ done
+ done
+}
+)# _AM_OUTPUT_DEPENDENCY_COMMANDS
+
+
+# AM_OUTPUT_DEPENDENCY_COMMANDS
+# -----------------------------
+# This macro should only be invoked once -- use via AC_REQUIRE.
+#
+# This code is only required when automatic dependency tracking
+# is enabled. FIXME. This creates each '.P' file that we will
+# need in order to bootstrap the dependency handling code.
+AC_DEFUN(AM_OUTPUT_DEPENDENCY_COMMANDS,
+AC_CONFIG_COMMANDS(depfiles,
+ test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS,
+ AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir")
+)
+
+# Do all the work for Automake. -*- Autoconf -*-
+
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This macro actually does too much. Some checks are only needed if
+# your package does certain things. But this isn't really a big deal.
+
+dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O.
+m4_define(AC_PROG_CC,
+m4_defn(AC_PROG_CC)
+_AM_PROG_CC_C_O
+)
+
+# AM_INIT_AUTOMAKE(PACKAGE, VERSION, NO-DEFINE)
+# AM_INIT_AUTOMAKE(OPTIONS)
+# -----------------------------------------------
+# The call with PACKAGE and VERSION arguments is the old style
+# call (pre autoconf-2.50), which is being phased out. PACKAGE
+# and VERSION should now be passed to AC_INIT and removed from
+# the call to AM_INIT_AUTOMAKE.
+# We support both call styles for the transition. After
+# the next Automake release, Autoconf can make the AC_INIT
+# arguments mandatory, and then we can depend on a new Autoconf
+# release and drop the old call support.
+AC_DEFUN(AM_INIT_AUTOMAKE,
+AC_PREREQ(2.65)dnl
+dnl Autoconf wants to disallow AM_ names. We explicitly allow
+dnl the ones we care about.
+m4_pattern_allow(^AM_A-Z+FLAGS$)dnl
+AC_REQUIRE(AM_SET_CURRENT_AUTOMAKE_VERSION)dnl
+AC_REQUIRE(AC_PROG_INSTALL)dnl
+if test "`cd $srcdir && pwd`" != "`pwd`"; then
+ # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
+ # is not polluted with repeated "-I."
+ AC_SUBST(am__isrc, ' -I$(srcdir)')_AM_SUBST_NOTMAKE(am__isrc)dnl
+ # test to see if srcdir already configured
+ if test -f $srcdir/config.status; then
+ AC_MSG_ERROR(source directory already configured; run "make distclean" there first)
+ fi
+fi
+
+# test whether we have cygpath
+if test -z "$CYGPATH_W"; then
+ if (cygpath --version) >/dev/null 2>/dev/null; then
+ CYGPATH_W='cygpath -w'
+ else
+ CYGPATH_W=echo
+ fi
+fi
+AC_SUBST(CYGPATH_W)
+
+# Define the identity of the package.
+dnl Distinguish between old-style and new-style calls.
+m4_ifval($2,
+AC_DIAGNOSE(obsolete,
+ $0: two- and three-arguments forms are deprecated.)
+m4_ifval($3, _AM_SET_OPTION(no-define))dnl
+ AC_SUBST(PACKAGE, $1)dnl
+ AC_SUBST(VERSION, $2),
+_AM_SET_OPTIONS($1)dnl
+dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
+m4_if(
+ m4_ifdef(AC_PACKAGE_NAME, ok):m4_ifdef(AC_PACKAGE_VERSION, ok),
+ ok:ok,,
+ m4_fatal(AC_INIT should be called with package and version arguments))dnl
+ AC_SUBST(PACKAGE, 'AC_PACKAGE_TARNAME')dnl
+ AC_SUBST(VERSION, 'AC_PACKAGE_VERSION'))dnl
+
+_AM_IF_OPTION(no-define,,
+AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", Name of package)
+ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", Version number of package))dnl
+
+# Some tools Automake needs.
+AC_REQUIRE(AM_SANITY_CHECK)dnl
+AC_REQUIRE(AC_ARG_PROGRAM)dnl
+AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
+AM_MISSING_PROG(AUTOCONF, autoconf)
+AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
+AM_MISSING_PROG(AUTOHEADER, autoheader)
+AM_MISSING_PROG(MAKEINFO, makeinfo)
+AC_REQUIRE(AM_PROG_INSTALL_SH)dnl
+AC_REQUIRE(AM_PROG_INSTALL_STRIP)dnl
+AC_REQUIRE(AC_PROG_MKDIR_P)dnl
+# For better backward compatibility. To be removed once Automake 1.9.x
+# dies out for good. For more background, see:
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+AC_SUBST(mkdir_p, '$(MKDIR_P)')
+# We need awk for the "check" target (and possibly the TAP driver). The
+# system "awk" is bad on some platforms.
+AC_REQUIRE(AC_PROG_AWK)dnl
+AC_REQUIRE(AC_PROG_MAKE_SET)dnl
+AC_REQUIRE(AM_SET_LEADING_DOT)dnl
+_AM_IF_OPTION(tar-ustar, _AM_PROG_TAR(ustar),
+	 _AM_IF_OPTION(tar-pax, _AM_PROG_TAR(pax),
+			 _AM_PROG_TAR(v7)))
+_AM_IF_OPTION(no-dependencies,,
+AC_PROVIDE_IFELSE(AC_PROG_CC,
+		 _AM_DEPENDENCIES(CC),
+		 m4_define(AC_PROG_CC,
+			 m4_defn(AC_PROG_CC)_AM_DEPENDENCIES(CC)))dnl
+AC_PROVIDE_IFELSE(AC_PROG_CXX,
+		 _AM_DEPENDENCIES(CXX),
+		 m4_define(AC_PROG_CXX,
+			 m4_defn(AC_PROG_CXX)_AM_DEPENDENCIES(CXX)))dnl
+AC_PROVIDE_IFELSE(AC_PROG_OBJC,
+		 _AM_DEPENDENCIES(OBJC),
+		 m4_define(AC_PROG_OBJC,
+			 m4_defn(AC_PROG_OBJC)_AM_DEPENDENCIES(OBJC)))dnl
+AC_PROVIDE_IFELSE(AC_PROG_OBJCXX,
+		 _AM_DEPENDENCIES(OBJCXX),
+		 m4_define(AC_PROG_OBJCXX,
+			 m4_defn(AC_PROG_OBJCXX)_AM_DEPENDENCIES(OBJCXX)))dnl
+)
+AC_REQUIRE(AM_SILENT_RULES)dnl
+dnl The testsuite driver may need to know about EXEEXT, so add the
+dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This
+dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below.
+AC_CONFIG_COMMANDS_PRE(dnl
+m4_provide_if(_AM_COMPILER_EXEEXT,
+ AM_CONDITIONAL(am__EXEEXT, test -n "$EXEEXT")))dnl
+
+# POSIX will say in a future version that running "rm -f" with no argument
+# is OK; and we want to be able to make that assumption in our Makefile
+# recipes. So use an aggressive probe to check that the usage we want is
+# actually supported "in the wild" to an acceptable degree.
+# See automake bug#10828.
+# To make any issue more visible, cause the running configure to be aborted
+# by default if the 'rm' program in use doesn't match our expectations; the
+# user can still override this though.
+if rm -f && rm -fr && rm -rf; then : OK; else
+ cat >&2 <<'END'
+Oops!
+
+Your 'rm' program seems unable to run without file operands specified
+on the command line, even when the '-f' option is present. This is contrary
+to the behaviour of most rm programs out there, and not conforming with
+the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
+
+Please tell bug-automake@gnu.org about your system, including the value
+of your $PATH and any error possibly output before this message. This
+can help us improve future automake versions.
+
+END
+ if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
+ echo 'Configuration will proceed anyway, since you have set the' >&2
+ echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
+ echo >&2
+ else
+ cat >&2 <<'END'
+Aborting the configuration process, to ensure you take notice of the issue.
+
+You can download and install GNU coreutils to get an 'rm' implementation
+that behaves properly: <http://www.gnu.org/software/coreutils/>.
+
+If you want to complete the configuration process using your problematic
+'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
+to "yes", and re-run configure.
+
+END
+ AC_MSG_ERROR(Your 'rm' program is bad, sorry.)
+ fi
+fi
+dnl The trailing newline in this macro's definition is deliberate, for
+dnl backward compatibility and to allow trailing 'dnl'-style comments
+dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841.
+)
+
+dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
+dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
+dnl mangled by Autoconf and run in a shell conditional statement.
+m4_define(_AC_COMPILER_EXEEXT,
+m4_defn(_AC_COMPILER_EXEEXT)m4_provide(_AM_COMPILER_EXEEXT))
+
+# When config.status generates a header, we must update the stamp-h file.
+# This file resides in the same directory as the config header
+# that is generated. The stamp files are numbered to have different names.
+
+# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
+# loop where config.status creates the headers, so we can generate
+# our stamp files there.
+AC_DEFUN(_AC_AM_CONFIG_HEADER_HOOK,
+# Compute $1's index in $config_headers.
+_am_arg=$1
+_am_stamp_count=1
+for _am_header in $config_headers :; do
+ case $_am_header in
+ $_am_arg | $_am_arg:* )
+ break ;;
+ * )
+ _am_stamp_count=`expr $_am_stamp_count + 1` ;;
+ esac
+done
+echo "timestamp for $_am_arg" >`AS_DIRNAME("$_am_arg")`/stamp-h$_am_stamp_count)
+
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_PROG_INSTALL_SH
+# ------------------
+# Define $install_sh.
+AC_DEFUN(AM_PROG_INSTALL_SH,
+AC_REQUIRE(AM_AUX_DIR_EXPAND)dnl
+if test x"${install_sh+set}" != xset; then
+ case $am_aux_dir in
+ *\ * | *\	*)
+ install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
+ *)
+ install_sh="\${SHELL} $am_aux_dir/install-sh"
+ esac
+fi
+AC_SUBST(install_sh))
+
+# Copyright (C) 2003-2014 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# Check whether the underlying file-system supports filenames
+# with a leading dot. For instance MS-DOS doesn't.
+AC_DEFUN(AM_SET_LEADING_DOT,
+rm -rf .tst 2>/dev/null
+mkdir .tst 2>/dev/null
+if test -d .tst; then
+ am__leading_dot=.
+else
+ am__leading_dot=_
+fi
+rmdir .tst 2>/dev/null
+AC_SUBST(am__leading_dot))
+
+# Check to see how 'make' treats includes.	 -*- Autoconf -*-
+
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_MAKE_INCLUDE()
+# -----------------
+# Check to see how make treats includes.
+AC_DEFUN(AM_MAKE_INCLUDE,
+am_make=${MAKE-make}
+cat > confinc << 'END'
+am__doit:
+	@echo this is the am__doit target
+.PHONY: am__doit
+END
+# If we don't find an include directive, just comment out the code.
+AC_MSG_CHECKING(for style of include used by $am_make)
+am__include="#"
+am__quote=
+_am_result=none
+# First try GNU make style include.
+echo "include confinc" > confmf
+# Ignore all kinds of additional output from 'make'.
+case `$am_make -s -f confmf 2> /dev/null` in #(
+*the\ am__doit\ target*)
+ am__include=include
+ am__quote=
+ _am_result=GNU
+ ;;
+esac
+# Now try BSD make style include.
+if test "$am__include" = "#"; then
+ echo '.include "confinc"' > confmf
+ case `$am_make -s -f confmf 2> /dev/null` in #(
+ *the\ am__doit\ target*)
+ am__include=.include
+ am__quote="\""
+ _am_result=BSD
+ ;;
+ esac
+fi
+AC_SUBST(am__include)
+AC_SUBST(am__quote)
+AC_MSG_RESULT($_am_result)
+rm -f confinc confmf
+)
+
+# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
+
+# Copyright (C) 1997-2014 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_MISSING_PROG(NAME, PROGRAM)
+# ------------------------------
+AC_DEFUN(AM_MISSING_PROG,
+AC_REQUIRE(AM_MISSING_HAS_RUN)
+$1=${$1-"${am_missing_run}$2"}
+AC_SUBST($1))
+
+# AM_MISSING_HAS_RUN
+# ------------------
+# Define MISSING if not defined so far and test if it is modern enough.
+# If it is, set am_missing_run to use it, otherwise, to nothing.
+AC_DEFUN(AM_MISSING_HAS_RUN,
+AC_REQUIRE(AM_AUX_DIR_EXPAND)dnl
+AC_REQUIRE_AUX_FILE(missing)dnl
+if test x"${MISSING+set}" != xset; then
+ case $am_aux_dir in
+ *\ * | *\	*)
+ MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
+ *)
+ MISSING="\${SHELL} $am_aux_dir/missing" ;;
+ esac
+fi
+# Use eval to expand $SHELL
+if eval "$MISSING --is-lightweight"; then
+ am_missing_run="$MISSING "
+else
+ am_missing_run=
+ AC_MSG_WARN('missing' script is too old or missing)
+fi
+)
+
+# Helper functions for option handling. -*- Autoconf -*-
+
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# _AM_MANGLE_OPTION(NAME)
+# -----------------------
+AC_DEFUN(_AM_MANGLE_OPTION,
+_AM_OPTION_m4_bpatsubst($1, ^a-zA-Z0-9_, _))
+
+# _AM_SET_OPTION(NAME)
+# --------------------
+# Set option NAME. Presently that only means defining a flag for this option.
+AC_DEFUN(_AM_SET_OPTION,
+m4_define(_AM_MANGLE_OPTION($1), 1))
+
+# _AM_SET_OPTIONS(OPTIONS)
+# ------------------------
+# OPTIONS is a space-separated list of Automake options.
+AC_DEFUN(_AM_SET_OPTIONS,
+m4_foreach_w(_AM_Option, $1, _AM_SET_OPTION(_AM_Option)))
+
+# _AM_IF_OPTION(OPTION, IF-SET, IF-NOT-SET)
+# -------------------------------------------
+# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
+AC_DEFUN(_AM_IF_OPTION,
+m4_ifset(_AM_MANGLE_OPTION($1), $2, $3))
+
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# _AM_PROG_CC_C_O
+# ---------------
+# Like AC_PROG_CC_C_O, but changed for automake. We rewrite AC_PROG_CC
+# to automatically call this.
+AC_DEFUN(_AM_PROG_CC_C_O,
+AC_REQUIRE(AM_AUX_DIR_EXPAND)dnl
+AC_REQUIRE_AUX_FILE(compile)dnl
+AC_LANG_PUSH(C)dnl
+AC_CACHE_CHECK(
+ whether $CC understands -c and -o together,
+ am_cv_prog_cc_c_o,
+ AC_LANG_CONFTEST(AC_LANG_PROGRAM())
+ # Make sure it works both with $CC and with simple cc.
+ # Following AC_PROG_CC_C_O, we do the test twice because some
+ # compilers refuse to overwrite an existing .o file with -o,
+ # though they will create one.
+ am_cv_prog_cc_c_o=yes
+ for am_i in 1 2; do
+ if AM_RUN_LOG($CC -c conftest.$ac_ext -o conftest2.$ac_objext) \
+ && test -f conftest2.$ac_objext; then
+ : OK
+ else
+ am_cv_prog_cc_c_o=no
+ break
+ fi
+ done
+ rm -f core conftest*
+ unset am_i)
+if test "$am_cv_prog_cc_c_o" != yes; then
+ # Losing compiler, so override with the script.
+ # FIXME: It is wrong to rewrite CC.
+ # But if we don't then we get into trouble of one sort or another.
+ # A longer-term fix would be to have automake use am__CC in this case,
+ # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+ CC="$am_aux_dir/compile $CC"
+fi
+AC_LANG_POP(C))
+
+# For backward compatibility.
+AC_DEFUN_ONCE(AM_PROG_CC_C_O, AC_REQUIRE(AC_PROG_CC))
+
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_RUN_LOG(COMMAND)
+# -------------------
+# Run COMMAND, save the exit status in ac_status, and log it.
+# (This has been adapted from Autoconf's _AC_RUN_LOG macro.)
+AC_DEFUN(AM_RUN_LOG,
+{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD
+ ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+ (exit $ac_status); })
+
+# Check to make sure that the build environment is sane. -*- Autoconf -*-
+
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_SANITY_CHECK
+# ---------------
+AC_DEFUN(AM_SANITY_CHECK,
+AC_MSG_CHECKING(whether build environment is sane)
+# Reject unsafe characters in $srcdir or the absolute working directory
+# name. Accept space and tab only in the latter.
+am_lf='
+'
+case `pwd` in
+ *\\\"\#\$\&\'\`$am_lf*)
+ AC_MSG_ERROR(unsafe absolute working directory name);;
+esac
+case $srcdir in
+ *\\\"\#\$\&\'\`$am_lf\ \	*)
+ AC_MSG_ERROR(unsafe srcdir value: '$srcdir');;
+esac
+
+# Do 'set' in a subshell so we don't clobber the current shell's
+# arguments. Must try -L first in case configure is actually a
+# symlink; some systems play weird games with the mod time of symlinks
+# (eg FreeBSD returns the mod time of the symlink's containing
+# directory).
+if (
+ am_has_slept=no
+ for am_try in 1 2; do
+ echo "timestamp, slept: $am_has_slept" > conftest.file
+ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+ if test "$*" = "X"; then
+	# -L didn't work.
+	set X `ls -t "$srcdir/configure" conftest.file`
+ fi
+ if test "$*" != "X $srcdir/configure conftest.file" \
+	&& test "$*" != "X conftest.file $srcdir/configure"; then
+
+	# If neither matched, then we have a broken ls. This can happen
+	# if, for instance, CONFIG_SHELL is bash and it inherits a
+	# broken ls alias from the environment. This has actually
+	# happened. Such a system could not be considered "sane".
+	AC_MSG_ERROR(ls -t appears to fail. Make sure there is not a broken
+ alias in your environment)
+ fi
+ if test "$2" = conftest.file || test $am_try -eq 2; then
+ break
+ fi
+ # Just in case.
+ sleep 1
+ am_has_slept=yes
+ done
+ test "$2" = conftest.file
+ )
+then
+ # Ok.
+ :
+else
+ AC_MSG_ERROR(newly created file is older than distributed files!
+Check your system clock)
+fi
+AC_MSG_RESULT(yes)
+# If we didn't sleep, we still need to ensure time stamps of config.status and
+# generated files are strictly newer.
+am_sleep_pid=
+if grep 'slept: no' conftest.file >/dev/null 2>&1; then
+ ( sleep 1 ) &
+ am_sleep_pid=$!
+fi
+AC_CONFIG_COMMANDS_PRE(
+ AC_MSG_CHECKING(that generated files are newer than configure)
+ if test -n "$am_sleep_pid"; then
+ # Hide warnings about reused PIDs.
+ wait $am_sleep_pid 2>/dev/null
+ fi
+ AC_MSG_RESULT(done))
+rm -f conftest.file
+)
+
+# Copyright (C) 2009-2014 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_SILENT_RULES(DEFAULT)
+# --------------------------
+# Enable less verbose build rules; with the default set to DEFAULT
+# ("yes" being less verbose, "no" or empty being verbose).
+AC_DEFUN(AM_SILENT_RULES,
+AC_ARG_ENABLE(silent-rules, dnl
+AS_HELP_STRING(
+ --enable-silent-rules,
+ less verbose build output (undo: "make V=1"))
+AS_HELP_STRING(
+ --disable-silent-rules,
+ verbose build output (undo: "make V=0"))dnl
+)
+case $enable_silent_rules in @%:@ (((
+ yes) AM_DEFAULT_VERBOSITY=0;;
+ no) AM_DEFAULT_VERBOSITY=1;;
+ *) AM_DEFAULT_VERBOSITY=m4_if($1, yes, 0, 1);;
+esac
+dnl
+dnl A few 'make' implementations (e.g., NonStop OS and NextStep)
+dnl do not support nested variable expansions.
+dnl See automake bug#9928 and bug#10237.
+am_make=${MAKE-make}
+AC_CACHE_CHECK(whether $am_make supports nested variables,
+ am_cv_make_support_nested_variables,
+ if AS_ECHO('TRUE=$(BAR$(V))
+BAR0=false
+BAR1=true
+V=1
+am__doit:
+	@$(TRUE)
+.PHONY: am__doit') | $am_make -f - >/dev/null 2>&1; then
+ am_cv_make_support_nested_variables=yes
+else
+ am_cv_make_support_nested_variables=no
+fi)
+if test $am_cv_make_support_nested_variables = yes; then
+ dnl Using '$V' instead of '$(V)' breaks IRIX make.
+ AM_V='$(V)'
+ AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+ AM_V=$AM_DEFAULT_VERBOSITY
+ AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
+AC_SUBST(AM_V)dnl
+AM_SUBST_NOTMAKE(AM_V)dnl
+AC_SUBST(AM_DEFAULT_V)dnl
+AM_SUBST_NOTMAKE(AM_DEFAULT_V)dnl
+AC_SUBST(AM_DEFAULT_VERBOSITY)dnl
+AM_BACKSLASH='\'
+AC_SUBST(AM_BACKSLASH)dnl
+_AM_SUBST_NOTMAKE(AM_BACKSLASH)dnl
+)
+
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_PROG_INSTALL_STRIP
+# ---------------------
+# One issue with vendor 'install' (even GNU) is that you can't
+# specify the program used to strip binaries. This is especially
+# annoying in cross-compiling environments, where the build's strip
+# is unlikely to handle the host's binaries.
+# Fortunately install-sh will honor a STRIPPROG variable, so we
+# always use install-sh in "make install-strip", and initialize
+# STRIPPROG with the value of the STRIP variable (set by the user).
+AC_DEFUN(AM_PROG_INSTALL_STRIP,
+AC_REQUIRE(AM_PROG_INSTALL_SH)dnl
+# Installed binaries are usually stripped using 'strip' when the user
+# run "make install-strip". However 'strip' might not be the right
+# tool to use in cross-compilation environments, therefore Automake
+# will honor the 'STRIP' environment variable to overrule this program.
+dnl Don't test for $cross_compiling = yes, because it might be 'maybe'.
+if test "$cross_compiling" != no; then
+ AC_CHECK_TOOL(STRIP, strip, :)
+fi
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+AC_SUBST(INSTALL_STRIP_PROGRAM))
+
+# Copyright (C) 2006-2014 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# _AM_SUBST_NOTMAKE(VARIABLE)
+# ---------------------------
+# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
+# This macro is traced by Automake.
+AC_DEFUN(_AM_SUBST_NOTMAKE)
+
+# AM_SUBST_NOTMAKE(VARIABLE)
+# --------------------------
+# Public sister of _AM_SUBST_NOTMAKE.
+AC_DEFUN(AM_SUBST_NOTMAKE, _AM_SUBST_NOTMAKE($@))
+
+# Check how to create a tarball. -*- Autoconf -*-
+
+# Copyright (C) 2004-2014 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# _AM_PROG_TAR(FORMAT)
+# --------------------
+# Check how to create a tarball in format FORMAT.
+# FORMAT should be one of 'v7', 'ustar', or 'pax'.
+#
+# Substitute a variable $(am__tar) that is a command
+# writing to stdout a FORMAT-tarball containing the directory
+# $tardir.
+# tardir=directory && $(am__tar) > result.tar
+#
+# Substitute a variable $(am__untar) that extract such
+# a tarball read from stdin.
+# $(am__untar) < result.tar
+#
+AC_DEFUN(_AM_PROG_TAR,
+# Always define AMTAR for backward compatibility. Yes, it's still used
+# in the wild :-( We should find a proper way to deprecate it ...
+AC_SUBST(AMTAR, '$${TAR-tar}')
+
+# We'll loop over all known methods to create a tar archive until one works.
+_am_tools='gnutar m4_if($1, ustar, plaintar) pax cpio none'
+
+m4_if($1, v7,
+ am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -',
+
+ m4_case($1,
+ ustar,
+ # The POSIX 1988 'ustar' format is defined with fixed-size fields.
+ # There is notably a 21 bits limit for the UID and the GID. In fact,
+ # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343
+ # and bug#13588).
+ am_max_uid=2097151 # 2^21 - 1
+ am_max_gid=$am_max_uid
+ # The $UID and $GID variables are not portable, so we need to resort
+ # to the POSIX-mandated id(1) utility. Errors in the 'id' calls
+ # below are definitely unexpected, so allow the users to see them
+ # (that is, avoid stderr redirection).
+ am_uid=`id -u || echo unknown`
+ am_gid=`id -g || echo unknown`
+ AC_MSG_CHECKING(whether UID '$am_uid' is supported by ustar format)
+ if test $am_uid -le $am_max_uid; then
+ AC_MSG_RESULT(yes)
+ else
+ AC_MSG_RESULT(no)
+ _am_tools=none
+ fi
+ AC_MSG_CHECKING(whether GID '$am_gid' is supported by ustar format)
+ if test $am_gid -le $am_max_gid; then
+ AC_MSG_RESULT(yes)
+ else
+ AC_MSG_RESULT(no)
+ _am_tools=none
+ fi,
+
+ pax,
+ ,
+
+ m4_fatal(Unknown tar format))
+
+ AC_MSG_CHECKING(how to create a $1 tar archive)
+
+ # Go ahead even if we have the value already cached. We do so because we
+ # need to set the values for the 'am__tar' and 'am__untar' variables.
+ _am_tools=${am_cv_prog_tar_$1-$_am_tools}
+
+ for _am_tool in $_am_tools; do
+ case $_am_tool in
+ gnutar)
+ for _am_tar in tar gnutar gtar; do
+ AM_RUN_LOG($_am_tar --version) && break
+ done
+ am__tar="$_am_tar --format=m4_if($1, pax, posix, $1) -chf - "'"$$tardir"'
+ am__tar_="$_am_tar --format=m4_if($1, pax, posix, $1) -chf - "'"$tardir"'
+ am__untar="$_am_tar -xf -"
+ ;;
+ plaintar)
+ # Must skip GNU tar: if it does not support --format= it doesn't create
+ # ustar tarball either.
+ (tar --version) >/dev/null 2>&1 && continue
+ am__tar='tar chf - "$$tardir"'
+ am__tar_='tar chf - "$tardir"'
+ am__untar='tar xf -'
+ ;;
+ pax)
+ am__tar='pax -L -x $1 -w "$$tardir"'
+ am__tar_='pax -L -x $1 -w "$tardir"'
+ am__untar='pax -r'
+ ;;
+ cpio)
+ am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
+ am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
+ am__untar='cpio -i -H $1 -d'
+ ;;
+ none)
+ am__tar=false
+ am__tar_=false
+ am__untar=false
+ ;;
+ esac
+
+ # If the value was cached, stop now. We just wanted to have am__tar
+ # and am__untar set.
+ test -n "${am_cv_prog_tar_$1}" && break
+
+ # tar/untar a dummy directory, and stop if the command works.
+ rm -rf conftest.dir
+ mkdir conftest.dir
+ echo GrepMe > conftest.dir/file
+ AM_RUN_LOG(tardir=conftest.dir && eval $am__tar_ >conftest.tar)
+ rm -rf conftest.dir
+ if test -s conftest.tar; then
+ AM_RUN_LOG($am__untar <conftest.tar)
+ AM_RUN_LOG(cat conftest.dir/file)
+ grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
+ fi
+ done
+ rm -rf conftest.dir
+
+ AC_CACHE_VAL(am_cv_prog_tar_$1, am_cv_prog_tar_$1=$_am_tool)
+ AC_MSG_RESULT($am_cv_prog_tar_$1))
+
+AC_SUBST(am__tar)
+AC_SUBST(am__untar)
+) # _AM_PROG_TAR
+
 m4_include(m4/ax_define_dir.m4)
 m4_include(m4/ax_gcc_builtin.m4)
 m4_include(m4/libtool.m4)

_service:tar_scm:libX11-1.8.1.tar.xz/compile -> _service:tar_scm:libX11-1.8.4.tar.xz/compile Changed

@@ -1,9 +1,9 @@
 #! /bin/sh
 # Wrapper for compilers which do not understand '-c -o'.
 
-scriptversion=2018-03-07.03; # UTC
+scriptversion=2012-10-14.11; # UTC
 
-# Copyright (C) 1999-2021 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
 # Written by Tom Tromey <tromey@cygnus.com>.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -17,7 +17,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program. If not, see <https://www.gnu.org/licenses/>.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -53,7 +53,7 @@
 	 MINGW*)
 	 file_conv=mingw
 	 ;;
-	 CYGWIN* | MSYS*)
+	 CYGWIN*)
 	 file_conv=cygwin
 	 ;;
 	 *)
@@ -67,7 +67,7 @@
 	mingw/*)
 	 file=`cmd //C echo "$file " | sed -e 's/"$.*$ " *$/\1/'`
 	 ;;
-	cygwin/* | msys/*)
+	cygwin/*)
 	 file=`cygpath -m "$file" || echo "$file"`
 	 ;;
 	wine/*)
@@ -255,8 +255,7 @@
 echo "compile $scriptversion"
 exit $?
 ;;
- cl | */\\cl | cl.exe | */\\cl.exe | \
- icl | */\\icl | icl.exe | */\\icl.exe )
+ cl | */\\cl | cl.exe | */\\cl.exe )
 func_cl_wrapper "$@" # Doesn't return...
 ;;
 esac
@@ -340,9 +339,9 @@
 # Local Variables:
 # mode: shell-script
 # sh-indentation: 2
-# eval: (add-hook 'before-save-hook 'time-stamp)
+# eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC0"
+# time-stamp-time-zone: "UTC"
 # time-stamp-end: "; # UTC"
 # End:

_service:tar_scm:libX11-1.8.1.tar.xz/config.guess -> _service:tar_scm:libX11-1.8.4.tar.xz/config.guess Changed

@@ -1,10 +1,8 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-# Copyright 1992-2021 Free Software Foundation, Inc.
+# Copyright 1992-2018 Free Software Foundation, Inc.
 
-# shellcheck disable=SC2006,SC2268 # see below for rationale
-
-timestamp='2021-06-03'
+timestamp='2018-03-01'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -29,19 +27,11 @@
 # Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
 #
 # You can get the latest version of this script from:
-# https://git.savannah.gnu.org/cgit/config.git/plain/config.guess
+# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
 #
 # Please send patches to <config-patches@gnu.org>.
 
 
-# The "shellcheck disable" line above the timestamp inhibits complaints
-# about features and limitations of the classic Bourne shell that were
-# superseded or lifted in POSIX. However, this script identifies a wide
-# variety of pre-POSIX systems that do not have POSIX shells at all, and
-# even some reasonably current systems (Solaris 10 as case-in-point) still
-# have a pre-POSIX /bin/sh.
-
-
 me=`echo "$0" | sed -e 's,.*/,,'`
 
 usage="\
@@ -60,7 +50,7 @@
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright 1992-2021 Free Software Foundation, Inc.
+Copyright 1992-2018 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions. There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -94,8 +84,7 @@
 exit 1
 fi
 
-# Just in case it came from the environment.
-GUESS=
+trap 'exit 1' 1 2 15
 
 # CC_FOR_BUILD -- compiler used by this script. Note that the use of a
 # compiler to aid in system detection is discouraged as it requires
@@ -107,90 +96,73 @@
 
 # Portable tmp directory creation inspired by the Autoconf team.
 
-tmp=
-# shellcheck disable=SC2172
-trap 'test -z "$tmp" || rm -fr "$tmp"' 0 1 2 13 15
-
-set_cc_for_build() {
- # prevent multiple calls if $tmp is already set
- test "$tmp" && return 0
- : "${TMPDIR=/tmp}"
- # shellcheck disable=SC2039,SC3028
- { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
-	{ test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir "$tmp" 2>/dev/null) ; } ||
-	{ tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir "$tmp" 2>/dev/null) && echo "Warning: creating insecure temp directory" >&2 ; } ||
-	{ echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; }
- dummy=$tmp/dummy
- case ${CC_FOR_BUILD-},${HOST_CC-},${CC-} in
-	,,) echo "int x;" > "$dummy.c"
-	 for driver in cc gcc c89 c99 ; do
-		 if ($driver -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then
-		 CC_FOR_BUILD=$driver
-		 break
-		 fi
-	 done
-	 if test x"$CC_FOR_BUILD" = x ; then
-		 CC_FOR_BUILD=no_compiler_found
-	 fi
-	 ;;
-	,,*) CC_FOR_BUILD=$CC ;;
-	,*,*) CC_FOR_BUILD=$HOST_CC ;;
- esac
-}
+set_cc_for_build='
+trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
+trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
+: ${TMPDIR=/tmp} ;
+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+ { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
+ { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
+ { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
+dummy=$tmp/dummy ;
+tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
+case $CC_FOR_BUILD,$HOST_CC,$CC in
+ ,,) echo "int x;" > "$dummy.c" ;
+	for c in cc gcc c89 c99 ; do
+	 if ($c -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then
+	 CC_FOR_BUILD="$c"; break ;
+	 fi ;
+	done ;
+	if test x"$CC_FOR_BUILD" = x ; then
+	 CC_FOR_BUILD=no_compiler_found ;
+	fi
+	;;
+ ,,*) CC_FOR_BUILD=$CC ;;
+ ,*,*) CC_FOR_BUILD=$HOST_CC ;;
+esac ; set_cc_for_build= ;'
 
 # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
 # (ghazi@noc.rutgers.edu 1994-08-24)
-if test -f /.attbin/uname ; then
+if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
 	PATH=$PATH:/.attbin ; export PATH
 fi
 
 UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
 UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
-UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
+UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
 
-case $UNAME_SYSTEM in
+case "$UNAME_SYSTEM" in
 Linux|GNU|GNU/*)
-	LIBC=unknown
+	# If the system lacks a compiler, then just pick glibc.
+	# We could probably try harder.
+	LIBC=gnu
 
-	set_cc_for_build
+	eval "$set_cc_for_build"
 	cat <<-EOF > "$dummy.c"
 	#include <features.h>
 	#if defined(__UCLIBC__)
 	LIBC=uclibc
 	#elif defined(__dietlibc__)
 	LIBC=dietlibc
-	#elif defined(__GLIBC__)
-	LIBC=gnu
 	#else
-	#include <stdarg.h>
-	/* First heuristic to detect musl libc. */
-	#ifdef __DEFINED_va_list
-	LIBC=musl
-	#endif
+	LIBC=gnu
 	#endif
 	EOF
-	cc_set_libc=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`
-	eval "$cc_set_libc"
+	eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`"
 
-	# Second heuristic to detect musl libc.
-	if "$LIBC" = unknown &&
-	 command -v ldd >/dev/null &&
-	 ldd --version 2>&1 | grep -q ^musl; then
-		LIBC=musl
-	fi
-
-	# If the system lacks a compiler, then just pick glibc.
-	# We could probably try harder.
-	if "$LIBC" = unknown ; then
-		LIBC=gnu
+	# If ldd exists, use it to detect musl libc.
+	if command -v ldd >/dev/null && \
+		ldd --version 2>&1 | grep -q ^musl
+	then
+	 LIBC=musl
 	fi
 	;;
 esac
 
 # Note: order is significant - the case branches are not exclusive.
 
-case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION in
+case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
 *:NetBSD:*:*)
 	# NetBSD (nbsd) targets should (where applicable) match one or
 	# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
@@ -202,12 +174,12 @@
 	#
 	# Note: NetBSD doesn't particularly care about the vendor
 	# portion of the name. We always set it to "unknown".
+	sysctl="sysctl -n hw.machine_arch"
 	UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \
-	 /sbin/sysctl -n hw.machine_arch 2>/dev/null || \
-	 /usr/sbin/sysctl -n hw.machine_arch 2>/dev/null || \
+	 "/sbin/$sysctl" 2>/dev/null || \
+	 "/usr/sbin/$sysctl" 2>/dev/null || \
 	 echo unknown)`
-	case $UNAME_MACHINE_ARCH in
-	 aarch64eb) machine=aarch64_be-unknown ;;
+	case "$UNAME_MACHINE_ARCH" in
 	 armeb) machine=armeb-unknown ;;
 	 arm*) machine=arm-unknown ;;
 	 sh3el) machine=shl-unknown ;;
@@ -216,18 +188,18 @@
 	 earmv*)
 		arch=`echo "$UNAME_MACHINE_ARCH" | sed -e 's,^e$armv0-9$.*$,\1,'`
 		endian=`echo "$UNAME_MACHINE_ARCH" | sed -ne 's,^.*$eb$$,\1,p'`
-		machine=${arch}${endian}-unknown
+		machine="${arch}${endian}"-unknown
 		;;
-	 *) machine=$UNAME_MACHINE_ARCH-unknown ;;
+	 *) machine="$UNAME_MACHINE_ARCH"-unknown ;;
 	esac
 	# The Operating System including object format, if it has switched
 	# to ELF recently (or will in the future) and ABI.
-	case $UNAME_MACHINE_ARCH in
+	case "$UNAME_MACHINE_ARCH" in
 	 earm*)
 		os=netbsdelf
 		;;
 	 arm*|i386|m68k|ns32k|sh3*|sparc|vax)
-		set_cc_for_build
+		eval "$set_cc_for_build"
 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
 			| grep -q __ELF__
 		then
@@ -243,7 +215,7 @@
 		;;
 	esac
 	# Determine ABI tags.
-	case $UNAME_MACHINE_ARCH in
+	case "$UNAME_MACHINE_ARCH" in
 	 earm*)
 		expr='s/^earmv0-9/-eabi/;s/eb$//'
 		abi=`echo "$UNAME_MACHINE_ARCH" | sed -e "$expr"`
@@ -254,7 +226,7 @@
 	# thus, need a distinct triplet. However, they do not need
 	# kernel version information, so it can be replaced with a
 	# suitable tag, in the style of linux-gnu.
-	case $UNAME_VERSION in
+	case "$UNAME_VERSION" in
 	 Debian*)
 		release='-gnu'
 		;;
@@ -265,57 +237,45 @@
 	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
 	# contains redundant information, the shorter form:
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
-	GUESS=$machine-${os}${release}${abi-}
-	;;
+	echo "$machine-${os}${release}${abi}"
+	exit ;;
 *:Bitrig:*:*)
 	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
-	GUESS=$UNAME_MACHINE_ARCH-unknown-bitrig$UNAME_RELEASE
-	;;
+	echo "$UNAME_MACHINE_ARCH"-unknown-bitrig"$UNAME_RELEASE"
+	exit ;;
 *:OpenBSD:*:*)
 	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
-	GUESS=$UNAME_MACHINE_ARCH-unknown-openbsd$UNAME_RELEASE
-	;;
- *:SecBSD:*:*)
-	UNAME_MACHINE_ARCH=`arch | sed 's/SecBSD.//'`
-	GUESS=$UNAME_MACHINE_ARCH-unknown-secbsd$UNAME_RELEASE
-	;;
+	echo "$UNAME_MACHINE_ARCH"-unknown-openbsd"$UNAME_RELEASE"
+	exit ;;
 *:LibertyBSD:*:*)
 	UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'`
-	GUESS=$UNAME_MACHINE_ARCH-unknown-libertybsd$UNAME_RELEASE
-	;;
+	echo "$UNAME_MACHINE_ARCH"-unknown-libertybsd"$UNAME_RELEASE"
+	exit ;;
 *:MidnightBSD:*:*)
-	GUESS=$UNAME_MACHINE-unknown-midnightbsd$UNAME_RELEASE
-	;;
+	echo "$UNAME_MACHINE"-unknown-midnightbsd"$UNAME_RELEASE"
+	exit ;;
 *:ekkoBSD:*:*)
-	GUESS=$UNAME_MACHINE-unknown-ekkobsd$UNAME_RELEASE
-	;;
+	echo "$UNAME_MACHINE"-unknown-ekkobsd"$UNAME_RELEASE"
+	exit ;;
 *:SolidBSD:*:*)
-	GUESS=$UNAME_MACHINE-unknown-solidbsd$UNAME_RELEASE
-	;;
- *:OS108:*:*)
-	GUESS=$UNAME_MACHINE-unknown-os108_$UNAME_RELEASE
-	;;
+	echo "$UNAME_MACHINE"-unknown-solidbsd"$UNAME_RELEASE"
+	exit ;;
 macppc:MirBSD:*:*)
-	GUESS=powerpc-unknown-mirbsd$UNAME_RELEASE
-	;;
+	echo powerpc-unknown-mirbsd"$UNAME_RELEASE"
+	exit ;;
 *:MirBSD:*:*)
-	GUESS=$UNAME_MACHINE-unknown-mirbsd$UNAME_RELEASE
-	;;
+	echo "$UNAME_MACHINE"-unknown-mirbsd"$UNAME_RELEASE"
+	exit ;;
 *:Sortix:*:*)
-	GUESS=$UNAME_MACHINE-unknown-sortix
-	;;
- *:Twizzler:*:*)
-	GUESS=$UNAME_MACHINE-unknown-twizzler
-	;;
+	echo "$UNAME_MACHINE"-unknown-sortix
+	exit ;;
 *:Redox:*:*)
-	GUESS=$UNAME_MACHINE-unknown-redox
-	;;
+	echo "$UNAME_MACHINE"-unknown-redox
+	exit ;;
 mips:OSF1:*.*)
-	GUESS=mips-dec-osf1
-	;;
+ echo mips-dec-osf1
+ exit ;;
 alpha:OSF1:*:*)
-	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
-	trap '' 0
 	case $UNAME_RELEASE in
 	*4.0)
 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
@@ -329,7 +289,7 @@
 	# covers most systems running today. This code pipes the CPU
 	# types through head -n 1, so we only detect the type of CPU 0.
 	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha $.*$ processor.*$/\1/p' | head -n 1`
-	case $ALPHA_CPU_TYPE in
+	case "$ALPHA_CPU_TYPE" in
 	 "EV4 (21064)")
 		UNAME_MACHINE=alpha ;;
 	 "EV4.5 (21064)")
@@ -366,76 +326,75 @@
 	# A Tn.n version is a released field test version.
 	# A Xn.n version is an unreleased experimental baselevel.
 	# 1.2 uses "1.2" for uname -r.
-	OSF_REL=`echo "$UNAME_RELEASE" | sed -e 's/^PVTX//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
-	GUESS=$UNAME_MACHINE-dec-osf$OSF_REL
-	;;
+	echo "$UNAME_MACHINE"-dec-osf"`echo "$UNAME_RELEASE" | sed -e 's/^PVTX//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`"
+	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
+	exitcode=$?
+	trap '' 0
+	exit $exitcode ;;
 Amiga*:UNIX_System_V:4.0:*)
-	GUESS=m68k-unknown-sysv4
-	;;
+	echo m68k-unknown-sysv4
+	exit ;;
 *:AamigaOoSs:*:*)
-	GUESS=$UNAME_MACHINE-unknown-amigaos
-	;;
+	echo "$UNAME_MACHINE"-unknown-amigaos
+	exit ;;
 *:MmorphOoSs:*:*)
-	GUESS=$UNAME_MACHINE-unknown-morphos
-	;;
+	echo "$UNAME_MACHINE"-unknown-morphos
+	exit ;;
 *:OS/390:*:*)
-	GUESS=i370-ibm-openedition
-	;;
+	echo i370-ibm-openedition
+	exit ;;
 *:z/VM:*:*)
-	GUESS=s390-ibm-zvmoe
-	;;
+	echo s390-ibm-zvmoe
+	exit ;;
 *:OS400:*:*)
-	GUESS=powerpc-ibm-os400
-	;;
+	echo powerpc-ibm-os400
+	exit ;;
 arm:RISC*:1.012*:*|arm:riscix:1.012*:*)
-	GUESS=arm-acorn-riscix$UNAME_RELEASE
-	;;
+	echo arm-acorn-riscix"$UNAME_RELEASE"
+	exit ;;
 arm*:riscos:*:*|arm*:RISCOS:*:*)
-	GUESS=arm-unknown-riscos
-	;;
+	echo arm-unknown-riscos
+	exit ;;
 SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
-	GUESS=hppa1.1-hitachi-hiuxmpp
-	;;
+	echo hppa1.1-hitachi-hiuxmpp
+	exit ;;
 Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
 	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
-	case `(/bin/universe) 2>/dev/null` in
-	 att) GUESS=pyramid-pyramid-sysv3 ;;
-	 *) GUESS=pyramid-pyramid-bsd ;;
-	esac
-	;;
+	if test "`(/bin/universe) 2>/dev/null`" = att ; then
+		echo pyramid-pyramid-sysv3
+	else
+		echo pyramid-pyramid-bsd
+	fi
+	exit ;;
 NILE*:*:*:dcosx)
-	GUESS=pyramid-pyramid-svr4
-	;;
+	echo pyramid-pyramid-svr4
+	exit ;;
 DRS?6000:unix:4.0:6*)
-	GUESS=sparc-icl-nx6
-	;;
+	echo sparc-icl-nx6
+	exit ;;
 DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
 	case `/usr/bin/uname -p` in
-	 sparc) GUESS=sparc-icl-nx7 ;;
-	esac
-	;;
+	 sparc) echo sparc-icl-nx7; exit ;;
+	esac ;;
 s390x:SunOS:*:*)
-	SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/^.*//'`
-	GUESS=$UNAME_MACHINE-ibm-solaris2$SUN_REL
-	;;
+	echo "$UNAME_MACHINE"-ibm-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/^.*//'`"
+	exit ;;
 sun4H:SunOS:5.*:*)
-	SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/^.*//'`
-	GUESS=sparc-hal-solaris2$SUN_REL
-	;;
+	echo sparc-hal-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/^.*//'`"
+	exit ;;
 sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
-	SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/^.*//'`
-	GUESS=sparc-sun-solaris2$SUN_REL
-	;;
+	echo sparc-sun-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/^.*//'`"
+	exit ;;
 i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
-	GUESS=i386-pc-auroraux$UNAME_RELEASE
-	;;
+	echo i386-pc-auroraux"$UNAME_RELEASE"
+	exit ;;
 i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
-	set_cc_for_build
+	eval "$set_cc_for_build"
 	SUN_ARCH=i386
 	# If there is a compiler, see if it is configured for 64-bit objects.
 	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
 	# This test works for both compilers.
-	if test "$CC_FOR_BUILD" != no_compiler_found; then
+	if "$CC_FOR_BUILD" != no_compiler_found ; then
 	 if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
 		(CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
 		grep IS_64BIT_ARCH >/dev/null
@@ -443,44 +402,41 @@
 		SUN_ARCH=x86_64
 	 fi
 	fi
-	SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/^.*//'`
-	GUESS=$SUN_ARCH-pc-solaris2$SUN_REL
-	;;
+	echo "$SUN_ARCH"-pc-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/^.*//'`"
+	exit ;;
 sun4*:SunOS:6*:*)
 	# According to config.sub, this is the proper way to canonicalize
 	# SunOS6. Hard to guess exactly what SunOS6 will be like, but
 	# it's likely to be more like Solaris than SunOS4.
-	SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/^.*//'`
-	GUESS=sparc-sun-solaris3$SUN_REL
-	;;
+	echo sparc-sun-solaris3"`echo "$UNAME_RELEASE"|sed -e 's/^.*//'`"
+	exit ;;
 sun4*:SunOS:*:*)
-	case `/usr/bin/arch -k` in
+	case "`/usr/bin/arch -k`" in
 	 Series*|S4*)
 		UNAME_RELEASE=`uname -v`
 		;;
 	esac
 	# Japanese Language versions have a version number like `4.1.3-JL'.
-	SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/-/_/'`
-	GUESS=sparc-sun-sunos$SUN_REL
-	;;
+	echo sparc-sun-sunos"`echo "$UNAME_RELEASE"|sed -e 's/-/_/'`"
+	exit ;;
 sun3*:SunOS:*:*)
-	GUESS=m68k-sun-sunos$UNAME_RELEASE
-	;;
+	echo m68k-sun-sunos"$UNAME_RELEASE"
+	exit ;;
 sun*:*:4.2BSD:*)
 	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
 	test "x$UNAME_RELEASE" = x && UNAME_RELEASE=3
-	case `/bin/arch` in
+	case "`/bin/arch`" in
 	 sun3)
-		GUESS=m68k-sun-sunos$UNAME_RELEASE
+		echo m68k-sun-sunos"$UNAME_RELEASE"
 		;;
 	 sun4)
-		GUESS=sparc-sun-sunos$UNAME_RELEASE
+		echo sparc-sun-sunos"$UNAME_RELEASE"
 		;;
 	esac
-	;;
+	exit ;;
 aushp:SunOS:*:*)
-	GUESS=sparc-auspex-sunos$UNAME_RELEASE
-	;;
+	echo sparc-auspex-sunos"$UNAME_RELEASE"
+	exit ;;
 # The situation for MiNT is a little confusing. The machine name
 # can be virtually everything (everything which is not
 # "atarist" or "atariste" at least should have a processor
@@ -490,43 +446,43 @@
 # MiNT. But MiNT is downward compatible to TOS, so this should
 # be no problem.
 atariste:*MiNT:*:* | atariste:*mint:*:* | atariste:*TOS:*:*)
-	GUESS=m68k-atari-mint$UNAME_RELEASE
-	;;
+	echo m68k-atari-mint"$UNAME_RELEASE"
+	exit ;;
 atari*:*MiNT:*:* | atari*:*mint:*:* | atariste:*TOS:*:*)
-	GUESS=m68k-atari-mint$UNAME_RELEASE
-	;;
+	echo m68k-atari-mint"$UNAME_RELEASE"
+	exit ;;
 *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-	GUESS=m68k-atari-mint$UNAME_RELEASE
-	;;
+	echo m68k-atari-mint"$UNAME_RELEASE"
+	exit ;;
 milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-	GUESS=m68k-milan-mint$UNAME_RELEASE
-	;;
+	echo m68k-milan-mint"$UNAME_RELEASE"
+	exit ;;
 hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-	GUESS=m68k-hades-mint$UNAME_RELEASE
-	;;
+	echo m68k-hades-mint"$UNAME_RELEASE"
+	exit ;;
 *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-	GUESS=m68k-unknown-mint$UNAME_RELEASE
-	;;
+	echo m68k-unknown-mint"$UNAME_RELEASE"
+	exit ;;
 m68k:machten:*:*)
-	GUESS=m68k-apple-machten$UNAME_RELEASE
-	;;
+	echo m68k-apple-machten"$UNAME_RELEASE"
+	exit ;;
 powerpc:machten:*:*)
-	GUESS=powerpc-apple-machten$UNAME_RELEASE
-	;;
+	echo powerpc-apple-machten"$UNAME_RELEASE"
+	exit ;;
 RISC*:Mach:*:*)
-	GUESS=mips-dec-mach_bsd4.3
-	;;
+	echo mips-dec-mach_bsd4.3
+	exit ;;
 RISC*:ULTRIX:*:*)
-	GUESS=mips-dec-ultrix$UNAME_RELEASE
-	;;
+	echo mips-dec-ultrix"$UNAME_RELEASE"
+	exit ;;
 VAX*:ULTRIX*:*:*)
-	GUESS=vax-dec-ultrix$UNAME_RELEASE
-	;;
+	echo vax-dec-ultrix"$UNAME_RELEASE"
+	exit ;;
 2020:CLIX:*:* | 2430:CLIX:*:*)
-	GUESS=clipper-intergraph-clix$UNAME_RELEASE
-	;;
+	echo clipper-intergraph-clix"$UNAME_RELEASE"
+	exit ;;
 mips:*:*:UMIPS | mips:*:*:RISCos)
-	set_cc_for_build
+	eval "$set_cc_for_build"
 	sed 's/^	//' << EOF > "$dummy.c"
 #ifdef __cplusplus
 #include <stdio.h> /* for printf() prototype */
@@ -552,79 +508,78 @@
 	 dummyarg=`echo "$UNAME_RELEASE" | sed -n 's/$0-9*$.*/\1/p'` &&
 	 SYSTEM_NAME=`"$dummy" "$dummyarg"` &&
 	 { echo "$SYSTEM_NAME"; exit; }
-	GUESS=mips-mips-riscos$UNAME_RELEASE
-	;;
+	echo mips-mips-riscos"$UNAME_RELEASE"
+	exit ;;
 Motorola:PowerMAX_OS:*:*)
-	GUESS=powerpc-motorola-powermax
-	;;
+	echo powerpc-motorola-powermax
+	exit ;;
 Motorola:*:4.3:PL8-*)
-	GUESS=powerpc-harris-powermax
-	;;
+	echo powerpc-harris-powermax
+	exit ;;
 Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
-	GUESS=powerpc-harris-powermax
-	;;
+	echo powerpc-harris-powermax
+	exit ;;
 Night_Hawk:Power_UNIX:*:*)
-	GUESS=powerpc-harris-powerunix
-	;;
+	echo powerpc-harris-powerunix
+	exit ;;
 m88k:CX/UX:7*:*)
-	GUESS=m88k-harris-cxux7
-	;;
+	echo m88k-harris-cxux7
+	exit ;;
 m88k:*:4*:R4*)
-	GUESS=m88k-motorola-sysv4
-	;;
+	echo m88k-motorola-sysv4
+	exit ;;
 m88k:*:3*:R3*)
-	GUESS=m88k-motorola-sysv3
-	;;
+	echo m88k-motorola-sysv3
+	exit ;;
 AViiON:dgux:*:*)
 	# DG/UX returns AViiON for all architectures
 	UNAME_PROCESSOR=`/usr/bin/uname -p`
-	if test "$UNAME_PROCESSOR" = mc88100 || test "$UNAME_PROCESSOR" = mc88110
+	if "$UNAME_PROCESSOR" = mc88100 || "$UNAME_PROCESSOR" = mc88110 
 	then
-	 if test "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx || \
-	 test "$TARGET_BINARY_INTERFACE"x = x
+	 if "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx || \
+	 "$TARGET_BINARY_INTERFACE"x = x 
 	 then
-		GUESS=m88k-dg-dgux$UNAME_RELEASE
+		echo m88k-dg-dgux"$UNAME_RELEASE"
 	 else
-		GUESS=m88k-dg-dguxbcs$UNAME_RELEASE
+		echo m88k-dg-dguxbcs"$UNAME_RELEASE"
 	 fi
 	else
-	 GUESS=i586-dg-dgux$UNAME_RELEASE
+	 echo i586-dg-dgux"$UNAME_RELEASE"
 	fi
-	;;
+	exit ;;
 M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
-	GUESS=m88k-dolphin-sysv3
-	;;
+	echo m88k-dolphin-sysv3
+	exit ;;
 M88*:*:R3*:*)
 	# Delta 88k system running SVR3
-	GUESS=m88k-motorola-sysv3
-	;;
+	echo m88k-motorola-sysv3
+	exit ;;
 XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
-	GUESS=m88k-tektronix-sysv3
-	;;
+	echo m88k-tektronix-sysv3
+	exit ;;
 Tek430-90-9:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
-	GUESS=m68k-tektronix-bsd
-	;;
+	echo m68k-tektronix-bsd
+	exit ;;
 *:IRIX*:*:*)
-	IRIX_REL=`echo "$UNAME_RELEASE" | sed -e 's/-/_/g'`
-	GUESS=mips-sgi-irix$IRIX_REL
-	;;
+	echo mips-sgi-irix"`echo "$UNAME_RELEASE"|sed -e 's/-/_/g'`"
+	exit ;;
 ????????:AIX?:12.1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
-	GUESS=romp-ibm-aix # uname -m gives an 8 hex-code CPU id
-	;; # Note that: echo "'`uname -s`'" gives 'AIX '
+	echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id
+	exit ;; # Note that: echo "'`uname -s`'" gives 'AIX '
 i*86:AIX:*:*)
-	GUESS=i386-ibm-aix
-	;;
+	echo i386-ibm-aix
+	exit ;;
 ia64:AIX:*:*)
-	if test -x /usr/bin/oslevel ; then
+	if -x /usr/bin/oslevel ; then
 		IBM_REV=`/usr/bin/oslevel`
 	else
-		IBM_REV=$UNAME_VERSION.$UNAME_RELEASE
+		IBM_REV="$UNAME_VERSION.$UNAME_RELEASE"
 	fi
-	GUESS=$UNAME_MACHINE-ibm-aix$IBM_REV
-	;;
+	echo "$UNAME_MACHINE"-ibm-aix"$IBM_REV"
+	exit ;;
 *:AIX:2:3)
 	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
-		set_cc_for_build
+		eval "$set_cc_for_build"
 		sed 's/^		//' << EOF > "$dummy.c"
 		#include <sys/systemcfg.h>
 
@@ -638,16 +593,16 @@
 EOF
 		if $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"`
 		then
-			GUESS=$SYSTEM_NAME
+			echo "$SYSTEM_NAME"
 		else
-			GUESS=rs6000-ibm-aix3.2.5
+			echo rs6000-ibm-aix3.2.5
 		fi
 	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
-		GUESS=rs6000-ibm-aix3.2.4
+		echo rs6000-ibm-aix3.2.4
 	else
-		GUESS=rs6000-ibm-aix3.2
+		echo rs6000-ibm-aix3.2
 	fi
-	;;
+	exit ;;
 *:AIX:*:4567)
 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
 	if /usr/sbin/lsattr -El "$IBM_CPU_ID" | grep ' POWER' >/dev/null 2>&1; then
@@ -655,57 +610,57 @@
 	else
 		IBM_ARCH=powerpc
 	fi
-	if test -x /usr/bin/lslpp ; then
-		IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc | \
+	if -x /usr/bin/lslpp ; then
+		IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc |
 			 awk -F: '{ print $3 }' | sed s/0-9*$/0/`
 	else
-		IBM_REV=$UNAME_VERSION.$UNAME_RELEASE
+		IBM_REV="$UNAME_VERSION.$UNAME_RELEASE"
 	fi
-	GUESS=$IBM_ARCH-ibm-aix$IBM_REV
-	;;
+	echo "$IBM_ARCH"-ibm-aix"$IBM_REV"
+	exit ;;
 *:AIX:*:*)
-	GUESS=rs6000-ibm-aix
-	;;
+	echo rs6000-ibm-aix
+	exit ;;
 ibmrt:4.4BSD:*|romp-ibm:4.4BSD:*)
-	GUESS=romp-ibm-bsd4.4
-	;;
+	echo romp-ibm-bsd4.4
+	exit ;;
 ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and
-	GUESS=romp-ibm-bsd$UNAME_RELEASE # 4.3 with uname added to
-	;; # report: romp-ibm BSD 4.3
+	echo romp-ibm-bsd"$UNAME_RELEASE" # 4.3 with uname added to
+	exit ;; # report: romp-ibm BSD 4.3
 *:BOSX:*:*)
-	GUESS=rs6000-bull-bosx
-	;;
+	echo rs6000-bull-bosx
+	exit ;;
 DPX/2?00:B.O.S.:*:*)
-	GUESS=m68k-bull-sysv3
-	;;
+	echo m68k-bull-sysv3
+	exit ;;
 9000/34??:4.3bsd:1.*:*)
-	GUESS=m68k-hp-bsd
-	;;
+	echo m68k-hp-bsd
+	exit ;;
 hp300:4.4BSD:*:* | 9000/34??:4.3bsd:2.*:*)
-	GUESS=m68k-hp-bsd4.4
-	;;
+	echo m68k-hp-bsd4.4
+	exit ;;
 9000/34678??:HP-UX:*:*)
-	HPUX_REV=`echo "$UNAME_RELEASE" | sed -e 's/^.*.0B*//'`
-	case $UNAME_MACHINE in
+	HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/^.*.0B*//'`
+	case "$UNAME_MACHINE" in
 	 9000/31?) HP_ARCH=m68000 ;;
 	 9000/34??) HP_ARCH=m68k ;;
 	 9000/6780-90-9)
-		if test -x /usr/bin/getconf; then
+		if -x /usr/bin/getconf ; then
 		 sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
 		 sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-		 case $sc_cpu_version in
+		 case "$sc_cpu_version" in
 		 523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0
 		 528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1
 		 532) # CPU_PA_RISC2_0
-			case $sc_kernel_bits in
+			case "$sc_kernel_bits" in
 			 32) HP_ARCH=hppa2.0n ;;
 			 64) HP_ARCH=hppa2.0w ;;
 			 '') HP_ARCH=hppa2.0 ;; # HP-UX 10.20
 			esac ;;
 		 esac
 		fi
-		if test "$HP_ARCH" = ""; then
-		 set_cc_for_build
+		if "$HP_ARCH" = "" ; then
+		 eval "$set_cc_for_build"
 		 sed 's/^		//' << EOF > "$dummy.c"
 
 		#define _HPUX_SOURCE
@@ -743,9 +698,9 @@
 		 test -z "$HP_ARCH" && HP_ARCH=hppa
 		fi ;;
 	esac
-	if test "$HP_ARCH" = hppa2.0w
+	if "$HP_ARCH" = hppa2.0w 
 	then
-	 set_cc_for_build
+	 eval "$set_cc_for_build"
 
 	 # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
 	 # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler
@@ -764,14 +719,14 @@
 		HP_ARCH=hppa64
 	 fi
 	fi
-	GUESS=$HP_ARCH-hp-hpux$HPUX_REV
-	;;
+	echo "$HP_ARCH"-hp-hpux"$HPUX_REV"
+	exit ;;
 ia64:HP-UX:*:*)
-	HPUX_REV=`echo "$UNAME_RELEASE" | sed -e 's/^.*.0B*//'`
-	GUESS=ia64-hp-hpux$HPUX_REV
-	;;
+	HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/^.*.0B*//'`
+	echo ia64-hp-hpux"$HPUX_REV"
+	exit ;;
 3050*:HI-UX:*:*)
-	set_cc_for_build
+	eval "$set_cc_for_build"
 	sed 's/^	//' << EOF > "$dummy.c"
 	#include <unistd.h>
 	int
@@ -799,36 +754,36 @@
 EOF
 	$CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` &&
 		{ echo "$SYSTEM_NAME"; exit; }
-	GUESS=unknown-hitachi-hiuxwe2
-	;;
+	echo unknown-hitachi-hiuxwe2
+	exit ;;
 9000/7??:4.3bsd:*:* | 9000/8?79:4.3bsd:*:*)
-	GUESS=hppa1.1-hp-bsd
-	;;
+	echo hppa1.1-hp-bsd
+	exit ;;
 9000/8??:4.3bsd:*:*)
-	GUESS=hppa1.0-hp-bsd
-	;;
+	echo hppa1.0-hp-bsd
+	exit ;;
 *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
-	GUESS=hppa1.0-hp-mpeix
-	;;
+	echo hppa1.0-hp-mpeix
+	exit ;;
 hp7??:OSF1:*:* | hp8?79:OSF1:*:*)
-	GUESS=hppa1.1-hp-osf
-	;;
+	echo hppa1.1-hp-osf
+	exit ;;
 hp8??:OSF1:*:*)
-	GUESS=hppa1.0-hp-osf
-	;;
+	echo hppa1.0-hp-osf
+	exit ;;
 i*86:OSF1:*:*)
-	if test -x /usr/sbin/sysversion ; then
-	 GUESS=$UNAME_MACHINE-unknown-osf1mk
+	if -x /usr/sbin/sysversion ; then
+	 echo "$UNAME_MACHINE"-unknown-osf1mk
 	else
-	 GUESS=$UNAME_MACHINE-unknown-osf1
+	 echo "$UNAME_MACHINE"-unknown-osf1
 	fi
-	;;
+	exit ;;
 parisc*:Lites*:*:*)
-	GUESS=hppa1.1-hp-lites
-	;;
+	echo hppa1.1-hp-lites
+	exit ;;
 C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
-	GUESS=c1-convex-bsd
-	;;
+	echo c1-convex-bsd
+	exit ;;
 C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
 	if getsysinfo -f scalar_acc
 	then echo c32-convex-bsd
@@ -836,18 +791,17 @@
 	fi
 	exit ;;
 C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
-	GUESS=c34-convex-bsd
-	;;
+	echo c34-convex-bsd
+	exit ;;
 C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
-	GUESS=c38-convex-bsd
-	;;
+	echo c38-convex-bsd
+	exit ;;
 C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
-	GUESS=c4-convex-bsd
-	;;
+	echo c4-convex-bsd
+	exit ;;
 CRAY*Y-MP:*:*:*)
-	CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.^.*$/.X/'`
-	GUESS=ymp-cray-unicos$CRAY_REL
-	;;
+	echo ymp-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.^.*$/.X/'
+	exit ;;
 CRAY*A-Z90:*:*:*)
 	echo "$UNAME_MACHINE"-cray-unicos"$UNAME_RELEASE" \
 	| sed -e 's/CRAY.*$A-Z90$/\1/' \
@@ -855,126 +809,103 @@
 	 -e 's/\.^.*$/.X/'
 	exit ;;
 CRAY*TS:*:*:*)
-	CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.^.*$/.X/'`
-	GUESS=t90-cray-unicos$CRAY_REL
-	;;
+	echo t90-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.^.*$/.X/'
+	exit ;;
 CRAY*T3E:*:*:*)
-	CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.^.*$/.X/'`
-	GUESS=alphaev5-cray-unicosmk$CRAY_REL
-	;;
+	echo alphaev5-cray-unicosmk"$UNAME_RELEASE" | sed -e 's/\.^.*$/.X/'
+	exit ;;
 CRAY*SV1:*:*:*)
-	CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.^.*$/.X/'`
-	GUESS=sv1-cray-unicos$CRAY_REL
-	;;
+	echo sv1-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.^.*$/.X/'
+	exit ;;
 *:UNICOS/mp:*:*)
-	CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.^.*$/.X/'`
-	GUESS=craynv-cray-unicosmp$CRAY_REL
-	;;
+	echo craynv-cray-unicosmp"$UNAME_RELEASE" | sed -e 's/\.^.*$/.X/'
+	exit ;;
 F3001:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
 	FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
 	FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
 	FUJITSU_REL=`echo "$UNAME_RELEASE" | sed -e 's/ /_/'`
-	GUESS=${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}
-	;;
+	echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+	exit ;;
 5000:UNIX_System_V:4.*:*)
 	FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
 	FUJITSU_REL=`echo "$UNAME_RELEASE" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'`
-	GUESS=sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}
-	;;
+	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+	exit ;;
 i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
-	GUESS=$UNAME_MACHINE-pc-bsdi$UNAME_RELEASE
-	;;
+	echo "$UNAME_MACHINE"-pc-bsdi"$UNAME_RELEASE"
+	exit ;;
 sparc*:BSD/OS:*:*)
-	GUESS=sparc-unknown-bsdi$UNAME_RELEASE
-	;;
+	echo sparc-unknown-bsdi"$UNAME_RELEASE"
+	exit ;;
 *:BSD/OS:*:*)
-	GUESS=$UNAME_MACHINE-unknown-bsdi$UNAME_RELEASE
-	;;
- arm:FreeBSD:*:*)
-	UNAME_PROCESSOR=`uname -p`
-	set_cc_for_build
-	if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
-	 | grep -q __ARM_PCS_VFP
-	then
-	 FREEBSD_REL=`echo "$UNAME_RELEASE" | sed -e 's/-(.*//'`
-	 GUESS=$UNAME_PROCESSOR-unknown-freebsd$FREEBSD_REL-gnueabi
-	else
-	 FREEBSD_REL=`echo "$UNAME_RELEASE" | sed -e 's/-(.*//'`
-	 GUESS=$UNAME_PROCESSOR-unknown-freebsd$FREEBSD_REL-gnueabihf
-	fi
-	;;
+	echo "$UNAME_MACHINE"-unknown-bsdi"$UNAME_RELEASE"
+	exit ;;
 *:FreeBSD:*:*)
 	UNAME_PROCESSOR=`/usr/bin/uname -p`
-	case $UNAME_PROCESSOR in
+	case "$UNAME_PROCESSOR" in
 	 amd64)
 		UNAME_PROCESSOR=x86_64 ;;
 	 i386)
 		UNAME_PROCESSOR=i586 ;;
 	esac
-	FREEBSD_REL=`echo "$UNAME_RELEASE" | sed -e 's/-(.*//'`
-	GUESS=$UNAME_PROCESSOR-unknown-freebsd$FREEBSD_REL
-	;;
+	echo "$UNAME_PROCESSOR"-unknown-freebsd"`echo "$UNAME_RELEASE"|sed -e 's/-(.*//'`"
+	exit ;;
 i*:CYGWIN*:*)
-	GUESS=$UNAME_MACHINE-pc-cygwin
-	;;
+	echo "$UNAME_MACHINE"-pc-cygwin
+	exit ;;
 *:MINGW64*:*)
-	GUESS=$UNAME_MACHINE-pc-mingw64
-	;;
+	echo "$UNAME_MACHINE"-pc-mingw64
+	exit ;;
 *:MINGW*:*)
-	GUESS=$UNAME_MACHINE-pc-mingw32
-	;;
+	echo "$UNAME_MACHINE"-pc-mingw32
+	exit ;;
 *:MSYS*:*)
-	GUESS=$UNAME_MACHINE-pc-msys
-	;;
+	echo "$UNAME_MACHINE"-pc-msys
+	exit ;;
 i*:PW*:*)
-	GUESS=$UNAME_MACHINE-pc-pw32
-	;;
+	echo "$UNAME_MACHINE"-pc-pw32
+	exit ;;
 *:Interix*:*)
-	case $UNAME_MACHINE in
+	case "$UNAME_MACHINE" in
 	 x86)
-		GUESS=i586-pc-interix$UNAME_RELEASE
-		;;
+		echo i586-pc-interix"$UNAME_RELEASE"
+		exit ;;
 	 authenticamd | genuineintel | EM64T)
-		GUESS=x86_64-unknown-interix$UNAME_RELEASE
-		;;
+		echo x86_64-unknown-interix"$UNAME_RELEASE"
+		exit ;;
 	 IA64)
-		GUESS=ia64-unknown-interix$UNAME_RELEASE
-		;;
+		echo ia64-unknown-interix"$UNAME_RELEASE"
+		exit ;;
 	esac ;;
 i*:UWIN*:*)
-	GUESS=$UNAME_MACHINE-pc-uwin
-	;;
+	echo "$UNAME_MACHINE"-pc-uwin
+	exit ;;
 amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
-	GUESS=x86_64-pc-cygwin
-	;;
+	echo x86_64-unknown-cygwin
+	exit ;;
 prep*:SunOS:5.*:*)
-	SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/^.*//'`
-	GUESS=powerpcle-unknown-solaris2$SUN_REL
-	;;
+	echo powerpcle-unknown-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/^.*//'`"
+	exit ;;
 *:GNU:*:*)
 	# the GNU system
-	GNU_ARCH=`echo "$UNAME_MACHINE" | sed -e 's,-/.*$,,'`
-	GNU_REL=`echo "$UNAME_RELEASE" | sed -e 's,/.*$,,'`
-	GUESS=$GNU_ARCH-unknown-$LIBC$GNU_REL
-	;;
+	echo "`echo "$UNAME_MACHINE"|sed -e 's,-/.*$,,'`-unknown-$LIBC`echo "$UNAME_RELEASE"|sed -e 's,/.*$,,'`"
+	exit ;;
 *:GNU/*:*:*)
 	# other systems with GNU libc and userland
-	GNU_SYS=`echo "$UNAME_SYSTEM" | sed 's,^^/*/,,' | tr ":upper:" ":lower:"`
-	GNU_REL=`echo "$UNAME_RELEASE" | sed -e 's/-(.*//'`
-	GUESS=$UNAME_MACHINE-unknown-$GNU_SYS$GNU_REL-$LIBC
-	;;
- *:Minix:*:*)
-	GUESS=$UNAME_MACHINE-unknown-minix
-	;;
+	echo "$UNAME_MACHINE-unknown-`echo "$UNAME_SYSTEM" | sed 's,^^/*/,,' | tr ":upper:" ":lower:"``echo "$UNAME_RELEASE"|sed -e 's/-(.*//'`-$LIBC"
+	exit ;;
+ i*86:Minix:*:*)
+	echo "$UNAME_MACHINE"-pc-minix
+	exit ;;
 aarch64:Linux:*:*)
-	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
-	;;
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+	exit ;;
 aarch64_be:Linux:*:*)
 	UNAME_MACHINE=aarch64_be
-	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
-	;;
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+	exit ;;
 alpha:Linux:*:*)
-	case `sed -n '/^cpu model/s/^.*: $.*$/\1/p' /proc/cpuinfo 2>/dev/null` in
+	case `sed -n '/^cpu model/s/^.*: $.*$/\1/p' < /proc/cpuinfo` in
 	 EV5) UNAME_MACHINE=alphaev5 ;;
 	 EV56) UNAME_MACHINE=alphaev56 ;;
 	 PCA56) UNAME_MACHINE=alphapca56 ;;
@@ -985,225 +916,183 @@
 	esac
 	objdump --private-headers /bin/sh | grep -q ld.so.1
 	if test "$?" = 0 ; then LIBC=gnulibc1 ; fi
-	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
-	;;
- arc:Linux:*:* | arceb:Linux:*:* | arc32:Linux:*:* | arc64:Linux:*:*)
-	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
-	;;
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+	exit ;;
+ arc:Linux:*:* | arceb:Linux:*:*)
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+	exit ;;
 arm*:Linux:*:*)
-	set_cc_for_build
+	eval "$set_cc_for_build"
 	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
 	 | grep -q __ARM_EABI__
 	then
-	 GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	 echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
 	else
 	 if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
 		| grep -q __ARM_PCS_VFP
 	 then
-		GUESS=$UNAME_MACHINE-unknown-linux-${LIBC}eabi
+		echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabi
 	 else
-		GUESS=$UNAME_MACHINE-unknown-linux-${LIBC}eabihf
+		echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabihf
 	 fi
 	fi
-	;;
+	exit ;;
 avr32*:Linux:*:*)
-	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
-	;;
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+	exit ;;
 cris:Linux:*:*)
-	GUESS=$UNAME_MACHINE-axis-linux-$LIBC
-	;;
+	echo "$UNAME_MACHINE"-axis-linux-"$LIBC"
+	exit ;;
 crisv32:Linux:*:*)
-	GUESS=$UNAME_MACHINE-axis-linux-$LIBC
-	;;
+	echo "$UNAME_MACHINE"-axis-linux-"$LIBC"
+	exit ;;
 e2k:Linux:*:*)
-	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
-	;;
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+	exit ;;
 frv:Linux:*:*)
-	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
-	;;
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+	exit ;;
 hexagon:Linux:*:*)
-	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
-	;;
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+	exit ;;
 i*86:Linux:*:*)
-	GUESS=$UNAME_MACHINE-pc-linux-$LIBC
-	;;
+	echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
+	exit ;;
 ia64:Linux:*:*)
-	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
-	;;
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+	exit ;;
 k1om:Linux:*:*)
-	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
-	;;
- loongarch32:Linux:*:* | loongarch64:Linux:*:* | loongarchx32:Linux:*:*)
-	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
-	;;
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+	exit ;;
 m32r*:Linux:*:*)
-	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
-	;;
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+	exit ;;
 m68*:Linux:*:*)
-	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
-	;;
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+	exit ;;
 mips:Linux:*:* | mips64:Linux:*:*)
-	set_cc_for_build
-	IS_GLIBC=0
-	test x"${LIBC}" = xgnu && IS_GLIBC=1
+	eval "$set_cc_for_build"
 	sed 's/^	//' << EOF > "$dummy.c"
 	#undef CPU
-	#undef mips
-	#undef mipsel
-	#undef mips64
-	#undef mips64el
-	#if ${IS_GLIBC} && defined(_ABI64)
-	LIBCABI=gnuabi64
-	#else
-	#if ${IS_GLIBC} && defined(_ABIN32)
-	LIBCABI=gnuabin32
-	#else
-	LIBCABI=${LIBC}
-	#endif
-	#endif
-
-	#if ${IS_GLIBC} && defined(__mips64) && defined(__mips_isa_rev) && __mips_isa_rev>=6
-	CPU=mipsisa64r6
-	#else
-	#if ${IS_GLIBC} && !defined(__mips64) && defined(__mips_isa_rev) && __mips_isa_rev>=6
-	CPU=mipsisa32r6
-	#else
-	#if defined(__mips64)
-	CPU=mips64
-	#else
-	CPU=mips
-	#endif
-	#endif
-	#endif
-
+	#undef ${UNAME_MACHINE}
+	#undef ${UNAME_MACHINE}el
 	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	MIPS_ENDIAN=el
+	CPU=${UNAME_MACHINE}el
 	#else
 	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	MIPS_ENDIAN=
+	CPU=${UNAME_MACHINE}
 	#else
-	MIPS_ENDIAN=
+	CPU=
 	#endif
 	#endif
 EOF
-	cc_set_vars=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU\|^MIPS_ENDIAN\|^LIBCABI'`
-	eval "$cc_set_vars"
-	test "x$CPU" != x && { echo "$CPU${MIPS_ENDIAN}-unknown-linux-$LIBCABI"; exit; }
+	eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU'`"
+	test "x$CPU" != x && { echo "$CPU-unknown-linux-$LIBC"; exit; }
 	;;
 mips64el:Linux:*:*)
-	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
-	;;
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+	exit ;;
 openrisc*:Linux:*:*)
-	GUESS=or1k-unknown-linux-$LIBC
-	;;
+	echo or1k-unknown-linux-"$LIBC"
+	exit ;;
 or32:Linux:*:* | or1k*:Linux:*:*)
-	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
-	;;
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+	exit ;;
 padre:Linux:*:*)
-	GUESS=sparc-unknown-linux-$LIBC
-	;;
+	echo sparc-unknown-linux-"$LIBC"
+	exit ;;
 parisc64:Linux:*:* | hppa64:Linux:*:*)
-	GUESS=hppa64-unknown-linux-$LIBC
-	;;
+	echo hppa64-unknown-linux-"$LIBC"
+	exit ;;
 parisc:Linux:*:* | hppa:Linux:*:*)
 	# Look for CPU level
 	case `grep '^cpu^a-z*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-	 PA7*) GUESS=hppa1.1-unknown-linux-$LIBC ;;
-	 PA8*) GUESS=hppa2.0-unknown-linux-$LIBC ;;
-	 *) GUESS=hppa-unknown-linux-$LIBC ;;
+	 PA7*) echo hppa1.1-unknown-linux-"$LIBC" ;;
+	 PA8*) echo hppa2.0-unknown-linux-"$LIBC" ;;
+	 *) echo hppa-unknown-linux-"$LIBC" ;;
 	esac
-	;;
+	exit ;;
 ppc64:Linux:*:*)
-	GUESS=powerpc64-unknown-linux-$LIBC
-	;;
+	echo powerpc64-unknown-linux-"$LIBC"
+	exit ;;
 ppc:Linux:*:*)
-	GUESS=powerpc-unknown-linux-$LIBC
-	;;
+	echo powerpc-unknown-linux-"$LIBC"
+	exit ;;
 ppc64le:Linux:*:*)
-	GUESS=powerpc64le-unknown-linux-$LIBC
-	;;
+	echo powerpc64le-unknown-linux-"$LIBC"
+	exit ;;
 ppcle:Linux:*:*)
-	GUESS=powerpcle-unknown-linux-$LIBC
-	;;
- riscv32:Linux:*:* | riscv32be:Linux:*:* | riscv64:Linux:*:* | riscv64be:Linux:*:*)
-	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
-	;;
+	echo powerpcle-unknown-linux-"$LIBC"
+	exit ;;
+ riscv32:Linux:*:* | riscv64:Linux:*:*)
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+	exit ;;
 s390:Linux:*:* | s390x:Linux:*:*)
-	GUESS=$UNAME_MACHINE-ibm-linux-$LIBC
-	;;
+	echo "$UNAME_MACHINE"-ibm-linux-"$LIBC"
+	exit ;;
 sh64*:Linux:*:*)
-	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
-	;;
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+	exit ;;
 sh*:Linux:*:*)
-	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
-	;;
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+	exit ;;
 sparc:Linux:*:* | sparc64:Linux:*:*)
-	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
-	;;
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+	exit ;;
 tile*:Linux:*:*)
-	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
-	;;
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+	exit ;;
 vax:Linux:*:*)
-	GUESS=$UNAME_MACHINE-dec-linux-$LIBC
-	;;
+	echo "$UNAME_MACHINE"-dec-linux-"$LIBC"
+	exit ;;
 x86_64:Linux:*:*)
-	set_cc_for_build
-	LIBCABI=$LIBC
-	if test "$CC_FOR_BUILD" != no_compiler_found; then
-	 if (echo '#ifdef __ILP32__'; echo IS_X32; echo '#endif') | \
-		(CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
-		grep IS_X32 >/dev/null
-	 then
-		LIBCABI=${LIBC}x32
-	 fi
-	fi
-	GUESS=$UNAME_MACHINE-pc-linux-$LIBCABI
-	;;
+	echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
+	exit ;;
 xtensa*:Linux:*:*)
-	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
-	;;
+	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+	exit ;;
 i*86:DYNIX/ptx:4*:*)
 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
 	# earlier versions are messed up and put the nodename in both
 	# sysname and nodename.
-	GUESS=i386-sequent-sysv4
-	;;
+	echo i386-sequent-sysv4
+	exit ;;
 i*86:UNIX_SV:4.2MP:2.*)
 	# Unixware is an offshoot of SVR4, but it has its own version
 	# number series starting with 2...
 	# I am not positive that other SVR4 systems won't match this,
 	# I just have to hope. -- rms.
 	# Use sysv4.2uw... so that sysv4* matches it.
-	GUESS=$UNAME_MACHINE-pc-sysv4.2uw$UNAME_VERSION
-	;;
+	echo "$UNAME_MACHINE"-pc-sysv4.2uw"$UNAME_VERSION"
+	exit ;;
 i*86:OS/2:*:*)
 	# If we were able to find `uname', then EMX Unix compatibility
 	# is probably installed.
-	GUESS=$UNAME_MACHINE-pc-os2-emx
-	;;
+	echo "$UNAME_MACHINE"-pc-os2-emx
+	exit ;;
 i*86:XTS-300:*:STOP)
-	GUESS=$UNAME_MACHINE-unknown-stop
-	;;
+	echo "$UNAME_MACHINE"-unknown-stop
+	exit ;;
 i*86:atheos:*:*)
-	GUESS=$UNAME_MACHINE-unknown-atheos
-	;;
+	echo "$UNAME_MACHINE"-unknown-atheos
+	exit ;;
 i*86:syllable:*:*)
-	GUESS=$UNAME_MACHINE-pc-syllable
-	;;
+	echo "$UNAME_MACHINE"-pc-syllable
+	exit ;;
 i*86:LynxOS:2.*:* | i*86:LynxOS:3.01*:* | i*86:LynxOS:4.02*:*)
-	GUESS=i386-unknown-lynxos$UNAME_RELEASE
-	;;
+	echo i386-unknown-lynxos"$UNAME_RELEASE"
+	exit ;;
 i*86:*DOS:*:*)
-	GUESS=$UNAME_MACHINE-pc-msdosdjgpp
-	;;
+	echo "$UNAME_MACHINE"-pc-msdosdjgpp
+	exit ;;
 i*86:*:4.*:*)
 	UNAME_REL=`echo "$UNAME_RELEASE" | sed 's/\/MP$//'`
 	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
-		GUESS=$UNAME_MACHINE-univel-sysv$UNAME_REL
+		echo "$UNAME_MACHINE"-univel-sysv"$UNAME_REL"
 	else
-		GUESS=$UNAME_MACHINE-pc-sysv$UNAME_REL
+		echo "$UNAME_MACHINE"-pc-sysv"$UNAME_REL"
 	fi
-	;;
+	exit ;;
 i*86:*:5:678*)
 	# UnixWare 7.x, OpenUNIX and OpenServer 6.
 	case `/bin/uname -X | grep "^Machine"` in
@@ -1211,12 +1100,12 @@
 	 *Pentium)	 UNAME_MACHINE=i586 ;;
 	 *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
 	esac
-	GUESS=$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
-	;;
+	echo "$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}{$UNAME_VERSION}"
+	exit ;;
 i*86:*:3.2:*)
 	if test -f /usr/options/cb.name; then
 		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
-		GUESS=$UNAME_MACHINE-pc-isc$UNAME_REL
+		echo "$UNAME_MACHINE"-pc-isc"$UNAME_REL"
 	elif /bin/uname -X 2>/dev/null >/dev/null ; then
 		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
 		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
@@ -1226,11 +1115,11 @@
 			&& UNAME_MACHINE=i686
 		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
 			&& UNAME_MACHINE=i686
-		GUESS=$UNAME_MACHINE-pc-sco$UNAME_REL
+		echo "$UNAME_MACHINE"-pc-sco"$UNAME_REL"
 	else
-		GUESS=$UNAME_MACHINE-pc-sysv32
+		echo "$UNAME_MACHINE"-pc-sysv32
 	fi
-	;;
+	exit ;;
 pc:*:*:*)
 	# Left here for compatibility:
 	# uname -m prints for DJGPP always 'pc', but it prints nothing about
@@ -1238,31 +1127,31 @@
 	# Note: whatever this is, it MUST be the same as what config.sub
 	# prints for the "djgpp" host, or else GDB configure will decide that
 	# this is a cross-build.
-	GUESS=i586-pc-msdosdjgpp
-	;;
+	echo i586-pc-msdosdjgpp
+	exit ;;
 Intel:Mach:3*:*)
-	GUESS=i386-pc-mach3
-	;;
+	echo i386-pc-mach3
+	exit ;;
 paragon:*:*:*)
-	GUESS=i860-intel-osf1
-	;;
+	echo i860-intel-osf1
+	exit ;;
 i860:*:4.*:*) # i860-SVR4
 	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
-	 GUESS=i860-stardent-sysv$UNAME_RELEASE # Stardent Vistra i860-SVR4
+	 echo i860-stardent-sysv"$UNAME_RELEASE" # Stardent Vistra i860-SVR4
 	else # Add other i860-SVR4 vendors below as they are discovered.
-	 GUESS=i860-unknown-sysv$UNAME_RELEASE # Unknown i860-SVR4
+	 echo i860-unknown-sysv"$UNAME_RELEASE" # Unknown i860-SVR4
 	fi
-	;;
+	exit ;;
 mini*:CTIX:SYS*5:*)
 	# "miniframe"
-	GUESS=m68010-convergent-sysv
-	;;
+	echo m68010-convergent-sysv
+	exit ;;
 mc68k:UNIX:SYSTEM5:3.51m)
-	GUESS=m68k-convergent-sysv
-	;;
+	echo m68k-convergent-sysv
+	exit ;;
 M680?0:D-NIX:5.3:*)
-	GUESS=m68k-diab-dnix
-	;;
+	echo m68k-diab-dnix
+	exit ;;
 M68*:*:R3V5678*:*)
 	test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
 3345??:*:4.0:3.0 | 334??A:*:4.0:3.0 | 334??,*:*:4.0:3.0 | 334??/*:*: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)
@@ -1287,401 +1176,249 @@
 	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
 	 && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;;
 m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
-	GUESS=m68k-unknown-lynxos$UNAME_RELEASE
-	;;
+	echo m68k-unknown-lynxos"$UNAME_RELEASE"
+	exit ;;
 mc68030:UNIX_System_V:4.*:*)
-	GUESS=m68k-atari-sysv4
-	;;
+	echo m68k-atari-sysv4
+	exit ;;
 TSUNAMI:LynxOS:2.*:*)
-	GUESS=sparc-unknown-lynxos$UNAME_RELEASE
-	;;
+	echo sparc-unknown-lynxos"$UNAME_RELEASE"
+	exit ;;
 rs6000:LynxOS:2.*:*)
-	GUESS=rs6000-unknown-lynxos$UNAME_RELEASE
-	;;
+	echo rs6000-unknown-lynxos"$UNAME_RELEASE"
+	exit ;;
 PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.01*:* | PowerPC:LynxOS:4.02*:*)
-	GUESS=powerpc-unknown-lynxos$UNAME_RELEASE
-	;;
+	echo powerpc-unknown-lynxos"$UNAME_RELEASE"
+	exit ;;
 SMBES:UNIX_SV:*:*)
-	GUESS=mips-dde-sysv$UNAME_RELEASE
-	;;
+	echo mips-dde-sysv"$UNAME_RELEASE"
+	exit ;;
 RM*:ReliantUNIX-*:*:*)
-	GUESS=mips-sni-sysv4
-	;;
+	echo mips-sni-sysv4
+	exit ;;
 RM*:SINIX-*:*:*)
-	GUESS=mips-sni-sysv4
-	;;
+	echo mips-sni-sysv4
+	exit ;;
 *:SINIX-*:*:*)
 	if uname -p 2>/dev/null >/dev/null ; then
 		UNAME_MACHINE=`(uname -p) 2>/dev/null`
-		GUESS=$UNAME_MACHINE-sni-sysv4
+		echo "$UNAME_MACHINE"-sni-sysv4
 	else
-		GUESS=ns32k-sni-sysv
+		echo ns32k-sni-sysv
 	fi
-	;;
+	exit ;;
 PENTIUM:*:4.0*:*)	# Unisys `ClearPath HMP IX 4000' SVR4/MP effort
 			# says <Richard.M.Bartel@ccMail.Census.GOV>
-	GUESS=i586-unisys-sysv4
-	;;
+	echo i586-unisys-sysv4
+	exit ;;
 *:UNIX_System_V:4*:FTX*)
 	# From Gerald Hewes <hewes@openmarket.com>.
 	# How about differentiating between stratus architectures? -djm
-	GUESS=hppa1.1-stratus-sysv4
-	;;
+	echo hppa1.1-stratus-sysv4
+	exit ;;
 *:*:*:FTX*)
 	# From seanf@swdc.stratus.com.
-	GUESS=i860-stratus-sysv4
-	;;
+	echo i860-stratus-sysv4
+	exit ;;
 i*86:VOS:*:*)
 	# From Paul.Green@stratus.com.
-	GUESS=$UNAME_MACHINE-stratus-vos
-	;;
+	echo "$UNAME_MACHINE"-stratus-vos
+	exit ;;
 *:VOS:*:*)
 	# From Paul.Green@stratus.com.
-	GUESS=hppa1.1-stratus-vos
-	;;
+	echo hppa1.1-stratus-vos
+	exit ;;
 mc68*:A/UX:*:*)
-	GUESS=m68k-apple-aux$UNAME_RELEASE
-	;;
+	echo m68k-apple-aux"$UNAME_RELEASE"
+	exit ;;
 news*:NEWS-OS:6*:*)
-	GUESS=mips-sony-newsos6
-	;;
+	echo mips-sony-newsos6
+	exit ;;
 R34000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
-	if test -d /usr/nec; then
-		GUESS=mips-nec-sysv$UNAME_RELEASE
+	if -d /usr/nec ; then
+		echo mips-nec-sysv"$UNAME_RELEASE"
 	else
-		GUESS=mips-unknown-sysv$UNAME_RELEASE
+		echo mips-unknown-sysv"$UNAME_RELEASE"
 	fi
-	;;
+	exit ;;
 BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
-	GUESS=powerpc-be-beos
-	;;
+	echo powerpc-be-beos
+	exit ;;
 BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
-	GUESS=powerpc-apple-beos
-	;;
+	echo powerpc-apple-beos
+	exit ;;
 BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
-	GUESS=i586-pc-beos
-	;;
+	echo i586-pc-beos
+	exit ;;
 BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
-	GUESS=i586-pc-haiku
-	;;
+	echo i586-pc-haiku
+	exit ;;
 x86_64:Haiku:*:*)
-	GUESS=x86_64-unknown-haiku
-	;;
+	echo x86_64-unknown-haiku
+	exit ;;
 SX-4:SUPER-UX:*:*)
-	GUESS=sx4-nec-superux$UNAME_RELEASE
-	;;
+	echo sx4-nec-superux"$UNAME_RELEASE"
+	exit ;;
 SX-5:SUPER-UX:*:*)
-	GUESS=sx5-nec-superux$UNAME_RELEASE
-	;;
+	echo sx5-nec-superux"$UNAME_RELEASE"
+	exit ;;
 SX-6:SUPER-UX:*:*)
-	GUESS=sx6-nec-superux$UNAME_RELEASE
-	;;
+	echo sx6-nec-superux"$UNAME_RELEASE"
+	exit ;;
 SX-7:SUPER-UX:*:*)
-	GUESS=sx7-nec-superux$UNAME_RELEASE
-	;;
+	echo sx7-nec-superux"$UNAME_RELEASE"
+	exit ;;
 SX-8:SUPER-UX:*:*)
-	GUESS=sx8-nec-superux$UNAME_RELEASE
-	;;
+	echo sx8-nec-superux"$UNAME_RELEASE"
+	exit ;;
 SX-8R:SUPER-UX:*:*)
-	GUESS=sx8r-nec-superux$UNAME_RELEASE
-	;;
+	echo sx8r-nec-superux"$UNAME_RELEASE"
+	exit ;;
 SX-ACE:SUPER-UX:*:*)
-	GUESS=sxace-nec-superux$UNAME_RELEASE
-	;;
+	echo sxace-nec-superux"$UNAME_RELEASE"
+	exit ;;
 Power*:Rhapsody:*:*)
-	GUESS=powerpc-apple-rhapsody$UNAME_RELEASE
-	;;
+	echo powerpc-apple-rhapsody"$UNAME_RELEASE"
+	exit ;;
 *:Rhapsody:*:*)
-	GUESS=$UNAME_MACHINE-apple-rhapsody$UNAME_RELEASE
-	;;
- arm64:Darwin:*:*)
-	GUESS=aarch64-apple-darwin$UNAME_RELEASE
-	;;
+	echo "$UNAME_MACHINE"-apple-rhapsody"$UNAME_RELEASE"
+	exit ;;
 *:Darwin:*:*)
-	UNAME_PROCESSOR=`uname -p`
-	case $UNAME_PROCESSOR in
-	 unknown) UNAME_PROCESSOR=powerpc ;;
-	esac
-	if command -v xcode-select > /dev/null 2> /dev/null && \
-		! xcode-select --print-path > /dev/null 2> /dev/null ; then
-	 # Avoid executing cc if there is no toolchain installed as
-	 # cc will be a stub that puts up a graphical alert
-	 # prompting the user to install developer tools.
-	 CC_FOR_BUILD=no_compiler_found
-	else
-	 set_cc_for_build
+	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
+	eval "$set_cc_for_build"
+	if test "$UNAME_PROCESSOR" = unknown ; then
+	 UNAME_PROCESSOR=powerpc
 	fi
-	if test "$CC_FOR_BUILD" != no_compiler_found; then
-	 if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
-		 (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
-		 grep IS_64BIT_ARCH >/dev/null
-	 then
-		case $UNAME_PROCESSOR in
-		 i386) UNAME_PROCESSOR=x86_64 ;;
-		 powerpc) UNAME_PROCESSOR=powerpc64 ;;
-		esac
-	 fi
-	 # On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc
-	 if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') | \
-		 (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
-		 grep IS_PPC >/dev/null
-	 then
-		UNAME_PROCESSOR=powerpc
+	if test "`echo "$UNAME_RELEASE" | sed -e 's/\..*//'`" -le 10 ; then
+	 if "$CC_FOR_BUILD" != no_compiler_found ; then
+		if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+		 (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
+		 grep IS_64BIT_ARCH >/dev/null
+		then
+		 case $UNAME_PROCESSOR in
+			i386) UNAME_PROCESSOR=x86_64 ;;
+			powerpc) UNAME_PROCESSOR=powerpc64 ;;
+		 esac
+		fi
+		# On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc
+		if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') | \
+		 (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
+		 grep IS_PPC >/dev/null
+		then
+		 UNAME_PROCESSOR=powerpc
+		fi
 	 fi
 	elif test "$UNAME_PROCESSOR" = i386 ; then
-	 # uname -m returns i386 or x86_64
-	 UNAME_PROCESSOR=$UNAME_MACHINE
+	 # Avoid executing cc on OS X 10.9, as it ships with a stub
+	 # that puts up a graphical alert prompting to install
+	 # developer tools. Any system running Mac OS X 10.7 or
+	 # later (Darwin 11 and later) is required to have a 64-bit
+	 # processor. This is not true of the ARM version of Darwin
+	 # that Apple uses in portable devices.
+	 UNAME_PROCESSOR=x86_64
 	fi
-	GUESS=$UNAME_PROCESSOR-apple-darwin$UNAME_RELEASE
-	;;
+	echo "$UNAME_PROCESSOR"-apple-darwin"$UNAME_RELEASE"
+	exit ;;
 *:procnto*:*:* | *:QNX:0123456789*:*)
 	UNAME_PROCESSOR=`uname -p`
 	if test "$UNAME_PROCESSOR" = x86; then
 		UNAME_PROCESSOR=i386
 		UNAME_MACHINE=pc
 	fi
-	GUESS=$UNAME_PROCESSOR-$UNAME_MACHINE-nto-qnx$UNAME_RELEASE
-	;;
+	echo "$UNAME_PROCESSOR"-"$UNAME_MACHINE"-nto-qnx"$UNAME_RELEASE"
+	exit ;;
 *:QNX:*:4*)
-	GUESS=i386-pc-qnx
-	;;
+	echo i386-pc-qnx
+	exit ;;
 NEO-*:NONSTOP_KERNEL:*:*)
-	GUESS=neo-tandem-nsk$UNAME_RELEASE
-	;;
+	echo neo-tandem-nsk"$UNAME_RELEASE"
+	exit ;;
 NSE-*:NONSTOP_KERNEL:*:*)
-	GUESS=nse-tandem-nsk$UNAME_RELEASE
-	;;
+	echo nse-tandem-nsk"$UNAME_RELEASE"
+	exit ;;
 NSR-*:NONSTOP_KERNEL:*:*)
-	GUESS=nsr-tandem-nsk$UNAME_RELEASE
-	;;
+	echo nsr-tandem-nsk"$UNAME_RELEASE"
+	exit ;;
 NSV-*:NONSTOP_KERNEL:*:*)
-	GUESS=nsv-tandem-nsk$UNAME_RELEASE
-	;;
+	echo nsv-tandem-nsk"$UNAME_RELEASE"
+	exit ;;
 NSX-*:NONSTOP_KERNEL:*:*)
-	GUESS=nsx-tandem-nsk$UNAME_RELEASE
-	;;
+	echo nsx-tandem-nsk"$UNAME_RELEASE"
+	exit ;;
 *:NonStop-UX:*:*)
-	GUESS=mips-compaq-nonstopux
-	;;
+	echo mips-compaq-nonstopux
+	exit ;;
 BS2000:POSIX*:*:*)
-	GUESS=bs2000-siemens-sysv
-	;;
+	echo bs2000-siemens-sysv
+	exit ;;
 DS/*:UNIX_System_V:*:*)
-	GUESS=$UNAME_MACHINE-$UNAME_SYSTEM-$UNAME_RELEASE
-	;;
+	echo "$UNAME_MACHINE"-"$UNAME_SYSTEM"-"$UNAME_RELEASE"
+	exit ;;
 *:Plan9:*:*)
 	# "uname -m" is not consistent, so use $cputype instead. 386
 	# is converted to i386 for consistency with other x86
 	# operating systems.
-	if test "${cputype-}" = 386; then
+	if test "$cputype" = 386; then
 	 UNAME_MACHINE=i386
-	elif test "x${cputype-}" != x; then
-	 UNAME_MACHINE=$cputype
+	else
+	 UNAME_MACHINE="$cputype"
 	fi
-	GUESS=$UNAME_MACHINE-unknown-plan9
-	;;
+	echo "$UNAME_MACHINE"-unknown-plan9
+	exit ;;
 *:TOPS-10:*:*)
-	GUESS=pdp10-unknown-tops10
-	;;
+	echo pdp10-unknown-tops10
+	exit ;;
 *:TENEX:*:*)
-	GUESS=pdp10-unknown-tenex
-	;;
+	echo pdp10-unknown-tenex
+	exit ;;
 KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
-	GUESS=pdp10-dec-tops20
-	;;
+	echo pdp10-dec-tops20
+	exit ;;
 XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
-	GUESS=pdp10-xkl-tops20
-	;;
+	echo pdp10-xkl-tops20
+	exit ;;
 *:TOPS-20:*:*)
-	GUESS=pdp10-unknown-tops20
-	;;
+	echo pdp10-unknown-tops20
+	exit ;;
 *:ITS:*:*)
-	GUESS=pdp10-unknown-its
-	;;
+	echo pdp10-unknown-its
+	exit ;;
 SEI:*:*:SEIUX)
-	GUESS=mips-sei-seiux$UNAME_RELEASE
-	;;
+	echo mips-sei-seiux"$UNAME_RELEASE"
+	exit ;;
 *:DragonFly:*:*)
-	DRAGONFLY_REL=`echo "$UNAME_RELEASE" | sed -e 's/-(.*//'`
-	GUESS=$UNAME_MACHINE-unknown-dragonfly$DRAGONFLY_REL
-	;;
+	echo "$UNAME_MACHINE"-unknown-dragonfly"`echo "$UNAME_RELEASE"|sed -e 's/-(.*//'`"
+	exit ;;
 *:*VMS:*:*)
 	UNAME_MACHINE=`(uname -p) 2>/dev/null`
-	case $UNAME_MACHINE in
-	 A*) GUESS=alpha-dec-vms ;;
-	 I*) GUESS=ia64-dec-vms ;;
-	 V*) GUESS=vax-dec-vms ;;
+	case "$UNAME_MACHINE" in
+	 A*) echo alpha-dec-vms ; exit ;;
+	 I*) echo ia64-dec-vms ; exit ;;
+	 V*) echo vax-dec-vms ; exit ;;
 	esac ;;
 *:XENIX:*:SysV)
-	GUESS=i386-pc-xenix
-	;;
+	echo i386-pc-xenix
+	exit ;;
 i*86:skyos:*:*)
-	SKYOS_REL=`echo "$UNAME_RELEASE" | sed -e 's/ .*$//'`
-	GUESS=$UNAME_MACHINE-pc-skyos$SKYOS_REL
-	;;
+	echo "$UNAME_MACHINE"-pc-skyos"`echo "$UNAME_RELEASE" | sed -e 's/ .*$//'`"
+	exit ;;
 i*86:rdos:*:*)
-	GUESS=$UNAME_MACHINE-pc-rdos
-	;;
- *:AROS:*:*)
-	GUESS=$UNAME_MACHINE-unknown-aros
-	;;
+	echo "$UNAME_MACHINE"-pc-rdos
+	exit ;;
+ i*86:AROS:*:*)
+	echo "$UNAME_MACHINE"-pc-aros
+	exit ;;
 x86_64:VMkernel:*:*)
-	GUESS=$UNAME_MACHINE-unknown-esx
-	;;
+	echo "$UNAME_MACHINE"-unknown-esx
+	exit ;;
 amd64:Isilon\ OneFS:*:*)
-	GUESS=x86_64-unknown-onefs
-	;;
- *:Unleashed:*:*)
-	GUESS=$UNAME_MACHINE-unknown-unleashed$UNAME_RELEASE
-	;;
+	echo x86_64-unknown-onefs
+	exit ;;
 esac
 
-# Do we have a guess based on uname results?
-if test "x$GUESS" != x; then
- echo "$GUESS"
- exit
-fi
-
-# No uname command or uname output not recognized.
-set_cc_for_build
-cat > "$dummy.c" <<EOF
-#ifdef _SEQUENT_
-#include <sys/types.h>
-#include <sys/utsname.h>
-#endif
-#if defined(ultrix) || defined(_ultrix) || defined(__ultrix) || defined(__ultrix__)
-#if defined (vax) || defined (__vax) || defined (__vax__) || defined(mips) || defined(__mips) || defined(__mips__) || defined(MIPS) || defined(__MIPS__)
-#include <signal.h>
-#if defined(_SIZE_T_) || defined(SIGLOST)
-#include <sys/utsname.h>
-#endif
-#endif
-#endif
-main ()
-{
-#if defined (sony)
-#if defined (MIPSEB)
- /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed,
- I don't know.... */
- printf ("mips-sony-bsd\n"); exit (0);
-#else
-#include <sys/param.h>
- printf ("m68k-sony-newsos%s\n",
-#ifdef NEWSOS4
- "4"
-#else
- ""
-#endif
- ); exit (0);
-#endif
-#endif
-
-#if defined (NeXT)
-#if !defined (__ARCHITECTURE__)
-#define __ARCHITECTURE__ "m68k"
-#endif
- int version;
- version=`(hostinfo | sed -n 's/.*NeXT Mach $0-9*$.*/\1/p') 2>/dev/null`;
- if (version < 4)
- printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
- else
- printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
- exit (0);
-#endif
-
-#if defined (MULTIMAX) || defined (n16)
-#if defined (UMAXV)
- printf ("ns32k-encore-sysv\n"); exit (0);
-#else
-#if defined (CMU)
- printf ("ns32k-encore-mach\n"); exit (0);
-#else
- printf ("ns32k-encore-bsd\n"); exit (0);
-#endif
-#endif
-#endif
-
-#if defined (__386BSD__)
- printf ("i386-pc-bsd\n"); exit (0);
-#endif
-
-#if defined (sequent)
-#if defined (i386)
- printf ("i386-sequent-dynix\n"); exit (0);
-#endif
-#if defined (ns32000)
- printf ("ns32k-sequent-dynix\n"); exit (0);
-#endif
-#endif
-
-#if defined (_SEQUENT_)
- struct utsname un;
-
- uname(&un);
- if (strncmp(un.version, "V2", 2) == 0) {
- printf ("i386-sequent-ptx2\n"); exit (0);
- }
- if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
- printf ("i386-sequent-ptx1\n"); exit (0);
- }
- printf ("i386-sequent-ptx\n"); exit (0);
-#endif
-
-#if defined (vax)
-#if !defined (ultrix)
-#include <sys/param.h>
-#if defined (BSD)
-#if BSD == 43
- printf ("vax-dec-bsd4.3\n"); exit (0);
-#else
-#if BSD == 199006
- printf ("vax-dec-bsd4.3reno\n"); exit (0);
-#else
- printf ("vax-dec-bsd\n"); exit (0);
-#endif
-#endif
-#else
- printf ("vax-dec-bsd\n"); exit (0);
-#endif
-#else
-#if defined(_SIZE_T_) || defined(SIGLOST)
- struct utsname un;
- uname (&un);
- printf ("vax-dec-ultrix%s\n", un.release); exit (0);
-#else
- printf ("vax-dec-ultrix\n"); exit (0);
-#endif
-#endif
-#endif
-#if defined(ultrix) || defined(_ultrix) || defined(__ultrix) || defined(__ultrix__)
-#if defined(mips) || defined(__mips) || defined(__mips__) || defined(MIPS) || defined(__MIPS__)
-#if defined(_SIZE_T_) || defined(SIGLOST)
- struct utsname *un;
- uname (&un);
- printf ("mips-dec-ultrix%s\n", un.release); exit (0);
-#else
- printf ("mips-dec-ultrix\n"); exit (0);
-#endif
-#endif
-#endif
-
-#if defined (alliant) && defined (i860)
- printf ("i860-alliant-bsd\n"); exit (0);
-#endif
-
- exit (1);
-}
-EOF
-
-$CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null && SYSTEM_NAME=`"$dummy"` &&
-	{ echo "$SYSTEM_NAME"; exit; }
-
-# Apollos put the system type in the environment.
-test -d /usr/apollo && { echo "$ISP-apollo-$SYSTYPE"; exit; }
-
 echo "$0: unable to guess system type" >&2
 
-case $UNAME_MACHINE:$UNAME_SYSTEM in
+case "$UNAME_MACHINE:$UNAME_SYSTEM" in
 mips:Linux | mips64:Linux)
 	# If we got here on MIPS GNU/Linux, output extra information.
 	cat >&2 <<EOF
@@ -1698,17 +1435,9 @@
 operating system you are using. If your script is old, overwrite *all*
 copies of config.guess and config.sub with the latest versions from:
 
- https://git.savannah.gnu.org/cgit/config.git/plain/config.guess
+ https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
 and
- https://git.savannah.gnu.org/cgit/config.git/plain/config.sub
-EOF
-
-our_year=`echo $timestamp | sed 's,-.*,,'`
-thisyear=`date +%Y`
-# shellcheck disable=SC2003
-script_age=`expr "$thisyear" - "$our_year"`
-if test "$script_age" -lt 3 ; then
- cat >&2 <<EOF
+ https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
 
 If $0 has already been updated, send the following data and any
 information you think might be pertinent to config-patches@gnu.org to
@@ -1736,12 +1465,11 @@
 UNAME_SYSTEM = "$UNAME_SYSTEM"
 UNAME_VERSION = "$UNAME_VERSION"
 EOF
-fi
 
 exit 1
 
 # Local variables:
-# eval: (add-hook 'before-save-hook 'time-stamp)
+# eval: (add-hook 'write-file-functions 'time-stamp)
 # time-stamp-start: "timestamp='"
 # time-stamp-format: "%:y-%02m-%02d"
 # time-stamp-end: "'"

_service:tar_scm:libX11-1.8.1.tar.xz/config.sub -> _service:tar_scm:libX11-1.8.4.tar.xz/config.sub Changed

@@ -1,10 +1,8 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-# Copyright 1992-2021 Free Software Foundation, Inc.
+# Copyright 1992-2018 Free Software Foundation, Inc.
 
-# shellcheck disable=SC2006,SC2268 # see below for rationale
-
-timestamp='2021-08-14'
+timestamp='2018-02-28'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -35,7 +33,7 @@
 # Otherwise, we print the canonical config type on stdout and succeed.
 
 # You can get the latest version of this script from:
-# https://git.savannah.gnu.org/cgit/config.git/plain/config.sub
+# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
 
 # This file is supposed to be the same for all GNU packages
 # and recognize all the CPU types, system types and aliases
@@ -52,13 +50,6 @@
 #	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
 # It is wrong to echo any other type of specification.
 
-# The "shellcheck disable" line above the timestamp inhibits complaints
-# about features and limitations of the classic Bourne shell that were
-# superseded or lifted in POSIX. However, this script identifies a wide
-# variety of pre-POSIX systems that do not have POSIX shells at all, and
-# even some reasonably current systems (Solaris 10 as case-in-point) still
-# have a pre-POSIX /bin/sh.
-
 me=`echo "$0" | sed -e 's,.*/,,'`
 
 usage="\
@@ -76,7 +67,7 @@
 version="\
 GNU config.sub ($timestamp)
 
-Copyright 1992-2021 Free Software Foundation, Inc.
+Copyright 1992-2018 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions. There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -98,7 +89,7 @@
 - )	# Use stdin as input.
 break ;;
 -* )
- echo "$me: invalid option $1$help" >&2
+ echo "$me: invalid option $1$help"
 exit 1 ;;
 
 *local*)
@@ -119,1181 +110,1223 @@
 exit 1;;
 esac
 
-# Split fields of configuration type
-# shellcheck disable=SC2162
-saved_IFS=$IFS
-IFS="-" read field1 field2 field3 field4 <<EOF
-$1
-EOF
-IFS=$saved_IFS
+# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
+# Here we must recognize all the valid KERNEL-OS combinations.
+maybe_os=`echo "$1" | sed 's/^$.*$-$^-*-^-*$$/\2/'`
+case $maybe_os in
+ nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
+ linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
+ knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \
+ kopensolaris*-gnu* | cloudabi*-eabi* | \
+ storm-chaos* | os2-emx* | rtmk-nova*)
+ os=-$maybe_os
+ basic_machine=`echo "$1" | sed 's/^$.*$-$^-*-^-*$$/\1/'`
+ ;;
+ android-linux)
+ os=-linux-android
+ basic_machine=`echo "$1" | sed 's/^$.*$-$^-*-^-*$$/\1/'`-unknown
+ ;;
+ *)
+ basic_machine=`echo "$1" | sed 's/-^-*$//'`
+ if "$basic_machine" != "$1" 
+ then os=`echo "$1" | sed 's/.*-/-/'`
+ else os=; fi
+ ;;
+esac
 
-# Separate into logical components for further validation
-case $1 in
-	*-*-*-*-*)
-		echo Invalid configuration \`"$1"\': more than four components >&2
-		exit 1
+### Let's recognize common machines as not being operating systems so
+### that things like config.sub decstation-3100 work. We also
+### recognize some manufacturers as not being operating systems, so we
+### can provide default operating systems below.
+case $os in
+	-sun*os*)
+		# Prevent following clause from handling this invalid input.
 		;;
-	*-*-*-*)
-		basic_machine=$field1-$field2
-		basic_os=$field3-$field4
+	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
+	-att* | -7300* | -3300* | -delta* | -motorola* | -sun234* | \
+	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
+	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
+	-c123* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
+	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
+	-apple | -axis | -knuth | -cray | -microblaze*)
+		os=
+		basic_machine=$1
 		;;
-	*-*-*)
-		# Ambiguous whether COMPANY is present, or skipped and KERNEL-OS is two
-		# parts
-		maybe_os=$field2-$field3
-		case $maybe_os in
-			nto-qnx* | linux-* | uclinux-uclibc* \
-			| uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* \
-			| netbsd*-eabi* | kopensolaris*-gnu* | cloudabi*-eabi* \
-			| storm-chaos* | os2-emx* | rtmk-nova*)
-				basic_machine=$field1
-				basic_os=$maybe_os
-				;;
-			android-linux)
-				basic_machine=$field1-unknown
-				basic_os=linux-android
-				;;
-			*)
-				basic_machine=$field1-$field2
-				basic_os=$field3
-				;;
-		esac
+	-bluegene*)
+		os=-cnk
 		;;
-	*-*)
-		# A lone config we happen to match not fitting any pattern
-		case $field1-$field2 in
-			decstation-3100)
-				basic_machine=mips-dec
-				basic_os=
-				;;
-			*-*)
-				# Second component is usually, but not always the OS
-				case $field2 in
-					# Prevent following clause from handling this valid os
-					sun*os*)
-						basic_machine=$field1
-						basic_os=$field2
-						;;
-					zephyr*)
-						basic_machine=$field1-unknown
-						basic_os=$field2
-						;;
-					# Manufacturers
-					dec* | mips* | sequent* | encore* | pc533* | sgi* | sony* \
-					| att* | 7300* | 3300* | delta* | motorola* | sun234* \
-					| unicom* | ibm* | next | hp | isi* | apollo | altos* \
-					| convergent* | ncr* | news | 32* | 3600* | 3100* \
-					| hitachi* | c123* | convex* | sun | crds | omron* | dg \
-					| ultra | tti* | harris | dolphin | highlevel | gould \
-					| cbm | ns | masscomp | apple | axis | knuth | cray \
-					| microblaze* | sim | cisco \
-					| oki | wec | wrs | winbond)
-						basic_machine=$field1-$field2
-						basic_os=
-						;;
-					*)
-						basic_machine=$field1
-						basic_os=$field2
-						;;
-				esac
-			;;
-		esac
+	-sim | -cisco | -oki | -wec | -winbond)
+		os=
+		basic_machine=$1
 		;;
-	*)
-		# Convert single-component short-hands not valid as part of
-		# multi-component configurations.
-		case $field1 in
-			386bsd)
-				basic_machine=i386-pc
-				basic_os=bsd
-				;;
-			a29khif)
-				basic_machine=a29k-amd
-				basic_os=udi
-				;;
-			adobe68k)
-				basic_machine=m68010-adobe
-				basic_os=scout
-				;;
-			alliant)
-				basic_machine=fx80-alliant
-				basic_os=
-				;;
-			altos | altos3068)
-				basic_machine=m68k-altos
-				basic_os=
-				;;
-			am29k)
-				basic_machine=a29k-none
-				basic_os=bsd
-				;;
-			amdahl)
-				basic_machine=580-amdahl
-				basic_os=sysv
-				;;
-			amiga)
-				basic_machine=m68k-unknown
-				basic_os=
-				;;
-			amigaos | amigados)
-				basic_machine=m68k-unknown
-				basic_os=amigaos
-				;;
-			amigaunix | amix)
-				basic_machine=m68k-unknown
-				basic_os=sysv4
-				;;
-			apollo68)
-				basic_machine=m68k-apollo
-				basic_os=sysv
-				;;
-			apollo68bsd)
-				basic_machine=m68k-apollo
-				basic_os=bsd
-				;;
-			aros)
-				basic_machine=i386-pc
-				basic_os=aros
-				;;
-			aux)
-				basic_machine=m68k-apple
-				basic_os=aux
-				;;
-			balance)
-				basic_machine=ns32k-sequent
-				basic_os=dynix
-				;;
-			blackfin)
-				basic_machine=bfin-unknown
-				basic_os=linux
-				;;
-			cegcc)
-				basic_machine=arm-unknown
-				basic_os=cegcc
-				;;
-			convex-c1)
-				basic_machine=c1-convex
-				basic_os=bsd
-				;;
-			convex-c2)
-				basic_machine=c2-convex
-				basic_os=bsd
-				;;
-			convex-c32)
-				basic_machine=c32-convex
-				basic_os=bsd
-				;;
-			convex-c34)
-				basic_machine=c34-convex
-				basic_os=bsd
-				;;
-			convex-c38)
-				basic_machine=c38-convex
-				basic_os=bsd
-				;;
-			cray)
-				basic_machine=j90-cray
-				basic_os=unicos
-				;;
-			crds | unos)
-				basic_machine=m68k-crds
-				basic_os=
-				;;
-			da30)
-				basic_machine=m68k-da30
-				basic_os=
-				;;
-			decstation | pmax | pmin | dec3100 | decstatn)
-				basic_machine=mips-dec
-				basic_os=
-				;;
-			delta88)
-				basic_machine=m88k-motorola
-				basic_os=sysv3
-				;;
-			dicos)
-				basic_machine=i686-pc
-				basic_os=dicos
-				;;
-			djgpp)
-				basic_machine=i586-pc
-				basic_os=msdosdjgpp
-				;;
-			ebmon29k)
-				basic_machine=a29k-amd
-				basic_os=ebmon
-				;;
-			es1800 | OSE68k | ose68k | ose | OSE)
-				basic_machine=m68k-ericsson
-				basic_os=ose
-				;;
-			gmicro)
-				basic_machine=tron-gmicro
-				basic_os=sysv
-				;;
-			go32)
-				basic_machine=i386-pc
-				basic_os=go32
-				;;
-			h8300hms)
-				basic_machine=h8300-hitachi
-				basic_os=hms
-				;;
-			h8300xray)
-				basic_machine=h8300-hitachi
-				basic_os=xray
-				;;
-			h8500hms)
-				basic_machine=h8500-hitachi
-				basic_os=hms
-				;;
-			harris)
-				basic_machine=m88k-harris
-				basic_os=sysv3
-				;;
-			hp300 | hp300hpux)
-				basic_machine=m68k-hp
-				basic_os=hpux
-				;;
-			hp300bsd)
-				basic_machine=m68k-hp
-				basic_os=bsd
-				;;
-			hppaosf)
-				basic_machine=hppa1.1-hp
-				basic_os=osf
-				;;
-			hppro)
-				basic_machine=hppa1.1-hp
-				basic_os=proelf
-				;;
-			i386mach)
-				basic_machine=i386-mach
-				basic_os=mach
-				;;
-			isi68 | isi)
-				basic_machine=m68k-isi
-				basic_os=sysv
-				;;
-			m68knommu)
-				basic_machine=m68k-unknown
-				basic_os=linux
-				;;
-			magnum | m3230)
-				basic_machine=mips-mips
-				basic_os=sysv
-				;;
-			merlin)
-				basic_machine=ns32k-utek
-				basic_os=sysv
-				;;
-			mingw64)
-				basic_machine=x86_64-pc
-				basic_os=mingw64
-				;;
-			mingw32)
-				basic_machine=i686-pc
-				basic_os=mingw32
-				;;
-			mingw32ce)
-				basic_machine=arm-unknown
-				basic_os=mingw32ce
-				;;
-			monitor)
-				basic_machine=m68k-rom68k
-				basic_os=coff
-				;;
-			morphos)
-				basic_machine=powerpc-unknown
-				basic_os=morphos
-				;;
-			moxiebox)
-				basic_machine=moxie-unknown
-				basic_os=moxiebox
-				;;
-			msdos)
-				basic_machine=i386-pc
-				basic_os=msdos
-				;;
-			msys)
-				basic_machine=i686-pc
-				basic_os=msys
-				;;
-			mvs)
-				basic_machine=i370-ibm
-				basic_os=mvs
-				;;
-			nacl)
-				basic_machine=le32-unknown
-				basic_os=nacl
-				;;
-			ncr3000)
-				basic_machine=i486-ncr
-				basic_os=sysv4
-				;;
-			netbsd386)
-				basic_machine=i386-pc
-				basic_os=netbsd
-				;;
-			netwinder)
-				basic_machine=armv4l-rebel
-				basic_os=linux
-				;;
-			news | news700 | news800 | news900)
-				basic_machine=m68k-sony
-				basic_os=newsos
-				;;
-			news1000)
-				basic_machine=m68030-sony
-				basic_os=newsos
-				;;
-			necv70)
-				basic_machine=v70-nec
-				basic_os=sysv
-				;;
-			nh3000)
-				basic_machine=m68k-harris
-				basic_os=cxux
-				;;
-			nh45000)
-				basic_machine=m88k-harris
-				basic_os=cxux
-				;;
-			nindy960)
-				basic_machine=i960-intel
-				basic_os=nindy
-				;;
-			mon960)
-				basic_machine=i960-intel
-				basic_os=mon960
-				;;
-			nonstopux)
-				basic_machine=mips-compaq
-				basic_os=nonstopux
-				;;
-			os400)
-				basic_machine=powerpc-ibm
-				basic_os=os400
-				;;
-			OSE68000 | ose68000)
-				basic_machine=m68000-ericsson
-				basic_os=ose
-				;;
-			os68k)
-				basic_machine=m68k-none
-				basic_os=os68k
-				;;
-			paragon)
-				basic_machine=i860-intel
-				basic_os=osf
-				;;
-			parisc)
-				basic_machine=hppa-unknown
-				basic_os=linux
-				;;
-			psp)
-				basic_machine=mipsallegrexel-sony
-				basic_os=psp
-				;;
-			pw32)
-				basic_machine=i586-unknown
-				basic_os=pw32
-				;;
-			rdos | rdos64)
-				basic_machine=x86_64-pc
-				basic_os=rdos
-				;;
-			rdos32)
-				basic_machine=i386-pc
-				basic_os=rdos
-				;;
-			rom68k)
-				basic_machine=m68k-rom68k
-				basic_os=coff
-				;;
-			sa29200)
-				basic_machine=a29k-amd
-				basic_os=udi
-				;;
-			sei)
-				basic_machine=mips-sei
-				basic_os=seiux
-				;;
-			sequent)
-				basic_machine=i386-sequent
-				basic_os=
-				;;
-			sps7)
-				basic_machine=m68k-bull
-				basic_os=sysv2
-				;;
-			st2000)
-				basic_machine=m68k-tandem
-				basic_os=
-				;;
-			stratus)
-				basic_machine=i860-stratus
-				basic_os=sysv4
-				;;
-			sun2)
-				basic_machine=m68000-sun
-				basic_os=
-				;;
-			sun2os3)
-				basic_machine=m68000-sun
-				basic_os=sunos3
-				;;
-			sun2os4)
-				basic_machine=m68000-sun
-				basic_os=sunos4
-				;;
-			sun3)
-				basic_machine=m68k-sun
-				basic_os=
-				;;
-			sun3os3)
-				basic_machine=m68k-sun
-				basic_os=sunos3
-				;;
-			sun3os4)
-				basic_machine=m68k-sun
-				basic_os=sunos4
-				;;
-			sun4)
-				basic_machine=sparc-sun
-				basic_os=
-				;;
-			sun4os3)
-				basic_machine=sparc-sun
-				basic_os=sunos3
-				;;
-			sun4os4)
-				basic_machine=sparc-sun
-				basic_os=sunos4
-				;;
-			sun4sol2)
-				basic_machine=sparc-sun
-				basic_os=solaris2
-				;;
-			sun386 | sun386i | roadrunner)
-				basic_machine=i386-sun
-				basic_os=
-				;;
-			sv1)
-				basic_machine=sv1-cray
-				basic_os=unicos
-				;;
-			symmetry)
-				basic_machine=i386-sequent
-				basic_os=dynix
-				;;
-			t3e)
-				basic_machine=alphaev5-cray
-				basic_os=unicos
-				;;
-			t90)
-				basic_machine=t90-cray
-				basic_os=unicos
-				;;
-			toad1)
-				basic_machine=pdp10-xkl
-				basic_os=tops20
-				;;
-			tpf)
-				basic_machine=s390x-ibm
-				basic_os=tpf
-				;;
-			udi29k)
-				basic_machine=a29k-amd
-				basic_os=udi
-				;;
-			ultra3)
-				basic_machine=a29k-nyu
-				basic_os=sym1
-				;;
-			v810 | necv810)
-				basic_machine=v810-nec
-				basic_os=none
-				;;
-			vaxv)
-				basic_machine=vax-dec
-				basic_os=sysv
-				;;
-			vms)
-				basic_machine=vax-dec
-				basic_os=vms
-				;;
-			vsta)
-				basic_machine=i386-pc
-				basic_os=vsta
-				;;
-			vxworks960)
-				basic_machine=i960-wrs
-				basic_os=vxworks
-				;;
-			vxworks68)
-				basic_machine=m68k-wrs
-				basic_os=vxworks
-				;;
-			vxworks29k)
-				basic_machine=a29k-wrs
-				basic_os=vxworks
-				;;
-			xbox)
-				basic_machine=i686-pc
-				basic_os=mingw32
-				;;
-			ymp)
-				basic_machine=ymp-cray
-				basic_os=unicos
-				;;
-			*)
-				basic_machine=$1
-				basic_os=
-				;;
-		esac
+	-scout)
+		;;
+	-wrs)
+		os=-vxworks
+		basic_machine=$1
+		;;
+	-chorusos*)
+		os=-chorusos
+		basic_machine=$1
+		;;
+	-chorusrdb)
+		os=-chorusrdb
+		basic_machine=$1
+		;;
+	-hiux*)
+		os=-hiuxwe2
+		;;
+	-sco6)
+		os=-sco5v6
+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco5)
+		os=-sco3.2v5
+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco4)
+		os=-sco3.2v4
+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco3.2.4-9*)
+		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco3.2v4-9*)
+		# Don't forget version if it is 3.2v4 or newer.
+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco5v6*)
+		# Don't forget version if it is 3.2v4 or newer.
+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco*)
+		os=-sco3.2v2
+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
+		;;
+	-udk*)
+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
+		;;
+	-isc)
+		os=-isc2.2
+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
+		;;
+	-clix*)
+		basic_machine=clipper-intergraph
+		;;
+	-isc*)
+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
+		;;
+	-lynx*178)
+		os=-lynxos178
+		;;
+	-lynx*5)
+		os=-lynxos5
+		;;
+	-lynx*)
+		os=-lynxos
+		;;
+	-ptx*)
+		basic_machine=`echo "$1" | sed -e 's/86-.*/86-sequent/'`
+		;;
+	-psos*)
+		os=-psos
+		;;
+	-mint | -mint0-9*)
+		basic_machine=m68k-atari
+		os=-mint
 		;;
 esac
 
-# Decode 1-component or ad-hoc basic machines
+# Decode aliases for certain CPU-COMPANY combinations.
 case $basic_machine in
-	# Here we handle the default manufacturer of certain CPU types. It is in
-	# some cases the only manufacturer, in others, it is the most popular.
-	w89k)
-		cpu=hppa1.1
-		vendor=winbond
+	# Recognize the basic CPU types without company name.
+	# Some are omitted here because they have special meanings below.
+	1750a | 580 \
+	| a29k \
+	| aarch64 | aarch64_be \
+	| alpha | alphaev4-8 | alphaev56 | alphaev678 | alphapca567 \
+	| alpha64 | alpha64ev4-8 | alpha64ev56 | alpha64ev678 | alpha64pca567 \
+	| am33_2.0 \
+	| arc | arceb \
+	| arm | armble | armelb | armv2-8 | armv3-8lb | armv7arm \
+	| avr | avr32 \
+	| ba \
+	| be32 | be64 \
+	| bfin \
+	| c4x | c8051 | clipper \
+	| d10v | d30v | dlx | dsp16xx \
+	| e2k | epiphany \
+	| fido | fr30 | frv | ft32 \
+	| h8300 | h8500 | hppa | hppa1.01 | hppa2.0 | hppa2.0nw | hppa64 \
+	| hexagon \
+	| i370 | i860 | i960 | ia16 | ia64 \
+	| ip2k | iq2000 \
+	| k1om \
+	| le32 | le64 \
+	| lm32 \
+	| m32c | m32r | m32rle | m68000 | m68k | m88k \
+	| maxq | mb | microblaze | microblazeel | mcore | mep | metag \
+	| mips | mipsbe | mipseb | mipsel | mipsle \
+	| mips16 \
+	| mips64 | mips64el \
+	| mips64octeon | mips64octeonel \
+	| mips64orion | mips64orionel \
+	| mips64r5900 | mips64r5900el \
+	| mips64vr | mips64vrel \
+	| mips64vr4100 | mips64vr4100el \
+	| mips64vr4300 | mips64vr4300el \
+	| mips64vr5000 | mips64vr5000el \
+	| mips64vr5900 | mips64vr5900el \
+	| mipsisa32 | mipsisa32el \
+	| mipsisa32r2 | mipsisa32r2el \
+	| mipsisa32r6 | mipsisa32r6el \
+	| mipsisa64 | mipsisa64el \
+	| mipsisa64r2 | mipsisa64r2el \
+	| mipsisa64r6 | mipsisa64r6el \
+	| mipsisa64sb1 | mipsisa64sb1el \
+	| mipsisa64sr71k | mipsisa64sr71kel \
+	| mipsr5900 | mipsr5900el \
+	| mipstx39 | mipstx39el \
+	| mn10200 | mn10300 \
+	| moxie \
+	| mt \
+	| msp430 \
+	| nds32 | nds32le | nds32be \
+	| nios | nios2 | nios2eb | nios2el \
+	| ns16k | ns32k \
+	| open8 | or1k | or1knd | or32 \
+	| pdp10 | pj | pjl \
+	| powerpc | powerpc64 | powerpc64le | powerpcle \
+	| pru \
+	| pyramid \
+	| riscv32 | riscv64 \
+	| rl78 | rx \
+	| score \
+	| sh | sh1234 | sh24a | sh24aeb | sh23e | sh234eb | sheb | shbe | shle | sh1234le | sh3ele \
+	| sh64 | sh64le \
+	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
+	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
+	| spu \
+	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
+	| ubicom32 \
+	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
+	| visium \
+	| wasm32 \
+	| x86 | xc16x | xstormy16 | xtensa \
+	| z8k | z80)
+		basic_machine=$basic_machine-unknown
+		;;
+	c54x)
+		basic_machine=tic54x-unknown
+		;;
+	c55x)
+		basic_machine=tic55x-unknown
+		;;
+	c6x)
+		basic_machine=tic6x-unknown
 		;;
-	op50n)
-		cpu=hppa1.1
-		vendor=oki
+	leon|leon3-9)
+		basic_machine=sparc-$basic_machine
 		;;
-	op60c)
-		cpu=hppa1.1
-		vendor=oki
+	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
+		basic_machine=$basic_machine-unknown
+		os=-none
 		;;
-	ibm*)
-		cpu=i370
-		vendor=ibm
+	m88110 | m680123460 | m683?2 | m68360 | m5200 | v70 | w65)
 		;;
-	orion105)
-		cpu=clipper
-		vendor=highlevel
+	ms1)
+		basic_machine=mt-unknown
 		;;
-	mac | mpw | mac-mpw)
-		cpu=m68k
-		vendor=apple
+
+	strongarm | thumb | xscale)
+		basic_machine=arm-unknown
 		;;
-	pmac | pmac-mpw)
-		cpu=powerpc
-		vendor=apple
+	xgate)
+		basic_machine=$basic_machine-unknown
+		os=-none
+		;;
+	xscaleeb)
+		basic_machine=armeb-unknown
 		;;
 
+	xscaleel)
+		basic_machine=armel-unknown
+		;;
+
+	# We use `pc' rather than `unknown'
+	# because (1) that's what they normally are, and
+	# (2) the word "unknown" tends to confuse beginning users.
+	i*86 | x86_64)
+	 basic_machine=$basic_machine-pc
+	 ;;
+	# Object if more than one company name word.
+	*-*-*)
+		echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2
+		exit 1
+		;;
+	# Recognize the basic CPU types with company name.
+	580-* \
+	| a29k-* \
+	| aarch64-* | aarch64_be-* \
+	| alpha-* | alphaev4-8-* | alphaev56-* | alphaev678-* \
+	| alpha64-* | alpha64ev4-8-* | alpha64ev56-* | alpha64ev678-* \
+	| alphapca567-* | alpha64pca567-* | arc-* | arceb-* \
+	| arm-* | armbe-* | armle-* | armeb-* | armv*-* \
+	| avr-* | avr32-* \
+	| ba-* \
+	| be32-* | be64-* \
+	| bfin-* | bs2000-* \
+	| c123* | c30-* | cjt90-* | c4x-* \
+	| c8051-* | clipper-* | craynv-* | cydra-* \
+	| d10v-* | d30v-* | dlx-* \
+	| e2k-* | elxsi-* \
+	| f3001-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
+	| h8300-* | h8500-* \
+	| hppa-* | hppa1.01-* | hppa2.0-* | hppa2.0nw-* | hppa64-* \
+	| hexagon-* \
+	| i*86-* | i860-* | i960-* | ia16-* | ia64-* \
+	| ip2k-* | iq2000-* \
+	| k1om-* \
+	| le32-* | le64-* \
+	| lm32-* \
+	| m32c-* | m32r-* | m32rle-* \
+	| m68000-* | m6800123460-* | m68360-* | m683?2-* | m68k-* \
+	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
+	| microblaze-* | microblazeel-* \
+	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
+	| mips16-* \
+	| mips64-* | mips64el-* \
+	| mips64octeon-* | mips64octeonel-* \
+	| mips64orion-* | mips64orionel-* \
+	| mips64r5900-* | mips64r5900el-* \
+	| mips64vr-* | mips64vrel-* \
+	| mips64vr4100-* | mips64vr4100el-* \
+	| mips64vr4300-* | mips64vr4300el-* \
+	| mips64vr5000-* | mips64vr5000el-* \
+	| mips64vr5900-* | mips64vr5900el-* \
+	| mipsisa32-* | mipsisa32el-* \
+	| mipsisa32r2-* | mipsisa32r2el-* \
+	| mipsisa32r6-* | mipsisa32r6el-* \
+	| mipsisa64-* | mipsisa64el-* \
+	| mipsisa64r2-* | mipsisa64r2el-* \
+	| mipsisa64r6-* | mipsisa64r6el-* \
+	| mipsisa64sb1-* | mipsisa64sb1el-* \
+	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
+	| mipsr5900-* | mipsr5900el-* \
+	| mipstx39-* | mipstx39el-* \
+	| mmix-* \
+	| mt-* \
+	| msp430-* \
+	| nds32-* | nds32le-* | nds32be-* \
+	| nios-* | nios2-* | nios2eb-* | nios2el-* \
+	| none-* | np1-* | ns16k-* | ns32k-* \
+	| open8-* \
+	| or1k*-* \
+	| orion-* \
+	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
+	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
+	| pru-* \
+	| pyramid-* \
+	| riscv32-* | riscv64-* \
+	| rl78-* | romp-* | rs6000-* | rx-* \
+	| sh-* | sh1234-* | sh24a-* | sh24aeb-* | sh23e-* | sh34eb-* | sheb-* | shbe-* \
+	| shle-* | sh1234le-* | sh3ele-* | sh64-* | sh64le-* \
+	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
+	| sparclite-* \
+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \
+	| tahoe-* \
+	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+	| tile*-* \
+	| tron-* \
+	| ubicom32-* \
+	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
+	| vax-* \
+	| visium-* \
+	| wasm32-* \
+	| we32k-* \
+	| x86-* | x86_64-* | xc16x-* | xps100-* \
+	| xstormy16-* | xtensa*-* \
+	| ymp-* \
+	| z8k-* | z80-*)
+		;;
+	# Recognize the basic CPU types without company name, with glob match.
+	xtensa*)
+		basic_machine=$basic_machine-unknown
+		;;
 	# Recognize the various machine names and aliases which stand
 	# for a CPU type and a company and sometimes even an OS.
+	386bsd)
+		basic_machine=i386-pc
+		os=-bsd
+		;;
 	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
-		cpu=m68000
-		vendor=att
+		basic_machine=m68000-att
 		;;
 	3b*)
-		cpu=we32k
-		vendor=att
+		basic_machine=we32k-att
+		;;
+	a29khif)
+		basic_machine=a29k-amd
+		os=-udi
+		;;
+	abacus)
+		basic_machine=abacus-unknown
+		;;
+	adobe68k)
+		basic_machine=m68010-adobe
+		os=-scout
+		;;
+	alliant | fx80)
+		basic_machine=fx80-alliant
+		;;
+	altos | altos3068)
+		basic_machine=m68k-altos
+		;;
+	am29k)
+		basic_machine=a29k-none
+		os=-bsd
+		;;
+	amd64)
+		basic_machine=x86_64-pc
+		;;
+	amd64-*)
+		basic_machine=x86_64-`echo "$basic_machine" | sed 's/^^-*-//'`
+		;;
+	amdahl)
+		basic_machine=580-amdahl
+		os=-sysv
+		;;
+	amiga | amiga-*)
+		basic_machine=m68k-unknown
+		;;
+	amigaos | amigados)
+		basic_machine=m68k-unknown
+		os=-amigaos
+		;;
+	amigaunix | amix)
+		basic_machine=m68k-unknown
+		os=-sysv4
+		;;
+	apollo68)
+		basic_machine=m68k-apollo
+		os=-sysv
+		;;
+	apollo68bsd)
+		basic_machine=m68k-apollo
+		os=-bsd
+		;;
+	aros)
+		basic_machine=i386-pc
+		os=-aros
+		;;
+	asmjs)
+		basic_machine=asmjs-unknown
+		;;
+	aux)
+		basic_machine=m68k-apple
+		os=-aux
+		;;
+	balance)
+		basic_machine=ns32k-sequent
+		os=-dynix
+		;;
+	blackfin)
+		basic_machine=bfin-unknown
+		os=-linux
+		;;
+	blackfin-*)
+		basic_machine=bfin-`echo "$basic_machine" | sed 's/^^-*-//'`
+		os=-linux
 		;;
 	bluegene*)
-		cpu=powerpc
-		vendor=ibm
-		basic_os=cnk
+		basic_machine=powerpc-ibm
+		os=-cnk
+		;;
+	c54x-*)
+		basic_machine=tic54x-`echo "$basic_machine" | sed 's/^^-*-//'`
+		;;
+	c55x-*)
+		basic_machine=tic55x-`echo "$basic_machine" | sed 's/^^-*-//'`
+		;;
+	c6x-*)
+		basic_machine=tic6x-`echo "$basic_machine" | sed 's/^^-*-//'`
+		;;
+	c90)
+		basic_machine=c90-cray
+		os=-unicos
+		;;
+	cegcc)
+		basic_machine=arm-unknown
+		os=-cegcc
+		;;
+	convex-c1)
+		basic_machine=c1-convex
+		os=-bsd
+		;;
+	convex-c2)
+		basic_machine=c2-convex
+		os=-bsd
+		;;
+	convex-c32)
+		basic_machine=c32-convex
+		os=-bsd
+		;;
+	convex-c34)
+		basic_machine=c34-convex
+		os=-bsd
+		;;
+	convex-c38)
+		basic_machine=c38-convex
+		os=-bsd
+		;;
+	cray | j90)
+		basic_machine=j90-cray
+		os=-unicos
+		;;
+	craynv)
+		basic_machine=craynv-cray
+		os=-unicosmp
+		;;
+	cr16 | cr16-*)
+		basic_machine=cr16-unknown
+		os=-elf
+		;;
+	crds | unos)
+		basic_machine=m68k-crds
+		;;
+	crisv32 | crisv32-* | etraxfs*)
+		basic_machine=crisv32-axis
+		;;
+	cris | cris-* | etrax*)
+		basic_machine=cris-axis
+		;;
+	crx)
+		basic_machine=crx-unknown
+		os=-elf
+		;;
+	da30 | da30-*)
+		basic_machine=m68k-da30
+		;;
+	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
+		basic_machine=mips-dec
 		;;
 	decsystem10* | dec10*)
-		cpu=pdp10
-		vendor=dec
-		basic_os=tops10
+		basic_machine=pdp10-dec
+		os=-tops10
 		;;
 	decsystem20* | dec20*)
-		cpu=pdp10
-		vendor=dec
-		basic_os=tops20
+		basic_machine=pdp10-dec
+		os=-tops20
 		;;
 	delta | 3300 | motorola-3300 | motorola-delta \
 	 | 3300-motorola | delta-motorola)
-		cpu=m68k
-		vendor=motorola
+		basic_machine=m68k-motorola
+		;;
+	delta88)
+		basic_machine=m88k-motorola
+		os=-sysv3
+		;;
+	dicos)
+		basic_machine=i686-pc
+		os=-dicos
+		;;
+	djgpp)
+		basic_machine=i586-pc
+		os=-msdosdjgpp
+		;;
+	dpx20 | dpx20-*)
+		basic_machine=rs6000-bull
+		os=-bosx
 		;;
 	dpx2*)
-		cpu=m68k
-		vendor=bull
-		basic_os=sysv3
+		basic_machine=m68k-bull
+		os=-sysv3
 		;;
-	encore | umax | mmax)
-		cpu=ns32k
-		vendor=encore
+	e500v12)
+		basic_machine=powerpc-unknown
+		os=$os"spe"
+		;;
+	e500v12-*)
+		basic_machine=powerpc-`echo "$basic_machine" | sed 's/^^-*-//'`
+		os=$os"spe"
+		;;
+	ebmon29k)
+		basic_machine=a29k-amd
+		os=-ebmon
 		;;
 	elxsi)
-		cpu=elxsi
-		vendor=elxsi
-		basic_os=${basic_os:-bsd}
+		basic_machine=elxsi-elxsi
+		os=-bsd
+		;;
+	encore | umax | mmax)
+		basic_machine=ns32k-encore
+		;;
+	es1800 | OSE68k | ose68k | ose | OSE)
+		basic_machine=m68k-ericsson
+		os=-ose
 		;;
 	fx2800)
-		cpu=i860
-		vendor=alliant
+		basic_machine=i860-alliant
 		;;
 	genix)
-		cpu=ns32k
-		vendor=ns
+		basic_machine=ns32k-ns
+		;;
+	gmicro)
+		basic_machine=tron-gmicro
+		os=-sysv
+		;;
+	go32)
+		basic_machine=i386-pc
+		os=-go32
 		;;
 	h3050r* | hiux*)
-		cpu=hppa1.1
-		vendor=hitachi
-		basic_os=hiuxwe2
+		basic_machine=hppa1.1-hitachi
+		os=-hiuxwe2
+		;;
+	h8300hms)
+		basic_machine=h8300-hitachi
+		os=-hms
+		;;
+	h8300xray)
+		basic_machine=h8300-hitachi
+		os=-xray
+		;;
+	h8500hms)
+		basic_machine=h8500-hitachi
+		os=-hms
+		;;
+	harris)
+		basic_machine=m88k-harris
+		os=-sysv3
+		;;
+	hp300-*)
+		basic_machine=m68k-hp
+		;;
+	hp300bsd)
+		basic_machine=m68k-hp
+		os=-bsd
+		;;
+	hp300hpux)
+		basic_machine=m68k-hp
+		os=-hpux
 		;;
 	hp3k90-90-9 | hp90-90-9)
-		cpu=hppa1.0
-		vendor=hp
+		basic_machine=hppa1.0-hp
 		;;
 	hp9k20-90-9 | hp9k310-9)
-		cpu=m68000
-		vendor=hp
+		basic_machine=m68000-hp
 		;;
 	hp9k32-90-9)
-		cpu=m68k
-		vendor=hp
+		basic_machine=m68k-hp
 		;;
 	hp9k60-90-9 | hp60-90-9)
-		cpu=hppa1.0
-		vendor=hp
+		basic_machine=hppa1.0-hp
 		;;
 	hp9k70-790-9 | hp70-790-9)
-		cpu=hppa1.1
-		vendor=hp
+		basic_machine=hppa1.1-hp
 		;;
 	hp9k780-9 | hp780-9)
 		# FIXME: really hppa2.0-hp
-		cpu=hppa1.1
-		vendor=hp
+		basic_machine=hppa1.1-hp
 		;;
 	hp9k8671 | hp8671 | hp9k8024 | hp8024 | hp9k8789 | hp8789 | hp9k893 | hp893)
 		# FIXME: really hppa2.0-hp
-		cpu=hppa1.1
-		vendor=hp
+		basic_machine=hppa1.1-hp
 		;;
 	hp9k80-913679 | hp80-913679)
-		cpu=hppa1.1
-		vendor=hp
+		basic_machine=hppa1.1-hp
 		;;
 	hp9k80-90-9 | hp80-90-9)
-		cpu=hppa1.0
-		vendor=hp
+		basic_machine=hppa1.0-hp
+		;;
+	hppaosf)
+		basic_machine=hppa1.1-hp
+		os=-osf
+		;;
+	hppro)
+		basic_machine=hppa1.1-hp
+		os=-proelf
+		;;
+	i370-ibm* | ibm*)
+		basic_machine=i370-ibm
 		;;
 	i*86v32)
-		cpu=`echo "$1" | sed -e 's/86.*/86/'`
-		vendor=pc
-		basic_os=sysv32
+		basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
+		os=-sysv32
 		;;
 	i*86v4*)
-		cpu=`echo "$1" | sed -e 's/86.*/86/'`
-		vendor=pc
-		basic_os=sysv4
+		basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
+		os=-sysv4
 		;;
 	i*86v)
-		cpu=`echo "$1" | sed -e 's/86.*/86/'`
-		vendor=pc
-		basic_os=sysv
+		basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
+		os=-sysv
 		;;
 	i*86sol2)
-		cpu=`echo "$1" | sed -e 's/86.*/86/'`
-		vendor=pc
-		basic_os=solaris2
+		basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
+		os=-solaris2
 		;;
-	j90 | j90-cray)
-		cpu=j90
-		vendor=cray
-		basic_os=${basic_os:-unicos}
+	i386mach)
+		basic_machine=i386-mach
+		os=-mach
+		;;
+	vsta)
+		basic_machine=i386-unknown
+		os=-vsta
 		;;
 	iris | iris4d)
-		cpu=mips
-		vendor=sgi
-		case $basic_os in
-		 irix*)
+		basic_machine=mips-sgi
+		case $os in
+		 -irix*)
 			;;
 		 *)
-			basic_os=irix4
+			os=-irix4
 			;;
 		esac
 		;;
+	isi68 | isi)
+		basic_machine=m68k-isi
+		os=-sysv
+		;;
+	leon-*|leon3-9-*)
+		basic_machine=sparc-`echo "$basic_machine" | sed 's/-.*//'`
+		;;
+	m68knommu)
+		basic_machine=m68k-unknown
+		os=-linux
+		;;
+	m68knommu-*)
+		basic_machine=m68k-`echo "$basic_machine" | sed 's/^^-*-//'`
+		os=-linux
+		;;
+	magnum | m3230)
+		basic_machine=mips-mips
+		os=-sysv
+		;;
+	merlin)
+		basic_machine=ns32k-utek
+		os=-sysv
+		;;
+	microblaze*)
+		basic_machine=microblaze-xilinx
+		;;
+	mingw64)
+		basic_machine=x86_64-pc
+		os=-mingw64
+		;;
+	mingw32)
+		basic_machine=i686-pc
+		os=-mingw32
+		;;
+	mingw32ce)
+		basic_machine=arm-unknown
+		os=-mingw32ce
+		;;
 	miniframe)
-		cpu=m68000
-		vendor=convergent
+		basic_machine=m68000-convergent
+		;;
+	*mint | -mint0-9* | *MiNT | *MiNT0-9*)
+		basic_machine=m68k-atari
+		os=-mint
+		;;
+	mips3*-*)
+		basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'`
+		;;
+	mips3*)
+		basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'`-unknown
+		;;
+	monitor)
+		basic_machine=m68k-rom68k
+		os=-coff
+		;;
+	morphos)
+		basic_machine=powerpc-unknown
+		os=-morphos
+		;;
+	moxiebox)
+		basic_machine=moxie-unknown
+		os=-moxiebox
+		;;
+	msdos)
+		basic_machine=i386-pc
+		os=-msdos
 		;;
-	*mint | mint0-9* | *MiNT | *MiNT0-9*)
-		cpu=m68k
-		vendor=atari
-		basic_os=mint
+	ms1-*)
+		basic_machine=`echo "$basic_machine" | sed -e 's/ms1-/mt-/'`
+		;;
+	msys)
+		basic_machine=i686-pc
+		os=-msys
+		;;
+	mvs)
+		basic_machine=i370-ibm
+		os=-mvs
+		;;
+	nacl)
+		basic_machine=le32-unknown
+		os=-nacl
+		;;
+	ncr3000)
+		basic_machine=i486-ncr
+		os=-sysv4
+		;;
+	netbsd386)
+		basic_machine=i386-unknown
+		os=-netbsd
+		;;
+	netwinder)
+		basic_machine=armv4l-rebel
+		os=-linux
+		;;
+	news | news700 | news800 | news900)
+		basic_machine=m68k-sony
+		os=-newsos
+		;;
+	news1000)
+		basic_machine=m68030-sony
+		os=-newsos
 		;;
 	news-3600 | risc-news)
-		cpu=mips
-		vendor=sony
-		basic_os=newsos
+		basic_machine=mips-sony
+		os=-newsos
+		;;
+	necv70)
+		basic_machine=v70-nec
+		os=-sysv
 		;;
 	next | m*-next)
-		cpu=m68k
-		vendor=next
-		case $basic_os in
-		 openstep*)
-		 ;;
-		 nextstep*)
+		basic_machine=m68k-next
+		case $os in
+		 -nextstep* )
 			;;
-		 ns2*)
-		 basic_os=nextstep2
+		 -ns2*)
+		 os=-nextstep2
 			;;
 		 *)
-		 basic_os=nextstep3
+		 os=-nextstep3
 			;;
 		esac
 		;;
+	nh3000)
+		basic_machine=m68k-harris
+		os=-cxux
+		;;
+	nh45000)
+		basic_machine=m88k-harris
+		os=-cxux
+		;;
+	nindy960)
+		basic_machine=i960-intel
+		os=-nindy
+		;;
+	mon960)
+		basic_machine=i960-intel
+		os=-mon960
+		;;
+	nonstopux)
+		basic_machine=mips-compaq
+		os=-nonstopux
+		;;
 	np1)
-		cpu=np1
-		vendor=gould
+		basic_machine=np1-gould
+		;;
+	neo-tandem)
+		basic_machine=neo-tandem
+		;;
+	nse-tandem)
+		basic_machine=nse-tandem
+		;;
+	nsr-tandem)
+		basic_machine=nsr-tandem
+		;;
+	nsv-tandem)
+		basic_machine=nsv-tandem
+		;;
+	nsx-tandem)
+		basic_machine=nsx-tandem
 		;;
 	op50n-* | op60c-*)
-		cpu=hppa1.1
-		vendor=oki
-		basic_os=proelf
+		basic_machine=hppa1.1-oki
+		os=-proelf
+		;;
+	openrisc | openrisc-*)
+		basic_machine=or32-unknown
+		;;
+	os400)
+		basic_machine=powerpc-ibm
+		os=-os400
+		;;
+	OSE68000 | ose68000)
+		basic_machine=m68000-ericsson
+		os=-ose
+		;;
+	os68k)
+		basic_machine=m68k-none
+		os=-os68k
 		;;
 	pa-hitachi)
-		cpu=hppa1.1
-		vendor=hitachi
-		basic_os=hiuxwe2
+		basic_machine=hppa1.1-hitachi
+		os=-hiuxwe2
+		;;
+	paragon)
+		basic_machine=i860-intel
+		os=-osf
+		;;
+	parisc)
+		basic_machine=hppa-unknown
+		os=-linux
+		;;
+	parisc-*)
+		basic_machine=hppa-`echo "$basic_machine" | sed 's/^^-*-//'`
+		os=-linux
 		;;
 	pbd)
-		cpu=sparc
-		vendor=tti
+		basic_machine=sparc-tti
 		;;
 	pbb)
-		cpu=m68k
-		vendor=tti
+		basic_machine=m68k-tti
+		;;
+	pc532 | pc532-*)
+		basic_machine=ns32k-pc532
+		;;
+	pc98)
+		basic_machine=i386-pc
+		;;
+	pc98-*)
+		basic_machine=i386-`echo "$basic_machine" | sed 's/^^-*-//'`
+		;;
+	pentium | p5 | k5 | k6 | nexgen | viac3)
+		basic_machine=i586-pc
+		;;
+	pentiumpro | p6 | 6x86 | athlon | athlon_*)
+		basic_machine=i686-pc
+		;;
+	pentiumii | pentium2 | pentiumiii | pentium3)
+		basic_machine=i686-pc
+		;;
+	pentium4)
+		basic_machine=i786-pc
+		;;
+	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
+		basic_machine=i586-`echo "$basic_machine" | sed 's/^^-*-//'`
 		;;
-	pc532)
-		cpu=ns32k
-		vendor=pc532
+	pentiumpro-* | p6-* | 6x86-* | athlon-*)
+		basic_machine=i686-`echo "$basic_machine" | sed 's/^^-*-//'`
+		;;
+	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
+		basic_machine=i686-`echo "$basic_machine" | sed 's/^^-*-//'`
+		;;
+	pentium4-*)
+		basic_machine=i786-`echo "$basic_machine" | sed 's/^^-*-//'`
 		;;
 	pn)
-		cpu=pn
-		vendor=gould
+		basic_machine=pn-gould
 		;;
-	power)
-		cpu=power
-		vendor=ibm
+	power)	basic_machine=power-ibm
 		;;
-	ps2)
-		cpu=i386
-		vendor=ibm
+	ppc | ppcbe)	basic_machine=powerpc-unknown
 		;;
-	rm4600)
-		cpu=mips
-		vendor=siemens
+	ppc-* | ppcbe-*)
+		basic_machine=powerpc-`echo "$basic_machine" | sed 's/^^-*-//'`
 		;;
-	rtpc | rtpc-*)
-		cpu=romp
-		vendor=ibm
+	ppcle | powerpclittle)
+		basic_machine=powerpcle-unknown
 		;;
-	sde)
-		cpu=mipsisa32
-		vendor=sde
-		basic_os=${basic_os:-elf}
+	ppcle-* | powerpclittle-*)
+		basic_machine=powerpcle-`echo "$basic_machine" | sed 's/^^-*-//'`
 		;;
-	simso-wrs)
-		cpu=sparclite
-		vendor=wrs
-		basic_os=vxworks
+	ppc64)	basic_machine=powerpc64-unknown
 		;;
-	tower | tower-32)
-		cpu=m68k
-		vendor=ncr
+	ppc64-*) basic_machine=powerpc64-`echo "$basic_machine" | sed 's/^^-*-//'`
 		;;
-	vpp*|vx|vx-*)
-		cpu=f301
-		vendor=fujitsu
+	ppc64le | powerpc64little)
+		basic_machine=powerpc64le-unknown
 		;;
-	w65)
-		cpu=w65
-		vendor=wdc
+	ppc64le-* | powerpc64little-*)
+		basic_machine=powerpc64le-`echo "$basic_machine" | sed 's/^^-*-//'`
 		;;
-	w89k-*)
-		cpu=hppa1.1
-		vendor=winbond
-		basic_os=proelf
+	ps2)
+		basic_machine=i386-ibm
 		;;
-	none)
-		cpu=none
-		vendor=none
+	pw32)
+		basic_machine=i586-unknown
+		os=-pw32
 		;;
-	leon|leon3-9)
-		cpu=sparc
-		vendor=$basic_machine
+	rdos | rdos64)
+		basic_machine=x86_64-pc
+		os=-rdos
 		;;
-	leon-*|leon3-9-*)
-		cpu=sparc
-		vendor=`echo "$basic_machine" | sed 's/-.*//'`
+	rdos32)
+		basic_machine=i386-pc
+		os=-rdos
 		;;
-
-	*-*)
-		# shellcheck disable=SC2162
-		saved_IFS=$IFS
-		IFS="-" read cpu vendor <<EOF
-$basic_machine
-EOF
-		IFS=$saved_IFS
+	rom68k)
+		basic_machine=m68k-rom68k
+		os=-coff
 		;;
-	# We use `pc' rather than `unknown'
-	# because (1) that's what they normally are, and
-	# (2) the word "unknown" tends to confuse beginning users.
-	i*86 | x86_64)
-		cpu=$basic_machine
-		vendor=pc
+	rm4600)
+		basic_machine=mips-siemens
 		;;
-	# These rules are duplicated from below for sake of the special case above;
-	# i.e. things that normalized to x86 arches should also default to "pc"
-	pc98)
-		cpu=i386
-		vendor=pc
+	rtpc | rtpc-*)
+		basic_machine=romp-ibm
 		;;
-	x64 | amd64)
-		cpu=x86_64
-		vendor=pc
+	s390 | s390-*)
+		basic_machine=s390-ibm
 		;;
-	# Recognize the basic CPU types without company name.
-	*)
-		cpu=$basic_machine
-		vendor=unknown
+	s390x | s390x-*)
+		basic_machine=s390x-ibm
 		;;
-esac
-
-unset -v basic_machine
-
-# Decode basic machines in the full and proper CPU-Company form.
-case $cpu-$vendor in
-	# Here we handle the default manufacturer of certain CPU types in canonical form. It is in
-	# some cases the only manufacturer, in others, it is the most popular.
-	craynv-unknown)
-		vendor=cray
-		basic_os=${basic_os:-unicosmp}
+	sa29200)
+		basic_machine=a29k-amd
+		os=-udi
 		;;
-	c90-unknown | c90-cray)
-		vendor=cray
-		basic_os=${Basic_os:-unicos}
+	sb1)
+		basic_machine=mipsisa64sb1-unknown
 		;;
-	fx80-unknown)
-		vendor=alliant
+	sb1el)
+		basic_machine=mipsisa64sb1el-unknown
 		;;
-	romp-unknown)
-		vendor=ibm
+	sde)
+		basic_machine=mipsisa32-sde
+		os=-elf
 		;;
-	mmix-unknown)
-		vendor=knuth
+	sei)
+		basic_machine=mips-sei
+		os=-seiux
 		;;
-	microblaze-unknown | microblazeel-unknown)
-		vendor=xilinx
+	sequent)
+		basic_machine=i386-sequent
 		;;
-	rs6000-unknown)
-		vendor=ibm
+	sh5el)
+		basic_machine=sh5le-unknown
 		;;
-	vax-unknown)
-		vendor=dec
+	simso-wrs)
+		basic_machine=sparclite-wrs
+		os=-vxworks
 		;;
-	pdp11-unknown)
-		vendor=dec
+	sps7)
+		basic_machine=m68k-bull
+		os=-sysv2
 		;;
-	we32k-unknown)
-		vendor=att
+	spur)
+		basic_machine=spur-unknown
 		;;
-	cydra-unknown)
-		vendor=cydrome
+	st2000)
+		basic_machine=m68k-tandem
 		;;
-	i370-ibm*)
-		vendor=ibm
+	stratus)
+		basic_machine=i860-stratus
+		os=-sysv4
 		;;
-	orion-unknown)
-		vendor=highlevel
+	strongarm-* | thumb-*)
+		basic_machine=arm-`echo "$basic_machine" | sed 's/^^-*-//'`
 		;;
-	xps-unknown | xps100-unknown)
-		cpu=xps100
-		vendor=honeywell
+	sun2)
+		basic_machine=m68000-sun
 		;;
-
-	# Here we normalize CPU types with a missing or matching vendor
-	dpx20-unknown | dpx20-bull)
-		cpu=rs6000
-		vendor=bull
-		basic_os=${basic_os:-bosx}
+	sun2os3)
+		basic_machine=m68000-sun
+		os=-sunos3
 		;;
-
-	# Here we normalize CPU types irrespective of the vendor
-	amd64-*)
-		cpu=x86_64
+	sun2os4)
+		basic_machine=m68000-sun
+		os=-sunos4
 		;;
-	blackfin-*)
-		cpu=bfin
-		basic_os=linux
+	sun3os3)
+		basic_machine=m68k-sun
+		os=-sunos3
 		;;
-	c54x-*)
-		cpu=tic54x
+	sun3os4)
+		basic_machine=m68k-sun
+		os=-sunos4
 		;;
-	c55x-*)
-		cpu=tic55x
+	sun4os3)
+		basic_machine=sparc-sun
+		os=-sunos3
 		;;
-	c6x-*)
-		cpu=tic6x
+	sun4os4)
+		basic_machine=sparc-sun
+		os=-sunos4
 		;;
-	e500v12-*)
-		cpu=powerpc
-		basic_os=${basic_os}"spe"
+	sun4sol2)
+		basic_machine=sparc-sun
+		os=-solaris2
 		;;
-	mips3*-*)
-		cpu=mips64
+	sun3 | sun3-*)
+		basic_machine=m68k-sun
 		;;
-	ms1-*)
-		cpu=mt
+	sun4)
+		basic_machine=sparc-sun
 		;;
-	m68knommu-*)
-		cpu=m68k
-		basic_os=linux
+	sun386 | sun386i | roadrunner)
+		basic_machine=i386-sun
 		;;
-	m9s12z-* | m68hcs12z-* | hcs12z-* | s12z-*)
-		cpu=s12z
+	sv1)
+		basic_machine=sv1-cray
+		os=-unicos
 		;;
-	openrisc-*)
-		cpu=or32
+	symmetry)
+		basic_machine=i386-sequent
+		os=-dynix
 		;;
-	parisc-*)
-		cpu=hppa
-		basic_os=linux
+	t3e)
+		basic_machine=alphaev5-cray
+		os=-unicos
 		;;
-	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
-		cpu=i586
+	t90)
+		basic_machine=t90-cray
+		os=-unicos
 		;;
-	pentiumpro-* | p6-* | 6x86-* | athlon-* | athalon_*-*)
-		cpu=i686
+	tile*)
+		basic_machine=$basic_machine-unknown
+		os=-linux-gnu
 		;;
-	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
-		cpu=i686
+	tx39)
+		basic_machine=mipstx39-unknown
 		;;
-	pentium4-*)
-		cpu=i786
+	tx39el)
+		basic_machine=mipstx39el-unknown
 		;;
-	pc98-*)
-		cpu=i386
+	toad1)
+		basic_machine=pdp10-xkl
+		os=-tops20
 		;;
-	ppc-* | ppcbe-*)
-		cpu=powerpc
+	tower | tower-32)
+		basic_machine=m68k-ncr
 		;;
-	ppcle-* | powerpclittle-*)
-		cpu=powerpcle
+	tpf)
+		basic_machine=s390x-ibm
+		os=-tpf
 		;;
-	ppc64-*)
-		cpu=powerpc64
+	udi29k)
+		basic_machine=a29k-amd
+		os=-udi
 		;;
-	ppc64le-* | powerpc64little-*)
-		cpu=powerpc64le
+	ultra3)
+		basic_machine=a29k-nyu
+		os=-sym1
 		;;
-	sb1-*)
-		cpu=mipsisa64sb1
+	v810 | necv810)
+		basic_machine=v810-nec
+		os=-none
 		;;
-	sb1el-*)
-		cpu=mipsisa64sb1el
+	vaxv)
+		basic_machine=vax-dec
+		os=-sysv
 		;;
-	sh5elb-*)
-		cpu=`echo "$cpu" | sed 's/^$sh.$e$.$$/\1\2e/'`
+	vms)
+		basic_machine=vax-dec
+		os=-vms
 		;;
-	spur-*)
-		cpu=spur
+	vpp*|vx|vx-*)
+		basic_machine=f301-fujitsu
 		;;
-	strongarm-* | thumb-*)
-		cpu=arm
+	vxworks960)
+		basic_machine=i960-wrs
+		os=-vxworks
 		;;
-	tx39-*)
-		cpu=mipstx39
+	vxworks68)
+		basic_machine=m68k-wrs
+		os=-vxworks
 		;;
-	tx39el-*)
-		cpu=mipstx39el
+	vxworks29k)
+		basic_machine=a29k-wrs
+		os=-vxworks
 		;;
-	x64-*)
-		cpu=x86_64
+	w65*)
+		basic_machine=w65-wdc
+		os=-none
+		;;
+	w89k-*)
+		basic_machine=hppa1.1-winbond
+		os=-proelf
+		;;
+	x64)
+		basic_machine=x86_64-pc
+		;;
+	xbox)
+		basic_machine=i686-pc
+		os=-mingw32
+		;;
+	xps | xps100)
+		basic_machine=xps100-honeywell
 		;;
 	xscale-* | xscaleebl-*)
-		cpu=`echo "$cpu" | sed 's/^xscale/arm/'`
+		basic_machine=`echo "$basic_machine" | sed 's/^xscale/arm/'`
+		;;
+	ymp)
+		basic_machine=ymp-cray
+		os=-unicos
 		;;
-	arm64-*)
-		cpu=aarch64
+	none)
+		basic_machine=none-none
+		os=-none
 		;;
 
-	# Recognize the canonical CPU Types that limit and/or modify the
-	# company names they are paired with.
-	cr16-*)
-		basic_os=${basic_os:-elf}
+# Here we handle the default manufacturer of certain CPU types. It is in
+# some cases the only manufacturer, in others, it is the most popular.
+	w89k)
+		basic_machine=hppa1.1-winbond
 		;;
-	crisv32-* | etraxfs*-*)
-		cpu=crisv32
-		vendor=axis
+	op50n)
+		basic_machine=hppa1.1-oki
 		;;
-	cris-* | etrax*-*)
-		cpu=cris
-		vendor=axis
+	op60c)
+		basic_machine=hppa1.1-oki
 		;;
-	crx-*)
-		basic_os=${basic_os:-elf}
+	romp)
+		basic_machine=romp-ibm
 		;;
-	neo-tandem)
-		cpu=neo
-		vendor=tandem
+	mmix)
+		basic_machine=mmix-knuth
 		;;
-	nse-tandem)
-		cpu=nse
-		vendor=tandem
+	rs6000)
+		basic_machine=rs6000-ibm
 		;;
-	nsr-tandem)
-		cpu=nsr
-		vendor=tandem
+	vax)
+		basic_machine=vax-dec
 		;;
-	nsv-tandem)
-		cpu=nsv
-		vendor=tandem
+	pdp11)
+		basic_machine=pdp11-dec
 		;;
-	nsx-tandem)
-		cpu=nsx
-		vendor=tandem
+	we32k)
+		basic_machine=we32k-att
 		;;
-	mipsallegrexel-sony)
-		cpu=mipsallegrexel
-		vendor=sony
+	sh1234 | sh24a | sh24aeb | sh34eb | sh1234le | sh23ele)
+		basic_machine=sh-unknown
 		;;
-	tile*-*)
-		basic_os=${basic_os:-linux-gnu}
+	cydra)
+		basic_machine=cydra-cydrome
+		;;
+	orion)
+		basic_machine=orion-highlevel
+		;;
+	orion105)
+		basic_machine=clipper-highlevel
+		;;
+	mac | mpw | mac-mpw)
+		basic_machine=m68k-apple
+		;;
+	pmac | pmac-mpw)
+		basic_machine=powerpc-apple
+		;;
+	*-unknown)
+		# Make sure to match an already-canonicalized machine name.
 		;;
-
 	*)
-		# Recognize the canonical CPU types that are allowed with any
-		# company name.
-		case $cpu in
-			1750a | 580 \
-			| a29k \
-			| aarch64 | aarch64_be \
-			| abacus \
-			| alpha | alphaev4-8 | alphaev56 | alphaev678 \
-			| alpha64 | alpha64ev4-8 | alpha64ev56 | alpha64ev678 \
-			| alphapca567 | alpha64pca567 \
-			| am33_2.0 \
-			| amdgcn \
-			| arc | arceb | arc32 | arc64 \
-			| arm | armlbe | armelb | armv* \
-			| avr | avr32 \
-			| asmjs \
-			| ba \
-			| be32 | be64 \
-			| bfin | bpf | bs2000 \
-			| c123* | c30 | cjt90 | c4x \
-			| c8051 | clipper | craynv | csky | cydra \
-			| d10v | d30v | dlx | dsp16xx \
-			| e2k | elxsi | epiphany \
-			| f3001 | f700 | fido | fr30 | frv | ft32 | fx80 \
-			| h8300 | h8500 \
-			| hppa | hppa1.01 | hppa2.0 | hppa2.0nw | hppa64 \
-			| hexagon \
-			| i370 | i*86 | i860 | i960 | ia16 | ia64 \
-			| ip2k | iq2000 \
-			| k1om \
-			| le32 | le64 \
-			| lm32 \
-			| loongarch32 | loongarch64 | loongarchx32 \
-			| m32c | m32r | m32rle \
-			| m5200 | m68000 | m6800123460 | m68360 | m683?2 | m68k \
-			| m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x \
-			| m88110 | m88k | maxq | mb | mcore | mep | metag \
-			| microblaze | microblazeel \
-			| mips | mipsbe | mipseb | mipsel | mipsle \
-			| mips16 \
-			| mips64 | mips64eb | mips64el \
-			| mips64octeon | mips64octeonel \
-			| mips64orion | mips64orionel \
-			| mips64r5900 | mips64r5900el \
-			| mips64vr | mips64vrel \
-			| mips64vr4100 | mips64vr4100el \
-			| mips64vr4300 | mips64vr4300el \
-			| mips64vr5000 | mips64vr5000el \
-			| mips64vr5900 | mips64vr5900el \
-			| mipsisa32 | mipsisa32el \
-			| mipsisa32r2 | mipsisa32r2el \
-			| mipsisa32r3 | mipsisa32r3el \
-			| mipsisa32r5 | mipsisa32r5el \
-			| mipsisa32r6 | mipsisa32r6el \
-			| mipsisa64 | mipsisa64el \
-			| mipsisa64r2 | mipsisa64r2el \
-			| mipsisa64r3 | mipsisa64r3el \
-			| mipsisa64r5 | mipsisa64r5el \
-			| mipsisa64r6 | mipsisa64r6el \
-			| mipsisa64sb1 | mipsisa64sb1el \
-			| mipsisa64sr71k | mipsisa64sr71kel \
-			| mipsr5900 | mipsr5900el \
-			| mipstx39 | mipstx39el \
-			| mmix \
-			| mn10200 | mn10300 \
-			| moxie \
-			| mt \
-			| msp430 \
-			| nds32 | nds32le | nds32be \
-			| nfp \
-			| nios | nios2 | nios2eb | nios2el \
-			| none | np1 | ns16k | ns32k | nvptx \
-			| open8 \
-			| or1k* \
-			| or32 \
-			| orion \
-			| picochip \
-			| pdp10 | pdp11 | pj | pjl | pn | power \
-			| powerpc | powerpc64 | powerpc64le | powerpcle | powerpcspe \
-			| pru \
-			| pyramid \
-			| riscv | riscv32 | riscv32be | riscv64 | riscv64be \
-			| rl78 | romp | rs6000 | rx \
-			| s390 | s390x \
-			| score \
-			| sh | shl \
-			| sh1234 | sh24a | sh24aelb | sh23e | shelb | shlbe \
-			| sh1234elb | sh12345lbe | sh23ele | sh64 | sh64le \
-			| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet \
-			| sparclite \
-			| sparcv8 | sparcv9 | sparcv9b | sparcv9v | sv1 | sx* \
-			| spu \
-			| tahoe \
-			| thumbv7* \
-			| tic30 | tic4x | tic54x | tic55x | tic6x | tic80 \
-			| tron \
-			| ubicom32 \
-			| v70 | v850 | v850e | v850e1 | v850es | v850e2 | v850e2v3 \
-			| vax \
-			| visium \
-			| w65 \
-			| wasm32 | wasm64 \
-			| we32k \
-			| x86 | x86_64 | xc16x | xgate | xps100 \
-			| xstormy16 | xtensa* \
-			| ymp \
-			| z8k | z80)
-				;;
-
-			*)
-				echo Invalid configuration \`"$1"\': machine \`"$cpu-$vendor"\' not recognized 1>&2
-				exit 1
-				;;
-		esac
+		echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2
+		exit 1
 		;;
 esac
 
 # Here we canonicalize certain aliases for manufacturers.
-case $vendor in
-	digital*)
-		vendor=dec
+case $basic_machine in
+	*-digital*)
+		basic_machine=`echo "$basic_machine" | sed 's/digital.*/dec/'`
 		;;
-	commodore*)
-		vendor=cbm
+	*-commodore*)
+		basic_machine=`echo "$basic_machine" | sed 's/commodore.*/cbm/'`
 		;;
 	*)
 		;;
@@ -1301,215 +1334,203 @@
 
 # Decode manufacturer-specific aliases for certain operating systems.
 
-if test x$basic_os != x
+if x"$os" != x"" 
 then
-
-# First recognize some ad-hoc caes, or perhaps split kernel-os, or else just
-# set os.
-case $basic_os in
-	gnu/linux*)
-		kernel=linux
-		os=`echo "$basic_os" | sed -e 's|gnu/linux|gnu|'`
-		;;
-	os2-emx)
-		kernel=os2
-		os=`echo "$basic_os" | sed -e 's|os2-emx|emx|'`
-		;;
-	nto-qnx*)
-		kernel=nto
-		os=`echo "$basic_os" | sed -e 's|nto-qnx|qnx|'`
-		;;
-	*-*)
-		# shellcheck disable=SC2162
-		saved_IFS=$IFS
-		IFS="-" read kernel os <<EOF
-$basic_os
-EOF
-		IFS=$saved_IFS
-		;;
-	# Default OS when just kernel was specified
-	nto*)
-		kernel=nto
-		os=`echo "$basic_os" | sed -e 's|nto|qnx|'`
-		;;
-	linux*)
-		kernel=linux
-		os=`echo "$basic_os" | sed -e 's|linux|gnu|'`
-		;;
-	*)
-		kernel=
-		os=$basic_os
-		;;
-esac
-
-# Now, normalize the OS (knowing we just have one component, it's not a kernel,
-# etc.)
 case $os in
 	# First match some system type aliases that might get confused
 	# with valid system types.
-	# solaris* is a basic system type, with this one exception.
-	auroraux)
-		os=auroraux
+	# -solaris* is a basic system type, with this one exception.
+	-auroraux)
+		os=-auroraux
 		;;
-	bluegene*)
-		os=cnk
+	-solaris1 | -solaris1.*)
+		os=`echo $os | sed -e 's|solaris1|sunos4|'`
 		;;
-	solaris1 | solaris1.*)
-		os=`echo "$os" | sed -e 's|solaris1|sunos4|'`
+	-solaris)
+		os=-solaris2
 		;;
-	solaris)
-		os=solaris2
+	-unixware*)
+		os=-sysv4.2uw
 		;;
-	unixware*)
-		os=sysv4.2uw
+	-gnu/linux*)
+		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
 		;;
 	# es1800 is here to avoid being matched by es* (a different OS)
-	es1800*)
-		os=ose
-		;;
-	# Some version numbers need modification
-	chorusos*)
-		os=chorusos
-		;;
-	isc)
-		os=isc2.2
-		;;
-	sco6)
-		os=sco5v6
-		;;
-	sco5)
-		os=sco3.2v5
-		;;
-	sco4)
-		os=sco3.2v4
-		;;
-	sco3.2.4-9*)
-		os=`echo "$os" | sed -e 's/sco3.2./sco3.2v/'`
+	-es1800*)
+		os=-ose
 		;;
-	sco*v* | scout)
-		# Don't match below
+	# Now accept the basic system types.
+	# The portable systems comes first.
+	# Each alternative MUST end in a * to match a version number.
+	# -sysv* is not here because it comes later, after sysvr4.
+	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
+	 | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos34*\
+	 | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
+	 | -sym* | -kopensolaris* | -plan9* \
+	 | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
+	 | -aos* | -aros* | -cloudabi* | -sortix* \
+	 | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
+	 | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
+	 | -hiux* | -knetbsd* | -mirbsd* | -netbsd* \
+	 | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \
+	 | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
+	 | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+	 | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+	 | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* | -hcos* \
+	 | -chorusos* | -chorusrdb* | -cegcc* | -glidix* \
+	 | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+	 | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
+	 | -linux-newlib* | -linux-musl* | -linux-uclibc* \
+	 | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
+	 | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* \
+	 | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
+	 | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
+	 | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
+	 | -morphos* | -superux* | -rtmk* | -windiss* \
+	 | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
+	 | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
+	 | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox* | -bme* \
+	 | -midnightbsd*)
+	# Remember, each alternative MUST END IN *, to match a version number.
+		;;
+	-qnx*)
+		case $basic_machine in
+		 x86-* | i*86-*)
+			;;
+		 *)
+			os=-nto$os
+			;;
+		esac
 		;;
-	sco*)
-		os=sco3.2v2
+	-nto-qnx*)
 		;;
-	psos*)
-		os=psos
+	-nto*)
+		os=`echo $os | sed -e 's|nto|nto-qnx|'`
 		;;
-	qnx*)
-		os=qnx
+	-sim | -xray | -os68k* | -v88r* \
+	 | -windows* | -osx | -abug | -netware* | -os9* \
+	 | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
 		;;
-	hiux*)
-		os=hiuxwe2
+	-mac*)
+		os=`echo "$os" | sed -e 's|mac|macos|'`
 		;;
-	lynx*178)
-		os=lynxos178
+	-linux-dietlibc)
+		os=-linux-dietlibc
 		;;
-	lynx*5)
-		os=lynxos5
+	-linux*)
+		os=`echo $os | sed -e 's|linux|linux-gnu|'`
 		;;
-	lynxos*)
-		# don't get caught up in next wildcard
+	-sunos5*)
+		os=`echo "$os" | sed -e 's|sunos5|solaris2|'`
 		;;
-	lynx*)
-		os=lynxos
+	-sunos6*)
+		os=`echo "$os" | sed -e 's|sunos6|solaris3|'`
 		;;
-	mac0-9*)
-		os=`echo "$os" | sed -e 's|mac|macos|'`
+	-opened*)
+		os=-openedition
 		;;
-	opened*)
-		os=openedition
+	-os400*)
+		os=-os400
 		;;
-	os400*)
-		os=os400
+	-wince*)
+		os=-wince
 		;;
-	sunos5*)
-		os=`echo "$os" | sed -e 's|sunos5|solaris2|'`
+	-utek*)
+		os=-bsd
 		;;
-	sunos6*)
-		os=`echo "$os" | sed -e 's|sunos6|solaris3|'`
+	-dynix*)
+		os=-bsd
 		;;
-	wince*)
-		os=wince
+	-acis*)
+		os=-aos
 		;;
-	utek*)
-		os=bsd
+	-atheos*)
+		os=-atheos
 		;;
-	dynix*)
-		os=bsd
+	-syllable*)
+		os=-syllable
 		;;
-	acis*)
-		os=aos
+	-386bsd)
+		os=-bsd
 		;;
-	atheos*)
-		os=atheos
+	-ctix* | -uts*)
+		os=-sysv
 		;;
-	syllable*)
-		os=syllable
+	-nova*)
+		os=-rtmk-nova
 		;;
-	386bsd)
-		os=bsd
+	-ns2)
+		os=-nextstep2
 		;;
-	ctix* | uts*)
-		os=sysv
+	-nsk*)
+		os=-nsk
 		;;
-	nova*)
-		os=rtmk-nova
+	# Preserve the version number of sinix5.
+	-sinix5.*)
+		os=`echo $os | sed -e 's|sinix|sysv|'`
 		;;
-	ns2)
-		os=nextstep2
+	-sinix*)
+		os=-sysv4
 		;;
-	# Preserve the version number of sinix5.
-	sinix5.*)
-		os=`echo "$os" | sed -e 's|sinix|sysv|'`
+	-tpf*)
+		os=-tpf
 		;;
-	sinix*)
-		os=sysv4
+	-triton*)
+		os=-sysv3
 		;;
-	tpf*)
-		os=tpf
+	-oss*)
+		os=-sysv3
 		;;
-	triton*)
-		os=sysv3
+	-svr4*)
+		os=-sysv4
 		;;
-	oss*)
-		os=sysv3
+	-svr3)
+		os=-sysv3
 		;;
-	svr4*)
-		os=sysv4
+	-sysvr4)
+		os=-sysv4
 		;;
-	svr3)
-		os=sysv3
+	# This must come after -sysvr4.
+	-sysv*)
 		;;
-	sysvr4)
-		os=sysv4
+	-ose*)
+		os=-ose
 		;;
-	ose*)
-		os=ose
+	-*mint | -mint0-9* | -*MiNT | -MiNT0-9*)
+		os=-mint
 		;;
-	*mint | mint0-9* | *MiNT | MiNT0-9*)
-		os=mint
+	-zvmoe)
+		os=-zvmoe
 		;;
-	dicos*)
-		os=dicos
+	-dicos*)
+		os=-dicos
 		;;
-	pikeos*)
+	-pikeos*)
 		# Until real need of OS specific support for
 		# particular features comes up, bare metal
 		# configurations are quite functional.
-		case $cpu in
+		case $basic_machine in
 		 arm*)
-			os=eabi
+			os=-eabi
 			;;
 		 *)
-			os=elf
+			os=-elf
 			;;
 		esac
 		;;
+	-nacl*)
+		;;
+	-ios)
+		;;
+	-none)
+		;;
 	*)
-		# No normalization, but not necessarily accepted, that comes below.
+		# Get rid of the `-' at the beginning of $os.
+		os=`echo $os | sed 's/^-*-//'`
+		echo Invalid configuration \`"$1"\': system \`"$os"\' not recognized 1>&2
+		exit 1
 		;;
 esac
-
 else
 
 # Here we handle the default operating systems that come with various machines.
@@ -1522,362 +1543,258 @@
 # will signal an error saying that MANUFACTURER isn't an operating
 # system, and we'll never get to this point.
 
-kernel=
-case $cpu-$vendor in
+case $basic_machine in
 	score-*)
-		os=elf
+		os=-elf
 		;;
 	spu-*)
-		os=elf
+		os=-elf
 		;;
 	*-acorn)
-		os=riscix1.2
+		os=-riscix1.2
 		;;
 	arm*-rebel)
-		kernel=linux
-		os=gnu
+		os=-linux
 		;;
 	arm*-semi)
-		os=aout
+		os=-aout
 		;;
 	c4x-* | tic4x-*)
-		os=coff
+		os=-coff
 		;;
 	c8051-*)
-		os=elf
-		;;
-	clipper-intergraph)
-		os=clix
+		os=-elf
 		;;
 	hexagon-*)
-		os=elf
+		os=-elf
 		;;
 	tic54x-*)
-		os=coff
+		os=-coff
 		;;
 	tic55x-*)
-		os=coff
+		os=-coff
 		;;
 	tic6x-*)
-		os=coff
+		os=-coff
 		;;
 	# This must come before the *-dec entry.
 	pdp10-*)
-		os=tops20
+		os=-tops20
 		;;
 	pdp11-*)
-		os=none
+		os=-none
 		;;
 	*-dec | vax-*)
-		os=ultrix4.2
+		os=-ultrix4.2
 		;;
 	m68*-apollo)
-		os=domain
+		os=-domain
 		;;
 	i386-sun)
-		os=sunos4.0.2
+		os=-sunos4.0.2
 		;;
 	m68000-sun)
-		os=sunos3
+		os=-sunos3
 		;;
 	m68*-cisco)
-		os=aout
+		os=-aout
 		;;
 	mep-*)
-		os=elf
+		os=-elf
 		;;
 	mips*-cisco)
-		os=elf
+		os=-elf
 		;;
 	mips*-*)
-		os=elf
+		os=-elf
 		;;
 	or32-*)
-		os=coff
+		os=-coff
 		;;
 	*-tti)	# must be before sparc entry or we get the wrong os.
-		os=sysv3
+		os=-sysv3
 		;;
 	sparc-* | *-sun)
-		os=sunos4.1.1
+		os=-sunos4.1.1
 		;;
 	pru-*)
-		os=elf
+		os=-elf
 		;;
 	*-be)
-		os=beos
+		os=-beos
 		;;
 	*-ibm)
-		os=aix
+		os=-aix
 		;;
 	*-knuth)
-		os=mmixware
+		os=-mmixware
 		;;
 	*-wec)
-		os=proelf
+		os=-proelf
 		;;
 	*-winbond)
-		os=proelf
+		os=-proelf
 		;;
 	*-oki)
-		os=proelf
+		os=-proelf
 		;;
 	*-hp)
-		os=hpux
+		os=-hpux
 		;;
 	*-hitachi)
-		os=hiux
+		os=-hiux
 		;;
 	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
-		os=sysv
+		os=-sysv
 		;;
 	*-cbm)
-		os=amigaos
+		os=-amigaos
 		;;
 	*-dg)
-		os=dgux
+		os=-dgux
 		;;
 	*-dolphin)
-		os=sysv3
+		os=-sysv3
 		;;
 	m68k-ccur)
-		os=rtu
+		os=-rtu
 		;;
 	m88k-omron*)
-		os=luna
+		os=-luna
 		;;
 	*-next)
-		os=nextstep
+		os=-nextstep
 		;;
 	*-sequent)
-		os=ptx
+		os=-ptx
 		;;
 	*-crds)
-		os=unos
+		os=-unos
 		;;
 	*-ns)
-		os=genix
+		os=-genix
 		;;
 	i370-*)
-		os=mvs
+		os=-mvs
 		;;
 	*-gould)
-		os=sysv
+		os=-sysv
 		;;
 	*-highlevel)
-		os=bsd
+		os=-bsd
 		;;
 	*-encore)
-		os=bsd
+		os=-bsd
 		;;
 	*-sgi)
-		os=irix
+		os=-irix
 		;;
 	*-siemens)
-		os=sysv4
+		os=-sysv4
 		;;
 	*-masscomp)
-		os=rtu
+		os=-rtu
 		;;
 	f3001-fujitsu | f700-fujitsu)
-		os=uxpv
+		os=-uxpv
 		;;
 	*-rom68k)
-		os=coff
+		os=-coff
 		;;
 	*-*bug)
-		os=coff
+		os=-coff
 		;;
 	*-apple)
-		os=macos
+		os=-macos
 		;;
 	*-atari*)
-		os=mint
-		;;
-	*-wrs)
-		os=vxworks
+		os=-mint
 		;;
 	*)
-		os=none
+		os=-none
 		;;
 esac
-
 fi
 
-# Now, validate our (potentially fixed-up) OS.
-case $os in
-	# Sometimes we do "kernel-libc", so those need to count as OSes.
-	musl* | newlib* | relibc* | uclibc*)
-		;;
-	# Likewise for "kernel-abi"
-	eabi* | gnueabi*)
-		;;
-	# VxWorks passes extra cpu info in the 4th filed.
-	simlinux | simwindows | spe)
-		;;
-	# Now accept the basic system types.
-	# The portable systems comes first.
-	# Each alternative MUST end in a * to match a version number.
-	gnu* | android* | bsd* | mach* | minix* | genix* | ultrix* | irix* \
-	 | *vms* | esix* | aix* | cnk* | sunos | sunos34* \
-	 | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \
-	 | sym* | plan9* | psp* | sim* | xray* | os68k* | v88r* \
-	 | hiux* | abug | nacl* | netware* | windows* \
-	 | os9* | macos* | osx* | ios* \
-	 | mpw* | magic* | mmixware* | mon960* | lnews* \
-	 | amigaos* | amigados* | msdos* | newsos* | unicos* | aof* \
-	 | aos* | aros* | cloudabi* | sortix* | twizzler* \
-	 | nindy* | vxsim* | vxworks* | ebmon* | hms* | mvs* \
-	 | clix* | riscos* | uniplus* | iris* | isc* | rtu* | xenix* \
-	 | mirbsd* | netbsd* | dicos* | openedition* | ose* \
-	 | bitrig* | openbsd* | secbsd* | solidbsd* | libertybsd* | os108* \
-	 | ekkobsd* | freebsd* | riscix* | lynxos* | os400* \
-	 | bosx* | nextstep* | cxux* | aout* | elf* | oabi* \
-	 | ptx* | coff* | ecoff* | winnt* | domain* | vsta* \
-	 | udi* | lites* | ieee* | go32* | aux* | hcos* \
-	 | chorusrdb* | cegcc* | glidix* | serenity* \
-	 | cygwin* | msys* | pe* | moss* | proelf* | rtems* \
-	 | midipix* | mingw32* | mingw64* | mint* \
-	 | uxpv* | beos* | mpeix* | udk* | moxiebox* \
-	 | interix* | uwin* | mks* | rhapsody* | darwin* \
-	 | openstep* | oskit* | conix* | pw32* | nonstopux* \
-	 | storm-chaos* | tops10* | tenex* | tops20* | its* \
-	 | os2* | vos* | palmos* | uclinux* | nucleus* | morphos* \
-	 | scout* | superux* | sysv* | rtmk* | tpf* | windiss* \
-	 | powermax* | dnix* | nx6 | nx7 | sei* | dragonfly* \
-	 | skyos* | haiku* | rdos* | toppers* | drops* | es* \
-	 | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \
-	 | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \
-	 | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx* | zephyr*)
-		;;
-	# This one is extra strict with allowed versions
-	sco3.2v2 | sco3.2v4-9* | sco5v6*)
-		# Don't forget version if it is 3.2v4 or newer.
-		;;
-	none)
-		;;
-	*)
-		echo Invalid configuration \`"$1"\': OS \`"$os"\' not recognized 1>&2
-		exit 1
-		;;
-esac
-
-# As a final step for OS-related things, validate the OS-kernel combination
-# (given a valid OS), if there is a kernel.
-case $kernel-$os in
-	linux-gnu* | linux-dietlibc* | linux-android* | linux-newlib* \
-		 | linux-musl* | linux-relibc* | linux-uclibc* )
-		;;
-	uclinux-uclibc* )
-		;;
-	-dietlibc* | -newlib* | -musl* | -relibc* | -uclibc* )
-		# These are just libc implementations, not actual OSes, and thus
-		# require a kernel.
-		echo "Invalid configuration \`$1': libc \`$os' needs explicit kernel." 1>&2
-		exit 1
-		;;
-	kfreebsd*-gnu* | kopensolaris*-gnu*)
-		;;
-	vxworks-simlinux | vxworks-simwindows | vxworks-spe)
-		;;
-	nto-qnx*)
-		;;
-	os2-emx)
-		;;
-	*-eabi* | *-gnueabi*)
-		;;
-	-*)
-		# Blank kernel with real OS is always fine.
-		;;
-	*-*)
-		echo "Invalid configuration \`$1': Kernel \`$kernel' not known to work with OS \`$os'." 1>&2
-		exit 1
-		;;
-esac
-
 # Here we handle the case where we know the os, and the CPU type, but not the
 # manufacturer. We pick the logical manufacturer.
-case $vendor in
-	unknown)
-		case $cpu-$os in
-			*-riscix*)
+vendor=unknown
+case $basic_machine in
+	*-unknown)
+		case $os in
+			-riscix*)
 				vendor=acorn
 				;;
-			*-sunos*)
+			-sunos*)
 				vendor=sun
 				;;
-			*-cnk* | *-aix*)
+			-cnk*|-aix*)
 				vendor=ibm
 				;;
-			*-beos*)
+			-beos*)
 				vendor=be
 				;;
-			*-hpux*)
+			-hpux*)
 				vendor=hp
 				;;
-			*-mpeix*)
+			-mpeix*)
 				vendor=hp
 				;;
-			*-hiux*)
+			-hiux*)
 				vendor=hitachi
 				;;
-			*-unos*)
+			-unos*)
 				vendor=crds
 				;;
-			*-dgux*)
+			-dgux*)
 				vendor=dg
 				;;
-			*-luna*)
+			-luna*)
 				vendor=omron
 				;;
-			*-genix*)
+			-genix*)
 				vendor=ns
 				;;
-			*-clix*)
-				vendor=intergraph
-				;;
-			*-mvs* | *-opened*)
-				vendor=ibm
-				;;
-			*-os400*)
+			-mvs* | -opened*)
 				vendor=ibm
 				;;
-			s390-* | s390x-*)
+			-os400*)
 				vendor=ibm
 				;;
-			*-ptx*)
+			-ptx*)
 				vendor=sequent
 				;;
-			*-tpf*)
+			-tpf*)
 				vendor=ibm
 				;;
-			*-vxsim* | *-vxworks* | *-windiss*)
+			-vxsim* | -vxworks* | -windiss*)
 				vendor=wrs
 				;;
-			*-aux*)
+			-aux*)
 				vendor=apple
 				;;
-			*-hms*)
+			-hms*)
 				vendor=hitachi
 				;;
-			*-mpw* | *-macos*)
+			-mpw* | -macos*)
 				vendor=apple
 				;;
-			*-*mint | *-mint0-9* | *-*MiNT | *-MiNT0-9*)
+			-*mint | -mint0-9* | -*MiNT | -MiNT0-9*)
 				vendor=atari
 				;;
-			*-vos*)
+			-vos*)
 				vendor=stratus
 				;;
 		esac
+		basic_machine=`echo "$basic_machine" | sed "s/unknown/$vendor/"`
 		;;
 esac
 
-echo "$cpu-$vendor-${kernel:+$kernel-}$os"
+echo "$basic_machine$os"
 exit
 
 # Local variables:
-# eval: (add-hook 'before-save-hook 'time-stamp)
+# eval: (add-hook 'write-file-functions 'time-stamp)
 # time-stamp-start: "timestamp='"
 # time-stamp-format: "%:y-%02m-%02d"
 # time-stamp-end: "'"

_service:tar_scm:libX11-1.8.1.tar.xz/configure -> _service:tar_scm:libX11-1.8.4.tar.xz/configure Changed

@@ -1,12 +1,11 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.71 for libX11 1.8.1.
+# Generated by GNU Autoconf 2.69 for libX11 1.8.4.
 #
-# Report bugs to <https://gitlab.freedesktop.org/xorg/lib/libx11/issues>.
+# Report bugs to <https://gitlab.freedesktop.org/xorg/lib/libx11/-/issues>.
 #
 #
-# Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation,
-# Inc.
+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
 #
 #
 # This configure script is free software; the Free Software Foundation
@@ -17,16 +16,14 @@
 
 # Be more Bourne compatible
 DUALCASE=1; export DUALCASE # for MKS sh
-as_nop=:
-if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1
-then :
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
 emulate sh
 NULLCMD=:
 # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
 # is contrary to our usage. Disable this feature.
 alias -g '${1+"$@"}'='"$@"'
 setopt NO_GLOB_SUBST
-else $as_nop
+else
 case `(set -o) 2>/dev/null` in #(
 *posix*) :
 set -o posix ;; #(
@@ -36,46 +33,46 @@
 fi
 
 
-
-# Reset variables that may have inherited troublesome values from
-# the environment.
-
-# IFS needs to be set, to space, tab, and newline, in precisely that order.
-# (If _AS_PATH_WALK were called with IFS unset, it would have the
-# side effect of setting IFS to empty, thus disabling word splitting.)
-# Quoting is to prevent editors from complaining about space-tab.
 as_nl='
 '
 export as_nl
-IFS=" ""	$as_nl"
-
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# Ensure predictable behavior from utilities with locale-dependent output.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
-
-# We cannot yet rely on "unset" to work, but we need these variables
-# to be unset--not just set to an empty or harmless value--now, to
-# avoid bugs in old shells (e.g. pre-3.0 UWIN ksh). This construct
-# also avoids known problems related to "unset" and subshell syntax
-# in other old shells (e.g. bash 2.01 and pdksh 5.2.14).
-for as_var in BASH_ENV ENV MAIL MAILPATH CDPATH
-do eval test \${$as_var+y} \
- && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
-done
-
-# Ensure that fds 0, 1, and 2 are open.
-if (exec 3>&0) 2>/dev/null; then :; else exec 0</dev/null; fi
-if (exec 3>&1) 2>/dev/null; then :; else exec 1>/dev/null; fi
-if (exec 3>&2) ; then :; else exec 2>/dev/null; fi
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+ && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+ as_echo='print -r --'
+ as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+ as_echo='printf %s\n'
+ as_echo_n='printf %s'
+else
+ if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+ as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+ as_echo_n='/usr/ucb/echo -n'
+ else
+ as_echo_body='eval expr "X$1" : "X\$.*\$"'
+ as_echo_n_body='eval
+ arg=$1;
+ case $arg in #(
+ *"$as_nl"*)
+	expr "X$arg" : "X\$.*\$$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\$.*\$"`;;
+ esac;
+ expr "X$arg" : "X\$.*\$" | tr -d "$as_nl"
+ '
+ export as_echo_n_body
+ as_echo_n='sh -c $as_echo_n_body as_echo'
+ fi
+ export as_echo_body
+ as_echo='sh -c $as_echo_body as_echo'
+fi
 
 # The user is always right.
-if ${PATH_SEPARATOR+false} :; then
+if test "${PATH_SEPARATOR+set}" != set; then
 PATH_SEPARATOR=:
 (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
 (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
@@ -84,6 +81,13 @@
 fi
 
 
+# IFS
+# We need space, tab and new line, in precisely that order. Quoting is
+# there to prevent editors from complaining about space-tab.
+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
+# splitting by setting IFS to empty value.)
+IFS=" ""	$as_nl"
+
 # Find who we are. Look in the path if we contain no directory separator.
 as_myself=
 case $0 in #((
@@ -92,12 +96,8 @@
 for as_dir in $PATH
 do
 IFS=$as_save_IFS
- case $as_dir in #(((
- '') as_dir=./ ;;
- */) ;;
- *) as_dir=$as_dir/ ;;
- esac
- test -r "$as_dir$0" && as_myself=$as_dir$0 && break
+ test -z "$as_dir" && as_dir=.
+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
 done
 IFS=$as_save_IFS
 
@@ -109,10 +109,30 @@
 as_myself=$0
 fi
 if test ! -f "$as_myself"; then
- printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+ $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
 exit 1
 fi
 
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there. '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+done
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# NLS nuisances.
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# CDPATH.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 # Use a proper internal environment variable to ensure we don't fall
 # into an infinite loop, continuously re-executing ourselves.
@@ -134,22 +154,20 @@
 exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
 # Admittedly, this is quite paranoid, since all the known shells bail
 # out after a failed `exec'.
-printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2
-exit 255
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+as_fn_exit 255
 fi
 # We don't want this to propagate to other subprocesses.
 { _as_can_reexec=; unset _as_can_reexec;}
 if test "x$CONFIG_SHELL" = x; then
- as_bourne_compatible="as_nop=:
-if test \${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1
-then :
+ as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
 emulate sh
 NULLCMD=:
 # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
 # is contrary to our usage. Disable this feature.
 alias -g '\${1+\"\$@\"}'='\"\$@\"'
 setopt NO_GLOB_SUBST
-else \$as_nop
+else
 case \`(set -o) 2>/dev/null\` in #(
 *posix*) :
 set -o posix ;; #(
@@ -169,20 +187,18 @@
 as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
 as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
 as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
-if ( set x; as_fn_ret_success y && test x = \"\$1\" )
-then :
+if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
 
-else \$as_nop
+else
 exitcode=1; echo positional parameters were not saved.
 fi
 test x\$exitcode = x0 || exit 1
-blah=\$(echo \$(echo blah))
-test x\"\$blah\" = xblah || exit 1
 test -x / || exit 1"
 as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
 as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
 eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
 test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
+test \$(( 1 + 1 )) = 2 || exit 1
 
 test -n \"\${ZSH_VERSION+set}\${BASH_VERSION+set}\" || (
 ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
@@ -190,40 +206,31 @@
 ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
 PATH=/empty FPATH=/empty; export PATH FPATH
 test \"X\`printf %s \$ECHO\`\" = \"X\$ECHO\" \\
- || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1
-test \$(( 1 + 1 )) = 2 || exit 1"
- if (eval "$as_required") 2>/dev/null
-then :
+ || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1"
+ if (eval "$as_required") 2>/dev/null; then :
 as_have_required=yes
-else $as_nop
+else
 as_have_required=no
 fi
- if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null
-then :
+ if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
 
-else $as_nop
+else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 as_found=false
 for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
 do
 IFS=$as_save_IFS
- case $as_dir in #(((
- '') as_dir=./ ;;
- */) ;;
- *) as_dir=$as_dir/ ;;
- esac
+ test -z "$as_dir" && as_dir=.
 as_found=:
 case $as_dir in #(
 	 /*)
 	 for as_base in sh bash ksh sh5; do
 	 # Try only shells that exist, to save several forks.
-	 as_shell=$as_dir$as_base
+	 as_shell=$as_dir/$as_base
 	 if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
-		 as_run=a "$as_shell" -c "$as_bourne_compatible""$as_required" 2>/dev/null
-then :
+		 { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
 CONFIG_SHELL=$as_shell as_have_required=yes
-		 if as_run=a "$as_shell" -c "$as_bourne_compatible""$as_suggested" 2>/dev/null
-then :
+		 if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
 break 2
 fi
 fi
@@ -231,21 +238,14 @@
 esac
 as_found=false
 done
-IFS=$as_save_IFS
-if $as_found
-then :
-
-else $as_nop
- if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
-	 as_run=a "$SHELL" -c "$as_bourne_compatible""$as_required" 2>/dev/null
-then :
+$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
+	 { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
 CONFIG_SHELL=$SHELL as_have_required=yes
-fi
-fi
+fi; }
+IFS=$as_save_IFS
 
 
- if test "x$CONFIG_SHELL" != x
-then :
+ if test "x$CONFIG_SHELL" != x; then :
 export CONFIG_SHELL
 # We cannot yet assume a decent shell, so we have to provide a
 # neutralization value for shells without unset; and this also
@@ -263,20 +263,19 @@
 exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
 # Admittedly, this is quite paranoid, since all the known shells bail
 # out after a failed `exec'.
-printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
 exit 255
 fi
 
- if test x$as_have_required = xno
-then :
- printf "%s\n" "$0: This script requires a shell more modern than all"
- printf "%s\n" "$0: the shells that I found on your system."
- if test ${ZSH_VERSION+y} ; then
- printf "%s\n" "$0: In particular, zsh $ZSH_VERSION has bugs and should"
- printf "%s\n" "$0: be upgraded to zsh 4.3.4 or later."
+ if test x$as_have_required = xno; then :
+ $as_echo "$0: This script requires a shell more modern than all"
+ $as_echo "$0: the shells that I found on your system."
+ if test x${ZSH_VERSION+set} = xset ; then
+ $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
+ $as_echo "$0: be upgraded to zsh 4.3.4 or later."
 else
- printf "%s\n" "$0: Please tell bug-autoconf@gnu.org and
-$0: https://gitlab.freedesktop.org/xorg/lib/libx11/issues
+ $as_echo "$0: Please tell bug-autoconf@gnu.org and
+$0: https://gitlab.freedesktop.org/xorg/lib/libx11/-/issues
 $0: about your system, including any error possibly output
 $0: before this message. Then install a modern shell, or
 $0: manually run the script under such a shell if you do
@@ -304,7 +303,6 @@
 }
 as_unset=as_fn_unset
 
-
 # as_fn_set_status STATUS
 # -----------------------
 # Set $? to STATUS, without forking.
@@ -322,14 +320,6 @@
 as_fn_set_status $1
 exit $1
 } # as_fn_exit
-# as_fn_nop
-# ---------
-# Do nothing but, unlike ":", preserve the value of $?.
-as_fn_nop ()
-{
- return $?
-}
-as_nop=as_fn_nop
 
 # as_fn_mkdir_p
 # -------------
@@ -344,7 +334,7 @@
 as_dirs=
 while :; do
 case $as_dir in #(
- *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
 *) as_qdir=$as_dir;;
 esac
 as_dirs="'$as_qdir' $as_dirs"
@@ -353,7 +343,7 @@
 	 X"$as_dir" : 'X$//$^/' \| \
 	 X"$as_dir" : 'X$//$$' \| \
 	 X"$as_dir" : 'X$/$' \| . 2>/dev/null ||
-printf "%s\n" X"$as_dir" |
+$as_echo X"$as_dir" |
 sed '/^X$.*^/$\/\/*^/^/*\/*$/{
 	 s//\1/
 	 q
@@ -392,13 +382,12 @@
 # advantage of any shell optimizations that allow amortized linear growth over
 # repeated appends, instead of the typical quadratic growth present in naive
 # implementations.
-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null
-then :
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
 eval 'as_fn_append ()
 {
 eval $1+=\$2
 }'
-else $as_nop
+else
 as_fn_append ()
 {
 eval $1=\$$1\$2
@@ -410,27 +399,18 @@
 # Perform arithmetic evaluation on the ARGs, and store the result in the
 # global $as_val. Take advantage of shells that can avoid forks. The arguments
 # must be portable across $(()) and expr.
-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null
-then :
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
 eval 'as_fn_arith ()
 {
 as_val=$(( $* ))
 }'
-else $as_nop
+else
 as_fn_arith ()
 {
 as_val=`expr "$@" || test $? -eq 1`
 }
 fi # as_fn_arith
 
-# as_fn_nop
-# ---------
-# Do nothing but, unlike ":", preserve the value of $?.
-as_fn_nop ()
-{
- return $?
-}
-as_nop=as_fn_nop
 
 # as_fn_error STATUS ERROR LINENO LOG_FD
 # ----------------------------------------
@@ -442,9 +422,9 @@
 as_status=$1; test $as_status -eq 0 && as_status=1
 if test "$4"; then
 as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
 fi
- printf "%s\n" "$as_me: error: $2" >&2
+ $as_echo "$as_me: error: $2" >&2
 as_fn_exit $as_status
 } # as_fn_error
 
@@ -471,7 +451,7 @@
 $as_expr X/"$0" : '.*/$^/^/*$/*$' \| \
 	 X"$0" : 'X$//$$' \| \
 	 X"$0" : 'X$/$' \| . 2>/dev/null ||
-printf "%s\n" X/"$0" |
+$as_echo X/"$0" |
 sed '/^.*\/$^/^/*$\/*$/{
 	 s//\1/
 	 q
@@ -515,7 +495,7 @@
 s/-\n.*//
 ' >$as_me.lineno &&
 chmod +x "$as_me.lineno" ||
- { printf "%s\n" "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
+ { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
 
 # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
 # already done that, so ensure we don't try to do so again and fall
@@ -529,10 +509,6 @@
 exit
 }
 
-
-# Determine whether it's possible to make 'echo' print without a newline.
-# These variables are no longer used directly by Autoconf, but are AC_SUBSTed
-# for compatibility with existing Makefiles.
 ECHO_C= ECHO_N= ECHO_T=
 case `echo -n x` in #(((((
 -n*)
@@ -546,13 +522,6 @@
 ECHO_N='-n';;
 esac
 
-# For backward compatibility with old third-party macros, we provide
-# the shell variables $as_echo and $as_echo_n. New code should use
-# AS_ECHO("message") and AS_ECHO_N("message"), respectively.
-as_echo='printf %s\n'
-as_echo_n='printf %s'
-
-
 rm -f conf$$ conf$$.exe conf$$.file
 if test -d conf$$.dir; then
 rm -f conf$$.dir/conf$$.file
@@ -682,45 +651,49 @@
 # Identity of this package.
 PACKAGE_NAME='libX11'
 PACKAGE_TARNAME='libX11'
-PACKAGE_VERSION='1.8.1'
-PACKAGE_STRING='libX11 1.8.1'
-PACKAGE_BUGREPORT='https://gitlab.freedesktop.org/xorg/lib/libx11/issues'
+PACKAGE_VERSION='1.8.4'
+PACKAGE_STRING='libX11 1.8.4'
+PACKAGE_BUGREPORT='https://gitlab.freedesktop.org/xorg/lib/libx11/-/issues'
 PACKAGE_URL=''
 
 ac_unique_file="Makefile.am"
 # Factoring default headers for most tests.
 ac_includes_default="\
-#include <stddef.h>
-#ifdef HAVE_STDIO_H
-# include <stdio.h>
+#include <stdio.h>
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
 #endif
-#ifdef HAVE_STDLIB_H
+#ifdef HAVE_SYS_STAT_H
+# include <sys/stat.h>
+#endif
+#ifdef STDC_HEADERS
 # include <stdlib.h>
+# include <stddef.h>
+#else
+# ifdef HAVE_STDLIB_H
+# include <stdlib.h>
+# endif
 #endif
 #ifdef HAVE_STRING_H
+# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
+# include <memory.h>
+# endif
 # include <string.h>
 #endif
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif
 #ifdef HAVE_INTTYPES_H
 # include <inttypes.h>
 #endif
 #ifdef HAVE_STDINT_H
 # include <stdint.h>
 #endif
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif"
 
-ac_header_c_list=
-ac_func_c_list=
+ac_header_list=
 ac_subst_vars='am__EXEEXT_FALSE
 am__EXEEXT_TRUE
 LTLIBOBJS
@@ -757,10 +730,9 @@
 XCMS_FALSE
 XCMS_TRUE
 KEYSYMDEFS
+USE_THREAD_LIBS
 XTHREAD_CFLAGS
 XTHREADLIB
-THRSTUBS_FALSE
-THRSTUBS_TRUE
 LAUNCHD
 OS2_FALSE
 OS2_TRUE
@@ -781,7 +753,6 @@
 TRADITIONALCPPFLAGS
 RAWCPPFLAGS
 RAWCPP
-CPP
 HAVE_STYLESHEETS_FALSE
 HAVE_STYLESHEETS_TRUE
 XSL_STYLESHEET
@@ -834,24 +805,18 @@
 AR
 DLLTOOL
 OBJDUMP
-FILECMD
 LN_S
 NM
 ac_ct_DUMPBIN
 DUMPBIN
 LD
 FGREP
-EGREP
-GREP
 SED
 LIBTOOL
 AM_BACKSLASH
 AM_DEFAULT_VERBOSITY
 AM_DEFAULT_V
 AM_V
-CSCOPE
-ETAGS
-CTAGS
 am__fastdepCC_FALSE
 am__fastdepCC_TRUE
 CCDEPMODE
@@ -859,6 +824,7 @@
 AMDEPBACKSLASH
 AMDEP_FALSE
 AMDEP_TRUE
+am__quote
 am__include
 DEPDIR
 am__untar
@@ -884,6 +850,9 @@
 INSTALL_DATA
 INSTALL_SCRIPT
 INSTALL_PROGRAM
+EGREP
+GREP
+CPP
 OBJEXT
 EXEEXT
 ac_ct_CC
@@ -918,7 +887,6 @@
 docdir
 oldincludedir
 includedir
-runstatedir
 localstatedir
 sharedstatedir
 sysconfdir
@@ -937,8 +905,7 @@
 PACKAGE_TARNAME
 PACKAGE_NAME
 PATH_SEPARATOR
-SHELL
-am__quote'
+SHELL'
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
@@ -989,6 +956,7 @@
 LDFLAGS
 LIBS
 CPPFLAGS
+CPP
 LT_SYS_LIBRARY_PATH
 PKG_CONFIG
 PKG_CONFIG_PATH
@@ -996,7 +964,6 @@
 XMLTO
 FOP
 XSLTPROC
-CPP
 PERL
 BIGFONT_CFLAGS
 BIGFONT_LIBS
@@ -1042,7 +1009,6 @@
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
-runstatedir='${localstatedir}/run'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
 docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -1072,6 +1038,8 @@
 *) ac_optarg=yes ;;
 esac
 
+ # Accept the important Cygnus configure options, so we can diagnose typos.
+
 case $ac_dashdash$ac_option in
 --)
 ac_dashdash=yes ;;
@@ -1112,9 +1080,9 @@
 ac_useropt=`expr "x$ac_option" : 'x-*disable-$.*$'`
 # Reject names that are not valid shell variable names.
 expr "x$ac_useropt" : ".*^-+._$as_cr_alnum" >/dev/null &&
- as_fn_error $? "invalid feature name: \`$ac_useropt'"
+ as_fn_error $? "invalid feature name: $ac_useropt"
 ac_useropt_orig=$ac_useropt
- ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/-+./_/g'`
+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/-+./_/g'`
 case $ac_user_opts in
 *"
 "enable_$ac_useropt"
@@ -1138,9 +1106,9 @@
 ac_useropt=`expr "x$ac_option" : 'x-*enable-$^=*$'`
 # Reject names that are not valid shell variable names.
 expr "x$ac_useropt" : ".*^-+._$as_cr_alnum" >/dev/null &&
- as_fn_error $? "invalid feature name: \`$ac_useropt'"
+ as_fn_error $? "invalid feature name: $ac_useropt"
 ac_useropt_orig=$ac_useropt
- ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/-+./_/g'`
+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/-+./_/g'`
 case $ac_user_opts in
 *"
 "enable_$ac_useropt"
@@ -1293,15 +1261,6 @@
 | -silent | --silent | --silen | --sile | --sil)
 silent=yes ;;
 
- -runstatedir | --runstatedir | --runstatedi | --runstated \
- | --runstate | --runstat | --runsta | --runst | --runs \
- | --run | --ru | --r)
- ac_prev=runstatedir ;;
- -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
- | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
- | --run=* | --ru=* | --r=*)
- runstatedir=$ac_optarg ;;
-
 -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
 ac_prev=sbindir ;;
 -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1351,9 +1310,9 @@
 ac_useropt=`expr "x$ac_option" : 'x-*with-$^=*$'`
 # Reject names that are not valid shell variable names.
 expr "x$ac_useropt" : ".*^-+._$as_cr_alnum" >/dev/null &&
- as_fn_error $? "invalid package name: \`$ac_useropt'"
+ as_fn_error $? "invalid package name: $ac_useropt"
 ac_useropt_orig=$ac_useropt
- ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/-+./_/g'`
+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/-+./_/g'`
 case $ac_user_opts in
 *"
 "with_$ac_useropt"
@@ -1367,9 +1326,9 @@
 ac_useropt=`expr "x$ac_option" : 'x-*without-$.*$'`
 # Reject names that are not valid shell variable names.
 expr "x$ac_useropt" : ".*^-+._$as_cr_alnum" >/dev/null &&
- as_fn_error $? "invalid package name: \`$ac_useropt'"
+ as_fn_error $? "invalid package name: $ac_useropt"
 ac_useropt_orig=$ac_useropt
- ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/-+./_/g'`
+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/-+./_/g'`
 case $ac_user_opts in
 *"
 "with_$ac_useropt"
@@ -1413,9 +1372,9 @@
 
 *)
 # FIXME: should be removed in autoconf 3.0.
- printf "%s\n" "$as_me: WARNING: you should use --build, --host, --target" >&2
+ $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
 expr "x$ac_option" : ".*^-._$as_cr_alnum" >/dev/null &&
- printf "%s\n" "$as_me: WARNING: invalid host type: $ac_option" >&2
+ $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
 : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
 ;;
 
@@ -1431,7 +1390,7 @@
 case $enable_option_checking in
 no) ;;
 fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
- *) printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
+ *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
 esac
 fi
 
@@ -1439,7 +1398,7 @@
 for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
 		datadir sysconfdir sharedstatedir localstatedir includedir \
 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-		libdir localedir mandir runstatedir
+		libdir localedir mandir
 do
 eval ac_val=\$$ac_var
 # Remove trailing slashes.
@@ -1495,7 +1454,7 @@
 	 X"$as_myself" : 'X$//$^/' \| \
 	 X"$as_myself" : 'X$//$$' \| \
 	 X"$as_myself" : 'X$/$' \| . 2>/dev/null ||
-printf "%s\n" X"$as_myself" |
+$as_echo X"$as_myself" |
 sed '/^X$.*^/$\/\/*^/^/*\/*$/{
 	 s//\1/
 	 q
@@ -1552,7 +1511,7 @@
 # Omit some internal or obsolete options to make the list less imposing.
 # This message is too long to be a string in the A/UX 3.1 sh.
 cat <<_ACEOF
-\`configure' configures libX11 1.8.1 to adapt to many kinds of systems.
+\`configure' configures libX11 1.8.4 to adapt to many kinds of systems.
 
 Usage: $0 OPTION... VAR=VALUE...
 
@@ -1592,7 +1551,6 @@
 --sysconfdir=DIR read-only single-machine data PREFIX/etc
 --sharedstatedir=DIR modifiable architecture-independent data PREFIX/com
 --localstatedir=DIR modifiable single-machine data PREFIX/var
- --runstatedir=DIR modifiable per-process data LOCALSTATEDIR/run
 --libdir=DIR object code libraries EPREFIX/lib
 --includedir=DIR C header files PREFIX/include
 --oldincludedir=DIR C header files for non-gcc /usr/include
@@ -1623,7 +1581,7 @@
 
 if test -n "$ac_init_help"; then
 case $ac_init_help in
- short | recursive ) echo "Configuration of libX11 1.8.1:";;
+ short | recursive ) echo "Configuration of libX11 1.8.4:";;
 esac
 cat <<\_ACEOF
 
@@ -1707,6 +1665,7 @@
 LIBS libraries to pass to the linker, e.g. -l<library>
 CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
 you have headers in a nonstandard directory <include dir>
+ CPP C preprocessor
 LT_SYS_LIBRARY_PATH
 User-defined run-time library search path.
 PKG_CONFIG path to pkg-config utility
@@ -1717,7 +1676,6 @@
 XMLTO Path to xmlto command
 FOP Path to fop command
 XSLTPROC Path to xsltproc command
- CPP C preprocessor
 PERL Path to perl command
 BIGFONT_CFLAGS
 C compiler flags for BIGFONT, overriding pkg-config
@@ -1731,7 +1689,7 @@
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
 
-Report bugs to <https://gitlab.freedesktop.org/xorg/lib/libx11/issues>.
+Report bugs to <https://gitlab.freedesktop.org/xorg/lib/libx11/-/issues>.
 _ACEOF
 ac_status=$?
 fi
@@ -1747,9 +1705,9 @@
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
- ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.\\/||'`
+ ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.\\/||'`
 # A ".." for each directory in $ac_dir_suffix.
- ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/^\\/*|/..|g;s|/||'`
+ ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/^\\/*|/..|g;s|/||'`
 case $ac_top_builddir_sub in
 "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -1777,8 +1735,7 @@
 ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
 
 cd "$ac_dir" || { ac_status=$?; continue; }
- # Check for configure.gnu first; this name is used for a wrapper for
- # Metaconfig's "Configure" on case-insensitive file systems.
+ # Check for guested configure.
 if test -f "$ac_srcdir/configure.gnu"; then
 echo &&
 $SHELL "$ac_srcdir/configure.gnu" --help=recursive
@@ -1786,7 +1743,7 @@
 echo &&
 $SHELL "$ac_srcdir/configure" --help=recursive
 else
- printf "%s\n" "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+ $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
 fi || ac_status=$?
 cd "$ac_pwd" || { ac_status=$?; break; }
 done
@@ -1795,10 +1752,10 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
 cat <<\_ACEOF
-libX11 configure 1.8.1
-generated by GNU Autoconf 2.71
+libX11 configure 1.8.4
+generated by GNU Autoconf 2.69
 
-Copyright (C) 2021 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
@@ -1815,14 +1772,14 @@
 ac_fn_c_try_compile ()
 {
 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- rm -f conftest.$ac_objext conftest.beam
+ rm -f conftest.$ac_objext
 if { { ac_try="$ac_compile"
 case "(($ac_try" in
 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+$as_echo "$ac_try_echo"; } >&5
 (eval "$ac_compile") 2>conftest.err
 ac_status=$?
 if test -s conftest.err; then
@@ -1830,15 +1787,14 @@
 cat conftest.er1 >&5
 mv -f conftest.er1 conftest.err
 fi
- printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
- } && test -s conftest.$ac_objext
-then :
+ } && test -s conftest.$ac_objext; then :
 ac_retval=0
-else $as_nop
- printf "%s\n" "$as_me: failed program was:" >&5
+else
+ $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_retval=1
@@ -1848,6 +1804,176 @@
 
 } # ac_fn_c_try_compile
 
+# ac_fn_c_try_cpp LINENO
+# ----------------------
+# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_cpp ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ if { { ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
+ ac_status=$?
+ if test -s conftest.err; then
+ grep -v '^ *+' conftest.err >conftest.er1
+ cat conftest.er1 >&5
+ mv -f conftest.er1 conftest.err
+ fi
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } > conftest.i && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+ }; then :
+ ac_retval=0
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_retval=1
+fi
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_cpp
+
+# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
+# -------------------------------------------------------
+# Tests whether HEADER exists, giving a warning if it cannot be compiled using
+# the include files in INCLUDES and setting the cache variable VAR
+# accordingly.
+ac_fn_c_check_header_mongrel ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ if eval \${$3+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+ $as_echo_n "(cached) " >&6
+fi
+eval ac_res=\$$3
+	 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+else
+ # Is the header compilable?
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
+$as_echo_n "checking $2 usability... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$4
+#include <$2>
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_header_compiler=yes
+else
+ ac_header_compiler=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
+$as_echo_n "checking $2 presence... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <$2>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+ ac_header_preproc=yes
+else
+ ac_header_preproc=no
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
+ yes:no: )
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+ ;;
+ no:yes:* )
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+( $as_echo "## ---------------------------------------------------------------------- ##
+## Report this to https://gitlab.freedesktop.org/xorg/lib/libx11/-/issues ##
+## ---------------------------------------------------------------------- ##"
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ eval "$3=\$ac_header_compiler"
+fi
+eval ac_res=\$$3
+	 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+fi
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_header_mongrel
+
+# ac_fn_c_try_run LINENO
+# ----------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
+# that executables *can* be run.
+ac_fn_c_try_run ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ if { { ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_link") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
+ { { case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; }; then :
+ ac_retval=0
+else
+ $as_echo "$as_me: program exited with status $ac_status" >&5
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_retval=$ac_status
+fi
+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_run
+
 # ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
 # -------------------------------------------------------
 # Tests whether HEADER exists and can be compiled using the include files in
@@ -1855,28 +1981,26 @@
 ac_fn_c_check_header_compile ()
 {
 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-printf %s "checking for $2... " >&6; }
-if eval test \${$3+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 $4
 #include <$2>
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 eval "$3=yes"
-else $as_nop
+else
 eval "$3=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 eval ac_res=\$$3
-	 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_header_compile
@@ -1887,14 +2011,14 @@
 ac_fn_c_try_link ()
 {
 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- rm -f conftest.$ac_objext conftest.beam conftest$ac_exeext
+ rm -f conftest.$ac_objext conftest$ac_exeext
 if { { ac_try="$ac_link"
 case "(($ac_try" in
 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+$as_echo "$ac_try_echo"; } >&5
 (eval "$ac_link") 2>conftest.err
 ac_status=$?
 if test -s conftest.err; then
@@ -1902,18 +2026,17 @@
 cat conftest.er1 >&5
 mv -f conftest.er1 conftest.err
 fi
- printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
 } && test -s conftest$ac_exeext && {
 	 test "$cross_compiling" = yes ||
 	 test -x conftest$ac_exeext
- }
-then :
+ }; then :
 ac_retval=0
-else $as_nop
- printf "%s\n" "$as_me: failed program was:" >&5
+else
+ $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_retval=1
@@ -1934,12 +2057,11 @@
 ac_fn_c_check_func ()
 {
 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-printf %s "checking for $2... " >&6; }
-if eval test \${$3+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 /* Define $2 to an innocuous variant, in case <limits.h> declares $2.
@@ -1947,9 +2069,16 @@
 #define $2 innocuous_$2
 
 /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $2 (); below. */
+ which can conflict with char $2 (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
 
-#include <limits.h>
 #undef $2
 
 /* Override any GCC internal prototype to avoid an error.
@@ -1967,51 +2096,47 @@
 #endif
 
 int
-main (void)
+main ()
 {
 return $2 ();
 ;
 return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 eval "$3=yes"
-else $as_nop
+else
 eval "$3=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
 conftest$ac_exeext conftest.$ac_ext
 fi
 eval ac_res=\$$3
-	 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_func
 
-# ac_fn_check_decl LINENO SYMBOL VAR INCLUDES EXTRA-OPTIONS FLAG-VAR
-# ------------------------------------------------------------------
+# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES
+# ---------------------------------------------
 # Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR
-# accordingly. Pass EXTRA-OPTIONS to the compiler, using FLAG-VAR.
-ac_fn_check_decl ()
+# accordingly.
+ac_fn_c_check_decl ()
 {
 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
 as_decl_name=`echo $2|sed 's/ *(.*//'`
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5
-printf %s "checking whether $as_decl_name is declared... " >&6; }
-if eval test \${$3+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
 as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'`
- eval ac_save_FLAGS=\$$6
- as_fn_append $6 " $5"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5
+$as_echo_n "checking whether $as_decl_name is declared... " >&6; }
+if eval \${$3+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 $4
 int
-main (void)
+main ()
 {
 #ifndef $as_decl_name
 #ifdef __cplusplus
@@ -2025,60 +2150,19 @@
 return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 eval "$3=yes"
-else $as_nop
+else
 eval "$3=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
- eval $6=\$ac_save_FLAGS
-
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 eval ac_res=\$$3
-	 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # ac_fn_check_decl
-
-# ac_fn_c_try_cpp LINENO
-# ----------------------
-# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_cpp ()
-{
- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- if { { ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
- ac_status=$?
- if test -s conftest.err; then
- grep -v '^ *+' conftest.err >conftest.er1
- cat conftest.er1 >&5
- mv -f conftest.er1 conftest.err
- fi
- printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; } > conftest.i && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
- }
-then :
- ac_retval=0
-else $as_nop
- printf "%s\n" "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_retval=1
-fi
+	 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
- as_fn_set_status $ac_retval
 
-} # ac_fn_c_try_cpp
+} # ac_fn_c_check_decl
 
 # ac_fn_c_check_member LINENO AGGR MEMBER VAR INCLUDES
 # ----------------------------------------------------
@@ -2087,17 +2171,16 @@
 ac_fn_c_check_member ()
 {
 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5
-printf %s "checking for $2.$3... " >&6; }
-if eval test \${$4+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5
+$as_echo_n "checking for $2.$3... " >&6; }
+if eval \${$4+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 $5
 int
-main (void)
+main ()
 {
 static $2 ac_aggr;
 if (ac_aggr.$3)
@@ -2106,15 +2189,14 @@
 return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 eval "$4=yes"
-else $as_nop
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 $5
 int
-main (void)
+main ()
 {
 static $2 ac_aggr;
 if (sizeof ac_aggr.$3)
@@ -2123,19 +2205,18 @@
 return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 eval "$4=yes"
-else $as_nop
+else
 eval "$4=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 eval ac_res=\$$4
-	 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_member
@@ -2147,18 +2228,17 @@
 ac_fn_c_check_type ()
 {
 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-printf %s "checking for $2... " >&6; }
-if eval test \${$3+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 eval "$3=no"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 $4
 int
-main (void)
+main ()
 {
 if (sizeof ($2))
 	 return 0;
@@ -2166,13 +2246,12 @@
 return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 $4
 int
-main (void)
+main ()
 {
 if (sizeof (($2)))
 	 return 0;
@@ -2180,93 +2259,29 @@
 return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 
-else $as_nop
+else
 eval "$3=yes"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 eval ac_res=\$$3
-	 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_type
-
-# ac_fn_c_try_run LINENO
-# ----------------------
-# Try to run conftest.$ac_ext, and return whether this succeeded. Assumes that
-# executables *can* be run.
-ac_fn_c_try_run ()
-{
- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- if { { ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
- { { case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; }
-then :
- ac_retval=0
-else $as_nop
- printf "%s\n" "$as_me: program exited with status $ac_status" >&5
- printf "%s\n" "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_retval=$ac_status
-fi
- rm -rf conftest.dSYM conftest_ipa8_conftest.oo
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
- as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_run
-ac_configure_args_raw=
-for ac_arg
-do
- case $ac_arg in
- *\'*)
- ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
- esac
- as_fn_append ac_configure_args_raw " '$ac_arg'"
-done
-
-case $ac_configure_args_raw in
- *$as_nl*)
- ac_safe_unquote= ;;
- *)
- ac_unsafe_z='|&;<>()$`\\"*? ''	' # This string ends in space, tab.
- ac_unsafe_a="$ac_unsafe_z#~"
- ac_safe_unquote="s/ '\$^$ac_unsafe_a^$ac_unsafe_z*\$'/ \\1/g"
- ac_configure_args_raw=` printf "%s\n" "$ac_configure_args_raw" | sed "$ac_safe_unquote"`;;
-esac
-
 cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by libX11 $as_me 1.8.1, which was
-generated by GNU Autoconf 2.71. Invocation command line was
+It was created by libX11 $as_me 1.8.4, which was
+generated by GNU Autoconf 2.69. Invocation command line was
 
- $ $0$ac_configure_args_raw
+ $ $0 $@
 
 _ACEOF
 exec 5>>config.log
@@ -2299,12 +2314,8 @@
 for as_dir in $PATH
 do
 IFS=$as_save_IFS
- case $as_dir in #(((
- '') as_dir=./ ;;
- */) ;;
- *) as_dir=$as_dir/ ;;
- esac
- printf "%s\n" "PATH: $as_dir"
+ test -z "$as_dir" && as_dir=.
+ $as_echo "PATH: $as_dir"
 done
 IFS=$as_save_IFS
 
@@ -2339,7 +2350,7 @@
 | -silent | --silent | --silen | --sile | --sil)
 continue ;;
 *\'*)
- ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+ ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
 esac
 case $ac_pass in
 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
@@ -2374,13 +2385,11 @@
 # WARNING: Use '\'' to represent an apostrophe within the trap.
 # WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
 trap 'exit_status=$?
- # Sanitize IFS.
- IFS=" ""	$as_nl"
 # Save into config.log some information that might help in debugging.
 {
 echo
 
- printf "%s\n" "## ---------------- ##
+ $as_echo "## ---------------- ##
 ## Cache variables. ##
 ## ---------------- ##"
 echo
@@ -2391,8 +2400,8 @@
 case $ac_val in #(
 *${as_nl}*)
 case $ac_var in #(
- *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
 esac
 case $ac_var in #(
 _ | IFS | as_nl) ;; #(
@@ -2416,7 +2425,7 @@
 )
 echo
 
- printf "%s\n" "## ----------------- ##
+ $as_echo "## ----------------- ##
 ## Output variables. ##
 ## ----------------- ##"
 echo
@@ -2424,14 +2433,14 @@
 do
 eval ac_val=\$$ac_var
 case $ac_val in
- *\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+ *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
 esac
- printf "%s\n" "$ac_var='\''$ac_val'\''"
+ $as_echo "$ac_var='\''$ac_val'\''"
 done | sort
 echo
 
 if test -n "$ac_subst_files"; then
- printf "%s\n" "## ------------------- ##
+ $as_echo "## ------------------- ##
 ## File substitutions. ##
 ## ------------------- ##"
 echo
@@ -2439,15 +2448,15 @@
 do
 	eval ac_val=\$$ac_var
 	case $ac_val in
-	*\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
 	esac
-	printf "%s\n" "$ac_var='\''$ac_val'\''"
+	$as_echo "$ac_var='\''$ac_val'\''"
 done | sort
 echo
 fi
 
 if test -s confdefs.h; then
- printf "%s\n" "## ----------- ##
+ $as_echo "## ----------- ##
 ## confdefs.h. ##
 ## ----------- ##"
 echo
@@ -2455,8 +2464,8 @@
 echo
 fi
 test "$ac_signal" != 0 &&
- printf "%s\n" "$as_me: caught signal $ac_signal"
- printf "%s\n" "$as_me: exit $exit_status"
+ $as_echo "$as_me: caught signal $ac_signal"
+ $as_echo "$as_me: exit $exit_status"
 } >&5
 rm -f core *.core core.conftest.* &&
 rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
@@ -2470,48 +2479,63 @@
 # confdefs.h avoids OS command line length limits that DEFS can exceed.
 rm -f -r conftest* confdefs.h
 
-printf "%s\n" "/* confdefs.h */" > confdefs.h
+$as_echo "/* confdefs.h */" > confdefs.h
 
 # Predefined preprocessor variables.
 
-printf "%s\n" "#define PACKAGE_NAME \"$PACKAGE_NAME\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_NAME "$PACKAGE_NAME"
+_ACEOF
 
-printf "%s\n" "#define PACKAGE_TARNAME \"$PACKAGE_TARNAME\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
+_ACEOF
 
-printf "%s\n" "#define PACKAGE_VERSION \"$PACKAGE_VERSION\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_VERSION "$PACKAGE_VERSION"
+_ACEOF
 
-printf "%s\n" "#define PACKAGE_STRING \"$PACKAGE_STRING\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_STRING "$PACKAGE_STRING"
+_ACEOF
 
-printf "%s\n" "#define PACKAGE_BUGREPORT \"$PACKAGE_BUGREPORT\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
+_ACEOF
 
-printf "%s\n" "#define PACKAGE_URL \"$PACKAGE_URL\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_URL "$PACKAGE_URL"
+_ACEOF
 
 
 # Let the site file select an alternate cache file if it wants to.
 # Prefer an explicitly selected file to automatically selected ones.
+ac_site_file1=NONE
+ac_site_file2=NONE
 if test -n "$CONFIG_SITE"; then
- ac_site_files="$CONFIG_SITE"
+ # We do not want a PATH search for config.site.
+ case $CONFIG_SITE in #((
+ -*) ac_site_file1=./$CONFIG_SITE;;
+ */*) ac_site_file1=$CONFIG_SITE;;
+ *) ac_site_file1=./$CONFIG_SITE;;
+ esac
 elif test "x$prefix" != xNONE; then
- ac_site_files="$prefix/share/config.site $prefix/etc/config.site"
+ ac_site_file1=$prefix/share/config.site
+ ac_site_file2=$prefix/etc/config.site
 else
- ac_site_files="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+ ac_site_file1=$ac_default_prefix/share/config.site
+ ac_site_file2=$ac_default_prefix/etc/config.site
 fi
-
-for ac_site_file in $ac_site_files
+for ac_site_file in "$ac_site_file1" "$ac_site_file2"
 do
- case $ac_site_file in #(
- */*) :
- ;; #(
- *) :
- ac_site_file=./$ac_site_file ;;
-esac
- if test -f "$ac_site_file" && test -r "$ac_site_file"; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
-printf "%s\n" "$as_me: loading site script $ac_site_file" >&6;}
+ test "x$ac_site_file" = xNONE && continue
+ if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
+$as_echo "$as_me: loading site script $ac_site_file" >&6;}
 sed 's/^/| /' "$ac_site_file" >&5
 . "$ac_site_file" \
- || { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+ || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "failed to load site script $ac_site_file
 See \`config.log' for more details" "$LINENO" 5; }
 fi
@@ -2521,438 +2545,22 @@
 # Some versions of bash will fail to source /dev/null (special files
 # actually), so we avoid doing that. DJGPP emulates it as a regular file.
 if test /dev/null != "$cache_file" && test -f "$cache_file"; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
-printf "%s\n" "$as_me: loading cache $cache_file" >&6;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
+$as_echo "$as_me: loading cache $cache_file" >&6;}
 case $cache_file in
 \\/* | ?:\\/* ) . "$cache_file";;
 *) . "./$cache_file";;
 esac
 fi
 else
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
-printf "%s\n" "$as_me: creating cache $cache_file" >&6;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
+$as_echo "$as_me: creating cache $cache_file" >&6;}
 >$cache_file
 fi
 
-as_fn_append ac_header_c_list " stdio.h stdio_h HAVE_STDIO_H"
-# Test code for whether the C compiler supports C89 (global declarations)
-ac_c_conftest_c89_globals='
-/* Does the compiler advertise C89 conformance?
- Do not test the value of __STDC__, because some compilers set it to 0
- while being otherwise adequately conformant. */
-#if !defined __STDC__
-# error "Compiler does not advertise C89 conformance"
-#endif
-
-#include <stddef.h>
-#include <stdarg.h>
-struct stat;
-/* Most of the following tests are stolen from RCS 5.7 src/conf.sh. */
-struct buf { int x; };
-struct buf * (*rcsopen) (struct buf *, struct stat *, int);
-static char *e (p, i)
- char **p;
- int i;
-{
- return pi;
-}
-static char *f (char * (*g) (char **, int), char **p, ...)
-{
- char *s;
- va_list v;
- va_start (v,p);
- s = g (p, va_arg (v,int));
- va_end (v);
- return s;
-}
-
-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
- function prototypes and stuff, but not \xHH hex character constants.
- These do not provoke an error unfortunately, instead are silently treated
- as an "x". The following induces an error, until -std is added to get
- proper ANSI mode. Curiously \x00 != x always comes out true, for an
- array size at least. It is necessary to write \x00 == 0 to get something
- that is true only with -std. */
-int osf4_cc_array '\''\x00'\'' == 0 ? 1 : -1;
-
-/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
- inside strings and character constants. */
-#define FOO(x) '\''x'\''
-int xlc6_cc_arrayFOO(a) == '\''x'\'' ? 1 : -1;
-
-int test (int i, double x);
-struct s1 {int (*f) (int a);};
-struct s2 {int (*f) (double a);};
-int pairnames (int, char **, int *(*)(struct buf *, struct stat *, int),
- int, int);'
-
-# Test code for whether the C compiler supports C89 (body of main).
-ac_c_conftest_c89_main='
-ok |= (argc == 0 || f (e, argv, 0) != argv0 || f (e, argv, 1) != argv1);
-'
-
-# Test code for whether the C compiler supports C99 (global declarations)
-ac_c_conftest_c99_globals='
-// Does the compiler advertise C99 conformance?
-#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 199901L
-# error "Compiler does not advertise C99 conformance"
-#endif
-
-#include <stdbool.h>
-extern int puts (const char *);
-extern int printf (const char *, ...);
-extern int dprintf (int, const char *, ...);
-extern void *malloc (size_t);
-
-// Check varargs macros. These examples are taken from C99 6.10.3.5.
-// dprintf is used instead of fprintf to avoid needing to declare
-// FILE and stderr.
-#define debug(...) dprintf (2, __VA_ARGS__)
-#define showlist(...) puts (#__VA_ARGS__)
-#define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__))
-static void
-test_varargs_macros (void)
-{
- int x = 1234;
- int y = 5678;
- debug ("Flag");
- debug ("X = %d\n", x);
- showlist (The first, second, and third items.);
- report (x>y, "x is %d but y is %d", x, y);
-}
-
-// Check long long types.
-#define BIG64 18446744073709551615ull
-#define BIG32 4294967295ul
-#define BIG_OK (BIG64 / BIG32 == 4294967297ull && BIG64 % BIG32 == 0)
-#if !BIG_OK
- #error "your preprocessor is broken"
-#endif
-#if BIG_OK
-#else
- #error "your preprocessor is broken"
-#endif
-static long long int bignum = -9223372036854775807LL;
-static unsigned long long int ubignum = BIG64;
-
-struct incomplete_array
-{
- int datasize;
- double data;
-};
-
-struct named_init {
- int number;
- const wchar_t *name;
- double average;
-};
-
-typedef const char *ccp;
-
-static inline int
-test_restrict (ccp restrict text)
-{
- // See if C++-style comments work.
- // Iterate through items via the restricted pointer.
- // Also check for declarations in for loops.
- for (unsigned int i = 0; *(text+i) != '\''\0'\''; ++i)
- continue;
- return 0;
-}
-
-// Check varargs and va_copy.
-static bool
-test_varargs (const char *format, ...)
-{
- va_list args;
- va_start (args, format);
- va_list args_copy;
- va_copy (args_copy, args);
-
- const char *str = "";
- int number = 0;
- float fnumber = 0;
-
- while (*format)
- {
- switch (*format++)
-	{
-	case '\''s'\'': // string
-	 str = va_arg (args_copy, const char *);
-	 break;
-	case '\''d'\'': // int
-	 number = va_arg (args_copy, int);
-	 break;
-	case '\''f'\'': // float
-	 fnumber = va_arg (args_copy, double);
-	 break;
-	default:
-	 break;
-	}
- }
- va_end (args_copy);
- va_end (args);
-
- return *str && number && fnumber;
-}
-'
-
-# Test code for whether the C compiler supports C99 (body of main).
-ac_c_conftest_c99_main='
- // Check bool.
- _Bool success = false;
- success |= (argc != 0);
-
- // Check restrict.
- if (test_restrict ("String literal") == 0)
- success = true;
- char *restrict newvar = "Another string";
-
- // Check varargs.
- success &= test_varargs ("s, d'\'' f .", "string", 65, 34.234);
- test_varargs_macros ();
-
- // Check flexible array members.
- struct incomplete_array *ia =
- malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10));
- ia->datasize = 10;
- for (int i = 0; i < ia->datasize; ++i)
- ia->datai = i * 1.234;
-
- // Check named initializers.
- struct named_init ni = {
- .number = 34,
- .name = L"Test wide string",
- .average = 543.34343,
- };
-
- ni.number = 58;
-
- int dynamic_arrayni.number;
- dynamic_array0 = argv00;
- dynamic_arrayni.number - 1 = 543;
-
- // work around unused variable warnings
- ok |= (!success || bignum == 0LL || ubignum == 0uLL || newvar0 == '\''x'\''
-	 || dynamic_arrayni.number - 1 != 543);
-'
-
-# Test code for whether the C compiler supports C11 (global declarations)
-ac_c_conftest_c11_globals='
-// Does the compiler advertise C11 conformance?
-#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 201112L
-# error "Compiler does not advertise C11 conformance"
-#endif
-
-// Check _Alignas.
-char _Alignas (double) aligned_as_double;
-char _Alignas (0) no_special_alignment;
-extern char aligned_as_int;
-char _Alignas (0) _Alignas (int) aligned_as_int;
-
-// Check _Alignof.
-enum
-{
- int_alignment = _Alignof (int),
- int_array_alignment = _Alignof (int100),
- char_alignment = _Alignof (char)
-};
-_Static_assert (0 < -_Alignof (int), "_Alignof is signed");
-
-// Check _Noreturn.
-int _Noreturn does_not_return (void) { for (;;) continue; }
-
-// Check _Static_assert.
-struct test_static_assert
-{
- int x;
- _Static_assert (sizeof (int) <= sizeof (long int),
- "_Static_assert does not work in struct");
- long int y;
-};
-
-// Check UTF-8 literals.
-#define u8 syntax error!
-char const utf8_literal = u8"happens to be ASCII" "another string";
-
-// Check duplicate typedefs.
-typedef long *long_ptr;
-typedef long int *long_ptr;
-typedef long_ptr long_ptr;
-
-// Anonymous structures and unions -- taken from C11 6.7.2.1 Example 1.
-struct anonymous
-{
- union {
- struct { int i; int j; };
- struct { int k; long int l; } w;
- };
- int m;
-} v1;
-'
-
-# Test code for whether the C compiler supports C11 (body of main).
-ac_c_conftest_c11_main='
- _Static_assert ((offsetof (struct anonymous, i)
-		 == offsetof (struct anonymous, w.k)),
-		 "Anonymous union alignment botch");
- v1.i = 2;
- v1.w.k = 5;
- ok |= v1.i != 5;
-'
-
-# Test code for whether the C compiler supports C11 (complete).
-ac_c_conftest_c11_program="${ac_c_conftest_c89_globals}
-${ac_c_conftest_c99_globals}
-${ac_c_conftest_c11_globals}
-
-int
-main (int argc, char **argv)
-{
- int ok = 0;
- ${ac_c_conftest_c89_main}
- ${ac_c_conftest_c99_main}
- ${ac_c_conftest_c11_main}
- return ok;
-}
-"
-
-# Test code for whether the C compiler supports C99 (complete).
-ac_c_conftest_c99_program="${ac_c_conftest_c89_globals}
-${ac_c_conftest_c99_globals}
-
-int
-main (int argc, char **argv)
-{
- int ok = 0;
- ${ac_c_conftest_c89_main}
- ${ac_c_conftest_c99_main}
- return ok;
-}
-"
-
-# Test code for whether the C compiler supports C89 (complete).
-ac_c_conftest_c89_program="${ac_c_conftest_c89_globals}
-
-int
-main (int argc, char **argv)
-{
- int ok = 0;
- ${ac_c_conftest_c89_main}
- return ok;
-}
-"
-
-as_fn_append ac_header_c_list " stdlib.h stdlib_h HAVE_STDLIB_H"
-as_fn_append ac_header_c_list " string.h string_h HAVE_STRING_H"
-as_fn_append ac_header_c_list " inttypes.h inttypes_h HAVE_INTTYPES_H"
-as_fn_append ac_header_c_list " stdint.h stdint_h HAVE_STDINT_H"
-as_fn_append ac_header_c_list " strings.h strings_h HAVE_STRINGS_H"
-as_fn_append ac_header_c_list " sys/stat.h sys_stat_h HAVE_SYS_STAT_H"
-as_fn_append ac_header_c_list " sys/types.h sys_types_h HAVE_SYS_TYPES_H"
-as_fn_append ac_header_c_list " unistd.h unistd_h HAVE_UNISTD_H"
-as_fn_append ac_header_c_list " wchar.h wchar_h HAVE_WCHAR_H"
-as_fn_append ac_header_c_list " minix/config.h minix_config_h HAVE_MINIX_CONFIG_H"
-as_fn_append ac_header_c_list " sys/param.h sys_param_h HAVE_SYS_PARAM_H"
-as_fn_append ac_func_c_list " getpagesize HAVE_GETPAGESIZE"
-
-# Auxiliary files required by this configure script.
-ac_aux_files="ltmain.sh missing install-sh compile config.guess config.sub"
-
-# Locations in which to look for auxiliary files.
-ac_aux_dir_candidates="${srcdir}${PATH_SEPARATOR}${srcdir}/..${PATH_SEPARATOR}${srcdir}/../.."
-
-# Search for a directory containing all of the required auxiliary files,
-# $ac_aux_files, from the $PATH-style list $ac_aux_dir_candidates.
-# If we don't find one directory that contains all the files we need,
-# we report the set of missing files from the *first* directory in
-# $ac_aux_dir_candidates and give up.
-ac_missing_aux_files=""
-ac_first_candidate=:
-printf "%s\n" "$as_me:${as_lineno-$LINENO}: looking for aux files: $ac_aux_files" >&5
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-as_found=false
-for as_dir in $ac_aux_dir_candidates
-do
- IFS=$as_save_IFS
- case $as_dir in #(((
- '') as_dir=./ ;;
- */) ;;
- *) as_dir=$as_dir/ ;;
- esac
- as_found=:
-
- printf "%s\n" "$as_me:${as_lineno-$LINENO}: trying $as_dir" >&5
- ac_aux_dir_found=yes
- ac_install_sh=
- for ac_aux in $ac_aux_files
- do
- # As a special case, if "install-sh" is required, that requirement
- # can be satisfied by any of "install-sh", "install.sh", or "shtool",
- # and $ac_install_sh is set appropriately for whichever one is found.
- if test x"$ac_aux" = x"install-sh"
- then
- if test -f "${as_dir}install-sh"; then
- printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}install-sh found" >&5
- ac_install_sh="${as_dir}install-sh -c"
- elif test -f "${as_dir}install.sh"; then
- printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}install.sh found" >&5
- ac_install_sh="${as_dir}install.sh -c"
- elif test -f "${as_dir}shtool"; then
- printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}shtool found" >&5
- ac_install_sh="${as_dir}shtool install -c"
- else
- ac_aux_dir_found=no
- if $ac_first_candidate; then
- ac_missing_aux_files="${ac_missing_aux_files} install-sh"
- else
- break
- fi
- fi
- else
- if test -f "${as_dir}${ac_aux}"; then
- printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}${ac_aux} found" >&5
- else
- ac_aux_dir_found=no
- if $ac_first_candidate; then
- ac_missing_aux_files="${ac_missing_aux_files} ${ac_aux}"
- else
- break
- fi
- fi
- fi
- done
- if test "$ac_aux_dir_found" = yes; then
- ac_aux_dir="$as_dir"
- break
- fi
- ac_first_candidate=false
-
- as_found=false
-done
-IFS=$as_save_IFS
-if $as_found
-then :
-
-else $as_nop
- as_fn_error $? "cannot find required auxiliary files:$ac_missing_aux_files" "$LINENO" 5
-fi
-
-
-# These three variables are undocumented and unsupported,
-# and are intended to be withdrawn in a future Autoconf release.
-# They can cause serious problems if a builder's source tree is in a directory
-# whose full name contains unusual characters.
-if test -f "${ac_aux_dir}config.guess"; then
- ac_config_guess="$SHELL ${ac_aux_dir}config.guess"
-fi
-if test -f "${ac_aux_dir}config.sub"; then
- ac_config_sub="$SHELL ${ac_aux_dir}config.sub"
-fi
-if test -f "$ac_aux_dir/configure"; then
- ac_configure="$SHELL ${ac_aux_dir}configure"
-fi
-
+as_fn_append ac_header_list " stdlib.h"
+as_fn_append ac_header_list " unistd.h"
+as_fn_append ac_header_list " sys/param.h"
 # Check that the precious variables saved in the cache have kept the same
 # value.
 ac_cache_corrupted=false
@@ -2963,12 +2571,12 @@
 eval ac_new_val=\$ac_env_${ac_var}_value
 case $ac_old_set,$ac_new_set in
 set,)
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-printf "%s\n" "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
 ac_cache_corrupted=: ;;
 ,set)
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
-printf "%s\n" "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
 ac_cache_corrupted=: ;;
 ,);;
 *)
@@ -2977,24 +2585,24 @@
 	ac_old_val_w=`echo x $ac_old_val`
 	ac_new_val_w=`echo x $ac_new_val`
 	if test "$ac_old_val_w" != "$ac_new_val_w"; then
-	 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
-printf "%s\n" "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+	 { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
+$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
 	 ac_cache_corrupted=:
 	else
-	 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
-printf "%s\n" "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
+	 { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
+$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
 	 eval $ac_var=\$ac_old_val
 	fi
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5
-printf "%s\n" "$as_me: former value: \`$ac_old_val'" >&2;}
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5
-printf "%s\n" "$as_me: current value: \`$ac_new_val'" >&2;}
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5
+$as_echo "$as_me: former value: \`$ac_old_val'" >&2;}
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5
+$as_echo "$as_me: current value: \`$ac_new_val'" >&2;}
 fi;;
 esac
 # Pass precious variables to config.status.
 if test "$ac_new_set" = set; then
 case $ac_new_val in
- *\'*) ac_arg=$ac_var=`printf "%s\n" "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+ *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
 *) ac_arg=$ac_var=$ac_new_val ;;
 esac
 case " $ac_configure_args " in
@@ -3004,12 +2612,11 @@
 fi
 done
 if $ac_cache_corrupted; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
-printf "%s\n" "$as_me: error: changes in the environment can compromise the build" >&2;}
- as_fn_error $? "run \`${MAKE-make} distclean' and/or \`rm $cache_file'
-	 and start over" "$LINENO" 5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
+$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+ as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
 fi
 ## -------------------- ##
 ## Main body of script. ##
@@ -3026,30 +2633,55 @@
 ac_config_headers="$ac_config_headers src/config.h include/X11/XlibConf.h"
 
 
+ac_aux_dir=
+for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
+ if test -f "$ac_dir/install-sh"; then
+ ac_aux_dir=$ac_dir
+ ac_install_sh="$ac_aux_dir/install-sh -c"
+ break
+ elif test -f "$ac_dir/install.sh"; then
+ ac_aux_dir=$ac_dir
+ ac_install_sh="$ac_aux_dir/install.sh -c"
+ break
+ elif test -f "$ac_dir/shtool"; then
+ ac_aux_dir=$ac_dir
+ ac_install_sh="$ac_aux_dir/shtool install -c"
+ break
+ fi
+done
+if test -z "$ac_aux_dir"; then
+ as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
+fi
 
+# These three variables are undocumented and unsupported,
+# and are intended to be withdrawn in a future Autoconf release.
+# They can cause serious problems if a builder's source tree is in a directory
+# whose full name contains unusual characters.
+ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var.
+ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var.
+ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
 
 
- # Make sure we can run config.sub.
-$SHELL "${ac_aux_dir}config.sub" sun4 >/dev/null 2>&1 ||
- as_fn_error $? "cannot run $SHELL ${ac_aux_dir}config.sub" "$LINENO" 5
-
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
-printf %s "checking build system type... " >&6; }
-if test ${ac_cv_build+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+# Make sure we can run config.sub.
+$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
+ as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
+$as_echo_n "checking build system type... " >&6; }
+if ${ac_cv_build+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 ac_build_alias=$build_alias
 test "x$ac_build_alias" = x &&
- ac_build_alias=`$SHELL "${ac_aux_dir}config.guess"`
+ ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
 test "x$ac_build_alias" = x &&
 as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
-ac_cv_build=`$SHELL "${ac_aux_dir}config.sub" $ac_build_alias` ||
- as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $ac_build_alias failed" "$LINENO" 5
+ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
+ as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
 
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
-printf "%s\n" "$ac_cv_build" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
+$as_echo "$ac_cv_build" >&6; }
 case $ac_cv_build in
 *-*-*) ;;
 *) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
@@ -3068,22 +2700,21 @@
 case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
-printf %s "checking host system type... " >&6; }
-if test ${ac_cv_host+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
+$as_echo_n "checking host system type... " >&6; }
+if ${ac_cv_host+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 if test "x$host_alias" = x; then
 ac_cv_host=$ac_cv_build
 else
- ac_cv_host=`$SHELL "${ac_aux_dir}config.sub" $host_alias` ||
- as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $host_alias failed" "$LINENO" 5
+ ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
+ as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
 fi
 
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
-printf "%s\n" "$ac_cv_host" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
+$as_echo "$ac_cv_host" >&6; }
 case $ac_cv_host in
 *-*-*) ;;
 *) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
@@ -3105,16 +2736,6 @@
 # Set common system defines for POSIX extensions, such as _GNU_SOURCE
 # Must be called before any macros that run the compiler (like AC_PROG_LIBTOOL)
 # to avoid autoconf errors.
-
-
-
-
-
-
-
-
-
-
 # Expand $ac_aux_dir to an absolute path.
 am_aux_dir=`cd "$ac_aux_dir" && pwd`
 
@@ -3126,12 +2747,11 @@
 if test -n "$ac_tool_prefix"; then
 # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_CC+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 if test -n "$CC"; then
 ac_cv_prog_CC="$CC" # Let the user override the test.
 else
@@ -3139,15 +2759,11 @@
 for as_dir in $PATH
 do
 IFS=$as_save_IFS
- case $as_dir in #(((
- '') as_dir=./ ;;
- */) ;;
- *) as_dir=$as_dir/ ;;
- esac
+ test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_prog_CC="${ac_tool_prefix}gcc"
- printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
 fi
 done
@@ -3158,11 +2774,11 @@
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-printf "%s\n" "$CC" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -3171,12 +2787,11 @@
 ac_ct_CC=$CC
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_ac_ct_CC+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 if test -n "$ac_ct_CC"; then
 ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
 else
@@ -3184,15 +2799,11 @@
 for as_dir in $PATH
 do
 IFS=$as_save_IFS
- case $as_dir in #(((
- '') as_dir=./ ;;
- */) ;;
- *) as_dir=$as_dir/ ;;
- esac
+ test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_prog_ac_ct_CC="gcc"
- printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
 fi
 done
@@ -3203,11 +2814,11 @@
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-printf "%s\n" "$ac_ct_CC" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
 else
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 if test "x$ac_ct_CC" = x; then
@@ -3215,8 +2826,8 @@
 else
 case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
 CC=$ac_ct_CC
@@ -3229,12 +2840,11 @@
 if test -n "$ac_tool_prefix"; then
 # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_CC+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 if test -n "$CC"; then
 ac_cv_prog_CC="$CC" # Let the user override the test.
 else
@@ -3242,15 +2852,11 @@
 for as_dir in $PATH
 do
 IFS=$as_save_IFS
- case $as_dir in #(((
- '') as_dir=./ ;;
- */) ;;
- *) as_dir=$as_dir/ ;;
- esac
+ test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_prog_CC="${ac_tool_prefix}cc"
- printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
 fi
 done
@@ -3261,11 +2867,11 @@
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-printf "%s\n" "$CC" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -3274,12 +2880,11 @@
 if test -z "$CC"; then
 # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_CC+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 if test -n "$CC"; then
 ac_cv_prog_CC="$CC" # Let the user override the test.
 else
@@ -3288,19 +2893,15 @@
 for as_dir in $PATH
 do
 IFS=$as_save_IFS
- case $as_dir in #(((
- '') as_dir=./ ;;
- */) ;;
- *) as_dir=$as_dir/ ;;
- esac
+ test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
- if test "$as_dir$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
 ac_prog_rejected=yes
 continue
 fi
 ac_cv_prog_CC="cc"
- printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
 fi
 done
@@ -3316,18 +2917,18 @@
 # However, it has the same basename, so the bogon will be chosen
 # first if we set CC to just the basename; use the full file name.
 shift
- ac_cv_prog_CC="$as_dir$ac_word${1+' '}$@"
+ ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
 fi
 fi
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-printf "%s\n" "$CC" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -3338,12 +2939,11 @@
 do
 # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_CC+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 if test -n "$CC"; then
 ac_cv_prog_CC="$CC" # Let the user override the test.
 else
@@ -3351,15 +2951,11 @@
 for as_dir in $PATH
 do
 IFS=$as_save_IFS
- case $as_dir in #(((
- '') as_dir=./ ;;
- */) ;;
- *) as_dir=$as_dir/ ;;
- esac
+ test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
- printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
 fi
 done
@@ -3370,11 +2966,11 @@
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-printf "%s\n" "$CC" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -3387,12 +2983,11 @@
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_ac_ct_CC+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 if test -n "$ac_ct_CC"; then
 ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
 else
@@ -3400,15 +2995,11 @@
 for as_dir in $PATH
 do
 IFS=$as_save_IFS
- case $as_dir in #(((
- '') as_dir=./ ;;
- */) ;;
- *) as_dir=$as_dir/ ;;
- esac
+ test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_prog_ac_ct_CC="$ac_prog"
- printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
 fi
 done
@@ -3419,11 +3010,11 @@
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-printf "%s\n" "$ac_ct_CC" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
 else
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -3435,8 +3026,8 @@
 else
 case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
 CC=$ac_ct_CC
@@ -3444,129 +3035,25 @@
 fi
 
 fi
-if test -z "$CC"; then
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}clang", so it can be a program name with args.
-set dummy ${ac_tool_prefix}clang; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_CC+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
- if test -n "$CC"; then
- ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- case $as_dir in #(((
- '') as_dir=./ ;;
- */) ;;
- *) as_dir=$as_dir/ ;;
- esac
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
- ac_cv_prog_CC="${ac_tool_prefix}clang"
- printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-printf "%s\n" "$CC" >&6; }
-else
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-fi
 
 
-fi
-if test -z "$ac_cv_prog_CC"; then
- ac_ct_CC=$CC
- # Extract the first word of "clang", so it can be a program name with args.
-set dummy clang; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_ac_ct_CC+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
- if test -n "$ac_ct_CC"; then
- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- case $as_dir in #(((
- '') as_dir=./ ;;
- */) ;;
- *) as_dir=$as_dir/ ;;
- esac
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
- ac_cv_prog_ac_ct_CC="clang"
- printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-printf "%s\n" "$ac_ct_CC" >&6; }
-else
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-fi
-
- if test "x$ac_ct_CC" = x; then
- CC=""
- else
- case $cross_compiling:$ac_tool_warned in
-yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
- CC=$ac_ct_CC
- fi
-else
- CC="$ac_cv_prog_CC"
-fi
-
-fi
-
-
-test -z "$CC" && { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "no acceptable C compiler found in \$PATH
 See \`config.log' for more details" "$LINENO" 5; }
 
 # Provide some information about the compiler.
-printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
 set X $ac_compile
 ac_compiler=$2
-for ac_option in --version -v -V -qversion -version; do
+for ac_option in --version -v -V -qversion; do
 { { ac_try="$ac_compiler $ac_option >&5"
 case "(($ac_try" in
 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+$as_echo "$ac_try_echo"; } >&5
 (eval "$ac_compiler $ac_option >&5") 2>conftest.err
 ac_status=$?
 if test -s conftest.err; then
@@ -3576,7 +3063,7 @@
 cat conftest.er1 >&5
 fi
 rm -f conftest.er1 conftest.err
- printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }
 done
 
@@ -3584,7 +3071,7 @@
 /* end confdefs.h. */
 
 int
-main (void)
+main ()
 {
 
 ;
@@ -3596,9 +3083,9 @@
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
-printf %s "checking whether the C compiler works... " >&6; }
-ac_link_default=`printf "%s\n" "$ac_link" | sed 's/ -o *conftest^ *//'`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
+$as_echo_n "checking whether the C compiler works... " >&6; }
+ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest^ *//'`
 
 # The possible output files:
 ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
@@ -3619,12 +3106,11 @@
 *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+$as_echo "$ac_try_echo"; } >&5
 (eval "$ac_link_default") 2>&5
 ac_status=$?
- printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }
-then :
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then :
 # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
 # So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
 # in a Makefile. We should not override ac_cv_exeext if it was cached,
@@ -3641,7 +3127,7 @@
 	# certainly right.
 	break;;
 *.* )
-	if test ${ac_cv_exeext+y} && test "$ac_cv_exeext" != no;
+	if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
 	then :; else
 	 ac_cv_exeext=`expr "$ac_file" : '^.*$\..*$'`
 	fi
@@ -3657,46 +3143,44 @@
 done
 test "$ac_cv_exeext" = no && ac_cv_exeext=
 
-else $as_nop
+else
 ac_file=''
 fi
-if test -z "$ac_file"
-then :
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-printf "%s\n" "$as_me: failed program was:" >&5
+if test -z "$ac_file"; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "C compiler cannot create executables
 See \`config.log' for more details" "$LINENO" 5; }
-else $as_nop
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
-printf %s "checking for C compiler default output file name... " >&6; }
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
-printf "%s\n" "$ac_file" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
+$as_echo_n "checking for C compiler default output file name... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
+$as_echo "$ac_file" >&6; }
 ac_exeext=$ac_cv_exeext
 
 rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
 ac_clean_files=$ac_clean_files_save
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
-printf %s "checking for suffix of executables... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
+$as_echo_n "checking for suffix of executables... " >&6; }
 if { { ac_try="$ac_link"
 case "(($ac_try" in
 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+$as_echo "$ac_try_echo"; } >&5
 (eval "$ac_link") 2>&5
 ac_status=$?
- printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }
-then :
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then :
 # If both `conftest.exe' and `conftest' are `present' (well, observable)
 # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
 # work properly (i.e., refer to `conftest.exe'), while it won't with
@@ -3710,15 +3194,15 @@
 * ) break;;
 esac
 done
-else $as_nop
- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+else
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot compute suffix of executables: cannot compile and link
 See \`config.log' for more details" "$LINENO" 5; }
 fi
 rm -f conftest conftest$ac_cv_exeext
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
-printf "%s\n" "$ac_cv_exeext" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
+$as_echo "$ac_cv_exeext" >&6; }
 
 rm -f conftest.$ac_ext
 EXEEXT=$ac_cv_exeext
@@ -3727,7 +3211,7 @@
 /* end confdefs.h. */
 #include <stdio.h>
 int
-main (void)
+main ()
 {
 FILE *f = fopen ("conftest.out", "w");
 return ferror (f) || fclose (f) != 0;
@@ -3739,8 +3223,8 @@
 ac_clean_files="$ac_clean_files conftest.out"
 # Check that the compiler produces executables we can run. If not, either
 # the compiler is broken, or we cross compile.
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
-printf %s "checking whether we are cross compiling... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
+$as_echo_n "checking whether we are cross compiling... " >&6; }
 if test "$cross_compiling" != yes; then
 { { ac_try="$ac_link"
 case "(($ac_try" in
@@ -3748,10 +3232,10 @@
 *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+$as_echo "$ac_try_echo"; } >&5
 (eval "$ac_link") 2>&5
 ac_status=$?
- printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }
 if { ac_try='./conftest$ac_cv_exeext'
 { { case "(($ac_try" in
@@ -3759,40 +3243,39 @@
 *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+$as_echo "$ac_try_echo"; } >&5
 (eval "$ac_try") 2>&5
 ac_status=$?
- printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; }; then
 cross_compiling=no
 else
 if test "$cross_compiling" = maybe; then
 	cross_compiling=yes
 else
-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot run C compiled programs.
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot run C compiled programs.
 If you meant to cross compile, use \`--host'.
 See \`config.log' for more details" "$LINENO" 5; }
 fi
 fi
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
-printf "%s\n" "$cross_compiling" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
+$as_echo "$cross_compiling" >&6; }
 
 rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
 ac_clean_files=$ac_clean_files_save
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
-printf %s "checking for suffix of object files... " >&6; }
-if test ${ac_cv_objext+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
+$as_echo_n "checking for suffix of object files... " >&6; }
+if ${ac_cv_objext+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 
 int
-main (void)
+main ()
 {
 
 ;
@@ -3806,12 +3289,11 @@
 *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+$as_echo "$ac_try_echo"; } >&5
 (eval "$ac_compile") 2>&5
 ac_status=$?
- printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }
-then :
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then :
 for ac_file in conftest.o conftest.obj conftest.*; do
 test -f "$ac_file" || continue;
 case $ac_file in
@@ -3820,32 +3302,31 @@
 break;;
 esac
 done
-else $as_nop
- printf "%s\n" "$as_me: failed program was:" >&5
+else
+ $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot compute suffix of object files: cannot compile
 See \`config.log' for more details" "$LINENO" 5; }
 fi
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
-printf "%s\n" "$ac_cv_objext" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
+$as_echo "$ac_cv_objext" >&6; }
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU C" >&5
-printf %s "checking whether the compiler supports GNU C... " >&6; }
-if test ${ac_cv_c_compiler_gnu+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
+if ${ac_cv_c_compiler_gnu+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 
 int
-main (void)
+main ()
 {
 #ifndef __GNUC__
 choke me
@@ -3855,33 +3336,29 @@
 return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 ac_compiler_gnu=yes
-else $as_nop
+else
 ac_compiler_gnu=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
-printf "%s\n" "$ac_cv_c_compiler_gnu" >&6; }
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
+$as_echo "$ac_cv_c_compiler_gnu" >&6; }
 if test $ac_compiler_gnu = yes; then
 GCC=yes
 else
 GCC=
 fi
-ac_test_CFLAGS=${CFLAGS+y}
+ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
-printf %s "checking whether $CC accepts -g... " >&6; }
-if test ${ac_cv_prog_cc_g+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+$as_echo_n "checking whether $CC accepts -g... " >&6; }
+if ${ac_cv_prog_cc_g+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 ac_save_c_werror_flag=$ac_c_werror_flag
 ac_c_werror_flag=yes
 ac_cv_prog_cc_g=no
@@ -3890,60 +3367,57 @@
 /* end confdefs.h. */
 
 int
-main (void)
+main ()
 {
 
 ;
 return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 ac_cv_prog_cc_g=yes
-else $as_nop
+else
 CFLAGS=""
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 
 int
-main (void)
+main ()
 {
 
 ;
 return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 
-else $as_nop
+else
 ac_c_werror_flag=$ac_save_c_werror_flag
 	 CFLAGS="-g"
 	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 
 int
-main (void)
+main ()
 {
 
 ;
 return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 ac_cv_prog_cc_g=yes
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_c_werror_flag=$ac_save_c_werror_flag
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
-printf "%s\n" "$ac_cv_prog_cc_g" >&6; }
-if test $ac_test_CFLAGS; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
+$as_echo "$ac_cv_prog_cc_g" >&6; }
+if test "$ac_test_CFLAGS" = set; then
 CFLAGS=$ac_save_CFLAGS
 elif test $ac_cv_prog_cc_g = yes; then
 if test "$GCC" = yes; then
@@ -3958,144 +3432,94 @@
 CFLAGS=
 fi
 fi
-ac_prog_cc_stdc=no
-if test x$ac_prog_cc_stdc = xno
-then :
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C11 features" >&5
-printf %s "checking for $CC option to enable C11 features... " >&6; }
-if test ${ac_cv_prog_cc_c11+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
- ac_cv_prog_cc_c11=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
+if ${ac_cv_prog_cc_c89+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_cv_prog_cc_c89=no
 ac_save_CC=$CC
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
-$ac_c_conftest_c11_program
-_ACEOF
-for ac_arg in '' -std=gnu11
-do
- CC="$ac_save_CC $ac_arg"
- if ac_fn_c_try_compile "$LINENO"
-then :
- ac_cv_prog_cc_c11=$ac_arg
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam
- test "x$ac_cv_prog_cc_c11" != "xno" && break
-done
-rm -f conftest.$ac_ext
-CC=$ac_save_CC
-fi
+#include <stdarg.h>
+#include <stdio.h>
+struct stat;
+/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
+struct buf { int x; };
+FILE * (*rcsopen) (struct buf *, struct stat *, int);
+static char *e (p, i)
+ char **p;
+ int i;
+{
+ return pi;
+}
+static char *f (char * (*g) (char **, int), char **p, ...)
+{
+ char *s;
+ va_list v;
+ va_start (v,p);
+ s = g (p, va_arg (v,int));
+ va_end (v);
+ return s;
+}
 
-if test "x$ac_cv_prog_cc_c11" = xno
-then :
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-printf "%s\n" "unsupported" >&6; }
-else $as_nop
- if test "x$ac_cv_prog_cc_c11" = x
-then :
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-printf "%s\n" "none needed" >&6; }
-else $as_nop
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5
-printf "%s\n" "$ac_cv_prog_cc_c11" >&6; }
- CC="$CC $ac_cv_prog_cc_c11"
-fi
- ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c11
- ac_prog_cc_stdc=c11
-fi
-fi
-if test x$ac_prog_cc_stdc = xno
-then :
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C99 features" >&5
-printf %s "checking for $CC option to enable C99 features... " >&6; }
-if test ${ac_cv_prog_cc_c99+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
- ac_cv_prog_cc_c99=no
-ac_save_CC=$CC
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-$ac_c_conftest_c99_program
-_ACEOF
-for ac_arg in '' -std=gnu99 -std=c99 -c99 -qlanglvl=extc1x -qlanglvl=extc99 -AC99 -D_STDC_C99=
-do
- CC="$ac_save_CC $ac_arg"
- if ac_fn_c_try_compile "$LINENO"
-then :
- ac_cv_prog_cc_c99=$ac_arg
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam
- test "x$ac_cv_prog_cc_c99" != "xno" && break
-done
-rm -f conftest.$ac_ext
-CC=$ac_save_CC
-fi
+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
+ function prototypes and stuff, but not '\xHH' hex character constants.
+ These don't provoke an error unfortunately, instead are silently treated
+ as 'x'. The following induces an error, until -std is added to get
+ proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an
+ array size at least. It's necessary to write '\x00'==0 to get something
+ that's true only with -std. */
+int osf4_cc_array '\x00' == 0 ? 1 : -1;
 
-if test "x$ac_cv_prog_cc_c99" = xno
-then :
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-printf "%s\n" "unsupported" >&6; }
-else $as_nop
- if test "x$ac_cv_prog_cc_c99" = x
-then :
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-printf "%s\n" "none needed" >&6; }
-else $as_nop
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5
-printf "%s\n" "$ac_cv_prog_cc_c99" >&6; }
- CC="$CC $ac_cv_prog_cc_c99"
-fi
- ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c99
- ac_prog_cc_stdc=c99
-fi
-fi
-if test x$ac_prog_cc_stdc = xno
-then :
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C89 features" >&5
-printf %s "checking for $CC option to enable C89 features... " >&6; }
-if test ${ac_cv_prog_cc_c89+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
- ac_cv_prog_cc_c89=no
-ac_save_CC=$CC
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-$ac_c_conftest_c89_program
+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
+ inside strings and character constants. */
+#define FOO(x) 'x'
+int xlc6_cc_arrayFOO(a) == 'x' ? 1 : -1;
+
+int test (int i, double x);
+struct s1 {int (*f) (int a);};
+struct s2 {int (*f) (double a);};
+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
+int argc;
+char **argv;
+int
+main ()
+{
+return f (e, argv, 0) != argv0 || f (e, argv, 1) != argv1;
+ ;
+ return 0;
+}
 _ACEOF
-for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
+	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
 do
 CC="$ac_save_CC $ac_arg"
- if ac_fn_c_try_compile "$LINENO"
-then :
+ if ac_fn_c_try_compile "$LINENO"; then :
 ac_cv_prog_cc_c89=$ac_arg
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam
+rm -f core conftest.err conftest.$ac_objext
 test "x$ac_cv_prog_cc_c89" != "xno" && break
 done
 rm -f conftest.$ac_ext
 CC=$ac_save_CC
-fi
 
-if test "x$ac_cv_prog_cc_c89" = xno
-then :
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-printf "%s\n" "unsupported" >&6; }
-else $as_nop
- if test "x$ac_cv_prog_cc_c89" = x
-then :
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-printf "%s\n" "none needed" >&6; }
-else $as_nop
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
-printf "%s\n" "$ac_cv_prog_cc_c89" >&6; }
- CC="$CC $ac_cv_prog_cc_c89"
-fi
- ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89
- ac_prog_cc_stdc=c89
 fi
+# AC_CACHE_VAL
+case "x$ac_cv_prog_cc_c89" in
+ x)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+$as_echo "none needed" >&6; } ;;
+ xno)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+$as_echo "unsupported" >&6; } ;;
+ *)
+ CC="$CC $ac_cv_prog_cc_c89"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
+esac
+if test "x$ac_cv_prog_cc_c89" != xno; then :
+
 fi
 
 ac_ext=c
@@ -4104,23 +3528,21 @@
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-
- ac_ext=c
+ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
-printf %s "checking whether $CC understands -c and -o together... " >&6; }
-if test ${am_cv_prog_cc_c_o+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
+$as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
+if ${am_cv_prog_cc_c_o+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 
 int
-main (void)
+main ()
 {
 
 ;
@@ -4148,8 +3570,8 @@
 rm -f core conftest*
 unset am_i
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
-printf "%s\n" "$am_cv_prog_cc_c_o" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
+$as_echo "$am_cv_prog_cc_c_o" >&6; }
 if test "$am_cv_prog_cc_c_o" != yes; then
 # Losing compiler, so override with the script.
 # FIXME: It is wrong to rewrite CC.
@@ -4166,182 +3588,469 @@
 
 
 
-ac_header= ac_cache=
-for ac_item in $ac_header_c_list
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
+$as_echo_n "checking how to run the C preprocessor... " >&6; }
+# On Suns, sometimes $CPP names a directory.
+if test -n "$CPP" && test -d "$CPP"; then
+ CPP=
+fi
+if test -z "$CPP"; then
+ if ${ac_cv_prog_CPP+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ # Double quotes because CPP needs to be expanded
+ for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
+ do
+ ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
 do
- if test $ac_cache; then
- ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default"
- if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then
- printf "%s\n" "#define $ac_item 1" >> confdefs.h
- fi
- ac_header= ac_cache=
- elif test $ac_header; then
- ac_cache=$ac_item
- else
- ac_header=$ac_item
- fi
+ # Use a header file that comes with gcc, so configuring glibc
+ # with a fresh cross-compiler works.
+ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ # <limits.h> exists even on freestanding compilers.
+ # On the NeXT, cc -E runs the code through the compiler's parser,
+ # not just through cpp. "Syntax error" is here to catch this case.
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+		 Syntax error
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+
+else
+ # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+ # OK, works on sane cases. Now check whether nonexistent headers
+ # can be detected and how.
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <ac_nonexistent.h>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+ # Broken: success on invalid input.
+continue
+else
+ # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
 done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
+ break
+fi
 
+ done
+ ac_cv_prog_CPP=$CPP
 
+fi
+ CPP=$ac_cv_prog_CPP
+else
+ ac_cv_prog_CPP=$CPP
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
+$as_echo "$CPP" >&6; }
+ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+ # Use a header file that comes with gcc, so configuring glibc
+ # with a fresh cross-compiler works.
+ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ # <limits.h> exists even on freestanding compilers.
+ # On the NeXT, cc -E runs the code through the compiler's parser,
+ # not just through cpp. "Syntax error" is here to catch this case.
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+		 Syntax error
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
 
+else
+ # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
 
+ # OK, works on sane cases. Now check whether nonexistent headers
+ # can be detected and how.
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <ac_nonexistent.h>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+ # Broken: success on invalid input.
+continue
+else
+ # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
 
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
 
+else
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details" "$LINENO" 5; }
+fi
 
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes
-then :
 
-printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
+$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
+if ${ac_cv_path_GREP+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -z "$GREP"; then
+ ac_path_GREP_found=false
+ # Loop through the user's path and test for each of PROGNAME-LIST
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_prog in grep ggrep; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
+ as_fn_executable_p "$ac_path_GREP" || continue
+# Check for GNU ac_path_GREP and select it if it is found.
+ # Check for GNU $ac_path_GREP
+case `"$ac_path_GREP" --version 2>&1` in
+*GNU*)
+ ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
+*)
+ ac_count=0
+ $as_echo_n 0123456789 >"conftest.in"
+ while :
+ do
+ cat "conftest.in" "conftest.in" >"conftest.tmp"
+ mv "conftest.tmp" "conftest.in"
+ cp "conftest.in" "conftest.nl"
+ $as_echo 'GREP' >> "conftest.nl"
+ "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+ as_fn_arith $ac_count + 1 && ac_count=$as_val
+ if test $ac_count -gt ${ac_path_GREP_max-0}; then
+ # Best one so far, save it but keep looking for a better one
+ ac_cv_path_GREP="$ac_path_GREP"
+ ac_path_GREP_max=$ac_count
+ fi
+ # 10*(2^10) chars as input seems more than enough
+ test $ac_count -gt 10 && break
+ done
+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
 
+ $ac_path_GREP_found && break 3
+ done
+ done
+ done
+IFS=$as_save_IFS
+ if test -z "$ac_cv_path_GREP"; then
+ as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+ fi
+else
+ ac_cv_path_GREP=$GREP
 fi
 
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
+$as_echo "$ac_cv_path_GREP" >&6; }
+ GREP="$ac_cv_path_GREP"
 
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
+$as_echo_n "checking for egrep... " >&6; }
+if ${ac_cv_path_EGREP+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
+ then ac_cv_path_EGREP="$GREP -E"
+ else
+ if test -z "$EGREP"; then
+ ac_path_EGREP_found=false
+ # Loop through the user's path and test for each of PROGNAME-LIST
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_prog in egrep; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
+ as_fn_executable_p "$ac_path_EGREP" || continue
+# Check for GNU ac_path_EGREP and select it if it is found.
+ # Check for GNU $ac_path_EGREP
+case `"$ac_path_EGREP" --version 2>&1` in
+*GNU*)
+ ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
+*)
+ ac_count=0
+ $as_echo_n 0123456789 >"conftest.in"
+ while :
+ do
+ cat "conftest.in" "conftest.in" >"conftest.tmp"
+ mv "conftest.tmp" "conftest.in"
+ cp "conftest.in" "conftest.nl"
+ $as_echo 'EGREP' >> "conftest.nl"
+ "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+ as_fn_arith $ac_count + 1 && ac_count=$as_val
+ if test $ac_count -gt ${ac_path_EGREP_max-0}; then
+ # Best one so far, save it but keep looking for a better one
+ ac_cv_path_EGREP="$ac_path_EGREP"
+ ac_path_EGREP_max=$ac_count
+ fi
+ # 10*(2^10) chars as input seems more than enough
+ test $ac_count -gt 10 && break
+ done
+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+ $ac_path_EGREP_found && break 3
+ done
+ done
+ done
+IFS=$as_save_IFS
+ if test -z "$ac_cv_path_EGREP"; then
+ as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+ fi
+else
+ ac_cv_path_EGREP=$EGREP
+fi
 
+ fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
+$as_echo "$ac_cv_path_EGREP" >&6; }
+ EGREP="$ac_cv_path_EGREP"
 
 
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5
-printf %s "checking whether it is safe to define __EXTENSIONS__... " >&6; }
-if test ${ac_cv_safe_to_define___extensions__+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
+$as_echo_n "checking for ANSI C header files... " >&6; }
+if ${ac_cv_header_stdc+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+#include <float.h>
 
-# define __EXTENSIONS__ 1
- $ac_includes_default
 int
-main (void)
+main ()
 {
 
 ;
 return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
- ac_cv_safe_to_define___extensions__=yes
-else $as_nop
- ac_cv_safe_to_define___extensions__=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_header_stdc=yes
+else
+ ac_cv_header_stdc=no
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5
-printf "%s\n" "$ac_cv_safe_to_define___extensions__" >&6; }
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether _XOPEN_SOURCE should be defined" >&5
-printf %s "checking whether _XOPEN_SOURCE should be defined... " >&6; }
-if test ${ac_cv_should_define__xopen_source+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
- ac_cv_should_define__xopen_source=no
- if test $ac_cv_header_wchar_h = yes
-then :
+if test $ac_cv_header_stdc = yes; then
+ # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
+#include <string.h>
 
- #include <wchar.h>
- mbstate_t x;
-int
-main (void)
-{
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ $EGREP "memchr" >/dev/null 2>&1; then :
+
+else
+ ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+fi
+
+if test $ac_cv_header_stdc = yes; then
+ # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <stdlib.h>
 
- ;
- return 0;
-}
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ $EGREP "free" >/dev/null 2>&1; then :
+
+else
+ ac_cv_header_stdc=no
+fi
+rm -f conftest*
 
-else $as_nop
+fi
+
+if test $ac_cv_header_stdc = yes; then
+ # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
+ if test "$cross_compiling" = yes; then :
+ :
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
+#include <ctype.h>
+#include <stdlib.h>
+#if ((' ' & 0x0FF) == 0x020)
+# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+#else
+# define ISLOWER(c) \
+		 (('a' <= (c) && (c) <= 'i') \
+		 || ('j' <= (c) && (c) <= 'r') \
+		 || ('s' <= (c) && (c) <= 'z'))
+# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
+#endif
 
- #define _XOPEN_SOURCE 500
- #include <wchar.h>
- mbstate_t x;
+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
 int
-main (void)
+main ()
 {
-
- ;
+ int i;
+ for (i = 0; i < 256; i++)
+ if (XOR (islower (i), ISLOWER (i))
+	|| toupper (i) != TOUPPER (i))
+ return 2;
 return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
- ac_cv_should_define__xopen_source=yes
+if ac_fn_c_try_run "$LINENO"; then :
+
+else
+ ac_cv_header_stdc=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+
 fi
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_should_define__xopen_source" >&5
-printf "%s\n" "$ac_cv_should_define__xopen_source" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
+$as_echo "$ac_cv_header_stdc" >&6; }
+if test $ac_cv_header_stdc = yes; then
 
- printf "%s\n" "#define _ALL_SOURCE 1" >>confdefs.h
+$as_echo "#define STDC_HEADERS 1" >>confdefs.h
 
- printf "%s\n" "#define _DARWIN_C_SOURCE 1" >>confdefs.h
+fi
 
- printf "%s\n" "#define _GNU_SOURCE 1" >>confdefs.h
+# On IRIX 5.3, sys/types and inttypes.h are conflicting.
+for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
+		 inttypes.h stdint.h unistd.h
+do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
+"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
 
- printf "%s\n" "#define _HPUX_ALT_XOPEN_SOCKET_API 1" >>confdefs.h
+fi
 
- printf "%s\n" "#define _NETBSD_SOURCE 1" >>confdefs.h
+done
 
- printf "%s\n" "#define _OPENBSD_SOURCE 1" >>confdefs.h
 
- printf "%s\n" "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h
 
- printf "%s\n" "#define __STDC_WANT_IEC_60559_ATTRIBS_EXT__ 1" >>confdefs.h
+ ac_fn_c_check_header_mongrel "$LINENO" "minix/config.h" "ac_cv_header_minix_config_h" "$ac_includes_default"
+if test "x$ac_cv_header_minix_config_h" = xyes; then :
+ MINIX=yes
+else
+ MINIX=
+fi
 
- printf "%s\n" "#define __STDC_WANT_IEC_60559_BFP_EXT__ 1" >>confdefs.h
 
- printf "%s\n" "#define __STDC_WANT_IEC_60559_DFP_EXT__ 1" >>confdefs.h
+ if test "$MINIX" = yes; then
 
- printf "%s\n" "#define __STDC_WANT_IEC_60559_FUNCS_EXT__ 1" >>confdefs.h
+$as_echo "#define _POSIX_SOURCE 1" >>confdefs.h
 
- printf "%s\n" "#define __STDC_WANT_IEC_60559_TYPES_EXT__ 1" >>confdefs.h
 
- printf "%s\n" "#define __STDC_WANT_LIB_EXT2__ 1" >>confdefs.h
+$as_echo "#define _POSIX_1_SOURCE 2" >>confdefs.h
 
- printf "%s\n" "#define __STDC_WANT_MATH_SPEC_FUNCS__ 1" >>confdefs.h
 
- printf "%s\n" "#define _TANDEM_SOURCE 1" >>confdefs.h
+$as_echo "#define _MINIX 1" >>confdefs.h
 
- if test $ac_cv_header_minix_config_h = yes
-then :
- MINIX=yes
- printf "%s\n" "#define _MINIX 1" >>confdefs.h
+ fi
 
- printf "%s\n" "#define _POSIX_SOURCE 1" >>confdefs.h
 
- printf "%s\n" "#define _POSIX_1_SOURCE 2" >>confdefs.h
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5
+$as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; }
+if ${ac_cv_safe_to_define___extensions__+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
 
-else $as_nop
- MINIX=
-fi
- if test $ac_cv_safe_to_define___extensions__ = yes
-then :
- printf "%s\n" "#define __EXTENSIONS__ 1" >>confdefs.h
+# define __EXTENSIONS__ 1
+ $ac_includes_default
+int
+main ()
+{
 
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_safe_to_define___extensions__=yes
+else
+ ac_cv_safe_to_define___extensions__=no
 fi
- if test $ac_cv_should_define__xopen_source = yes
-then :
- printf "%s\n" "#define _XOPEN_SOURCE 500" >>confdefs.h
-
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5
+$as_echo "$ac_cv_safe_to_define___extensions__" >&6; }
+ test $ac_cv_safe_to_define___extensions__ = yes &&
+ $as_echo "#define __EXTENSIONS__ 1" >>confdefs.h
 
+ $as_echo "#define _ALL_SOURCE 1" >>confdefs.h
+
+ $as_echo "#define _GNU_SOURCE 1" >>confdefs.h
+
+ $as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h
+
+ $as_echo "#define _TANDEM_SOURCE 1" >>confdefs.h
 
-# Initialize Automake
-am__api_version='1.16'
 
 
- # Find a good install program. We prefer a C program (faster),
+# Initialize Automake
+am__api_version='1.15'
+
+# Find a good install program. We prefer a C program (faster),
 # so one script is as good as another. But avoid the broken or
 # incompatible versions:
 # SysV /etc/install, /usr/sbin/install
@@ -4355,25 +4064,20 @@
 # OS/2's system install, which has a completely different semantic
 # ./install, which can be erroneously created by make from ./install.sh.
 # Reject install programs that cannot install multiple files.
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
-printf %s "checking for a BSD-compatible install... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
+$as_echo_n "checking for a BSD-compatible install... " >&6; }
 if test -z "$INSTALL"; then
-if test ${ac_cv_path_install+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+if ${ac_cv_path_install+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
 IFS=$as_save_IFS
- case $as_dir in #(((
- '') as_dir=./ ;;
- */) ;;
- *) as_dir=$as_dir/ ;;
- esac
- # Account for fact that we put trailing slashes in our PATH walk.
-case $as_dir in #((
- ./ | /cC/* | \
+ test -z "$as_dir" && as_dir=.
+ # Account for people who put trailing slashes in PATH elements.
+case $as_dir/ in #((
+ ./ | .// | /cC/* | \
 /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
 ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
 /usr/ucb/* ) ;;
@@ -4383,13 +4087,13 @@
 # by default.
 for ac_prog in ginstall scoinst install; do
 for ac_exec_ext in '' $ac_executable_extensions; do
-	if as_fn_executable_p "$as_dir$ac_prog$ac_exec_ext"; then
+	if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
 	 if test $ac_prog = install &&
-	 grep dspmsg "$as_dir$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+	 grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
 	 # AIX install. It has an incompatible calling convention.
 	 :
 	 elif test $ac_prog = install &&
-	 grep pwplus "$as_dir$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+	 grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
 	 # program-specific install script used by HP pwplus--don't use.
 	 :
 	 else
@@ -4397,12 +4101,12 @@
 	 echo one > conftest.one
 	 echo two > conftest.two
 	 mkdir conftest.dir
-	 if "$as_dir$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir/" &&
+	 if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
 	 test -s conftest.one && test -s conftest.two &&
 	 test -s conftest.dir/conftest.one &&
 	 test -s conftest.dir/conftest.two
 	 then
-	 ac_cv_path_install="$as_dir$ac_prog$ac_exec_ext -c"
+	 ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
 	 break 3
 	 fi
 	 fi
@@ -4418,7 +4122,7 @@
 rm -rf conftest.one conftest.two conftest.dir
 
 fi
- if test ${ac_cv_path_install+y}; then
+ if test "${ac_cv_path_install+set}" = set; then
 INSTALL=$ac_cv_path_install
 else
 # As a last resort, use the slow shell script. Don't cache a
@@ -4428,8 +4132,8 @@
 INSTALL=$ac_install_sh
 fi
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
-printf "%s\n" "$INSTALL" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
+$as_echo "$INSTALL" >&6; }
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
 # It thinks the first close brace ends the variable substitution.
@@ -4439,8 +4143,8 @@
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
-printf %s "checking whether build environment is sane... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
+$as_echo_n "checking whether build environment is sane... " >&6; }
 # Reject unsafe characters in $srcdir or the absolute working directory
 # name. Accept space and tab only in the latter.
 am_lf='
@@ -4494,8 +4198,8 @@
 as_fn_error $? "newly created file is older than distributed files!
 Check your system clock" "$LINENO" 5
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 # If we didn't sleep, we still need to ensure time stamps of config.status and
 # generated files are strictly newer.
 am_sleep_pid=
@@ -4514,19 +4218,23 @@
 # Double any \ or $.
 # By default was `s,x,x', remove it if useless.
 ac_script='s/\\$/&&/g;s/;s,x,x,$//'
-program_transform_name=`printf "%s\n" "$program_transform_name" | sed "$ac_script"`
-
+program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
 
- if test x"${MISSING+set}" != xset; then
- MISSING="\${SHELL} '$am_aux_dir/missing'"
+if test x"${MISSING+set}" != xset; then
+ case $am_aux_dir in
+ *\ * | *\	*)
+ MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
+ *)
+ MISSING="\${SHELL} $am_aux_dir/missing" ;;
+ esac
 fi
 # Use eval to expand $SHELL
 if eval "$MISSING --is-lightweight"; then
 am_missing_run="$MISSING "
 else
 am_missing_run=
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
-printf "%s\n" "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
+$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
 fi
 
 if test x"${install_sh+set}" != xset; then
@@ -4546,12 +4254,11 @@
 if test -n "$ac_tool_prefix"; then
 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
 set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_STRIP+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_STRIP+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 if test -n "$STRIP"; then
 ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
 else
@@ -4559,15 +4266,11 @@
 for as_dir in $PATH
 do
 IFS=$as_save_IFS
- case $as_dir in #(((
- '') as_dir=./ ;;
- */) ;;
- *) as_dir=$as_dir/ ;;
- esac
+ test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_prog_STRIP="${ac_tool_prefix}strip"
- printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
 fi
 done
@@ -4578,11 +4281,11 @@
 fi
 STRIP=$ac_cv_prog_STRIP
 if test -n "$STRIP"; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
-printf "%s\n" "$STRIP" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
+$as_echo "$STRIP" >&6; }
 else
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -4591,12 +4294,11 @@
 ac_ct_STRIP=$STRIP
 # Extract the first word of "strip", so it can be a program name with args.
 set dummy strip; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_ac_ct_STRIP+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 if test -n "$ac_ct_STRIP"; then
 ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
 else
@@ -4604,15 +4306,11 @@
 for as_dir in $PATH
 do
 IFS=$as_save_IFS
- case $as_dir in #(((
- '') as_dir=./ ;;
- */) ;;
- *) as_dir=$as_dir/ ;;
- esac
+ test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_prog_ac_ct_STRIP="strip"
- printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
 fi
 done
@@ -4623,11 +4321,11 @@
 fi
 ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
 if test -n "$ac_ct_STRIP"; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
-printf "%s\n" "$ac_ct_STRIP" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
+$as_echo "$ac_ct_STRIP" >&6; }
 else
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 if test "x$ac_ct_STRIP" = x; then
@@ -4635,8 +4333,8 @@
 else
 case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
 STRIP=$ac_ct_STRIP
@@ -4648,31 +4346,25 @@
 fi
 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 
-
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a race-free mkdir -p" >&5
-printf %s "checking for a race-free mkdir -p... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
+$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
 if test -z "$MKDIR_P"; then
- if test ${ac_cv_path_mkdir+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+ if ${ac_cv_path_mkdir+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
 do
 IFS=$as_save_IFS
- case $as_dir in #(((
- '') as_dir=./ ;;
- */) ;;
- *) as_dir=$as_dir/ ;;
- esac
+ test -z "$as_dir" && as_dir=.
 for ac_prog in mkdir gmkdir; do
 	 for ac_exec_ext in '' $ac_executable_extensions; do
-	 as_fn_executable_p "$as_dir$ac_prog$ac_exec_ext" || continue
-	 case `"$as_dir$ac_prog$ac_exec_ext" --version 2>&1` in #(
-	 'mkdir ('*'coreutils) '* | \
-	 'BusyBox '* | \
+	 as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue
+	 case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
+	 'mkdir (GNU coreutils) '* | \
+	 'mkdir (coreutils) '* | \
 	 'mkdir (fileutils) '4.1*)
-	 ac_cv_path_mkdir=$as_dir$ac_prog$ac_exec_ext
+	 ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
 	 break 3;;
 	 esac
 	 done
@@ -4683,7 +4375,7 @@
 fi
 
 test -d ./--version && rmdir ./--version
- if test ${ac_cv_path_mkdir+y}; then
+ if test "${ac_cv_path_mkdir+set}" = set; then
 MKDIR_P="$ac_cv_path_mkdir -p"
 else
 # As a last resort, use the slow shell script. Don't cache a
@@ -4693,19 +4385,18 @@
 MKDIR_P="$ac_install_sh -d"
 fi
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
-printf "%s\n" "$MKDIR_P" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
+$as_echo "$MKDIR_P" >&6; }
 
 for ac_prog in gawk mawk nawk awk
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_AWK+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_AWK+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 if test -n "$AWK"; then
 ac_cv_prog_AWK="$AWK" # Let the user override the test.
 else
@@ -4713,15 +4404,11 @@
 for as_dir in $PATH
 do
 IFS=$as_save_IFS
- case $as_dir in #(((
- '') as_dir=./ ;;
- */) ;;
- *) as_dir=$as_dir/ ;;
- esac
+ test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_prog_AWK="$ac_prog"
- printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
 fi
 done
@@ -4732,25 +4419,24 @@
 fi
 AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
-printf "%s\n" "$AWK" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
+$as_echo "$AWK" >&6; }
 else
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
 test -n "$AWK" && break
 done
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-printf %s "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
 set x ${MAKE-make}
-ac_make=`printf "%s\n" "$2" | sed 's/+/p/g; s/^a-zA-Z0-9_/_/g'`
-if eval test \${ac_cv_prog_make_${ac_make}_set+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+ac_make=`$as_echo "$2" | sed 's/+/p/g; s/^a-zA-Z0-9_/_/g'`
+if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat >conftest.make <<\_ACEOF
 SHELL = /bin/sh
 all:
@@ -4766,12 +4452,12 @@
 rm -f conftest.make
 fi
 if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 SET_MAKE=
 else
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 SET_MAKE="MAKE=${MAKE-make}"
 fi
 
@@ -4788,49 +4474,48 @@
 
 ac_config_commands="$ac_config_commands depfiles"
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} supports the include directive" >&5
-printf %s "checking whether ${MAKE-make} supports the include directive... " >&6; }
-cat > confinc.mk << 'END'
+
+am_make=${MAKE-make}
+cat > confinc << 'END'
 am__doit:
-	@echo this is the am__doit target >confinc.out
+	@echo this is the am__doit target
 .PHONY: am__doit
 END
+# If we don't find an include directive, just comment out the code.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
+$as_echo_n "checking for style of include used by $am_make... " >&6; }
 am__include="#"
 am__quote=
-# BSD make does it like this.
-echo '.include "confinc.mk" # ignored' > confmf.BSD
-# Other make implementations (GNU, Solaris 10, AIX) do it like this.
-echo 'include confinc.mk # ignored' > confmf.GNU
-_am_result=no
-for s in GNU BSD; do
- { echo "$as_me:$LINENO: ${MAKE-make} -f confmf.$s && cat confinc.out" >&5
- (${MAKE-make} -f confmf.$s && cat confinc.out) >&5 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
- case $?:`cat confinc.out 2>/dev/null` in #(
- '0:this is the am__doit target') :
- case $s in #(
- BSD) :
- am__include='.include' am__quote='"' ;; #(
- *) :
- am__include='include' am__quote='' ;;
-esac ;; #(
- *) :
+_am_result=none
+# First try GNU make style include.
+echo "include confinc" > confmf
+# Ignore all kinds of additional output from 'make'.
+case `$am_make -s -f confmf 2> /dev/null` in #(
+*the\ am__doit\ target*)
+ am__include=include
+ am__quote=
+ _am_result=GNU
+ ;;
+esac
+# Now try BSD make style include.
+if test "$am__include" = "#"; then
+ echo '.include "confinc"' > confmf
+ case `$am_make -s -f confmf 2> /dev/null` in #(
+ *the\ am__doit\ target*)
+ am__include=.include
+ am__quote="\""
+ _am_result=BSD
 ;;
-esac
- if test "$am__include" != "#"; then
- _am_result="yes ($s style)"
- break
- fi
-done
-rm -f confinc.* confmf.*
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${_am_result}" >&5
-printf "%s\n" "${_am_result}" >&6; }
+ esac
+fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
+$as_echo "$_am_result" >&6; }
+rm -f confinc confmf
 
 # Check whether --enable-dependency-tracking was given.
-if test ${enable_dependency_tracking+y}
-then :
+if test "${enable_dependency_tracking+set}" = set; then :
 enableval=$enable_dependency_tracking;
 fi
 
@@ -4849,8 +4534,7 @@
 
 
 # Check whether --enable-silent-rules was given.
-if test ${enable_silent_rules+y}
-then :
+if test "${enable_silent_rules+set}" = set; then :
 enableval=$enable_silent_rules;
 fi
 
@@ -4860,13 +4544,12 @@
 *) AM_DEFAULT_VERBOSITY=1;;
 esac
 am_make=${MAKE-make}
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
-printf %s "checking whether $am_make supports nested variables... " >&6; }
-if test ${am_cv_make_support_nested_variables+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
- if printf "%s\n" 'TRUE=$(BAR$(V))
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
+$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
+if ${am_cv_make_support_nested_variables+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if $as_echo 'TRUE=$(BAR$(V))
 BAR0=false
 BAR1=true
 V=1
@@ -4878,8 +4561,8 @@
 am_cv_make_support_nested_variables=no
 fi
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
-printf "%s\n" "$am_cv_make_support_nested_variables" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
+$as_echo "$am_cv_make_support_nested_variables" >&6; }
 if test $am_cv_make_support_nested_variables = yes; then
 AM_V='$(V)'
 AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
@@ -4911,13 +4594,17 @@
 
 # Define the identity of the package.
 PACKAGE='libX11'
- VERSION='1.8.1'
+ VERSION='1.8.4'
 
 
-printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE "$PACKAGE"
+_ACEOF
 
 
-printf "%s\n" "#define VERSION \"$VERSION\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define VERSION "$VERSION"
+_ACEOF
 
 # Some tools Automake needs.
 
@@ -4937,8 +4624,8 @@
 
 # For better backward compatibility. To be removed once Automake 1.9.x
 # dies out for good. For more background, see:
-# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
-# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
 mkdir_p='$(MKDIR_P)'
 
 # We need awk for the "check" target (and possibly the TAP driver). The
@@ -4959,12 +4646,11 @@
 
 depcc="$CC" am_compiler_list=
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
-printf %s "checking dependency style of $depcc... " >&6; }
-if test ${am_cv_CC_dependencies_compiler_type+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
+$as_echo_n "checking dependency style of $depcc... " >&6; }
+if ${am_cv_CC_dependencies_compiler_type+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
 # We make a subdir and do the tests there. Otherwise we can end up
 # making bogus files that we don't know about and never remove. For
@@ -5071,8 +4757,8 @@
 fi
 
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
-printf "%s\n" "$am_cv_CC_dependencies_compiler_type" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
+$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
 CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
 
 if
@@ -5086,20 +4772,6 @@
 fi
 
 
-# Variables for tags utilities; see am/tags.am
-if test -z "$CTAGS"; then
- CTAGS=ctags
-fi
-
-if test -z "$ETAGS"; then
- ETAGS=etags
-fi
-
-if test -z "$CSCOPE"; then
- CSCOPE=cscope
-fi
-
-
 
 # POSIX will say in a future version that running "rm -f" with no argument
 # is OK; and we want to be able to make that assumption in our Makefile
@@ -5132,7 +4804,7 @@
 Aborting the configuration process, to ensure you take notice of the issue.
 
 You can download and install GNU coreutils to get an 'rm' implementation
-that behaves properly: <https://www.gnu.org/software/coreutils/>.
+that behaves properly: <http://www.gnu.org/software/coreutils/>.
 
 If you want to complete the configuration process using your problematic
 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
@@ -5147,15 +4819,14 @@
 # Initialize libtool
 case `pwd` in
 *\ * | *\	*)
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
-printf "%s\n" "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
+$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
 esac
 
 
 
-macro_version='2.4.7'
-macro_revision='2.4.7'
-
+macro_version='2.4.6'
+macro_revision='2.4.6'
 
 
 
@@ -5192,8 +4863,8 @@
 ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
 ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
-printf %s "checking how to print strings... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
+$as_echo_n "checking how to print strings... " >&6; }
 # Test print first, because it will be a builtin if present.
 if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
 test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
@@ -5219,12 +4890,12 @@
 }
 
 case $ECHO in
- printf*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: printf" >&5
-printf "%s\n" "printf" >&6; } ;;
- print*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: print -r" >&5
-printf "%s\n" "print -r" >&6; } ;;
- *) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: cat" >&5
-printf "%s\n" "cat" >&6; } ;;
+ printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5
+$as_echo "printf" >&6; } ;;
+ print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5
+$as_echo "print -r" >&6; } ;;
+ *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5
+$as_echo "cat" >&6; } ;;
 esac
 
 
@@ -5240,12 +4911,11 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
-printf %s "checking for a sed that does not truncate output... " >&6; }
-if test ${ac_cv_path_SED+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
+$as_echo_n "checking for a sed that does not truncate output... " >&6; }
+if ${ac_cv_path_SED+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
 for ac_i in 1 2 3 4 5 6 7; do
 ac_script="$ac_script$as_nl$ac_script"
@@ -5259,15 +4929,10 @@
 for as_dir in $PATH
 do
 IFS=$as_save_IFS
- case $as_dir in #(((
- '') as_dir=./ ;;
- */) ;;
- *) as_dir=$as_dir/ ;;
- esac
- for ac_prog in sed gsed
- do
+ test -z "$as_dir" && as_dir=.
+ for ac_prog in sed gsed; do
 for ac_exec_ext in '' $ac_executable_extensions; do
- ac_path_SED="$as_dir$ac_prog$ac_exec_ext"
+ ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
 as_fn_executable_p "$ac_path_SED" || continue
 # Check for GNU ac_path_SED and select it if it is found.
 # Check for GNU $ac_path_SED
@@ -5276,13 +4941,13 @@
 ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
 *)
 ac_count=0
- printf %s 0123456789 >"conftest.in"
+ $as_echo_n 0123456789 >"conftest.in"
 while :
 do
 cat "conftest.in" "conftest.in" >"conftest.tmp"
 mv "conftest.tmp" "conftest.in"
 cp "conftest.in" "conftest.nl"
- printf "%s\n" '' >> "conftest.nl"
+ $as_echo '' >> "conftest.nl"
 "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
 diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
 as_fn_arith $ac_count + 1 && ac_count=$as_val
@@ -5310,8 +4975,8 @@
 fi
 
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
-printf "%s\n" "$ac_cv_path_SED" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
+$as_echo "$ac_cv_path_SED" >&6; }
 SED="$ac_cv_path_SED"
 rm -f conftest.sed
 
@@ -5328,154 +4993,11 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
-printf %s "checking for grep that handles long lines and -e... " >&6; }
-if test ${ac_cv_path_GREP+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
- if test -z "$GREP"; then
- ac_path_GREP_found=false
- # Loop through the user's path and test for each of PROGNAME-LIST
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
- IFS=$as_save_IFS
- case $as_dir in #(((
- '') as_dir=./ ;;
- */) ;;
- *) as_dir=$as_dir/ ;;
- esac
- for ac_prog in grep ggrep
- do
- for ac_exec_ext in '' $ac_executable_extensions; do
- ac_path_GREP="$as_dir$ac_prog$ac_exec_ext"
- as_fn_executable_p "$ac_path_GREP" || continue
-# Check for GNU ac_path_GREP and select it if it is found.
- # Check for GNU $ac_path_GREP
-case `"$ac_path_GREP" --version 2>&1` in
-*GNU*)
- ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
-*)
- ac_count=0
- printf %s 0123456789 >"conftest.in"
- while :
- do
- cat "conftest.in" "conftest.in" >"conftest.tmp"
- mv "conftest.tmp" "conftest.in"
- cp "conftest.in" "conftest.nl"
- printf "%s\n" 'GREP' >> "conftest.nl"
- "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
- diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
- as_fn_arith $ac_count + 1 && ac_count=$as_val
- if test $ac_count -gt ${ac_path_GREP_max-0}; then
- # Best one so far, save it but keep looking for a better one
- ac_cv_path_GREP="$ac_path_GREP"
- ac_path_GREP_max=$ac_count
- fi
- # 10*(2^10) chars as input seems more than enough
- test $ac_count -gt 10 && break
- done
- rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
- $ac_path_GREP_found && break 3
- done
- done
- done
-IFS=$as_save_IFS
- if test -z "$ac_cv_path_GREP"; then
- as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
- fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
+$as_echo_n "checking for fgrep... " >&6; }
+if ${ac_cv_path_FGREP+:} false; then :
+ $as_echo_n "(cached) " >&6
 else
- ac_cv_path_GREP=$GREP
-fi
-
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
-printf "%s\n" "$ac_cv_path_GREP" >&6; }
- GREP="$ac_cv_path_GREP"
-
-
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
-printf %s "checking for egrep... " >&6; }
-if test ${ac_cv_path_EGREP+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
- if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
- then ac_cv_path_EGREP="$GREP -E"
- else
- if test -z "$EGREP"; then
- ac_path_EGREP_found=false
- # Loop through the user's path and test for each of PROGNAME-LIST
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
- IFS=$as_save_IFS
- case $as_dir in #(((
- '') as_dir=./ ;;
- */) ;;
- *) as_dir=$as_dir/ ;;
- esac
- for ac_prog in egrep
- do
- for ac_exec_ext in '' $ac_executable_extensions; do
- ac_path_EGREP="$as_dir$ac_prog$ac_exec_ext"
- as_fn_executable_p "$ac_path_EGREP" || continue
-# Check for GNU ac_path_EGREP and select it if it is found.
- # Check for GNU $ac_path_EGREP
-case `"$ac_path_EGREP" --version 2>&1` in
-*GNU*)
- ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
-*)
- ac_count=0
- printf %s 0123456789 >"conftest.in"
- while :
- do
- cat "conftest.in" "conftest.in" >"conftest.tmp"
- mv "conftest.tmp" "conftest.in"
- cp "conftest.in" "conftest.nl"
- printf "%s\n" 'EGREP' >> "conftest.nl"
- "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
- diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
- as_fn_arith $ac_count + 1 && ac_count=$as_val
- if test $ac_count -gt ${ac_path_EGREP_max-0}; then
- # Best one so far, save it but keep looking for a better one
- ac_cv_path_EGREP="$ac_path_EGREP"
- ac_path_EGREP_max=$ac_count
- fi
- # 10*(2^10) chars as input seems more than enough
- test $ac_count -gt 10 && break
- done
- rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
- $ac_path_EGREP_found && break 3
- done
- done
- done
-IFS=$as_save_IFS
- if test -z "$ac_cv_path_EGREP"; then
- as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
- fi
-else
- ac_cv_path_EGREP=$EGREP
-fi
-
- fi
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
-printf "%s\n" "$ac_cv_path_EGREP" >&6; }
- EGREP="$ac_cv_path_EGREP"
-
-
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
-printf %s "checking for fgrep... " >&6; }
-if test ${ac_cv_path_FGREP+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
 if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
 then ac_cv_path_FGREP="$GREP -F"
 else
@@ -5486,15 +5008,10 @@
 for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
 do
 IFS=$as_save_IFS
- case $as_dir in #(((
- '') as_dir=./ ;;
- */) ;;
- *) as_dir=$as_dir/ ;;
- esac
- for ac_prog in fgrep
- do
+ test -z "$as_dir" && as_dir=.
+ for ac_prog in fgrep; do
 for ac_exec_ext in '' $ac_executable_extensions; do
- ac_path_FGREP="$as_dir$ac_prog$ac_exec_ext"
+ ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
 as_fn_executable_p "$ac_path_FGREP" || continue
 # Check for GNU ac_path_FGREP and select it if it is found.
 # Check for GNU $ac_path_FGREP
@@ -5503,13 +5020,13 @@
 ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;;
 *)
 ac_count=0
- printf %s 0123456789 >"conftest.in"
+ $as_echo_n 0123456789 >"conftest.in"
 while :
 do
 cat "conftest.in" "conftest.in" >"conftest.tmp"
 mv "conftest.tmp" "conftest.in"
 cp "conftest.in" "conftest.nl"
- printf "%s\n" 'FGREP' >> "conftest.nl"
+ $as_echo 'FGREP' >> "conftest.nl"
 "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break
 diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
 as_fn_arith $ac_count + 1 && ac_count=$as_val
@@ -5538,8 +5055,8 @@
 
 fi
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5
-printf "%s\n" "$ac_cv_path_FGREP" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5
+$as_echo "$ac_cv_path_FGREP" >&6; }
 FGREP="$ac_cv_path_FGREP"
 
 
@@ -5564,18 +5081,17 @@
 
 
 # Check whether --with-gnu-ld was given.
-if test ${with_gnu_ld+y}
-then :
+if test "${with_gnu_ld+set}" = set; then :
 withval=$with_gnu_ld; test no = "$withval" || with_gnu_ld=yes
-else $as_nop
+else
 with_gnu_ld=no
 fi
 
 ac_prog=ld
 if test yes = "$GCC"; then
 # Check if gcc -print-prog-name=ld gives a path.
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
-printf %s "checking for ld used by $CC... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
+$as_echo_n "checking for ld used by $CC... " >&6; }
 case $host in
 *-*-mingw*)
 # gcc leaves a trailing carriage return, which upsets mingw
@@ -5604,16 +5120,15 @@
 ;;
 esac
 elif test yes = "$with_gnu_ld"; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
-printf %s "checking for GNU ld... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
+$as_echo_n "checking for GNU ld... " >&6; }
 else
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
-printf %s "checking for non-GNU ld... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
+$as_echo_n "checking for non-GNU ld... " >&6; }
 fi
-if test ${lt_cv_path_LD+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+if ${lt_cv_path_LD+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 if test -z "$LD"; then
 lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
 for ac_dir in $PATH; do
@@ -5642,19 +5157,18 @@
 
 LD=$lt_cv_path_LD
 if test -n "$LD"; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
-printf "%s\n" "$LD" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
+$as_echo "$LD" >&6; }
 else
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
-printf %s "checking if the linker ($LD) is GNU ld... " >&6; }
-if test ${lt_cv_prog_gnu_ld+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
+$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
+if ${lt_cv_prog_gnu_ld+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 # I'd rather use --version here, but apparently some GNU lds only accept -v.
 case `$LD -v 2>&1 </dev/null` in
 *GNU* | *'with BFD'*)
@@ -5665,8 +5179,8 @@
 ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
-printf "%s\n" "$lt_cv_prog_gnu_ld" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
+$as_echo "$lt_cv_prog_gnu_ld" >&6; }
 with_gnu_ld=$lt_cv_prog_gnu_ld
 
 
@@ -5677,12 +5191,11 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5
-printf %s "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
-if test ${lt_cv_path_NM+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5
+$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
+if ${lt_cv_path_NM+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 if test -n "$NM"; then
 # Let the user override the test.
 lt_cv_path_NM=$NM
@@ -5707,13 +5220,13 @@
 	mingw*) lt_bad_file=conftest.nm/nofile ;;
 	*) lt_bad_file=/dev/null ;;
 	esac
-	case `"$tmp_nm" -B $lt_bad_file 2>&1 | $SED '1q'` in
+	case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in
 	*$lt_bad_file* | *'Invalid file or object type'*)
 	 lt_cv_path_NM="$tmp_nm -B"
 	 break 2
 	 ;;
 	*)
-	 case `"$tmp_nm" -p /dev/null 2>&1 | $SED '1q'` in
+	 case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
 	 */dev/null*)
 	 lt_cv_path_NM="$tmp_nm -p"
 	 break 2
@@ -5732,8 +5245,8 @@
 : ${lt_cv_path_NM=no}
 fi
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
-printf "%s\n" "$lt_cv_path_NM" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
+$as_echo "$lt_cv_path_NM" >&6; }
 if test no != "$lt_cv_path_NM"; then
 NM=$lt_cv_path_NM
 else
@@ -5746,12 +5259,11 @@
 do
 # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_DUMPBIN+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_DUMPBIN+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 if test -n "$DUMPBIN"; then
 ac_cv_prog_DUMPBIN="$DUMPBIN" # Let the user override the test.
 else
@@ -5759,15 +5271,11 @@
 for as_dir in $PATH
 do
 IFS=$as_save_IFS
- case $as_dir in #(((
- '') as_dir=./ ;;
- */) ;;
- *) as_dir=$as_dir/ ;;
- esac
+ test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
- printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
 fi
 done
@@ -5778,11 +5286,11 @@
 fi
 DUMPBIN=$ac_cv_prog_DUMPBIN
 if test -n "$DUMPBIN"; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5
-printf "%s\n" "$DUMPBIN" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5
+$as_echo "$DUMPBIN" >&6; }
 else
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -5795,12 +5303,11 @@
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_ac_ct_DUMPBIN+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_DUMPBIN+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 if test -n "$ac_ct_DUMPBIN"; then
 ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # Let the user override the test.
 else
@@ -5808,15 +5315,11 @@
 for as_dir in $PATH
 do
 IFS=$as_save_IFS
- case $as_dir in #(((
- '') as_dir=./ ;;
- */) ;;
- *) as_dir=$as_dir/ ;;
- esac
+ test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
- printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
 fi
 done
@@ -5827,11 +5330,11 @@
 fi
 ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN
 if test -n "$ac_ct_DUMPBIN"; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5
-printf "%s\n" "$ac_ct_DUMPBIN" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5
+$as_echo "$ac_ct_DUMPBIN" >&6; }
 else
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -5843,15 +5346,15 @@
 else
 case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
 DUMPBIN=$ac_ct_DUMPBIN
 fi
 fi
 
- case `$DUMPBIN -symbols -headers /dev/null 2>&1 | $SED '1q'` in
+ case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in
 *COFF*)
 DUMPBIN="$DUMPBIN -symbols -headers"
 ;;
@@ -5872,12 +5375,11 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
-printf %s "checking the name lister ($NM) interface... " >&6; }
-if test ${lt_cv_nm_interface+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
+$as_echo_n "checking the name lister ($NM) interface... " >&6; }
+if ${lt_cv_nm_interface+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 lt_cv_nm_interface="BSD nm"
 echo "int some_variable = 0;" > conftest.$ac_ext
 (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5)
@@ -5893,27 +5395,26 @@
 fi
 rm -f conftest*
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5
-printf "%s\n" "$lt_cv_nm_interface" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5
+$as_echo "$lt_cv_nm_interface" >&6; }
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
-printf %s "checking whether ln -s works... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
+$as_echo_n "checking whether ln -s works... " >&6; }
 LN_S=$as_ln_s
 if test "$LN_S" = "ln -s"; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 else
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
-printf "%s\n" "no, using $LN_S" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
+$as_echo "no, using $LN_S" >&6; }
 fi
 
 # find the maximum length of command line arguments
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
-printf %s "checking the maximum length of command line arguments... " >&6; }
-if test ${lt_cv_sys_max_cmd_len+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
+$as_echo_n "checking the maximum length of command line arguments... " >&6; }
+if ${lt_cv_sys_max_cmd_len+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 i=0
 teststring=ABCD
 
@@ -5955,7 +5456,7 @@
 lt_cv_sys_max_cmd_len=8192;
 ;;
 
- bitrig* | darwin* | dragonfly* | freebsd* | midnightbsd* | netbsd* | openbsd*)
+ bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*)
 # This has been around since 386BSD, at least. Likely further.
 if test -x /sbin/sysctl; then
 lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
@@ -5998,7 +5499,7 @@
 sysv5* | sco5v6* | sysv4.2uw2*)
 kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
 if test -n "$kargmax"; then
- lt_cv_sys_max_cmd_len=`echo $kargmax | $SED 's/.*	 //'`
+ lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*	 //'`
 else
 lt_cv_sys_max_cmd_len=32768
 fi
@@ -6040,11 +5541,11 @@
 fi
 
 if test -n "$lt_cv_sys_max_cmd_len"; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5
-printf "%s\n" "$lt_cv_sys_max_cmd_len" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5
+$as_echo "$lt_cv_sys_max_cmd_len" >&6; }
 else
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none" >&5
-printf "%s\n" "none" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
+$as_echo "none" >&6; }
 fi
 max_cmd_len=$lt_cv_sys_max_cmd_len
 
@@ -6088,12 +5589,11 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
-printf %s "checking how to convert $build file names to $host format... " >&6; }
-if test ${lt_cv_to_host_file_cmd+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
+$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
+if ${lt_cv_to_host_file_cmd+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 case $host in
 *-*-mingw* )
 case $build in
@@ -6129,19 +5629,18 @@
 fi
 
 to_host_file_cmd=$lt_cv_to_host_file_cmd
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
-printf "%s\n" "$lt_cv_to_host_file_cmd" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
+$as_echo "$lt_cv_to_host_file_cmd" >&6; }
 
 
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
-printf %s "checking how to convert $build file names to toolchain format... " >&6; }
-if test ${lt_cv_to_tool_file_cmd+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
+if ${lt_cv_to_tool_file_cmd+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 #assume ordinary cross tools, or native build.
 lt_cv_to_tool_file_cmd=func_convert_file_noop
 case $host in
@@ -6157,23 +5656,22 @@
 fi
 
 to_tool_file_cmd=$lt_cv_to_tool_file_cmd
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
-printf "%s\n" "$lt_cv_to_tool_file_cmd" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
+$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
 
 
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
-printf %s "checking for $LD option to reload object files... " >&6; }
-if test ${lt_cv_ld_reload_flag+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
+$as_echo_n "checking for $LD option to reload object files... " >&6; }
+if ${lt_cv_ld_reload_flag+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 lt_cv_ld_reload_flag='-r'
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5
-printf "%s\n" "$lt_cv_ld_reload_flag" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5
+$as_echo "$lt_cv_ld_reload_flag" >&6; }
 reload_flag=$lt_cv_ld_reload_flag
 case $reload_flag in
 "" | " "*) ;;
@@ -6204,122 +5702,13 @@
 
 
 if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}file", so it can be a program name with args.
-set dummy ${ac_tool_prefix}file; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_FILECMD+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
- if test -n "$FILECMD"; then
- ac_cv_prog_FILECMD="$FILECMD" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- case $as_dir in #(((
- '') as_dir=./ ;;
- */) ;;
- *) as_dir=$as_dir/ ;;
- esac
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
- ac_cv_prog_FILECMD="${ac_tool_prefix}file"
- printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-FILECMD=$ac_cv_prog_FILECMD
-if test -n "$FILECMD"; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $FILECMD" >&5
-printf "%s\n" "$FILECMD" >&6; }
-else
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_FILECMD"; then
- ac_ct_FILECMD=$FILECMD
- # Extract the first word of "file", so it can be a program name with args.
-set dummy file; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_ac_ct_FILECMD+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
- if test -n "$ac_ct_FILECMD"; then
- ac_cv_prog_ac_ct_FILECMD="$ac_ct_FILECMD" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- case $as_dir in #(((
- '') as_dir=./ ;;
- */) ;;
- *) as_dir=$as_dir/ ;;
- esac
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
- ac_cv_prog_ac_ct_FILECMD="file"
- printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_FILECMD=$ac_cv_prog_ac_ct_FILECMD
-if test -n "$ac_ct_FILECMD"; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_FILECMD" >&5
-printf "%s\n" "$ac_ct_FILECMD" >&6; }
-else
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-fi
-
- if test "x$ac_ct_FILECMD" = x; then
- FILECMD=":"
- else
- case $cross_compiling:$ac_tool_warned in
-yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
- FILECMD=$ac_ct_FILECMD
- fi
-else
- FILECMD="$ac_cv_prog_FILECMD"
-fi
-
-
-
-
-
-
-
-if test -n "$ac_tool_prefix"; then
 # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
 set dummy ${ac_tool_prefix}objdump; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_OBJDUMP+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_OBJDUMP+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 if test -n "$OBJDUMP"; then
 ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
 else
@@ -6327,15 +5716,11 @@
 for as_dir in $PATH
 do
 IFS=$as_save_IFS
- case $as_dir in #(((
- '') as_dir=./ ;;
- */) ;;
- *) as_dir=$as_dir/ ;;
- esac
+ test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
- printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
 fi
 done
@@ -6346,11 +5731,11 @@
 fi
 OBJDUMP=$ac_cv_prog_OBJDUMP
 if test -n "$OBJDUMP"; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
-printf "%s\n" "$OBJDUMP" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
+$as_echo "$OBJDUMP" >&6; }
 else
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -6359,12 +5744,11 @@
 ac_ct_OBJDUMP=$OBJDUMP
 # Extract the first word of "objdump", so it can be a program name with args.
 set dummy objdump; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_ac_ct_OBJDUMP+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 if test -n "$ac_ct_OBJDUMP"; then
 ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
 else
@@ -6372,15 +5756,11 @@
 for as_dir in $PATH
 do
 IFS=$as_save_IFS
- case $as_dir in #(((
- '') as_dir=./ ;;
- */) ;;
- *) as_dir=$as_dir/ ;;
- esac
+ test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_prog_ac_ct_OBJDUMP="objdump"
- printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
 fi
 done
@@ -6391,11 +5771,11 @@
 fi
 ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
 if test -n "$ac_ct_OBJDUMP"; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
-printf "%s\n" "$ac_ct_OBJDUMP" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
+$as_echo "$ac_ct_OBJDUMP" >&6; }
 else
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 if test "x$ac_ct_OBJDUMP" = x; then
@@ -6403,8 +5783,8 @@
 else
 case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
 OBJDUMP=$ac_ct_OBJDUMP
@@ -6423,12 +5803,11 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
-printf %s "checking how to recognize dependent libraries... " >&6; }
-if test ${lt_cv_deplibs_check_method+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
+$as_echo_n "checking how to recognize dependent libraries... " >&6; }
+if ${lt_cv_deplibs_check_method+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 lt_cv_file_magic_cmd='$MAGIC_CMD'
 lt_cv_file_magic_test_file=
 lt_cv_deplibs_check_method='unknown'
@@ -6454,7 +5833,7 @@
 
 bsdi45*)
 lt_cv_deplibs_check_method='file_magic ELF 0-90-9*-bit MLSB (shared object|dynamic lib)'
- lt_cv_file_magic_cmd='$FILECMD -L'
+ lt_cv_file_magic_cmd='/usr/bin/file -L'
 lt_cv_file_magic_test_file=/shlib/libc.so
 ;;
 
@@ -6488,14 +5867,14 @@
 lt_cv_deplibs_check_method=pass_all
 ;;
 
-freebsd* | dragonfly* | midnightbsd*)
+freebsd* | dragonfly*)
 if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
 case $host_cpu in
 i*86 )
 # Not sure whether the presence of OpenBSD here was a mistake.
 # Let's accept both of them until this is cleared up.
 lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i3-986 (compact )?demand paged shared library'
- lt_cv_file_magic_cmd=$FILECMD
+ lt_cv_file_magic_cmd=/usr/bin/file
 lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
 ;;
 esac
@@ -6509,7 +5888,7 @@
 ;;
 
 hpux10.20* | hpux11*)
- lt_cv_file_magic_cmd=$FILECMD
+ lt_cv_file_magic_cmd=/usr/bin/file
 case $host_cpu in
 ia64*)
 lt_cv_deplibs_check_method='file_magic (s0-90-90-9|ELF-0-90-9) shared object file - IA64'
@@ -6556,7 +5935,7 @@
 
 newos6*)
 lt_cv_deplibs_check_method='file_magic ELF 0-90-9*-bit MLSB (executable|dynamic lib)'
- lt_cv_file_magic_cmd=$FILECMD
+ lt_cv_file_magic_cmd=/usr/bin/file
 lt_cv_file_magic_test_file=/usr/lib/libnls.so
 ;;
 
@@ -6624,8 +6003,8 @@
 esac
 
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
-printf "%s\n" "$lt_cv_deplibs_check_method" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
+$as_echo "$lt_cv_deplibs_check_method" >&6; }
 
 file_magic_glob=
 want_nocaseglob=no
@@ -6669,12 +6048,11 @@
 if test -n "$ac_tool_prefix"; then
 # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
 set dummy ${ac_tool_prefix}dlltool; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_DLLTOOL+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_DLLTOOL+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 if test -n "$DLLTOOL"; then
 ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
 else
@@ -6682,15 +6060,11 @@
 for as_dir in $PATH
 do
 IFS=$as_save_IFS
- case $as_dir in #(((
- '') as_dir=./ ;;
- */) ;;
- *) as_dir=$as_dir/ ;;
- esac
+ test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
- printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
 fi
 done
@@ -6701,11 +6075,11 @@
 fi
 DLLTOOL=$ac_cv_prog_DLLTOOL
 if test -n "$DLLTOOL"; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
-printf "%s\n" "$DLLTOOL" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
+$as_echo "$DLLTOOL" >&6; }
 else
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -6714,12 +6088,11 @@
 ac_ct_DLLTOOL=$DLLTOOL
 # Extract the first word of "dlltool", so it can be a program name with args.
 set dummy dlltool; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_ac_ct_DLLTOOL+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 if test -n "$ac_ct_DLLTOOL"; then
 ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
 else
@@ -6727,15 +6100,11 @@
 for as_dir in $PATH
 do
 IFS=$as_save_IFS
- case $as_dir in #(((
- '') as_dir=./ ;;
- */) ;;
- *) as_dir=$as_dir/ ;;
- esac
+ test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_prog_ac_ct_DLLTOOL="dlltool"
- printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
 fi
 done
@@ -6746,11 +6115,11 @@
 fi
 ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
 if test -n "$ac_ct_DLLTOOL"; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
-printf "%s\n" "$ac_ct_DLLTOOL" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
+$as_echo "$ac_ct_DLLTOOL" >&6; }
 else
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 if test "x$ac_ct_DLLTOOL" = x; then
@@ -6758,8 +6127,8 @@
 else
 case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
 DLLTOOL=$ac_ct_DLLTOOL
@@ -6779,12 +6148,11 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
-printf %s "checking how to associate runtime and link libraries... " >&6; }
-if test ${lt_cv_sharedlib_from_linklib_cmd+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
+$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 lt_cv_sharedlib_from_linklib_cmd='unknown'
 
 case $host_os in
@@ -6807,8 +6175,8 @@
 esac
 
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
-printf "%s\n" "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
 sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
 test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
 
@@ -6823,12 +6191,11 @@
 do
 # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_AR+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_AR+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 if test -n "$AR"; then
 ac_cv_prog_AR="$AR" # Let the user override the test.
 else
@@ -6836,15 +6203,11 @@
 for as_dir in $PATH
 do
 IFS=$as_save_IFS
- case $as_dir in #(((
- '') as_dir=./ ;;
- */) ;;
- *) as_dir=$as_dir/ ;;
- esac
+ test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
- printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
 fi
 done
@@ -6855,11 +6218,11 @@
 fi
 AR=$ac_cv_prog_AR
 if test -n "$AR"; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
-printf "%s\n" "$AR" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
+$as_echo "$AR" >&6; }
 else
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -6872,12 +6235,11 @@
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_ac_ct_AR+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_AR+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 if test -n "$ac_ct_AR"; then
 ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
 else
@@ -6885,15 +6247,11 @@
 for as_dir in $PATH
 do
 IFS=$as_save_IFS
- case $as_dir in #(((
- '') as_dir=./ ;;
- */) ;;
- *) as_dir=$as_dir/ ;;
- esac
+ test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_prog_ac_ct_AR="$ac_prog"
- printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
 fi
 done
@@ -6904,11 +6262,11 @@
 fi
 ac_ct_AR=$ac_cv_prog_ac_ct_AR
 if test -n "$ac_ct_AR"; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
-printf "%s\n" "$ac_ct_AR" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
+$as_echo "$ac_ct_AR" >&6; }
 else
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -6920,8 +6278,8 @@
 else
 case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
 AR=$ac_ct_AR
@@ -6929,60 +6287,42 @@
 fi
 
 : ${AR=ar}
+: ${AR_FLAGS=cru}
 
 
 
 
 
 
-# Use ARFLAGS variable as AR's operation code to sync the variable naming with
-# Automake. If both AR_FLAGS and ARFLAGS are specified, AR_FLAGS should have
-# higher priority because thats what people were doing historically (setting
-# ARFLAGS for automake and AR_FLAGS for libtool). FIXME: Make the AR_FLAGS
-# variable obsoleted/removed.
-
-test ${AR_FLAGS+y} || AR_FLAGS=${ARFLAGS-cr}
-lt_ar_flags=$AR_FLAGS
-
-
-
 
 
 
-# Make AR_FLAGS overridable by 'make ARFLAGS='. Don't try to run-time override
-# by AR_FLAGS because that was never working and AR_FLAGS is about to die.
 
 
-
-
-
-
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
-printf %s "checking for archiver @FILE support... " >&6; }
-if test ${lt_cv_ar_at_file+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
+$as_echo_n "checking for archiver @FILE support... " >&6; }
+if ${lt_cv_ar_at_file+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 lt_cv_ar_at_file=no
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 
 int
-main (void)
+main ()
 {
 
 ;
 return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 echo conftest.$ac_objext > conftest.lst
 lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
 { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
 (eval $lt_ar_try) 2>&5
 ac_status=$?
- printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }
 if test 0 -eq "$ac_status"; then
 	# Ensure the archiver fails upon bogus file names.
@@ -6990,7 +6330,7 @@
 	{ { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
 (eval $lt_ar_try) 2>&5
 ac_status=$?
- printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }
 	if test 0 -ne "$ac_status"; then
 lt_cv_ar_at_file=@
@@ -6999,11 +6339,11 @@
 rm -f conftest.* libconftest.a
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
-printf "%s\n" "$lt_cv_ar_at_file" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
+$as_echo "$lt_cv_ar_at_file" >&6; }
 
 if test no = "$lt_cv_ar_at_file"; then
 archiver_list_spec=
@@ -7020,12 +6360,11 @@
 if test -n "$ac_tool_prefix"; then
 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
 set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_STRIP+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_STRIP+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 if test -n "$STRIP"; then
 ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
 else
@@ -7033,15 +6372,11 @@
 for as_dir in $PATH
 do
 IFS=$as_save_IFS
- case $as_dir in #(((
- '') as_dir=./ ;;
- */) ;;
- *) as_dir=$as_dir/ ;;
- esac
+ test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_prog_STRIP="${ac_tool_prefix}strip"
- printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
 fi
 done
@@ -7052,11 +6387,11 @@
 fi
 STRIP=$ac_cv_prog_STRIP
 if test -n "$STRIP"; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
-printf "%s\n" "$STRIP" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
+$as_echo "$STRIP" >&6; }
 else
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -7065,12 +6400,11 @@
 ac_ct_STRIP=$STRIP
 # Extract the first word of "strip", so it can be a program name with args.
 set dummy strip; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_ac_ct_STRIP+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 if test -n "$ac_ct_STRIP"; then
 ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
 else
@@ -7078,15 +6412,11 @@
 for as_dir in $PATH
 do
 IFS=$as_save_IFS
- case $as_dir in #(((
- '') as_dir=./ ;;
- */) ;;
- *) as_dir=$as_dir/ ;;
- esac
+ test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_prog_ac_ct_STRIP="strip"
- printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
 fi
 done
@@ -7097,11 +6427,11 @@
 fi
 ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
 if test -n "$ac_ct_STRIP"; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
-printf "%s\n" "$ac_ct_STRIP" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
+$as_echo "$ac_ct_STRIP" >&6; }
 else
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 if test "x$ac_ct_STRIP" = x; then
@@ -7109,8 +6439,8 @@
 else
 case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
 STRIP=$ac_ct_STRIP
@@ -7129,12 +6459,11 @@
 if test -n "$ac_tool_prefix"; then
 # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_RANLIB+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_RANLIB+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 if test -n "$RANLIB"; then
 ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
 else
@@ -7142,15 +6471,11 @@
 for as_dir in $PATH
 do
 IFS=$as_save_IFS
- case $as_dir in #(((
- '') as_dir=./ ;;
- */) ;;
- *) as_dir=$as_dir/ ;;
- esac
+ test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
- printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
 fi
 done
@@ -7161,11 +6486,11 @@
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
-printf "%s\n" "$RANLIB" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
+$as_echo "$RANLIB" >&6; }
 else
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -7174,12 +6499,11 @@
 ac_ct_RANLIB=$RANLIB
 # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_ac_ct_RANLIB+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 if test -n "$ac_ct_RANLIB"; then
 ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
 else
@@ -7187,15 +6511,11 @@
 for as_dir in $PATH
 do
 IFS=$as_save_IFS
- case $as_dir in #(((
- '') as_dir=./ ;;
- */) ;;
- *) as_dir=$as_dir/ ;;
- esac
+ test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_prog_ac_ct_RANLIB="ranlib"
- printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
 fi
 done
@@ -7206,11 +6526,11 @@
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
-printf "%s\n" "$ac_ct_RANLIB" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
+$as_echo "$ac_ct_RANLIB" >&6; }
 else
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 if test "x$ac_ct_RANLIB" = x; then
@@ -7218,8 +6538,8 @@
 else
 case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
 RANLIB=$ac_ct_RANLIB
@@ -7308,12 +6628,11 @@
 
 
 # Check for command to grab the raw symbol name followed by C symbol from nm.
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
-printf %s "checking command to parse $NM output from $compiler object... " >&6; }
-if test ${lt_cv_sys_global_symbol_pipe+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
+$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
+if ${lt_cv_sys_global_symbol_pipe+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 
 # These are sane defaults that work on at least a few old systems.
 # They come from Ultrix. What could be older than Ultrix?!! ;)
@@ -7368,7 +6687,7 @@
 
 if test "$lt_cv_nm_interface" = "MS dumpbin"; then
 # Gets list of data symbols to import.
- lt_cv_sys_global_symbol_to_import="$SED -n -e 's/^I .* $.*$$/\1/p'"
+ lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* $.*$$/\1/p'"
 # Adjust the below global symbol transforms to fixup imported variables.
 lt_cdecl_hook=" -e 's/^I .* $.*$$/extern __declspec(dllimport) char \1;/p'"
 lt_c_name_hook=" -e 's/^I .* $.*$$/ {\"\1\", (void *) 0},/p'"
@@ -7386,20 +6705,20 @@
 # Transform an extracted symbol line into a proper C declaration.
 # Some systems (esp. on ia64) link data and code symbols differently,
 # so use this general approach.
-lt_cv_sys_global_symbol_to_cdecl="$SED -n"\
+lt_cv_sys_global_symbol_to_cdecl="sed -n"\
 $lt_cdecl_hook\
 " -e 's/^T .* $.*$$/extern int \1();/p'"\
 " -e 's/^$symcode$symcode* .* $.*$$/extern char \1;/p'"
 
 # Transform an extracted symbol line into symbol name and symbol address
-lt_cv_sys_global_symbol_to_c_name_address="$SED -n"\
+lt_cv_sys_global_symbol_to_c_name_address="sed -n"\
 $lt_c_name_hook\
 " -e 's/^: $.*$ .*$/ {\"\1\", (void *) 0},/p'"\
 " -e 's/^$symcode$symcode* .* $.*$$/ {\"\1\", (void *) \&\1},/p'"
 
 # Transform an extracted symbol line into symbol name with lib prefix and
 # symbol address.
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="$SED -n"\
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\
 $lt_c_name_lib_hook\
 " -e 's/^: $.*$ .*$/ {\"\1\", (void *) 0},/p'"\
 " -e 's/^$symcode$symcode* .* $lib.*$$/ {\"\1\", (void *) \&\1},/p'"\
@@ -7423,7 +6742,7 @@
 if test "$lt_cv_nm_interface" = "MS dumpbin"; then
 # Fake it for dumpbin and say T for any non-static function,
 # D for any global variable and I for any imported variable.
- # Also find C++ and __fastcall symbols from MSVC++ or ICC,
+ # Also find C++ and __fastcall symbols from MSVC++,
 # which start with @ or ?.
 lt_cv_sys_global_symbol_pipe="$AWK '"\
 " {last_section=section; section=\$ 3};"\
@@ -7441,9 +6760,9 @@
 " s1~prfx {split(s1,t,\"@\"); print f,t1,substr(t1,length(prfx))}"\
 " ' prfx=^$ac_symprfx"
 else
- lt_cv_sys_global_symbol_pipe="$SED -n -e 's/^.*	 $$symcode$symcode*$	 	 *$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
+ lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*	 $$symcode$symcode*$	 	 *$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
 fi
- lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | $SED '/ __gnu_lto/d'"
+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
 
 # Check to see that the pipe works correctly.
 pipe_works=no
@@ -7465,14 +6784,14 @@
 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
 (eval $ac_compile) 2>&5
 ac_status=$?
- printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
 # Now try to grab the symbols.
 nlist=conftest.nm
 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5
 (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5
 ac_status=$?
- printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; } && test -s "$nlist"; then
 # Try sorting and uniquifying the output.
 if sort "$nlist" | uniq > "$nlist"T; then
@@ -7541,7 +6860,7 @@
 	 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
 (eval $ac_link) 2>&5
 ac_status=$?
- printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; } && test -s conftest$ac_exeext; then
 	 pipe_works=yes
 	 fi
@@ -7576,11 +6895,11 @@
 lt_cv_sys_global_symbol_to_cdecl=
 fi
 if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: failed" >&5
-printf "%s\n" "failed" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
+$as_echo "failed" >&6; }
 else
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ok" >&5
-printf "%s\n" "ok" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
+$as_echo "ok" >&6; }
 fi
 
 # Response file support.
@@ -7626,14 +6945,13 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
-printf %s "checking for sysroot... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
+$as_echo_n "checking for sysroot... " >&6; }
 
 # Check whether --with-sysroot was given.
-if test ${with_sysroot+y}
-then :
+if test "${with_sysroot+set}" = set; then :
 withval=$with_sysroot;
-else $as_nop
+else
 with_sysroot=no
 fi
 
@@ -7646,30 +6964,29 @@
 fi
 ;; #(
 /*)
- lt_sysroot=`echo "$with_sysroot" | $SED -e "$sed_quote_subst"`
+ lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
 ;; #(
 no|'')
 ;; #(
 *)
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_sysroot" >&5
-printf "%s\n" "$with_sysroot" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_sysroot" >&5
+$as_echo "$with_sysroot" >&6; }
 as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
 ;;
 esac
 
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
-printf "%s\n" "${lt_sysroot:-no}" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
+$as_echo "${lt_sysroot:-no}" >&6; }
 
 
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a working dd" >&5
-printf %s "checking for a working dd... " >&6; }
-if test ${ac_cv_path_lt_DD+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a working dd" >&5
+$as_echo_n "checking for a working dd... " >&6; }
+if ${ac_cv_path_lt_DD+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 printf 0123456789abcdef0123456789abcdef >conftest.i
 cat conftest.i conftest.i >conftest2.i
 : ${lt_DD:=$DD}
@@ -7680,15 +6997,10 @@
 for as_dir in $PATH
 do
 IFS=$as_save_IFS
- case $as_dir in #(((
- '') as_dir=./ ;;
- */) ;;
- *) as_dir=$as_dir/ ;;
- esac
- for ac_prog in dd
- do
+ test -z "$as_dir" && as_dir=.
+ for ac_prog in dd; do
 for ac_exec_ext in '' $ac_executable_extensions; do
- ac_path_lt_DD="$as_dir$ac_prog$ac_exec_ext"
+ ac_path_lt_DD="$as_dir/$ac_prog$ac_exec_ext"
 as_fn_executable_p "$ac_path_lt_DD" || continue
 if "$ac_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
 cmp -s conftest.i conftest.out \
@@ -7708,16 +7020,15 @@
 
 rm -f conftest.i conftest2.i conftest.out
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_lt_DD" >&5
-printf "%s\n" "$ac_cv_path_lt_DD" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_lt_DD" >&5
+$as_echo "$ac_cv_path_lt_DD" >&6; }
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to truncate binary pipes" >&5
-printf %s "checking how to truncate binary pipes... " >&6; }
-if test ${lt_cv_truncate_bin+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to truncate binary pipes" >&5
+$as_echo_n "checking how to truncate binary pipes... " >&6; }
+if ${lt_cv_truncate_bin+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 printf 0123456789abcdef0123456789abcdef >conftest.i
 cat conftest.i conftest.i >conftest2.i
 lt_cv_truncate_bin=
@@ -7728,8 +7039,8 @@
 rm -f conftest.i conftest2.i conftest.out
 test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q"
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_truncate_bin" >&5
-printf "%s\n" "$lt_cv_truncate_bin" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_truncate_bin" >&5
+$as_echo "$lt_cv_truncate_bin" >&6; }
 
 
 
@@ -7752,8 +7063,7 @@
 }
 
 # Check whether --enable-libtool-lock was given.
-if test ${enable_libtool_lock+y}
-then :
+if test "${enable_libtool_lock+set}" = set; then :
 enableval=$enable_libtool_lock;
 fi
 
@@ -7769,9 +7079,9 @@
 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
 (eval $ac_compile) 2>&5
 ac_status=$?
- printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- case `$FILECMD conftest.$ac_objext` in
+ case `/usr/bin/file conftest.$ac_objext` in
 *ELF-32*)
 	HPUX_IA64_MODE=32
 	;;
@@ -7789,10 +7099,10 @@
 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
 (eval $ac_compile) 2>&5
 ac_status=$?
- printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
 if test yes = "$lt_cv_prog_gnu_ld"; then
- case `$FILECMD conftest.$ac_objext` in
+ case `/usr/bin/file conftest.$ac_objext` in
 	*32-bit*)
 	 LD="${LD-ld} -melf32bsmip"
 	 ;;
@@ -7804,7 +7114,7 @@
 	;;
 esac
 else
- case `$FILECMD conftest.$ac_objext` in
+ case `/usr/bin/file conftest.$ac_objext` in
 	*32-bit*)
 	 LD="${LD-ld} -32"
 	 ;;
@@ -7827,10 +7137,10 @@
 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
 (eval $ac_compile) 2>&5
 ac_status=$?
- printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
 emul=elf
- case `$FILECMD conftest.$ac_objext` in
+ case `/usr/bin/file conftest.$ac_objext` in
 *32-bit*)
 	emul="${emul}32"
 	;;
@@ -7838,7 +7148,7 @@
 	emul="${emul}64"
 	;;
 esac
- case `$FILECMD conftest.$ac_objext` in
+ case `/usr/bin/file conftest.$ac_objext` in
 *MSB*)
 	emul="${emul}btsmip"
 	;;
@@ -7846,7 +7156,7 @@
 	emul="${emul}ltsmip"
 	;;
 esac
- case `$FILECMD conftest.$ac_objext` in
+ case `/usr/bin/file conftest.$ac_objext` in
 *N32*)
 	emul="${emul}n32"
 	;;
@@ -7868,16 +7178,16 @@
 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
 (eval $ac_compile) 2>&5
 ac_status=$?
- printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- case `$FILECMD conftest.o` in
+ case `/usr/bin/file conftest.o` in
 *32-bit*)
 	case $host in
 	 x86_64-*kfreebsd*-gnu)
 	 LD="${LD-ld} -m elf_i386_fbsd"
 	 ;;
 	 x86_64-*linux*)
-	 case `$FILECMD conftest.o` in
+	 case `/usr/bin/file conftest.o` in
 	 *x86-64*)
 		LD="${LD-ld} -m elf32_x86_64"
 		;;
@@ -7931,12 +7241,11 @@
 # On SCO OpenServer 5, we need -belf to get full-featured binaries.
 SAVE_CFLAGS=$CFLAGS
 CFLAGS="$CFLAGS -belf"
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
-printf %s "checking whether the C compiler needs -belf... " >&6; }
-if test ${lt_cv_cc_needs_belf+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
+$as_echo_n "checking whether the C compiler needs -belf... " >&6; }
+if ${lt_cv_cc_needs_belf+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -7947,20 +7256,19 @@
 /* end confdefs.h. */
 
 int
-main (void)
+main ()
 {
 
 ;
 return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 lt_cv_cc_needs_belf=yes
-else $as_nop
+else
 lt_cv_cc_needs_belf=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
 conftest$ac_exeext conftest.$ac_ext
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -7969,8 +7277,8 @@
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
-printf "%s\n" "$lt_cv_cc_needs_belf" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
+$as_echo "$lt_cv_cc_needs_belf" >&6; }
 if test yes != "$lt_cv_cc_needs_belf"; then
 # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
 CFLAGS=$SAVE_CFLAGS
@@ -7983,9 +7291,9 @@
 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
 (eval $ac_compile) 2>&5
 ac_status=$?
- printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- case `$FILECMD conftest.o` in
+ case `/usr/bin/file conftest.o` in
 *64-bit*)
 case $lt_cv_prog_gnu_ld in
 yes*)
@@ -8020,12 +7328,11 @@
 if test -n "$ac_tool_prefix"; then
 # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
 set dummy ${ac_tool_prefix}mt; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_MANIFEST_TOOL+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 if test -n "$MANIFEST_TOOL"; then
 ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
 else
@@ -8033,15 +7340,11 @@
 for as_dir in $PATH
 do
 IFS=$as_save_IFS
- case $as_dir in #(((
- '') as_dir=./ ;;
- */) ;;
- *) as_dir=$as_dir/ ;;
- esac
+ test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
- printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
 fi
 done
@@ -8052,11 +7355,11 @@
 fi
 MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
 if test -n "$MANIFEST_TOOL"; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
-printf "%s\n" "$MANIFEST_TOOL" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
+$as_echo "$MANIFEST_TOOL" >&6; }
 else
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -8065,12 +7368,11 @@
 ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
 # Extract the first word of "mt", so it can be a program name with args.
 set dummy mt; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_ac_ct_MANIFEST_TOOL+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 if test -n "$ac_ct_MANIFEST_TOOL"; then
 ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
 else
@@ -8078,15 +7380,11 @@
 for as_dir in $PATH
 do
 IFS=$as_save_IFS
- case $as_dir in #(((
- '') as_dir=./ ;;
- */) ;;
- *) as_dir=$as_dir/ ;;
- esac
+ test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
- printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
 fi
 done
@@ -8097,11 +7395,11 @@
 fi
 ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
 if test -n "$ac_ct_MANIFEST_TOOL"; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
-printf "%s\n" "$ac_ct_MANIFEST_TOOL" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
 else
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 if test "x$ac_ct_MANIFEST_TOOL" = x; then
@@ -8109,8 +7407,8 @@
 else
 case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
 MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
@@ -8120,12 +7418,11 @@
 fi
 
 test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
-printf %s "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
-if test ${lt_cv_path_mainfest_tool+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
+if ${lt_cv_path_mainfest_tool+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 lt_cv_path_mainfest_tool=no
 echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
 $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
@@ -8135,8 +7432,8 @@
 fi
 rm -f conftest*
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
-printf "%s\n" "$lt_cv_path_mainfest_tool" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
+$as_echo "$lt_cv_path_mainfest_tool" >&6; }
 if test yes != "$lt_cv_path_mainfest_tool"; then
 MANIFEST_TOOL=:
 fi
@@ -8151,12 +7448,11 @@
 if test -n "$ac_tool_prefix"; then
 # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
 set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_DSYMUTIL+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_DSYMUTIL+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 if test -n "$DSYMUTIL"; then
 ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
 else
@@ -8164,15 +7460,11 @@
 for as_dir in $PATH
 do
 IFS=$as_save_IFS
- case $as_dir in #(((
- '') as_dir=./ ;;
- */) ;;
- *) as_dir=$as_dir/ ;;
- esac
+ test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
- printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
 fi
 done
@@ -8183,11 +7475,11 @@
 fi
 DSYMUTIL=$ac_cv_prog_DSYMUTIL
 if test -n "$DSYMUTIL"; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5
-printf "%s\n" "$DSYMUTIL" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5
+$as_echo "$DSYMUTIL" >&6; }
 else
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -8196,12 +7488,11 @@
 ac_ct_DSYMUTIL=$DSYMUTIL
 # Extract the first word of "dsymutil", so it can be a program name with args.
 set dummy dsymutil; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_ac_ct_DSYMUTIL+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_DSYMUTIL+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 if test -n "$ac_ct_DSYMUTIL"; then
 ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test.
 else
@@ -8209,15 +7500,11 @@
 for as_dir in $PATH
 do
 IFS=$as_save_IFS
- case $as_dir in #(((
- '') as_dir=./ ;;
- */) ;;
- *) as_dir=$as_dir/ ;;
- esac
+ test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
- printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
 fi
 done
@@ -8228,11 +7515,11 @@
 fi
 ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
 if test -n "$ac_ct_DSYMUTIL"; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5
-printf "%s\n" "$ac_ct_DSYMUTIL" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5
+$as_echo "$ac_ct_DSYMUTIL" >&6; }
 else
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 if test "x$ac_ct_DSYMUTIL" = x; then
@@ -8240,8 +7527,8 @@
 else
 case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
 DSYMUTIL=$ac_ct_DSYMUTIL
@@ -8253,12 +7540,11 @@
 if test -n "$ac_tool_prefix"; then
 # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
 set dummy ${ac_tool_prefix}nmedit; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_NMEDIT+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_NMEDIT+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 if test -n "$NMEDIT"; then
 ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.
 else
@@ -8266,15 +7552,11 @@
 for as_dir in $PATH
 do
 IFS=$as_save_IFS
- case $as_dir in #(((
- '') as_dir=./ ;;
- */) ;;
- *) as_dir=$as_dir/ ;;
- esac
+ test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
- printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
 fi
 done
@@ -8285,11 +7567,11 @@
 fi
 NMEDIT=$ac_cv_prog_NMEDIT
 if test -n "$NMEDIT"; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5
-printf "%s\n" "$NMEDIT" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5
+$as_echo "$NMEDIT" >&6; }
 else
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -8298,12 +7580,11 @@
 ac_ct_NMEDIT=$NMEDIT
 # Extract the first word of "nmedit", so it can be a program name with args.
 set dummy nmedit; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_ac_ct_NMEDIT+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_NMEDIT+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 if test -n "$ac_ct_NMEDIT"; then
 ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.
 else
@@ -8311,15 +7592,11 @@
 for as_dir in $PATH
 do
 IFS=$as_save_IFS
- case $as_dir in #(((
- '') as_dir=./ ;;
- */) ;;
- *) as_dir=$as_dir/ ;;
- esac
+ test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_prog_ac_ct_NMEDIT="nmedit"
- printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
 fi
 done
@@ -8330,11 +7607,11 @@
 fi
 ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
 if test -n "$ac_ct_NMEDIT"; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5
-printf "%s\n" "$ac_ct_NMEDIT" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5
+$as_echo "$ac_ct_NMEDIT" >&6; }
 else
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 if test "x$ac_ct_NMEDIT" = x; then
@@ -8342,8 +7619,8 @@
 else
 case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
 NMEDIT=$ac_ct_NMEDIT
@@ -8355,12 +7632,11 @@
 if test -n "$ac_tool_prefix"; then
 # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.
 set dummy ${ac_tool_prefix}lipo; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_LIPO+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_LIPO+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 if test -n "$LIPO"; then
 ac_cv_prog_LIPO="$LIPO" # Let the user override the test.
 else
@@ -8368,15 +7644,11 @@
 for as_dir in $PATH
 do
 IFS=$as_save_IFS
- case $as_dir in #(((
- '') as_dir=./ ;;
- */) ;;
- *) as_dir=$as_dir/ ;;
- esac
+ test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
- printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
 fi
 done
@@ -8387,11 +7659,11 @@
 fi
 LIPO=$ac_cv_prog_LIPO
 if test -n "$LIPO"; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5
-printf "%s\n" "$LIPO" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5
+$as_echo "$LIPO" >&6; }
 else
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -8400,12 +7672,11 @@
 ac_ct_LIPO=$LIPO
 # Extract the first word of "lipo", so it can be a program name with args.
 set dummy lipo; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_ac_ct_LIPO+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_LIPO+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 if test -n "$ac_ct_LIPO"; then
 ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # Let the user override the test.
 else
@@ -8413,15 +7684,11 @@
 for as_dir in $PATH
 do
 IFS=$as_save_IFS
- case $as_dir in #(((
- '') as_dir=./ ;;
- */) ;;
- *) as_dir=$as_dir/ ;;
- esac
+ test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_prog_ac_ct_LIPO="lipo"
- printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
 fi
 done
@@ -8432,11 +7699,11 @@
 fi
 ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO
 if test -n "$ac_ct_LIPO"; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5
-printf "%s\n" "$ac_ct_LIPO" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5
+$as_echo "$ac_ct_LIPO" >&6; }
 else
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 if test "x$ac_ct_LIPO" = x; then
@@ -8444,8 +7711,8 @@
 else
 case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
 LIPO=$ac_ct_LIPO
@@ -8457,12 +7724,11 @@
 if test -n "$ac_tool_prefix"; then
 # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args.
 set dummy ${ac_tool_prefix}otool; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_OTOOL+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_OTOOL+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 if test -n "$OTOOL"; then
 ac_cv_prog_OTOOL="$OTOOL" # Let the user override the test.
 else
@@ -8470,15 +7736,11 @@
 for as_dir in $PATH
 do
 IFS=$as_save_IFS
- case $as_dir in #(((
- '') as_dir=./ ;;
- */) ;;
- *) as_dir=$as_dir/ ;;
- esac
+ test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
- printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
 fi
 done
@@ -8489,11 +7751,11 @@
 fi
 OTOOL=$ac_cv_prog_OTOOL
 if test -n "$OTOOL"; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5
-printf "%s\n" "$OTOOL" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5
+$as_echo "$OTOOL" >&6; }
 else
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -8502,12 +7764,11 @@
 ac_ct_OTOOL=$OTOOL
 # Extract the first word of "otool", so it can be a program name with args.
 set dummy otool; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_ac_ct_OTOOL+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_OTOOL+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 if test -n "$ac_ct_OTOOL"; then
 ac_cv_prog_ac_ct_OTOOL="$ac_ct_OTOOL" # Let the user override the test.
 else
@@ -8515,15 +7776,11 @@
 for as_dir in $PATH
 do
 IFS=$as_save_IFS
- case $as_dir in #(((
- '') as_dir=./ ;;
- */) ;;
- *) as_dir=$as_dir/ ;;
- esac
+ test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_prog_ac_ct_OTOOL="otool"
- printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
 fi
 done
@@ -8534,11 +7791,11 @@
 fi
 ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL
 if test -n "$ac_ct_OTOOL"; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5
-printf "%s\n" "$ac_ct_OTOOL" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5
+$as_echo "$ac_ct_OTOOL" >&6; }
 else
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 if test "x$ac_ct_OTOOL" = x; then
@@ -8546,8 +7803,8 @@
 else
 case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
 OTOOL=$ac_ct_OTOOL
@@ -8559,12 +7816,11 @@
 if test -n "$ac_tool_prefix"; then
 # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args.
 set dummy ${ac_tool_prefix}otool64; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_OTOOL64+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_OTOOL64+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 if test -n "$OTOOL64"; then
 ac_cv_prog_OTOOL64="$OTOOL64" # Let the user override the test.
 else
@@ -8572,15 +7828,11 @@
 for as_dir in $PATH
 do
 IFS=$as_save_IFS
- case $as_dir in #(((
- '') as_dir=./ ;;
- */) ;;
- *) as_dir=$as_dir/ ;;
- esac
+ test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
- printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
 fi
 done
@@ -8591,11 +7843,11 @@
 fi
 OTOOL64=$ac_cv_prog_OTOOL64
 if test -n "$OTOOL64"; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5
-printf "%s\n" "$OTOOL64" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5
+$as_echo "$OTOOL64" >&6; }
 else
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -8604,12 +7856,11 @@
 ac_ct_OTOOL64=$OTOOL64
 # Extract the first word of "otool64", so it can be a program name with args.
 set dummy otool64; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_ac_ct_OTOOL64+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_OTOOL64+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 if test -n "$ac_ct_OTOOL64"; then
 ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # Let the user override the test.
 else
@@ -8617,15 +7868,11 @@
 for as_dir in $PATH
 do
 IFS=$as_save_IFS
- case $as_dir in #(((
- '') as_dir=./ ;;
- */) ;;
- *) as_dir=$as_dir/ ;;
- esac
+ test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_prog_ac_ct_OTOOL64="otool64"
- printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
 fi
 done
@@ -8636,11 +7883,11 @@
 fi
 ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64
 if test -n "$ac_ct_OTOOL64"; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5
-printf "%s\n" "$ac_ct_OTOOL64" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5
+$as_echo "$ac_ct_OTOOL64" >&6; }
 else
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 if test "x$ac_ct_OTOOL64" = x; then
@@ -8648,8 +7895,8 @@
 else
 case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
 OTOOL64=$ac_ct_OTOOL64
@@ -8684,12 +7931,11 @@
 
 
 
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
-printf %s "checking for -single_module linker flag... " >&6; }
-if test ${lt_cv_apple_cc_single_mod+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
+$as_echo_n "checking for -single_module linker flag... " >&6; }
+if ${lt_cv_apple_cc_single_mod+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 lt_cv_apple_cc_single_mod=no
 if test -z "$LT_MULTI_MODULE"; then
 	# By default we will add the -single_module flag. You can override
@@ -8718,15 +7964,14 @@
 	rm -f conftest.*
 fi
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
-printf "%s\n" "$lt_cv_apple_cc_single_mod" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
+$as_echo "$lt_cv_apple_cc_single_mod" >&6; }
 
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
-printf %s "checking for -exported_symbols_list linker flag... " >&6; }
-if test ${lt_cv_ld_exported_symbols_list+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
+$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
+if ${lt_cv_ld_exported_symbols_list+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 lt_cv_ld_exported_symbols_list=no
 save_LDFLAGS=$LDFLAGS
 echo "_main" > conftest.sym
@@ -8735,41 +7980,39 @@
 /* end confdefs.h. */
 
 int
-main (void)
+main ()
 {
 
 ;
 return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 lt_cv_ld_exported_symbols_list=yes
-else $as_nop
+else
 lt_cv_ld_exported_symbols_list=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
 conftest$ac_exeext conftest.$ac_ext
 	LDFLAGS=$save_LDFLAGS
 
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
-printf "%s\n" "$lt_cv_ld_exported_symbols_list" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
+$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
 
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
-printf %s "checking for -force_load linker flag... " >&6; }
-if test ${lt_cv_ld_force_load+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
+$as_echo_n "checking for -force_load linker flag... " >&6; }
+if ${lt_cv_ld_force_load+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 lt_cv_ld_force_load=no
 cat > conftest.c << _LT_EOF
 int forced_loaded() { return 2;}
 _LT_EOF
 echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5
 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
- echo "$AR $AR_FLAGS libconftest.a conftest.o" >&5
- $AR $AR_FLAGS libconftest.a conftest.o 2>&5
+ echo "$AR cru libconftest.a conftest.o" >&5
+ $AR cru libconftest.a conftest.o 2>&5
 echo "$RANLIB libconftest.a" >&5
 $RANLIB libconftest.a 2>&5
 cat > conftest.c << _LT_EOF
@@ -8789,19 +8032,24 @@
 rm -rf conftest.dSYM
 
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5
-printf "%s\n" "$lt_cv_ld_force_load" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5
+$as_echo "$lt_cv_ld_force_load" >&6; }
 case $host_os in
 rhapsody* | darwin1.012)
 _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;;
 darwin1.*)
 _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
- darwin*)
- case $MACOSX_DEPLOYMENT_TARGET,$host in
- 10.012,*|,*powerpc*-darwin5-8*)
- _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
- *)
- _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
+ darwin*) # darwin 5.x on
+ # if running on 10.5 or later, the deployment target defaults
+ # to the OS version, if on x86, and 10.4, the deployment
+ # target defaults to 10.4. Don't you love it?
+ case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
+	10.0,*86*-darwin8*|10.0,*-darwin91*)
+	 _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
+	10.012,.*)
+	 _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
+	10.*)
+	 _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
 esac
 ;;
 esac
@@ -8856,14 +8104,19 @@
 esac
 }
 
-ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
+for ac_header in dlfcn.h
+do :
+ ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
 "
-if test "x$ac_cv_header_dlfcn_h" = xyes
-then :
- printf "%s\n" "#define HAVE_DLFCN_H 1" >>confdefs.h
+if test "x$ac_cv_header_dlfcn_h" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_DLFCN_H 1
+_ACEOF
 
 fi
 
+done
+
 
 
 
@@ -8879,8 +8132,7 @@
 
 
 # Check whether --enable-shared was given.
-if test ${enable_shared+y}
-then :
+if test "${enable_shared+set}" = set; then :
 enableval=$enable_shared; p=${PACKAGE-default}
 case $enableval in
 yes) enable_shared=yes ;;
@@ -8898,7 +8150,7 @@
 IFS=$lt_save_ifs
 ;;
 esac
-else $as_nop
+else
 enable_shared=yes
 fi
 
@@ -8911,8 +8163,7 @@
 
 
 # Check whether --enable-static was given.
-if test ${enable_static+y}
-then :
+if test "${enable_static+set}" = set; then :
 enableval=$enable_static; p=${PACKAGE-default}
 case $enableval in
 yes) enable_static=yes ;;
@@ -8930,7 +8181,7 @@
 IFS=$lt_save_ifs
 ;;
 esac
-else $as_nop
+else
 enable_static=yes
 fi
 
@@ -8944,8 +8195,7 @@
 
 
 # Check whether --with-pic was given.
-if test ${with_pic+y}
-then :
+if test "${with_pic+set}" = set; then :
 withval=$with_pic; lt_p=${PACKAGE-default}
 case $withval in
 yes|no) pic_mode=$withval ;;
@@ -8962,7 +8212,7 @@
 IFS=$lt_save_ifs
 ;;
 esac
-else $as_nop
+else
 pic_mode=default
 fi
 
@@ -8974,8 +8224,7 @@
 
 
 # Check whether --enable-fast-install was given.
-if test ${enable_fast_install+y}
-then :
+if test "${enable_fast_install+set}" = set; then :
 enableval=$enable_fast_install; p=${PACKAGE-default}
 case $enableval in
 yes) enable_fast_install=yes ;;
@@ -8993,7 +8242,7 @@
 IFS=$lt_save_ifs
 ;;
 esac
-else $as_nop
+else
 enable_fast_install=yes
 fi
 
@@ -9007,12 +8256,11 @@
 shared_archive_member_spec=
 case $host,$enable_shared in
 power*-*-aix5-9*,yes)
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which variant of shared library versioning to provide" >&5
-printf %s "checking which variant of shared library versioning to provide... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking which variant of shared library versioning to provide" >&5
+$as_echo_n "checking which variant of shared library versioning to provide... " >&6; }
 
 # Check whether --with-aix-soname was given.
-if test ${with_aix_soname+y}
-then :
+if test "${with_aix_soname+set}" = set; then :
 withval=$with_aix_soname; case $withval in
 aix|svr4|both)
 ;;
@@ -9021,19 +8269,18 @@
 ;;
 esac
 lt_cv_with_aix_soname=$with_aix_soname
-else $as_nop
- if test ${lt_cv_with_aix_soname+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+else
+ if ${lt_cv_with_aix_soname+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 lt_cv_with_aix_soname=aix
 fi
 
 with_aix_soname=$lt_cv_with_aix_soname
 fi
 
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_aix_soname" >&5
-printf "%s\n" "$with_aix_soname" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_aix_soname" >&5
+$as_echo "$with_aix_soname" >&6; }
 if test aix != "$with_aix_soname"; then
 # For the AIX way of multilib, we name the shared archive member
 # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o',
@@ -9115,12 +8362,11 @@
 setopt NO_GLOB_SUBST
 fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
-printf %s "checking for objdir... " >&6; }
-if test ${lt_cv_objdir+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
+$as_echo_n "checking for objdir... " >&6; }
+if ${lt_cv_objdir+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 rm -f .libs 2>/dev/null
 mkdir .libs 2>/dev/null
 if test -d .libs; then
@@ -9131,15 +8377,17 @@
 fi
 rmdir .libs 2>/dev/null
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5
-printf "%s\n" "$lt_cv_objdir" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5
+$as_echo "$lt_cv_objdir" >&6; }
 objdir=$lt_cv_objdir
 
 
 
 
 
-printf "%s\n" "#define LT_OBJDIR \"$lt_cv_objdir/\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define LT_OBJDIR "$lt_cv_objdir/"
+_ACEOF
 
 
 
@@ -9160,8 +8408,8 @@
 ofile=libtool
 can_build_shared=yes
 
-# All known linkers require a '.a' archive for static linking (except MSVC and
-# ICC, which need '.lib').
+# All known linkers require a '.a' archive for static linking (except MSVC,
+# which needs '.lib').
 libext=a
 
 with_gnu_ld=$lt_cv_prog_gnu_ld
@@ -9185,12 +8433,11 @@
 case $deplibs_check_method in
 file_magic*)
 if test "$file_magic_cmd" = '$MAGIC_CMD'; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
-printf %s "checking for ${ac_tool_prefix}file... " >&6; }
-if test ${lt_cv_path_MAGIC_CMD+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
+$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
+if ${lt_cv_path_MAGIC_CMD+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 case $MAGIC_CMD in
 \\/* | ?:\\/*)
 lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path.
@@ -9239,11 +8486,11 @@
 
 MAGIC_CMD=$lt_cv_path_MAGIC_CMD
 if test -n "$MAGIC_CMD"; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
-printf "%s\n" "$MAGIC_CMD" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
+$as_echo "$MAGIC_CMD" >&6; }
 else
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -9252,12 +8499,11 @@
 
 if test -z "$lt_cv_path_MAGIC_CMD"; then
 if test -n "$ac_tool_prefix"; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for file" >&5
-printf %s "checking for file... " >&6; }
-if test ${lt_cv_path_MAGIC_CMD+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5
+$as_echo_n "checking for file... " >&6; }
+if ${lt_cv_path_MAGIC_CMD+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 case $MAGIC_CMD in
 \\/* | ?:\\/*)
 lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path.
@@ -9306,11 +8552,11 @@
 
 MAGIC_CMD=$lt_cv_path_MAGIC_CMD
 if test -n "$MAGIC_CMD"; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
-printf "%s\n" "$MAGIC_CMD" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
+$as_echo "$MAGIC_CMD" >&6; }
 else
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -9395,12 +8641,11 @@
 lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;;
 esac
 
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
-printf %s "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
-if test ${lt_cv_prog_compiler_rtti_exceptions+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
+if ${lt_cv_prog_compiler_rtti_exceptions+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 lt_cv_prog_compiler_rtti_exceptions=no
 ac_outfile=conftest.$ac_objext
 echo "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -9431,8 +8676,8 @@
 $RM conftest*
 
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
-printf "%s\n" "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
+$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
 
 if test yes = "$lt_cv_prog_compiler_rtti_exceptions"; then
 lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
@@ -9673,7 +8918,7 @@
 	lt_prog_compiler_static='-qstaticlink'
 	;;
 *)
-	case `$CC -V 2>&1 | $SED 5q` in
+	case `$CC -V 2>&1 | sed 5q` in
 	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ 1-7.* | *Sun*Fortran*\ 8.0-3*)
 	 # Sun Fortran 8.3 passes all unrecognized flags to the linker
 	 lt_prog_compiler_pic='-KPIC'
@@ -9789,28 +9034,26 @@
 ;;
 esac
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
-printf %s "checking for $compiler option to produce PIC... " >&6; }
-if test ${lt_cv_prog_compiler_pic+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+if ${lt_cv_prog_compiler_pic+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
-printf "%s\n" "$lt_cv_prog_compiler_pic" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
+$as_echo "$lt_cv_prog_compiler_pic" >&6; }
 lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
 
 #
 # Check to make sure the PIC flag actually works.
 #
 if test -n "$lt_prog_compiler_pic"; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
-printf %s "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
-if test ${lt_cv_prog_compiler_pic_works+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
+$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
+if ${lt_cv_prog_compiler_pic_works+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 lt_cv_prog_compiler_pic_works=no
 ac_outfile=conftest.$ac_objext
 echo "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -9841,8 +9084,8 @@
 $RM conftest*
 
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
-printf "%s\n" "$lt_cv_prog_compiler_pic_works" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
+$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
 
 if test yes = "$lt_cv_prog_compiler_pic_works"; then
 case $lt_prog_compiler_pic in
@@ -9870,12 +9113,11 @@
 # Check to make sure the static flag actually works.
 #
 wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-printf %s "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
-if test ${lt_cv_prog_compiler_static_works+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
+if ${lt_cv_prog_compiler_static_works+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 lt_cv_prog_compiler_static_works=no
 save_LDFLAGS=$LDFLAGS
 LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
@@ -9899,8 +9141,8 @@
 LDFLAGS=$save_LDFLAGS
 
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
-printf "%s\n" "$lt_cv_prog_compiler_static_works" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
+$as_echo "$lt_cv_prog_compiler_static_works" >&6; }
 
 if test yes = "$lt_cv_prog_compiler_static_works"; then
 :
@@ -9914,12 +9156,11 @@
 
 
 
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
-printf %s "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if test ${lt_cv_prog_compiler_c_o+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+if ${lt_cv_prog_compiler_c_o+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 lt_cv_prog_compiler_c_o=no
 $RM -r conftest 2>/dev/null
 mkdir conftest
@@ -9962,20 +9203,19 @@
 $RM conftest*
 
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
-printf "%s\n" "$lt_cv_prog_compiler_c_o" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
+$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
 
 
 
 
 
 
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
-printf %s "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if test ${lt_cv_prog_compiler_c_o+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+if ${lt_cv_prog_compiler_c_o+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 lt_cv_prog_compiler_c_o=no
 $RM -r conftest 2>/dev/null
 mkdir conftest
@@ -10018,8 +9258,8 @@
 $RM conftest*
 
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
-printf "%s\n" "$lt_cv_prog_compiler_c_o" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
+$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
 
 
 
@@ -10027,19 +9267,19 @@
 hard_links=nottested
 if test no = "$lt_cv_prog_compiler_c_o" && test no != "$need_locks"; then
 # do not overwrite the value of need_locks provided by the user
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
-printf %s "checking if we can lock with hard links... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
+$as_echo_n "checking if we can lock with hard links... " >&6; }
 hard_links=yes
 $RM conftest*
 ln conftest.a conftest.b 2>/dev/null && hard_links=no
 touch conftest.a
 ln conftest.a conftest.b 2>&5 || hard_links=no
 ln conftest.a conftest.b 2>/dev/null && hard_links=no
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
-printf "%s\n" "$hard_links" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
+$as_echo "$hard_links" >&6; }
 if test no = "$hard_links"; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5
-printf "%s\n" "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5
+$as_echo "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;}
 need_locks=warn
 fi
 else
@@ -10051,8 +9291,8 @@
 
 
 
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-printf %s "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
 
 runpath_var=
 allow_undefined_flag=
@@ -10096,15 +9336,15 @@
 
 case $host_os in
 cygwin* | mingw* | pw32* | cegcc*)
- # FIXME: the MSVC++ and ICC port hasn't been tested in a loooong time
+ # FIXME: the MSVC++ port hasn't been tested in a loooong time
 # When not using gcc, we currently assume that we are using
- # Microsoft Visual C++ or Intel C++ Compiler.
+ # Microsoft Visual C++.
 if test yes != "$GCC"; then
 with_gnu_ld=no
 fi
 ;;
 interix*)
- # we just hope/assume this is gcc and not c89 (= MSVC++ or ICC)
+ # we just hope/assume this is gcc and not c89 (= MSVC++)
 with_gnu_ld=yes
 ;;
 openbsd* | bitrig*)
@@ -10156,7 +9396,7 @@
 whole_archive_flag_spec=
 fi
 supports_anon_versioning=no
- case `$LD -v | $SED -e 's/(^)\+)\s\+//' 2>&1` in
+ case `$LD -v | $SED -e 's/(^)\+)\s\+//' 2>&1` in
 *GNU\ gold*) supports_anon_versioning=yes ;;
 *\ 01.* | *\ 2.0-9.* | *\ 2.10.*) ;; # catch versions < 2.11
 *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
@@ -10268,7 +9508,6 @@
 	emximp -o $lib $output_objdir/$libname.def'
 old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
 enable_shared_with_static_runtimes=yes
- file_list_spec='@'
 ;;
 
 interix3-9*)
@@ -10283,7 +9522,7 @@
 # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
 # time. Moving up from 0x10000000 also allows more sbrk(2) space.
 archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
- archive_expsym_cmds='$SED "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ archive_expsym_cmds='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
 ;;
 
 gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
@@ -10326,7 +9565,7 @@
 	 compiler_needs_object=yes
 	 ;;
 	esac
-	case `$CC -V 2>&1 | $SED 5q` in
+	case `$CC -V 2>&1 | sed 5q` in
 	*Sun\ C*)			# Sun C 5.9
 	 whole_archive_flag_spec='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
 	 compiler_needs_object=yes
@@ -10338,7 +9577,7 @@
 
 if test yes = "$supports_anon_versioning"; then
 archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
- cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~
+ cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~
 echo "local: *; };" >> $output_objdir/$libname.ver~
 $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
 fi
@@ -10354,7 +9593,7 @@
 	 archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
 	 if test yes = "$supports_anon_versioning"; then
 	 archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
- cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~
+ cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~
 echo "local: *; };" >> $output_objdir/$libname.ver~
 $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
 	 fi
@@ -10486,7 +9725,7 @@
 	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
 	 export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
 	else
-	 export_symbols_cmds='`func_echo_all $NM | $SED -e '\''s/B$^B*$$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "L") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
+	 export_symbols_cmds='`func_echo_all $NM | $SED -e '\''s/B$^B*$$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
 	fi
 	aix_use_runtimelinking=no
 
@@ -10608,23 +9847,21 @@
 if test set = "${lt_cv_aix_libpath+set}"; then
 aix_libpath=$lt_cv_aix_libpath
 else
- if test ${lt_cv_aix_libpath_+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+ if ${lt_cv_aix_libpath_+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 
 int
-main (void)
+main ()
 {
 
 ;
 return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 
 lt_aix_libpath_sed='
 /Import File Strings/,/^$/ {
@@ -10639,7 +9876,7 @@
 lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 fi
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
 conftest$ac_exeext conftest.$ac_ext
 if test -z "$lt_cv_aix_libpath_"; then
 lt_cv_aix_libpath_=/usr/lib:/lib
@@ -10663,23 +9900,21 @@
 	 if test set = "${lt_cv_aix_libpath+set}"; then
 aix_libpath=$lt_cv_aix_libpath
 else
- if test ${lt_cv_aix_libpath_+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+ if ${lt_cv_aix_libpath_+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 
 int
-main (void)
+main ()
 {
 
 ;
 return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 
 lt_aix_libpath_sed='
 /Import File Strings/,/^$/ {
@@ -10694,7 +9929,7 @@
 lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 fi
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
 conftest$ac_exeext conftest.$ac_ext
 if test -z "$lt_cv_aix_libpath_"; then
 lt_cv_aix_libpath_=/usr/lib:/lib
@@ -10757,12 +9992,12 @@
 
 cygwin* | mingw* | pw32* | cegcc*)
 # When not using gcc, we currently assume that we are using
- # Microsoft Visual C++ or Intel C++ Compiler.
+ # Microsoft Visual C++.
 # hardcode_libdir_flag_spec is actually meaningless, as there is
 # no search path for DLLs.
 case $cc_basename in
- cl* | icl*)
-	# Native MSVC or ICC
+ cl*)
+	# Native MSVC
 	hardcode_libdir_flag_spec=' '
 	allow_undefined_flag=unsupported
 	always_export_symbols=yes
@@ -10803,7 +10038,7 @@
 fi'
 	;;
 *)
-	# Assume MSVC and ICC wrapper
+	# Assume MSVC wrapper
 	hardcode_libdir_flag_spec=' '
 	allow_undefined_flag=unsupported
 	# Tell ltmain to make .lib files, not .a files.
@@ -10844,8 +10079,8 @@
 output_verbose_link_cmd=func_echo_all
 archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil"
 module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil"
- archive_expsym_cmds="$SED 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil"
- module_expsym_cmds="$SED -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil"
+ archive_expsym_cmds="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil"
+ module_expsym_cmds="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil"
 
 else
 ld_shlibs=no
@@ -10879,7 +10114,7 @@
 ;;
 
 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
- freebsd* | dragonfly* | midnightbsd*)
+ freebsd* | dragonfly*)
 archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
 hardcode_libdir_flag_spec='-R$libdir'
 hardcode_direct=yes
@@ -10945,12 +10180,11 @@
 
 	 # Older versions of the 11.00 compiler do not understand -b yet
 	 # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
-	 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5
-printf %s "checking if $CC understands -b... " >&6; }
-if test ${lt_cv_prog_compiler__b+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+	 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5
+$as_echo_n "checking if $CC understands -b... " >&6; }
+if ${lt_cv_prog_compiler__b+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 lt_cv_prog_compiler__b=no
 save_LDFLAGS=$LDFLAGS
 LDFLAGS="$LDFLAGS -b"
@@ -10974,8 +10208,8 @@
 LDFLAGS=$save_LDFLAGS
 
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5
-printf "%s\n" "$lt_cv_prog_compiler__b" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5
+$as_echo "$lt_cv_prog_compiler__b" >&6; }
 
 if test yes = "$lt_cv_prog_compiler__b"; then
 archive_cmds='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
@@ -11015,30 +10249,28 @@
 	# work, assume that -exports_file does not work either and
 	# implicitly export all symbols.
 	# This should be the same for all languages, so no per-tag cache variable.
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
-printf %s "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
-if test ${lt_cv_irix_exported_symbol+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
+if ${lt_cv_irix_exported_symbol+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 save_LDFLAGS=$LDFLAGS
 	 LDFLAGS="$LDFLAGS -shared $wl-exported_symbol ${wl}foo $wl-update_registry $wl/dev/null"
 	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int foo (void) { return 0; }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 lt_cv_irix_exported_symbol=yes
-else $as_nop
+else
 lt_cv_irix_exported_symbol=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
 conftest$ac_exeext conftest.$ac_ext
 LDFLAGS=$save_LDFLAGS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
-printf "%s\n" "$lt_cv_irix_exported_symbol" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
+$as_echo "$lt_cv_irix_exported_symbol" >&6; }
 	if test yes = "$lt_cv_irix_exported_symbol"; then
 archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib'
 	fi
@@ -11130,7 +10362,6 @@
 	emximp -o $lib $output_objdir/$libname.def'
 old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
 enable_shared_with_static_runtimes=yes
- file_list_spec='@'
 ;;
 
 osf3*)
@@ -11319,8 +10550,8 @@
 fi
 fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5
-printf "%s\n" "$ld_shlibs" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5
+$as_echo "$ld_shlibs" >&6; }
 test no = "$ld_shlibs" && can_build_shared=no
 
 with_gnu_ld=$with_gnu_ld
@@ -11356,19 +10587,18 @@
 # Test whether the compiler implicitly links with -lc since on some
 # systems, -lgcc has to come before -lc. If gcc already passes -lc
 # to ld, don't add -lc before -lgcc.
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
-printf %s "checking whether -lc should be explicitly linked in... " >&6; }
-if test ${lt_cv_archive_cmds_need_lc+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
+$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
+if ${lt_cv_archive_cmds_need_lc+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 $RM conftest*
 	echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
 	if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
 (eval $ac_compile) 2>&5
 ac_status=$?
- printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; } 2>conftest.err; then
 	 soname=conftest
 	 lib=conftest
@@ -11386,7 +10616,7 @@
 	 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
 (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
 ac_status=$?
- printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }
 	 then
 	 lt_cv_archive_cmds_need_lc=no
@@ -11400,8 +10630,8 @@
 	$RM conftest*
 
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5
-printf "%s\n" "$lt_cv_archive_cmds_need_lc" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5
+$as_echo "$lt_cv_archive_cmds_need_lc" >&6; }
 archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc
 ;;
 esac
@@ -11560,8 +10790,8 @@
 
 
 
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
-printf %s "checking dynamic linker characteristics... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
+$as_echo_n "checking dynamic linker characteristics... " >&6; }
 
 if test yes = "$GCC"; then
 case $host_os in
@@ -11823,7 +11053,7 @@
 case $host_os in
 cygwin*)
 # Cygwin DLLs use 'cyg' prefix rather than 'lib'
- soname_spec='`echo $libname | $SED -e 's/^lib/cyg/'``echo $release | $SED -e 's/./-/g'`$versuffix$shared_ext'
+ soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/./-/g'`$versuffix$shared_ext'
 
 sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
 ;;
@@ -11833,14 +11063,14 @@
 ;;
 pw32*)
 # pw32 DLLs use 'pw' prefix rather than 'lib'
- library_names_spec='`echo $libname | $SED -e 's/^lib/pw/'``echo $release | $SED -e 's/./-/g'`$versuffix$shared_ext'
+ library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/./-/g'`$versuffix$shared_ext'
 ;;
 esac
 dynamic_linker='Win32 ld.exe'
 ;;
 
- *,cl* | *,icl*)
- # Native MSVC or ICC
+ *,cl*)
+ # Native MSVC
 libname_spec='$name'
 soname_spec='$libname`echo $release | $SED -e 's/./-/g'`$versuffix$shared_ext'
 library_names_spec='$libname.dll.lib'
@@ -11859,7 +11089,7 @@
 done
 IFS=$lt_save_ifs
 # Convert to MSYS style.
- sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's|\\\\|/|g' -e 's| \$a-zA-Z\$:| /\\1|g' -e 's|^ ||'`
+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \$a-zA-Z\$:| /\\1|g' -e 's|^ ||'`
 ;;
 cygwin*)
 # Convert to unix form, then to dos form, then back to unix form
@@ -11896,7 +11126,7 @@
 ;;
 
 *)
- # Assume MSVC and ICC wrapper
+ # Assume MSVC wrapper
 library_names_spec='$libname`echo $release | $SED -e 's/./-/g'`$versuffix$shared_ext $libname.lib'
 dynamic_linker='Win32 ld.exe'
 ;;
@@ -11929,7 +11159,7 @@
 shlibpath_var=LD_LIBRARY_PATH
 ;;
 
-freebsd* | dragonfly* | midnightbsd*)
+freebsd* | dragonfly*)
 # DragonFly does not have aout. When/if they implement a new
 # versioning mechanism, adjust this.
 if test -x /usr/bin/objformat; then
@@ -12122,10 +11352,9 @@
 shlibpath_overrides_runpath=no
 
 # Some binutils ld are patched to set DT_RUNPATH
- if test ${lt_cv_shlibpath_overrides_runpath+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+ if ${lt_cv_shlibpath_overrides_runpath+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 lt_cv_shlibpath_overrides_runpath=no
 save_LDFLAGS=$LDFLAGS
 save_libdir=$libdir
@@ -12135,21 +11364,19 @@
 /* end confdefs.h. */
 
 int
-main (void)
+main ()
 {
 
 ;
 return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
- if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null
-then :
+if ac_fn_c_try_link "$LINENO"; then :
+ if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
 lt_cv_shlibpath_overrides_runpath=yes
 fi
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
 conftest$ac_exeext conftest.$ac_ext
 LDFLAGS=$save_LDFLAGS
 libdir=$save_libdir
@@ -12381,8 +11608,8 @@
 dynamic_linker=no
 ;;
 esac
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
-printf "%s\n" "$dynamic_linker" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
+$as_echo "$dynamic_linker" >&6; }
 test no = "$dynamic_linker" && can_build_shared=no
 
 variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
@@ -12503,8 +11730,8 @@
 
 
 
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
-printf %s "checking how to hardcode library paths into programs... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
+$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
 hardcode_action=
 if test -n "$hardcode_libdir_flag_spec" ||
 test -n "$runpath_var" ||
@@ -12528,8 +11755,8 @@
 # directories.
 hardcode_action=unsupported
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5
-printf "%s\n" "$hardcode_action" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5
+$as_echo "$hardcode_action" >&6; }
 
 if test relink = "$hardcode_action" ||
 test yes = "$inherit_rpath"; then
@@ -12573,12 +11800,11 @@
 
 darwin*)
 # if libdl is installed we need to link against it
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
-printf %s "checking for dlopen in -ldl... " >&6; }
-if test ${ac_cv_lib_dl_dlopen+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+$as_echo_n "checking for dlopen in -ldl... " >&6; }
+if ${ac_cv_lib_dl_dlopen+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -12587,31 +11813,32 @@
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
 builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
 char dlopen ();
 int
-main (void)
+main ()
 {
 return dlopen ();
 ;
 return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 ac_cv_lib_dl_dlopen=yes
-else $as_nop
+else
 ac_cv_lib_dl_dlopen=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
-printf "%s\n" "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
 lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl
-else $as_nop
+else
 
 lt_cv_dlopen=dyld
 lt_cv_dlopen_libs=
@@ -12631,16 +11858,14 @@
 
 *)
 ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
-if test "x$ac_cv_func_shl_load" = xyes
-then :
+if test "x$ac_cv_func_shl_load" = xyes; then :
 lt_cv_dlopen=shl_load
-else $as_nop
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
-printf %s "checking for shl_load in -ldld... " >&6; }
-if test ${ac_cv_lib_dld_shl_load+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
+$as_echo_n "checking for shl_load in -ldld... " >&6; }
+if ${ac_cv_lib_dld_shl_load+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldld $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -12649,42 +11874,41 @@
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
 builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
 char shl_load ();
 int
-main (void)
+main ()
 {
 return shl_load ();
 ;
 return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 ac_cv_lib_dld_shl_load=yes
-else $as_nop
+else
 ac_cv_lib_dld_shl_load=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
-printf "%s\n" "$ac_cv_lib_dld_shl_load" >&6; }
-if test "x$ac_cv_lib_dld_shl_load" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
+$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
+if test "x$ac_cv_lib_dld_shl_load" = xyes; then :
 lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld
-else $as_nop
+else
 ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
-if test "x$ac_cv_func_dlopen" = xyes
-then :
+if test "x$ac_cv_func_dlopen" = xyes; then :
 lt_cv_dlopen=dlopen
-else $as_nop
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
-printf %s "checking for dlopen in -ldl... " >&6; }
-if test ${ac_cv_lib_dl_dlopen+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+$as_echo_n "checking for dlopen in -ldl... " >&6; }
+if ${ac_cv_lib_dl_dlopen+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -12693,37 +11917,37 @@
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
 builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
 char dlopen ();
 int
-main (void)
+main ()
 {
 return dlopen ();
 ;
 return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 ac_cv_lib_dl_dlopen=yes
-else $as_nop
+else
 ac_cv_lib_dl_dlopen=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
-printf "%s\n" "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
 lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl
-else $as_nop
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
-printf %s "checking for dlopen in -lsvld... " >&6; }
-if test ${ac_cv_lib_svld_dlopen+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
+$as_echo_n "checking for dlopen in -lsvld... " >&6; }
+if ${ac_cv_lib_svld_dlopen+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsvld $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -12732,37 +11956,37 @@
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
 builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
 char dlopen ();
 int
-main (void)
+main ()
 {
 return dlopen ();
 ;
 return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 ac_cv_lib_svld_dlopen=yes
-else $as_nop
+else
 ac_cv_lib_svld_dlopen=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
-printf "%s\n" "$ac_cv_lib_svld_dlopen" >&6; }
-if test "x$ac_cv_lib_svld_dlopen" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
+$as_echo "$ac_cv_lib_svld_dlopen" >&6; }
+if test "x$ac_cv_lib_svld_dlopen" = xyes; then :
 lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld
-else $as_nop
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
-printf %s "checking for dld_link in -ldld... " >&6; }
-if test ${ac_cv_lib_dld_dld_link+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
+$as_echo_n "checking for dld_link in -ldld... " >&6; }
+if ${ac_cv_lib_dld_dld_link+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldld $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -12771,29 +11995,30 @@
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
 builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
 char dld_link ();
 int
-main (void)
+main ()
 {
 return dld_link ();
 ;
 return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 ac_cv_lib_dld_dld_link=yes
-else $as_nop
+else
 ac_cv_lib_dld_dld_link=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
-printf "%s\n" "$ac_cv_lib_dld_dld_link" >&6; }
-if test "x$ac_cv_lib_dld_dld_link" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
+$as_echo "$ac_cv_lib_dld_dld_link" >&6; }
+if test "x$ac_cv_lib_dld_dld_link" = xyes; then :
 lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld
 fi
 
@@ -12832,12 +12057,11 @@
 save_LIBS=$LIBS
 LIBS="$lt_cv_dlopen_libs $LIBS"
 
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
-printf %s "checking whether a program can dlopen itself... " >&6; }
-if test ${lt_cv_dlopen_self+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
+$as_echo_n "checking whether a program can dlopen itself... " >&6; }
+if ${lt_cv_dlopen_self+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 	 if test yes = "$cross_compiling"; then :
 lt_cv_dlopen_self=cross
 else
@@ -12916,7 +12140,7 @@
 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
 (eval $ac_link) 2>&5
 ac_status=$?
- printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then
 (./conftest; exit; ) >&5 2>/dev/null
 lt_status=$?
@@ -12934,17 +12158,16 @@
 
 
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
-printf "%s\n" "$lt_cv_dlopen_self" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
+$as_echo "$lt_cv_dlopen_self" >&6; }
 
 if test yes = "$lt_cv_dlopen_self"; then
 wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
-printf %s "checking whether a statically linked program can dlopen itself... " >&6; }
-if test ${lt_cv_dlopen_self_static+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
+$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
+if ${lt_cv_dlopen_self_static+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 	 if test yes = "$cross_compiling"; then :
 lt_cv_dlopen_self_static=cross
 else
@@ -13023,7 +12246,7 @@
 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
 (eval $ac_link) 2>&5
 ac_status=$?
- printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then
 (./conftest; exit; ) >&5 2>/dev/null
 lt_status=$?
@@ -13041,8 +12264,8 @@
 
 
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5
-printf "%s\n" "$lt_cv_dlopen_self_static" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5
+$as_echo "$lt_cv_dlopen_self_static" >&6; }
 fi
 
 CPPFLAGS=$save_CPPFLAGS
@@ -13080,43 +12303,32 @@
 
 striplib=
 old_striplib=
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
-printf %s "checking whether stripping libraries is possible... " >&6; }
-if test -z "$STRIP"; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-else
- if $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
- old_striplib="$STRIP --strip-debug"
- striplib="$STRIP --strip-unneeded"
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
- else
- case $host_os in
- darwin*)
- # FIXME - insert some real tests, host_os isn't really good enough
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
+$as_echo_n "checking whether stripping libraries is possible... " >&6; }
+if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
+ test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
+ test -z "$striplib" && striplib="$STRIP --strip-unneeded"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+# FIXME - insert some real tests, host_os isn't really good enough
+ case $host_os in
+ darwin*)
+ if test -n "$STRIP"; then
 striplib="$STRIP -x"
 old_striplib="$STRIP -S"
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
- ;;
- freebsd*)
- if $STRIP -V 2>&1 | $GREP "elftoolchain" >/dev/null; then
- old_striplib="$STRIP --strip-debug"
- striplib="$STRIP --strip-unneeded"
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
- else
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
- fi
- ;;
- *)
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
- ;;
- esac
- fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ fi
+ ;;
+ *)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ ;;
+ esac
 fi
 
 
@@ -13131,13 +12343,13 @@
 
 
 # Report what library types will actually be built
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5
-printf %s "checking if libtool supports shared libraries... " >&6; }
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
-printf "%s\n" "$can_build_shared" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5
+$as_echo_n "checking if libtool supports shared libraries... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
+$as_echo "$can_build_shared" >&6; }
 
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
-printf %s "checking whether to build shared libraries... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
+$as_echo_n "checking whether to build shared libraries... " >&6; }
 test no = "$can_build_shared" && enable_shared=no
 
 # On AIX, shared libraries and static libraries use the same namespace, and
@@ -13161,15 +12373,15 @@
 fi
 ;;
 esac
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
-printf "%s\n" "$enable_shared" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
+$as_echo "$enable_shared" >&6; }
 
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
-printf %s "checking whether to build static libraries... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
+$as_echo_n "checking whether to build static libraries... " >&6; }
 # Make sure either enable_shared or enable_static is yes.
 test yes = "$enable_shared" || enable_static=yes
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
-printf "%s\n" "$enable_static" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
+$as_echo "$enable_static" >&6; }
 
 
 
@@ -13207,19 +12419,17 @@
 
 
 # Check whether --enable-largefile was given.
-if test ${enable_largefile+y}
-then :
+if test "${enable_largefile+set}" = set; then :
 enableval=$enable_largefile;
 fi
 
 if test "$enable_largefile" != no; then
 
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5
-printf %s "checking for special C compiler options needed for large files... " >&6; }
-if test ${ac_cv_sys_largefile_CC+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5
+$as_echo_n "checking for special C compiler options needed for large files... " >&6; }
+if ${ac_cv_sys_largefile_CC+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 ac_cv_sys_largefile_CC=no
 if test "$GCC" != yes; then
 ac_save_CC=$CC
@@ -13233,47 +12443,44 @@
 We can't simply define LARGE_OFF_T to be 9223372036854775807,
 since some C++ compilers masquerading as C compilers
 incorrectly reject 9223372036854775807. */
-#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31))
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
 int off_t_is_large(LARGE_OFF_T % 2147483629 == 721
 		 && LARGE_OFF_T % 2147483647 == 1)
 		 ? 1 : -1;
 int
-main (void)
+main ()
 {
 
 ;
 return 0;
 }
 _ACEOF
-	 if ac_fn_c_try_compile "$LINENO"
-then :
+	 if ac_fn_c_try_compile "$LINENO"; then :
 break
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam
+rm -f core conftest.err conftest.$ac_objext
 	 CC="$CC -n32"
-	 if ac_fn_c_try_compile "$LINENO"
-then :
+	 if ac_fn_c_try_compile "$LINENO"; then :
 ac_cv_sys_largefile_CC=' -n32'; break
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam
+rm -f core conftest.err conftest.$ac_objext
 	 break
 done
 CC=$ac_save_CC
 rm -f conftest.$ac_ext
 fi
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5
-printf "%s\n" "$ac_cv_sys_largefile_CC" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5
+$as_echo "$ac_cv_sys_largefile_CC" >&6; }
 if test "$ac_cv_sys_largefile_CC" != no; then
 CC=$CC$ac_cv_sys_largefile_CC
 fi
 
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5
-printf %s "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; }
-if test ${ac_cv_sys_file_offset_bits+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+$as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; }
+if ${ac_cv_sys_file_offset_bits+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 while :; do
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
@@ -13282,23 +12489,22 @@
 We can't simply define LARGE_OFF_T to be 9223372036854775807,
 since some C++ compilers masquerading as C compilers
 incorrectly reject 9223372036854775807. */
-#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31))
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
 int off_t_is_large(LARGE_OFF_T % 2147483629 == 721
 		 && LARGE_OFF_T % 2147483647 == 1)
 		 ? 1 : -1;
 int
-main (void)
+main ()
 {
 
 ;
 return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 ac_cv_sys_file_offset_bits=no; break
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 #define _FILE_OFFSET_BITS 64
@@ -13307,43 +12513,43 @@
 We can't simply define LARGE_OFF_T to be 9223372036854775807,
 since some C++ compilers masquerading as C compilers
 incorrectly reject 9223372036854775807. */
-#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31))
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
 int off_t_is_large(LARGE_OFF_T % 2147483629 == 721
 		 && LARGE_OFF_T % 2147483647 == 1)
 		 ? 1 : -1;
 int
-main (void)
+main ()
 {
 
 ;
 return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 ac_cv_sys_file_offset_bits=64; break
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_sys_file_offset_bits=unknown
 break
 done
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5
-printf "%s\n" "$ac_cv_sys_file_offset_bits" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5
+$as_echo "$ac_cv_sys_file_offset_bits" >&6; }
 case $ac_cv_sys_file_offset_bits in #(
 no | unknown) ;;
 *)
-printf "%s\n" "#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits
+_ACEOF
 ;;
 esac
 rm -rf conftest*
 if test $ac_cv_sys_file_offset_bits = unknown; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5
-printf %s "checking for _LARGE_FILES value needed for large files... " >&6; }
-if test ${ac_cv_sys_large_files+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5
+$as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; }
+if ${ac_cv_sys_large_files+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 while :; do
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
@@ -13352,23 +12558,22 @@
 We can't simply define LARGE_OFF_T to be 9223372036854775807,
 since some C++ compilers masquerading as C compilers
 incorrectly reject 9223372036854775807. */
-#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31))
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
 int off_t_is_large(LARGE_OFF_T % 2147483629 == 721
 		 && LARGE_OFF_T % 2147483647 == 1)
 		 ? 1 : -1;
 int
-main (void)
+main ()
 {
 
 ;
 return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 ac_cv_sys_large_files=no; break
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 #define _LARGE_FILES 1
@@ -13377,37 +12582,40 @@
 We can't simply define LARGE_OFF_T to be 9223372036854775807,
 since some C++ compilers masquerading as C compilers
 incorrectly reject 9223372036854775807. */
-#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31))
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
 int off_t_is_large(LARGE_OFF_T % 2147483629 == 721
 		 && LARGE_OFF_T % 2147483647 == 1)
 		 ? 1 : -1;
 int
-main (void)
+main ()
 {
 
 ;
 return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 ac_cv_sys_large_files=1; break
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_sys_large_files=unknown
 break
 done
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5
-printf "%s\n" "$ac_cv_sys_large_files" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5
+$as_echo "$ac_cv_sys_large_files" >&6; }
 case $ac_cv_sys_large_files in #(
 no | unknown) ;;
 *)
-printf "%s\n" "#define _LARGE_FILES $ac_cv_sys_large_files" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define _LARGE_FILES $ac_cv_sys_large_files
+_ACEOF
 ;;
 esac
 rm -rf conftest*
 fi
+
+
 fi
 
 
@@ -13423,110 +12631,205 @@
 
 
 
-
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC options needed to detect all undeclared functions" >&5
-printf %s "checking for $CC options needed to detect all undeclared functions... " >&6; }
-if test ${ac_cv_c_undeclared_builtin_options+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
- ac_save_CFLAGS=$CFLAGS
- ac_cv_c_undeclared_builtin_options='cannot detect'
- for ac_arg in '' -fno-builtin; do
- CFLAGS="$ac_save_CFLAGS $ac_arg"
- # This test program should *not* compile successfully.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C99" >&5
+$as_echo_n "checking for $CC option to accept ISO C99... " >&6; }
+if ${ac_cv_prog_cc_c99+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_cv_prog_cc_c99=no
+ac_save_CC=$CC
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdlib.h>
+#include <wchar.h>
+#include <stdio.h>
 
-int
-main (void)
+// Check varargs macros. These examples are taken from C99 6.10.3.5.
+#define debug(...) fprintf (stderr, __VA_ARGS__)
+#define showlist(...) puts (#__VA_ARGS__)
+#define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__))
+static void
+test_varargs_macros (void)
 {
-(void) strchr;
- ;
+ int x = 1234;
+ int y = 5678;
+ debug ("Flag");
+ debug ("X = %d\n", x);
+ showlist (The first, second, and third items.);
+ report (x>y, "x is %d but y is %d", x, y);
+}
+
+// Check long long types.
+#define BIG64 18446744073709551615ull
+#define BIG32 4294967295ul
+#define BIG_OK (BIG64 / BIG32 == 4294967297ull && BIG64 % BIG32 == 0)
+#if !BIG_OK
+ your preprocessor is broken;
+#endif
+#if BIG_OK
+#else
+ your preprocessor is broken;
+#endif
+static long long int bignum = -9223372036854775807LL;
+static unsigned long long int ubignum = BIG64;
+
+struct incomplete_array
+{
+ int datasize;
+ double data;
+};
+
+struct named_init {
+ int number;
+ const wchar_t *name;
+ double average;
+};
+
+typedef const char *ccp;
+
+static inline int
+test_restrict (ccp restrict text)
+{
+ // See if C++-style comments work.
+ // Iterate through items via the restricted pointer.
+ // Also check for declarations in for loops.
+ for (unsigned int i = 0; *(text+i) != '\0'; ++i)
+ continue;
 return 0;
 }
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
 
-else $as_nop
- # This test program should compile successfully.
- # No library function is consistently available on
- # freestanding implementations, so test against a dummy
- # declaration. Include always-available headers on the
- # off chance that they somehow elicit warnings.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <float.h>
-#include <limits.h>
-#include <stdarg.h>
-#include <stddef.h>
-extern void ac_decl (int, char *);
+// Check varargs and va_copy.
+static void
+test_varargs (const char *format, ...)
+{
+ va_list args;
+ va_start (args, format);
+ va_list args_copy;
+ va_copy (args_copy, args);
+
+ const char *str;
+ int number;
+ float fnumber;
+
+ while (*format)
+ {
+ switch (*format++)
+	{
+	case 's': // string
+	 str = va_arg (args_copy, const char *);
+	 break;
+	case 'd': // int
+	 number = va_arg (args_copy, int);
+	 break;
+	case 'f': // float
+	 fnumber = va_arg (args_copy, double);
+	 break;
+	default:
+	 break;
+	}
+ }
+ va_end (args_copy);
+ va_end (args);
+}
 
 int
-main (void)
+main ()
 {
-(void) ac_decl (0, (char *) 0);
- (void) ac_decl;
+
+ // Check bool.
+ _Bool success = false;
+
+ // Check restrict.
+ if (test_restrict ("String literal") == 0)
+ success = true;
+ char *restrict newvar = "Another string";
+
+ // Check varargs.
+ test_varargs ("s, d' f .", "string", 65, 34.234);
+ test_varargs_macros ();
+
+ // Check flexible array members.
+ struct incomplete_array *ia =
+ malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10));
+ ia->datasize = 10;
+ for (int i = 0; i < ia->datasize; ++i)
+ ia->datai = i * 1.234;
+
+ // Check named initializers.
+ struct named_init ni = {
+ .number = 34,
+ .name = L"Test wide string",
+ .average = 543.34343,
+ };
+
+ ni.number = 58;
+
+ int dynamic_arrayni.number;
+ dynamic_arrayni.number - 1 = 543;
+
+ // work around unused variable warnings
+ return (!success || bignum == 0LL || ubignum == 0uLL || newvar0 == 'x'
+	 || dynamic_arrayni.number - 1 != 543);
 
 ;
 return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
- if test x"$ac_arg" = x
-then :
- ac_cv_c_undeclared_builtin_options='none needed'
-else $as_nop
- ac_cv_c_undeclared_builtin_options=$ac_arg
-fi
- break
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+for ac_arg in '' -std=gnu99 -std=c99 -c99 -AC99 -D_STDC_C99= -qlanglvl=extc99
+do
+ CC="$ac_save_CC $ac_arg"
+ if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_prog_cc_c99=$ac_arg
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
- done
- CFLAGS=$ac_save_CFLAGS
+rm -f core conftest.err conftest.$ac_objext
+ test "x$ac_cv_prog_cc_c99" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CC=$ac_save_CC
 
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_undeclared_builtin_options" >&5
-printf "%s\n" "$ac_cv_c_undeclared_builtin_options" >&6; }
- case $ac_cv_c_undeclared_builtin_options in #(
- 'cannot detect') :
- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot make $CC report undeclared builtins
-See \`config.log' for more details" "$LINENO" 5; } ;; #(
- 'none needed') :
- ac_c_undeclared_builtin_options='' ;; #(
- *) :
- ac_c_undeclared_builtin_options=$ac_cv_c_undeclared_builtin_options ;;
+# AC_CACHE_VAL
+case "x$ac_cv_prog_cc_c99" in
+ x)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+$as_echo "none needed" >&6; } ;;
+ xno)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+$as_echo "unsupported" >&6; } ;;
+ *)
+ CC="$CC $ac_cv_prog_cc_c99"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5
+$as_echo "$ac_cv_prog_cc_c99" >&6; } ;;
 esac
+if test "x$ac_cv_prog_cc_c99" != xno; then :
+
+fi
 
 
 
 
 
-ac_fn_check_decl "$LINENO" "__clang__" "ac_cv_have_decl___clang__" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
-if test "x$ac_cv_have_decl___clang__" = xyes
-then :
+
+ac_fn_c_check_decl "$LINENO" "__clang__" "ac_cv_have_decl___clang__" "$ac_includes_default"
+if test "x$ac_cv_have_decl___clang__" = xyes; then :
 CLANGCC="yes"
-else $as_nop
+else
 CLANGCC="no"
 fi
-ac_fn_check_decl "$LINENO" "__INTEL_COMPILER" "ac_cv_have_decl___INTEL_COMPILER" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
-if test "x$ac_cv_have_decl___INTEL_COMPILER" = xyes
-then :
+
+ac_fn_c_check_decl "$LINENO" "__INTEL_COMPILER" "ac_cv_have_decl___INTEL_COMPILER" "$ac_includes_default"
+if test "x$ac_cv_have_decl___INTEL_COMPILER" = xyes; then :
 INTELCC="yes"
-else $as_nop
+else
 INTELCC="no"
 fi
-ac_fn_check_decl "$LINENO" "__SUNPRO_C" "ac_cv_have_decl___SUNPRO_C" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
-if test "x$ac_cv_have_decl___SUNPRO_C" = xyes
-then :
+
+ac_fn_c_check_decl "$LINENO" "__SUNPRO_C" "ac_cv_have_decl___SUNPRO_C" "$ac_includes_default"
+if test "x$ac_cv_have_decl___SUNPRO_C" = xyes; then :
 SUNCC="yes"
-else $as_nop
+else
 SUNCC="no"
 fi
 
@@ -13537,16 +12840,16 @@
 
 
 
+
 if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
 	if test -n "$ac_tool_prefix"; then
 # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
 set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_path_PKG_CONFIG+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_PKG_CONFIG+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 case $PKG_CONFIG in
 \\/* | ?:\\/*)
 ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
@@ -13556,15 +12859,11 @@
 for as_dir in $PATH
 do
 IFS=$as_save_IFS
- case $as_dir in #(((
- '') as_dir=./ ;;
- */) ;;
- *) as_dir=$as_dir/ ;;
- esac
+ test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
- ac_cv_path_PKG_CONFIG="$as_dir$ac_word$ac_exec_ext"
- printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
 fi
 done
@@ -13576,11 +12875,11 @@
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 if test -n "$PKG_CONFIG"; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-printf "%s\n" "$PKG_CONFIG" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
 else
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -13589,12 +12888,11 @@
 ac_pt_PKG_CONFIG=$PKG_CONFIG
 # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_path_ac_pt_PKG_CONFIG+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 case $ac_pt_PKG_CONFIG in
 \\/* | ?:\\/*)
 ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
@@ -13604,15 +12902,11 @@
 for as_dir in $PATH
 do
 IFS=$as_save_IFS
- case $as_dir in #(((
- '') as_dir=./ ;;
- */) ;;
- *) as_dir=$as_dir/ ;;
- esac
+ test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
- ac_cv_path_ac_pt_PKG_CONFIG="$as_dir$ac_word$ac_exec_ext"
- printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
 fi
 done
@@ -13624,11 +12918,11 @@
 fi
 ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
 if test -n "$ac_pt_PKG_CONFIG"; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
-printf "%s\n" "$ac_pt_PKG_CONFIG" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
+$as_echo "$ac_pt_PKG_CONFIG" >&6; }
 else
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 if test "x$ac_pt_PKG_CONFIG" = x; then
@@ -13636,8 +12930,8 @@
 else
 case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
 PKG_CONFIG=$ac_pt_PKG_CONFIG
@@ -13649,14 +12943,14 @@
 fi
 if test -n "$PKG_CONFIG"; then
 	_pkg_min_version=0.9.0
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
-printf %s "checking pkg-config is at least version $_pkg_min_version... " >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
+$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
 	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 	else
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 		PKG_CONFIG=""
 	fi
 fi
@@ -13666,10 +12960,9 @@
 
 
 # Check whether --enable-selective-werror was given.
-if test ${enable_selective_werror+y}
-then :
+if test "${enable_selective_werror+set}" = set; then :
 enableval=$enable_selective_werror; SELECTIVE_WERROR=$enableval
-else $as_nop
+else
 SELECTIVE_WERROR=yes
 fi
 
@@ -13702,26 +12995,24 @@
 
 if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then
 	CFLAGS="$CFLAGS -Werror=unknown-warning-option"
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5
-printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
-if test ${xorg_cv_cc_flag_unknown_warning_option+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5
+$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
+if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 xorg_cv_cc_flag_unknown_warning_option=yes
-else $as_nop
+else
 xorg_cv_cc_flag_unknown_warning_option=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
-printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
+$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
 	xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
@@ -13731,26 +13022,24 @@
 		CFLAGS="$CFLAGS -Werror=unknown-warning-option"
 	fi
 	CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5
-printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
-if test ${xorg_cv_cc_flag_unused_command_line_argument+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5
+$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
+if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 xorg_cv_cc_flag_unused_command_line_argument=yes
-else $as_nop
+else
 xorg_cv_cc_flag_unused_command_line_argument=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
-printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
+$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
 	xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
@@ -13768,31 +13057,29 @@
 
 		CFLAGS="$CFLAGS -Wall"
 
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wall" >&5
-printf %s "checking if $CC supports -Wall... " >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wall" >&5
+$as_echo_n "checking if $CC supports -Wall... " >&6; }
 		cacheid=xorg_cv_cc_flag__Wall
-		if eval test \${$cacheid+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+		if eval \${$cacheid+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 int
-main (void)
+main ()
 {
 
 ;
 return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 eval $cacheid=yes
-else $as_nop
+else
 eval $cacheid=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
 conftest$ac_exeext conftest.$ac_ext
 fi
 
@@ -13800,8 +13087,8 @@
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
 		eval supported=\$$cacheid
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5
-printf "%s\n" "$supported" >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5
+$as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
 			BASE_CFLAGS="$BASE_CFLAGS -Wall"
 			found="yes"
@@ -13826,26 +13113,24 @@
 
 if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then
 	CFLAGS="$CFLAGS -Werror=unknown-warning-option"
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5
-printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
-if test ${xorg_cv_cc_flag_unknown_warning_option+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5
+$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
+if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 xorg_cv_cc_flag_unknown_warning_option=yes
-else $as_nop
+else
 xorg_cv_cc_flag_unknown_warning_option=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
-printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
+$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
 	xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
@@ -13855,26 +13140,24 @@
 		CFLAGS="$CFLAGS -Werror=unknown-warning-option"
 	fi
 	CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5
-printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
-if test ${xorg_cv_cc_flag_unused_command_line_argument+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5
+$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
+if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 xorg_cv_cc_flag_unused_command_line_argument=yes
-else $as_nop
+else
 xorg_cv_cc_flag_unused_command_line_argument=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
-printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
+$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
 	xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
@@ -13892,31 +13175,29 @@
 
 		CFLAGS="$CFLAGS -Wpointer-arith"
 
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wpointer-arith" >&5
-printf %s "checking if $CC supports -Wpointer-arith... " >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wpointer-arith" >&5
+$as_echo_n "checking if $CC supports -Wpointer-arith... " >&6; }
 		cacheid=xorg_cv_cc_flag__Wpointer_arith
-		if eval test \${$cacheid+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+		if eval \${$cacheid+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 int
-main (void)
+main ()
 {
 
 ;
 return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 eval $cacheid=yes
-else $as_nop
+else
 eval $cacheid=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
 conftest$ac_exeext conftest.$ac_ext
 fi
 
@@ -13924,8 +13205,8 @@
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
 		eval supported=\$$cacheid
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5
-printf "%s\n" "$supported" >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5
+$as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
 			BASE_CFLAGS="$BASE_CFLAGS -Wpointer-arith"
 			found="yes"
@@ -13950,26 +13231,24 @@
 
 if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then
 	CFLAGS="$CFLAGS -Werror=unknown-warning-option"
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5
-printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
-if test ${xorg_cv_cc_flag_unknown_warning_option+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5
+$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
+if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 xorg_cv_cc_flag_unknown_warning_option=yes
-else $as_nop
+else
 xorg_cv_cc_flag_unknown_warning_option=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
-printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
+$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
 	xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
@@ -13979,26 +13258,24 @@
 		CFLAGS="$CFLAGS -Werror=unknown-warning-option"
 	fi
 	CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5
-printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
-if test ${xorg_cv_cc_flag_unused_command_line_argument+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5
+$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
+if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 xorg_cv_cc_flag_unused_command_line_argument=yes
-else $as_nop
+else
 xorg_cv_cc_flag_unused_command_line_argument=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
-printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
+$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
 	xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
@@ -14016,31 +13293,29 @@
 
 		CFLAGS="$CFLAGS -Wmissing-declarations"
 
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wmissing-declarations" >&5
-printf %s "checking if $CC supports -Wmissing-declarations... " >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wmissing-declarations" >&5
+$as_echo_n "checking if $CC supports -Wmissing-declarations... " >&6; }
 		cacheid=xorg_cv_cc_flag__Wmissing_declarations
-		if eval test \${$cacheid+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+		if eval \${$cacheid+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 int
-main (void)
+main ()
 {
 
 ;
 return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 eval $cacheid=yes
-else $as_nop
+else
 eval $cacheid=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
 conftest$ac_exeext conftest.$ac_ext
 fi
 
@@ -14048,8 +13323,8 @@
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
 		eval supported=\$$cacheid
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5
-printf "%s\n" "$supported" >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5
+$as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
 			BASE_CFLAGS="$BASE_CFLAGS -Wmissing-declarations"
 			found="yes"
@@ -14074,26 +13349,24 @@
 
 if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then
 	CFLAGS="$CFLAGS -Werror=unknown-warning-option"
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5
-printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
-if test ${xorg_cv_cc_flag_unknown_warning_option+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5
+$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
+if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 xorg_cv_cc_flag_unknown_warning_option=yes
-else $as_nop
+else
 xorg_cv_cc_flag_unknown_warning_option=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
-printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
+$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
 	xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
@@ -14103,26 +13376,24 @@
 		CFLAGS="$CFLAGS -Werror=unknown-warning-option"
 	fi
 	CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5
-printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
-if test ${xorg_cv_cc_flag_unused_command_line_argument+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5
+$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
+if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 xorg_cv_cc_flag_unused_command_line_argument=yes
-else $as_nop
+else
 xorg_cv_cc_flag_unused_command_line_argument=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
-printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
+$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
 	xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
@@ -14140,31 +13411,29 @@
 
 		CFLAGS="$CFLAGS -Wformat=2"
 
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wformat=2" >&5
-printf %s "checking if $CC supports -Wformat=2... " >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wformat=2" >&5
+$as_echo_n "checking if $CC supports -Wformat=2... " >&6; }
 		cacheid=xorg_cv_cc_flag__Wformat_2
-		if eval test \${$cacheid+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+		if eval \${$cacheid+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 int
-main (void)
+main ()
 {
 
 ;
 return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 eval $cacheid=yes
-else $as_nop
+else
 eval $cacheid=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
 conftest$ac_exeext conftest.$ac_ext
 fi
 
@@ -14172,8 +13441,8 @@
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
 		eval supported=\$$cacheid
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5
-printf "%s\n" "$supported" >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5
+$as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
 			BASE_CFLAGS="$BASE_CFLAGS -Wformat=2"
 			found="yes"
@@ -14191,31 +13460,29 @@
 
 		CFLAGS="$CFLAGS -Wformat"
 
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wformat" >&5
-printf %s "checking if $CC supports -Wformat... " >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wformat" >&5
+$as_echo_n "checking if $CC supports -Wformat... " >&6; }
 		cacheid=xorg_cv_cc_flag__Wformat
-		if eval test \${$cacheid+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+		if eval \${$cacheid+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 int
-main (void)
+main ()
 {
 
 ;
 return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 eval $cacheid=yes
-else $as_nop
+else
 eval $cacheid=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
 conftest$ac_exeext conftest.$ac_ext
 fi
 
@@ -14223,8 +13490,8 @@
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
 		eval supported=\$$cacheid
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5
-printf "%s\n" "$supported" >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5
+$as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
 			BASE_CFLAGS="$BASE_CFLAGS -Wformat"
 			found="yes"
@@ -14251,26 +13518,24 @@
 
 if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then
 	CFLAGS="$CFLAGS -Werror=unknown-warning-option"
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5
-printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
-if test ${xorg_cv_cc_flag_unknown_warning_option+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5
+$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
+if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 xorg_cv_cc_flag_unknown_warning_option=yes
-else $as_nop
+else
 xorg_cv_cc_flag_unknown_warning_option=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
-printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
+$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
 	xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
@@ -14280,26 +13545,24 @@
 		CFLAGS="$CFLAGS -Werror=unknown-warning-option"
 	fi
 	CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5
-printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
-if test ${xorg_cv_cc_flag_unused_command_line_argument+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5
+$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
+if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 xorg_cv_cc_flag_unused_command_line_argument=yes
-else $as_nop
+else
 xorg_cv_cc_flag_unused_command_line_argument=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
-printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
+$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
 	xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
@@ -14317,31 +13580,29 @@
 
 		CFLAGS="$CFLAGS -Wstrict-prototypes"
 
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wstrict-prototypes" >&5
-printf %s "checking if $CC supports -Wstrict-prototypes... " >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wstrict-prototypes" >&5
+$as_echo_n "checking if $CC supports -Wstrict-prototypes... " >&6; }
 		cacheid=xorg_cv_cc_flag__Wstrict_prototypes
-		if eval test \${$cacheid+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+		if eval \${$cacheid+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 int
-main (void)
+main ()
 {
 
 ;
 return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 eval $cacheid=yes
-else $as_nop
+else
 eval $cacheid=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
 conftest$ac_exeext conftest.$ac_ext
 fi
 
@@ -14349,8 +13610,8 @@
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
 		eval supported=\$$cacheid
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5
-printf "%s\n" "$supported" >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5
+$as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
 			BASE_CFLAGS="$BASE_CFLAGS -Wstrict-prototypes"
 			found="yes"
@@ -14375,26 +13636,24 @@
 
 if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then
 	CFLAGS="$CFLAGS -Werror=unknown-warning-option"
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5
-printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
-if test ${xorg_cv_cc_flag_unknown_warning_option+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5
+$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
+if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 xorg_cv_cc_flag_unknown_warning_option=yes
-else $as_nop
+else
 xorg_cv_cc_flag_unknown_warning_option=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
-printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
+$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
 	xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
@@ -14404,26 +13663,24 @@
 		CFLAGS="$CFLAGS -Werror=unknown-warning-option"
 	fi
 	CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5
-printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
-if test ${xorg_cv_cc_flag_unused_command_line_argument+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5
+$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
+if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 xorg_cv_cc_flag_unused_command_line_argument=yes
-else $as_nop
+else
 xorg_cv_cc_flag_unused_command_line_argument=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
-printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
+$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
 	xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
@@ -14441,31 +13698,29 @@
 
 		CFLAGS="$CFLAGS -Wmissing-prototypes"
 
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wmissing-prototypes" >&5
-printf %s "checking if $CC supports -Wmissing-prototypes... " >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wmissing-prototypes" >&5
+$as_echo_n "checking if $CC supports -Wmissing-prototypes... " >&6; }
 		cacheid=xorg_cv_cc_flag__Wmissing_prototypes
-		if eval test \${$cacheid+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+		if eval \${$cacheid+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 int
-main (void)
+main ()
 {
 
 ;
 return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 eval $cacheid=yes
-else $as_nop
+else
 eval $cacheid=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
 conftest$ac_exeext conftest.$ac_ext
 fi
 
@@ -14473,8 +13728,8 @@
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
 		eval supported=\$$cacheid
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5
-printf "%s\n" "$supported" >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5
+$as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
 			BASE_CFLAGS="$BASE_CFLAGS -Wmissing-prototypes"
 			found="yes"
@@ -14499,26 +13754,24 @@
 
 if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then
 	CFLAGS="$CFLAGS -Werror=unknown-warning-option"
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5
-printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
-if test ${xorg_cv_cc_flag_unknown_warning_option+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5
+$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
+if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 xorg_cv_cc_flag_unknown_warning_option=yes
-else $as_nop
+else
 xorg_cv_cc_flag_unknown_warning_option=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
-printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
+$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
 	xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
@@ -14528,26 +13781,24 @@
 		CFLAGS="$CFLAGS -Werror=unknown-warning-option"
 	fi
 	CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5
-printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
-if test ${xorg_cv_cc_flag_unused_command_line_argument+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5
+$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
+if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 xorg_cv_cc_flag_unused_command_line_argument=yes
-else $as_nop
+else
 xorg_cv_cc_flag_unused_command_line_argument=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
-printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
+$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
 	xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
@@ -14565,31 +13816,29 @@
 
 		CFLAGS="$CFLAGS -Wnested-externs"
 
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wnested-externs" >&5
-printf %s "checking if $CC supports -Wnested-externs... " >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wnested-externs" >&5
+$as_echo_n "checking if $CC supports -Wnested-externs... " >&6; }
 		cacheid=xorg_cv_cc_flag__Wnested_externs
-		if eval test \${$cacheid+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+		if eval \${$cacheid+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 int
-main (void)
+main ()
 {
 
 ;
 return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 eval $cacheid=yes
-else $as_nop
+else
 eval $cacheid=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
 conftest$ac_exeext conftest.$ac_ext
 fi
 
@@ -14597,8 +13846,8 @@
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
 		eval supported=\$$cacheid
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5
-printf "%s\n" "$supported" >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5
+$as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
 			BASE_CFLAGS="$BASE_CFLAGS -Wnested-externs"
 			found="yes"
@@ -14623,26 +13872,24 @@
 
 if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then
 	CFLAGS="$CFLAGS -Werror=unknown-warning-option"
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5
-printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
-if test ${xorg_cv_cc_flag_unknown_warning_option+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5
+$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
+if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 xorg_cv_cc_flag_unknown_warning_option=yes
-else $as_nop
+else
 xorg_cv_cc_flag_unknown_warning_option=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
-printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
+$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
 	xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
@@ -14652,26 +13899,24 @@
 		CFLAGS="$CFLAGS -Werror=unknown-warning-option"
 	fi
 	CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5
-printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
-if test ${xorg_cv_cc_flag_unused_command_line_argument+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5
+$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
+if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 xorg_cv_cc_flag_unused_command_line_argument=yes
-else $as_nop
+else
 xorg_cv_cc_flag_unused_command_line_argument=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
-printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
+$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
 	xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
@@ -14689,31 +13934,29 @@
 
 		CFLAGS="$CFLAGS -Wbad-function-cast"
 
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wbad-function-cast" >&5
-printf %s "checking if $CC supports -Wbad-function-cast... " >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wbad-function-cast" >&5
+$as_echo_n "checking if $CC supports -Wbad-function-cast... " >&6; }
 		cacheid=xorg_cv_cc_flag__Wbad_function_cast
-		if eval test \${$cacheid+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+		if eval \${$cacheid+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 int
-main (void)
+main ()
 {
 
 ;
 return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 eval $cacheid=yes
-else $as_nop
+else
 eval $cacheid=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
 conftest$ac_exeext conftest.$ac_ext
 fi
 
@@ -14721,8 +13964,8 @@
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
 		eval supported=\$$cacheid
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5
-printf "%s\n" "$supported" >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5
+$as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
 			BASE_CFLAGS="$BASE_CFLAGS -Wbad-function-cast"
 			found="yes"
@@ -14747,26 +13990,24 @@
 
 if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then
 	CFLAGS="$CFLAGS -Werror=unknown-warning-option"
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5
-printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
-if test ${xorg_cv_cc_flag_unknown_warning_option+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5
+$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
+if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 xorg_cv_cc_flag_unknown_warning_option=yes
-else $as_nop
+else
 xorg_cv_cc_flag_unknown_warning_option=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
-printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
+$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
 	xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
@@ -14776,26 +14017,24 @@
 		CFLAGS="$CFLAGS -Werror=unknown-warning-option"
 	fi
 	CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5
-printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
-if test ${xorg_cv_cc_flag_unused_command_line_argument+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5
+$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
+if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 xorg_cv_cc_flag_unused_command_line_argument=yes
-else $as_nop
+else
 xorg_cv_cc_flag_unused_command_line_argument=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
-printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
+$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
 	xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
@@ -14813,31 +14052,29 @@
 
 		CFLAGS="$CFLAGS -Wold-style-definition"
 
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wold-style-definition" >&5
-printf %s "checking if $CC supports -Wold-style-definition... " >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wold-style-definition" >&5
+$as_echo_n "checking if $CC supports -Wold-style-definition... " >&6; }
 		cacheid=xorg_cv_cc_flag__Wold_style_definition
-		if eval test \${$cacheid+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+		if eval \${$cacheid+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 int
-main (void)
+main ()
 {
 
 ;
 return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 eval $cacheid=yes
-else $as_nop
+else
 eval $cacheid=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
 conftest$ac_exeext conftest.$ac_ext
 fi
 
@@ -14845,8 +14082,8 @@
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
 		eval supported=\$$cacheid
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5
-printf "%s\n" "$supported" >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5
+$as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
 			BASE_CFLAGS="$BASE_CFLAGS -Wold-style-definition"
 			found="yes"
@@ -14864,31 +14101,29 @@
 
 		CFLAGS="$CFLAGS -fd"
 
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -fd" >&5
-printf %s "checking if $CC supports -fd... " >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -fd" >&5
+$as_echo_n "checking if $CC supports -fd... " >&6; }
 		cacheid=xorg_cv_cc_flag__fd
-		if eval test \${$cacheid+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+		if eval \${$cacheid+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 int
-main (void)
+main ()
 {
 
 ;
 return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 eval $cacheid=yes
-else $as_nop
+else
 eval $cacheid=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
 conftest$ac_exeext conftest.$ac_ext
 fi
 
@@ -14896,8 +14131,8 @@
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
 		eval supported=\$$cacheid
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5
-printf "%s\n" "$supported" >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5
+$as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
 			BASE_CFLAGS="$BASE_CFLAGS -fd"
 			found="yes"
@@ -14922,26 +14157,24 @@
 
 if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then
 	CFLAGS="$CFLAGS -Werror=unknown-warning-option"
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5
-printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
-if test ${xorg_cv_cc_flag_unknown_warning_option+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5
+$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
+if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 xorg_cv_cc_flag_unknown_warning_option=yes
-else $as_nop
+else
 xorg_cv_cc_flag_unknown_warning_option=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
-printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
+$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
 	xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
@@ -14951,26 +14184,24 @@
 		CFLAGS="$CFLAGS -Werror=unknown-warning-option"
 	fi
 	CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5
-printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
-if test ${xorg_cv_cc_flag_unused_command_line_argument+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5
+$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
+if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 xorg_cv_cc_flag_unused_command_line_argument=yes
-else $as_nop
+else
 xorg_cv_cc_flag_unused_command_line_argument=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
-printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
+$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
 	xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
@@ -14988,31 +14219,29 @@
 
 		CFLAGS="$CFLAGS -Wdeclaration-after-statement"
 
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wdeclaration-after-statement" >&5
-printf %s "checking if $CC supports -Wdeclaration-after-statement... " >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wdeclaration-after-statement" >&5
+$as_echo_n "checking if $CC supports -Wdeclaration-after-statement... " >&6; }
 		cacheid=xorg_cv_cc_flag__Wdeclaration_after_statement
-		if eval test \${$cacheid+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+		if eval \${$cacheid+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 int
-main (void)
+main ()
 {
 
 ;
 return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 eval $cacheid=yes
-else $as_nop
+else
 eval $cacheid=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
 conftest$ac_exeext conftest.$ac_ext
 fi
 
@@ -15020,8 +14249,8 @@
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
 		eval supported=\$$cacheid
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5
-printf "%s\n" "$supported" >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5
+$as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
 			BASE_CFLAGS="$BASE_CFLAGS -Wdeclaration-after-statement"
 			found="yes"
@@ -15050,26 +14279,24 @@
 
 if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then
 	CFLAGS="$CFLAGS -Werror=unknown-warning-option"
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5
-printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
-if test ${xorg_cv_cc_flag_unknown_warning_option+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5
+$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
+if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 xorg_cv_cc_flag_unknown_warning_option=yes
-else $as_nop
+else
 xorg_cv_cc_flag_unknown_warning_option=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
-printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
+$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
 	xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
@@ -15079,26 +14306,24 @@
 		CFLAGS="$CFLAGS -Werror=unknown-warning-option"
 	fi
 	CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5
-printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
-if test ${xorg_cv_cc_flag_unused_command_line_argument+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5
+$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
+if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 xorg_cv_cc_flag_unused_command_line_argument=yes
-else $as_nop
+else
 xorg_cv_cc_flag_unused_command_line_argument=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
-printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
+$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
 	xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
@@ -15116,31 +14341,29 @@
 
 		CFLAGS="$CFLAGS -Wunused"
 
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wunused" >&5
-printf %s "checking if $CC supports -Wunused... " >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wunused" >&5
+$as_echo_n "checking if $CC supports -Wunused... " >&6; }
 		cacheid=xorg_cv_cc_flag__Wunused
-		if eval test \${$cacheid+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+		if eval \${$cacheid+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 int
-main (void)
+main ()
 {
 
 ;
 return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 eval $cacheid=yes
-else $as_nop
+else
 eval $cacheid=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
 conftest$ac_exeext conftest.$ac_ext
 fi
 
@@ -15148,8 +14371,8 @@
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
 		eval supported=\$$cacheid
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5
-printf "%s\n" "$supported" >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5
+$as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
 			BASE_CFLAGS="$BASE_CFLAGS -Wunused"
 			found="yes"
@@ -15174,26 +14397,24 @@
 
 if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then
 	CFLAGS="$CFLAGS -Werror=unknown-warning-option"
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5
-printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
-if test ${xorg_cv_cc_flag_unknown_warning_option+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5
+$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
+if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 xorg_cv_cc_flag_unknown_warning_option=yes
-else $as_nop
+else
 xorg_cv_cc_flag_unknown_warning_option=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
-printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
+$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
 	xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
@@ -15203,26 +14424,24 @@
 		CFLAGS="$CFLAGS -Werror=unknown-warning-option"
 	fi
 	CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5
-printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
-if test ${xorg_cv_cc_flag_unused_command_line_argument+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5
+$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
+if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 xorg_cv_cc_flag_unused_command_line_argument=yes
-else $as_nop
+else
 xorg_cv_cc_flag_unused_command_line_argument=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
-printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
+$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
 	xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
@@ -15240,31 +14459,29 @@
 
 		CFLAGS="$CFLAGS -Wuninitialized"
 
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wuninitialized" >&5
-printf %s "checking if $CC supports -Wuninitialized... " >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wuninitialized" >&5
+$as_echo_n "checking if $CC supports -Wuninitialized... " >&6; }
 		cacheid=xorg_cv_cc_flag__Wuninitialized
-		if eval test \${$cacheid+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+		if eval \${$cacheid+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 int
-main (void)
+main ()
 {
 
 ;
 return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 eval $cacheid=yes
-else $as_nop
+else
 eval $cacheid=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
 conftest$ac_exeext conftest.$ac_ext
 fi
 
@@ -15272,8 +14489,8 @@
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
 		eval supported=\$$cacheid
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5
-printf "%s\n" "$supported" >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5
+$as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
 			BASE_CFLAGS="$BASE_CFLAGS -Wuninitialized"
 			found="yes"
@@ -15298,26 +14515,24 @@
 
 if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then
 	CFLAGS="$CFLAGS -Werror=unknown-warning-option"
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5
-printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
-if test ${xorg_cv_cc_flag_unknown_warning_option+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5
+$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
+if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 xorg_cv_cc_flag_unknown_warning_option=yes
-else $as_nop
+else
 xorg_cv_cc_flag_unknown_warning_option=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
-printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
+$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
 	xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
@@ -15327,26 +14542,24 @@
 		CFLAGS="$CFLAGS -Werror=unknown-warning-option"
 	fi
 	CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5
-printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
-if test ${xorg_cv_cc_flag_unused_command_line_argument+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5
+$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
+if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 xorg_cv_cc_flag_unused_command_line_argument=yes
-else $as_nop
+else
 xorg_cv_cc_flag_unused_command_line_argument=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
-printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
+$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
 	xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
@@ -15364,31 +14577,29 @@
 
 		CFLAGS="$CFLAGS -Wshadow"
 
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wshadow" >&5
-printf %s "checking if $CC supports -Wshadow... " >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wshadow" >&5
+$as_echo_n "checking if $CC supports -Wshadow... " >&6; }
 		cacheid=xorg_cv_cc_flag__Wshadow
-		if eval test \${$cacheid+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+		if eval \${$cacheid+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 int
-main (void)
+main ()
 {
 
 ;
 return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 eval $cacheid=yes
-else $as_nop
+else
 eval $cacheid=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
 conftest$ac_exeext conftest.$ac_ext
 fi
 
@@ -15396,8 +14607,8 @@
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
 		eval supported=\$$cacheid
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5
-printf "%s\n" "$supported" >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5
+$as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
 			BASE_CFLAGS="$BASE_CFLAGS -Wshadow"
 			found="yes"
@@ -15422,26 +14633,24 @@
 
 if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then
 	CFLAGS="$CFLAGS -Werror=unknown-warning-option"
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5
-printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
-if test ${xorg_cv_cc_flag_unknown_warning_option+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5
+$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
+if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 xorg_cv_cc_flag_unknown_warning_option=yes
-else $as_nop
+else
 xorg_cv_cc_flag_unknown_warning_option=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
-printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
+$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
 	xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
@@ -15451,26 +14660,24 @@
 		CFLAGS="$CFLAGS -Werror=unknown-warning-option"
 	fi
 	CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5
-printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
-if test ${xorg_cv_cc_flag_unused_command_line_argument+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5
+$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
+if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 xorg_cv_cc_flag_unused_command_line_argument=yes
-else $as_nop
+else
 xorg_cv_cc_flag_unused_command_line_argument=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
-printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
+$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
 	xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
@@ -15488,31 +14695,29 @@
 
 		CFLAGS="$CFLAGS -Wmissing-noreturn"
 
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wmissing-noreturn" >&5
-printf %s "checking if $CC supports -Wmissing-noreturn... " >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wmissing-noreturn" >&5
+$as_echo_n "checking if $CC supports -Wmissing-noreturn... " >&6; }
 		cacheid=xorg_cv_cc_flag__Wmissing_noreturn
-		if eval test \${$cacheid+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+		if eval \${$cacheid+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 int
-main (void)
+main ()
 {
 
 ;
 return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 eval $cacheid=yes
-else $as_nop
+else
 eval $cacheid=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
 conftest$ac_exeext conftest.$ac_ext
 fi
 
@@ -15520,8 +14725,8 @@
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
 		eval supported=\$$cacheid
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5
-printf "%s\n" "$supported" >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5
+$as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
 			BASE_CFLAGS="$BASE_CFLAGS -Wmissing-noreturn"
 			found="yes"
@@ -15546,26 +14751,24 @@
 
 if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then
 	CFLAGS="$CFLAGS -Werror=unknown-warning-option"
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5
-printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
-if test ${xorg_cv_cc_flag_unknown_warning_option+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5
+$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
+if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 xorg_cv_cc_flag_unknown_warning_option=yes
-else $as_nop
+else
 xorg_cv_cc_flag_unknown_warning_option=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
-printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
+$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
 	xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
@@ -15575,26 +14778,24 @@
 		CFLAGS="$CFLAGS -Werror=unknown-warning-option"
 	fi
 	CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5
-printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
-if test ${xorg_cv_cc_flag_unused_command_line_argument+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5
+$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
+if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 xorg_cv_cc_flag_unused_command_line_argument=yes
-else $as_nop
+else
 xorg_cv_cc_flag_unused_command_line_argument=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
-printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
+$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
 	xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
@@ -15612,31 +14813,29 @@
 
 		CFLAGS="$CFLAGS -Wmissing-format-attribute"
 
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wmissing-format-attribute" >&5
-printf %s "checking if $CC supports -Wmissing-format-attribute... " >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wmissing-format-attribute" >&5
+$as_echo_n "checking if $CC supports -Wmissing-format-attribute... " >&6; }
 		cacheid=xorg_cv_cc_flag__Wmissing_format_attribute
-		if eval test \${$cacheid+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+		if eval \${$cacheid+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 int
-main (void)
+main ()
 {
 
 ;
 return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 eval $cacheid=yes
-else $as_nop
+else
 eval $cacheid=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
 conftest$ac_exeext conftest.$ac_ext
 fi
 
@@ -15644,8 +14843,8 @@
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
 		eval supported=\$$cacheid
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5
-printf "%s\n" "$supported" >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5
+$as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
 			BASE_CFLAGS="$BASE_CFLAGS -Wmissing-format-attribute"
 			found="yes"
@@ -15670,26 +14869,24 @@
 
 if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then
 	CFLAGS="$CFLAGS -Werror=unknown-warning-option"
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5
-printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
-if test ${xorg_cv_cc_flag_unknown_warning_option+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5
+$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
+if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 xorg_cv_cc_flag_unknown_warning_option=yes
-else $as_nop
+else
 xorg_cv_cc_flag_unknown_warning_option=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
-printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
+$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
 	xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
@@ -15699,26 +14896,24 @@
 		CFLAGS="$CFLAGS -Werror=unknown-warning-option"
 	fi
 	CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5
-printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
-if test ${xorg_cv_cc_flag_unused_command_line_argument+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5
+$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
+if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 xorg_cv_cc_flag_unused_command_line_argument=yes
-else $as_nop
+else
 xorg_cv_cc_flag_unused_command_line_argument=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
-printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
+$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
 	xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
@@ -15736,31 +14931,29 @@
 
 		CFLAGS="$CFLAGS -Wredundant-decls"
 
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wredundant-decls" >&5
-printf %s "checking if $CC supports -Wredundant-decls... " >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wredundant-decls" >&5
+$as_echo_n "checking if $CC supports -Wredundant-decls... " >&6; }
 		cacheid=xorg_cv_cc_flag__Wredundant_decls
-		if eval test \${$cacheid+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+		if eval \${$cacheid+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 int
-main (void)
+main ()
 {
 
 ;
 return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 eval $cacheid=yes
-else $as_nop
+else
 eval $cacheid=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
 conftest$ac_exeext conftest.$ac_ext
 fi
 
@@ -15768,8 +14961,8 @@
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
 		eval supported=\$$cacheid
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5
-printf "%s\n" "$supported" >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5
+$as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
 			BASE_CFLAGS="$BASE_CFLAGS -Wredundant-decls"
 			found="yes"
@@ -15794,26 +14987,24 @@
 
 if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then
 	CFLAGS="$CFLAGS -Werror=unknown-warning-option"
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5
-printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
-if test ${xorg_cv_cc_flag_unknown_warning_option+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5
+$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
+if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 xorg_cv_cc_flag_unknown_warning_option=yes
-else $as_nop
+else
 xorg_cv_cc_flag_unknown_warning_option=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
-printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
+$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
 	xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
@@ -15823,26 +15014,24 @@
 		CFLAGS="$CFLAGS -Werror=unknown-warning-option"
 	fi
 	CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5
-printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
-if test ${xorg_cv_cc_flag_unused_command_line_argument+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5
+$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
+if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 xorg_cv_cc_flag_unused_command_line_argument=yes
-else $as_nop
+else
 xorg_cv_cc_flag_unused_command_line_argument=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
-printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
+$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
 	xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
@@ -15860,31 +15049,29 @@
 
 		CFLAGS="$CFLAGS -Wlogical-op"
 
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wlogical-op" >&5
-printf %s "checking if $CC supports -Wlogical-op... " >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wlogical-op" >&5
+$as_echo_n "checking if $CC supports -Wlogical-op... " >&6; }
 		cacheid=xorg_cv_cc_flag__Wlogical_op
-		if eval test \${$cacheid+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+		if eval \${$cacheid+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 int
-main (void)
+main ()
 {
 
 ;
 return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 eval $cacheid=yes
-else $as_nop
+else
 eval $cacheid=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
 conftest$ac_exeext conftest.$ac_ext
 fi
 
@@ -15892,8 +15079,8 @@
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
 		eval supported=\$$cacheid
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5
-printf "%s\n" "$supported" >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5
+$as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
 			BASE_CFLAGS="$BASE_CFLAGS -Wlogical-op"
 			found="yes"
@@ -15930,26 +15117,24 @@
 
 if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then
 	CFLAGS="$CFLAGS -Werror=unknown-warning-option"
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5
-printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
-if test ${xorg_cv_cc_flag_unknown_warning_option+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5
+$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
+if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 xorg_cv_cc_flag_unknown_warning_option=yes
-else $as_nop
+else
 xorg_cv_cc_flag_unknown_warning_option=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
-printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
+$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
 	xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
@@ -15959,26 +15144,24 @@
 		CFLAGS="$CFLAGS -Werror=unknown-warning-option"
 	fi
 	CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5
-printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
-if test ${xorg_cv_cc_flag_unused_command_line_argument+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5
+$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
+if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 xorg_cv_cc_flag_unused_command_line_argument=yes
-else $as_nop
+else
 xorg_cv_cc_flag_unused_command_line_argument=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
-printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
+$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
 	xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
@@ -15996,31 +15179,29 @@
 
 		CFLAGS="$CFLAGS -Werror=implicit"
 
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=implicit" >&5
-printf %s "checking if $CC supports -Werror=implicit... " >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=implicit" >&5
+$as_echo_n "checking if $CC supports -Werror=implicit... " >&6; }
 		cacheid=xorg_cv_cc_flag__Werror_implicit
-		if eval test \${$cacheid+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+		if eval \${$cacheid+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 int
-main (void)
+main ()
 {
 
 ;
 return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 eval $cacheid=yes
-else $as_nop
+else
 eval $cacheid=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
 conftest$ac_exeext conftest.$ac_ext
 fi
 
@@ -16028,8 +15209,8 @@
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
 		eval supported=\$$cacheid
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5
-printf "%s\n" "$supported" >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5
+$as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
 			BASE_CFLAGS="$BASE_CFLAGS -Werror=implicit"
 			found="yes"
@@ -16047,31 +15228,29 @@
 
 		CFLAGS="$CFLAGS -errwarn=E_NO_EXPLICIT_TYPE_GIVEN -errwarn=E_NO_IMPLICIT_DECL_ALLOWED"
 
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -errwarn=E_NO_EXPLICIT_TYPE_GIVEN -errwarn=E_NO_IMPLICIT_DECL_ALLOWED" >&5
-printf %s "checking if $CC supports -errwarn=E_NO_EXPLICIT_TYPE_GIVEN -errwarn=E_NO_IMPLICIT_DECL_ALLOWED... " >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -errwarn=E_NO_EXPLICIT_TYPE_GIVEN -errwarn=E_NO_IMPLICIT_DECL_ALLOWED" >&5
+$as_echo_n "checking if $CC supports -errwarn=E_NO_EXPLICIT_TYPE_GIVEN -errwarn=E_NO_IMPLICIT_DECL_ALLOWED... " >&6; }
 		cacheid=xorg_cv_cc_flag__errwarn_E_NO_EXPLICIT_TYPE_GIVEN__errwarn_E_NO_IMPLICIT_DECL_ALLOWED
-		if eval test \${$cacheid+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+		if eval \${$cacheid+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 int
-main (void)
+main ()
 {
 
 ;
 return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 eval $cacheid=yes
-else $as_nop
+else
 eval $cacheid=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
 conftest$ac_exeext conftest.$ac_ext
 fi
 
@@ -16079,8 +15258,8 @@
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
 		eval supported=\$$cacheid
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5
-printf "%s\n" "$supported" >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5
+$as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
 			BASE_CFLAGS="$BASE_CFLAGS -errwarn=E_NO_EXPLICIT_TYPE_GIVEN -errwarn=E_NO_IMPLICIT_DECL_ALLOWED"
 			found="yes"
@@ -16105,26 +15284,24 @@
 
 if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then
 	CFLAGS="$CFLAGS -Werror=unknown-warning-option"
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5
-printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
-if test ${xorg_cv_cc_flag_unknown_warning_option+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5
+$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
+if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 xorg_cv_cc_flag_unknown_warning_option=yes
-else $as_nop
+else
 xorg_cv_cc_flag_unknown_warning_option=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
-printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
+$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
 	xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
@@ -16134,26 +15311,24 @@
 		CFLAGS="$CFLAGS -Werror=unknown-warning-option"
 	fi
 	CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5
-printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
-if test ${xorg_cv_cc_flag_unused_command_line_argument+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5
+$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
+if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 xorg_cv_cc_flag_unused_command_line_argument=yes
-else $as_nop
+else
 xorg_cv_cc_flag_unused_command_line_argument=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
-printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
+$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
 	xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
@@ -16171,31 +15346,29 @@
 
 		CFLAGS="$CFLAGS -Werror=nonnull"
 
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=nonnull" >&5
-printf %s "checking if $CC supports -Werror=nonnull... " >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=nonnull" >&5
+$as_echo_n "checking if $CC supports -Werror=nonnull... " >&6; }
 		cacheid=xorg_cv_cc_flag__Werror_nonnull
-		if eval test \${$cacheid+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+		if eval \${$cacheid+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 int
-main (void)
+main ()
 {
 
 ;
 return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 eval $cacheid=yes
-else $as_nop
+else
 eval $cacheid=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
 conftest$ac_exeext conftest.$ac_ext
 fi
 
@@ -16203,8 +15376,8 @@
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
 		eval supported=\$$cacheid
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5
-printf "%s\n" "$supported" >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5
+$as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
 			BASE_CFLAGS="$BASE_CFLAGS -Werror=nonnull"
 			found="yes"
@@ -16229,26 +15402,24 @@
 
 if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then
 	CFLAGS="$CFLAGS -Werror=unknown-warning-option"
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5
-printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
-if test ${xorg_cv_cc_flag_unknown_warning_option+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5
+$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
+if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 xorg_cv_cc_flag_unknown_warning_option=yes
-else $as_nop
+else
 xorg_cv_cc_flag_unknown_warning_option=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
-printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
+$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
 	xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
@@ -16258,26 +15429,24 @@
 		CFLAGS="$CFLAGS -Werror=unknown-warning-option"
 	fi
 	CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5
-printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
-if test ${xorg_cv_cc_flag_unused_command_line_argument+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5
+$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
+if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 xorg_cv_cc_flag_unused_command_line_argument=yes
-else $as_nop
+else
 xorg_cv_cc_flag_unused_command_line_argument=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
-printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
+$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
 	xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
@@ -16295,31 +15464,29 @@
 
 		CFLAGS="$CFLAGS -Werror=init-self"
 
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=init-self" >&5
-printf %s "checking if $CC supports -Werror=init-self... " >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=init-self" >&5
+$as_echo_n "checking if $CC supports -Werror=init-self... " >&6; }
 		cacheid=xorg_cv_cc_flag__Werror_init_self
-		if eval test \${$cacheid+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+		if eval \${$cacheid+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 int
-main (void)
+main ()
 {
 
 ;
 return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 eval $cacheid=yes
-else $as_nop
+else
 eval $cacheid=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
 conftest$ac_exeext conftest.$ac_ext
 fi
 
@@ -16327,8 +15494,8 @@
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
 		eval supported=\$$cacheid
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5
-printf "%s\n" "$supported" >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5
+$as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
 			BASE_CFLAGS="$BASE_CFLAGS -Werror=init-self"
 			found="yes"
@@ -16353,26 +15520,24 @@
 
 if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then
 	CFLAGS="$CFLAGS -Werror=unknown-warning-option"
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5
-printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
-if test ${xorg_cv_cc_flag_unknown_warning_option+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5
+$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
+if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 xorg_cv_cc_flag_unknown_warning_option=yes
-else $as_nop
+else
 xorg_cv_cc_flag_unknown_warning_option=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
-printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
+$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
 	xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
@@ -16382,26 +15547,24 @@
 		CFLAGS="$CFLAGS -Werror=unknown-warning-option"
 	fi
 	CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5
-printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
-if test ${xorg_cv_cc_flag_unused_command_line_argument+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5
+$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
+if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 xorg_cv_cc_flag_unused_command_line_argument=yes
-else $as_nop
+else
 xorg_cv_cc_flag_unused_command_line_argument=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
-printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
+$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
 	xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
@@ -16419,31 +15582,29 @@
 
 		CFLAGS="$CFLAGS -Werror=main"
 
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=main" >&5
-printf %s "checking if $CC supports -Werror=main... " >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=main" >&5
+$as_echo_n "checking if $CC supports -Werror=main... " >&6; }
 		cacheid=xorg_cv_cc_flag__Werror_main
-		if eval test \${$cacheid+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+		if eval \${$cacheid+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 int
-main (void)
+main ()
 {
 
 ;
 return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 eval $cacheid=yes
-else $as_nop
+else
 eval $cacheid=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
 conftest$ac_exeext conftest.$ac_ext
 fi
 
@@ -16451,8 +15612,8 @@
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
 		eval supported=\$$cacheid
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5
-printf "%s\n" "$supported" >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5
+$as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
 			BASE_CFLAGS="$BASE_CFLAGS -Werror=main"
 			found="yes"
@@ -16477,26 +15638,24 @@
 
 if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then
 	CFLAGS="$CFLAGS -Werror=unknown-warning-option"
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5
-printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
-if test ${xorg_cv_cc_flag_unknown_warning_option+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5
+$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
+if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 xorg_cv_cc_flag_unknown_warning_option=yes
-else $as_nop
+else
 xorg_cv_cc_flag_unknown_warning_option=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
-printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
+$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
 	xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
@@ -16506,26 +15665,24 @@
 		CFLAGS="$CFLAGS -Werror=unknown-warning-option"
 	fi
 	CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5
-printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
-if test ${xorg_cv_cc_flag_unused_command_line_argument+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5
+$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
+if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 xorg_cv_cc_flag_unused_command_line_argument=yes
-else $as_nop
+else
 xorg_cv_cc_flag_unused_command_line_argument=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
-printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
+$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
 	xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
@@ -16543,31 +15700,29 @@
 
 		CFLAGS="$CFLAGS -Werror=missing-braces"
 
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=missing-braces" >&5
-printf %s "checking if $CC supports -Werror=missing-braces... " >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=missing-braces" >&5
+$as_echo_n "checking if $CC supports -Werror=missing-braces... " >&6; }
 		cacheid=xorg_cv_cc_flag__Werror_missing_braces
-		if eval test \${$cacheid+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+		if eval \${$cacheid+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 int
-main (void)
+main ()
 {
 
 ;
 return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 eval $cacheid=yes
-else $as_nop
+else
 eval $cacheid=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
 conftest$ac_exeext conftest.$ac_ext
 fi
 
@@ -16575,8 +15730,8 @@
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
 		eval supported=\$$cacheid
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5
-printf "%s\n" "$supported" >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5
+$as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
 			BASE_CFLAGS="$BASE_CFLAGS -Werror=missing-braces"
 			found="yes"
@@ -16601,26 +15756,24 @@
 
 if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then
 	CFLAGS="$CFLAGS -Werror=unknown-warning-option"
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5
-printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
-if test ${xorg_cv_cc_flag_unknown_warning_option+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5
+$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
+if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 xorg_cv_cc_flag_unknown_warning_option=yes
-else $as_nop
+else
 xorg_cv_cc_flag_unknown_warning_option=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
-printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
+$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
 	xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
@@ -16630,26 +15783,24 @@
 		CFLAGS="$CFLAGS -Werror=unknown-warning-option"
 	fi
 	CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5
-printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
-if test ${xorg_cv_cc_flag_unused_command_line_argument+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5
+$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
+if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 xorg_cv_cc_flag_unused_command_line_argument=yes
-else $as_nop
+else
 xorg_cv_cc_flag_unused_command_line_argument=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
-printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
+$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
 	xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
@@ -16667,31 +15818,29 @@
 
 		CFLAGS="$CFLAGS -Werror=sequence-point"
 
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=sequence-point" >&5
-printf %s "checking if $CC supports -Werror=sequence-point... " >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=sequence-point" >&5
+$as_echo_n "checking if $CC supports -Werror=sequence-point... " >&6; }
 		cacheid=xorg_cv_cc_flag__Werror_sequence_point
-		if eval test \${$cacheid+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+		if eval \${$cacheid+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 int
-main (void)
+main ()
 {
 
 ;
 return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 eval $cacheid=yes
-else $as_nop
+else
 eval $cacheid=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
 conftest$ac_exeext conftest.$ac_ext
 fi
 
@@ -16699,8 +15848,8 @@
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
 		eval supported=\$$cacheid
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5
-printf "%s\n" "$supported" >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5
+$as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
 			BASE_CFLAGS="$BASE_CFLAGS -Werror=sequence-point"
 			found="yes"
@@ -16725,26 +15874,24 @@
 
 if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then
 	CFLAGS="$CFLAGS -Werror=unknown-warning-option"
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5
-printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
-if test ${xorg_cv_cc_flag_unknown_warning_option+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5
+$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
+if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 xorg_cv_cc_flag_unknown_warning_option=yes
-else $as_nop
+else
 xorg_cv_cc_flag_unknown_warning_option=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
-printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
+$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
 	xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
@@ -16754,26 +15901,24 @@
 		CFLAGS="$CFLAGS -Werror=unknown-warning-option"
 	fi
 	CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5
-printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
-if test ${xorg_cv_cc_flag_unused_command_line_argument+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5
+$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
+if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 xorg_cv_cc_flag_unused_command_line_argument=yes
-else $as_nop
+else
 xorg_cv_cc_flag_unused_command_line_argument=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
-printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
+$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
 	xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
@@ -16791,31 +15936,29 @@
 
 		CFLAGS="$CFLAGS -Werror=return-type"
 
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=return-type" >&5
-printf %s "checking if $CC supports -Werror=return-type... " >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=return-type" >&5
+$as_echo_n "checking if $CC supports -Werror=return-type... " >&6; }
 		cacheid=xorg_cv_cc_flag__Werror_return_type
-		if eval test \${$cacheid+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+		if eval \${$cacheid+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 int
-main (void)
+main ()
 {
 
 ;
 return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 eval $cacheid=yes
-else $as_nop
+else
 eval $cacheid=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
 conftest$ac_exeext conftest.$ac_ext
 fi
 
@@ -16823,8 +15966,8 @@
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
 		eval supported=\$$cacheid
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5
-printf "%s\n" "$supported" >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5
+$as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
 			BASE_CFLAGS="$BASE_CFLAGS -Werror=return-type"
 			found="yes"
@@ -16842,31 +15985,29 @@
 
 		CFLAGS="$CFLAGS -errwarn=E_FUNC_HAS_NO_RETURN_STMT"
 
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -errwarn=E_FUNC_HAS_NO_RETURN_STMT" >&5
-printf %s "checking if $CC supports -errwarn=E_FUNC_HAS_NO_RETURN_STMT... " >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -errwarn=E_FUNC_HAS_NO_RETURN_STMT" >&5
+$as_echo_n "checking if $CC supports -errwarn=E_FUNC_HAS_NO_RETURN_STMT... " >&6; }
 		cacheid=xorg_cv_cc_flag__errwarn_E_FUNC_HAS_NO_RETURN_STMT
-		if eval test \${$cacheid+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+		if eval \${$cacheid+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 int
-main (void)
+main ()
 {
 
 ;
 return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 eval $cacheid=yes
-else $as_nop
+else
 eval $cacheid=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
 conftest$ac_exeext conftest.$ac_ext
 fi
 
@@ -16874,8 +16015,8 @@
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
 		eval supported=\$$cacheid
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5
-printf "%s\n" "$supported" >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5
+$as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
 			BASE_CFLAGS="$BASE_CFLAGS -errwarn=E_FUNC_HAS_NO_RETURN_STMT"
 			found="yes"
@@ -16900,26 +16041,24 @@
 
 if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then
 	CFLAGS="$CFLAGS -Werror=unknown-warning-option"
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5
-printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
-if test ${xorg_cv_cc_flag_unknown_warning_option+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5
+$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
+if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 xorg_cv_cc_flag_unknown_warning_option=yes
-else $as_nop
+else
 xorg_cv_cc_flag_unknown_warning_option=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
-printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
+$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
 	xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
@@ -16929,26 +16068,24 @@
 		CFLAGS="$CFLAGS -Werror=unknown-warning-option"
 	fi
 	CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5
-printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
-if test ${xorg_cv_cc_flag_unused_command_line_argument+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5
+$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
+if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 xorg_cv_cc_flag_unused_command_line_argument=yes
-else $as_nop
+else
 xorg_cv_cc_flag_unused_command_line_argument=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
-printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
+$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
 	xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
@@ -16966,31 +16103,29 @@
 
 		CFLAGS="$CFLAGS -Werror=trigraphs"
 
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=trigraphs" >&5
-printf %s "checking if $CC supports -Werror=trigraphs... " >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=trigraphs" >&5
+$as_echo_n "checking if $CC supports -Werror=trigraphs... " >&6; }
 		cacheid=xorg_cv_cc_flag__Werror_trigraphs
-		if eval test \${$cacheid+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+		if eval \${$cacheid+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 int
-main (void)
+main ()
 {
 
 ;
 return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 eval $cacheid=yes
-else $as_nop
+else
 eval $cacheid=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
 conftest$ac_exeext conftest.$ac_ext
 fi
 
@@ -16998,8 +16133,8 @@
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
 		eval supported=\$$cacheid
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5
-printf "%s\n" "$supported" >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5
+$as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
 			BASE_CFLAGS="$BASE_CFLAGS -Werror=trigraphs"
 			found="yes"
@@ -17024,26 +16159,24 @@
 
 if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then
 	CFLAGS="$CFLAGS -Werror=unknown-warning-option"
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5
-printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
-if test ${xorg_cv_cc_flag_unknown_warning_option+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5
+$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
+if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 xorg_cv_cc_flag_unknown_warning_option=yes
-else $as_nop
+else
 xorg_cv_cc_flag_unknown_warning_option=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
-printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
+$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
 	xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
@@ -17053,26 +16186,24 @@
 		CFLAGS="$CFLAGS -Werror=unknown-warning-option"
 	fi
 	CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5
-printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
-if test ${xorg_cv_cc_flag_unused_command_line_argument+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5
+$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
+if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 xorg_cv_cc_flag_unused_command_line_argument=yes
-else $as_nop
+else
 xorg_cv_cc_flag_unused_command_line_argument=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
-printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
+$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
 	xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
@@ -17090,31 +16221,29 @@
 
 		CFLAGS="$CFLAGS -Werror=array-bounds"
 
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=array-bounds" >&5
-printf %s "checking if $CC supports -Werror=array-bounds... " >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=array-bounds" >&5
+$as_echo_n "checking if $CC supports -Werror=array-bounds... " >&6; }
 		cacheid=xorg_cv_cc_flag__Werror_array_bounds
-		if eval test \${$cacheid+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+		if eval \${$cacheid+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 int
-main (void)
+main ()
 {
 
 ;
 return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 eval $cacheid=yes
-else $as_nop
+else
 eval $cacheid=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
 conftest$ac_exeext conftest.$ac_ext
 fi
 
@@ -17122,8 +16251,8 @@
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
 		eval supported=\$$cacheid
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5
-printf "%s\n" "$supported" >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5
+$as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
 			BASE_CFLAGS="$BASE_CFLAGS -Werror=array-bounds"
 			found="yes"
@@ -17148,26 +16277,24 @@
 
 if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then
 	CFLAGS="$CFLAGS -Werror=unknown-warning-option"
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5
-printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
-if test ${xorg_cv_cc_flag_unknown_warning_option+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5
+$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
+if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 xorg_cv_cc_flag_unknown_warning_option=yes
-else $as_nop
+else
 xorg_cv_cc_flag_unknown_warning_option=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
-printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
+$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
 	xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
@@ -17177,26 +16304,24 @@
 		CFLAGS="$CFLAGS -Werror=unknown-warning-option"
 	fi
 	CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5
-printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
-if test ${xorg_cv_cc_flag_unused_command_line_argument+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5
+$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
+if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 xorg_cv_cc_flag_unused_command_line_argument=yes
-else $as_nop
+else
 xorg_cv_cc_flag_unused_command_line_argument=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
-printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
+$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
 	xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
@@ -17214,31 +16339,29 @@
 
 		CFLAGS="$CFLAGS -Werror=write-strings"
 
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=write-strings" >&5
-printf %s "checking if $CC supports -Werror=write-strings... " >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=write-strings" >&5
+$as_echo_n "checking if $CC supports -Werror=write-strings... " >&6; }
 		cacheid=xorg_cv_cc_flag__Werror_write_strings
-		if eval test \${$cacheid+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+		if eval \${$cacheid+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 int
-main (void)
+main ()
 {
 
 ;
 return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 eval $cacheid=yes
-else $as_nop
+else
 eval $cacheid=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
 conftest$ac_exeext conftest.$ac_ext
 fi
 
@@ -17246,8 +16369,8 @@
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
 		eval supported=\$$cacheid
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5
-printf "%s\n" "$supported" >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5
+$as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
 			BASE_CFLAGS="$BASE_CFLAGS -Werror=write-strings"
 			found="yes"
@@ -17272,26 +16395,24 @@
 
 if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then
 	CFLAGS="$CFLAGS -Werror=unknown-warning-option"
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5
-printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
-if test ${xorg_cv_cc_flag_unknown_warning_option+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5
+$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
+if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 xorg_cv_cc_flag_unknown_warning_option=yes
-else $as_nop
+else
 xorg_cv_cc_flag_unknown_warning_option=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
-printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
+$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
 	xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
@@ -17301,26 +16422,24 @@
 		CFLAGS="$CFLAGS -Werror=unknown-warning-option"
 	fi
 	CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5
-printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
-if test ${xorg_cv_cc_flag_unused_command_line_argument+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5
+$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
+if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 xorg_cv_cc_flag_unused_command_line_argument=yes
-else $as_nop
+else
 xorg_cv_cc_flag_unused_command_line_argument=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
-printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
+$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
 	xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
@@ -17338,31 +16457,29 @@
 
 		CFLAGS="$CFLAGS -Werror=address"
 
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=address" >&5
-printf %s "checking if $CC supports -Werror=address... " >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=address" >&5
+$as_echo_n "checking if $CC supports -Werror=address... " >&6; }
 		cacheid=xorg_cv_cc_flag__Werror_address
-		if eval test \${$cacheid+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+		if eval \${$cacheid+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 int
-main (void)
+main ()
 {
 
 ;
 return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 eval $cacheid=yes
-else $as_nop
+else
 eval $cacheid=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
 conftest$ac_exeext conftest.$ac_ext
 fi
 
@@ -17370,8 +16487,8 @@
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
 		eval supported=\$$cacheid
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5
-printf "%s\n" "$supported" >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5
+$as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
 			BASE_CFLAGS="$BASE_CFLAGS -Werror=address"
 			found="yes"
@@ -17396,26 +16513,24 @@
 
 if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then
 	CFLAGS="$CFLAGS -Werror=unknown-warning-option"
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5
-printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
-if test ${xorg_cv_cc_flag_unknown_warning_option+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5
+$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
+if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 xorg_cv_cc_flag_unknown_warning_option=yes
-else $as_nop
+else
 xorg_cv_cc_flag_unknown_warning_option=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
-printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
+$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
 	xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
@@ -17425,26 +16540,24 @@
 		CFLAGS="$CFLAGS -Werror=unknown-warning-option"
 	fi
 	CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5
-printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
-if test ${xorg_cv_cc_flag_unused_command_line_argument+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5
+$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
+if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 xorg_cv_cc_flag_unused_command_line_argument=yes
-else $as_nop
+else
 xorg_cv_cc_flag_unused_command_line_argument=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
-printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
+$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
 	xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
@@ -17462,31 +16575,29 @@
 
 		CFLAGS="$CFLAGS -Werror=int-to-pointer-cast"
 
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=int-to-pointer-cast" >&5
-printf %s "checking if $CC supports -Werror=int-to-pointer-cast... " >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=int-to-pointer-cast" >&5
+$as_echo_n "checking if $CC supports -Werror=int-to-pointer-cast... " >&6; }
 		cacheid=xorg_cv_cc_flag__Werror_int_to_pointer_cast
-		if eval test \${$cacheid+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+		if eval \${$cacheid+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 int
-main (void)
+main ()
 {
 
 ;
 return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 eval $cacheid=yes
-else $as_nop
+else
 eval $cacheid=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
 conftest$ac_exeext conftest.$ac_ext
 fi
 
@@ -17494,8 +16605,8 @@
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
 		eval supported=\$$cacheid
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5
-printf "%s\n" "$supported" >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5
+$as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
 			BASE_CFLAGS="$BASE_CFLAGS -Werror=int-to-pointer-cast"
 			found="yes"
@@ -17513,31 +16624,29 @@
 
 		CFLAGS="$CFLAGS -errwarn=E_BAD_PTR_INT_COMBINATION"
 
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -errwarn=E_BAD_PTR_INT_COMBINATION" >&5
-printf %s "checking if $CC supports -errwarn=E_BAD_PTR_INT_COMBINATION... " >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -errwarn=E_BAD_PTR_INT_COMBINATION" >&5
+$as_echo_n "checking if $CC supports -errwarn=E_BAD_PTR_INT_COMBINATION... " >&6; }
 		cacheid=xorg_cv_cc_flag__errwarn_E_BAD_PTR_INT_COMBINATION
-		if eval test \${$cacheid+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+		if eval \${$cacheid+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 int
-main (void)
+main ()
 {
 
 ;
 return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 eval $cacheid=yes
-else $as_nop
+else
 eval $cacheid=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
 conftest$ac_exeext conftest.$ac_ext
 fi
 
@@ -17545,8 +16654,8 @@
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
 		eval supported=\$$cacheid
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5
-printf "%s\n" "$supported" >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5
+$as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
 			BASE_CFLAGS="$BASE_CFLAGS -errwarn=E_BAD_PTR_INT_COMBINATION"
 			found="yes"
@@ -17571,26 +16680,24 @@
 
 if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then
 	CFLAGS="$CFLAGS -Werror=unknown-warning-option"
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5
-printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
-if test ${xorg_cv_cc_flag_unknown_warning_option+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5
+$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
+if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 xorg_cv_cc_flag_unknown_warning_option=yes
-else $as_nop
+else
 xorg_cv_cc_flag_unknown_warning_option=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
-printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
+$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
 	xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
@@ -17600,26 +16707,24 @@
 		CFLAGS="$CFLAGS -Werror=unknown-warning-option"
 	fi
 	CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5
-printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
-if test ${xorg_cv_cc_flag_unused_command_line_argument+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5
+$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
+if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 xorg_cv_cc_flag_unused_command_line_argument=yes
-else $as_nop
+else
 xorg_cv_cc_flag_unused_command_line_argument=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
-printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
+$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
 	xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
@@ -17637,31 +16742,29 @@
 
 		CFLAGS="$CFLAGS -Werror=pointer-to-int-cast"
 
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=pointer-to-int-cast" >&5
-printf %s "checking if $CC supports -Werror=pointer-to-int-cast... " >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=pointer-to-int-cast" >&5
+$as_echo_n "checking if $CC supports -Werror=pointer-to-int-cast... " >&6; }
 		cacheid=xorg_cv_cc_flag__Werror_pointer_to_int_cast
-		if eval test \${$cacheid+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+		if eval \${$cacheid+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 int
-main (void)
+main ()
 {
 
 ;
 return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 eval $cacheid=yes
-else $as_nop
+else
 eval $cacheid=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
 conftest$ac_exeext conftest.$ac_ext
 fi
 
@@ -17669,8 +16772,8 @@
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
 		eval supported=\$$cacheid
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5
-printf "%s\n" "$supported" >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5
+$as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
 			BASE_CFLAGS="$BASE_CFLAGS -Werror=pointer-to-int-cast"
 			found="yes"
@@ -17679,8 +16782,8 @@
 
 # Also -errwarn=E_BAD_PTR_INT_COMBINATION
 else
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: You have chosen not to turn some select compiler warnings into errors. This should not be necessary. Please report why you needed to do so in a bug report at $PACKAGE_BUGREPORT" >&5
-printf "%s\n" "$as_me: WARNING: You have chosen not to turn some select compiler warnings into errors. This should not be necessary. Please report why you needed to do so in a bug report at $PACKAGE_BUGREPORT" >&2;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: You have chosen not to turn some select compiler warnings into errors. This should not be necessary. Please report why you needed to do so in a bug report at $PACKAGE_BUGREPORT" >&5
+$as_echo "$as_me: WARNING: You have chosen not to turn some select compiler warnings into errors. This should not be necessary. Please report why you needed to do so in a bug report at $PACKAGE_BUGREPORT" >&2;}
 
 
 
@@ -17698,26 +16801,24 @@
 
 if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then
 	CFLAGS="$CFLAGS -Werror=unknown-warning-option"
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5
-printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
-if test ${xorg_cv_cc_flag_unknown_warning_option+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5
+$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
+if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 xorg_cv_cc_flag_unknown_warning_option=yes
-else $as_nop
+else
 xorg_cv_cc_flag_unknown_warning_option=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
-printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
+$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
 	xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
@@ -17727,26 +16828,24 @@
 		CFLAGS="$CFLAGS -Werror=unknown-warning-option"
 	fi
 	CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5
-printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
-if test ${xorg_cv_cc_flag_unused_command_line_argument+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5
+$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
+if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 xorg_cv_cc_flag_unused_command_line_argument=yes
-else $as_nop
+else
 xorg_cv_cc_flag_unused_command_line_argument=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
-printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
+$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
 	xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
@@ -17764,31 +16863,29 @@
 
 		CFLAGS="$CFLAGS -Wimplicit"
 
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wimplicit" >&5
-printf %s "checking if $CC supports -Wimplicit... " >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wimplicit" >&5
+$as_echo_n "checking if $CC supports -Wimplicit... " >&6; }
 		cacheid=xorg_cv_cc_flag__Wimplicit
-		if eval test \${$cacheid+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+		if eval \${$cacheid+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 int
-main (void)
+main ()
 {
 
 ;
 return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 eval $cacheid=yes
-else $as_nop
+else
 eval $cacheid=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
 conftest$ac_exeext conftest.$ac_ext
 fi
 
@@ -17796,8 +16893,8 @@
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
 		eval supported=\$$cacheid
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5
-printf "%s\n" "$supported" >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5
+$as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
 			BASE_CFLAGS="$BASE_CFLAGS -Wimplicit"
 			found="yes"
@@ -17822,26 +16919,24 @@
 
 if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then
 	CFLAGS="$CFLAGS -Werror=unknown-warning-option"
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5
-printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
-if test ${xorg_cv_cc_flag_unknown_warning_option+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5
+$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
+if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 xorg_cv_cc_flag_unknown_warning_option=yes
-else $as_nop
+else
 xorg_cv_cc_flag_unknown_warning_option=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
-printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
+$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
 	xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
@@ -17851,26 +16946,24 @@
 		CFLAGS="$CFLAGS -Werror=unknown-warning-option"
 	fi
 	CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5
-printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
-if test ${xorg_cv_cc_flag_unused_command_line_argument+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5
+$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
+if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 xorg_cv_cc_flag_unused_command_line_argument=yes
-else $as_nop
+else
 xorg_cv_cc_flag_unused_command_line_argument=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
-printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
+$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
 	xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
@@ -17888,31 +16981,29 @@
 
 		CFLAGS="$CFLAGS -Wnonnull"
 
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wnonnull" >&5
-printf %s "checking if $CC supports -Wnonnull... " >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wnonnull" >&5
+$as_echo_n "checking if $CC supports -Wnonnull... " >&6; }
 		cacheid=xorg_cv_cc_flag__Wnonnull
-		if eval test \${$cacheid+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+		if eval \${$cacheid+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 int
-main (void)
+main ()
 {
 
 ;
 return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 eval $cacheid=yes
-else $as_nop
+else
 eval $cacheid=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
 conftest$ac_exeext conftest.$ac_ext
 fi
 
@@ -17920,8 +17011,8 @@
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
 		eval supported=\$$cacheid
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5
-printf "%s\n" "$supported" >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5
+$as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
 			BASE_CFLAGS="$BASE_CFLAGS -Wnonnull"
 			found="yes"
@@ -17946,26 +17037,24 @@
 
 if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then
 	CFLAGS="$CFLAGS -Werror=unknown-warning-option"
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5
-printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
-if test ${xorg_cv_cc_flag_unknown_warning_option+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5
+$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
+if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 xorg_cv_cc_flag_unknown_warning_option=yes
-else $as_nop
+else
 xorg_cv_cc_flag_unknown_warning_option=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
-printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
+$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
 	xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
@@ -17975,26 +17064,24 @@
 		CFLAGS="$CFLAGS -Werror=unknown-warning-option"
 	fi
 	CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5
-printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
-if test ${xorg_cv_cc_flag_unused_command_line_argument+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5
+$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
+if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 xorg_cv_cc_flag_unused_command_line_argument=yes
-else $as_nop
+else
 xorg_cv_cc_flag_unused_command_line_argument=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
-printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
+$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
 	xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
@@ -18012,31 +17099,29 @@
 
 		CFLAGS="$CFLAGS -Winit-self"
 
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Winit-self" >&5
-printf %s "checking if $CC supports -Winit-self... " >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Winit-self" >&5
+$as_echo_n "checking if $CC supports -Winit-self... " >&6; }
 		cacheid=xorg_cv_cc_flag__Winit_self
-		if eval test \${$cacheid+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+		if eval \${$cacheid+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 int
-main (void)
+main ()
 {
 
 ;
 return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 eval $cacheid=yes
-else $as_nop
+else
 eval $cacheid=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
 conftest$ac_exeext conftest.$ac_ext
 fi
 
@@ -18044,8 +17129,8 @@
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
 		eval supported=\$$cacheid
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5
-printf "%s\n" "$supported" >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5
+$as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
 			BASE_CFLAGS="$BASE_CFLAGS -Winit-self"
 			found="yes"
@@ -18070,26 +17155,24 @@
 
 if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then
 	CFLAGS="$CFLAGS -Werror=unknown-warning-option"
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5
-printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
-if test ${xorg_cv_cc_flag_unknown_warning_option+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5
+$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
+if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 xorg_cv_cc_flag_unknown_warning_option=yes
-else $as_nop
+else
 xorg_cv_cc_flag_unknown_warning_option=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
-printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
+$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
 	xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
@@ -18099,26 +17182,24 @@
 		CFLAGS="$CFLAGS -Werror=unknown-warning-option"
 	fi
 	CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5
-printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
-if test ${xorg_cv_cc_flag_unused_command_line_argument+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5
+$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
+if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 xorg_cv_cc_flag_unused_command_line_argument=yes
-else $as_nop
+else
 xorg_cv_cc_flag_unused_command_line_argument=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
-printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
+$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
 	xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
@@ -18136,31 +17217,29 @@
 
 		CFLAGS="$CFLAGS -Wmain"
 
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wmain" >&5
-printf %s "checking if $CC supports -Wmain... " >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wmain" >&5
+$as_echo_n "checking if $CC supports -Wmain... " >&6; }
 		cacheid=xorg_cv_cc_flag__Wmain
-		if eval test \${$cacheid+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+		if eval \${$cacheid+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 int
-main (void)
+main ()
 {
 
 ;
 return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 eval $cacheid=yes
-else $as_nop
+else
 eval $cacheid=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
 conftest$ac_exeext conftest.$ac_ext
 fi
 
@@ -18168,8 +17247,8 @@
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
 		eval supported=\$$cacheid
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5
-printf "%s\n" "$supported" >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5
+$as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
 			BASE_CFLAGS="$BASE_CFLAGS -Wmain"
 			found="yes"
@@ -18194,26 +17273,24 @@
 
 if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then
 	CFLAGS="$CFLAGS -Werror=unknown-warning-option"
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5
-printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
-if test ${xorg_cv_cc_flag_unknown_warning_option+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5
+$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
+if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 xorg_cv_cc_flag_unknown_warning_option=yes
-else $as_nop
+else
 xorg_cv_cc_flag_unknown_warning_option=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
-printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
+$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
 	xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
@@ -18223,26 +17300,24 @@
 		CFLAGS="$CFLAGS -Werror=unknown-warning-option"
 	fi
 	CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5
-printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
-if test ${xorg_cv_cc_flag_unused_command_line_argument+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5
+$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
+if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 xorg_cv_cc_flag_unused_command_line_argument=yes
-else $as_nop
+else
 xorg_cv_cc_flag_unused_command_line_argument=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
-printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
+$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
 	xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
@@ -18260,31 +17335,29 @@
 
 		CFLAGS="$CFLAGS -Wmissing-braces"
 
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wmissing-braces" >&5
-printf %s "checking if $CC supports -Wmissing-braces... " >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wmissing-braces" >&5
+$as_echo_n "checking if $CC supports -Wmissing-braces... " >&6; }
 		cacheid=xorg_cv_cc_flag__Wmissing_braces
-		if eval test \${$cacheid+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+		if eval \${$cacheid+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 int
-main (void)
+main ()
 {
 
 ;
 return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 eval $cacheid=yes
-else $as_nop
+else
 eval $cacheid=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
 conftest$ac_exeext conftest.$ac_ext
 fi
 
@@ -18292,8 +17365,8 @@
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
 		eval supported=\$$cacheid
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5
-printf "%s\n" "$supported" >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5
+$as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
 			BASE_CFLAGS="$BASE_CFLAGS -Wmissing-braces"
 			found="yes"
@@ -18318,26 +17391,24 @@
 
 if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then
 	CFLAGS="$CFLAGS -Werror=unknown-warning-option"
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5
-printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
-if test ${xorg_cv_cc_flag_unknown_warning_option+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5
+$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
+if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 xorg_cv_cc_flag_unknown_warning_option=yes
-else $as_nop
+else
 xorg_cv_cc_flag_unknown_warning_option=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
-printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
+$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
 	xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
@@ -18347,26 +17418,24 @@
 		CFLAGS="$CFLAGS -Werror=unknown-warning-option"
 	fi
 	CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5
-printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
-if test ${xorg_cv_cc_flag_unused_command_line_argument+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5
+$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
+if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 xorg_cv_cc_flag_unused_command_line_argument=yes
-else $as_nop
+else
 xorg_cv_cc_flag_unused_command_line_argument=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
-printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
+$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
 	xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
@@ -18384,31 +17453,29 @@
 
 		CFLAGS="$CFLAGS -Wsequence-point"
 
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wsequence-point" >&5
-printf %s "checking if $CC supports -Wsequence-point... " >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wsequence-point" >&5
+$as_echo_n "checking if $CC supports -Wsequence-point... " >&6; }
 		cacheid=xorg_cv_cc_flag__Wsequence_point
-		if eval test \${$cacheid+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+		if eval \${$cacheid+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 int
-main (void)
+main ()
 {
 
 ;
 return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 eval $cacheid=yes
-else $as_nop
+else
 eval $cacheid=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
 conftest$ac_exeext conftest.$ac_ext
 fi
 
@@ -18416,8 +17483,8 @@
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
 		eval supported=\$$cacheid
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5
-printf "%s\n" "$supported" >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5
+$as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
 			BASE_CFLAGS="$BASE_CFLAGS -Wsequence-point"
 			found="yes"
@@ -18442,26 +17509,24 @@
 
 if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then
 	CFLAGS="$CFLAGS -Werror=unknown-warning-option"
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5
-printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
-if test ${xorg_cv_cc_flag_unknown_warning_option+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5
+$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
+if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 xorg_cv_cc_flag_unknown_warning_option=yes
-else $as_nop
+else
 xorg_cv_cc_flag_unknown_warning_option=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
-printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
+$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
 	xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
@@ -18471,26 +17536,24 @@
 		CFLAGS="$CFLAGS -Werror=unknown-warning-option"
 	fi
 	CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5
-printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
-if test ${xorg_cv_cc_flag_unused_command_line_argument+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5
+$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
+if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 xorg_cv_cc_flag_unused_command_line_argument=yes
-else $as_nop
+else
 xorg_cv_cc_flag_unused_command_line_argument=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
-printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
+$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
 	xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
@@ -18508,31 +17571,29 @@
 
 		CFLAGS="$CFLAGS -Wreturn-type"
 
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wreturn-type" >&5
-printf %s "checking if $CC supports -Wreturn-type... " >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wreturn-type" >&5
+$as_echo_n "checking if $CC supports -Wreturn-type... " >&6; }
 		cacheid=xorg_cv_cc_flag__Wreturn_type
-		if eval test \${$cacheid+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+		if eval \${$cacheid+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 int
-main (void)
+main ()
 {
 
 ;
 return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 eval $cacheid=yes
-else $as_nop
+else
 eval $cacheid=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
 conftest$ac_exeext conftest.$ac_ext
 fi
 
@@ -18540,8 +17601,8 @@
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
 		eval supported=\$$cacheid
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5
-printf "%s\n" "$supported" >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5
+$as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
 			BASE_CFLAGS="$BASE_CFLAGS -Wreturn-type"
 			found="yes"
@@ -18566,26 +17627,24 @@
 
 if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then
 	CFLAGS="$CFLAGS -Werror=unknown-warning-option"
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5
-printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
-if test ${xorg_cv_cc_flag_unknown_warning_option+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5
+$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
+if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 xorg_cv_cc_flag_unknown_warning_option=yes
-else $as_nop
+else
 xorg_cv_cc_flag_unknown_warning_option=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
-printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
+$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
 	xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
@@ -18595,26 +17654,24 @@
 		CFLAGS="$CFLAGS -Werror=unknown-warning-option"
 	fi
 	CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5
-printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
-if test ${xorg_cv_cc_flag_unused_command_line_argument+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5
+$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
+if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 xorg_cv_cc_flag_unused_command_line_argument=yes
-else $as_nop
+else
 xorg_cv_cc_flag_unused_command_line_argument=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
-printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
+$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
 	xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
@@ -18632,31 +17689,29 @@
 
 		CFLAGS="$CFLAGS -Wtrigraphs"
 
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wtrigraphs" >&5
-printf %s "checking if $CC supports -Wtrigraphs... " >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wtrigraphs" >&5
+$as_echo_n "checking if $CC supports -Wtrigraphs... " >&6; }
 		cacheid=xorg_cv_cc_flag__Wtrigraphs
-		if eval test \${$cacheid+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+		if eval \${$cacheid+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 int
-main (void)
+main ()
 {
 
 ;
 return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 eval $cacheid=yes
-else $as_nop
+else
 eval $cacheid=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
 conftest$ac_exeext conftest.$ac_ext
 fi
 
@@ -18664,8 +17719,8 @@
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
 		eval supported=\$$cacheid
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5
-printf "%s\n" "$supported" >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5
+$as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
 			BASE_CFLAGS="$BASE_CFLAGS -Wtrigraphs"
 			found="yes"
@@ -18690,26 +17745,24 @@
 
 if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then
 	CFLAGS="$CFLAGS -Werror=unknown-warning-option"
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5
-printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
-if test ${xorg_cv_cc_flag_unknown_warning_option+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5
+$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
+if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 xorg_cv_cc_flag_unknown_warning_option=yes
-else $as_nop
+else
 xorg_cv_cc_flag_unknown_warning_option=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
-printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
+$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
 	xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
@@ -18719,26 +17772,24 @@
 		CFLAGS="$CFLAGS -Werror=unknown-warning-option"
 	fi
 	CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5
-printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
-if test ${xorg_cv_cc_flag_unused_command_line_argument+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5
+$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
+if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 xorg_cv_cc_flag_unused_command_line_argument=yes
-else $as_nop
+else
 xorg_cv_cc_flag_unused_command_line_argument=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
-printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
+$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
 	xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
@@ -18756,31 +17807,29 @@
 
 		CFLAGS="$CFLAGS -Warray-bounds"
 
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Warray-bounds" >&5
-printf %s "checking if $CC supports -Warray-bounds... " >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Warray-bounds" >&5
+$as_echo_n "checking if $CC supports -Warray-bounds... " >&6; }
 		cacheid=xorg_cv_cc_flag__Warray_bounds
-		if eval test \${$cacheid+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+		if eval \${$cacheid+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 int
-main (void)
+main ()
 {
 
 ;
 return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 eval $cacheid=yes
-else $as_nop
+else
 eval $cacheid=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
 conftest$ac_exeext conftest.$ac_ext
 fi
 
@@ -18788,8 +17837,8 @@
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
 		eval supported=\$$cacheid
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5
-printf "%s\n" "$supported" >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5
+$as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
 			BASE_CFLAGS="$BASE_CFLAGS -Warray-bounds"
 			found="yes"
@@ -18814,26 +17863,24 @@
 
 if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then
 	CFLAGS="$CFLAGS -Werror=unknown-warning-option"
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5
-printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
-if test ${xorg_cv_cc_flag_unknown_warning_option+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5
+$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
+if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 xorg_cv_cc_flag_unknown_warning_option=yes
-else $as_nop
+else
 xorg_cv_cc_flag_unknown_warning_option=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
-printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
+$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
 	xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
@@ -18843,26 +17890,24 @@
 		CFLAGS="$CFLAGS -Werror=unknown-warning-option"
 	fi
 	CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5
-printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
-if test ${xorg_cv_cc_flag_unused_command_line_argument+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5
+$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
+if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 xorg_cv_cc_flag_unused_command_line_argument=yes
-else $as_nop
+else
 xorg_cv_cc_flag_unused_command_line_argument=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
-printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
+$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
 	xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
@@ -18880,31 +17925,29 @@
 
 		CFLAGS="$CFLAGS -Wwrite-strings"
 
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wwrite-strings" >&5
-printf %s "checking if $CC supports -Wwrite-strings... " >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wwrite-strings" >&5
+$as_echo_n "checking if $CC supports -Wwrite-strings... " >&6; }
 		cacheid=xorg_cv_cc_flag__Wwrite_strings
-		if eval test \${$cacheid+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+		if eval \${$cacheid+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 int
-main (void)
+main ()
 {
 
 ;
 return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 eval $cacheid=yes
-else $as_nop
+else
 eval $cacheid=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
 conftest$ac_exeext conftest.$ac_ext
 fi
 
@@ -18912,8 +17955,8 @@
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
 		eval supported=\$$cacheid
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5
-printf "%s\n" "$supported" >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5
+$as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
 			BASE_CFLAGS="$BASE_CFLAGS -Wwrite-strings"
 			found="yes"
@@ -18938,26 +17981,24 @@
 
 if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then
 	CFLAGS="$CFLAGS -Werror=unknown-warning-option"
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5
-printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
-if test ${xorg_cv_cc_flag_unknown_warning_option+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5
+$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
+if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 xorg_cv_cc_flag_unknown_warning_option=yes
-else $as_nop
+else
 xorg_cv_cc_flag_unknown_warning_option=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
-printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
+$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
 	xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
@@ -18967,26 +18008,24 @@
 		CFLAGS="$CFLAGS -Werror=unknown-warning-option"
 	fi
 	CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5
-printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
-if test ${xorg_cv_cc_flag_unused_command_line_argument+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5
+$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
+if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 xorg_cv_cc_flag_unused_command_line_argument=yes
-else $as_nop
+else
 xorg_cv_cc_flag_unused_command_line_argument=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
-printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
+$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
 	xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
@@ -19004,31 +18043,29 @@
 
 		CFLAGS="$CFLAGS -Waddress"
 
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Waddress" >&5
-printf %s "checking if $CC supports -Waddress... " >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Waddress" >&5
+$as_echo_n "checking if $CC supports -Waddress... " >&6; }
 		cacheid=xorg_cv_cc_flag__Waddress
-		if eval test \${$cacheid+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+		if eval \${$cacheid+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 int
-main (void)
+main ()
 {
 
 ;
 return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 eval $cacheid=yes
-else $as_nop
+else
 eval $cacheid=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
 conftest$ac_exeext conftest.$ac_ext
 fi
 
@@ -19036,8 +18073,8 @@
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
 		eval supported=\$$cacheid
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5
-printf "%s\n" "$supported" >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5
+$as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
 			BASE_CFLAGS="$BASE_CFLAGS -Waddress"
 			found="yes"
@@ -19062,26 +18099,24 @@
 
 if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then
 	CFLAGS="$CFLAGS -Werror=unknown-warning-option"
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5
-printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
-if test ${xorg_cv_cc_flag_unknown_warning_option+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5
+$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
+if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 xorg_cv_cc_flag_unknown_warning_option=yes
-else $as_nop
+else
 xorg_cv_cc_flag_unknown_warning_option=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
-printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
+$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
 	xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
@@ -19091,26 +18126,24 @@
 		CFLAGS="$CFLAGS -Werror=unknown-warning-option"
 	fi
 	CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5
-printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
-if test ${xorg_cv_cc_flag_unused_command_line_argument+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5
+$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
+if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 xorg_cv_cc_flag_unused_command_line_argument=yes
-else $as_nop
+else
 xorg_cv_cc_flag_unused_command_line_argument=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
-printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
+$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
 	xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
@@ -19128,31 +18161,29 @@
 
 		CFLAGS="$CFLAGS -Wint-to-pointer-cast"
 
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wint-to-pointer-cast" >&5
-printf %s "checking if $CC supports -Wint-to-pointer-cast... " >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wint-to-pointer-cast" >&5
+$as_echo_n "checking if $CC supports -Wint-to-pointer-cast... " >&6; }
 		cacheid=xorg_cv_cc_flag__Wint_to_pointer_cast
-		if eval test \${$cacheid+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+		if eval \${$cacheid+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 int
-main (void)
+main ()
 {
 
 ;
 return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 eval $cacheid=yes
-else $as_nop
+else
 eval $cacheid=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
 conftest$ac_exeext conftest.$ac_ext
 fi
 
@@ -19160,8 +18191,8 @@
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
 		eval supported=\$$cacheid
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5
-printf "%s\n" "$supported" >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5
+$as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
 			BASE_CFLAGS="$BASE_CFLAGS -Wint-to-pointer-cast"
 			found="yes"
@@ -19186,26 +18217,24 @@
 
 if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then
 	CFLAGS="$CFLAGS -Werror=unknown-warning-option"
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5
-printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
-if test ${xorg_cv_cc_flag_unknown_warning_option+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5
+$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
+if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 xorg_cv_cc_flag_unknown_warning_option=yes
-else $as_nop
+else
 xorg_cv_cc_flag_unknown_warning_option=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
-printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
+$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
 	xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
@@ -19215,26 +18244,24 @@
 		CFLAGS="$CFLAGS -Werror=unknown-warning-option"
 	fi
 	CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5
-printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
-if test ${xorg_cv_cc_flag_unused_command_line_argument+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5
+$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
+if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 xorg_cv_cc_flag_unused_command_line_argument=yes
-else $as_nop
+else
 xorg_cv_cc_flag_unused_command_line_argument=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
-printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
+$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
 	xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
@@ -19252,31 +18279,29 @@
 
 		CFLAGS="$CFLAGS -Wpointer-to-int-cast"
 
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wpointer-to-int-cast" >&5
-printf %s "checking if $CC supports -Wpointer-to-int-cast... " >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wpointer-to-int-cast" >&5
+$as_echo_n "checking if $CC supports -Wpointer-to-int-cast... " >&6; }
 		cacheid=xorg_cv_cc_flag__Wpointer_to_int_cast
-		if eval test \${$cacheid+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+		if eval \${$cacheid+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 int
-main (void)
+main ()
 {
 
 ;
 return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 eval $cacheid=yes
-else $as_nop
+else
 eval $cacheid=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
 conftest$ac_exeext conftest.$ac_ext
 fi
 
@@ -19284,8 +18309,8 @@
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
 		eval supported=\$$cacheid
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5
-printf "%s\n" "$supported" >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5
+$as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
 			BASE_CFLAGS="$BASE_CFLAGS -Wpointer-to-int-cast"
 			found="yes"
@@ -19314,10 +18339,9 @@
 
 
 # Check whether --enable-strict-compilation was given.
-if test ${enable_strict_compilation+y}
-then :
+if test "${enable_strict_compilation+set}" = set; then :
 enableval=$enable_strict_compilation; STRICT_COMPILE=$enableval
-else $as_nop
+else
 STRICT_COMPILE=no
 fi
 
@@ -19344,26 +18368,24 @@
 
 if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then
 	CFLAGS="$CFLAGS -Werror=unknown-warning-option"
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5
-printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
-if test ${xorg_cv_cc_flag_unknown_warning_option+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5
+$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
+if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 xorg_cv_cc_flag_unknown_warning_option=yes
-else $as_nop
+else
 xorg_cv_cc_flag_unknown_warning_option=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
-printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
+$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
 	xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
@@ -19373,26 +18395,24 @@
 		CFLAGS="$CFLAGS -Werror=unknown-warning-option"
 	fi
 	CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5
-printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
-if test ${xorg_cv_cc_flag_unused_command_line_argument+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5
+$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
+if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 xorg_cv_cc_flag_unused_command_line_argument=yes
-else $as_nop
+else
 xorg_cv_cc_flag_unused_command_line_argument=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
-printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
+$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
 	xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
@@ -19410,31 +18430,29 @@
 
 		CFLAGS="$CFLAGS -pedantic"
 
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -pedantic" >&5
-printf %s "checking if $CC supports -pedantic... " >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -pedantic" >&5
+$as_echo_n "checking if $CC supports -pedantic... " >&6; }
 		cacheid=xorg_cv_cc_flag__pedantic
-		if eval test \${$cacheid+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+		if eval \${$cacheid+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 int
-main (void)
+main ()
 {
 
 ;
 return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 eval $cacheid=yes
-else $as_nop
+else
 eval $cacheid=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
 conftest$ac_exeext conftest.$ac_ext
 fi
 
@@ -19442,8 +18460,8 @@
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
 		eval supported=\$$cacheid
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5
-printf "%s\n" "$supported" >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5
+$as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
 			STRICT_CFLAGS="$STRICT_CFLAGS -pedantic"
 			found="yes"
@@ -19468,26 +18486,24 @@
 
 if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then
 	CFLAGS="$CFLAGS -Werror=unknown-warning-option"
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5
-printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
-if test ${xorg_cv_cc_flag_unknown_warning_option+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5
+$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
+if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 xorg_cv_cc_flag_unknown_warning_option=yes
-else $as_nop
+else
 xorg_cv_cc_flag_unknown_warning_option=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
-printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
+$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
 	xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
@@ -19497,26 +18513,24 @@
 		CFLAGS="$CFLAGS -Werror=unknown-warning-option"
 	fi
 	CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5
-printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
-if test ${xorg_cv_cc_flag_unused_command_line_argument+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5
+$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
+if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 xorg_cv_cc_flag_unused_command_line_argument=yes
-else $as_nop
+else
 xorg_cv_cc_flag_unused_command_line_argument=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
-printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
+$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
 	xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
@@ -19534,31 +18548,29 @@
 
 		CFLAGS="$CFLAGS -Werror"
 
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror" >&5
-printf %s "checking if $CC supports -Werror... " >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror" >&5
+$as_echo_n "checking if $CC supports -Werror... " >&6; }
 		cacheid=xorg_cv_cc_flag__Werror
-		if eval test \${$cacheid+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+		if eval \${$cacheid+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 int
-main (void)
+main ()
 {
 
 ;
 return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 eval $cacheid=yes
-else $as_nop
+else
 eval $cacheid=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
 conftest$ac_exeext conftest.$ac_ext
 fi
 
@@ -19566,8 +18578,8 @@
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
 		eval supported=\$$cacheid
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5
-printf "%s\n" "$supported" >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5
+$as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
 			STRICT_CFLAGS="$STRICT_CFLAGS -Werror"
 			found="yes"
@@ -19585,31 +18597,29 @@
 
 		CFLAGS="$CFLAGS -errwarn"
 
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -errwarn" >&5
-printf %s "checking if $CC supports -errwarn... " >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -errwarn" >&5
+$as_echo_n "checking if $CC supports -errwarn... " >&6; }
 		cacheid=xorg_cv_cc_flag__errwarn
-		if eval test \${$cacheid+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+		if eval \${$cacheid+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 int
-main (void)
+main ()
 {
 
 ;
 return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 eval $cacheid=yes
-else $as_nop
+else
 eval $cacheid=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
 conftest$ac_exeext conftest.$ac_ext
 fi
 
@@ -19617,8 +18627,8 @@
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
 		eval supported=\$$cacheid
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5
-printf "%s\n" "$supported" >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5
+$as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
 			STRICT_CFLAGS="$STRICT_CFLAGS -errwarn"
 			found="yes"
@@ -19646,26 +18656,24 @@
 
 if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then
 	CFLAGS="$CFLAGS -Werror=unknown-warning-option"
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5
-printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
-if test ${xorg_cv_cc_flag_unknown_warning_option+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5
+$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
+if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 xorg_cv_cc_flag_unknown_warning_option=yes
-else $as_nop
+else
 xorg_cv_cc_flag_unknown_warning_option=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
-printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
+$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
 	xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
@@ -19675,26 +18683,24 @@
 		CFLAGS="$CFLAGS -Werror=unknown-warning-option"
 	fi
 	CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5
-printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
-if test ${xorg_cv_cc_flag_unused_command_line_argument+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5
+$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
+if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 xorg_cv_cc_flag_unused_command_line_argument=yes
-else $as_nop
+else
 xorg_cv_cc_flag_unused_command_line_argument=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
-printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
+$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
 	xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument
 	CFLAGS="$xorg_testset_save_CFLAGS"
 fi
@@ -19712,31 +18718,29 @@
 
 		CFLAGS="$CFLAGS -Werror=attributes"
 
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=attributes" >&5
-printf %s "checking if $CC supports -Werror=attributes... " >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=attributes" >&5
+$as_echo_n "checking if $CC supports -Werror=attributes... " >&6; }
 		cacheid=xorg_cv_cc_flag__Werror_attributes
-		if eval test \${$cacheid+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+		if eval \${$cacheid+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int i;
 int
-main (void)
+main ()
 {
 
 ;
 return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 eval $cacheid=yes
-else $as_nop
+else
 eval $cacheid=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
 conftest$ac_exeext conftest.$ac_ext
 fi
 
@@ -19744,8 +18748,8 @@
 		CFLAGS="$xorg_testset_save_CFLAGS"
 
 		eval supported=\$$cacheid
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5
-printf "%s\n" "$supported" >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5
+$as_echo "$supported" >&6; }
 		if test "$supported" = "yes" ; then
 			STRICT_CFLAGS="$STRICT_CFLAGS -Werror=attributes"
 			found="yes"
@@ -19773,22 +18777,25 @@
 		PVM="0"
 	fi
 
-printf "%s\n" "#define PACKAGE_VERSION_MINOR $PVM" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_VERSION_MINOR $PVM
+_ACEOF
 
 	PVP=`echo $PACKAGE_VERSION | cut -d . -f 3 | cut -d - -f 1`
 	if test "x$PVP" = "x"; then
 		PVP="0"
 	fi
 
-printf "%s\n" "#define PACKAGE_VERSION_PATCHLEVEL $PVP" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_VERSION_PATCHLEVEL $PVP
+_ACEOF
 
 
 
-CHANGELOG_CMD="((GIT_DIR=\$(top_srcdir)/.git git log > \$(top_srcdir)/.changelog.tmp) 2>/dev/null && \
+CHANGELOG_CMD="(GIT_DIR=\$(top_srcdir)/.git git log > \$(top_srcdir)/.changelog.tmp && \
 mv \$(top_srcdir)/.changelog.tmp \$(top_srcdir)/ChangeLog) \
-|| (rm -f \$(top_srcdir)/.changelog.tmp; test -e \$(top_srcdir)/ChangeLog || ( \
-touch \$(top_srcdir)/ChangeLog; \
-echo 'git failed to create ChangeLog: installing empty ChangeLog.' >&2))"
+|| (rm -f \$(top_srcdir)/.changelog.tmp; touch \$(top_srcdir)/ChangeLog; \
+echo 'git directory not found: installing possibly empty changelog.' >&2)"
 
 
 
@@ -19796,47 +18803,14 @@
 macros_datadir=`$PKG_CONFIG --print-errors --variable=pkgdatadir xorg-macros`
 INSTALL_CMD="(cp -f "$macros_datadir/INSTALL" \$(top_srcdir)/.INSTALL.tmp && \
 mv \$(top_srcdir)/.INSTALL.tmp \$(top_srcdir)/INSTALL) \
-|| (rm -f \$(top_srcdir)/.INSTALL.tmp; test -e \$(top_srcdir)/INSTALL || ( \
-touch \$(top_srcdir)/INSTALL; \
-echo 'failed to copy INSTALL from util-macros: installing empty INSTALL.' >&2))"
+|| (rm -f \$(top_srcdir)/.INSTALL.tmp; touch \$(top_srcdir)/INSTALL; \
+echo 'util-macros \"pkgdatadir\" from xorg-macros.pc not found: installing possibly empty INSTALL.' >&2)"
 
 
 
 
 
 
-case $host_os in
- solaris*)
- # Solaris 2.0 - 11.3 use SysV man page section numbers, so we
- # check for a man page file found in later versions that use
- # traditional section numbers instead
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for /usr/share/man/man7/attributes.7" >&5
-printf %s "checking for /usr/share/man/man7/attributes.7... " >&6; }
-if test ${ac_cv_file__usr_share_man_man7_attributes_7+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
- test "$cross_compiling" = yes &&
- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
-if test -r "/usr/share/man/man7/attributes.7"; then
- ac_cv_file__usr_share_man_man7_attributes_7=yes
-else
- ac_cv_file__usr_share_man_man7_attributes_7=no
-fi
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_man_man7_attributes_7" >&5
-printf "%s\n" "$ac_cv_file__usr_share_man_man7_attributes_7" >&6; }
-if test "x$ac_cv_file__usr_share_man_man7_attributes_7" = xyes
-then :
- SYSV_MAN_SECTIONS=false
-else $as_nop
- SYSV_MAN_SECTIONS=true
-fi
-
- ;;
- *) SYSV_MAN_SECTIONS=false ;;
-esac
-
 if test x$APP_MAN_SUFFIX = x ; then
 APP_MAN_SUFFIX=1
 fi
@@ -19852,8 +18826,9 @@
 fi
 
 if test x$FILE_MAN_SUFFIX = x ; then
- case $SYSV_MAN_SECTIONS in
-	true)				FILE_MAN_SUFFIX=4 ;;
+ case $host_os in
+	# Solaris 2.0 - 11 use SysV man page sections
+	solaris2.?|solaris2.101)	FILE_MAN_SUFFIX=4 ;;
 	*)				FILE_MAN_SUFFIX=5 ;;
 esac
 fi
@@ -19862,8 +18837,9 @@
 fi
 
 if test x$MISC_MAN_SUFFIX = x ; then
- case $SYSV_MAN_SECTIONS in
-	true)				MISC_MAN_SUFFIX=5 ;;
+ case $host_os in
+	# Solaris 2.0 - 11 use SysV man page sections
+	solaris2.?|solaris2.101)	MISC_MAN_SUFFIX=5 ;;
 	*)				MISC_MAN_SUFFIX=7 ;;
 esac
 fi
@@ -19872,8 +18848,9 @@
 fi
 
 if test x$DRIVER_MAN_SUFFIX = x ; then
- case $SYSV_MAN_SECTIONS in
-	true)				DRIVER_MAN_SUFFIX=7 ;;
+ case $host_os in
+	# Solaris 2.0 - 11 use SysV man page sections
+	solaris2.?|solaris2.101)	DRIVER_MAN_SUFFIX=7 ;;
 	*)				DRIVER_MAN_SUFFIX=4 ;;
 esac
 fi
@@ -19882,8 +18859,9 @@
 fi
 
 if test x$ADMIN_MAN_SUFFIX = x ; then
- case $SYSV_MAN_SECTIONS in
-	true)				ADMIN_MAN_SUFFIX=1m ;;
+ case $host_os in
+	# Solaris 2.0 - 11 use SysV man page sections
+	solaris2.?|solaris2.101)	ADMIN_MAN_SUFFIX=1m ;;
 	*)				ADMIN_MAN_SUFFIX=8 ;;
 esac
 fi
@@ -19924,8 +18902,7 @@
 
 
 # Check whether --enable-silent-rules was given.
-if test ${enable_silent_rules+y}
-then :
+if test "${enable_silent_rules+set}" = set; then :
 enableval=$enable_silent_rules;
 fi
 
@@ -19935,13 +18912,12 @@
 *) AM_DEFAULT_VERBOSITY=0;;
 esac
 am_make=${MAKE-make}
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
-printf %s "checking whether $am_make supports nested variables... " >&6; }
-if test ${am_cv_make_support_nested_variables+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
- if printf "%s\n" 'TRUE=$(BAR$(V))
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
+$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
+if ${am_cv_make_support_nested_variables+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if $as_echo 'TRUE=$(BAR$(V))
 BAR0=false
 BAR1=true
 V=1
@@ -19953,8 +18929,8 @@
 am_cv_make_support_nested_variables=no
 fi
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
-printf "%s\n" "$am_cv_make_support_nested_variables" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
+$as_echo "$am_cv_make_support_nested_variables" >&6; }
 if test $am_cv_make_support_nested_variables = yes; then
 AM_V='$(V)'
 AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
@@ -19968,10 +18944,9 @@
 
 
 # Check whether --enable-specs was given.
-if test ${enable_specs+y}
-then :
+if test "${enable_specs+set}" = set; then :
 enableval=$enable_specs; build_specs=$enableval
-else $as_nop
+else
 build_specs=yes
 fi
 
@@ -19984,20 +18959,19 @@
 ENABLE_SPECS_FALSE=
 fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build functional specifications" >&5
-printf %s "checking whether to build functional specifications... " >&6; }
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $build_specs" >&5
-printf "%s\n" "$build_specs" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build functional specifications" >&5
+$as_echo_n "checking whether to build functional specifications... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $build_specs" >&5
+$as_echo "$build_specs" >&6; }
 
 
 
 
 
 # Check whether --with-xmlto was given.
-if test ${with_xmlto+y}
-then :
+if test "${with_xmlto+set}" = set; then :
 withval=$with_xmlto; use_xmlto=$withval
-else $as_nop
+else
 use_xmlto=auto
 fi
 
@@ -20006,12 +18980,11 @@
 if test "x$use_xmlto" = x"auto"; then
 # Extract the first word of "xmlto", so it can be a program name with args.
 set dummy xmlto; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_path_XMLTO+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_XMLTO+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 case $XMLTO in
 \\/* | ?:\\/*)
 ac_cv_path_XMLTO="$XMLTO" # Let the user override the test with a path.
@@ -20021,15 +18994,11 @@
 for as_dir in $PATH
 do
 IFS=$as_save_IFS
- case $as_dir in #(((
- '') as_dir=./ ;;
- */) ;;
- *) as_dir=$as_dir/ ;;
- esac
+ test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
- ac_cv_path_XMLTO="$as_dir$ac_word$ac_exec_ext"
- printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_XMLTO="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
 fi
 done
@@ -20041,17 +19010,17 @@
 fi
 XMLTO=$ac_cv_path_XMLTO
 if test -n "$XMLTO"; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $XMLTO" >&5
-printf "%s\n" "$XMLTO" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XMLTO" >&5
+$as_echo "$XMLTO" >&6; }
 else
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
 if test "x$XMLTO" = "x"; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: xmlto not found - documentation targets will be skipped" >&5
-printf "%s\n" "$as_me: WARNING: xmlto not found - documentation targets will be skipped" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: xmlto not found - documentation targets will be skipped" >&5
+$as_echo "$as_me: WARNING: xmlto not found - documentation targets will be skipped" >&2;}
 	have_xmlto=no
 else
 have_xmlto=yes
@@ -20059,12 +19028,11 @@
 elif test "x$use_xmlto" = x"yes" ; then
 # Extract the first word of "xmlto", so it can be a program name with args.
 set dummy xmlto; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_path_XMLTO+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_XMLTO+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 case $XMLTO in
 \\/* | ?:\\/*)
 ac_cv_path_XMLTO="$XMLTO" # Let the user override the test with a path.
@@ -20074,15 +19042,11 @@
 for as_dir in $PATH
 do
 IFS=$as_save_IFS
- case $as_dir in #(((
- '') as_dir=./ ;;
- */) ;;
- *) as_dir=$as_dir/ ;;
- esac
+ test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
- ac_cv_path_XMLTO="$as_dir$ac_word$ac_exec_ext"
- printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_XMLTO="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
 fi
 done
@@ -20094,11 +19058,11 @@
 fi
 XMLTO=$ac_cv_path_XMLTO
 if test -n "$XMLTO"; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $XMLTO" >&5
-printf "%s\n" "$XMLTO" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XMLTO" >&5
+$as_echo "$XMLTO" >&6; }
 else
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -20108,8 +19072,8 @@
 have_xmlto=yes
 elif test "x$use_xmlto" = x"no" ; then
 if test "x$XMLTO" != "x"; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ignoring XMLTO environment variable since --with-xmlto=no was specified" >&5
-printf "%s\n" "$as_me: WARNING: ignoring XMLTO environment variable since --with-xmlto=no was specified" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ignoring XMLTO environment variable since --with-xmlto=no was specified" >&5
+$as_echo "$as_me: WARNING: ignoring XMLTO environment variable since --with-xmlto=no was specified" >&2;}
 fi
 have_xmlto=no
 else
@@ -20119,19 +19083,19 @@
 # Test for a minimum version of xmlto, if provided.
 if test "$have_xmlto" = yes; then
 # scrape the xmlto version
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking the xmlto version" >&5
-printf %s "checking the xmlto version... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking the xmlto version" >&5
+$as_echo_n "checking the xmlto version... " >&6; }
 xmlto_version=`$XMLTO --version 2>/dev/null | cut -d' ' -f3`
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xmlto_version" >&5
-printf "%s\n" "$xmlto_version" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $xmlto_version" >&5
+$as_echo "$xmlto_version" >&6; }
 as_arg_v1=$xmlto_version
 as_arg_v2=0.0.22
 awk "$as_awk_strverscmp" v1="$as_arg_v1" v2="$as_arg_v2" /dev/null
 case $? in #(
 1) :
 if test "x$use_xmlto" = xauto; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: xmlto version $xmlto_version found, but 0.0.22 needed" >&5
-printf "%s\n" "$as_me: WARNING: xmlto version $xmlto_version found, but 0.0.22 needed" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: xmlto version $xmlto_version found, but 0.0.22 needed" >&5
+$as_echo "$as_me: WARNING: xmlto version $xmlto_version found, but 0.0.22 needed" >&2;}
 have_xmlto=no
 else
 as_fn_error $? "xmlto version $xmlto_version found, but 0.0.22 needed" "$LINENO" 5
@@ -20154,22 +19118,19 @@
 have_xmlto_text=no
 cat > conftest.xml << "EOF"
 EOF
-if test "$have_xmlto" = yes
-then :
- if $XMLTO --skip-validation txt conftest.xml >/dev/null 2>&1
-then :
+if test "$have_xmlto" = yes; then :
+ if $XMLTO --skip-validation txt conftest.xml >/dev/null 2>&1; then :
 have_xmlto_text=yes
-else $as_nop
+else
 # Try it again with a non-empty XML file.
 cat > conftest.xml << "EOF"
 <x></x>
 EOF
- if $XMLTO --skip-validation txt conftest.xml >/dev/null 2>&1
-then :
+ if $XMLTO --skip-validation txt conftest.xml >/dev/null 2>&1; then :
 have_xmlto_text=yes
-else $as_nop
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: xmlto cannot generate text format, this format skipped" >&5
-printf "%s\n" "$as_me: WARNING: xmlto cannot generate text format, this format skipped" >&2;}
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: xmlto cannot generate text format, this format skipped" >&5
+$as_echo "$as_me: WARNING: xmlto cannot generate text format, this format skipped" >&2;}
 fi
 fi
 fi
@@ -20196,10 +19157,9 @@
 
 
 # Check whether --with-fop was given.
-if test ${with_fop+y}
-then :
+if test "${with_fop+set}" = set; then :
 withval=$with_fop; use_fop=$withval
-else $as_nop
+else
 use_fop=no
 fi
 
@@ -20208,12 +19168,11 @@
 if test "x$use_fop" = x"auto"; then
 # Extract the first word of "fop", so it can be a program name with args.
 set dummy fop; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_path_FOP+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_FOP+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 case $FOP in
 \\/* | ?:\\/*)
 ac_cv_path_FOP="$FOP" # Let the user override the test with a path.
@@ -20223,15 +19182,11 @@
 for as_dir in $PATH
 do
 IFS=$as_save_IFS
- case $as_dir in #(((
- '') as_dir=./ ;;
- */) ;;
- *) as_dir=$as_dir/ ;;
- esac
+ test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
- ac_cv_path_FOP="$as_dir$ac_word$ac_exec_ext"
- printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_FOP="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
 fi
 done
@@ -20243,17 +19198,17 @@
 fi
 FOP=$ac_cv_path_FOP
 if test -n "$FOP"; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $FOP" >&5
-printf "%s\n" "$FOP" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FOP" >&5
+$as_echo "$FOP" >&6; }
 else
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
 if test "x$FOP" = "x"; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: fop not found - documentation targets will be skipped" >&5
-printf "%s\n" "$as_me: WARNING: fop not found - documentation targets will be skipped" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: fop not found - documentation targets will be skipped" >&5
+$as_echo "$as_me: WARNING: fop not found - documentation targets will be skipped" >&2;}
 	have_fop=no
 else
 have_fop=yes
@@ -20261,12 +19216,11 @@
 elif test "x$use_fop" = x"yes" ; then
 # Extract the first word of "fop", so it can be a program name with args.
 set dummy fop; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_path_FOP+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_FOP+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 case $FOP in
 \\/* | ?:\\/*)
 ac_cv_path_FOP="$FOP" # Let the user override the test with a path.
@@ -20276,15 +19230,11 @@
 for as_dir in $PATH
 do
 IFS=$as_save_IFS
- case $as_dir in #(((
- '') as_dir=./ ;;
- */) ;;
- *) as_dir=$as_dir/ ;;
- esac
+ test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
- ac_cv_path_FOP="$as_dir$ac_word$ac_exec_ext"
- printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_FOP="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
 fi
 done
@@ -20296,11 +19246,11 @@
 fi
 FOP=$ac_cv_path_FOP
 if test -n "$FOP"; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $FOP" >&5
-printf "%s\n" "$FOP" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FOP" >&5
+$as_echo "$FOP" >&6; }
 else
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -20310,8 +19260,8 @@
 have_fop=yes
 elif test "x$use_fop" = x"no" ; then
 if test "x$FOP" != "x"; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ignoring FOP environment variable since --with-fop=no was specified" >&5
-printf "%s\n" "$as_me: WARNING: ignoring FOP environment variable since --with-fop=no was specified" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ignoring FOP environment variable since --with-fop=no was specified" >&5
+$as_echo "$as_me: WARNING: ignoring FOP environment variable since --with-fop=no was specified" >&2;}
 fi
 have_fop=no
 else
@@ -20336,10 +19286,9 @@
 
 
 # Check whether --with-xsltproc was given.
-if test ${with_xsltproc+y}
-then :
+if test "${with_xsltproc+set}" = set; then :
 withval=$with_xsltproc; use_xsltproc=$withval
-else $as_nop
+else
 use_xsltproc=auto
 fi
 
@@ -20348,12 +19297,11 @@
 if test "x$use_xsltproc" = x"auto"; then
 # Extract the first word of "xsltproc", so it can be a program name with args.
 set dummy xsltproc; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_path_XSLTPROC+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_XSLTPROC+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 case $XSLTPROC in
 \\/* | ?:\\/*)
 ac_cv_path_XSLTPROC="$XSLTPROC" # Let the user override the test with a path.
@@ -20363,15 +19311,11 @@
 for as_dir in $PATH
 do
 IFS=$as_save_IFS
- case $as_dir in #(((
- '') as_dir=./ ;;
- */) ;;
- *) as_dir=$as_dir/ ;;
- esac
+ test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
- ac_cv_path_XSLTPROC="$as_dir$ac_word$ac_exec_ext"
- printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_XSLTPROC="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
 fi
 done
@@ -20383,17 +19327,17 @@
 fi
 XSLTPROC=$ac_cv_path_XSLTPROC
 if test -n "$XSLTPROC"; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $XSLTPROC" >&5
-printf "%s\n" "$XSLTPROC" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XSLTPROC" >&5
+$as_echo "$XSLTPROC" >&6; }
 else
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
 if test "x$XSLTPROC" = "x"; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: xsltproc not found - cannot transform XML documents" >&5
-printf "%s\n" "$as_me: WARNING: xsltproc not found - cannot transform XML documents" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: xsltproc not found - cannot transform XML documents" >&5
+$as_echo "$as_me: WARNING: xsltproc not found - cannot transform XML documents" >&2;}
 	have_xsltproc=no
 else
 have_xsltproc=yes
@@ -20401,12 +19345,11 @@
 elif test "x$use_xsltproc" = x"yes" ; then
 # Extract the first word of "xsltproc", so it can be a program name with args.
 set dummy xsltproc; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_path_XSLTPROC+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_XSLTPROC+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 case $XSLTPROC in
 \\/* | ?:\\/*)
 ac_cv_path_XSLTPROC="$XSLTPROC" # Let the user override the test with a path.
@@ -20416,15 +19359,11 @@
 for as_dir in $PATH
 do
 IFS=$as_save_IFS
- case $as_dir in #(((
- '') as_dir=./ ;;
- */) ;;
- *) as_dir=$as_dir/ ;;
- esac
+ test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
- ac_cv_path_XSLTPROC="$as_dir$ac_word$ac_exec_ext"
- printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_XSLTPROC="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
 fi
 done
@@ -20436,11 +19375,11 @@
 fi
 XSLTPROC=$ac_cv_path_XSLTPROC
 if test -n "$XSLTPROC"; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $XSLTPROC" >&5
-printf "%s\n" "$XSLTPROC" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XSLTPROC" >&5
+$as_echo "$XSLTPROC" >&6; }
 else
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -20450,8 +19389,8 @@
 have_xsltproc=yes
 elif test "x$use_xsltproc" = x"no" ; then
 if test "x$XSLTPROC" != "x"; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ignoring XSLTPROC environment variable since --with-xsltproc=no was specified" >&5
-printf "%s\n" "$as_me: WARNING: ignoring XSLTPROC environment variable since --with-xsltproc=no was specified" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ignoring XSLTPROC environment variable since --with-xsltproc=no was specified" >&5
+$as_echo "$as_me: WARNING: ignoring XSLTPROC environment variable since --with-xsltproc=no was specified" >&2;}
 fi
 have_xsltproc=no
 else
@@ -20468,14 +19407,14 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for X.Org SGML entities >= 1.10" >&5
-printf %s "checking for X.Org SGML entities >= 1.10... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for X.Org SGML entities >= 1.10" >&5
+$as_echo_n "checking for X.Org SGML entities >= 1.10... " >&6; }
 XORG_SGML_PATH=
 if test -n "$PKG_CONFIG" && \
- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xorg-sgml-doctools >= 1.10\""; } >&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xorg-sgml-doctools >= 1.10\""; } >&5
 ($PKG_CONFIG --exists --print-errors "xorg-sgml-doctools >= 1.10") 2>&5
 ac_status=$?
- printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
 XORG_SGML_PATH=`$PKG_CONFIG --variable=sgmlrootdir xorg-sgml-doctools`
 else
@@ -20486,13 +19425,13 @@
 # Define variables STYLESHEET_SRCDIR and XSL_STYLESHEET containing
 # the path and the name of the doc stylesheet
 if test "x$XORG_SGML_PATH" != "x" ; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $XORG_SGML_PATH" >&5
-printf "%s\n" "$XORG_SGML_PATH" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XORG_SGML_PATH" >&5
+$as_echo "$XORG_SGML_PATH" >&6; }
 STYLESHEET_SRCDIR=$XORG_SGML_PATH/X11
 XSL_STYLESHEET=$STYLESHEET_SRCDIR/xorg.xsl
 else
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -20507,149 +19446,17 @@
 fi
 
 
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
-printf %s "checking how to run the C preprocessor... " >&6; }
-# On Suns, sometimes $CPP names a directory.
-if test -n "$CPP" && test -d "$CPP"; then
- CPP=
-fi
-if test -z "$CPP"; then
- if test ${ac_cv_prog_CPP+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
- # Double quotes because $CC needs to be expanded
- for CPP in "$CC -E" "$CC -E -traditional-cpp" cpp /lib/cpp
- do
- ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
- # Use a header file that comes with gcc, so configuring glibc
- # with a fresh cross-compiler works.
- # On the NeXT, cc -E runs the code through the compiler's parser,
- # not just through cpp. "Syntax error" is here to catch this case.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <limits.h>
-		 Syntax error
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"
-then :
-
-else $as_nop
- # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
- # OK, works on sane cases. Now check whether nonexistent headers
- # can be detected and how.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <ac_nonexistent.h>
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"
-then :
- # Broken: success on invalid input.
-continue
-else $as_nop
- # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok
-then :
- break
-fi
 
- done
- ac_cv_prog_CPP=$CPP
 
-fi
- CPP=$ac_cv_prog_CPP
-else
- ac_cv_prog_CPP=$CPP
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
-printf "%s\n" "$CPP" >&6; }
-ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
+for ac_prog in cpp
 do
- # Use a header file that comes with gcc, so configuring glibc
- # with a fresh cross-compiler works.
- # On the NeXT, cc -E runs the code through the compiler's parser,
- # not just through cpp. "Syntax error" is here to catch this case.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <limits.h>
-		 Syntax error
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"
-then :
-
-else $as_nop
- # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
- # OK, works on sane cases. Now check whether nonexistent headers
- # can be detected and how.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <ac_nonexistent.h>
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"
-then :
- # Broken: success on invalid input.
-continue
-else $as_nop
- # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok
-then :
-
-else $as_nop
- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details" "$LINENO" 5; }
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-
-if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}cpp", so it can be a program name with args.
-set dummy ${ac_tool_prefix}cpp; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_path_RAWCPP+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_RAWCPP+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 case $RAWCPP in
 \\/* | ?:\\/*)
 ac_cv_path_RAWCPP="$RAWCPP" # Let the user override the test with a path.
@@ -20660,15 +19467,11 @@
 for as_dir in $as_dummy
 do
 IFS=$as_save_IFS
- case $as_dir in #(((
- '') as_dir=./ ;;
- */) ;;
- *) as_dir=$as_dir/ ;;
- esac
+ test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
- ac_cv_path_RAWCPP="$as_dir$ac_word$ac_exec_ext"
- printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_RAWCPP="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
 fi
 done
@@ -20680,121 +19483,62 @@
 fi
 RAWCPP=$ac_cv_path_RAWCPP
 if test -n "$RAWCPP"; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $RAWCPP" >&5
-printf "%s\n" "$RAWCPP" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RAWCPP" >&5
+$as_echo "$RAWCPP" >&6; }
 else
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
-fi
-if test -z "$ac_cv_path_RAWCPP"; then
- ac_pt_RAWCPP=$RAWCPP
- # Extract the first word of "cpp", so it can be a program name with args.
-set dummy cpp; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_path_ac_pt_RAWCPP+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
- case $ac_pt_RAWCPP in
- \\/* | ?:\\/*)
- ac_cv_path_ac_pt_RAWCPP="$ac_pt_RAWCPP" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-as_dummy="$PATH:/bin:/usr/bin:/usr/lib:/usr/libexec:/usr/ccs/lib:/usr/ccs/lbin:/lib"
-for as_dir in $as_dummy
-do
- IFS=$as_save_IFS
- case $as_dir in #(((
- '') as_dir=./ ;;
- */) ;;
- *) as_dir=$as_dir/ ;;
- esac
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
- ac_cv_path_ac_pt_RAWCPP="$as_dir$ac_word$ac_exec_ext"
- printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
- break 2
- fi
+ test -n "$RAWCPP" && break
 done
- done
-IFS=$as_save_IFS
-
- ;;
-esac
-fi
-ac_pt_RAWCPP=$ac_cv_path_ac_pt_RAWCPP
-if test -n "$ac_pt_RAWCPP"; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_pt_RAWCPP" >&5
-printf "%s\n" "$ac_pt_RAWCPP" >&6; }
-else
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-fi
-
- if test "x$ac_pt_RAWCPP" = x; then
- RAWCPP="${CPP}"
- else
- case $cross_compiling:$ac_tool_warned in
-yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
- RAWCPP=$ac_pt_RAWCPP
- fi
-else
- RAWCPP="$ac_cv_path_RAWCPP"
-fi
+test -n "$RAWCPP" || RAWCPP="${CPP}"
 
 
 # Check for flag to avoid builtin definitions - assumes unix is predefined,
 # which is not the best choice for supporting other OS'es, but covers most
 # of the ones we need for now.
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $RAWCPP requires -undef" >&5
-printf %s "checking if $RAWCPP requires -undef... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $RAWCPP requires -undef" >&5
+$as_echo_n "checking if $RAWCPP requires -undef... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 Does cpp redefine unix ?
 _ACEOF
 if test `${RAWCPP} < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 else
 	if test `${RAWCPP} -undef < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then
 		RAWCPPFLAGS=-undef
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 	# under Cygwin unix is still defined even with -undef
 	elif test `${RAWCPP} -undef -ansi < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then
 		RAWCPPFLAGS="-undef -ansi"
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes, with -ansi" >&5
-printf "%s\n" "yes, with -ansi" >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, with -ansi" >&5
+$as_echo "yes, with -ansi" >&6; }
 	else
 		as_fn_error $? "${RAWCPP} defines unix with or without -undef. I don't know what to do." "$LINENO" 5
 	fi
 fi
 rm -f conftest.$ac_ext
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $RAWCPP requires -traditional" >&5
-printf %s "checking if $RAWCPP requires -traditional... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $RAWCPP requires -traditional" >&5
+$as_echo_n "checking if $RAWCPP requires -traditional... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 Does cpp preserve "whitespace"?
 _ACEOF
 if test `${RAWCPP} < conftest.$ac_ext | grep -c 'preserve \"'` -eq 1 ; then
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 else
 	if test `${RAWCPP} -traditional < conftest.$ac_ext | grep -c 'preserve \"'` -eq 1 ; then
 		TRADITIONALCPPFLAGS="-traditional"
 		RAWCPPFLAGS="${RAWCPPFLAGS} -traditional"
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 	else
 		as_fn_error $? "${RAWCPP} does not preserve whitespace with or without -traditional. I don't know what to do." "$LINENO" 5
 	fi
@@ -20810,10 +19554,9 @@
 
 
 # Check whether --with-perl was given.
-if test ${with_perl+y}
-then :
+if test "${with_perl+set}" = set; then :
 withval=$with_perl; use_perl=$withval
-else $as_nop
+else
 use_perl=auto
 fi
 
@@ -20822,12 +19565,11 @@
 if test "x$use_perl" = x"auto"; then
 # Extract the first word of "perl", so it can be a program name with args.
 set dummy perl; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_path_PERL+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_PERL+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 case $PERL in
 \\/* | ?:\\/*)
 ac_cv_path_PERL="$PERL" # Let the user override the test with a path.
@@ -20837,15 +19579,11 @@
 for as_dir in $PATH
 do
 IFS=$as_save_IFS
- case $as_dir in #(((
- '') as_dir=./ ;;
- */) ;;
- *) as_dir=$as_dir/ ;;
- esac
+ test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
- ac_cv_path_PERL="$as_dir$ac_word$ac_exec_ext"
- printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
 fi
 done
@@ -20857,17 +19595,17 @@
 fi
 PERL=$ac_cv_path_PERL
 if test -n "$PERL"; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PERL" >&5
-printf "%s\n" "$PERL" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PERL" >&5
+$as_echo "$PERL" >&6; }
 else
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
 if test "x$PERL" = "x"; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: perl not found - cannot extract information and report" >&5
-printf "%s\n" "$as_me: WARNING: perl not found - cannot extract information and report" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: perl not found - cannot extract information and report" >&5
+$as_echo "$as_me: WARNING: perl not found - cannot extract information and report" >&2;}
 	have_perl=no
 else
 have_perl=yes
@@ -20875,12 +19613,11 @@
 elif test "x$use_perl" = x"yes" ; then
 # Extract the first word of "perl", so it can be a program name with args.
 set dummy perl; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_path_PERL+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_PERL+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 case $PERL in
 \\/* | ?:\\/*)
 ac_cv_path_PERL="$PERL" # Let the user override the test with a path.
@@ -20890,15 +19627,11 @@
 for as_dir in $PATH
 do
 IFS=$as_save_IFS
- case $as_dir in #(((
- '') as_dir=./ ;;
- */) ;;
- *) as_dir=$as_dir/ ;;
- esac
+ test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
- ac_cv_path_PERL="$as_dir$ac_word$ac_exec_ext"
- printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
 fi
 done
@@ -20910,11 +19643,11 @@
 fi
 PERL=$ac_cv_path_PERL
 if test -n "$PERL"; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PERL" >&5
-printf "%s\n" "$PERL" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PERL" >&5
+$as_echo "$PERL" >&6; }
 else
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -20924,8 +19657,8 @@
 have_perl=yes
 elif test "x$use_perl" = x"no" ; then
 if test "x$PERL" != "x"; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ignoring PERL environment variable since --with-perl=no was specified" >&5
-printf "%s\n" "$as_me: WARNING: ignoring PERL environment variable since --with-perl=no was specified" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ignoring PERL environment variable since --with-perl=no was specified" >&5
+$as_echo "$as_me: WARNING: ignoring PERL environment variable since --with-perl=no was specified" >&2;}
 fi
 have_perl=no
 else
@@ -20954,12 +19687,11 @@
 	if test -n "$ac_tool_prefix"; then
 # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
 set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_path_PKG_CONFIG+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_PKG_CONFIG+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 case $PKG_CONFIG in
 \\/* | ?:\\/*)
 ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
@@ -20969,15 +19701,11 @@
 for as_dir in $PATH
 do
 IFS=$as_save_IFS
- case $as_dir in #(((
- '') as_dir=./ ;;
- */) ;;
- *) as_dir=$as_dir/ ;;
- esac
+ test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
- ac_cv_path_PKG_CONFIG="$as_dir$ac_word$ac_exec_ext"
- printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
 fi
 done
@@ -20989,11 +19717,11 @@
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 if test -n "$PKG_CONFIG"; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-printf "%s\n" "$PKG_CONFIG" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
 else
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -21002,12 +19730,11 @@
 ac_pt_PKG_CONFIG=$PKG_CONFIG
 # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_path_ac_pt_PKG_CONFIG+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 case $ac_pt_PKG_CONFIG in
 \\/* | ?:\\/*)
 ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
@@ -21017,15 +19744,11 @@
 for as_dir in $PATH
 do
 IFS=$as_save_IFS
- case $as_dir in #(((
- '') as_dir=./ ;;
- */) ;;
- *) as_dir=$as_dir/ ;;
- esac
+ test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
- ac_cv_path_ac_pt_PKG_CONFIG="$as_dir$ac_word$ac_exec_ext"
- printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
 fi
 done
@@ -21037,11 +19760,11 @@
 fi
 ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
 if test -n "$ac_pt_PKG_CONFIG"; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
-printf "%s\n" "$ac_pt_PKG_CONFIG" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
+$as_echo "$ac_pt_PKG_CONFIG" >&6; }
 else
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 if test "x$ac_pt_PKG_CONFIG" = x; then
@@ -21049,8 +19772,8 @@
 else
 case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
 PKG_CONFIG=$ac_pt_PKG_CONFIG
@@ -21062,14 +19785,14 @@
 fi
 if test -n "$PKG_CONFIG"; then
 	_pkg_min_version=0.9.0
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
-printf %s "checking pkg-config is at least version $_pkg_min_version... " >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
+$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
 	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 	else
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 		PKG_CONFIG=""
 	fi
 fi
@@ -21080,12 +19803,11 @@
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_CC_FOR_BUILD+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC_FOR_BUILD+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 if test -n "$CC_FOR_BUILD"; then
 ac_cv_prog_CC_FOR_BUILD="$CC_FOR_BUILD" # Let the user override the test.
 else
@@ -21093,15 +19815,11 @@
 for as_dir in $PATH
 do
 IFS=$as_save_IFS
- case $as_dir in #(((
- '') as_dir=./ ;;
- */) ;;
- *) as_dir=$as_dir/ ;;
- esac
+ test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_prog_CC_FOR_BUILD="$ac_prog"
- printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
 fi
 done
@@ -21112,11 +19830,11 @@
 fi
 CC_FOR_BUILD=$ac_cv_prog_CC_FOR_BUILD
 if test -n "$CC_FOR_BUILD"; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC_FOR_BUILD" >&5
-printf "%s\n" "$CC_FOR_BUILD" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC_FOR_BUILD" >&5
+$as_echo "$CC_FOR_BUILD" >&6; }
 else
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -21175,12 +19893,11 @@
 	if test -n "$ac_tool_prefix"; then
 # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
 set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_path_PKG_CONFIG+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_PKG_CONFIG+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 case $PKG_CONFIG in
 \\/* | ?:\\/*)
 ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
@@ -21190,15 +19907,11 @@
 for as_dir in $PATH
 do
 IFS=$as_save_IFS
- case $as_dir in #(((
- '') as_dir=./ ;;
- */) ;;
- *) as_dir=$as_dir/ ;;
- esac
+ test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
- ac_cv_path_PKG_CONFIG="$as_dir$ac_word$ac_exec_ext"
- printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
 fi
 done
@@ -21210,11 +19923,11 @@
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 if test -n "$PKG_CONFIG"; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-printf "%s\n" "$PKG_CONFIG" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
 else
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -21223,12 +19936,11 @@
 ac_pt_PKG_CONFIG=$PKG_CONFIG
 # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_path_ac_pt_PKG_CONFIG+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 case $ac_pt_PKG_CONFIG in
 \\/* | ?:\\/*)
 ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
@@ -21238,15 +19950,11 @@
 for as_dir in $PATH
 do
 IFS=$as_save_IFS
- case $as_dir in #(((
- '') as_dir=./ ;;
- */) ;;
- *) as_dir=$as_dir/ ;;
- esac
+ test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
- ac_cv_path_ac_pt_PKG_CONFIG="$as_dir$ac_word$ac_exec_ext"
- printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
 fi
 done
@@ -21258,11 +19966,11 @@
 fi
 ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
 if test -n "$ac_pt_PKG_CONFIG"; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
-printf "%s\n" "$ac_pt_PKG_CONFIG" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
+$as_echo "$ac_pt_PKG_CONFIG" >&6; }
 else
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 if test "x$ac_pt_PKG_CONFIG" = x; then
@@ -21270,8 +19978,8 @@
 else
 case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
 PKG_CONFIG=$ac_pt_PKG_CONFIG
@@ -21283,14 +19991,14 @@
 fi
 if test -n "$PKG_CONFIG"; then
 	_pkg_min_version=0.9.0
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
-printf %s "checking pkg-config is at least version $_pkg_min_version... " >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
+$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
 	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 	else
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 		PKG_CONFIG=""
 	fi
 fi
@@ -21314,46 +20022,43 @@
 	*)	unixdef="yes" ;;
 esac
 # Check whether --enable-unix-transport was given.
-if test ${enable_unix_transport+y}
-then :
+if test "${enable_unix_transport+set}" = set; then :
 enableval=$enable_unix_transport; UNIXCONN=$enableval
-else $as_nop
+else
 UNIXCONN=$unixdef
 fi
 
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if Xtrans should support UNIX socket connections" >&5
-printf %s "checking if Xtrans should support UNIX socket connections... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if Xtrans should support UNIX socket connections" >&5
+$as_echo_n "checking if Xtrans should support UNIX socket connections... " >&6; }
 if test "$UNIXCONN" = "yes"; then
 
-printf "%s\n" "#define UNIXCONN 1" >>confdefs.h
+$as_echo "#define UNIXCONN 1" >>confdefs.h
 
 fi
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $UNIXCONN" >&5
-printf "%s\n" "$UNIXCONN" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $UNIXCONN" >&5
+$as_echo "$UNIXCONN" >&6; }
 # Check whether --enable-tcp-transport was given.
-if test ${enable_tcp_transport+y}
-then :
+if test "${enable_tcp_transport+set}" = set; then :
 enableval=$enable_tcp_transport; TCPCONN=$enableval
-else $as_nop
+else
 TCPCONN=yes
 fi
 
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if Xtrans should support TCP socket connections" >&5
-printf %s "checking if Xtrans should support TCP socket connections... " >&6; }
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $TCPCONN" >&5
-printf "%s\n" "$TCPCONN" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if Xtrans should support TCP socket connections" >&5
+$as_echo_n "checking if Xtrans should support TCP socket connections... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TCPCONN" >&5
+$as_echo "$TCPCONN" >&6; }
 if test "$TCPCONN" = "yes"; then
 
-printf "%s\n" "#define TCPCONN 1" >>confdefs.h
+$as_echo "#define TCPCONN 1" >>confdefs.h
 
 
 # SVR4 hides these in libraries other than libc
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing socket" >&5
-printf %s "checking for library containing socket... " >&6; }
-if test ${ac_cv_search_socket+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing socket" >&5
+$as_echo_n "checking for library containing socket... " >&6; }
+if ${ac_cv_search_socket+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 ac_func_search_save_LIBS=$LIBS
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
@@ -21361,58 +20066,55 @@
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
 builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
 char socket ();
 int
-main (void)
+main ()
 {
 return socket ();
 ;
 return 0;
 }
 _ACEOF
-for ac_lib in '' socket
-do
+for ac_lib in '' socket; do
 if test -z "$ac_lib"; then
 ac_res="none required"
 else
 ac_res=-l$ac_lib
 LIBS="-l$ac_lib $ac_func_search_save_LIBS"
 fi
- if ac_fn_c_try_link "$LINENO"
-then :
+ if ac_fn_c_try_link "$LINENO"; then :
 ac_cv_search_socket=$ac_res
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
 conftest$ac_exeext
- if test ${ac_cv_search_socket+y}
-then :
+ if ${ac_cv_search_socket+:} false; then :
 break
 fi
 done
-if test ${ac_cv_search_socket+y}
-then :
+if ${ac_cv_search_socket+:} false; then :
 
-else $as_nop
+else
 ac_cv_search_socket=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_socket" >&5
-printf "%s\n" "$ac_cv_search_socket" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_socket" >&5
+$as_echo "$ac_cv_search_socket" >&6; }
 ac_res=$ac_cv_search_socket
-if test "$ac_res" != no
-then :
+if test "$ac_res" != no; then :
 test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
 fi
 
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing gethostbyname" >&5
-printf %s "checking for library containing gethostbyname... " >&6; }
-if test ${ac_cv_search_gethostbyname+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing gethostbyname" >&5
+$as_echo_n "checking for library containing gethostbyname... " >&6; }
+if ${ac_cv_search_gethostbyname+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 ac_func_search_save_LIBS=$LIBS
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
@@ -21420,59 +20122,56 @@
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
 builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
 char gethostbyname ();
 int
-main (void)
+main ()
 {
 return gethostbyname ();
 ;
 return 0;
 }
 _ACEOF
-for ac_lib in '' nsl
-do
+for ac_lib in '' nsl; do
 if test -z "$ac_lib"; then
 ac_res="none required"
 else
 ac_res=-l$ac_lib
 LIBS="-l$ac_lib $ac_func_search_save_LIBS"
 fi
- if ac_fn_c_try_link "$LINENO"
-then :
+ if ac_fn_c_try_link "$LINENO"; then :
 ac_cv_search_gethostbyname=$ac_res
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
 conftest$ac_exeext
- if test ${ac_cv_search_gethostbyname+y}
-then :
+ if ${ac_cv_search_gethostbyname+:} false; then :
 break
 fi
 done
-if test ${ac_cv_search_gethostbyname+y}
-then :
+if ${ac_cv_search_gethostbyname+:} false; then :
 
-else $as_nop
+else
 ac_cv_search_gethostbyname=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_gethostbyname" >&5
-printf "%s\n" "$ac_cv_search_gethostbyname" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_gethostbyname" >&5
+$as_echo "$ac_cv_search_gethostbyname" >&6; }
 ac_res=$ac_cv_search_gethostbyname
-if test "$ac_res" != no
-then :
+if test "$ac_res" != no; then :
 test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
 fi
 
 if test "$ac_cv_search_socket$ac_cv_search_gethostbyname" = "nono"; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for main in -lws2_32" >&5
-printf %s "checking for main in -lws2_32... " >&6; }
-if test ${ac_cv_lib_ws2_32_main+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lws2_32" >&5
+$as_echo_n "checking for main in -lws2_32... " >&6; }
+if ${ac_cv_lib_ws2_32_main+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 ac_check_lib_save_LIBS=$LIBS
 LIBS="-lws2_32 $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -21480,28 +20179,28 @@
 
 
 int
-main (void)
+main ()
 {
 return main ();
 ;
 return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 ac_cv_lib_ws2_32_main=yes
-else $as_nop
+else
 ac_cv_lib_ws2_32_main=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ws2_32_main" >&5
-printf "%s\n" "$ac_cv_lib_ws2_32_main" >&6; }
-if test "x$ac_cv_lib_ws2_32_main" = xyes
-then :
- printf "%s\n" "#define HAVE_LIBWS2_32 1" >>confdefs.h
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ws2_32_main" >&5
+$as_echo "$ac_cv_lib_ws2_32_main" >&6; }
+if test "x$ac_cv_lib_ws2_32_main" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBWS2_32 1
+_ACEOF
 
 LIBS="-lws2_32 $LIBS"
 
@@ -21511,29 +20210,27 @@
 
 # Needs to come after above checks for libsocket & libnsl for SVR4 systems
 # Check whether --enable-ipv6 was given.
-if test ${enable_ipv6+y}
-then :
+if test "${enable_ipv6+set}" = set; then :
 enableval=$enable_ipv6; IPV6CONN=$enableval
-else $as_nop
+else
 ac_fn_c_check_func "$LINENO" "getaddrinfo" "ac_cv_func_getaddrinfo"
-if test "x$ac_cv_func_getaddrinfo" = xyes
-then :
+if test "x$ac_cv_func_getaddrinfo" = xyes; then :
 IPV6CONN=yes
-else $as_nop
+else
 IPV6CONN=no
 fi
 
 fi
 
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if IPv6 support should be built" >&5
-printf %s "checking if IPv6 support should be built... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if IPv6 support should be built" >&5
+$as_echo_n "checking if IPv6 support should be built... " >&6; }
 if test "$IPV6CONN" = "yes"; then
 
-printf "%s\n" "#define IPv6 1" >>confdefs.h
+$as_echo "#define IPv6 1" >>confdefs.h
 
 fi
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $IPV6CONN" >&5
-printf "%s\n" "$IPV6CONN" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IPV6CONN" >&5
+$as_echo "$IPV6CONN" >&6; }
 
 # 4.3BSD-Reno added a new member to struct sockaddr_in
 ac_fn_c_check_member "$LINENO" "struct sockaddr_in" "sin_len" "ac_cv_member_struct_sockaddr_in_sin_len" "
@@ -21542,10 +20239,9 @@
 #include <netinet/in.h>
 
 "
-if test "x$ac_cv_member_struct_sockaddr_in_sin_len" = xyes
-then :
+if test "x$ac_cv_member_struct_sockaddr_in_sin_len" = xyes; then :
 
-printf "%s\n" "#define BSD44SOCKETS 1" >>confdefs.h
+$as_echo "#define BSD44SOCKETS 1" >>confdefs.h
 
 fi
 
@@ -21555,10 +20251,11 @@
 $ac_includes_default
 #include <sys/socket.h>
 "
-if test "x$ac_cv_type_socklen_t" = xyes
-then :
+if test "x$ac_cv_type_socklen_t" = xyes; then :
 
-printf "%s\n" "#define HAVE_SOCKLEN_T 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define HAVE_SOCKLEN_T 1
+_ACEOF
 
 
 fi
@@ -21571,26 +20268,24 @@
 #include <sys/socket.h>
 
 "
-if test "x$ac_cv_member_struct_msghdr_msg_control" = xyes
-then :
+if test "x$ac_cv_member_struct_msghdr_msg_control" = xyes; then :
 
 fi
 
 # First try for Solaris in C99 compliant mode, which requires XPG6/UNIX03
 if test "x$ac_cv_member_struct_msghdr_msg_control" = xno; then
 unset ac_cv_member_struct_msghdr_msg_control
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: trying again with _XOPEN_SOURCE=600" >&5
-printf "%s\n" "$as_me: trying again with _XOPEN_SOURCE=600" >&6;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: trying again with _XOPEN_SOURCE=600" >&5
+$as_echo "$as_me: trying again with _XOPEN_SOURCE=600" >&6;}
 ac_fn_c_check_member "$LINENO" "struct msghdr" "msg_control" "ac_cv_member_struct_msghdr_msg_control" "
 #define _XOPEN_SOURCE 600
 $ac_includes_default
 #include <sys/socket.h>
 
 "
-if test "x$ac_cv_member_struct_msghdr_msg_control" = xyes
-then :
+if test "x$ac_cv_member_struct_msghdr_msg_control" = xyes; then :
 
-printf "%s\n" "#define _XOPEN_SOURCE 600" >>confdefs.h
+$as_echo "#define _XOPEN_SOURCE 600" >>confdefs.h
 
 
 fi
@@ -21599,18 +20294,17 @@
 # If that didn't work, fall back to XPG5/UNIX98 with C89
 if test "x$ac_cv_member_struct_msghdr_msg_control" = xno; then
 unset ac_cv_member_struct_msghdr_msg_control
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: trying again with _XOPEN_SOURCE=500" >&5
-printf "%s\n" "$as_me: trying again with _XOPEN_SOURCE=500" >&6;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: trying again with _XOPEN_SOURCE=500" >&5
+$as_echo "$as_me: trying again with _XOPEN_SOURCE=500" >&6;}
 ac_fn_c_check_member "$LINENO" "struct msghdr" "msg_control" "ac_cv_member_struct_msghdr_msg_control" "
 #define _XOPEN_SOURCE 500
 $ac_includes_default
 #include <sys/socket.h>
 
 "
-if test "x$ac_cv_member_struct_msghdr_msg_control" = xyes
-then :
+if test "x$ac_cv_member_struct_msghdr_msg_control" = xyes; then :
 
-printf "%s\n" "#define _XOPEN_SOURCE 500" >>confdefs.h
+$as_echo "#define _XOPEN_SOURCE 500" >>confdefs.h
 
 
 fi
@@ -21621,53 +20315,36 @@
 
 fi
 case $host_os in
-	solaris*)		localdef="yes" ;;
+	solaris*|sco*|sysv4*)	localdef="yes" ;;
 	*)			localdef="no" ;;
 esac
 # Check whether --enable-local-transport was given.
-if test ${enable_local_transport+y}
-then :
+if test "${enable_local_transport+set}" = set; then :
 enableval=$enable_local_transport; LOCALCONN=$enableval
-else $as_nop
+else
 LOCALCONN=$localdef
 fi
 
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if Xtrans should support os-specific local connections" >&5
-printf %s "checking if Xtrans should support os-specific local connections... " >&6; }
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LOCALCONN" >&5
-printf "%s\n" "$LOCALCONN" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if Xtrans should support os-specific local connections" >&5
+$as_echo_n "checking if Xtrans should support os-specific local connections... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LOCALCONN" >&5
+$as_echo "$LOCALCONN" >&6; }
 if test "$LOCALCONN" = "yes"; then
 
-printf "%s\n" "#define LOCALCONN 1" >>confdefs.h
+$as_echo "#define LOCALCONN 1" >>confdefs.h
 
 fi
 
- # Other functions Xtrans may need
- ac_fn_c_check_func "$LINENO" "strcasecmp" "ac_cv_func_strcasecmp"
-if test "x$ac_cv_func_strcasecmp" = xyes
-then :
- printf "%s\n" "#define HAVE_STRCASECMP 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "strlcpy" "ac_cv_func_strlcpy"
-if test "x$ac_cv_func_strlcpy" = xyes
-then :
- printf "%s\n" "#define HAVE_STRLCPY 1" >>confdefs.h
-
-fi
-
-
 
 
 # Check for dlopen
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if run-time linking is supported" >&5
-printf %s "checking if run-time linking is supported... " >&6; }
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing dlopen" >&5
-printf %s "checking for library containing dlopen... " >&6; }
-if test ${ac_cv_search_dlopen+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if run-time linking is supported" >&5
+$as_echo_n "checking if run-time linking is supported... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing dlopen" >&5
+$as_echo_n "checking for library containing dlopen... " >&6; }
+if ${ac_cv_search_dlopen+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 ac_func_search_save_LIBS=$LIBS
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
@@ -21675,59 +20352,56 @@
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
 builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
 char dlopen ();
 int
-main (void)
+main ()
 {
 return dlopen ();
 ;
 return 0;
 }
 _ACEOF
-for ac_lib in '' dl svld
-do
+for ac_lib in '' dl svld; do
 if test -z "$ac_lib"; then
 ac_res="none required"
 else
 ac_res=-l$ac_lib
 LIBS="-l$ac_lib $ac_func_search_save_LIBS"
 fi
- if ac_fn_c_try_link "$LINENO"
-then :
+ if ac_fn_c_try_link "$LINENO"; then :
 ac_cv_search_dlopen=$ac_res
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
 conftest$ac_exeext
- if test ${ac_cv_search_dlopen+y}
-then :
+ if ${ac_cv_search_dlopen+:} false; then :
 break
 fi
 done
-if test ${ac_cv_search_dlopen+y}
-then :
+if ${ac_cv_search_dlopen+:} false; then :
 
-else $as_nop
+else
 ac_cv_search_dlopen=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_dlopen" >&5
-printf "%s\n" "$ac_cv_search_dlopen" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_dlopen" >&5
+$as_echo "$ac_cv_search_dlopen" >&6; }
 ac_res=$ac_cv_search_dlopen
-if test "$ac_res" != no
-then :
+if test "$ac_res" != no; then :
 test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
 fi
 
 if test "x$ac_cv_search_dlopen" = xno; then
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing shl_load" >&5
-printf %s "checking for library containing shl_load... " >&6; }
-if test ${ac_cv_search_shl_load+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing shl_load" >&5
+$as_echo_n "checking for library containing shl_load... " >&6; }
+if ${ac_cv_search_shl_load+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 ac_func_search_save_LIBS=$LIBS
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
@@ -21735,91 +20409,98 @@
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
 builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
 char shl_load ();
 int
-main (void)
+main ()
 {
 return shl_load ();
 ;
 return 0;
 }
 _ACEOF
-for ac_lib in '' dld
-do
+for ac_lib in '' dld; do
 if test -z "$ac_lib"; then
 ac_res="none required"
 else
 ac_res=-l$ac_lib
 LIBS="-l$ac_lib $ac_func_search_save_LIBS"
 fi
- if ac_fn_c_try_link "$LINENO"
-then :
+ if ac_fn_c_try_link "$LINENO"; then :
 ac_cv_search_shl_load=$ac_res
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
 conftest$ac_exeext
- if test ${ac_cv_search_shl_load+y}
-then :
+ if ${ac_cv_search_shl_load+:} false; then :
 break
 fi
 done
-if test ${ac_cv_search_shl_load+y}
-then :
+if ${ac_cv_search_shl_load+:} false; then :
 
-else $as_nop
+else
 ac_cv_search_shl_load=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_shl_load" >&5
-printf "%s\n" "$ac_cv_search_shl_load" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_shl_load" >&5
+$as_echo "$ac_cv_search_shl_load" >&6; }
 ac_res=$ac_cv_search_shl_load
-if test "$ac_res" != no
-then :
+if test "$ac_res" != no; then :
 test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
 fi
 
 	if test "x$ac_cv_search_shl_load" != xno; then
 
-printf "%s\n" "#define HAVE_SHL_LOAD 1" >>confdefs.h
+$as_echo "#define HAVE_SHL_LOAD 1" >>confdefs.h
 
-		ac_fn_c_check_header_compile "$LINENO" "dl.h" "ac_cv_header_dl_h" "$ac_includes_default"
-if test "x$ac_cv_header_dl_h" = xyes
-then :
- printf "%s\n" "#define HAVE_DL_H 1" >>confdefs.h
+		for ac_header in dl.h
+do :
+ ac_fn_c_check_header_mongrel "$LINENO" "dl.h" "ac_cv_header_dl_h" "$ac_includes_default"
+if test "x$ac_cv_header_dl_h" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_DL_H 1
+_ACEOF
 
 fi
 
+done
+
 	fi
 else
 
-printf "%s\n" "#define HAVE_DLOPEN 1" >>confdefs.h
+$as_echo "#define HAVE_DLOPEN 1" >>confdefs.h
 
-	ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default"
-if test "x$ac_cv_header_dlfcn_h" = xyes
-then :
- printf "%s\n" "#define HAVE_DLFCN_H 1" >>confdefs.h
+	for ac_header in dlfcn.h
+do :
+ ac_fn_c_check_header_mongrel "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default"
+if test "x$ac_cv_header_dlfcn_h" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_DLFCN_H 1
+_ACEOF
 
 fi
 
+done
+
 fi
 if test "x$ac_cv_header_dlfcn_h" = xyes -o "x$ac_cv_header_dl_h" = xyes; then
 	HAVE_LOADABLE_MODULES=yes
 else
 	HAVE_LOADABLE_MODULES=no
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $HAVE_LOADABLE_MODULES" >&5
-printf "%s\n" "$HAVE_LOADABLE_MODULES" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $HAVE_LOADABLE_MODULES" >&5
+$as_echo "$HAVE_LOADABLE_MODULES" >&6; }
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if loadable i18n module support should be enabled" >&5
-printf %s "checking if loadable i18n module support should be enabled... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if loadable i18n module support should be enabled" >&5
+$as_echo_n "checking if loadable i18n module support should be enabled... " >&6; }
 # Check whether --enable-loadable-i18n was given.
-if test ${enable_loadable_i18n+y}
-then :
+if test "${enable_loadable_i18n+set}" = set; then :
 enableval=$enable_loadable_i18n; XLIB_LOADABLE_I18N=$enableval
-else $as_nop
+else
 XLIB_LOADABLE_I18N="no"
 fi
 
@@ -21828,13 +20509,13 @@
 		as_fn_error $? "Loadable module support is required to enable loadable i18n module support" "$LINENO" 5
 	fi
 
-printf "%s\n" "#define USE_DYNAMIC_LC 1" >>confdefs.h
+$as_echo "#define USE_DYNAMIC_LC 1" >>confdefs.h
 
 	I18N_MODULE_LIBS='${top_builddir}/src/libX11.la'
 
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $XLIB_LOADABLE_I18N" >&5
-printf "%s\n" "$XLIB_LOADABLE_I18N" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $XLIB_LOADABLE_I18N" >&5
+$as_echo "$XLIB_LOADABLE_I18N" >&6; }
 
 if test x$XLIB_LOADABLE_I18N = xyes; then
 XLIB_LOADABLE_I18N_TRUE=
@@ -21845,81 +20526,66 @@
 fi
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if loadable Xcursor library support should be enabled" >&5
-printf %s "checking if loadable Xcursor library support should be enabled... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if loadable Xcursor library support should be enabled" >&5
+$as_echo_n "checking if loadable Xcursor library support should be enabled... " >&6; }
 # Check whether --enable-loadable-xcursor was given.
-if test ${enable_loadable_xcursor+y}
-then :
+if test "${enable_loadable_xcursor+set}" = set; then :
 enableval=$enable_loadable_xcursor; XLIB_LOADABLE_XCURSOR=$enableval
-else $as_nop
+else
 XLIB_LOADABLE_XCURSOR=$HAVE_LOADABLE_MODULES
 fi
 
 if test x$XLIB_LOADABLE_XCURSOR = xyes; then
 
-printf "%s\n" "#define USE_DYNAMIC_XCURSOR 1" >>confdefs.h
+$as_echo "#define USE_DYNAMIC_XCURSOR 1" >>confdefs.h
 
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $XLIB_LOADABLE_XCURSOR" >&5
-printf "%s\n" "$XLIB_LOADABLE_XCURSOR" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $XLIB_LOADABLE_XCURSOR" >&5
+$as_echo "$XLIB_LOADABLE_XCURSOR" >&6; }
 
 # Check whether --enable-thread-safety-constructor was given.
-if test ${enable_thread_safety_constructor+y}
-then :
+if test "${enable_thread_safety_constructor+set}" = set; then :
 enableval=$enable_thread_safety_constructor; USE_THREAD_SAFETY_CONSTRUCTOR=$enableval
-else $as_nop
+else
 USE_THREAD_SAFETY_CONSTRUCTOR="yes"
 fi
 
 if test "x$USE_THREAD_SAFETY_CONSTRUCTOR" = "xyes"; then
 
-printf "%s\n" "#define USE_THREAD_SAFETY_CONSTRUCTOR 1" >>confdefs.h
+$as_echo "#define USE_THREAD_SAFETY_CONSTRUCTOR 1" >>confdefs.h
 
 fi
 
 # Checks for header files.
-ac_fn_c_check_header_compile "$LINENO" "sys/filio.h" "ac_cv_header_sys_filio_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_filio_h" = xyes
-then :
- printf "%s\n" "#define HAVE_SYS_FILIO_H 1" >>confdefs.h
-
-fi
-ac_fn_c_check_header_compile "$LINENO" "sys/select.h" "ac_cv_header_sys_select_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_select_h" = xyes
-then :
- printf "%s\n" "#define HAVE_SYS_SELECT_H 1" >>confdefs.h
-
-fi
-ac_fn_c_check_header_compile "$LINENO" "sys/ioctl.h" "ac_cv_header_sys_ioctl_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_ioctl_h" = xyes
-then :
- printf "%s\n" "#define HAVE_SYS_IOCTL_H 1" >>confdefs.h
+for ac_header in sys/filio.h sys/select.h sys/ioctl.h sys/socket.h
+do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
 
 fi
-ac_fn_c_check_header_compile "$LINENO" "sys/socket.h" "ac_cv_header_sys_socket_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_socket_h" = xyes
-then :
- printf "%s\n" "#define HAVE_SYS_SOCKET_H 1" >>confdefs.h
 
-fi
+done
 
 
 # Checks for typedefs, structures, and compiler characteristics.
 
 
 
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __builtin_popcountl" >&5
-printf %s "checking for __builtin_popcountl... " >&6; }
-if test ${ax_cv_have___builtin_popcountl+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __builtin_popcountl" >&5
+$as_echo_n "checking for __builtin_popcountl... " >&6; }
+if ${ax_cv_have___builtin_popcountl+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 
 int
-main (void)
+main ()
 {
 
 __builtin_popcountl(0)
@@ -21928,23 +20594,23 @@
 return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 ax_cv_have___builtin_popcountl=yes
-else $as_nop
+else
 ax_cv_have___builtin_popcountl=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
 conftest$ac_exeext conftest.$ac_ext
 
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_have___builtin_popcountl" >&5
-printf "%s\n" "$ax_cv_have___builtin_popcountl" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_have___builtin_popcountl" >&5
+$as_echo "$ax_cv_have___builtin_popcountl" >&6; }
 
- if test yes = $ax_cv_have___builtin_popcountl
-then :
+ if test yes = $ax_cv_have___builtin_popcountl; then :
 
-printf "%s\n" "#define HAVE___BUILTIN_POPCOUNTL 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define HAVE___BUILTIN_POPCOUNTL 1
+_ACEOF
 
 fi
 
@@ -21952,25 +20618,23 @@
 
 
 # Checks for library functions.
-ac_fn_c_check_func "$LINENO" "strtol" "ac_cv_func_strtol"
-if test "x$ac_cv_func_strtol" = xyes
-then :
- printf "%s\n" "#define HAVE_STRTOL 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "seteuid" "ac_cv_func_seteuid"
-if test "x$ac_cv_func_seteuid" = xyes
-then :
- printf "%s\n" "#define HAVE_SETEUID 1" >>confdefs.h
+for ac_func in strtol seteuid
+do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
 
 fi
+done
 
 ac_fn_c_check_func "$LINENO" "reallocarray" "ac_cv_func_reallocarray"
-if test "x$ac_cv_func_reallocarray" = xyes
-then :
- printf "%s\n" "#define HAVE_REALLOCARRAY 1" >>confdefs.h
+if test "x$ac_cv_func_reallocarray" = xyes; then :
+ $as_echo "#define HAVE_REALLOCARRAY 1" >>confdefs.h
 
-else $as_nop
+else
 case " $LIBOBJS " in
 *" reallocarray.$ac_objext "* ) ;;
 *) LIBOBJS="$LIBOBJS reallocarray.$ac_objext"
@@ -21979,40 +20643,38 @@
 
 fi
 
+
 # Used in lcFile.c (see also --enable-xlocaledir settings below)
 XLOCALEDIR_IS_SAFE="no"
-ac_fn_check_decl "$LINENO" "issetugid" "ac_cv_have_decl_issetugid" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
-if test "x$ac_cv_have_decl_issetugid" = xyes
-then :
+ac_fn_c_check_decl "$LINENO" "issetugid" "ac_cv_have_decl_issetugid" "$ac_includes_default"
+if test "x$ac_cv_have_decl_issetugid" = xyes; then :
 
 fi
+
 ac_fn_c_check_func "$LINENO" "issetugid" "ac_cv_func_issetugid"
-if test "x$ac_cv_func_issetugid" = xyes
-then :
+if test "x$ac_cv_func_issetugid" = xyes; then :
 
 fi
 
 if test "$ac_cv_have_decl_issetugid" = yes && test "$ac_cv_func_issetugid" = yes; then
 XLOCALEDIR_IS_SAFE="yes"
 
-printf "%s\n" "#define HASSETUGID 1" >>confdefs.h
+$as_echo "#define HASSETUGID 1" >>confdefs.h
 
 fi
 ac_fn_c_check_func "$LINENO" "getresuid" "ac_cv_func_getresuid"
-if test "x$ac_cv_func_getresuid" = xyes
-then :
+if test "x$ac_cv_func_getresuid" = xyes; then :
 XLOCALEDIR_IS_SAFE="yes"
 
-printf "%s\n" "#define HASGETRESUID 1" >>confdefs.h
+$as_echo "#define HASGETRESUID 1" >>confdefs.h
 
 fi
 
 # Used in Font.c
 ac_fn_c_check_func "$LINENO" "shmat" "ac_cv_func_shmat"
-if test "x$ac_cv_func_shmat" = xyes
-then :
+if test "x$ac_cv_func_shmat" = xyes; then :
 
-printf "%s\n" "#define HAS_SHM 1" >>confdefs.h
+$as_echo "#define HAS_SHM 1" >>confdefs.h
 
 fi
 
@@ -22039,10 +20701,9 @@
 
 
 # Check whether --with-launchd was given.
-if test ${with_launchd+y}
-then :
+if test "${with_launchd+set}" = set; then :
 withval=$with_launchd; LAUNCHD=$withval
-else $as_nop
+else
 LAUNCHD=auto
 fi
 
@@ -22050,12 +20711,11 @@
 	unset LAUNCHD
 	# Extract the first word of "launchd", so it can be a program name with args.
 set dummy launchd; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_LAUNCHD+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_LAUNCHD+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 if test -n "$LAUNCHD"; then
 ac_cv_prog_LAUNCHD="$LAUNCHD" # Let the user override the test.
 else
@@ -22063,15 +20723,11 @@
 for as_dir in $PATH$PATH_SEPARATOR/sbin
 do
 IFS=$as_save_IFS
- case $as_dir in #(((
- '') as_dir=./ ;;
- */) ;;
- *) as_dir=$as_dir/ ;;
- esac
+ test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 ac_cv_prog_LAUNCHD="yes"
- printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
 fi
 done
@@ -22083,11 +20739,11 @@
 fi
 LAUNCHD=$ac_cv_prog_LAUNCHD
 if test -n "$LAUNCHD"; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LAUNCHD" >&5
-printf "%s\n" "$LAUNCHD" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LAUNCHD" >&5
+$as_echo "$LAUNCHD" >&6; }
 else
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -22095,28 +20751,26 @@
 
 if test "x$LAUNCHD" = xyes ; then
 
-printf "%s\n" "#define HAVE_LAUNCHD 1" >>confdefs.h
+$as_echo "#define HAVE_LAUNCHD 1" >>confdefs.h
 
 
-printf "%s\n" "#define TRANS_REOPEN 1" >>confdefs.h
+$as_echo "#define TRANS_REOPEN 1" >>confdefs.h
 
 fi
 
 # Check whether --enable-xthreads was given.
-if test ${enable_xthreads+y}
-then :
+if test "${enable_xthreads+set}" = set; then :
 enableval=$enable_xthreads; xthreads=$enableval
-else $as_nop
+else
 xthreads=yes
 fi
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for getpwuid_r in -lc" >&5
-printf %s "checking for getpwuid_r in -lc... " >&6; }
-if test ${ac_cv_lib_c_getpwuid_r+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for getpwuid_r in -lc" >&5
+$as_echo_n "checking for getpwuid_r in -lc... " >&6; }
+if ${ac_cv_lib_c_getpwuid_r+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 ac_check_lib_save_LIBS=$LIBS
 LIBS="-lc $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -22125,31 +20779,32 @@
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
 builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
 char getpwuid_r ();
 int
-main (void)
+main ()
 {
 return getpwuid_r ();
 ;
 return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 ac_cv_lib_c_getpwuid_r=yes
-else $as_nop
+else
 ac_cv_lib_c_getpwuid_r=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
 conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_getpwuid_r" >&5
-printf "%s\n" "$ac_cv_lib_c_getpwuid_r" >&6; }
-if test "x$ac_cv_lib_c_getpwuid_r" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_getpwuid_r" >&5
+$as_echo "$ac_cv_lib_c_getpwuid_r" >&6; }
+if test "x$ac_cv_lib_c_getpwuid_r" = xyes; then :
 mtsafeapi="yes"
-else $as_nop
+else
 mtsafeapi="no"
 fi
 
@@ -22157,12 +20812,12 @@
 case x$xthreads in
 xyes)
 
-printf "%s\n" "#define XTHREADS 1" >>confdefs.h
+$as_echo "#define XTHREADS 1" >>confdefs.h
 
 	if test x$mtsafeapi = xyes
 	then
 
-printf "%s\n" "#define XUSE_MTSAFE_API 1" >>confdefs.h
+$as_echo "#define XUSE_MTSAFE_API 1" >>confdefs.h
 
 	fi
 	;;
@@ -22170,57 +20825,6 @@
 	;;
 esac
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pthread_self in -lc" >&5
-printf %s "checking for pthread_self in -lc... " >&6; }
-if test ${ac_cv_lib_c_pthread_self+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lc $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char pthread_self ();
-int
-main (void)
-{
-return pthread_self ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
- ac_cv_lib_c_pthread_self=yes
-else $as_nop
- ac_cv_lib_c_pthread_self=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_pthread_self" >&5
-printf "%s\n" "$ac_cv_lib_c_pthread_self" >&6; }
-if test "x$ac_cv_lib_c_pthread_self" = xyes
-then :
- thrstubs="no"
-else $as_nop
- thrstubs="yes"
-fi
-
- if test x$thrstubs = xyes; then
- THRSTUBS_TRUE=
- THRSTUBS_FALSE='#'
-else
- THRSTUBS_TRUE='#'
- THRSTUBS_FALSE=
-fi
-
-
 # XXX incomplete, please fill this in
 if test x$xthreads = xyes ; then
 case $host_os in
@@ -22241,11 +20845,21 @@
 
 
 
+if test "x$USE_THREAD_SAFETY_CONSTRUCTOR" = "xyes"; then
+ USE_THREAD_LIBS="$XTHREADLIB"
+else
+ # This should be kept in sync with libxcb
+ case $host_os in
+ linux*|darwin*|solaris*) ;;
+ *) X11_REQUIRES="$X11_REQUIRES pthread-stubs" ;;
+ esac
+fi
+
+
 ac_fn_c_check_func "$LINENO" "poll" "ac_cv_func_poll"
-if test "x$ac_cv_func_poll" = xyes
-then :
+if test "x$ac_cv_func_poll" = xyes; then :
 
-printf "%s\n" "#define USE_POLL 1" >>confdefs.h
+$as_echo "#define USE_POLL 1" >>confdefs.h
 
 fi
 
@@ -22253,14 +20867,13 @@
 #
 # Find keysymdef.h
 #
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking keysym definitions" >&5
-printf %s "checking keysym definitions... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking keysym definitions" >&5
+$as_echo_n "checking keysym definitions... " >&6; }
 
 # Check whether --with-keysymdefdir was given.
-if test ${with_keysymdefdir+y}
-then :
+if test "${with_keysymdefdir+set}" = set; then :
 withval=$with_keysymdefdir; KEYSYMDEFDIR=$withval
-else $as_nop
+else
 KEYSYMDEFDIR=`$PKG_CONFIG --variable=includedir xproto`/X11
 fi
 
@@ -22277,15 +20890,14 @@
 	 as_fn_error $? "Cannot find keysymdef.h" "$LINENO" 5
 fi
 done
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $KEYSYMDEFS" >&5
-printf "%s\n" "$KEYSYMDEFS" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $KEYSYMDEFS" >&5
+$as_echo "$KEYSYMDEFS" >&6; }
 
 
 # Check whether --enable-xcms was given.
-if test ${enable_xcms+y}
-then :
+if test "${enable_xcms+set}" = set; then :
 enableval=$enable_xcms; XCMS=$enableval
-else $as_nop
+else
 XCMS=yes
 fi
 
@@ -22299,15 +20911,14 @@
 
 if test x"$XCMS" = "xyes"; then
 
-printf "%s\n" "#define XCMS 1" >>confdefs.h
+$as_echo "#define XCMS 1" >>confdefs.h
 
 fi
 
 # Check whether --enable-xlocale was given.
-if test ${enable_xlocale+y}
-then :
+if test "${enable_xlocale+set}" = set; then :
 enableval=$enable_xlocale; XLOCALE=$enableval
-else $as_nop
+else
 XLOCALE=yes
 fi
 
@@ -22322,53 +20933,51 @@
 
 if test x"$XLOCALE" = "xyes"; then
 
-printf "%s\n" "#define XLOCALE 1" >>confdefs.h
+$as_echo "#define XLOCALE 1" >>confdefs.h
 
 fi
 
 # This disables XLOCALEDIR. Set it if you're using BuildLoadableXlibI18n,
 # don't have either issetugid() or getresuid(), and you need to protect
 # clients that are setgid or setuid to an id other than 0.
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if XLOCALEDIR support should be enabled" >&5
-printf %s "checking if XLOCALEDIR support should be enabled... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if XLOCALEDIR support should be enabled" >&5
+$as_echo_n "checking if XLOCALEDIR support should be enabled... " >&6; }
 # Check whether --enable-xlocaledir was given.
-if test ${enable_xlocaledir+y}
-then :
+if test "${enable_xlocaledir+set}" = set; then :
 enableval=$enable_xlocaledir; ENABLE_XLOCALEDIR=$enableval
-else $as_nop
+else
 ENABLE_XLOCALEDIR=$XLOCALEDIR_IS_SAFE
 fi
 
 if test "x$ENABLE_XLOCALEDIR" = "xno"; then
 
-printf "%s\n" "#define NO_XLOCALEDIR 1" >>confdefs.h
+$as_echo "#define NO_XLOCALEDIR 1" >>confdefs.h
 
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ENABLE_XLOCALEDIR" >&5
-printf "%s\n" "$ENABLE_XLOCALEDIR" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ENABLE_XLOCALEDIR" >&5
+$as_echo "$ENABLE_XLOCALEDIR" >&6; }
 
 # Check whether --enable-xf86bigfont was given.
-if test ${enable_xf86bigfont+y}
-then :
+if test "${enable_xf86bigfont+set}" = set; then :
 enableval=$enable_xf86bigfont; XF86BIGFONT=$enableval
-else $as_nop
+else
 XF86BIGFONT="yes"
 fi
 
 if test "x$XF86BIGFONT" = "xyes"; then
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for BIGFONT" >&5
-printf %s "checking for BIGFONT... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BIGFONT" >&5
+$as_echo_n "checking for BIGFONT... " >&6; }
 
 if test -n "$BIGFONT_CFLAGS"; then
 pkg_cv_BIGFONT_CFLAGS="$BIGFONT_CFLAGS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xf86bigfontproto >= 1.2.0\""; } >&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xf86bigfontproto >= 1.2.0\""; } >&5
 ($PKG_CONFIG --exists --print-errors "xf86bigfontproto >= 1.2.0") 2>&5
 ac_status=$?
- printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
 pkg_cv_BIGFONT_CFLAGS=`$PKG_CONFIG --cflags "xf86bigfontproto >= 1.2.0" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
@@ -22382,10 +20991,10 @@
 pkg_cv_BIGFONT_LIBS="$BIGFONT_LIBS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xf86bigfontproto >= 1.2.0\""; } >&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xf86bigfontproto >= 1.2.0\""; } >&5
 ($PKG_CONFIG --exists --print-errors "xf86bigfontproto >= 1.2.0") 2>&5
 ac_status=$?
- printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
 pkg_cv_BIGFONT_LIBS=`$PKG_CONFIG --libs "xf86bigfontproto >= 1.2.0" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
@@ -22399,8 +21008,8 @@
 
 
 if test $pkg_failed = yes; then
- 	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
 _pkg_short_errors_supported=yes
@@ -22417,25 +21026,24 @@
 
 	XF86BIGFONT="no"
 elif test $pkg_failed = untried; then
- 	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 	XF86BIGFONT="no"
 else
 	BIGFONT_CFLAGS=$pkg_cv_BIGFONT_CFLAGS
 	BIGFONT_LIBS=$pkg_cv_BIGFONT_LIBS
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
-printf "%s\n" "#define XF86BIGFONT 1" >>confdefs.h
+$as_echo "#define XF86BIGFONT 1" >>confdefs.h
 
 fi
 fi
 
 # Check whether --enable-xkb was given.
-if test ${enable_xkb+y}
-then :
+if test "${enable_xkb+set}" = set; then :
 enableval=$enable_xkb; XKB=$enableval
-else $as_nop
+else
 XKB=yes
 fi
 
@@ -22452,7 +21060,7 @@
 XKBPROTO_REQUIRES="kbproto"
 X11_REQUIRES="${X11_REQUIRES} kbproto inputproto"
 
-printf "%s\n" "#define XKB 1" >>confdefs.h
+$as_echo "#define XKB 1" >>confdefs.h
 
 else
 XKBPROTO_REQUIRES=""
@@ -22460,36 +21068,48 @@
 
 
 
-ac_func=
-for ac_item in $ac_func_c_list
-do
- if test $ac_func; then
- ac_fn_c_check_func "$LINENO" $ac_func ac_cv_func_$ac_func
- if eval test \"x\$ac_cv_func_$ac_func\" = xyes; then
- echo "#define $ac_item 1" >> confdefs.h
- fi
- ac_func=
- else
- ac_func=$ac_item
- fi
+
+
+ for ac_header in $ac_header_list
+do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
+"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
 done
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working mmap" >&5
-printf %s "checking for working mmap... " >&6; }
-if test ${ac_cv_func_mmap_fixed_mapped+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
- if test "$cross_compiling" = yes
-then :
- case "$host_os" in # ((
-			 # Guess yes on platforms where we know the result.
-		 linux*) ac_cv_func_mmap_fixed_mapped=yes ;;
-			 # If we don't know, assume the worst.
-		 *) ac_cv_func_mmap_fixed_mapped=no ;;
-		esac
-else $as_nop
+
+
+
+
+
+
+for ac_func in getpagesize
+do :
+ ac_fn_c_check_func "$LINENO" "getpagesize" "ac_cv_func_getpagesize"
+if test "x$ac_cv_func_getpagesize" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_GETPAGESIZE 1
+_ACEOF
+
+fi
+done
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working mmap" >&5
+$as_echo_n "checking for working mmap... " >&6; }
+if ${ac_cv_func_mmap_fixed_mapped+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test "$cross_compiling" = yes; then :
+ ac_cv_func_mmap_fixed_mapped=no
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 $ac_includes_default
@@ -22521,6 +21141,10 @@
 #include <fcntl.h>
 #include <sys/mman.h>
 
+#if !defined STDC_HEADERS && !defined HAVE_STDLIB_H
+char *malloc ();
+#endif
+
 /* This mess was copied from the GNU getpagesize.h. */
 #ifndef HAVE_GETPAGESIZE
 # ifdef _SC_PAGESIZE
@@ -22554,7 +21178,7 @@
 #endif /* no HAVE_GETPAGESIZE */
 
 int
-main (void)
+main ()
 {
 char *data, *data2, *data3;
 const char *cdata2;
@@ -22622,15 +21246,12 @@
 if (*(data + i) != *(data3 + i))
 return 14;
 close (fd);
- free (data);
- free (data3);
 return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
 ac_cv_func_mmap_fixed_mapped=yes
-else $as_nop
+else
 ac_cv_func_mmap_fixed_mapped=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -22638,35 +21259,33 @@
 fi
 
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_mmap_fixed_mapped" >&5
-printf "%s\n" "$ac_cv_func_mmap_fixed_mapped" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_mmap_fixed_mapped" >&5
+$as_echo "$ac_cv_func_mmap_fixed_mapped" >&6; }
 if test $ac_cv_func_mmap_fixed_mapped = yes; then
 
-printf "%s\n" "#define HAVE_MMAP 1" >>confdefs.h
+$as_echo "#define HAVE_MMAP 1" >>confdefs.h
 
 fi
 rm -f conftest.mmap conftest.txt
 
 composecache_default=$ac_cv_func_mmap_fixed_mapped
 ac_fn_c_check_func "$LINENO" "nl_langinfo" "ac_cv_func_nl_langinfo"
-if test "x$ac_cv_func_nl_langinfo" = xyes
-then :
+if test "x$ac_cv_func_nl_langinfo" = xyes; then :
 
-else $as_nop
+else
 composecache_default=no
 fi
 
 # Check whether --enable-composecache was given.
-if test ${enable_composecache+y}
-then :
+if test "${enable_composecache+set}" = set; then :
 enableval=$enable_composecache; COMPOSECACHE=$enableval
-else $as_nop
+else
 COMPOSECACHE=$composecache_default
 fi
 
 if test x"$COMPOSECACHE" = "xyes"; then
 
-printf "%s\n" "#define COMPOSECACHE 1" >>confdefs.h
+$as_echo "#define COMPOSECACHE 1" >>confdefs.h
 
 fi
 
@@ -22677,10 +21296,9 @@
 
 
 # Check whether --with-lint was given.
-if test ${with_lint+y}
-then :
+if test "${with_lint+set}" = set; then :
 withval=$with_lint; use_lint=$withval
-else $as_nop
+else
 use_lint=no
 fi
 
@@ -22706,12 +21324,11 @@
 if test "x$use_lint" = x"yes" ; then
 # Extract the first word of "$lint_name", so it can be a program name with args.
 set dummy $lint_name; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_path_LINT+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_LINT+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
 case $LINT in
 \\/* | ?:\\/*)
 ac_cv_path_LINT="$LINT" # Let the user override the test with a path.
@@ -22721,15 +21338,11 @@
 for as_dir in $PATH
 do
 IFS=$as_save_IFS
- case $as_dir in #(((
- '') as_dir=./ ;;
- */) ;;
- *) as_dir=$as_dir/ ;;
- esac
+ test -z "$as_dir" && as_dir=.
 for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
- ac_cv_path_LINT="$as_dir$ac_word$ac_exec_ext"
- printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_LINT="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 break 2
 fi
 done
@@ -22741,11 +21354,11 @@
 fi
 LINT=$ac_cv_path_LINT
 if test -n "$LINT"; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LINT" >&5
-printf "%s\n" "$LINT" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LINT" >&5
+$as_echo "$LINT" >&6; }
 else
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -22754,8 +21367,8 @@
 fi
 elif test "x$use_lint" = x"no" ; then
 if test "x$LINT" != "x"; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ignoring LINT environment variable since --with-lint=no was specified" >&5
-printf "%s\n" "$as_me: WARNING: ignoring LINT environment variable since --with-lint=no was specified" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ignoring LINT environment variable since --with-lint=no was specified" >&5
+$as_echo "$as_me: WARNING: ignoring LINT environment variable since --with-lint=no was specified" >&2;}
 fi
 else
 as_fn_error $? "--with-lint expects 'yes' or 'no'. Use LINT variable to specify path." "$LINENO" 5
@@ -22781,10 +21394,9 @@
 
 
 # Check whether --enable-lint-library was given.
-if test ${enable_lint_library+y}
-then :
+if test "${enable_lint_library+set}" = set; then :
 enableval=$enable_lint_library; make_lint_lib=$enableval
-else $as_nop
+else
 make_lint_lib=no
 fi
 
@@ -22821,7 +21433,9 @@
 X11_DATADIR="$ax_define_dir"
 
 
-printf "%s\n" "#define X11_DATADIR \"$ax_define_dir\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define X11_DATADIR "$ax_define_dir"
+_ACEOF
 
 test "$prefix_NONE" && prefix=NONE
 test "$exec_prefix_NONE" && exec_prefix=NONE
@@ -22839,7 +21453,9 @@
 X11_LIBDIR="$ax_define_dir"
 
 
-printf "%s\n" "#define X11_LIBDIR \"$ax_define_dir\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define X11_LIBDIR "$ax_define_dir"
+_ACEOF
 
 test "$prefix_NONE" && prefix=NONE
 test "$exec_prefix_NONE" && exec_prefix=NONE
@@ -22848,17 +21464,17 @@
 
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for X11" >&5
-printf %s "checking for X11... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for X11" >&5
+$as_echo_n "checking for X11... " >&6; }
 
 if test -n "$X11_CFLAGS"; then
 pkg_cv_X11_CFLAGS="$X11_CFLAGS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$X11_REQUIRES\""; } >&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$X11_REQUIRES\""; } >&5
 ($PKG_CONFIG --exists --print-errors "$X11_REQUIRES") 2>&5
 ac_status=$?
- printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
 pkg_cv_X11_CFLAGS=`$PKG_CONFIG --cflags "$X11_REQUIRES" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
@@ -22872,10 +21488,10 @@
 pkg_cv_X11_LIBS="$X11_LIBS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$X11_REQUIRES\""; } >&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$X11_REQUIRES\""; } >&5
 ($PKG_CONFIG --exists --print-errors "$X11_REQUIRES") 2>&5
 ac_status=$?
- printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
 pkg_cv_X11_LIBS=`$PKG_CONFIG --libs "$X11_REQUIRES" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
@@ -22889,8 +21505,8 @@
 
 
 if test $pkg_failed = yes; then
- 	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
 _pkg_short_errors_supported=yes
@@ -22916,10 +21532,10 @@
 and X11_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
- 	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -22933,8 +21549,8 @@
 else
 	X11_CFLAGS=$pkg_cv_X11_CFLAGS
 	X11_LIBS=$pkg_cv_X11_LIBS
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 fi
 X11_CFLAGS="$X11_CFLAGS $XTHREAD_CFLAGS"
@@ -22958,7 +21574,9 @@
 XLOCALEDATADIR="$ax_define_dir"
 
 
-printf "%s\n" "#define XLOCALEDATADIR \"$ax_define_dir\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define XLOCALEDATADIR "$ax_define_dir"
+_ACEOF
 
 test "$prefix_NONE" && prefix=NONE
 test "$exec_prefix_NONE" && exec_prefix=NONE
@@ -22967,10 +21585,9 @@
 
 
 # Check whether --with-locale-lib-dir was given.
-if test ${with_locale_lib_dir+y}
-then :
+if test "${with_locale_lib_dir+set}" = set; then :
 withval=$with_locale_lib_dir; X11_LOCALELIBDIR="$withval"
-else $as_nop
+else
 X11_LOCALELIBDIR="${X11_LIBDIR}/locale"
 fi
 
@@ -22984,7 +21601,9 @@
 XLOCALELIBDIR="$ax_define_dir"
 
 
-printf "%s\n" "#define XLOCALELIBDIR \"$ax_define_dir\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define XLOCALELIBDIR "$ax_define_dir"
+_ACEOF
 
 test "$prefix_NONE" && prefix=NONE
 test "$exec_prefix_NONE" && exec_prefix=NONE
@@ -23002,7 +21621,9 @@
 XLOCALEDIR="$ax_define_dir"
 
 
-printf "%s\n" "#define XLOCALEDIR \"$ax_define_dir\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define XLOCALEDIR "$ax_define_dir"
+_ACEOF
 
 test "$prefix_NONE" && prefix=NONE
 test "$exec_prefix_NONE" && exec_prefix=NONE
@@ -23035,7 +21656,9 @@
 XKEYSYMDB="$ax_define_dir"
 
 
-printf "%s\n" "#define XKEYSYMDB \"$ax_define_dir\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define XKEYSYMDB "$ax_define_dir"
+_ACEOF
 
 test "$prefix_NONE" && prefix=NONE
 test "$exec_prefix_NONE" && exec_prefix=NONE
@@ -23052,7 +21675,9 @@
 XERRORDB="$ax_define_dir"
 
 
-printf "%s\n" "#define XERRORDB \"$ax_define_dir\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define XERRORDB "$ax_define_dir"
+_ACEOF
 
 test "$prefix_NONE" && prefix=NONE
 test "$exec_prefix_NONE" && exec_prefix=NONE
@@ -23060,35 +21685,32 @@
 
 
 # Check whether --enable-malloc0returnsnull was given.
-if test ${enable_malloc0returnsnull+y}
-then :
+if test "${enable_malloc0returnsnull+set}" = set; then :
 enableval=$enable_malloc0returnsnull; MALLOC_ZERO_RETURNS_NULL=$enableval
-else $as_nop
+else
 MALLOC_ZERO_RETURNS_NULL=auto
 fi
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether malloc(0) returns NULL" >&5
-printf %s "checking whether malloc(0) returns NULL... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether malloc(0) returns NULL" >&5
+$as_echo_n "checking whether malloc(0) returns NULL... " >&6; }
 if test "x$MALLOC_ZERO_RETURNS_NULL" = xauto; then
-if test ${xorg_cv_malloc0_returns_null+y}
-then :
- printf %s "(cached) " >&6
-else $as_nop
- if test "$cross_compiling" = yes
-then :
- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+if ${xorg_cv_malloc0_returns_null+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test "$cross_compiling" = yes; then :
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot run test program while cross compiling
 See \`config.log' for more details" "$LINENO" 5; }
-else $as_nop
+else
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 
 #include <stdlib.h>
 
 int
-main (void)
+main ()
 {
 
 char *m0, *r0, *c0, *p;
@@ -23102,10 +21724,9 @@
 return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
 xorg_cv_malloc0_returns_null=yes
-else $as_nop
+else
 xorg_cv_malloc0_returns_null=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -23116,8 +21737,8 @@
 
 MALLOC_ZERO_RETURNS_NULL=$xorg_cv_malloc0_returns_null
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MALLOC_ZERO_RETURNS_NULL" >&5
-printf "%s\n" "$MALLOC_ZERO_RETURNS_NULL" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MALLOC_ZERO_RETURNS_NULL" >&5
+$as_echo "$MALLOC_ZERO_RETURNS_NULL" >&6; }
 
 if test "x$MALLOC_ZERO_RETURNS_NULL" = xyes; then
 	MALLOC_ZERO_CFLAGS="-DMALLOC_0_RETURNS_NULL"
@@ -23163,8 +21784,8 @@
 case $ac_val in #(
 *${as_nl}*)
 case $ac_var in #(
- *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
 esac
 case $ac_var in #(
 _ | IFS | as_nl) ;; #(
@@ -23194,15 +21815,15 @@
 /^ac_cv_env_/b end
 t clear
 :clear
- s/^$^=*$=$.*{}.*$$/test ${\1+y} || &/
+ s/^$^=*$=$.*{}.*$$/test "${\1+set}" = set || &/
 t end
 s/^$^=*$=$.*$$/\1=${\1=\2}/
 :end' >>confcache
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
 if test -w "$cache_file"; then
 if test "x$cache_file" != "x/dev/null"; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
-printf "%s\n" "$as_me: updating cache $cache_file" >&6;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
+$as_echo "$as_me: updating cache $cache_file" >&6;}
 if test ! -f "$cache_file" || test -h "$cache_file"; then
 	cat confcache >"$cache_file"
 else
@@ -23216,8 +21837,8 @@
 fi
 fi
 else
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
-printf "%s\n" "$as_me: not updating unwritable cache $cache_file" >&6;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
 fi
 fi
 rm -f confcache
@@ -23234,7 +21855,7 @@
 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
 # 1. Remove the extension, and $U if already installed.
 ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
- ac_i=`printf "%s\n" "$ac_i" | sed "$ac_script"`
+ ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
 # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR
 # will be set to the directory where LIBOBJS objects are built.
 as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
@@ -23245,14 +21866,14 @@
 LTLIBOBJS=$ac_ltlibobjs
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5
-printf %s "checking that generated files are newer than configure... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5
+$as_echo_n "checking that generated files are newer than configure... " >&6; }
 if test -n "$am_sleep_pid"; then
 # Hide warnings about reused PIDs.
 wait $am_sleep_pid 2>/dev/null
 fi
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: done" >&5
-printf "%s\n" "done" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
+$as_echo "done" >&6; }
 if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
 as_fn_error $? "conditional \"AMDEP\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -23305,10 +21926,6 @@
 as_fn_error $? "conditional \"OS2\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${THRSTUBS_TRUE}" && test -z "${THRSTUBS_FALSE}"; then
- as_fn_error $? "conditional \"THRSTUBS\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
 if test -z "${XCMS_TRUE}" && test -z "${XCMS_FALSE}"; then
 as_fn_error $? "conditional \"XCMS\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -23334,8 +21951,8 @@
 ac_write_fail=0
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
-printf "%s\n" "$as_me: creating $CONFIG_STATUS" >&6;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
 as_write_fail=0
 cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
 #! $SHELL
@@ -23358,16 +21975,14 @@
 
 # Be more Bourne compatible
 DUALCASE=1; export DUALCASE # for MKS sh
-as_nop=:
-if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1
-then :
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
 emulate sh
 NULLCMD=:
 # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
 # is contrary to our usage. Disable this feature.
 alias -g '${1+"$@"}'='"$@"'
 setopt NO_GLOB_SUBST
-else $as_nop
+else
 case `(set -o) 2>/dev/null` in #(
 *posix*) :
 set -o posix ;; #(
@@ -23377,46 +21992,46 @@
 fi
 
 
-
-# Reset variables that may have inherited troublesome values from
-# the environment.
-
-# IFS needs to be set, to space, tab, and newline, in precisely that order.
-# (If _AS_PATH_WALK were called with IFS unset, it would have the
-# side effect of setting IFS to empty, thus disabling word splitting.)
-# Quoting is to prevent editors from complaining about space-tab.
 as_nl='
 '
 export as_nl
-IFS=" ""	$as_nl"
-
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# Ensure predictable behavior from utilities with locale-dependent output.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
-
-# We cannot yet rely on "unset" to work, but we need these variables
-# to be unset--not just set to an empty or harmless value--now, to
-# avoid bugs in old shells (e.g. pre-3.0 UWIN ksh). This construct
-# also avoids known problems related to "unset" and subshell syntax
-# in other old shells (e.g. bash 2.01 and pdksh 5.2.14).
-for as_var in BASH_ENV ENV MAIL MAILPATH CDPATH
-do eval test \${$as_var+y} \
- && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
-done
-
-# Ensure that fds 0, 1, and 2 are open.
-if (exec 3>&0) 2>/dev/null; then :; else exec 0</dev/null; fi
-if (exec 3>&1) 2>/dev/null; then :; else exec 1>/dev/null; fi
-if (exec 3>&2) ; then :; else exec 2>/dev/null; fi
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+ && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+ as_echo='print -r --'
+ as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+ as_echo='printf %s\n'
+ as_echo_n='printf %s'
+else
+ if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+ as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+ as_echo_n='/usr/ucb/echo -n'
+ else
+ as_echo_body='eval expr "X$1" : "X\$.*\$"'
+ as_echo_n_body='eval
+ arg=$1;
+ case $arg in #(
+ *"$as_nl"*)
+	expr "X$arg" : "X\$.*\$$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\$.*\$"`;;
+ esac;
+ expr "X$arg" : "X\$.*\$" | tr -d "$as_nl"
+ '
+ export as_echo_n_body
+ as_echo_n='sh -c $as_echo_n_body as_echo'
+ fi
+ export as_echo_body
+ as_echo='sh -c $as_echo_body as_echo'
+fi
 
 # The user is always right.
-if ${PATH_SEPARATOR+false} :; then
+if test "${PATH_SEPARATOR+set}" != set; then
 PATH_SEPARATOR=:
 (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
 (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
@@ -23425,6 +22040,13 @@
 fi
 
 
+# IFS
+# We need space, tab and new line, in precisely that order. Quoting is
+# there to prevent editors from complaining about space-tab.
+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
+# splitting by setting IFS to empty value.)
+IFS=" ""	$as_nl"
+
 # Find who we are. Look in the path if we contain no directory separator.
 as_myself=
 case $0 in #((
@@ -23433,12 +22055,8 @@
 for as_dir in $PATH
 do
 IFS=$as_save_IFS
- case $as_dir in #(((
- '') as_dir=./ ;;
- */) ;;
- *) as_dir=$as_dir/ ;;
- esac
- test -r "$as_dir$0" && as_myself=$as_dir$0 && break
+ test -z "$as_dir" && as_dir=.
+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
 done
 IFS=$as_save_IFS
 
@@ -23450,10 +22068,30 @@
 as_myself=$0
 fi
 if test ! -f "$as_myself"; then
- printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+ $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
 exit 1
 fi
 
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there. '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+done
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# NLS nuisances.
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# CDPATH.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 
 # as_fn_error STATUS ERROR LINENO LOG_FD
@@ -23466,14 +22104,13 @@
 as_status=$1; test $as_status -eq 0 && as_status=1
 if test "$4"; then
 as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
 fi
- printf "%s\n" "$as_me: error: $2" >&2
+ $as_echo "$as_me: error: $2" >&2
 as_fn_exit $as_status
 } # as_fn_error
 
 
-
 # as_fn_set_status STATUS
 # -----------------------
 # Set $? to STATUS, without forking.
@@ -23500,20 +22137,18 @@
 { eval $1=; unset $1;}
 }
 as_unset=as_fn_unset
-
 # as_fn_append VAR VALUE
 # ----------------------
 # Append the text in VALUE to the end of the definition contained in VAR. Take
 # advantage of any shell optimizations that allow amortized linear growth over
 # repeated appends, instead of the typical quadratic growth present in naive
 # implementations.
-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null
-then :
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
 eval 'as_fn_append ()
 {
 eval $1+=\$2
 }'
-else $as_nop
+else
 as_fn_append ()
 {
 eval $1=\$$1\$2
@@ -23525,13 +22160,12 @@
 # Perform arithmetic evaluation on the ARGs, and store the result in the
 # global $as_val. Take advantage of shells that can avoid forks. The arguments
 # must be portable across $(()) and expr.
-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null
-then :
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
 eval 'as_fn_arith ()
 {
 as_val=$(( $* ))
 }'
-else $as_nop
+else
 as_fn_arith ()
 {
 as_val=`expr "$@" || test $? -eq 1`
@@ -23562,7 +22196,7 @@
 $as_expr X/"$0" : '.*/$^/^/*$/*$' \| \
 	 X"$0" : 'X$//$$' \| \
 	 X"$0" : 'X$/$' \| . 2>/dev/null ||
-printf "%s\n" X/"$0" |
+$as_echo X/"$0" |
 sed '/^.*\/$^/^/*$\/*$/{
 	 s//\1/
 	 q
@@ -23584,10 +22218,6 @@
 as_cr_digits='0123456789'
 as_cr_alnum=$as_cr_Letters$as_cr_digits
 
-
-# Determine whether it's possible to make 'echo' print without a newline.
-# These variables are no longer used directly by Autoconf, but are AC_SUBSTed
-# for compatibility with existing Makefiles.
 ECHO_C= ECHO_N= ECHO_T=
 case `echo -n x` in #(((((
 -n*)
@@ -23601,12 +22231,6 @@
 ECHO_N='-n';;
 esac
 
-# For backward compatibility with old third-party macros, we provide
-# the shell variables $as_echo and $as_echo_n. New code should use
-# AS_ECHO("message") and AS_ECHO_N("message"), respectively.
-as_echo='printf %s\n'
-as_echo_n='printf %s'
-
 rm -f conf$$ conf$$.exe conf$$.file
 if test -d conf$$.dir; then
 rm -f conf$$.dir/conf$$.file
@@ -23648,7 +22272,7 @@
 as_dirs=
 while :; do
 case $as_dir in #(
- *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
 *) as_qdir=$as_dir;;
 esac
 as_dirs="'$as_qdir' $as_dirs"
@@ -23657,7 +22281,7 @@
 	 X"$as_dir" : 'X$//$^/' \| \
 	 X"$as_dir" : 'X$//$$' \| \
 	 X"$as_dir" : 'X$/$' \| . 2>/dev/null ||
-printf "%s\n" X"$as_dir" |
+$as_echo X"$as_dir" |
 sed '/^X$.*^/$\/\/*^/^/*\/*$/{
 	 s//\1/
 	 q
@@ -23719,8 +22343,8 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by libX11 $as_me 1.8.1, which was
-generated by GNU Autoconf 2.71. Invocation command line was
+This file was extended by libX11 $as_me 1.8.4, which was
+generated by GNU Autoconf 2.69. Invocation command line was
 
 CONFIG_FILES = $CONFIG_FILES
 CONFIG_HEADERS = $CONFIG_HEADERS
@@ -23779,19 +22403,17 @@
 Configuration commands:
 $config_commands
 
-Report bugs to <https://gitlab.freedesktop.org/xorg/lib/libx11/issues>."
+Report bugs to <https://gitlab.freedesktop.org/xorg/lib/libx11/-/issues>."
 
 _ACEOF
-ac_cs_config=`printf "%s\n" "$ac_configure_args" | sed "$ac_safe_unquote"`
-ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\''/g"`
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-ac_cs_config='$ac_cs_config_escaped'
+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/\\""\`\$/\\\\&/g'`"
 ac_cs_version="\\
-libX11 config.status 1.8.1
-configured by $0, generated by GNU Autoconf 2.71,
+libX11 config.status 1.8.4
+configured by $0, generated by GNU Autoconf 2.69,
 with options \\"\$ac_cs_config\\"
 
-Copyright (C) 2021 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -23831,15 +22453,15 @@
 -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
 ac_cs_recheck=: ;;
 --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
- printf "%s\n" "$ac_cs_version"; exit ;;
+ $as_echo "$ac_cs_version"; exit ;;
 --config | --confi | --conf | --con | --co | --c )
- printf "%s\n" "$ac_cs_config"; exit ;;
+ $as_echo "$ac_cs_config"; exit ;;
 --debug | --debu | --deb | --de | --d | -d )
 debug=: ;;
 --file | --fil | --fi | --f )
 $ac_shift
 case $ac_optarg in
- *\'*) ac_optarg=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+ *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
 '') as_fn_error $? "missing file argument" ;;
 esac
 as_fn_append CONFIG_FILES " '$ac_optarg'"
@@ -23847,7 +22469,7 @@
 --header | --heade | --head | --hea )
 $ac_shift
 case $ac_optarg in
- *\'*) ac_optarg=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+ *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
 esac
 as_fn_append CONFIG_HEADERS " '$ac_optarg'"
 ac_need_defaults=false;;
@@ -23856,7 +22478,7 @@
 as_fn_error $? "ambiguous option: \`$1'
 Try \`$0 --help' for more information.";;
 --help | --hel | -h )
- printf "%s\n" "$ac_cs_usage"; exit ;;
+ $as_echo "$ac_cs_usage"; exit ;;
 -q | -quiet | --quiet | --quie | --qui | --qu | --q \
 | -silent | --silent | --silen | --sile | --sil | --si | --s)
 ac_cs_silent=: ;;
@@ -23884,7 +22506,7 @@
 if \$ac_cs_recheck; then
 set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
 shift
- \printf "%s\n" "running CONFIG_SHELL=$SHELL \$*" >&6
+ \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
 CONFIG_SHELL='$SHELL'
 export CONFIG_SHELL
 exec "\$@"
@@ -23898,7 +22520,7 @@
 sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
 ## Running $as_me. ##
 _ASBOX
- printf "%s\n" "$ac_log"
+ $as_echo "$ac_log"
 } >&5
 
 _ACEOF
@@ -23906,7 +22528,7 @@
 #
 # INIT-COMMANDS
 #
-AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"
+AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
 
 
 # The HP-UX ksh and POSIX shell print the target directory to stdout
@@ -23950,7 +22572,6 @@
 lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
 reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
 reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
-FILECMD='`$ECHO "$FILECMD" | $SED "$delay_single_quote_subst"`'
 OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
 deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
 file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
@@ -23959,7 +22580,6 @@
 DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
 sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
 AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
-lt_ar_flags='`$ECHO "$lt_ar_flags" | $SED "$delay_single_quote_subst"`'
 AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
 archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
@@ -24080,7 +22700,6 @@
 lt_SP2NL \
 lt_NL2SP \
 reload_flag \
-FILECMD \
 OBJDUMP \
 deplibs_check_method \
 file_magic_cmd \
@@ -24089,6 +22708,7 @@
 DLLTOOL \
 sharedlib_from_linklib_cmd \
 AR \
+AR_FLAGS \
 archiver_list_spec \
 STRIP \
 RANLIB \
@@ -24246,9 +22866,9 @@
 # We use the long form for the default assignment because of an extremely
 # bizarre bug on SunOS 4.1.3.
 if $ac_need_defaults; then
- test ${CONFIG_FILES+y} || CONFIG_FILES=$config_files
- test ${CONFIG_HEADERS+y} || CONFIG_HEADERS=$config_headers
- test ${CONFIG_COMMANDS+y} || CONFIG_COMMANDS=$config_commands
+ test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
+ test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
+ test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
 fi
 
 # Have a temporary directory for convenience. Make it in the build tree
@@ -24584,7 +23204,7 @@
 	 esac ||
 	 as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
 esac
- case $ac_f in *\'*) ac_f=`printf "%s\n" "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+ case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
 as_fn_append ac_file_inputs " '$ac_f'"
 done
 
@@ -24592,17 +23212,17 @@
 # use $as_me), people would be surprised to read:
 # /* config.h. Generated by config.status. */
 configure_input='Generated from '`
-	 printf "%s\n" "$*" | sed 's|^^:*/||;s|:^:*/|, |g'
+	 $as_echo "$*" | sed 's|^^:*/||;s|:^:*/|, |g'
 	`' by configure.'
 if test x"$ac_file" != x-; then
 configure_input="$ac_file. $configure_input"
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
-printf "%s\n" "$as_me: creating $ac_file" >&6;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
+$as_echo "$as_me: creating $ac_file" >&6;}
 fi
 # Neutralize special characters interpreted by sed in replacement strings.
 case $configure_input in #(
 *\&* | *\|* | *\\* )
- ac_sed_conf_input=`printf "%s\n" "$configure_input" |
+ ac_sed_conf_input=`$as_echo "$configure_input" |
 sed 's/\\\\&|/\\\\&/g'`;; #(
 *) ac_sed_conf_input=$configure_input;;
 esac
@@ -24619,7 +23239,7 @@
 	 X"$ac_file" : 'X$//$^/' \| \
 	 X"$ac_file" : 'X$//$$' \| \
 	 X"$ac_file" : 'X$/$' \| . 2>/dev/null ||
-printf "%s\n" X"$ac_file" |
+$as_echo X"$ac_file" |
 sed '/^X$.*^/$\/\/*^/^/*\/*$/{
 	 s//\1/
 	 q
@@ -24643,9 +23263,9 @@
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
- ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.\\/||'`
+ ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.\\/||'`
 # A ".." for each directory in $ac_dir_suffix.
- ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/^\\/*|/..|g;s|/||'`
+ ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/^\\/*|/..|g;s|/||'`
 case $ac_top_builddir_sub in
 "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -24707,8 +23327,8 @@
 case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
 *datarootdir*) ac_datarootdir_seen=yes;;
 *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-printf "%s\n" "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_datarootdir_hack='
@@ -24752,9 +23372,9 @@
 { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
 { ac_out=`sed -n '/^	 *datarootdir	 *:*=/p' \
 "$ac_tmp/out"`; test -z "$ac_out"; } &&
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined. Please make sure it is defined" >&5
-printf "%s\n" "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined. Please make sure it is defined" >&2;}
 
 rm -f "$ac_tmp/stdin"
@@ -24770,20 +23390,20 @@
 #
 if test x"$ac_file" != x-; then
 {
- printf "%s\n" "/* $configure_input */" >&1 \
+ $as_echo "/* $configure_input */" \
 && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
 } >"$ac_tmp/config.h" \
 || as_fn_error $? "could not create $ac_file" "$LINENO" 5
 if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
-printf "%s\n" "$as_me: $ac_file is unchanged" >&6;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
+$as_echo "$as_me: $ac_file is unchanged" >&6;}
 else
 rm -f "$ac_file"
 mv "$ac_tmp/config.h" "$ac_file" \
 	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
 fi
 else
- printf "%s\n" "/* $configure_input */" >&1 \
+ $as_echo "/* $configure_input */" \
 && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
 || as_fn_error $? "could not create -" "$LINENO" 5
 fi
@@ -24803,7 +23423,7 @@
 	 X"$_am_arg" : 'X$//$^/' \| \
 	 X"$_am_arg" : 'X$//$$' \| \
 	 X"$_am_arg" : 'X$/$' \| . 2>/dev/null ||
-printf "%s\n" X"$_am_arg" |
+$as_echo X"$_am_arg" |
 sed '/^X$.*^/$\/\/*^/^/*\/*$/{
 	 s//\1/
 	 q
@@ -24823,8 +23443,8 @@
 	 s/.*/./; q'`/stamp-h$_am_stamp_count
 ;;
 
- :C) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
-printf "%s\n" "$as_me: executing $ac_file commands" >&6;}
+ :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
+$as_echo "$as_me: executing $ac_file commands" >&6;}
 ;;
 esac
 
@@ -24834,35 +23454,29 @@
 # Older Autoconf quotes --file arguments for eval, but not when files
 # are listed without --file. Let's play safe and only enable the eval
 # if we detect the quoting.
- # TODO: see whether this extra hack can be removed once we start
- # requiring Autoconf 2.70 or later.
- case $CONFIG_FILES in #(
- *\'*) :
- eval set x "$CONFIG_FILES" ;; #(
- *) :
- set x $CONFIG_FILES ;; #(
- *) :
- ;;
-esac
+ case $CONFIG_FILES in
+ *\'*) eval set x "$CONFIG_FILES" ;;
+ *) set x $CONFIG_FILES ;;
+ esac
 shift
- # Used to flag and report bootstrapping failures.
- am_rc=0
- for am_mf
+ for mf
 do
 # Strip MF so we end up with the name of the file.
- am_mf=`printf "%s\n" "$am_mf" | sed -e 's/:.*$//'`
- # Check whether this is an Automake generated Makefile which includes
- # dependency-tracking related rules and includes.
- # Grep'ing the whole file directly is not great: AIX grep has a line
+ mf=`echo "$mf" | sed -e 's/:.*$//'`
+ # Check whether this is an Automake generated Makefile or not.
+ # We used to match only the files named 'Makefile.in', but
+ # some people rename them; so instead we look at the file content.
+ # Grep'ing the first line is not enough: some people post-process
+ # each Makefile.in and add a new line on top of each file to say so.
+ # Grep'ing the whole file is not good either: AIX grep has a line
 # limit of 2048, but all sed's we know have understand at least 4000.
- sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \
- || continue
- am_dirpart=`$as_dirname -- "$am_mf" ||
-$as_expr X"$am_mf" : 'X$.*^/$//*^/^/*/*$' \| \
-	 X"$am_mf" : 'X$//$^/' \| \
-	 X"$am_mf" : 'X$//$$' \| \
-	 X"$am_mf" : 'X$/$' \| . 2>/dev/null ||
-printf "%s\n" X"$am_mf" |
+ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+ dirpart=`$as_dirname -- "$mf" ||
+$as_expr X"$mf" : 'X$.*^/$//*^/^/*/*$' \| \
+	 X"$mf" : 'X$//$^/' \| \
+	 X"$mf" : 'X$//$$' \| \
+	 X"$mf" : 'X$/$' \| . 2>/dev/null ||
+$as_echo X"$mf" |
 sed '/^X$.*^/$\/\/*^/^/*\/*$/{
 	 s//\1/
 	 q
@@ -24880,50 +23494,53 @@
 	 q
 	 }
 	 s/.*/./; q'`
- am_filepart=`$as_basename -- "$am_mf" ||
-$as_expr X/"$am_mf" : '.*/$^/^/*$/*$' \| \
-	 X"$am_mf" : 'X$//$$' \| \
-	 X"$am_mf" : 'X$/$' \| . 2>/dev/null ||
-printf "%s\n" X/"$am_mf" |
- sed '/^.*\/$^/^/*$\/*$/{
+ else
+ continue
+ fi
+ # Extract the definition of DEPDIR, am__include, and am__quote
+ # from the Makefile without running 'make'.
+ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+ test -z "$DEPDIR" && continue
+ am__include=`sed -n 's/^am__include = //p' < "$mf"`
+ test -z "$am__include" && continue
+ am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+ # Find all dependency output files, they are included files with
+ # $(DEPDIR) in their names. We invoke sed twice because it is the
+ # simplest approach to changing $(DEPDIR) to its actual value in the
+ # expansion.
+ for file in `sed -n "
+ s/^$am__include $am__quote$.*(DEPDIR).*$$am__quote"'$/\1/p' <"$mf" | \
+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
+ # Make sure the directory exists.
+ test -f "$dirpart/$file" && continue
+ fdir=`$as_dirname -- "$file" ||
+$as_expr X"$file" : 'X$.*^/$//*^/^/*/*$' \| \
+	 X"$file" : 'X$//$^/' \| \
+	 X"$file" : 'X$//$$' \| \
+	 X"$file" : 'X$/$' \| . 2>/dev/null ||
+$as_echo X"$file" |
+ sed '/^X$.*^/$\/\/*^/^/*\/*$/{
 	 s//\1/
 	 q
 	 }
-	 /^X\/$\/\/$$/{
+	 /^X$\/\/$^/.*/{
 	 s//\1/
 	 q
 	 }
-	 /^X\/$\/$.*/{
+	 /^X$\/\/$$/{
+	 s//\1/
+	 q
+	 }
+	 /^X$\/$.*/{
 	 s//\1/
 	 q
 	 }
 	 s/.*/./; q'`
- { echo "$as_me:$LINENO: cd "$am_dirpart" \
- && sed -e '/# am--include-marker/d' "$am_filepart" \
- | $MAKE -f - am--depfiles" >&5
- (cd "$am_dirpart" \
- && sed -e '/# am--include-marker/d' "$am_filepart" \
- | $MAKE -f - am--depfiles) >&5 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } || am_rc=$?
+ as_dir=$dirpart/$fdir; as_fn_mkdir_p
+ # echo "creating $dirpart/$file"
+ echo '# dummy' > "$dirpart/$file"
+ done
 done
- if test $am_rc -ne 0; then
- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "Something went wrong bootstrapping makefile fragments
- for automatic dependency tracking. If GNU make was not used, consider
- re-running the configure script with MAKE=\"gmake\" (or whatever is
- necessary). You can also try re-running configure with the
- '--disable-dependency-tracking' option to at least be able to build
- the package (albeit without support for automatic dependency tracking).
-See \`config.log' for more details" "$LINENO" 5; }
- fi
- { am_dirpart=; unset am_dirpart;}
- { am_filepart=; unset am_filepart;}
- { am_mf=; unset am_mf;}
- { am_rc=; unset am_rc;}
- rm -f conftest-deps.mk
 }
 ;;
 "libtool":C)
@@ -25061,9 +23678,6 @@
 # convert \$build files to toolchain format.
 to_tool_file_cmd=$lt_cv_to_tool_file_cmd
 
-# A file(cmd) program that detects file types.
-FILECMD=$lt_FILECMD
-
 # An object symbol dumper.
 OBJDUMP=$lt_OBJDUMP
 
@@ -25088,11 +23702,8 @@
 # The archiver.
 AR=$lt_AR
 
-# Flags to create an archive (by configure).
-lt_ar_flags=$lt_ar_flags
-
 # Flags to create an archive.
-AR_FLAGS=\${ARFLAGS-"\$lt_ar_flags"}
+AR_FLAGS=$lt_AR_FLAGS
 
 # How to feed a file listing to the archiver.
 archiver_list_spec=$lt_archiver_list_spec
@@ -25460,7 +24071,6 @@
 esac
 
 
-
 ltmain=$ac_aux_dir/ltmain.sh
 
 
@@ -25468,7 +24078,7 @@
 # if finds mixed CR/LF and LF-only lines. Since sed operates in
 # text mode, it properly converts lines to CR/LF. This bash problem
 # is reportedly fixed, but why not run on old versions too?
- $SED '$q' "$ltmain" >> "$cfgfile" \
+ sed '$q' "$ltmain" >> "$cfgfile" \
 || (rm -f "$cfgfile"; exit 1)
 
 mv -f "$cfgfile" "$ofile" ||
@@ -25510,18 +24120,18 @@
 $ac_cs_success || as_fn_exit 1
 fi
 if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
-printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
 fi
 
 
 echo ""
-echo "X11 will be built with the following settings:"
+echo "$PACKAGE_STRING will be built with the following settings:"
 echo " Loadable i18n module support: "$XLIB_LOADABLE_I18N
 echo " Loadable xcursor library support: "$XLIB_LOADABLE_XCURSOR
 echo " Threading support: "$xthreads
 echo " Use Threads safe API: "$mtsafeapi
-echo " Threads stubs in libX11: "$thrstubs
+echo " Use thread safety constructor: "$USE_THREAD_SAFETY_CONSTRUCTOR
 echo " XCMS: "$XCMS
 echo " Internationalization support: "$XLOCALE
 echo " XF86BigFont support: "$XF86BIGFONT
@@ -25530,4 +24140,3 @@
 echo " Compose table cache enabled: "$COMPOSECACHE
 echo " Functional specs building enabled: "$build_specs
 echo ""
-

_service:tar_scm:libX11-1.8.1.tar.xz/configure.ac -> _service:tar_scm:libX11-1.8.4.tar.xz/configure.ac Changed

@@ -1,8 +1,8 @@
 
 # Initialize Autoconf
 AC_PREREQ(2.60)
-AC_INIT(libX11, 1.8.1,
-        https://gitlab.freedesktop.org/xorg/lib/libx11/issues, libX11)
+AC_INIT(libX11, 1.8.4,
+        https://gitlab.freedesktop.org/xorg/lib/libx11/-/issues, libX11)
 AC_CONFIG_SRCDIR(Makefile.am)
 AC_CONFIG_HEADERS(src/config.h include/X11/XlibConf.h)
 AC_CONFIG_MACRO_DIR(m4)
@@ -222,9 +222,6 @@
 	;;
 esac
 
-AC_CHECK_LIB(c, pthread_self, thrstubs="no", thrstubs="yes")
-AM_CONDITIONAL(THRSTUBS, test x$thrstubs = xyes)
-
 # XXX incomplete, please fill this in
 if test x$xthreads = xyes ; then
     case $host_os in
@@ -245,6 +242,17 @@
 AC_SUBST(XTHREADLIB)
 AC_SUBST(XTHREAD_CFLAGS)
 
+if test "x$USE_THREAD_SAFETY_CONSTRUCTOR" = "xyes"; then
+    USE_THREAD_LIBS="$XTHREADLIB"
+else
+    # This should be kept in sync with libxcb
+    case $host_os in
+    linux*|darwin*|solaris*) ;;
+         *) X11_REQUIRES="$X11_REQUIRES pthread-stubs" ;;
+    esac
+fi
+AC_SUBST(USE_THREAD_LIBS)
+
 AC_CHECK_FUNC(poll, AC_DEFINE(USE_POLL, 1, poll() function is available), )
 
 #
@@ -432,12 +440,12 @@
 AC_OUTPUT
 
 echo ""
-echo "X11 will be built with the following settings:"
+echo "$PACKAGE_STRING will be built with the following settings:"
 echo " Loadable i18n module support:            "$XLIB_LOADABLE_I18N
 echo " Loadable xcursor library support:        "$XLIB_LOADABLE_XCURSOR
 echo " Threading support:                       "$xthreads
 echo " Use Threads safe API:                    "$mtsafeapi
-echo " Threads stubs in libX11:                 "$thrstubs
+echo " Use thread safety constructor:           "$USE_THREAD_SAFETY_CONSTRUCTOR
 echo " XCMS:                                    "$XCMS
 echo " Internationalization support:            "$XLOCALE
 echo " XF86BigFont support:                     "$XF86BIGFONT

_service:tar_scm:libX11-1.8.1.tar.xz/depcomp -> _service:tar_scm:libX11-1.8.4.tar.xz/depcomp Changed

@@ -1,9 +1,9 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects
 
-scriptversion=2018-03-07.03; # UTC
+scriptversion=2013-05-30.07; # UTC
 
-# Copyright (C) 1999-2021 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with this program. If not, see <https://www.gnu.org/licenses/>.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -783,9 +783,9 @@
 # Local Variables:
 # mode: shell-script
 # sh-indentation: 2
-# eval: (add-hook 'before-save-hook 'time-stamp)
+# eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC0"
+# time-stamp-time-zone: "UTC"
 # time-stamp-end: "; # UTC"
 # End:

_service:tar_scm:libX11-1.8.1.tar.xz/include/Makefile.in -> _service:tar_scm:libX11-1.8.4.tar.xz/include/Makefile.in Changed

@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.5 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2021 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -171,6 +171,8 @@
   unique=`for i in $$list; do \
     if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
   done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
 am__DIST_COMMON = $(srcdir)/Makefile.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
@@ -197,8 +199,6 @@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
-CSCOPE = @CSCOPE@
-CTAGS = @CTAGS@
 CWARNFLAGS = @CWARNFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
@@ -212,11 +212,9 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ETAGS = @ETAGS@
 EXEEXT = @EXEEXT@
 EXEEXT_FOR_BUILD = @EXEEXT_FOR_BUILD@
 FGREP = @FGREP@
-FILECMD = @FILECMD@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 FOP = @FOP@
@@ -280,6 +278,7 @@
 STRIP = @STRIP@
 STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@
 TRADITIONALCPPFLAGS = @TRADITIONALCPPFLAGS@
+USE_THREAD_LIBS = @USE_THREAD_LIBS@
 VERSION = @VERSION@
 WCHAR32 = @WCHAR32@
 X11_CFLAGS = @X11_CFLAGS@
@@ -350,7 +349,6 @@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
-runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -403,8 +401,8 @@
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
 	esac;
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -536,10 +534,8 @@
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-distdir: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) distdir-am
 
-distdir-am: $(DISTFILES)
+distdir: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
 	list='$(DISTFILES)'; \

_service:tar_scm:libX11-1.8.1.tar.xz/include/X11/Xlib.h -> _service:tar_scm:libX11-1.8.4.tar.xz/include/X11/Xlib.h Changed

_service:tar_scm:libX11-1.8.1.tar.xz/include/X11/Xlibint.h -> _service:tar_scm:libX11-1.8.4.tar.xz/include/X11/Xlibint.h Changed

@@ -43,6 +43,10 @@
 #include <X11/Xproto.h>		/* to declare xEvent */
 #include <X11/XlibConf.h>	/* for configured options like XTHREADS */
 
+#ifdef XTHREADS
+#include <X11/Xthreads.h>
+#endif
+
 /* The Xlib structs are full of implicit padding to properly align members.
 We can't clean that up without breaking ABI, so tell clang not to bother
 complaining about it. */
@@ -207,6 +211,10 @@
 
 	XIOErrorExitHandler exit_handler;
 	void *exit_handler_data;
+	CARD32 in_ifevent;
+#ifdef XTHREADS
+	xthread_t ifevent_thread;
+#endif
 };
 
 #define XAllocIDs(dpy,ids,n) (*(dpy)->idlist_alloc)(dpy,ids,n)
@@ -581,11 +589,11 @@
 #define MakeBigReq(req,n) \
 { \
 CARD64 _BRdat; \
- CARD32 _BRlen = req->length - 1; \
+ CARD32 _BRlen = (CARD32) (req->length - 1); \
 req->length = 0; \
 _BRdat = ((CARD32 *)req)_BRlen; \
 memmove(((char *)req) + 8, ((char *)req) + 4, (_BRlen - 1) << 2); \
- ((CARD32 *)req)1 = _BRlen + n + 2; \
+ ((CARD32 *)req)1 = _BRlen + (CARD32) (n) + 2; \
 Data32(dpy, &_BRdat, 4); \
 }
 #else
@@ -596,7 +604,7 @@
 req->length = 0; \
 _BRdat = ((CARD32 *)req)_BRlen; \
 memmove(((char *)req) + 8, ((char *)req) + 4, (_BRlen - 1) << 2); \
- ((CARD32 *)req)1 = _BRlen + n + 2; \
+ ((CARD32 *)req)1 = _BRlen + (CARD32) (n) + 2; \
 Data32(dpy, &_BRdat, 4); \
 }
 #endif
@@ -615,10 +623,10 @@
 	 MakeBigReq(req,n) \
 	} else { \
 	 n = badlen; \
-	 req->length += n; \
+	 req->length = (CARD16) (req->length + n); \
 	} \
 } else \
-	req->length += n
+	req->length = (CARD16) (req->length + n)
 #else
 #define SetReqLen(req,n,badlen) \
 req->length += n
@@ -641,10 +649,10 @@
 #ifndef DataRoutineIsProcedure
 #define Data(dpy, data, len) {\
 	if (dpy->bufptr + (len) <= dpy->bufmax) {\
-		memcpy(dpy->bufptr, data, (int)(len));\
-		dpy->bufptr += ((len) + 3) & ~3;\
+		memcpy(dpy->bufptr, data, (size_t)(len));\
+		dpy->bufptr += ((size_t)((len) + 3) & (size_t)~3);\
 	} else\
-		_XSend(dpy, data, len);\
+		_XSend(dpy, (_Xconst char*)(data), (long)(len));\
 }
 #endif /* DataRoutineIsProcedure */
 
@@ -667,14 +675,14 @@
 if (dpy->bufptr + (n) > dpy->bufmax) \
 _XFlush (dpy); \
 ptr = (type) dpy->bufptr; \
- memset(ptr, '\0', n); \
+ memset(ptr, '\0', (size_t)(n)); \
 dpy->bufptr += (n);
 
 #define Data16(dpy, data, len) Data((dpy), (_Xconst char *)(data), (len))
 #define _XRead16Pad(dpy, data, len) _XReadPad((dpy), (char *)(data), (len))
 #define _XRead16(dpy, data, len) _XRead((dpy), (char *)(data), (len))
 #ifdef LONG64
-#define Data32(dpy, data, len) _XData32(dpy, (_Xconst long *)data, len)
+#define Data32(dpy, data, len) _XData32(dpy, (_Xconst long *)(data), (unsigned)(len))
 extern int _XData32(
 	 Display *dpy,
 	 _Xconst long *data,
@@ -686,7 +694,7 @@
 	 long len
 );
 #else
-#define Data32(dpy, data, len) Data((dpy), (_Xconst char *)(data), (len))
+#define Data32(dpy, data, len) Data((dpy), (_Xconst char *)(data), (long)(len))
 #define _XRead32(dpy, data, len) _XRead((dpy), (char *)(data), (len))
 #endif

_service:tar_scm:libX11-1.8.1.tar.xz/install-sh -> _service:tar_scm:libX11-1.8.4.tar.xz/install-sh Changed

@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2020-11-14.01; # UTC
+scriptversion=2013-12-25.23; # UTC
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -69,11 +69,6 @@
 # Desired mode of installed file.
 mode=0755
 
-# Create dirs (including intermediate dirs) using mode 755.
-# This is like GNU 'install' as of coreutils 8.32 (2020).
-mkdir_umask=22
-
-backupsuffix=
 chgrpcmd=
 chmodcmd=$chmodprog
 chowncmd=
@@ -104,28 +99,18 @@
      --version  display version info and exit.
 
   -c            (ignored)
-  -C            install only if different (preserve data modification time)
+  -C            install only if different (preserve the last data modification time)
   -d            create directories instead of installing files.
   -g GROUP      $chgrpprog installed files to GROUP.
   -m MODE       $chmodprog installed files to MODE.
   -o USER       $chownprog installed files to USER.
-  -p            pass -p to $cpprog.
   -s            $stripprog installed files.
-  -S SUFFIX     attempt to back up existing files, with suffix SUFFIX.
   -t DIRECTORY  install into DIRECTORY.
   -T            report an error if DSTFILE is a directory.
 
 Environment variables override the default commands:
   CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
   RMPROG STRIPPROG
-
-By default, rm is invoked with -f; when overridden with RMPROG,
-it's up to you to specify -f if you want it.
-
-If -S is not specified, no backups are attempted.
-
-Email bug reports to bug-automake@gnu.org.
-Automake home page: https://www.gnu.org/software/automake/
 "
 
 while test $# -ne 0; do
@@ -152,13 +137,8 @@
     -o) chowncmd="$chownprog $2"
         shift;;
 
-    -p) cpprog="$cpprog -p";;
-
     -s) stripcmd=$stripprog;;
 
-    -S) backupsuffix="$2"
-        shift;;
-
     -t)
         is_target_a_directory=always
         dst_arg=$2
@@ -275,10 +255,6 @@
     dstdir=$dst
     test -d "$dstdir"
     dstdir_status=$?
-    # Don't chown directories that already exist.
-    if test $dstdir_status = 0; then
-      chowncmd=""
-    fi
   else
 
     # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
@@ -295,18 +271,15 @@
     fi
     dst=$dst_arg
 
-    # If destination is a directory, append the input filename.
+    # If destination is a directory, append the input filename; won't work
+    # if double slashes aren't ignored.
     if test -d "$dst"; then
       if test "$is_target_a_directory" = never; then
         echo "$0: $dst_arg: Is a directory" >&2
         exit 1
       fi
       dstdir=$dst
-      dstbase=`basename "$src"`
-      case $dst in
-	*/) dst=$dst$dstbase;;
-	*)  dst=$dst/$dstbase;;
-      esac
+      dst=$dstdir/`basename "$src"`
       dstdir_status=0
     else
       dstdir=`dirname "$dst"`
@@ -315,16 +288,27 @@
     fi
   fi
 
-  case $dstdir in
-    */) dstdirslash=$dstdir;;
-    *)  dstdirslash=$dstdir/;;
-  esac
-
   obsolete_mkdir_used=false
 
   if test $dstdir_status != 0; then
     case $posix_mkdir in
       '')
+        # Create intermediate dirs using mode 755 as modified by the umask.
+        # This is like FreeBSD 'install' as of 1997-10-28.
+        umask=`umask`
+        case $stripcmd.$umask in
+          # Optimize common cases.
+          *23672367) mkdir_umask=$umask;;
+          .*00202 | .0202 | .02) mkdir_umask=22;;
+
+          *0-7)
+            mkdir_umask=`expr $umask + 22 \
+              - $umask % 100 % 40 + $umask % 20 \
+              - $umask % 10 % 4 + $umask % 2
+            `;;
+          *) mkdir_umask=$umask,go-w;;
+        esac
+
         # With -d, create the new directory with the user-specified mode.
         # Otherwise, rely on $mkdir_umask.
         if test -n "$dir_arg"; then
@@ -334,49 +318,43 @@
         fi
 
         posix_mkdir=false
-	# The $RANDOM variable is not portable (e.g., dash).  Use it
-	# here however when possible just to lower collision chance.
-	tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
-
-	trap '
-	  ret=$?
-	  rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null
-	  exit $ret
-	' 0
-
-	# Because "mkdir -p" follows existing symlinks and we likely work
-	# directly in world-writeable /tmp, make sure that the '$tmpdir'
-	# directory is successfully created first before we actually test
-	# 'mkdir -p'.
-	if (umask $mkdir_umask &&
-	    $mkdirprog $mkdir_mode "$tmpdir" &&
-	    exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1
-	then
-	  if test -z "$dir_arg" || {
-	       # Check for POSIX incompatibilities with -m.
-	       # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
-	       # other-writable bit of parent directory when it shouldn't.
-	       # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
-	       test_tmpdir="$tmpdir/a"
-	       ls_ld_tmpdir=`ls -ld "$test_tmpdir"`
-	       case $ls_ld_tmpdir in
-		 d????-?r-*) different_mode=700;;
-		 d????-?--*) different_mode=755;;
-		 *) false;;
-	       esac &&
-	       $mkdirprog -m$different_mode -p -- "$test_tmpdir" && {
-		 ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"`
-		 test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
-	       }
-	     }
-	  then posix_mkdir=:
-	  fi
-	  rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir"
-	else
-	  # Remove any dirs left behind by ancient mkdir implementations.
-	  rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null
-	fi
-	trap '' 0;;
+        case $umask in
+          *1235670-70-7)
+            # POSIX mkdir -p sets u+wx bits regardless of umask, which
+            # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
+            ;;
+          *)
+            tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
+            trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
+
+            if (umask $mkdir_umask &&
+                exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
+            then
+              if test -z "$dir_arg" || {
+                   # Check for POSIX incompatibilities with -m.
+                   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
+                   # other-writable bit of parent directory when it shouldn't.
+                   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
+                   ls_ld_tmpdir=`ls -ld "$tmpdir"`
+                   case $ls_ld_tmpdir in
+                     d????-?r-*) different_mode=700;;
+                     d????-?--*) different_mode=755;;
+                     *) false;;
+                   esac &&
+                   $mkdirprog -m$different_mode -p -- "$tmpdir" && {
+                     ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
+                     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
+                   }
+                 }
+              then posix_mkdir=:
+              fi
+              rmdir "$tmpdir/d" "$tmpdir"
+            else
+              # Remove any dirs left behind by ancient mkdir implementations.
+              rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
+            fi
+            trap '' 0;;
+        esac;;
     esac
 
     if
@@ -387,7 +365,7 @@
     then :
     else
 
-      # mkdir does not conform to POSIX,
+      # The umask is ridiculous, or mkdir does not conform to POSIX,
       # or it failed possibly due to a race condition.  Create the
       # directory the slow way, step by step, checking for races as we go.
 
@@ -416,7 +394,7 @@
           prefixes=
         else
           if $posix_mkdir; then
-            (umask $mkdir_umask &&
+            (umask=$mkdir_umask &&
              $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
             # Don't fail if two instances are running concurrently.
             test -d "$prefix" || exit 1
@@ -449,25 +427,14 @@
   else
 
     # Make a couple of temp file names in the proper directory.
-    dsttmp=${dstdirslash}_inst.$$_
-    rmtmp=${dstdirslash}_rm.$$_
+    dsttmp=$dstdir/_inst.$$_
+    rmtmp=$dstdir/_rm.$$_
 
     # Trap to clean up those temp files at exit.
     trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
 
     # Copy the file name to the temp name.
-    (umask $cp_umask &&
-     { test -z "$stripcmd" || {
-	 # Create $dsttmp read-write so that cp doesn't create it read-only,
-	 # which would cause strip to fail.
-	 if test -z "$doit"; then
-	   : >"$dsttmp" # No need to fork-exec 'touch'.
-	 else
-	   $doit touch "$dsttmp"
-	 fi
-       }
-     } &&
-     $doit_exec $cpprog "$src" "$dsttmp") &&
+    (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
 
     # and set any options; do chmod last to preserve setuid bits.
     #
@@ -493,13 +460,6 @@
     then
       rm -f "$dsttmp"
     else
-      # If $backupsuffix is set, and the file being installed
-      # already exists, attempt a backup.  Don't worry if it fails,
-      # e.g., if mv doesn't support -f.
-      if test -n "$backupsuffix" && test -f "$dst"; then
-        $doit $mvcmd -f "$dst" "$dst$backupsuffix" 2>/dev/null
-      fi
-
       # Rename the file to the real destination.
       $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
 
@@ -514,9 +474,9 @@
         # file should still install successfully.
         {
           test ! -f "$dst" ||
-          $doit $rmcmd "$dst" 2>/dev/null ||
+          $doit $rmcmd -f "$dst" 2>/dev/null ||
           { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
-            { $doit $rmcmd "$rmtmp" 2>/dev/null; :; }
+            { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
           } ||
           { echo "$0: cannot unlink or rename $dst" >&2
             (exit 1); exit 1
@@ -533,9 +493,9 @@
 done
 
 # Local variables:
-# eval: (add-hook 'before-save-hook 'time-stamp)
+# eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC0"
+# time-stamp-time-zone: "UTC"
 # time-stamp-end: "; # UTC"
 # End:

_service:tar_scm:libX11-1.8.1.tar.xz/ltmain.sh -> _service:tar_scm:libX11-1.8.4.tar.xz/ltmain.sh Changed

@@ -1,12 +1,12 @@
-#! /usr/bin/env sh
+#! /bin/sh
 ## DO NOT EDIT - This file generated from ./build-aux/ltmain.in
-## by inline-source v2019-02-19.15
+## by inline-source v2014-01-03.01
 
-# libtool (GNU libtool) 2.4.7
+# libtool (GNU libtool) 2.4.6
 # Provide generalized library-building support services.
 # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 
-# Copyright (C) 1996-2019, 2021-2022 Free Software Foundation, Inc.
+# Copyright (C) 1996-2015 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions. There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -31,8 +31,8 @@
 
 PROGRAM=libtool
 PACKAGE=libtool
-VERSION=2.4.7
-package_revision=2.4.7
+VERSION=2.4.6
+package_revision=2.4.6
 
 
 ## ------ ##
@@ -64,25 +64,34 @@
 # libraries, which are installed to $pkgauxdir.
 
 # Set a version string for this script.
-scriptversion=2019-02-19.15; # UTC
+scriptversion=2015-01-20.17; # UTC
 
 # General shell script boiler plate, and helper functions.
 # Written by Gary V. Vaughan, 2004
 
-# This is free software. There is NO warranty; not even for
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-#
-# Copyright (C) 2004-2019, 2021 Bootstrap Authors
-#
-# This file is dual licensed under the terms of the MIT license
-# <https://opensource.org/license/MIT>, and GPL version 2 or later
-# <http://www.gnu.org/licenses/gpl-2.0.html>. You must apply one of
-# these licenses when using or redistributing this software or any of
-# the files within it. See the URLs above, or the file `LICENSE`
-# included in the Bootstrap distribution for the full license texts.
+# Copyright (C) 2004-2015 Free Software Foundation, Inc.
+# This is free software; see the source for copying conditions. There is NO
+# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+
+# As a special exception to the GNU General Public License, if you distribute
+# this file as part of a program or library that is built using GNU Libtool,
+# you may include this file under the same distribution terms that you use
+# for the rest of that program.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNES FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
 
-# Please report bugs or propose patches to:
-# <https://github.com/gnulib-modules/bootstrap/issues>
+# Please report bugs or propose patches to gary@gnu.org.
 
 
 ## ------ ##
@@ -130,12 +139,9 @@
 	 _G_safe_locale=\"$_G_var=C; \$_G_safe_locale\"
 	fi"
 done
-# These NLS vars are set unconditionally (bootstrap issue #24). Unset those
-# in case the environment reset is needed later and the $save_* variant is not
-# defined (see the code above).
-LC_ALL=C
-LANGUAGE=C
-export LANGUAGE LC_ALL
+
+# CDPATH.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 # Make sure IFS has a sensible default
 sp=' '
@@ -153,26 +159,6 @@
 fi
 
 
-# func_unset VAR
-# --------------
-# Portably unset VAR.
-# In some shells, an 'unset VAR' statement leaves a non-zero return
-# status if VAR is already unset, which might be problematic if the
-# statement is used at the end of a function (thus poisoning its return
-# value) or when 'set -e' is active (causing even a spurious abort of
-# the script in this case).
-func_unset ()
-{
- { eval $1=; (eval unset $1) >/dev/null 2>&1 && eval unset $1 || : ; }
-}
-
-
-# Make sure CDPATH doesn't cause `cd` commands to output the target dir.
-func_unset CDPATH
-
-# Make sure ${,E,F}GREP behave sanely.
-func_unset GREP_OPTIONS
-
 
 ## ------------------------- ##
 ## Locate command utilities. ##
@@ -273,7 +259,7 @@
 rm -f conftest.in conftest.tmp conftest.nl conftest.out
 }
 
- func_path_progs "sed gsed" func_check_prog_sed "$PATH:/usr/xpg4/bin"
+ func_path_progs "sed gsed" func_check_prog_sed $PATH:/usr/xpg4/bin
 rm -f conftest.sed
 SED=$func_path_progs_result
 }
@@ -309,7 +295,7 @@
 rm -f conftest.in conftest.tmp conftest.nl conftest.out
 }
 
- func_path_progs "grep ggrep" func_check_prog_grep "$PATH:/usr/xpg4/bin"
+ func_path_progs "grep ggrep" func_check_prog_grep $PATH:/usr/xpg4/bin
 GREP=$func_path_progs_result
 }
 
@@ -374,35 +360,6 @@
 s/\$^$_G_bs\$$_G_bs2$_G_dollar/\\1$_G_bs2$_G_bs$_G_dollar/g
 s/\n//g"
 
-# require_check_ifs_backslash
-# ---------------------------
-# Check if we can use backslash as IFS='\' separator, and set
-# $check_ifs_backshlash_broken to ':' or 'false'.
-require_check_ifs_backslash=func_require_check_ifs_backslash
-func_require_check_ifs_backslash ()
-{
- _G_save_IFS=$IFS
- IFS='\'
- _G_check_ifs_backshlash='a\\b'
- for _G_i in $_G_check_ifs_backshlash
- do
- case $_G_i in
- a)
- check_ifs_backshlash_broken=false
- ;;
- '')
- break
- ;;
- *)
- check_ifs_backshlash_broken=:
- break
- ;;
- esac
- done
- IFS=$_G_save_IFS
- require_check_ifs_backslash=:
-}
-
 
 ## ----------------- ##
 ## Global variables. ##
@@ -623,16 +580,16 @@
 {
 $debug_cmd
 
- func_quote_arg pretty "$2"
- eval "$1+=\\ \$func_quote_arg_result"
+ func_quote_for_eval "$2"
+ eval "$1+=\\ \$func_quote_for_eval_result"
 }'
 else
 func_append_quoted ()
 {
 $debug_cmd
 
- func_quote_arg pretty "$2"
- eval "$1=\$$1\\ \$func_quote_arg_result"
+ func_quote_for_eval "$2"
+ eval "$1=\$$1\\ \$func_quote_for_eval_result"
 }
 fi
 
@@ -1134,203 +1091,85 @@
 }
 
 
-# func_quote_portable EVAL ARG
-# ----------------------------
-# Internal function to portably implement func_quote_arg. Note that we still
-# keep attention to performance here so we as much as possible try to avoid
-# calling sed binary (so far O(N) complexity as long as func_append is O(1)).
-func_quote_portable ()
+# func_quote_for_eval ARG...
+# --------------------------
+# Aesthetically quote ARGs to be evaled later.
+# This function returns two values:
+# i) func_quote_for_eval_result
+# double-quoted, suitable for a subsequent eval
+# ii) func_quote_for_eval_unquoted_result
+# has all characters that are still active within double
+# quotes backslashified.
+func_quote_for_eval ()
 {
 $debug_cmd
 
- $require_check_ifs_backslash
-
- func_quote_portable_result=$2
-
- # one-time-loop (easy break)
- while true
- do
- if $1; then
- func_quote_portable_result=`$ECHO "$2" | $SED \
- -e "$sed_double_quote_subst" -e "$sed_double_backslash"`
- break
- fi
-
- # Quote for eval.
- case $func_quote_portable_result in
+ func_quote_for_eval_unquoted_result=
+ func_quote_for_eval_result=
+ while test 0 -lt $#; do
+ case $1 in
 *\\\`\"\$*)
- # Fallback to sed for $func_check_bs_ifs_broken=:, or when the string
- # contains the shell wildcard characters.
- case $check_ifs_backshlash_broken$func_quote_portable_result in
- :*|*\\*\?*)
- func_quote_portable_result=`$ECHO "$func_quote_portable_result" \
- | $SED "$sed_quote_subst"`
- break
- ;;
- esac
+	 _G_unquoted_arg=`printf '%s\n' "$1" |$SED "$sed_quote_subst"` ;;
+ *)
+ _G_unquoted_arg=$1 ;;
+ esac
+ if test -n "$func_quote_for_eval_unquoted_result"; then
+	func_append func_quote_for_eval_unquoted_result " $_G_unquoted_arg"
+ else
+ func_append func_quote_for_eval_unquoted_result "$_G_unquoted_arg"
+ fi
 
- func_quote_portable_old_IFS=$IFS
- for _G_char in '\' '`' '"' '$'
- do
- # STATE($1) PREV($2) SEPARATOR($3)
- set start "" ""
- func_quote_portable_result=dummy"$_G_char$func_quote_portable_result$_G_char"dummy
- IFS=$_G_char
- for _G_part in $func_quote_portable_result
- do
- case $1 in
- quote)
- func_append func_quote_portable_result "$3$2"
- set quote "$_G_part" "\\$_G_char"
- ;;
- start)
- set first "" ""
- func_quote_portable_result=
- ;;
- first)
- set quote "$_G_part" ""
- ;;
- esac
- done
- done
- IFS=$func_quote_portable_old_IFS
+ case $_G_unquoted_arg in
+ # Double-quote args containing shell metacharacters to delay
+ # word splitting, command substitution and variable expansion
+ # for a subsequent eval.
+ # Many Bourne shells cannot handle close brackets correctly
+ # in scan sets, so we specify it separately.
+ *\\~\#\^\&\*\{\}\|\;\<\>\?\'\ \	*|**|"")
+ _G_quoted_arg=\"$_G_unquoted_arg\"
 ;;
- *) ;;
+ *)
+ _G_quoted_arg=$_G_unquoted_arg
+	 ;;
 esac
- break
- done
 
- func_quote_portable_unquoted_result=$func_quote_portable_result
- case $func_quote_portable_result in
- # double-quote args containing shell metacharacters to delay
- # word splitting, command substitution and variable expansion
- # for a subsequent eval.
- # many bourne shells cannot handle close brackets correctly
- # in scan sets, so we specify it separately.
- *\\~\#\^\&\*\{\}\|\;\<\>\?\'\ \	*|**|"")
- func_quote_portable_result=\"$func_quote_portable_result\"
- ;;
- esac
+ if test -n "$func_quote_for_eval_result"; then
+	func_append func_quote_for_eval_result " $_G_quoted_arg"
+ else
+ func_append func_quote_for_eval_result "$_G_quoted_arg"
+ fi
+ shift
+ done
 }
 
 
-# func_quotefast_eval ARG
-# -----------------------
-# Quote one ARG (internal). This is equivalent to 'func_quote_arg eval ARG',
-# but optimized for speed. Result is stored in $func_quotefast_eval.
-if test xyes = `(x=; printf -v x %q yes; echo x"$x") 2>/dev/null`; then
- printf -v _GL_test_printf_tilde %q '~'
- if test '\~' = "$_GL_test_printf_tilde"; then
- func_quotefast_eval ()
- {
- printf -v func_quotefast_eval_result %q "$1"
- }
- else
- # Broken older Bash implementations. Make those faster too if possible.
- func_quotefast_eval ()
- {
- case $1 in
- '~'*)
- func_quote_portable false "$1"
- func_quotefast_eval_result=$func_quote_portable_result
- ;;
- *)
- printf -v func_quotefast_eval_result %q "$1"
- ;;
- esac
- }
- fi
-else
- func_quotefast_eval ()
- {
- func_quote_portable false "$1"
- func_quotefast_eval_result=$func_quote_portable_result
- }
-fi
-
+# func_quote_for_expand ARG
+# -------------------------
+# Aesthetically quote ARG to be evaled later; same as above,
+# but do not quote variable references.
+func_quote_for_expand ()
+{
+ $debug_cmd
 
-# func_quote_arg MODEs ARG
-# ------------------------
-# Quote one ARG to be evaled later. MODEs argument may contain zero or more
-# specifiers listed below separated by ',' character. This function returns two
-# values:
-# i) func_quote_arg_result
-# double-quoted (when needed), suitable for a subsequent eval
-# ii) func_quote_arg_unquoted_result
-# has all characters that are still active within double
-# quotes backslashified. Available only if 'unquoted' is specified.
-#
-# Available modes:
-# ----------------
-# 'eval' (default)
-# - escape shell special characters
-# 'expand'
-# - the same as 'eval'; but do not quote variable references
-# 'pretty'
-# - request aesthetic output, i.e. '"a b"' instead of 'a\ b'. This might
-# be used later in func_quote to get output like: 'echo "a b"' instead
-# of 'echo a\ b'. This is slower than default on some shells.
-# 'unquoted'
-# - produce also $func_quote_arg_unquoted_result which does not contain
-# wrapping double-quotes.
-#
-# Examples for 'func_quote_arg pretty,unquoted string':
-#
-# string | *_result | *_unquoted_result
-# ------------+-----------------------+-------------------
-# " | \" | \"
-# a b | "a b" | a b
-# "a b" | "\"a b\"" | \"a b\"
-# * | "*" | *
-# z="${x-$y}" | "z=\"\${x-\$y}\"" | z=\"\${x-\$y}\"
-#
-# Examples for 'func_quote_arg pretty,unquoted,expand string':
-#
-# string | *_result | *_unquoted_result
-# --------------+---------------------+--------------------
-# z="${x-$y}" | "z=\"${x-$y}\"" | z=\"${x-$y}\"
-func_quote_arg ()
-{
- _G_quote_expand=false
- case ,$1, in
- *,expand,*)
- _G_quote_expand=:
- ;;
+ case $1 in
+ *\\\`\"*)
+	_G_arg=`$ECHO "$1" | $SED \
+	 -e "$sed_double_quote_subst" -e "$sed_double_backslash"` ;;
+ *)
+ _G_arg=$1 ;;
 esac
 
- case ,$1, in
- *,pretty,*|*,expand,*|*,unquoted,*)
- func_quote_portable $_G_quote_expand "$2"
- func_quote_arg_result=$func_quote_portable_result
- func_quote_arg_unquoted_result=$func_quote_portable_unquoted_result
- ;;
- *)
- # Faster quote-for-eval for some shells.
- func_quotefast_eval "$2"
- func_quote_arg_result=$func_quotefast_eval_result
+ case $_G_arg in
+ # Double-quote args containing shell metacharacters to delay
+ # word splitting and command substitution for a subsequent eval.
+ # Many Bourne shells cannot handle close brackets correctly
+ # in scan sets, so we specify it separately.
+ *\\~\#\^\&\*\{\}\|\;\<\>\?\'\ \	*|**|"")
+ _G_arg=\"$_G_arg\"
 ;;
 esac
-}
 
-
-# func_quote MODEs ARGs...
-# ------------------------
-# Quote all ARGs to be evaled later and join them into single command. See
-# func_quote_arg's description for more info.
-func_quote ()
-{
- $debug_cmd
- _G_func_quote_mode=$1 ; shift
- func_quote_result=
- while test 0 -lt $#; do
- func_quote_arg "$_G_func_quote_mode" "$1"
- if test -n "$func_quote_result"; then
- func_append func_quote_result " $func_quote_arg_result"
- else
- func_append func_quote_result "$func_quote_arg_result"
- fi
- shift
- done
+ func_quote_for_expand_result=$_G_arg
 }
 
 
@@ -1376,8 +1215,8 @@
 _G_cmd=$1
 _G_fail_exp=${2-':'}
 
- func_quote_arg pretty,expand "$_G_cmd"
- eval "func_notquiet $func_quote_arg_result"
+ func_quote_for_expand "$_G_cmd"
+ eval "func_notquiet $func_quote_for_expand_result"
 
 $opt_dry_run || {
 eval "$_G_cmd"
@@ -1402,8 +1241,8 @@
 _G_fail_exp=${2-':'}
 
 $opt_quiet || {
- func_quote_arg expand,pretty "$_G_cmd"
- eval "func_echo $func_quote_arg_result"
+ func_quote_for_expand "$_G_cmd"
+ eval "func_echo $func_quote_for_expand_result"
 }
 
 $opt_dry_run || {
@@ -1530,26 +1369,30 @@
 # End:
 #! /bin/sh
 
+# Set a version string for this script.
+scriptversion=2014-01-07.03; # UTC
+
 # A portable, pluggable option parser for Bourne shell.
 # Written by Gary V. Vaughan, 2010
 
-# This is free software. There is NO warranty; not even for
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-#
-# Copyright (C) 2010-2019, 2021 Bootstrap Authors
-#
-# This file is dual licensed under the terms of the MIT license
-# <https://opensource.org/license/MIT>, and GPL version 2 or later
-# <http://www.gnu.org/licenses/gpl-2.0.html>. You must apply one of
-# these licenses when using or redistributing this software or any of
-# the files within it. See the URLs above, or the file `LICENSE`
-# included in the Bootstrap distribution for the full license texts.
+# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# This is free software; see the source for copying conditions. There is NO
+# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-# Please report bugs or propose patches to:
-# <https://github.com/gnulib-modules/bootstrap/issues>
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
 
-# Set a version string for this script.
-scriptversion=2019-02-19.15; # UTC
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+# Please report bugs or propose patches to gary@gnu.org.
 
 
 ## ------ ##
@@ -1572,7 +1415,7 @@
 #
 # In order for the '--version' option to work, you will need to have a
 # suitably formatted comment like the one at the top of this file
-# starting with '# Written by ' and ending with '# Copyright'.
+# starting with '# Written by ' and ending with '# warranty; '.
 #
 # For '-h' and '--help' to work, you will also need a one line
 # description of your script's purpose in a comment directly above the
@@ -1584,7 +1427,7 @@
 # to display verbose messages only when your user has specified
 # '--verbose'.
 #
-# After sourcing this file, you can plug in processing for additional
+# After sourcing this file, you can plug processing for additional
 # options by amending the variables from the 'Configuration' section
 # below, and following the instructions in the 'Option parsing'
 # section further down.
@@ -1633,8 +1476,8 @@
 ## ------------------------- ##
 
 # This section contains functions for adding, removing, and running hooks
-# in the main code. A hook is just a list of function names that can be
-# run in order later on.
+# to the main code. A hook is just a named list of of function, that can
+# be run in order later on.
 
 # func_hookable FUNC_NAME
 # -----------------------
@@ -1667,8 +1510,7 @@
 
 # func_remove_hook FUNC_NAME HOOK_FUNC
 # ------------------------------------
-# Remove HOOK_FUNC from the list of hook functions to be called by
-# FUNC_NAME.
+# Remove HOOK_FUNC from the list of functions called by FUNC_NAME.
 func_remove_hook ()
 {
 $debug_cmd
@@ -1677,28 +1519,10 @@
 }
 
 
-# func_propagate_result FUNC_NAME_A FUNC_NAME_B
-# ---------------------------------------------
-# If the *_result variable of FUNC_NAME_A _is set_, assign its value to
-# *_result variable of FUNC_NAME_B.
-func_propagate_result ()
-{
- $debug_cmd
-
- func_propagate_result_result=:
- if eval "test \"\${${1}_result+set}\" = set"
- then
- eval "${2}_result=\$${1}_result"
- else
- func_propagate_result_result=false
- fi
-}
-
-
 # func_run_hooks FUNC_NAME ARG...
 # ---------------------------------
 # Run all hook functions registered to FUNC_NAME.
-# It's assumed that the list of hook functions contains nothing more
+# It is assumed that the list of hook functions contains nothing more
 # than a whitespace-delimited list of legal shell function names, and
 # no effort is wasted trying to catch shell meta-characters or preserve
 # whitespace.
@@ -1708,19 +1532,22 @@
 
 case " $hookable_fns " in
 *" $1 "*) ;;
- *) func_fatal_error "'$1' does not support hook functions." ;;
+ *) func_fatal_error "'$1' does not support hook funcions.n" ;;
 esac
 
 eval _G_hook_fns=\$$1_hooks; shift
 
 for _G_hook in $_G_hook_fns; do
- func_unset "${_G_hook}_result"
- eval $_G_hook '${1+"$@"}'
- func_propagate_result $_G_hook func_run_hooks
- if $func_propagate_result_result; then
- eval set dummy "$func_run_hooks_result"; shift
- fi
+ eval $_G_hook '"$@"'
+
+ # store returned options list back into positional
+ # parameters for next 'cmd' execution.
+ eval _G_hook_result=\$${_G_hook}_result
+ eval set dummy "$_G_hook_result"; shift
 done
+
+ func_quote_for_eval ${1+"$@"}
+ func_run_hooks_result=$func_quote_for_eval_result
 }
 
 
@@ -1730,18 +1557,10 @@
 ## --------------- ##
 
 # In order to add your own option parsing hooks, you must accept the
-# full positional parameter list from your hook function. You may remove
-# or edit any options that you action, and then pass back the remaining
-# unprocessed options in '<hooked_function_name>_result', escaped
-# suitably for 'eval'.
-#
-# The '<hooked_function_name>_result' variable is automatically unset
-# before your hook gets called; for best performance, only set the
-# *_result variable when necessary (i.e. don't call the 'func_quote'
-# function unnecessarily because it can be an expensive operation on some
-# machines).
-#
-# Like this:
+# full positional parameter list in your hook function, remove any
+# options that you action, and then pass back the remaining unprocessed
+# options in '<hooked_function_name>_result', escaped suitably for
+# 'eval'. Like this:
 #
 # my_options_prep ()
 # {
@@ -1751,8 +1570,9 @@
 # usage_message=$usage_message'
 # -s, --silent don'\''t print informational messages
 # '
-# # No change in '$@' (ignored completely by this hook). Leave
-# # my_options_prep_result variable intact.
+#
+# func_quote_for_eval ${1+"$@"}
+# my_options_prep_result=$func_quote_for_eval_result
 # }
 # func_add_hook func_options_prep my_options_prep
 #
@@ -1761,36 +1581,25 @@
 # {
 # $debug_cmd
 #
-# args_changed=false
-#
-# # Note that, for efficiency, we parse as many options as we can
+# # Note that for efficiency, we parse as many options as we can
 # # recognise in a loop before passing the remainder back to the
 # # caller on the first unrecognised argument we encounter.
 # while test $# -gt 0; do
 # opt=$1; shift
 # case $opt in
-# --silent|-s) opt_silent=:
-# args_changed=:
-# ;;
+# --silent|-s) opt_silent=: ;;
 # # Separate non-argument short options:
 # -s*) func_split_short_opt "$_G_opt"
 # set dummy "$func_split_short_opt_name" \
 # "-$func_split_short_opt_arg" ${1+"$@"}
 # shift
-# args_changed=:
 # ;;
-# *) # Make sure the first unrecognised option "$_G_opt"
-# # is added back to "$@" in case we need it later,
-# # if $args_changed was set to 'true'.
-# set dummy "$_G_opt" ${1+"$@"}; shift; break ;;
+# *) set dummy "$_G_opt" "$*"; shift; break ;;
 # esac
 # done
 #
-# # Only call 'func_quote' here if we processed at least one argument.
-# if $args_changed; then
-# func_quote eval ${1+"$@"}
-# my_silent_option_result=$func_quote_result
-# fi
+# func_quote_for_eval ${1+"$@"}
+# my_silent_option_result=$func_quote_for_eval_result
 # }
 # func_add_hook func_parse_options my_silent_option
 #
@@ -1801,26 +1610,17 @@
 #
 # $opt_silent && $opt_verbose && func_fatal_help "\
 # '--silent' and '--verbose' options are mutually exclusive."
+#
+# func_quote_for_eval ${1+"$@"}
+# my_option_validation_result=$func_quote_for_eval_result
 # }
 # func_add_hook func_validate_options my_option_validation
 #
-# You'll also need to manually amend $usage_message to reflect the extra
+# You'll alse need to manually amend $usage_message to reflect the extra
 # options you parse. It's preferable to append if you can, so that
 # multiple option parsing hooks can be added safely.
 
 
-# func_options_finish ARG...
-# ----------------------------
-# Finishing the option parse loop (call 'func_options' hooks ATM).
-func_options_finish ()
-{
- $debug_cmd
-
- func_run_hooks func_options ${1+"$@"}
- func_propagate_result func_run_hooks func_options_finish
-}
-
-
 # func_options ARG...
 # ---------------------
 # All the functions called inside func_options are hookable. See the
@@ -1830,27 +1630,17 @@
 {
 $debug_cmd
 
- _G_options_quoted=false
+ func_options_prep ${1+"$@"}
+ eval func_parse_options \
+ ${func_options_prep_result+"$func_options_prep_result"}
+ eval func_validate_options \
+ ${func_parse_options_result+"$func_parse_options_result"}
 
- for my_func in options_prep parse_options validate_options options_finish
- do
- func_unset func_${my_func}_result
- func_unset func_run_hooks_result
- eval func_$my_func '${1+"$@"}'
- func_propagate_result func_$my_func func_options
- if $func_propagate_result_result; then
- eval set dummy "$func_options_result"; shift
- _G_options_quoted=:
- fi
- done
+ eval func_run_hooks func_options \
+ ${func_validate_options_result+"$func_validate_options_result"}
 
- $_G_options_quoted || {
- # As we (func_options) are top-level options-parser function and
- # nobody quoted "$@" for us yet, we need to do it explicitly for
- # caller.
- func_quote eval ${1+"$@"}
- func_options_result=$func_quote_result
- }
+ # save modified positional parameters for caller
+ func_options_result=$func_run_hooks_result
 }
 
 
@@ -1859,8 +1649,9 @@
 # All initialisations required before starting the option parse loop.
 # Note that when calling hook functions, we pass through the list of
 # positional parameters. If a hook function modifies that list, and
-# needs to propagate that back to rest of this script, then the complete
-# modified list must be put in 'func_run_hooks_result' before returning.
+# needs to propogate that back to rest of this script, then the complete
+# modified list must be put in 'func_run_hooks_result' before
+# returning.
 func_hookable func_options_prep
 func_options_prep ()
 {
@@ -1871,7 +1662,9 @@
 opt_warning_types=
 
 func_run_hooks func_options_prep ${1+"$@"}
- func_propagate_result func_run_hooks func_options_prep
+
+ # save modified positional parameters for caller
+ func_options_prep_result=$func_run_hooks_result
 }
 
 
@@ -1883,32 +1676,25 @@
 {
 $debug_cmd
 
- _G_parse_options_requote=false
+ func_parse_options_result=
+
 # this just eases exit handling
 while test $# -gt 0; do
 # Defer to hook functions for initial option parsing, so they
 # get priority in the event of reusing an option name.
 func_run_hooks func_parse_options ${1+"$@"}
- func_propagate_result func_run_hooks func_parse_options
- if $func_propagate_result_result; then
- eval set dummy "$func_parse_options_result"; shift
- # Even though we may have changed "$@", we passed the "$@" array
- # down into the hook and it quoted it for us (because we are in
- # this if-branch). No need to quote it again.
- _G_parse_options_requote=false
- fi
+
+ # Adjust func_parse_options positional parameters to match
+ eval set dummy "$func_run_hooks_result"; shift
 
 # Break out of the loop if we already parsed every option.
 test $# -gt 0 || break
 
- # We expect that one of the options parsed in this function matches
- # and thus we remove _G_opt from "$@" and need to re-quote.
- _G_match_parse_options=:
 _G_opt=$1
 shift
 case $_G_opt in
 --debug|-x) debug_cmd='set -x'
- func_echo "enabling shell trace mode" >&2
+ func_echo "enabling shell trace mode"
 $debug_cmd
 ;;
 
@@ -1918,10 +1704,7 @@
 		 ;;
 
 --warnings|--warning|-W)
- if test $# = 0 && func_missing_arg $_G_opt; then
- _G_parse_options_requote=:
- break
- fi
+ test $# = 0 && func_missing_arg $_G_opt && break
 case " $warning_categories $1" in
 *" $1 "*)
 # trailing space prevents matching last $1 above
@@ -1974,24 +1757,15 @@
 shift
 ;;
 
- --) _G_parse_options_requote=: ; break ;;
+ --) break ;;
 -*) func_fatal_help "unrecognised option: '$_G_opt'" ;;
- *) set dummy "$_G_opt" ${1+"$@"}; shift
- _G_match_parse_options=false
- break
- ;;
+ *) set dummy "$_G_opt" ${1+"$@"}; shift; break ;;
 esac
-
- if $_G_match_parse_options; then
- _G_parse_options_requote=:
- fi
 done
 
- if $_G_parse_options_requote; then
- # save modified positional parameters for caller
- func_quote eval ${1+"$@"}
- func_parse_options_result=$func_quote_result
- fi
+ # save modified positional parameters for caller
+ func_quote_for_eval ${1+"$@"}
+ func_parse_options_result=$func_quote_for_eval_result
 }
 
 
@@ -2008,10 +1782,12 @@
 test -n "$opt_warning_types" || opt_warning_types=" $warning_categories"
 
 func_run_hooks func_validate_options ${1+"$@"}
- func_propagate_result func_run_hooks func_validate_options
 
 # Bail if the options were screwed!
 $exit_cmd $EXIT_FAILURE
+
+ # save modified positional parameters for caller
+ func_validate_options_result=$func_run_hooks_result
 }
 
 
@@ -2067,8 +1843,8 @@
 
 # func_split_equals STRING
 # ------------------------
-# Set func_split_equals_lhs and func_split_equals_rhs shell variables
-# after splitting STRING at the '=' sign.
+# Set func_split_equals_lhs and func_split_equals_rhs shell variables after
+# splitting STRING at the '=' sign.
 test -z "$_G_HAVE_XSI_OPS" \
 && (eval 'x=a/b/c;
 test 5aa/bb/cc = "${#x}${x%%/*}${x%/*}${x#*/}${x##*/}"') 2>/dev/null \
@@ -2083,9 +1859,8 @@
 
 func_split_equals_lhs=${1%%=*}
 func_split_equals_rhs=${1#*=}
- if test "x$func_split_equals_lhs" = "x$1"; then
- func_split_equals_rhs=
- fi
+ test "x$func_split_equals_lhs" = "x$1" \
+ && func_split_equals_rhs=
 }'
 else
 # ...otherwise fall back to using expr, which is often a shell builtin.
@@ -2095,7 +1870,7 @@
 
 func_split_equals_lhs=`expr "x$1" : 'x$^=*$'`
 func_split_equals_rhs=
- test "x$func_split_equals_lhs=" = "x$1" \
+ test "x$func_split_equals_lhs" = "x$1" \
 || func_split_equals_rhs=`expr "x$1" : 'x^=*=$.*$$'`
 }
 fi #func_split_equals
@@ -2121,7 +1896,7 @@
 {
 $debug_cmd
 
- func_split_short_opt_name=`expr "x$1" : 'x$-.$'`
+ func_split_short_opt_name=`expr "x$1" : 'x-$.$'`
 func_split_short_opt_arg=`expr "x$1" : 'x-.$.*$$'`
 }
 fi #func_split_short_opt
@@ -2163,44 +1938,31 @@
 # func_version
 # ------------
 # Echo version message to standard output and exit.
-# The version message is extracted from the calling file's header
-# comments, with leading '# ' stripped:
-# 1. First display the progname and version
-# 2. Followed by the header comment line matching /^# Written by /
-# 3. Then a blank line followed by the first following line matching
-# /^# Copyright /
-# 4. Immediately followed by any lines between the previous matches,
-# except lines preceding the intervening completely blank line.
-# For example, see the header comments of this file.
 func_version ()
 {
 $debug_cmd
 
 printf '%s\n' "$progname $scriptversion"
 $SED -n '
- /^# Written by /!b
- s|^# ||; p; n
-
- :fwd2blnk
- /./ {
- n
- b fwd2blnk
+ /(C)/!b go
+ :more
+ /\./!{
+ N
+ s|\n# | |
+ b more
 }
- p; n
-
- :holdwrnt
- s|^# ||
- s|^# *$||
- /^Copyright /!{
- /./H
- n
- b holdwrnt
+ :go
+ /^# Written by /,/# warranty; / {
+ s|^# ||
+ s|^# *$||
+ s|$(C)$ 0-9,-* ,-$1-90-9* $|\1 \2|
+ p
 }
-
- s|$(C)$ 0-9,-* ,-$1-90-9* $|\1 \2|
- G
- s|$\n$\n*|\1|g
- p; q' < "$progpath"
+ /^# Written by / {
+ s|^# ||
+ p
+ }
+ /^warranty; /q' < "$progpath"
 
 exit $?
 }
@@ -2210,12 +1972,12 @@
 # mode: shell-script
 # sh-indentation: 2
 # eval: (add-hook 'before-save-hook 'time-stamp)
-# time-stamp-pattern: "30/scriptversion=%:y-%02m-%02d.%02H; # UTC"
+# time-stamp-pattern: "10/scriptversion=%:y-%02m-%02d.%02H; # UTC"
 # time-stamp-time-zone: "UTC"
 # End:
 
 # Set a version string.
-scriptversion='(GNU libtool) 2.4.7'
+scriptversion='(GNU libtool) 2.4.6'
 
 
 # func_echo ARG...
@@ -2306,12 +2068,12 @@
 compiler: $LTCC
 compiler flags: $LTCFLAGS
 linker: $LD (gnu? $with_gnu_ld)
- version: $progname (GNU libtool) 2.4.7
+ version: $progname (GNU libtool) 2.4.6
 automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q`
 autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q`
 
 Report bugs to <bug-libtool@gnu.org>.
-GNU libtool home page: <http://www.gnu.org/software/libtool/>.
+GNU libtool home page: <http://www.gnu.org/s/libtool/>.
 General help using GNU software: <http://www.gnu.org/gethelp/>."
 exit 0
 }
@@ -2362,7 +2124,7 @@
 # a configuration failure hint, and exit.
 func_fatal_configuration ()
 {
- func_fatal_error ${1+"$@"} \
+ func__fatal_error ${1+"$@"} \
 "See the $PACKAGE documentation for more information." \
 "Fatal configuration error."
 }
@@ -2508,8 +2270,6 @@
 nonopt=
 preserve_args=
 
- _G_rc_lt_options_prep=:
-
 # Shorthand for --mode=foo, only valid as the first argument
 case $1 in
 clean|clea|cle|cl)
@@ -2533,16 +2293,11 @@
 uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
 shift; set dummy --mode uninstall ${1+"$@"}; shift
 ;;
- *)
- _G_rc_lt_options_prep=false
- ;;
 esac
 
- if $_G_rc_lt_options_prep; then
- # Pass back the list of options.
- func_quote eval ${1+"$@"}
- libtool_options_prep_result=$func_quote_result
- fi
+ # Pass back the list of options.
+ func_quote_for_eval ${1+"$@"}
+ libtool_options_prep_result=$func_quote_for_eval_result
 }
 func_add_hook func_options_prep libtool_options_prep
 
@@ -2554,12 +2309,9 @@
 {
 $debug_cmd
 
- _G_rc_lt_parse_options=false
-
 # Perform our own loop to consume as many options as possible in
 # each iteration.
 while test $# -gt 0; do
- _G_match_lt_parse_options=:
 _G_opt=$1
 shift
 case $_G_opt in
@@ -2634,20 +2386,15 @@
 func_append preserve_args " $_G_opt"
 ;;
 
- # An option not handled by this hook function:
- *) set dummy "$_G_opt" ${1+"$@"} ; shift
- _G_match_lt_parse_options=false
- break
- ;;
+	# An option not handled by this hook function:
+ *)		set dummy "$_G_opt" ${1+"$@"};	shift; break ;;
 esac
- $_G_match_lt_parse_options && _G_rc_lt_parse_options=:
 done
 
- if $_G_rc_lt_parse_options; then
- # save modified positional parameters for caller
- func_quote eval ${1+"$@"}
- libtool_parse_options_result=$func_quote_result
- fi
+
+ # save modified positional parameters for caller
+ func_quote_for_eval ${1+"$@"}
+ libtool_parse_options_result=$func_quote_for_eval_result
 }
 func_add_hook func_parse_options libtool_parse_options
 
@@ -2704,8 +2451,8 @@
 }
 
 # Pass back the unparsed argument list
- func_quote eval ${1+"$@"}
- libtool_validate_options_result=$func_quote_result
+ func_quote_for_eval ${1+"$@"}
+ libtool_validate_options_result=$func_quote_for_eval_result
 }
 func_add_hook func_validate_options libtool_validate_options
 
@@ -3671,8 +3418,8 @@
 esac
 done
 
- func_quote_arg pretty "$libobj"
- test "X$libobj" != "X$func_quote_arg_result" \
+ func_quote_for_eval "$libobj"
+ test "X$libobj" != "X$func_quote_for_eval_result" \
 && $ECHO "X$libobj" | $GREP '~#^*{};<>?"'"'"'	 &()|`$' \
 && func_warning "libobj name '$libobj' may not contain shell special characters."
 func_dirname_and_basename "$obj" "/" ""
@@ -3745,8 +3492,8 @@
 
 func_to_tool_file "$srcfile" func_convert_file_msys_to_w32
 srcfile=$func_to_tool_file_result
- func_quote_arg pretty "$srcfile"
- qsrcfile=$func_quote_arg_result
+ func_quote_for_eval "$srcfile"
+ qsrcfile=$func_quote_for_eval_result
 
 # Only build a PIC object if we are building libtool libraries.
 if test yes = "$build_libtool_libs"; then
@@ -3901,8 +3648,7 @@
 -prefer-non-pic try to build non-PIC objects only
 -shared do not build a '.o' file suitable for static linking
 -static only build a '.o' file suitable for static linking
- -Wc,FLAG
- -Xcompiler FLAG pass FLAG directly to the compiler
+ -Wc,FLAG pass FLAG directly to the compiler
 
 COMPILE-COMMAND is a command to be used in creating a 'standard' object file
 from the given SOURCEFILE.
@@ -4008,8 +3754,6 @@
 -weak LIBNAME declare that the target provides the LIBNAME interface
 -Wc,FLAG
 -Xcompiler FLAG pass linker-specific FLAG directly to the compiler
- -Wa,FLAG
- -Xassembler FLAG pass linker-specific FLAG directly to the assembler
 -Wl,FLAG
 -Xlinker FLAG pass linker-specific FLAG directly to the linker
 -XCClinker FLAG pass link-specific FLAG to the compiler driver (CC)
@@ -4352,8 +4096,8 @@
 case $nonopt in *shtool*) :;; *) false;; esac
 then
 # Aesthetically quote it.
- func_quote_arg pretty "$nonopt"
- install_prog="$func_quote_arg_result "
+ func_quote_for_eval "$nonopt"
+ install_prog="$func_quote_for_eval_result "
 arg=$1
 shift
 else
@@ -4363,8 +4107,8 @@
 
 # The real first argument should be the name of the installation program.
 # Aesthetically quote it.
- func_quote_arg pretty "$arg"
- func_append install_prog "$func_quote_arg_result"
+ func_quote_for_eval "$arg"
+ func_append install_prog "$func_quote_for_eval_result"
 install_shared_prog=$install_prog
 case " $install_prog " in
 *\\\ /cp\ *) install_cp=: ;;
@@ -4421,12 +4165,12 @@
 esac
 
 # Aesthetically quote the argument.
- func_quote_arg pretty "$arg"
- func_append install_prog " $func_quote_arg_result"
+ func_quote_for_eval "$arg"
+ func_append install_prog " $func_quote_for_eval_result"
 if test -n "$arg2"; then
-	func_quote_arg pretty "$arg2"
+	func_quote_for_eval "$arg2"
 fi
- func_append install_shared_prog " $func_quote_arg_result"
+ func_append install_shared_prog " $func_quote_for_eval_result"
 done
 
 test -z "$install_prog" && \
@@ -4437,8 +4181,8 @@
 
 if test -n "$install_override_mode" && $no_mode; then
 if $install_cp; then :; else
-	func_quote_arg pretty "$install_override_mode"
-	func_append install_shared_prog " -m $func_quote_arg_result"
+	func_quote_for_eval "$install_override_mode"
+	func_append install_shared_prog " -m $func_quote_for_eval_result"
 fi
 fi
 
@@ -4734,8 +4478,8 @@
 	 relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'`
 
 	 $opt_quiet || {
-	 func_quote_arg expand,pretty "$relink_command"
-		 eval "func_echo $func_quote_arg_result"
+	 func_quote_for_expand "$relink_command"
+		 eval "func_echo $func_quote_for_expand_result"
 	 }
 	 if eval "$relink_command"; then :
 	 else
@@ -5514,8 +5258,7 @@
 if test \"\$libtool_execute_magic\" != \"$magic\"; then
 file=\"\$0\""
 
- func_quote_arg pretty "$ECHO"
- qECHO=$func_quote_arg_result
+ qECHO=`$ECHO "$ECHO" | $SED "$sed_quote_subst"`
 $ECHO "\
 
 # A function that is used when there is no print builtin or printf.
@@ -5525,7 +5268,7 @@
 \$1
 _LTECHO_EOF'
 }
- ECHO=$qECHO
+ ECHO=\"$qECHO\"
 fi
 
 # Very basic option parsing. These options are (a) specific to
@@ -6868,9 +6611,9 @@
 while test "$#" -gt 0; do
 arg=$1
 shift
- func_quote_arg pretty,unquoted "$arg"
- qarg=$func_quote_arg_unquoted_result
- func_append libtool_args " $func_quote_arg_result"
+ func_quote_for_eval "$arg"
+ qarg=$func_quote_for_eval_unquoted_result
+ func_append libtool_args " $func_quote_for_eval_result"
 
 # If the previous option needs an argument, assign it.
 if test -n "$prev"; then
@@ -7106,13 +6849,6 @@
 	 prev=
 	 continue
 	 ;;
-	xassembler)
-	 func_append compiler_flags " -Xassembler $qarg"
-	 prev=
-	 func_append compile_command " -Xassembler $qarg"
-	 func_append finalize_command " -Xassembler $qarg"
-	 continue
-	 ;;
 	xcclinker)
 	 func_append linker_flags " $qarg"
 	 func_append compiler_flags " $qarg"
@@ -7283,7 +7019,7 @@
 	 # These systems don't actually have a C library (as such)
 	 test X-lc = "X$arg" && continue
 	 ;;
-	 *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig* | *-*-midnightbsd*)
+	 *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*)
 	 # Do not include libc due to us having libc/libc_r.
 	 test X-lc = "X$arg" && continue
 	 ;;
@@ -7303,7 +7039,7 @@
 	 esac
 	elif test X-lc_r = "X$arg"; then
 	 case $host in
-	 *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig* | *-*-midnightbsd*)
+	 *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*)
 	 # Do not include libc_r directly, use -pthread flag.
 	 continue
 	 ;;
@@ -7333,20 +7069,8 @@
 	prev=xcompiler
 	continue
 	;;
- # Solaris ld rejects as of 11.4. Refer to Oracle bug 22985199.
- -pthread)
-	case $host in
-	 *solaris2*) ;;
-	 *)
-	 case "$new_inherited_linker_flags " in
-	 *" $arg "*) ;;
-	 * ) func_append new_inherited_linker_flags " $arg" ;;
-	 esac
-	 ;;
-	esac
-	continue
-	;;
- -mt|-mthreads|-kthread|-Kthread|-pthreads|--thread-safe \
+
+ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
 |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
 	func_append compiler_flags " $arg"
 	func_append compile_command " $arg"
@@ -7487,9 +7211,9 @@
 	save_ifs=$IFS; IFS=,
 	for flag in $args; do
 	 IFS=$save_ifs
- func_quote_arg pretty "$flag"
-	 func_append arg " $func_quote_arg_result"
-	 func_append compiler_flags " $func_quote_arg_result"
+ func_quote_for_eval "$flag"
+	 func_append arg " $func_quote_for_eval_result"
+	 func_append compiler_flags " $func_quote_for_eval_result"
 	done
 	IFS=$save_ifs
 	func_stripname ' ' '' "$arg"
@@ -7503,21 +7227,16 @@
 	save_ifs=$IFS; IFS=,
 	for flag in $args; do
 	 IFS=$save_ifs
- func_quote_arg pretty "$flag"
-	 func_append arg " $wl$func_quote_arg_result"
-	 func_append compiler_flags " $wl$func_quote_arg_result"
-	 func_append linker_flags " $func_quote_arg_result"
+ func_quote_for_eval "$flag"
+	 func_append arg " $wl$func_quote_for_eval_result"
+	 func_append compiler_flags " $wl$func_quote_for_eval_result"
+	 func_append linker_flags " $func_quote_for_eval_result"
 	done
 	IFS=$save_ifs
 	func_stripname ' ' '' "$arg"
 	arg=$func_stripname_result
 	;;
 
- -Xassembler)
- prev=xassembler
- continue
- ;;
-
 -Xcompiler)
 	prev=xcompiler
 	continue
@@ -7535,8 +7254,8 @@
 
 # -msg_* for osf cc
 -msg_*)
-	func_quote_arg pretty "$arg"
-	arg=$func_quote_arg_result
+	func_quote_for_eval "$arg"
+	arg=$func_quote_for_eval_result
 	;;
 
 # Flags to be passed through unchanged, with rationale:
@@ -7553,17 +7272,12 @@
 # -tp=* Portland pgcc target processor selection
 # --sysroot=* for sysroot support
 # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
- # -specs=* GCC specs files
 # -stdlib=* select c++ std lib with clang
- # -fsanitize=* Clang/GCC memory and address sanitizer
- # -fuse-ld=* Linker select flags for GCC
- # -Wa,* Pass flags directly to the assembler
 -64|-mips0-9|-r0-90-9*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
 -t45*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
- -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \
- -specs=*|-fsanitize=*|-fuse-ld=*|-Wa,*)
- func_quote_arg pretty "$arg"
-	arg=$func_quote_arg_result
+ -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*)
+ func_quote_for_eval "$arg"
+	arg=$func_quote_for_eval_result
 func_append compile_command " $arg"
 func_append finalize_command " $arg"
 func_append compiler_flags " $arg"
@@ -7584,15 +7298,15 @@
 	 continue
 else
 	 # Otherwise treat like 'Some other compiler flag' below
-	 func_quote_arg pretty "$arg"
-	 arg=$func_quote_arg_result
+	 func_quote_for_eval "$arg"
+	 arg=$func_quote_for_eval_result
 fi
 	;;
 
 # Some other compiler flag.
 -* | +*)
- func_quote_arg pretty "$arg"
-	arg=$func_quote_arg_result
+ func_quote_for_eval "$arg"
+	arg=$func_quote_for_eval_result
 	;;
 
 *.$objext)
@@ -7712,8 +7426,8 @@
 *)
 	# Unknown arguments in both finalize_command and compile_command need
 	# to be aesthetically quoted because they are evaled later.
-	func_quote_arg pretty "$arg"
-	arg=$func_quote_arg_result
+	func_quote_for_eval "$arg"
+	arg=$func_quote_for_eval_result
 	;;
 esac # arg
 
@@ -8918,7 +8632,7 @@
 test CXX = "$tagname" && {
 case $host_os in
 linux*)
- case `$CC -V 2>&1 | $SED 5q` in
+ case `$CC -V 2>&1 | sed 5q` in
 *Sun\ C*) # Sun C++ 5.9
 func_suncc_cstd_abi
 
@@ -9091,7 +8805,7 @@
 	 #
 	 case $version_type in
 	 # correct linux to gnu/linux during the next big refactor
-	 darwin|freebsd-elf|linux|midnightbsd-elf|osf|windows|none)
+	 darwin|freebsd-elf|linux|osf|windows|none)
 	 func_arith $number_major + $number_minor
 	 current=$func_arith_result
 	 age=$number_minor
@@ -9182,7 +8896,7 @@
 	 versuffix=.$current.$revision
 	 ;;
 
-	freebsd-elf | midnightbsd-elf)
+	freebsd-elf)
 	 func_arith $current - $age
 	 major=.$func_arith_result
 	 versuffix=$major.$age.$revision
@@ -9408,7 +9122,7 @@
 	 *-*-netbsd*)
 	 # Don't link with libc until the a.out ld.so is fixed.
 	 ;;
-	 *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-midnightbsd*)
+	 *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
 	 # Do not include libc due to us having libc/libc_r.
 	 ;;
 	 *-*-sco3.2v5* | *-*-sco5v6*)
@@ -10219,8 +9933,8 @@
 	 for cmd in $concat_cmds; do
 	 IFS=$save_ifs
 	 $opt_quiet || {
-		 func_quote_arg expand,pretty "$cmd"
-		 eval "func_echo $func_quote_arg_result"
+		 func_quote_for_expand "$cmd"
+		 eval "func_echo $func_quote_for_expand_result"
 	 }
 	 $opt_dry_run || eval "$cmd" || {
 		lt_exit=$?
@@ -10313,8 +10027,8 @@
 	 eval cmd=\"$cmd\"
 	 IFS=$save_ifs
 	 $opt_quiet || {
-	 func_quote_arg expand,pretty "$cmd"
-	 eval "func_echo $func_quote_arg_result"
+	 func_quote_for_expand "$cmd"
+	 eval "func_echo $func_quote_for_expand_result"
 	 }
 	 $opt_dry_run || eval "$cmd" || {
 	 lt_exit=$?
@@ -10788,13 +10502,12 @@
 	 elif eval var_value=\$$var; test -z "$var_value"; then
 	 relink_command="$var=; export $var; $relink_command"
 	 else
-	 func_quote_arg pretty "$var_value"
-	 relink_command="$var=$func_quote_arg_result; export $var; $relink_command"
+	 func_quote_for_eval "$var_value"
+	 relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command"
 	 fi
 	done
-	func_quote eval cd "`pwd`"
-	func_quote_arg pretty,unquoted "($func_quote_result; $relink_command)"
-	relink_command=$func_quote_arg_unquoted_result
+	relink_command="(cd `pwd`; $relink_command)"
+	relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
 fi
 
 # Only actually do things if not in dry run mode.
@@ -11034,15 +10747,13 @@
 	elif eval var_value=\$$var; test -z "$var_value"; then
 	 relink_command="$var=; export $var; $relink_command"
 	else
-	 func_quote_arg pretty,unquoted "$var_value"
-	 relink_command="$var=$func_quote_arg_unquoted_result; export $var; $relink_command"
+	 func_quote_for_eval "$var_value"
+	 relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command"
 	fi
 done
 # Quote the link command for shipping.
- func_quote eval cd "`pwd`"
- relink_command="($func_quote_result; $SHELL \"$progpath\" $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
- func_quote_arg pretty,unquoted "$relink_command"
- relink_command=$func_quote_arg_unquoted_result
+ relink_command="(cd `pwd`; $SHELL \"$progpath\" $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
+ relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
 if test yes = "$hardcode_automatic"; then
 	relink_command=
 fi

_service:tar_scm:libX11-1.8.1.tar.xz/m4/libtool.m4 -> _service:tar_scm:libX11-1.8.4.tar.xz/m4/libtool.m4 Changed

@@ -1,7 +1,6 @@
 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 #
-# Copyright (C) 1996-2001, 2003-2019, 2021-2022 Free Software
-# Foundation, Inc.
+# Copyright (C) 1996-2001, 2003-2015 Free Software Foundation, Inc.
 # Written by Gordon Matzigkeit, 1996
 #
 # This file is free software; the Free Software Foundation gives
@@ -32,7 +31,7 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 )
 
-# serial 59 LT_INIT
+# serial 58 LT_INIT
 
 
 # LT_PREREQ(VERSION)
@@ -182,7 +181,6 @@
 m4_require(_LT_CHECK_SHELL_FEATURES)dnl
 m4_require(_LT_PATH_CONVERSION_FUNCTIONS)dnl
 m4_require(_LT_CMD_RELOAD)dnl
-m4_require(_LT_DECL_FILECMD)dnl
 m4_require(_LT_CHECK_MAGIC_METHOD)dnl
 m4_require(_LT_CHECK_SHAREDLIB_FROM_LINKLIB)dnl
 m4_require(_LT_CMD_OLD_ARCHIVE)dnl
@@ -221,8 +219,8 @@
 ofile=libtool
 can_build_shared=yes
 
-# All known linkers require a '.a' archive for static linking (except MSVC and
-# ICC, which need '.lib').
+# All known linkers require a '.a' archive for static linking (except MSVC,
+# which needs '.lib').
 libext=a
 
 with_gnu_ld=$lt_cv_prog_gnu_ld
@@ -780,7 +778,7 @@
 # if finds mixed CR/LF and LF-only lines. Since sed operates in
 # text mode, it properly converts lines to CR/LF. This bash problem
 # is reportedly fixed, but why not run on old versions too?
- $SED '$q' "$ltmain" >> "$cfgfile" \
+ sed '$q' "$ltmain" >> "$cfgfile" \
 || (rm -f "$cfgfile"; exit 1)
 
 mv -f "$cfgfile" "$ofile" ||
@@ -1044,8 +1042,8 @@
 _LT_EOF
 echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD
 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD
- echo "$AR $AR_FLAGS libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
- $AR $AR_FLAGS libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
+ echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
+ $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
 echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD
 $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD
 cat > conftest.c << _LT_EOF
@@ -1069,12 +1067,17 @@
 _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;;
 darwin1.*)
 _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
- darwin*)
- case $MACOSX_DEPLOYMENT_TARGET,$host in
- 10.012,*|,*powerpc*-darwin5-8*)
- _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
- *)
- _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
+ darwin*) # darwin 5.x on
+ # if running on 10.5 or later, the deployment target defaults
+ # to the OS version, if on x86, and 10.4, the deployment
+ # target defaults to 10.4. Don't you love it?
+ case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
+	10.0,*86*-darwin8*|10.0,*-darwin91*)
+	 _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
+	10.012,.*)
+	 _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
+	10.*)
+	 _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
 esac
 ;;
 esac
@@ -1123,12 +1126,12 @@
 output_verbose_link_cmd=func_echo_all
 _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil"
 _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil"
- _LT_TAGVAR(archive_expsym_cmds, $1)="$SED 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil"
- _LT_TAGVAR(module_expsym_cmds, $1)="$SED -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil"
+ _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil"
+ _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil"
 m4_if($1, CXX,
 if test yes != "$lt_cv_apple_cc_single_mod"; then
 _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dsymutil"
- _LT_TAGVAR(archive_expsym_cmds, $1)="$SED 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil"
+ _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil"
 fi
 ,)
 else
@@ -1242,8 +1245,7 @@
 # _LT_WITH_SYSROOT
 # ----------------
 AC_DEFUN(_LT_WITH_SYSROOT,
-m4_require(_LT_DECL_SED)dnl
-AC_MSG_CHECKING(for sysroot)
+AC_MSG_CHECKING(for sysroot)
 AC_ARG_WITH(sysroot,
 AS_HELP_STRING(--with-sysroot@<:@=DIR@:>@,
 Search for dependent libraries within DIR (or the compiler's sysroot
@@ -1260,7 +1262,7 @@
 fi
 ;; #(
 /*)
- lt_sysroot=`echo "$with_sysroot" | $SED -e "$sed_quote_subst"`
+ lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
 ;; #(
 no|'')
 ;; #(
@@ -1290,7 +1292,7 @@
 # options accordingly.
 echo 'int i;' > conftest.$ac_ext
 if AC_TRY_EVAL(ac_compile); then
- case `$FILECMD conftest.$ac_objext` in
+ case `/usr/bin/file conftest.$ac_objext` in
 *ELF-32*)
 	HPUX_IA64_MODE=32
 	;;
@@ -1307,7 +1309,7 @@
 echo '#line '$LINENO' "configure"' > conftest.$ac_ext
 if AC_TRY_EVAL(ac_compile); then
 if test yes = "$lt_cv_prog_gnu_ld"; then
- case `$FILECMD conftest.$ac_objext` in
+ case `/usr/bin/file conftest.$ac_objext` in
 	*32-bit*)
 	 LD="${LD-ld} -melf32bsmip"
 	 ;;
@@ -1319,7 +1321,7 @@
 	;;
 esac
 else
- case `$FILECMD conftest.$ac_objext` in
+ case `/usr/bin/file conftest.$ac_objext` in
 	*32-bit*)
 	 LD="${LD-ld} -32"
 	 ;;
@@ -1341,7 +1343,7 @@
 echo '#line '$LINENO' "configure"' > conftest.$ac_ext
 if AC_TRY_EVAL(ac_compile); then
 emul=elf
- case `$FILECMD conftest.$ac_objext` in
+ case `/usr/bin/file conftest.$ac_objext` in
 *32-bit*)
 	emul="${emul}32"
 	;;
@@ -1349,7 +1351,7 @@
 	emul="${emul}64"
 	;;
 esac
- case `$FILECMD conftest.$ac_objext` in
+ case `/usr/bin/file conftest.$ac_objext` in
 *MSB*)
 	emul="${emul}btsmip"
 	;;
@@ -1357,7 +1359,7 @@
 	emul="${emul}ltsmip"
 	;;
 esac
- case `$FILECMD conftest.$ac_objext` in
+ case `/usr/bin/file conftest.$ac_objext` in
 *N32*)
 	emul="${emul}n32"
 	;;
@@ -1377,14 +1379,14 @@
 # not appear in the list.
 echo 'int i;' > conftest.$ac_ext
 if AC_TRY_EVAL(ac_compile); then
- case `$FILECMD conftest.o` in
+ case `/usr/bin/file conftest.o` in
 *32-bit*)
 	case $host in
 	 x86_64-*kfreebsd*-gnu)
 	 LD="${LD-ld} -m elf_i386_fbsd"
 	 ;;
 	 x86_64-*linux*)
-	 case `$FILECMD conftest.o` in
+	 case `/usr/bin/file conftest.o` in
 	 *x86-64*)
 		LD="${LD-ld} -m elf32_x86_64"
 		;;
@@ -1452,7 +1454,7 @@
 # options accordingly.
 echo 'int i;' > conftest.$ac_ext
 if AC_TRY_EVAL(ac_compile); then
- case `$FILECMD conftest.o` in
+ case `/usr/bin/file conftest.o` in
 *64-bit*)
 case $lt_cv_prog_gnu_ld in
 yes*)
@@ -1491,22 +1493,9 @@
 m4_defun(_LT_PROG_AR,
 AC_CHECK_TOOLS(AR, ar, false)
 : ${AR=ar}
+: ${AR_FLAGS=cru}
 _LT_DECL(, AR, 1, The archiver)
-
-# Use ARFLAGS variable as AR's operation code to sync the variable naming with
-# Automake. If both AR_FLAGS and ARFLAGS are specified, AR_FLAGS should have
-# higher priority because thats what people were doing historically (setting
-# ARFLAGS for automake and AR_FLAGS for libtool). FIXME: Make the AR_FLAGS
-# variable obsoleted/removed.
-
-test ${AR_FLAGS+y} || AR_FLAGS=${ARFLAGS-cr}
-lt_ar_flags=$AR_FLAGS
-_LT_DECL(, lt_ar_flags, 0, Flags to create an archive (by configure))
-
-# Make AR_FLAGS overridable by 'make ARFLAGS='. Don't try to run-time override
-# by AR_FLAGS because that was never working and AR_FLAGS is about to die.
-_LT_DECL(, AR_FLAGS, \@S|@{ARFLAGS-"\@S|@lt_ar_flags"},
- Flags to create an archive)
+_LT_DECL(, AR_FLAGS, 1, Flags to create an archive)
 
 AC_CACHE_CHECK(for archiver @FILE support, lt_cv_ar_at_file,
 lt_cv_ar_at_file=no
@@ -1725,7 +1714,7 @@
 lt_cv_sys_max_cmd_len=8192;
 ;;
 
- bitrig* | darwin* | dragonfly* | freebsd* | midnightbsd* | netbsd* | openbsd*)
+ bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*)
 # This has been around since 386BSD, at least. Likely further.
 if test -x /sbin/sysctl; then
 lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
@@ -1768,7 +1757,7 @@
 sysv5* | sco5v6* | sysv4.2uw2*)
 kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
 if test -n "$kargmax"; then
- lt_cv_sys_max_cmd_len=`echo $kargmax | $SED 's/.*	 //'`
+ lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*	 //'`
 else
 lt_cv_sys_max_cmd_len=32768
 fi
@@ -2218,35 +2207,26 @@
 striplib=
 old_striplib=
 AC_MSG_CHECKING(whether stripping libraries is possible)
-if test -z "$STRIP"; then
- AC_MSG_RESULT(no)
+if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
+ test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
+ test -z "$striplib" && striplib="$STRIP --strip-unneeded"
+ AC_MSG_RESULT(yes)
 else
- if $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
- old_striplib="$STRIP --strip-debug"
- striplib="$STRIP --strip-unneeded"
- AC_MSG_RESULT(yes)
- else
- case $host_os in
- darwin*)
- # FIXME - insert some real tests, host_os isn't really good enough
+# FIXME - insert some real tests, host_os isn't really good enough
+ case $host_os in
+ darwin*)
+ if test -n "$STRIP"; then
 striplib="$STRIP -x"
 old_striplib="$STRIP -S"
 AC_MSG_RESULT(yes)
- ;;
- freebsd*)
- if $STRIP -V 2>&1 | $GREP "elftoolchain" >/dev/null; then
- old_striplib="$STRIP --strip-debug"
- striplib="$STRIP --strip-unneeded"
- AC_MSG_RESULT(yes)
- else
- AC_MSG_RESULT(no)
- fi
- ;;
- *)
+ else
 AC_MSG_RESULT(no)
- ;;
- esac
- fi
+ fi
+ ;;
+ *)
+ AC_MSG_RESULT(no)
+ ;;
+ esac
 fi
 _LT_DECL(, old_striplib, 1, Commands to strip libraries)
 _LT_DECL(, striplib, 1)
@@ -2569,7 +2549,7 @@
 case $host_os in
 cygwin*)
 # Cygwin DLLs use 'cyg' prefix rather than 'lib'
- soname_spec='`echo $libname | $SED -e 's/^lib/cyg/'``echo $release | $SED -e 's/./-/g'`$versuffix$shared_ext'
+ soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/./-/g'`$versuffix$shared_ext'
 m4_if($1, ,
 sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api")
 ;;
@@ -2579,14 +2559,14 @@
 ;;
 pw32*)
 # pw32 DLLs use 'pw' prefix rather than 'lib'
- library_names_spec='`echo $libname | $SED -e 's/^lib/pw/'``echo $release | $SED -e 's/./-/g'`$versuffix$shared_ext'
+ library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/./-/g'`$versuffix$shared_ext'
 ;;
 esac
 dynamic_linker='Win32 ld.exe'
 ;;
 
- *,cl* | *,icl*)
- # Native MSVC or ICC
+ *,cl*)
+ # Native MSVC
 libname_spec='$name'
 soname_spec='$libname`echo $release | $SED -e 's/./-/g'`$versuffix$shared_ext'
 library_names_spec='$libname.dll.lib'
@@ -2605,7 +2585,7 @@
 done
 IFS=$lt_save_ifs
 # Convert to MSYS style.
- sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's|\\\\|/|g' -e 's| \$a-zA-Z\$:| /\\1|g' -e 's|^ ||'`
+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \$a-zA-Z\$:| /\\1|g' -e 's|^ ||'`
 ;;
 cygwin*)
 # Convert to unix form, then to dos form, then back to unix form
@@ -2642,7 +2622,7 @@
 ;;
 
 *)
- # Assume MSVC and ICC wrapper
+ # Assume MSVC wrapper
 library_names_spec='$libname`echo $release | $SED -e 's/./-/g'`$versuffix$shared_ext $libname.lib'
 dynamic_linker='Win32 ld.exe'
 ;;
@@ -2675,7 +2655,7 @@
 shlibpath_var=LD_LIBRARY_PATH
 ;;
 
-freebsd* | dragonfly* | midnightbsd*)
+freebsd* | dragonfly*)
 # DragonFly does not have aout. When/if they implement a new
 # versioning mechanism, adjust this.
 if test -x /usr/bin/objformat; then
@@ -3474,7 +3454,7 @@
 
 bsdi45*)
 lt_cv_deplibs_check_method='file_magic ELF 0-90-9*-bit MLSB (shared object|dynamic lib)'
- lt_cv_file_magic_cmd='$FILECMD -L'
+ lt_cv_file_magic_cmd='/usr/bin/file -L'
 lt_cv_file_magic_test_file=/shlib/libc.so
 ;;
 
@@ -3508,14 +3488,14 @@
 lt_cv_deplibs_check_method=pass_all
 ;;
 
-freebsd* | dragonfly* | midnightbsd*)
+freebsd* | dragonfly*)
 if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
 case $host_cpu in
 i*86 )
 # Not sure whether the presence of OpenBSD here was a mistake.
 # Let's accept both of them until this is cleared up.
 lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i3-986 (compact )?demand paged shared library'
- lt_cv_file_magic_cmd=$FILECMD
+ lt_cv_file_magic_cmd=/usr/bin/file
 lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
 ;;
 esac
@@ -3529,7 +3509,7 @@
 ;;
 
 hpux10.20* | hpux11*)
- lt_cv_file_magic_cmd=$FILECMD
+ lt_cv_file_magic_cmd=/usr/bin/file
 case $host_cpu in
 ia64*)
 lt_cv_deplibs_check_method='file_magic (s0-90-90-9|ELF-0-90-9) shared object file - IA64'
@@ -3576,7 +3556,7 @@
 
 newos6*)
 lt_cv_deplibs_check_method='file_magic ELF 0-90-9*-bit MLSB (executable|dynamic lib)'
- lt_cv_file_magic_cmd=$FILECMD
+ lt_cv_file_magic_cmd=/usr/bin/file
 lt_cv_file_magic_test_file=/usr/lib/libnls.so
 ;;
 
@@ -3703,13 +3683,13 @@
 	mingw*) lt_bad_file=conftest.nm/nofile ;;
 	*) lt_bad_file=/dev/null ;;
 	esac
-	case `"$tmp_nm" -B $lt_bad_file 2>&1 | $SED '1q'` in
+	case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in
 	*$lt_bad_file* | *'Invalid file or object type'*)
 	 lt_cv_path_NM="$tmp_nm -B"
 	 break 2
 	 ;;
 	*)
-	 case `"$tmp_nm" -p /dev/null 2>&1 | $SED '1q'` in
+	 case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
 	 */dev/null*)
 	 lt_cv_path_NM="$tmp_nm -p"
 	 break 2
@@ -3735,7 +3715,7 @@
 # Let the user override the test.
 else
 AC_CHECK_TOOLS(DUMPBIN, dumpbin "link -dump", :)
- case `$DUMPBIN -symbols -headers /dev/null 2>&1 | $SED '1q'` in
+ case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in
 *COFF*)
 DUMPBIN="$DUMPBIN -symbols -headers"
 ;;
@@ -3975,7 +3955,7 @@
 
 if test "$lt_cv_nm_interface" = "MS dumpbin"; then
 # Gets list of data symbols to import.
- lt_cv_sys_global_symbol_to_import="$SED -n -e 's/^I .* $.*$$/\1/p'"
+ lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* $.*$$/\1/p'"
 # Adjust the below global symbol transforms to fixup imported variables.
 lt_cdecl_hook=" -e 's/^I .* $.*$$/extern __declspec(dllimport) char \1;/p'"
 lt_c_name_hook=" -e 's/^I .* $.*$$/ {\"\1\", (void *) 0},/p'"
@@ -3993,20 +3973,20 @@
 # Transform an extracted symbol line into a proper C declaration.
 # Some systems (esp. on ia64) link data and code symbols differently,
 # so use this general approach.
-lt_cv_sys_global_symbol_to_cdecl="$SED -n"\
+lt_cv_sys_global_symbol_to_cdecl="sed -n"\
 $lt_cdecl_hook\
 " -e 's/^T .* $.*$$/extern int \1();/p'"\
 " -e 's/^$symcode$symcode* .* $.*$$/extern char \1;/p'"
 
 # Transform an extracted symbol line into symbol name and symbol address
-lt_cv_sys_global_symbol_to_c_name_address="$SED -n"\
+lt_cv_sys_global_symbol_to_c_name_address="sed -n"\
 $lt_c_name_hook\
 " -e 's/^: $.*$ .*$/ {\"\1\", (void *) 0},/p'"\
 " -e 's/^$symcode$symcode* .* $.*$$/ {\"\1\", (void *) \&\1},/p'"
 
 # Transform an extracted symbol line into symbol name with lib prefix and
 # symbol address.
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="$SED -n"\
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\
 $lt_c_name_lib_hook\
 " -e 's/^: $.*$ .*$/ {\"\1\", (void *) 0},/p'"\
 " -e 's/^$symcode$symcode* .* $lib.*$$/ {\"\1\", (void *) \&\1},/p'"\
@@ -4030,7 +4010,7 @@
 if test "$lt_cv_nm_interface" = "MS dumpbin"; then
 # Fake it for dumpbin and say T for any non-static function,
 # D for any global variable and I for any imported variable.
- # Also find C++ and __fastcall symbols from MSVC++ or ICC,
+ # Also find C++ and __fastcall symbols from MSVC++,
 # which start with @ or ?.
 lt_cv_sys_global_symbol_pipe="$AWK '"\
 " {last_section=section; section=\$ 3};"\
@@ -4048,9 +4028,9 @@
 " s1~prfx {split(s1,t,\"@\"); print f,t1,substr(t1,length(prfx))}"\
 " ' prfx=^$ac_symprfx"
 else
- lt_cv_sys_global_symbol_pipe="$SED -n -e 's/^.*	 $$symcode$symcode*$	 	 *$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
+ lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*	 $$symcode$symcode*$	 	 *$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
 fi
- lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | $SED '/ __gnu_lto/d'"
+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
 
 # Check to see that the pipe works correctly.
 pipe_works=no
@@ -4337,7 +4317,7 @@
 	 ;;
 	esac
 	;;
- freebsd* | dragonfly* | midnightbsd*)
+ freebsd* | dragonfly*)
 	# FreeBSD uses GNU C++
 	;;
 hpux9* | hpux10* | hpux11*)
@@ -4420,7 +4400,7 @@
 	 _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
 	 ;;
 	 *)
-	 case `$CC -V 2>&1 | $SED 5q` in
+	 case `$CC -V 2>&1 | sed 5q` in
 	 *Sun\ C*)
 	 # Sun C++ 5.9
 	 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
@@ -4756,7 +4736,7 @@
 	_LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
 	;;
 *)
-	case `$CC -V 2>&1 | $SED 5q` in
+	case `$CC -V 2>&1 | sed 5q` in
 	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ 1-7.* | *Sun*Fortran*\ 8.0-3*)
 	 # Sun Fortran 8.3 passes all unrecognized flags to the linker
 	 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
@@ -4939,7 +4919,7 @@
 if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
 _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
 else
- _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B$^B*$$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "L") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
+ _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B$^B*$$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
 fi
 ;;
 pw32*)
@@ -4947,7 +4927,7 @@
 ;;
 cygwin* | mingw* | cegcc*)
 case $cc_basename in
- cl* | icl*)
+ cl*)
 _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
 ;;
 *)
@@ -5004,15 +4984,15 @@
 
 case $host_os in
 cygwin* | mingw* | pw32* | cegcc*)
- # FIXME: the MSVC++ and ICC port hasn't been tested in a loooong time
+ # FIXME: the MSVC++ port hasn't been tested in a loooong time
 # When not using gcc, we currently assume that we are using
- # Microsoft Visual C++ or Intel C++ Compiler.
+ # Microsoft Visual C++.
 if test yes != "$GCC"; then
 with_gnu_ld=no
 fi
 ;;
 interix*)
- # we just hope/assume this is gcc and not c89 (= MSVC++ or ICC)
+ # we just hope/assume this is gcc and not c89 (= MSVC++)
 with_gnu_ld=yes
 ;;
 openbsd* | bitrig*)
@@ -5064,7 +5044,7 @@
 _LT_TAGVAR(whole_archive_flag_spec, $1)=
 fi
 supports_anon_versioning=no
- case `$LD -v | $SED -e 's/(^)\+)\s\+//' 2>&1` in
+ case `$LD -v | $SED -e 's/(^)\+)\s\+//' 2>&1` in
 *GNU\ gold*) supports_anon_versioning=yes ;;
 *\ 01.* | *\ 2.0-9.* | *\ 2.10.*) ;; # catch versions < 2.11
 *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
@@ -5176,7 +5156,6 @@
 	emximp -o $lib $output_objdir/$libname.def'
 _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
 _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
- _LT_TAGVAR(file_list_spec, $1)='@'
 ;;
 
 interix3-9*)
@@ -5191,7 +5170,7 @@
 # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
 # time. Moving up from 0x10000000 also allows more sbrk(2) space.
 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$SED "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
 ;;
 
 gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
@@ -5234,7 +5213,7 @@
 	 _LT_TAGVAR(compiler_needs_object, $1)=yes
 	 ;;
 	esac
-	case `$CC -V 2>&1 | $SED 5q` in
+	case `$CC -V 2>&1 | sed 5q` in
 	*Sun\ C*)			# Sun C 5.9
 	 _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
 	 _LT_TAGVAR(compiler_needs_object, $1)=yes
@@ -5246,7 +5225,7 @@
 
 if test yes = "$supports_anon_versioning"; then
 _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
- cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~
+ cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~
 echo "local: *; };" >> $output_objdir/$libname.ver~
 $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
 fi
@@ -5262,7 +5241,7 @@
 	 _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
 	 if test yes = "$supports_anon_versioning"; then
 	 _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
- cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~
+ cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~
 echo "local: *; };" >> $output_objdir/$libname.ver~
 $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
 	 fi
@@ -5394,7 +5373,7 @@
 	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
 	 _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
 	else
-	 _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B$^B*$$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "L") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
+	 _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B$^B*$$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
 	fi
 	aix_use_runtimelinking=no
 
@@ -5577,12 +5556,12 @@
 
 cygwin* | mingw* | pw32* | cegcc*)
 # When not using gcc, we currently assume that we are using
- # Microsoft Visual C++ or Intel C++ Compiler.
+ # Microsoft Visual C++.
 # hardcode_libdir_flag_spec is actually meaningless, as there is
 # no search path for DLLs.
 case $cc_basename in
- cl* | icl*)
-	# Native MSVC or ICC
+ cl*)
+	# Native MSVC
 	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
 	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
 	_LT_TAGVAR(always_export_symbols, $1)=yes
@@ -5623,7 +5602,7 @@
 fi'
 	;;
 *)
-	# Assume MSVC and ICC wrapper
+	# Assume MSVC wrapper
 	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
 	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
 	# Tell ltmain to make .lib files, not .a files.
@@ -5671,7 +5650,7 @@
 ;;
 
 # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
- freebsd* | dragonfly* | midnightbsd*)
+ freebsd* | dragonfly*)
 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
 _LT_TAGVAR(hardcode_direct, $1)=yes
@@ -5882,7 +5861,6 @@
 	emximp -o $lib $output_objdir/$libname.def'
 _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
 _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
- _LT_TAGVAR(file_list_spec, $1)='@'
 ;;
 
 osf3*)
@@ -6653,8 +6631,8 @@
 
 cygwin* | mingw* | pw32* | cegcc*)
 	case $GXX,$cc_basename in
-	,cl* | no,cl* | ,icl* | no,icl*)
-	 # Native MSVC or ICC
+	,cl* | no,cl*)
+	 # Native MSVC
 	 # hardcode_libdir_flag_spec is actually meaningless, as there is
 	 # no search path for DLLs.
 	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
@@ -6752,7 +6730,6 @@
 	 emximp -o $lib $output_objdir/$libname.def'
 	_LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
 	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-	_LT_TAGVAR(file_list_spec, $1)='@'
 	;;
 
 dgux*)
@@ -6783,7 +6760,7 @@
 _LT_TAGVAR(archive_cmds_need_lc, $1)=no
 ;;
 
- freebsd* | dragonfly* | midnightbsd*)
+ freebsd* | dragonfly*)
 # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
 # conventions
 _LT_TAGVAR(ld_shlibs, $1)=yes
@@ -6920,7 +6897,7 @@
 	# 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
 	# time. Moving up from 0x10000000 also allows more sbrk(2) space.
 	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$SED "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
 	;;
 irix5* | irix6*)
 case $cc_basename in
@@ -7060,13 +7037,13 @@
 	 _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
 	 if test yes = "$supports_anon_versioning"; then
 	 _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
- cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~
+ cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~
 echo "local: *; };" >> $output_objdir/$libname.ver~
 $CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
 	 fi
 	 ;;
 	 *)
-	 case `$CC -V 2>&1 | $SED 5q` in
+	 case `$CC -V 2>&1 | sed 5q` in
 	 *Sun\ C*)
 	 # Sun C++ 5.9
 	 _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
@@ -8212,14 +8189,6 @@
 AC_SUBST(DLLTOOL)
 )
 
-# _LT_DECL_FILECMD
-# ----------------
-# Check for a file(cmd) program that can be used to detect file type and magic
-m4_defun(_LT_DECL_FILECMD,
-AC_CHECK_TOOL(FILECMD, file, :)
-_LT_DECL(, FILECMD, 1, A file(cmd) program that detects file types)
-)# _LD_DECL_FILECMD
-
 # _LT_DECL_SED
 # ------------
 # Check for a fully-functional sed program, that truncates

_service:tar_scm:libX11-1.8.1.tar.xz/m4/ltoptions.m4 -> _service:tar_scm:libX11-1.8.4.tar.xz/m4/ltoptions.m4 Changed

_service:tar_scm:libX11-1.8.1.tar.xz/m4/ltsugar.m4 -> _service:tar_scm:libX11-1.8.4.tar.xz/m4/ltsugar.m4 Changed

_service:tar_scm:libX11-1.8.1.tar.xz/m4/ltversion.m4 -> _service:tar_scm:libX11-1.8.4.tar.xz/m4/ltversion.m4 Changed

_service:tar_scm:libX11-1.8.1.tar.xz/m4/lt~obsolete.m4 -> _service:tar_scm:libX11-1.8.4.tar.xz/m4/lt~obsolete.m4 Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/Compose.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/Compose.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/Makefile.in -> _service:tar_scm:libX11-1.8.4.tar.xz/man/Makefile.in Changed

@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.5 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2021 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -166,7 +166,7 @@
   $(RECURSIVE_CLEAN_TARGETS) \
   $(am__extra_recursive_targets)
 AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
-	distdir distdir-am
+	distdir
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 # Read a list of newline-separated strings from the standard input,
 # and print each of them once, without duplicates.  Input order is
@@ -184,6 +184,8 @@
   unique=`for i in $$list; do \
     if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
   done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
 am__DIST_COMMON = $(srcdir)/Makefile.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -236,8 +238,6 @@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
-CSCOPE = @CSCOPE@
-CTAGS = @CTAGS@
 CWARNFLAGS = @CWARNFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
@@ -251,11 +251,9 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ETAGS = @ETAGS@
 EXEEXT = @EXEEXT@
 EXEEXT_FOR_BUILD = @EXEEXT_FOR_BUILD@
 FGREP = @FGREP@
-FILECMD = @FILECMD@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 FOP = @FOP@
@@ -319,6 +317,7 @@
 STRIP = @STRIP@
 STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@
 TRADITIONALCPPFLAGS = @TRADITIONALCPPFLAGS@
+USE_THREAD_LIBS = @USE_THREAD_LIBS@
 VERSION = @VERSION@
 WCHAR32 = @WCHAR32@
 X11_CFLAGS = @X11_CFLAGS@
@@ -389,7 +388,6 @@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
-runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -1488,8 +1486,8 @@
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
 	esac;
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -1647,10 +1645,8 @@
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-distdir: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) distdir-am
 
-distdir-am: $(DISTFILES)
+distdir: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
 	list='$(DISTFILES)'; \

_service:tar_scm:libX11-1.8.1.tar.xz/man/XAddHost.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/XAddHost.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/XIfEvent.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/XIfEvent.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/XInitThreads.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/XInitThreads.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/XOpenIM.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/XOpenIM.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/Makefile.in -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/Makefile.in Changed

@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.5 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2021 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -178,8 +178,6 @@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
-CSCOPE = @CSCOPE@
-CTAGS = @CTAGS@
 CWARNFLAGS = @CWARNFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
@@ -193,11 +191,9 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ETAGS = @ETAGS@
 EXEEXT = @EXEEXT@
 EXEEXT_FOR_BUILD = @EXEEXT_FOR_BUILD@
 FGREP = @FGREP@
-FILECMD = @FILECMD@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 FOP = @FOP@
@@ -261,6 +257,7 @@
 STRIP = @STRIP@
 STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@
 TRADITIONALCPPFLAGS = @TRADITIONALCPPFLAGS@
+USE_THREAD_LIBS = @USE_THREAD_LIBS@
 VERSION = @VERSION@
 WCHAR32 = @WCHAR32@
 X11_CFLAGS = @X11_CFLAGS@
@@ -331,7 +328,6 @@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
-runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -570,8 +566,8 @@
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
 	esac;
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -615,10 +611,8 @@
 
 cscope cscopelist:
 
-distdir: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) distdir-am
 
-distdir-am: $(DISTFILES)
+distdir: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
 	list='$(DISTFILES)'; \

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbActionCtrls.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbActionCtrls.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbAddDeviceLedInfo.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbAddDeviceLedInfo.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbAddGeomColor.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbAddGeomColor.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbAddGeomDoodad.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbAddGeomDoodad.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbAddGeomKey.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbAddGeomKey.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbAddGeomKeyAlias.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbAddGeomKeyAlias.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbAddGeomOutline.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbAddGeomOutline.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbAddGeomOverlay.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbAddGeomOverlay.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbAddGeomOverlayKey.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbAddGeomOverlayKey.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbAddGeomOverlayRow.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbAddGeomOverlayRow.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbAddGeomProperty.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbAddGeomProperty.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbAddGeomRow.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbAddGeomRow.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbAddGeomSection.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbAddGeomSection.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbAddGeomShape.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbAddGeomShape.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbAddSymInterpret.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbAddSymInterpret.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbAllocClientMap.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbAllocClientMap.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbAllocCompatMap.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbAllocCompatMap.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbAllocControls.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbAllocControls.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbAllocDeviceInfo.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbAllocDeviceInfo.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbAllocDeviceLedInfo.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbAllocDeviceLedInfo.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbAllocGeomColors.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbAllocGeomColors.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbAllocGeomDoodads.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbAllocGeomDoodads.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbAllocGeomKeyAliases.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbAllocGeomKeyAliases.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbAllocGeomKeys.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbAllocGeomKeys.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbAllocGeomOutlines.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbAllocGeomOutlines.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbAllocGeomOverlayKeys.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbAllocGeomOverlayKeys.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbAllocGeomOverlayRows.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbAllocGeomOverlayRows.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbAllocGeomOverlays.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbAllocGeomOverlays.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbAllocGeomPoints.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbAllocGeomPoints.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbAllocGeomProps.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbAllocGeomProps.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbAllocGeomRows.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbAllocGeomRows.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbAllocGeomSectionDoodads.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbAllocGeomSectionDoodads.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbAllocGeomSections.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbAllocGeomSections.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbAllocGeomShapes.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbAllocGeomShapes.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbAllocGeometry.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbAllocGeometry.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbAllocIndicatorMaps.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbAllocIndicatorMaps.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbAllocKeyboard.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbAllocKeyboard.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbAllocNames.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbAllocNames.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbAllocServerMap.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbAllocServerMap.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbApplyCompatMapToKey.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbApplyCompatMapToKey.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbBell.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbBell.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbBellEvent.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbBellEvent.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbChangeControls.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbChangeControls.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbChangeDeviceInfo.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbChangeDeviceInfo.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbChangeEnabledControls.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbChangeEnabledControls.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbChangeIndicators.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbChangeIndicators.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbChangeMap.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbChangeMap.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbChangeNames.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbChangeNames.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbChangeTypesOfKey.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbChangeTypesOfKey.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbComputeRowBounds.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbComputeRowBounds.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbComputeSectionBounds.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbComputeSectionBounds.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbComputeShapeBounds.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbComputeShapeBounds.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbComputeShapeTop.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbComputeShapeTop.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbCopyKeyType.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbCopyKeyType.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbCopyKeyTypes.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbCopyKeyTypes.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbDeviceBell.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbDeviceBell.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbDeviceBellEvent.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbDeviceBellEvent.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbFindOverlayForKey.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbFindOverlayForKey.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbForceBell.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbForceBell.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbForceDeviceBell.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbForceDeviceBell.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbFreeClientMap.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbFreeClientMap.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbFreeCompatMap.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbFreeCompatMap.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbFreeComponentList.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbFreeComponentList.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbFreeControls.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbFreeControls.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbFreeDeviceInfo.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbFreeDeviceInfo.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbFreeGeomColors.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbFreeGeomColors.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbFreeGeomDoodads.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbFreeGeomDoodads.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbFreeGeomKeyAliases.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbFreeGeomKeyAliases.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbFreeGeomKeys.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbFreeGeomKeys.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbFreeGeomOutlines.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbFreeGeomOutlines.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbFreeGeomOverlayKeys.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbFreeGeomOverlayKeys.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbFreeGeomOverlayRows.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbFreeGeomOverlayRows.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbFreeGeomOverlays.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbFreeGeomOverlays.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbFreeGeomPoints.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbFreeGeomPoints.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbFreeGeomProperties.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbFreeGeomProperties.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbFreeGeomRows.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbFreeGeomRows.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbFreeGeomSections.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbFreeGeomSections.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbFreeGeomShapes.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbFreeGeomShapes.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbFreeGeometry.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbFreeGeometry.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbFreeIndicatorMaps.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbFreeIndicatorMaps.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbFreeKeyboard.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbFreeKeyboard.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbFreeNames.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbFreeNames.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbFreeServerMap.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbFreeServerMap.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbGetAccessXTimeout.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbGetAccessXTimeout.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbGetAutoRepeatRate.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbGetAutoRepeatRate.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbGetAutoResetControls.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbGetAutoResetControls.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbGetBounceKeysDelay.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbGetBounceKeysDelay.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbGetCompatMap.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbGetCompatMap.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbGetControls.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbGetControls.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbGetControlsChanges.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbGetControlsChanges.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbGetDetectableAutoRepeat.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbGetDetectableAutoRepeat.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbGetDeviceButtonActions.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbGetDeviceButtonActions.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbGetDeviceInfo.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbGetDeviceInfo.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbGetDeviceInfoChanges.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbGetDeviceInfoChanges.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbGetDeviceLedInfo.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbGetDeviceLedInfo.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbGetGeometry.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbGetGeometry.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbGetIndicatorChanges.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbGetIndicatorChanges.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbGetIndicatorMap.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbGetIndicatorMap.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbGetIndicatorState.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbGetIndicatorState.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbGetKeyActions.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbGetKeyActions.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbGetKeyBehaviors.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbGetKeyBehaviors.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbGetKeyExplicitComponents.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbGetKeyExplicitComponents.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbGetKeyModifierMap.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbGetKeyModifierMap.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbGetKeySyms.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbGetKeySyms.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbGetKeyTypes.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbGetKeyTypes.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbGetKeyVirtualModMap.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbGetKeyVirtualModMap.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbGetKeyboard.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbGetKeyboard.man Changed

@@ -1,5 +1,5 @@
 '\" t
-.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved.
+.\" Copyright (c) 1999, Oracle and/or its affiliates.
 .\"
 .\" Permission is hereby granted, free of charge, to any person obtaining a
 .\" copy of this software and associated documentation files (the "Software"),
@@ -47,7 +47,7 @@
 1=>select, 0->deselect; for events in bits_to_change
 .SH DESCRIPTION
 .LP
-.I XkbGetKeyboard 
+.B XkbGetKeyboard
 allocates and returns a pointer to a keyboard description. It queries the server for those 
 components specified in the 
 .I which 
@@ -76,17 +76,32 @@
 XkbAllComponentsMask	All Fields	(1L<<7)
 .TE
 
-.I XkbGetKeyboard 
+.B XkbGetKeyboard
 is used to read the current description for one or more components of a keyboard device. It calls
-.I XkbGetKeyboardByName 
+.BR XkbGetKeyboardByName (__libmansuffix__)
 as follows:
 
 .I XkbGetKeyboardByName(dpy, device_spec, 
 NULL, 
 .I which, which, 
 False).
+.LP
+If successful,
+.B XkbGetKeyboard
+returns a pointer to a newly allocated
+.B XkbDescRec
+structure,
+which is described in
+.BR XkbGetKeyboardByName (__libmansuffix__),
+and which should be freed with
+.BR XkbFreeKeyboard (__libmansuffix__).
+If
+.B XkbGetKeyboard
+does not succeed, it returns
+.BR NULL .
 .SH DIAGNOSTICS
 .TP 15
 .SM BadAlloc
 Unable to allocate storage
-
+.SH "SEE ALSO"
+.BR XkbGetKeyboardByName (__libmansuffix__)

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbGetKeyboardByName.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbGetKeyboardByName.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbGetMap.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbGetMap.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbGetNameChanges.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbGetNameChanges.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbGetNamedGeometry.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbGetNamedGeometry.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbGetNamedIndicator.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbGetNamedIndicator.man Changed

@@ -1,4 +1,4 @@
-.\" Copyright 1999, 2017, Oracle and/or its affiliates. All rights reserved.
+.\" Copyright (c) 1999, 2017, Oracle and/or its affiliates.
 .\"
 .\" Permission is hereby granted, free of charge, to any person obtaining a
 .\" copy of this software and associated documentation files (the "Software"),
@@ -47,31 +47,31 @@
 .if t .ti +.5i
 .SH ARGUMENTS
 .TP
-.I \- dpy
+.I dpy
 connection to the X server 
 .TP
-.I \- dev_spec
+.I dev_spec
 keyboard device ID, or XkbUseCoreKbd
 .TP
-.I \- led_class
+.I led_class
 feedback class, or XkbDfltXIClass
 .TP
-.I \- led_id
+.I led_id
 feedback ID, or XkbDfltXIId
 .TP
-.I \- name
+.I name
 name of the indicator to be retrieved
 .TP
-.I \- ndx_rtrn
+.I ndx_rtrn
 backfilled with the index of the retrieved indicator
 .TP
-.I \- state_rtrn
+.I state_rtrn
 backfilled with the current state of the retrieved indicator
 .TP
-.I \- map_rtrn
- backfilled with the mapping for the retrieved indicator 
+.I map_rtrn
+backfilled with the mapping for the retrieved indicator 
 .TP
-.I \- real_rtrn
+.I real_rtrn
 backfilled with True if the named indicator is real (physical)
 .SH DESCRIPTION
 .LP

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbGetNames.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbGetNames.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbGetSlowKeysDelay.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbGetSlowKeysDelay.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbGetState.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbGetState.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbGetStickyKeysOptions.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbGetStickyKeysOptions.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbGetUpdatedMap.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbGetUpdatedMap.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbGetVirtualMods.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbGetVirtualMods.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbGetXlibControls.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbGetXlibControls.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbIgnoreExtension.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbIgnoreExtension.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbInitCanonicalKeyTypes.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbInitCanonicalKeyTypes.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbKeyAction.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbKeyAction.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbKeyActionEntry.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbKeyActionEntry.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbKeyActionsPtr.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbKeyActionsPtr.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbKeyGroupInfo.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbKeyGroupInfo.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbKeyGroupWidth.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbKeyGroupWidth.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbKeyGroupsWidth.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbKeyGroupsWidth.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbKeyHasActions.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbKeyHasActions.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbKeyNumActions.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbKeyNumActions.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbKeyNumGroups.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbKeyNumGroups.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbKeyNumSyms.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbKeyNumSyms.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbKeySymEntry.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbKeySymEntry.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbKeySymsOffset.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbKeySymsOffset.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbKeySymsPtr.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbKeySymsPtr.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbKeyType.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbKeyType.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbKeyTypeIndex.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbKeyTypeIndex.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbKeyTypesForCoreSymbols.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbKeyTypesForCoreSymbols.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbKeycodeToKeysym.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbKeycodeToKeysym.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbKeysymToModifiers.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbKeysymToModifiers.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbLatchGroup.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbLatchGroup.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbLatchModifiers.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbLatchModifiers.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbLibraryVersion.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbLibraryVersion.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbListComponents.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbListComponents.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbLockGroup.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbLockGroup.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbLockModifiers.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbLockModifiers.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbLookupKeyBinding.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbLookupKeyBinding.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbLookupKeySym.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbLookupKeySym.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbModActionVMods.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbModActionVMods.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbNoteControlsChanges.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbNoteControlsChanges.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbNoteDeviceChanges.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbNoteDeviceChanges.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbNoteIndicatorChanges.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbNoteIndicatorChanges.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbNoteNameChanges.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbNoteNameChanges.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbOpenDisplay.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbOpenDisplay.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbOutOfRangeGroupInfo.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbOutOfRangeGroupInfo.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbOutOfRangeGroupNumber.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbOutOfRangeGroupNumber.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbPtrActionX.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbPtrActionX.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbPtrActionY.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbPtrActionY.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbQueryExtension.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbQueryExtension.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbRefreshKeyboardMapping.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbRefreshKeyboardMapping.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbResizeDeviceButtonActions.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbResizeDeviceButtonActions.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbResizeKeyActions.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbResizeKeyActions.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbResizeKeySyms.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbResizeKeySyms.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbResizeKeyType.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbResizeKeyType.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbSAActionSetCtrls.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbSAActionSetCtrls.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbSAGroup.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbSAGroup.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbSAPtrDfltValue.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbSAPtrDfltValue.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbSARedirectSetVMods.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbSARedirectSetVMods.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbSARedirectSetVModsMask.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbSARedirectSetVModsMask.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbSARedirectVMods.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbSARedirectVMods.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbSARedirectVModsMask.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbSARedirectVModsMask.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbSAScreen.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbSAScreen.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbSASetGroup.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbSASetGroup.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbSASetPtrDfltValue.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbSASetPtrDfltValue.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbSASetScreen.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbSASetScreen.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbSelectEventDetails.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbSelectEventDetails.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbSelectEvents.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbSelectEvents.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbSetAccessXTimeout.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbSetAccessXTimeout.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbSetAutoRepeatRate.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbSetAutoRepeatRate.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbSetAutoResetControls.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbSetAutoResetControls.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbSetBounceKeysDelay.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbSetBounceKeysDelay.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbSetCompatMap.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbSetCompatMap.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbSetControls.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbSetControls.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbSetDebuggingFlags.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbSetDebuggingFlags.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbSetDetectableAutoRepeat.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbSetDetectableAutoRepeat.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbSetDeviceButtonActions.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbSetDeviceButtonActions.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbSetDeviceInfo.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbSetDeviceInfo.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbSetIgnoreLockMods.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbSetIgnoreLockMods.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbSetIndicatorMap.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbSetIndicatorMap.man Changed

@@ -1,5 +1,5 @@
 '\" t
-.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved.
+.\" Copyright (c) 1999, Oracle and/or its affiliates.
 .\"
 .\" Permission is hereby granted, free of charge, to any person obtaining a
 .\" copy of this software and associated documentation files (the "Software"),
@@ -35,13 +35,13 @@
 .if t .ti +.5i
 .SH ARGUMENTS
 .TP
-.I \- dpy
+.I dpy
 connection to the X server
 .TP
-.I \- which
+.I which
 mask of indicators to change
 .TP
-.I \- desc
+.I desc
 keyboard description from which the maps are taken
 .SH DESCRIPTION
 .LP
@@ -102,7 +102,9 @@
 _
 which_mods	New State	Effect on Keyboard Modifiers
 _
-XkbIM_UseNone or XkbIM_UseBase	On or Off	No Effect
+XkbIM_UseNone or
+.br
+XkbIM_UseBase	On or Off	No Effect
 XkbIM_UseLatched	On	T{
 Any modifiers specified in the mask field of mods are added to the latched 
 modifiers.
@@ -111,7 +113,11 @@
 Any modifiers specified in the mask field of mods are removed from the latched 
 modifiers.
 T}
-XkbIM_UseLocked, XkbIM_UseCompat, or XkbIM_UseEffective	On	T{
+XkbIM_UseLocked,
+.br
+XkbIM_UseCompat, or
+.br
+XkbIM_UseEffective	On	T{
 Any modifiers specified in the mask field of mods are added to the locked 
 modifiers.
 T}
@@ -119,7 +125,9 @@
 Any modifiers specified in the mask field of mods are removed from the locked 
 modifiers.
 T}
-XkbIM_UseCompat or XkbIM_UseEffective	Off	T{
+XkbIM_UseCompat or
+.br
+XkbIM_UseEffective	Off	T{
 Any modifiers specified in the mask field of mods are removed from both the 
 locked and latched modifiers.
 T}
@@ -129,8 +137,8 @@
 function that updates the server's image of the indicator map (such as
 .I XkbSetIndicatorMap 
 or 
-.I XkbSetNamedIndicator),
- Xkb changes the keyboard state and controls to reflect the other fields of the 
+.IR XkbSetNamedIndicator ),
+Xkb changes the keyboard state and controls to reflect the other fields of the
 indicator map. If you attempt to explicitly change the value of an indicator for 
 which XkbIM_LEDDrivesKB is absent or for which XkbIM_NoExplicit is present, 
 keyboard state or controls are unaffected.

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbSetMap.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbSetMap.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbSetModActionVMods.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbSetModActionVMods.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbSetNamedIndicator.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbSetNamedIndicator.man Changed

@@ -1,4 +1,4 @@
-.\" Copyright 1999, 2017, Oracle and/or its affiliates. All rights reserved.
+.\" Copyright (c) 1999, 2017, Oracle and/or its affiliates.
 .\"
 .\" Permission is hereby granted, free of charge, to any person obtaining a
 .\" copy of this software and associated documentation files (the "Software"),
@@ -48,31 +48,31 @@
 .if t .ti +.5i
 .SH ARGUMENTS
 .TP
-.I \- dpy
+.I dpy
 connection to the X server
 .TP
-.I \- device_spec
+.I device_spec
 device ID, or XkbUseCoreKbd
 .TP
-.I \- led_class
+.I led_class
 feedback class, or XkbDfltXIClass
 .TP
-.I \- led_id
+.I led_id
 feedback ID, or XkbDfltXIId
 .TP
-.I \- name
+.I name
 name of the indicator to change
 .TP
-.I \- change_state
+.I change_state
 whether to change the indicator state or not
 .TP
-.I \- state
+.I state
 desired new state for the indicator
 .TP
-.I \- create_new
+.I create_new
 whether a new indicator with the specified name should be created when necessary
 .TP
-.I \- map
+.I map
 new map for the indicator
 .SH DESCRIPTION
 .LP

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbSetNames.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbSetNames.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbSetPtrActionX.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbSetPtrActionX.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbSetPtrActionY.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbSetPtrActionY.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbSetServerInternalMods.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbSetServerInternalMods.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbSetXlibControls.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbSetXlibControls.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbTranslateKeyCode.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbTranslateKeyCode.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbTranslateKeySym.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbTranslateKeySym.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbUpdateMapFromCore.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbUpdateMapFromCore.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/man/xkb/XkbVirtualModsToReal.man -> _service:tar_scm:libX11-1.8.4.tar.xz/man/xkb/XkbVirtualModsToReal.man Changed

_service:tar_scm:libX11-1.8.1.tar.xz/missing -> _service:tar_scm:libX11-1.8.4.tar.xz/missing Changed

@@ -1,9 +1,9 @@
 #! /bin/sh
 # Common wrapper for a few potentially missing GNU programs.
 
-scriptversion=2018-03-07.03; # UTC
+scriptversion=2013-10-28.13; # UTC
 
-# Copyright (C) 1996-2021 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
 # Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
 
 # This program is free software; you can redistribute it and/or modify
@@ -17,7 +17,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with this program. If not, see <https://www.gnu.org/licenses/>.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -101,9 +101,9 @@
 exit $st
 fi
 
-perl_URL=https://www.perl.org/
-flex_URL=https://github.com/westes/flex
-gnu_software_URL=https://www.gnu.org/software
+perl_URL=http://www.perl.org/
+flex_URL=http://flex.sourceforge.net/
+gnu_software_URL=http://www.gnu.org/software
 
 program_details ()
 {
@@ -207,9 +207,9 @@
 exit $st
 
 # Local variables:
-# eval: (add-hook 'before-save-hook 'time-stamp)
+# eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC0"
+# time-stamp-time-zone: "UTC"
 # time-stamp-end: "; # UTC"
 # End:

_service:tar_scm:libX11-1.8.1.tar.xz/modules/Makefile.in -> _service:tar_scm:libX11-1.8.4.tar.xz/modules/Makefile.in Changed

@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.5 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2021 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -136,7 +136,7 @@
   $(RECURSIVE_CLEAN_TARGETS) \
   $(am__extra_recursive_targets)
 AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
-	distdir distdir-am
+	distdir
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 # Read a list of newline-separated strings from the standard input,
 # and print each of them once, without duplicates.  Input order is
@@ -154,6 +154,8 @@
   unique=`for i in $$list; do \
     if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
   done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
 am__DIST_COMMON = $(srcdir)/Makefile.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -206,8 +208,6 @@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
-CSCOPE = @CSCOPE@
-CTAGS = @CTAGS@
 CWARNFLAGS = @CWARNFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
@@ -221,11 +221,9 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ETAGS = @ETAGS@
 EXEEXT = @EXEEXT@
 EXEEXT_FOR_BUILD = @EXEEXT_FOR_BUILD@
 FGREP = @FGREP@
-FILECMD = @FILECMD@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 FOP = @FOP@
@@ -289,6 +287,7 @@
 STRIP = @STRIP@
 STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@
 TRADITIONALCPPFLAGS = @TRADITIONALCPPFLAGS@
+USE_THREAD_LIBS = @USE_THREAD_LIBS@
 VERSION = @VERSION@
 WCHAR32 = @WCHAR32@
 X11_CFLAGS = @X11_CFLAGS@
@@ -359,7 +358,6 @@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
-runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -389,8 +387,8 @@
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
 	esac;
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -506,10 +504,8 @@
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-distdir: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) distdir-am
 
-distdir-am: $(DISTFILES)
+distdir: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
 	list='$(DISTFILES)'; \

_service:tar_scm:libX11-1.8.1.tar.xz/modules/im/Makefile.in -> _service:tar_scm:libX11-1.8.4.tar.xz/modules/im/Makefile.in Changed

@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.5 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2021 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -136,7 +136,7 @@
   $(RECURSIVE_CLEAN_TARGETS) \
   $(am__extra_recursive_targets)
 AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
-	distdir distdir-am
+	distdir
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 # Read a list of newline-separated strings from the standard input,
 # and print each of them once, without duplicates.  Input order is
@@ -154,6 +154,8 @@
   unique=`for i in $$list; do \
     if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
   done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
 am__DIST_COMMON = $(srcdir)/Makefile.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -206,8 +208,6 @@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
-CSCOPE = @CSCOPE@
-CTAGS = @CTAGS@
 CWARNFLAGS = @CWARNFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
@@ -221,11 +221,9 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ETAGS = @ETAGS@
 EXEEXT = @EXEEXT@
 EXEEXT_FOR_BUILD = @EXEEXT_FOR_BUILD@
 FGREP = @FGREP@
-FILECMD = @FILECMD@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 FOP = @FOP@
@@ -289,6 +287,7 @@
 STRIP = @STRIP@
 STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@
 TRADITIONALCPPFLAGS = @TRADITIONALCPPFLAGS@
+USE_THREAD_LIBS = @USE_THREAD_LIBS@
 VERSION = @VERSION@
 WCHAR32 = @WCHAR32@
 X11_CFLAGS = @X11_CFLAGS@
@@ -359,7 +358,6 @@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
-runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -389,8 +387,8 @@
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
 	esac;
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -506,10 +504,8 @@
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-distdir: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) distdir-am
 
-distdir-am: $(DISTFILES)
+distdir: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
 	list='$(DISTFILES)'; \

_service:tar_scm:libX11-1.8.1.tar.xz/modules/im/ximcp/Makefile.in -> _service:tar_scm:libX11-1.8.4.tar.xz/modules/im/ximcp/Makefile.in Changed

@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.5 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2021 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -174,21 +174,7 @@
 am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src -I$(top_builddir)/include/X11
 depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__maybe_remake_depfiles = depfiles
-am__depfiles_remade = ./$(DEPDIR)/imCallbk.Plo \
-	./$(DEPDIR)/imDefFlt.Plo ./$(DEPDIR)/imDefIc.Plo \
-	./$(DEPDIR)/imDefIm.Plo ./$(DEPDIR)/imDefLkup.Plo \
-	./$(DEPDIR)/imDispch.Plo ./$(DEPDIR)/imEvToWire.Plo \
-	./$(DEPDIR)/imExten.Plo ./$(DEPDIR)/imImSw.Plo \
-	./$(DEPDIR)/imInsClbk.Plo ./$(DEPDIR)/imInt.Plo \
-	./$(DEPDIR)/imLcFlt.Plo ./$(DEPDIR)/imLcGIc.Plo \
-	./$(DEPDIR)/imLcIc.Plo ./$(DEPDIR)/imLcIm.Plo \
-	./$(DEPDIR)/imLcLkup.Plo ./$(DEPDIR)/imLcPrs.Plo \
-	./$(DEPDIR)/imLcSIc.Plo ./$(DEPDIR)/imRm.Plo \
-	./$(DEPDIR)/imRmAttr.Plo ./$(DEPDIR)/imThaiFlt.Plo \
-	./$(DEPDIR)/imThaiIc.Plo ./$(DEPDIR)/imThaiIm.Plo \
-	./$(DEPDIR)/imTrX.Plo ./$(DEPDIR)/imTrans.Plo \
-	./$(DEPDIR)/imTransR.Plo
+am__depfiles_maybe = depfiles
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -232,6 +218,8 @@
 unique=`for i in $$list; do \
 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
 am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
@@ -258,8 +246,6 @@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
-CSCOPE = @CSCOPE@
-CTAGS = @CTAGS@
 CWARNFLAGS = @CWARNFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
@@ -273,11 +259,9 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ETAGS = @ETAGS@
 EXEEXT = @EXEEXT@
 EXEEXT_FOR_BUILD = @EXEEXT_FOR_BUILD@
 FGREP = @FGREP@
-FILECMD = @FILECMD@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 FOP = @FOP@
@@ -341,6 +325,7 @@
 STRIP = @STRIP@
 STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@
 TRADITIONALCPPFLAGS = @TRADITIONALCPPFLAGS@
+USE_THREAD_LIBS = @USE_THREAD_LIBS@
 VERSION = @VERSION@
 WCHAR32 = @WCHAR32@
 X11_CFLAGS = @X11_CFLAGS@
@@ -411,7 +396,6 @@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
-runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -492,8 +476,8 @@
 	 *config.status*) \
 	 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	 *) \
-	 echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
-	 cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
+	 echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	 cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
 	esac;
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -563,38 +547,32 @@
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imCallbk.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imDefFlt.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imDefIc.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imDefIm.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imDefLkup.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imDispch.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imEvToWire.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imExten.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imImSw.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imInsClbk.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imInt.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imLcFlt.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imLcGIc.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imLcIc.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imLcIm.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imLcLkup.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imLcPrs.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imLcSIc.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imRm.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imRmAttr.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imThaiFlt.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imThaiIc.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imThaiIm.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imTrX.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imTrans.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imTransR.Plo@am__quote@ # am--include-marker
-
-$(am__depfiles_remade):
-	@$(MKDIR_P) $(@D)
-	@echo '# dummy' >$@-t && $(am__mv) $@-t $@
-
-am--depfiles: $(am__depfiles_remade)
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imCallbk.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imDefFlt.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imDefIc.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imDefIm.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imDefLkup.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imDispch.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imEvToWire.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imExten.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imImSw.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imInsClbk.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imInt.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imLcFlt.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imLcGIc.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imLcIc.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imLcIm.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imLcLkup.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imLcPrs.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imLcSIc.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imRm.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imRmAttr.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imThaiFlt.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imThaiIc.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imThaiIm.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imTrX.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imTrans.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imTransR.Plo@am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -674,10 +652,8 @@
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-distdir: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) distdir-am
 
-distdir-am: $(DISTFILES)
+distdir: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
@@ -750,32 +726,7 @@
 	clean-noinstLTLIBRARIES mostlyclean-am
 
 distclean: distclean-am
-		-rm -f ./$(DEPDIR)/imCallbk.Plo
-	-rm -f ./$(DEPDIR)/imDefFlt.Plo
-	-rm -f ./$(DEPDIR)/imDefIc.Plo
-	-rm -f ./$(DEPDIR)/imDefIm.Plo
-	-rm -f ./$(DEPDIR)/imDefLkup.Plo
-	-rm -f ./$(DEPDIR)/imDispch.Plo
-	-rm -f ./$(DEPDIR)/imEvToWire.Plo
-	-rm -f ./$(DEPDIR)/imExten.Plo
-	-rm -f ./$(DEPDIR)/imImSw.Plo
-	-rm -f ./$(DEPDIR)/imInsClbk.Plo
-	-rm -f ./$(DEPDIR)/imInt.Plo
-	-rm -f ./$(DEPDIR)/imLcFlt.Plo
-	-rm -f ./$(DEPDIR)/imLcGIc.Plo
-	-rm -f ./$(DEPDIR)/imLcIc.Plo
-	-rm -f ./$(DEPDIR)/imLcIm.Plo
-	-rm -f ./$(DEPDIR)/imLcLkup.Plo
-	-rm -f ./$(DEPDIR)/imLcPrs.Plo
-	-rm -f ./$(DEPDIR)/imLcSIc.Plo
-	-rm -f ./$(DEPDIR)/imRm.Plo
-	-rm -f ./$(DEPDIR)/imRmAttr.Plo
-	-rm -f ./$(DEPDIR)/imThaiFlt.Plo
-	-rm -f ./$(DEPDIR)/imThaiIc.Plo
-	-rm -f ./$(DEPDIR)/imThaiIm.Plo
-	-rm -f ./$(DEPDIR)/imTrX.Plo
-	-rm -f ./$(DEPDIR)/imTrans.Plo
-	-rm -f ./$(DEPDIR)/imTransR.Plo
+	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-tags
@@ -821,32 +772,7 @@
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-		-rm -f ./$(DEPDIR)/imCallbk.Plo
-	-rm -f ./$(DEPDIR)/imDefFlt.Plo
-	-rm -f ./$(DEPDIR)/imDefIc.Plo
-	-rm -f ./$(DEPDIR)/imDefIm.Plo
-	-rm -f ./$(DEPDIR)/imDefLkup.Plo
-	-rm -f ./$(DEPDIR)/imDispch.Plo
-	-rm -f ./$(DEPDIR)/imEvToWire.Plo
-	-rm -f ./$(DEPDIR)/imExten.Plo
-	-rm -f ./$(DEPDIR)/imImSw.Plo
-	-rm -f ./$(DEPDIR)/imInsClbk.Plo
-	-rm -f ./$(DEPDIR)/imInt.Plo
-	-rm -f ./$(DEPDIR)/imLcFlt.Plo
-	-rm -f ./$(DEPDIR)/imLcGIc.Plo
-	-rm -f ./$(DEPDIR)/imLcIc.Plo
-	-rm -f ./$(DEPDIR)/imLcIm.Plo
-	-rm -f ./$(DEPDIR)/imLcLkup.Plo
-	-rm -f ./$(DEPDIR)/imLcPrs.Plo
-	-rm -f ./$(DEPDIR)/imLcSIc.Plo
-	-rm -f ./$(DEPDIR)/imRm.Plo
-	-rm -f ./$(DEPDIR)/imRmAttr.Plo
-	-rm -f ./$(DEPDIR)/imThaiFlt.Plo
-	-rm -f ./$(DEPDIR)/imThaiIc.Plo
-	-rm -f ./$(DEPDIR)/imThaiIm.Plo
-	-rm -f ./$(DEPDIR)/imTrX.Plo
-	-rm -f ./$(DEPDIR)/imTrans.Plo
-	-rm -f ./$(DEPDIR)/imTransR.Plo
+	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
@@ -867,7 +793,7 @@
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
 	clean-commonlibLTLIBRARIES clean-generic clean-libtool \
 	clean-noinstLTLIBRARIES cscopelist-am ctags ctags-am distclean \
 	distclean-compile distclean-generic distclean-libtool \

_service:tar_scm:libX11-1.8.1.tar.xz/modules/im/ximcp/imDefIc.c -> _service:tar_scm:libX11-1.8.4.tar.xz/modules/im/ximcp/imDefIc.c Changed

_service:tar_scm:libX11-1.8.1.tar.xz/modules/im/ximcp/imDefIm.c -> _service:tar_scm:libX11-1.8.4.tar.xz/modules/im/ximcp/imDefIm.c Changed

_service:tar_scm:libX11-1.8.1.tar.xz/modules/im/ximcp/imInsClbk.c -> _service:tar_scm:libX11-1.8.4.tar.xz/modules/im/ximcp/imInsClbk.c Changed

_service:tar_scm:libX11-1.8.1.tar.xz/modules/im/ximcp/imLcPrs.c -> _service:tar_scm:libX11-1.8.4.tar.xz/modules/im/ximcp/imLcPrs.c Changed

_service:tar_scm:libX11-1.8.1.tar.xz/modules/im/ximcp/imRm.c -> _service:tar_scm:libX11-1.8.4.tar.xz/modules/im/ximcp/imRm.c Changed

_service:tar_scm:libX11-1.8.1.tar.xz/modules/im/ximcp/imTrX.c -> _service:tar_scm:libX11-1.8.4.tar.xz/modules/im/ximcp/imTrX.c Changed

_service:tar_scm:libX11-1.8.1.tar.xz/modules/im/ximcp/imTrans.c -> _service:tar_scm:libX11-1.8.4.tar.xz/modules/im/ximcp/imTrans.c Changed

_service:tar_scm:libX11-1.8.1.tar.xz/modules/im/ximcp/imTransR.c -> _service:tar_scm:libX11-1.8.4.tar.xz/modules/im/ximcp/imTransR.c Changed

_service:tar_scm:libX11-1.8.1.tar.xz/modules/lc/Makefile.in -> _service:tar_scm:libX11-1.8.4.tar.xz/modules/lc/Makefile.in Changed

@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.5 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2021 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -136,7 +136,7 @@
   $(RECURSIVE_CLEAN_TARGETS) \
   $(am__extra_recursive_targets)
 AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
-	distdir distdir-am
+	distdir
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 # Read a list of newline-separated strings from the standard input,
 # and print each of them once, without duplicates.  Input order is
@@ -154,6 +154,8 @@
   unique=`for i in $$list; do \
     if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
   done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
 am__DIST_COMMON = $(srcdir)/Makefile.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -206,8 +208,6 @@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
-CSCOPE = @CSCOPE@
-CTAGS = @CTAGS@
 CWARNFLAGS = @CWARNFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
@@ -221,11 +221,9 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ETAGS = @ETAGS@
 EXEEXT = @EXEEXT@
 EXEEXT_FOR_BUILD = @EXEEXT_FOR_BUILD@
 FGREP = @FGREP@
-FILECMD = @FILECMD@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 FOP = @FOP@
@@ -289,6 +287,7 @@
 STRIP = @STRIP@
 STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@
 TRADITIONALCPPFLAGS = @TRADITIONALCPPFLAGS@
+USE_THREAD_LIBS = @USE_THREAD_LIBS@
 VERSION = @VERSION@
 WCHAR32 = @WCHAR32@
 X11_CFLAGS = @X11_CFLAGS@
@@ -359,7 +358,6 @@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
-runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -389,8 +387,8 @@
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
 	esac;
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -506,10 +504,8 @@
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-distdir: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) distdir-am
 
-distdir-am: $(DISTFILES)
+distdir: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
 	list='$(DISTFILES)'; \

_service:tar_scm:libX11-1.8.1.tar.xz/modules/lc/Utf8/Makefile.in -> _service:tar_scm:libX11-1.8.4.tar.xz/modules/lc/Utf8/Makefile.in Changed

@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.5 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2021 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -166,8 +166,7 @@
 am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src -I$(top_builddir)/include/X11
 depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__maybe_remake_depfiles = depfiles
-am__depfiles_remade = ./$(DEPDIR)/lcUTF8Load.Plo
+am__depfiles_maybe = depfiles
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -211,6 +210,8 @@
 unique=`for i in $$list; do \
 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
 am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
@@ -237,8 +238,6 @@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
-CSCOPE = @CSCOPE@
-CTAGS = @CTAGS@
 CWARNFLAGS = @CWARNFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
@@ -252,11 +251,9 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ETAGS = @ETAGS@
 EXEEXT = @EXEEXT@
 EXEEXT_FOR_BUILD = @EXEEXT_FOR_BUILD@
 FGREP = @FGREP@
-FILECMD = @FILECMD@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 FOP = @FOP@
@@ -320,6 +317,7 @@
 STRIP = @STRIP@
 STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@
 TRADITIONALCPPFLAGS = @TRADITIONALCPPFLAGS@
+USE_THREAD_LIBS = @USE_THREAD_LIBS@
 VERSION = @VERSION@
 WCHAR32 = @WCHAR32@
 X11_CFLAGS = @X11_CFLAGS@
@@ -390,7 +388,6 @@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
-runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -445,8 +442,8 @@
 	 *config.status*) \
 	 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	 *) \
-	 echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
-	 cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
+	 echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	 cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
 	esac;
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -516,13 +513,7 @@
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lcUTF8Load.Plo@am__quote@ # am--include-marker
-
-$(am__depfiles_remade):
-	@$(MKDIR_P) $(@D)
-	@echo '# dummy' >$@-t && $(am__mv) $@-t $@
-
-am--depfiles: $(am__depfiles_remade)
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lcUTF8Load.Plo@am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -602,10 +593,8 @@
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-distdir: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) distdir-am
 
-distdir-am: $(DISTFILES)
+distdir: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
@@ -678,7 +667,7 @@
 	clean-noinstLTLIBRARIES mostlyclean-am
 
 distclean: distclean-am
-		-rm -f ./$(DEPDIR)/lcUTF8Load.Plo
+	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-tags
@@ -724,7 +713,7 @@
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-		-rm -f ./$(DEPDIR)/lcUTF8Load.Plo
+	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
@@ -745,7 +734,7 @@
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
 	clean-commonlibLTLIBRARIES clean-generic clean-libtool \
 	clean-noinstLTLIBRARIES cscopelist-am ctags ctags-am distclean \
 	distclean-compile distclean-generic distclean-libtool \

_service:tar_scm:libX11-1.8.1.tar.xz/modules/lc/def/Makefile.in -> _service:tar_scm:libX11-1.8.4.tar.xz/modules/lc/def/Makefile.in Changed

@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.5 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2021 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -164,8 +164,7 @@
 am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src -I$(top_builddir)/include/X11
 depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__maybe_remake_depfiles = depfiles
-am__depfiles_remade = ./$(DEPDIR)/lcDefConv.Plo
+am__depfiles_maybe = depfiles
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -209,6 +208,8 @@
 unique=`for i in $$list; do \
 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
 am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
@@ -235,8 +236,6 @@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
-CSCOPE = @CSCOPE@
-CTAGS = @CTAGS@
 CWARNFLAGS = @CWARNFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
@@ -250,11 +249,9 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ETAGS = @ETAGS@
 EXEEXT = @EXEEXT@
 EXEEXT_FOR_BUILD = @EXEEXT_FOR_BUILD@
 FGREP = @FGREP@
-FILECMD = @FILECMD@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 FOP = @FOP@
@@ -318,6 +315,7 @@
 STRIP = @STRIP@
 STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@
 TRADITIONALCPPFLAGS = @TRADITIONALCPPFLAGS@
+USE_THREAD_LIBS = @USE_THREAD_LIBS@
 VERSION = @VERSION@
 WCHAR32 = @WCHAR32@
 X11_CFLAGS = @X11_CFLAGS@
@@ -388,7 +386,6 @@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
-runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -442,8 +439,8 @@
 	 *config.status*) \
 	 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	 *) \
-	 echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
-	 cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
+	 echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	 cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
 	esac;
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -513,13 +510,7 @@
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lcDefConv.Plo@am__quote@ # am--include-marker
-
-$(am__depfiles_remade):
-	@$(MKDIR_P) $(@D)
-	@echo '# dummy' >$@-t && $(am__mv) $@-t $@
-
-am--depfiles: $(am__depfiles_remade)
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lcDefConv.Plo@am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -599,10 +590,8 @@
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-distdir: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) distdir-am
 
-distdir-am: $(DISTFILES)
+distdir: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
@@ -675,7 +664,7 @@
 	clean-noinstLTLIBRARIES mostlyclean-am
 
 distclean: distclean-am
-		-rm -f ./$(DEPDIR)/lcDefConv.Plo
+	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-tags
@@ -721,7 +710,7 @@
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-		-rm -f ./$(DEPDIR)/lcDefConv.Plo
+	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
@@ -742,7 +731,7 @@
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
 	clean-commonlibLTLIBRARIES clean-generic clean-libtool \
 	clean-noinstLTLIBRARIES cscopelist-am ctags ctags-am distclean \
 	distclean-compile distclean-generic distclean-libtool \

_service:tar_scm:libX11-1.8.1.tar.xz/modules/lc/gen/Makefile.in -> _service:tar_scm:libX11-1.8.4.tar.xz/modules/lc/gen/Makefile.in Changed

@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.5 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2021 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -164,8 +164,7 @@
 am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src -I$(top_builddir)/include/X11
 depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__maybe_remake_depfiles = depfiles
-am__depfiles_remade = ./$(DEPDIR)/lcGenConv.Plo
+am__depfiles_maybe = depfiles
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -209,6 +208,8 @@
 unique=`for i in $$list; do \
 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
 am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
@@ -235,8 +236,6 @@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
-CSCOPE = @CSCOPE@
-CTAGS = @CTAGS@
 CWARNFLAGS = @CWARNFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
@@ -250,11 +249,9 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ETAGS = @ETAGS@
 EXEEXT = @EXEEXT@
 EXEEXT_FOR_BUILD = @EXEEXT_FOR_BUILD@
 FGREP = @FGREP@
-FILECMD = @FILECMD@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 FOP = @FOP@
@@ -318,6 +315,7 @@
 STRIP = @STRIP@
 STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@
 TRADITIONALCPPFLAGS = @TRADITIONALCPPFLAGS@
+USE_THREAD_LIBS = @USE_THREAD_LIBS@
 VERSION = @VERSION@
 WCHAR32 = @WCHAR32@
 X11_CFLAGS = @X11_CFLAGS@
@@ -388,7 +386,6 @@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
-runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -442,8 +439,8 @@
 	 *config.status*) \
 	 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	 *) \
-	 echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
-	 cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
+	 echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	 cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
 	esac;
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -513,13 +510,7 @@
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lcGenConv.Plo@am__quote@ # am--include-marker
-
-$(am__depfiles_remade):
-	@$(MKDIR_P) $(@D)
-	@echo '# dummy' >$@-t && $(am__mv) $@-t $@
-
-am--depfiles: $(am__depfiles_remade)
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lcGenConv.Plo@am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -599,10 +590,8 @@
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-distdir: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) distdir-am
 
-distdir-am: $(DISTFILES)
+distdir: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
@@ -675,7 +664,7 @@
 	clean-noinstLTLIBRARIES mostlyclean-am
 
 distclean: distclean-am
-		-rm -f ./$(DEPDIR)/lcGenConv.Plo
+	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-tags
@@ -721,7 +710,7 @@
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-		-rm -f ./$(DEPDIR)/lcGenConv.Plo
+	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
@@ -742,7 +731,7 @@
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
 	clean-commonlibLTLIBRARIES clean-generic clean-libtool \
 	clean-noinstLTLIBRARIES cscopelist-am ctags ctags-am distclean \
 	distclean-compile distclean-generic distclean-libtool \

_service:tar_scm:libX11-1.8.1.tar.xz/modules/om/Makefile.in -> _service:tar_scm:libX11-1.8.4.tar.xz/modules/om/Makefile.in Changed

@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.5 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2021 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -136,7 +136,7 @@
   $(RECURSIVE_CLEAN_TARGETS) \
   $(am__extra_recursive_targets)
 AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
-	distdir distdir-am
+	distdir
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 # Read a list of newline-separated strings from the standard input,
 # and print each of them once, without duplicates.  Input order is
@@ -154,6 +154,8 @@
   unique=`for i in $$list; do \
     if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
   done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
 am__DIST_COMMON = $(srcdir)/Makefile.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -206,8 +208,6 @@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
-CSCOPE = @CSCOPE@
-CTAGS = @CTAGS@
 CWARNFLAGS = @CWARNFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
@@ -221,11 +221,9 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ETAGS = @ETAGS@
 EXEEXT = @EXEEXT@
 EXEEXT_FOR_BUILD = @EXEEXT_FOR_BUILD@
 FGREP = @FGREP@
-FILECMD = @FILECMD@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 FOP = @FOP@
@@ -289,6 +287,7 @@
 STRIP = @STRIP@
 STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@
 TRADITIONALCPPFLAGS = @TRADITIONALCPPFLAGS@
+USE_THREAD_LIBS = @USE_THREAD_LIBS@
 VERSION = @VERSION@
 WCHAR32 = @WCHAR32@
 X11_CFLAGS = @X11_CFLAGS@
@@ -359,7 +358,6 @@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
-runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -389,8 +387,8 @@
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
 	esac;
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -506,10 +504,8 @@
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-distdir: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) distdir-am
 
-distdir-am: $(DISTFILES)
+distdir: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
 	list='$(DISTFILES)'; \

_service:tar_scm:libX11-1.8.1.tar.xz/modules/om/generic/Makefile.in -> _service:tar_scm:libX11-1.8.4.tar.xz/modules/om/generic/Makefile.in Changed

@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.5 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2021 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -167,12 +167,7 @@
 am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src -I$(top_builddir)/include/X11
 depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__maybe_remake_depfiles = depfiles
-am__depfiles_remade = ./$(DEPDIR)/omDefault.Plo \
-	./$(DEPDIR)/omGeneric.Plo ./$(DEPDIR)/omImText.Plo \
-	./$(DEPDIR)/omText.Plo ./$(DEPDIR)/omTextEsc.Plo \
-	./$(DEPDIR)/omTextExt.Plo ./$(DEPDIR)/omTextPer.Plo \
-	./$(DEPDIR)/omXChar.Plo
+am__depfiles_maybe = depfiles
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -216,6 +211,8 @@
 unique=`for i in $$list; do \
 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
 am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
@@ -242,8 +239,6 @@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
-CSCOPE = @CSCOPE@
-CTAGS = @CTAGS@
 CWARNFLAGS = @CWARNFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
@@ -257,11 +252,9 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ETAGS = @ETAGS@
 EXEEXT = @EXEEXT@
 EXEEXT_FOR_BUILD = @EXEEXT_FOR_BUILD@
 FGREP = @FGREP@
-FILECMD = @FILECMD@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 FOP = @FOP@
@@ -325,6 +318,7 @@
 STRIP = @STRIP@
 STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@
 TRADITIONALCPPFLAGS = @TRADITIONALCPPFLAGS@
+USE_THREAD_LIBS = @USE_THREAD_LIBS@
 VERSION = @VERSION@
 WCHAR32 = @WCHAR32@
 X11_CFLAGS = @X11_CFLAGS@
@@ -395,7 +389,6 @@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
-runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -458,8 +451,8 @@
 	 *config.status*) \
 	 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	 *) \
-	 echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
-	 cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
+	 echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	 cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
 	esac;
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -529,20 +522,14 @@
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/omDefault.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/omGeneric.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/omImText.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/omText.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/omTextEsc.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/omTextExt.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/omTextPer.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/omXChar.Plo@am__quote@ # am--include-marker
-
-$(am__depfiles_remade):
-	@$(MKDIR_P) $(@D)
-	@echo '# dummy' >$@-t && $(am__mv) $@-t $@
-
-am--depfiles: $(am__depfiles_remade)
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/omDefault.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/omGeneric.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/omImText.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/omText.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/omTextEsc.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/omTextExt.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/omTextPer.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/omXChar.Plo@am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -622,10 +609,8 @@
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-distdir: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) distdir-am
 
-distdir-am: $(DISTFILES)
+distdir: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
@@ -698,14 +683,7 @@
 	clean-noinstLTLIBRARIES mostlyclean-am
 
 distclean: distclean-am
-		-rm -f ./$(DEPDIR)/omDefault.Plo
-	-rm -f ./$(DEPDIR)/omGeneric.Plo
-	-rm -f ./$(DEPDIR)/omImText.Plo
-	-rm -f ./$(DEPDIR)/omText.Plo
-	-rm -f ./$(DEPDIR)/omTextEsc.Plo
-	-rm -f ./$(DEPDIR)/omTextExt.Plo
-	-rm -f ./$(DEPDIR)/omTextPer.Plo
-	-rm -f ./$(DEPDIR)/omXChar.Plo
+	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-tags
@@ -751,14 +729,7 @@
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-		-rm -f ./$(DEPDIR)/omDefault.Plo
-	-rm -f ./$(DEPDIR)/omGeneric.Plo
-	-rm -f ./$(DEPDIR)/omImText.Plo
-	-rm -f ./$(DEPDIR)/omText.Plo
-	-rm -f ./$(DEPDIR)/omTextEsc.Plo
-	-rm -f ./$(DEPDIR)/omTextExt.Plo
-	-rm -f ./$(DEPDIR)/omTextPer.Plo
-	-rm -f ./$(DEPDIR)/omXChar.Plo
+	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
@@ -779,7 +750,7 @@
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
 	clean-commonlibLTLIBRARIES clean-generic clean-libtool \
 	clean-noinstLTLIBRARIES cscopelist-am ctags ctags-am distclean \
 	distclean-compile distclean-generic distclean-libtool \

_service:tar_scm:libX11-1.8.1.tar.xz/nls/Makefile.in -> _service:tar_scm:libX11-1.8.4.tar.xz/nls/Makefile.in Changed

@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.5 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2021 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -314,7 +314,6 @@
   bases='$(TEST_LOGS)'; \
   bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \
   bases=`echo $$bases`
-AM_TESTSUITE_SUMMARY_HEADER = ' for $(PACKAGE_STRING)'
 RECHECK_LOGS = $(TEST_LOGS)
 AM_RECURSIVE_TARGETS = check recheck
 TEST_SUITE_LOG = test-suite.log
@@ -364,8 +363,6 @@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
-CSCOPE = @CSCOPE@
-CTAGS = @CTAGS@
 CWARNFLAGS = @CWARNFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
@@ -379,11 +376,9 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ETAGS = @ETAGS@
 EXEEXT = @EXEEXT@
 EXEEXT_FOR_BUILD = @EXEEXT_FOR_BUILD@
 FGREP = @FGREP@
-FILECMD = @FILECMD@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 FOP = @FOP@
@@ -447,6 +442,7 @@
 STRIP = @STRIP@
 STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@
 TRADITIONALCPPFLAGS = @TRADITIONALCPPFLAGS@
+USE_THREAD_LIBS = @USE_THREAD_LIBS@
 VERSION = @VERSION@
 WCHAR32 = @WCHAR32@
 X11_CFLAGS = @X11_CFLAGS@
@@ -517,7 +513,6 @@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
-runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -580,8 +575,8 @@
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
 	esac;
 $(top_srcdir)/cpprules.in $(am__empty):
 
@@ -782,7 +777,7 @@
 	  test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG);		\
 	fi;								\
 	echo "$${col}$$br$${std}"; 					\
-	echo "$${col}Testsuite summary"$(AM_TESTSUITE_SUMMARY_HEADER)"$${std}";	\
+	echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}";	\
 	echo "$${col}$$br$${std}"; 					\
 	create_testsuite_report --maybe-color;				\
 	echo "$$col$$br$$std";						\
@@ -795,7 +790,7 @@
 	fi;								\
 	$$success || exit 1
 
-check-TESTS: 
+check-TESTS:
 	@list='$(RECHECK_LOGS)';           test -z "$$list" || rm -f $$list
 	@list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list
 	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
@@ -837,10 +832,8 @@
 @am__EXEEXT_TRUE@	--log-file $$b.log --trs-file $$b.trs \
 @am__EXEEXT_TRUE@	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
 @am__EXEEXT_TRUE@	"$$tst" $(AM_TESTS_FD_REDIRECT)
-distdir: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) distdir-am
 
-distdir-am: $(DISTFILES)
+distdir: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
 	list='$(DISTFILES)'; \

_service:tar_scm:libX11-1.8.1.tar.xz/nls/compose-check.pl -> _service:tar_scm:libX11-1.8.4.tar.xz/nls/compose-check.pl Changed

_service:tar_scm:libX11-1.8.1.tar.xz/nls/compose.dir.pre -> _service:tar_scm:libX11-1.8.4.tar.xz/nls/compose.dir.pre Changed

_service:tar_scm:libX11-1.8.1.tar.xz/nls/en_US.UTF-8/Compose.pre -> _service:tar_scm:libX11-1.8.4.tar.xz/nls/en_US.UTF-8/Compose.pre Changed

@@ -14,6 +14,8 @@
 <dead_grave> <dead_grave>		: "`"	grave # GRAVE ACCENT
 <dead_circumflex> <space>		: "^"	asciicircum # CIRCUMFLEX ACCENT
 <dead_circumflex> <dead_circumflex>	: "^"	asciicircum # CIRCUMFLEX ACCENT
+<Multi_key> <greater> <space>		: "^"	asciicircum # CIRCUMFLEX ACCENT
+<Multi_key> <space> <greater>		: "^"	asciicircum # CIRCUMFLEX ACCENT
 <dead_abovering> <space>		: "°"	degree # DEGREE SIGN
 <dead_abovering> <dead_abovering>	: "°"	degree # DEGREE SIGN
 <Multi_key> <o> <o>			: "°"	degree # DEGREE SIGN
@@ -22,13 +24,14 @@
 <dead_macron> <space>			: "¯"	macron # MACRON
 <dead_macron> <dead_macron>		: "¯"	macron # MACRON
 <Multi_key> <minus> <asciicircum>	: "¯"	macron # MACRON
-<Multi_key> <asciicircum> <minus>	: "¯"	macron # MACRON
+<Multi_key> <underscore> <space>	: "¯"	macron # MACRON
+<Multi_key> <space> <underscore>	: "¯"	macron # MACRON
 <Multi_key> <underscore> <underscore>	: "¯"	macron # MACRON
 <Multi_key> <underscore> <asciicircum>	: "¯"	macron # MACRON
 <dead_breve> <space>			: "˘"	breve # BREVE
 <dead_breve> <dead_breve>		: "˘"	breve # BREVE
-<Multi_key> <space> <parenleft>		: "˘"	breve # BREVE
 <Multi_key> <parenleft> <space>		: "˘"	breve # BREVE
+<Multi_key> <space> <parenleft>		: "˘"	breve # BREVE
 <dead_abovedot> <space>			: "˙"	abovedot # DOT ABOVE
 <dead_abovedot> <dead_abovedot>		: "˙"	abovedot # DOT ABOVE
 <Multi_key> <period> <space>		: "˙"	abovedot # DOT ABOVE
@@ -40,8 +43,8 @@
 <dead_doubleacute> <dead_doubleacute>	: "˝"	U2dd # DOUBLE ACUTE ACCENT
 <dead_caron> <space>			: "ˇ"	caron # CARON
 <dead_caron> <dead_caron>		: "ˇ"	caron # CARON
-<Multi_key> <space> <less>		: "ˇ"	caron # CARON
 <Multi_key> <less> <space>		: "ˇ"	caron # CARON
+<Multi_key> <space> <less>		: "ˇ"	caron # CARON
 <dead_cedilla> <space>			: "¸"	cedilla # CEDILLA
 <dead_cedilla> <dead_cedilla>		: "¸"	cedilla # CEDILLA
 <Multi_key> <comma> <space>		: "¸"	cedilla # CEDILLA
@@ -56,17 +59,18 @@
 XCOMM ASCII characters that may be difficult to access on some keyboards.
 <Multi_key> <plus> <plus>		: "#"	numbersign # NUMBER SIGN
 <Multi_key> <A> <T>			: "@"	at # COMMERCIAL AT
+
 <Multi_key> <parenleft> <parenleft>	: ""	bracketleft # LEFT SQUARE BRACKET
+<Multi_key> <parenright> <parenright>	: ""	bracketright # RIGHT SQUARE BRACKET
+
 <Multi_key> <slash> <slash>		: "\\"	backslash # REVERSE SOLIDUS
 <Multi_key> <slash> <less>		: "\\"	backslash # REVERSE SOLIDUS
 <Multi_key> <less> <slash>		: "\\"	backslash # REVERSE SOLIDUS
-<Multi_key> <parenright> <parenright>	: ""	bracketright # RIGHT SQUARE BRACKET
-
-<Multi_key> <greater> <space>		: "^"	asciicircum # CIRCUMFLEX ACCENT
-<Multi_key> <space> <greater>		: "^"	asciicircum # CIRCUMFLEX ACCENT
 
 <Multi_key> <parenleft> <minus>		: "{"	braceleft # LEFT CURLY BRACKET
 <Multi_key> <minus> <parenleft>		: "{"	braceleft # LEFT CURLY BRACKET
+<Multi_key> <parenright> <minus>	: "}"	braceright # RIGHT CURLY BRACKET
+<Multi_key> <minus> <parenright>	: "}"	braceright # RIGHT CURLY BRACKET
 
 <Multi_key> <slash> <asciicircum>	: "|"	bar # VERTICAL LINE
 <Multi_key> <asciicircum> <slash>	: "|"	bar # VERTICAL LINE
@@ -75,9 +79,6 @@
 <Multi_key> <v> <l>			: "|"	bar # VERTICAL LINE
 <Multi_key> <l> <v>			: "|"	bar # VERTICAL LINE
 
-<Multi_key> <parenright> <minus>	: "}"	braceright # RIGHT CURLY BRACKET
-<Multi_key> <minus> <parenright>	: "}"	braceright # RIGHT CURLY BRACKET
-
 <Multi_key> <L> <T>			: "<"	less # LESS-THAN
 <Multi_key> <l> <t>			: "<"	less # LESS-THAN
 <Multi_key> <G> <T>			: ">"	greater # GREATER-THAN
@@ -294,6 +295,11 @@
 <Multi_key> <asciicircum> <underscore> <a>	: "ª"	ordfeminine # FEMININE ORDINAL INDICATOR
 <dead_circumflex> <Multi_key> <underscore> <o>	: "º"	masculine # MASCULINE ORDINAL INDICATOR
 <Multi_key> <asciicircum> <underscore> <o>	: "º"	masculine # MASCULINE ORDINAL INDICATOR
+<dead_circumflex> <1>			: "¹"	onesuperior # SUPERSCRIPT ONE
+<Multi_key> <asciicircum> <1>		: "¹"	onesuperior # SUPERSCRIPT ONE
+<Multi_key> <1> <asciicircum>		: "¹"	onesuperior # SUPERSCRIPT ONE
+<dead_circumflex> <KP_1>		: "¹"	onesuperior # SUPERSCRIPT ONE
+<Multi_key> <asciicircum> <KP_1>	: "¹"	onesuperior # SUPERSCRIPT ONE
 <dead_circumflex> <2>			: "²"	twosuperior # SUPERSCRIPT TWO
 <Multi_key> <asciicircum> <2>		: "²"	twosuperior # SUPERSCRIPT TWO
 <Multi_key> <2> <asciicircum>		: "²"	twosuperior # SUPERSCRIPT TWO
@@ -307,11 +313,6 @@
 <Multi_key> <m> 			: "µ"	mu # MICRO SIGN
 <Multi_key> <slash> 			: "µ"	mu # MICRO SIGN
 <Multi_key> <slash>			: "µ"	mu # MICRO SIGN
-<dead_circumflex> <1>			: "¹"	onesuperior # SUPERSCRIPT ONE
-<Multi_key> <asciicircum> <1>		: "¹"	onesuperior # SUPERSCRIPT ONE
-<Multi_key> <1> <asciicircum>		: "¹"	onesuperior # SUPERSCRIPT ONE
-<dead_circumflex> <KP_1>		: "¹"	onesuperior # SUPERSCRIPT ONE
-<Multi_key> <asciicircum> <KP_1>	: "¹"	onesuperior # SUPERSCRIPT ONE
 <Multi_key> <1> <4>			: "¼"	onequarter # VULGAR FRACTION ONE QUARTER
 <Multi_key> <1> <2>			: "½"	onehalf # VULGAR FRACTION ONE HALF
 <Multi_key> <3> <4>			: "¾"	threequarters # VULGAR FRACTION THREE QUARTERS
@@ -706,20 +707,18 @@
 <dead_breve> <G>			: "Ğ"	U011E # LATIN CAPITAL LETTER G WITH BREVE
 <Multi_key> <G>			: "Ğ"	U011E # LATIN CAPITAL LETTER G WITH BREVE
 <Multi_key> <G>			: "Ğ"	U011E # LATIN CAPITAL LETTER G WITH BREVE
-<Multi_key> <G> 			: "Ğ"	U011E # LATIN CAPITAL LETTER G WITH BREVE
-<Multi_key> <G> 			: "Ğ"	U011E # LATIN CAPITAL LETTER G WITH BREVE
 <Multi_key> <G>			: "Ğ"	U011E # LATIN CAPITAL LETTER G WITH BREVE
 <Multi_key> <breve> <G>			: "Ğ"	U011E # LATIN CAPITAL LETTER G WITH BREVE
 <Multi_key> <G> <breve>			: "Ğ"	U011E # LATIN CAPITAL LETTER G WITH BREVE
+<Multi_key> <G> 			: "Ğ"	U011E # LATIN CAPITAL LETTER G WITH BREVE
 <Multi_key> <G> <parenleft>		: "Ğ"	U011E # LATIN CAPITAL LETTER G WITH BREVE
 <dead_breve> <g>			: "ğ"	U011F # LATIN SMALL LETTER G WITH BREVE
 <Multi_key> <g>			: "ğ"	U011F # LATIN SMALL LETTER G WITH BREVE
 <Multi_key> <g>			: "ğ"	U011F # LATIN SMALL LETTER G WITH BREVE
-<Multi_key> <g> 			: "ğ"	U011F # LATIN SMALL LETTER G WITH BREVE
-<Multi_key> <g> 			: "ğ"	U011F # LATIN SMALL LETTER G WITH BREVE
 <Multi_key> <g>			: "ğ"	U011F # LATIN SMALL LETTER G WITH BREVE
 <Multi_key> <breve> <g>			: "ğ"	U011F # LATIN SMALL LETTER G WITH BREVE
 <Multi_key> <g> <breve>			: "ğ"	U011F # LATIN SMALL LETTER G WITH BREVE
+<Multi_key> <g> 			: "ğ"	U011F # LATIN SMALL LETTER G WITH BREVE
 <Multi_key> <g> <parenleft>		: "ğ"	U011F # LATIN SMALL LETTER G WITH BREVE
 <dead_abovedot> <G>			: "Ġ"	U0120 # LATIN CAPITAL LETTER G WITH DOT ABOVE
 <Multi_key> <period> <G>		: "Ġ"	U0120 # LATIN CAPITAL LETTER G WITH DOT ABOVE
@@ -1339,6 +1338,18 @@
 <dead_doublegrave> 				: "ȕ"	U0215 # LATIN SMALL LETTER U WITH DOUBLE GRAVE
 <dead_invertedbreve> 			: "Ȗ"	U0216 # LATIN CAPITAL LETTER U WITH INVERTED BREVE
 <dead_invertedbreve> 			: "ȗ"	U0217 # LATIN SMALL LETTER U WITH INVERTED BREVE
+<dead_belowcomma> <S>				: "Ș"	U0218 # LATIN CAPITAL LETTER S WITH COMMA BELOW
+<Multi_key> <semicolon> <S>			: "Ș"	U0218 # LATIN CAPITAL LETTER S WITH COMMA BELOW
+<Multi_key> <S> <semicolon>			: "Ș"	U0218 # LATIN CAPITAL LETTER S WITH COMMA BELOW
+<dead_belowcomma> <s>				: "ș"	U0219 # LATIN SMALL LETTER S WITH COMMA BELOW
+<Multi_key> <semicolon> <s>			: "ș"	U0219 # LATIN SMALL LETTER S WITH COMMA BELOW
+<Multi_key> <s> <semicolon>			: "ș"	U0219 # LATIN SMALL LETTER S WITH COMMA BELOW
+<dead_belowcomma> <T>				: "Ț"	U021A # LATIN CAPITAL LETTER T WITH COMMA BELOW
+<Multi_key> <semicolon> <T>			: "Ț"	U021A # LATIN CAPITAL LETTER T WITH COMMA BELOW
+<Multi_key> <T> <semicolon>			: "Ț"	U021A # LATIN CAPITAL LETTER T WITH COMMA BELOW
+<dead_belowcomma> <t>				: "ț"	U021B # LATIN SMALL LETTER T WITH COMMA BELOW
+<Multi_key> <semicolon> <t>			: "ț"	U021B # LATIN SMALL LETTER T WITH COMMA BELOW
+<Multi_key> <t> <semicolon>			: "ț"	U021B # LATIN SMALL LETTER T WITH COMMA BELOW
 <dead_caron> <H>				: "Ȟ"	U021E # LATIN CAPITAL LETTER H WITH CARON
 <Multi_key> <c> <H>				: "Ȟ"	U021E # LATIN CAPITAL LETTER H WITH CARON
 <Multi_key> <v> <H>				: "Ȟ"	U021E # LATIN CAPITAL LETTER H WITH CARON
@@ -1417,8 +1428,17 @@
 <dead_macron> <y>				: "ȳ"	U0233 # LATIN SMALL LETTER Y WITH MACRON
 <Multi_key> <macron> <y>			: "ȳ"	U0233 # LATIN SMALL LETTER Y WITH MACRON
 <Multi_key> <underscore> <y>			: "ȳ"	U0233 # LATIN SMALL LETTER Y WITH MACRON
-<Multi_key> <e> <e>				: "ə"	U0259 # LATIN SMALL LETTER SCHWA
+<dead_stroke> 				: "Ƀ"	U0243 # LATIN CAPITAL LETTER B WITH STROKE
+<Multi_key> <slash> 				: "Ƀ"	U0243 # LATIN CAPITAL LETTER B WITH STROKE
+<Multi_key> <KP_Divide> 			: "Ƀ"	U0243 # LATIN CAPITAL LETTER B WITH STROKE
+/* Four sequences for Samogitian. */
+<Multi_key> <minus> <period> <E>		: "Ė̄"	# LATIN CAPITAL LETTER E WITH DOT ABOVE plus combining macron
+<Multi_key> <underscore> <period> <E>		: "Ė̄"	# LATIN CAPITAL LETTER E WITH DOT ABOVE plus combining macron
+<Multi_key> <minus> <period> <e>		: "ė̄"	# LATIN SMALL LETTER E WITH DOT ABOVE plus combining macron
+<Multi_key> <underscore> <period> <e>		: "ė̄"	# LATIN SMALL LETTER E WITH DOT ABOVE plus combining macron
 
+XCOMM IPA Extensions
+<Multi_key> <e> <e>				: "ə"	U0259 # LATIN SMALL LETTER SCHWA
 <dead_stroke> 				: "ɨ"	U0268 # LATIN SMALL LETTER I WITH STROKE
 <Multi_key> <slash> 				: "ɨ"	U0268 # LATIN SMALL LETTER I WITH STROKE
 <Multi_key> <KP_Divide> 			: "ɨ"	U0268 # LATIN SMALL LETTER I WITH STROKE
@@ -4428,6 +4448,7 @@
 <dead_circumflex> <KP_Add>			: "⁺"	U207A # SUPERSCRIPT PLUS SIGN
 <Multi_key> <asciicircum> <KP_Add>		: "⁺"	U207A # SUPERSCRIPT PLUS SIGN
 <dead_circumflex> <minus>			: "⁻"	U207B # SUPERSCRIPT MINUS
+<Multi_key> <asciicircum> <minus>		: "⁻"	U207B # SUPERSCRIPT MINUS
 <dead_circumflex> <U2212>			: "⁻"	U207B # SUPERSCRIPT MINUS
 <Multi_key> <asciicircum> <U2212>		: "⁻"	U207B # SUPERSCRIPT MINUS
 <dead_circumflex> <equal>			: "⁼"	U207C # SUPERSCRIPT EQUALS SIGN
@@ -4462,6 +4483,7 @@
 <Multi_key> <underscore> <KP_9>			: "₉"	U2089 # SUBSCRIPT NINE
 <Multi_key> <underscore> <plus>			: "₊"	U208A # SUBSCRIPT PLUS SIGN
 <Multi_key> <underscore> <KP_Add>		: "₊"	U208A # SUBSCRIPT PLUS SIGN
+<Multi_key> <underscore> <minus>		: "₋"	U208B # SUBSCRIPT MINUS
 <Multi_key> <underscore> <U2212>		: "₋"	U208B # SUBSCRIPT MINUS
 <Multi_key> <underscore> <equal>		: "₌"	U208C # SUBSCRIPT EQUALS SIGN
 <Multi_key> <underscore> <KP_Equal>		: "₌"	U208C # SUBSCRIPT EQUALS SIGN
@@ -4469,20 +4491,17 @@
 <Multi_key> <underscore> <parenright>		: "₎"	U208E # SUBSCRIPT RIGHT PARENTHESIS
 
 XCOMM Letterlike Symbols
+<Multi_key> <C> <C>			: "ℂ"	U2102 # DOUBLE-STRUCK CAPITAL C
+<Multi_key> <N> <N>			: "ℕ"	U2115 # DOUBLE-STRUCK CAPITAL N
+<Multi_key> <Q> <Q>			: "ℚ"	U211A # DOUBLE-STRUCK CAPITAL Q
+<Multi_key> <R> <R>			: "ℝ"	U211D # DOUBLE-STRUCK CAPITAL R
+<Multi_key> <Z> <Z>			: "ℤ"	U2124 # DOUBLE-STRUCK CAPITAL Z
 <dead_circumflex> <Multi_key> <S> <M>	: "℠"	U2120 # SERVICE MARK
 <Multi_key> <S> <M>			: "℠"	U2120 # SERVICE MARK
-<dead_circumflex> <Multi_key> <s> <M>	: "℠"	U2120 # SERVICE MARK
-<Multi_key> <s> <M>			: "℠"	U2120 # SERVICE MARK
-<dead_circumflex> <Multi_key> <S> <m>	: "℠"	U2120 # SERVICE MARK
-<Multi_key> <S> <m>			: "℠"	U2120 # SERVICE MARK
 <dead_circumflex> <Multi_key> <s> <m>	: "℠"	U2120 # SERVICE MARK
 <Multi_key> <s> <m>			: "℠"	U2120 # SERVICE MARK
 <dead_circumflex> <Multi_key> <T> <M>	: "™"	U2122 # TRADE MARK SIGN
 <Multi_key> <T> <M>			: "™"	U2122 # TRADE MARK SIGN
-<dead_circumflex> <Multi_key> <t> <M>	: "™"	U2122 # TRADE MARK SIGN
-<Multi_key> <t> <M>			: "™"	U2122 # TRADE MARK SIGN
-<dead_circumflex> <Multi_key> <T> <m>	: "™"	U2122 # TRADE MARK SIGN
-<Multi_key> <T> <m>			: "™"	U2122 # TRADE MARK SIGN
 <dead_circumflex> <Multi_key> <t> <m>	: "™"	U2122 # TRADE MARK SIGN
 <Multi_key> <t> <m>			: "™"	U2122 # TRADE MARK SIGN
 
@@ -4529,6 +4548,7 @@
 <Multi_key> <braceleft> <braceright>	: "∅"	U2205 # EMPTY SET
 <Multi_key> <U2208> <U0338>		: "∉"	U2209 # NOT AN ELEMENT OF
 <Multi_key> <U220B> <U0338>		: "∌"	U220C # DOES NOT CONTAIN AS MEMBER
+<Multi_key> <minus> <underscore>	: "−"	U2212 # MINUS SIGN
 <Multi_key> <U2223> <U0338>		: "∤"	U2224 # DOES NOT DIVIDE
 <Multi_key> <U2225> <U0338>		: "∦"	U2226 # NOT PARALLEL TO
 <Multi_key> <U223C> <U0338>		: "≁"	U2241 # NOT TILDE
@@ -4544,9 +4564,7 @@
 <Multi_key> <greater> <equal>		: "≥"	U2265 # GREATER-THAN OR EQUAL TO
 <Multi_key> <U224D> <U0338>		: "≭"	U226D # NOT EQUIVALENT TO
 <Multi_key> <less> <U0338>		: "≮"	U226E # NOT LESS-THAN
-<Multi_key> <leftcaret> <U0338>		: "≮"	U226E # NOT LESS-THAN
 <Multi_key> <greater> <U0338>		: "≯"	U226F # NOT GREATER-THAN
-<Multi_key> <rightcaret> <U0338>	: "≯"	U226F # NOT GREATER-THAN
 <Multi_key> <lessthanequal> <U0338>	: "≰"	U2270 # NEITHER LESS-THAN NOR EQUAL TO
 <Multi_key> <greaterthanequal> <U0338>	: "≱"	U2271 # NEITHER GREATER-THAN NOR EQUAL TO
 <Multi_key> <U2272> <U0338>		: "≴"	U2274 # NEITHER LESS-THAN NOR EQUIVALENT TO
@@ -4596,48 +4614,26 @@
 <Multi_key> <parenleft> <9> <parenright>		: "⑨"	U2468 # CIRCLED DIGIT NINE
 <Multi_key> <parenleft> <KP_9> <parenright>		: "⑨"	U2468 # CIRCLED DIGIT NINE
 <Multi_key> <parenleft> <1> <0> <parenright>		: "⑩"	U2469 # CIRCLED NUMBER TEN
-<Multi_key> <parenleft> <1> <KP_0> <parenright>		: "⑩"	U2469 # CIRCLED NUMBER TEN
-<Multi_key> <parenleft> <KP_1> <0> <parenright>		: "⑩"	U2469 # CIRCLED NUMBER TEN
 <Multi_key> <parenleft> <KP_1> <KP_0> <parenright>	: "⑩"	U2469 # CIRCLED NUMBER TEN
 <Multi_key> <parenleft> <1> <1> <parenright>		: "⑪"	U246A # CIRCLED NUMBER ELEVEN
-<Multi_key> <parenleft> <1> <KP_1> <parenright>		: "⑪"	U246A # CIRCLED NUMBER ELEVEN
-<Multi_key> <parenleft> <KP_1> <1> <parenright>		: "⑪"	U246A # CIRCLED NUMBER ELEVEN
 <Multi_key> <parenleft> <KP_1> <KP_1> <parenright>	: "⑪"	U246A # CIRCLED NUMBER ELEVEN
 <Multi_key> <parenleft> <1> <2> <parenright>		: "⑫"	U246B # CIRCLED NUMBER TWELVE
-<Multi_key> <parenleft> <1> <KP_2> <parenright>		: "⑫"	U246B # CIRCLED NUMBER TWELVE
-<Multi_key> <parenleft> <KP_1> <2> <parenright>		: "⑫"	U246B # CIRCLED NUMBER TWELVE
 <Multi_key> <parenleft> <KP_1> <KP_2> <parenright>	: "⑫"	U246B # CIRCLED NUMBER TWELVE
 <Multi_key> <parenleft> <1> <3> <parenright>		: "⑬"	U246C # CIRCLED NUMBER THIRTEEN
-<Multi_key> <parenleft> <1> <KP_3> <parenright>		: "⑬"	U246C # CIRCLED NUMBER THIRTEEN
-<Multi_key> <parenleft> <KP_1> <3> <parenright>		: "⑬"	U246C # CIRCLED NUMBER THIRTEEN
 <Multi_key> <parenleft> <KP_1> <KP_3> <parenright>	: "⑬"	U246C # CIRCLED NUMBER THIRTEEN
 <Multi_key> <parenleft> <1> <4> <parenright>		: "⑭"	U246D # CIRCLED NUMBER FOURTEEN
-<Multi_key> <parenleft> <1> <KP_4> <parenright>		: "⑭"	U246D # CIRCLED NUMBER FOURTEEN
-<Multi_key> <parenleft> <KP_1> <4> <parenright>		: "⑭"	U246D # CIRCLED NUMBER FOURTEEN
 <Multi_key> <parenleft> <KP_1> <KP_4> <parenright>	: "⑭"	U246D # CIRCLED NUMBER FOURTEEN
 <Multi_key> <parenleft> <1> <5> <parenright>		: "⑮"	U246E # CIRCLED NUMBER FIFTEEN
-<Multi_key> <parenleft> <1> <KP_5> <parenright>		: "⑮"	U246E # CIRCLED NUMBER FIFTEEN
-<Multi_key> <parenleft> <KP_1> <5> <parenright>		: "⑮"	U246E # CIRCLED NUMBER FIFTEEN
 <Multi_key> <parenleft> <KP_1> <KP_5> <parenright>	: "⑮"	U246E # CIRCLED NUMBER FIFTEEN
 <Multi_key> <parenleft> <1> <6> <parenright>		: "⑯"	U246F # CIRCLED NUMBER SIXTEEN
-<Multi_key> <parenleft> <1> <KP_6> <parenright>		: "⑯"	U246F # CIRCLED NUMBER SIXTEEN
-<Multi_key> <parenleft> <KP_1> <6> <parenright>		: "⑯"	U246F # CIRCLED NUMBER SIXTEEN
 <Multi_key> <parenleft> <KP_1> <KP_6> <parenright>	: "⑯"	U246F # CIRCLED NUMBER SIXTEEN
 <Multi_key> <parenleft> <1> <7> <parenright>		: "⑰"	U2470 # CIRCLED NUMBER SEVENTEEN
-<Multi_key> <parenleft> <1> <KP_7> <parenright>		: "⑰"	U2470 # CIRCLED NUMBER SEVENTEEN
-<Multi_key> <parenleft> <KP_1> <7> <parenright>		: "⑰"	U2470 # CIRCLED NUMBER SEVENTEEN
 <Multi_key> <parenleft> <KP_1> <KP_7> <parenright>	: "⑰"	U2470 # CIRCLED NUMBER SEVENTEEN
 <Multi_key> <parenleft> <1> <8> <parenright>		: "⑱"	U2471 # CIRCLED NUMBER EIGHTEEN
-<Multi_key> <parenleft> <1> <KP_8> <parenright>		: "⑱"	U2471 # CIRCLED NUMBER EIGHTEEN
-<Multi_key> <parenleft> <KP_1> <8> <parenright>		: "⑱"	U2471 # CIRCLED NUMBER EIGHTEEN
 <Multi_key> <parenleft> <KP_1> <KP_8> <parenright>	: "⑱"	U2471 # CIRCLED NUMBER EIGHTEEN
 <Multi_key> <parenleft> <1> <9> <parenright>		: "⑲"	U2472 # CIRCLED NUMBER NINETEEN
-<Multi_key> <parenleft> <1> <KP_9> <parenright>		: "⑲"	U2472 # CIRCLED NUMBER NINETEEN
-<Multi_key> <parenleft> <KP_1> <9> <parenright>		: "⑲"	U2472 # CIRCLED NUMBER NINETEEN
 <Multi_key> <parenleft> <KP_1> <KP_9> <parenright>	: "⑲"	U2472 # CIRCLED NUMBER NINETEEN
 <Multi_key> <parenleft> <2> <0> <parenright>		: "⑳"	U2473 # CIRCLED NUMBER TWENTY
-<Multi_key> <parenleft> <2> <KP_0> <parenright>		: "⑳"	U2473 # CIRCLED NUMBER TWENTY
-<Multi_key> <parenleft> <KP_2> <0> <parenright>		: "⑳"	U2473 # CIRCLED NUMBER TWENTY
 <Multi_key> <parenleft> <KP_2> <KP_0> <parenright>	: "⑳"	U2473 # CIRCLED NUMBER TWENTY
 <Multi_key> <parenleft> <A> <parenright>	: "Ⓐ"	U24B6 # CIRCLED LATIN CAPITAL LETTER A
 <Multi_key> <parenleft> <parenright>	: "Ⓑ"	U24B7 # CIRCLED LATIN CAPITAL LETTER B
@@ -4798,64 +4794,34 @@
 
 XCOMM Enclosed CJK Letters and Months
 <Multi_key> <parenleft> <2> <1> <parenright>		: "㉑"	U3251 # CIRCLED NUMBER TWENTY ONE
-<Multi_key> <parenleft> <2> <KP_1> <parenright>		: "㉑"	U3251 # CIRCLED NUMBER TWENTY ONE
-<Multi_key> <parenleft> <KP_2> <1> <parenright>		: "㉑"	U3251 # CIRCLED NUMBER TWENTY ONE
 <Multi_key> <parenleft> <KP_2> <KP_1> <parenright>	: "㉑"	U3251 # CIRCLED NUMBER TWENTY ONE
 <Multi_key> <parenleft> <2> <2> <parenright>		: "㉒"	U3252 # CIRCLED NUMBER TWENTY TWO
-<Multi_key> <parenleft> <2> <KP_2> <parenright>		: "㉒"	U3252 # CIRCLED NUMBER TWENTY TWO
-<Multi_key> <parenleft> <KP_2> <2> <parenright>		: "㉒"	U3252 # CIRCLED NUMBER TWENTY TWO
 <Multi_key> <parenleft> <KP_2> <KP_2> <parenright>	: "㉒"	U3252 # CIRCLED NUMBER TWENTY TWO
 <Multi_key> <parenleft> <2> <3> <parenright>		: "㉓"	U3253 # CIRCLED NUMBER TWENTY THREE
-<Multi_key> <parenleft> <2> <KP_3> <parenright>		: "㉓"	U3253 # CIRCLED NUMBER TWENTY THREE
-<Multi_key> <parenleft> <KP_2> <3> <parenright>		: "㉓"	U3253 # CIRCLED NUMBER TWENTY THREE
 <Multi_key> <parenleft> <KP_2> <KP_3> <parenright>	: "㉓"	U3253 # CIRCLED NUMBER TWENTY THREE
 <Multi_key> <parenleft> <2> <4> <parenright>		: "㉔"	U3254 # CIRCLED NUMBER TWENTY FOUR
-<Multi_key> <parenleft> <2> <KP_4> <parenright>		: "㉔"	U3254 # CIRCLED NUMBER TWENTY FOUR
-<Multi_key> <parenleft> <KP_2> <4> <parenright>		: "㉔"	U3254 # CIRCLED NUMBER TWENTY FOUR
 <Multi_key> <parenleft> <KP_2> <KP_4> <parenright>	: "㉔"	U3254 # CIRCLED NUMBER TWENTY FOUR
 <Multi_key> <parenleft> <2> <5> <parenright>		: "㉕"	U3255 # CIRCLED NUMBER TWENTY FIVE
-<Multi_key> <parenleft> <2> <KP_5> <parenright>		: "㉕"	U3255 # CIRCLED NUMBER TWENTY FIVE
-<Multi_key> <parenleft> <KP_2> <5> <parenright>		: "㉕"	U3255 # CIRCLED NUMBER TWENTY FIVE
 <Multi_key> <parenleft> <KP_2> <KP_5> <parenright>	: "㉕"	U3255 # CIRCLED NUMBER TWENTY FIVE
 <Multi_key> <parenleft> <2> <6> <parenright>		: "㉖"	U3256 # CIRCLED NUMBER TWENTY SIX
-<Multi_key> <parenleft> <2> <KP_6> <parenright>		: "㉖"	U3256 # CIRCLED NUMBER TWENTY SIX
-<Multi_key> <parenleft> <KP_2> <6> <parenright>		: "㉖"	U3256 # CIRCLED NUMBER TWENTY SIX
 <Multi_key> <parenleft> <KP_2> <KP_6> <parenright>	: "㉖"	U3256 # CIRCLED NUMBER TWENTY SIX
 <Multi_key> <parenleft> <2> <7> <parenright>		: "㉗"	U3257 # CIRCLED NUMBER TWENTY SEVEN
-<Multi_key> <parenleft> <2> <KP_7> <parenright>		: "㉗"	U3257 # CIRCLED NUMBER TWENTY SEVEN
-<Multi_key> <parenleft> <KP_2> <7> <parenright>		: "㉗"	U3257 # CIRCLED NUMBER TWENTY SEVEN
 <Multi_key> <parenleft> <KP_2> <KP_7> <parenright>	: "㉗"	U3257 # CIRCLED NUMBER TWENTY SEVEN
 <Multi_key> <parenleft> <2> <8> <parenright>		: "㉘"	U3258 # CIRCLED NUMBER TWENTY EIGHT
-<Multi_key> <parenleft> <2> <KP_8> <parenright>		: "㉘"	U3258 # CIRCLED NUMBER TWENTY EIGHT
-<Multi_key> <parenleft> <KP_2> <8> <parenright>		: "㉘"	U3258 # CIRCLED NUMBER TWENTY EIGHT
 <Multi_key> <parenleft> <KP_2> <KP_8> <parenright>	: "㉘"	U3258 # CIRCLED NUMBER TWENTY EIGHT
 <Multi_key> <parenleft> <2> <9> <parenright>		: "㉙"	U3259 # CIRCLED NUMBER TWENTY NINE
-<Multi_key> <parenleft> <2> <KP_9> <parenright>		: "㉙"	U3259 # CIRCLED NUMBER TWENTY NINE
-<Multi_key> <parenleft> <KP_2> <9> <parenright>		: "㉙"	U3259 # CIRCLED NUMBER TWENTY NINE
 <Multi_key> <parenleft> <KP_2> <KP_9> <parenright>	: "㉙"	U3259 # CIRCLED NUMBER TWENTY NINE
 <Multi_key> <parenleft> <3> <0> <parenright>		: "㉚"	U325A # CIRCLED NUMBER THIRTY
-<Multi_key> <parenleft> <3> <KP_0> <parenright>		: "㉚"	U325A # CIRCLED NUMBER THIRTY
-<Multi_key> <parenleft> <KP_3> <0> <parenright>		: "㉚"	U325A # CIRCLED NUMBER THIRTY
 <Multi_key> <parenleft> <KP_3> <KP_0> <parenright>	: "㉚"	U325A # CIRCLED NUMBER THIRTY
 <Multi_key> <parenleft> <3> <1> <parenright>		: "㉛"	U325B # CIRCLED NUMBER THIRTY ONE
-<Multi_key> <parenleft> <3> <KP_1> <parenright>		: "㉛"	U325B # CIRCLED NUMBER THIRTY ONE
-<Multi_key> <parenleft> <KP_3> <1> <parenright>		: "㉛"	U325B # CIRCLED NUMBER THIRTY ONE
 <Multi_key> <parenleft> <KP_3> <KP_1> <parenright>	: "㉛"	U325B # CIRCLED NUMBER THIRTY ONE
 <Multi_key> <parenleft> <3> <2> <parenright>		: "㉜"	U325C # CIRCLED NUMBER THIRTY TWO
-<Multi_key> <parenleft> <3> <KP_2> <parenright>		: "㉜"	U325C # CIRCLED NUMBER THIRTY TWO
-<Multi_key> <parenleft> <KP_3> <2> <parenright>		: "㉜"	U325C # CIRCLED NUMBER THIRTY TWO
 <Multi_key> <parenleft> <KP_3> <KP_2> <parenright>	: "㉜"	U325C # CIRCLED NUMBER THIRTY TWO
 <Multi_key> <parenleft> <3> <3> <parenright>		: "㉝"	U325D # CIRCLED NUMBER THIRTY THREE
-<Multi_key> <parenleft> <3> <KP_3> <parenright>		: "㉝"	U325D # CIRCLED NUMBER THIRTY THREE
-<Multi_key> <parenleft> <KP_3> <3> <parenright>		: "㉝"	U325D # CIRCLED NUMBER THIRTY THREE
 <Multi_key> <parenleft> <KP_3> <KP_3> <parenright>	: "㉝"	U325D # CIRCLED NUMBER THIRTY THREE
 <Multi_key> <parenleft> <3> <4> <parenright>		: "㉞"	U325E # CIRCLED NUMBER THIRTY FOUR
-<Multi_key> <parenleft> <3> <KP_4> <parenright>		: "㉞"	U325E # CIRCLED NUMBER THIRTY FOUR
-<Multi_key> <parenleft> <KP_3> <4> <parenright>		: "㉞"	U325E # CIRCLED NUMBER THIRTY FOUR
 <Multi_key> <parenleft> <KP_3> <KP_4> <parenright>	: "㉞"	U325E # CIRCLED NUMBER THIRTY FOUR
 <Multi_key> <parenleft> <3> <5> <parenright>		: "㉟"	U325F # CIRCLED NUMBER THIRTY FIVE
-<Multi_key> <parenleft> <3> <KP_5> <parenright>		: "㉟"	U325F # CIRCLED NUMBER THIRTY FIVE
-<Multi_key> <parenleft> <KP_3> <5> <parenright>		: "㉟"	U325F # CIRCLED NUMBER THIRTY FIVE
 <Multi_key> <parenleft> <KP_3> <KP_5> <parenright>	: "㉟"	U325F # CIRCLED NUMBER THIRTY FIVE
 <Multi_key> <parenleft> <U1100> <parenright>		: "㉠"	U3260 # CIRCLED HANGUL KIYEOK
 <Multi_key> <parenleft> <U1102> <parenright>		: "㉡"	U3261 # CIRCLED HANGUL NIEUN
@@ -4935,64 +4901,34 @@
 <Multi_key> <parenleft> <U5354> <parenright>	: "㊯"	U32AF # CIRCLED IDEOGRAPH ALLIANCE
 <Multi_key> <parenleft> <U591C> <parenright>	: "㊰"	U32B0 # CIRCLED IDEOGRAPH NIGHT
 <Multi_key> <parenleft> <3> <6> <parenright>		: "㊱"	U32B1 # CIRCLED NUMBER THIRTY SIX
-<Multi_key> <parenleft> <3> <KP_6> <parenright>		: "㊱"	U32B1 # CIRCLED NUMBER THIRTY SIX
-<Multi_key> <parenleft> <KP_3> <6> <parenright>		: "㊱"	U32B1 # CIRCLED NUMBER THIRTY SIX
 <Multi_key> <parenleft> <KP_3> <KP_6> <parenright>	: "㊱"	U32B1 # CIRCLED NUMBER THIRTY SIX
 <Multi_key> <parenleft> <3> <7> <parenright>		: "㊲"	U32B2 # CIRCLED NUMBER THIRTY SEVEN
-<Multi_key> <parenleft> <3> <KP_7> <parenright>		: "㊲"	U32B2 # CIRCLED NUMBER THIRTY SEVEN
-<Multi_key> <parenleft> <KP_3> <7> <parenright>		: "㊲"	U32B2 # CIRCLED NUMBER THIRTY SEVEN
 <Multi_key> <parenleft> <KP_3> <KP_7> <parenright>	: "㊲"	U32B2 # CIRCLED NUMBER THIRTY SEVEN
 <Multi_key> <parenleft> <3> <8> <parenright>		: "㊳"	U32B3 # CIRCLED NUMBER THIRTY EIGHT
-<Multi_key> <parenleft> <3> <KP_8> <parenright>		: "㊳"	U32B3 # CIRCLED NUMBER THIRTY EIGHT
-<Multi_key> <parenleft> <KP_3> <8> <parenright>		: "㊳"	U32B3 # CIRCLED NUMBER THIRTY EIGHT
 <Multi_key> <parenleft> <KP_3> <KP_8> <parenright>	: "㊳"	U32B3 # CIRCLED NUMBER THIRTY EIGHT
 <Multi_key> <parenleft> <3> <9> <parenright>		: "㊴"	U32B4 # CIRCLED NUMBER THIRTY NINE
-<Multi_key> <parenleft> <3> <KP_9> <parenright>		: "㊴"	U32B4 # CIRCLED NUMBER THIRTY NINE
-<Multi_key> <parenleft> <KP_3> <9> <parenright>		: "㊴"	U32B4 # CIRCLED NUMBER THIRTY NINE
 <Multi_key> <parenleft> <KP_3> <KP_9> <parenright>	: "㊴"	U32B4 # CIRCLED NUMBER THIRTY NINE
 <Multi_key> <parenleft> <4> <0> <parenright>		: "㊵"	U32B5 # CIRCLED NUMBER FORTY
-<Multi_key> <parenleft> <4> <KP_0> <parenright>		: "㊵"	U32B5 # CIRCLED NUMBER FORTY
-<Multi_key> <parenleft> <KP_4> <0> <parenright>		: "㊵"	U32B5 # CIRCLED NUMBER FORTY
 <Multi_key> <parenleft> <KP_4> <KP_0> <parenright>	: "㊵"	U32B5 # CIRCLED NUMBER FORTY
 <Multi_key> <parenleft> <4> <1> <parenright>		: "㊶"	U32B6 # CIRCLED NUMBER FORTY ONE
-<Multi_key> <parenleft> <4> <KP_1> <parenright>		: "㊶"	U32B6 # CIRCLED NUMBER FORTY ONE
-<Multi_key> <parenleft> <KP_4> <1> <parenright>		: "㊶"	U32B6 # CIRCLED NUMBER FORTY ONE
 <Multi_key> <parenleft> <KP_4> <KP_1> <parenright>	: "㊶"	U32B6 # CIRCLED NUMBER FORTY ONE
 <Multi_key> <parenleft> <4> <2> <parenright>		: "㊷"	U32B7 # CIRCLED NUMBER FORTY TWO
-<Multi_key> <parenleft> <4> <KP_2> <parenright>		: "㊷"	U32B7 # CIRCLED NUMBER FORTY TWO
-<Multi_key> <parenleft> <KP_4> <2> <parenright>		: "㊷"	U32B7 # CIRCLED NUMBER FORTY TWO
 <Multi_key> <parenleft> <KP_4> <KP_2> <parenright>	: "㊷"	U32B7 # CIRCLED NUMBER FORTY TWO
 <Multi_key> <parenleft> <4> <3> <parenright>		: "㊸"	U32B8 # CIRCLED NUMBER FORTY THREE
-<Multi_key> <parenleft> <4> <KP_3> <parenright>		: "㊸"	U32B8 # CIRCLED NUMBER FORTY THREE
-<Multi_key> <parenleft> <KP_4> <3> <parenright>		: "㊸"	U32B8 # CIRCLED NUMBER FORTY THREE
 <Multi_key> <parenleft> <KP_4> <KP_3> <parenright>	: "㊸"	U32B8 # CIRCLED NUMBER FORTY THREE
 <Multi_key> <parenleft> <4> <4> <parenright>		: "㊹"	U32B9 # CIRCLED NUMBER FORTY FOUR
-<Multi_key> <parenleft> <4> <KP_4> <parenright>		: "㊹"	U32B9 # CIRCLED NUMBER FORTY FOUR
-<Multi_key> <parenleft> <KP_4> <4> <parenright>		: "㊹"	U32B9 # CIRCLED NUMBER FORTY FOUR
 <Multi_key> <parenleft> <KP_4> <KP_4> <parenright>	: "㊹"	U32B9 # CIRCLED NUMBER FORTY FOUR
 <Multi_key> <parenleft> <4> <5> <parenright>		: "㊺"	U32BA # CIRCLED NUMBER FORTY FIVE
-<Multi_key> <parenleft> <4> <KP_5> <parenright>		: "㊺"	U32BA # CIRCLED NUMBER FORTY FIVE
-<Multi_key> <parenleft> <KP_4> <5> <parenright>		: "㊺"	U32BA # CIRCLED NUMBER FORTY FIVE
 <Multi_key> <parenleft> <KP_4> <KP_5> <parenright>	: "㊺"	U32BA # CIRCLED NUMBER FORTY FIVE
 <Multi_key> <parenleft> <4> <6> <parenright>		: "㊻"	U32BB # CIRCLED NUMBER FORTY SIX
-<Multi_key> <parenleft> <4> <KP_6> <parenright>		: "㊻"	U32BB # CIRCLED NUMBER FORTY SIX
-<Multi_key> <parenleft> <KP_4> <6> <parenright>		: "㊻"	U32BB # CIRCLED NUMBER FORTY SIX
 <Multi_key> <parenleft> <KP_4> <KP_6> <parenright>	: "㊻"	U32BB # CIRCLED NUMBER FORTY SIX
 <Multi_key> <parenleft> <4> <7> <parenright>		: "㊼"	U32BC # CIRCLED NUMBER FORTY SEVEN
-<Multi_key> <parenleft> <4> <KP_7> <parenright>		: "㊼"	U32BC # CIRCLED NUMBER FORTY SEVEN
-<Multi_key> <parenleft> <KP_4> <7> <parenright>		: "㊼"	U32BC # CIRCLED NUMBER FORTY SEVEN
 <Multi_key> <parenleft> <KP_4> <KP_7> <parenright>	: "㊼"	U32BC # CIRCLED NUMBER FORTY SEVEN
 <Multi_key> <parenleft> <4> <8> <parenright>		: "㊽"	U32BD # CIRCLED NUMBER FORTY EIGHT
-<Multi_key> <parenleft> <4> <KP_8> <parenright>		: "㊽"	U32BD # CIRCLED NUMBER FORTY EIGHT
-<Multi_key> <parenleft> <KP_4> <8> <parenright>		: "㊽"	U32BD # CIRCLED NUMBER FORTY EIGHT
 <Multi_key> <parenleft> <KP_4> <KP_8> <parenright>	: "㊽"	U32BD # CIRCLED NUMBER FORTY EIGHT
 <Multi_key> <parenleft> <4> <9> <parenright>		: "㊾"	U32BE # CIRCLED NUMBER FORTY NINE
-<Multi_key> <parenleft> <4> <KP_9> <parenright>		: "㊾"	U32BE # CIRCLED NUMBER FORTY NINE
-<Multi_key> <parenleft> <KP_4> <9> <parenright>		: "㊾"	U32BE # CIRCLED NUMBER FORTY NINE
 <Multi_key> <parenleft> <KP_4> <KP_9> <parenright>	: "㊾"	U32BE # CIRCLED NUMBER FORTY NINE
 <Multi_key> <parenleft> <5> <0> <parenright>		: "㊿"	U32BF # CIRCLED NUMBER FIFTY
-<Multi_key> <parenleft> <5> <KP_0> <parenright>		: "㊿"	U32BF # CIRCLED NUMBER FIFTY
-<Multi_key> <parenleft> <KP_5> <0> <parenright>		: "㊿"	U32BF # CIRCLED NUMBER FIFTY
 <Multi_key> <parenleft> <KP_5> <KP_0> <parenright>	: "㊿"	U32BF # CIRCLED NUMBER FIFTY
 <Multi_key> <parenleft> <kana_A> <parenright>	: "㋐"	U32D0 # CIRCLED KATAKANA A
 <Multi_key> <parenleft> <kana_I> <parenright>	: "㋑"	U32D1 # CIRCLED KATAKANA I
@@ -5109,31 +5045,21 @@
 <UFEF5>	: "لآ" # ARABIC LIGATURE LAM WITH ALEF WITH MADDA ABOVE
 
 XCOMM French-Dvorak Bépo compositions
-<dead_abovedot> <Amacron>		: "Ǡ"	U01E0 # LATIN CAPITAL LETTER A WITH DOT ABOVE AND MACRON
-<dead_abovedot> <amacron>		: "ǡ"	U01E1 # LATIN SMALL LETTER A WITH DOT ABOVE AND MACRON
 <dead_abovedot> <j>			: "ȷ"	U0237 # LATIN SMALL LETTER DOTLESS J
 <dead_abovedot> <L>			: "Ŀ"	U013F # LATIN CAPITAL LETTER L WITH MIDDLE DOT
 <dead_abovedot> <l>			: "ŀ"	U0140 # LATIN SMALL LETTER L WITH MIDDLE DOT
-<dead_abovedot> <Omacron>		: "Ȱ"	U0230 # LATIN CAPITAL LETTER O WITH DOT ABOVE AND MACRON
-<dead_abovedot> <omacron>		: "ȱ"	U0231 # LATIN SMALL LETTER O WITH DOT ABOVE AND MACRON
 <dead_abovedot> <nobreakspace>		: "̇"	U0307 # COMBINING DOT ABOVE
-<dead_acute> <Sabovedot>		: "Ṥ"	U1E64 # LATIN CAPITAL LETTER S WITH ACUTE AND DOT ABOVE
-<dead_acute> <sabovedot>		: "ṥ"	U1E65 # LATIN SMALL LETTER S WITH ACUTE AND DOT ABOVE
 <dead_acute> <V>			: "Ǘ"	U01D7 # LATIN CAPITAL LETTER U WITH DIAERESIS AND ACUTE
 <dead_acute> <v>			: "ǘ"	U01D8 # LATIN SMALL LETTER U WITH DIAERESIS AND ACUTE
 <dead_acute> <nobreakspace>		: "́"	U0301 # COMBINING ACUTE ACCENT
-<dead_belowdot> <Sabovedot>		: "Ṩ"	U1E68 # LATIN CAPITAL LETTER S WITH DOT BELOW AND DOT ABOVE
-<dead_belowdot> <sabovedot>		: "ṩ"	U1E69 # LATIN SMALL LETTER S WITH DOT BELOW AND DOT ABOVE
 <dead_belowdot> <dead_belowdot>		: "̣"	U0323 # COMBINING DOT BELOW
 <dead_belowdot> <nobreakspace>		: "̣"	U0323 # COMBINING DOT BELOW
 <dead_belowdot> <space>			: "̣"	U0323 # COMBINING DOT BELOW
 <dead_breve> <Aacute>			: "Ắ"	Abreveacute # LATIN CAPITAL LETTER A WITH BREVE AND ACUTE
 <dead_breve> <Agrave>			: "Ằ"	Abrevegrave # LATIN CAPITAL LETTER A WITH BREVE AND GRAVE
-<dead_breve> <Ahook>			: "Ẳ"	Abrevehook # LATIN CAPITAL LETTER A WITH BREVE AND HOOK ABOVE
 <dead_breve> <Atilde>			: "Ẵ"	Abrevetilde # LATIN CAPITAL LETTER A WITH BREVE AND TILDE
 <dead_breve> <aacute>			: "ắ"	abreveacute # LATIN SMALL LETTER A WITH BREVE AND ACUTE
 <dead_breve> <agrave>			: "ằ"	abrevegrave # LATIN SMALL LETTER A WITH BREVE AND GRAVE
-<dead_breve> <ahook>			: "ẳ"	abrevehook # LATIN SMALL LETTER A WITH BREVE AND HOOK ABOVE
 <dead_breve> <atilde>			: "ẵ"	abrevetilde # LATIN SMALL LETTER A WITH BREVE AND TILDE
 <dead_breve> <nobreakspace>		: "̆"	U0306 # COMBINING BREVE
 <dead_caron> <parenleft>		: "₍"	U208D # SUBSCRIPT LEFT PARENTHESIS
@@ -5152,13 +5078,10 @@
 <dead_caron> <9>			: "₉"	ninesubscript # SUBSCRIPT NINE
 <dead_caron> <equal>			: "₌"	U208C # SUBSCRIPT EQUALS SIGN
 <dead_caron> <U01F2>			: "ǅ"	U01C5 # LATIN CAPITAL LETTER D WITH SMALL LETTER Z WITH CARON
-<dead_caron> <Sabovedot>		: "Ṧ"	U1E66 # LATIN CAPITAL LETTER S WITH CARON AND DOT ABOVE
-<dead_caron> <sabovedot>		: "ṧ"	U1E67 # LATIN SMALL LETTER S WITH CARON AND DOT ABOVE
 <dead_caron> <V>			: "Ǚ"	U01D9 # LATIN CAPITAL LETTER U WITH DIAERESIS AND CARON
 <dead_caron> <v>			: "ǚ"	U01DA # LATIN SMALL LETTER U WITH DIAERESIS AND CARON
 <dead_caron> <nobreakspace>		: "̌"	U030C # COMBINING CARON
 <dead_cedilla> <Cacute>			: "Ḉ"	U1E08 # LATIN CAPITAL LETTER C WITH CEDILLA AND ACUTE
-<dead_cedilla> <ColonSign>		: "₵"	U20B5 # CEDI SIGN
 <dead_cedilla> <cacute>			: "ḉ"	U1E09 # LATIN SMALL LETTER C WITH CEDILLA AND ACUTE
 <dead_cedilla> <cent>			: "₵"	U20B5 # CEDI SIGN
 <dead_cedilla> <U0114>			: "Ḝ"	U1E1C # LATIN CAPITAL LETTER E WITH CEDILLA AND BREVE
@@ -5166,41 +5089,23 @@
 <dead_cedilla> <nobreakspace>		: "̧"	U0327 # COMBINING CEDILLA
 <dead_circumflex> <Aacute>		: "Ấ"	Acircumflexacute # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND ACUTE
 <dead_circumflex> <Agrave>		: "Ầ"	Acircumflexgrave # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND GRAVE
-<dead_circumflex> <Ahook>		: "Ẩ"	Acircumflexhook # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE
 <dead_circumflex> <Atilde>		: "Ẫ"	Acircumflextilde # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND TILDE
 <dead_circumflex> <aacute>		: "ấ"	acircumflexacute # LATIN SMALL LETTER A WITH CIRCUMFLEX AND ACUTE
 <dead_circumflex> <agrave>		: "ầ"	acircumflexgrave # LATIN SMALL LETTER A WITH CIRCUMFLEX AND GRAVE
-<dead_circumflex> <ahook>		: "ẩ"	acircumflexhook # LATIN SMALL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE
 <dead_circumflex> <atilde>		: "ẫ"	acircumflextilde # LATIN SMALL LETTER A WITH CIRCUMFLEX AND TILDE
 <dead_circumflex> <Eacute>		: "Ế"	Ecircumflexacute # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND ACUTE
 <dead_circumflex> <Egrave>		: "Ề"	Ecircumflexgrave # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND GRAVE
-<dead_circumflex> <Ehook>		: "Ể"	Ecircumflexhook # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE
 <dead_circumflex> <Etilde>		: "Ễ"	Ecircumflextilde # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND TILDE
 <dead_circumflex> <eacute>		: "ế"	ecircumflexacute # LATIN SMALL LETTER E WITH CIRCUMFLEX AND ACUTE
 <dead_circumflex> <egrave>		: "ề"	ecircumflexgrave # LATIN SMALL LETTER E WITH CIRCUMFLEX AND GRAVE
-<dead_circumflex> <ehook>		: "ể"	ecircumflexhook # LATIN SMALL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE
 <dead_circumflex> <etilde>		: "ễ"	ecircumflextilde # LATIN SMALL LETTER E WITH CIRCUMFLEX AND TILDE
 <dead_circumflex> <Oacute>		: "Ố"	Ocircumflexacute # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND ACUTE
 <dead_circumflex> <Ograve>		: "Ồ"	Ocircumflexgrave # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND GRAVE
-<dead_circumflex> <Ohook>		: "Ổ"	Ocircumflexhook # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE
 <dead_circumflex> <Otilde>		: "Ỗ"	Ocircumflextilde # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND TILDE
 <dead_circumflex> <oacute>		: "ố"	ocircumflexacute # LATIN SMALL LETTER O WITH CIRCUMFLEX AND ACUTE
 <dead_circumflex> <ograve>		: "ồ"	ocircumflexgrave # LATIN SMALL LETTER O WITH CIRCUMFLEX AND GRAVE
-<dead_circumflex> <ohook>		: "ổ"	ocircumflexhook # LATIN SMALL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE
 <dead_circumflex> <otilde>		: "ỗ"	ocircumflextilde # LATIN SMALL LETTER O WITH CIRCUMFLEX AND TILDE
 <dead_circumflex> <nobreakspace>	: "̂"	U0302 # COMBINING CIRCUMFLEX ACCENT
-<dead_belowcomma> <S>			: "Ș"	U0218 # LATIN CAPITAL LETTER S WITH COMMA BELOW
-<Multi_key> <semicolon> <S>		: "Ș"	U0218 # LATIN CAPITAL LETTER S WITH COMMA BELOW
-<Multi_key> <S> <semicolon>		: "Ș"	U0218 # LATIN CAPITAL LETTER S WITH COMMA BELOW
-<dead_belowcomma> <s>			: "ș"	U0219 # LATIN SMALL LETTER S WITH COMMA BELOW
-<Multi_key> <semicolon> <s>		: "ș"	U0219 # LATIN SMALL LETTER S WITH COMMA BELOW
-<Multi_key> <s> <semicolon>		: "ș"	U0219 # LATIN SMALL LETTER S WITH COMMA BELOW
-<dead_belowcomma> <T>			: "Ț"	U021A # LATIN CAPITAL LETTER T WITH COMMA BELOW
-<Multi_key> <semicolon> <T>		: "Ț"	U021A # LATIN CAPITAL LETTER T WITH COMMA BELOW
-<Multi_key> <T> <semicolon>		: "Ț"	U021A # LATIN CAPITAL LETTER T WITH COMMA BELOW
-<dead_belowcomma> <t>			: "ț"	U021B # LATIN SMALL LETTER T WITH COMMA BELOW
-<Multi_key> <semicolon> <t>		: "ț"	U021B # LATIN SMALL LETTER T WITH COMMA BELOW
-<Multi_key> <t> <semicolon>		: "ț"	U021B # LATIN SMALL LETTER T WITH COMMA BELOW
 <dead_belowcomma> <dead_belowcomma>	: ","	comma # COMMA
 <dead_belowcomma> <nobreakspace>	: "̦"	U0326 # COMBINING COMMA BELOW
 <dead_belowcomma> <space>		: ","	comma # COMMA
@@ -5253,12 +5158,8 @@
 <dead_currency> <dead_currency>		: "¤"	currency # CURRENCY SIGN
 <dead_currency> <nobreakspace>		: "¤"	currency # CURRENCY SIGN
 <dead_currency> <space>			: "¤"	currency # CURRENCY SIGN
-<dead_diaeresis> <Amacron>		: "Ǟ"	U01DE # LATIN CAPITAL LETTER A WITH DIAERESIS AND MACRON
-<dead_diaeresis> <amacron>		: "ǟ"	U01DF # LATIN SMALL LETTER A WITH DIAERESIS AND MACRON
 <dead_diaeresis> <Iacute>		: "Ḯ"	U1E2E # LATIN CAPITAL LETTER I WITH DIAERESIS AND ACUTE
 <dead_diaeresis> <iacute>		: "ḯ"	U1E2F # LATIN SMALL LETTER I WITH DIAERESIS AND ACUTE
-<dead_diaeresis> <Omacron>		: "Ȫ"	U022A # LATIN CAPITAL LETTER O WITH DIAERESIS AND MACRON
-<dead_diaeresis> <omacron>		: "ȫ"	U022B # LATIN SMALL LETTER O WITH DIAERESIS AND MACRON
 <dead_diaeresis> <Uacute>		: "Ǘ"	U01D7 # LATIN CAPITAL LETTER U WITH DIAERESIS AND ACUTE
 <dead_diaeresis> <U01D3>		: "Ǚ"	U01D9 # LATIN CAPITAL LETTER U WITH DIAERESIS AND CARON
 <dead_diaeresis> <Ugrave>		: "Ǜ"	U01DB # LATIN CAPITAL LETTER U WITH DIAERESIS AND GRAVE
@@ -5327,13 +5228,11 @@
 <dead_hook> <c>				: "ƈ"	U0188 # LATIN SMALL LETTER C WITH HOOK
 <dead_hook> <D>				: "Ɗ"	U018A # LATIN CAPITAL LETTER D WITH HOOK
 <dead_hook> <d>				: "ɗ"	U0257 # LATIN SMALL LETTER D WITH HOOK
-<dead_hook> <U0256>			: "ᶑ"	U1D91 # LATIN SMALL LETTER D WITH HOOK AND TAIL
 <dead_hook> <F>				: "Ƒ"	U0191 # LATIN CAPITAL LETTER F WITH HOOK
 <dead_hook> <f>				: "ƒ"	function # LATIN SMALL LETTER F WITH HOOK
 <dead_hook> <G>				: "Ɠ"	U0193 # LATIN CAPITAL LETTER G WITH HOOK
 <dead_hook> <g>				: "ɠ"	U0260 # LATIN SMALL LETTER G WITH HOOK
 <dead_hook> <h>				: "ɦ"	U0266 # LATIN SMALL LETTER H WITH HOOK
-<dead_hook> <U025F>			: "ʄ"	U0284 # LATIN SMALL LETTER DOTLESS J WITH STROKE AND HOOK
 <dead_hook> <K>				: "Ƙ"	U0198 # LATIN CAPITAL LETTER K WITH HOOK
 <dead_hook> <k>				: "ƙ"	U0199 # LATIN SMALL LETTER K WITH HOOK
 <dead_hook> <M>				: "Ɱ"	U2C6E # LATIN CAPITAL LETTER M WITH HOOK
@@ -5343,13 +5242,11 @@
 <dead_hook> 				: "Ƥ"	U01A4 # LATIN CAPITAL LETTER P WITH HOOK
 <dead_hook> 				: "ƥ"	U01A5 # LATIN SMALL LETTER P WITH HOOK
 <dead_hook> <q>				: "ʠ"	U02A0 # LATIN SMALL LETTER Q WITH HOOK
-<dead_hook> <U025C>			: "ɝ"	U025D # LATIN SMALL LETTER REVERSED OPEN E WITH HOOK
 <dead_hook> <r>				: "ɼ"	U027C # LATIN SMALL LETTER R WITH LONG LEG
 <dead_hook> <s>				: "ʂ"	U0282 # LATIN SMALL LETTER S WITH HOOK
 <dead_hook> <schwa>			: "ɚ"	U025A # LATIN SMALL LETTER SCHWA WITH HOOK
 <dead_hook> <T>				: "Ƭ"	U01AC # LATIN CAPITAL LETTER T WITH HOOK
 <dead_hook> <t>				: "ƭ"	U01AD # LATIN SMALL LETTER T WITH HOOK
-<dead_hook> <U0279>			: "ɻ"	U027B # LATIN SMALL LETTER TURNED R WITH HOOK
 <dead_hook> <V>				: "Ʋ"	U01B2 # LATIN CAPITAL LETTER V WITH HOOK
 <dead_hook> <v>				: "ʋ"	U028B # LATIN SMALL LETTER V WITH HOOK
 <dead_hook> <W>				: "Ⱳ"	U2C72 # LATIN CAPITAL LETTER W WITH HOOK
@@ -5360,25 +5257,17 @@
 <dead_hook> <nobreakspace>		: "̉"	U0309 # COMBINING HOOK ABOVE
 <dead_hook> <space>			: "̉"	U0309 # COMBINING HOOK ABOVE
 <dead_horn> <Oacute>			: "Ớ"	Ohornacute # LATIN CAPITAL LETTER O WITH HORN AND ACUTE
-<dead_horn> <Obelowdot>			: "Ợ"	Ohornbelowdot # LATIN CAPITAL LETTER O WITH HORN AND DOT BELOW
 <dead_horn> <Ograve>			: "Ờ"	Ohorngrave # LATIN CAPITAL LETTER O WITH HORN AND GRAVE
 <dead_horn> <Ohook>			: "Ở"	Ohornhook # LATIN CAPITAL LETTER O WITH HORN AND HOOK ABOVE
-<dead_horn> <Otilde>			: "Ỡ"	Ohorntilde # LATIN CAPITAL LETTER O WITH HORN AND TILDE
 <dead_horn> <oacute>			: "ớ"	ohornacute # LATIN SMALL LETTER O WITH HORN AND ACUTE
-<dead_horn> <obelowdot>			: "ợ"	ohornbelowdot # LATIN SMALL LETTER O WITH HORN AND DOT BELOW
 <dead_horn> <ograve>			: "ờ"	ohorngrave # LATIN SMALL LETTER O WITH HORN AND GRAVE
 <dead_horn> <ohook>			: "ở"	ohornhook # LATIN SMALL LETTER O WITH HORN AND HOOK ABOVE
-<dead_horn> <otilde>			: "ỡ"	ohorntilde # LATIN SMALL LETTER O WITH HORN AND TILDE
 <dead_horn> <Uacute>			: "Ứ"	Uhornacute # LATIN CAPITAL LETTER U WITH HORN AND ACUTE
-<dead_horn> <Ubelowdot>			: "Ự"	Uhornbelowdot # LATIN CAPITAL LETTER U WITH HORN AND DOT BELOW
 <dead_horn> <Ugrave>			: "Ừ"	Uhorngrave # LATIN CAPITAL LETTER U WITH HORN AND GRAVE
 <dead_horn> <Uhook>			: "Ử"	Uhornhook # LATIN CAPITAL LETTER U WITH HORN AND HOOK ABOVE
-<dead_horn> <Utilde>			: "Ữ"	Uhorntilde # LATIN CAPITAL LETTER U WITH HORN AND TILDE
 <dead_horn> <uacute>			: "ứ"	uhornacute # LATIN SMALL LETTER U WITH HORN AND ACUTE
-<dead_horn> <ubelowdot>			: "ự"	uhornbelowdot # LATIN SMALL LETTER U WITH HORN AND DOT BELOW
 <dead_horn> <ugrave>			: "ừ"	uhorngrave # LATIN SMALL LETTER U WITH HORN AND GRAVE
 <dead_horn> <uhook>			: "ử"	uhornhook # LATIN SMALL LETTER U WITH HORN AND HOOK ABOVE
-<dead_horn> <utilde>			: "ữ"	uhorntilde # LATIN SMALL LETTER U WITH HORN AND TILDE
 <dead_horn> <dead_horn>			: "̛"	U031B # COMBINING HORN
 <dead_horn> <nobreakspace>		: "̛"	U031B # COMBINING HORN
 <dead_horn> <space>			: "̛"	U031B # COMBINING HORN
@@ -5393,8 +5282,6 @@
 <dead_macron> <V>			: "Ǖ"	U01D5 # LATIN CAPITAL LETTER U WITH DIAERESIS AND MACRON
 <dead_macron> <v>			: "ǖ"	U01D6 # LATIN SMALL LETTER U WITH DIAERESIS AND MACRON
 <dead_macron> <nobreakspace>		: "̄"	U0304 # COMBINING MACRON
-<dead_ogonek> <Omacron>			: "Ǭ"	U01EC # LATIN CAPITAL LETTER O WITH OGONEK AND MACRON
-<dead_ogonek> <omacron>			: "ǭ"	U01ED # LATIN SMALL LETTER O WITH OGONEK AND MACRON
 <dead_ogonek> <nobreakspace>		: "̨"	U0328 # COMBINING OGONEK
 <dead_abovering> <Aacute>		: "Ǻ"	U01FA # LATIN CAPITAL LETTER A WITH RING ABOVE AND ACUTE
 <dead_abovering> <aacute>		: "ǻ"	U01FB # LATIN SMALL LETTER A WITH RING ABOVE AND ACUTE
@@ -5403,7 +5290,6 @@
 <dead_stroke> <equal>			: "≠"	notequal # NOT EQUAL TO
 <dead_stroke> <A>			: "Ⱥ"	U023A # LATIN CAPITAL LETTER A WITH STROKE
 <dead_stroke> <a>			: "ⱥ"	U2C65 # LATIN SMALL LETTER A WITH STROKE
-<dead_stroke> 			: "Ƀ"	U0243 # LATIN CAPITAL LETTER B WITH STROKE
 <dead_stroke> <C>			: "Ȼ"	U023B # LATIN CAPITAL LETTER C WITH STROKE
 <dead_stroke> <c>			: "ȼ"	U023C # LATIN SMALL LETTER C WITH STROKE
 <dead_stroke> <E>			: "Ɇ"	U0246 # LATIN CAPITAL LETTER E WITH STROKE
@@ -5431,82 +5317,26 @@
 <dead_stroke> <space>			: "/"	slash # SOLIDUS
 <dead_tilde> <Oacute>			: "Ṍ"	U1E4C # LATIN CAPITAL LETTER O WITH TILDE AND ACUTE
 <dead_tilde> <Odiaeresis>		: "Ṏ"	U1E4E # LATIN CAPITAL LETTER O WITH TILDE AND DIAERESIS
-<dead_tilde> <Omacron>			: "Ȭ"	U022C # LATIN CAPITAL LETTER O WITH TILDE AND MACRON
 <dead_tilde> <oacute>			: "ṍ"	U1E4D # LATIN SMALL LETTER O WITH TILDE AND ACUTE
 <dead_tilde> <odiaeresis>		: "ṏ"	U1E4F # LATIN SMALL LETTER O WITH TILDE AND DIAERESIS
-<dead_tilde> <omacron>			: "ȭ"	U022D # LATIN SMALL LETTER O WITH TILDE AND MACRON
 <dead_tilde> <Uacute>			: "Ṹ"	U1E78 # LATIN CAPITAL LETTER U WITH TILDE AND ACUTE
 <dead_tilde> <uacute>			: "ṹ"	U1E79 # LATIN SMALL LETTER U WITH TILDE AND ACUTE
 <dead_tilde> <equal>			: "≃"	similarequal # ASYMPTOTICALLY EQUAL TO
 <dead_tilde> <less>			: "≲"	U2272 # LESS-THAN OR EQUIVALENT TO
 <dead_tilde> <greater>			: "≳"	U2273 # GREATER-THAN OR EQUIVALENT TO
 <dead_tilde> <nobreakspace>		: "̃"	U0303 # COMBINING TILDE
-<dead_acute> <dead_abovedot> <S>	: "Ṥ"	U1E64 # LATIN CAPITAL LETTER S WITH ACUTE AND DOT ABOVE
-<dead_acute> <dead_abovedot> <s>	: "ṥ"	U1E65 # LATIN SMALL LETTER S WITH ACUTE AND DOT ABOVE
-<dead_belowdot> <dead_abovedot> <S>	: "Ṩ"	U1E68 # LATIN CAPITAL LETTER S WITH DOT BELOW AND DOT ABOVE
-<dead_belowdot> <dead_abovedot> <s>	: "ṩ"	U1E69 # LATIN SMALL LETTER S WITH DOT BELOW AND DOT ABOVE
-<dead_caron> <dead_abovedot> <S>	: "Ṧ"	U1E66 # LATIN CAPITAL LETTER S WITH CARON AND DOT ABOVE
-<dead_caron> <dead_abovedot> <s>	: "ṧ"	U1E67 # LATIN SMALL LETTER S WITH CARON AND DOT ABOVE
-<dead_abovedot> <dead_macron> <A>	: "Ǡ"	U01E0 # LATIN CAPITAL LETTER A WITH DOT ABOVE AND MACRON
-<dead_abovedot> <dead_macron> <a>	: "ǡ"	U01E1 # LATIN SMALL LETTER A WITH DOT ABOVE AND MACRON
-<dead_abovedot> <dead_macron> <O>	: "Ȱ"	U0230 # LATIN CAPITAL LETTER O WITH DOT ABOVE AND MACRON
-<dead_abovedot> <dead_macron> <o>	: "ȱ"	U0231 # LATIN SMALL LETTER O WITH DOT ABOVE AND MACRON
 <dead_abovedot> <dead_stroke> <j>	: "ɟ"	U025F # LATIN SMALL LETTER DOTLESS J WITH STROKE
 <dead_stroke> <dead_abovedot> <j>	: "ɟ"	U025F # LATIN SMALL LETTER DOTLESS J WITH STROKE
-<dead_breve> <dead_acute> <A>		: "Ắ"	Abreveacute # LATIN CAPITAL LETTER A WITH BREVE AND ACUTE
-<dead_breve> <dead_acute> <a>		: "ắ"	abreveacute # LATIN SMALL LETTER A WITH BREVE AND ACUTE
-<dead_cedilla> <dead_acute> <C>		: "Ḉ"	U1E08 # LATIN CAPITAL LETTER C WITH CEDILLA AND ACUTE
-<dead_cedilla> <dead_acute> <c>		: "ḉ"	U1E09 # LATIN SMALL LETTER C WITH CEDILLA AND ACUTE
 <dead_circumflex> <dead_acute> <A>	: "Ấ"	Acircumflexacute # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND ACUTE
 <dead_circumflex> <dead_acute> <a>	: "ấ"	acircumflexacute # LATIN SMALL LETTER A WITH CIRCUMFLEX AND ACUTE
 <dead_circumflex> <dead_acute> <E>	: "Ế"	Ecircumflexacute # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND ACUTE
 <dead_circumflex> <dead_acute> <e>	: "ế"	ecircumflexacute # LATIN SMALL LETTER E WITH CIRCUMFLEX AND ACUTE
 <dead_circumflex> <dead_acute> <O>	: "Ố"	Ocircumflexacute # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND ACUTE
 <dead_circumflex> <dead_acute> <o>	: "ố"	ocircumflexacute # LATIN SMALL LETTER O WITH CIRCUMFLEX AND ACUTE
-<dead_diaeresis> <dead_acute> 	: "Ḯ"	U1E2E # LATIN CAPITAL LETTER I WITH DIAERESIS AND ACUTE
-<dead_diaeresis> <dead_acute> 	: "ḯ"	U1E2F # LATIN SMALL LETTER I WITH DIAERESIS AND ACUTE
-<dead_diaeresis> <dead_acute> 	: "Ǘ"	U01D7 # LATIN CAPITAL LETTER U WITH DIAERESIS AND ACUTE
-<dead_diaeresis> <dead_acute> 	: "ǘ"	U01D8 # LATIN SMALL LETTER U WITH DIAERESIS AND ACUTE
-<dead_horn> <dead_acute> <O>		: "Ớ"	Ohornacute # LATIN CAPITAL LETTER O WITH HORN AND ACUTE
-<dead_horn> <dead_acute> <o>		: "ớ"	ohornacute # LATIN SMALL LETTER O WITH HORN AND ACUTE
-<dead_horn> <dead_acute> 		: "Ứ"	Uhornacute # LATIN CAPITAL LETTER U WITH HORN AND ACUTE
-<dead_horn> <dead_acute> 		: "ứ"	uhornacute # LATIN SMALL LETTER U WITH HORN AND ACUTE
-<dead_macron> <dead_acute> <E>		: "Ḗ"	U1E16 # LATIN CAPITAL LETTER E WITH MACRON AND ACUTE
-<dead_macron> <dead_acute> <e>		: "ḗ"	U1E17 # LATIN SMALL LETTER E WITH MACRON AND ACUTE
-<dead_macron> <dead_acute> <O>		: "Ṓ"	U1E52 # LATIN CAPITAL LETTER O WITH MACRON AND ACUTE
-<dead_macron> <dead_acute> <o>		: "ṓ"	U1E53 # LATIN SMALL LETTER O WITH MACRON AND ACUTE
-<dead_abovering> <dead_acute> <A>	: "Ǻ"	U01FA # LATIN CAPITAL LETTER A WITH RING ABOVE AND ACUTE
-<dead_abovering> <dead_acute> <a>	: "ǻ"	U01FB # LATIN SMALL LETTER A WITH RING ABOVE AND ACUTE
-<dead_tilde> <dead_acute> <O>		: "Ṍ"	U1E4C # LATIN CAPITAL LETTER O WITH TILDE AND ACUTE
-<dead_tilde> <dead_acute> <o>		: "ṍ"	U1E4D # LATIN SMALL LETTER O WITH TILDE AND ACUTE
-<dead_tilde> <dead_acute> 		: "Ṹ"	U1E78 # LATIN CAPITAL LETTER U WITH TILDE AND ACUTE
-<dead_tilde> <dead_acute> 		: "ṹ"	U1E79 # LATIN SMALL LETTER U WITH TILDE AND ACUTE
-<dead_belowdot> <dead_breve> <A>	: "Ặ"	Abrevebelowdot # LATIN CAPITAL LETTER A WITH BREVE AND DOT BELOW
-<dead_belowdot> <dead_breve> <a>	: "ặ"	abrevebelowdot # LATIN SMALL LETTER A WITH BREVE AND DOT BELOW
-<dead_belowdot> <dead_circumflex> <A>	: "Ậ"	Acircumflexbelowdot # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND DOT BELOW
-<dead_belowdot> <dead_circumflex> <a>	: "ậ"	acircumflexbelowdot # LATIN SMALL LETTER A WITH CIRCUMFLEX AND DOT BELOW
-<dead_belowdot> <dead_circumflex> <E>	: "Ệ"	Ecircumflexbelowdot # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND DOT BELOW
-<dead_belowdot> <dead_circumflex> <e>	: "ệ"	ecircumflexbelowdot # LATIN SMALL LETTER E WITH CIRCUMFLEX AND DOT BELOW
-<dead_belowdot> <dead_circumflex> <O>	: "Ộ"	Ocircumflexbelowdot # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND DOT BELOW
-<dead_belowdot> <dead_circumflex> <o>	: "ộ"	ocircumflexbelowdot # LATIN SMALL LETTER O WITH CIRCUMFLEX AND DOT BELOW
 <dead_horn> <dead_belowdot> <O>		: "Ợ"	Ohornbelowdot # LATIN CAPITAL LETTER O WITH HORN AND DOT BELOW
 <dead_horn> <dead_belowdot> <o>		: "ợ"	ohornbelowdot # LATIN SMALL LETTER O WITH HORN AND DOT BELOW
 <dead_horn> <dead_belowdot> 		: "Ự"	Uhornbelowdot # LATIN CAPITAL LETTER U WITH HORN AND DOT BELOW
 <dead_horn> <dead_belowdot> 		: "ự"	uhornbelowdot # LATIN SMALL LETTER U WITH HORN AND DOT BELOW
-<dead_belowdot> <dead_macron> <L>	: "Ḹ"	U1E38 # LATIN CAPITAL LETTER L WITH DOT BELOW AND MACRON
-<dead_belowdot> <dead_macron> <l>	: "ḹ"	U1E39 # LATIN SMALL LETTER L WITH DOT BELOW AND MACRON
-<dead_belowdot> <dead_macron> <R>	: "Ṝ"	U1E5C # LATIN CAPITAL LETTER R WITH DOT BELOW AND MACRON
-<dead_belowdot> <dead_macron> <r>	: "ṝ"	U1E5D # LATIN SMALL LETTER R WITH DOT BELOW AND MACRON
-<dead_cedilla> <dead_breve> <E>		: "Ḝ"	U1E1C # LATIN CAPITAL LETTER E WITH CEDILLA AND BREVE
-<dead_cedilla> <dead_breve> <e>		: "ḝ"	U1E1D # LATIN SMALL LETTER E WITH CEDILLA AND BREVE
-<dead_breve> <dead_grave> <A>		: "Ằ"	Abrevegrave # LATIN CAPITAL LETTER A WITH BREVE AND GRAVE
-<dead_breve> <dead_grave> <a>		: "ằ"	abrevegrave # LATIN SMALL LETTER A WITH BREVE AND GRAVE
-<dead_breve> <dead_hook> <A>		: "Ẳ"	Abrevehook # LATIN CAPITAL LETTER A WITH BREVE AND HOOK ABOVE
-<dead_breve> <dead_hook> <a>		: "ẳ"	abrevehook # LATIN SMALL LETTER A WITH BREVE AND HOOK ABOVE
-<dead_breve> <dead_tilde> <A>		: "Ẵ"	Abrevetilde # LATIN CAPITAL LETTER A WITH BREVE AND TILDE
-<dead_breve> <dead_tilde> <a>		: "ẵ"	abrevetilde # LATIN SMALL LETTER A WITH BREVE AND TILDE
-<dead_diaeresis> <dead_caron> 	: "Ǚ"	U01D9 # LATIN CAPITAL LETTER U WITH DIAERESIS AND CARON
-<dead_diaeresis> <dead_caron> 	: "ǚ"	U01DA # LATIN SMALL LETTER U WITH DIAERESIS AND CARON
 <dead_cedilla> <dead_currency> <C>	: "₵"	U20B5 # CEDI SIGN
 <dead_currency> <dead_cedilla> <C>	: "₵"	U20B5 # CEDI SIGN
 <dead_cedilla> <dead_currency> <c>	: "₵"	U20B5 # CEDI SIGN
@@ -5523,40 +5353,6 @@
 <dead_circumflex> <dead_hook> <e>	: "ể"	ecircumflexhook # LATIN SMALL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE
 <dead_circumflex> <dead_hook> <O>	: "Ổ"	Ocircumflexhook # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE
 <dead_circumflex> <dead_hook> <o>	: "ổ"	ocircumflexhook # LATIN SMALL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE
-<dead_circumflex> <dead_tilde> <A>	: "Ẫ"	Acircumflextilde # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND TILDE
-<dead_circumflex> <dead_tilde> <a>	: "ẫ"	acircumflextilde # LATIN SMALL LETTER A WITH CIRCUMFLEX AND TILDE
-<dead_circumflex> <dead_tilde> <E>	: "Ễ"	Ecircumflextilde # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND TILDE
-<dead_circumflex> <dead_tilde> <e>	: "ễ"	ecircumflextilde # LATIN SMALL LETTER E WITH CIRCUMFLEX AND TILDE
-<dead_circumflex> <dead_tilde> <O>	: "Ỗ"	Ocircumflextilde # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND TILDE
-<dead_circumflex> <dead_tilde> <o>	: "ỗ"	ocircumflextilde # LATIN SMALL LETTER O WITH CIRCUMFLEX AND TILDE
-<dead_diaeresis> <dead_grave> 	: "Ǜ"	U01DB # LATIN CAPITAL LETTER U WITH DIAERESIS AND GRAVE
-<dead_diaeresis> <dead_grave> 	: "ǜ"	U01DC # LATIN SMALL LETTER U WITH DIAERESIS AND GRAVE
-<dead_diaeresis> <dead_macron> <A>	: "Ǟ"	U01DE # LATIN CAPITAL LETTER A WITH DIAERESIS AND MACRON
-<dead_diaeresis> <dead_macron> <a>	: "ǟ"	U01DF # LATIN SMALL LETTER A WITH DIAERESIS AND MACRON
-<dead_diaeresis> <dead_macron> <O>	: "Ȫ"	U022A # LATIN CAPITAL LETTER O WITH DIAERESIS AND MACRON
-<dead_diaeresis> <dead_macron> <o>	: "ȫ"	U022B # LATIN SMALL LETTER O WITH DIAERESIS AND MACRON
-<dead_tilde> <dead_diaeresis> <O>	: "Ṏ"	U1E4E # LATIN CAPITAL LETTER O WITH TILDE AND DIAERESIS
-<dead_tilde> <dead_diaeresis> <o>	: "ṏ"	U1E4F # LATIN SMALL LETTER O WITH TILDE AND DIAERESIS
-<dead_horn> <dead_grave> <O>		: "Ờ"	Ohorngrave # LATIN CAPITAL LETTER O WITH HORN AND GRAVE
-<dead_horn> <dead_grave> <o>		: "ờ"	ohorngrave # LATIN SMALL LETTER O WITH HORN AND GRAVE
-<dead_horn> <dead_grave> 		: "Ừ"	Uhorngrave # LATIN CAPITAL LETTER U WITH HORN AND GRAVE
-<dead_horn> <dead_grave> 		: "ừ"	uhorngrave # LATIN SMALL LETTER U WITH HORN AND GRAVE
-<dead_macron> <dead_grave> <E>		: "Ḕ"	U1E14 # LATIN CAPITAL LETTER E WITH MACRON AND GRAVE
-<dead_macron> <dead_grave> <e>		: "ḕ"	U1E15 # LATIN SMALL LETTER E WITH MACRON AND GRAVE
-<dead_macron> <dead_grave> <O>		: "Ṑ"	U1E50 # LATIN CAPITAL LETTER O WITH MACRON AND GRAVE
-<dead_macron> <dead_grave> <o>		: "ṑ"	U1E51 # LATIN SMALL LETTER O WITH MACRON AND GRAVE
-<dead_horn> <dead_hook> <O>		: "Ở"	Ohornhook # LATIN CAPITAL LETTER O WITH HORN AND HOOK ABOVE
-<dead_horn> <dead_hook> <o>		: "ở"	ohornhook # LATIN SMALL LETTER O WITH HORN AND HOOK ABOVE
-<dead_horn> <dead_hook> 		: "Ử"	Uhornhook # LATIN CAPITAL LETTER U WITH HORN AND HOOK ABOVE
-<dead_horn> <dead_hook> 		: "ử"	uhornhook # LATIN SMALL LETTER U WITH HORN AND HOOK ABOVE
-<dead_horn> <dead_tilde> <O>		: "Ỡ"	Ohorntilde # LATIN CAPITAL LETTER O WITH HORN AND TILDE
-<dead_horn> <dead_tilde> <o>		: "ỡ"	ohorntilde # LATIN SMALL LETTER O WITH HORN AND TILDE
-<dead_horn> <dead_tilde> 		: "Ữ"	Uhorntilde # LATIN CAPITAL LETTER U WITH HORN AND TILDE
-<dead_horn> <dead_tilde> 		: "ữ"	uhorntilde # LATIN SMALL LETTER U WITH HORN AND TILDE
-<dead_ogonek> <dead_macron> <O>		: "Ǭ"	U01EC # LATIN CAPITAL LETTER O WITH OGONEK AND MACRON
-<dead_ogonek> <dead_macron> <o>		: "ǭ"	U01ED # LATIN SMALL LETTER O WITH OGONEK AND MACRON
-<dead_tilde> <dead_macron> <O>		: "Ȭ"	U022C # LATIN CAPITAL LETTER O WITH TILDE AND MACRON
-<dead_tilde> <dead_macron> <o>		: "ȭ"	U022D # LATIN SMALL LETTER O WITH TILDE AND MACRON
 <dead_greek> <dead_hook> 		: "ϒ"	U03D2 # GREEK UPSILON WITH HOOK SYMBOL
 <dead_hook> <dead_greek> 		: "ϒ"	U03D2 # GREEK UPSILON WITH HOOK SYMBOL
 <dead_greek> <dead_macron> <A>		: "Ᾱ"	U1FB9 # GREEK CAPITAL LETTER ALPHA WITH MACRON

_service:tar_scm:libX11-1.8.1.tar.xz/nls/en_US.UTF-8/XLC_LOCALE.pre -> _service:tar_scm:libX11-1.8.4.tar.xz/nls/en_US.UTF-8/XLC_LOCALE.pre Changed

@@ -83,7 +83,7 @@
 		primary	ISO8859-7:GR
 	}
 }
-XCOMM	fs9 class (ISO8859 families)
+XCOMM	fs8 class (ISO8859 families)
 fs8	{
 	charset	{
 		name	ISO8859-9:GR
@@ -92,7 +92,7 @@
 		primary	ISO8859-9:GR
 	}
 }
-XCOMM	fs13 class (ISO8859 families)
+XCOMM	fs9 class (ISO8859 families)
 fs9	{
 	charset	{
 		name	ISO8859-13:GR
@@ -101,7 +101,7 @@
 		primary	ISO8859-13:GR
 	}
 }
-XCOMM	fs14 class (ISO8859 families)
+XCOMM	fs10 class (ISO8859 families)
 fs10	{
 	charset	{
 		name	ISO8859-14:GR
@@ -110,7 +110,7 @@
 		primary	ISO8859-14:GR
 	}
 }
-XCOMM	fs15 class (ISO8859 families)
+XCOMM	fs11 class (ISO8859 families)
 fs11	{
 	charset	{
 		name	ISO8859-15:GR
@@ -119,7 +119,7 @@
 		primary	ISO8859-15:GR
 	}
 }
-XCOMM 	fs16 class (Kanji)
+XCOMM 	fs12 class (Kanji)
 fs12	{
 	charset	{
 		name	JISX0208.1983-0:GL
@@ -128,7 +128,7 @@
 		primary	JISX0208.1983-0:GL
 	}
 }
-XCOMM   fs17 class (Korean Character)
+XCOMM   fs13 class (Korean Character)
 fs13	{
 	charset	{
 		name	KSC5601.1987-0:GL
@@ -137,7 +137,7 @@
 		primary	KSC5601.1987-0:GL
 	}
 }
-XCOMM   fs18 class (Chinese Han Character)
+XCOMM   fs14 class (Chinese Han Character)
 fs14	{
 	charset	{
 		name	GB2312.1980-0:GL
@@ -146,7 +146,7 @@
 		primary	GB2312.1980-0:GL
 	}
 }
-XCOMM	fs20 class (Half Kana)
+XCOMM	fs15 class (Half Kana)
 fs15	{
 	charset	{
 		name	JISX0201.1976-0:GR
@@ -157,7 +157,7 @@
 	}
 }
 XCOMM	ISO10646 should come last so the fonts above will actually be used
-XCOMM	fs24 class
+XCOMM	fs16 class
 fs16	{
 	charset	{
 		name	ISO10646-1
@@ -223,76 +223,69 @@
 cs6     {
         side            GR
         length          1
-        ct_encoding     KOI8-R:GR
+        ct_encoding     ISO8859-7:GR
 }
  
 XCOMM	cs7 class
 cs7     {
         side            GR
         length          1
-        ct_encoding     ISO8859-7:GR
-}
- 
-XCOMM	cs9 class
-cs8     {
-        side            GR
-        length          1
         ct_encoding     ISO8859-9:GR
 }
  
-XCOMM	cs13 class
-cs9     {
+XCOMM	cs8 class
+cs8     {
         side            GR
         length          1
         ct_encoding     ISO8859-13:GR
 }
  
-XCOMM	cs14 class
-cs10     {
+XCOMM	cs9 class
+cs9     {
         side            GR
         length          1
         ct_encoding     ISO8859-14:GR
 }
  
-XCOMM	cs15 class
-cs11     {
+XCOMM	cs10 class
+cs10    {
         side            GR
         length          1
         ct_encoding     ISO8859-15:GR
 }
  
-XCOMM	cs16 class
-cs12	{
+XCOMM	cs11 class
+cs11	{
 	side		GR
 	length		2
 	ct_encoding	JISX0208.1983-0:GL; JISX0208.1983-0:GR;\
 			JISX0208.1983-1:GL; JISX0208.1983-1:GR
 }
 
-XCOMM	cs17 class
-cs13     {
+XCOMM	cs12 class
+cs12    {
         side            GL
         length          2
         ct_encoding     KSC5601.1987-0:GL; KSC5601.1987-0:GR;\
                         KSC5601.1987-1:GL; KSC5601.1987-1:GR
 }
  
-XCOMM	cs18 class
-cs14     {
+XCOMM	cs13 class
+cs13    {
         side            GR
         length          2
         ct_encoding     GB2312.1980-0:GL; GB2312.1980-0:GR
 }
  
-XCOMM	cs20 class
-cs15	{
+XCOMM	cs14 class
+cs14	{
 	side		GR
 	length		1
 	ct_encoding	JISX0201.1976-0:GR
 }
  
-XCOMM	cs24 class
-cs16	{
+XCOMM	cs15 class
+cs15	{
 	side		none
 	ct_encoding	ISO10646-1
 }

_service:tar_scm:libX11-1.8.1.tar.xz/specs/Makefile.am -> _service:tar_scm:libX11-1.8.4.tar.xz/specs/Makefile.am Changed

_service:tar_scm:libX11-1.8.1.tar.xz/specs/Makefile.in -> _service:tar_scm:libX11-1.8.4.tar.xz/specs/Makefile.in Changed

@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.5 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2021 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -15,7 +15,7 @@
 @SET_MAKE@
 
 #
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, Oracle and/or its affiliates.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -159,7 +159,7 @@
   $(RECURSIVE_CLEAN_TARGETS) \
   $(am__extra_recursive_targets)
 AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
-	distdir distdir-am
+	distdir
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 # Read a list of newline-separated strings from the standard input,
 # and print each of them once, without duplicates.  Input order is
@@ -177,6 +177,8 @@
   unique=`for i in $$list; do \
     if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
   done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
 am__DIST_COMMON = $(srcdir)/Makefile.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -229,8 +231,6 @@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
-CSCOPE = @CSCOPE@
-CTAGS = @CTAGS@
 CWARNFLAGS = @CWARNFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
@@ -244,11 +244,9 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ETAGS = @ETAGS@
 EXEEXT = @EXEEXT@
 EXEEXT_FOR_BUILD = @EXEEXT_FOR_BUILD@
 FGREP = @FGREP@
-FILECMD = @FILECMD@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 FOP = @FOP@
@@ -312,6 +310,7 @@
 STRIP = @STRIP@
 STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@
 TRADITIONALCPPFLAGS = @TRADITIONALCPPFLAGS@
+USE_THREAD_LIBS = @USE_THREAD_LIBS@
 VERSION = @VERSION@
 WCHAR32 = @WCHAR32@
 X11_CFLAGS = @X11_CFLAGS@
@@ -382,7 +381,6 @@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
-runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -412,8 +410,8 @@
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
 	esac;
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -529,10 +527,8 @@
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-distdir: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) distdir-am
 
-distdir-am: $(DISTFILES)
+distdir: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
 	list='$(DISTFILES)'; \

_service:tar_scm:libX11-1.8.1.tar.xz/specs/XIM/Makefile.in -> _service:tar_scm:libX11-1.8.4.tar.xz/specs/XIM/Makefile.in Changed

@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.5 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2021 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -204,8 +204,6 @@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
-CSCOPE = @CSCOPE@
-CTAGS = @CTAGS@
 CWARNFLAGS = @CWARNFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
@@ -219,11 +217,9 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ETAGS = @ETAGS@
 EXEEXT = @EXEEXT@
 EXEEXT_FOR_BUILD = @EXEEXT_FOR_BUILD@
 FGREP = @FGREP@
-FILECMD = @FILECMD@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 FOP = @FOP@
@@ -287,6 +283,7 @@
 STRIP = @STRIP@
 STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@
 TRADITIONALCPPFLAGS = @TRADITIONALCPPFLAGS@
+USE_THREAD_LIBS = @USE_THREAD_LIBS@
 VERSION = @VERSION@
 WCHAR32 = @WCHAR32@
 X11_CFLAGS = @X11_CFLAGS@
@@ -357,7 +354,6 @@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
-runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -460,8 +456,8 @@
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
 	esac;
 $(top_srcdir)/docbook.am $(am__empty):
 
@@ -527,10 +523,8 @@
 
 cscope cscopelist:
 
-distdir: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) distdir-am
 
-distdir-am: $(DISTFILES)
+distdir: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
 	list='$(DISTFILES)'; \

_service:tar_scm:libX11-1.8.1.tar.xz/specs/XKB/Makefile.in -> _service:tar_scm:libX11-1.8.4.tar.xz/specs/XKB/Makefile.in Changed

@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.5 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2021 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -211,8 +211,6 @@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
-CSCOPE = @CSCOPE@
-CTAGS = @CTAGS@
 CWARNFLAGS = @CWARNFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
@@ -226,11 +224,9 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ETAGS = @ETAGS@
 EXEEXT = @EXEEXT@
 EXEEXT_FOR_BUILD = @EXEEXT_FOR_BUILD@
 FGREP = @FGREP@
-FILECMD = @FILECMD@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 FOP = @FOP@
@@ -294,6 +290,7 @@
 STRIP = @STRIP@
 STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@
 TRADITIONALCPPFLAGS = @TRADITIONALCPPFLAGS@
+USE_THREAD_LIBS = @USE_THREAD_LIBS@
 VERSION = @VERSION@
 WCHAR32 = @WCHAR32@
 X11_CFLAGS = @X11_CFLAGS@
@@ -364,7 +361,6 @@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
-runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -505,8 +501,8 @@
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
 	esac;
 $(top_srcdir)/docbook.am $(am__empty):
 
@@ -572,10 +568,8 @@
 
 cscope cscopelist:
 
-distdir: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) distdir-am
 
-distdir-am: $(DISTFILES)
+distdir: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
 	list='$(DISTFILES)'; \

_service:tar_scm:libX11-1.8.1.tar.xz/specs/i18n/Makefile.am -> _service:tar_scm:libX11-1.8.4.tar.xz/specs/i18n/Makefile.am Changed

_service:tar_scm:libX11-1.8.1.tar.xz/specs/i18n/Makefile.in -> _service:tar_scm:libX11-1.8.4.tar.xz/specs/i18n/Makefile.in Changed

@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.5 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2021 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -15,7 +15,7 @@
 @SET_MAKE@
 
 #
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, Oracle and/or its affiliates.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -159,7 +159,7 @@
   $(RECURSIVE_CLEAN_TARGETS) \
   $(am__extra_recursive_targets)
 AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
-	distdir distdir-am
+	distdir
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 # Read a list of newline-separated strings from the standard input,
 # and print each of them once, without duplicates.  Input order is
@@ -177,6 +177,8 @@
   unique=`for i in $$list; do \
     if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
   done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
 am__DIST_COMMON = $(srcdir)/Makefile.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -229,8 +231,6 @@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
-CSCOPE = @CSCOPE@
-CTAGS = @CTAGS@
 CWARNFLAGS = @CWARNFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
@@ -244,11 +244,9 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ETAGS = @ETAGS@
 EXEEXT = @EXEEXT@
 EXEEXT_FOR_BUILD = @EXEEXT_FOR_BUILD@
 FGREP = @FGREP@
-FILECMD = @FILECMD@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 FOP = @FOP@
@@ -312,6 +310,7 @@
 STRIP = @STRIP@
 STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@
 TRADITIONALCPPFLAGS = @TRADITIONALCPPFLAGS@
+USE_THREAD_LIBS = @USE_THREAD_LIBS@
 VERSION = @VERSION@
 WCHAR32 = @WCHAR32@
 X11_CFLAGS = @X11_CFLAGS@
@@ -382,7 +381,6 @@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
-runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -412,8 +410,8 @@
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
 	esac;
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -529,10 +527,8 @@
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-distdir: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) distdir-am
 
-distdir-am: $(DISTFILES)
+distdir: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
 	list='$(DISTFILES)'; \

_service:tar_scm:libX11-1.8.1.tar.xz/specs/i18n/compose/Makefile.in -> _service:tar_scm:libX11-1.8.4.tar.xz/specs/i18n/compose/Makefile.in Changed

@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.5 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2021 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -204,8 +204,6 @@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
-CSCOPE = @CSCOPE@
-CTAGS = @CTAGS@
 CWARNFLAGS = @CWARNFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
@@ -219,11 +217,9 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ETAGS = @ETAGS@
 EXEEXT = @EXEEXT@
 EXEEXT_FOR_BUILD = @EXEEXT_FOR_BUILD@
 FGREP = @FGREP@
-FILECMD = @FILECMD@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 FOP = @FOP@
@@ -287,6 +283,7 @@
 STRIP = @STRIP@
 STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@
 TRADITIONALCPPFLAGS = @TRADITIONALCPPFLAGS@
+USE_THREAD_LIBS = @USE_THREAD_LIBS@
 VERSION = @VERSION@
 WCHAR32 = @WCHAR32@
 X11_CFLAGS = @X11_CFLAGS@
@@ -357,7 +354,6 @@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
-runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -473,8 +469,8 @@
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
 	esac;
 $(srcdir)/docbook-nl.am $(am__empty):
 
@@ -519,10 +515,8 @@
 
 cscope cscopelist:
 
-distdir: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) distdir-am
 
-distdir-am: $(DISTFILES)
+distdir: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
 	list='$(DISTFILES)'; \

_service:tar_scm:libX11-1.8.1.tar.xz/specs/i18n/compose/compose-chart.pl -> _service:tar_scm:libX11-1.8.4.tar.xz/specs/i18n/compose/compose-chart.pl Changed

_service:tar_scm:libX11-1.8.1.tar.xz/specs/i18n/framework/Makefile.in -> _service:tar_scm:libX11-1.8.4.tar.xz/specs/i18n/framework/Makefile.in Changed

@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.5 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2021 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -202,8 +202,6 @@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
-CSCOPE = @CSCOPE@
-CTAGS = @CTAGS@
 CWARNFLAGS = @CWARNFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
@@ -217,11 +215,9 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ETAGS = @ETAGS@
 EXEEXT = @EXEEXT@
 EXEEXT_FOR_BUILD = @EXEEXT_FOR_BUILD@
 FGREP = @FGREP@
-FILECMD = @FILECMD@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 FOP = @FOP@
@@ -285,6 +281,7 @@
 STRIP = @STRIP@
 STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@
 TRADITIONALCPPFLAGS = @TRADITIONALCPPFLAGS@
+USE_THREAD_LIBS = @USE_THREAD_LIBS@
 VERSION = @VERSION@
 WCHAR32 = @WCHAR32@
 X11_CFLAGS = @X11_CFLAGS@
@@ -355,7 +352,6 @@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
-runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -450,8 +446,8 @@
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
 	esac;
 $(top_srcdir)/docbook.am $(am__empty):
 
@@ -517,10 +513,8 @@
 
 cscope cscopelist:
 
-distdir: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) distdir-am
 
-distdir-am: $(DISTFILES)
+distdir: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
 	list='$(DISTFILES)'; \

_service:tar_scm:libX11-1.8.1.tar.xz/specs/i18n/localedb/Makefile.in -> _service:tar_scm:libX11-1.8.4.tar.xz/specs/i18n/localedb/Makefile.in Changed

@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.5 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2021 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -202,8 +202,6 @@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
-CSCOPE = @CSCOPE@
-CTAGS = @CTAGS@
 CWARNFLAGS = @CWARNFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
@@ -217,11 +215,9 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ETAGS = @ETAGS@
 EXEEXT = @EXEEXT@
 EXEEXT_FOR_BUILD = @EXEEXT_FOR_BUILD@
 FGREP = @FGREP@
-FILECMD = @FILECMD@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 FOP = @FOP@
@@ -285,6 +281,7 @@
 STRIP = @STRIP@
 STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@
 TRADITIONALCPPFLAGS = @TRADITIONALCPPFLAGS@
+USE_THREAD_LIBS = @USE_THREAD_LIBS@
 VERSION = @VERSION@
 WCHAR32 = @WCHAR32@
 X11_CFLAGS = @X11_CFLAGS@
@@ -355,7 +352,6 @@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
-runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -447,8 +443,8 @@
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
 	esac;
 $(top_srcdir)/docbook.am $(am__empty):
 
@@ -514,10 +510,8 @@
 
 cscope cscopelist:
 
-distdir: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) distdir-am
 
-distdir-am: $(DISTFILES)
+distdir: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
 	list='$(DISTFILES)'; \

_service:tar_scm:libX11-1.8.1.tar.xz/specs/i18n/trans/Makefile.in -> _service:tar_scm:libX11-1.8.4.tar.xz/specs/i18n/trans/Makefile.in Changed

@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.5 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2021 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -202,8 +202,6 @@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
-CSCOPE = @CSCOPE@
-CTAGS = @CTAGS@
 CWARNFLAGS = @CWARNFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
@@ -217,11 +215,9 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ETAGS = @ETAGS@
 EXEEXT = @EXEEXT@
 EXEEXT_FOR_BUILD = @EXEEXT_FOR_BUILD@
 FGREP = @FGREP@
-FILECMD = @FILECMD@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 FOP = @FOP@
@@ -285,6 +281,7 @@
 STRIP = @STRIP@
 STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@
 TRADITIONALCPPFLAGS = @TRADITIONALCPPFLAGS@
+USE_THREAD_LIBS = @USE_THREAD_LIBS@
 VERSION = @VERSION@
 WCHAR32 = @WCHAR32@
 X11_CFLAGS = @X11_CFLAGS@
@@ -355,7 +352,6 @@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
-runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -447,8 +443,8 @@
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
 	esac;
 $(top_srcdir)/docbook.am $(am__empty):
 
@@ -514,10 +510,8 @@
 
 cscope cscopelist:
 
-distdir: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) distdir-am
 
-distdir-am: $(DISTFILES)
+distdir: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
 	list='$(DISTFILES)'; \

_service:tar_scm:libX11-1.8.1.tar.xz/specs/libX11/CH13.xml -> _service:tar_scm:libX11-1.8.4.tar.xz/specs/libX11/CH13.xml Changed

_service:tar_scm:libX11-1.8.1.tar.xz/specs/libX11/Makefile.in -> _service:tar_scm:libX11-1.8.4.tar.xz/specs/libX11/Makefile.in Changed

@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.5 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2021 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -205,8 +205,6 @@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
-CSCOPE = @CSCOPE@
-CTAGS = @CTAGS@
 CWARNFLAGS = @CWARNFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
@@ -220,11 +218,9 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ETAGS = @ETAGS@
 EXEEXT = @EXEEXT@
 EXEEXT_FOR_BUILD = @EXEEXT_FOR_BUILD@
 FGREP = @FGREP@
-FILECMD = @FILECMD@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 FOP = @FOP@
@@ -288,6 +284,7 @@
 STRIP = @STRIP@
 STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@
 TRADITIONALCPPFLAGS = @TRADITIONALCPPFLAGS@
+USE_THREAD_LIBS = @USE_THREAD_LIBS@
 VERSION = @VERSION@
 WCHAR32 = @WCHAR32@
 X11_CFLAGS = @X11_CFLAGS@
@@ -358,7 +355,6 @@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
-runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -476,8 +472,8 @@
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
 	esac;
 $(top_srcdir)/docbook.am $(am__empty):
 
@@ -543,10 +539,8 @@
 
 cscope cscopelist:
 
-distdir: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) distdir-am
 
-distdir-am: $(DISTFILES)
+distdir: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
 	list='$(DISTFILES)'; \

_service:tar_scm:libX11-1.8.1.tar.xz/src/ChProp.c -> _service:tar_scm:libX11-1.8.4.tar.xz/src/ChProp.c Changed

_service:tar_scm:libX11-1.8.1.tar.xz/src/ChkIfEv.c -> _service:tar_scm:libX11-1.8.4.tar.xz/src/ChkIfEv.c Changed

_service:tar_scm:libX11-1.8.1.tar.xz/src/DrArcs.c -> _service:tar_scm:libX11-1.8.4.tar.xz/src/DrArcs.c Changed

_service:tar_scm:libX11-1.8.1.tar.xz/src/DrLines.c -> _service:tar_scm:libX11-1.8.4.tar.xz/src/DrLines.c Changed

_service:tar_scm:libX11-1.8.1.tar.xz/src/DrPoints.c -> _service:tar_scm:libX11-1.8.4.tar.xz/src/DrPoints.c Changed

_service:tar_scm:libX11-1.8.1.tar.xz/src/DrRects.c -> _service:tar_scm:libX11-1.8.4.tar.xz/src/DrRects.c Changed

_service:tar_scm:libX11-1.8.1.tar.xz/src/DrSegs.c -> _service:tar_scm:libX11-1.8.4.tar.xz/src/DrSegs.c Changed

_service:tar_scm:libX11-1.8.1.tar.xz/src/FillArcs.c -> _service:tar_scm:libX11-1.8.4.tar.xz/src/FillArcs.c Changed

_service:tar_scm:libX11-1.8.1.tar.xz/src/FillPoly.c -> _service:tar_scm:libX11-1.8.4.tar.xz/src/FillPoly.c Changed

_service:tar_scm:libX11-1.8.1.tar.xz/src/FillRcts.c -> _service:tar_scm:libX11-1.8.4.tar.xz/src/FillRcts.c Changed

_service:tar_scm:libX11-1.8.1.tar.xz/src/Host.c -> _service:tar_scm:libX11-1.8.4.tar.xz/src/Host.c Changed

_service:tar_scm:libX11-1.8.1.tar.xz/src/IfEvent.c -> _service:tar_scm:libX11-1.8.4.tar.xz/src/IfEvent.c Changed

_service:tar_scm:libX11-1.8.1.tar.xz/src/LiHosts.c -> _service:tar_scm:libX11-1.8.4.tar.xz/src/LiHosts.c Changed

_service:tar_scm:libX11-1.8.1.tar.xz/src/Makefile.am -> _service:tar_scm:libX11-1.8.4.tar.xz/src/Makefile.am Changed

_service:tar_scm:libX11-1.8.1.tar.xz/src/Makefile.in -> _service:tar_scm:libX11-1.8.4.tar.xz/src/Makefile.in Changed

@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.5 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2021 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -94,8 +94,7 @@
 # ========================= Extra stuff ============================
 #
 @OS2_TRUE@am__append_1 = os2Stubs.c
-@THRSTUBS_TRUE@am__append_2 = UIThrStubs.c
-@MAKE_LINT_LIB_TRUE@am__append_3 = $(lintlib_DATA)
+@MAKE_LINT_LIB_TRUE@am__append_2 = $(lintlib_DATA)
 subdir = src
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_define_dir.m4 \
@@ -152,7 +151,8 @@
 	$(libX11_xcb_la_LDFLAGS) $(LDFLAGS) -o $@
 am__DEPENDENCIES_1 =
 libX11_la_DEPENDENCIES = $(LTLIBOBJS) $(USE_I18N_LIBS) \
-	$(USE_XCMS_LIBS) $(USE_XKB_LIBS) $(am__DEPENDENCIES_1)
+	$(USE_XCMS_LIBS) $(USE_XKB_LIBS) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1)
 am__libX11_la_SOURCES_DIST = AllCells.c AllowEv.c AllPlanes.c \
 	AutoRep.c Backgnd.c BdrWidth.c Bell.c Border.c ChAccCon.c \
 	ChActPGb.c ChClMode.c ChCmap.c ChGC.c ChKeyCon.c ChkIfEv.c \
@@ -203,9 +203,8 @@
 	Window.c WinEvent.c Withdraw.c WMGeom.c WMProps.c WrBitF.c \
 	Xatomtype.h xcb_disp.c xcb_io.c Xintatom.h Xintconn.h \
 	XlibAsync.c XlibInt.c Xprivate.h XomGeneric.h Xresinternal.h \
-	Xrm.c Xxcbint.h os2Stubs.c UIThrStubs.c
+	Xrm.c Xxcbint.h os2Stubs.c
 @OS2_TRUE@am__objects_1 = os2Stubs.lo
-@THRSTUBS_TRUE@am__objects_2 = UIThrStubs.lo
 am_libX11_la_OBJECTS = AllCells.lo AllowEv.lo AllPlanes.lo AutoRep.lo \
 	Backgnd.lo BdrWidth.lo Bell.lo Border.lo ChAccCon.lo \
 	ChActPGb.lo ChClMode.lo ChCmap.lo ChGC.lo ChKeyCon.lo \
@@ -259,7 +258,7 @@
 	UnldFont.lo UnmapSubs.lo UnmapWin.lo VisUtil.lo WarpPtr.lo \
 	Window.lo WinEvent.lo Withdraw.lo WMGeom.lo WMProps.lo \
 	WrBitF.lo xcb_disp.lo xcb_io.lo XlibAsync.lo XlibInt.lo Xrm.lo \
-	$(am__objects_1) $(am__objects_2)
+	$(am__objects_1)
 libX11_la_OBJECTS = $(am_libX11_la_OBJECTS)
 libX11_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
@@ -278,139 +277,7 @@
 am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include/X11
 depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__maybe_remake_depfiles = depfiles
-am__depfiles_remade = $(DEPDIR)/reallocarray.Plo \
-	./$(DEPDIR)/AllCells.Plo ./$(DEPDIR)/AllPlanes.Plo \
-	./$(DEPDIR)/AllowEv.Plo ./$(DEPDIR)/AutoRep.Plo \
-	./$(DEPDIR)/Backgnd.Plo ./$(DEPDIR)/BdrWidth.Plo \
-	./$(DEPDIR)/Bell.Plo ./$(DEPDIR)/Border.Plo \
-	./$(DEPDIR)/ChAccCon.Plo ./$(DEPDIR)/ChActPGb.Plo \
-	./$(DEPDIR)/ChClMode.Plo ./$(DEPDIR)/ChCmap.Plo \
-	./$(DEPDIR)/ChGC.Plo ./$(DEPDIR)/ChKeyCon.Plo \
-	./$(DEPDIR)/ChPntCon.Plo ./$(DEPDIR)/ChProp.Plo \
-	./$(DEPDIR)/ChSaveSet.Plo ./$(DEPDIR)/ChWAttrs.Plo \
-	./$(DEPDIR)/ChWindow.Plo ./$(DEPDIR)/ChkIfEv.Plo \
-	./$(DEPDIR)/ChkMaskEv.Plo ./$(DEPDIR)/ChkTypEv.Plo \
-	./$(DEPDIR)/ChkTypWEv.Plo ./$(DEPDIR)/ChkWinEv.Plo \
-	./$(DEPDIR)/CirWin.Plo ./$(DEPDIR)/CirWinDn.Plo \
-	./$(DEPDIR)/CirWinUp.Plo ./$(DEPDIR)/ClDisplay.Plo \
-	./$(DEPDIR)/Clear.Plo ./$(DEPDIR)/ClearArea.Plo \
-	./$(DEPDIR)/ConfWind.Plo ./$(DEPDIR)/Context.Plo \
-	./$(DEPDIR)/ConvSel.Plo ./$(DEPDIR)/CopyArea.Plo \
-	./$(DEPDIR)/CopyCmap.Plo ./$(DEPDIR)/CopyGC.Plo \
-	./$(DEPDIR)/CopyPlane.Plo ./$(DEPDIR)/CrBFData.Plo \
-	./$(DEPDIR)/CrCmap.Plo ./$(DEPDIR)/CrCursor.Plo \
-	./$(DEPDIR)/CrGC.Plo ./$(DEPDIR)/CrGlCur.Plo \
-	./$(DEPDIR)/CrPFBData.Plo ./$(DEPDIR)/CrPixmap.Plo \
-	./$(DEPDIR)/CrWindow.Plo ./$(DEPDIR)/Cursor.Plo \
-	./$(DEPDIR)/DefCursor.Plo ./$(DEPDIR)/DelProp.Plo \
-	./$(DEPDIR)/Depths.Plo ./$(DEPDIR)/DestSubs.Plo \
-	./$(DEPDIR)/DestWind.Plo ./$(DEPDIR)/DisName.Plo \
-	./$(DEPDIR)/DrArc.Plo ./$(DEPDIR)/DrArcs.Plo \
-	./$(DEPDIR)/DrLine.Plo ./$(DEPDIR)/DrLines.Plo \
-	./$(DEPDIR)/DrPoint.Plo ./$(DEPDIR)/DrPoints.Plo \
-	./$(DEPDIR)/DrRect.Plo ./$(DEPDIR)/DrRects.Plo \
-	./$(DEPDIR)/DrSegs.Plo ./$(DEPDIR)/ErrDes.Plo \
-	./$(DEPDIR)/ErrHndlr.Plo ./$(DEPDIR)/EvToWire.Plo \
-	./$(DEPDIR)/FSSaver.Plo ./$(DEPDIR)/FSWrap.Plo \
-	./$(DEPDIR)/FetchName.Plo ./$(DEPDIR)/FillArc.Plo \
-	./$(DEPDIR)/FillArcs.Plo ./$(DEPDIR)/FillPoly.Plo \
-	./$(DEPDIR)/FillRct.Plo ./$(DEPDIR)/FillRcts.Plo \
-	./$(DEPDIR)/FilterEv.Plo ./$(DEPDIR)/Flush.Plo \
-	./$(DEPDIR)/Font.Plo ./$(DEPDIR)/FontInfo.Plo \
-	./$(DEPDIR)/FontNames.Plo ./$(DEPDIR)/FreeCmap.Plo \
-	./$(DEPDIR)/FreeCols.Plo ./$(DEPDIR)/FreeCurs.Plo \
-	./$(DEPDIR)/FreeEData.Plo ./$(DEPDIR)/FreeEventData.Plo \
-	./$(DEPDIR)/FreeGC.Plo ./$(DEPDIR)/FreePix.Plo \
-	./$(DEPDIR)/GCMisc.Plo ./$(DEPDIR)/Geom.Plo \
-	./$(DEPDIR)/GetAtomNm.Plo ./$(DEPDIR)/GetColor.Plo \
-	./$(DEPDIR)/GetDflt.Plo ./$(DEPDIR)/GetEventData.Plo \
-	./$(DEPDIR)/GetFPath.Plo ./$(DEPDIR)/GetFProp.Plo \
-	./$(DEPDIR)/GetGCVals.Plo ./$(DEPDIR)/GetGeom.Plo \
-	./$(DEPDIR)/GetHColor.Plo ./$(DEPDIR)/GetHints.Plo \
-	./$(DEPDIR)/GetIFocus.Plo ./$(DEPDIR)/GetImage.Plo \
-	./$(DEPDIR)/GetKCnt.Plo ./$(DEPDIR)/GetMoEv.Plo \
-	./$(DEPDIR)/GetNrmHint.Plo ./$(DEPDIR)/GetPCnt.Plo \
-	./$(DEPDIR)/GetPntMap.Plo ./$(DEPDIR)/GetProp.Plo \
-	./$(DEPDIR)/GetRGBCMap.Plo ./$(DEPDIR)/GetSOwner.Plo \
-	./$(DEPDIR)/GetSSaver.Plo ./$(DEPDIR)/GetStCmap.Plo \
-	./$(DEPDIR)/GetTxtProp.Plo ./$(DEPDIR)/GetWAttrs.Plo \
-	./$(DEPDIR)/GetWMCMapW.Plo ./$(DEPDIR)/GetWMProto.Plo \
-	./$(DEPDIR)/GrButton.Plo ./$(DEPDIR)/GrKey.Plo \
-	./$(DEPDIR)/GrKeybd.Plo ./$(DEPDIR)/GrPointer.Plo \
-	./$(DEPDIR)/GrServer.Plo ./$(DEPDIR)/Host.Plo \
-	./$(DEPDIR)/Iconify.Plo ./$(DEPDIR)/IfEvent.Plo \
-	./$(DEPDIR)/ImText.Plo ./$(DEPDIR)/ImText16.Plo \
-	./$(DEPDIR)/ImUtil.Plo ./$(DEPDIR)/InitExt.Plo \
-	./$(DEPDIR)/InsCmap.Plo ./$(DEPDIR)/IntAtom.Plo \
-	./$(DEPDIR)/KeyBind.Plo ./$(DEPDIR)/KeysymStr.Plo \
-	./$(DEPDIR)/KillCl.Plo ./$(DEPDIR)/LiHosts.Plo \
-	./$(DEPDIR)/LiICmaps.Plo ./$(DEPDIR)/LiProps.Plo \
-	./$(DEPDIR)/ListExt.Plo ./$(DEPDIR)/LoadFont.Plo \
-	./$(DEPDIR)/LockDis.Plo ./$(DEPDIR)/LookupCol.Plo \
-	./$(DEPDIR)/LowerWin.Plo ./$(DEPDIR)/Macros.Plo \
-	./$(DEPDIR)/MapRaised.Plo ./$(DEPDIR)/MapSubs.Plo \
-	./$(DEPDIR)/MapWindow.Plo ./$(DEPDIR)/MaskEvent.Plo \
-	./$(DEPDIR)/Misc.Plo ./$(DEPDIR)/ModMap.Plo \
-	./$(DEPDIR)/MoveWin.Plo ./$(DEPDIR)/NextEvent.Plo \
-	./$(DEPDIR)/OCWrap.Plo ./$(DEPDIR)/OMWrap.Plo \
-	./$(DEPDIR)/OpenDis.Plo ./$(DEPDIR)/ParseCmd.Plo \
-	./$(DEPDIR)/ParseCol.Plo ./$(DEPDIR)/ParseGeom.Plo \
-	./$(DEPDIR)/PeekEvent.Plo ./$(DEPDIR)/PeekIfEv.Plo \
-	./$(DEPDIR)/Pending.Plo ./$(DEPDIR)/PixFormats.Plo \
-	./$(DEPDIR)/PmapBgnd.Plo ./$(DEPDIR)/PmapBord.Plo \
-	./$(DEPDIR)/PolyReg.Plo ./$(DEPDIR)/PolyTxt.Plo \
-	./$(DEPDIR)/PolyTxt16.Plo ./$(DEPDIR)/PropAlloc.Plo \
-	./$(DEPDIR)/PutBEvent.Plo ./$(DEPDIR)/PutImage.Plo \
-	./$(DEPDIR)/QuBest.Plo ./$(DEPDIR)/QuColor.Plo \
-	./$(DEPDIR)/QuColors.Plo ./$(DEPDIR)/QuCurShp.Plo \
-	./$(DEPDIR)/QuExt.Plo ./$(DEPDIR)/QuKeybd.Plo \
-	./$(DEPDIR)/QuPntr.Plo ./$(DEPDIR)/QuStipShp.Plo \
-	./$(DEPDIR)/QuTextE16.Plo ./$(DEPDIR)/QuTextExt.Plo \
-	./$(DEPDIR)/QuTileShp.Plo ./$(DEPDIR)/QuTree.Plo \
-	./$(DEPDIR)/Quarks.Plo ./$(DEPDIR)/RaiseWin.Plo \
-	./$(DEPDIR)/RdBitF.Plo ./$(DEPDIR)/RecolorC.Plo \
-	./$(DEPDIR)/ReconfWM.Plo ./$(DEPDIR)/ReconfWin.Plo \
-	./$(DEPDIR)/Region.Plo ./$(DEPDIR)/RegstFlt.Plo \
-	./$(DEPDIR)/RepWindow.Plo ./$(DEPDIR)/RestackWs.Plo \
-	./$(DEPDIR)/RotProp.Plo ./$(DEPDIR)/ScrResStr.Plo \
-	./$(DEPDIR)/SelInput.Plo ./$(DEPDIR)/SendEvent.Plo \
-	./$(DEPDIR)/SetBack.Plo ./$(DEPDIR)/SetCRects.Plo \
-	./$(DEPDIR)/SetClMask.Plo ./$(DEPDIR)/SetClOrig.Plo \
-	./$(DEPDIR)/SetDashes.Plo ./$(DEPDIR)/SetFPath.Plo \
-	./$(DEPDIR)/SetFont.Plo ./$(DEPDIR)/SetFore.Plo \
-	./$(DEPDIR)/SetFunc.Plo ./$(DEPDIR)/SetHints.Plo \
-	./$(DEPDIR)/SetIFocus.Plo ./$(DEPDIR)/SetLStyle.Plo \
-	./$(DEPDIR)/SetLocale.Plo ./$(DEPDIR)/SetNrmHint.Plo \
-	./$(DEPDIR)/SetPMask.Plo ./$(DEPDIR)/SetPntMap.Plo \
-	./$(DEPDIR)/SetRGBCMap.Plo ./$(DEPDIR)/SetSOwner.Plo \
-	./$(DEPDIR)/SetSSaver.Plo ./$(DEPDIR)/SetStCmap.Plo \
-	./$(DEPDIR)/SetState.Plo ./$(DEPDIR)/SetStip.Plo \
-	./$(DEPDIR)/SetTSOrig.Plo ./$(DEPDIR)/SetTile.Plo \
-	./$(DEPDIR)/SetTxtProp.Plo ./$(DEPDIR)/SetWMCMapW.Plo \
-	./$(DEPDIR)/SetWMProto.Plo ./$(DEPDIR)/StBytes.Plo \
-	./$(DEPDIR)/StColor.Plo ./$(DEPDIR)/StColors.Plo \
-	./$(DEPDIR)/StNColor.Plo ./$(DEPDIR)/StName.Plo \
-	./$(DEPDIR)/StrKeysym.Plo ./$(DEPDIR)/StrToText.Plo \
-	./$(DEPDIR)/Sync.Plo ./$(DEPDIR)/Synchro.Plo \
-	./$(DEPDIR)/Text.Plo ./$(DEPDIR)/Text16.Plo \
-	./$(DEPDIR)/TextExt.Plo ./$(DEPDIR)/TextExt16.Plo \
-	./$(DEPDIR)/TextToStr.Plo ./$(DEPDIR)/TrCoords.Plo \
-	./$(DEPDIR)/UIThrStubs.Plo ./$(DEPDIR)/UndefCurs.Plo \
-	./$(DEPDIR)/UngrabBut.Plo ./$(DEPDIR)/UngrabKbd.Plo \
-	./$(DEPDIR)/UngrabKey.Plo ./$(DEPDIR)/UngrabPtr.Plo \
-	./$(DEPDIR)/UngrabSvr.Plo ./$(DEPDIR)/UninsCmap.Plo \
-	./$(DEPDIR)/UnldFont.Plo ./$(DEPDIR)/UnmapSubs.Plo \
-	./$(DEPDIR)/UnmapWin.Plo ./$(DEPDIR)/VisUtil.Plo \
-	./$(DEPDIR)/WMGeom.Plo ./$(DEPDIR)/WMProps.Plo \
-	./$(DEPDIR)/WarpPtr.Plo ./$(DEPDIR)/WinEvent.Plo \
-	./$(DEPDIR)/Window.Plo ./$(DEPDIR)/Withdraw.Plo \
-	./$(DEPDIR)/WrBitF.Plo ./$(DEPDIR)/XlibAsync.Plo \
-	./$(DEPDIR)/XlibInt.Plo ./$(DEPDIR)/Xrm.Plo \
-	./$(DEPDIR)/evtomask.Plo ./$(DEPDIR)/globals.Plo \
-	./$(DEPDIR)/imConv.Plo ./$(DEPDIR)/locking.Plo \
-	./$(DEPDIR)/os2Stubs.Plo ./$(DEPDIR)/x11_xcb.Plo \
-	./$(DEPDIR)/xcb_disp.Plo ./$(DEPDIR)/xcb_io.Plo
+am__depfiles_maybe = depfiles
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -453,9 +320,9 @@
 $(RECURSIVE_CLEAN_TARGETS) \
 $(am__extra_recursive_targets)
 AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
-	distdir distdir-am
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) \
-	config.h.in
+	distdir
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
+	$(LISP)config.h.in
 # Read a list of newline-separated strings from the standard input,
 # and print each of them once, without duplicates. Input order is
 # *not* preserved.
@@ -472,6 +339,8 @@
 unique=`for i in $$list; do \
 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
 DIST_SUBDIRS = util xcms xlibi18n xkb
 am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \
 	$(top_srcdir)/depcomp reallocarray.c
@@ -525,8 +394,6 @@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
-CSCOPE = @CSCOPE@
-CTAGS = @CTAGS@
 CWARNFLAGS = @CWARNFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
@@ -540,11 +407,9 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ETAGS = @ETAGS@
 EXEEXT = @EXEEXT@
 EXEEXT_FOR_BUILD = @EXEEXT_FOR_BUILD@
 FGREP = @FGREP@
-FILECMD = @FILECMD@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 FOP = @FOP@
@@ -612,6 +477,7 @@
 STRIP = @STRIP@
 STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@
 TRADITIONALCPPFLAGS = @TRADITIONALCPPFLAGS@
+USE_THREAD_LIBS = @USE_THREAD_LIBS@
 VERSION = @VERSION@
 WCHAR32 = @WCHAR32@
 X11_CFLAGS = @X11_CFLAGS@
@@ -682,7 +548,6 @@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
-runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -695,7 +560,7 @@
 SUBDIRS = util xcms xlibi18n $(XKB_SUBDIRS)
 lib_LTLIBRARIES = libX11.la libX11-xcb.la
 BUILT_SOURCES = ks_tables.h
-CLEANFILES = ks_tables.h ks_tables_h $(am__append_3)
+CLEANFILES = ks_tables.h ks_tables_h $(am__append_2)
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/include \
 	-I$(top_srcdir)/include/X11 \
@@ -787,13 +652,12 @@
 	Window.c WinEvent.c Withdraw.c WMGeom.c WMProps.c WrBitF.c \
 	Xatomtype.h xcb_disp.c xcb_io.c Xintatom.h Xintconn.h \
 	XlibAsync.c XlibInt.c Xprivate.h XomGeneric.h Xresinternal.h \
-	Xrm.c Xxcbint.h $(am__append_1) $(am__append_2)
+	Xrm.c Xxcbint.h $(am__append_1)
 x11datadir = @X11_DATADIR@
 x11data_DATA = XErrorDB
 EXTRA_DIST = \
 	$(x11data_DATA) \
-	os2Stubs.c \
-	UIThrStubs.c 
+	os2Stubs.c
 
 libX11_xcb_la_SOURCES = x11_xcb.c Xxcbint.h
 libX11_xcb_la_LDFLAGS = -version-number 1:0:0 -no-undefined
@@ -810,6 +674,7 @@
 	$(USE_I18N_LIBS) \
 	$(USE_XCMS_LIBS) \
 	$(USE_XKB_LIBS) \
+	$(USE_THREAD_LIBS) \
 	$(X11_LIBS)
 
 
@@ -842,8 +707,8 @@
 	 *config.status*) \
 	 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	 *) \
-	 echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
-	 cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
+	 echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	 cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
 	esac;
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -917,275 +782,268 @@
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/reallocarray.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/AllCells.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/AllPlanes.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/AllowEv.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/AutoRep.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Backgnd.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BdrWidth.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Bell.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Border.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ChAccCon.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ChActPGb.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ChClMode.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ChCmap.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ChGC.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ChKeyCon.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ChPntCon.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ChProp.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ChSaveSet.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ChWAttrs.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ChWindow.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ChkIfEv.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ChkMaskEv.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ChkTypEv.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ChkTypWEv.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ChkWinEv.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CirWin.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CirWinDn.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CirWinUp.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ClDisplay.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Clear.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ClearArea.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ConfWind.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Context.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ConvSel.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CopyArea.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CopyCmap.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CopyGC.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CopyPlane.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CrBFData.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CrCmap.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CrCursor.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CrGC.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CrGlCur.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CrPFBData.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CrPixmap.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CrWindow.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Cursor.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/DefCursor.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/DelProp.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Depths.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/DestSubs.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/DestWind.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/DisName.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/DrArc.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/DrArcs.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/DrLine.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/DrLines.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/DrPoint.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/DrPoints.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/DrRect.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/DrRects.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/DrSegs.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ErrDes.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ErrHndlr.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/EvToWire.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FSSaver.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FSWrap.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FetchName.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FillArc.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FillArcs.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FillPoly.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FillRct.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FillRcts.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FilterEv.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Flush.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Font.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FontInfo.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FontNames.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FreeCmap.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FreeCols.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FreeCurs.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FreeEData.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FreeEventData.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FreeGC.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FreePix.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GCMisc.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Geom.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GetAtomNm.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GetColor.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GetDflt.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GetEventData.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GetFPath.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GetFProp.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GetGCVals.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GetGeom.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GetHColor.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GetHints.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GetIFocus.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GetImage.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GetKCnt.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GetMoEv.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GetNrmHint.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GetPCnt.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GetPntMap.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GetProp.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GetRGBCMap.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GetSOwner.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GetSSaver.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GetStCmap.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GetTxtProp.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GetWAttrs.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GetWMCMapW.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GetWMProto.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GrButton.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GrKey.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GrKeybd.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GrPointer.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GrServer.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Host.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Iconify.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IfEvent.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ImText.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ImText16.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ImUtil.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/InitExt.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/InsCmap.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IntAtom.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/KeyBind.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/KeysymStr.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/KillCl.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LiHosts.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LiICmaps.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LiProps.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ListExt.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LoadFont.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LockDis.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LookupCol.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LowerWin.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Macros.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MapRaised.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MapSubs.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MapWindow.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MaskEvent.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Misc.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ModMap.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MoveWin.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/NextEvent.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/OCWrap.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/OMWrap.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/OpenDis.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ParseCmd.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ParseCol.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ParseGeom.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PeekEvent.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PeekIfEv.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Pending.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PixFormats.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PmapBgnd.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PmapBord.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PolyReg.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PolyTxt.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PolyTxt16.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PropAlloc.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PutBEvent.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PutImage.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/QuBest.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/QuColor.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/QuColors.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/QuCurShp.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/QuExt.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/QuKeybd.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/QuPntr.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/QuStipShp.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/QuTextE16.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/QuTextExt.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/QuTileShp.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/QuTree.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Quarks.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/RaiseWin.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/RdBitF.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/RecolorC.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ReconfWM.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ReconfWin.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Region.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/RegstFlt.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/RepWindow.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/RestackWs.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/RotProp.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ScrResStr.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SelInput.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SendEvent.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SetBack.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SetCRects.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SetClMask.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SetClOrig.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SetDashes.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SetFPath.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SetFont.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SetFore.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SetFunc.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SetHints.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SetIFocus.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SetLStyle.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SetLocale.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SetNrmHint.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SetPMask.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SetPntMap.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SetRGBCMap.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SetSOwner.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SetSSaver.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SetStCmap.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SetState.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SetStip.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SetTSOrig.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SetTile.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SetTxtProp.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SetWMCMapW.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SetWMProto.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/StBytes.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/StColor.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/StColors.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/StNColor.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/StName.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/StrKeysym.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/StrToText.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Sync.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Synchro.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Text.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Text16.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TextExt.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TextExt16.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TextToStr.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TrCoords.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/UIThrStubs.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/UndefCurs.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/UngrabBut.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/UngrabKbd.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/UngrabKey.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/UngrabPtr.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/UngrabSvr.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/UninsCmap.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/UnldFont.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/UnmapSubs.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/UnmapWin.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/VisUtil.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/WMGeom.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/WMProps.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/WarpPtr.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/WinEvent.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Window.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Withdraw.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/WrBitF.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XlibAsync.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XlibInt.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Xrm.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evtomask.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/globals.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imConv.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/locking.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/os2Stubs.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/x11_xcb.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xcb_disp.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xcb_io.Plo@am__quote@ # am--include-marker
-
-$(am__depfiles_remade):
-	@$(MKDIR_P) $(@D)
-	@echo '# dummy' >$@-t && $(am__mv) $@-t $@
-
-am--depfiles: $(am__depfiles_remade)
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/reallocarray.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/AllCells.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/AllPlanes.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/AllowEv.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/AutoRep.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Backgnd.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BdrWidth.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Bell.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Border.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ChAccCon.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ChActPGb.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ChClMode.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ChCmap.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ChGC.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ChKeyCon.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ChPntCon.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ChProp.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ChSaveSet.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ChWAttrs.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ChWindow.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ChkIfEv.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ChkMaskEv.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ChkTypEv.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ChkTypWEv.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ChkWinEv.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CirWin.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CirWinDn.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CirWinUp.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ClDisplay.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Clear.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ClearArea.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ConfWind.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Context.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ConvSel.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CopyArea.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CopyCmap.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CopyGC.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CopyPlane.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CrBFData.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CrCmap.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CrCursor.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CrGC.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CrGlCur.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CrPFBData.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CrPixmap.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CrWindow.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Cursor.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/DefCursor.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/DelProp.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Depths.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/DestSubs.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/DestWind.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/DisName.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/DrArc.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/DrArcs.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/DrLine.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/DrLines.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/DrPoint.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/DrPoints.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/DrRect.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/DrRects.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/DrSegs.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ErrDes.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ErrHndlr.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/EvToWire.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FSSaver.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FSWrap.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FetchName.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FillArc.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FillArcs.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FillPoly.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FillRct.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FillRcts.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FilterEv.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Flush.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Font.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FontInfo.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FontNames.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FreeCmap.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FreeCols.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FreeCurs.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FreeEData.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FreeEventData.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FreeGC.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FreePix.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GCMisc.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Geom.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GetAtomNm.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GetColor.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GetDflt.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GetEventData.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GetFPath.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GetFProp.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GetGCVals.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GetGeom.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GetHColor.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GetHints.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GetIFocus.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GetImage.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GetKCnt.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GetMoEv.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GetNrmHint.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GetPCnt.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GetPntMap.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GetProp.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GetRGBCMap.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GetSOwner.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GetSSaver.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GetStCmap.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GetTxtProp.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GetWAttrs.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GetWMCMapW.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GetWMProto.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GrButton.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GrKey.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GrKeybd.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GrPointer.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GrServer.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Host.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Iconify.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IfEvent.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ImText.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ImText16.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ImUtil.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/InitExt.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/InsCmap.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IntAtom.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/KeyBind.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/KeysymStr.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/KillCl.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LiHosts.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LiICmaps.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LiProps.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ListExt.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LoadFont.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LockDis.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LookupCol.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LowerWin.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Macros.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MapRaised.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MapSubs.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MapWindow.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MaskEvent.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Misc.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ModMap.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MoveWin.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/NextEvent.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/OCWrap.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/OMWrap.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/OpenDis.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ParseCmd.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ParseCol.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ParseGeom.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PeekEvent.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PeekIfEv.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Pending.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PixFormats.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PmapBgnd.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PmapBord.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PolyReg.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PolyTxt.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PolyTxt16.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PropAlloc.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PutBEvent.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PutImage.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/QuBest.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/QuColor.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/QuColors.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/QuCurShp.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/QuExt.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/QuKeybd.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/QuPntr.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/QuStipShp.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/QuTextE16.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/QuTextExt.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/QuTileShp.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/QuTree.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Quarks.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/RaiseWin.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/RdBitF.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/RecolorC.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ReconfWM.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ReconfWin.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Region.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/RegstFlt.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/RepWindow.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/RestackWs.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/RotProp.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ScrResStr.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SelInput.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SendEvent.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SetBack.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SetCRects.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SetClMask.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SetClOrig.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SetDashes.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SetFPath.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SetFont.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SetFore.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SetFunc.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SetHints.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SetIFocus.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SetLStyle.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SetLocale.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SetNrmHint.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SetPMask.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SetPntMap.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SetRGBCMap.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SetSOwner.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SetSSaver.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SetStCmap.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SetState.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SetStip.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SetTSOrig.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SetTile.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SetTxtProp.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SetWMCMapW.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SetWMProto.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/StBytes.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/StColor.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/StColors.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/StNColor.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/StName.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/StrKeysym.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/StrToText.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Sync.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Synchro.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Text.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Text16.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TextExt.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TextExt16.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TextToStr.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TrCoords.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/UndefCurs.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/UngrabBut.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/UngrabKbd.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/UngrabKey.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/UngrabPtr.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/UngrabSvr.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/UninsCmap.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/UnldFont.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/UnmapSubs.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/UnmapWin.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/VisUtil.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/WMGeom.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/WMProps.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/WarpPtr.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/WinEvent.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Window.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Withdraw.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/WrBitF.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XlibAsync.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XlibInt.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Xrm.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evtomask.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/globals.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imConv.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/locking.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/os2Stubs.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/x11_xcb.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xcb_disp.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xcb_io.Plo@am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -1354,10 +1212,8 @@
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-distdir: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) distdir-am
 
-distdir-am: $(DISTFILES)
+distdir: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
@@ -1423,8 +1279,7 @@
 	done
 install: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) install-recursive
-install-exec: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) install-exec-recursive
+install-exec: install-exec-recursive
 install-data: install-data-recursive
 uninstall: uninstall-recursive
 
@@ -1461,269 +1316,7 @@
 	mostlyclean-am
 
 distclean: distclean-recursive
-		-rm -f $(DEPDIR)/reallocarray.Plo
-	-rm -f ./$(DEPDIR)/AllCells.Plo
-	-rm -f ./$(DEPDIR)/AllPlanes.Plo
-	-rm -f ./$(DEPDIR)/AllowEv.Plo
-	-rm -f ./$(DEPDIR)/AutoRep.Plo
-	-rm -f ./$(DEPDIR)/Backgnd.Plo
-	-rm -f ./$(DEPDIR)/BdrWidth.Plo
-	-rm -f ./$(DEPDIR)/Bell.Plo
-	-rm -f ./$(DEPDIR)/Border.Plo
-	-rm -f ./$(DEPDIR)/ChAccCon.Plo
-	-rm -f ./$(DEPDIR)/ChActPGb.Plo
-	-rm -f ./$(DEPDIR)/ChClMode.Plo
-	-rm -f ./$(DEPDIR)/ChCmap.Plo
-	-rm -f ./$(DEPDIR)/ChGC.Plo
-	-rm -f ./$(DEPDIR)/ChKeyCon.Plo
-	-rm -f ./$(DEPDIR)/ChPntCon.Plo
-	-rm -f ./$(DEPDIR)/ChProp.Plo
-	-rm -f ./$(DEPDIR)/ChSaveSet.Plo
-	-rm -f ./$(DEPDIR)/ChWAttrs.Plo
-	-rm -f ./$(DEPDIR)/ChWindow.Plo
-	-rm -f ./$(DEPDIR)/ChkIfEv.Plo
-	-rm -f ./$(DEPDIR)/ChkMaskEv.Plo
-	-rm -f ./$(DEPDIR)/ChkTypEv.Plo
-	-rm -f ./$(DEPDIR)/ChkTypWEv.Plo
-	-rm -f ./$(DEPDIR)/ChkWinEv.Plo
-	-rm -f ./$(DEPDIR)/CirWin.Plo
-	-rm -f ./$(DEPDIR)/CirWinDn.Plo
-	-rm -f ./$(DEPDIR)/CirWinUp.Plo
-	-rm -f ./$(DEPDIR)/ClDisplay.Plo
-	-rm -f ./$(DEPDIR)/Clear.Plo
-	-rm -f ./$(DEPDIR)/ClearArea.Plo
-	-rm -f ./$(DEPDIR)/ConfWind.Plo
-	-rm -f ./$(DEPDIR)/Context.Plo
-	-rm -f ./$(DEPDIR)/ConvSel.Plo
-	-rm -f ./$(DEPDIR)/CopyArea.Plo
-	-rm -f ./$(DEPDIR)/CopyCmap.Plo
-	-rm -f ./$(DEPDIR)/CopyGC.Plo
-	-rm -f ./$(DEPDIR)/CopyPlane.Plo
-	-rm -f ./$(DEPDIR)/CrBFData.Plo
-	-rm -f ./$(DEPDIR)/CrCmap.Plo
-	-rm -f ./$(DEPDIR)/CrCursor.Plo
-	-rm -f ./$(DEPDIR)/CrGC.Plo
-	-rm -f ./$(DEPDIR)/CrGlCur.Plo
-	-rm -f ./$(DEPDIR)/CrPFBData.Plo
-	-rm -f ./$(DEPDIR)/CrPixmap.Plo
-	-rm -f ./$(DEPDIR)/CrWindow.Plo
-	-rm -f ./$(DEPDIR)/Cursor.Plo
-	-rm -f ./$(DEPDIR)/DefCursor.Plo
-	-rm -f ./$(DEPDIR)/DelProp.Plo
-	-rm -f ./$(DEPDIR)/Depths.Plo
-	-rm -f ./$(DEPDIR)/DestSubs.Plo
-	-rm -f ./$(DEPDIR)/DestWind.Plo
-	-rm -f ./$(DEPDIR)/DisName.Plo
-	-rm -f ./$(DEPDIR)/DrArc.Plo
-	-rm -f ./$(DEPDIR)/DrArcs.Plo
-	-rm -f ./$(DEPDIR)/DrLine.Plo
-	-rm -f ./$(DEPDIR)/DrLines.Plo
-	-rm -f ./$(DEPDIR)/DrPoint.Plo
-	-rm -f ./$(DEPDIR)/DrPoints.Plo
-	-rm -f ./$(DEPDIR)/DrRect.Plo
-	-rm -f ./$(DEPDIR)/DrRects.Plo
-	-rm -f ./$(DEPDIR)/DrSegs.Plo
-	-rm -f ./$(DEPDIR)/ErrDes.Plo
-	-rm -f ./$(DEPDIR)/ErrHndlr.Plo
-	-rm -f ./$(DEPDIR)/EvToWire.Plo
-	-rm -f ./$(DEPDIR)/FSSaver.Plo
-	-rm -f ./$(DEPDIR)/FSWrap.Plo
-	-rm -f ./$(DEPDIR)/FetchName.Plo
-	-rm -f ./$(DEPDIR)/FillArc.Plo
-	-rm -f ./$(DEPDIR)/FillArcs.Plo
-	-rm -f ./$(DEPDIR)/FillPoly.Plo
-	-rm -f ./$(DEPDIR)/FillRct.Plo
-	-rm -f ./$(DEPDIR)/FillRcts.Plo
-	-rm -f ./$(DEPDIR)/FilterEv.Plo
-	-rm -f ./$(DEPDIR)/Flush.Plo
-	-rm -f ./$(DEPDIR)/Font.Plo
-	-rm -f ./$(DEPDIR)/FontInfo.Plo
-	-rm -f ./$(DEPDIR)/FontNames.Plo
-	-rm -f ./$(DEPDIR)/FreeCmap.Plo
-	-rm -f ./$(DEPDIR)/FreeCols.Plo
-	-rm -f ./$(DEPDIR)/FreeCurs.Plo
-	-rm -f ./$(DEPDIR)/FreeEData.Plo
-	-rm -f ./$(DEPDIR)/FreeEventData.Plo
-	-rm -f ./$(DEPDIR)/FreeGC.Plo
-	-rm -f ./$(DEPDIR)/FreePix.Plo
-	-rm -f ./$(DEPDIR)/GCMisc.Plo
-	-rm -f ./$(DEPDIR)/Geom.Plo
-	-rm -f ./$(DEPDIR)/GetAtomNm.Plo
-	-rm -f ./$(DEPDIR)/GetColor.Plo
-	-rm -f ./$(DEPDIR)/GetDflt.Plo
-	-rm -f ./$(DEPDIR)/GetEventData.Plo
-	-rm -f ./$(DEPDIR)/GetFPath.Plo
-	-rm -f ./$(DEPDIR)/GetFProp.Plo
-	-rm -f ./$(DEPDIR)/GetGCVals.Plo
-	-rm -f ./$(DEPDIR)/GetGeom.Plo
-	-rm -f ./$(DEPDIR)/GetHColor.Plo
-	-rm -f ./$(DEPDIR)/GetHints.Plo
-	-rm -f ./$(DEPDIR)/GetIFocus.Plo
-	-rm -f ./$(DEPDIR)/GetImage.Plo
-	-rm -f ./$(DEPDIR)/GetKCnt.Plo
-	-rm -f ./$(DEPDIR)/GetMoEv.Plo
-	-rm -f ./$(DEPDIR)/GetNrmHint.Plo
-	-rm -f ./$(DEPDIR)/GetPCnt.Plo
-	-rm -f ./$(DEPDIR)/GetPntMap.Plo
-	-rm -f ./$(DEPDIR)/GetProp.Plo
-	-rm -f ./$(DEPDIR)/GetRGBCMap.Plo
-	-rm -f ./$(DEPDIR)/GetSOwner.Plo
-	-rm -f ./$(DEPDIR)/GetSSaver.Plo
-	-rm -f ./$(DEPDIR)/GetStCmap.Plo
-	-rm -f ./$(DEPDIR)/GetTxtProp.Plo
-	-rm -f ./$(DEPDIR)/GetWAttrs.Plo
-	-rm -f ./$(DEPDIR)/GetWMCMapW.Plo
-	-rm -f ./$(DEPDIR)/GetWMProto.Plo
-	-rm -f ./$(DEPDIR)/GrButton.Plo
-	-rm -f ./$(DEPDIR)/GrKey.Plo
-	-rm -f ./$(DEPDIR)/GrKeybd.Plo
-	-rm -f ./$(DEPDIR)/GrPointer.Plo
-	-rm -f ./$(DEPDIR)/GrServer.Plo
-	-rm -f ./$(DEPDIR)/Host.Plo
-	-rm -f ./$(DEPDIR)/Iconify.Plo
-	-rm -f ./$(DEPDIR)/IfEvent.Plo
-	-rm -f ./$(DEPDIR)/ImText.Plo
-	-rm -f ./$(DEPDIR)/ImText16.Plo
-	-rm -f ./$(DEPDIR)/ImUtil.Plo
-	-rm -f ./$(DEPDIR)/InitExt.Plo
-	-rm -f ./$(DEPDIR)/InsCmap.Plo
-	-rm -f ./$(DEPDIR)/IntAtom.Plo
-	-rm -f ./$(DEPDIR)/KeyBind.Plo
-	-rm -f ./$(DEPDIR)/KeysymStr.Plo
-	-rm -f ./$(DEPDIR)/KillCl.Plo
-	-rm -f ./$(DEPDIR)/LiHosts.Plo
-	-rm -f ./$(DEPDIR)/LiICmaps.Plo
-	-rm -f ./$(DEPDIR)/LiProps.Plo
-	-rm -f ./$(DEPDIR)/ListExt.Plo
-	-rm -f ./$(DEPDIR)/LoadFont.Plo
-	-rm -f ./$(DEPDIR)/LockDis.Plo
-	-rm -f ./$(DEPDIR)/LookupCol.Plo
-	-rm -f ./$(DEPDIR)/LowerWin.Plo
-	-rm -f ./$(DEPDIR)/Macros.Plo
-	-rm -f ./$(DEPDIR)/MapRaised.Plo
-	-rm -f ./$(DEPDIR)/MapSubs.Plo
-	-rm -f ./$(DEPDIR)/MapWindow.Plo
-	-rm -f ./$(DEPDIR)/MaskEvent.Plo
-	-rm -f ./$(DEPDIR)/Misc.Plo
-	-rm -f ./$(DEPDIR)/ModMap.Plo
-	-rm -f ./$(DEPDIR)/MoveWin.Plo
-	-rm -f ./$(DEPDIR)/NextEvent.Plo
-	-rm -f ./$(DEPDIR)/OCWrap.Plo
-	-rm -f ./$(DEPDIR)/OMWrap.Plo
-	-rm -f ./$(DEPDIR)/OpenDis.Plo
-	-rm -f ./$(DEPDIR)/ParseCmd.Plo
-	-rm -f ./$(DEPDIR)/ParseCol.Plo
-	-rm -f ./$(DEPDIR)/ParseGeom.Plo
-	-rm -f ./$(DEPDIR)/PeekEvent.Plo
-	-rm -f ./$(DEPDIR)/PeekIfEv.Plo
-	-rm -f ./$(DEPDIR)/Pending.Plo
-	-rm -f ./$(DEPDIR)/PixFormats.Plo
-	-rm -f ./$(DEPDIR)/PmapBgnd.Plo
-	-rm -f ./$(DEPDIR)/PmapBord.Plo
-	-rm -f ./$(DEPDIR)/PolyReg.Plo
-	-rm -f ./$(DEPDIR)/PolyTxt.Plo
-	-rm -f ./$(DEPDIR)/PolyTxt16.Plo
-	-rm -f ./$(DEPDIR)/PropAlloc.Plo
-	-rm -f ./$(DEPDIR)/PutBEvent.Plo
-	-rm -f ./$(DEPDIR)/PutImage.Plo
-	-rm -f ./$(DEPDIR)/QuBest.Plo
-	-rm -f ./$(DEPDIR)/QuColor.Plo
-	-rm -f ./$(DEPDIR)/QuColors.Plo
-	-rm -f ./$(DEPDIR)/QuCurShp.Plo
-	-rm -f ./$(DEPDIR)/QuExt.Plo
-	-rm -f ./$(DEPDIR)/QuKeybd.Plo
-	-rm -f ./$(DEPDIR)/QuPntr.Plo
-	-rm -f ./$(DEPDIR)/QuStipShp.Plo
-	-rm -f ./$(DEPDIR)/QuTextE16.Plo
-	-rm -f ./$(DEPDIR)/QuTextExt.Plo
-	-rm -f ./$(DEPDIR)/QuTileShp.Plo
-	-rm -f ./$(DEPDIR)/QuTree.Plo
-	-rm -f ./$(DEPDIR)/Quarks.Plo
-	-rm -f ./$(DEPDIR)/RaiseWin.Plo
-	-rm -f ./$(DEPDIR)/RdBitF.Plo
-	-rm -f ./$(DEPDIR)/RecolorC.Plo
-	-rm -f ./$(DEPDIR)/ReconfWM.Plo
-	-rm -f ./$(DEPDIR)/ReconfWin.Plo
-	-rm -f ./$(DEPDIR)/Region.Plo
-	-rm -f ./$(DEPDIR)/RegstFlt.Plo
-	-rm -f ./$(DEPDIR)/RepWindow.Plo
-	-rm -f ./$(DEPDIR)/RestackWs.Plo
-	-rm -f ./$(DEPDIR)/RotProp.Plo
-	-rm -f ./$(DEPDIR)/ScrResStr.Plo
-	-rm -f ./$(DEPDIR)/SelInput.Plo
-	-rm -f ./$(DEPDIR)/SendEvent.Plo
-	-rm -f ./$(DEPDIR)/SetBack.Plo
-	-rm -f ./$(DEPDIR)/SetCRects.Plo
-	-rm -f ./$(DEPDIR)/SetClMask.Plo
-	-rm -f ./$(DEPDIR)/SetClOrig.Plo
-	-rm -f ./$(DEPDIR)/SetDashes.Plo
-	-rm -f ./$(DEPDIR)/SetFPath.Plo
-	-rm -f ./$(DEPDIR)/SetFont.Plo
-	-rm -f ./$(DEPDIR)/SetFore.Plo
-	-rm -f ./$(DEPDIR)/SetFunc.Plo
-	-rm -f ./$(DEPDIR)/SetHints.Plo
-	-rm -f ./$(DEPDIR)/SetIFocus.Plo
-	-rm -f ./$(DEPDIR)/SetLStyle.Plo
-	-rm -f ./$(DEPDIR)/SetLocale.Plo
-	-rm -f ./$(DEPDIR)/SetNrmHint.Plo
-	-rm -f ./$(DEPDIR)/SetPMask.Plo
-	-rm -f ./$(DEPDIR)/SetPntMap.Plo
-	-rm -f ./$(DEPDIR)/SetRGBCMap.Plo
-	-rm -f ./$(DEPDIR)/SetSOwner.Plo
-	-rm -f ./$(DEPDIR)/SetSSaver.Plo
-	-rm -f ./$(DEPDIR)/SetStCmap.Plo
-	-rm -f ./$(DEPDIR)/SetState.Plo
-	-rm -f ./$(DEPDIR)/SetStip.Plo
-	-rm -f ./$(DEPDIR)/SetTSOrig.Plo
-	-rm -f ./$(DEPDIR)/SetTile.Plo
-	-rm -f ./$(DEPDIR)/SetTxtProp.Plo
-	-rm -f ./$(DEPDIR)/SetWMCMapW.Plo
-	-rm -f ./$(DEPDIR)/SetWMProto.Plo
-	-rm -f ./$(DEPDIR)/StBytes.Plo
-	-rm -f ./$(DEPDIR)/StColor.Plo
-	-rm -f ./$(DEPDIR)/StColors.Plo
-	-rm -f ./$(DEPDIR)/StNColor.Plo
-	-rm -f ./$(DEPDIR)/StName.Plo
-	-rm -f ./$(DEPDIR)/StrKeysym.Plo
-	-rm -f ./$(DEPDIR)/StrToText.Plo
-	-rm -f ./$(DEPDIR)/Sync.Plo
-	-rm -f ./$(DEPDIR)/Synchro.Plo
-	-rm -f ./$(DEPDIR)/Text.Plo
-	-rm -f ./$(DEPDIR)/Text16.Plo
-	-rm -f ./$(DEPDIR)/TextExt.Plo
-	-rm -f ./$(DEPDIR)/TextExt16.Plo
-	-rm -f ./$(DEPDIR)/TextToStr.Plo
-	-rm -f ./$(DEPDIR)/TrCoords.Plo
-	-rm -f ./$(DEPDIR)/UIThrStubs.Plo
-	-rm -f ./$(DEPDIR)/UndefCurs.Plo
-	-rm -f ./$(DEPDIR)/UngrabBut.Plo
-	-rm -f ./$(DEPDIR)/UngrabKbd.Plo
-	-rm -f ./$(DEPDIR)/UngrabKey.Plo
-	-rm -f ./$(DEPDIR)/UngrabPtr.Plo
-	-rm -f ./$(DEPDIR)/UngrabSvr.Plo
-	-rm -f ./$(DEPDIR)/UninsCmap.Plo
-	-rm -f ./$(DEPDIR)/UnldFont.Plo
-	-rm -f ./$(DEPDIR)/UnmapSubs.Plo
-	-rm -f ./$(DEPDIR)/UnmapWin.Plo
-	-rm -f ./$(DEPDIR)/VisUtil.Plo
-	-rm -f ./$(DEPDIR)/WMGeom.Plo
-	-rm -f ./$(DEPDIR)/WMProps.Plo
-	-rm -f ./$(DEPDIR)/WarpPtr.Plo
-	-rm -f ./$(DEPDIR)/WinEvent.Plo
-	-rm -f ./$(DEPDIR)/Window.Plo
-	-rm -f ./$(DEPDIR)/Withdraw.Plo
-	-rm -f ./$(DEPDIR)/WrBitF.Plo
-	-rm -f ./$(DEPDIR)/XlibAsync.Plo
-	-rm -f ./$(DEPDIR)/XlibInt.Plo
-	-rm -f ./$(DEPDIR)/Xrm.Plo
-	-rm -f ./$(DEPDIR)/evtomask.Plo
-	-rm -f ./$(DEPDIR)/globals.Plo
-	-rm -f ./$(DEPDIR)/imConv.Plo
-	-rm -f ./$(DEPDIR)/locking.Plo
-	-rm -f ./$(DEPDIR)/os2Stubs.Plo
-	-rm -f ./$(DEPDIR)/x11_xcb.Plo
-	-rm -f ./$(DEPDIR)/xcb_disp.Plo
-	-rm -f ./$(DEPDIR)/xcb_io.Plo
+	-rm -rf $(DEPDIR) ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-hdr distclean-tags
@@ -1769,269 +1362,7 @@
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
-		-rm -f $(DEPDIR)/reallocarray.Plo
-	-rm -f ./$(DEPDIR)/AllCells.Plo
-	-rm -f ./$(DEPDIR)/AllPlanes.Plo
-	-rm -f ./$(DEPDIR)/AllowEv.Plo
-	-rm -f ./$(DEPDIR)/AutoRep.Plo
-	-rm -f ./$(DEPDIR)/Backgnd.Plo
-	-rm -f ./$(DEPDIR)/BdrWidth.Plo
-	-rm -f ./$(DEPDIR)/Bell.Plo
-	-rm -f ./$(DEPDIR)/Border.Plo
-	-rm -f ./$(DEPDIR)/ChAccCon.Plo
-	-rm -f ./$(DEPDIR)/ChActPGb.Plo
-	-rm -f ./$(DEPDIR)/ChClMode.Plo
-	-rm -f ./$(DEPDIR)/ChCmap.Plo
-	-rm -f ./$(DEPDIR)/ChGC.Plo
-	-rm -f ./$(DEPDIR)/ChKeyCon.Plo
-	-rm -f ./$(DEPDIR)/ChPntCon.Plo
-	-rm -f ./$(DEPDIR)/ChProp.Plo
-	-rm -f ./$(DEPDIR)/ChSaveSet.Plo
-	-rm -f ./$(DEPDIR)/ChWAttrs.Plo
-	-rm -f ./$(DEPDIR)/ChWindow.Plo
-	-rm -f ./$(DEPDIR)/ChkIfEv.Plo
-	-rm -f ./$(DEPDIR)/ChkMaskEv.Plo
-	-rm -f ./$(DEPDIR)/ChkTypEv.Plo
-	-rm -f ./$(DEPDIR)/ChkTypWEv.Plo
-	-rm -f ./$(DEPDIR)/ChkWinEv.Plo
-	-rm -f ./$(DEPDIR)/CirWin.Plo
-	-rm -f ./$(DEPDIR)/CirWinDn.Plo
-	-rm -f ./$(DEPDIR)/CirWinUp.Plo
-	-rm -f ./$(DEPDIR)/ClDisplay.Plo
-	-rm -f ./$(DEPDIR)/Clear.Plo
-	-rm -f ./$(DEPDIR)/ClearArea.Plo
-	-rm -f ./$(DEPDIR)/ConfWind.Plo
-	-rm -f ./$(DEPDIR)/Context.Plo
-	-rm -f ./$(DEPDIR)/ConvSel.Plo
-	-rm -f ./$(DEPDIR)/CopyArea.Plo
-	-rm -f ./$(DEPDIR)/CopyCmap.Plo
-	-rm -f ./$(DEPDIR)/CopyGC.Plo
-	-rm -f ./$(DEPDIR)/CopyPlane.Plo
-	-rm -f ./$(DEPDIR)/CrBFData.Plo
-	-rm -f ./$(DEPDIR)/CrCmap.Plo
-	-rm -f ./$(DEPDIR)/CrCursor.Plo
-	-rm -f ./$(DEPDIR)/CrGC.Plo
-	-rm -f ./$(DEPDIR)/CrGlCur.Plo
-	-rm -f ./$(DEPDIR)/CrPFBData.Plo
-	-rm -f ./$(DEPDIR)/CrPixmap.Plo
-	-rm -f ./$(DEPDIR)/CrWindow.Plo
-	-rm -f ./$(DEPDIR)/Cursor.Plo
-	-rm -f ./$(DEPDIR)/DefCursor.Plo
-	-rm -f ./$(DEPDIR)/DelProp.Plo
-	-rm -f ./$(DEPDIR)/Depths.Plo
-	-rm -f ./$(DEPDIR)/DestSubs.Plo
-	-rm -f ./$(DEPDIR)/DestWind.Plo
-	-rm -f ./$(DEPDIR)/DisName.Plo
-	-rm -f ./$(DEPDIR)/DrArc.Plo
-	-rm -f ./$(DEPDIR)/DrArcs.Plo
-	-rm -f ./$(DEPDIR)/DrLine.Plo
-	-rm -f ./$(DEPDIR)/DrLines.Plo
-	-rm -f ./$(DEPDIR)/DrPoint.Plo
-	-rm -f ./$(DEPDIR)/DrPoints.Plo
-	-rm -f ./$(DEPDIR)/DrRect.Plo
-	-rm -f ./$(DEPDIR)/DrRects.Plo
-	-rm -f ./$(DEPDIR)/DrSegs.Plo
-	-rm -f ./$(DEPDIR)/ErrDes.Plo
-	-rm -f ./$(DEPDIR)/ErrHndlr.Plo
-	-rm -f ./$(DEPDIR)/EvToWire.Plo
-	-rm -f ./$(DEPDIR)/FSSaver.Plo
-	-rm -f ./$(DEPDIR)/FSWrap.Plo
-	-rm -f ./$(DEPDIR)/FetchName.Plo
-	-rm -f ./$(DEPDIR)/FillArc.Plo
-	-rm -f ./$(DEPDIR)/FillArcs.Plo
-	-rm -f ./$(DEPDIR)/FillPoly.Plo
-	-rm -f ./$(DEPDIR)/FillRct.Plo
-	-rm -f ./$(DEPDIR)/FillRcts.Plo
-	-rm -f ./$(DEPDIR)/FilterEv.Plo
-	-rm -f ./$(DEPDIR)/Flush.Plo
-	-rm -f ./$(DEPDIR)/Font.Plo
-	-rm -f ./$(DEPDIR)/FontInfo.Plo
-	-rm -f ./$(DEPDIR)/FontNames.Plo
-	-rm -f ./$(DEPDIR)/FreeCmap.Plo
-	-rm -f ./$(DEPDIR)/FreeCols.Plo
-	-rm -f ./$(DEPDIR)/FreeCurs.Plo
-	-rm -f ./$(DEPDIR)/FreeEData.Plo
-	-rm -f ./$(DEPDIR)/FreeEventData.Plo
-	-rm -f ./$(DEPDIR)/FreeGC.Plo
-	-rm -f ./$(DEPDIR)/FreePix.Plo
-	-rm -f ./$(DEPDIR)/GCMisc.Plo
-	-rm -f ./$(DEPDIR)/Geom.Plo
-	-rm -f ./$(DEPDIR)/GetAtomNm.Plo
-	-rm -f ./$(DEPDIR)/GetColor.Plo
-	-rm -f ./$(DEPDIR)/GetDflt.Plo
-	-rm -f ./$(DEPDIR)/GetEventData.Plo
-	-rm -f ./$(DEPDIR)/GetFPath.Plo
-	-rm -f ./$(DEPDIR)/GetFProp.Plo
-	-rm -f ./$(DEPDIR)/GetGCVals.Plo
-	-rm -f ./$(DEPDIR)/GetGeom.Plo
-	-rm -f ./$(DEPDIR)/GetHColor.Plo
-	-rm -f ./$(DEPDIR)/GetHints.Plo
-	-rm -f ./$(DEPDIR)/GetIFocus.Plo
-	-rm -f ./$(DEPDIR)/GetImage.Plo
-	-rm -f ./$(DEPDIR)/GetKCnt.Plo
-	-rm -f ./$(DEPDIR)/GetMoEv.Plo
-	-rm -f ./$(DEPDIR)/GetNrmHint.Plo
-	-rm -f ./$(DEPDIR)/GetPCnt.Plo
-	-rm -f ./$(DEPDIR)/GetPntMap.Plo
-	-rm -f ./$(DEPDIR)/GetProp.Plo
-	-rm -f ./$(DEPDIR)/GetRGBCMap.Plo
-	-rm -f ./$(DEPDIR)/GetSOwner.Plo
-	-rm -f ./$(DEPDIR)/GetSSaver.Plo
-	-rm -f ./$(DEPDIR)/GetStCmap.Plo
-	-rm -f ./$(DEPDIR)/GetTxtProp.Plo
-	-rm -f ./$(DEPDIR)/GetWAttrs.Plo
-	-rm -f ./$(DEPDIR)/GetWMCMapW.Plo
-	-rm -f ./$(DEPDIR)/GetWMProto.Plo
-	-rm -f ./$(DEPDIR)/GrButton.Plo
-	-rm -f ./$(DEPDIR)/GrKey.Plo
-	-rm -f ./$(DEPDIR)/GrKeybd.Plo
-	-rm -f ./$(DEPDIR)/GrPointer.Plo
-	-rm -f ./$(DEPDIR)/GrServer.Plo
-	-rm -f ./$(DEPDIR)/Host.Plo
-	-rm -f ./$(DEPDIR)/Iconify.Plo
-	-rm -f ./$(DEPDIR)/IfEvent.Plo
-	-rm -f ./$(DEPDIR)/ImText.Plo
-	-rm -f ./$(DEPDIR)/ImText16.Plo
-	-rm -f ./$(DEPDIR)/ImUtil.Plo
-	-rm -f ./$(DEPDIR)/InitExt.Plo
-	-rm -f ./$(DEPDIR)/InsCmap.Plo
-	-rm -f ./$(DEPDIR)/IntAtom.Plo
-	-rm -f ./$(DEPDIR)/KeyBind.Plo
-	-rm -f ./$(DEPDIR)/KeysymStr.Plo
-	-rm -f ./$(DEPDIR)/KillCl.Plo
-	-rm -f ./$(DEPDIR)/LiHosts.Plo
-	-rm -f ./$(DEPDIR)/LiICmaps.Plo
-	-rm -f ./$(DEPDIR)/LiProps.Plo
-	-rm -f ./$(DEPDIR)/ListExt.Plo
-	-rm -f ./$(DEPDIR)/LoadFont.Plo
-	-rm -f ./$(DEPDIR)/LockDis.Plo
-	-rm -f ./$(DEPDIR)/LookupCol.Plo
-	-rm -f ./$(DEPDIR)/LowerWin.Plo
-	-rm -f ./$(DEPDIR)/Macros.Plo
-	-rm -f ./$(DEPDIR)/MapRaised.Plo
-	-rm -f ./$(DEPDIR)/MapSubs.Plo
-	-rm -f ./$(DEPDIR)/MapWindow.Plo
-	-rm -f ./$(DEPDIR)/MaskEvent.Plo
-	-rm -f ./$(DEPDIR)/Misc.Plo
-	-rm -f ./$(DEPDIR)/ModMap.Plo
-	-rm -f ./$(DEPDIR)/MoveWin.Plo
-	-rm -f ./$(DEPDIR)/NextEvent.Plo
-	-rm -f ./$(DEPDIR)/OCWrap.Plo
-	-rm -f ./$(DEPDIR)/OMWrap.Plo
-	-rm -f ./$(DEPDIR)/OpenDis.Plo
-	-rm -f ./$(DEPDIR)/ParseCmd.Plo
-	-rm -f ./$(DEPDIR)/ParseCol.Plo
-	-rm -f ./$(DEPDIR)/ParseGeom.Plo
-	-rm -f ./$(DEPDIR)/PeekEvent.Plo
-	-rm -f ./$(DEPDIR)/PeekIfEv.Plo
-	-rm -f ./$(DEPDIR)/Pending.Plo
-	-rm -f ./$(DEPDIR)/PixFormats.Plo
-	-rm -f ./$(DEPDIR)/PmapBgnd.Plo
-	-rm -f ./$(DEPDIR)/PmapBord.Plo
-	-rm -f ./$(DEPDIR)/PolyReg.Plo
-	-rm -f ./$(DEPDIR)/PolyTxt.Plo
-	-rm -f ./$(DEPDIR)/PolyTxt16.Plo
-	-rm -f ./$(DEPDIR)/PropAlloc.Plo
-	-rm -f ./$(DEPDIR)/PutBEvent.Plo
-	-rm -f ./$(DEPDIR)/PutImage.Plo
-	-rm -f ./$(DEPDIR)/QuBest.Plo
-	-rm -f ./$(DEPDIR)/QuColor.Plo
-	-rm -f ./$(DEPDIR)/QuColors.Plo
-	-rm -f ./$(DEPDIR)/QuCurShp.Plo
-	-rm -f ./$(DEPDIR)/QuExt.Plo
-	-rm -f ./$(DEPDIR)/QuKeybd.Plo
-	-rm -f ./$(DEPDIR)/QuPntr.Plo
-	-rm -f ./$(DEPDIR)/QuStipShp.Plo
-	-rm -f ./$(DEPDIR)/QuTextE16.Plo
-	-rm -f ./$(DEPDIR)/QuTextExt.Plo
-	-rm -f ./$(DEPDIR)/QuTileShp.Plo
-	-rm -f ./$(DEPDIR)/QuTree.Plo
-	-rm -f ./$(DEPDIR)/Quarks.Plo
-	-rm -f ./$(DEPDIR)/RaiseWin.Plo
-	-rm -f ./$(DEPDIR)/RdBitF.Plo
-	-rm -f ./$(DEPDIR)/RecolorC.Plo
-	-rm -f ./$(DEPDIR)/ReconfWM.Plo
-	-rm -f ./$(DEPDIR)/ReconfWin.Plo
-	-rm -f ./$(DEPDIR)/Region.Plo
-	-rm -f ./$(DEPDIR)/RegstFlt.Plo
-	-rm -f ./$(DEPDIR)/RepWindow.Plo
-	-rm -f ./$(DEPDIR)/RestackWs.Plo
-	-rm -f ./$(DEPDIR)/RotProp.Plo
-	-rm -f ./$(DEPDIR)/ScrResStr.Plo
-	-rm -f ./$(DEPDIR)/SelInput.Plo
-	-rm -f ./$(DEPDIR)/SendEvent.Plo
-	-rm -f ./$(DEPDIR)/SetBack.Plo
-	-rm -f ./$(DEPDIR)/SetCRects.Plo
-	-rm -f ./$(DEPDIR)/SetClMask.Plo
-	-rm -f ./$(DEPDIR)/SetClOrig.Plo
-	-rm -f ./$(DEPDIR)/SetDashes.Plo
-	-rm -f ./$(DEPDIR)/SetFPath.Plo
-	-rm -f ./$(DEPDIR)/SetFont.Plo
-	-rm -f ./$(DEPDIR)/SetFore.Plo
-	-rm -f ./$(DEPDIR)/SetFunc.Plo
-	-rm -f ./$(DEPDIR)/SetHints.Plo
-	-rm -f ./$(DEPDIR)/SetIFocus.Plo
-	-rm -f ./$(DEPDIR)/SetLStyle.Plo
-	-rm -f ./$(DEPDIR)/SetLocale.Plo
-	-rm -f ./$(DEPDIR)/SetNrmHint.Plo
-	-rm -f ./$(DEPDIR)/SetPMask.Plo
-	-rm -f ./$(DEPDIR)/SetPntMap.Plo
-	-rm -f ./$(DEPDIR)/SetRGBCMap.Plo
-	-rm -f ./$(DEPDIR)/SetSOwner.Plo
-	-rm -f ./$(DEPDIR)/SetSSaver.Plo
-	-rm -f ./$(DEPDIR)/SetStCmap.Plo
-	-rm -f ./$(DEPDIR)/SetState.Plo
-	-rm -f ./$(DEPDIR)/SetStip.Plo
-	-rm -f ./$(DEPDIR)/SetTSOrig.Plo
-	-rm -f ./$(DEPDIR)/SetTile.Plo
-	-rm -f ./$(DEPDIR)/SetTxtProp.Plo
-	-rm -f ./$(DEPDIR)/SetWMCMapW.Plo
-	-rm -f ./$(DEPDIR)/SetWMProto.Plo
-	-rm -f ./$(DEPDIR)/StBytes.Plo
-	-rm -f ./$(DEPDIR)/StColor.Plo
-	-rm -f ./$(DEPDIR)/StColors.Plo
-	-rm -f ./$(DEPDIR)/StNColor.Plo
-	-rm -f ./$(DEPDIR)/StName.Plo
-	-rm -f ./$(DEPDIR)/StrKeysym.Plo
-	-rm -f ./$(DEPDIR)/StrToText.Plo
-	-rm -f ./$(DEPDIR)/Sync.Plo
-	-rm -f ./$(DEPDIR)/Synchro.Plo
-	-rm -f ./$(DEPDIR)/Text.Plo
-	-rm -f ./$(DEPDIR)/Text16.Plo
-	-rm -f ./$(DEPDIR)/TextExt.Plo
-	-rm -f ./$(DEPDIR)/TextExt16.Plo
-	-rm -f ./$(DEPDIR)/TextToStr.Plo
-	-rm -f ./$(DEPDIR)/TrCoords.Plo
-	-rm -f ./$(DEPDIR)/UIThrStubs.Plo
-	-rm -f ./$(DEPDIR)/UndefCurs.Plo
-	-rm -f ./$(DEPDIR)/UngrabBut.Plo
-	-rm -f ./$(DEPDIR)/UngrabKbd.Plo
-	-rm -f ./$(DEPDIR)/UngrabKey.Plo
-	-rm -f ./$(DEPDIR)/UngrabPtr.Plo
-	-rm -f ./$(DEPDIR)/UngrabSvr.Plo
-	-rm -f ./$(DEPDIR)/UninsCmap.Plo
-	-rm -f ./$(DEPDIR)/UnldFont.Plo
-	-rm -f ./$(DEPDIR)/UnmapSubs.Plo
-	-rm -f ./$(DEPDIR)/UnmapWin.Plo
-	-rm -f ./$(DEPDIR)/VisUtil.Plo
-	-rm -f ./$(DEPDIR)/WMGeom.Plo
-	-rm -f ./$(DEPDIR)/WMProps.Plo
-	-rm -f ./$(DEPDIR)/WarpPtr.Plo
-	-rm -f ./$(DEPDIR)/WinEvent.Plo
-	-rm -f ./$(DEPDIR)/Window.Plo
-	-rm -f ./$(DEPDIR)/Withdraw.Plo
-	-rm -f ./$(DEPDIR)/WrBitF.Plo
-	-rm -f ./$(DEPDIR)/XlibAsync.Plo
-	-rm -f ./$(DEPDIR)/XlibInt.Plo
-	-rm -f ./$(DEPDIR)/Xrm.Plo
-	-rm -f ./$(DEPDIR)/evtomask.Plo
-	-rm -f ./$(DEPDIR)/globals.Plo
-	-rm -f ./$(DEPDIR)/imConv.Plo
-	-rm -f ./$(DEPDIR)/locking.Plo
-	-rm -f ./$(DEPDIR)/os2Stubs.Plo
-	-rm -f ./$(DEPDIR)/x11_xcb.Plo
-	-rm -f ./$(DEPDIR)/xcb_disp.Plo
-	-rm -f ./$(DEPDIR)/xcb_io.Plo
+	-rm -rf $(DEPDIR) ./$(DEPDIR)
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
@@ -2052,25 +1383,24 @@
 	uninstall-x11dataDATA
 
 .MAKE: $(am__recursive_targets) all check install install-am \
-	install-exec install-strip
-
-.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
-	am--depfiles check check-am clean clean-generic \
-	clean-libLTLIBRARIES clean-libtool cscopelist-am ctags \
-	ctags-am distclean distclean-compile distclean-generic \
-	distclean-hdr distclean-libtool distclean-tags distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-libLTLIBRARIES \
-	install-lintlibDATA install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip install-x11dataDATA \
-	installcheck installcheck-am installdirs installdirs-am \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
-	uninstall-libLTLIBRARIES uninstall-lintlibDATA \
-	uninstall-x11dataDATA
+	install-strip
+
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
+	check-am clean clean-generic clean-libLTLIBRARIES \
+	clean-libtool cscopelist-am ctags ctags-am distclean \
+	distclean-compile distclean-generic distclean-hdr \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-libLTLIBRARIES install-lintlibDATA \
+	install-man install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip install-x11dataDATA installcheck \
+	installcheck-am installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-am uninstall uninstall-am uninstall-libLTLIBRARIES \
+	uninstall-lintlibDATA uninstall-x11dataDATA
 
 .PRECIOUS: Makefile

_service:tar_scm:libX11-1.8.1.tar.xz/src/OpenDis.c -> _service:tar_scm:libX11-1.8.4.tar.xz/src/OpenDis.c Changed

_service:tar_scm:libX11-1.8.1.tar.xz/src/PeekIfEv.c -> _service:tar_scm:libX11-1.8.4.tar.xz/src/PeekIfEv.c Changed

_service:tar_scm:libX11-1.8.1.tar.xz/src/QuColors.c -> _service:tar_scm:libX11-1.8.4.tar.xz/src/QuColors.c Changed

@@ -43,7 +43,7 @@
 
 GetReq(QueryColors, req);
 
- req->cmap = cmap;
+ req->cmap = (CARD32) cmap;
 SetReqLen(req, ncolors, ncolors); /* each pixel is a CARD32 */
 
 for (i = 0; i < ncolors; i++)
@@ -51,11 +51,11 @@
 /* XXX this isn't very efficient */
 
 if (_XReply(dpy, (xReply *) &rep, 0, xFalse) != 0) {
-	xrgb *color = Xmallocarray(ncolors, sizeof(xrgb));
+	xrgb *color = Xmallocarray((size_t) ncolors, sizeof(xrgb));
 	if (color != NULL) {
- unsigned long nbytes = (long) ncolors * SIZEOF(xrgb);
+ unsigned long nbytes = (size_t) ncolors * SIZEOF(xrgb);
 
-	 _XRead(dpy, (char *) color, nbytes);
+	 _XRead(dpy, (char *) color, (long) nbytes);
 
 	 for (i = 0; i < ncolors; i++) {
 		register XColor *def = &defsi;
@@ -82,9 +82,9 @@
 int n;
 
 if (dpy->bigreq_size > 0)
-	n = dpy->bigreq_size - (sizeof (xQueryColorsReq) >> 2) - 1;
+	n = (int) (dpy->bigreq_size - (sizeof (xQueryColorsReq) >> 2) - 1);
 else
-	n = dpy->max_request_size - (sizeof (xQueryColorsReq) >> 2);
+	n = (int) (dpy->max_request_size - (sizeof (xQueryColorsReq) >> 2));
 
 LockDisplay(dpy);
 while (ncolors >= n) {

_service:tar_scm:libX11-1.8.1.tar.xz/src/SetCRects.c -> _service:tar_scm:libX11-1.8.4.tar.xz/src/SetCRects.c Changed

_service:tar_scm:libX11-1.8.1.tar.xz/src/config.h.in -> _service:tar_scm:libX11-1.8.4.tar.xz/src/config.h.in Changed

@@ -36,8 +36,8 @@
 /* Define to 1 if you have the `ws2_32' library (-lws2_32). */
 #undef HAVE_LIBWS2_32
 
-/* Define to 1 if you have the <minix/config.h> header file. */
-#undef HAVE_MINIX_CONFIG_H
+/* Define to 1 if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H
 
 /* Define to 1 if you have a working `mmap' system call. */
 #undef HAVE_MMAP
@@ -57,24 +57,15 @@
 /* Define to 1 if you have the <stdint.h> header file. */
 #undef HAVE_STDINT_H
 
-/* Define to 1 if you have the <stdio.h> header file. */
-#undef HAVE_STDIO_H
-
 /* Define to 1 if you have the <stdlib.h> header file. */
 #undef HAVE_STDLIB_H
 
-/* Define to 1 if you have the `strcasecmp' function. */
-#undef HAVE_STRCASECMP
-
 /* Define to 1 if you have the <strings.h> header file. */
 #undef HAVE_STRINGS_H
 
 /* Define to 1 if you have the <string.h> header file. */
 #undef HAVE_STRING_H
 
-/* Define to 1 if you have the `strlcpy' function. */
-#undef HAVE_STRLCPY
-
 /* Define to 1 if you have the `strtol' function. */
 #undef HAVE_STRTOL
 
@@ -102,9 +93,6 @@
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H
 
-/* Define to 1 if you have the <wchar.h> header file. */
-#undef HAVE_WCHAR_H
-
 /* Define to 1 if the system has the `__builtin_popcountl' built-in function
 */
 #undef HAVE___BUILTIN_POPCOUNTL
@@ -151,9 +139,7 @@
 /* Patch version of this package */
 #undef PACKAGE_VERSION_PATCHLEVEL
 
-/* Define to 1 if all of the C90 standard headers exist (not just the ones
- required in a freestanding environment). This macro is provided for
- backward compatibility; new code need not use it. */
+/* Define to 1 if you have the ANSI C header files. */
 #undef STDC_HEADERS
 
 /* Support TCP socket connections */
@@ -178,87 +164,21 @@
 #ifndef _ALL_SOURCE
 # undef _ALL_SOURCE
 #endif
-/* Enable general extensions on macOS. */
-#ifndef _DARWIN_C_SOURCE
-# undef _DARWIN_C_SOURCE
-#endif
-/* Enable general extensions on Solaris. */
-#ifndef __EXTENSIONS__
-# undef __EXTENSIONS__
-#endif
 /* Enable GNU extensions on systems that have them. */
 #ifndef _GNU_SOURCE
 # undef _GNU_SOURCE
 #endif
-/* Enable X/Open compliant socket functions that do not require linking
- with -lxnet on HP-UX 11.11. */
-#ifndef _HPUX_ALT_XOPEN_SOCKET_API
-# undef _HPUX_ALT_XOPEN_SOCKET_API
-#endif
-/* Identify the host operating system as Minix.
- This macro does not affect the system headers' behavior.
- A future release of Autoconf may stop defining this macro. */
-#ifndef _MINIX
-# undef _MINIX
-#endif
-/* Enable general extensions on NetBSD.
- Enable NetBSD compatibility extensions on Minix. */
-#ifndef _NETBSD_SOURCE
-# undef _NETBSD_SOURCE
-#endif
-/* Enable OpenBSD compatibility extensions on NetBSD.
- Oddly enough, this does nothing on OpenBSD. */
-#ifndef _OPENBSD_SOURCE
-# undef _OPENBSD_SOURCE
-#endif
-/* Define to 1 if needed for POSIX-compatible behavior. */
-#ifndef _POSIX_SOURCE
-# undef _POSIX_SOURCE
-#endif
-/* Define to 2 if needed for POSIX-compatible behavior. */
-#ifndef _POSIX_1_SOURCE
-# undef _POSIX_1_SOURCE
-#endif
-/* Enable POSIX-compatible threading on Solaris. */
+/* Enable threading extensions on Solaris. */
 #ifndef _POSIX_PTHREAD_SEMANTICS
 # undef _POSIX_PTHREAD_SEMANTICS
 #endif
-/* Enable extensions specified by ISO/IEC TS 18661-5:2014. */
-#ifndef __STDC_WANT_IEC_60559_ATTRIBS_EXT__
-# undef __STDC_WANT_IEC_60559_ATTRIBS_EXT__
-#endif
-/* Enable extensions specified by ISO/IEC TS 18661-1:2014. */
-#ifndef __STDC_WANT_IEC_60559_BFP_EXT__
-# undef __STDC_WANT_IEC_60559_BFP_EXT__
-#endif
-/* Enable extensions specified by ISO/IEC TS 18661-2:2015. */
-#ifndef __STDC_WANT_IEC_60559_DFP_EXT__
-# undef __STDC_WANT_IEC_60559_DFP_EXT__
-#endif
-/* Enable extensions specified by ISO/IEC TS 18661-4:2015. */
-#ifndef __STDC_WANT_IEC_60559_FUNCS_EXT__
-# undef __STDC_WANT_IEC_60559_FUNCS_EXT__
-#endif
-/* Enable extensions specified by ISO/IEC TS 18661-3:2015. */
-#ifndef __STDC_WANT_IEC_60559_TYPES_EXT__
-# undef __STDC_WANT_IEC_60559_TYPES_EXT__
-#endif
-/* Enable extensions specified by ISO/IEC TR 24731-2:2010. */
-#ifndef __STDC_WANT_LIB_EXT2__
-# undef __STDC_WANT_LIB_EXT2__
-#endif
-/* Enable extensions specified by ISO/IEC 24747:2009. */
-#ifndef __STDC_WANT_MATH_SPEC_FUNCS__
-# undef __STDC_WANT_MATH_SPEC_FUNCS__
-#endif
 /* Enable extensions on HP NonStop. */
 #ifndef _TANDEM_SOURCE
 # undef _TANDEM_SOURCE
 #endif
-/* Enable X/Open extensions. Define to 500 only if necessary
- to make mbstate_t available. */
-#ifndef _XOPEN_SOURCE
-# undef _XOPEN_SOURCE
+/* Enable general extensions on Solaris. */
+#ifndef __EXTENSIONS__
+# undef __EXTENSIONS__
 #endif
 
 
@@ -307,11 +227,26 @@
 /* Whether libX11 needs to use MT safe API's */
 #undef XUSE_MTSAFE_API
 
+/* Enable large inode numbers on Mac OS X 10.5. */
+#ifndef _DARWIN_USE_64_BIT_INODE
+# define _DARWIN_USE_64_BIT_INODE 1
+#endif
+
 /* Number of bits in a file offset, on hosts where this is settable. */
 #undef _FILE_OFFSET_BITS
 
 /* Define for large files, on AIX-style hosts. */
 #undef _LARGE_FILES
 
+/* Define to 1 if on MINIX. */
+#undef _MINIX
+
+/* Define to 2 if the system does not provide POSIX.1 features except with
+ this defined. */
+#undef _POSIX_1_SOURCE
+
+/* Define to 1 if you need to in order for `stat' and other things to work. */
+#undef _POSIX_SOURCE
+
 /* Defined if needed to expose struct msghdr.msg_control */
 #undef _XOPEN_SOURCE

_service:tar_scm:libX11-1.8.1.tar.xz/src/globals.c -> _service:tar_scm:libX11-1.8.4.tar.xz/src/globals.c Changed

_service:tar_scm:libX11-1.8.1.tar.xz/src/locking.c -> _service:tar_scm:libX11-1.8.4.tar.xz/src/locking.c Changed

@@ -240,7 +240,9 @@
     if (lock_hist_loc >= LOCK_HIST_SIZE)
 	lock_hist_loc = 0;
 #endif /* XTHREADS_WARN */
-    xmutex_unlock(dpy->lock->mutex);
+
+    if (dpy->in_ifevent == 0 || !xthread_equal(dpy->ifevent_thread, xthread_self()))
+        xmutex_unlock(dpy->lock->mutex);
 }
 
 
@@ -457,17 +459,20 @@
     XTHREADS_FILE_LINE_ARGS
     )
 {
-#ifdef XTHREADS
     struct _XErrorThreadInfo *ti;
-#endif
+
+    if (dpy->in_ifevent && xthread_equal(dpy->ifevent_thread, xthread_self()))
+        return;
+
 #ifdef XTHREADS_WARN
     _XLockDisplayWarn(dpy, file, line);
 #else
     xmutex_lock(dpy->lock->mutex);
 #endif
+
     if (dpy->lock->locking_level > 0)
-	_XDisplayLockWait(dpy);
-#ifdef XTHREADS
+    _XDisplayLockWait(dpy);
+
     /*
      * Skip the two function calls below which may generate requests
      * when LockDisplay is called from within _XError.
@@ -475,7 +480,7 @@
     for (ti = dpy->error_threads; ti; ti = ti->next)
 	    if (ti->error_thread == xthread_self())
 		    return;
-#endif
+
     _XIDHandler(dpy);
     _XSeqSyncFunction(dpy);
 }
@@ -490,6 +495,9 @@
     XTHREADS_FILE_LINE_ARGS
     )
 {
+    if (dpy->in_ifevent && xthread_equal(dpy->ifevent_thread, xthread_self()))
+        return;
+
 #ifdef XTHREADS_WARN
     _XLockDisplayWarn(dpy, file, line);
 #else
@@ -643,9 +651,32 @@
     return 1;
 }
 
+Status XFreeThreads(void)
+{
+    if (global_lock.lock != NULL) {
+	xmutex_free(global_lock.lock);
+	global_lock.lock = NULL;
+    }
+    if (i18n_lock.lock != NULL) {
+	xmutex_free(i18n_lock.lock);
+	i18n_lock.lock = NULL;
+    }
+    if (conv_lock.lock != NULL) {
+	xmutex_free(conv_lock.lock);
+	conv_lock.lock = NULL;
+    }
+
+    return 1;
+}
+
 #else /* XTHREADS */
 Status XInitThreads(void)
 {
     return 0;
 }
+
+Status XFreeThreads(void)
+{
+    return 0;
+}
 #endif /* XTHREADS */

_service:tar_scm:libX11-1.8.1.tar.xz/src/reallocarray.h -> _service:tar_scm:libX11-1.8.4.tar.xz/src/reallocarray.h Changed

_service:tar_scm:libX11-1.8.1.tar.xz/src/util/Makefile.in -> _service:tar_scm:libX11-1.8.4.tar.xz/src/util/Makefile.in Changed

@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.5 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2021 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -126,8 +126,7 @@
 am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src -I$(top_builddir)/include/X11
 depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__maybe_remake_depfiles = depfiles
-am__depfiles_remade = ./$(DEPDIR)/makekeys.Po
+am__depfiles_maybe = depfiles
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -168,6 +167,8 @@
 unique=`for i in $$list; do \
 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
 am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
@@ -194,8 +195,6 @@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS_FOR_BUILD@
 CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
-CSCOPE = @CSCOPE@
-CTAGS = @CTAGS@
 CWARNFLAGS = @CWARNFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
@@ -209,11 +208,9 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ETAGS = @ETAGS@
 EXEEXT = @EXEEXT_FOR_BUILD@
 EXEEXT_FOR_BUILD = @EXEEXT_FOR_BUILD@
 FGREP = @FGREP@
-FILECMD = @FILECMD@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 FOP = @FOP@
@@ -277,6 +274,7 @@
 STRIP = @STRIP@
 STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@
 TRADITIONALCPPFLAGS = @TRADITIONALCPPFLAGS@
+USE_THREAD_LIBS = @USE_THREAD_LIBS@
 VERSION = @VERSION@
 WCHAR32 = @WCHAR32@
 X11_CFLAGS = @X11_CFLAGS@
@@ -347,7 +345,6 @@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
-runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -390,8 +387,8 @@
 	 *config.status*) \
 	 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	 *) \
-	 echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
-	 cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
+	 echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	 cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
 	esac;
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -422,13 +419,7 @@
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/makekeys.Po@am__quote@ # am--include-marker
-
-$(am__depfiles_remade):
-	@$(MKDIR_P) $(@D)
-	@echo '# dummy' >$@-t && $(am__mv) $@-t $@
-
-am--depfiles: $(am__depfiles_remade)
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/makekeys.Po@am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -508,10 +499,8 @@
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-distdir: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) distdir-am
 
-distdir-am: $(DISTFILES)
+distdir: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
@@ -581,7 +570,7 @@
 	mostlyclean-am
 
 distclean: distclean-am
-		-rm -f ./$(DEPDIR)/makekeys.Po
+	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-tags
@@ -627,7 +616,7 @@
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-		-rm -f ./$(DEPDIR)/makekeys.Po
+	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
@@ -648,9 +637,9 @@
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \
-	clean-generic clean-libtool clean-noinstPROGRAMS cscopelist-am \
-	ctags ctags-am distclean distclean-compile distclean-generic \
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-noinstPROGRAMS cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
 	distclean-libtool distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-data \
 	install-data-am install-dvi install-dvi-am install-exec \

_service:tar_scm:libX11-1.8.1.tar.xz/src/xcms/Makefile.in -> _service:tar_scm:libX11-1.8.4.tar.xz/src/xcms/Makefile.in Changed

@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.5 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2021 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -137,39 +137,7 @@
 am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src -I$(top_builddir)/include/X11
 depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__maybe_remake_depfiles = depfiles
-am__depfiles_remade = ./$(DEPDIR)/AddDIC.Plo ./$(DEPDIR)/AddSF.Plo \
-	./$(DEPDIR)/CCC.Plo ./$(DEPDIR)/CvColW.Plo \
-	./$(DEPDIR)/CvCols.Plo ./$(DEPDIR)/HVC.Plo \
-	./$(DEPDIR)/HVCGcC.Plo ./$(DEPDIR)/HVCGcV.Plo \
-	./$(DEPDIR)/HVCGcVC.Plo ./$(DEPDIR)/HVCMnV.Plo \
-	./$(DEPDIR)/HVCMxC.Plo ./$(DEPDIR)/HVCMxV.Plo \
-	./$(DEPDIR)/HVCMxVC.Plo ./$(DEPDIR)/HVCMxVs.Plo \
-	./$(DEPDIR)/HVCWpAj.Plo ./$(DEPDIR)/IdOfPr.Plo \
-	./$(DEPDIR)/LRGB.Plo ./$(DEPDIR)/Lab.Plo \
-	./$(DEPDIR)/LabGcC.Plo ./$(DEPDIR)/LabGcL.Plo \
-	./$(DEPDIR)/LabGcLC.Plo ./$(DEPDIR)/LabMnL.Plo \
-	./$(DEPDIR)/LabMxC.Plo ./$(DEPDIR)/LabMxL.Plo \
-	./$(DEPDIR)/LabMxLC.Plo ./$(DEPDIR)/LabWpAj.Plo \
-	./$(DEPDIR)/Luv.Plo ./$(DEPDIR)/LuvGcC.Plo \
-	./$(DEPDIR)/LuvGcL.Plo ./$(DEPDIR)/LuvGcLC.Plo \
-	./$(DEPDIR)/LuvMnL.Plo ./$(DEPDIR)/LuvMxC.Plo \
-	./$(DEPDIR)/LuvMxL.Plo ./$(DEPDIR)/LuvMxLC.Plo \
-	./$(DEPDIR)/LuvWpAj.Plo ./$(DEPDIR)/OfCCC.Plo \
-	./$(DEPDIR)/PrOfId.Plo ./$(DEPDIR)/QBlack.Plo \
-	./$(DEPDIR)/QBlue.Plo ./$(DEPDIR)/QGreen.Plo \
-	./$(DEPDIR)/QRed.Plo ./$(DEPDIR)/QWhite.Plo \
-	./$(DEPDIR)/QuCol.Plo ./$(DEPDIR)/QuCols.Plo \
-	./$(DEPDIR)/SetCCC.Plo ./$(DEPDIR)/SetGetCols.Plo \
-	./$(DEPDIR)/StCol.Plo ./$(DEPDIR)/StCols.Plo \
-	./$(DEPDIR)/UNDEFINED.Plo ./$(DEPDIR)/XRGB.Plo \
-	./$(DEPDIR)/XYZ.Plo ./$(DEPDIR)/cmsAllCol.Plo \
-	./$(DEPDIR)/cmsAllNCol.Plo ./$(DEPDIR)/cmsCmap.Plo \
-	./$(DEPDIR)/cmsColNm.Plo ./$(DEPDIR)/cmsGlobls.Plo \
-	./$(DEPDIR)/cmsInt.Plo ./$(DEPDIR)/cmsLkCol.Plo \
-	./$(DEPDIR)/cmsMath.Plo ./$(DEPDIR)/cmsProp.Plo \
-	./$(DEPDIR)/cmsTrig.Plo ./$(DEPDIR)/uvY.Plo \
-	./$(DEPDIR)/xyY.Plo
+am__depfiles_maybe = depfiles
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -242,6 +210,8 @@
 unique=`for i in $$list; do \
 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
 am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
@@ -268,8 +238,6 @@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
-CSCOPE = @CSCOPE@
-CTAGS = @CTAGS@
 CWARNFLAGS = @CWARNFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
@@ -283,11 +251,9 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ETAGS = @ETAGS@
 EXEEXT = @EXEEXT@
 EXEEXT_FOR_BUILD = @EXEEXT_FOR_BUILD@
 FGREP = @FGREP@
-FILECMD = @FILECMD@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 FOP = @FOP@
@@ -351,6 +317,7 @@
 STRIP = @STRIP@
 STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@
 TRADITIONALCPPFLAGS = @TRADITIONALCPPFLAGS@
+USE_THREAD_LIBS = @USE_THREAD_LIBS@
 VERSION = @VERSION@
 WCHAR32 = @WCHAR32@
 X11_CFLAGS = @X11_CFLAGS@
@@ -421,7 +388,6 @@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
-runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -544,8 +510,8 @@
 	 *config.status*) \
 	 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	 *) \
-	 echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
-	 cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
+	 echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	 cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
 	esac;
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -577,75 +543,69 @@
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/AddDIC.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/AddSF.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CCC.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CvColW.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CvCols.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/HVC.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/HVCGcC.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/HVCGcV.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/HVCGcVC.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/HVCMnV.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/HVCMxC.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/HVCMxV.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/HVCMxVC.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/HVCMxVs.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/HVCWpAj.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IdOfPr.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LRGB.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Lab.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LabGcC.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LabGcL.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LabGcLC.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LabMnL.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LabMxC.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LabMxL.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LabMxLC.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LabWpAj.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Luv.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LuvGcC.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LuvGcL.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LuvGcLC.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LuvMnL.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LuvMxC.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LuvMxL.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LuvMxLC.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LuvWpAj.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/OfCCC.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PrOfId.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/QBlack.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/QBlue.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/QGreen.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/QRed.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/QWhite.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/QuCol.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/QuCols.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SetCCC.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SetGetCols.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/StCol.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/StCols.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/UNDEFINED.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XRGB.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XYZ.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cmsAllCol.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cmsAllNCol.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cmsCmap.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cmsColNm.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cmsGlobls.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cmsInt.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cmsLkCol.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cmsMath.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cmsProp.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cmsTrig.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uvY.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xyY.Plo@am__quote@ # am--include-marker
-
-$(am__depfiles_remade):
-	@$(MKDIR_P) $(@D)
-	@echo '# dummy' >$@-t && $(am__mv) $@-t $@
-
-am--depfiles: $(am__depfiles_remade)
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/AddDIC.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/AddSF.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CCC.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CvColW.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CvCols.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/HVC.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/HVCGcC.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/HVCGcV.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/HVCGcVC.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/HVCMnV.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/HVCMxC.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/HVCMxV.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/HVCMxVC.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/HVCMxVs.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/HVCWpAj.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IdOfPr.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LRGB.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Lab.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LabGcC.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LabGcL.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LabGcLC.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LabMnL.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LabMxC.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LabMxL.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LabMxLC.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LabWpAj.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Luv.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LuvGcC.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LuvGcL.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LuvGcLC.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LuvMnL.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LuvMxC.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LuvMxL.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LuvMxLC.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LuvWpAj.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/OfCCC.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PrOfId.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/QBlack.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/QBlue.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/QGreen.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/QRed.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/QWhite.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/QuCol.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/QuCols.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SetCCC.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SetGetCols.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/StCol.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/StCols.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/UNDEFINED.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XRGB.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XYZ.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cmsAllCol.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cmsAllNCol.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cmsCmap.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cmsColNm.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cmsGlobls.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cmsInt.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cmsLkCol.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cmsMath.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cmsProp.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cmsTrig.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uvY.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xyY.Plo@am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -746,10 +706,8 @@
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-distdir: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) distdir-am
 
-distdir-am: $(DISTFILES)
+distdir: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
@@ -822,69 +780,7 @@
 	mostlyclean-am
 
 distclean: distclean-am
-		-rm -f ./$(DEPDIR)/AddDIC.Plo
-	-rm -f ./$(DEPDIR)/AddSF.Plo
-	-rm -f ./$(DEPDIR)/CCC.Plo
-	-rm -f ./$(DEPDIR)/CvColW.Plo
-	-rm -f ./$(DEPDIR)/CvCols.Plo
-	-rm -f ./$(DEPDIR)/HVC.Plo
-	-rm -f ./$(DEPDIR)/HVCGcC.Plo
-	-rm -f ./$(DEPDIR)/HVCGcV.Plo
-	-rm -f ./$(DEPDIR)/HVCGcVC.Plo
-	-rm -f ./$(DEPDIR)/HVCMnV.Plo
-	-rm -f ./$(DEPDIR)/HVCMxC.Plo
-	-rm -f ./$(DEPDIR)/HVCMxV.Plo
-	-rm -f ./$(DEPDIR)/HVCMxVC.Plo
-	-rm -f ./$(DEPDIR)/HVCMxVs.Plo
-	-rm -f ./$(DEPDIR)/HVCWpAj.Plo
-	-rm -f ./$(DEPDIR)/IdOfPr.Plo
-	-rm -f ./$(DEPDIR)/LRGB.Plo
-	-rm -f ./$(DEPDIR)/Lab.Plo
-	-rm -f ./$(DEPDIR)/LabGcC.Plo
-	-rm -f ./$(DEPDIR)/LabGcL.Plo
-	-rm -f ./$(DEPDIR)/LabGcLC.Plo
-	-rm -f ./$(DEPDIR)/LabMnL.Plo
-	-rm -f ./$(DEPDIR)/LabMxC.Plo
-	-rm -f ./$(DEPDIR)/LabMxL.Plo
-	-rm -f ./$(DEPDIR)/LabMxLC.Plo
-	-rm -f ./$(DEPDIR)/LabWpAj.Plo
-	-rm -f ./$(DEPDIR)/Luv.Plo
-	-rm -f ./$(DEPDIR)/LuvGcC.Plo
-	-rm -f ./$(DEPDIR)/LuvGcL.Plo
-	-rm -f ./$(DEPDIR)/LuvGcLC.Plo
-	-rm -f ./$(DEPDIR)/LuvMnL.Plo
-	-rm -f ./$(DEPDIR)/LuvMxC.Plo
-	-rm -f ./$(DEPDIR)/LuvMxL.Plo
-	-rm -f ./$(DEPDIR)/LuvMxLC.Plo
-	-rm -f ./$(DEPDIR)/LuvWpAj.Plo
-	-rm -f ./$(DEPDIR)/OfCCC.Plo
-	-rm -f ./$(DEPDIR)/PrOfId.Plo
-	-rm -f ./$(DEPDIR)/QBlack.Plo
-	-rm -f ./$(DEPDIR)/QBlue.Plo
-	-rm -f ./$(DEPDIR)/QGreen.Plo
-	-rm -f ./$(DEPDIR)/QRed.Plo
-	-rm -f ./$(DEPDIR)/QWhite.Plo
-	-rm -f ./$(DEPDIR)/QuCol.Plo
-	-rm -f ./$(DEPDIR)/QuCols.Plo
-	-rm -f ./$(DEPDIR)/SetCCC.Plo
-	-rm -f ./$(DEPDIR)/SetGetCols.Plo
-	-rm -f ./$(DEPDIR)/StCol.Plo
-	-rm -f ./$(DEPDIR)/StCols.Plo
-	-rm -f ./$(DEPDIR)/UNDEFINED.Plo
-	-rm -f ./$(DEPDIR)/XRGB.Plo
-	-rm -f ./$(DEPDIR)/XYZ.Plo
-	-rm -f ./$(DEPDIR)/cmsAllCol.Plo
-	-rm -f ./$(DEPDIR)/cmsAllNCol.Plo
-	-rm -f ./$(DEPDIR)/cmsCmap.Plo
-	-rm -f ./$(DEPDIR)/cmsColNm.Plo
-	-rm -f ./$(DEPDIR)/cmsGlobls.Plo
-	-rm -f ./$(DEPDIR)/cmsInt.Plo
-	-rm -f ./$(DEPDIR)/cmsLkCol.Plo
-	-rm -f ./$(DEPDIR)/cmsMath.Plo
-	-rm -f ./$(DEPDIR)/cmsProp.Plo
-	-rm -f ./$(DEPDIR)/cmsTrig.Plo
-	-rm -f ./$(DEPDIR)/uvY.Plo
-	-rm -f ./$(DEPDIR)/xyY.Plo
+	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-tags
@@ -930,69 +826,7 @@
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-		-rm -f ./$(DEPDIR)/AddDIC.Plo
-	-rm -f ./$(DEPDIR)/AddSF.Plo
-	-rm -f ./$(DEPDIR)/CCC.Plo
-	-rm -f ./$(DEPDIR)/CvColW.Plo
-	-rm -f ./$(DEPDIR)/CvCols.Plo
-	-rm -f ./$(DEPDIR)/HVC.Plo
-	-rm -f ./$(DEPDIR)/HVCGcC.Plo
-	-rm -f ./$(DEPDIR)/HVCGcV.Plo
-	-rm -f ./$(DEPDIR)/HVCGcVC.Plo
-	-rm -f ./$(DEPDIR)/HVCMnV.Plo
-	-rm -f ./$(DEPDIR)/HVCMxC.Plo
-	-rm -f ./$(DEPDIR)/HVCMxV.Plo
-	-rm -f ./$(DEPDIR)/HVCMxVC.Plo
-	-rm -f ./$(DEPDIR)/HVCMxVs.Plo
-	-rm -f ./$(DEPDIR)/HVCWpAj.Plo
-	-rm -f ./$(DEPDIR)/IdOfPr.Plo
-	-rm -f ./$(DEPDIR)/LRGB.Plo
-	-rm -f ./$(DEPDIR)/Lab.Plo
-	-rm -f ./$(DEPDIR)/LabGcC.Plo
-	-rm -f ./$(DEPDIR)/LabGcL.Plo
-	-rm -f ./$(DEPDIR)/LabGcLC.Plo
-	-rm -f ./$(DEPDIR)/LabMnL.Plo
-	-rm -f ./$(DEPDIR)/LabMxC.Plo
-	-rm -f ./$(DEPDIR)/LabMxL.Plo
-	-rm -f ./$(DEPDIR)/LabMxLC.Plo
-	-rm -f ./$(DEPDIR)/LabWpAj.Plo
-	-rm -f ./$(DEPDIR)/Luv.Plo
-	-rm -f ./$(DEPDIR)/LuvGcC.Plo
-	-rm -f ./$(DEPDIR)/LuvGcL.Plo
-	-rm -f ./$(DEPDIR)/LuvGcLC.Plo
-	-rm -f ./$(DEPDIR)/LuvMnL.Plo
-	-rm -f ./$(DEPDIR)/LuvMxC.Plo
-	-rm -f ./$(DEPDIR)/LuvMxL.Plo
-	-rm -f ./$(DEPDIR)/LuvMxLC.Plo
-	-rm -f ./$(DEPDIR)/LuvWpAj.Plo
-	-rm -f ./$(DEPDIR)/OfCCC.Plo
-	-rm -f ./$(DEPDIR)/PrOfId.Plo
-	-rm -f ./$(DEPDIR)/QBlack.Plo
-	-rm -f ./$(DEPDIR)/QBlue.Plo
-	-rm -f ./$(DEPDIR)/QGreen.Plo
-	-rm -f ./$(DEPDIR)/QRed.Plo
-	-rm -f ./$(DEPDIR)/QWhite.Plo
-	-rm -f ./$(DEPDIR)/QuCol.Plo
-	-rm -f ./$(DEPDIR)/QuCols.Plo
-	-rm -f ./$(DEPDIR)/SetCCC.Plo
-	-rm -f ./$(DEPDIR)/SetGetCols.Plo
-	-rm -f ./$(DEPDIR)/StCol.Plo
-	-rm -f ./$(DEPDIR)/StCols.Plo
-	-rm -f ./$(DEPDIR)/UNDEFINED.Plo
-	-rm -f ./$(DEPDIR)/XRGB.Plo
-	-rm -f ./$(DEPDIR)/XYZ.Plo
-	-rm -f ./$(DEPDIR)/cmsAllCol.Plo
-	-rm -f ./$(DEPDIR)/cmsAllNCol.Plo
-	-rm -f ./$(DEPDIR)/cmsCmap.Plo
-	-rm -f ./$(DEPDIR)/cmsColNm.Plo
-	-rm -f ./$(DEPDIR)/cmsGlobls.Plo
-	-rm -f ./$(DEPDIR)/cmsInt.Plo
-	-rm -f ./$(DEPDIR)/cmsLkCol.Plo
-	-rm -f ./$(DEPDIR)/cmsMath.Plo
-	-rm -f ./$(DEPDIR)/cmsProp.Plo
-	-rm -f ./$(DEPDIR)/cmsTrig.Plo
-	-rm -f ./$(DEPDIR)/uvY.Plo
-	-rm -f ./$(DEPDIR)/xyY.Plo
+	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
@@ -1013,12 +847,12 @@
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \
-	clean-generic clean-libtool clean-noinstLTLIBRARIES \
-	cscopelist-am ctags ctags-am distclean distclean-compile \
-	distclean-generic distclean-libtool distclean-tags distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dist_X11DATA install-dvi \
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dist_X11DATA install-dvi \
 	install-dvi-am install-exec install-exec-am install-html \
 	install-html-am install-info install-info-am install-man \
 	install-pdf install-pdf-am install-ps install-ps-am \

_service:tar_scm:libX11-1.8.1.tar.xz/src/xkb/Makefile.in -> _service:tar_scm:libX11-1.8.4.tar.xz/src/xkb/Makefile.in Changed

@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.5 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2021 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -129,18 +129,7 @@
 am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src -I$(top_builddir)/include/X11
 depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__maybe_remake_depfiles = depfiles
-am__depfiles_remade = ./$(DEPDIR)/XKB.Plo ./$(DEPDIR)/XKBAlloc.Plo \
-	./$(DEPDIR)/XKBBell.Plo ./$(DEPDIR)/XKBBind.Plo \
-	./$(DEPDIR)/XKBCompat.Plo ./$(DEPDIR)/XKBCtrls.Plo \
-	./$(DEPDIR)/XKBCvt.Plo ./$(DEPDIR)/XKBExtDev.Plo \
-	./$(DEPDIR)/XKBGAlloc.Plo ./$(DEPDIR)/XKBGeom.Plo \
-	./$(DEPDIR)/XKBGetByName.Plo ./$(DEPDIR)/XKBGetMap.Plo \
-	./$(DEPDIR)/XKBList.Plo ./$(DEPDIR)/XKBMAlloc.Plo \
-	./$(DEPDIR)/XKBMisc.Plo ./$(DEPDIR)/XKBNames.Plo \
-	./$(DEPDIR)/XKBRdBuf.Plo ./$(DEPDIR)/XKBSetGeom.Plo \
-	./$(DEPDIR)/XKBSetMap.Plo ./$(DEPDIR)/XKBUse.Plo \
-	./$(DEPDIR)/XKBleds.Plo
+am__depfiles_maybe = depfiles
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -184,6 +173,8 @@
 unique=`for i in $$list; do \
 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
 am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
@@ -210,8 +201,6 @@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
-CSCOPE = @CSCOPE@
-CTAGS = @CTAGS@
 CWARNFLAGS = @CWARNFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
@@ -225,11 +214,9 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ETAGS = @ETAGS@
 EXEEXT = @EXEEXT@
 EXEEXT_FOR_BUILD = @EXEEXT_FOR_BUILD@
 FGREP = @FGREP@
-FILECMD = @FILECMD@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 FOP = @FOP@
@@ -293,6 +280,7 @@
 STRIP = @STRIP@
 STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@
 TRADITIONALCPPFLAGS = @TRADITIONALCPPFLAGS@
+USE_THREAD_LIBS = @USE_THREAD_LIBS@
 VERSION = @VERSION@
 WCHAR32 = @WCHAR32@
 X11_CFLAGS = @X11_CFLAGS@
@@ -363,7 +351,6 @@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
-runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -440,8 +427,8 @@
 	 *config.status*) \
 	 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	 *) \
-	 echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
-	 cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
+	 echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	 cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
 	esac;
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -473,33 +460,27 @@
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XKB.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XKBAlloc.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XKBBell.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XKBBind.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XKBCompat.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XKBCtrls.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XKBCvt.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XKBExtDev.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XKBGAlloc.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XKBGeom.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XKBGetByName.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XKBGetMap.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XKBList.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XKBMAlloc.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XKBMisc.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XKBNames.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XKBRdBuf.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XKBSetGeom.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XKBSetMap.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XKBUse.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XKBleds.Plo@am__quote@ # am--include-marker
-
-$(am__depfiles_remade):
-	@$(MKDIR_P) $(@D)
-	@echo '# dummy' >$@-t && $(am__mv) $@-t $@
-
-am--depfiles: $(am__depfiles_remade)
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XKB.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XKBAlloc.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XKBBell.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XKBBind.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XKBCompat.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XKBCtrls.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XKBCvt.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XKBExtDev.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XKBGAlloc.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XKBGeom.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XKBGetByName.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XKBGetMap.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XKBList.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XKBMAlloc.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XKBMisc.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XKBNames.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XKBRdBuf.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XKBSetGeom.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XKBSetMap.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XKBUse.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XKBleds.Plo@am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -579,10 +560,8 @@
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-distdir: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) distdir-am
 
-distdir-am: $(DISTFILES)
+distdir: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
@@ -652,27 +631,7 @@
 	mostlyclean-am
 
 distclean: distclean-am
-		-rm -f ./$(DEPDIR)/XKB.Plo
-	-rm -f ./$(DEPDIR)/XKBAlloc.Plo
-	-rm -f ./$(DEPDIR)/XKBBell.Plo
-	-rm -f ./$(DEPDIR)/XKBBind.Plo
-	-rm -f ./$(DEPDIR)/XKBCompat.Plo
-	-rm -f ./$(DEPDIR)/XKBCtrls.Plo
-	-rm -f ./$(DEPDIR)/XKBCvt.Plo
-	-rm -f ./$(DEPDIR)/XKBExtDev.Plo
-	-rm -f ./$(DEPDIR)/XKBGAlloc.Plo
-	-rm -f ./$(DEPDIR)/XKBGeom.Plo
-	-rm -f ./$(DEPDIR)/XKBGetByName.Plo
-	-rm -f ./$(DEPDIR)/XKBGetMap.Plo
-	-rm -f ./$(DEPDIR)/XKBList.Plo
-	-rm -f ./$(DEPDIR)/XKBMAlloc.Plo
-	-rm -f ./$(DEPDIR)/XKBMisc.Plo
-	-rm -f ./$(DEPDIR)/XKBNames.Plo
-	-rm -f ./$(DEPDIR)/XKBRdBuf.Plo
-	-rm -f ./$(DEPDIR)/XKBSetGeom.Plo
-	-rm -f ./$(DEPDIR)/XKBSetMap.Plo
-	-rm -f ./$(DEPDIR)/XKBUse.Plo
-	-rm -f ./$(DEPDIR)/XKBleds.Plo
+	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-tags
@@ -718,27 +677,7 @@
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-		-rm -f ./$(DEPDIR)/XKB.Plo
-	-rm -f ./$(DEPDIR)/XKBAlloc.Plo
-	-rm -f ./$(DEPDIR)/XKBBell.Plo
-	-rm -f ./$(DEPDIR)/XKBBind.Plo
-	-rm -f ./$(DEPDIR)/XKBCompat.Plo
-	-rm -f ./$(DEPDIR)/XKBCtrls.Plo
-	-rm -f ./$(DEPDIR)/XKBCvt.Plo
-	-rm -f ./$(DEPDIR)/XKBExtDev.Plo
-	-rm -f ./$(DEPDIR)/XKBGAlloc.Plo
-	-rm -f ./$(DEPDIR)/XKBGeom.Plo
-	-rm -f ./$(DEPDIR)/XKBGetByName.Plo
-	-rm -f ./$(DEPDIR)/XKBGetMap.Plo
-	-rm -f ./$(DEPDIR)/XKBList.Plo
-	-rm -f ./$(DEPDIR)/XKBMAlloc.Plo
-	-rm -f ./$(DEPDIR)/XKBMisc.Plo
-	-rm -f ./$(DEPDIR)/XKBNames.Plo
-	-rm -f ./$(DEPDIR)/XKBRdBuf.Plo
-	-rm -f ./$(DEPDIR)/XKBSetGeom.Plo
-	-rm -f ./$(DEPDIR)/XKBSetMap.Plo
-	-rm -f ./$(DEPDIR)/XKBUse.Plo
-	-rm -f ./$(DEPDIR)/XKBleds.Plo
+	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
@@ -759,16 +698,16 @@
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \
-	clean-generic clean-libtool clean-noinstLTLIBRARIES \
-	cscopelist-am ctags ctags-am distclean distclean-compile \
-	distclean-generic distclean-libtool distclean-tags distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	tags tags-am uninstall uninstall-am

_service:tar_scm:libX11-1.8.1.tar.xz/src/xkb/XKBBind.c -> _service:tar_scm:libX11-1.8.4.tar.xz/src/xkb/XKBBind.c Changed

@@ -113,36 +113,24 @@
 return NoSymbol;
 
 if (col > 3) {
- int lastSym, tmp, nGrp;
+ int firstSym, nGrp, grp;
 
- lastSym = 3;
+ firstSym = 4;
 nGrp = XkbKeyNumGroups(xkb, kc);
- if ((nGrp > 0) &&
- ((tmp = XkbKeyGroupWidth(xkb, kc, XkbGroup1Index)) > 2)) {
- if (col <= (lastSym + tmp - 2))
- return XkbKeycodeToKeysym(dpy, kc, XkbGroup1Index,
- col - lastSym + 2);
- lastSym += tmp - 2;
- }
- if ((nGrp > 1) &&
- ((tmp = XkbKeyGroupWidth(xkb, kc, XkbGroup2Index)) > 2)) {
- if (col <= (lastSym + tmp - 2))
- return XkbKeycodeToKeysym(dpy, kc, XkbGroup2Index,
- col - lastSym + 2);
- lastSym += tmp - 2;
- }
- if (nGrp > 2) {
- tmp = XkbKeyGroupWidth(xkb, kc, XkbGroup3Index);
- if (col <= lastSym + tmp)
- return XkbKeycodeToKeysym(dpy, kc, XkbGroup3Index,
- col - lastSym);
- lastSym += tmp;
- }
- if (nGrp > 3) {
- tmp = XkbKeyGroupWidth(xkb, kc, XkbGroup4Index);
- if (col <= lastSym + tmp)
- return XkbKeycodeToKeysym(dpy, kc, XkbGroup4Index,
- col - lastSym);
+ for (grp = 0; grp < nGrp; grp++) {
+ int width = XkbKeyGroupWidth(xkb, kc, grp);
+ int skip = 0;
+ if (grp < 2) {
+ /* Skip the first two symbols in the first two groups, since we
+ * return them below for indexes 0-3. */
+ skip = 2;
+ width -= skip;
+ if (width < 0)
+ width = 0;
+ }
+ if (col < firstSym + width)
+ return XkbKeycodeToKeysym(dpy, kc, grp, col - firstSym + skip);
+ firstSym += width;
 }
 return NoSymbol;
 }
@@ -214,6 +202,14 @@
 return mods;
 }
 
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+#elif defined(__GNUC__)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
+
 KeySym
 XLookupKeysym(register XKeyEvent * event, int col)
 {
@@ -223,22 +219,15 @@
 return _XLookupKeysym(event, col);
 _XkbCheckPendingRefresh(dpy, dpy->xkb_info);
 
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-#elif defined(__GNUC__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-#endif
 return XKeycodeToKeysym(dpy, event->keycode, col);
+}
+
 #ifdef __clang__
 #pragma clang diagnostic pop
 #elif defined(__GNUC__)
 #pragma GCC diagnostic pop
 #endif
 
-}
-
 /*
 * Not a public entry point -- XkbTranslateKey is an obsolete name
 * that is preserved here so that functions linked against the old

_service:tar_scm:libX11-1.8.1.tar.xz/src/xkb/XKBNames.c -> _service:tar_scm:libX11-1.8.4.tar.xz/src/xkb/XKBNames.c Changed

_service:tar_scm:libX11-1.8.1.tar.xz/src/xlibi18n/Makefile.in -> _service:tar_scm:libX11-1.8.4.tar.xz/src/xlibi18n/Makefile.in Changed

@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.5 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2021 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -157,22 +157,7 @@
 am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src -I$(top_builddir)/include/X11
 depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__maybe_remake_depfiles = depfiles
-am__depfiles_remade = ./$(DEPDIR)/ICWrap.Plo ./$(DEPDIR)/IMWrap.Plo \
-	./$(DEPDIR)/XDefaultIMIF.Plo ./$(DEPDIR)/XDefaultOMIF.Plo \
-	./$(DEPDIR)/XlcDL.Plo ./$(DEPDIR)/XlcSL.Plo \
-	./$(DEPDIR)/imKStoUCS.Plo ./$(DEPDIR)/lcCT.Plo \
-	./$(DEPDIR)/lcCharSet.Plo ./$(DEPDIR)/lcConv.Plo \
-	./$(DEPDIR)/lcDB.Plo ./$(DEPDIR)/lcDynamic.Plo \
-	./$(DEPDIR)/lcFile.Plo ./$(DEPDIR)/lcGeneric.Plo \
-	./$(DEPDIR)/lcInit.Plo ./$(DEPDIR)/lcPrTxt.Plo \
-	./$(DEPDIR)/lcPubWrap.Plo ./$(DEPDIR)/lcPublic.Plo \
-	./$(DEPDIR)/lcRM.Plo ./$(DEPDIR)/lcStd.Plo \
-	./$(DEPDIR)/lcTxtPr.Plo ./$(DEPDIR)/lcUTF8.Plo \
-	./$(DEPDIR)/lcUtil.Plo ./$(DEPDIR)/lcWrap.Plo \
-	./$(DEPDIR)/mbWMProps.Plo ./$(DEPDIR)/mbWrap.Plo \
-	./$(DEPDIR)/utf8WMProps.Plo ./$(DEPDIR)/utf8Wrap.Plo \
-	./$(DEPDIR)/wcWrap.Plo ./$(DEPDIR)/xim_trans.Plo
+am__depfiles_maybe = depfiles
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -216,6 +201,8 @@
 unique=`for i in $$list; do \
 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
 am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
@@ -242,8 +229,6 @@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
-CSCOPE = @CSCOPE@
-CTAGS = @CTAGS@
 CWARNFLAGS = @CWARNFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
@@ -257,11 +242,9 @@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ETAGS = @ETAGS@
 EXEEXT = @EXEEXT@
 EXEEXT_FOR_BUILD = @EXEEXT_FOR_BUILD@
 FGREP = @FGREP@
-FILECMD = @FILECMD@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 FOP = @FOP@
@@ -325,6 +308,7 @@
 STRIP = @STRIP@
 STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@
 TRADITIONALCPPFLAGS = @TRADITIONALCPPFLAGS@
+USE_THREAD_LIBS = @USE_THREAD_LIBS@
 VERSION = @VERSION@
 WCHAR32 = @WCHAR32@
 X11_CFLAGS = @X11_CFLAGS@
@@ -395,7 +379,6 @@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
-runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -567,8 +550,8 @@
 	 *config.status*) \
 	 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	 *) \
-	 echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
-	 cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
+	 echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	 cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
 	esac;
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -600,42 +583,36 @@
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ICWrap.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IMWrap.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XDefaultIMIF.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XDefaultOMIF.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XlcDL.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XlcSL.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imKStoUCS.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lcCT.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lcCharSet.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lcConv.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lcDB.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lcDynamic.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lcFile.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lcGeneric.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lcInit.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lcPrTxt.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lcPubWrap.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lcPublic.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lcRM.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lcStd.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lcTxtPr.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lcUTF8.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lcUtil.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lcWrap.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mbWMProps.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mbWrap.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utf8WMProps.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utf8Wrap.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wcWrap.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xim_trans.Plo@am__quote@ # am--include-marker
-
-$(am__depfiles_remade):
-	@$(MKDIR_P) $(@D)
-	@echo '# dummy' >$@-t && $(am__mv) $@-t $@
-
-am--depfiles: $(am__depfiles_remade)
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ICWrap.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IMWrap.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XDefaultIMIF.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XDefaultOMIF.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XlcDL.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XlcSL.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imKStoUCS.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lcCT.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lcCharSet.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lcConv.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lcDB.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lcDynamic.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lcFile.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lcGeneric.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lcInit.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lcPrTxt.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lcPubWrap.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lcPublic.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lcRM.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lcStd.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lcTxtPr.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lcUTF8.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lcUtil.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lcWrap.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mbWMProps.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mbWrap.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utf8WMProps.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utf8Wrap.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wcWrap.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xim_trans.Plo@am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -715,10 +692,8 @@
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-distdir: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) distdir-am
 
-distdir-am: $(DISTFILES)
+distdir: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/.^$$\\*/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
@@ -788,36 +763,7 @@
 	mostlyclean-am
 
 distclean: distclean-am
-		-rm -f ./$(DEPDIR)/ICWrap.Plo
-	-rm -f ./$(DEPDIR)/IMWrap.Plo
-	-rm -f ./$(DEPDIR)/XDefaultIMIF.Plo
-	-rm -f ./$(DEPDIR)/XDefaultOMIF.Plo
-	-rm -f ./$(DEPDIR)/XlcDL.Plo
-	-rm -f ./$(DEPDIR)/XlcSL.Plo
-	-rm -f ./$(DEPDIR)/imKStoUCS.Plo
-	-rm -f ./$(DEPDIR)/lcCT.Plo
-	-rm -f ./$(DEPDIR)/lcCharSet.Plo
-	-rm -f ./$(DEPDIR)/lcConv.Plo
-	-rm -f ./$(DEPDIR)/lcDB.Plo
-	-rm -f ./$(DEPDIR)/lcDynamic.Plo
-	-rm -f ./$(DEPDIR)/lcFile.Plo
-	-rm -f ./$(DEPDIR)/lcGeneric.Plo
-	-rm -f ./$(DEPDIR)/lcInit.Plo
-	-rm -f ./$(DEPDIR)/lcPrTxt.Plo
-	-rm -f ./$(DEPDIR)/lcPubWrap.Plo
-	-rm -f ./$(DEPDIR)/lcPublic.Plo
-	-rm -f ./$(DEPDIR)/lcRM.Plo
-	-rm -f ./$(DEPDIR)/lcStd.Plo
-	-rm -f ./$(DEPDIR)/lcTxtPr.Plo
-	-rm -f ./$(DEPDIR)/lcUTF8.Plo
-	-rm -f ./$(DEPDIR)/lcUtil.Plo
-	-rm -f ./$(DEPDIR)/lcWrap.Plo
-	-rm -f ./$(DEPDIR)/mbWMProps.Plo
-	-rm -f ./$(DEPDIR)/mbWrap.Plo
-	-rm -f ./$(DEPDIR)/utf8WMProps.Plo
-	-rm -f ./$(DEPDIR)/utf8Wrap.Plo
-	-rm -f ./$(DEPDIR)/wcWrap.Plo
-	-rm -f ./$(DEPDIR)/xim_trans.Plo
+	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-tags
@@ -863,36 +809,7 @@
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-		-rm -f ./$(DEPDIR)/ICWrap.Plo
-	-rm -f ./$(DEPDIR)/IMWrap.Plo
-	-rm -f ./$(DEPDIR)/XDefaultIMIF.Plo
-	-rm -f ./$(DEPDIR)/XDefaultOMIF.Plo
-	-rm -f ./$(DEPDIR)/XlcDL.Plo
-	-rm -f ./$(DEPDIR)/XlcSL.Plo
-	-rm -f ./$(DEPDIR)/imKStoUCS.Plo
-	-rm -f ./$(DEPDIR)/lcCT.Plo
-	-rm -f ./$(DEPDIR)/lcCharSet.Plo
-	-rm -f ./$(DEPDIR)/lcConv.Plo
-	-rm -f ./$(DEPDIR)/lcDB.Plo
-	-rm -f ./$(DEPDIR)/lcDynamic.Plo
-	-rm -f ./$(DEPDIR)/lcFile.Plo
-	-rm -f ./$(DEPDIR)/lcGeneric.Plo
-	-rm -f ./$(DEPDIR)/lcInit.Plo
-	-rm -f ./$(DEPDIR)/lcPrTxt.Plo
-	-rm -f ./$(DEPDIR)/lcPubWrap.Plo
-	-rm -f ./$(DEPDIR)/lcPublic.Plo
-	-rm -f ./$(DEPDIR)/lcRM.Plo
-	-rm -f ./$(DEPDIR)/lcStd.Plo
-	-rm -f ./$(DEPDIR)/lcTxtPr.Plo
-	-rm -f ./$(DEPDIR)/lcUTF8.Plo
-	-rm -f ./$(DEPDIR)/lcUtil.Plo
-	-rm -f ./$(DEPDIR)/lcWrap.Plo
-	-rm -f ./$(DEPDIR)/mbWMProps.Plo
-	-rm -f ./$(DEPDIR)/mbWrap.Plo
-	-rm -f ./$(DEPDIR)/utf8WMProps.Plo
-	-rm -f ./$(DEPDIR)/utf8Wrap.Plo
-	-rm -f ./$(DEPDIR)/wcWrap.Plo
-	-rm -f ./$(DEPDIR)/xim_trans.Plo
+	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
@@ -913,16 +830,16 @@
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \
-	clean-generic clean-libtool clean-noinstLTLIBRARIES \
-	cscopelist-am ctags ctags-am distclean distclean-compile \
-	distclean-generic distclean-libtool distclean-tags distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	tags tags-am uninstall uninstall-am

_service:tar_scm:libX11-1.8.1.tar.xz/src/xlibi18n/XDefaultIMIF.c -> _service:tar_scm:libX11-1.8.4.tar.xz/src/xlibi18n/XDefaultIMIF.c Changed

_service:tar_scm:libX11-1.8.1.tar.xz/src/xlibi18n/XDefaultOMIF.c -> _service:tar_scm:libX11-1.8.4.tar.xz/src/xlibi18n/XDefaultOMIF.c Changed

_service:tar_scm:libX11-1.8.1.tar.xz/src/xlibi18n/XimTrInt.h -> _service:tar_scm:libX11-1.8.4.tar.xz/src/xlibi18n/XimTrInt.h Changed

_service:tar_scm:libX11-1.8.1.tar.xz/src/xlibi18n/XimTrX.h -> _service:tar_scm:libX11-1.8.4.tar.xz/src/xlibi18n/XimTrX.h Changed

_service:tar_scm:libX11-1.8.1.tar.xz/src/xlibi18n/XimTrans.h -> _service:tar_scm:libX11-1.8.4.tar.xz/src/xlibi18n/XimTrans.h Changed

_service:tar_scm:libX11-1.8.1.tar.xz/src/xlibi18n/XimintP.h -> _service:tar_scm:libX11-1.8.4.tar.xz/src/xlibi18n/XimintP.h Changed

_service:tar_scm:libX11-1.8.1.tar.xz/src/xlibi18n/XlcDL.c -> _service:tar_scm:libX11-1.8.4.tar.xz/src/xlibi18n/XlcDL.c Changed

_service:tar_scm:libX11-1.8.1.tar.xz/src/xlibi18n/XlcSL.c -> _service:tar_scm:libX11-1.8.4.tar.xz/src/xlibi18n/XlcSL.c Changed

_service:tar_scm:libX11-1.8.1.tar.xz/src/xlibi18n/lcFile.c -> _service:tar_scm:libX11-1.8.4.tar.xz/src/xlibi18n/lcFile.c Changed

_service:tar_scm:libX11-1.8.1.tar.xz/src/xlibi18n/lcInit.c -> _service:tar_scm:libX11-1.8.4.tar.xz/src/xlibi18n/lcInit.c Changed

_service:tar_scm:libX11-1.8.1.tar.xz/test-driver -> _service:tar_scm:libX11-1.8.4.tar.xz/test-driver Changed

@@ -1,9 +1,9 @@
 #! /bin/sh
 # test-driver - basic testsuite driver script.
 
-scriptversion=2018-03-07.03; # UTC
+scriptversion=2013-07-13.22; # UTC
 
-# Copyright (C) 2011-2021 Free Software Foundation, Inc.
+# Copyright (C) 2011-2014 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program. If not, see <https://www.gnu.org/licenses/>.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -42,13 +42,11 @@
 {
 cat <<END
 Usage:
- test-driver --test-name NAME --log-file PATH --trs-file PATH
- --expect-failure {yes|no} --color-tests {yes|no}
- --enable-hard-errors {yes|no} --
+ test-driver --test-name=NAME --log-file=PATH --trs-file=PATH
+ --expect-failure={yes|no} --color-tests={yes|no}
+ --enable-hard-errors={yes|no} --
 TEST-SCRIPT TEST-SCRIPT-ARGUMENTS
-
 The '--test-name', '--log-file' and '--trs-file' options are mandatory.
-See the GNU Automake documentation for information.
 END
 }
 
@@ -105,11 +103,8 @@
 trap "st=141; $do_exit" 13
 trap "st=143; $do_exit" 15
 
-# Test script is run here. We create the file first, then append to it,
-# to ameliorate tests themselves also writing to the log file. Our tests
-# don't, but others can (automake bug#35762).
-: >"$log_file"
-"$@" >>"$log_file" 2>&1
+# Test script is run here.
+"$@" >$log_file 2>&1
 estatus=$?
 
 if test $enable_hard_errors = no && test $estatus -eq 99; then
@@ -131,7 +126,7 @@
 # know whether the test passed or failed simply by looking at the '.log'
 # file, without the need of also peaking into the corresponding '.trs'
 # file (automake bug#11814).
-echo "$res $test_name (exit status: $estatus)" >>"$log_file"
+echo "$res $test_name (exit status: $estatus)" >>$log_file
 
 # Report outcome to console.
 echo "${col}${res}${std}: $test_name"
@@ -145,9 +140,9 @@
 # Local Variables:
 # mode: shell-script
 # sh-indentation: 2
-# eval: (add-hook 'before-save-hook 'time-stamp)
+# eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC0"
+# time-stamp-time-zone: "UTC"
 # time-stamp-end: "; # UTC"
 # End:

Changes of Revision 2