diff --git a/CVE-2024-5642-OpenSSL-API-buf-overread-NPN.patch b/CVE-2024-5642-OpenSSL-API-buf-overread-NPN.patch new file mode 100644 index 0000000..18ba7b8 --- /dev/null +++ b/CVE-2024-5642-OpenSSL-API-buf-overread-NPN.patch @@ -0,0 +1,23438 @@ +From 3ddf7fa83b19463e710b75ae6e8a28831e575f3d Mon Sep 17 00:00:00 2001 +From: Christian Heimes +Date: Wed, 28 Oct 2020 09:26:39 +0100 +Subject: [PATCH] PEP-644: Require OpenSSL 1.1.1 or newer + +- Remove HAVE_X509_VERIFY_PARAM_SET1_HOST check +- Update hashopenssl to require OpenSSL 1.1.1 +- multissltests only OpenSSL > 1.1.0 +- ALPN is always supported +- SNI is always supported +- Remove deprecated NPN code. Python wrappers are no-op. +- ECDH is always supported +- Remove OPENSSL_VERSION_1_1 macro +- Remove locking callbacks +- Drop PY_OPENSSL_1_1_API macro +- Drop HAVE_SSL_CTX_CLEAR_OPTIONS macro +- SSL_CTRL_GET_MAX_PROTO_VERSION is always defined now +- security level is always available now +- get_num_tickets is available with TLS 1.3 +- X509_V_ERR MISMATCH is always available now +- Always set SSL_MODE_RELEASE_BUFFERS +- X509_V_FLAG_TRUSTED_FIRST is always available +- get_ciphers is always supported +- SSL_CTX_set_keylog_callback is always available +- Update Modules/Setup with static link example +- Mention PEP in whatsnew +- Drop 1.0.2 and 1.1.0 from GHA tests +--- + .github/workflows/build.yml | 2 +- + Doc/using/unix.rst | 1 + + Doc/whatsnew/3.10.rst | 6 +- + Lib/ssl.py | 10 +- + Lib/test/test_ssl.py | 119 +- + .../2021-03-30-14-19-39.bpo-43669.lWMUYx.rst | 1 + + Modules/Setup | 22 +- + Modules/_hashopenssl.c | 66 +- + Modules/_ssl.c | 537 +- + Modules/_ssl/debughelpers.c | 4 - + Modules/clinic/_hashopenssl.c.h | 14 +- + Modules/clinic/_ssl.c.h | 87 +- + Tools/ssl/multissltests.py | 6 +- + configure | 12795 +++++++--------- + configure.ac | 36 - + pyconfig.h.in | 3 - + setup.py | 41 +- + 17 files changed, 5310 insertions(+), 8440 deletions(-) + create mode 100644 Misc/NEWS.d/next/Build/2021-03-30-14-19-39.bpo-43669.lWMUYx.rst + +diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml +index c6e6ce3085415c..333c508ef53a79 100644 +--- a/.github/workflows/build.yml ++++ b/.github/workflows/build.yml +@@ -177,7 +177,7 @@ jobs: + strategy: + fail-fast: false + matrix: +- openssl_ver: [1.0.2u, 1.1.0l, 1.1.1k, 3.0.0-alpha14] ++ openssl_ver: [1.1.1k, 3.0.0-alpha14] + env: + OPENSSL_VER: ${{ matrix.openssl_ver }} + MULTISSL_DIR: ${{ github.workspace }}/multissl +diff --git a/Doc/using/unix.rst b/Doc/using/unix.rst +index 09dd5b0ac6e909..1d1fa8bd85d7ed 100644 +--- a/Doc/using/unix.rst ++++ b/Doc/using/unix.rst +@@ -135,6 +135,7 @@ some Unices may not have the :program:`env` command, so you may need to hardcode + + To use shell commands in your Python scripts, look at the :mod:`subprocess` module. + ++.. _unix_custom_openssl: + + Custom OpenSSL + ============== +diff --git a/Doc/whatsnew/3.10.rst b/Doc/whatsnew/3.10.rst +index 6623adfbf4f3d3..0198b6e75deab3 100644 +--- a/Doc/whatsnew/3.10.rst ++++ b/Doc/whatsnew/3.10.rst +@@ -65,6 +65,7 @@ Summary -- Release highlights + + .. PEP-sized items next. + ++* :pep:`644`, require OpenSSL 1.1.1 or newer + + + New Features +@@ -1438,6 +1439,10 @@ CPython bytecode changes + Build Changes + ============= + ++* :pep:`644`: Python now requires OpenSSL 1.1.1 or newer. OpenSSL 1.0.2 is no ++ longer supported. ++ (Contributed by Christian Heimes in :issue:`43669`.) ++ + * The C99 functions :c:func:`snprintf` and :c:func:`vsnprintf` are now required + to build Python. + (Contributed by Victor Stinner in :issue:`36020`.) +@@ -1483,7 +1488,6 @@ Build Changes + (Contributed by Christian Heimes in :issue:`43466`.) + + +- + C API Changes + ============= + +diff --git a/Lib/ssl.py b/Lib/ssl.py +index 30f4e5934febf9..9c1ba581dd66f5 100644 +--- a/Lib/ssl.py ++++ b/Lib/ssl.py +@@ -909,15 +909,12 @@ def selected_npn_protocol(self): + """Return the currently selected NPN protocol as a string, or ``None`` + if a next protocol was not negotiated or if NPN is not supported by one + of the peers.""" +- if _ssl.HAS_NPN: +- return self._sslobj.selected_npn_protocol() + + def selected_alpn_protocol(self): + """Return the currently selected ALPN protocol as a string, or ``None`` + if a next protocol was not negotiated or if ALPN is not supported by one + of the peers.""" +- if _ssl.HAS_ALPN: +- return self._sslobj.selected_alpn_protocol() ++ return self._sslobj.selected_alpn_protocol() + + def cipher(self): + """Return the currently selected cipher as a 3-tuple ``(name, +@@ -1126,10 +1123,7 @@ def getpeercert(self, binary_form=False): + @_sslcopydoc + def selected_npn_protocol(self): + self._checkClosed() +- if self._sslobj is None or not _ssl.HAS_NPN: +- return None +- else: +- return self._sslobj.selected_npn_protocol() ++ return None + + @_sslcopydoc + def selected_alpn_protocol(self): +diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py +index 54007c78ed31ae..3ad14c63968e64 100644 +--- a/Lib/test/test_ssl.py ++++ b/Lib/test/test_ssl.py +@@ -40,7 +40,6 @@ + PROTOCOLS = sorted(ssl._PROTOCOL_NAMES) + HOST = socket_helper.HOST + IS_LIBRESSL = ssl.OPENSSL_VERSION.startswith('LibreSSL') +-IS_OPENSSL_1_1_0 = not IS_LIBRESSL and ssl.OPENSSL_VERSION_INFO >= (1, 1, 0) + IS_OPENSSL_1_1_1 = not IS_LIBRESSL and ssl.OPENSSL_VERSION_INFO >= (1, 1, 1) + IS_OPENSSL_3_0_0 = not IS_LIBRESSL and ssl.OPENSSL_VERSION_INFO >= (3, 0, 0) + PY_SSL_DEFAULT_CIPHERS = sysconfig.get_config_var('PY_SSL_DEFAULT_CIPHERS') +@@ -270,18 +269,6 @@ def handle_error(prefix): + if support.verbose: + sys.stdout.write(prefix + exc_format) + +-def can_clear_options(): +- # 0.9.8m or higher +- return ssl._OPENSSL_API_VERSION >= (0, 9, 8, 13, 15) +- +-def no_sslv2_implies_sslv3_hello(): +- # 0.9.7h or higher +- return ssl.OPENSSL_VERSION_INFO >= (0, 9, 7, 8, 15) +- +-def have_verify_flags(): +- # 0.9.8 or higher +- return ssl.OPENSSL_VERSION_INFO >= (0, 9, 8, 0, 15) +- + def _have_secp_curves(): + if not ssl.HAS_ECDH: + return False +@@ -372,17 +359,15 @@ def test_constants(self): + ssl.OP_SINGLE_DH_USE + if ssl.HAS_ECDH: + ssl.OP_SINGLE_ECDH_USE +- if ssl.OPENSSL_VERSION_INFO >= (1, 0): +- ssl.OP_NO_COMPRESSION ++ ssl.OP_NO_COMPRESSION + self.assertIn(ssl.HAS_SNI, {True, False}) + self.assertIn(ssl.HAS_ECDH, {True, False}) + ssl.OP_NO_SSLv2 + ssl.OP_NO_SSLv3 + ssl.OP_NO_TLSv1 + ssl.OP_NO_TLSv1_3 +- if ssl.OPENSSL_VERSION_INFO >= (1, 0, 1): +- ssl.OP_NO_TLSv1_1 +- ssl.OP_NO_TLSv1_2 ++ ssl.OP_NO_TLSv1_1 ++ ssl.OP_NO_TLSv1_2 + self.assertEqual(ssl.PROTOCOL_TLS, ssl.PROTOCOL_SSLv23) + + def test_private_init(self): +@@ -1161,7 +1146,6 @@ def test_python_ciphers(self): + self.assertNotIn("RC4", name) + self.assertNotIn("3DES", name) + +- @unittest.skipIf(ssl.OPENSSL_VERSION_INFO < (1, 0, 2, 0, 0), 'OpenSSL too old') + def test_get_ciphers(self): + ctx = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT) + ctx.set_ciphers('AESGCM') +@@ -1181,15 +1165,11 @@ def test_options(self): + self.assertEqual(default, ctx.options) + ctx.options |= ssl.OP_NO_TLSv1 + self.assertEqual(default | ssl.OP_NO_TLSv1, ctx.options) +- if can_clear_options(): +- ctx.options = (ctx.options & ~ssl.OP_NO_TLSv1) +- self.assertEqual(default, ctx.options) +- ctx.options = 0 +- # Ubuntu has OP_NO_SSLv3 forced on by default +- self.assertEqual(0, ctx.options & ~ssl.OP_NO_SSLv3) +- else: +- with self.assertRaises(ValueError): +- ctx.options = 0 ++ ctx.options = (ctx.options & ~ssl.OP_NO_TLSv1) ++ self.assertEqual(default, ctx.options) ++ ctx.options = 0 ++ # Ubuntu has OP_NO_SSLv3 forced on by default ++ self.assertEqual(0, ctx.options & ~ssl.OP_NO_SSLv3) + + def test_verify_mode_protocol(self): + ctx = ssl.SSLContext(ssl.PROTOCOL_TLS) +@@ -1327,8 +1307,6 @@ def test_security_level(self): + } + self.assertIn(ctx.security_level, security_level_range) + +- @unittest.skipUnless(have_verify_flags(), +- "verify_flags need OpenSSL > 0.9.8") + def test_verify_flags(self): + ctx = ssl.SSLContext(ssl.PROTOCOL_TLS_SERVER) + # default value +@@ -1797,7 +1775,6 @@ class MySSLObject(ssl.SSLObject): + obj = ctx.wrap_bio(ssl.MemoryBIO(), ssl.MemoryBIO()) + self.assertIsInstance(obj, MySSLObject) + +- @unittest.skipUnless(IS_OPENSSL_1_1_1, "Test requires OpenSSL 1.1.1") + def test_num_tickest(self): + ctx = ssl.SSLContext(ssl.PROTOCOL_TLS_SERVER) + self.assertEqual(ctx.num_tickets, 2) +@@ -2956,8 +2933,6 @@ def test_getpeercert(self): + after = ssl.cert_time_to_seconds(cert['notAfter']) + self.assertLess(before, after) + +- @unittest.skipUnless(have_verify_flags(), +- "verify_flags need OpenSSL > 0.9.8") + def test_crl_check(self): + if support.verbose: + sys.stdout.write("\n") +@@ -3859,12 +3834,7 @@ def test_version_basic(self): + self.assertIs(s.version(), None) + self.assertIs(s._sslobj, None) + s.connect((HOST, server.port)) +- if IS_OPENSSL_1_1_1 and has_tls_version('TLSv1_3'): +- self.assertEqual(s.version(), 'TLSv1.3') +- elif ssl.OPENSSL_VERSION_INFO >= (1, 0, 2): +- self.assertEqual(s.version(), 'TLSv1.2') +- else: # 0.9.8 to 1.0.1 +- self.assertIn(s.version(), ('TLSv1', 'TLSv1.2')) ++ self.assertEqual(s.version(), 'TLSv1.3') + self.assertIs(s._sslobj, None) + self.assertIs(s.version(), None) + +@@ -3966,8 +3936,6 @@ def test_default_ecdh_curve(self): + # explicitly using the 'ECCdraft' cipher alias. Otherwise, + # our default cipher list should prefer ECDH-based ciphers + # automatically. +- if ssl.OPENSSL_VERSION_INFO < (1, 0, 0): +- context.set_ciphers("ECCdraft:ECDH") + with ThreadedEchoServer(context=context) as server: + with context.wrap_socket(socket.socket()) as s: + s.connect((HOST, server.port)) +@@ -4099,15 +4067,11 @@ def test_ecdh_curve(self): + server_context.set_ciphers("ECDHE:!eNULL:!aNULL") + server_context.options |= ssl.OP_NO_TLSv1 | ssl.OP_NO_TLSv1_1 + try: +- stats = server_params_test(client_context, server_context, +- chatty=True, connectionchatty=True, +- sni_name=hostname) ++ server_params_test(client_context, server_context, ++ chatty=True, connectionchatty=True, ++ sni_name=hostname) + except ssl.SSLError: +- pass +- else: +- # OpenSSL 1.0.2 does not fail although it should. +- if IS_OPENSSL_1_1_0: +- self.fail("mismatch curve did not fail") ++ self.fail("mismatch curve did not fail") + + def test_selected_alpn_protocol(self): + # selected_alpn_protocol() is None unless ALPN is used. +@@ -4117,7 +4081,6 @@ def test_selected_alpn_protocol(self): + sni_name=hostname) + self.assertIs(stats['client_alpn_protocol'], None) + +- @unittest.skipUnless(ssl.HAS_ALPN, "ALPN support required") + def test_selected_alpn_protocol_if_server_uses_alpn(self): + # selected_alpn_protocol() is None unless ALPN is used by the client. + client_context, server_context, hostname = testing_context() +@@ -4127,7 +4090,6 @@ def test_selected_alpn_protocol_if_server_uses_alpn(self): + sni_name=hostname) + self.assertIs(stats['client_alpn_protocol'], None) + +- @unittest.skipUnless(ssl.HAS_ALPN, "ALPN support needed for this test") + def test_alpn_protocols(self): + server_protocols = ['foo', 'bar', 'milkshake'] + protocol_tests = [ +@@ -4150,22 +4112,17 @@ def test_alpn_protocols(self): + except ssl.SSLError as e: + stats = e + +- if (expected is None and IS_OPENSSL_1_1_0 +- and ssl.OPENSSL_VERSION_INFO < (1, 1, 0, 6)): +- # OpenSSL 1.1.0 to 1.1.0e raises handshake error +- self.assertIsInstance(stats, ssl.SSLError) +- else: +- msg = "failed trying %s (s) and %s (c).\n" \ +- "was expecting %s, but got %%s from the %%s" \ +- % (str(server_protocols), str(client_protocols), +- str(expected)) +- client_result = stats['client_alpn_protocol'] +- self.assertEqual(client_result, expected, +- msg % (client_result, "client")) +- server_result = stats['server_alpn_protocols'][-1] \ +- if len(stats['server_alpn_protocols']) else 'nothing' +- self.assertEqual(server_result, expected, +- msg % (server_result, "server")) ++ msg = "failed trying %s (s) and %s (c).\n" \ ++ "was expecting %s, but got %%s from the %%s" \ ++ % (str(server_protocols), str(client_protocols), ++ str(expected)) ++ client_result = stats['client_alpn_protocol'] ++ self.assertEqual(client_result, expected, ++ msg % (client_result, "client")) ++ server_result = stats['server_alpn_protocols'][-1] \ ++ if len(stats['server_alpn_protocols']) else 'nothing' ++ self.assertEqual(server_result, expected, ++ msg % (server_result, "server")) + + def test_selected_npn_protocol(self): + # selected_npn_protocol() is None unless NPN is used +@@ -4175,31 +4132,8 @@ def test_selected_npn_protocol(self): + sni_name=hostname) + self.assertIs(stats['client_npn_protocol'], None) + +- @unittest.skipUnless(ssl.HAS_NPN, "NPN support needed for this test") + def test_npn_protocols(self): +- server_protocols = ['http/1.1', 'spdy/2'] +- protocol_tests = [ +- (['http/1.1', 'spdy/2'], 'http/1.1'), +- (['spdy/2', 'http/1.1'], 'http/1.1'), +- (['spdy/2', 'test'], 'spdy/2'), +- (['abc', 'def'], 'abc') +- ] +- for client_protocols, expected in protocol_tests: +- client_context, server_context, hostname = testing_context() +- server_context.set_npn_protocols(server_protocols) +- client_context.set_npn_protocols(client_protocols) +- stats = server_params_test(client_context, server_context, +- chatty=True, connectionchatty=True, +- sni_name=hostname) +- msg = "failed trying %s (s) and %s (c).\n" \ +- "was expecting %s, but got %%s from the %%s" \ +- % (str(server_protocols), str(client_protocols), +- str(expected)) +- client_result = stats['client_npn_protocol'] +- self.assertEqual(client_result, expected, msg % (client_result, "client")) +- server_result = stats['server_npn_protocols'][-1] \ +- if len(stats['server_npn_protocols']) else 'nothing' +- self.assertEqual(server_result, expected, msg % (server_result, "server")) ++ assert not ssl.HAS_NPN + + def sni_contexts(self): + server_context = ssl.SSLContext(ssl.PROTOCOL_TLS_SERVER) +@@ -4369,8 +4303,7 @@ def test_session(self): + self.assertGreater(session.time, 0) + self.assertGreater(session.timeout, 0) + self.assertTrue(session.has_ticket) +- if ssl.OPENSSL_VERSION_INFO > (1, 0, 1): +- self.assertGreater(session.ticket_lifetime_hint, 0) ++ self.assertGreater(session.ticket_lifetime_hint, 0) + self.assertFalse(stats['session_reused']) + sess_stat = server_context.session_stats() + self.assertEqual(sess_stat['accept'], 1) +diff --git a/Misc/NEWS.d/next/Build/2021-03-30-14-19-39.bpo-43669.lWMUYx.rst b/Misc/NEWS.d/next/Build/2021-03-30-14-19-39.bpo-43669.lWMUYx.rst +new file mode 100644 +index 00000000000000..48c74813daa903 +--- /dev/null ++++ b/Misc/NEWS.d/next/Build/2021-03-30-14-19-39.bpo-43669.lWMUYx.rst +@@ -0,0 +1 @@ ++Implement :pep:`644`. Python now requires OpenSSL 1.1.1 or newer. +diff --git a/Modules/Setup b/Modules/Setup +index a5fbaf6381be5d..cce78582a1e28a 100644 +--- a/Modules/Setup ++++ b/Modules/Setup +@@ -207,11 +207,23 @@ _symtable symtablemodule.c + #_socket socketmodule.c + + # Socket module helper for SSL support; you must comment out the other +-# socket line above, and possibly edit the SSL variable: +-#SSL=/usr/local/ssl +-#_ssl _ssl.c \ +-# -DUSE_SSL -I$(SSL)/include -I$(SSL)/include/openssl \ +-# -L$(SSL)/lib -lssl -lcrypto ++# socket line above, and edit the OPENSSL variable: ++# OPENSSL=/path/to/openssl/directory ++# _ssl _ssl.c \ ++# -I$(OPENSSL)/include -L$(OPENSSL)/lib \ ++# -lssl -lcrypto ++#_hashlib _hashopenssl.c \ ++# -I$(OPENSSL)/include -L$(OPENSSL)/lib \ ++# -lcrypto ++ ++# To statically link OpenSSL: ++# _ssl _ssl.c \ ++# -I$(OPENSSL)/include -L$(OPENSSL)/lib \ ++# -l:libssl.a -Wl,--exclude-libs,libssl.a \ ++# -l:libcrypto.a -Wl,--exclude-libs,libcrypto.a ++#_hashlib _hashopenssl.c \ ++# -I$(OPENSSL)/include -L$(OPENSSL)/lib \ ++# -l:libcrypto.a -Wl,--exclude-libs,libcrypto.a + + # The crypt module is now disabled by default because it breaks builds + # on many systems (where -lcrypt is needed), e.g. Linux (I believe). +diff --git a/Modules/_hashopenssl.c b/Modules/_hashopenssl.c +index 272df354e6702b..870ee89fdafc63 100644 +--- a/Modules/_hashopenssl.c ++++ b/Modules/_hashopenssl.c +@@ -38,51 +38,12 @@ + # error "OPENSSL_THREADS is not defined, Python requires thread-safe OpenSSL" + #endif + +-#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) +-/* OpenSSL < 1.1.0 */ +-#define EVP_MD_CTX_new EVP_MD_CTX_create +-#define EVP_MD_CTX_free EVP_MD_CTX_destroy +- +-HMAC_CTX * +-HMAC_CTX_new(void) +-{ +- HMAC_CTX *ctx = OPENSSL_malloc(sizeof(HMAC_CTX)); +- if (ctx != NULL) { +- memset(ctx, 0, sizeof(HMAC_CTX)); +- HMAC_CTX_init(ctx); +- } +- return ctx; +-} +- +-void +-HMAC_CTX_free(HMAC_CTX *ctx) +-{ +- if (ctx != NULL) { +- HMAC_CTX_cleanup(ctx); +- OPENSSL_free(ctx); +- } +-} +- +-const EVP_MD * +-HMAC_CTX_get_md(const HMAC_CTX *ctx) +-{ +- return ctx->md; +-} +-#endif +- + #define MUNCH_SIZE INT_MAX + +-#ifdef NID_sha3_224 ++#define PY_OPENSSL_HAS_SCRYPT 1 + #define PY_OPENSSL_HAS_SHA3 1 +-#endif +- +-#if defined(EVP_MD_FLAG_XOF) && defined(NID_shake128) + #define PY_OPENSSL_HAS_SHAKE 1 +-#endif +- +-#if defined(NID_blake2b512) && !defined(OPENSSL_NO_BLAKE2) + #define PY_OPENSSL_HAS_BLAKE2 1 +-#endif + + static PyModuleDef _hashlibmodule; + +@@ -1252,8 +1213,7 @@ pbkdf2_hmac_impl(PyObject *module, const char *hash_name, + return key_obj; + } + +-#if OPENSSL_VERSION_NUMBER > 0x10100000L && !defined(OPENSSL_NO_SCRYPT) && !defined(LIBRESSL_VERSION_NUMBER) +-#define PY_SCRYPT 1 ++#ifdef PY_OPENSSL_HAS_SCRYPT + + /* XXX: Parameters salt, n, r and p should be required keyword-only parameters. + They are optional in the Argument Clinic declaration only due to a +@@ -1376,7 +1336,7 @@ _hashlib_scrypt_impl(PyObject *module, Py_buffer *password, Py_buffer *salt, + } + return key_obj; + } +-#endif ++#endif /* PY_OPENSSL_HAS_SCRYPT */ + + /* Fast HMAC for hmac.digest() + */ +@@ -1844,12 +1804,6 @@ hashlib_md_meth_names(PyObject *module) + return 0; + } + +-/* LibreSSL doesn't support FIPS: +- https://marc.info/?l=openbsd-misc&m=139819485423701&w=2 +- +- Ted Unangst wrote: "I figured I should mention our current libressl policy +- wrt FIPS mode. It's gone and it's not coming back." */ +-#ifndef LIBRESSL_VERSION_NUMBER + /*[clinic input] + _hashlib.get_fips_mode -> int + +@@ -1887,7 +1841,6 @@ _hashlib_get_fips_mode_impl(PyObject *module) + return result; + #endif + } +-#endif // !LIBRESSL_VERSION_NUMBER + + + static int +@@ -2067,17 +2020,6 @@ hashlib_free(void *m) + } + + /* Py_mod_exec functions */ +-static int +-hashlib_openssl_legacy_init(PyObject *module) +-{ +-#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) +- /* Load all digest algorithms and initialize cpuid */ +- OPENSSL_add_all_algorithms_noconf(); +- ERR_load_crypto_strings(); +-#endif +- return 0; +-} +- + static int + hashlib_init_evptype(PyObject *module) + { +@@ -2200,8 +2142,6 @@ hashlib_exception(PyObject *module) + + + static PyModuleDef_Slot hashlib_slots[] = { +- /* OpenSSL 1.0.2 and LibreSSL */ +- {Py_mod_exec, hashlib_openssl_legacy_init}, + {Py_mod_exec, hashlib_init_evptype}, + {Py_mod_exec, hashlib_init_evpxoftype}, + {Py_mod_exec, hashlib_init_hmactype}, +diff --git a/Modules/_ssl.c b/Modules/_ssl.c +index 951f9699278db7..f441a16625bc76 100644 +--- a/Modules/_ssl.c ++++ b/Modules/_ssl.c +@@ -29,9 +29,9 @@ + #define _PySSL_FIX_ERRNO + + #define PySSL_BEGIN_ALLOW_THREADS_S(save) \ +- do { if (_ssl_locks_count>0) { (save) = PyEval_SaveThread(); } } while (0) ++ do { (save) = PyEval_SaveThread(); } while(0) + #define PySSL_END_ALLOW_THREADS_S(save) \ +- do { if (_ssl_locks_count>0) { PyEval_RestoreThread(save); } _PySSL_FIX_ERRNO; } while (0) ++ do { PyEval_RestoreThread(save); _PySSL_FIX_ERRNO; } while(0) + #define PySSL_BEGIN_ALLOW_THREADS { \ + PyThreadState *_save = NULL; \ + PySSL_BEGIN_ALLOW_THREADS_S(_save); +@@ -62,16 +62,6 @@ static PySocketModule_APIObject PySocketModule; + #include "openssl/bio.h" + #include "openssl/dh.h" + +-#ifndef HAVE_X509_VERIFY_PARAM_SET1_HOST +-# ifdef LIBRESSL_VERSION_NUMBER +-# error "LibreSSL is missing X509_VERIFY_PARAM_set1_host(), see https://github.com/libressl-portable/portable/issues/381" +-# elif OPENSSL_VERSION_NUMBER > 0x1000200fL +-# define HAVE_X509_VERIFY_PARAM_SET1_HOST +-# else +-# error "libssl is too old and does not support X509_VERIFY_PARAM_set1_host()" +-# endif +-#endif +- + #ifndef OPENSSL_THREADS + # error "OPENSSL_THREADS is not defined, Python requires thread-safe OpenSSL" + #endif +@@ -142,15 +132,7 @@ static void _PySSLFixErrno(void) { + #include "_ssl_data.h" + #endif + +-#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER) +-# define OPENSSL_VERSION_1_1 1 +-# define PY_OPENSSL_1_1_API 1 +-#endif +- +-/* OpenSSL API 1.1.0+ does not include version methods. Define the methods +- * unless OpenSSL is compiled without the methods. It's the easiest way to +- * make 1.0.2, 1.1.0, 1.1.1, and 3.0.0 happy without deprecation warnings. +- */ ++/* OpenSSL API 1.1.0+ does not include version methods */ + #ifndef OPENSSL_NO_TLS1_METHOD + extern const SSL_METHOD *TLSv1_method(void); + #endif +@@ -161,129 +143,12 @@ extern const SSL_METHOD *TLSv1_1_method(void); + extern const SSL_METHOD *TLSv1_2_method(void); + #endif + +-/* LibreSSL 2.7.0 provides necessary OpenSSL 1.1.0 APIs */ +-#if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x2070000fL +-# define PY_OPENSSL_1_1_API 1 +-#endif +- +-/* SNI support (client- and server-side) appeared in OpenSSL 1.0.0 and 0.9.8f +- * This includes the SSL_set_SSL_CTX() function. +- */ +-#ifdef SSL_CTRL_SET_TLSEXT_HOSTNAME +-# define HAVE_SNI 1 +-#else +-# define HAVE_SNI 0 +-#endif +- +-#ifdef TLSEXT_TYPE_application_layer_protocol_negotiation +-# define HAVE_ALPN 1 +-#else +-# define HAVE_ALPN 0 +-#endif +- +-/* We cannot rely on OPENSSL_NO_NEXTPROTONEG because LibreSSL 2.6.1 dropped +- * NPN support but did not set OPENSSL_NO_NEXTPROTONEG for compatibility +- * reasons. The check for TLSEXT_TYPE_next_proto_neg works with +- * OpenSSL 1.0.1+ and LibreSSL. +- * OpenSSL 1.1.1-pre1 dropped NPN but still has TLSEXT_TYPE_next_proto_neg. +- */ +-#ifdef OPENSSL_NO_NEXTPROTONEG +-# define HAVE_NPN 0 +-#elif (OPENSSL_VERSION_NUMBER >= 0x10101000L) && !defined(LIBRESSL_VERSION_NUMBER) +-# define HAVE_NPN 0 +-#elif defined(TLSEXT_TYPE_next_proto_neg) +-# define HAVE_NPN 1 +-#else +-# define HAVE_NPN 0 +-#endif +- +-#if (OPENSSL_VERSION_NUMBER >= 0x10101000L) && !defined(LIBRESSL_VERSION_NUMBER) +-#define HAVE_OPENSSL_KEYLOG 1 +-#endif +- + #ifndef INVALID_SOCKET /* MS defines this */ + #define INVALID_SOCKET (-1) + #endif + +-/* OpenSSL 1.0.2 and LibreSSL needs extra code for locking */ +-#ifndef OPENSSL_VERSION_1_1 +-#define HAVE_OPENSSL_CRYPTO_LOCK +-#endif +- +-#if defined(OPENSSL_VERSION_1_1) && !defined(OPENSSL_NO_SSL2) ++/* OpenSSL 1.1 does not have SSL 2.0 */ + #define OPENSSL_NO_SSL2 +-#endif +- +-#ifndef PY_OPENSSL_1_1_API +-/* OpenSSL 1.1 API shims for OpenSSL < 1.1.0 and LibreSSL < 2.7.0 */ +- +-#define TLS_method SSLv23_method +-#define TLS_client_method SSLv23_client_method +-#define TLS_server_method SSLv23_server_method +-#define ASN1_STRING_get0_data ASN1_STRING_data +-#define X509_get0_notBefore X509_get_notBefore +-#define X509_get0_notAfter X509_get_notAfter +-#define OpenSSL_version_num SSLeay +-#define OpenSSL_version SSLeay_version +-#define OPENSSL_VERSION SSLEAY_VERSION +- +-static int X509_NAME_ENTRY_set(const X509_NAME_ENTRY *ne) +-{ +- return ne->set; +-} +- +-#ifndef OPENSSL_NO_COMP +-/* LCOV_EXCL_START */ +-static int COMP_get_type(const COMP_METHOD *meth) +-{ +- return meth->type; +-} +-/* LCOV_EXCL_STOP */ +-#endif +- +-static pem_password_cb *SSL_CTX_get_default_passwd_cb(SSL_CTX *ctx) +-{ +- return ctx->default_passwd_callback; +-} +- +-static void *SSL_CTX_get_default_passwd_cb_userdata(SSL_CTX *ctx) +-{ +- return ctx->default_passwd_callback_userdata; +-} +- +-static int X509_OBJECT_get_type(X509_OBJECT *x) +-{ +- return x->type; +-} +- +-static X509 *X509_OBJECT_get0_X509(X509_OBJECT *x) +-{ +- return x->data.x509; +-} +- +-static int BIO_up_ref(BIO *b) +-{ +- CRYPTO_add(&b->references, 1, CRYPTO_LOCK_BIO); +- return 1; +-} +- +-static STACK_OF(X509_OBJECT) *X509_STORE_get0_objects(X509_STORE *store) { +- return store->objs; +-} +- +-static int +-SSL_SESSION_has_ticket(const SSL_SESSION *s) +-{ +- return (s->tlsext_ticklen > 0) ? 1 : 0; +-} +- +-static unsigned long +-SSL_SESSION_get_ticket_lifetime_hint(const SSL_SESSION *s) +-{ +- return s->tlsext_tick_lifetime_hint; +-} +- +-#endif /* OpenSSL < 1.1.0 or LibreSSL < 2.7.0 */ + + /* Default cipher suites */ + #ifndef PY_SSL_DEFAULT_CIPHERS +@@ -395,24 +260,10 @@ enum py_proto_version { + #endif + }; + +- +-/* serves as a flag to see whether we've initialized the SSL thread support. */ +-/* 0 means no, greater than 0 means yes */ +- +-static unsigned int _ssl_locks_count = 0; +- + /* SSL socket object */ + + #define X509_NAME_MAXLEN 256 + +-/* SSL_CTX_clear_options() and SSL_clear_options() were first added in +- * OpenSSL 0.9.8m but do not appear in some 0.9.9-dev versions such the +- * 0.9.9 from "May 2008" that NetBSD 5.0 uses. */ +-#if OPENSSL_VERSION_NUMBER >= 0x009080dfL && OPENSSL_VERSION_NUMBER != 0x00909000L +-# define HAVE_SSL_CTX_CLEAR_OPTIONS +-#else +-# undef HAVE_SSL_CTX_CLEAR_OPTIONS +-#endif + + /* In case of 'tls-unique' it will be 12 bytes for TLS, 36 bytes for + * older SSL, but let's be safe */ +@@ -422,17 +273,9 @@ static unsigned int _ssl_locks_count = 0; + typedef struct { + PyObject_HEAD + SSL_CTX *ctx; +-#if HAVE_NPN +- unsigned char *npn_protocols; +- int npn_protocols_len; +-#endif +-#if HAVE_ALPN + unsigned char *alpn_protocols; + unsigned int alpn_protocols_len; +-#endif +-#ifndef OPENSSL_NO_TLSEXT + PyObject *set_sni_cb; +-#endif + int check_hostname; + /* OpenSSL has no API to get hostflags from X509_VERIFY_PARAM* struct. + * We have to maintain our own copy. OpenSSL's hostflags default to 0. +@@ -443,10 +286,8 @@ typedef struct { + int post_handshake_auth; + #endif + PyObject *msg_cb; +-#ifdef HAVE_OPENSSL_KEYLOG + PyObject *keylog_filename; + BIO *keylog_bio; +-#endif + } PySSLContext; + + typedef struct { +@@ -652,23 +493,18 @@ fill_and_set_sslerror(PySSLSocket *sslsock, PyObject *type, int ssl_errno, + } + + switch (verify_code) { +-#ifdef X509_V_ERR_HOSTNAME_MISMATCH +- /* OpenSSL >= 1.0.2, LibreSSL >= 2.5.3 */ + case X509_V_ERR_HOSTNAME_MISMATCH: + verify_obj = PyUnicode_FromFormat( + "Hostname mismatch, certificate is not valid for '%S'.", + sslsock->server_hostname + ); + break; +-#endif +-#ifdef X509_V_ERR_IP_ADDRESS_MISMATCH + case X509_V_ERR_IP_ADDRESS_MISMATCH: + verify_obj = PyUnicode_FromFormat( + "IP address mismatch, certificate is not valid for '%S'.", + sslsock->server_hostname + ); + break; +-#endif + default: + verify_str = X509_verify_cert_error_string(verify_code); + if (verify_str != NULL) { +@@ -1995,7 +1831,6 @@ cipher_to_tuple(const SSL_CIPHER *cipher) + return NULL; + } + +-#if OPENSSL_VERSION_NUMBER >= 0x10002000UL + static PyObject * + cipher_to_dict(const SSL_CIPHER *cipher) + { +@@ -2004,10 +1839,8 @@ cipher_to_dict(const SSL_CIPHER *cipher) + unsigned long cipher_id; + int alg_bits, strength_bits, len; + char buf[512] = {0}; +-#if OPENSSL_VERSION_1_1 + int aead, nid; + const char *skcipher = NULL, *digest = NULL, *kx = NULL, *auth = NULL; +-#endif + + /* can be NULL */ + cipher_name = SSL_CIPHER_get_name(cipher); +@@ -2020,7 +1853,6 @@ cipher_to_dict(const SSL_CIPHER *cipher) + buf[len-1] = '\0'; + strength_bits = SSL_CIPHER_get_bits(cipher, &alg_bits); + +-#if OPENSSL_VERSION_1_1 + aead = SSL_CIPHER_is_aead(cipher); + nid = SSL_CIPHER_get_cipher_nid(cipher); + skcipher = nid != NID_undef ? OBJ_nid2ln(nid) : NULL; +@@ -2030,13 +1862,10 @@ cipher_to_dict(const SSL_CIPHER *cipher) + kx = nid != NID_undef ? OBJ_nid2ln(nid) : NULL; + nid = SSL_CIPHER_get_auth_nid(cipher); + auth = nid != NID_undef ? OBJ_nid2ln(nid) : NULL; +-#endif + + return Py_BuildValue( + "{sksssssssisi" +-#if OPENSSL_VERSION_1_1 + "sOssssssss" +-#endif + "}", + "id", cipher_id, + "name", cipher_name, +@@ -2044,16 +1873,13 @@ cipher_to_dict(const SSL_CIPHER *cipher) + "description", buf, + "strength_bits", strength_bits, + "alg_bits", alg_bits +-#if OPENSSL_VERSION_1_1 + ,"aead", aead ? Py_True : Py_False, + "symmetric", skcipher, + "digest", digest, + "kea", kx, + "auth", auth +-#endif + ); + } +-#endif + + /*[clinic input] + _ssl._SSLSocket.shared_ciphers +@@ -2124,28 +1950,6 @@ _ssl__SSLSocket_version_impl(PySSLSocket *self) + return PyUnicode_FromString(version); + } + +-#if HAVE_NPN +-/*[clinic input] +-_ssl._SSLSocket.selected_npn_protocol +-[clinic start generated code]*/ +- +-static PyObject * +-_ssl__SSLSocket_selected_npn_protocol_impl(PySSLSocket *self) +-/*[clinic end generated code: output=b91d494cd207ecf6 input=c28fde139204b826]*/ +-{ +- const unsigned char *out; +- unsigned int outlen; +- +- SSL_get0_next_proto_negotiated(self->ssl, +- &out, &outlen); +- +- if (out == NULL) +- Py_RETURN_NONE; +- return PyUnicode_FromStringAndSize((char *)out, outlen); +-} +-#endif +- +-#if HAVE_ALPN + /*[clinic input] + _ssl._SSLSocket.selected_alpn_protocol + [clinic start generated code]*/ +@@ -2163,7 +1967,6 @@ _ssl__SSLSocket_selected_alpn_protocol_impl(PySSLSocket *self) + Py_RETURN_NONE; + return PyUnicode_FromStringAndSize((char *)out, outlen); + } +-#endif + + /*[clinic input] + _ssl._SSLSocket.compression +@@ -2200,11 +2003,6 @@ static int PySSL_set_context(PySSLSocket *self, PyObject *value, + void *closure) { + + if (PyObject_TypeCheck(value, PySSLContext_Type)) { +-#if !HAVE_SNI +- PyErr_SetString(PyExc_NotImplementedError, "setting a socket's " +- "context is not supported by your OpenSSL library"); +- return -1; +-#else + Py_INCREF(value); + Py_SETREF(self->ctx, (PySSLContext *)value); + SSL_set_SSL_CTX(self->ssl, self->ctx->ctx); +@@ -2213,7 +2011,6 @@ static int PySSL_set_context(PySSLSocket *self, PyObject *value, + self->ssl, + self->ctx->msg_cb ? _PySSL_msg_callback : NULL + ); +-#endif + } else { + PyErr_SetString(PyExc_TypeError, "The value must be a SSLContext"); + return -1; +@@ -2840,8 +2637,6 @@ _ssl__SSLSocket_verify_client_post_handshake_impl(PySSLSocket *self) + #endif + } + +-#ifdef OPENSSL_VERSION_1_1 +- + static SSL_SESSION* + _ssl_session_dup(SSL_SESSION *session) { + SSL_SESSION *newsession = NULL; +@@ -2882,7 +2677,6 @@ _ssl_session_dup(SSL_SESSION *session) { + } + return NULL; + } +-#endif + + static PyObject * + PySSL_get_session(PySSLSocket *self, void *closure) { +@@ -2891,7 +2685,6 @@ PySSL_get_session(PySSLSocket *self, void *closure) { + PySSLSession *pysess; + SSL_SESSION *session; + +-#ifdef OPENSSL_VERSION_1_1 + /* duplicate session as workaround for session bug in OpenSSL 1.1.0, + * https://github.com/openssl/openssl/issues/1550 */ + session = SSL_get0_session(self->ssl); /* borrowed reference */ +@@ -2901,12 +2694,10 @@ PySSL_get_session(PySSLSocket *self, void *closure) { + if ((session = _ssl_session_dup(session)) == NULL) { + return NULL; + } +-#else + session = SSL_get1_session(self->ssl); + if (session == NULL) { + Py_RETURN_NONE; + } +-#endif + pysess = PyObject_GC_New(PySSLSession, PySSLSession_Type); + if (pysess == NULL) { + SSL_SESSION_free(session); +@@ -2925,9 +2716,7 @@ static int PySSL_set_session(PySSLSocket *self, PyObject *value, + void *closure) + { + PySSLSession *pysess; +-#ifdef OPENSSL_VERSION_1_1 + SSL_SESSION *session; +-#endif + int result; + + if (!PySSLSession_Check(value)) { +@@ -2951,7 +2740,6 @@ static int PySSL_set_session(PySSLSocket *self, PyObject *value, + "Cannot set session after handshake."); + return -1; + } +-#ifdef OPENSSL_VERSION_1_1 + /* duplicate session */ + if ((session = _ssl_session_dup(pysess->session)) == NULL) { + return -1; +@@ -2959,9 +2747,6 @@ static int PySSL_set_session(PySSLSocket *self, PyObject *value, + result = SSL_set_session(self->ssl, session); + /* free duplicate, SSL_set_session() bumps ref count */ + SSL_SESSION_free(session); +-#else +- result = SSL_set_session(self->ssl, pysess->session); +-#endif + if (result == 0) { + _setSSLError(NULL, 0, __FILE__, __LINE__); + return -1; +@@ -3012,7 +2797,6 @@ static PyMethodDef PySSLMethods[] = { + _SSL__SSLSOCKET_CIPHER_METHODDEF + _SSL__SSLSOCKET_SHARED_CIPHERS_METHODDEF + _SSL__SSLSOCKET_VERSION_METHODDEF +- _SSL__SSLSOCKET_SELECTED_NPN_PROTOCOL_METHODDEF + _SSL__SSLSOCKET_SELECTED_ALPN_PROTOCOL_METHODDEF + _SSL__SSLSOCKET_COMPRESSION_METHODDEF + _SSL__SSLSOCKET_SHUTDOWN_METHODDEF +@@ -3089,9 +2873,6 @@ _ssl__SSLContext_impl(PyTypeObject *type, int proto_version) + SSL_CTX *ctx = NULL; + X509_VERIFY_PARAM *params; + int result; +-#if defined(SSL_MODE_RELEASE_BUFFERS) +- unsigned long libver; +-#endif + + PySSL_BEGIN_ALLOW_THREADS + switch(proto_version) { +@@ -3156,19 +2937,10 @@ _ssl__SSLContext_impl(PyTypeObject *type, int proto_version) + self->hostflags = X509_CHECK_FLAG_NO_PARTIAL_WILDCARDS; + self->protocol = proto_version; + self->msg_cb = NULL; +-#ifdef HAVE_OPENSSL_KEYLOG + self->keylog_filename = NULL; + self->keylog_bio = NULL; +-#endif +-#if HAVE_NPN +- self->npn_protocols = NULL; +-#endif +-#if HAVE_ALPN + self->alpn_protocols = NULL; +-#endif +-#ifndef OPENSSL_NO_TLSEXT + self->set_sni_cb = NULL; +-#endif + /* Don't check host name by default */ + if (proto_version == PY_SSL_VERSION_TLS_CLIENT) { + self->check_hostname = 1; +@@ -3230,37 +3002,9 @@ _ssl__SSLContext_impl(PyTypeObject *type, int proto_version) + return NULL; + } + +-#if defined(SSL_MODE_RELEASE_BUFFERS) + /* Set SSL_MODE_RELEASE_BUFFERS. This potentially greatly reduces memory +- usage for no cost at all. However, don't do this for OpenSSL versions +- between 1.0.1 and 1.0.1h or 1.0.0 and 1.0.0m, which are affected by CVE +- 2014-0198. I can't find exactly which beta fixed this CVE, so be +- conservative and assume it wasn't fixed until release. We do this check +- at runtime to avoid problems from the dynamic linker. +- See #25672 for more on this. */ +- libver = OpenSSL_version_num(); +- if (!(libver >= 0x10001000UL && libver < 0x1000108fUL) && +- !(libver >= 0x10000000UL && libver < 0x100000dfUL)) { +- SSL_CTX_set_mode(self->ctx, SSL_MODE_RELEASE_BUFFERS); +- } +-#endif +- +- +-#if !defined(OPENSSL_NO_ECDH) && !defined(OPENSSL_VERSION_1_1) +- /* Allow automatic ECDH curve selection (on OpenSSL 1.0.2+), or use +- prime256v1 by default. This is Apache mod_ssl's initialization +- policy, so we should be safe. OpenSSL 1.1 has it enabled by default. +- */ +-#if defined(SSL_CTX_set_ecdh_auto) +- SSL_CTX_set_ecdh_auto(self->ctx, 1); +-#else +- { +- EC_KEY *key = EC_KEY_new_by_curve_name(NID_X9_62_prime256v1); +- SSL_CTX_set_tmp_ecdh(self->ctx, key); +- EC_KEY_free(key); +- } +-#endif +-#endif ++ usage for no cost at all. */ ++ SSL_CTX_set_mode(self->ctx, SSL_MODE_RELEASE_BUFFERS); + + #define SID_CTX "Python" + SSL_CTX_set_session_id_context(self->ctx, (const unsigned char *) SID_CTX, +@@ -3268,11 +3012,9 @@ _ssl__SSLContext_impl(PyTypeObject *type, int proto_version) + #undef SID_CTX + + params = SSL_CTX_get0_param(self->ctx); +-#ifdef X509_V_FLAG_TRUSTED_FIRST + /* Improve trust chain building when cross-signed intermediate + certificates are present. See https://bugs.python.org/issue23476. */ + X509_VERIFY_PARAM_set_flags(params, X509_V_FLAG_TRUSTED_FIRST); +-#endif + X509_VERIFY_PARAM_set_hostflags(params, self->hostflags); + + #ifdef TLS1_3_VERSION +@@ -3286,9 +3028,7 @@ _ssl__SSLContext_impl(PyTypeObject *type, int proto_version) + static int + context_traverse(PySSLContext *self, visitproc visit, void *arg) + { +-#ifndef OPENSSL_NO_TLSEXT + Py_VISIT(self->set_sni_cb); +-#endif + Py_VISIT(self->msg_cb); + return 0; + } +@@ -3296,11 +3036,8 @@ context_traverse(PySSLContext *self, visitproc visit, void *arg) + static int + context_clear(PySSLContext *self) + { +-#ifndef OPENSSL_NO_TLSEXT + Py_CLEAR(self->set_sni_cb); +-#endif + Py_CLEAR(self->msg_cb); +-#ifdef HAVE_OPENSSL_KEYLOG + Py_CLEAR(self->keylog_filename); + if (self->keylog_bio != NULL) { + PySSL_BEGIN_ALLOW_THREADS +@@ -3308,7 +3045,6 @@ context_clear(PySSLContext *self) + PySSL_END_ALLOW_THREADS + self->keylog_bio = NULL; + } +-#endif + return 0; + } + +@@ -3320,12 +3056,7 @@ context_dealloc(PySSLContext *self) + PyObject_GC_UnTrack(self); + context_clear(self); + SSL_CTX_free(self->ctx); +-#if HAVE_NPN +- PyMem_Free(self->npn_protocols); +-#endif +-#if HAVE_ALPN +- PyMem_Free(self->alpn_protocols); +-#endif ++ PyMem_FREE(self->alpn_protocols); + Py_TYPE(self)->tp_free(self); + Py_DECREF(tp); + } +@@ -3353,7 +3084,6 @@ _ssl__SSLContext_set_ciphers_impl(PySSLContext *self, const char *cipherlist) + Py_RETURN_NONE; + } + +-#if OPENSSL_VERSION_NUMBER >= 0x10002000UL + /*[clinic input] + _ssl._SSLContext.get_ciphers + [clinic start generated code]*/ +@@ -3396,10 +3126,8 @@ _ssl__SSLContext_get_ciphers_impl(PySSLContext *self) + return result; + + } +-#endif + + +-#if HAVE_NPN || HAVE_ALPN + static int + do_protocol_selection(int alpn, unsigned char **out, unsigned char *outlen, + const unsigned char *server_protocols, unsigned int server_protocols_len, +@@ -3423,77 +3151,7 @@ do_protocol_selection(int alpn, unsigned char **out, unsigned char *outlen, + + return SSL_TLSEXT_ERR_OK; + } +-#endif +- +-#if HAVE_NPN +-/* this callback gets passed to SSL_CTX_set_next_protos_advertise_cb */ +-static int +-_advertiseNPN_cb(SSL *s, +- const unsigned char **data, unsigned int *len, +- void *args) +-{ +- PySSLContext *ssl_ctx = (PySSLContext *) args; +- +- if (ssl_ctx->npn_protocols == NULL) { +- *data = (unsigned char *)""; +- *len = 0; +- } else { +- *data = ssl_ctx->npn_protocols; +- *len = ssl_ctx->npn_protocols_len; +- } + +- return SSL_TLSEXT_ERR_OK; +-} +-/* this callback gets passed to SSL_CTX_set_next_proto_select_cb */ +-static int +-_selectNPN_cb(SSL *s, +- unsigned char **out, unsigned char *outlen, +- const unsigned char *server, unsigned int server_len, +- void *args) +-{ +- PySSLContext *ctx = (PySSLContext *)args; +- return do_protocol_selection(0, out, outlen, server, server_len, +- ctx->npn_protocols, ctx->npn_protocols_len); +-} +-#endif +- +-/*[clinic input] +-_ssl._SSLContext._set_npn_protocols +- protos: Py_buffer +- / +-[clinic start generated code]*/ +- +-static PyObject * +-_ssl__SSLContext__set_npn_protocols_impl(PySSLContext *self, +- Py_buffer *protos) +-/*[clinic end generated code: output=72b002c3324390c6 input=319fcb66abf95bd7]*/ +-{ +-#if HAVE_NPN +- PyMem_Free(self->npn_protocols); +- self->npn_protocols = PyMem_Malloc(protos->len); +- if (self->npn_protocols == NULL) +- return PyErr_NoMemory(); +- memcpy(self->npn_protocols, protos->buf, protos->len); +- self->npn_protocols_len = (int) protos->len; +- +- /* set both server and client callbacks, because the context can +- * be used to create both types of sockets */ +- SSL_CTX_set_next_protos_advertised_cb(self->ctx, +- _advertiseNPN_cb, +- self); +- SSL_CTX_set_next_proto_select_cb(self->ctx, +- _selectNPN_cb, +- self); +- +- Py_RETURN_NONE; +-#else +- PyErr_SetString(PyExc_NotImplementedError, +- "The NPN extension requires OpenSSL 1.0.1 or later."); +- return NULL; +-#endif +-} +- +-#if HAVE_ALPN + static int + _selectALPN_cb(SSL *s, + const unsigned char **out, unsigned char *outlen, +@@ -3505,7 +3163,6 @@ _selectALPN_cb(SSL *s, + ctx->alpn_protocols, ctx->alpn_protocols_len, + client_protocols, client_protocols_len); + } +-#endif + + /*[clinic input] + _ssl._SSLContext._set_alpn_protocols +@@ -3518,7 +3175,6 @@ _ssl__SSLContext__set_alpn_protocols_impl(PySSLContext *self, + Py_buffer *protos) + /*[clinic end generated code: output=87599a7f76651a9b input=9bba964595d519be]*/ + { +-#if HAVE_ALPN + if ((size_t)protos->len > UINT_MAX) { + PyErr_Format(PyExc_OverflowError, + "protocols longer than %u bytes", UINT_MAX); +@@ -3537,11 +3193,6 @@ _ssl__SSLContext__set_alpn_protocols_impl(PySSLContext *self, + SSL_CTX_set_alpn_select_cb(self->ctx, _selectALPN_cb, self); + + Py_RETURN_NONE; +-#else +- PyErr_SetString(PyExc_NotImplementedError, +- "The ALPN extension requires OpenSSL 1.0.2 or later."); +- return NULL; +-#endif + } + + static PyObject * +@@ -3617,9 +3268,6 @@ set_verify_flags(PySSLContext *self, PyObject *arg, void *c) + } + + /* Getter and setter for protocol version */ +-#if defined(SSL_CTRL_GET_MAX_PROTO_VERSION) +- +- + static int + set_min_max_proto_version(PySSLContext *self, PyObject *arg, int what) + { +@@ -3714,9 +3362,8 @@ set_maximum_version(PySSLContext *self, PyObject *arg, void *c) + { + return set_min_max_proto_version(self, arg, 1); + } +-#endif /* SSL_CTRL_GET_MAX_PROTO_VERSION */ + +-#if (OPENSSL_VERSION_NUMBER >= 0x10101000L) && !defined(LIBRESSL_VERSION_NUMBER) ++#ifdef TLS1_3_VERSION + static PyObject * + get_num_tickets(PySSLContext *self, void *c) + { +@@ -3747,16 +3394,14 @@ set_num_tickets(PySSLContext *self, PyObject *arg, void *c) + + PyDoc_STRVAR(PySSLContext_num_tickets_doc, + "Control the number of TLSv1.3 session tickets"); +-#endif /* OpenSSL 1.1.1 */ ++#endif /* TLS1_3_VERSION */ + +-#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER) + static PyObject * + get_security_level(PySSLContext *self, void *c) + { + return PyLong_FromLong(SSL_CTX_get_security_level(self->ctx)); + } + PyDoc_STRVAR(PySSLContext_security_level_doc, "The current security level"); +-#endif /* OpenSSL 1.1.0 */ + + static PyObject * + get_options(PySSLContext *self, void *c) +@@ -3774,13 +3419,7 @@ set_options(PySSLContext *self, PyObject *arg, void *c) + clear = opts & ~new_opts; + set = ~opts & new_opts; + if (clear) { +-#ifdef HAVE_SSL_CTX_CLEAR_OPTIONS + SSL_CTX_clear_options(self->ctx, clear); +-#else +- PyErr_SetString(PyExc_ValueError, +- "can't clear options before OpenSSL 0.9.8m"); +- return -1; +-#endif + } + if (set) + SSL_CTX_set_options(self->ctx, set); +@@ -4468,7 +4107,6 @@ _ssl__SSLContext_set_default_verify_paths_impl(PySSLContext *self) + Py_RETURN_NONE; + } + +-#ifndef OPENSSL_NO_ECDH + /*[clinic input] + _ssl._SSLContext.set_ecdh_curve + name: object +@@ -4503,9 +4141,7 @@ _ssl__SSLContext_set_ecdh_curve(PySSLContext *self, PyObject *name) + EC_KEY_free(key); + Py_RETURN_NONE; + } +-#endif + +-#if HAVE_SNI && !defined(OPENSSL_NO_TLSEXT) + static int + _servername_callback(SSL *s, int *al, void *args) + { +@@ -4609,7 +4245,6 @@ _servername_callback(SSL *s, int *al, void *args) + PyGILState_Release(gstate); + return ret; + } +-#endif + + static PyObject * + get_sni_callback(PySSLContext *self, void *c) +@@ -4630,7 +4265,6 @@ set_sni_callback(PySSLContext *self, PyObject *arg, void *c) + "sni_callback cannot be set on TLS_CLIENT context"); + return -1; + } +-#if HAVE_SNI && !defined(OPENSSL_NO_TLSEXT) + Py_CLEAR(self->set_sni_cb); + if (arg == Py_None) { + SSL_CTX_set_tlsext_servername_callback(self->ctx, NULL); +@@ -4648,13 +4282,6 @@ set_sni_callback(PySSLContext *self, PyObject *arg, void *c) + SSL_CTX_set_tlsext_servername_arg(self->ctx, self); + } + return 0; +-#else +- PyErr_SetString(PyExc_NotImplementedError, +- "The TLS extension servername callback, " +- "SSL_CTX_set_tlsext_servername_callback, " +- "is not in the current OpenSSL library."); +- return -1; +-#endif + } + + PyDoc_STRVAR(PySSLContext_sni_callback_doc, +@@ -4779,21 +4406,17 @@ static PyGetSetDef context_getsetlist[] = { + (setter) set_check_hostname, NULL}, + {"_host_flags", (getter) get_host_flags, + (setter) set_host_flags, NULL}, +-#if SSL_CTRL_GET_MAX_PROTO_VERSION + {"minimum_version", (getter) get_minimum_version, + (setter) set_minimum_version, NULL}, + {"maximum_version", (getter) get_maximum_version, + (setter) set_maximum_version, NULL}, +-#endif +-#ifdef HAVE_OPENSSL_KEYLOG + {"keylog_filename", (getter) _PySSLContext_get_keylog_filename, + (setter) _PySSLContext_set_keylog_filename, NULL}, +-#endif + {"_msg_callback", (getter) _PySSLContext_get_msg_callback, + (setter) _PySSLContext_set_msg_callback, NULL}, + {"sni_callback", (getter) get_sni_callback, + (setter) set_sni_callback, PySSLContext_sni_callback_doc}, +-#if (OPENSSL_VERSION_NUMBER >= 0x10101000L) && !defined(LIBRESSL_VERSION_NUMBER) ++#ifdef TLS1_3_VERSION + {"num_tickets", (getter) get_num_tickets, + (setter) set_num_tickets, PySSLContext_num_tickets_doc}, + #endif +@@ -4812,10 +4435,8 @@ static PyGetSetDef context_getsetlist[] = { + (setter) set_verify_flags, NULL}, + {"verify_mode", (getter) get_verify_mode, + (setter) set_verify_mode, NULL}, +-#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER) + {"security_level", (getter) get_security_level, + NULL, PySSLContext_security_level_doc}, +-#endif + {NULL}, /* sentinel */ + }; + +@@ -4824,7 +4445,6 @@ static struct PyMethodDef context_methods[] = { + _SSL__SSLCONTEXT__WRAP_BIO_METHODDEF + _SSL__SSLCONTEXT_SET_CIPHERS_METHODDEF + _SSL__SSLCONTEXT__SET_ALPN_PROTOCOLS_METHODDEF +- _SSL__SSLCONTEXT__SET_NPN_PROTOCOLS_METHODDEF + _SSL__SSLCONTEXT_LOAD_CERT_CHAIN_METHODDEF + _SSL__SSLCONTEXT_LOAD_DH_PARAMS_METHODDEF + _SSL__SSLCONTEXT_LOAD_VERIFY_LOCATIONS_METHODDEF +@@ -5281,11 +4901,7 @@ PySSL_RAND(int len, int pseudo) + if (bytes == NULL) + return NULL; + if (pseudo) { +-#ifdef PY_OPENSSL_1_1_API + ok = RAND_bytes((unsigned char*)PyBytes_AS_STRING(bytes), len); +-#else +- ok = RAND_pseudo_bytes((unsigned char*)PyBytes_AS_STRING(bytes), len); +-#endif + if (ok == 0 || ok == 1) + return Py_BuildValue("NO", bytes, ok == 1 ? Py_True : Py_False); + } +@@ -5840,92 +5456,6 @@ static PyMethodDef PySSL_methods[] = { + }; + + +-#ifdef HAVE_OPENSSL_CRYPTO_LOCK +- +-/* an implementation of OpenSSL threading operations in terms +- * of the Python C thread library +- * Only used up to 1.0.2. OpenSSL 1.1.0+ has its own locking code. +- */ +- +-static PyThread_type_lock *_ssl_locks = NULL; +- +-#if OPENSSL_VERSION_NUMBER >= 0x10000000 +-/* use new CRYPTO_THREADID API. */ +-static void +-_ssl_threadid_callback(CRYPTO_THREADID *id) +-{ +- CRYPTO_THREADID_set_numeric(id, PyThread_get_thread_ident()); +-} +-#else +-/* deprecated CRYPTO_set_id_callback() API. */ +-static unsigned long +-_ssl_thread_id_function (void) { +- return PyThread_get_thread_ident(); +-} +-#endif +- +-static void _ssl_thread_locking_function +- (int mode, int n, const char *file, int line) { +- /* this function is needed to perform locking on shared data +- structures. (Note that OpenSSL uses a number of global data +- structures that will be implicitly shared whenever multiple +- threads use OpenSSL.) Multi-threaded applications will +- crash at random if it is not set. +- +- locking_function() must be able to handle up to +- CRYPTO_num_locks() different mutex locks. It sets the n-th +- lock if mode & CRYPTO_LOCK, and releases it otherwise. +- +- file and line are the file number of the function setting the +- lock. They can be useful for debugging. +- */ +- +- if ((_ssl_locks == NULL) || +- (n < 0) || ((unsigned)n >= _ssl_locks_count)) +- return; +- +- if (mode & CRYPTO_LOCK) { +- PyThread_acquire_lock(_ssl_locks[n], 1); +- } else { +- PyThread_release_lock(_ssl_locks[n]); +- } +-} +- +-static int _setup_ssl_threads(void) { +- +- unsigned int i; +- +- if (_ssl_locks == NULL) { +- _ssl_locks_count = CRYPTO_num_locks(); +- _ssl_locks = PyMem_Calloc(_ssl_locks_count, +- sizeof(PyThread_type_lock)); +- if (_ssl_locks == NULL) { +- PyErr_NoMemory(); +- return 0; +- } +- for (i = 0; i < _ssl_locks_count; i++) { +- _ssl_locks[i] = PyThread_allocate_lock(); +- if (_ssl_locks[i] == NULL) { +- unsigned int j; +- for (j = 0; j < i; j++) { +- PyThread_free_lock(_ssl_locks[j]); +- } +- PyMem_Free(_ssl_locks); +- return 0; +- } +- } +- CRYPTO_set_locking_callback(_ssl_thread_locking_function); +-#if OPENSSL_VERSION_NUMBER >= 0x10000000 +- CRYPTO_THREADID_set_callback(_ssl_threadid_callback); +-#else +- CRYPTO_set_id_callback(_ssl_thread_id_function); +-#endif +- } +- return 1; +-} +- +-#endif /* HAVE_OPENSSL_CRYPTO_LOCK for OpenSSL < 1.1.0 */ +- + static int + sslmodule_init_types(PyObject *module) + { +@@ -6205,10 +5735,8 @@ sslmodule_init_constants(PyObject *m) + X509_V_FLAG_X509_STRICT); + PyModule_AddIntConstant(m, "VERIFY_ALLOW_PROXY_CERTS", + X509_V_FLAG_ALLOW_PROXY_CERTS); +-#ifdef X509_V_FLAG_TRUSTED_FIRST + PyModule_AddIntConstant(m, "VERIFY_X509_TRUSTED_FIRST", + X509_V_FLAG_TRUSTED_FIRST); +-#endif + + /* Alert Descriptions from ssl.h */ + /* note RESERVED constants no longer intended for use have been removed */ +@@ -6365,31 +5893,11 @@ sslmodule_init_constants(PyObject *m) + PyModule_AddObject((m), (key), bool_obj); \ + } while (0) + +-#if HAVE_SNI + addbool(m, "HAS_SNI", 1); +-#else +- addbool(m, "HAS_SNI", 0); +-#endif +- + addbool(m, "HAS_TLS_UNIQUE", 1); +- +-#ifndef OPENSSL_NO_ECDH + addbool(m, "HAS_ECDH", 1); +-#else +- addbool(m, "HAS_ECDH", 0); +-#endif +- +-#if HAVE_NPN +- addbool(m, "HAS_NPN", 1); +-#else + addbool(m, "HAS_NPN", 0); +-#endif +- +-#if HAVE_ALPN + addbool(m, "HAS_ALPN", 1); +-#else +- addbool(m, "HAS_ALPN", 0); +-#endif + + #if defined(SSL2_VERSION) && !defined(OPENSSL_NO_SSL2) + addbool(m, "HAS_SSLv2", 1); +@@ -6430,29 +5938,6 @@ sslmodule_init_constants(PyObject *m) + return 0; + } + +-static int +-sslmodule_legacy(PyObject *module) +-{ +-#ifndef OPENSSL_VERSION_1_1 +- /* Load all algorithms and initialize cpuid */ +- OPENSSL_add_all_algorithms_noconf(); +- /* Init OpenSSL */ +- SSL_load_error_strings(); +- SSL_library_init(); +-#endif +- +-#ifdef HAVE_OPENSSL_CRYPTO_LOCK +- /* note that this will start threading if not already started */ +- if (!_setup_ssl_threads()) { +- return 0; +- } +-#elif OPENSSL_VERSION_1_1 +- /* OpenSSL 1.1.0 builtin thread support is enabled */ +- _ssl_locks_count++; +-#endif +- return 0; +-} +- + PyDoc_STRVAR(module_doc, + "Implementation module for SSL socket operations. See the socket module\n\ + for documentation."); +@@ -6491,8 +5976,6 @@ PyInit__ssl(void) + return NULL; + if (sslmodule_init_versioninfo(m) != 0) + return NULL; +- if (sslmodule_legacy(m) != 0) +- return NULL; + + return m; + } +diff --git a/Modules/_ssl/debughelpers.c b/Modules/_ssl/debughelpers.c +index af56f9d28d1642..f39372ca53d9e1 100644 +--- a/Modules/_ssl/debughelpers.c ++++ b/Modules/_ssl/debughelpers.c +@@ -114,8 +114,6 @@ _PySSLContext_set_msg_callback(PySSLContext *self, PyObject *arg, void *c) { + return 0; + } + +-#ifdef HAVE_OPENSSL_KEYLOG +- + static void + _PySSL_keylog_callback(const SSL *ssl, const char *line) + { +@@ -219,5 +217,3 @@ _PySSLContext_set_keylog_filename(PySSLContext *self, PyObject *arg, void *c) { + SSL_CTX_set_keylog_callback(self->ctx, _PySSL_keylog_callback); + return 0; + } +- +-#endif +diff --git a/Modules/clinic/_hashopenssl.c.h b/Modules/clinic/_hashopenssl.c.h +index fbdff26026f6cc..de01489e6a3b02 100644 +--- a/Modules/clinic/_hashopenssl.c.h ++++ b/Modules/clinic/_hashopenssl.c.h +@@ -950,7 +950,7 @@ pbkdf2_hmac(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject + return return_value; + } + +-#if (OPENSSL_VERSION_NUMBER > 0x10100000L && !defined(OPENSSL_NO_SCRYPT) && !defined(LIBRESSL_VERSION_NUMBER)) ++#if defined(PY_OPENSSL_HAS_SCRYPT) + + PyDoc_STRVAR(_hashlib_scrypt__doc__, + "scrypt($module, /, password, *, salt=None, n=None, r=None, p=None,\n" +@@ -1068,7 +1068,7 @@ _hashlib_scrypt(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObj + return return_value; + } + +-#endif /* (OPENSSL_VERSION_NUMBER > 0x10100000L && !defined(OPENSSL_NO_SCRYPT) && !defined(LIBRESSL_VERSION_NUMBER)) */ ++#endif /* defined(PY_OPENSSL_HAS_SCRYPT) */ + + PyDoc_STRVAR(_hashlib_hmac_singleshot__doc__, + "hmac_digest($module, /, key, msg, digest)\n" +@@ -1275,8 +1275,6 @@ _hashlib_HMAC_hexdigest(HMACobject *self, PyObject *Py_UNUSED(ignored)) + return _hashlib_HMAC_hexdigest_impl(self); + } + +-#if !defined(LIBRESSL_VERSION_NUMBER) +- + PyDoc_STRVAR(_hashlib_get_fips_mode__doc__, + "get_fips_mode($module, /)\n" + "--\n" +@@ -1312,8 +1310,6 @@ _hashlib_get_fips_mode(PyObject *module, PyObject *Py_UNUSED(ignored)) + return return_value; + } + +-#endif /* !defined(LIBRESSL_VERSION_NUMBER) */ +- + PyDoc_STRVAR(_hashlib_compare_digest__doc__, + "compare_digest($module, a, b, /)\n" + "--\n" +@@ -1389,8 +1385,4 @@ _hashlib_compare_digest(PyObject *module, PyObject *const *args, Py_ssize_t narg + #ifndef _HASHLIB_SCRYPT_METHODDEF + #define _HASHLIB_SCRYPT_METHODDEF + #endif /* !defined(_HASHLIB_SCRYPT_METHODDEF) */ +- +-#ifndef _HASHLIB_GET_FIPS_MODE_METHODDEF +- #define _HASHLIB_GET_FIPS_MODE_METHODDEF +-#endif /* !defined(_HASHLIB_GET_FIPS_MODE_METHODDEF) */ +-/*[clinic end generated code: output=980087de1b03ad42 input=a9049054013a1b77]*/ ++/*[clinic end generated code: output=162369cb9d43f1cc input=a9049054013a1b77]*/ +diff --git a/Modules/clinic/_ssl.c.h b/Modules/clinic/_ssl.c.h +index 43469d3c358242..95aad0c21df9a0 100644 +--- a/Modules/clinic/_ssl.c.h ++++ b/Modules/clinic/_ssl.c.h +@@ -139,29 +139,6 @@ _ssl__SSLSocket_version(PySSLSocket *self, PyObject *Py_UNUSED(ignored)) + return _ssl__SSLSocket_version_impl(self); + } + +-#if (HAVE_NPN) +- +-PyDoc_STRVAR(_ssl__SSLSocket_selected_npn_protocol__doc__, +-"selected_npn_protocol($self, /)\n" +-"--\n" +-"\n"); +- +-#define _SSL__SSLSOCKET_SELECTED_NPN_PROTOCOL_METHODDEF \ +- {"selected_npn_protocol", (PyCFunction)_ssl__SSLSocket_selected_npn_protocol, METH_NOARGS, _ssl__SSLSocket_selected_npn_protocol__doc__}, +- +-static PyObject * +-_ssl__SSLSocket_selected_npn_protocol_impl(PySSLSocket *self); +- +-static PyObject * +-_ssl__SSLSocket_selected_npn_protocol(PySSLSocket *self, PyObject *Py_UNUSED(ignored)) +-{ +- return _ssl__SSLSocket_selected_npn_protocol_impl(self); +-} +- +-#endif /* (HAVE_NPN) */ +- +-#if (HAVE_ALPN) +- + PyDoc_STRVAR(_ssl__SSLSocket_selected_alpn_protocol__doc__, + "selected_alpn_protocol($self, /)\n" + "--\n" +@@ -179,8 +156,6 @@ _ssl__SSLSocket_selected_alpn_protocol(PySSLSocket *self, PyObject *Py_UNUSED(ig + return _ssl__SSLSocket_selected_alpn_protocol_impl(self); + } + +-#endif /* (HAVE_ALPN) */ +- + PyDoc_STRVAR(_ssl__SSLSocket_compression__doc__, + "compression($self, /)\n" + "--\n" +@@ -452,8 +427,6 @@ _ssl__SSLContext_set_ciphers(PySSLContext *self, PyObject *arg) + return return_value; + } + +-#if (OPENSSL_VERSION_NUMBER >= 0x10002000UL) +- + PyDoc_STRVAR(_ssl__SSLContext_get_ciphers__doc__, + "get_ciphers($self, /)\n" + "--\n" +@@ -471,44 +444,6 @@ _ssl__SSLContext_get_ciphers(PySSLContext *self, PyObject *Py_UNUSED(ignored)) + return _ssl__SSLContext_get_ciphers_impl(self); + } + +-#endif /* (OPENSSL_VERSION_NUMBER >= 0x10002000UL) */ +- +-PyDoc_STRVAR(_ssl__SSLContext__set_npn_protocols__doc__, +-"_set_npn_protocols($self, protos, /)\n" +-"--\n" +-"\n"); +- +-#define _SSL__SSLCONTEXT__SET_NPN_PROTOCOLS_METHODDEF \ +- {"_set_npn_protocols", (PyCFunction)_ssl__SSLContext__set_npn_protocols, METH_O, _ssl__SSLContext__set_npn_protocols__doc__}, +- +-static PyObject * +-_ssl__SSLContext__set_npn_protocols_impl(PySSLContext *self, +- Py_buffer *protos); +- +-static PyObject * +-_ssl__SSLContext__set_npn_protocols(PySSLContext *self, PyObject *arg) +-{ +- PyObject *return_value = NULL; +- Py_buffer protos = {NULL, NULL}; +- +- if (PyObject_GetBuffer(arg, &protos, PyBUF_SIMPLE) != 0) { +- goto exit; +- } +- if (!PyBuffer_IsContiguous(&protos, 'C')) { +- _PyArg_BadArgument("_set_npn_protocols", "argument", "contiguous buffer", arg); +- goto exit; +- } +- return_value = _ssl__SSLContext__set_npn_protocols_impl(self, &protos); +- +-exit: +- /* Cleanup for protos */ +- if (protos.obj) { +- PyBuffer_Release(&protos); +- } +- +- return return_value; +-} +- + PyDoc_STRVAR(_ssl__SSLContext__set_alpn_protocols__doc__, + "_set_alpn_protocols($self, protos, /)\n" + "--\n" +@@ -829,8 +764,6 @@ _ssl__SSLContext_set_default_verify_paths(PySSLContext *self, PyObject *Py_UNUSE + return _ssl__SSLContext_set_default_verify_paths_impl(self); + } + +-#if !defined(OPENSSL_NO_ECDH) +- + PyDoc_STRVAR(_ssl__SSLContext_set_ecdh_curve__doc__, + "set_ecdh_curve($self, name, /)\n" + "--\n" +@@ -839,8 +772,6 @@ PyDoc_STRVAR(_ssl__SSLContext_set_ecdh_curve__doc__, + #define _SSL__SSLCONTEXT_SET_ECDH_CURVE_METHODDEF \ + {"set_ecdh_curve", (PyCFunction)_ssl__SSLContext_set_ecdh_curve, METH_O, _ssl__SSLContext_set_ecdh_curve__doc__}, + +-#endif /* !defined(OPENSSL_NO_ECDH) */ +- + PyDoc_STRVAR(_ssl__SSLContext_cert_store_stats__doc__, + "cert_store_stats($self, /)\n" + "--\n" +@@ -1420,22 +1351,6 @@ _ssl_enum_crls(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObje + + #endif /* defined(_MSC_VER) */ + +-#ifndef _SSL__SSLSOCKET_SELECTED_NPN_PROTOCOL_METHODDEF +- #define _SSL__SSLSOCKET_SELECTED_NPN_PROTOCOL_METHODDEF +-#endif /* !defined(_SSL__SSLSOCKET_SELECTED_NPN_PROTOCOL_METHODDEF) */ +- +-#ifndef _SSL__SSLSOCKET_SELECTED_ALPN_PROTOCOL_METHODDEF +- #define _SSL__SSLSOCKET_SELECTED_ALPN_PROTOCOL_METHODDEF +-#endif /* !defined(_SSL__SSLSOCKET_SELECTED_ALPN_PROTOCOL_METHODDEF) */ +- +-#ifndef _SSL__SSLCONTEXT_GET_CIPHERS_METHODDEF +- #define _SSL__SSLCONTEXT_GET_CIPHERS_METHODDEF +-#endif /* !defined(_SSL__SSLCONTEXT_GET_CIPHERS_METHODDEF) */ +- +-#ifndef _SSL__SSLCONTEXT_SET_ECDH_CURVE_METHODDEF +- #define _SSL__SSLCONTEXT_SET_ECDH_CURVE_METHODDEF +-#endif /* !defined(_SSL__SSLCONTEXT_SET_ECDH_CURVE_METHODDEF) */ +- + #ifndef _SSL_RAND_EGD_METHODDEF + #define _SSL_RAND_EGD_METHODDEF + #endif /* !defined(_SSL_RAND_EGD_METHODDEF) */ +@@ -1447,4 +1362,4 @@ _ssl_enum_crls(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObje + #ifndef _SSL_ENUM_CRLS_METHODDEF + #define _SSL_ENUM_CRLS_METHODDEF + #endif /* !defined(_SSL_ENUM_CRLS_METHODDEF) */ +-/*[clinic end generated code: output=2bb53a80040c9b35 input=a9049054013a1b77]*/ ++/*[clinic end generated code: output=9468e58904a565a2 input=a9049054013a1b77]*/ +diff --git a/Tools/ssl/multissltests.py b/Tools/ssl/multissltests.py +index dd8d211646df3e..90213b3dff5e18 100755 +--- a/Tools/ssl/multissltests.py ++++ b/Tools/ssl/multissltests.py +@@ -43,21 +43,17 @@ + log = logging.getLogger("multissl") + + OPENSSL_OLD_VERSIONS = [ +- "1.0.2u", +- "1.1.0l", + ] + + OPENSSL_RECENT_VERSIONS = [ + "1.1.1k", +- # "3.0.0-alpha14" ++ "3.0.0-alpha14" + ] + + LIBRESSL_OLD_VERSIONS = [ +- "2.9.2", + ] + + LIBRESSL_RECENT_VERSIONS = [ +- "3.2.4", + ] + + # store files in ../multissl +diff --git a/configure b/configure +index e03b9ac5b3ddbb..ad0367fe0e20bb 100755 +--- a/configure ++++ b/configure +@@ -1,12 +1,11 @@ + #! /bin/sh + # Guess values for system-dependent variables and create Makefiles. +-# Generated by GNU Autoconf 2.71 for python 3.10. ++# Generated by GNU Autoconf 2.69 for python 3.10. + # + # Report bugs to . + # + # +-# 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 @@ esac + 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&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 @@ if ${PATH_SEPARATOR+false} :; then + 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 @@ case $0 in #(( + 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 @@ if test "x$as_myself" = x; then + 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 @@ esac + 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,53 +187,42 @@ as_fn_success || { exitcode=1; echo as_fn_success failed.; } + 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" +- if (eval "$as_required") 2>/dev/null +-then : ++ 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 +@@ -223,21 +230,14 @@ fi + 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 +@@ -255,19 +255,18 @@ esac + 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 ++ $as_echo "$0: Please tell bug-autoconf@gnu.org and + $0: https://bugs.python.org/ about your system, including + $0: any error possibly output before this message. Then + $0: install a modern shell, or manually run the script +@@ -295,7 +294,6 @@ as_fn_unset () + } + as_unset=as_fn_unset + +- + # as_fn_set_status STATUS + # ----------------------- + # Set $? to STATUS, without forking. +@@ -313,14 +311,6 @@ as_fn_exit () + 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 + # ------------- +@@ -335,7 +325,7 @@ as_fn_mkdir_p () + 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" +@@ -344,7 +334,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + 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 +@@ -383,13 +373,12 @@ as_fn_executable_p () + # 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 +@@ -401,27 +390,18 @@ fi # as_fn_append + # 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] + # ---------------------------------------- +@@ -433,9 +413,9 @@ as_fn_error () + 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 + +@@ -462,7 +442,7 @@ as_me=`$as_basename -- "$0" || + $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 +@@ -506,7 +486,7 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits + 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 +@@ -520,10 +500,6 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits + 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*) +@@ -537,13 +513,6 @@ case `echo -n x` in #((((( + 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 +@@ -619,36 +588,40 @@ PACKAGE_URL='' + ac_unique_file="Include/object.h" + # Factoring default headers for most tests. + ac_includes_default="\ +-#include +-#ifdef HAVE_STDIO_H +-# include ++#include ++#ifdef HAVE_SYS_TYPES_H ++# include + #endif +-#ifdef HAVE_STDLIB_H ++#ifdef HAVE_SYS_STAT_H ++# include ++#endif ++#ifdef STDC_HEADERS + # include ++# include ++#else ++# ifdef HAVE_STDLIB_H ++# include ++# endif + #endif + #ifdef HAVE_STRING_H ++# if !defined STDC_HEADERS && defined HAVE_MEMORY_H ++# include ++# endif + # include + #endif ++#ifdef HAVE_STRINGS_H ++# include ++#endif + #ifdef HAVE_INTTYPES_H + # include + #endif + #ifdef HAVE_STDINT_H + # include + #endif +-#ifdef HAVE_STRINGS_H +-# include +-#endif +-#ifdef HAVE_SYS_TYPES_H +-# include +-#endif +-#ifdef HAVE_SYS_STAT_H +-# include +-#endif + #ifdef HAVE_UNISTD_H + # include + #endif" + +-ac_header_c_list= + ac_subst_vars='LTLIBOBJS + TEST_MODULES + LIBRARY_DEPS +@@ -702,7 +675,6 @@ LDSHARED + SHLIB_SUFFIX + LIBTOOL_CRUFT + OTHER_LIBTOOL_OPT +-EGREP + UNIVERSAL_ARCH_FLAGS + LDFLAGS_NODIST + CFLAGS_NODIST +@@ -746,6 +718,7 @@ DLLLIBRARY + LDLIBRARY + LIBRARY + BUILDEXEEXT ++EGREP + NO_AS_NEEDED + MULTIARCH_CPPFLAGS + PLATFORM_TRIPLET +@@ -819,7 +792,6 @@ infodir + docdir + oldincludedir + includedir +-runstatedir + localstatedir + sharedstatedir + sysconfdir +@@ -943,7 +915,6 @@ datadir='${datarootdir}' + sysconfdir='${prefix}/etc' + sharedstatedir='${prefix}/com' + localstatedir='${prefix}/var' +-runstatedir='${localstatedir}/run' + includedir='${prefix}/include' + oldincludedir='/usr/include' + docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' +@@ -973,6 +944,8 @@ do + *) ac_optarg=yes ;; + esac + ++ # Accept the important Cygnus configure options, so we can diagnose typos. ++ + case $ac_dashdash$ac_option in + --) + ac_dashdash=yes ;; +@@ -1013,9 +986,9 @@ do + 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" +@@ -1039,9 +1012,9 @@ do + 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" +@@ -1194,15 +1167,6 @@ do + | -silent | --silent | --silen | --sile | --sil) + silent=yes ;; + +- -runstatedir | --runstatedir | --runstatedi | --runstated \ +- | --runstate | --runstat | --runsta | --runst | --runs \ +- | --run | --ru | --r) +- ac_prev=runstatedir ;; +- -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ +- | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ +- | --run=* | --ru=* | --r=*) +- runstatedir=$ac_optarg ;; +- + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) + ac_prev=sbindir ;; + -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ +@@ -1252,9 +1216,9 @@ do + 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" +@@ -1268,9 +1232,9 @@ do + 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" +@@ -1314,9 +1278,9 @@ Try \`$0 --help' for more information" + + *) + # 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}" + ;; + +@@ -1332,7 +1296,7 @@ if test -n "$ac_unrecognized_opts"; then + 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 + +@@ -1340,7 +1304,7 @@ fi + for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ + datadir sysconfdir sharedstatedir localstatedir includedir \ + oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ +- libdir localedir mandir runstatedir ++ libdir localedir mandir + do + eval ac_val=\$$ac_var + # Remove trailing slashes. +@@ -1396,7 +1360,7 @@ $as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + 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 +@@ -1493,7 +1457,6 @@ Fine tuning of the installation directories: + --sysconfdir=DIR read-only single-machine data [PREFIX/etc] + --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] + --localstatedir=DIR modifiable single-machine data [PREFIX/var] +- --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] + --libdir=DIR object code libraries [EPREFIX/lib] + --includedir=DIR C header files [PREFIX/include] + --oldincludedir=DIR C header files for non-gcc [/usr/include] +@@ -1690,9 +1653,9 @@ if test "$ac_init_help" = "recursive"; then + 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/ ;; +@@ -1720,8 +1683,7 @@ esac + 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 +@@ -1729,7 +1691,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix + 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 +@@ -1739,9 +1701,9 @@ test -n "$ac_init_help" && exit $ac_status + if $ac_init_version; then + cat <<\_ACEOF + python configure 3.10 +-generated by GNU Autoconf 2.71 ++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 +@@ -1758,14 +1720,14 @@ fi + 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 +@@ -1773,15 +1735,14 @@ printf "%s\n" "$ac_try_echo"; } >&5 + 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 +@@ -1803,7 +1764,7 @@ case "(($ac_try" in + *) 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_cpp conftest.$ac_ext") 2>conftest.err + ac_status=$? + if test -s conftest.err; then +@@ -1811,15 +1772,14 @@ printf "%s\n" "$ac_try_echo"; } >&5 + 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; } > conftest.i && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err +- } +-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 +@@ -1835,14 +1795,14 @@ fi + 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 +@@ -1850,18 +1810,17 @@ printf "%s\n" "$ac_try_echo"; } >&5 + 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 +@@ -1876,43 +1835,101 @@ fi + + } # ac_fn_c_try_link + +-# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES ++# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES + # ------------------------------------------------------- +-# Tests whether HEADER exists and can be compiled using the include files in +-# INCLUDES, setting the cache variable VAR accordingly. +-ac_fn_c_check_header_compile () ++# 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 +- { 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 +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++ 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 : +- eval "$3=yes" +-else $as_nop +- eval "$3=no" ++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 core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ++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://bugs.python.org/ ## ++## --------------------------------------- ##" ++ ) | 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 +- { 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; } ++fi + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +-} # ac_fn_c_check_header_compile ++} # ac_fn_c_check_header_mongrel + + # ac_fn_c_try_run LINENO + # ---------------------- +-# Try to run conftest.$ac_ext, and return whether this succeeded. Assumes that +-# executables *can* be run. ++# 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 +@@ -1922,26 +1939,25 @@ case "(($ac_try" in + *) 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; } && { 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 ++$as_echo "$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 : ++ $as_echo "$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 ++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 +@@ -1952,6 +1968,37 @@ fi + + } # 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 ++# INCLUDES, setting the cache variable VAR accordingly. ++ac_fn_c_check_header_compile () ++{ ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ { $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 : ++ eval "$3=yes" ++else ++ eval "$3=no" ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++eval ac_res=\$$3 ++ { $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 ++ + # ac_fn_c_check_type LINENO TYPE VAR INCLUDES + # ------------------------------------------- + # Tests whether TYPE exists after having included INCLUDES, setting cache +@@ -1959,18 +2006,17 @@ fi + 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; +@@ -1978,13 +2024,12 @@ if (sizeof ($2)) + 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; +@@ -1992,19 +2037,18 @@ if (sizeof (($2))) + 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 +@@ -2023,7 +2067,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + $4 + int +-main (void) ++main () + { + static int test_array [1 - 2 * !(($2) >= 0)]; + test_array [0] = 0; +@@ -2033,15 +2077,14 @@ return test_array [0]; + return 0; + } + _ACEOF +-if ac_fn_c_try_compile "$LINENO" +-then : ++if ac_fn_c_try_compile "$LINENO"; then : + ac_lo=0 ac_mid=0 + while :; do + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + $4 + int +-main (void) ++main () + { + static int test_array [1 - 2 * !(($2) <= $ac_mid)]; + test_array [0] = 0; +@@ -2051,10 +2094,9 @@ return test_array [0]; + return 0; + } + _ACEOF +-if ac_fn_c_try_compile "$LINENO" +-then : ++if ac_fn_c_try_compile "$LINENO"; then : + ac_hi=$ac_mid; break +-else $as_nop ++else + as_fn_arith $ac_mid + 1 && ac_lo=$as_val + if test $ac_lo -le $ac_mid; then + ac_lo= ac_hi= +@@ -2062,14 +2104,14 @@ else $as_nop + fi + as_fn_arith 2 '*' $ac_mid + 1 && ac_mid=$as_val + 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 + done +-else $as_nop ++else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + $4 + int +-main (void) ++main () + { + static int test_array [1 - 2 * !(($2) < 0)]; + test_array [0] = 0; +@@ -2079,15 +2121,14 @@ return test_array [0]; + return 0; + } + _ACEOF +-if ac_fn_c_try_compile "$LINENO" +-then : ++if ac_fn_c_try_compile "$LINENO"; then : + ac_hi=-1 ac_mid=-1 + while :; do + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + $4 + int +-main (void) ++main () + { + static int test_array [1 - 2 * !(($2) >= $ac_mid)]; + test_array [0] = 0; +@@ -2097,10 +2138,9 @@ return test_array [0]; + return 0; + } + _ACEOF +-if ac_fn_c_try_compile "$LINENO" +-then : ++if ac_fn_c_try_compile "$LINENO"; then : + ac_lo=$ac_mid; break +-else $as_nop ++else + as_fn_arith '(' $ac_mid ')' - 1 && ac_hi=$as_val + if test $ac_mid -le $ac_hi; then + ac_lo= ac_hi= +@@ -2108,14 +2148,14 @@ else $as_nop + fi + as_fn_arith 2 '*' $ac_mid && ac_mid=$as_val + 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 + done +-else $as_nop ++else + ac_lo= ac_hi= + 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 + # Binary search between lo and hi bounds. + while test "x$ac_lo" != "x$ac_hi"; do + as_fn_arith '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo && ac_mid=$as_val +@@ -2123,7 +2163,7 @@ while test "x$ac_lo" != "x$ac_hi"; do + /* end confdefs.h. */ + $4 + int +-main (void) ++main () + { + static int test_array [1 - 2 * !(($2) <= $ac_mid)]; + test_array [0] = 0; +@@ -2133,13 +2173,12 @@ return test_array [0]; + return 0; + } + _ACEOF +-if ac_fn_c_try_compile "$LINENO" +-then : ++if ac_fn_c_try_compile "$LINENO"; then : + ac_hi=$ac_mid +-else $as_nop ++else + as_fn_arith '(' $ac_mid ')' + 1 && ac_lo=$as_val + 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 + done + case $ac_lo in #(( + ?*) eval "$3=\$ac_lo"; ac_retval=0 ;; +@@ -2149,12 +2188,12 @@ esac + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + $4 +-static long int longval (void) { return $2; } +-static unsigned long int ulongval (void) { return $2; } ++static long int longval () { return $2; } ++static unsigned long int ulongval () { return $2; } + #include + #include + int +-main (void) ++main () + { + + FILE *f = fopen ("conftest.val", "w"); +@@ -2182,10 +2221,9 @@ main (void) + return 0; + } + _ACEOF +-if ac_fn_c_try_run "$LINENO" +-then : ++if ac_fn_c_try_run "$LINENO"; then : + echo >>conftest.val; read $3 &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 declares $2. +@@ -2217,9 +2254,16 @@ else $as_nop + #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 to if __STDC__ is defined, since ++ exists even on freestanding compilers. */ ++ ++#ifdef __STDC__ ++# include ++#else ++# include ++#endif + +-#include + #undef $2 + + /* Override any GCC internal prototype to avoid an error. +@@ -2237,51 +2281,47 @@ choke me + #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 +@@ -2295,22 +2335,19 @@ main (void) + 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; } ++ { $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_check_decl ++} # ac_fn_c_check_decl + + # ac_fn_c_check_member LINENO AGGR MEMBER VAR INCLUDES + # ---------------------------------------------------- +@@ -2319,17 +2356,16 @@ printf "%s\n" "$ac_res" >&6; } + 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) +@@ -2338,15 +2374,14 @@ return 0; + 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) +@@ -2355,50 +2390,29 @@ return 0; + 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 +-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 python $as_me 3.10, which was +-generated by GNU Autoconf 2.71. Invocation command line was ++generated by GNU Autoconf 2.69. Invocation command line was + +- $ $0$ac_configure_args_raw ++ $ $0 $@ + + _ACEOF + exec 5>>config.log +@@ -2431,12 +2445,8 @@ 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 +- printf "%s\n" "PATH: $as_dir" ++ test -z "$as_dir" && as_dir=. ++ $as_echo "PATH: $as_dir" + done + IFS=$as_save_IFS + +@@ -2471,7 +2481,7 @@ do + | -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'" ;; +@@ -2506,13 +2516,11 @@ done + # 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 +@@ -2523,8 +2531,8 @@ trap 'exit_status=$? + 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) ;; #( +@@ -2548,7 +2556,7 @@ printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} + ) + echo + +- printf "%s\n" "## ----------------- ## ++ $as_echo "## ----------------- ## + ## Output variables. ## + ## ----------------- ##" + echo +@@ -2556,14 +2564,14 @@ printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} + 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 +@@ -2571,15 +2579,15 @@ printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} + 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 +@@ -2587,8 +2595,8 @@ printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} + 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 && +@@ -2602,48 +2610,63 @@ ac_signal=0 + # 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 +@@ -2653,504 +2676,85 @@ if test -r "$cache_file"; then + # 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 + +-# 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 ++# Check that the precious variables saved in the cache have kept the same ++# value. ++ac_cache_corrupted=false ++for ac_var in $ac_precious_vars; do ++ eval ac_old_set=\$ac_cv_env_${ac_var}_set ++ eval ac_new_set=\$ac_env_${ac_var}_set ++ eval ac_old_val=\$ac_cv_env_${ac_var}_value ++ eval ac_new_val=\$ac_env_${ac_var}_value ++ case $ac_old_set,$ac_new_set in ++ set,) ++ { $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) ++ { $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=: ;; ++ ,);; ++ *) ++ if test "x$ac_old_val" != "x$ac_new_val"; then ++ # differences in whitespace do not lead to failure. ++ 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 ++ { $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 ++ { $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 ++ { $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=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; ++ *) ac_arg=$ac_var=$ac_new_val ;; ++ esac ++ case " $ac_configure_args " in ++ *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. ++ *) as_fn_append ac_configure_args " '$ac_arg'" ;; ++ esac ++ fi ++done ++if $ac_cache_corrupted; then ++ { $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. ## ++## -------------------- ## + +-#include +-#include +-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 p[i]; +-} +-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_array[FOO(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) != argv[0] || f (e, argv, 1) != argv[1]); +-' +- +-# 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 +-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->data[i] = 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_array[ni.number]; +- dynamic_array[0] = argv[0][0]; +- dynamic_array[ni.number - 1] = 543; +- +- // work around unused variable warnings +- ok |= (!success || bignum == 0LL || ubignum == 0uLL || newvar[0] == '\''x'\'' +- || dynamic_array[ni.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 (int[100]), +- 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 " stdio.h stdio_h HAVE_STDIO_H" +-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/time.h sys_time_h HAVE_SYS_TIME_H" +- +-# Auxiliary files required by this configure script. +-ac_aux_files="install-sh 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 +- +-# Check that the precious variables saved in the cache have kept the same +-# value. +-ac_cache_corrupted=false +-for ac_var in $ac_precious_vars; do +- eval ac_old_set=\$ac_cv_env_${ac_var}_set +- eval ac_new_set=\$ac_env_${ac_var}_set +- eval ac_old_val=\$ac_cv_env_${ac_var}_value +- 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;} +- 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;} +- ac_cache_corrupted=: ;; +- ,);; +- *) +- if test "x$ac_old_val" != "x$ac_new_val"; then +- # differences in whitespace do not lead to failure. +- 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;} +- 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;} +- 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;} +- 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=$ac_new_val ;; +- esac +- case " $ac_configure_args " in +- *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. +- *) as_fn_append ac_configure_args " '$ac_arg'" ;; +- esac +- 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 +-fi +-## -------------------- ## +-## Main body of script. ## +-## -------------------- ## +- +-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 ++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 + + + +@@ -3180,12 +2784,11 @@ if test -e $srcdir/.git + then + # Extract the first word of "git", so it can be a program name with args. + set dummy git; 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_HAS_GIT+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_HAS_GIT+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else + if test -n "$HAS_GIT"; then + ac_cv_prog_HAS_GIT="$HAS_GIT" # Let the user override the test. + else +@@ -3193,15 +2796,11 @@ 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 ++ 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_HAS_GIT="found" +- 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 +@@ -3213,11 +2812,11 @@ fi + fi + HAS_GIT=$ac_cv_prog_HAS_GIT + if test -n "$HAS_GIT"; then +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $HAS_GIT" >&5 +-printf "%s\n" "$HAS_GIT" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HAS_GIT" >&5 ++$as_echo "$HAS_GIT" >&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 + + +@@ -3239,30 +2838,55 @@ fi + ac_config_headers="$ac_config_headers pyconfig.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 ++# 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 ++{ $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;; +@@ -3281,22 +2905,21 @@ IFS=$ac_save_IFS + 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;; +@@ -3325,12 +2948,11 @@ for ac_prog in python$PACKAGE_VERSION python3 python + 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_PYTHON_FOR_REGEN+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_PYTHON_FOR_REGEN+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else + if test -n "$PYTHON_FOR_REGEN"; then + ac_cv_prog_PYTHON_FOR_REGEN="$PYTHON_FOR_REGEN" # Let the user override the test. + else +@@ -3338,15 +2960,11 @@ 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 ++ 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_PYTHON_FOR_REGEN="$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 +@@ -3357,11 +2975,11 @@ fi + fi + PYTHON_FOR_REGEN=$ac_cv_prog_PYTHON_FOR_REGEN + if test -n "$PYTHON_FOR_REGEN"; then +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PYTHON_FOR_REGEN" >&5 +-printf "%s\n" "$PYTHON_FOR_REGEN" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON_FOR_REGEN" >&5 ++$as_echo "$PYTHON_FOR_REGEN" >&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 + + +@@ -3372,8 +2990,8 @@ test -n "$PYTHON_FOR_REGEN" || PYTHON_FOR_REGEN="python3" + + + if test "$cross_compiling" = yes; then +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for python interpreter for cross build" >&5 +-printf %s "checking for python interpreter for cross build... " >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for python interpreter for cross build" >&5 ++$as_echo_n "checking for python interpreter for cross build... " >&6; } + if test -z "$PYTHON_FOR_BUILD"; then + for interp in python$PACKAGE_VERSION python3 python; do + which $interp >/dev/null 2>&1 || continue +@@ -3385,8 +3003,8 @@ printf %s "checking for python interpreter for cross build... " >&6; } + if test x$interp = x; then + as_fn_error $? "python$PACKAGE_VERSION interpreter not found" "$LINENO" 5 + fi +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $interp" >&5 +-printf "%s\n" "$interp" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $interp" >&5 ++$as_echo "$interp" >&6; } + PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`:)$(srcdir)/Lib _PYTHON_SYSCONFIGDATA_NAME=_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH) '$interp + fi + elif test "$cross_compiling" = maybe; then +@@ -3420,28 +3038,28 @@ SOVERSION=1.0 + # The later defininition of _XOPEN_SOURCE disables certain features + # on Linux, so we need _GNU_SOURCE to re-enable them (makedev, tm_zone). + +-printf "%s\n" "#define _GNU_SOURCE 1" >>confdefs.h ++$as_echo "#define _GNU_SOURCE 1" >>confdefs.h + + + # The later defininition of _XOPEN_SOURCE and _POSIX_C_SOURCE disables + # certain features on NetBSD, so we need _NETBSD_SOURCE to re-enable + # them. + +-printf "%s\n" "#define _NETBSD_SOURCE 1" >>confdefs.h ++$as_echo "#define _NETBSD_SOURCE 1" >>confdefs.h + + + # The later defininition of _XOPEN_SOURCE and _POSIX_C_SOURCE disables + # certain features on FreeBSD, so we need __BSD_VISIBLE to re-enable + # them. + +-printf "%s\n" "#define __BSD_VISIBLE 1" >>confdefs.h ++$as_echo "#define __BSD_VISIBLE 1" >>confdefs.h + + + # The later defininition of _XOPEN_SOURCE and _POSIX_C_SOURCE disables + # certain features on Mac OS X, so we need _DARWIN_C_SOURCE to re-enable + # them. + +-printf "%s\n" "#define _DARWIN_C_SOURCE 1" >>confdefs.h ++$as_echo "#define _DARWIN_C_SOURCE 1" >>confdefs.h + + + +@@ -3451,11 +3069,10 @@ define_xopen_source=yes + + CONFIG_ARGS="$ac_configure_args" + +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for --enable-universalsdk" >&5 +-printf %s "checking for --enable-universalsdk... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --enable-universalsdk" >&5 ++$as_echo_n "checking for --enable-universalsdk... " >&6; } + # Check whether --enable-universalsdk was given. +-if test ${enable_universalsdk+y} +-then : ++if test "${enable_universalsdk+set}" = set; then : + enableval=$enable_universalsdk; + case $enableval in + yes) +@@ -3487,7 +3104,7 @@ then : + esac + + +-else $as_nop ++else + + UNIVERSALSDK= + enable_universalsdk= +@@ -3496,11 +3113,11 @@ fi + + if test -n "${UNIVERSALSDK}" + then +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${UNIVERSALSDK}" >&5 +-printf "%s\n" "${UNIVERSALSDK}" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${UNIVERSALSDK}" >&5 ++$as_echo "${UNIVERSALSDK}" >&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 + + +@@ -3522,12 +3139,11 @@ then + fi + + +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for --with-universal-archs" >&5 +-printf %s "checking for --with-universal-archs... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-universal-archs" >&5 ++$as_echo_n "checking for --with-universal-archs... " >&6; } + + # Check whether --with-universal-archs was given. +-if test ${with_universal_archs+y} +-then : ++if test "${with_universal_archs+set}" = set; then : + withval=$with_universal_archs; + UNIVERSAL_ARCHS="$withval" + +@@ -3535,23 +3151,22 @@ fi + + if test -n "${UNIVERSALSDK}" + then +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${UNIVERSAL_ARCHS}" >&5 +-printf "%s\n" "${UNIVERSAL_ARCHS}" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${UNIVERSAL_ARCHS}" >&5 ++$as_echo "${UNIVERSAL_ARCHS}" >&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 + + + # Check whether --with-framework-name was given. +-if test ${with_framework_name+y} +-then : ++if test "${with_framework_name+set}" = set; then : + withval=$with_framework_name; + PYTHONFRAMEWORK=${withval} + PYTHONFRAMEWORKDIR=${withval}.framework + PYTHONFRAMEWORKIDENTIFIER=org.python.`echo $withval | tr 'A-Z' 'a-z'` + +-else $as_nop ++else + + PYTHONFRAMEWORK=Python + PYTHONFRAMEWORKDIR=Python.framework +@@ -3560,8 +3175,7 @@ else $as_nop + fi + + # Check whether --enable-framework was given. +-if test ${enable_framework+y} +-then : ++if test "${enable_framework+set}" = set; then : + enableval=$enable_framework; + case $enableval in + yes) +@@ -3650,7 +3264,7 @@ then : + + esac + +-else $as_nop ++else + + PYTHONFRAMEWORK= + PYTHONFRAMEWORKDIR=no-framework +@@ -3685,7 +3299,9 @@ fi + + + +-printf "%s\n" "#define _PYTHONFRAMEWORK \"${PYTHONFRAMEWORK}\"" >>confdefs.h ++cat >>confdefs.h <<_ACEOF ++#define _PYTHONFRAMEWORK "${PYTHONFRAMEWORK}" ++_ACEOF + + + ##AC_ARG_WITH(dyld, +@@ -3694,8 +3310,8 @@ printf "%s\n" "#define _PYTHONFRAMEWORK \"${PYTHONFRAMEWORK}\"" >>confdefs.h + ## + # Set name for machine-dependent library files + +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking MACHDEP" >&5 +-printf %s "checking MACHDEP... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking MACHDEP" >&5 ++$as_echo_n "checking MACHDEP... " >&6; } + if test -z "$MACHDEP" + then + # avoid using uname for cross builds +@@ -3745,8 +3361,8 @@ then + '') MACHDEP="unknown";; + esac + fi +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: \"$MACHDEP\"" >&5 +-printf "%s\n" "\"$MACHDEP\"" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: \"$MACHDEP\"" >&5 ++$as_echo "\"$MACHDEP\"" >&6; } + + + if test "$cross_compiling" = yes; then +@@ -3795,7 +3411,7 @@ case $ac_sys_system/$ac_sys_release in + # also defined. This can be overridden by defining _BSD_SOURCE + # As this has a different meaning on Linux, only define it on OpenBSD + +-printf "%s\n" "#define _BSD_SOURCE 1" >>confdefs.h ++$as_echo "#define _BSD_SOURCE 1" >>confdefs.h + + ;; + OpenBSD/*) +@@ -3803,7 +3419,7 @@ printf "%s\n" "#define _BSD_SOURCE 1" >>confdefs.h + # also defined. This can be overridden by defining _BSD_SOURCE + # As this has a different meaning on Linux, only define it on OpenBSD + +-printf "%s\n" "#define _BSD_SOURCE 1" >>confdefs.h ++$as_echo "#define _BSD_SOURCE 1" >>confdefs.h + + ;; + # Defining _XOPEN_SOURCE on NetBSD version prior to the introduction of +@@ -3861,7 +3477,7 @@ if test $define_xopen_source = yes + then + # X/Open 7, incorporating POSIX.1-2008 + +-printf "%s\n" "#define _XOPEN_SOURCE 700" >>confdefs.h ++$as_echo "#define _XOPEN_SOURCE 700" >>confdefs.h + + + # On Tru64 Unix 4.0F, defining _XOPEN_SOURCE also requires +@@ -3869,11 +3485,11 @@ printf "%s\n" "#define _XOPEN_SOURCE 700" >>confdefs.h + # several APIs are not declared. Since this is also needed in some + # cases for HP-UX, we define it globally. + +-printf "%s\n" "#define _XOPEN_SOURCE_EXTENDED 1" >>confdefs.h ++$as_echo "#define _XOPEN_SOURCE_EXTENDED 1" >>confdefs.h + + + +-printf "%s\n" "#define _POSIX_C_SOURCE 200809L" >>confdefs.h ++$as_echo "#define _POSIX_C_SOURCE 200809L" >>confdefs.h + + fi + +@@ -3888,7 +3504,7 @@ esac + if test $define_stdc_a1 = yes + then + +-printf "%s\n" "#define _INCLUDE__STDC_A1_SOURCE 1" >>confdefs.h ++$as_echo "#define _INCLUDE__STDC_A1_SOURCE 1" >>confdefs.h + + fi + +@@ -3952,8 +3568,8 @@ then + then + if test -n "`"$found_gcc" --version | grep llvm-gcc`" + then +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Detected llvm-gcc, falling back to clang" >&5 +-printf "%s\n" "$as_me: Detected llvm-gcc, falling back to clang" >&6;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: Detected llvm-gcc, falling back to clang" >&5 ++$as_echo "$as_me: Detected llvm-gcc, falling back to clang" >&6;} + CC="$found_clang" + CXX="$found_clang++" + fi +@@ -3961,8 +3577,8 @@ printf "%s\n" "$as_me: Detected llvm-gcc, falling back to clang" >&6;} + + elif test -z "$found_gcc" -a -n "$found_clang" + then +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: No GCC found, use CLANG" >&5 +-printf "%s\n" "$as_me: No GCC found, use CLANG" >&6;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: No GCC found, use CLANG" >&5 ++$as_echo "$as_me: No GCC found, use CLANG" >&6;} + CC="$found_clang" + CXX="$found_clang++" + +@@ -3971,8 +3587,8 @@ printf "%s\n" "$as_me: No GCC found, use CLANG" >&6;} + found_clang=`/usr/bin/xcrun -find clang 2>/dev/null` + if test -n "${found_clang}" + then +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Using clang from Xcode.app" >&5 +-printf "%s\n" "$as_me: Using clang from Xcode.app" >&6;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: Using clang from Xcode.app" >&5 ++$as_echo "$as_me: Using clang from Xcode.app" >&6;} + CC="${found_clang}" + CXX="`/usr/bin/xcrun -find clang++`" + +@@ -3981,15 +3597,6 @@ printf "%s\n" "$as_me: Using clang from Xcode.app" >&6;} + fi + fi + fi +- +- +- +- +- +- +- +- +- + ac_ext=c + ac_cpp='$CPP $CPPFLAGS' + ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +@@ -3998,12 +3605,11 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + 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 +@@ -4011,15 +3617,11 @@ 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 ++ 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 +@@ -4030,11 +3632,11 @@ 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 + + +@@ -4043,12 +3645,11 @@ if test -z "$ac_cv_prog_CC"; then + 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 +@@ -4056,15 +3657,11 @@ 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 ++ 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 +@@ -4075,11 +3672,11 @@ 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; } ++ { $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 +@@ -4087,8 +3684,8 @@ fi + 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 +@@ -4101,12 +3698,11 @@ if test -z "$CC"; then + 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 +@@ -4114,15 +3710,11 @@ 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 ++ 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 +@@ -4133,11 +3725,11 @@ 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 + + +@@ -4146,12 +3738,11 @@ fi + 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 +@@ -4160,19 +3751,15 @@ 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 ++ 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 +@@ -4188,18 +3775,18 @@ if test $ac_prog_rejected = yes; then + # 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 + + +@@ -4210,12 +3797,11 @@ if test -z "$CC"; then + 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 +@@ -4223,15 +3809,11 @@ 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 ++ 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 +@@ -4242,11 +3824,11 @@ 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 + + +@@ -4259,12 +3841,11 @@ if test -z "$CC"; then + 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 +@@ -4272,15 +3853,11 @@ 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 ++ 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 +@@ -4291,11 +3868,11 @@ 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; } ++ { $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 + + +@@ -4307,138 +3884,34 @@ done + 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 +-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;} ++{ $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 + 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 +@@ -4448,7 +3921,7 @@ printf "%s\n" "$ac_try_echo"; } >&5 + 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 + +@@ -4456,7 +3929,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +-main (void) ++main () + { + + ; +@@ -4468,9 +3941,9 @@ ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" + # 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.*" +@@ -4491,12 +3964,11 @@ case "(($ac_try" in + *) 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, +@@ -4513,7 +3985,7 @@ do + # 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 +@@ -4529,46 +4001,44 @@ do + 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 +@@ -4582,15 +4052,15 @@ for ac_file in conftest.exe conftest conftest.*; do + * ) 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 +@@ -4599,7 +4069,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + int +-main (void) ++main () + { + FILE *f = fopen ("conftest.out", "w"); + return ferror (f) || fclose (f) != 0; +@@ -4611,8 +4081,8 @@ _ACEOF + 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 +@@ -4620,10 +4090,10 @@ case "(($ac_try" in + *) 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 +@@ -4631,40 +4101,39 @@ printf "%s\n" "$ac_try_echo"; } >&5 + *) 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 () + { + + ; +@@ -4678,12 +4147,11 @@ case "(($ac_try" in + *) 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 +@@ -4692,32 +4160,31 @@ then : + 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 +@@ -4727,33 +4194,29 @@ main (void) + 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 +@@ -4762,60 +4225,57 @@ else $as_nop + /* 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 +@@ -4830,144 +4290,94 @@ else + 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 ++#include ++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 p[i]; ++} ++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_array[FOO(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) != argv[0] || f (e, argv, 1) != argv[1]; ++ ; ++ 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 +@@ -4981,36 +4391,40 @@ 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; } ++{ $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 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 ++ 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 + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. ++ # Prefer to if __STDC__ is defined, since ++ # 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. */ +-#include ++#ifdef __STDC__ ++# include ++#else ++# include ++#endif + Syntax error + _ACEOF +-if ac_fn_c_try_cpp "$LINENO" +-then : ++if ac_fn_c_try_cpp "$LINENO"; then : + +-else $as_nop ++else + # Broken: fails on valid input. + continue + fi +@@ -5022,11 +4436,10 @@ rm -f conftest.err conftest.i conftest.$ac_ext + /* end confdefs.h. */ + #include + _ACEOF +-if ac_fn_c_try_cpp "$LINENO" +-then : ++if ac_fn_c_try_cpp "$LINENO"; then : + # Broken: success on invalid input. + continue +-else $as_nop ++else + # Passes both tests. + ac_preproc_ok=: + break +@@ -5036,8 +4449,7 @@ 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 : ++if $ac_preproc_ok; then : + break + fi + +@@ -5049,24 +4461,29 @@ fi + else + ac_cv_prog_CPP=$CPP + fi +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 +-printf "%s\n" "$CPP" >&6; } ++{ $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 to if __STDC__ is defined, since ++ # 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. */ +-#include ++#ifdef __STDC__ ++# include ++#else ++# include ++#endif + Syntax error + _ACEOF +-if ac_fn_c_try_cpp "$LINENO" +-then : ++if ac_fn_c_try_cpp "$LINENO"; then : + +-else $as_nop ++else + # Broken: fails on valid input. + continue + fi +@@ -5078,11 +4495,10 @@ rm -f conftest.err conftest.i conftest.$ac_ext + /* end confdefs.h. */ + #include + _ACEOF +-if ac_fn_c_try_cpp "$LINENO" +-then : ++if ac_fn_c_try_cpp "$LINENO"; then : + # Broken: success on invalid input. + continue +-else $as_nop ++else + # Passes both tests. + ac_preproc_ok=: + break +@@ -5092,12 +4508,11 @@ 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 : ++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;} ++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 +@@ -5108,12 +4523,11 @@ 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 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 ++{ $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 +@@ -5121,15 +4535,10 @@ else $as_nop + 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 ++ 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" ++ 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 +@@ -5138,13 +4547,13 @@ case `"$ac_path_GREP" --version 2>&1` in + ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_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" 'GREP' >> "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 +@@ -5172,17 +4581,16 @@ else + fi + + fi +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 +-printf "%s\n" "$ac_cv_path_GREP" >&6; } ++{ $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" + + +-{ 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" +@@ -5196,15 +4604,10 @@ else $as_nop + 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 +@@ -5213,13 +4616,13 @@ case `"$ac_path_SED" --version 2>&1` in + 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 +@@ -5247,20 +4650,19 @@ else + 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 + + + + +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for --with-cxx-main=" >&5 +-printf %s "checking for --with-cxx-main=... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-cxx-main=" >&5 ++$as_echo_n "checking for --with-cxx-main=... " >&6; } + + # Check whether --with-cxx_main was given. +-if test ${with_cxx_main+y} +-then : ++if test "${with_cxx_main+set}" = set; then : + withval=$with_cxx_main; + + case $withval in +@@ -5275,15 +4677,15 @@ then : + CXX=$withval + fi;; + esac +-else $as_nop ++else + + with_cxx_main=no + MAINCC='$(CC)' + + fi + +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_cxx_main" >&5 +-printf "%s\n" "$with_cxx_main" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_cxx_main" >&5 ++$as_echo "$with_cxx_main" >&6; } + + preset_cxx="$CXX" + if test -z "$CXX" +@@ -5292,12 +4694,11 @@ then + gcc) if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}g++", so it can be a program name with args. + set dummy ${ac_tool_prefix}g++; 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_CXX+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_CXX+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else + case $CXX in + [\\/]* | ?:[\\/]*) + ac_cv_path_CXX="$CXX" # Let the user override the test with a path. +@@ -5307,15 +4708,11 @@ else $as_nop + for as_dir in notfound + 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_CXX="$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_CXX="$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 +@@ -5327,11 +4724,11 @@ esac + fi + CXX=$ac_cv_path_CXX + if test -n "$CXX"; then +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5 +-printf "%s\n" "$CXX" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5 ++$as_echo "$CXX" >&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 + + +@@ -5340,12 +4737,11 @@ if test -z "$ac_cv_path_CXX"; then + ac_pt_CXX=$CXX + # Extract the first word of "g++", so it can be a program name with args. + set dummy g++; 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_CXX+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_CXX+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else + case $ac_pt_CXX in + [\\/]* | ?:[\\/]*) + ac_cv_path_ac_pt_CXX="$ac_pt_CXX" # Let the user override the test with a path. +@@ -5355,15 +4751,11 @@ else $as_nop + for as_dir in notfound + 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_CXX="$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_CXX="$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 +@@ -5375,11 +4767,11 @@ esac + fi + ac_pt_CXX=$ac_cv_path_ac_pt_CXX + if test -n "$ac_pt_CXX"; then +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_pt_CXX" >&5 +-printf "%s\n" "$ac_pt_CXX" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_CXX" >&5 ++$as_echo "$ac_pt_CXX" >&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_CXX" = x; then +@@ -5387,8 +4779,8 @@ fi + 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 + CXX=$ac_pt_CXX +@@ -5400,12 +4792,11 @@ fi + cc) if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}c++", so it can be a program name with args. + set dummy ${ac_tool_prefix}c++; 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_CXX+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_CXX+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else + case $CXX in + [\\/]* | ?:[\\/]*) + ac_cv_path_CXX="$CXX" # Let the user override the test with a path. +@@ -5415,15 +4806,11 @@ else $as_nop + for as_dir in notfound + 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_CXX="$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_CXX="$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 +@@ -5435,11 +4822,11 @@ esac + fi + CXX=$ac_cv_path_CXX + if test -n "$CXX"; then +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5 +-printf "%s\n" "$CXX" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5 ++$as_echo "$CXX" >&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 + + +@@ -5448,12 +4835,11 @@ if test -z "$ac_cv_path_CXX"; then + ac_pt_CXX=$CXX + # Extract the first word of "c++", so it can be a program name with args. + set dummy c++; 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_CXX+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_CXX+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else + case $ac_pt_CXX in + [\\/]* | ?:[\\/]*) + ac_cv_path_ac_pt_CXX="$ac_pt_CXX" # Let the user override the test with a path. +@@ -5463,15 +4849,11 @@ else $as_nop + for as_dir in notfound + 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_CXX="$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_CXX="$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 +@@ -5483,11 +4865,11 @@ esac + fi + ac_pt_CXX=$ac_cv_path_ac_pt_CXX + if test -n "$ac_pt_CXX"; then +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_pt_CXX" >&5 +-printf "%s\n" "$ac_pt_CXX" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_CXX" >&5 ++$as_echo "$ac_pt_CXX" >&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_CXX" = x; then +@@ -5495,8 +4877,8 @@ fi + 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 + CXX=$ac_pt_CXX +@@ -5508,12 +4890,11 @@ fi + clang|*/clang) 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_path_CXX+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_CXX+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else + case $CXX in + [\\/]* | ?:[\\/]*) + ac_cv_path_CXX="$CXX" # Let the user override the test with a path. +@@ -5523,15 +4904,11 @@ else $as_nop + for as_dir in notfound + 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_CXX="$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_CXX="$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 +@@ -5543,11 +4920,11 @@ esac + fi + CXX=$ac_cv_path_CXX + if test -n "$CXX"; then +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5 +-printf "%s\n" "$CXX" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5 ++$as_echo "$CXX" >&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 + + +@@ -5556,12 +4933,11 @@ if test -z "$ac_cv_path_CXX"; then + ac_pt_CXX=$CXX + # 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_path_ac_pt_CXX+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_CXX+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else + case $ac_pt_CXX in + [\\/]* | ?:[\\/]*) + ac_cv_path_ac_pt_CXX="$ac_pt_CXX" # Let the user override the test with a path. +@@ -5571,15 +4947,11 @@ else $as_nop + for as_dir in notfound + 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_CXX="$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_CXX="$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 +@@ -5591,11 +4963,11 @@ esac + fi + ac_pt_CXX=$ac_cv_path_ac_pt_CXX + if test -n "$ac_pt_CXX"; then +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_pt_CXX" >&5 +-printf "%s\n" "$ac_pt_CXX" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_CXX" >&5 ++$as_echo "$ac_pt_CXX" >&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_CXX" = x; then +@@ -5603,8 +4975,8 @@ fi + 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 + CXX=$ac_pt_CXX +@@ -5616,12 +4988,11 @@ fi + icc|*/icc) if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}icpc", so it can be a program name with args. + set dummy ${ac_tool_prefix}icpc; 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_CXX+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_CXX+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else + case $CXX in + [\\/]* | ?:[\\/]*) + ac_cv_path_CXX="$CXX" # Let the user override the test with a path. +@@ -5631,15 +5002,11 @@ else $as_nop + for as_dir in notfound + 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_CXX="$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_CXX="$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 +@@ -5651,11 +5018,11 @@ esac + fi + CXX=$ac_cv_path_CXX + if test -n "$CXX"; then +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5 +-printf "%s\n" "$CXX" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5 ++$as_echo "$CXX" >&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 + + +@@ -5664,12 +5031,11 @@ if test -z "$ac_cv_path_CXX"; then + ac_pt_CXX=$CXX + # Extract the first word of "icpc", so it can be a program name with args. + set dummy icpc; 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_CXX+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_CXX+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else + case $ac_pt_CXX in + [\\/]* | ?:[\\/]*) + ac_cv_path_ac_pt_CXX="$ac_pt_CXX" # Let the user override the test with a path. +@@ -5679,15 +5045,11 @@ else $as_nop + for as_dir in notfound + 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_CXX="$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_CXX="$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 +@@ -5699,11 +5061,11 @@ esac + fi + ac_pt_CXX=$ac_cv_path_ac_pt_CXX + if test -n "$ac_pt_CXX"; then +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_pt_CXX" >&5 +-printf "%s\n" "$ac_pt_CXX" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_CXX" >&5 ++$as_echo "$ac_pt_CXX" >&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_CXX" = x; then +@@ -5711,8 +5073,8 @@ fi + 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 + CXX=$ac_pt_CXX +@@ -5734,12 +5096,11 @@ then + 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_CXX+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_CXX+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else + if test -n "$CXX"; then + ac_cv_prog_CXX="$CXX" # Let the user override the test. + else +@@ -5747,15 +5108,11 @@ 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 ++ 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_CXX="$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 +@@ -5766,11 +5123,11 @@ fi + fi + CXX=$ac_cv_prog_CXX + if test -n "$CXX"; then +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5 +-printf "%s\n" "$CXX" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5 ++$as_echo "$CXX" >&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 + + +@@ -5783,12 +5140,11 @@ if test -z "$CXX"; then + 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_CXX+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_CXX+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else + if test -n "$ac_ct_CXX"; then + ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. + else +@@ -5796,15 +5152,11 @@ 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 ++ 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_CXX="$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 +@@ -5815,11 +5167,11 @@ fi + fi + ac_ct_CXX=$ac_cv_prog_ac_ct_CXX + if test -n "$ac_ct_CXX"; then +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5 +-printf "%s\n" "$ac_ct_CXX" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5 ++$as_echo "$ac_ct_CXX" >&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 + + +@@ -5831,8 +5183,8 @@ done + 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 + CXX=$ac_ct_CXX +@@ -5846,12 +5198,12 @@ fi + fi + if test "$preset_cxx" != "$CXX" + then +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: ++ { $as_echo "$as_me:${as_lineno-$LINENO}: + + By default, distutils will build C++ extension modules with \"$CXX\". + If this is not intended, then set CXX on the configure command line. + " >&5 +-printf "%s\n" "$as_me: ++$as_echo "$as_me: + + By default, distutils will build C++ extension modules with \"$CXX\". + If this is not intended, then set CXX on the configure command line. +@@ -5862,8 +5214,8 @@ fi + MULTIARCH=$($CC --print-multiarch 2>/dev/null) + + +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for the platform triplet based on compiler characteristics" >&5 +-printf %s "checking for the platform triplet based on compiler characteristics... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the platform triplet based on compiler characteristics" >&5 ++$as_echo_n "checking for the platform triplet based on compiler characteristics... " >&6; } + cat >> conftest.c <conftest.out 2>/dev/null; then + PLATFORM_TRIPLET=`grep -v '^#' conftest.out | grep -v '^ *$' | tr -d ' '` +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PLATFORM_TRIPLET" >&5 +-printf "%s\n" "$PLATFORM_TRIPLET" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PLATFORM_TRIPLET" >&5 ++$as_echo "$PLATFORM_TRIPLET" >&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 + rm -f conftest.c conftest.out + +@@ -6033,8 +5385,8 @@ if test x$MULTIARCH != x; then + fi + + +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -Wl,--no-as-needed" >&5 +-printf %s "checking for -Wl,--no-as-needed... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -Wl,--no-as-needed" >&5 ++$as_echo_n "checking for -Wl,--no-as-needed... " >&6; } + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -Wl,--no-as-needed" + +@@ -6042,203 +5394,290 @@ 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 : + NO_AS_NEEDED="-Wl,--no-as-needed" +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-printf "%s\n" "yes" >&6; } +-else $as_nop ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; } ++else + NO_AS_NEEDED="" +- { 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 +-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" + + + + # checks for UNIX variants that set C preprocessor variables +-ac_header= ac_cache= +-for ac_item in $ac_header_c_list ++ ++{ $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 +- 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 ++ 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 +- ac_header= ac_cache= +- elif test $ac_header; then +- ac_cache=$ac_item +- else +- ac_header=$ac_item +- fi +-done +- +- +- +- +- +- +- +- +-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 ++ # 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 ++#include ++#include ++#include + +-# 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 + +- #include +- 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 + +- ; +- 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* ++ ++fi + +-else $as_nop ++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 ++#include ++#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 +- 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 ++ ++$as_echo "#define STDC_HEADERS 1" >>confdefs.h + +- printf "%s\n" "#define _ALL_SOURCE 1" >>confdefs.h ++fi + +- printf "%s\n" "#define _DARWIN_C_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 _GNU_SOURCE 1" >>confdefs.h ++fi + +- printf "%s\n" "#define _HPUX_ALT_XOPEN_SOCKET_API 1" >>confdefs.h ++done + +- printf "%s\n" "#define _NETBSD_SOURCE 1" >>confdefs.h + +- printf "%s\n" "#define _OPENBSD_SOURCE 1" >>confdefs.h + +- printf "%s\n" "#define _POSIX_PTHREAD_SEMANTICS 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_ATTRIBS_EXT__ 1" >>confdefs.h + +- printf "%s\n" "#define __STDC_WANT_IEC_60559_BFP_EXT__ 1" >>confdefs.h ++ if test "$MINIX" = yes; then + +- printf "%s\n" "#define __STDC_WANT_IEC_60559_DFP_EXT__ 1" >>confdefs.h ++$as_echo "#define _POSIX_SOURCE 1" >>confdefs.h + +- printf "%s\n" "#define __STDC_WANT_IEC_60559_FUNCS_EXT__ 1" >>confdefs.h + +- printf "%s\n" "#define __STDC_WANT_IEC_60559_TYPES_EXT__ 1" >>confdefs.h ++$as_echo "#define _POSIX_1_SOURCE 2" >>confdefs.h + +- printf "%s\n" "#define __STDC_WANT_LIB_EXT2__ 1" >>confdefs.h + +- printf "%s\n" "#define __STDC_WANT_MATH_SPEC_FUNCS__ 1" >>confdefs.h ++$as_echo "#define _MINIX 1" >>confdefs.h + +- printf "%s\n" "#define _TANDEM_SOURCE 1" >>confdefs.h ++ fi + +- if test $ac_cv_header_minix_config_h = yes +-then : +- MINIX=yes +- printf "%s\n" "#define _MINIX 1" >>confdefs.h + +- printf "%s\n" "#define _POSIX_SOURCE 1" >>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. */ + +- printf "%s\n" "#define _POSIX_1_SOURCE 2" >>confdefs.h ++# define __EXTENSIONS__ 1 ++ $ac_includes_default ++int ++main () ++{ + +-else $as_nop +- MINIX= ++ ; ++ 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_safe_to_define___extensions__ = yes +-then : +- printf "%s\n" "#define __EXTENSIONS__ 1" >>confdefs.h +- ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi +- if test $ac_cv_should_define__xopen_source = yes +-then : +- printf "%s\n" "#define _XOPEN_SOURCE 500" >>confdefs.h ++{ $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 + +-fi + + +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for the Android API level" >&5 +-printf %s "checking for the Android API level... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the Android API level" >&5 ++$as_echo_n "checking for the Android API level... " >&6; } + cat >> conftest.c <conftest.out 2>/dev/null; then + ANDROID_API_LEVEL=`sed -n -e '/__ANDROID_API__/d' -e 's/^android_api = //p' conftest.out` + _arm_arch=`sed -n -e '/__ARM_ARCH/d' -e 's/^arm_arch = //p' conftest.out` +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ANDROID_API_LEVEL" >&5 +-printf "%s\n" "$ANDROID_API_LEVEL" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ANDROID_API_LEVEL" >&5 ++$as_echo "$ANDROID_API_LEVEL" >&6; } + if test -z "$ANDROID_API_LEVEL"; then + echo 'Fatal: you must define __ANDROID_API__' + exit 1 + fi + +-printf "%s\n" "#define ANDROID_API_LEVEL $ANDROID_API_LEVEL" >>confdefs.h ++cat >>confdefs.h <<_ACEOF ++#define ANDROID_API_LEVEL $ANDROID_API_LEVEL ++_ACEOF + + +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for the Android arm ABI" >&5 +-printf %s "checking for the Android arm ABI... " >&6; } +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $_arm_arch" >&5 +-printf "%s\n" "$_arm_arch" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the Android arm ABI" >&5 ++$as_echo_n "checking for the Android arm ABI... " >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $_arm_arch" >&5 ++$as_echo "$_arm_arch" >&6; } + if test "$_arm_arch" = 7; then + BASECFLAGS="${BASECFLAGS} -mfloat-abi=softfp -mfpu=vfpv3-d16" + LDFLAGS="${LDFLAGS} -march=armv7-a -Wl,--fix-cortex-a8" + fi + else +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not Android" >&5 +-printf "%s\n" "not Android" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: not Android" >&5 ++$as_echo "not Android" >&6; } + fi + rm -f conftest.c conftest.out + +@@ -6284,12 +5725,11 @@ atheos*|Linux*/1*) + esac + + +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for --with-suffix" >&5 +-printf %s "checking for --with-suffix... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-suffix" >&5 ++$as_echo_n "checking for --with-suffix... " >&6; } + + # Check whether --with-suffix was given. +-if test ${with_suffix+y} +-then : ++if test "${with_suffix+set}" = set; then : + withval=$with_suffix; + case $withval in + no) EXEEXT=;; +@@ -6298,26 +5738,26 @@ then : + esac + fi + +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $EXEEXT" >&5 +-printf "%s\n" "$EXEEXT" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $EXEEXT" >&5 ++$as_echo "$EXEEXT" >&6; } + + # Test whether we're running on a non-case-sensitive system, in which + # case we give a warning if no ext is given + +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for case-insensitive build directory" >&5 +-printf %s "checking for case-insensitive build directory... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for case-insensitive build directory" >&5 ++$as_echo_n "checking for case-insensitive build directory... " >&6; } + if test ! -d CaseSensitiveTestDir; then + mkdir CaseSensitiveTestDir + fi + + if test -d casesensitivetestdir + 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; } + BUILDEXEEXT=.exe + 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; } + BUILDEXEEXT=$EXEEXT + fi + rmdir CaseSensitiveTestDir +@@ -6330,14 +5770,14 @@ hp*|HP*) + esac + + +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking LIBRARY" >&5 +-printf %s "checking LIBRARY... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBRARY" >&5 ++$as_echo_n "checking LIBRARY... " >&6; } + if test -z "$LIBRARY" + then + LIBRARY='libpython$(VERSION)$(ABIFLAGS).a' + fi +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIBRARY" >&5 +-printf "%s\n" "$LIBRARY" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBRARY" >&5 ++$as_echo "$LIBRARY" >&6; } + + # LDLIBRARY is the name of the library to link against (as opposed to the + # name of the library into which to insert object files). BLDLIBRARY is also +@@ -6376,8 +5816,8 @@ LDVERSION="$VERSION" + # compiled with CXX, LINKCC is CXX instead. Always using CXX is undesirable: + # python might then depend on the C++ runtime + +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking LINKCC" >&5 +-printf %s "checking LINKCC... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking LINKCC" >&5 ++$as_echo_n "checking LINKCC... " >&6; } + if test -z "$LINKCC" + then + LINKCC='$(PURIFY) $(MAINCC)' +@@ -6388,8 +5828,8 @@ then + LINKCC=qcc;; + esac + fi +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LINKCC" >&5 +-printf "%s\n" "$LINKCC" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $LINKCC" >&5 ++$as_echo "$LINKCC" >&6; } + + # EXPORTSYMS holds the list of exported symbols for AIX. + # EXPORTSFROM holds the module name exporting symbols on AIX. +@@ -6397,16 +5837,16 @@ EXPORTSYMS= + EXPORTSFROM= + + +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking EXPORTSYMS" >&5 +-printf %s "checking EXPORTSYMS... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking EXPORTSYMS" >&5 ++$as_echo_n "checking EXPORTSYMS... " >&6; } + case $ac_sys_system in + AIX*) + EXPORTSYMS="Modules/python.exp" + EXPORTSFROM=. # the main executable + ;; + esac +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $EXPORTSYMS" >&5 +-printf "%s\n" "$EXPORTSYMS" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $EXPORTSYMS" >&5 ++$as_echo "$EXPORTSYMS" >&6; } + + # GNULD is set to "yes" if the GNU linker is used. If this goes wrong + # make sure we default having it set to "no": this is used by +@@ -6414,8 +5854,8 @@ printf "%s\n" "$EXPORTSYMS" >&6; } + # to linker command lines, and failing to detect GNU ld simply results + # in the same bahaviour as before. + +-{ 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; } + ac_prog=ld + if test "$GCC" = yes; then + ac_prog=`$CC -print-prog-name=ld` +@@ -6426,14 +5866,13 @@ case `"$ac_prog" -V 2>&1 < /dev/null` in + *) + GNULD=no;; + esac +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GNULD" >&5 +-printf "%s\n" "$GNULD" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNULD" >&5 ++$as_echo "$GNULD" >&6; } + +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for --enable-shared" >&5 +-printf %s "checking for --enable-shared... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --enable-shared" >&5 ++$as_echo_n "checking for --enable-shared... " >&6; } + # Check whether --enable-shared was given. +-if test ${enable_shared+y} +-then : ++if test "${enable_shared+set}" = set; then : + enableval=$enable_shared; + fi + +@@ -6447,14 +5886,13 @@ then + enable_shared="no";; + esac + fi +-{ 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 for --enable-profiling" >&5 +-printf %s "checking for --enable-profiling... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --enable-profiling" >&5 ++$as_echo_n "checking for --enable-profiling... " >&6; } + # Check whether --enable-profiling was given. +-if test ${enable_profiling+y} +-then : ++if test "${enable_profiling+set}" = set; then : + enableval=$enable_profiling; + fi + +@@ -6465,28 +5903,27 @@ if test "x$enable_profiling" = xyes; then + /* end confdefs.h. */ + int main() { return 0; } + _ACEOF +-if ac_fn_c_try_link "$LINENO" +-then : ++if ac_fn_c_try_link "$LINENO"; then : + +-else $as_nop ++else + enable_profiling=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 + CC="$ac_save_cc" + else + enable_profiling=no + fi +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_profiling" >&5 +-printf "%s\n" "$enable_profiling" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_profiling" >&5 ++$as_echo "$enable_profiling" >&6; } + + if test "x$enable_profiling" = xyes; then + BASECFLAGS="-pg $BASECFLAGS" + LDFLAGS="-pg $LDFLAGS" + fi + +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking LDLIBRARY" >&5 +-printf %s "checking LDLIBRARY... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking LDLIBRARY" >&5 ++$as_echo_n "checking LDLIBRARY... " >&6; } + + # MacOSX framework builds need more magic. LDLIBRARY is the dynamic + # library that we build, but we do not want to link against it (we +@@ -6507,7 +5944,7 @@ fi + if test $enable_shared = "yes"; then + PY_ENABLE_SHARED=1 + +-printf "%s\n" "#define Py_ENABLE_SHARED 1" >>confdefs.h ++$as_echo "#define Py_ENABLE_SHARED 1" >>confdefs.h + + case $ac_sys_system in + CYGWIN*) +@@ -6571,8 +6008,8 @@ if test "$cross_compiling" = yes; then + RUNSHARED= + fi + +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LDLIBRARY" >&5 +-printf "%s\n" "$LDLIBRARY" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $LDLIBRARY" >&5 ++$as_echo "$LDLIBRARY" >&6; } + + + if test -n "$ac_tool_prefix"; then +@@ -6580,12 +6017,11 @@ if test -n "$ac_tool_prefix"; then + 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 +@@ -6593,15 +6029,11 @@ 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 ++ 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 +@@ -6612,11 +6044,11 @@ fi + 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 + + +@@ -6629,12 +6061,11 @@ if test -z "$AR"; then + 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 +@@ -6642,15 +6073,11 @@ 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 ++ 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 +@@ -6661,11 +6088,11 @@ fi + 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 + + +@@ -6677,8 +6104,8 @@ done + 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 +@@ -6698,12 +6125,11 @@ if test -n "$ac_tool_prefix"; then + 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_READELF+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_READELF+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else + if test -n "$READELF"; then + ac_cv_prog_READELF="$READELF" # Let the user override the test. + else +@@ -6711,15 +6137,11 @@ 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 ++ 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_READELF="$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 +@@ -6730,11 +6152,11 @@ fi + fi + READELF=$ac_cv_prog_READELF + if test -n "$READELF"; then +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $READELF" >&5 +-printf "%s\n" "$READELF" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $READELF" >&5 ++$as_echo "$READELF" >&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 + + +@@ -6747,12 +6169,11 @@ if test -z "$READELF"; then + 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_READELF+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_READELF+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else + if test -n "$ac_ct_READELF"; then + ac_cv_prog_ac_ct_READELF="$ac_ct_READELF" # Let the user override the test. + else +@@ -6760,15 +6181,11 @@ 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 ++ 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_READELF="$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 +@@ -6779,11 +6196,11 @@ fi + fi + ac_ct_READELF=$ac_cv_prog_ac_ct_READELF + if test -n "$ac_ct_READELF"; then +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_READELF" >&5 +-printf "%s\n" "$ac_ct_READELF" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_READELF" >&5 ++$as_echo "$ac_ct_READELF" >&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 + + +@@ -6795,8 +6212,8 @@ done + 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 + READELF=$ac_ct_READELF +@@ -6821,8 +6238,7 @@ hp*|HP*) + INSTALL="${srcdir}/install-sh -c" + fi + esac +- +- # Find a good install program. We prefer a C program (faster), ++# 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 +@@ -6836,25 +6252,20 @@ esac + # 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/* ) ;; +@@ -6864,13 +6275,13 @@ case $as_dir in #(( + # 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 +@@ -6878,12 +6289,12 @@ case $as_dir in #(( + 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 +@@ -6899,7 +6310,7 @@ IFS=$as_save_IFS + 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 +@@ -6909,8 +6320,8 @@ fi + 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. +@@ -6920,31 +6331,25 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' + + test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' + +- +- { 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 +@@ -6955,7 +6360,7 @@ IFS=$as_save_IFS + 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 +@@ -6965,8 +6370,8 @@ fi + 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; } + + + # Not every filesystem supports hard links +@@ -6983,63 +6388,60 @@ fi + ABIFLAGS="" + + # Check for --with-pydebug +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for --with-pydebug" >&5 +-printf %s "checking for --with-pydebug... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-pydebug" >&5 ++$as_echo_n "checking for --with-pydebug... " >&6; } + + # Check whether --with-pydebug was given. +-if test ${with_pydebug+y} +-then : ++if test "${with_pydebug+set}" = set; then : + withval=$with_pydebug; + if test "$withval" != no + then + +-printf "%s\n" "#define Py_DEBUG 1" >>confdefs.h ++$as_echo "#define Py_DEBUG 1" >>confdefs.h + +- { 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; }; + Py_DEBUG='true' + ABIFLAGS="${ABIFLAGS}d" +-else { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-printf "%s\n" "no" >&6; }; Py_DEBUG='false' ++else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; }; Py_DEBUG='false' + fi +-else $as_nop +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-printf "%s\n" "no" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } + fi + + + # Check for --with-trace-refs + # --with-trace-refs +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for --with-trace-refs" >&5 +-printf %s "checking for --with-trace-refs... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-trace-refs" >&5 ++$as_echo_n "checking for --with-trace-refs... " >&6; } + + # Check whether --with-trace-refs was given. +-if test ${with_trace_refs+y} +-then : ++if test "${with_trace_refs+set}" = set; then : + withval=$with_trace_refs; +-else $as_nop ++else + with_trace_refs=no + fi + +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_trace_refs" >&5 +-printf "%s\n" "$with_trace_refs" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_trace_refs" >&5 ++$as_echo "$with_trace_refs" >&6; } + + if test "$with_trace_refs" = "yes" + then + +-printf "%s\n" "#define Py_TRACE_REFS 1" >>confdefs.h ++$as_echo "#define Py_TRACE_REFS 1" >>confdefs.h + + fi + + # Check for --with-assertions. + # This allows enabling assertions without Py_DEBUG. + assertions='false' +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for --with-assertions" >&5 +-printf %s "checking for --with-assertions... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-assertions" >&5 ++$as_echo_n "checking for --with-assertions... " >&6; } + + # Check whether --with-assertions was given. +-if test ${with_assertions+y} +-then : ++if test "${with_assertions+set}" = set; then : + withval=$with_assertions; + if test "$withval" != no + then +@@ -7048,40 +6450,39 @@ fi + fi + + if test "$assertions" = 'true'; 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; } + elif test "$Py_DEBUG" = 'true'; then + assertions='true' +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: implied by --with-pydebug" >&5 +-printf "%s\n" "implied by --with-pydebug" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: implied by --with-pydebug" >&5 ++$as_echo "implied by --with-pydebug" >&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 + + # Enable optimization flags + + + Py_OPT='false' +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for --enable-optimizations" >&5 +-printf %s "checking for --enable-optimizations... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --enable-optimizations" >&5 ++$as_echo_n "checking for --enable-optimizations... " >&6; } + # Check whether --enable-optimizations was given. +-if test ${enable_optimizations+y} +-then : ++if test "${enable_optimizations+set}" = set; then : + enableval=$enable_optimizations; + if test "$enableval" != no + then + Py_OPT='true' +- { 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 + Py_OPT='false' +- { 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 +-else $as_nop +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-printf "%s\n" "no" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } + fi + + if test "$Py_OPT" = 'true' ; then +@@ -7094,12 +6495,11 @@ if test "$Py_OPT" = 'true' ; then + DEF_MAKE_RULE="build_all" + case $CC in + *gcc*) +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -fno-semantic-interposition" >&5 +-printf %s "checking whether C compiler accepts -fno-semantic-interposition... " >&6; } +-if test ${ax_cv_check_cflags___fno_semantic_interposition+y} +-then : +- printf %s "(cached) " >&6 +-else $as_nop ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -fno-semantic-interposition" >&5 ++$as_echo_n "checking whether C compiler accepts -fno-semantic-interposition... " >&6; } ++if ${ax_cv_check_cflags___fno_semantic_interposition+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else + + ax_check_save_flags=$CFLAGS + CFLAGS="$CFLAGS -fno-semantic-interposition" +@@ -7107,31 +6507,29 @@ else $as_nop + /* 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 : + ax_cv_check_cflags___fno_semantic_interposition=yes +-else $as_nop ++else + ax_cv_check_cflags___fno_semantic_interposition=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 + CFLAGS=$ax_check_save_flags + fi +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___fno_semantic_interposition" >&5 +-printf "%s\n" "$ax_cv_check_cflags___fno_semantic_interposition" >&6; } +-if test "x$ax_cv_check_cflags___fno_semantic_interposition" = xyes +-then : ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___fno_semantic_interposition" >&5 ++$as_echo "$ax_cv_check_cflags___fno_semantic_interposition" >&6; } ++if test "x$ax_cv_check_cflags___fno_semantic_interposition" = xyes; then : + + CFLAGS_NODIST="$CFLAGS_NODIST -fno-semantic-interposition" + LDFLAGS_NODIST="$LDFLAGS_NODIST -fno-semantic-interposition" + +-else $as_nop ++else + : + fi + +@@ -7146,14 +6544,14 @@ else + fi + + +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking PROFILE_TASK" >&5 +-printf %s "checking PROFILE_TASK... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking PROFILE_TASK" >&5 ++$as_echo_n "checking PROFILE_TASK... " >&6; } + if test -z "$PROFILE_TASK" + then + PROFILE_TASK='-m test --pgo --timeout=$(TESTTIMEOUT)' + fi +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PROFILE_TASK" >&5 +-printf "%s\n" "$PROFILE_TASK" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $PROFILE_TASK" >&5 ++$as_echo "$PROFILE_TASK" >&6; } + + # Make llvm-relatec checks work on systems where llvm tools are not installed with their + # normal names in the default $PATH (ie: Ubuntu). They exist under the +@@ -7176,26 +6574,25 @@ then + fi + + # Enable LTO flags +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for --with-lto" >&5 +-printf %s "checking for --with-lto... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-lto" >&5 ++$as_echo_n "checking for --with-lto... " >&6; } + + # Check whether --with-lto was given. +-if test ${with_lto+y} +-then : ++if test "${with_lto+set}" = set; then : + withval=$with_lto; + if test "$withval" != no + then + Py_LTO='true' +- { 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 + Py_LTO='false' +- { 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 +-else $as_nop +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-printf "%s\n" "no" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } + fi + + if test "$Py_LTO" = 'true' ; then +@@ -7205,12 +6602,11 @@ if test "$Py_LTO" = 'true' ; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}llvm-ar", so it can be a program name with args. + set dummy ${ac_tool_prefix}llvm-ar; 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_LLVM_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_path_LLVM_AR+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else + case $LLVM_AR in + [\\/]* | ?:[\\/]*) + ac_cv_path_LLVM_AR="$LLVM_AR" # Let the user override the test with a path. +@@ -7220,15 +6616,11 @@ else $as_nop + for as_dir in ${llvm_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_LLVM_AR="$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_LLVM_AR="$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 +@@ -7240,11 +6632,11 @@ esac + fi + LLVM_AR=$ac_cv_path_LLVM_AR + if test -n "$LLVM_AR"; then +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LLVM_AR" >&5 +-printf "%s\n" "$LLVM_AR" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LLVM_AR" >&5 ++$as_echo "$LLVM_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 + + +@@ -7253,12 +6645,11 @@ if test -z "$ac_cv_path_LLVM_AR"; then + ac_pt_LLVM_AR=$LLVM_AR + # Extract the first word of "llvm-ar", so it can be a program name with args. + set dummy llvm-ar; 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_LLVM_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_path_ac_pt_LLVM_AR+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else + case $ac_pt_LLVM_AR in + [\\/]* | ?:[\\/]*) + ac_cv_path_ac_pt_LLVM_AR="$ac_pt_LLVM_AR" # Let the user override the test with a path. +@@ -7268,15 +6659,11 @@ else $as_nop + for as_dir in ${llvm_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_LLVM_AR="$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_LLVM_AR="$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 +@@ -7288,11 +6675,11 @@ esac + fi + ac_pt_LLVM_AR=$ac_cv_path_ac_pt_LLVM_AR + if test -n "$ac_pt_LLVM_AR"; then +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_pt_LLVM_AR" >&5 +-printf "%s\n" "$ac_pt_LLVM_AR" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_LLVM_AR" >&5 ++$as_echo "$ac_pt_LLVM_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 + + if test "x$ac_pt_LLVM_AR" = x; then +@@ -7300,8 +6687,8 @@ fi + 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 + LLVM_AR=$ac_pt_LLVM_AR +@@ -7324,8 +6711,8 @@ fi + then + LLVM_AR='/usr/bin/xcrun llvm-ar' + LLVM_AR_FOUND=found +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: llvm-ar found via xcrun: ${LLVM_AR}" >&5 +-printf "%s\n" "$as_me: llvm-ar found via xcrun: ${LLVM_AR}" >&6;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: llvm-ar found via xcrun: ${LLVM_AR}" >&5 ++$as_echo "$as_me: llvm-ar found via xcrun: ${LLVM_AR}" >&6;} + fi + fi + if test $LLVM_AR_FOUND = not-found +@@ -7379,12 +6766,11 @@ fi + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}llvm-profdata", so it can be a program name with args. + set dummy ${ac_tool_prefix}llvm-profdata; 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_LLVM_PROFDATA+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_LLVM_PROFDATA+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else + case $LLVM_PROFDATA in + [\\/]* | ?:[\\/]*) + ac_cv_path_LLVM_PROFDATA="$LLVM_PROFDATA" # Let the user override the test with a path. +@@ -7394,15 +6780,11 @@ else $as_nop + for as_dir in ${llvm_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_LLVM_PROFDATA="$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_LLVM_PROFDATA="$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 +@@ -7414,11 +6796,11 @@ esac + fi + LLVM_PROFDATA=$ac_cv_path_LLVM_PROFDATA + if test -n "$LLVM_PROFDATA"; then +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LLVM_PROFDATA" >&5 +-printf "%s\n" "$LLVM_PROFDATA" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LLVM_PROFDATA" >&5 ++$as_echo "$LLVM_PROFDATA" >&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 + + +@@ -7427,12 +6809,11 @@ if test -z "$ac_cv_path_LLVM_PROFDATA"; then + ac_pt_LLVM_PROFDATA=$LLVM_PROFDATA + # Extract the first word of "llvm-profdata", so it can be a program name with args. + set dummy llvm-profdata; 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_LLVM_PROFDATA+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_LLVM_PROFDATA+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else + case $ac_pt_LLVM_PROFDATA in + [\\/]* | ?:[\\/]*) + ac_cv_path_ac_pt_LLVM_PROFDATA="$ac_pt_LLVM_PROFDATA" # Let the user override the test with a path. +@@ -7442,15 +6823,11 @@ else $as_nop + for as_dir in ${llvm_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_LLVM_PROFDATA="$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_LLVM_PROFDATA="$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 +@@ -7462,11 +6839,11 @@ esac + fi + ac_pt_LLVM_PROFDATA=$ac_cv_path_ac_pt_LLVM_PROFDATA + if test -n "$ac_pt_LLVM_PROFDATA"; then +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_pt_LLVM_PROFDATA" >&5 +-printf "%s\n" "$ac_pt_LLVM_PROFDATA" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_LLVM_PROFDATA" >&5 ++$as_echo "$ac_pt_LLVM_PROFDATA" >&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_LLVM_PROFDATA" = x; then +@@ -7474,8 +6851,8 @@ fi + 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 + LLVM_PROFDATA=$ac_pt_LLVM_PROFDATA +@@ -7500,8 +6877,8 @@ then + # https://apple.stackexchange.com/questions/197053/ + LLVM_PROFDATA='/usr/bin/xcrun llvm-profdata' + LLVM_PROF_FOUND=found +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: llvm-profdata found via xcrun: ${LLVM_PROFDATA}" >&5 +-printf "%s\n" "$as_me: llvm-profdata found via xcrun: ${LLVM_PROFDATA}" >&6;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: llvm-profdata found via xcrun: ${LLVM_PROFDATA}" >&5 ++$as_echo "$as_me: llvm-profdata found via xcrun: ${LLVM_PROFDATA}" >&6;} + fi + fi + LLVM_PROF_ERR=no +@@ -7645,20 +7022,19 @@ case $GCC in + yes) + CFLAGS_NODIST="$CFLAGS_NODIST -std=c99" + +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -Wextra" >&5 +-printf %s "checking for -Wextra... " >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -Wextra" >&5 ++$as_echo_n "checking for -Wextra... " >&6; } + ac_save_cc="$CC" + CC="$CC -Wextra -Werror" +- if test ${ac_cv_extra_warnings+y} +-then : +- printf %s "(cached) " >&6 +-else $as_nop ++ if ${ac_cv_extra_warnings+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + + int +-main (void) ++main () + { + + ; +@@ -7666,22 +7042,21 @@ main (void) + } + + _ACEOF +-if ac_fn_c_try_compile "$LINENO" +-then : ++if ac_fn_c_try_compile "$LINENO"; then : + + ac_cv_extra_warnings=yes + +-else $as_nop ++else + + ac_cv_extra_warnings=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 + + CC="$ac_save_cc" +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_extra_warnings" >&5 +-printf "%s\n" "$ac_cv_extra_warnings" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_extra_warnings" >&5 ++$as_echo "$ac_cv_extra_warnings" >&6; } + + if test $ac_cv_extra_warnings = yes + then +@@ -7692,21 +7067,20 @@ printf "%s\n" "$ac_cv_extra_warnings" >&6; } + # GCC produce warnings for legal Python code. Enable + # -fno-strict-aliasing on versions of GCC that support but produce + # warnings. See Issue3326 +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts and needs -fno-strict-aliasing" >&5 +-printf %s "checking whether $CC accepts and needs -fno-strict-aliasing... " >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts and needs -fno-strict-aliasing" >&5 ++$as_echo_n "checking whether $CC accepts and needs -fno-strict-aliasing... " >&6; } + ac_save_cc="$CC" + CC="$CC -fno-strict-aliasing" + save_CFLAGS="$CFLAGS" +- if test ${ac_cv_no_strict_aliasing+y} +-then : +- printf %s "(cached) " >&6 +-else $as_nop ++ if ${ac_cv_no_strict_aliasing+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + + int +-main (void) ++main () + { + + ; +@@ -7714,8 +7088,7 @@ main (void) + } + + _ACEOF +-if ac_fn_c_try_compile "$LINENO" +-then : ++if ac_fn_c_try_compile "$LINENO"; then : + + CC="$ac_save_cc -fstrict-aliasing" + CFLAGS="$CFLAGS -Werror -Wstrict-aliasing" +@@ -7724,7 +7097,7 @@ then : + + void f(int **x) {} + int +-main (void) ++main () + { + double *x; f((int **) &x); + ; +@@ -7732,30 +7105,29 @@ double *x; f((int **) &x); + } + + _ACEOF +-if ac_fn_c_try_compile "$LINENO" +-then : ++if ac_fn_c_try_compile "$LINENO"; then : + + ac_cv_no_strict_aliasing=no + +-else $as_nop ++else + + ac_cv_no_strict_aliasing=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 + +-else $as_nop ++else + + ac_cv_no_strict_aliasing=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 + + CFLAGS="$save_CFLAGS" + CC="$ac_save_cc" +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_no_strict_aliasing" >&5 +-printf "%s\n" "$ac_cv_no_strict_aliasing" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_no_strict_aliasing" >&5 ++$as_echo "$ac_cv_no_strict_aliasing" >&6; } + if test $ac_cv_no_strict_aliasing = yes + then + BASECFLAGS="$BASECFLAGS -fno-strict-aliasing" +@@ -7768,21 +7140,20 @@ printf "%s\n" "$ac_cv_no_strict_aliasing" >&6; } + ac_cv_disable_unused_result_warning=no + ;; + *) +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if we can turn off $CC unused result warning" >&5 +-printf %s "checking if we can turn off $CC unused result warning... " >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can turn off $CC unused result warning" >&5 ++$as_echo_n "checking if we can turn off $CC unused result warning... " >&6; } + ac_save_cc="$CC" + CC="$CC -Wunused-result -Werror" + save_CFLAGS="$CFLAGS" +- if test ${ac_cv_disable_unused_result_warning+y} +-then : +- printf %s "(cached) " >&6 +-else $as_nop ++ if ${ac_cv_disable_unused_result_warning+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + + int +-main (void) ++main () + { + + ; +@@ -7790,23 +7161,22 @@ main (void) + } + + _ACEOF +-if ac_fn_c_try_compile "$LINENO" +-then : ++if ac_fn_c_try_compile "$LINENO"; then : + + ac_cv_disable_unused_result_warning=yes + +-else $as_nop ++else + + ac_cv_disable_unused_result_warning=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 + + CFLAGS="$save_CFLAGS" + CC="$ac_save_cc" +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_disable_unused_result_warning" >&5 +-printf "%s\n" "$ac_cv_disable_unused_result_warning" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_disable_unused_result_warning" >&5 ++$as_echo "$ac_cv_disable_unused_result_warning" >&6; } + ;; + esac + +@@ -7816,20 +7186,19 @@ printf "%s\n" "$ac_cv_disable_unused_result_warning" >&6; } + CFLAGS_NODIST="$CFLAGS_NODIST -Wno-unused-result" + fi + +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if we can turn off $CC unused parameter warning" >&5 +-printf %s "checking if we can turn off $CC unused parameter warning... " >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can turn off $CC unused parameter warning" >&5 ++$as_echo_n "checking if we can turn off $CC unused parameter warning... " >&6; } + ac_save_cc="$CC" + CC="$CC -Wunused-parameter -Werror" +- if test ${ac_cv_disable_unused_parameter_warning+y} +-then : +- printf %s "(cached) " >&6 +-else $as_nop ++ if ${ac_cv_disable_unused_parameter_warning+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + + int +-main (void) ++main () + { + + ; +@@ -7837,42 +7206,40 @@ main (void) + } + + _ACEOF +-if ac_fn_c_try_compile "$LINENO" +-then : ++if ac_fn_c_try_compile "$LINENO"; then : + + ac_cv_disable_unused_parameter_warning=yes + +-else $as_nop ++else + + ac_cv_disable_unused_parameter_warning=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 + + CC="$ac_save_cc" +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_disable_unused_parameter_warning" >&5 +-printf "%s\n" "$ac_cv_disable_unused_parameter_warning" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_disable_unused_parameter_warning" >&5 ++$as_echo "$ac_cv_disable_unused_parameter_warning" >&6; } + + if test $ac_cv_disable_unused_parameter_warning = yes + then + CFLAGS_NODIST="$CFLAGS_NODIST -Wno-unused-parameter" + fi + +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if we can turn off $CC missing field initializers warning" >&5 +-printf %s "checking if we can turn off $CC missing field initializers warning... " >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can turn off $CC missing field initializers warning" >&5 ++$as_echo_n "checking if we can turn off $CC missing field initializers warning... " >&6; } + ac_save_cc="$CC" + CC="$CC -Wmissing-field-initializers -Werror" +- if test ${ac_cv_disable_missing_field_initializers+y} +-then : +- printf %s "(cached) " >&6 +-else $as_nop ++ if ${ac_cv_disable_missing_field_initializers+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + + int +-main (void) ++main () + { + + ; +@@ -7880,43 +7247,41 @@ main (void) + } + + _ACEOF +-if ac_fn_c_try_compile "$LINENO" +-then : ++if ac_fn_c_try_compile "$LINENO"; then : + + ac_cv_disable_missing_field_initializers=yes + +-else $as_nop ++else + + ac_cv_disable_missing_field_initializers=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 + + CC="$ac_save_cc" +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_disable_missing_field_initializers" >&5 +-printf "%s\n" "$ac_cv_disable_missing_field_initializers" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_disable_missing_field_initializers" >&5 ++$as_echo "$ac_cv_disable_missing_field_initializers" >&6; } + + if test $ac_cv_disable_missing_field_initializers = yes + then + CFLAGS_NODIST="$CFLAGS_NODIST -Wno-missing-field-initializers" + fi + +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if we can turn on $CC mixed sign comparison warning" >&5 +-printf %s "checking if we can turn on $CC mixed sign comparison warning... " >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can turn on $CC mixed sign comparison warning" >&5 ++$as_echo_n "checking if we can turn on $CC mixed sign comparison warning... " >&6; } + ac_save_cc="$CC" + CC="$CC -Wsign-compare" + save_CFLAGS="$CFLAGS" +- if test ${ac_cv_enable_sign_compare_warning+y} +-then : +- printf %s "(cached) " >&6 +-else $as_nop ++ if ${ac_cv_enable_sign_compare_warning+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + + int +-main (void) ++main () + { + + ; +@@ -7924,44 +7289,42 @@ main (void) + } + + _ACEOF +-if ac_fn_c_try_compile "$LINENO" +-then : ++if ac_fn_c_try_compile "$LINENO"; then : + + ac_cv_enable_sign_compare_warning=yes + +-else $as_nop ++else + + ac_cv_enable_sign_compare_warning=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 + + CFLAGS="$save_CFLAGS" + CC="$ac_save_cc" +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_enable_sign_compare_warning" >&5 +-printf "%s\n" "$ac_cv_enable_sign_compare_warning" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_enable_sign_compare_warning" >&5 ++$as_echo "$ac_cv_enable_sign_compare_warning" >&6; } + + if test $ac_cv_enable_sign_compare_warning = yes + then + BASECFLAGS="$BASECFLAGS -Wsign-compare" + fi + +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if we can turn on $CC unreachable code warning" >&5 +-printf %s "checking if we can turn on $CC unreachable code warning... " >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can turn on $CC unreachable code warning" >&5 ++$as_echo_n "checking if we can turn on $CC unreachable code warning... " >&6; } + ac_save_cc="$CC" + CC="$CC -Wunreachable-code" + save_CFLAGS="$CFLAGS" +- if test ${ac_cv_enable_unreachable_code_warning+y} +-then : +- printf %s "(cached) " >&6 +-else $as_nop ++ if ${ac_cv_enable_unreachable_code_warning+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + + int +-main (void) ++main () + { + + ; +@@ -7969,17 +7332,16 @@ main (void) + } + + _ACEOF +-if ac_fn_c_try_compile "$LINENO" +-then : ++if ac_fn_c_try_compile "$LINENO"; then : + + ac_cv_enable_unreachable_code_warning=yes + +-else $as_nop ++else + + ac_cv_enable_unreachable_code_warning=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 + + CFLAGS="$save_CFLAGS" +@@ -8000,23 +7362,22 @@ fi + else + ac_cv_enable_unreachable_code_warning=no + fi +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_enable_unreachable_code_warning" >&5 +-printf "%s\n" "$ac_cv_enable_unreachable_code_warning" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_enable_unreachable_code_warning" >&5 ++$as_echo "$ac_cv_enable_unreachable_code_warning" >&6; } + +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if we can turn on $CC strict-prototypes warning" >&5 +-printf %s "checking if we can turn on $CC strict-prototypes warning... " >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can turn on $CC strict-prototypes warning" >&5 ++$as_echo_n "checking if we can turn on $CC strict-prototypes warning... " >&6; } + ac_save_cc="$CC" + CC="$CC -Werror -Wstrict-prototypes" +- if test ${ac_cv_enable_enable_strict_prototypes_warning+y} +-then : +- printf %s "(cached) " >&6 +-else $as_nop ++ if ${ac_cv_enable_enable_strict_prototypes_warning+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + + int +-main (void) ++main () + { + + ; +@@ -8024,42 +7385,40 @@ main (void) + } + + _ACEOF +-if ac_fn_c_try_compile "$LINENO" +-then : ++if ac_fn_c_try_compile "$LINENO"; then : + + ac_cv_enable_strict_prototypes_warning=yes + +-else $as_nop ++else + + ac_cv_enable_strict_prototypes_warning=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 + + CC="$ac_save_cc" +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_enable_strict_prototypes_warning" >&5 +-printf "%s\n" "$ac_cv_enable_strict_prototypes_warning" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_enable_strict_prototypes_warning" >&5 ++$as_echo "$ac_cv_enable_strict_prototypes_warning" >&6; } + + if test $ac_cv_enable_strict_prototypes_warning = yes + then + CFLAGS_NODIST="$CFLAGS_NODIST -Wstrict-prototypes" + fi + +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if we can make implicit function declaration an error in $CC" >&5 +-printf %s "checking if we can make implicit function declaration an error in $CC... " >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can make implicit function declaration an error in $CC" >&5 ++$as_echo_n "checking if we can make implicit function declaration an error in $CC... " >&6; } + ac_save_cc="$CC" + CC="$CC -Werror=implicit-function-declaration" +- if test ${ac_cv_enable_implicit_function_declaration_error+y} +-then : +- printf %s "(cached) " >&6 +-else $as_nop ++ if ${ac_cv_enable_implicit_function_declaration_error+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + + int +-main (void) ++main () + { + + ; +@@ -8067,42 +7426,40 @@ main (void) + } + + _ACEOF +-if ac_fn_c_try_compile "$LINENO" +-then : ++if ac_fn_c_try_compile "$LINENO"; then : + + ac_cv_enable_implicit_function_declaration_error=yes + +-else $as_nop ++else + + ac_cv_enable_implicit_function_declaration_error=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 + + CC="$ac_save_cc" +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_enable_implicit_function_declaration_error" >&5 +-printf "%s\n" "$ac_cv_enable_implicit_function_declaration_error" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_enable_implicit_function_declaration_error" >&5 ++$as_echo "$ac_cv_enable_implicit_function_declaration_error" >&6; } + + if test $ac_cv_enable_implicit_function_declaration_error = yes + then + CFLAGS_NODIST="$CFLAGS_NODIST -Werror=implicit-function-declaration" + fi + +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if we can use visibility in $CC" >&5 +-printf %s "checking if we can use visibility in $CC... " >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can use visibility in $CC" >&5 ++$as_echo_n "checking if we can use visibility in $CC... " >&6; } + ac_save_cc="$CC" + CC="$CC -fvisibility=hidden" +- if test ${ac_cv_enable_visibility+y} +-then : +- printf %s "(cached) " >&6 +-else $as_nop ++ if ${ac_cv_enable_visibility+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + + int +-main (void) ++main () + { + + ; +@@ -8110,22 +7467,21 @@ main (void) + } + + _ACEOF +-if ac_fn_c_try_compile "$LINENO" +-then : ++if ac_fn_c_try_compile "$LINENO"; then : + + ac_cv_enable_visibility=yes + +-else $as_nop ++else + + ac_cv_enable_visibility=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 + + CC="$ac_save_cc" +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_enable_visibility" >&5 +-printf "%s\n" "$ac_cv_enable_visibility" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_enable_visibility" >&5 ++$as_echo "$ac_cv_enable_visibility" >&6; } + + if test $ac_cv_enable_visibility = yes + then +@@ -8151,8 +7507,8 @@ printf "%s\n" "$ac_cv_enable_visibility" >&6; } + # used to be here, but non-Apple gcc doesn't accept them. + if test "${CC}" = gcc + then +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which compiler should be used" >&5 +-printf %s "checking which compiler should be used... " >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking which compiler should be used" >&5 ++$as_echo_n "checking which compiler should be used... " >&6; } + case "${UNIVERSALSDK}" in + */MacOSX10.4u.sdk) + # Build using 10.4 SDK, force usage of gcc when the +@@ -8162,8 +7518,8 @@ printf %s "checking which compiler should be used... " >&6; } + CPP=cpp-4.0 + ;; + esac +- { 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; } + fi + + if test "${enable_universalsdk}" +@@ -8238,8 +7594,8 @@ printf "%s\n" "$CC" >&6; } + # below to pick either 10.3, 10.4, or 10.5 as the target. + # 4. If we are running on OS X 10.2 or earlier, good luck! + +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which MACOSX_DEPLOYMENT_TARGET to use" >&5 +-printf %s "checking which MACOSX_DEPLOYMENT_TARGET to use... " >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking which MACOSX_DEPLOYMENT_TARGET to use" >&5 ++$as_echo_n "checking which MACOSX_DEPLOYMENT_TARGET to use... " >&6; } + cur_target_major=`sw_vers -productVersion | \ + sed 's/\([0-9]*\)\.\([0-9]*\).*/\1/'` + cur_target_minor=`sw_vers -productVersion | \ +@@ -8276,33 +7632,32 @@ printf %s "checking which MACOSX_DEPLOYMENT_TARGET to use... " >&6; } + MACOSX_DEPLOYMENT_TARGET="$CONFIGURE_MACOSX_DEPLOYMENT_TARGET" + export MACOSX_DEPLOYMENT_TARGET + EXPORT_MACOSX_DEPLOYMENT_TARGET='' +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MACOSX_DEPLOYMENT_TARGET" >&5 +-printf "%s\n" "$MACOSX_DEPLOYMENT_TARGET" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MACOSX_DEPLOYMENT_TARGET" >&5 ++$as_echo "$MACOSX_DEPLOYMENT_TARGET" >&6; } + +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if specified universal architectures work" >&5 +-printf %s "checking if specified universal architectures work... " >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if specified universal architectures work" >&5 ++$as_echo_n "checking if specified universal architectures work... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + int +-main (void) ++main () + { + printf("%d", 42); + ; + return 0; + } + _ACEOF +-if ac_fn_c_try_link "$LINENO" +-then : +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-printf "%s\n" "yes" >&6; } +-else $as_nop +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-printf "%s\n" "no" >&6; } ++if ac_fn_c_try_link "$LINENO"; then : ++ { $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; } + as_fn_error $? "check config.log and use the '--with-universal-archs' option" "$LINENO" 5 + + 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 + + # end of Darwin* tests +@@ -8348,16 +7703,14 @@ fi + # complain if unaccepted options are passed (e.g. gcc on Mac OS X). + # So we have to see first whether pthreads are available without + # options before we can check whether -Kpthread improves anything. +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether pthreads are available without options" >&5 +-printf %s "checking whether pthreads are available without options... " >&6; } +-if test ${ac_cv_pthread_is_default+y} +-then : +- printf %s "(cached) " >&6 +-else $as_nop +- if test "$cross_compiling" = yes +-then : ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pthreads are available without options" >&5 ++$as_echo_n "checking whether pthreads are available without options... " >&6; } ++if ${ac_cv_pthread_is_default+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test "$cross_compiling" = yes; then : + ac_cv_pthread_is_default=no +-else $as_nop ++else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -8375,14 +7728,13 @@ int main(){ + } + + _ACEOF +-if ac_fn_c_try_run "$LINENO" +-then : ++if ac_fn_c_try_run "$LINENO"; then : + + ac_cv_pthread_is_default=yes + ac_cv_kthread=no + ac_cv_pthread=no + +-else $as_nop ++else + ac_cv_pthread_is_default=no + fi + rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ +@@ -8392,8 +7744,8 @@ fi + + fi + +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_pthread_is_default" >&5 +-printf "%s\n" "$ac_cv_pthread_is_default" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_pthread_is_default" >&5 ++$as_echo "$ac_cv_pthread_is_default" >&6; } + + + if test $ac_cv_pthread_is_default = yes +@@ -8405,18 +7757,16 @@ else + # Some compilers won't report that they do not support -Kpthread, + # so we need to run a program to see whether it really made the + # function available. +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -Kpthread" >&5 +-printf %s "checking whether $CC accepts -Kpthread... " >&6; } +-if test ${ac_cv_kpthread+y} +-then : +- printf %s "(cached) " >&6 +-else $as_nop ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -Kpthread" >&5 ++$as_echo_n "checking whether $CC accepts -Kpthread... " >&6; } ++if ${ac_cv_kpthread+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else + ac_save_cc="$CC" + CC="$CC -Kpthread" +-if test "$cross_compiling" = yes +-then : ++if test "$cross_compiling" = yes; then : + ac_cv_kpthread=no +-else $as_nop ++else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -8434,10 +7784,9 @@ int main(){ + } + + _ACEOF +-if ac_fn_c_try_run "$LINENO" +-then : ++if ac_fn_c_try_run "$LINENO"; then : + ac_cv_kpthread=yes +-else $as_nop ++else + ac_cv_kpthread=no + fi + rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ +@@ -8447,8 +7796,8 @@ fi + CC="$ac_save_cc" + fi + +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_kpthread" >&5 +-printf "%s\n" "$ac_cv_kpthread" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_kpthread" >&5 ++$as_echo "$ac_cv_kpthread" >&6; } + fi + + if test $ac_cv_kpthread = no -a $ac_cv_pthread_is_default = no +@@ -8458,18 +7807,16 @@ then + # Some compilers won't report that they do not support -Kthread, + # so we need to run a program to see whether it really made the + # function available. +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -Kthread" >&5 +-printf %s "checking whether $CC accepts -Kthread... " >&6; } +-if test ${ac_cv_kthread+y} +-then : +- printf %s "(cached) " >&6 +-else $as_nop ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -Kthread" >&5 ++$as_echo_n "checking whether $CC accepts -Kthread... " >&6; } ++if ${ac_cv_kthread+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else + ac_save_cc="$CC" + CC="$CC -Kthread" +-if test "$cross_compiling" = yes +-then : ++if test "$cross_compiling" = yes; then : + ac_cv_kthread=no +-else $as_nop ++else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -8487,10 +7834,9 @@ int main(){ + } + + _ACEOF +-if ac_fn_c_try_run "$LINENO" +-then : ++if ac_fn_c_try_run "$LINENO"; then : + ac_cv_kthread=yes +-else $as_nop ++else + ac_cv_kthread=no + fi + rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ +@@ -8500,8 +7846,8 @@ fi + CC="$ac_save_cc" + fi + +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_kthread" >&5 +-printf "%s\n" "$ac_cv_kthread" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_kthread" >&5 ++$as_echo "$ac_cv_kthread" >&6; } + fi + + if test $ac_cv_kthread = no -a $ac_cv_pthread_is_default = no +@@ -8511,18 +7857,16 @@ then + # Some compilers won't report that they do not support -pthread, + # so we need to run a program to see whether it really made the + # function available. +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -pthread" >&5 +-printf %s "checking whether $CC accepts -pthread... " >&6; } +-if test ${ac_cv_pthread+y} +-then : +- printf %s "(cached) " >&6 +-else $as_nop ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -pthread" >&5 ++$as_echo_n "checking whether $CC accepts -pthread... " >&6; } ++if ${ac_cv_pthread+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else + ac_save_cc="$CC" + CC="$CC -pthread" +-if test "$cross_compiling" = yes +-then : ++if test "$cross_compiling" = yes; then : + ac_cv_pthread=no +-else $as_nop ++else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -8540,10 +7884,9 @@ int main(){ + } + + _ACEOF +-if ac_fn_c_try_run "$LINENO" +-then : ++if ac_fn_c_try_run "$LINENO"; then : + ac_cv_pthread=yes +-else $as_nop ++else + ac_cv_pthread=no + fi + rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ +@@ -8553,8 +7896,8 @@ fi + CC="$ac_save_cc" + fi + +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_pthread" >&5 +-printf "%s\n" "$ac_cv_pthread" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_pthread" >&5 ++$as_echo "$ac_cv_pthread" >&6; } + fi + + # If we have set a CC compiler flag for thread support then +@@ -8562,8 +7905,8 @@ fi + ac_cv_cxx_thread=no + if test ! -z "$CXX" + then +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CXX also accepts flags for thread support" >&5 +-printf %s "checking whether $CXX also accepts flags for thread support... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX also accepts flags for thread support" >&5 ++$as_echo_n "checking whether $CXX also accepts flags for thread support... " >&6; } + ac_save_cxx="$CXX" + + if test "$ac_cv_kpthread" = "yes" +@@ -8593,702 +7936,358 @@ then + fi + rm -fr conftest* + fi +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_thread" >&5 +-printf "%s\n" "$ac_cv_cxx_thread" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_thread" >&5 ++$as_echo "$ac_cv_cxx_thread" >&6; } + fi + CXX="$ac_save_cxx" + + + # checks for header files +-# Autoupdate added the next two lines to ensure that your configure +-# script's behavior did not change. They are probably safe to remove. +- +-{ 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 ++{ $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 +- 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" +- +- +- +-ac_fn_c_check_header_compile "$LINENO" "asm/types.h" "ac_cv_header_asm_types_h" "$ac_includes_default" +-if test "x$ac_cv_header_asm_types_h" = xyes +-then : +- printf "%s\n" "#define HAVE_ASM_TYPES_H 1" >>confdefs.h +- +-fi +-ac_fn_c_check_header_compile "$LINENO" "crypt.h" "ac_cv_header_crypt_h" "$ac_includes_default" +-if test "x$ac_cv_header_crypt_h" = xyes +-then : +- printf "%s\n" "#define HAVE_CRYPT_H 1" >>confdefs.h +- +-fi +-ac_fn_c_check_header_compile "$LINENO" "conio.h" "ac_cv_header_conio_h" "$ac_includes_default" +-if test "x$ac_cv_header_conio_h" = xyes +-then : +- printf "%s\n" "#define HAVE_CONIO_H 1" >>confdefs.h +- +-fi +-ac_fn_c_check_header_compile "$LINENO" "direct.h" "ac_cv_header_direct_h" "$ac_includes_default" +-if test "x$ac_cv_header_direct_h" = xyes +-then : +- printf "%s\n" "#define HAVE_DIRECT_H 1" >>confdefs.h +- +-fi +-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 ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#include ++#include ++#include ++#include + +-fi +-ac_fn_c_check_header_compile "$LINENO" "errno.h" "ac_cv_header_errno_h" "$ac_includes_default" +-if test "x$ac_cv_header_errno_h" = xyes +-then : +- printf "%s\n" "#define HAVE_ERRNO_H 1" >>confdefs.h ++int ++main () ++{ + ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ ac_cv_header_stdc=yes ++else ++ ac_cv_header_stdc=no + fi +-ac_fn_c_check_header_compile "$LINENO" "fcntl.h" "ac_cv_header_fcntl_h" "$ac_includes_default" +-if test "x$ac_cv_header_fcntl_h" = xyes +-then : +- printf "%s\n" "#define HAVE_FCNTL_H 1" >>confdefs.h ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +-fi +-ac_fn_c_check_header_compile "$LINENO" "grp.h" "ac_cv_header_grp_h" "$ac_includes_default" +-if test "x$ac_cv_header_grp_h" = xyes +-then : +- printf "%s\n" "#define HAVE_GRP_H 1" >>confdefs.h ++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 + +-fi +-ac_fn_c_check_header_compile "$LINENO" "ieeefp.h" "ac_cv_header_ieeefp_h" "$ac_includes_default" +-if test "x$ac_cv_header_ieeefp_h" = xyes +-then : +- printf "%s\n" "#define HAVE_IEEEFP_H 1" >>confdefs.h ++_ACEOF ++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | ++ $EGREP "memchr" >/dev/null 2>&1; then : + ++else ++ ac_cv_header_stdc=no + fi +-ac_fn_c_check_header_compile "$LINENO" "io.h" "ac_cv_header_io_h" "$ac_includes_default" +-if test "x$ac_cv_header_io_h" = xyes +-then : +- printf "%s\n" "#define HAVE_IO_H 1" >>confdefs.h ++rm -f conftest* + + fi +-ac_fn_c_check_header_compile "$LINENO" "langinfo.h" "ac_cv_header_langinfo_h" "$ac_includes_default" +-if test "x$ac_cv_header_langinfo_h" = xyes +-then : +- printf "%s\n" "#define HAVE_LANGINFO_H 1" >>confdefs.h + +-fi +-ac_fn_c_check_header_compile "$LINENO" "libintl.h" "ac_cv_header_libintl_h" "$ac_includes_default" +-if test "x$ac_cv_header_libintl_h" = xyes +-then : +- printf "%s\n" "#define HAVE_LIBINTL_H 1" >>confdefs.h ++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 + +-fi +-ac_fn_c_check_header_compile "$LINENO" "process.h" "ac_cv_header_process_h" "$ac_includes_default" +-if test "x$ac_cv_header_process_h" = xyes +-then : +- printf "%s\n" "#define HAVE_PROCESS_H 1" >>confdefs.h ++_ACEOF ++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | ++ $EGREP "free" >/dev/null 2>&1; then : + ++else ++ ac_cv_header_stdc=no + fi +-ac_fn_c_check_header_compile "$LINENO" "pthread.h" "ac_cv_header_pthread_h" "$ac_includes_default" +-if test "x$ac_cv_header_pthread_h" = xyes +-then : +- printf "%s\n" "#define HAVE_PTHREAD_H 1" >>confdefs.h ++rm -f conftest* + + fi +-ac_fn_c_check_header_compile "$LINENO" "sched.h" "ac_cv_header_sched_h" "$ac_includes_default" +-if test "x$ac_cv_header_sched_h" = xyes +-then : +- printf "%s\n" "#define HAVE_SCHED_H 1" >>confdefs.h + +-fi +-ac_fn_c_check_header_compile "$LINENO" "shadow.h" "ac_cv_header_shadow_h" "$ac_includes_default" +-if test "x$ac_cv_header_shadow_h" = xyes +-then : +- printf "%s\n" "#define HAVE_SHADOW_H 1" >>confdefs.h ++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 ++#include ++#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 + +-fi +-ac_fn_c_check_header_compile "$LINENO" "signal.h" "ac_cv_header_signal_h" "$ac_includes_default" +-if test "x$ac_cv_header_signal_h" = xyes +-then : +- printf "%s\n" "#define HAVE_SIGNAL_H 1" >>confdefs.h ++#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) ++int ++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_run "$LINENO"; then : + ++else ++ ac_cv_header_stdc=no + fi +-ac_fn_c_check_header_compile "$LINENO" "stropts.h" "ac_cv_header_stropts_h" "$ac_includes_default" +-if test "x$ac_cv_header_stropts_h" = xyes +-then : +- printf "%s\n" "#define HAVE_STROPTS_H 1" >>confdefs.h +- ++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ ++ conftest.$ac_objext conftest.beam conftest.$ac_ext + fi +-ac_fn_c_check_header_compile "$LINENO" "termios.h" "ac_cv_header_termios_h" "$ac_includes_default" +-if test "x$ac_cv_header_termios_h" = xyes +-then : +- printf "%s\n" "#define HAVE_TERMIOS_H 1" >>confdefs.h + + fi +-ac_fn_c_check_header_compile "$LINENO" "utime.h" "ac_cv_header_utime_h" "$ac_includes_default" +-if test "x$ac_cv_header_utime_h" = xyes +-then : +- printf "%s\n" "#define HAVE_UTIME_H 1" >>confdefs.h +- + fi +-ac_fn_c_check_header_compile "$LINENO" "poll.h" "ac_cv_header_poll_h" "$ac_includes_default" +-if test "x$ac_cv_header_poll_h" = xyes +-then : +- printf "%s\n" "#define HAVE_POLL_H 1" >>confdefs.h ++{ $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 + +-fi +-ac_fn_c_check_header_compile "$LINENO" "sys/devpoll.h" "ac_cv_header_sys_devpoll_h" "$ac_includes_default" +-if test "x$ac_cv_header_sys_devpoll_h" = xyes +-then : +- printf "%s\n" "#define HAVE_SYS_DEVPOLL_H 1" >>confdefs.h ++$as_echo "#define STDC_HEADERS 1" >>confdefs.h + + fi +-ac_fn_c_check_header_compile "$LINENO" "sys/epoll.h" "ac_cv_header_sys_epoll_h" "$ac_includes_default" +-if test "x$ac_cv_header_sys_epoll_h" = xyes +-then : +- printf "%s\n" "#define HAVE_SYS_EPOLL_H 1" >>confdefs.h + +-fi +-ac_fn_c_check_header_compile "$LINENO" "sys/poll.h" "ac_cv_header_sys_poll_h" "$ac_includes_default" +-if test "x$ac_cv_header_sys_poll_h" = xyes +-then : +- printf "%s\n" "#define HAVE_SYS_POLL_H 1" >>confdefs.h ++for ac_header in asm/types.h crypt.h conio.h direct.h dlfcn.h errno.h \ ++fcntl.h grp.h \ ++ieeefp.h io.h langinfo.h libintl.h process.h pthread.h \ ++sched.h shadow.h signal.h stropts.h termios.h \ ++utime.h \ ++poll.h sys/devpoll.h sys/epoll.h sys/poll.h \ ++sys/audioio.h sys/xattr.h sys/bsdtty.h sys/event.h sys/file.h sys/ioctl.h \ ++sys/kern_control.h sys/loadavg.h sys/lock.h sys/mkdev.h sys/modem.h \ ++sys/param.h sys/random.h sys/select.h sys/sendfile.h sys/socket.h sys/statvfs.h \ ++sys/stat.h sys/syscall.h sys/sys_domain.h sys/termio.h sys/time.h \ ++sys/times.h sys/types.h sys/uio.h sys/un.h sys/utsname.h sys/wait.h pty.h \ ++libutil.h sys/resource.h netpacket/packet.h sysexits.h bluetooth.h \ ++linux/tipc.h linux/random.h spawn.h util.h alloca.h endian.h \ ++sys/endian.h sys/sysmacros.h linux/memfd.h linux/wait.h sys/memfd.h \ ++sys/mman.h sys/eventfd.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/audioio.h" "ac_cv_header_sys_audioio_h" "$ac_includes_default" +-if test "x$ac_cv_header_sys_audioio_h" = xyes +-then : +- printf "%s\n" "#define HAVE_SYS_AUDIOIO_H 1" >>confdefs.h + +-fi +-ac_fn_c_check_header_compile "$LINENO" "sys/xattr.h" "ac_cv_header_sys_xattr_h" "$ac_includes_default" +-if test "x$ac_cv_header_sys_xattr_h" = xyes +-then : +- printf "%s\n" "#define HAVE_SYS_XATTR_H 1" >>confdefs.h ++done + +-fi +-ac_fn_c_check_header_compile "$LINENO" "sys/bsdtty.h" "ac_cv_header_sys_bsdtty_h" "$ac_includes_default" +-if test "x$ac_cv_header_sys_bsdtty_h" = xyes +-then : +- printf "%s\n" "#define HAVE_SYS_BSDTTY_H 1" >>confdefs.h ++ac_header_dirent=no ++for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do ++ as_ac_Header=`$as_echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh` ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_hdr that defines DIR" >&5 ++$as_echo_n "checking for $ac_hdr that defines DIR... " >&6; } ++if eval \${$as_ac_Header+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#include ++#include <$ac_hdr> + ++int ++main () ++{ ++if ((DIR *) 0) ++return 0; ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ eval "$as_ac_Header=yes" ++else ++ eval "$as_ac_Header=no" + fi +-ac_fn_c_check_header_compile "$LINENO" "sys/event.h" "ac_cv_header_sys_event_h" "$ac_includes_default" +-if test "x$ac_cv_header_sys_event_h" = xyes +-then : +- printf "%s\n" "#define HAVE_SYS_EVENT_H 1" >>confdefs.h +- ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi +-ac_fn_c_check_header_compile "$LINENO" "sys/file.h" "ac_cv_header_sys_file_h" "$ac_includes_default" +-if test "x$ac_cv_header_sys_file_h" = xyes +-then : +- printf "%s\n" "#define HAVE_SYS_FILE_H 1" >>confdefs.h ++eval ac_res=\$$as_ac_Header ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 ++$as_echo "$ac_res" >&6; } ++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : ++ cat >>confdefs.h <<_ACEOF ++#define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1 ++_ACEOF + ++ac_header_dirent=$ac_hdr; break + 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 + +-fi +-ac_fn_c_check_header_compile "$LINENO" "sys/kern_control.h" "ac_cv_header_sys_kern_control_h" "$ac_includes_default" +-if test "x$ac_cv_header_sys_kern_control_h" = xyes +-then : +- printf "%s\n" "#define HAVE_SYS_KERN_CONTROL_H 1" >>confdefs.h ++done ++# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. ++if test $ac_header_dirent = dirent.h; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5 ++$as_echo_n "checking for library containing opendir... " >&6; } ++if ${ac_cv_search_opendir+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ac_func_search_save_LIBS=$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. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char opendir (); ++int ++main () ++{ ++return opendir (); ++ ; ++ return 0; ++} ++_ACEOF ++for ac_lib in '' dir; 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 : ++ ac_cv_search_opendir=$ac_res + fi +-ac_fn_c_check_header_compile "$LINENO" "sys/loadavg.h" "ac_cv_header_sys_loadavg_h" "$ac_includes_default" +-if test "x$ac_cv_header_sys_loadavg_h" = xyes +-then : +- printf "%s\n" "#define HAVE_SYS_LOADAVG_H 1" >>confdefs.h +- ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext ++ if ${ac_cv_search_opendir+:} false; then : ++ break + fi +-ac_fn_c_check_header_compile "$LINENO" "sys/lock.h" "ac_cv_header_sys_lock_h" "$ac_includes_default" +-if test "x$ac_cv_header_sys_lock_h" = xyes +-then : +- printf "%s\n" "#define HAVE_SYS_LOCK_H 1" >>confdefs.h ++done ++if ${ac_cv_search_opendir+:} false; then : + ++else ++ ac_cv_search_opendir=no + fi +-ac_fn_c_check_header_compile "$LINENO" "sys/mkdev.h" "ac_cv_header_sys_mkdev_h" "$ac_includes_default" +-if test "x$ac_cv_header_sys_mkdev_h" = xyes +-then : +- printf "%s\n" "#define HAVE_SYS_MKDEV_H 1" >>confdefs.h +- ++rm conftest.$ac_ext ++LIBS=$ac_func_search_save_LIBS + fi +-ac_fn_c_check_header_compile "$LINENO" "sys/modem.h" "ac_cv_header_sys_modem_h" "$ac_includes_default" +-if test "x$ac_cv_header_sys_modem_h" = xyes +-then : +- printf "%s\n" "#define HAVE_SYS_MODEM_H 1" >>confdefs.h ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opendir" >&5 ++$as_echo "$ac_cv_search_opendir" >&6; } ++ac_res=$ac_cv_search_opendir ++if test "$ac_res" != no; then : ++ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + + fi +-ac_fn_c_check_header_compile "$LINENO" "sys/param.h" "ac_cv_header_sys_param_h" "$ac_includes_default" +-if test "x$ac_cv_header_sys_param_h" = xyes +-then : +- printf "%s\n" "#define HAVE_SYS_PARAM_H 1" >>confdefs.h + +-fi +-ac_fn_c_check_header_compile "$LINENO" "sys/random.h" "ac_cv_header_sys_random_h" "$ac_includes_default" +-if test "x$ac_cv_header_sys_random_h" = xyes +-then : +- printf "%s\n" "#define HAVE_SYS_RANDOM_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/sendfile.h" "ac_cv_header_sys_sendfile_h" "$ac_includes_default" +-if test "x$ac_cv_header_sys_sendfile_h" = xyes +-then : +- printf "%s\n" "#define HAVE_SYS_SENDFILE_H 1" >>confdefs.h +- +-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 +-ac_fn_c_check_header_compile "$LINENO" "sys/statvfs.h" "ac_cv_header_sys_statvfs_h" "$ac_includes_default" +-if test "x$ac_cv_header_sys_statvfs_h" = xyes +-then : +- printf "%s\n" "#define HAVE_SYS_STATVFS_H 1" >>confdefs.h +- +-fi +-ac_fn_c_check_header_compile "$LINENO" "sys/stat.h" "ac_cv_header_sys_stat_h" "$ac_includes_default" +-if test "x$ac_cv_header_sys_stat_h" = xyes +-then : +- printf "%s\n" "#define HAVE_SYS_STAT_H 1" >>confdefs.h +- +-fi +-ac_fn_c_check_header_compile "$LINENO" "sys/syscall.h" "ac_cv_header_sys_syscall_h" "$ac_includes_default" +-if test "x$ac_cv_header_sys_syscall_h" = xyes +-then : +- printf "%s\n" "#define HAVE_SYS_SYSCALL_H 1" >>confdefs.h +- +-fi +-ac_fn_c_check_header_compile "$LINENO" "sys/sys_domain.h" "ac_cv_header_sys_sys_domain_h" "$ac_includes_default" +-if test "x$ac_cv_header_sys_sys_domain_h" = xyes +-then : +- printf "%s\n" "#define HAVE_SYS_SYS_DOMAIN_H 1" >>confdefs.h +- +-fi +-ac_fn_c_check_header_compile "$LINENO" "sys/termio.h" "ac_cv_header_sys_termio_h" "$ac_includes_default" +-if test "x$ac_cv_header_sys_termio_h" = xyes +-then : +- printf "%s\n" "#define HAVE_SYS_TERMIO_H 1" >>confdefs.h +- +-fi +-ac_fn_c_check_header_compile "$LINENO" "sys/time.h" "ac_cv_header_sys_time_h" "$ac_includes_default" +-if test "x$ac_cv_header_sys_time_h" = xyes +-then : +- printf "%s\n" "#define HAVE_SYS_TIME_H 1" >>confdefs.h +- +-fi +-ac_fn_c_check_header_compile "$LINENO" "sys/times.h" "ac_cv_header_sys_times_h" "$ac_includes_default" +-if test "x$ac_cv_header_sys_times_h" = xyes +-then : +- printf "%s\n" "#define HAVE_SYS_TIMES_H 1" >>confdefs.h +- +-fi +-ac_fn_c_check_header_compile "$LINENO" "sys/types.h" "ac_cv_header_sys_types_h" "$ac_includes_default" +-if test "x$ac_cv_header_sys_types_h" = xyes +-then : +- printf "%s\n" "#define HAVE_SYS_TYPES_H 1" >>confdefs.h +- +-fi +-ac_fn_c_check_header_compile "$LINENO" "sys/uio.h" "ac_cv_header_sys_uio_h" "$ac_includes_default" +-if test "x$ac_cv_header_sys_uio_h" = xyes +-then : +- printf "%s\n" "#define HAVE_SYS_UIO_H 1" >>confdefs.h +- +-fi +-ac_fn_c_check_header_compile "$LINENO" "sys/un.h" "ac_cv_header_sys_un_h" "$ac_includes_default" +-if test "x$ac_cv_header_sys_un_h" = xyes +-then : +- printf "%s\n" "#define HAVE_SYS_UN_H 1" >>confdefs.h +- +-fi +-ac_fn_c_check_header_compile "$LINENO" "sys/utsname.h" "ac_cv_header_sys_utsname_h" "$ac_includes_default" +-if test "x$ac_cv_header_sys_utsname_h" = xyes +-then : +- printf "%s\n" "#define HAVE_SYS_UTSNAME_H 1" >>confdefs.h +- +-fi +-ac_fn_c_check_header_compile "$LINENO" "sys/wait.h" "ac_cv_header_sys_wait_h" "$ac_includes_default" +-if test "x$ac_cv_header_sys_wait_h" = xyes +-then : +- printf "%s\n" "#define HAVE_SYS_WAIT_H 1" >>confdefs.h +- +-fi +-ac_fn_c_check_header_compile "$LINENO" "pty.h" "ac_cv_header_pty_h" "$ac_includes_default" +-if test "x$ac_cv_header_pty_h" = xyes +-then : +- printf "%s\n" "#define HAVE_PTY_H 1" >>confdefs.h +- +-fi +-ac_fn_c_check_header_compile "$LINENO" "libutil.h" "ac_cv_header_libutil_h" "$ac_includes_default" +-if test "x$ac_cv_header_libutil_h" = xyes +-then : +- printf "%s\n" "#define HAVE_LIBUTIL_H 1" >>confdefs.h +- +-fi +-ac_fn_c_check_header_compile "$LINENO" "sys/resource.h" "ac_cv_header_sys_resource_h" "$ac_includes_default" +-if test "x$ac_cv_header_sys_resource_h" = xyes +-then : +- printf "%s\n" "#define HAVE_SYS_RESOURCE_H 1" >>confdefs.h +- +-fi +-ac_fn_c_check_header_compile "$LINENO" "netpacket/packet.h" "ac_cv_header_netpacket_packet_h" "$ac_includes_default" +-if test "x$ac_cv_header_netpacket_packet_h" = xyes +-then : +- printf "%s\n" "#define HAVE_NETPACKET_PACKET_H 1" >>confdefs.h +- +-fi +-ac_fn_c_check_header_compile "$LINENO" "sysexits.h" "ac_cv_header_sysexits_h" "$ac_includes_default" +-if test "x$ac_cv_header_sysexits_h" = xyes +-then : +- printf "%s\n" "#define HAVE_SYSEXITS_H 1" >>confdefs.h +- +-fi +-ac_fn_c_check_header_compile "$LINENO" "bluetooth.h" "ac_cv_header_bluetooth_h" "$ac_includes_default" +-if test "x$ac_cv_header_bluetooth_h" = xyes +-then : +- printf "%s\n" "#define HAVE_BLUETOOTH_H 1" >>confdefs.h +- +-fi +-ac_fn_c_check_header_compile "$LINENO" "linux/tipc.h" "ac_cv_header_linux_tipc_h" "$ac_includes_default" +-if test "x$ac_cv_header_linux_tipc_h" = xyes +-then : +- printf "%s\n" "#define HAVE_LINUX_TIPC_H 1" >>confdefs.h +- +-fi +-ac_fn_c_check_header_compile "$LINENO" "linux/random.h" "ac_cv_header_linux_random_h" "$ac_includes_default" +-if test "x$ac_cv_header_linux_random_h" = xyes +-then : +- printf "%s\n" "#define HAVE_LINUX_RANDOM_H 1" >>confdefs.h +- +-fi +-ac_fn_c_check_header_compile "$LINENO" "spawn.h" "ac_cv_header_spawn_h" "$ac_includes_default" +-if test "x$ac_cv_header_spawn_h" = xyes +-then : +- printf "%s\n" "#define HAVE_SPAWN_H 1" >>confdefs.h +- +-fi +-ac_fn_c_check_header_compile "$LINENO" "util.h" "ac_cv_header_util_h" "$ac_includes_default" +-if test "x$ac_cv_header_util_h" = xyes +-then : +- printf "%s\n" "#define HAVE_UTIL_H 1" >>confdefs.h +- +-fi +-ac_fn_c_check_header_compile "$LINENO" "alloca.h" "ac_cv_header_alloca_h" "$ac_includes_default" +-if test "x$ac_cv_header_alloca_h" = xyes +-then : +- printf "%s\n" "#define HAVE_ALLOCA_H 1" >>confdefs.h +- +-fi +-ac_fn_c_check_header_compile "$LINENO" "endian.h" "ac_cv_header_endian_h" "$ac_includes_default" +-if test "x$ac_cv_header_endian_h" = xyes +-then : +- printf "%s\n" "#define HAVE_ENDIAN_H 1" >>confdefs.h +- +-fi +-ac_fn_c_check_header_compile "$LINENO" "sys/endian.h" "ac_cv_header_sys_endian_h" "$ac_includes_default" +-if test "x$ac_cv_header_sys_endian_h" = xyes +-then : +- printf "%s\n" "#define HAVE_SYS_ENDIAN_H 1" >>confdefs.h +- +-fi +-ac_fn_c_check_header_compile "$LINENO" "sys/sysmacros.h" "ac_cv_header_sys_sysmacros_h" "$ac_includes_default" +-if test "x$ac_cv_header_sys_sysmacros_h" = xyes +-then : +- printf "%s\n" "#define HAVE_SYS_SYSMACROS_H 1" >>confdefs.h +- +-fi +-ac_fn_c_check_header_compile "$LINENO" "linux/memfd.h" "ac_cv_header_linux_memfd_h" "$ac_includes_default" +-if test "x$ac_cv_header_linux_memfd_h" = xyes +-then : +- printf "%s\n" "#define HAVE_LINUX_MEMFD_H 1" >>confdefs.h +- +-fi +-ac_fn_c_check_header_compile "$LINENO" "linux/wait.h" "ac_cv_header_linux_wait_h" "$ac_includes_default" +-if test "x$ac_cv_header_linux_wait_h" = xyes +-then : +- printf "%s\n" "#define HAVE_LINUX_WAIT_H 1" >>confdefs.h +- +-fi +-ac_fn_c_check_header_compile "$LINENO" "sys/memfd.h" "ac_cv_header_sys_memfd_h" "$ac_includes_default" +-if test "x$ac_cv_header_sys_memfd_h" = xyes +-then : +- printf "%s\n" "#define HAVE_SYS_MEMFD_H 1" >>confdefs.h +- +-fi +-ac_fn_c_check_header_compile "$LINENO" "sys/mman.h" "ac_cv_header_sys_mman_h" "$ac_includes_default" +-if test "x$ac_cv_header_sys_mman_h" = xyes +-then : +- printf "%s\n" "#define HAVE_SYS_MMAN_H 1" >>confdefs.h +- +-fi +-ac_fn_c_check_header_compile "$LINENO" "sys/eventfd.h" "ac_cv_header_sys_eventfd_h" "$ac_includes_default" +-if test "x$ac_cv_header_sys_eventfd_h" = xyes +-then : +- printf "%s\n" "#define HAVE_SYS_EVENTFD_H 1" >>confdefs.h +- +-fi +- +-ac_header_dirent=no +-for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do +- as_ac_Header=`printf "%s\n" "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh` +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_hdr that defines DIR" >&5 +-printf %s "checking for $ac_hdr that defines DIR... " >&6; } +-if eval test \${$as_ac_Header+y} +-then : +- printf %s "(cached) " >&6 +-else $as_nop +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-#include +-#include <$ac_hdr> +- +-int +-main (void) +-{ +-if ((DIR *) 0) +-return 0; +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_compile "$LINENO" +-then : +- eval "$as_ac_Header=yes" +-else $as_nop +- eval "$as_ac_Header=no" +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +-fi +-eval ac_res=\$$as_ac_Header +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +-printf "%s\n" "$ac_res" >&6; } +-if eval test \"x\$"$as_ac_Header"\" = x"yes" +-then : +- cat >>confdefs.h <<_ACEOF +-#define `printf "%s\n" "HAVE_$ac_hdr" | $as_tr_cpp` 1 +-_ACEOF +- +-ac_header_dirent=$ac_hdr; break +-fi +- +-done +-# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. +-if test $ac_header_dirent = dirent.h; then +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5 +-printf %s "checking for library containing opendir... " >&6; } +-if test ${ac_cv_search_opendir+y} +-then : +- printf %s "(cached) " >&6 +-else $as_nop +- ac_func_search_save_LIBS=$LIBS +-cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5 ++$as_echo_n "checking for library containing opendir... " >&6; } ++if ${ac_cv_search_opendir+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ac_func_search_save_LIBS=$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. */ ++#ifdef __cplusplus ++extern "C" ++#endif + char opendir (); + int +-main (void) ++main () + { + return opendir (); + ; + return 0; + } + _ACEOF +-for ac_lib in '' dir +-do ++for ac_lib in '' x; 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_opendir=$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_opendir+y} +-then : ++ if ${ac_cv_search_opendir+:} false; then : + break + fi + done +-if test ${ac_cv_search_opendir+y} +-then : ++if ${ac_cv_search_opendir+:} false; then : + +-else $as_nop ++else + ac_cv_search_opendir=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_opendir" >&5 +-printf "%s\n" "$ac_cv_search_opendir" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opendir" >&5 ++$as_echo "$ac_cv_search_opendir" >&6; } + ac_res=$ac_cv_search_opendir +-if test "$ac_res" != no +-then : ++if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + + fi + ++fi ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether sys/types.h defines makedev" >&5 ++$as_echo_n "checking whether sys/types.h defines makedev... " >&6; } ++if ${ac_cv_header_sys_types_h_makedev+:} false; then : ++ $as_echo_n "(cached) " >&6 + else +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5 +-printf %s "checking for library containing opendir... " >&6; } +-if test ${ac_cv_search_opendir+y} +-then : +- printf %s "(cached) " >&6 +-else $as_nop +- ac_func_search_save_LIBS=$LIBS +-cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++ 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 opendir (); ++#include + int +-main (void) ++main () + { +-return opendir (); ++return makedev(0, 0); + ; + return 0; + } + _ACEOF +-for ac_lib in '' x +-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 : +- ac_cv_search_opendir=$ac_res +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.beam \ +- conftest$ac_exeext +- if test ${ac_cv_search_opendir+y} +-then : +- break +-fi +-done +-if test ${ac_cv_search_opendir+y} +-then : +- +-else $as_nop +- ac_cv_search_opendir=no +-fi +-rm conftest.$ac_ext +-LIBS=$ac_func_search_save_LIBS ++if ac_fn_c_try_link "$LINENO"; then : ++ ac_cv_header_sys_types_h_makedev=yes ++else ++ ac_cv_header_sys_types_h_makedev=no + fi +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opendir" >&5 +-printf "%s\n" "$ac_cv_search_opendir" >&6; } +-ac_res=$ac_cv_search_opendir +-if test "$ac_res" != no +-then : +- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + + fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_sys_types_h_makedev" >&5 ++$as_echo "$ac_cv_header_sys_types_h_makedev" >&6; } + +-fi ++if test $ac_cv_header_sys_types_h_makedev = no; then ++ac_fn_c_check_header_mongrel "$LINENO" "sys/mkdev.h" "ac_cv_header_sys_mkdev_h" "$ac_includes_default" ++if test "x$ac_cv_header_sys_mkdev_h" = xyes; then : + ++$as_echo "#define MAJOR_IN_MKDEV 1" >>confdefs.h + +-ac_fn_c_check_header_compile "$LINENO" "sys/mkdev.h" "ac_cv_header_sys_mkdev_h" "$ac_includes_default" +-if test "x$ac_cv_header_sys_mkdev_h" = xyes +-then : ++fi + +-printf "%s\n" "#define MAJOR_IN_MKDEV 1" >>confdefs.h + +-fi + +-if test $ac_cv_header_sys_mkdev_h = no; then +- ac_fn_c_check_header_compile "$LINENO" "sys/sysmacros.h" "ac_cv_header_sys_sysmacros_h" "$ac_includes_default" +-if test "x$ac_cv_header_sys_sysmacros_h" = xyes +-then : ++ if test $ac_cv_header_sys_mkdev_h = no; then ++ ac_fn_c_check_header_mongrel "$LINENO" "sys/sysmacros.h" "ac_cv_header_sys_sysmacros_h" "$ac_includes_default" ++if test "x$ac_cv_header_sys_sysmacros_h" = xyes; then : + +-printf "%s\n" "#define MAJOR_IN_SYSMACROS 1" >>confdefs.h ++$as_echo "#define MAJOR_IN_SYSMACROS 1" >>confdefs.h + + fi + ++ ++ fi + fi + + +@@ -9296,17 +8295,24 @@ fi + # http://permalink.gmane.org/gmane.linux.bluez.kernel/22294 + SAVE_CFLAGS=$CFLAGS + CFLAGS="-std=c99 $CFLAGS" +-ac_fn_c_check_header_compile "$LINENO" "bluetooth/bluetooth.h" "ac_cv_header_bluetooth_bluetooth_h" "$ac_includes_default" +-if test "x$ac_cv_header_bluetooth_bluetooth_h" = xyes +-then : +- printf "%s\n" "#define HAVE_BLUETOOTH_BLUETOOTH_H 1" >>confdefs.h ++for ac_header in bluetooth/bluetooth.h ++do : ++ ac_fn_c_check_header_mongrel "$LINENO" "bluetooth/bluetooth.h" "ac_cv_header_bluetooth_bluetooth_h" "$ac_includes_default" ++if test "x$ac_cv_header_bluetooth_bluetooth_h" = xyes; then : ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_BLUETOOTH_BLUETOOTH_H 1 ++_ACEOF + + fi + ++done ++ + CFLAGS=$SAVE_CFLAGS + + # On Darwin (OS X) net/if.h requires sys/socket.h to be imported first. +-ac_fn_c_check_header_compile "$LINENO" "net/if.h" "ac_cv_header_net_if_h" "#include ++for ac_header in net/if.h ++do : ++ ac_fn_c_check_header_compile "$LINENO" "net/if.h" "ac_cv_header_net_if_h" "#include + #ifdef STDC_HEADERS + # include + # include +@@ -9320,15 +8326,20 @@ ac_fn_c_check_header_compile "$LINENO" "net/if.h" "ac_cv_header_net_if_h" "#incl + #endif + + " +-if test "x$ac_cv_header_net_if_h" = xyes +-then : +- printf "%s\n" "#define HAVE_NET_IF_H 1" >>confdefs.h ++if test "x$ac_cv_header_net_if_h" = xyes; then : ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_NET_IF_H 1 ++_ACEOF + + fi + ++done ++ + + # On Linux, netlink.h requires asm/types.h +-ac_fn_c_check_header_compile "$LINENO" "linux/netlink.h" "ac_cv_header_linux_netlink_h" " ++for ac_header in linux/netlink.h ++do : ++ ac_fn_c_check_header_compile "$LINENO" "linux/netlink.h" "ac_cv_header_linux_netlink_h" " + #ifdef HAVE_ASM_TYPES_H + #include + #endif +@@ -9337,15 +8348,20 @@ ac_fn_c_check_header_compile "$LINENO" "linux/netlink.h" "ac_cv_header_linux_net + #endif + + " +-if test "x$ac_cv_header_linux_netlink_h" = xyes +-then : +- printf "%s\n" "#define HAVE_LINUX_NETLINK_H 1" >>confdefs.h ++if test "x$ac_cv_header_linux_netlink_h" = xyes; then : ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_LINUX_NETLINK_H 1 ++_ACEOF + + fi + ++done ++ + + # On Linux, qrtr.h requires asm/types.h +-ac_fn_c_check_header_compile "$LINENO" "linux/qrtr.h" "ac_cv_header_linux_qrtr_h" " ++for ac_header in linux/qrtr.h ++do : ++ ac_fn_c_check_header_compile "$LINENO" "linux/qrtr.h" "ac_cv_header_linux_qrtr_h" " + #ifdef HAVE_ASM_TYPES_H + #include + #endif +@@ -9354,101 +8370,80 @@ ac_fn_c_check_header_compile "$LINENO" "linux/qrtr.h" "ac_cv_header_linux_qrtr_h + #endif + + " +-if test "x$ac_cv_header_linux_qrtr_h" = xyes +-then : +- printf "%s\n" "#define HAVE_LINUX_QRTR_H 1" >>confdefs.h ++if test "x$ac_cv_header_linux_qrtr_h" = xyes; then : ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_LINUX_QRTR_H 1 ++_ACEOF + + fi + +- +-ac_fn_c_check_header_compile "$LINENO" "linux/vm_sockets.h" "ac_cv_header_linux_vm_sockets_h" " +-#ifdef HAVE_SYS_SOCKET_H +-#include +-#endif +- +-" +-if test "x$ac_cv_header_linux_vm_sockets_h" = xyes +-then : +- printf "%s\n" "#define HAVE_LINUX_VM_SOCKETS_H 1" >>confdefs.h +- +-fi ++done + + +-# On Linux, can.h, can/bcm.h, can/j1939.h, can/raw.h require sys/socket.h +-ac_fn_c_check_header_compile "$LINENO" "linux/can.h" "ac_cv_header_linux_can_h" " ++for ac_header in linux/vm_sockets.h ++do : ++ ac_fn_c_check_header_compile "$LINENO" "linux/vm_sockets.h" "ac_cv_header_linux_vm_sockets_h" " + #ifdef HAVE_SYS_SOCKET_H + #include + #endif + + " +-if test "x$ac_cv_header_linux_can_h" = xyes +-then : +- printf "%s\n" "#define HAVE_LINUX_CAN_H 1" >>confdefs.h ++if test "x$ac_cv_header_linux_vm_sockets_h" = xyes; then : ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_LINUX_VM_SOCKETS_H 1 ++_ACEOF + + fi +-ac_fn_c_check_header_compile "$LINENO" "linux/can/bcm.h" "ac_cv_header_linux_can_bcm_h" " +-#ifdef HAVE_SYS_SOCKET_H +-#include +-#endif + +-" +-if test "x$ac_cv_header_linux_can_bcm_h" = xyes +-then : +- printf "%s\n" "#define HAVE_LINUX_CAN_BCM_H 1" >>confdefs.h +- +-fi +-ac_fn_c_check_header_compile "$LINENO" "linux/can/j1939.h" "ac_cv_header_linux_can_j1939_h" " +-#ifdef HAVE_SYS_SOCKET_H +-#include +-#endif ++done + +-" +-if test "x$ac_cv_header_linux_can_j1939_h" = xyes +-then : +- printf "%s\n" "#define HAVE_LINUX_CAN_J1939_H 1" >>confdefs.h + +-fi +-ac_fn_c_check_header_compile "$LINENO" "linux/can/raw.h" "ac_cv_header_linux_can_raw_h" " ++# On Linux, can.h, can/bcm.h, can/j1939.h, can/raw.h require sys/socket.h ++for ac_header in linux/can.h linux/can/bcm.h linux/can/j1939.h linux/can/raw.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" " + #ifdef HAVE_SYS_SOCKET_H + #include + #endif + + " +-if test "x$ac_cv_header_linux_can_raw_h" = xyes +-then : +- printf "%s\n" "#define HAVE_LINUX_CAN_RAW_H 1" >>confdefs.h ++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 ++ + + # checks for typedefs + was_it_defined=no +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for clock_t in time.h" >&5 +-printf %s "checking for clock_t in time.h... " >&6; } +- ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for clock_t in time.h" >&5 ++$as_echo_n "checking for clock_t in time.h... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + + _ACEOF + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +- $EGREP "clock_t" >/dev/null 2>&1 +-then : ++ $EGREP "clock_t" >/dev/null 2>&1; then : + was_it_defined=yes +-else $as_nop ++else + + +-printf "%s\n" "#define clock_t long" >>confdefs.h ++$as_echo "#define clock_t long" >>confdefs.h + + + fi +-rm -rf conftest* ++rm -f conftest* + +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $was_it_defined" >&5 +-printf "%s\n" "$was_it_defined" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $was_it_defined" >&5 ++$as_echo "$was_it_defined" >&6; } + +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for makedev" >&5 +-printf %s "checking for makedev... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for makedev" >&5 ++$as_echo_n "checking for makedev... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -9461,7 +8456,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + #endif + + int +-main (void) ++main () + { + + makedev(0, 0) +@@ -9470,25 +8465,24 @@ main (void) + } + + _ACEOF +-if ac_fn_c_try_link "$LINENO" +-then : ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_has_makedev=yes +-else $as_nop ++else + ac_cv_has_makedev=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 +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_has_makedev" >&5 +-printf "%s\n" "$ac_cv_has_makedev" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_has_makedev" >&5 ++$as_echo "$ac_cv_has_makedev" >&6; } + if test "$ac_cv_has_makedev" = "yes"; then + +-printf "%s\n" "#define HAVE_MAKEDEV 1" >>confdefs.h ++$as_echo "#define HAVE_MAKEDEV 1" >>confdefs.h + + fi + + # byte swapping +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for le64toh" >&5 +-printf %s "checking for le64toh... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for le64toh" >&5 ++$as_echo_n "checking for le64toh... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -9499,7 +8493,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + #endif + + int +-main (void) ++main () + { + + le64toh(1) +@@ -9508,19 +8502,18 @@ main (void) + } + + _ACEOF +-if ac_fn_c_try_link "$LINENO" +-then : ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_has_le64toh=yes +-else $as_nop ++else + ac_cv_has_le64toh=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 +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_has_le64toh" >&5 +-printf "%s\n" "$ac_cv_has_le64toh" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_has_le64toh" >&5 ++$as_echo "$ac_cv_has_le64toh" >&6; } + if test "$ac_cv_has_le64toh" = "yes"; then + +-printf "%s\n" "#define HAVE_HTOLE64 1" >>confdefs.h ++$as_echo "#define HAVE_HTOLE64 1" >>confdefs.h + + fi + +@@ -9536,15 +8529,15 @@ if test "$use_lfs" = "yes"; then + case $ac_sys_system/$ac_sys_release in + AIX*) + +-printf "%s\n" "#define _LARGE_FILES 1" >>confdefs.h ++$as_echo "#define _LARGE_FILES 1" >>confdefs.h + + ;; + esac + +-printf "%s\n" "#define _LARGEFILE_SOURCE 1" >>confdefs.h ++$as_echo "#define _LARGEFILE_SOURCE 1" >>confdefs.h + + +-printf "%s\n" "#define _FILE_OFFSET_BITS 64" >>confdefs.h ++$as_echo "#define _FILE_OFFSET_BITS 64" >>confdefs.h + + fi + +@@ -9557,121 +8550,96 @@ EOF + + # Type availability checks + ac_fn_c_check_type "$LINENO" "mode_t" "ac_cv_type_mode_t" "$ac_includes_default" +-if test "x$ac_cv_type_mode_t" = xyes +-then : ++if test "x$ac_cv_type_mode_t" = xyes; then : + +-else $as_nop ++else + +-printf "%s\n" "#define mode_t int" >>confdefs.h ++cat >>confdefs.h <<_ACEOF ++#define mode_t int ++_ACEOF + + fi + + ac_fn_c_check_type "$LINENO" "off_t" "ac_cv_type_off_t" "$ac_includes_default" +-if test "x$ac_cv_type_off_t" = xyes +-then : ++if test "x$ac_cv_type_off_t" = xyes; then : + +-else $as_nop ++else + +-printf "%s\n" "#define off_t long int" >>confdefs.h ++cat >>confdefs.h <<_ACEOF ++#define off_t long int ++_ACEOF + + fi + ++ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default" ++if test "x$ac_cv_type_pid_t" = xyes; then : + +- ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default +-" +-if test "x$ac_cv_type_pid_t" = xyes +-then : +- +-else $as_nop +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +- #if defined _WIN64 && !defined __CYGWIN__ +- LLP64 +- #endif +- +-int +-main (void) +-{ +- +- ; +- return 0; +-} ++else + ++cat >>confdefs.h <<_ACEOF ++#define pid_t int + _ACEOF +-if ac_fn_c_try_compile "$LINENO" +-then : +- ac_pid_type='int' +-else $as_nop +- ac_pid_type='__int64' +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +- +-printf "%s\n" "#define pid_t $ac_pid_type" >>confdefs.h +- + + fi + + +- +-printf "%s\n" "#define RETSIGTYPE void" >>confdefs.h ++cat >>confdefs.h <<_ACEOF ++#define RETSIGTYPE void ++_ACEOF + + ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default" +-if test "x$ac_cv_type_size_t" = xyes +-then : ++if test "x$ac_cv_type_size_t" = xyes; then : + +-else $as_nop ++else + +-printf "%s\n" "#define size_t unsigned int" >>confdefs.h ++cat >>confdefs.h <<_ACEOF ++#define size_t unsigned int ++_ACEOF + + fi + +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for uid_t in sys/types.h" >&5 +-printf %s "checking for uid_t in sys/types.h... " >&6; } +-if test ${ac_cv_type_uid_t+y} +-then : +- printf %s "(cached) " >&6 +-else $as_nop ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for uid_t in sys/types.h" >&5 ++$as_echo_n "checking for uid_t in sys/types.h... " >&6; } ++if ${ac_cv_type_uid_t+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + + _ACEOF + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +- $EGREP "uid_t" >/dev/null 2>&1 +-then : ++ $EGREP "uid_t" >/dev/null 2>&1; then : + ac_cv_type_uid_t=yes +-else $as_nop ++else + ac_cv_type_uid_t=no + fi +-rm -rf conftest* ++rm -f conftest* + + fi +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_uid_t" >&5 +-printf "%s\n" "$ac_cv_type_uid_t" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_uid_t" >&5 ++$as_echo "$ac_cv_type_uid_t" >&6; } + if test $ac_cv_type_uid_t = no; then + +-printf "%s\n" "#define uid_t int" >>confdefs.h ++$as_echo "#define uid_t int" >>confdefs.h + + +-printf "%s\n" "#define gid_t int" >>confdefs.h ++$as_echo "#define gid_t int" >>confdefs.h + + fi + + + ac_fn_c_check_type "$LINENO" "ssize_t" "ac_cv_type_ssize_t" "$ac_includes_default" +-if test "x$ac_cv_type_ssize_t" = xyes +-then : ++if test "x$ac_cv_type_ssize_t" = xyes; then : + +-printf "%s\n" "#define HAVE_SSIZE_T 1" >>confdefs.h ++$as_echo "#define HAVE_SSIZE_T 1" >>confdefs.h + + fi + + ac_fn_c_check_type "$LINENO" "__uint128_t" "ac_cv_type___uint128_t" "$ac_includes_default" +-if test "x$ac_cv_type___uint128_t" = xyes +-then : ++if test "x$ac_cv_type___uint128_t" = xyes; then : + +-printf "%s\n" "#define HAVE_GCC_UINT128_T 1" >>confdefs.h ++$as_echo "#define HAVE_GCC_UINT128_T 1" >>confdefs.h + + fi + +@@ -9682,19 +8650,17 @@ fi + # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects + # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. + # This bug is HP SR number 8606223364. +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of int" >&5 +-printf %s "checking size of int... " >&6; } +-if test ${ac_cv_sizeof_int+y} +-then : +- printf %s "(cached) " >&6 +-else $as_nop +- if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int))" "ac_cv_sizeof_int" "$ac_includes_default" +-then : +- +-else $as_nop ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int" >&5 ++$as_echo_n "checking size of int... " >&6; } ++if ${ac_cv_sizeof_int+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int))" "ac_cv_sizeof_int" "$ac_includes_default"; then : ++ ++else + if test "$ac_cv_type_int" = 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;} ++ { { $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 "cannot compute sizeof (int) + See \`config.log' for more details" "$LINENO" 5; } + else +@@ -9703,31 +8669,31 @@ See \`config.log' for more details" "$LINENO" 5; } + fi + + fi +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_int" >&5 +-printf "%s\n" "$ac_cv_sizeof_int" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_int" >&5 ++$as_echo "$ac_cv_sizeof_int" >&6; } + + + +-printf "%s\n" "#define SIZEOF_INT $ac_cv_sizeof_int" >>confdefs.h ++cat >>confdefs.h <<_ACEOF ++#define SIZEOF_INT $ac_cv_sizeof_int ++_ACEOF + + + # The cast to long int works around a bug in the HP C Compiler + # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects + # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. + # This bug is HP SR number 8606223364. +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of long" >&5 +-printf %s "checking size of long... " >&6; } +-if test ${ac_cv_sizeof_long+y} +-then : +- printf %s "(cached) " >&6 +-else $as_nop +- if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long" "$ac_includes_default" +-then : +- +-else $as_nop ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5 ++$as_echo_n "checking size of long... " >&6; } ++if ${ac_cv_sizeof_long+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long" "$ac_includes_default"; then : ++ ++else + if test "$ac_cv_type_long" = 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;} ++ { { $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 "cannot compute sizeof (long) + See \`config.log' for more details" "$LINENO" 5; } + else +@@ -9736,30 +8702,33 @@ See \`config.log' for more details" "$LINENO" 5; } + fi + + fi +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5 +-printf "%s\n" "$ac_cv_sizeof_long" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5 ++$as_echo "$ac_cv_sizeof_long" >&6; } + + + +-printf "%s\n" "#define SIZEOF_LONG $ac_cv_sizeof_long" >>confdefs.h ++cat >>confdefs.h <<_ACEOF ++#define SIZEOF_LONG $ac_cv_sizeof_long ++_ACEOF + + + # The cast to long int works around a bug in the HP C Compiler, + # see AC_CHECK_SIZEOF for more information. +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking alignment of long" >&5 +-printf %s "checking alignment of long... " >&6; } +-if test ${ac_cv_alignof_long+y} +-then : +- printf %s "(cached) " >&6 +-else $as_nop ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking alignment of long" >&5 ++$as_echo_n "checking alignment of long... " >&6; } ++if ${ac_cv_alignof_long+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else + if ac_fn_c_compute_int "$LINENO" "(long int) offsetof (ac__type_alignof_, y)" "ac_cv_alignof_long" "$ac_includes_default +-typedef struct { char x; long y; } ac__type_alignof_;" +-then : ++#ifndef offsetof ++# define offsetof(type, member) ((char *) &((type *) 0)->member - (char *) 0) ++#endif ++typedef struct { char x; long y; } ac__type_alignof_;"; then : + +-else $as_nop ++else + if test "$ac_cv_type_long" = 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;} ++ { { $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 "cannot compute alignment of long + See \`config.log' for more details" "$LINENO" 5; } + else +@@ -9768,31 +8737,31 @@ See \`config.log' for more details" "$LINENO" 5; } + fi + + fi +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_alignof_long" >&5 +-printf "%s\n" "$ac_cv_alignof_long" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_alignof_long" >&5 ++$as_echo "$ac_cv_alignof_long" >&6; } + + + +-printf "%s\n" "#define ALIGNOF_LONG $ac_cv_alignof_long" >>confdefs.h ++cat >>confdefs.h <<_ACEOF ++#define ALIGNOF_LONG $ac_cv_alignof_long ++_ACEOF + + + # The cast to long int works around a bug in the HP C Compiler + # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects + # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. + # This bug is HP SR number 8606223364. +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of long long" >&5 +-printf %s "checking size of long long... " >&6; } +-if test ${ac_cv_sizeof_long_long+y} +-then : +- printf %s "(cached) " >&6 +-else $as_nop +- if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long long))" "ac_cv_sizeof_long_long" "$ac_includes_default" +-then : +- +-else $as_nop ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long long" >&5 ++$as_echo_n "checking size of long long... " >&6; } ++if ${ac_cv_sizeof_long_long+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long long))" "ac_cv_sizeof_long_long" "$ac_includes_default"; then : ++ ++else + if test "$ac_cv_type_long_long" = 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;} ++ { { $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 "cannot compute sizeof (long long) + See \`config.log' for more details" "$LINENO" 5; } + else +@@ -9801,31 +8770,31 @@ See \`config.log' for more details" "$LINENO" 5; } + fi + + fi +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long_long" >&5 +-printf "%s\n" "$ac_cv_sizeof_long_long" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long_long" >&5 ++$as_echo "$ac_cv_sizeof_long_long" >&6; } + + + +-printf "%s\n" "#define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long" >>confdefs.h ++cat >>confdefs.h <<_ACEOF ++#define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long ++_ACEOF + + + # The cast to long int works around a bug in the HP C Compiler + # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects + # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. + # This bug is HP SR number 8606223364. +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of void *" >&5 +-printf %s "checking size of void *... " >&6; } +-if test ${ac_cv_sizeof_void_p+y} +-then : +- printf %s "(cached) " >&6 +-else $as_nop +- if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (void *))" "ac_cv_sizeof_void_p" "$ac_includes_default" +-then : +- +-else $as_nop ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of void *" >&5 ++$as_echo_n "checking size of void *... " >&6; } ++if ${ac_cv_sizeof_void_p+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (void *))" "ac_cv_sizeof_void_p" "$ac_includes_default"; then : ++ ++else + if test "$ac_cv_type_void_p" = 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;} ++ { { $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 "cannot compute sizeof (void *) + See \`config.log' for more details" "$LINENO" 5; } + else +@@ -9834,31 +8803,31 @@ See \`config.log' for more details" "$LINENO" 5; } + fi + + fi +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_void_p" >&5 +-printf "%s\n" "$ac_cv_sizeof_void_p" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_void_p" >&5 ++$as_echo "$ac_cv_sizeof_void_p" >&6; } + + + +-printf "%s\n" "#define SIZEOF_VOID_P $ac_cv_sizeof_void_p" >>confdefs.h ++cat >>confdefs.h <<_ACEOF ++#define SIZEOF_VOID_P $ac_cv_sizeof_void_p ++_ACEOF + + + # The cast to long int works around a bug in the HP C Compiler + # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects + # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. + # This bug is HP SR number 8606223364. +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of short" >&5 +-printf %s "checking size of short... " >&6; } +-if test ${ac_cv_sizeof_short+y} +-then : +- printf %s "(cached) " >&6 +-else $as_nop +- if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (short))" "ac_cv_sizeof_short" "$ac_includes_default" +-then : +- +-else $as_nop ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of short" >&5 ++$as_echo_n "checking size of short... " >&6; } ++if ${ac_cv_sizeof_short+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (short))" "ac_cv_sizeof_short" "$ac_includes_default"; then : ++ ++else + if test "$ac_cv_type_short" = 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;} ++ { { $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 "cannot compute sizeof (short) + See \`config.log' for more details" "$LINENO" 5; } + else +@@ -9867,31 +8836,31 @@ See \`config.log' for more details" "$LINENO" 5; } + fi + + fi +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_short" >&5 +-printf "%s\n" "$ac_cv_sizeof_short" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_short" >&5 ++$as_echo "$ac_cv_sizeof_short" >&6; } + + + +-printf "%s\n" "#define SIZEOF_SHORT $ac_cv_sizeof_short" >>confdefs.h ++cat >>confdefs.h <<_ACEOF ++#define SIZEOF_SHORT $ac_cv_sizeof_short ++_ACEOF + + + # The cast to long int works around a bug in the HP C Compiler + # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects + # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. + # This bug is HP SR number 8606223364. +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of float" >&5 +-printf %s "checking size of float... " >&6; } +-if test ${ac_cv_sizeof_float+y} +-then : +- printf %s "(cached) " >&6 +-else $as_nop +- if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (float))" "ac_cv_sizeof_float" "$ac_includes_default" +-then : +- +-else $as_nop ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of float" >&5 ++$as_echo_n "checking size of float... " >&6; } ++if ${ac_cv_sizeof_float+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (float))" "ac_cv_sizeof_float" "$ac_includes_default"; then : ++ ++else + if test "$ac_cv_type_float" = 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;} ++ { { $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 "cannot compute sizeof (float) + See \`config.log' for more details" "$LINENO" 5; } + else +@@ -9900,31 +8869,31 @@ See \`config.log' for more details" "$LINENO" 5; } + fi + + fi +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_float" >&5 +-printf "%s\n" "$ac_cv_sizeof_float" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_float" >&5 ++$as_echo "$ac_cv_sizeof_float" >&6; } + + + +-printf "%s\n" "#define SIZEOF_FLOAT $ac_cv_sizeof_float" >>confdefs.h ++cat >>confdefs.h <<_ACEOF ++#define SIZEOF_FLOAT $ac_cv_sizeof_float ++_ACEOF + + + # The cast to long int works around a bug in the HP C Compiler + # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects + # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. + # This bug is HP SR number 8606223364. +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of double" >&5 +-printf %s "checking size of double... " >&6; } +-if test ${ac_cv_sizeof_double+y} +-then : +- printf %s "(cached) " >&6 +-else $as_nop +- if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (double))" "ac_cv_sizeof_double" "$ac_includes_default" +-then : +- +-else $as_nop ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of double" >&5 ++$as_echo_n "checking size of double... " >&6; } ++if ${ac_cv_sizeof_double+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (double))" "ac_cv_sizeof_double" "$ac_includes_default"; then : ++ ++else + if test "$ac_cv_type_double" = 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;} ++ { { $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 "cannot compute sizeof (double) + See \`config.log' for more details" "$LINENO" 5; } + else +@@ -9933,31 +8902,31 @@ See \`config.log' for more details" "$LINENO" 5; } + fi + + fi +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_double" >&5 +-printf "%s\n" "$ac_cv_sizeof_double" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_double" >&5 ++$as_echo "$ac_cv_sizeof_double" >&6; } + + + +-printf "%s\n" "#define SIZEOF_DOUBLE $ac_cv_sizeof_double" >>confdefs.h ++cat >>confdefs.h <<_ACEOF ++#define SIZEOF_DOUBLE $ac_cv_sizeof_double ++_ACEOF + + + # The cast to long int works around a bug in the HP C Compiler + # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects + # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. + # This bug is HP SR number 8606223364. +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of fpos_t" >&5 +-printf %s "checking size of fpos_t... " >&6; } +-if test ${ac_cv_sizeof_fpos_t+y} +-then : +- printf %s "(cached) " >&6 +-else $as_nop +- if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (fpos_t))" "ac_cv_sizeof_fpos_t" "$ac_includes_default" +-then : +- +-else $as_nop ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of fpos_t" >&5 ++$as_echo_n "checking size of fpos_t... " >&6; } ++if ${ac_cv_sizeof_fpos_t+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (fpos_t))" "ac_cv_sizeof_fpos_t" "$ac_includes_default"; then : ++ ++else + if test "$ac_cv_type_fpos_t" = 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;} ++ { { $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 "cannot compute sizeof (fpos_t) + See \`config.log' for more details" "$LINENO" 5; } + else +@@ -9966,31 +8935,31 @@ See \`config.log' for more details" "$LINENO" 5; } + fi + + fi +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_fpos_t" >&5 +-printf "%s\n" "$ac_cv_sizeof_fpos_t" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_fpos_t" >&5 ++$as_echo "$ac_cv_sizeof_fpos_t" >&6; } + + + +-printf "%s\n" "#define SIZEOF_FPOS_T $ac_cv_sizeof_fpos_t" >>confdefs.h ++cat >>confdefs.h <<_ACEOF ++#define SIZEOF_FPOS_T $ac_cv_sizeof_fpos_t ++_ACEOF + + + # The cast to long int works around a bug in the HP C Compiler + # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects + # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. + # This bug is HP SR number 8606223364. +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of size_t" >&5 +-printf %s "checking size of size_t... " >&6; } +-if test ${ac_cv_sizeof_size_t+y} +-then : +- printf %s "(cached) " >&6 +-else $as_nop +- if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (size_t))" "ac_cv_sizeof_size_t" "$ac_includes_default" +-then : +- +-else $as_nop ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of size_t" >&5 ++$as_echo_n "checking size of size_t... " >&6; } ++if ${ac_cv_sizeof_size_t+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (size_t))" "ac_cv_sizeof_size_t" "$ac_includes_default"; then : ++ ++else + if test "$ac_cv_type_size_t" = 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;} ++ { { $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 "cannot compute sizeof (size_t) + See \`config.log' for more details" "$LINENO" 5; } + else +@@ -9999,30 +8968,33 @@ See \`config.log' for more details" "$LINENO" 5; } + fi + + fi +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_size_t" >&5 +-printf "%s\n" "$ac_cv_sizeof_size_t" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_size_t" >&5 ++$as_echo "$ac_cv_sizeof_size_t" >&6; } + + + +-printf "%s\n" "#define SIZEOF_SIZE_T $ac_cv_sizeof_size_t" >>confdefs.h ++cat >>confdefs.h <<_ACEOF ++#define SIZEOF_SIZE_T $ac_cv_sizeof_size_t ++_ACEOF + + + # The cast to long int works around a bug in the HP C Compiler, + # see AC_CHECK_SIZEOF for more information. +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking alignment of size_t" >&5 +-printf %s "checking alignment of size_t... " >&6; } +-if test ${ac_cv_alignof_size_t+y} +-then : +- printf %s "(cached) " >&6 +-else $as_nop ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking alignment of size_t" >&5 ++$as_echo_n "checking alignment of size_t... " >&6; } ++if ${ac_cv_alignof_size_t+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else + if ac_fn_c_compute_int "$LINENO" "(long int) offsetof (ac__type_alignof_, y)" "ac_cv_alignof_size_t" "$ac_includes_default +-typedef struct { char x; size_t y; } ac__type_alignof_;" +-then : ++#ifndef offsetof ++# define offsetof(type, member) ((char *) &((type *) 0)->member - (char *) 0) ++#endif ++typedef struct { char x; size_t y; } ac__type_alignof_;"; then : + +-else $as_nop ++else + if test "$ac_cv_type_size_t" = 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;} ++ { { $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 "cannot compute alignment of size_t + See \`config.log' for more details" "$LINENO" 5; } + else +@@ -10031,31 +9003,31 @@ See \`config.log' for more details" "$LINENO" 5; } + fi + + fi +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_alignof_size_t" >&5 +-printf "%s\n" "$ac_cv_alignof_size_t" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_alignof_size_t" >&5 ++$as_echo "$ac_cv_alignof_size_t" >&6; } + + + +-printf "%s\n" "#define ALIGNOF_SIZE_T $ac_cv_alignof_size_t" >>confdefs.h ++cat >>confdefs.h <<_ACEOF ++#define ALIGNOF_SIZE_T $ac_cv_alignof_size_t ++_ACEOF + + + # The cast to long int works around a bug in the HP C Compiler + # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects + # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. + # This bug is HP SR number 8606223364. +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of pid_t" >&5 +-printf %s "checking size of pid_t... " >&6; } +-if test ${ac_cv_sizeof_pid_t+y} +-then : +- printf %s "(cached) " >&6 +-else $as_nop +- if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (pid_t))" "ac_cv_sizeof_pid_t" "$ac_includes_default" +-then : +- +-else $as_nop ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of pid_t" >&5 ++$as_echo_n "checking size of pid_t... " >&6; } ++if ${ac_cv_sizeof_pid_t+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (pid_t))" "ac_cv_sizeof_pid_t" "$ac_includes_default"; then : ++ ++else + if test "$ac_cv_type_pid_t" = 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;} ++ { { $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 "cannot compute sizeof (pid_t) + See \`config.log' for more details" "$LINENO" 5; } + else +@@ -10064,31 +9036,31 @@ See \`config.log' for more details" "$LINENO" 5; } + fi + + fi +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_pid_t" >&5 +-printf "%s\n" "$ac_cv_sizeof_pid_t" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_pid_t" >&5 ++$as_echo "$ac_cv_sizeof_pid_t" >&6; } + + + +-printf "%s\n" "#define SIZEOF_PID_T $ac_cv_sizeof_pid_t" >>confdefs.h ++cat >>confdefs.h <<_ACEOF ++#define SIZEOF_PID_T $ac_cv_sizeof_pid_t ++_ACEOF + + + # The cast to long int works around a bug in the HP C Compiler + # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects + # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. + # This bug is HP SR number 8606223364. +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of uintptr_t" >&5 +-printf %s "checking size of uintptr_t... " >&6; } +-if test ${ac_cv_sizeof_uintptr_t+y} +-then : +- printf %s "(cached) " >&6 +-else $as_nop +- if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (uintptr_t))" "ac_cv_sizeof_uintptr_t" "$ac_includes_default" +-then : +- +-else $as_nop ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of uintptr_t" >&5 ++$as_echo_n "checking size of uintptr_t... " >&6; } ++if ${ac_cv_sizeof_uintptr_t+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (uintptr_t))" "ac_cv_sizeof_uintptr_t" "$ac_includes_default"; then : ++ ++else + if test "$ac_cv_type_uintptr_t" = 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;} ++ { { $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 "cannot compute sizeof (uintptr_t) + See \`config.log' for more details" "$LINENO" 5; } + else +@@ -10097,22 +9069,23 @@ See \`config.log' for more details" "$LINENO" 5; } + fi + + fi +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_uintptr_t" >&5 +-printf "%s\n" "$ac_cv_sizeof_uintptr_t" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_uintptr_t" >&5 ++$as_echo "$ac_cv_sizeof_uintptr_t" >&6; } + + + +-printf "%s\n" "#define SIZEOF_UINTPTR_T $ac_cv_sizeof_uintptr_t" >>confdefs.h ++cat >>confdefs.h <<_ACEOF ++#define SIZEOF_UINTPTR_T $ac_cv_sizeof_uintptr_t ++_ACEOF + + + + +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for long double" >&5 +-printf %s "checking for long double... " >&6; } +-if test ${ac_cv_type_long_double+y} +-then : +- printf %s "(cached) " >&6 +-else $as_nop ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for long double" >&5 ++$as_echo_n "checking for long double... " >&6; } ++if ${ac_cv_type_long_double+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else + if test "$GCC" = yes; then + ac_cv_type_long_double=yes + else +@@ -10122,7 +9095,7 @@ else $as_nop + not support it. */ + long double foo = 0.0L; + int +-main (void) ++main () + { + static int test_array [1 - 2 * !(/* On Ultrix 4.3 cc, long double is 4 and double is 8. */ + sizeof (double) <= sizeof (long double))]; +@@ -10133,20 +9106,19 @@ return test_array [0]; + return 0; + } + _ACEOF +-if ac_fn_c_try_compile "$LINENO" +-then : ++if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_type_long_double=yes +-else $as_nop ++else + ac_cv_type_long_double=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 + fi +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_long_double" >&5 +-printf "%s\n" "$ac_cv_type_long_double" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_long_double" >&5 ++$as_echo "$ac_cv_type_long_double" >&6; } + if test $ac_cv_type_long_double = yes; then + +-printf "%s\n" "#define HAVE_LONG_DOUBLE 1" >>confdefs.h ++$as_echo "#define HAVE_LONG_DOUBLE 1" >>confdefs.h + + fi + +@@ -10154,19 +9126,17 @@ printf "%s\n" "#define HAVE_LONG_DOUBLE 1" >>confdefs.h + # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects + # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. + # This bug is HP SR number 8606223364. +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of long double" >&5 +-printf %s "checking size of long double... " >&6; } +-if test ${ac_cv_sizeof_long_double+y} +-then : +- printf %s "(cached) " >&6 +-else $as_nop +- if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long double))" "ac_cv_sizeof_long_double" "$ac_includes_default" +-then : +- +-else $as_nop ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long double" >&5 ++$as_echo_n "checking size of long double... " >&6; } ++if ${ac_cv_sizeof_long_double+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long double))" "ac_cv_sizeof_long_double" "$ac_includes_default"; then : ++ ++else + if test "$ac_cv_type_long_double" = 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;} ++ { { $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 "cannot compute sizeof (long double) + See \`config.log' for more details" "$LINENO" 5; } + else +@@ -10175,12 +9145,14 @@ See \`config.log' for more details" "$LINENO" 5; } + fi + + fi +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long_double" >&5 +-printf "%s\n" "$ac_cv_sizeof_long_double" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long_double" >&5 ++$as_echo "$ac_cv_sizeof_long_double" >&6; } + + + +-printf "%s\n" "#define SIZEOF_LONG_DOUBLE $ac_cv_sizeof_long_double" >>confdefs.h ++cat >>confdefs.h <<_ACEOF ++#define SIZEOF_LONG_DOUBLE $ac_cv_sizeof_long_double ++_ACEOF + + + +@@ -10188,19 +9160,17 @@ printf "%s\n" "#define SIZEOF_LONG_DOUBLE $ac_cv_sizeof_long_double" >>confdefs. + # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects + # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. + # This bug is HP SR number 8606223364. +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of _Bool" >&5 +-printf %s "checking size of _Bool... " >&6; } +-if test ${ac_cv_sizeof__Bool+y} +-then : +- printf %s "(cached) " >&6 +-else $as_nop +- if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (_Bool))" "ac_cv_sizeof__Bool" "$ac_includes_default" +-then : +- +-else $as_nop ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of _Bool" >&5 ++$as_echo_n "checking size of _Bool... " >&6; } ++if ${ac_cv_sizeof__Bool+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (_Bool))" "ac_cv_sizeof__Bool" "$ac_includes_default"; then : ++ ++else + if test "$ac_cv_type__Bool" = 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;} ++ { { $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 "cannot compute sizeof (_Bool) + See \`config.log' for more details" "$LINENO" 5; } + else +@@ -10209,12 +9179,14 @@ See \`config.log' for more details" "$LINENO" 5; } + fi + + fi +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof__Bool" >&5 +-printf "%s\n" "$ac_cv_sizeof__Bool" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof__Bool" >&5 ++$as_echo "$ac_cv_sizeof__Bool" >&6; } + + + +-printf "%s\n" "#define SIZEOF__BOOL $ac_cv_sizeof__Bool" >>confdefs.h ++cat >>confdefs.h <<_ACEOF ++#define SIZEOF__BOOL $ac_cv_sizeof__Bool ++_ACEOF + + + +@@ -10222,24 +9194,22 @@ printf "%s\n" "#define SIZEOF__BOOL $ac_cv_sizeof__Bool" >>confdefs.h + # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects + # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. + # This bug is HP SR number 8606223364. +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of off_t" >&5 +-printf %s "checking size of off_t... " >&6; } +-if test ${ac_cv_sizeof_off_t+y} +-then : +- printf %s "(cached) " >&6 +-else $as_nop ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of off_t" >&5 ++$as_echo_n "checking size of off_t... " >&6; } ++if ${ac_cv_sizeof_off_t+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (off_t))" "ac_cv_sizeof_off_t" " + #ifdef HAVE_SYS_TYPES_H + #include + #endif + +-" +-then : ++"; then : + +-else $as_nop ++else + if test "$ac_cv_type_off_t" = 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;} ++ { { $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 "cannot compute sizeof (off_t) + See \`config.log' for more details" "$LINENO" 5; } + else +@@ -10248,39 +9218,40 @@ See \`config.log' for more details" "$LINENO" 5; } + fi + + fi +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_off_t" >&5 +-printf "%s\n" "$ac_cv_sizeof_off_t" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_off_t" >&5 ++$as_echo "$ac_cv_sizeof_off_t" >&6; } + + + +-printf "%s\n" "#define SIZEOF_OFF_T $ac_cv_sizeof_off_t" >>confdefs.h ++cat >>confdefs.h <<_ACEOF ++#define SIZEOF_OFF_T $ac_cv_sizeof_off_t ++_ACEOF + + + +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable large file support" >&5 +-printf %s "checking whether to enable large file support... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable large file support" >&5 ++$as_echo_n "checking whether to enable large file support... " >&6; } + if test "$ac_cv_sizeof_off_t" -gt "$ac_cv_sizeof_long" -a \ + "$ac_cv_sizeof_long_long" -ge "$ac_cv_sizeof_off_t"; then + +-printf "%s\n" "#define HAVE_LARGEFILE_SUPPORT 1" >>confdefs.h ++$as_echo "#define HAVE_LARGEFILE_SUPPORT 1" >>confdefs.h + +- { 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; } + fi + + # The cast to long int works around a bug in the HP C Compiler + # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects + # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. + # This bug is HP SR number 8606223364. +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of time_t" >&5 +-printf %s "checking size of time_t... " >&6; } +-if test ${ac_cv_sizeof_time_t+y} +-then : +- printf %s "(cached) " >&6 +-else $as_nop ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of time_t" >&5 ++$as_echo_n "checking size of time_t... " >&6; } ++if ${ac_cv_sizeof_time_t+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (time_t))" "ac_cv_sizeof_time_t" " + #ifdef HAVE_SYS_TYPES_H + #include +@@ -10289,13 +9260,12 @@ else $as_nop + #include + #endif + +-" +-then : ++"; then : + +-else $as_nop ++else + if test "$ac_cv_type_time_t" = 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;} ++ { { $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 "cannot compute sizeof (time_t) + See \`config.log' for more details" "$LINENO" 5; } + else +@@ -10304,12 +9274,14 @@ See \`config.log' for more details" "$LINENO" 5; } + fi + + fi +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_time_t" >&5 +-printf "%s\n" "$ac_cv_sizeof_time_t" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_time_t" >&5 ++$as_echo "$ac_cv_sizeof_time_t" >&6; } + + + +-printf "%s\n" "#define SIZEOF_TIME_T $ac_cv_sizeof_time_t" >>confdefs.h ++cat >>confdefs.h <<_ACEOF ++#define SIZEOF_TIME_T $ac_cv_sizeof_time_t ++_ACEOF + + + +@@ -10323,15 +9295,15 @@ elif test "$ac_cv_pthread" = "yes" + then CC="$CC -pthread" + fi + +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pthread_t" >&5 +-printf %s "checking for pthread_t... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_t" >&5 ++$as_echo_n "checking for pthread_t... " >&6; } + have_pthread_t=no + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include + int +-main (void) ++main () + { + pthread_t x; x = *(pthread_t*)0; + ; +@@ -10339,36 +9311,33 @@ pthread_t x; x = *(pthread_t*)0; + } + + _ACEOF +-if ac_fn_c_try_compile "$LINENO" +-then : ++if ac_fn_c_try_compile "$LINENO"; then : + have_pthread_t=yes + fi +-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $have_pthread_t" >&5 +-printf "%s\n" "$have_pthread_t" >&6; } ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_pthread_t" >&5 ++$as_echo "$have_pthread_t" >&6; } + if test "$have_pthread_t" = yes ; then + # The cast to long int works around a bug in the HP C Compiler + # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects + # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. + # This bug is HP SR number 8606223364. +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of pthread_t" >&5 +-printf %s "checking size of pthread_t... " >&6; } +-if test ${ac_cv_sizeof_pthread_t+y} +-then : +- printf %s "(cached) " >&6 +-else $as_nop ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of pthread_t" >&5 ++$as_echo_n "checking size of pthread_t... " >&6; } ++if ${ac_cv_sizeof_pthread_t+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (pthread_t))" "ac_cv_sizeof_pthread_t" " + #ifdef HAVE_PTHREAD_H + #include + #endif + +-" +-then : ++"; then : + +-else $as_nop ++else + if test "$ac_cv_type_pthread_t" = 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;} ++ { { $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 "cannot compute sizeof (pthread_t) + See \`config.log' for more details" "$LINENO" 5; } + else +@@ -10377,12 +9346,14 @@ See \`config.log' for more details" "$LINENO" 5; } + fi + + fi +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_pthread_t" >&5 +-printf "%s\n" "$ac_cv_sizeof_pthread_t" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_pthread_t" >&5 ++$as_echo "$ac_cv_sizeof_pthread_t" >&6; } + + + +-printf "%s\n" "#define SIZEOF_PTHREAD_T $ac_cv_sizeof_pthread_t" >>confdefs.h ++cat >>confdefs.h <<_ACEOF ++#define SIZEOF_PTHREAD_T $ac_cv_sizeof_pthread_t ++_ACEOF + + + fi +@@ -10393,20 +9364,18 @@ fi + # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects + # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. + # This bug is HP SR number 8606223364. +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of pthread_key_t" >&5 +-printf %s "checking size of pthread_key_t... " >&6; } +-if test ${ac_cv_sizeof_pthread_key_t+y} +-then : +- printf %s "(cached) " >&6 +-else $as_nop ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of pthread_key_t" >&5 ++$as_echo_n "checking size of pthread_key_t... " >&6; } ++if ${ac_cv_sizeof_pthread_key_t+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (pthread_key_t))" "ac_cv_sizeof_pthread_key_t" "#include +-" +-then : ++"; then : + +-else $as_nop ++else + if test "$ac_cv_type_pthread_key_t" = 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;} ++ { { $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 "cannot compute sizeof (pthread_key_t) + See \`config.log' for more details" "$LINENO" 5; } + else +@@ -10415,46 +9384,47 @@ See \`config.log' for more details" "$LINENO" 5; } + fi + + fi +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_pthread_key_t" >&5 +-printf "%s\n" "$ac_cv_sizeof_pthread_key_t" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_pthread_key_t" >&5 ++$as_echo "$ac_cv_sizeof_pthread_key_t" >&6; } + + + +-printf "%s\n" "#define SIZEOF_PTHREAD_KEY_T $ac_cv_sizeof_pthread_key_t" >>confdefs.h ++cat >>confdefs.h <<_ACEOF ++#define SIZEOF_PTHREAD_KEY_T $ac_cv_sizeof_pthread_key_t ++_ACEOF + + +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether pthread_key_t is compatible with int" >&5 +-printf %s "checking whether pthread_key_t is compatible with int... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pthread_key_t is compatible with int" >&5 ++$as_echo_n "checking whether pthread_key_t is compatible with int... " >&6; } + if test "$ac_cv_sizeof_pthread_key_t" -eq "$ac_cv_sizeof_int" ; then + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + int +-main (void) ++main () + { + pthread_key_t k; k * 1; + ; + return 0; + } + _ACEOF +-if ac_fn_c_try_compile "$LINENO" +-then : ++if ac_fn_c_try_compile "$LINENO"; then : + ac_pthread_key_t_is_arithmetic_type=yes +-else $as_nop ++else + ac_pthread_key_t_is_arithmetic_type=no + + fi +-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_pthread_key_t_is_arithmetic_type" >&5 +-printf "%s\n" "$ac_pthread_key_t_is_arithmetic_type" >&6; } ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pthread_key_t_is_arithmetic_type" >&5 ++$as_echo "$ac_pthread_key_t_is_arithmetic_type" >&6; } + if test "$ac_pthread_key_t_is_arithmetic_type" = yes ; then + +-printf "%s\n" "#define PTHREAD_KEY_T_IS_COMPATIBLE_WITH_INT 1" >>confdefs.h ++$as_echo "#define PTHREAD_KEY_T_IS_COMPATIBLE_WITH_INT 1" >>confdefs.h + + fi + 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 + CC="$ac_save_cc" + +@@ -10488,10 +9458,9 @@ case $ac_sys_system/$ac_sys_release in + else + LIBTOOL_CRUFT="" + fi +- if test "$cross_compiling" = yes +-then : ++ if test "$cross_compiling" = yes; then : + ac_osx_32bit=yes +-else $as_nop ++else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -10506,10 +9475,9 @@ else $as_nop + } + + _ACEOF +-if ac_fn_c_try_run "$LINENO" +-then : ++if ac_fn_c_try_run "$LINENO"; then : + ac_osx_32bit=yes +-else $as_nop ++else + ac_osx_32bit=no + fi + rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ +@@ -10551,40 +9519,40 @@ fi + LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)' + LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';; + esac +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for --enable-framework" >&5 +-printf %s "checking for --enable-framework... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --enable-framework" >&5 ++$as_echo_n "checking for --enable-framework... " >&6; } + if test "$enable_framework" + then + BASECFLAGS="$BASECFLAGS -fno-common -dynamic" + # -F. is needed to allow linking to the framework while + # in the build location. + +-printf "%s\n" "#define WITH_NEXT_FRAMEWORK 1" >>confdefs.h ++$as_echo "#define WITH_NEXT_FRAMEWORK 1" >>confdefs.h + +- { 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 test $enable_shared = "yes" + then + as_fn_error $? "Specifying both --enable-shared and --enable-framework is not supported, use only --enable-framework instead" "$LINENO" 5 + fi + 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 + +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dyld" >&5 +-printf %s "checking for dyld... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dyld" >&5 ++$as_echo_n "checking for dyld... " >&6; } + case $ac_sys_system/$ac_sys_release in + Darwin/*) + +-printf "%s\n" "#define WITH_DYLD 1" >>confdefs.h ++$as_echo "#define WITH_DYLD 1" >>confdefs.h + +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: always on for Darwin" >&5 +-printf "%s\n" "always on for Darwin" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: always on for Darwin" >&5 ++$as_echo "always on for Darwin" >&6; } + ;; + *) +- { 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; } + ;; + esac + +@@ -10598,8 +9566,8 @@ esac + + # SHLIB_SUFFIX is the extension of shared libraries `(including the dot!) + # -- usually .so, .sl on HP-UX, .dll on Cygwin +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking the extension of shared libraries" >&5 +-printf %s "checking the extension of shared libraries... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the extension of shared libraries" >&5 ++$as_echo_n "checking the extension of shared libraries... " >&6; } + if test -z "$SHLIB_SUFFIX"; then + case $ac_sys_system in + hp*|HP*) +@@ -10612,15 +9580,15 @@ if test -z "$SHLIB_SUFFIX"; then + *) SHLIB_SUFFIX=.so;; + esac + fi +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $SHLIB_SUFFIX" >&5 +-printf "%s\n" "$SHLIB_SUFFIX" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $SHLIB_SUFFIX" >&5 ++$as_echo "$SHLIB_SUFFIX" >&6; } + + # LDSHARED is the ld *command* used to create shared library + # -- "cc -G" on SunOS 5.x. + # (Shared libraries in this instance are shared modules to be loaded into + # Python, as opposed to building Python itself as a shared library.) +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking LDSHARED" >&5 +-printf %s "checking LDSHARED... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking LDSHARED" >&5 ++$as_echo_n "checking LDSHARED... " >&6; } + if test -z "$LDSHARED" + then + case $ac_sys_system/$ac_sys_release in +@@ -10750,14 +9718,14 @@ then + *) LDSHARED="ld";; + esac + fi +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LDSHARED" >&5 +-printf "%s\n" "$LDSHARED" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $LDSHARED" >&5 ++$as_echo "$LDSHARED" >&6; } + LDCXXSHARED=${LDCXXSHARED-$LDSHARED} + BLDSHARED=${BLDSHARED-$LDSHARED} + # CCSHARED are the C *flags* used to create objects to go into a shared + # library (module) -- this is only needed for a few systems +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking CCSHARED" >&5 +-printf %s "checking CCSHARED... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking CCSHARED" >&5 ++$as_echo_n "checking CCSHARED... " >&6; } + if test -z "$CCSHARED" + then + case $ac_sys_system/$ac_sys_release in +@@ -10788,12 +9756,12 @@ then + CCSHARED="-fpic -D__SO_PICABILINUX__ -ftls-model=global-dynamic" + esac + fi +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CCSHARED" >&5 +-printf "%s\n" "$CCSHARED" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CCSHARED" >&5 ++$as_echo "$CCSHARED" >&6; } + # LINKFORSHARED are the flags passed to the $(CC) command that links + # the python executable -- this is only needed for a few systems +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking LINKFORSHARED" >&5 +-printf %s "checking LINKFORSHARED... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking LINKFORSHARED" >&5 ++$as_echo_n "checking LINKFORSHARED... " >&6; } + if test -z "$LINKFORSHARED" + then + case $ac_sys_system/$ac_sys_release in +@@ -10850,13 +9818,13 @@ then + LINKFORSHARED='-Wl,-export-dynamic';; + esac + fi +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LINKFORSHARED" >&5 +-printf "%s\n" "$LINKFORSHARED" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $LINKFORSHARED" >&5 ++$as_echo "$LINKFORSHARED" >&6; } + + + +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking CFLAGSFORSHARED" >&5 +-printf %s "checking CFLAGSFORSHARED... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking CFLAGSFORSHARED" >&5 ++$as_echo_n "checking CFLAGSFORSHARED... " >&6; } + if test ! "$LIBRARY" = "$LDLIBRARY" + then + case $ac_sys_system in +@@ -10868,8 +9836,8 @@ then + CFLAGSFORSHARED='$(CCSHARED)' + esac + fi +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CFLAGSFORSHARED" >&5 +-printf "%s\n" "$CFLAGSFORSHARED" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CFLAGSFORSHARED" >&5 ++$as_echo "$CFLAGSFORSHARED" >&6; } + + # SHLIBS are libraries (except -lc and -lm) to link to the python shared + # library (with --enable-shared). +@@ -10880,23 +9848,22 @@ printf "%s\n" "$CFLAGSFORSHARED" >&6; } + # don't need to link LIBS explicitly. The default should be only changed + # on systems where this approach causes problems. + +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking SHLIBS" >&5 +-printf %s "checking SHLIBS... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking SHLIBS" >&5 ++$as_echo_n "checking SHLIBS... " >&6; } + case "$ac_sys_system" in + *) + SHLIBS='$(LIBS)';; + esac +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $SHLIBS" >&5 +-printf "%s\n" "$SHLIBS" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $SHLIBS" >&5 ++$as_echo "$SHLIBS" >&6; } + + + # checks for libraries +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sendfile in -lsendfile" >&5 +-printf %s "checking for sendfile in -lsendfile... " >&6; } +-if test ${ac_cv_lib_sendfile_sendfile+y} +-then : +- printf %s "(cached) " >&6 +-else $as_nop ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sendfile in -lsendfile" >&5 ++$as_echo_n "checking for sendfile in -lsendfile... " >&6; } ++if ${ac_cv_lib_sendfile_sendfile+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lsendfile $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -10905,41 +9872,43 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* 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 sendfile (); + int +-main (void) ++main () + { + return sendfile (); + ; + return 0; + } + _ACEOF +-if ac_fn_c_try_link "$LINENO" +-then : ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_sendfile_sendfile=yes +-else $as_nop ++else + ac_cv_lib_sendfile_sendfile=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_sendfile_sendfile" >&5 +-printf "%s\n" "$ac_cv_lib_sendfile_sendfile" >&6; } +-if test "x$ac_cv_lib_sendfile_sendfile" = xyes +-then : +- printf "%s\n" "#define HAVE_LIBSENDFILE 1" >>confdefs.h ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sendfile_sendfile" >&5 ++$as_echo "$ac_cv_lib_sendfile_sendfile" >&6; } ++if test "x$ac_cv_lib_sendfile_sendfile" = xyes; then : ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_LIBSENDFILE 1 ++_ACEOF + + LIBS="-lsendfile $LIBS" + + fi + +-{ 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 +@@ -10948,41 +9917,43 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* 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 : +- printf "%s\n" "#define HAVE_LIBDL 1" >>confdefs.h ++{ $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 : ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_LIBDL 1 ++_ACEOF + + LIBS="-ldl $LIBS" + + fi + # Dynamic linking for SunOS/Solaris and SYSV +-{ 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 ++{ $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 +@@ -10991,30 +9962,33 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* 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 : +- printf "%s\n" "#define HAVE_LIBDLD 1" >>confdefs.h ++{ $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 : ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_LIBDLD 1 ++_ACEOF + + LIBS="-ldld $LIBS" + +@@ -11022,27 +9996,27 @@ fi + # Dynamic linking for HP-UX + + # checks for uuid.h location +-ac_fn_c_check_header_compile "$LINENO" "uuid/uuid.h" "ac_cv_header_uuid_uuid_h" "$ac_includes_default" +-if test "x$ac_cv_header_uuid_uuid_h" = xyes +-then : +- printf "%s\n" "#define HAVE_UUID_UUID_H 1" >>confdefs.h ++for ac_header in uuid/uuid.h uuid.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" "uuid.h" "ac_cv_header_uuid_h" "$ac_includes_default" +-if test "x$ac_cv_header_uuid_h" = xyes +-then : +- printf "%s\n" "#define HAVE_UUID_H 1" >>confdefs.h + +-fi ++done + + +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for uuid_generate_time_safe" >&5 +-printf %s "checking for uuid_generate_time_safe... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for uuid_generate_time_safe" >&5 ++$as_echo_n "checking for uuid_generate_time_safe... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + int +-main (void) ++main () + { + + #ifndef uuid_generate_time_safe +@@ -11053,29 +10027,28 @@ void *x = uuid_generate_time_safe + return 0; + } + _ACEOF +-if ac_fn_c_try_compile "$LINENO" +-then : ++if ac_fn_c_try_compile "$LINENO"; then : + +-printf "%s\n" "#define HAVE_UUID_GENERATE_TIME_SAFE 1" >>confdefs.h ++$as_echo "#define HAVE_UUID_GENERATE_TIME_SAFE 1" >>confdefs.h + +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-printf "%s\n" "yes" >&6; } +-else $as_nop +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-printf "%s\n" "no" >&6; } ++ { $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 +-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + # AIX provides support for RFC4122 (uuid) in libc.a starting with AIX 6.1 (anno 2007) + # FreeBSD and OpenBSD provides support as well +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for uuid_create" >&5 +-printf %s "checking for uuid_create... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for uuid_create" >&5 ++$as_echo_n "checking for uuid_create... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + int +-main (void) ++main () + { + + #ifndef uuid_create +@@ -11086,29 +10059,28 @@ void *x = uuid_create + return 0; + } + _ACEOF +-if ac_fn_c_try_compile "$LINENO" +-then : ++if ac_fn_c_try_compile "$LINENO"; then : + +-printf "%s\n" "#define HAVE_UUID_CREATE 1" >>confdefs.h ++$as_echo "#define HAVE_UUID_CREATE 1" >>confdefs.h + +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-printf "%s\n" "yes" >&6; } +-else $as_nop +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-printf "%s\n" "no" >&6; } ++ { $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 +-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + # Little-endian FreeBSD, OpenBSD and NetBSD needs encoding into an octet + # stream in big-endian byte-order +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for uuid_enc_be" >&5 +-printf %s "checking for uuid_enc_be... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for uuid_enc_be" >&5 ++$as_echo_n "checking for uuid_enc_be... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + int +-main (void) ++main () + { + + #ifndef uuid_enc_be +@@ -11119,29 +10091,27 @@ void *x = uuid_enc_be + return 0; + } + _ACEOF +-if ac_fn_c_try_compile "$LINENO" +-then : ++if ac_fn_c_try_compile "$LINENO"; then : + +-printf "%s\n" "#define HAVE_UUID_ENC_BE 1" >>confdefs.h ++$as_echo "#define HAVE_UUID_ENC_BE 1" >>confdefs.h + +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-printf "%s\n" "yes" >&6; } +-else $as_nop +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-printf "%s\n" "no" >&6; } ++ { $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 +-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + # 'Real Time' functions on Solaris + # posix4 on Solaris 2.6 + # pthread (first!) on Linux +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing sem_init" >&5 +-printf %s "checking for library containing sem_init... " >&6; } +-if test ${ac_cv_search_sem_init+y} +-then : +- printf %s "(cached) " >&6 +-else $as_nop ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing sem_init" >&5 ++$as_echo_n "checking for library containing sem_init... " >&6; } ++if ${ac_cv_search_sem_init+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else + ac_func_search_save_LIBS=$LIBS + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +@@ -11149,60 +10119,57 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* 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 sem_init (); + int +-main (void) ++main () + { + return sem_init (); + ; + return 0; + } + _ACEOF +-for ac_lib in '' pthread rt posix4 +-do ++for ac_lib in '' pthread rt posix4; 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_sem_init=$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_sem_init+y} +-then : ++ if ${ac_cv_search_sem_init+:} false; then : + break + fi + done +-if test ${ac_cv_search_sem_init+y} +-then : ++if ${ac_cv_search_sem_init+:} false; then : + +-else $as_nop ++else + ac_cv_search_sem_init=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_sem_init" >&5 +-printf "%s\n" "$ac_cv_search_sem_init" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_sem_init" >&5 ++$as_echo "$ac_cv_search_sem_init" >&6; } + ac_res=$ac_cv_search_sem_init +-if test "$ac_res" != no +-then : ++if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + + fi + + + # check if we need libintl for locale functions +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for textdomain in -lintl" >&5 +-printf %s "checking for textdomain in -lintl... " >&6; } +-if test ${ac_cv_lib_intl_textdomain+y} +-then : +- printf %s "(cached) " >&6 +-else $as_nop ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for textdomain in -lintl" >&5 ++$as_echo_n "checking for textdomain in -lintl... " >&6; } ++if ${ac_cv_lib_intl_textdomain+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lintl $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -11211,31 +10178,32 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* 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 textdomain (); + int +-main (void) ++main () + { + return textdomain (); + ; + return 0; + } + _ACEOF +-if ac_fn_c_try_link "$LINENO" +-then : ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_intl_textdomain=yes +-else $as_nop ++else + ac_cv_lib_intl_textdomain=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_intl_textdomain" >&5 +-printf "%s\n" "$ac_cv_lib_intl_textdomain" >&6; } +-if test "x$ac_cv_lib_intl_textdomain" = xyes +-then : ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_textdomain" >&5 ++$as_echo "$ac_cv_lib_intl_textdomain" >&6; } ++if test "x$ac_cv_lib_intl_textdomain" = xyes; then : + +-printf "%s\n" "#define WITH_LIBINTL 1" >>confdefs.h ++$as_echo "#define WITH_LIBINTL 1" >>confdefs.h + + LIBS="-lintl $LIBS" + fi +@@ -11243,14 +10211,14 @@ fi + + # checks for system dependent C++ extensions support + case "$ac_sys_system" in +- AIX*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for genuine AIX C++ extensions support" >&5 +-printf %s "checking for genuine AIX C++ extensions support... " >&6; } ++ AIX*) { $as_echo "$as_me:${as_lineno-$LINENO}: checking for genuine AIX C++ extensions support" >&5 ++$as_echo_n "checking for genuine AIX C++ extensions support... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include + int +-main (void) ++main () + { + loadAndInit("", 0, "") + ; +@@ -11258,49 +10226,48 @@ loadAndInit("", 0, "") + } + + _ACEOF +-if ac_fn_c_try_link "$LINENO" +-then : ++if ac_fn_c_try_link "$LINENO"; then : + + +-printf "%s\n" "#define AIX_GENUINE_CPLUSPLUS 1" >>confdefs.h ++$as_echo "#define AIX_GENUINE_CPLUSPLUS 1" >>confdefs.h + +- { 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_nop ++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 +-rm -f core conftest.err conftest.$ac_objext conftest.beam \ ++rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + # BUILD_GNU_TYPE + AIX_BUILDDATE are used to construct the platform_tag + # of the AIX system used to build/package Python executable. This tag serves + # as a baseline for bdist module packages +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for the system builddate" >&5 +-printf %s "checking for the system builddate... " >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the system builddate" >&5 ++$as_echo_n "checking for the system builddate... " >&6; } + AIX_BUILDDATE=$(lslpp -Lcq bos.mp64 | awk -F: '{ print $NF }') + +-printf "%s\n" "#define AIX_BUILDDATE $AIX_BUILDDATE" >>confdefs.h ++cat >>confdefs.h <<_ACEOF ++#define AIX_BUILDDATE $AIX_BUILDDATE ++_ACEOF + +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AIX_BUILDDATE" >&5 +-printf "%s\n" "$AIX_BUILDDATE" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AIX_BUILDDATE" >&5 ++$as_echo "$AIX_BUILDDATE" >&6; } + ;; + *) ;; + esac + + # check for systems that require aligned memory access +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking aligned memory access is required" >&5 +-printf %s "checking aligned memory access is required... " >&6; } +-if test ${ac_cv_aligned_required+y} +-then : +- printf %s "(cached) " >&6 +-else $as_nop +- if test "$cross_compiling" = yes +-then : ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking aligned memory access is required" >&5 ++$as_echo_n "checking aligned memory access is required... " >&6; } ++if ${ac_cv_aligned_required+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test "$cross_compiling" = yes; then : + ac_cv_aligned_required=yes +-else $as_nop ++else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -11317,10 +10284,9 @@ int main() + return 0; + } + _ACEOF +-if ac_fn_c_try_run "$LINENO" +-then : ++if ac_fn_c_try_run "$LINENO"; then : + ac_cv_aligned_required=no +-else $as_nop ++else + ac_cv_aligned_required=yes + fi + rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ +@@ -11330,33 +10296,32 @@ fi + + fi + +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_aligned_required" >&5 +-printf "%s\n" "$ac_cv_aligned_required" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_aligned_required" >&5 ++$as_echo "$ac_cv_aligned_required" >&6; } + if test "$ac_cv_aligned_required" = yes ; then + +-printf "%s\n" "#define HAVE_ALIGNED_REQUIRED 1" >>confdefs.h ++$as_echo "#define HAVE_ALIGNED_REQUIRED 1" >>confdefs.h + + fi + + # str, bytes and memoryview hash algorithm + + +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for --with-hash-algorithm" >&5 +-printf %s "checking for --with-hash-algorithm... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-hash-algorithm" >&5 ++$as_echo_n "checking for --with-hash-algorithm... " >&6; } + + # Check whether --with-hash_algorithm was given. +-if test ${with_hash_algorithm+y} +-then : ++if test "${with_hash_algorithm+set}" = set; then : + withval=$with_hash_algorithm; +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $withval" >&5 +-printf "%s\n" "$withval" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $withval" >&5 ++$as_echo "$withval" >&6; } + case "$withval" in + siphash24) +- printf "%s\n" "#define Py_HASH_ALGORITHM 1" >>confdefs.h ++ $as_echo "#define Py_HASH_ALGORITHM 1" >>confdefs.h + + ;; + fnv) +- printf "%s\n" "#define Py_HASH_ALGORITHM 2" >>confdefs.h ++ $as_echo "#define Py_HASH_ALGORITHM 2" >>confdefs.h + + ;; + *) +@@ -11364,9 +10329,9 @@ case "$withval" in + ;; + esac + +-else $as_nop +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: default" >&5 +-printf "%s\n" "default" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: default" >&5 ++$as_echo "default" >&6; } + fi + + +@@ -11385,12 +10350,11 @@ validate_tzpath() { + } + + TZPATH="/usr/share/zoneinfo:/usr/lib/zoneinfo:/usr/share/lib/zoneinfo:/etc/zoneinfo" +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for --with-tzpath" >&5 +-printf %s "checking for --with-tzpath... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-tzpath" >&5 ++$as_echo_n "checking for --with-tzpath... " >&6; } + + # Check whether --with-tzpath was given. +-if test ${with_tzpath+y} +-then : ++if test "${with_tzpath+set}" = set; then : + withval=$with_tzpath; + case "$withval" in + yes) +@@ -11399,84 +10363,80 @@ case "$withval" in + *) + validate_tzpath "$withval" + TZPATH="$withval" +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: \"$withval\"" >&5 +-printf "%s\n" "\"$withval\"" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"$withval\"" >&5 ++$as_echo "\"$withval\"" >&6; } + ;; + esac + +-else $as_nop ++else + validate_tzpath "$TZPATH" +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: \"$TZPATH\"" >&5 +-printf "%s\n" "\"$TZPATH\"" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"$TZPATH\"" >&5 ++$as_echo "\"$TZPATH\"" >&6; } + fi + + + +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for --with-address-sanitizer" >&5 +-printf %s "checking for --with-address-sanitizer... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-address-sanitizer" >&5 ++$as_echo_n "checking for --with-address-sanitizer... " >&6; } + + # Check whether --with-address_sanitizer was given. +-if test ${with_address_sanitizer+y} +-then : ++if test "${with_address_sanitizer+set}" = set; then : + withval=$with_address_sanitizer; +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $withval" >&5 +-printf "%s\n" "$withval" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $withval" >&5 ++$as_echo "$withval" >&6; } + BASECFLAGS="-fsanitize=address -fno-omit-frame-pointer $BASECFLAGS" + LDFLAGS="-fsanitize=address $LDFLAGS" + # ASan works by controlling memory allocation, our own malloc interferes. + with_pymalloc="no" + +-else $as_nop +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-printf "%s\n" "no" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } + fi + + +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for --with-memory-sanitizer" >&5 +-printf %s "checking for --with-memory-sanitizer... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-memory-sanitizer" >&5 ++$as_echo_n "checking for --with-memory-sanitizer... " >&6; } + + # Check whether --with-memory_sanitizer was given. +-if test ${with_memory_sanitizer+y} +-then : ++if test "${with_memory_sanitizer+set}" = set; then : + withval=$with_memory_sanitizer; +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $withval" >&5 +-printf "%s\n" "$withval" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $withval" >&5 ++$as_echo "$withval" >&6; } + BASECFLAGS="-fsanitize=memory -fsanitize-memory-track-origins=2 -fno-omit-frame-pointer $BASECFLAGS" + LDFLAGS="-fsanitize=memory -fsanitize-memory-track-origins=2 $LDFLAGS" + # MSan works by controlling memory allocation, our own malloc interferes. + with_pymalloc="no" + +-else $as_nop +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-printf "%s\n" "no" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } + fi + + +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for --with-undefined-behavior-sanitizer" >&5 +-printf %s "checking for --with-undefined-behavior-sanitizer... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-undefined-behavior-sanitizer" >&5 ++$as_echo_n "checking for --with-undefined-behavior-sanitizer... " >&6; } + + # Check whether --with-undefined_behavior_sanitizer was given. +-if test ${with_undefined_behavior_sanitizer+y} +-then : ++if test "${with_undefined_behavior_sanitizer+set}" = set; then : + withval=$with_undefined_behavior_sanitizer; +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $withval" >&5 +-printf "%s\n" "$withval" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $withval" >&5 ++$as_echo "$withval" >&6; } + BASECFLAGS="-fsanitize=undefined $BASECFLAGS" + LDFLAGS="-fsanitize=undefined $LDFLAGS" + +-else $as_nop +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-printf "%s\n" "no" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } + fi + + + # Most SVR4 platforms (e.g. Solaris) need -lsocket and -lnsl. +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for t_open in -lnsl" >&5 +-printf %s "checking for t_open in -lnsl... " >&6; } +-if test ${ac_cv_lib_nsl_t_open+y} +-then : +- printf %s "(cached) " >&6 +-else $as_nop ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for t_open in -lnsl" >&5 ++$as_echo_n "checking for t_open in -lnsl... " >&6; } ++if ${ac_cv_lib_nsl_t_open+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lnsl $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -11485,38 +10445,38 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* 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 t_open (); + int +-main (void) ++main () + { + return t_open (); + ; + return 0; + } + _ACEOF +-if ac_fn_c_try_link "$LINENO" +-then : ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_nsl_t_open=yes +-else $as_nop ++else + ac_cv_lib_nsl_t_open=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_nsl_t_open" >&5 +-printf "%s\n" "$ac_cv_lib_nsl_t_open" >&6; } +-if test "x$ac_cv_lib_nsl_t_open" = xyes +-then : ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_t_open" >&5 ++$as_echo "$ac_cv_lib_nsl_t_open" >&6; } ++if test "x$ac_cv_lib_nsl_t_open" = xyes; then : + LIBS="-lnsl $LIBS" + fi + # SVR4 +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for socket in -lsocket" >&5 +-printf %s "checking for socket in -lsocket... " >&6; } +-if test ${ac_cv_lib_socket_socket+y} +-then : +- printf %s "(cached) " >&6 +-else $as_nop ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for socket in -lsocket" >&5 ++$as_echo_n "checking for socket in -lsocket... " >&6; } ++if ${ac_cv_lib_socket_socket+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lsocket $LIBS $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -11525,47 +10485,47 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* 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 +-if ac_fn_c_try_link "$LINENO" +-then : ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_socket_socket=yes +-else $as_nop ++else + ac_cv_lib_socket_socket=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_socket_socket" >&5 +-printf "%s\n" "$ac_cv_lib_socket_socket" >&6; } +-if test "x$ac_cv_lib_socket_socket" = xyes +-then : ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_socket" >&5 ++$as_echo "$ac_cv_lib_socket_socket" >&6; } ++if test "x$ac_cv_lib_socket_socket" = xyes; then : + LIBS="-lsocket $LIBS" + fi + # SVR4 sockets + +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for --with-libs" >&5 +-printf %s "checking for --with-libs... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-libs" >&5 ++$as_echo_n "checking for --with-libs... " >&6; } + + # Check whether --with-libs was given. +-if test ${with_libs+y} +-then : ++if test "${with_libs+set}" = set; then : + withval=$with_libs; +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $withval" >&5 +-printf "%s\n" "$withval" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $withval" >&5 ++$as_echo "$withval" >&6; } + LIBS="$withval $LIBS" + +-else $as_nop +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-printf "%s\n" "no" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } + fi + + +@@ -11580,12 +10540,11 @@ 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. +@@ -11595,15 +10554,11 @@ else $as_nop + 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 +@@ -11615,11 +10570,11 @@ esac + 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 + + +@@ -11628,12 +10583,11 @@ if test -z "$ac_cv_path_PKG_CONFIG"; then + 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. +@@ -11643,15 +10597,11 @@ else $as_nop + 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 +@@ -11663,11 +10613,11 @@ esac + 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 +@@ -11675,8 +10625,8 @@ fi + 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 +@@ -11688,41 +10638,39 @@ fi + 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 + + # Check for use of the system expat library +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for --with-system-expat" >&5 +-printf %s "checking for --with-system-expat... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-system-expat" >&5 ++$as_echo_n "checking for --with-system-expat... " >&6; } + + # Check whether --with-system_expat was given. +-if test ${with_system_expat+y} +-then : ++if test "${with_system_expat+set}" = set; then : + withval=$with_system_expat; +-else $as_nop ++else + with_system_expat="no" + fi + + +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_system_expat" >&5 +-printf "%s\n" "$with_system_expat" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_system_expat" >&5 ++$as_echo "$with_system_expat" >&6; } + + # Check for use of the system libffi library +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for --with-system-ffi" >&5 +-printf %s "checking for --with-system-ffi... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-system-ffi" >&5 ++$as_echo_n "checking for --with-system-ffi... " >&6; } + + # Check whether --with-system_ffi was given. +-if test ${with_system_ffi+y} +-then : ++if test "${with_system_ffi+set}" = set; then : + withval=$with_system_ffi; + fi + +@@ -11739,15 +10687,15 @@ then + as_fn_error $? "--with-system-ffi accepts no arguments" "$LINENO" 5 + ;; + esac +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_system_ffi" >&5 +-printf "%s\n" "$with_system_ffi" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_system_ffi" >&5 ++$as_echo "$with_system_ffi" >&6; } + else +- { 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 test "$with_system_ffi" != "" + then +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: --with(out)-system-ffi is ignored on this platform" >&5 +-printf "%s\n" "$as_me: WARNING: --with(out)-system-ffi is ignored on this platform" >&2;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: --with(out)-system-ffi is ignored on this platform" >&5 ++$as_echo "$as_me: WARNING: --with(out)-system-ffi is ignored on this platform" >&2;} + fi + with_system_ffi="yes" + fi +@@ -11760,30 +10708,28 @@ fi + + + # Check for use of the system libmpdec library +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for --with-system-libmpdec" >&5 +-printf %s "checking for --with-system-libmpdec... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-system-libmpdec" >&5 ++$as_echo_n "checking for --with-system-libmpdec... " >&6; } + + # Check whether --with-system_libmpdec was given. +-if test ${with_system_libmpdec+y} +-then : ++if test "${with_system_libmpdec+set}" = set; then : + withval=$with_system_libmpdec; +-else $as_nop ++else + with_system_libmpdec="no" + fi + + +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_system_libmpdec" >&5 +-printf "%s\n" "$with_system_libmpdec" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_system_libmpdec" >&5 ++$as_echo "$with_system_libmpdec" >&6; } + + # Check whether _decimal should use a coroutine-local or thread-local context +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for --with-decimal-contextvar" >&5 +-printf %s "checking for --with-decimal-contextvar... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-decimal-contextvar" >&5 ++$as_echo_n "checking for --with-decimal-contextvar... " >&6; } + + # Check whether --with-decimal_contextvar was given. +-if test ${with_decimal_contextvar+y} +-then : ++if test "${with_decimal_contextvar+set}" = set; then : + withval=$with_decimal_contextvar; +-else $as_nop ++else + with_decimal_contextvar="yes" + fi + +@@ -11791,57 +10737,54 @@ fi + if test "$with_decimal_contextvar" != "no" + then + +-printf "%s\n" "#define WITH_DECIMAL_CONTEXTVAR 1" >>confdefs.h ++$as_echo "#define WITH_DECIMAL_CONTEXTVAR 1" >>confdefs.h + + fi + +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_decimal_contextvar" >&5 +-printf "%s\n" "$with_decimal_contextvar" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_decimal_contextvar" >&5 ++$as_echo "$with_decimal_contextvar" >&6; } + + # Check for support for loadable sqlite extensions +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for --enable-loadable-sqlite-extensions" >&5 +-printf %s "checking for --enable-loadable-sqlite-extensions... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --enable-loadable-sqlite-extensions" >&5 ++$as_echo_n "checking for --enable-loadable-sqlite-extensions... " >&6; } + # Check whether --enable-loadable-sqlite-extensions was given. +-if test ${enable_loadable_sqlite_extensions+y} +-then : ++if test "${enable_loadable_sqlite_extensions+set}" = set; then : + enableval=$enable_loadable_sqlite_extensions; +-else $as_nop ++else + enable_loadable_sqlite_extensions="no" + fi + + +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_loadable_sqlite_extensions" >&5 +-printf "%s\n" "$enable_loadable_sqlite_extensions" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_loadable_sqlite_extensions" >&5 ++$as_echo "$enable_loadable_sqlite_extensions" >&6; } + + # Check for --with-tcltk-includes=path and --with-tcltk-libs=path + + +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for --with-tcltk-includes" >&5 +-printf %s "checking for --with-tcltk-includes... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-tcltk-includes" >&5 ++$as_echo_n "checking for --with-tcltk-includes... " >&6; } + + # Check whether --with-tcltk-includes was given. +-if test ${with_tcltk_includes+y} +-then : ++if test "${with_tcltk_includes+set}" = set; then : + withval=$with_tcltk_includes; +-else $as_nop ++else + with_tcltk_includes="default" + fi + +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_tcltk_includes" >&5 +-printf "%s\n" "$with_tcltk_includes" >&6; } +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for --with-tcltk-libs" >&5 +-printf %s "checking for --with-tcltk-libs... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_tcltk_includes" >&5 ++$as_echo "$with_tcltk_includes" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-tcltk-libs" >&5 ++$as_echo_n "checking for --with-tcltk-libs... " >&6; } + + # Check whether --with-tcltk-libs was given. +-if test ${with_tcltk_libs+y} +-then : ++if test "${with_tcltk_libs+set}" = set; then : + withval=$with_tcltk_libs; +-else $as_nop ++else + with_tcltk_libs="default" + fi + +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_tcltk_libs" >&5 +-printf "%s\n" "$with_tcltk_libs" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_tcltk_libs" >&5 ++$as_echo "$with_tcltk_libs" >&6; } + if test "x$with_tcltk_includes" = xdefault || test "x$with_tcltk_libs" = xdefault + then + if test "x$with_tcltk_includes" != "x$with_tcltk_libs" +@@ -11861,12 +10804,11 @@ else + fi + + # Check for --with-dbmliborder +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for --with-dbmliborder" >&5 +-printf %s "checking for --with-dbmliborder... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-dbmliborder" >&5 ++$as_echo_n "checking for --with-dbmliborder... " >&6; } + + # Check whether --with-dbmliborder was given. +-if test ${with_dbmliborder+y} +-then : ++if test "${with_dbmliborder+set}" = set; then : + withval=$with_dbmliborder; + if test x$with_dbmliborder = xyes + then +@@ -11881,8 +10823,8 @@ else + fi + fi + +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_dbmliborder" >&5 +-printf "%s\n" "$with_dbmliborder" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_dbmliborder" >&5 ++$as_echo "$with_dbmliborder" >&6; } + + # Templates for things AC_DEFINEd more than once. + # For a single AC_DEFINE, no template is needed. +@@ -11891,7 +10833,7 @@ printf "%s\n" "$with_dbmliborder" >&6; } + if test "$ac_cv_pthread_is_default" = yes + then + # Defining _REENTRANT on system with POSIX threads should not hurt. +- printf "%s\n" "#define _REENTRANT 1" >>confdefs.h ++ $as_echo "#define _REENTRANT 1" >>confdefs.h + + posix_threads=yes + if test "$ac_sys_system" = "SunOS"; then +@@ -11926,8 +10868,8 @@ else + # According to the POSIX spec, a pthreads implementation must + # define _POSIX_THREADS in unistd.h. Some apparently don't + # (e.g. gnu pth with pthread emulation) +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for _POSIX_THREADS in unistd.h" >&5 +-printf %s "checking for _POSIX_THREADS in unistd.h... " >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _POSIX_THREADS in unistd.h" >&5 ++$as_echo_n "checking for _POSIX_THREADS in unistd.h... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -11938,26 +10880,25 @@ yes + + _ACEOF + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +- $EGREP "yes" >/dev/null 2>&1 +-then : ++ $EGREP "yes" >/dev/null 2>&1; then : + unistd_defines_pthreads=yes +-else $as_nop ++else + unistd_defines_pthreads=no + fi +-rm -rf conftest* ++rm -f conftest* + +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $unistd_defines_pthreads" >&5 +-printf "%s\n" "$unistd_defines_pthreads" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $unistd_defines_pthreads" >&5 ++$as_echo "$unistd_defines_pthreads" >&6; } + +- printf "%s\n" "#define _REENTRANT 1" >>confdefs.h ++ $as_echo "#define _REENTRANT 1" >>confdefs.h + + # Just looking for pthread_create in libpthread is not enough: + # on HP/UX, pthread.h renames pthread_create to a different symbol name. + # So we really have to include pthread.h, and then link. + _libs=$LIBS + LIBS="$LIBS -lpthread" +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthread" >&5 +-printf %s "checking for pthread_create in -lpthread... " >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthread" >&5 ++$as_echo_n "checking for pthread_create in -lpthread... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -11966,7 +10907,7 @@ printf %s "checking for pthread_create in -lpthread... " >&6; } + + void * start_routine (void *arg) { exit (0); } + int +-main (void) ++main () + { + + pthread_create (NULL, NULL, start_routine, NULL) +@@ -11974,30 +10915,27 @@ pthread_create (NULL, NULL, start_routine, NULL) + return 0; + } + _ACEOF +-if ac_fn_c_try_link "$LINENO" +-then : ++if ac_fn_c_try_link "$LINENO"; 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; } + posix_threads=yes + +-else $as_nop ++else + + LIBS=$_libs + ac_fn_c_check_func "$LINENO" "pthread_detach" "ac_cv_func_pthread_detach" +-if test "x$ac_cv_func_pthread_detach" = xyes +-then : ++if test "x$ac_cv_func_pthread_detach" = xyes; then : + + posix_threads=yes + +-else $as_nop ++else + +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthreads" >&5 +-printf %s "checking for pthread_create in -lpthreads... " >&6; } +-if test ${ac_cv_lib_pthreads_pthread_create+y} +-then : +- printf %s "(cached) " >&6 +-else $as_nop ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthreads" >&5 ++$as_echo_n "checking for pthread_create in -lpthreads... " >&6; } ++if ${ac_cv_lib_pthreads_pthread_create+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lpthreads $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -12006,41 +10944,41 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* 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 pthread_create (); + int +-main (void) ++main () + { + return pthread_create (); + ; + return 0; + } + _ACEOF +-if ac_fn_c_try_link "$LINENO" +-then : ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_pthreads_pthread_create=yes +-else $as_nop ++else + ac_cv_lib_pthreads_pthread_create=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_pthreads_pthread_create" >&5 +-printf "%s\n" "$ac_cv_lib_pthreads_pthread_create" >&6; } +-if test "x$ac_cv_lib_pthreads_pthread_create" = xyes +-then : ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthreads_pthread_create" >&5 ++$as_echo "$ac_cv_lib_pthreads_pthread_create" >&6; } ++if test "x$ac_cv_lib_pthreads_pthread_create" = xyes; then : + + posix_threads=yes + LIBS="$LIBS -lpthreads" + +-else $as_nop ++else + +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lc_r" >&5 +-printf %s "checking for pthread_create in -lc_r... " >&6; } +-if test ${ac_cv_lib_c_r_pthread_create+y} +-then : +- printf %s "(cached) " >&6 +-else $as_nop ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lc_r" >&5 ++$as_echo_n "checking for pthread_create in -lc_r... " >&6; } ++if ${ac_cv_lib_c_r_pthread_create+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lc_r $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -12049,41 +10987,41 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* 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 pthread_create (); + int +-main (void) ++main () + { + return pthread_create (); + ; + return 0; + } + _ACEOF +-if ac_fn_c_try_link "$LINENO" +-then : ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_c_r_pthread_create=yes +-else $as_nop ++else + ac_cv_lib_c_r_pthread_create=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_r_pthread_create" >&5 +-printf "%s\n" "$ac_cv_lib_c_r_pthread_create" >&6; } +-if test "x$ac_cv_lib_c_r_pthread_create" = xyes +-then : ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_r_pthread_create" >&5 ++$as_echo "$ac_cv_lib_c_r_pthread_create" >&6; } ++if test "x$ac_cv_lib_c_r_pthread_create" = xyes; then : + + posix_threads=yes + LIBS="$LIBS -lc_r" + +-else $as_nop ++else + +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __pthread_create_system in -lpthread" >&5 +-printf %s "checking for __pthread_create_system in -lpthread... " >&6; } +-if test ${ac_cv_lib_pthread___pthread_create_system+y} +-then : +- printf %s "(cached) " >&6 +-else $as_nop ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __pthread_create_system in -lpthread" >&5 ++$as_echo_n "checking for __pthread_create_system in -lpthread... " >&6; } ++if ${ac_cv_lib_pthread___pthread_create_system+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lpthread $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -12092,41 +11030,41 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* 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 __pthread_create_system (); + int +-main (void) ++main () + { + return __pthread_create_system (); + ; + return 0; + } + _ACEOF +-if ac_fn_c_try_link "$LINENO" +-then : ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_pthread___pthread_create_system=yes +-else $as_nop ++else + ac_cv_lib_pthread___pthread_create_system=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_pthread___pthread_create_system" >&5 +-printf "%s\n" "$ac_cv_lib_pthread___pthread_create_system" >&6; } +-if test "x$ac_cv_lib_pthread___pthread_create_system" = xyes +-then : ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread___pthread_create_system" >&5 ++$as_echo "$ac_cv_lib_pthread___pthread_create_system" >&6; } ++if test "x$ac_cv_lib_pthread___pthread_create_system" = xyes; then : + + posix_threads=yes + LIBS="$LIBS -lpthread" + +-else $as_nop ++else + +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lcma" >&5 +-printf %s "checking for pthread_create in -lcma... " >&6; } +-if test ${ac_cv_lib_cma_pthread_create+y} +-then : +- printf %s "(cached) " >&6 +-else $as_nop ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lcma" >&5 ++$as_echo_n "checking for pthread_create in -lcma... " >&6; } ++if ${ac_cv_lib_cma_pthread_create+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lcma $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -12135,34 +11073,35 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* 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 pthread_create (); + int +-main (void) ++main () + { + return pthread_create (); + ; + return 0; + } + _ACEOF +-if ac_fn_c_try_link "$LINENO" +-then : ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_cma_pthread_create=yes +-else $as_nop ++else + ac_cv_lib_cma_pthread_create=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_cma_pthread_create" >&5 +-printf "%s\n" "$ac_cv_lib_cma_pthread_create" >&6; } +-if test "x$ac_cv_lib_cma_pthread_create" = xyes +-then : ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_cma_pthread_create" >&5 ++$as_echo "$ac_cv_lib_cma_pthread_create" >&6; } ++if test "x$ac_cv_lib_cma_pthread_create" = xyes; then : + + posix_threads=yes + LIBS="$LIBS -lcma" + +-else $as_nop ++else + + as_fn_error $? "could not find pthreads on your system" "$LINENO" 5 + +@@ -12178,15 +11117,14 @@ fi + 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 + +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for usconfig in -lmpc" >&5 +-printf %s "checking for usconfig in -lmpc... " >&6; } +-if test ${ac_cv_lib_mpc_usconfig+y} +-then : +- printf %s "(cached) " >&6 +-else $as_nop ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for usconfig in -lmpc" >&5 ++$as_echo_n "checking for usconfig in -lmpc... " >&6; } ++if ${ac_cv_lib_mpc_usconfig+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lmpc $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -12195,29 +11133,30 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* 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 usconfig (); + int +-main (void) ++main () + { + return usconfig (); + ; + return 0; + } + _ACEOF +-if ac_fn_c_try_link "$LINENO" +-then : ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_mpc_usconfig=yes +-else $as_nop ++else + ac_cv_lib_mpc_usconfig=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_mpc_usconfig" >&5 +-printf "%s\n" "$ac_cv_lib_mpc_usconfig" >&6; } +-if test "x$ac_cv_lib_mpc_usconfig" = xyes +-then : ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mpc_usconfig" >&5 ++$as_echo "$ac_cv_lib_mpc_usconfig" >&6; } ++if test "x$ac_cv_lib_mpc_usconfig" = xyes; then : + + LIBS="$LIBS -lmpc" + +@@ -12229,36 +11168,34 @@ fi + if test "$posix_threads" = "yes"; then + if test "$unistd_defines_pthreads" = "no"; then + +-printf "%s\n" "#define _POSIX_THREADS 1" >>confdefs.h ++$as_echo "#define _POSIX_THREADS 1" >>confdefs.h + + fi + + # Bug 662787: Using semaphores causes unexplicable hangs on Solaris 8. + case $ac_sys_system/$ac_sys_release in + SunOS/5.6) +-printf "%s\n" "#define HAVE_PTHREAD_DESTRUCTOR 1" >>confdefs.h ++$as_echo "#define HAVE_PTHREAD_DESTRUCTOR 1" >>confdefs.h + + ;; + SunOS/5.8) +-printf "%s\n" "#define HAVE_BROKEN_POSIX_SEMAPHORES 1" >>confdefs.h ++$as_echo "#define HAVE_BROKEN_POSIX_SEMAPHORES 1" >>confdefs.h + + ;; + AIX/*) +-printf "%s\n" "#define HAVE_BROKEN_POSIX_SEMAPHORES 1" >>confdefs.h ++$as_echo "#define HAVE_BROKEN_POSIX_SEMAPHORES 1" >>confdefs.h + + ;; + esac + +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if PTHREAD_SCOPE_SYSTEM is supported" >&5 +-printf %s "checking if PTHREAD_SCOPE_SYSTEM is supported... " >&6; } +- if test ${ac_cv_pthread_system_supported+y} +-then : +- printf %s "(cached) " >&6 +-else $as_nop +- if test "$cross_compiling" = yes +-then : ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if PTHREAD_SCOPE_SYSTEM is supported" >&5 ++$as_echo_n "checking if PTHREAD_SCOPE_SYSTEM is supported... " >&6; } ++ if ${ac_cv_pthread_system_supported+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test "$cross_compiling" = yes; then : + ac_cv_pthread_system_supported=no +-else $as_nop ++else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -12276,10 +11213,9 @@ else $as_nop + return (0); + } + _ACEOF +-if ac_fn_c_try_run "$LINENO" +-then : ++if ac_fn_c_try_run "$LINENO"; then : + ac_cv_pthread_system_supported=yes +-else $as_nop ++else + ac_cv_pthread_system_supported=no + fi + rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ +@@ -12289,61 +11225,64 @@ fi + + fi + +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_pthread_system_supported" >&5 +-printf "%s\n" "$ac_cv_pthread_system_supported" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_pthread_system_supported" >&5 ++$as_echo "$ac_cv_pthread_system_supported" >&6; } + if test "$ac_cv_pthread_system_supported" = "yes"; then + +-printf "%s\n" "#define PTHREAD_SYSTEM_SCHED_SUPPORTED 1" >>confdefs.h ++$as_echo "#define PTHREAD_SYSTEM_SCHED_SUPPORTED 1" >>confdefs.h + + fi +- +- for ac_func in pthread_sigmask ++ for ac_func in pthread_sigmask + do : + ac_fn_c_check_func "$LINENO" "pthread_sigmask" "ac_cv_func_pthread_sigmask" +-if test "x$ac_cv_func_pthread_sigmask" = xyes +-then : +- printf "%s\n" "#define HAVE_PTHREAD_SIGMASK 1" >>confdefs.h ++if test "x$ac_cv_func_pthread_sigmask" = xyes; then : ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_PTHREAD_SIGMASK 1 ++_ACEOF + case $ac_sys_system in + CYGWIN*) + +-printf "%s\n" "#define HAVE_BROKEN_PTHREAD_SIGMASK 1" >>confdefs.h ++$as_echo "#define HAVE_BROKEN_PTHREAD_SIGMASK 1" >>confdefs.h + + ;; + esac + fi +- + done +- ac_fn_c_check_func "$LINENO" "pthread_getcpuclockid" "ac_cv_func_pthread_getcpuclockid" +-if test "x$ac_cv_func_pthread_getcpuclockid" = xyes +-then : +- printf "%s\n" "#define HAVE_PTHREAD_GETCPUCLOCKID 1" >>confdefs.h ++ ++ for ac_func in pthread_getcpuclockid ++do : ++ ac_fn_c_check_func "$LINENO" "pthread_getcpuclockid" "ac_cv_func_pthread_getcpuclockid" ++if test "x$ac_cv_func_pthread_getcpuclockid" = xyes; then : ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_PTHREAD_GETCPUCLOCKID 1 ++_ACEOF + + fi ++done + + fi + + + # Check for enable-ipv6 + +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if --enable-ipv6 is specified" >&5 +-printf %s "checking if --enable-ipv6 is specified... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if --enable-ipv6 is specified" >&5 ++$as_echo_n "checking if --enable-ipv6 is specified... " >&6; } + # Check whether --enable-ipv6 was given. +-if test ${enable_ipv6+y} +-then : ++if test "${enable_ipv6+set}" = set; then : + enableval=$enable_ipv6; case "$enableval" in + no) +- { 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; } + ipv6=no + ;; +- *) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-printf "%s\n" "yes" >&6; } +- printf "%s\n" "#define ENABLE_IPV6 1" >>confdefs.h ++ *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; } ++ $as_echo "#define ENABLE_IPV6 1" >>confdefs.h + + ipv6=yes + ;; + esac +-else $as_nop ++else + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +@@ -12351,39 +11290,38 @@ else $as_nop + #include + #include + int +-main (void) ++main () + { + int domain = AF_INET6; + ; + return 0; + } + _ACEOF +-if ac_fn_c_try_compile "$LINENO" +-then : ++if ac_fn_c_try_compile "$LINENO"; 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; } + ipv6=yes + +-else $as_nop ++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; } + ipv6=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 + + if test "$ipv6" = "yes"; then +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if RFC2553 API is available" >&5 +-printf %s "checking if RFC2553 API is available... " >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if RFC2553 API is available" >&5 ++$as_echo_n "checking if RFC2553 API is available... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include + #include + int +-main (void) ++main () + { + struct sockaddr_in6 x; + x.sin6_scope_id; +@@ -12392,25 +11330,24 @@ struct sockaddr_in6 x; + } + + _ACEOF +-if ac_fn_c_try_compile "$LINENO" +-then : ++if ac_fn_c_try_compile "$LINENO"; 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; } + ipv6=yes + +-else $as_nop ++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; } + ipv6=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 + + if test "$ipv6" = "yes"; then +- printf "%s\n" "#define ENABLE_IPV6 1" >>confdefs.h ++ $as_echo "#define ENABLE_IPV6 1" >>confdefs.h + + fi + +@@ -12422,8 +11359,8 @@ ipv6lib=none + ipv6trylibc=no + + if test "$ipv6" = "yes"; then +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking ipv6 stack type" >&5 +-printf %s "checking ipv6 stack type... " >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking ipv6 stack type" >&5 ++$as_echo_n "checking ipv6 stack type... " >&6; } + for i in inria kame linux-glibc linux-inet6 solaris toshiba v6d zeta; + do + case $i in +@@ -12437,11 +11374,10 @@ yes + #endif + _ACEOF + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +- $EGREP "yes" >/dev/null 2>&1 +-then : ++ $EGREP "yes" >/dev/null 2>&1; then : + ipv6type=$i + fi +-rm -rf conftest* ++rm -f conftest* + + ;; + kame) +@@ -12454,14 +11390,13 @@ yes + #endif + _ACEOF + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +- $EGREP "yes" >/dev/null 2>&1 +-then : ++ $EGREP "yes" >/dev/null 2>&1; then : + ipv6type=$i; + ipv6lib=inet6 + ipv6libdir=/usr/local/v6/lib + ipv6trylibc=yes + fi +-rm -rf conftest* ++rm -f conftest* + + ;; + linux-glibc) +@@ -12474,12 +11409,11 @@ yes + #endif + _ACEOF + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +- $EGREP "yes" >/dev/null 2>&1 +-then : ++ $EGREP "yes" >/dev/null 2>&1; then : + ipv6type=$i; + ipv6trylibc=yes + fi +-rm -rf conftest* ++rm -f conftest* + + ;; + linux-inet6) +@@ -12508,13 +11442,12 @@ yes + #endif + _ACEOF + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +- $EGREP "yes" >/dev/null 2>&1 +-then : ++ $EGREP "yes" >/dev/null 2>&1; then : + ipv6type=$i; + ipv6lib=inet6; + ipv6libdir=/usr/local/v6/lib + fi +-rm -rf conftest* ++rm -f conftest* + + ;; + v6d) +@@ -12527,14 +11460,13 @@ yes + #endif + _ACEOF + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +- $EGREP "yes" >/dev/null 2>&1 +-then : ++ $EGREP "yes" >/dev/null 2>&1; then : + ipv6type=$i; + ipv6lib=v6; + ipv6libdir=/usr/local/v6/lib; + BASECFLAGS="-I/usr/local/v6/include $BASECFLAGS" + fi +-rm -rf conftest* ++rm -f conftest* + + ;; + zeta) +@@ -12547,13 +11479,12 @@ yes + #endif + _ACEOF + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +- $EGREP "yes" >/dev/null 2>&1 +-then : ++ $EGREP "yes" >/dev/null 2>&1; then : + ipv6type=$i; + ipv6lib=inet6; + ipv6libdir=/usr/local/v6/lib + fi +-rm -rf conftest* ++rm -f conftest* + + ;; + esac +@@ -12561,8 +11492,8 @@ rm -rf conftest* + break + fi + done +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ipv6type" >&5 +-printf "%s\n" "$ipv6type" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ipv6type" >&5 ++$as_echo "$ipv6type" >&6; } + fi + + if test "$ipv6" = "yes" -a "$ipv6lib" != "none"; then +@@ -12581,1633 +11512,591 @@ if test "$ipv6" = "yes" -a "$ipv6lib" != "none"; then + fi + fi + +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for CAN_RAW_FD_FRAMES" >&5 +-printf %s "checking for CAN_RAW_FD_FRAMES... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CAN_RAW_FD_FRAMES" >&5 ++$as_echo_n "checking for CAN_RAW_FD_FRAMES... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + /* CAN_RAW_FD_FRAMES available check */ + #include + int +-main (void) ++main () + { + int can_raw_fd_frames = CAN_RAW_FD_FRAMES; + ; + return 0; + } + _ACEOF +-if ac_fn_c_try_compile "$LINENO" +-then : ++if ac_fn_c_try_compile "$LINENO"; then : + + +-printf "%s\n" "#define HAVE_LINUX_CAN_RAW_FD_FRAMES 1" >>confdefs.h ++$as_echo "#define HAVE_LINUX_CAN_RAW_FD_FRAMES 1" >>confdefs.h + +- { 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_nop ++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 +-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for CAN_RAW_JOIN_FILTERS" >&5 +-printf %s "checking for CAN_RAW_JOIN_FILTERS... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CAN_RAW_JOIN_FILTERS" >&5 ++$as_echo_n "checking for CAN_RAW_JOIN_FILTERS... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include + int +-main (void) ++main () + { + int can_raw_join_filters = CAN_RAW_JOIN_FILTERS; + ; + return 0; + } + _ACEOF +-if ac_fn_c_try_compile "$LINENO" +-then : +- +- +-printf "%s\n" "#define HAVE_LINUX_CAN_RAW_JOIN_FILTERS 1" >>confdefs.h +- +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-printf "%s\n" "yes" >&6; } +- +-else $as_nop +- +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-printf "%s\n" "no" >&6; } +- +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +- +-# Check for --with-doc-strings +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for --with-doc-strings" >&5 +-printf %s "checking for --with-doc-strings... " >&6; } +- +-# Check whether --with-doc-strings was given. +-if test ${with_doc_strings+y} +-then : +- withval=$with_doc_strings; +-fi +- +- +-if test -z "$with_doc_strings" +-then with_doc_strings="yes" +-fi +-if test "$with_doc_strings" != "no" +-then +- +-printf "%s\n" "#define WITH_DOC_STRINGS 1" >>confdefs.h +- +-fi +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_doc_strings" >&5 +-printf "%s\n" "$with_doc_strings" >&6; } +- +-# Check for Python-specific malloc support +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for --with-pymalloc" >&5 +-printf %s "checking for --with-pymalloc... " >&6; } +- +-# Check whether --with-pymalloc was given. +-if test ${with_pymalloc+y} +-then : +- withval=$with_pymalloc; +-fi +- +- +-if test -z "$with_pymalloc" +-then +- with_pymalloc="yes" +-fi +-if test "$with_pymalloc" != "no" +-then +- +-printf "%s\n" "#define WITH_PYMALLOC 1" >>confdefs.h +- +-fi +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_pymalloc" >&5 +-printf "%s\n" "$with_pymalloc" >&6; } +- +-# Check for --with-c-locale-coercion +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for --with-c-locale-coercion" >&5 +-printf %s "checking for --with-c-locale-coercion... " >&6; } +- +-# Check whether --with-c-locale-coercion was given. +-if test ${with_c_locale_coercion+y} +-then : +- withval=$with_c_locale_coercion; +-fi +- +- +-if test -z "$with_c_locale_coercion" +-then +- with_c_locale_coercion="yes" +-fi +-if test "$with_c_locale_coercion" != "no" +-then +- +-printf "%s\n" "#define PY_COERCE_C_LOCALE 1" >>confdefs.h +- +-fi +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_c_locale_coercion" >&5 +-printf "%s\n" "$with_c_locale_coercion" >&6; } +- +-# Check for Valgrind support +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for --with-valgrind" >&5 +-printf %s "checking for --with-valgrind... " >&6; } +- +-# Check whether --with-valgrind was given. +-if test ${with_valgrind+y} +-then : +- withval=$with_valgrind; +-else $as_nop +- with_valgrind=no +-fi +- +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_valgrind" >&5 +-printf "%s\n" "$with_valgrind" >&6; } +-if test "$with_valgrind" != no; then +- ac_fn_c_check_header_compile "$LINENO" "valgrind/valgrind.h" "ac_cv_header_valgrind_valgrind_h" "$ac_includes_default" +-if test "x$ac_cv_header_valgrind_valgrind_h" = xyes +-then : +- +-printf "%s\n" "#define WITH_VALGRIND 1" >>confdefs.h +- +-else $as_nop +- as_fn_error $? "Valgrind support requested but headers not available" "$LINENO" 5 +- +-fi +- +- OPT="-DDYNAMIC_ANNOTATIONS_ENABLED=1 $OPT" +-fi +- +-# Check for DTrace support +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for --with-dtrace" >&5 +-printf %s "checking for --with-dtrace... " >&6; } +- +-# Check whether --with-dtrace was given. +-if test ${with_dtrace+y} +-then : +- withval=$with_dtrace; +-else $as_nop +- with_dtrace=no +-fi +- +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_dtrace" >&5 +-printf "%s\n" "$with_dtrace" >&6; } +- +- +- +- +- +-DTRACE= +-DTRACE_HEADERS= +-DTRACE_OBJS= +- +-if test "$with_dtrace" = "yes" +-then +- # Extract the first word of "dtrace", so it can be a program name with args. +-set dummy dtrace; 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_DTRACE+y} +-then : +- printf %s "(cached) " >&6 +-else $as_nop +- case $DTRACE in +- [\\/]* | ?:[\\/]*) +- ac_cv_path_DTRACE="$DTRACE" # Let the user override the test with a path. +- ;; +- *) +- 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_path_DTRACE="$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 +-done +- done +-IFS=$as_save_IFS +- +- test -z "$ac_cv_path_DTRACE" && ac_cv_path_DTRACE="not found" +- ;; +-esac +-fi +-DTRACE=$ac_cv_path_DTRACE +-if test -n "$DTRACE"; then +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DTRACE" >&5 +-printf "%s\n" "$DTRACE" >&6; } +-else +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-printf "%s\n" "no" >&6; } +-fi +- +- +- if test "$DTRACE" = "not found"; then +- as_fn_error $? "dtrace command not found on \$PATH" "$LINENO" 5 +- fi +- +-printf "%s\n" "#define WITH_DTRACE 1" >>confdefs.h +- +- DTRACE_HEADERS="Include/pydtrace_probes.h" +- +- # On OS X, DTrace providers do not need to be explicitly compiled and +- # linked into the binary. Correspondingly, dtrace(1) is missing the ELF +- # generation flag '-G'. We check for presence of this flag, rather than +- # hardcoding support by OS, in the interest of robustness. +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether DTrace probes require linking" >&5 +-printf %s "checking whether DTrace probes require linking... " >&6; } +-if test ${ac_cv_dtrace_link+y} +-then : +- printf %s "(cached) " >&6 +-else $as_nop +- ac_cv_dtrace_link=no +- echo 'BEGIN{}' > conftest.d +- "$DTRACE" $DFLAGS -G -s conftest.d -o conftest.o > /dev/null 2>&1 && \ +- ac_cv_dtrace_link=yes +- +-fi +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_dtrace_link" >&5 +-printf "%s\n" "$ac_cv_dtrace_link" >&6; } +- if test "$ac_cv_dtrace_link" = "yes"; then +- DTRACE_OBJS="Python/pydtrace.o" +- fi +-fi +- +-# -I${DLINCLDIR} is added to the compile rule for importdl.o +- +-DLINCLDIR=. +- +-# the dlopen() function means we might want to use dynload_shlib.o. some +-# platforms have dlopen(), but don't want to use it. +-ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen" +-if test "x$ac_cv_func_dlopen" = xyes +-then : +- printf "%s\n" "#define HAVE_DLOPEN 1" >>confdefs.h +- +-fi +- +- +-# DYNLOADFILE specifies which dynload_*.o file we will use for dynamic +-# loading of modules. +- +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking DYNLOADFILE" >&5 +-printf %s "checking DYNLOADFILE... " >&6; } +-if test -z "$DYNLOADFILE" +-then +- case $ac_sys_system/$ac_sys_release in +- hp*|HP*) DYNLOADFILE="dynload_hpux.o";; +- *) +- # use dynload_shlib.c and dlopen() if we have it; otherwise stub +- # out any dynamic loading +- if test "$ac_cv_func_dlopen" = yes +- then DYNLOADFILE="dynload_shlib.o" +- else DYNLOADFILE="dynload_stub.o" +- fi +- ;; +- esac +-fi +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DYNLOADFILE" >&5 +-printf "%s\n" "$DYNLOADFILE" >&6; } +-if test "$DYNLOADFILE" != "dynload_stub.o" +-then +- +-printf "%s\n" "#define HAVE_DYNAMIC_LOADING 1" >>confdefs.h +- +-fi +- +-# MACHDEP_OBJS can be set to platform-specific object files needed by Python +- +- +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking MACHDEP_OBJS" >&5 +-printf %s "checking MACHDEP_OBJS... " >&6; } +-if test -z "$MACHDEP_OBJS" +-then +- MACHDEP_OBJS=$extra_machdep_objs +-else +- MACHDEP_OBJS="$MACHDEP_OBJS $extra_machdep_objs" +-fi +-if test -z "$MACHDEP_OBJS"; then +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none" >&5 +-printf "%s\n" "none" >&6; } +-else +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MACHDEP_OBJS" >&5 +-printf "%s\n" "$MACHDEP_OBJS" >&6; } +-fi +- +-# checks for library functions +-ac_fn_c_check_func "$LINENO" "alarm" "ac_cv_func_alarm" +-if test "x$ac_cv_func_alarm" = xyes +-then : +- printf "%s\n" "#define HAVE_ALARM 1" >>confdefs.h +- +-fi +-ac_fn_c_check_func "$LINENO" "accept4" "ac_cv_func_accept4" +-if test "x$ac_cv_func_accept4" = xyes +-then : +- printf "%s\n" "#define HAVE_ACCEPT4 1" >>confdefs.h +- +-fi +-ac_fn_c_check_func "$LINENO" "setitimer" "ac_cv_func_setitimer" +-if test "x$ac_cv_func_setitimer" = xyes +-then : +- printf "%s\n" "#define HAVE_SETITIMER 1" >>confdefs.h +- +-fi +-ac_fn_c_check_func "$LINENO" "getitimer" "ac_cv_func_getitimer" +-if test "x$ac_cv_func_getitimer" = xyes +-then : +- printf "%s\n" "#define HAVE_GETITIMER 1" >>confdefs.h +- +-fi +-ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset" +-if test "x$ac_cv_func_bind_textdomain_codeset" = xyes +-then : +- printf "%s\n" "#define HAVE_BIND_TEXTDOMAIN_CODESET 1" >>confdefs.h +- +-fi +-ac_fn_c_check_func "$LINENO" "chown" "ac_cv_func_chown" +-if test "x$ac_cv_func_chown" = xyes +-then : +- printf "%s\n" "#define HAVE_CHOWN 1" >>confdefs.h +- +-fi +-ac_fn_c_check_func "$LINENO" "clock" "ac_cv_func_clock" +-if test "x$ac_cv_func_clock" = xyes +-then : +- printf "%s\n" "#define HAVE_CLOCK 1" >>confdefs.h +- +-fi +-ac_fn_c_check_func "$LINENO" "confstr" "ac_cv_func_confstr" +-if test "x$ac_cv_func_confstr" = xyes +-then : +- printf "%s\n" "#define HAVE_CONFSTR 1" >>confdefs.h +- +-fi +-ac_fn_c_check_func "$LINENO" "close_range" "ac_cv_func_close_range" +-if test "x$ac_cv_func_close_range" = xyes +-then : +- printf "%s\n" "#define HAVE_CLOSE_RANGE 1" >>confdefs.h +- +-fi +-ac_fn_c_check_func "$LINENO" "copy_file_range" "ac_cv_func_copy_file_range" +-if test "x$ac_cv_func_copy_file_range" = xyes +-then : +- printf "%s\n" "#define HAVE_COPY_FILE_RANGE 1" >>confdefs.h +- +-fi +-ac_fn_c_check_func "$LINENO" "ctermid" "ac_cv_func_ctermid" +-if test "x$ac_cv_func_ctermid" = xyes +-then : +- printf "%s\n" "#define HAVE_CTERMID 1" >>confdefs.h +- +-fi +-ac_fn_c_check_func "$LINENO" "dup3" "ac_cv_func_dup3" +-if test "x$ac_cv_func_dup3" = xyes +-then : +- printf "%s\n" "#define HAVE_DUP3 1" >>confdefs.h +- +-fi +-ac_fn_c_check_func "$LINENO" "execv" "ac_cv_func_execv" +-if test "x$ac_cv_func_execv" = xyes +-then : +- printf "%s\n" "#define HAVE_EXECV 1" >>confdefs.h +- +-fi +-ac_fn_c_check_func "$LINENO" "explicit_bzero" "ac_cv_func_explicit_bzero" +-if test "x$ac_cv_func_explicit_bzero" = xyes +-then : +- printf "%s\n" "#define HAVE_EXPLICIT_BZERO 1" >>confdefs.h +- +-fi +-ac_fn_c_check_func "$LINENO" "explicit_memset" "ac_cv_func_explicit_memset" +-if test "x$ac_cv_func_explicit_memset" = xyes +-then : +- printf "%s\n" "#define HAVE_EXPLICIT_MEMSET 1" >>confdefs.h +- +-fi +-ac_fn_c_check_func "$LINENO" "faccessat" "ac_cv_func_faccessat" +-if test "x$ac_cv_func_faccessat" = xyes +-then : +- printf "%s\n" "#define HAVE_FACCESSAT 1" >>confdefs.h +- +-fi +-ac_fn_c_check_func "$LINENO" "fchmod" "ac_cv_func_fchmod" +-if test "x$ac_cv_func_fchmod" = xyes +-then : +- printf "%s\n" "#define HAVE_FCHMOD 1" >>confdefs.h +- +-fi +-ac_fn_c_check_func "$LINENO" "fchmodat" "ac_cv_func_fchmodat" +-if test "x$ac_cv_func_fchmodat" = xyes +-then : +- printf "%s\n" "#define HAVE_FCHMODAT 1" >>confdefs.h +- +-fi +-ac_fn_c_check_func "$LINENO" "fchown" "ac_cv_func_fchown" +-if test "x$ac_cv_func_fchown" = xyes +-then : +- printf "%s\n" "#define HAVE_FCHOWN 1" >>confdefs.h +- +-fi +-ac_fn_c_check_func "$LINENO" "fchownat" "ac_cv_func_fchownat" +-if test "x$ac_cv_func_fchownat" = xyes +-then : +- printf "%s\n" "#define HAVE_FCHOWNAT 1" >>confdefs.h +- +-fi +-ac_fn_c_check_func "$LINENO" "fdwalk" "ac_cv_func_fdwalk" +-if test "x$ac_cv_func_fdwalk" = xyes +-then : +- printf "%s\n" "#define HAVE_FDWALK 1" >>confdefs.h +- +-fi +-ac_fn_c_check_func "$LINENO" "fexecve" "ac_cv_func_fexecve" +-if test "x$ac_cv_func_fexecve" = xyes +-then : +- printf "%s\n" "#define HAVE_FEXECVE 1" >>confdefs.h +- +-fi +-ac_fn_c_check_func "$LINENO" "fdopendir" "ac_cv_func_fdopendir" +-if test "x$ac_cv_func_fdopendir" = xyes +-then : +- printf "%s\n" "#define HAVE_FDOPENDIR 1" >>confdefs.h +- +-fi +-ac_fn_c_check_func "$LINENO" "fork" "ac_cv_func_fork" +-if test "x$ac_cv_func_fork" = xyes +-then : +- printf "%s\n" "#define HAVE_FORK 1" >>confdefs.h +- +-fi +-ac_fn_c_check_func "$LINENO" "fpathconf" "ac_cv_func_fpathconf" +-if test "x$ac_cv_func_fpathconf" = xyes +-then : +- printf "%s\n" "#define HAVE_FPATHCONF 1" >>confdefs.h +- +-fi +-ac_fn_c_check_func "$LINENO" "fstatat" "ac_cv_func_fstatat" +-if test "x$ac_cv_func_fstatat" = xyes +-then : +- printf "%s\n" "#define HAVE_FSTATAT 1" >>confdefs.h +- +-fi +-ac_fn_c_check_func "$LINENO" "ftime" "ac_cv_func_ftime" +-if test "x$ac_cv_func_ftime" = xyes +-then : +- printf "%s\n" "#define HAVE_FTIME 1" >>confdefs.h +- +-fi +-ac_fn_c_check_func "$LINENO" "ftruncate" "ac_cv_func_ftruncate" +-if test "x$ac_cv_func_ftruncate" = xyes +-then : +- printf "%s\n" "#define HAVE_FTRUNCATE 1" >>confdefs.h +- +-fi +-ac_fn_c_check_func "$LINENO" "futimesat" "ac_cv_func_futimesat" +-if test "x$ac_cv_func_futimesat" = xyes +-then : +- printf "%s\n" "#define HAVE_FUTIMESAT 1" >>confdefs.h +- +-fi +-ac_fn_c_check_func "$LINENO" "futimens" "ac_cv_func_futimens" +-if test "x$ac_cv_func_futimens" = xyes +-then : +- printf "%s\n" "#define HAVE_FUTIMENS 1" >>confdefs.h +- +-fi +-ac_fn_c_check_func "$LINENO" "futimes" "ac_cv_func_futimes" +-if test "x$ac_cv_func_futimes" = xyes +-then : +- printf "%s\n" "#define HAVE_FUTIMES 1" >>confdefs.h +- +-fi +-ac_fn_c_check_func "$LINENO" "gai_strerror" "ac_cv_func_gai_strerror" +-if test "x$ac_cv_func_gai_strerror" = xyes +-then : +- printf "%s\n" "#define HAVE_GAI_STRERROR 1" >>confdefs.h +- +-fi +-ac_fn_c_check_func "$LINENO" "getentropy" "ac_cv_func_getentropy" +-if test "x$ac_cv_func_getentropy" = xyes +-then : +- printf "%s\n" "#define HAVE_GETENTROPY 1" >>confdefs.h +- +-fi +-ac_fn_c_check_func "$LINENO" "getgrgid_r" "ac_cv_func_getgrgid_r" +-if test "x$ac_cv_func_getgrgid_r" = xyes +-then : +- printf "%s\n" "#define HAVE_GETGRGID_R 1" >>confdefs.h +- +-fi +-ac_fn_c_check_func "$LINENO" "getgrnam_r" "ac_cv_func_getgrnam_r" +-if test "x$ac_cv_func_getgrnam_r" = xyes +-then : +- printf "%s\n" "#define HAVE_GETGRNAM_R 1" >>confdefs.h +- +-fi +-ac_fn_c_check_func "$LINENO" "getgrouplist" "ac_cv_func_getgrouplist" +-if test "x$ac_cv_func_getgrouplist" = xyes +-then : +- printf "%s\n" "#define HAVE_GETGROUPLIST 1" >>confdefs.h +- +-fi +-ac_fn_c_check_func "$LINENO" "getgroups" "ac_cv_func_getgroups" +-if test "x$ac_cv_func_getgroups" = xyes +-then : +- printf "%s\n" "#define HAVE_GETGROUPS 1" >>confdefs.h +- +-fi +-ac_fn_c_check_func "$LINENO" "getlogin" "ac_cv_func_getlogin" +-if test "x$ac_cv_func_getlogin" = xyes +-then : +- printf "%s\n" "#define HAVE_GETLOGIN 1" >>confdefs.h +- +-fi +-ac_fn_c_check_func "$LINENO" "getloadavg" "ac_cv_func_getloadavg" +-if test "x$ac_cv_func_getloadavg" = xyes +-then : +- printf "%s\n" "#define HAVE_GETLOADAVG 1" >>confdefs.h +- +-fi +-ac_fn_c_check_func "$LINENO" "getpeername" "ac_cv_func_getpeername" +-if test "x$ac_cv_func_getpeername" = xyes +-then : +- printf "%s\n" "#define HAVE_GETPEERNAME 1" >>confdefs.h +- +-fi +-ac_fn_c_check_func "$LINENO" "getpgid" "ac_cv_func_getpgid" +-if test "x$ac_cv_func_getpgid" = xyes +-then : +- printf "%s\n" "#define HAVE_GETPGID 1" >>confdefs.h +- +-fi +-ac_fn_c_check_func "$LINENO" "getpid" "ac_cv_func_getpid" +-if test "x$ac_cv_func_getpid" = xyes +-then : +- printf "%s\n" "#define HAVE_GETPID 1" >>confdefs.h +- +-fi +-ac_fn_c_check_func "$LINENO" "getpriority" "ac_cv_func_getpriority" +-if test "x$ac_cv_func_getpriority" = xyes +-then : +- printf "%s\n" "#define HAVE_GETPRIORITY 1" >>confdefs.h +- +-fi +-ac_fn_c_check_func "$LINENO" "getresuid" "ac_cv_func_getresuid" +-if test "x$ac_cv_func_getresuid" = xyes +-then : +- printf "%s\n" "#define HAVE_GETRESUID 1" >>confdefs.h +- +-fi +-ac_fn_c_check_func "$LINENO" "getresgid" "ac_cv_func_getresgid" +-if test "x$ac_cv_func_getresgid" = xyes +-then : +- printf "%s\n" "#define HAVE_GETRESGID 1" >>confdefs.h +- +-fi +-ac_fn_c_check_func "$LINENO" "getpwent" "ac_cv_func_getpwent" +-if test "x$ac_cv_func_getpwent" = xyes +-then : +- printf "%s\n" "#define HAVE_GETPWENT 1" >>confdefs.h +- +-fi +-ac_fn_c_check_func "$LINENO" "getpwnam_r" "ac_cv_func_getpwnam_r" +-if test "x$ac_cv_func_getpwnam_r" = xyes +-then : +- printf "%s\n" "#define HAVE_GETPWNAM_R 1" >>confdefs.h +- +-fi +-ac_fn_c_check_func "$LINENO" "getpwuid_r" "ac_cv_func_getpwuid_r" +-if test "x$ac_cv_func_getpwuid_r" = xyes +-then : +- printf "%s\n" "#define HAVE_GETPWUID_R 1" >>confdefs.h +- +-fi +-ac_fn_c_check_func "$LINENO" "getspnam" "ac_cv_func_getspnam" +-if test "x$ac_cv_func_getspnam" = xyes +-then : +- printf "%s\n" "#define HAVE_GETSPNAM 1" >>confdefs.h +- +-fi +-ac_fn_c_check_func "$LINENO" "getspent" "ac_cv_func_getspent" +-if test "x$ac_cv_func_getspent" = xyes +-then : +- printf "%s\n" "#define HAVE_GETSPENT 1" >>confdefs.h +- +-fi +-ac_fn_c_check_func "$LINENO" "getsid" "ac_cv_func_getsid" +-if test "x$ac_cv_func_getsid" = xyes +-then : +- printf "%s\n" "#define HAVE_GETSID 1" >>confdefs.h +- +-fi +-ac_fn_c_check_func "$LINENO" "getwd" "ac_cv_func_getwd" +-if test "x$ac_cv_func_getwd" = xyes +-then : +- printf "%s\n" "#define HAVE_GETWD 1" >>confdefs.h +- +-fi +-ac_fn_c_check_func "$LINENO" "if_nameindex" "ac_cv_func_if_nameindex" +-if test "x$ac_cv_func_if_nameindex" = xyes +-then : +- printf "%s\n" "#define HAVE_IF_NAMEINDEX 1" >>confdefs.h +- +-fi +-ac_fn_c_check_func "$LINENO" "initgroups" "ac_cv_func_initgroups" +-if test "x$ac_cv_func_initgroups" = xyes +-then : +- printf "%s\n" "#define HAVE_INITGROUPS 1" >>confdefs.h +- +-fi +-ac_fn_c_check_func "$LINENO" "kill" "ac_cv_func_kill" +-if test "x$ac_cv_func_kill" = xyes +-then : +- printf "%s\n" "#define HAVE_KILL 1" >>confdefs.h +- +-fi +-ac_fn_c_check_func "$LINENO" "killpg" "ac_cv_func_killpg" +-if test "x$ac_cv_func_killpg" = xyes +-then : +- printf "%s\n" "#define HAVE_KILLPG 1" >>confdefs.h +- +-fi +-ac_fn_c_check_func "$LINENO" "lchown" "ac_cv_func_lchown" +-if test "x$ac_cv_func_lchown" = xyes +-then : +- printf "%s\n" "#define HAVE_LCHOWN 1" >>confdefs.h +- +-fi +-ac_fn_c_check_func "$LINENO" "lockf" "ac_cv_func_lockf" +-if test "x$ac_cv_func_lockf" = xyes +-then : +- printf "%s\n" "#define HAVE_LOCKF 1" >>confdefs.h +- +-fi +-ac_fn_c_check_func "$LINENO" "linkat" "ac_cv_func_linkat" +-if test "x$ac_cv_func_linkat" = xyes +-then : +- printf "%s\n" "#define HAVE_LINKAT 1" >>confdefs.h +- +-fi +-ac_fn_c_check_func "$LINENO" "lstat" "ac_cv_func_lstat" +-if test "x$ac_cv_func_lstat" = xyes +-then : +- printf "%s\n" "#define HAVE_LSTAT 1" >>confdefs.h +- +-fi +-ac_fn_c_check_func "$LINENO" "lutimes" "ac_cv_func_lutimes" +-if test "x$ac_cv_func_lutimes" = xyes +-then : +- printf "%s\n" "#define HAVE_LUTIMES 1" >>confdefs.h +- +-fi +-ac_fn_c_check_func "$LINENO" "mmap" "ac_cv_func_mmap" +-if test "x$ac_cv_func_mmap" = xyes +-then : +- printf "%s\n" "#define HAVE_MMAP 1" >>confdefs.h +- +-fi +-ac_fn_c_check_func "$LINENO" "memrchr" "ac_cv_func_memrchr" +-if test "x$ac_cv_func_memrchr" = xyes +-then : +- printf "%s\n" "#define HAVE_MEMRCHR 1" >>confdefs.h +- +-fi +-ac_fn_c_check_func "$LINENO" "mbrtowc" "ac_cv_func_mbrtowc" +-if test "x$ac_cv_func_mbrtowc" = xyes +-then : +- printf "%s\n" "#define HAVE_MBRTOWC 1" >>confdefs.h +- +-fi +-ac_fn_c_check_func "$LINENO" "mkdirat" "ac_cv_func_mkdirat" +-if test "x$ac_cv_func_mkdirat" = xyes +-then : +- printf "%s\n" "#define HAVE_MKDIRAT 1" >>confdefs.h +- +-fi +-ac_fn_c_check_func "$LINENO" "mkfifo" "ac_cv_func_mkfifo" +-if test "x$ac_cv_func_mkfifo" = xyes +-then : +- printf "%s\n" "#define HAVE_MKFIFO 1" >>confdefs.h +- +-fi +-ac_fn_c_check_func "$LINENO" "madvise" "ac_cv_func_madvise" +-if test "x$ac_cv_func_madvise" = xyes +-then : +- printf "%s\n" "#define HAVE_MADVISE 1" >>confdefs.h +- +-fi +-ac_fn_c_check_func "$LINENO" "mkfifoat" "ac_cv_func_mkfifoat" +-if test "x$ac_cv_func_mkfifoat" = xyes +-then : +- printf "%s\n" "#define HAVE_MKFIFOAT 1" >>confdefs.h +- +-fi +-ac_fn_c_check_func "$LINENO" "mknod" "ac_cv_func_mknod" +-if test "x$ac_cv_func_mknod" = xyes +-then : +- printf "%s\n" "#define HAVE_MKNOD 1" >>confdefs.h +- +-fi +-ac_fn_c_check_func "$LINENO" "mknodat" "ac_cv_func_mknodat" +-if test "x$ac_cv_func_mknodat" = xyes +-then : +- printf "%s\n" "#define HAVE_MKNODAT 1" >>confdefs.h +- +-fi +-ac_fn_c_check_func "$LINENO" "mktime" "ac_cv_func_mktime" +-if test "x$ac_cv_func_mktime" = xyes +-then : +- printf "%s\n" "#define HAVE_MKTIME 1" >>confdefs.h +- +-fi +-ac_fn_c_check_func "$LINENO" "mremap" "ac_cv_func_mremap" +-if test "x$ac_cv_func_mremap" = xyes +-then : +- printf "%s\n" "#define HAVE_MREMAP 1" >>confdefs.h +- +-fi +-ac_fn_c_check_func "$LINENO" "nice" "ac_cv_func_nice" +-if test "x$ac_cv_func_nice" = xyes +-then : +- printf "%s\n" "#define HAVE_NICE 1" >>confdefs.h +- +-fi +-ac_fn_c_check_func "$LINENO" "openat" "ac_cv_func_openat" +-if test "x$ac_cv_func_openat" = xyes +-then : +- printf "%s\n" "#define HAVE_OPENAT 1" >>confdefs.h +- +-fi +-ac_fn_c_check_func "$LINENO" "pathconf" "ac_cv_func_pathconf" +-if test "x$ac_cv_func_pathconf" = xyes +-then : +- printf "%s\n" "#define HAVE_PATHCONF 1" >>confdefs.h +- +-fi +-ac_fn_c_check_func "$LINENO" "pause" "ac_cv_func_pause" +-if test "x$ac_cv_func_pause" = xyes +-then : +- printf "%s\n" "#define HAVE_PAUSE 1" >>confdefs.h +- +-fi +-ac_fn_c_check_func "$LINENO" "pipe2" "ac_cv_func_pipe2" +-if test "x$ac_cv_func_pipe2" = xyes +-then : +- printf "%s\n" "#define HAVE_PIPE2 1" >>confdefs.h +- +-fi +-ac_fn_c_check_func "$LINENO" "plock" "ac_cv_func_plock" +-if test "x$ac_cv_func_plock" = xyes +-then : +- printf "%s\n" "#define HAVE_PLOCK 1" >>confdefs.h +- +-fi +-ac_fn_c_check_func "$LINENO" "poll" "ac_cv_func_poll" +-if test "x$ac_cv_func_poll" = xyes +-then : +- printf "%s\n" "#define HAVE_POLL 1" >>confdefs.h +- +-fi +-ac_fn_c_check_func "$LINENO" "posix_fallocate" "ac_cv_func_posix_fallocate" +-if test "x$ac_cv_func_posix_fallocate" = xyes +-then : +- printf "%s\n" "#define HAVE_POSIX_FALLOCATE 1" >>confdefs.h +- +-fi +-ac_fn_c_check_func "$LINENO" "posix_fadvise" "ac_cv_func_posix_fadvise" +-if test "x$ac_cv_func_posix_fadvise" = xyes +-then : +- printf "%s\n" "#define HAVE_POSIX_FADVISE 1" >>confdefs.h +- +-fi +-ac_fn_c_check_func "$LINENO" "posix_spawn" "ac_cv_func_posix_spawn" +-if test "x$ac_cv_func_posix_spawn" = xyes +-then : +- printf "%s\n" "#define HAVE_POSIX_SPAWN 1" >>confdefs.h +- +-fi +-ac_fn_c_check_func "$LINENO" "posix_spawnp" "ac_cv_func_posix_spawnp" +-if test "x$ac_cv_func_posix_spawnp" = xyes +-then : +- printf "%s\n" "#define HAVE_POSIX_SPAWNP 1" >>confdefs.h +- +-fi +-ac_fn_c_check_func "$LINENO" "pread" "ac_cv_func_pread" +-if test "x$ac_cv_func_pread" = xyes +-then : +- printf "%s\n" "#define HAVE_PREAD 1" >>confdefs.h +- +-fi +-ac_fn_c_check_func "$LINENO" "preadv" "ac_cv_func_preadv" +-if test "x$ac_cv_func_preadv" = xyes +-then : +- printf "%s\n" "#define HAVE_PREADV 1" >>confdefs.h +- +-fi +-ac_fn_c_check_func "$LINENO" "preadv2" "ac_cv_func_preadv2" +-if test "x$ac_cv_func_preadv2" = xyes +-then : +- printf "%s\n" "#define HAVE_PREADV2 1" >>confdefs.h +- +-fi +-ac_fn_c_check_func "$LINENO" "pthread_condattr_setclock" "ac_cv_func_pthread_condattr_setclock" +-if test "x$ac_cv_func_pthread_condattr_setclock" = xyes +-then : +- printf "%s\n" "#define HAVE_PTHREAD_CONDATTR_SETCLOCK 1" >>confdefs.h +- +-fi +-ac_fn_c_check_func "$LINENO" "pthread_init" "ac_cv_func_pthread_init" +-if test "x$ac_cv_func_pthread_init" = xyes +-then : +- printf "%s\n" "#define HAVE_PTHREAD_INIT 1" >>confdefs.h +- +-fi +-ac_fn_c_check_func "$LINENO" "pthread_kill" "ac_cv_func_pthread_kill" +-if test "x$ac_cv_func_pthread_kill" = xyes +-then : +- printf "%s\n" "#define HAVE_PTHREAD_KILL 1" >>confdefs.h +- +-fi +-ac_fn_c_check_func "$LINENO" "pwrite" "ac_cv_func_pwrite" +-if test "x$ac_cv_func_pwrite" = xyes +-then : +- printf "%s\n" "#define HAVE_PWRITE 1" >>confdefs.h +- +-fi +-ac_fn_c_check_func "$LINENO" "pwritev" "ac_cv_func_pwritev" +-if test "x$ac_cv_func_pwritev" = xyes +-then : +- printf "%s\n" "#define HAVE_PWRITEV 1" >>confdefs.h +- +-fi +-ac_fn_c_check_func "$LINENO" "pwritev2" "ac_cv_func_pwritev2" +-if test "x$ac_cv_func_pwritev2" = xyes +-then : +- printf "%s\n" "#define HAVE_PWRITEV2 1" >>confdefs.h +- +-fi +-ac_fn_c_check_func "$LINENO" "readlink" "ac_cv_func_readlink" +-if test "x$ac_cv_func_readlink" = xyes +-then : +- printf "%s\n" "#define HAVE_READLINK 1" >>confdefs.h +- +-fi +-ac_fn_c_check_func "$LINENO" "readlinkat" "ac_cv_func_readlinkat" +-if test "x$ac_cv_func_readlinkat" = xyes +-then : +- printf "%s\n" "#define HAVE_READLINKAT 1" >>confdefs.h +- +-fi +-ac_fn_c_check_func "$LINENO" "readv" "ac_cv_func_readv" +-if test "x$ac_cv_func_readv" = xyes +-then : +- printf "%s\n" "#define HAVE_READV 1" >>confdefs.h +- +-fi +-ac_fn_c_check_func "$LINENO" "realpath" "ac_cv_func_realpath" +-if test "x$ac_cv_func_realpath" = xyes +-then : +- printf "%s\n" "#define HAVE_REALPATH 1" >>confdefs.h +- +-fi +-ac_fn_c_check_func "$LINENO" "renameat" "ac_cv_func_renameat" +-if test "x$ac_cv_func_renameat" = xyes +-then : +- printf "%s\n" "#define HAVE_RENAMEAT 1" >>confdefs.h +- +-fi +-ac_fn_c_check_func "$LINENO" "sem_open" "ac_cv_func_sem_open" +-if test "x$ac_cv_func_sem_open" = xyes +-then : +- printf "%s\n" "#define HAVE_SEM_OPEN 1" >>confdefs.h +- +-fi +-ac_fn_c_check_func "$LINENO" "sem_timedwait" "ac_cv_func_sem_timedwait" +-if test "x$ac_cv_func_sem_timedwait" = xyes +-then : +- printf "%s\n" "#define HAVE_SEM_TIMEDWAIT 1" >>confdefs.h +- +-fi +-ac_fn_c_check_func "$LINENO" "sem_getvalue" "ac_cv_func_sem_getvalue" +-if test "x$ac_cv_func_sem_getvalue" = xyes +-then : +- printf "%s\n" "#define HAVE_SEM_GETVALUE 1" >>confdefs.h ++if ac_fn_c_try_compile "$LINENO"; then : + +-fi +-ac_fn_c_check_func "$LINENO" "sem_unlink" "ac_cv_func_sem_unlink" +-if test "x$ac_cv_func_sem_unlink" = xyes +-then : +- printf "%s\n" "#define HAVE_SEM_UNLINK 1" >>confdefs.h + +-fi +-ac_fn_c_check_func "$LINENO" "sendfile" "ac_cv_func_sendfile" +-if test "x$ac_cv_func_sendfile" = xyes +-then : +- printf "%s\n" "#define HAVE_SENDFILE 1" >>confdefs.h ++$as_echo "#define HAVE_LINUX_CAN_RAW_JOIN_FILTERS 1" >>confdefs.h + +-fi +-ac_fn_c_check_func "$LINENO" "setegid" "ac_cv_func_setegid" +-if test "x$ac_cv_func_setegid" = xyes +-then : +- printf "%s\n" "#define HAVE_SETEGID 1" >>confdefs.h ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; } + +-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 ++else + +-fi +-ac_fn_c_check_func "$LINENO" "setgid" "ac_cv_func_setgid" +-if test "x$ac_cv_func_setgid" = xyes +-then : +- printf "%s\n" "#define HAVE_SETGID 1" >>confdefs.h ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } + + fi +-ac_fn_c_check_func "$LINENO" "sethostname" "ac_cv_func_sethostname" +-if test "x$ac_cv_func_sethostname" = xyes +-then : +- printf "%s\n" "#define HAVE_SETHOSTNAME 1" >>confdefs.h ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +-fi +-ac_fn_c_check_func "$LINENO" "setlocale" "ac_cv_func_setlocale" +-if test "x$ac_cv_func_setlocale" = xyes +-then : +- printf "%s\n" "#define HAVE_SETLOCALE 1" >>confdefs.h ++# Check for --with-doc-strings ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-doc-strings" >&5 ++$as_echo_n "checking for --with-doc-strings... " >&6; } + ++# Check whether --with-doc-strings was given. ++if test "${with_doc_strings+set}" = set; then : ++ withval=$with_doc_strings; + fi +-ac_fn_c_check_func "$LINENO" "setregid" "ac_cv_func_setregid" +-if test "x$ac_cv_func_setregid" = xyes +-then : +- printf "%s\n" "#define HAVE_SETREGID 1" >>confdefs.h + +-fi +-ac_fn_c_check_func "$LINENO" "setreuid" "ac_cv_func_setreuid" +-if test "x$ac_cv_func_setreuid" = xyes +-then : +- printf "%s\n" "#define HAVE_SETREUID 1" >>confdefs.h + ++if test -z "$with_doc_strings" ++then with_doc_strings="yes" + fi +-ac_fn_c_check_func "$LINENO" "setresuid" "ac_cv_func_setresuid" +-if test "x$ac_cv_func_setresuid" = xyes +-then : +- printf "%s\n" "#define HAVE_SETRESUID 1" >>confdefs.h ++if test "$with_doc_strings" != "no" ++then + +-fi +-ac_fn_c_check_func "$LINENO" "setresgid" "ac_cv_func_setresgid" +-if test "x$ac_cv_func_setresgid" = xyes +-then : +- printf "%s\n" "#define HAVE_SETRESGID 1" >>confdefs.h ++$as_echo "#define WITH_DOC_STRINGS 1" >>confdefs.h + + fi +-ac_fn_c_check_func "$LINENO" "setsid" "ac_cv_func_setsid" +-if test "x$ac_cv_func_setsid" = xyes +-then : +- printf "%s\n" "#define HAVE_SETSID 1" >>confdefs.h ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_doc_strings" >&5 ++$as_echo "$with_doc_strings" >&6; } + +-fi +-ac_fn_c_check_func "$LINENO" "setpgid" "ac_cv_func_setpgid" +-if test "x$ac_cv_func_setpgid" = xyes +-then : +- printf "%s\n" "#define HAVE_SETPGID 1" >>confdefs.h ++# Check for Python-specific malloc support ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-pymalloc" >&5 ++$as_echo_n "checking for --with-pymalloc... " >&6; } + ++# Check whether --with-pymalloc was given. ++if test "${with_pymalloc+set}" = set; then : ++ withval=$with_pymalloc; + fi +-ac_fn_c_check_func "$LINENO" "setpgrp" "ac_cv_func_setpgrp" +-if test "x$ac_cv_func_setpgrp" = xyes +-then : +- printf "%s\n" "#define HAVE_SETPGRP 1" >>confdefs.h + +-fi +-ac_fn_c_check_func "$LINENO" "setpriority" "ac_cv_func_setpriority" +-if test "x$ac_cv_func_setpriority" = xyes +-then : +- printf "%s\n" "#define HAVE_SETPRIORITY 1" >>confdefs.h + ++if test -z "$with_pymalloc" ++then ++ with_pymalloc="yes" + fi +-ac_fn_c_check_func "$LINENO" "setuid" "ac_cv_func_setuid" +-if test "x$ac_cv_func_setuid" = xyes +-then : +- printf "%s\n" "#define HAVE_SETUID 1" >>confdefs.h ++if test "$with_pymalloc" != "no" ++then + +-fi +-ac_fn_c_check_func "$LINENO" "setvbuf" "ac_cv_func_setvbuf" +-if test "x$ac_cv_func_setvbuf" = xyes +-then : +- printf "%s\n" "#define HAVE_SETVBUF 1" >>confdefs.h ++$as_echo "#define WITH_PYMALLOC 1" >>confdefs.h + + fi +-ac_fn_c_check_func "$LINENO" "sched_get_priority_max" "ac_cv_func_sched_get_priority_max" +-if test "x$ac_cv_func_sched_get_priority_max" = xyes +-then : +- printf "%s\n" "#define HAVE_SCHED_GET_PRIORITY_MAX 1" >>confdefs.h ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_pymalloc" >&5 ++$as_echo "$with_pymalloc" >&6; } + +-fi +-ac_fn_c_check_func "$LINENO" "sched_setaffinity" "ac_cv_func_sched_setaffinity" +-if test "x$ac_cv_func_sched_setaffinity" = xyes +-then : +- printf "%s\n" "#define HAVE_SCHED_SETAFFINITY 1" >>confdefs.h ++# Check for --with-c-locale-coercion ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-c-locale-coercion" >&5 ++$as_echo_n "checking for --with-c-locale-coercion... " >&6; } + ++# Check whether --with-c-locale-coercion was given. ++if test "${with_c_locale_coercion+set}" = set; then : ++ withval=$with_c_locale_coercion; + fi +-ac_fn_c_check_func "$LINENO" "sched_setscheduler" "ac_cv_func_sched_setscheduler" +-if test "x$ac_cv_func_sched_setscheduler" = xyes +-then : +- printf "%s\n" "#define HAVE_SCHED_SETSCHEDULER 1" >>confdefs.h + +-fi +-ac_fn_c_check_func "$LINENO" "sched_setparam" "ac_cv_func_sched_setparam" +-if test "x$ac_cv_func_sched_setparam" = xyes +-then : +- printf "%s\n" "#define HAVE_SCHED_SETPARAM 1" >>confdefs.h + ++if test -z "$with_c_locale_coercion" ++then ++ with_c_locale_coercion="yes" + fi +-ac_fn_c_check_func "$LINENO" "sched_rr_get_interval" "ac_cv_func_sched_rr_get_interval" +-if test "x$ac_cv_func_sched_rr_get_interval" = xyes +-then : +- printf "%s\n" "#define HAVE_SCHED_RR_GET_INTERVAL 1" >>confdefs.h ++if test "$with_c_locale_coercion" != "no" ++then + +-fi +-ac_fn_c_check_func "$LINENO" "sigaction" "ac_cv_func_sigaction" +-if test "x$ac_cv_func_sigaction" = xyes +-then : +- printf "%s\n" "#define HAVE_SIGACTION 1" >>confdefs.h ++$as_echo "#define PY_COERCE_C_LOCALE 1" >>confdefs.h + + fi +-ac_fn_c_check_func "$LINENO" "sigaltstack" "ac_cv_func_sigaltstack" +-if test "x$ac_cv_func_sigaltstack" = xyes +-then : +- printf "%s\n" "#define HAVE_SIGALTSTACK 1" >>confdefs.h ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_c_locale_coercion" >&5 ++$as_echo "$with_c_locale_coercion" >&6; } + +-fi +-ac_fn_c_check_func "$LINENO" "sigfillset" "ac_cv_func_sigfillset" +-if test "x$ac_cv_func_sigfillset" = xyes +-then : +- printf "%s\n" "#define HAVE_SIGFILLSET 1" >>confdefs.h ++# Check for Valgrind support ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-valgrind" >&5 ++$as_echo_n "checking for --with-valgrind... " >&6; } + ++# Check whether --with-valgrind was given. ++if test "${with_valgrind+set}" = set; then : ++ withval=$with_valgrind; ++else ++ with_valgrind=no + fi +-ac_fn_c_check_func "$LINENO" "siginterrupt" "ac_cv_func_siginterrupt" +-if test "x$ac_cv_func_siginterrupt" = xyes +-then : +- printf "%s\n" "#define HAVE_SIGINTERRUPT 1" >>confdefs.h + +-fi +-ac_fn_c_check_func "$LINENO" "sigpending" "ac_cv_func_sigpending" +-if test "x$ac_cv_func_sigpending" = xyes +-then : +- printf "%s\n" "#define HAVE_SIGPENDING 1" >>confdefs.h ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_valgrind" >&5 ++$as_echo "$with_valgrind" >&6; } ++if test "$with_valgrind" != no; then ++ ac_fn_c_check_header_mongrel "$LINENO" "valgrind/valgrind.h" "ac_cv_header_valgrind_valgrind_h" "$ac_includes_default" ++if test "x$ac_cv_header_valgrind_valgrind_h" = xyes; then : + +-fi +-ac_fn_c_check_func "$LINENO" "sigrelse" "ac_cv_func_sigrelse" +-if test "x$ac_cv_func_sigrelse" = xyes +-then : +- printf "%s\n" "#define HAVE_SIGRELSE 1" >>confdefs.h ++$as_echo "#define WITH_VALGRIND 1" >>confdefs.h + +-fi +-ac_fn_c_check_func "$LINENO" "sigtimedwait" "ac_cv_func_sigtimedwait" +-if test "x$ac_cv_func_sigtimedwait" = xyes +-then : +- printf "%s\n" "#define HAVE_SIGTIMEDWAIT 1" >>confdefs.h ++else ++ as_fn_error $? "Valgrind support requested but headers not available" "$LINENO" 5 + + fi +-ac_fn_c_check_func "$LINENO" "sigwait" "ac_cv_func_sigwait" +-if test "x$ac_cv_func_sigwait" = xyes +-then : +- printf "%s\n" "#define HAVE_SIGWAIT 1" >>confdefs.h + +-fi +-ac_fn_c_check_func "$LINENO" "sigwaitinfo" "ac_cv_func_sigwaitinfo" +-if test "x$ac_cv_func_sigwaitinfo" = xyes +-then : +- printf "%s\n" "#define HAVE_SIGWAITINFO 1" >>confdefs.h + ++ OPT="-DDYNAMIC_ANNOTATIONS_ENABLED=1 $OPT" + fi +-ac_fn_c_check_func "$LINENO" "snprintf" "ac_cv_func_snprintf" +-if test "x$ac_cv_func_snprintf" = xyes +-then : +- printf "%s\n" "#define HAVE_SNPRINTF 1" >>confdefs.h + +-fi +-ac_fn_c_check_func "$LINENO" "splice" "ac_cv_func_splice" +-if test "x$ac_cv_func_splice" = xyes +-then : +- printf "%s\n" "#define HAVE_SPLICE 1" >>confdefs.h ++# Check for DTrace support ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-dtrace" >&5 ++$as_echo_n "checking for --with-dtrace... " >&6; } + ++# Check whether --with-dtrace was given. ++if test "${with_dtrace+set}" = set; then : ++ withval=$with_dtrace; ++else ++ with_dtrace=no + fi +-ac_fn_c_check_func "$LINENO" "strftime" "ac_cv_func_strftime" +-if test "x$ac_cv_func_strftime" = xyes +-then : +- printf "%s\n" "#define HAVE_STRFTIME 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 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_dtrace" >&5 ++$as_echo "$with_dtrace" >&6; } + +-fi +-ac_fn_c_check_func "$LINENO" "strsignal" "ac_cv_func_strsignal" +-if test "x$ac_cv_func_strsignal" = xyes +-then : +- printf "%s\n" "#define HAVE_STRSIGNAL 1" >>confdefs.h + +-fi +-ac_fn_c_check_func "$LINENO" "symlinkat" "ac_cv_func_symlinkat" +-if test "x$ac_cv_func_symlinkat" = xyes +-then : +- printf "%s\n" "#define HAVE_SYMLINKAT 1" >>confdefs.h + +-fi +-ac_fn_c_check_func "$LINENO" "sync" "ac_cv_func_sync" +-if test "x$ac_cv_func_sync" = xyes +-then : +- printf "%s\n" "#define HAVE_SYNC 1" >>confdefs.h + +-fi +-ac_fn_c_check_func "$LINENO" "sysconf" "ac_cv_func_sysconf" +-if test "x$ac_cv_func_sysconf" = xyes +-then : +- printf "%s\n" "#define HAVE_SYSCONF 1" >>confdefs.h + +-fi +-ac_fn_c_check_func "$LINENO" "tcgetpgrp" "ac_cv_func_tcgetpgrp" +-if test "x$ac_cv_func_tcgetpgrp" = xyes +-then : +- printf "%s\n" "#define HAVE_TCGETPGRP 1" >>confdefs.h ++DTRACE= ++DTRACE_HEADERS= ++DTRACE_OBJS= + +-fi +-ac_fn_c_check_func "$LINENO" "tcsetpgrp" "ac_cv_func_tcsetpgrp" +-if test "x$ac_cv_func_tcsetpgrp" = xyes +-then : +- printf "%s\n" "#define HAVE_TCSETPGRP 1" >>confdefs.h ++if test "$with_dtrace" = "yes" ++then ++ # Extract the first word of "dtrace", so it can be a program name with args. ++set dummy dtrace; 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_DTRACE+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ case $DTRACE in ++ [\\/]* | ?:[\\/]*) ++ ac_cv_path_DTRACE="$DTRACE" # Let the user override the test with a path. ++ ;; ++ *) ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ ac_cv_path_DTRACE="$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 ++ done ++IFS=$as_save_IFS + ++ test -z "$ac_cv_path_DTRACE" && ac_cv_path_DTRACE="not found" ++ ;; ++esac + fi +-ac_fn_c_check_func "$LINENO" "tempnam" "ac_cv_func_tempnam" +-if test "x$ac_cv_func_tempnam" = xyes +-then : +- printf "%s\n" "#define HAVE_TEMPNAM 1" >>confdefs.h +- ++DTRACE=$ac_cv_path_DTRACE ++if test -n "$DTRACE"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DTRACE" >&5 ++$as_echo "$DTRACE" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } + fi +-ac_fn_c_check_func "$LINENO" "timegm" "ac_cv_func_timegm" +-if test "x$ac_cv_func_timegm" = xyes +-then : +- printf "%s\n" "#define HAVE_TIMEGM 1" >>confdefs.h + +-fi +-ac_fn_c_check_func "$LINENO" "times" "ac_cv_func_times" +-if test "x$ac_cv_func_times" = xyes +-then : +- printf "%s\n" "#define HAVE_TIMES 1" >>confdefs.h + +-fi +-ac_fn_c_check_func "$LINENO" "tmpfile" "ac_cv_func_tmpfile" +-if test "x$ac_cv_func_tmpfile" = xyes +-then : +- printf "%s\n" "#define HAVE_TMPFILE 1" >>confdefs.h ++ if test "$DTRACE" = "not found"; then ++ as_fn_error $? "dtrace command not found on \$PATH" "$LINENO" 5 ++ fi + +-fi +-ac_fn_c_check_func "$LINENO" "tmpnam" "ac_cv_func_tmpnam" +-if test "x$ac_cv_func_tmpnam" = xyes +-then : +- printf "%s\n" "#define HAVE_TMPNAM 1" >>confdefs.h ++$as_echo "#define WITH_DTRACE 1" >>confdefs.h + +-fi +-ac_fn_c_check_func "$LINENO" "tmpnam_r" "ac_cv_func_tmpnam_r" +-if test "x$ac_cv_func_tmpnam_r" = xyes +-then : +- printf "%s\n" "#define HAVE_TMPNAM_R 1" >>confdefs.h ++ DTRACE_HEADERS="Include/pydtrace_probes.h" + +-fi +-ac_fn_c_check_func "$LINENO" "truncate" "ac_cv_func_truncate" +-if test "x$ac_cv_func_truncate" = xyes +-then : +- printf "%s\n" "#define HAVE_TRUNCATE 1" >>confdefs.h ++ # On OS X, DTrace providers do not need to be explicitly compiled and ++ # linked into the binary. Correspondingly, dtrace(1) is missing the ELF ++ # generation flag '-G'. We check for presence of this flag, rather than ++ # hardcoding support by OS, in the interest of robustness. ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether DTrace probes require linking" >&5 ++$as_echo_n "checking whether DTrace probes require linking... " >&6; } ++if ${ac_cv_dtrace_link+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ac_cv_dtrace_link=no ++ echo 'BEGIN{}' > conftest.d ++ "$DTRACE" $DFLAGS -G -s conftest.d -o conftest.o > /dev/null 2>&1 && \ ++ ac_cv_dtrace_link=yes + + fi +-ac_fn_c_check_func "$LINENO" "uname" "ac_cv_func_uname" +-if test "x$ac_cv_func_uname" = xyes +-then : +- printf "%s\n" "#define HAVE_UNAME 1" >>confdefs.h +- ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_dtrace_link" >&5 ++$as_echo "$ac_cv_dtrace_link" >&6; } ++ if test "$ac_cv_dtrace_link" = "yes"; then ++ DTRACE_OBJS="Python/pydtrace.o" ++ fi + fi +-ac_fn_c_check_func "$LINENO" "unlinkat" "ac_cv_func_unlinkat" +-if test "x$ac_cv_func_unlinkat" = xyes +-then : +- printf "%s\n" "#define HAVE_UNLINKAT 1" >>confdefs.h + +-fi +-ac_fn_c_check_func "$LINENO" "utimensat" "ac_cv_func_utimensat" +-if test "x$ac_cv_func_utimensat" = xyes +-then : +- printf "%s\n" "#define HAVE_UTIMENSAT 1" >>confdefs.h ++# -I${DLINCLDIR} is added to the compile rule for importdl.o + +-fi +-ac_fn_c_check_func "$LINENO" "utimes" "ac_cv_func_utimes" +-if test "x$ac_cv_func_utimes" = xyes +-then : +- printf "%s\n" "#define HAVE_UTIMES 1" >>confdefs.h ++DLINCLDIR=. + +-fi +-ac_fn_c_check_func "$LINENO" "vfork" "ac_cv_func_vfork" +-if test "x$ac_cv_func_vfork" = xyes +-then : +- printf "%s\n" "#define HAVE_VFORK 1" >>confdefs.h ++# the dlopen() function means we might want to use dynload_shlib.o. some ++# platforms have dlopen(), but don't want to use it. ++for ac_func in dlopen ++do : ++ ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen" ++if test "x$ac_cv_func_dlopen" = xyes; then : ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_DLOPEN 1 ++_ACEOF + + fi +-ac_fn_c_check_func "$LINENO" "waitid" "ac_cv_func_waitid" +-if test "x$ac_cv_func_waitid" = xyes +-then : +- printf "%s\n" "#define HAVE_WAITID 1" >>confdefs.h ++done + +-fi +-ac_fn_c_check_func "$LINENO" "waitpid" "ac_cv_func_waitpid" +-if test "x$ac_cv_func_waitpid" = xyes +-then : +- printf "%s\n" "#define HAVE_WAITPID 1" >>confdefs.h + +-fi +-ac_fn_c_check_func "$LINENO" "wait3" "ac_cv_func_wait3" +-if test "x$ac_cv_func_wait3" = xyes +-then : +- printf "%s\n" "#define HAVE_WAIT3 1" >>confdefs.h ++# DYNLOADFILE specifies which dynload_*.o file we will use for dynamic ++# loading of modules. + ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking DYNLOADFILE" >&5 ++$as_echo_n "checking DYNLOADFILE... " >&6; } ++if test -z "$DYNLOADFILE" ++then ++ case $ac_sys_system/$ac_sys_release in ++ hp*|HP*) DYNLOADFILE="dynload_hpux.o";; ++ *) ++ # use dynload_shlib.c and dlopen() if we have it; otherwise stub ++ # out any dynamic loading ++ if test "$ac_cv_func_dlopen" = yes ++ then DYNLOADFILE="dynload_shlib.o" ++ else DYNLOADFILE="dynload_stub.o" ++ fi ++ ;; ++ esac + fi +-ac_fn_c_check_func "$LINENO" "wait4" "ac_cv_func_wait4" +-if test "x$ac_cv_func_wait4" = xyes +-then : +- printf "%s\n" "#define HAVE_WAIT4 1" >>confdefs.h ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $DYNLOADFILE" >&5 ++$as_echo "$DYNLOADFILE" >&6; } ++if test "$DYNLOADFILE" != "dynload_stub.o" ++then + +-fi +-ac_fn_c_check_func "$LINENO" "wcscoll" "ac_cv_func_wcscoll" +-if test "x$ac_cv_func_wcscoll" = xyes +-then : +- printf "%s\n" "#define HAVE_WCSCOLL 1" >>confdefs.h ++$as_echo "#define HAVE_DYNAMIC_LOADING 1" >>confdefs.h + + fi +-ac_fn_c_check_func "$LINENO" "wcsftime" "ac_cv_func_wcsftime" +-if test "x$ac_cv_func_wcsftime" = xyes +-then : +- printf "%s\n" "#define HAVE_WCSFTIME 1" >>confdefs.h + +-fi +-ac_fn_c_check_func "$LINENO" "wcsxfrm" "ac_cv_func_wcsxfrm" +-if test "x$ac_cv_func_wcsxfrm" = xyes +-then : +- printf "%s\n" "#define HAVE_WCSXFRM 1" >>confdefs.h ++# MACHDEP_OBJS can be set to platform-specific object files needed by Python + +-fi +-ac_fn_c_check_func "$LINENO" "wmemcmp" "ac_cv_func_wmemcmp" +-if test "x$ac_cv_func_wmemcmp" = xyes +-then : +- printf "%s\n" "#define HAVE_WMEMCMP 1" >>confdefs.h + ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking MACHDEP_OBJS" >&5 ++$as_echo_n "checking MACHDEP_OBJS... " >&6; } ++if test -z "$MACHDEP_OBJS" ++then ++ MACHDEP_OBJS=$extra_machdep_objs ++else ++ MACHDEP_OBJS="$MACHDEP_OBJS $extra_machdep_objs" + fi +-ac_fn_c_check_func "$LINENO" "writev" "ac_cv_func_writev" +-if test "x$ac_cv_func_writev" = xyes +-then : +- printf "%s\n" "#define HAVE_WRITEV 1" >>confdefs.h +- ++if test -z "$MACHDEP_OBJS"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5 ++$as_echo "none" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MACHDEP_OBJS" >&5 ++$as_echo "$MACHDEP_OBJS" >&6; } + fi +-ac_fn_c_check_func "$LINENO" "_getpty" "ac_cv_func__getpty" +-if test "x$ac_cv_func__getpty" = xyes +-then : +- printf "%s\n" "#define HAVE__GETPTY 1" >>confdefs.h + +-fi +-ac_fn_c_check_func "$LINENO" "rtpSpawn" "ac_cv_func_rtpSpawn" +-if test "x$ac_cv_func_rtpSpawn" = xyes +-then : +- printf "%s\n" "#define HAVE_RTPSPAWN 1" >>confdefs.h ++# checks for library functions ++for ac_func in alarm accept4 setitimer getitimer bind_textdomain_codeset chown \ ++ clock confstr close_range copy_file_range ctermid dup3 execv explicit_bzero \ ++ explicit_memset faccessat fchmod fchmodat fchown fchownat \ ++ fdwalk fexecve fdopendir fork fpathconf fstatat ftime ftruncate futimesat \ ++ futimens futimes gai_strerror getentropy \ ++ getgrgid_r getgrnam_r \ ++ getgrouplist getgroups getlogin getloadavg getpeername getpgid getpid \ ++ getpriority getresuid getresgid getpwent getpwnam_r getpwuid_r getspnam getspent getsid getwd \ ++ if_nameindex \ ++ initgroups kill killpg lchown lockf linkat lstat lutimes mmap \ ++ memrchr mbrtowc mkdirat mkfifo \ ++ madvise mkfifoat mknod mknodat mktime mremap nice openat pathconf pause pipe2 plock poll \ ++ posix_fallocate posix_fadvise posix_spawn posix_spawnp pread preadv preadv2 \ ++ pthread_condattr_setclock pthread_init pthread_kill pwrite pwritev pwritev2 \ ++ readlink readlinkat readv realpath renameat \ ++ sem_open sem_timedwait sem_getvalue sem_unlink sendfile setegid seteuid \ ++ setgid sethostname \ ++ setlocale setregid setreuid setresuid setresgid setsid setpgid setpgrp setpriority setuid setvbuf \ ++ sched_get_priority_max sched_setaffinity sched_setscheduler sched_setparam \ ++ sched_rr_get_interval \ ++ sigaction sigaltstack sigfillset siginterrupt sigpending sigrelse \ ++ sigtimedwait sigwait sigwaitinfo snprintf splice strftime strlcpy strsignal symlinkat sync \ ++ sysconf tcgetpgrp tcsetpgrp tempnam timegm times tmpfile tmpnam tmpnam_r \ ++ truncate uname unlinkat utimensat utimes vfork waitid waitpid wait3 wait4 \ ++ wcscoll wcsftime wcsxfrm wmemcmp writev _getpty rtpSpawn ++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 + + + # Force lchmod off for Linux. Linux disallows changing the mode of symbolic + # links. Some libc implementations have a stub lchmod implementation that always + # returns an error. + if test "$MACHDEP" != linux; then ++ for ac_func in lchmod ++do : + ac_fn_c_check_func "$LINENO" "lchmod" "ac_cv_func_lchmod" +-if test "x$ac_cv_func_lchmod" = xyes +-then : +- printf "%s\n" "#define HAVE_LCHMOD 1" >>confdefs.h +- +-fi +- +-fi +- +-{ 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 +-/* end confdefs.h. */ +- +-int +-main (void) +-{ +-(void) strchr; +- ; +- return 0; +-} ++if test "x$ac_cv_func_lchmod" = xyes; then : ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_LCHMOD 1 + _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 +-#include +-#include +-#include +-extern void ac_decl (int, char *); +- +-int +-main (void) +-{ +-(void) ac_decl (0, (char *) 0); +- (void) ac_decl; + +- ; +- 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 ++done ++ + fi +-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +- done +- CFLAGS=$ac_save_CFLAGS +- +-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 ;; +-esac + +-ac_fn_check_decl "$LINENO" "dirfd" "ac_cv_have_decl_dirfd" "#include ++ac_fn_c_check_decl "$LINENO" "dirfd" "ac_cv_have_decl_dirfd" "#include + #include +-" "$ac_c_undeclared_builtin_options" "CFLAGS" +-if test "x$ac_cv_have_decl_dirfd" = xyes +-then : ++" ++if test "x$ac_cv_have_decl_dirfd" = xyes; then : + +-printf "%s\n" "#define HAVE_DIRFD 1" >>confdefs.h ++$as_echo "#define HAVE_DIRFD 1" >>confdefs.h + + fi + ++ + # For some functions, having a definition is not sufficient, since + # we want to take their address. +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for chroot" >&5 +-printf %s "checking for chroot... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for chroot" >&5 ++$as_echo_n "checking for chroot... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + int +-main (void) ++main () + { + void *x=chroot + ; + return 0; + } + _ACEOF +-if ac_fn_c_try_compile "$LINENO" +-then : ++if ac_fn_c_try_compile "$LINENO"; then : + +-printf "%s\n" "#define HAVE_CHROOT 1" >>confdefs.h ++$as_echo "#define HAVE_CHROOT 1" >>confdefs.h + +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-printf "%s\n" "yes" >&6; } +-else $as_nop +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-printf "%s\n" "no" >&6; } ++ { $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 +-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for link" >&5 +-printf %s "checking for link... " >&6; } ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for link" >&5 ++$as_echo_n "checking for link... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + int +-main (void) ++main () + { + void *x=link + ; + return 0; + } + _ACEOF +-if ac_fn_c_try_compile "$LINENO" +-then : ++if ac_fn_c_try_compile "$LINENO"; then : + +-printf "%s\n" "#define HAVE_LINK 1" >>confdefs.h ++$as_echo "#define HAVE_LINK 1" >>confdefs.h + +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-printf "%s\n" "yes" >&6; } +-else $as_nop +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-printf "%s\n" "no" >&6; } ++ { $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 +-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for symlink" >&5 +-printf %s "checking for symlink... " >&6; } ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for symlink" >&5 ++$as_echo_n "checking for symlink... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + int +-main (void) ++main () + { + void *x=symlink + ; + return 0; + } + _ACEOF +-if ac_fn_c_try_compile "$LINENO" +-then : ++if ac_fn_c_try_compile "$LINENO"; then : + +-printf "%s\n" "#define HAVE_SYMLINK 1" >>confdefs.h ++$as_echo "#define HAVE_SYMLINK 1" >>confdefs.h + +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-printf "%s\n" "yes" >&6; } +-else $as_nop +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-printf "%s\n" "no" >&6; } ++ { $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 +-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for fchdir" >&5 +-printf %s "checking for fchdir... " >&6; } ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fchdir" >&5 ++$as_echo_n "checking for fchdir... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + int +-main (void) ++main () + { + void *x=fchdir + ; + return 0; + } + _ACEOF +-if ac_fn_c_try_compile "$LINENO" +-then : ++if ac_fn_c_try_compile "$LINENO"; then : + +-printf "%s\n" "#define HAVE_FCHDIR 1" >>confdefs.h ++$as_echo "#define HAVE_FCHDIR 1" >>confdefs.h + +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-printf "%s\n" "yes" >&6; } +-else $as_nop +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-printf "%s\n" "no" >&6; } ++ { $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 +-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for fsync" >&5 +-printf %s "checking for fsync... " >&6; } ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fsync" >&5 ++$as_echo_n "checking for fsync... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + int +-main (void) ++main () + { + void *x=fsync + ; + return 0; + } + _ACEOF +-if ac_fn_c_try_compile "$LINENO" +-then : ++if ac_fn_c_try_compile "$LINENO"; then : + +-printf "%s\n" "#define HAVE_FSYNC 1" >>confdefs.h ++$as_echo "#define HAVE_FSYNC 1" >>confdefs.h + +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-printf "%s\n" "yes" >&6; } +-else $as_nop +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-printf "%s\n" "no" >&6; } ++ { $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 +-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for fdatasync" >&5 +-printf %s "checking for fdatasync... " >&6; } ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fdatasync" >&5 ++$as_echo_n "checking for fdatasync... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + int +-main (void) ++main () + { + void *x=fdatasync + ; + return 0; + } + _ACEOF +-if ac_fn_c_try_compile "$LINENO" +-then : ++if ac_fn_c_try_compile "$LINENO"; then : + +-printf "%s\n" "#define HAVE_FDATASYNC 1" >>confdefs.h ++$as_echo "#define HAVE_FDATASYNC 1" >>confdefs.h + +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-printf "%s\n" "yes" >&6; } +-else $as_nop +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-printf "%s\n" "no" >&6; } ++ { $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 +-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for epoll" >&5 +-printf %s "checking for epoll... " >&6; } ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for epoll" >&5 ++$as_echo_n "checking for epoll... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + int +-main (void) ++main () + { + void *x=epoll_create + ; + return 0; + } + _ACEOF +-if ac_fn_c_try_compile "$LINENO" +-then : ++if ac_fn_c_try_compile "$LINENO"; then : + +-printf "%s\n" "#define HAVE_EPOLL 1" >>confdefs.h ++$as_echo "#define HAVE_EPOLL 1" >>confdefs.h + +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-printf "%s\n" "yes" >&6; } +-else $as_nop +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-printf "%s\n" "no" >&6; } ++ { $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 +-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for epoll_create1" >&5 +-printf %s "checking for epoll_create1... " >&6; } ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for epoll_create1" >&5 ++$as_echo_n "checking for epoll_create1... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + int +-main (void) ++main () + { + void *x=epoll_create1 + ; + return 0; + } + _ACEOF +-if ac_fn_c_try_compile "$LINENO" +-then : ++if ac_fn_c_try_compile "$LINENO"; then : + +-printf "%s\n" "#define HAVE_EPOLL_CREATE1 1" >>confdefs.h ++$as_echo "#define HAVE_EPOLL_CREATE1 1" >>confdefs.h + +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-printf "%s\n" "yes" >&6; } +-else $as_nop +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-printf "%s\n" "no" >&6; } ++ { $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 +-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for kqueue" >&5 +-printf %s "checking for kqueue... " >&6; } ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for kqueue" >&5 ++$as_echo_n "checking for kqueue... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -14215,28 +12104,27 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + #include + + int +-main (void) ++main () + { + int x=kqueue() + ; + return 0; + } + _ACEOF +-if ac_fn_c_try_compile "$LINENO" +-then : ++if ac_fn_c_try_compile "$LINENO"; then : + +-printf "%s\n" "#define HAVE_KQUEUE 1" >>confdefs.h ++$as_echo "#define HAVE_KQUEUE 1" >>confdefs.h + +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-printf "%s\n" "yes" >&6; } +-else $as_nop +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-printf "%s\n" "no" >&6; } ++ { $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 +-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for prlimit" >&5 +-printf %s "checking for prlimit... " >&6; } ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for prlimit" >&5 ++$as_echo_n "checking for prlimit... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -14244,55 +12132,53 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + #include + + int +-main (void) ++main () + { + void *x=prlimit + ; + return 0; + } + _ACEOF +-if ac_fn_c_try_compile "$LINENO" +-then : ++if ac_fn_c_try_compile "$LINENO"; then : + +-printf "%s\n" "#define HAVE_PRLIMIT 1" >>confdefs.h ++$as_echo "#define HAVE_PRLIMIT 1" >>confdefs.h + +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-printf "%s\n" "yes" >&6; } +-else $as_nop +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-printf "%s\n" "no" >&6; } ++ { $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 +-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for _dyld_shared_cache_contains_path" >&5 +-printf %s "checking for _dyld_shared_cache_contains_path... " >&6; } ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for _dyld_shared_cache_contains_path" >&5 ++$as_echo_n "checking for _dyld_shared_cache_contains_path... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + int +-main (void) ++main () + { + void *x=_dyld_shared_cache_contains_path + ; + return 0; + } + _ACEOF +-if ac_fn_c_try_compile "$LINENO" +-then : ++if ac_fn_c_try_compile "$LINENO"; then : + +-printf "%s\n" "#define HAVE_DYLD_SHARED_CACHE_CONTAINS_PATH 1" >>confdefs.h ++$as_echo "#define HAVE_DYLD_SHARED_CACHE_CONTAINS_PATH 1" >>confdefs.h + +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-printf "%s\n" "yes" >&6; } +-else $as_nop +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-printf "%s\n" "no" >&6; } ++ { $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 +-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for memfd_create" >&5 +-printf %s "checking for memfd_create... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for memfd_create" >&5 ++$as_echo_n "checking for memfd_create... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -14304,29 +12190,28 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + #endif + + int +-main (void) ++main () + { + void *x=memfd_create + ; + return 0; + } + _ACEOF +-if ac_fn_c_try_compile "$LINENO" +-then : ++if ac_fn_c_try_compile "$LINENO"; then : + +-printf "%s\n" "#define HAVE_MEMFD_CREATE 1" >>confdefs.h ++$as_echo "#define HAVE_MEMFD_CREATE 1" >>confdefs.h + +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-printf "%s\n" "yes" >&6; } +-else $as_nop +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-printf "%s\n" "no" >&6; } ++ { $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 +-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for eventfd" >&5 +-printf %s "checking for eventfd... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for eventfd" >&5 ++$as_echo_n "checking for eventfd... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -14335,26 +12220,25 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + #endif + + int +-main (void) ++main () + { + int x = eventfd(0, EFD_CLOEXEC) + ; + return 0; + } + _ACEOF +-if ac_fn_c_try_compile "$LINENO" +-then : ++if ac_fn_c_try_compile "$LINENO"; then : + +-printf "%s\n" "#define HAVE_EVENTFD 1" >>confdefs.h ++$as_echo "#define HAVE_EVENTFD 1" >>confdefs.h + +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-printf "%s\n" "yes" >&6; } +-else $as_nop +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-printf "%s\n" "no" >&6; } ++ { $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 +-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + # On some systems (eg. FreeBSD 5), we would find a definition of the + # functions ctermid_r, setgroups in the library, but no prototype +@@ -14362,46 +12246,44 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + # address to avoid compiler warnings and potential miscompilations + # because of the missing prototypes. + +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ctermid_r" >&5 +-printf %s "checking for ctermid_r... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ctermid_r" >&5 ++$as_echo_n "checking for ctermid_r... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include + + int +-main (void) ++main () + { + void* p = ctermid_r + ; + return 0; + } + _ACEOF +-if ac_fn_c_try_compile "$LINENO" +-then : ++if ac_fn_c_try_compile "$LINENO"; then : + +-printf "%s\n" "#define HAVE_CTERMID_R 1" >>confdefs.h ++$as_echo "#define HAVE_CTERMID_R 1" >>confdefs.h + +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-printf "%s\n" "yes" >&6; } +-else $as_nop +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-printf "%s\n" "no" >&6; } ++ { $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 +-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for flock declaration" >&5 +-printf %s "checking for flock declaration... " >&6; } +-if test ${ac_cv_flock_decl+y} +-then : +- printf %s "(cached) " >&6 +-else $as_nop ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for flock declaration" >&5 ++$as_echo_n "checking for flock declaration... " >&6; } ++if ${ac_cv_flock_decl+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + int +-main (void) ++main () + { + void* p = flock + +@@ -14409,34 +12291,32 @@ void* p = flock + return 0; + } + _ACEOF +-if ac_fn_c_try_compile "$LINENO" +-then : ++if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_flock_decl=yes +-else $as_nop ++else + ac_cv_flock_decl=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: $ac_cv_flock_decl" >&5 +-printf "%s\n" "$ac_cv_flock_decl" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_flock_decl" >&5 ++$as_echo "$ac_cv_flock_decl" >&6; } + if test "x${ac_cv_flock_decl}" = xyes; then +- + for ac_func in flock + do : + ac_fn_c_check_func "$LINENO" "flock" "ac_cv_func_flock" +-if test "x$ac_cv_func_flock" = xyes +-then : +- printf "%s\n" "#define HAVE_FLOCK 1" >>confdefs.h +- +-else $as_nop +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for flock in -lbsd" >&5 +-printf %s "checking for flock in -lbsd... " >&6; } +-if test ${ac_cv_lib_bsd_flock+y} +-then : +- printf %s "(cached) " >&6 +-else $as_nop ++if test "x$ac_cv_func_flock" = xyes; then : ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_FLOCK 1 ++_ACEOF ++ ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for flock in -lbsd" >&5 ++$as_echo_n "checking for flock in -lbsd... " >&6; } ++if ${ac_cv_lib_bsd_flock+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lbsd $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -14445,111 +12325,109 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* 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 flock (); + int +-main (void) ++main () + { + return flock (); + ; + return 0; + } + _ACEOF +-if ac_fn_c_try_link "$LINENO" +-then : ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_bsd_flock=yes +-else $as_nop ++else + ac_cv_lib_bsd_flock=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_bsd_flock" >&5 +-printf "%s\n" "$ac_cv_lib_bsd_flock" >&6; } +-if test "x$ac_cv_lib_bsd_flock" = xyes +-then : +- printf "%s\n" "#define HAVE_FLOCK 1" >>confdefs.h ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_flock" >&5 ++$as_echo "$ac_cv_lib_bsd_flock" >&6; } ++if test "x$ac_cv_lib_bsd_flock" = xyes; then : ++ $as_echo "#define HAVE_FLOCK 1" >>confdefs.h + + +-printf "%s\n" "#define FLOCK_NEEDS_LIBBSD 1" >>confdefs.h ++$as_echo "#define FLOCK_NEEDS_LIBBSD 1" >>confdefs.h + + + fi + + + fi +- + done ++ + fi + +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for getpagesize" >&5 +-printf %s "checking for getpagesize... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for getpagesize" >&5 ++$as_echo_n "checking for getpagesize... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include + + int +-main (void) ++main () + { + void* p = getpagesize + ; + return 0; + } + _ACEOF +-if ac_fn_c_try_compile "$LINENO" +-then : ++if ac_fn_c_try_compile "$LINENO"; then : + +-printf "%s\n" "#define HAVE_GETPAGESIZE 1" >>confdefs.h ++$as_echo "#define HAVE_GETPAGESIZE 1" >>confdefs.h + +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-printf "%s\n" "yes" >&6; } +-else $as_nop +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-printf "%s\n" "no" >&6; } ++ { $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 +-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for broken unsetenv" >&5 +-printf %s "checking for broken unsetenv... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken unsetenv" >&5 ++$as_echo_n "checking for broken unsetenv... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include + + int +-main (void) ++main () + { + int res = unsetenv("DUMMY") + ; + return 0; + } + _ACEOF +-if ac_fn_c_try_compile "$LINENO" +-then : +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-printf "%s\n" "no" >&6; } +-else $as_nop ++if ac_fn_c_try_compile "$LINENO"; then : ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++else + +-printf "%s\n" "#define HAVE_BROKEN_UNSETENV 1" >>confdefs.h ++$as_echo "#define HAVE_BROKEN_UNSETENV 1" >>confdefs.h + +- { 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 +-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + for ac_prog in true + 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_TRUE+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_TRUE+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else + if test -n "$TRUE"; then + ac_cv_prog_TRUE="$TRUE" # Let the user override the test. + else +@@ -14557,15 +12435,11 @@ 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 ++ 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_TRUE="$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 +@@ -14576,11 +12450,11 @@ fi + fi + TRUE=$ac_cv_prog_TRUE + if test -n "$TRUE"; then +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $TRUE" >&5 +-printf "%s\n" "$TRUE" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TRUE" >&5 ++$as_echo "$TRUE" >&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 + + +@@ -14589,12 +12463,11 @@ done + test -n "$TRUE" || TRUE="/bin/true" + + +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for inet_aton in -lc" >&5 +-printf %s "checking for inet_aton in -lc... " >&6; } +-if test ${ac_cv_lib_c_inet_aton+y} +-then : +- printf %s "(cached) " >&6 +-else $as_nop ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inet_aton in -lc" >&5 ++$as_echo_n "checking for inet_aton in -lc... " >&6; } ++if ${ac_cv_lib_c_inet_aton+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lc $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -14603,37 +12476,37 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* 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 inet_aton (); + int +-main (void) ++main () + { + return inet_aton (); + ; + return 0; + } + _ACEOF +-if ac_fn_c_try_link "$LINENO" +-then : ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_c_inet_aton=yes +-else $as_nop ++else + ac_cv_lib_c_inet_aton=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_inet_aton" >&5 +-printf "%s\n" "$ac_cv_lib_c_inet_aton" >&6; } +-if test "x$ac_cv_lib_c_inet_aton" = xyes +-then : ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_inet_aton" >&5 ++$as_echo "$ac_cv_lib_c_inet_aton" >&6; } ++if test "x$ac_cv_lib_c_inet_aton" = xyes; then : + $ac_cv_prog_TRUE +-else $as_nop +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for inet_aton in -lresolv" >&5 +-printf %s "checking for inet_aton in -lresolv... " >&6; } +-if test ${ac_cv_lib_resolv_inet_aton+y} +-then : +- printf %s "(cached) " >&6 +-else $as_nop ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inet_aton in -lresolv" >&5 ++$as_echo_n "checking for inet_aton in -lresolv... " >&6; } ++if ${ac_cv_lib_resolv_inet_aton+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lresolv $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -14642,30 +12515,33 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* 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 inet_aton (); + int +-main (void) ++main () + { + return inet_aton (); + ; + return 0; + } + _ACEOF +-if ac_fn_c_try_link "$LINENO" +-then : ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_resolv_inet_aton=yes +-else $as_nop ++else + ac_cv_lib_resolv_inet_aton=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_resolv_inet_aton" >&5 +-printf "%s\n" "$ac_cv_lib_resolv_inet_aton" >&6; } +-if test "x$ac_cv_lib_resolv_inet_aton" = xyes +-then : +- printf "%s\n" "#define HAVE_LIBRESOLV 1" >>confdefs.h ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_inet_aton" >&5 ++$as_echo "$ac_cv_lib_resolv_inet_aton" >&6; } ++if test "x$ac_cv_lib_resolv_inet_aton" = xyes; then : ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_LIBRESOLV 1 ++_ACEOF + + LIBS="-lresolv $LIBS" + +@@ -14677,16 +12553,14 @@ fi + + # On Tru64, chflags seems to be present, but calling it will + # exit Python +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for chflags" >&5 +-printf %s "checking for chflags... " >&6; } +-if test ${ac_cv_have_chflags+y} +-then : +- printf %s "(cached) " >&6 +-else $as_nop +- if test "$cross_compiling" = yes +-then : ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for chflags" >&5 ++$as_echo_n "checking for chflags... " >&6; } ++if ${ac_cv_have_chflags+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test "$cross_compiling" = yes; then : + ac_cv_have_chflags=cross +-else $as_nop ++else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -14700,10 +12574,9 @@ int main(int argc, char*argv[]) + } + + _ACEOF +-if ac_fn_c_try_run "$LINENO" +-then : ++if ac_fn_c_try_run "$LINENO"; then : + ac_cv_have_chflags=yes +-else $as_nop ++else + ac_cv_have_chflags=no + fi + rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ +@@ -14712,34 +12585,31 @@ fi + + + fi +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_chflags" >&5 +-printf "%s\n" "$ac_cv_have_chflags" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_chflags" >&5 ++$as_echo "$ac_cv_have_chflags" >&6; } + if test "$ac_cv_have_chflags" = cross ; then + ac_fn_c_check_func "$LINENO" "chflags" "ac_cv_func_chflags" +-if test "x$ac_cv_func_chflags" = xyes +-then : ++if test "x$ac_cv_func_chflags" = xyes; then : + ac_cv_have_chflags="yes" +-else $as_nop ++else + ac_cv_have_chflags="no" + fi + + fi + if test "$ac_cv_have_chflags" = yes ; then + +-printf "%s\n" "#define HAVE_CHFLAGS 1" >>confdefs.h ++$as_echo "#define HAVE_CHFLAGS 1" >>confdefs.h + + fi + +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for lchflags" >&5 +-printf %s "checking for lchflags... " >&6; } +-if test ${ac_cv_have_lchflags+y} +-then : +- printf %s "(cached) " >&6 +-else $as_nop +- if test "$cross_compiling" = yes +-then : ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for lchflags" >&5 ++$as_echo_n "checking for lchflags... " >&6; } ++if ${ac_cv_have_lchflags+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test "$cross_compiling" = yes; then : + ac_cv_have_lchflags=cross +-else $as_nop ++else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -14753,10 +12623,9 @@ int main(int argc, char*argv[]) + } + + _ACEOF +-if ac_fn_c_try_run "$LINENO" +-then : ++if ac_fn_c_try_run "$LINENO"; then : + ac_cv_have_lchflags=yes +-else $as_nop ++else + ac_cv_have_lchflags=no + fi + rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ +@@ -14765,21 +12634,20 @@ fi + + + fi +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_lchflags" >&5 +-printf "%s\n" "$ac_cv_have_lchflags" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_lchflags" >&5 ++$as_echo "$ac_cv_have_lchflags" >&6; } + if test "$ac_cv_have_lchflags" = cross ; then + ac_fn_c_check_func "$LINENO" "lchflags" "ac_cv_func_lchflags" +-if test "x$ac_cv_func_lchflags" = xyes +-then : ++if test "x$ac_cv_func_lchflags" = xyes; then : + ac_cv_have_lchflags="yes" +-else $as_nop ++else + ac_cv_have_lchflags="no" + fi + + fi + if test "$ac_cv_have_lchflags" = yes ; then + +-printf "%s\n" "#define HAVE_LCHFLAGS 1" >>confdefs.h ++$as_echo "#define HAVE_LCHFLAGS 1" >>confdefs.h + + fi + +@@ -14792,12 +12660,11 @@ Darwin/*) + ;; + esac + +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for inflateCopy in -lz" >&5 +-printf %s "checking for inflateCopy in -lz... " >&6; } +-if test ${ac_cv_lib_z_inflateCopy+y} +-then : +- printf %s "(cached) " >&6 +-else $as_nop ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inflateCopy in -lz" >&5 ++$as_echo_n "checking for inflateCopy in -lz... " >&6; } ++if ${ac_cv_lib_z_inflateCopy+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lz $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -14806,31 +12673,32 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* 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 inflateCopy (); + int +-main (void) ++main () + { + return inflateCopy (); + ; + return 0; + } + _ACEOF +-if ac_fn_c_try_link "$LINENO" +-then : ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_z_inflateCopy=yes +-else $as_nop ++else + ac_cv_lib_z_inflateCopy=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_z_inflateCopy" >&5 +-printf "%s\n" "$ac_cv_lib_z_inflateCopy" >&6; } +-if test "x$ac_cv_lib_z_inflateCopy" = xyes +-then : ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_inflateCopy" >&5 ++$as_echo "$ac_cv_lib_z_inflateCopy" >&6; } ++if test "x$ac_cv_lib_z_inflateCopy" = xyes; then : + +-printf "%s\n" "#define HAVE_ZLIB_COPY 1" >>confdefs.h ++$as_echo "#define HAVE_ZLIB_COPY 1" >>confdefs.h + + fi + +@@ -14842,38 +12710,37 @@ Darwin/*) + ;; + esac + +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for hstrerror" >&5 +-printf %s "checking for hstrerror... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for hstrerror" >&5 ++$as_echo_n "checking for hstrerror... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include + + int +-main (void) ++main () + { + void* p = hstrerror; hstrerror(0) + ; + return 0; + } + _ACEOF +-if ac_fn_c_try_link "$LINENO" +-then : ++if ac_fn_c_try_link "$LINENO"; then : + +-printf "%s\n" "#define HAVE_HSTRERROR 1" >>confdefs.h ++$as_echo "#define HAVE_HSTRERROR 1" >>confdefs.h + +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-printf "%s\n" "yes" >&6; } +-else $as_nop +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-printf "%s\n" "no" >&6; } ++ { $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 +-rm -f core conftest.err conftest.$ac_objext conftest.beam \ ++rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for inet_aton" >&5 +-printf %s "checking for inet_aton... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inet_aton" >&5 ++$as_echo_n "checking for inet_aton... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -14883,30 +12750,29 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + #include + + int +-main (void) ++main () + { + void* p = inet_aton;inet_aton(0,0) + ; + return 0; + } + _ACEOF +-if ac_fn_c_try_link "$LINENO" +-then : ++if ac_fn_c_try_link "$LINENO"; then : + +-printf "%s\n" "#define HAVE_INET_ATON 1" >>confdefs.h ++$as_echo "#define HAVE_INET_ATON 1" >>confdefs.h + +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-printf "%s\n" "yes" >&6; } +-else $as_nop +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-printf "%s\n" "no" >&6; } ++ { $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 +-rm -f core conftest.err conftest.$ac_objext conftest.beam \ ++rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for inet_pton" >&5 +-printf %s "checking for inet_pton... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inet_pton" >&5 ++$as_echo_n "checking for inet_pton... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -14916,30 +12782,29 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + #include + + int +-main (void) ++main () + { + void* p = inet_pton + ; + return 0; + } + _ACEOF +-if ac_fn_c_try_compile "$LINENO" +-then : ++if ac_fn_c_try_compile "$LINENO"; then : + +-printf "%s\n" "#define HAVE_INET_PTON 1" >>confdefs.h ++$as_echo "#define HAVE_INET_PTON 1" >>confdefs.h + +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-printf "%s\n" "yes" >&6; } +-else $as_nop +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-printf "%s\n" "no" >&6; } ++ { $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 +-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + # On some systems, setgroups is in unistd.h, on others, in grp.h +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for setgroups" >&5 +-printf %s "checking for setgroups... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for setgroups" >&5 ++$as_echo_n "checking for setgroups... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -14949,44 +12814,42 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + #endif + + int +-main (void) ++main () + { + void* p = setgroups + ; + return 0; + } + _ACEOF +-if ac_fn_c_try_compile "$LINENO" +-then : ++if ac_fn_c_try_compile "$LINENO"; then : + +-printf "%s\n" "#define HAVE_SETGROUPS 1" >>confdefs.h ++$as_echo "#define HAVE_SETGROUPS 1" >>confdefs.h + +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-printf "%s\n" "yes" >&6; } +-else $as_nop +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-printf "%s\n" "no" >&6; } ++ { $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 +-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + # check for openpty and forkpty + +- +- for ac_func in openpty ++for ac_func in openpty + do : + ac_fn_c_check_func "$LINENO" "openpty" "ac_cv_func_openpty" +-if test "x$ac_cv_func_openpty" = xyes +-then : +- printf "%s\n" "#define HAVE_OPENPTY 1" >>confdefs.h +- +-else $as_nop +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for openpty in -lutil" >&5 +-printf %s "checking for openpty in -lutil... " >&6; } +-if test ${ac_cv_lib_util_openpty+y} +-then : +- printf %s "(cached) " >&6 +-else $as_nop ++if test "x$ac_cv_func_openpty" = xyes; then : ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_OPENPTY 1 ++_ACEOF ++ ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for openpty in -lutil" >&5 ++$as_echo_n "checking for openpty in -lutil... " >&6; } ++if ${ac_cv_lib_util_openpty+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lutil $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -14995,38 +12858,38 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* 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 openpty (); + int +-main (void) ++main () + { + return openpty (); + ; + return 0; + } + _ACEOF +-if ac_fn_c_try_link "$LINENO" +-then : ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_util_openpty=yes +-else $as_nop ++else + ac_cv_lib_util_openpty=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_util_openpty" >&5 +-printf "%s\n" "$ac_cv_lib_util_openpty" >&6; } +-if test "x$ac_cv_lib_util_openpty" = xyes +-then : +- printf "%s\n" "#define HAVE_OPENPTY 1" >>confdefs.h ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_util_openpty" >&5 ++$as_echo "$ac_cv_lib_util_openpty" >&6; } ++if test "x$ac_cv_lib_util_openpty" = xyes; then : ++ $as_echo "#define HAVE_OPENPTY 1" >>confdefs.h + LIBS="$LIBS -lutil" +-else $as_nop +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for openpty in -lbsd" >&5 +-printf %s "checking for openpty in -lbsd... " >&6; } +-if test ${ac_cv_lib_bsd_openpty+y} +-then : +- printf %s "(cached) " >&6 +-else $as_nop ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for openpty in -lbsd" >&5 ++$as_echo_n "checking for openpty in -lbsd... " >&6; } ++if ${ac_cv_lib_bsd_openpty+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lbsd $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -15035,30 +12898,31 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* 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 openpty (); + int +-main (void) ++main () + { + return openpty (); + ; + return 0; + } + _ACEOF +-if ac_fn_c_try_link "$LINENO" +-then : ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_bsd_openpty=yes +-else $as_nop ++else + ac_cv_lib_bsd_openpty=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_bsd_openpty" >&5 +-printf "%s\n" "$ac_cv_lib_bsd_openpty" >&6; } +-if test "x$ac_cv_lib_bsd_openpty" = xyes +-then : +- printf "%s\n" "#define HAVE_OPENPTY 1" >>confdefs.h ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_openpty" >&5 ++$as_echo "$ac_cv_lib_bsd_openpty" >&6; } ++if test "x$ac_cv_lib_bsd_openpty" = xyes; then : ++ $as_echo "#define HAVE_OPENPTY 1" >>confdefs.h + LIBS="$LIBS -lbsd" + fi + +@@ -15067,23 +12931,22 @@ fi + + + fi +- + done + +- for ac_func in forkpty ++for ac_func in forkpty + do : + ac_fn_c_check_func "$LINENO" "forkpty" "ac_cv_func_forkpty" +-if test "x$ac_cv_func_forkpty" = xyes +-then : +- printf "%s\n" "#define HAVE_FORKPTY 1" >>confdefs.h +- +-else $as_nop +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for forkpty in -lutil" >&5 +-printf %s "checking for forkpty in -lutil... " >&6; } +-if test ${ac_cv_lib_util_forkpty+y} +-then : +- printf %s "(cached) " >&6 +-else $as_nop ++if test "x$ac_cv_func_forkpty" = xyes; then : ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_FORKPTY 1 ++_ACEOF ++ ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for forkpty in -lutil" >&5 ++$as_echo_n "checking for forkpty in -lutil... " >&6; } ++if ${ac_cv_lib_util_forkpty+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lutil $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -15092,38 +12955,38 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* 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 forkpty (); + int +-main (void) ++main () + { + return forkpty (); + ; + return 0; + } + _ACEOF +-if ac_fn_c_try_link "$LINENO" +-then : ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_util_forkpty=yes +-else $as_nop ++else + ac_cv_lib_util_forkpty=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_util_forkpty" >&5 +-printf "%s\n" "$ac_cv_lib_util_forkpty" >&6; } +-if test "x$ac_cv_lib_util_forkpty" = xyes +-then : +- printf "%s\n" "#define HAVE_FORKPTY 1" >>confdefs.h ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_util_forkpty" >&5 ++$as_echo "$ac_cv_lib_util_forkpty" >&6; } ++if test "x$ac_cv_lib_util_forkpty" = xyes; then : ++ $as_echo "#define HAVE_FORKPTY 1" >>confdefs.h + LIBS="$LIBS -lutil" +-else $as_nop +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for forkpty in -lbsd" >&5 +-printf %s "checking for forkpty in -lbsd... " >&6; } +-if test ${ac_cv_lib_bsd_forkpty+y} +-then : +- printf %s "(cached) " >&6 +-else $as_nop ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for forkpty in -lbsd" >&5 ++$as_echo_n "checking for forkpty in -lbsd... " >&6; } ++if ${ac_cv_lib_bsd_forkpty+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lbsd $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -15132,30 +12995,31 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* 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 forkpty (); + int +-main (void) ++main () + { + return forkpty (); + ; + return 0; + } + _ACEOF +-if ac_fn_c_try_link "$LINENO" +-then : ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_bsd_forkpty=yes +-else $as_nop ++else + ac_cv_lib_bsd_forkpty=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_bsd_forkpty" >&5 +-printf "%s\n" "$ac_cv_lib_bsd_forkpty" >&6; } +-if test "x$ac_cv_lib_bsd_forkpty" = xyes +-then : +- printf "%s\n" "#define HAVE_FORKPTY 1" >>confdefs.h ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_forkpty" >&5 ++$as_echo "$ac_cv_lib_bsd_forkpty" >&6; } ++if test "x$ac_cv_lib_bsd_forkpty" = xyes; then : ++ $as_echo "#define HAVE_FORKPTY 1" >>confdefs.h + LIBS="$LIBS -lbsd" + fi + +@@ -15164,54 +13028,28 @@ fi + + + fi +- + done + +-# check for long file support functions +-ac_fn_c_check_func "$LINENO" "fseek64" "ac_cv_func_fseek64" +-if test "x$ac_cv_func_fseek64" = xyes +-then : +- printf "%s\n" "#define HAVE_FSEEK64 1" >>confdefs.h +- +-fi +-ac_fn_c_check_func "$LINENO" "fseeko" "ac_cv_func_fseeko" +-if test "x$ac_cv_func_fseeko" = xyes +-then : +- printf "%s\n" "#define HAVE_FSEEKO 1" >>confdefs.h +- +-fi +-ac_fn_c_check_func "$LINENO" "fstatvfs" "ac_cv_func_fstatvfs" +-if test "x$ac_cv_func_fstatvfs" = xyes +-then : +- printf "%s\n" "#define HAVE_FSTATVFS 1" >>confdefs.h +- +-fi +-ac_fn_c_check_func "$LINENO" "ftell64" "ac_cv_func_ftell64" +-if test "x$ac_cv_func_ftell64" = xyes +-then : +- printf "%s\n" "#define HAVE_FTELL64 1" >>confdefs.h +- +-fi +-ac_fn_c_check_func "$LINENO" "ftello" "ac_cv_func_ftello" +-if test "x$ac_cv_func_ftello" = xyes +-then : +- printf "%s\n" "#define HAVE_FTELLO 1" >>confdefs.h + +-fi +-ac_fn_c_check_func "$LINENO" "statvfs" "ac_cv_func_statvfs" +-if test "x$ac_cv_func_statvfs" = xyes +-then : +- printf "%s\n" "#define HAVE_STATVFS 1" >>confdefs.h ++# check for long file support functions ++for ac_func in fseek64 fseeko fstatvfs ftell64 ftello statvfs ++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" "dup2" "ac_cv_func_dup2" +-if test "x$ac_cv_func_dup2" = xyes +-then : +- printf "%s\n" "#define HAVE_DUP2 1" >>confdefs.h ++if test "x$ac_cv_func_dup2" = xyes; then : ++ $as_echo "#define HAVE_DUP2 1" >>confdefs.h + +-else $as_nop ++else + case " $LIBOBJS " in + *" dup2.$ac_objext "* ) ;; + *) LIBOBJS="$LIBOBJS dup2.$ac_objext" +@@ -15221,72 +13059,70 @@ esac + fi + + +- for ac_func in getpgrp ++for ac_func in getpgrp + do : + ac_fn_c_check_func "$LINENO" "getpgrp" "ac_cv_func_getpgrp" +-if test "x$ac_cv_func_getpgrp" = xyes +-then : +- printf "%s\n" "#define HAVE_GETPGRP 1" >>confdefs.h ++if test "x$ac_cv_func_getpgrp" = xyes; then : ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_GETPGRP 1 ++_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + int +-main (void) ++main () + { + getpgrp(0); + ; + return 0; + } + _ACEOF +-if ac_fn_c_try_compile "$LINENO" +-then : ++if ac_fn_c_try_compile "$LINENO"; then : + +-printf "%s\n" "#define GETPGRP_HAVE_ARG 1" >>confdefs.h ++$as_echo "#define GETPGRP_HAVE_ARG 1" >>confdefs.h + + 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 +- + done + +- for ac_func in setpgrp ++for ac_func in setpgrp + do : + ac_fn_c_check_func "$LINENO" "setpgrp" "ac_cv_func_setpgrp" +-if test "x$ac_cv_func_setpgrp" = xyes +-then : +- printf "%s\n" "#define HAVE_SETPGRP 1" >>confdefs.h ++if test "x$ac_cv_func_setpgrp" = xyes; then : ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_SETPGRP 1 ++_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + int +-main (void) ++main () + { + setpgrp(0,0); + ; + return 0; + } + _ACEOF +-if ac_fn_c_try_compile "$LINENO" +-then : ++if ac_fn_c_try_compile "$LINENO"; then : + +-printf "%s\n" "#define SETPGRP_HAVE_ARG 1" >>confdefs.h ++$as_echo "#define SETPGRP_HAVE_ARG 1" >>confdefs.h + + 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 +- + done + ++ + # We search for both crypt and crypt_r as one or the other may be defined + # This gets us our -lcrypt in LIBS when required on the target platform. +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing crypt" >&5 +-printf %s "checking for library containing crypt... " >&6; } +-if test ${ac_cv_search_crypt+y} +-then : +- printf %s "(cached) " >&6 +-else $as_nop ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing crypt" >&5 ++$as_echo_n "checking for library containing crypt... " >&6; } ++if ${ac_cv_search_crypt+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else + ac_func_search_save_LIBS=$LIBS + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +@@ -15294,58 +13130,55 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* 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 crypt (); + int +-main (void) ++main () + { + return crypt (); + ; + return 0; + } + _ACEOF +-for ac_lib in '' crypt +-do ++for ac_lib in '' crypt; 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_crypt=$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_crypt+y} +-then : ++ if ${ac_cv_search_crypt+:} false; then : + break + fi + done +-if test ${ac_cv_search_crypt+y} +-then : ++if ${ac_cv_search_crypt+:} false; then : + +-else $as_nop ++else + ac_cv_search_crypt=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_crypt" >&5 +-printf "%s\n" "$ac_cv_search_crypt" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_crypt" >&5 ++$as_echo "$ac_cv_search_crypt" >&6; } + ac_res=$ac_cv_search_crypt +-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 crypt_r" >&5 +-printf %s "checking for library containing crypt_r... " >&6; } +-if test ${ac_cv_search_crypt_r+y} +-then : +- printf %s "(cached) " >&6 +-else $as_nop ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing crypt_r" >&5 ++$as_echo_n "checking for library containing crypt_r... " >&6; } ++if ${ac_cv_search_crypt_r+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else + ac_func_search_save_LIBS=$LIBS + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +@@ -15353,56 +13186,53 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* 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 crypt_r (); + int +-main (void) ++main () + { + return crypt_r (); + ; + return 0; + } + _ACEOF +-for ac_lib in '' crypt +-do ++for ac_lib in '' crypt; 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_crypt_r=$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_crypt_r+y} +-then : ++ if ${ac_cv_search_crypt_r+:} false; then : + break + fi + done +-if test ${ac_cv_search_crypt_r+y} +-then : ++if ${ac_cv_search_crypt_r+:} false; then : + +-else $as_nop ++else + ac_cv_search_crypt_r=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_crypt_r" >&5 +-printf "%s\n" "$ac_cv_search_crypt_r" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_crypt_r" >&5 ++$as_echo "$ac_cv_search_crypt_r" >&6; } + ac_res=$ac_cv_search_crypt_r +-if test "$ac_res" != no +-then : ++if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + + fi + + + ac_fn_c_check_func "$LINENO" "crypt_r" "ac_cv_func_crypt_r" +-if test "x$ac_cv_func_crypt_r" = xyes +-then : ++if test "x$ac_cv_func_crypt_r" = xyes; then : + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -15410,7 +13240,7 @@ then : + #include + + int +-main (void) ++main () + { + + struct crypt_data d; +@@ -15420,33 +13250,31 @@ char *r = crypt_r("", "", &d); + return 0; + } + _ACEOF +-if ac_fn_c_try_compile "$LINENO" +-then : ++if ac_fn_c_try_compile "$LINENO"; then : + +-printf "%s\n" "#define HAVE_CRYPT_R 1" >>confdefs.h ++$as_echo "#define HAVE_CRYPT_R 1" >>confdefs.h + + 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 + + +- +- for ac_func in clock_gettime ++for ac_func in clock_gettime + do : + ac_fn_c_check_func "$LINENO" "clock_gettime" "ac_cv_func_clock_gettime" +-if test "x$ac_cv_func_clock_gettime" = xyes +-then : +- printf "%s\n" "#define HAVE_CLOCK_GETTIME 1" >>confdefs.h +- +-else $as_nop +- +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for clock_gettime in -lrt" >&5 +-printf %s "checking for clock_gettime in -lrt... " >&6; } +-if test ${ac_cv_lib_rt_clock_gettime+y} +-then : +- printf %s "(cached) " >&6 +-else $as_nop ++if test "x$ac_cv_func_clock_gettime" = xyes; then : ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_CLOCK_GETTIME 1 ++_ACEOF ++ ++else ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for clock_gettime in -lrt" >&5 ++$as_echo_n "checking for clock_gettime in -lrt... " >&6; } ++if ${ac_cv_lib_rt_clock_gettime+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lrt $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -15455,60 +13283,60 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* 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 clock_gettime (); + int +-main (void) ++main () + { + return clock_gettime (); + ; + return 0; + } + _ACEOF +-if ac_fn_c_try_link "$LINENO" +-then : ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_rt_clock_gettime=yes +-else $as_nop ++else + ac_cv_lib_rt_clock_gettime=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_rt_clock_gettime" >&5 +-printf "%s\n" "$ac_cv_lib_rt_clock_gettime" >&6; } +-if test "x$ac_cv_lib_rt_clock_gettime" = xyes +-then : ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_clock_gettime" >&5 ++$as_echo "$ac_cv_lib_rt_clock_gettime" >&6; } ++if test "x$ac_cv_lib_rt_clock_gettime" = xyes; then : + + LIBS="$LIBS -lrt" +- printf "%s\n" "#define HAVE_CLOCK_GETTIME 1" >>confdefs.h ++ $as_echo "#define HAVE_CLOCK_GETTIME 1" >>confdefs.h + + +-printf "%s\n" "#define TIMEMODULE_LIB rt" >>confdefs.h ++$as_echo "#define TIMEMODULE_LIB rt" >>confdefs.h + + + fi + + + fi +- + done + + +- for ac_func in clock_getres ++for ac_func in clock_getres + do : + ac_fn_c_check_func "$LINENO" "clock_getres" "ac_cv_func_clock_getres" +-if test "x$ac_cv_func_clock_getres" = xyes +-then : +- printf "%s\n" "#define HAVE_CLOCK_GETRES 1" >>confdefs.h +- +-else $as_nop +- +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for clock_getres in -lrt" >&5 +-printf %s "checking for clock_getres in -lrt... " >&6; } +-if test ${ac_cv_lib_rt_clock_getres+y} +-then : +- printf %s "(cached) " >&6 +-else $as_nop ++if test "x$ac_cv_func_clock_getres" = xyes; then : ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_CLOCK_GETRES 1 ++_ACEOF ++ ++else ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for clock_getres in -lrt" >&5 ++$as_echo_n "checking for clock_getres in -lrt... " >&6; } ++if ${ac_cv_lib_rt_clock_getres+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lrt $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -15517,56 +13345,56 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* 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 clock_getres (); + int +-main (void) ++main () + { + return clock_getres (); + ; + return 0; + } + _ACEOF +-if ac_fn_c_try_link "$LINENO" +-then : ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_rt_clock_getres=yes +-else $as_nop ++else + ac_cv_lib_rt_clock_getres=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_rt_clock_getres" >&5 +-printf "%s\n" "$ac_cv_lib_rt_clock_getres" >&6; } +-if test "x$ac_cv_lib_rt_clock_getres" = xyes +-then : ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_clock_getres" >&5 ++$as_echo "$ac_cv_lib_rt_clock_getres" >&6; } ++if test "x$ac_cv_lib_rt_clock_getres" = xyes; then : + +- printf "%s\n" "#define HAVE_CLOCK_GETRES 1" >>confdefs.h ++ $as_echo "#define HAVE_CLOCK_GETRES 1" >>confdefs.h + + + fi + + + fi +- + done + + +- for ac_func in clock_settime ++for ac_func in clock_settime + do : + ac_fn_c_check_func "$LINENO" "clock_settime" "ac_cv_func_clock_settime" +-if test "x$ac_cv_func_clock_settime" = xyes +-then : +- printf "%s\n" "#define HAVE_CLOCK_SETTIME 1" >>confdefs.h +- +-else $as_nop +- +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for clock_settime in -lrt" >&5 +-printf %s "checking for clock_settime in -lrt... " >&6; } +-if test ${ac_cv_lib_rt_clock_settime+y} +-then : +- printf %s "(cached) " >&6 +-else $as_nop ++if test "x$ac_cv_func_clock_settime" = xyes; then : ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_CLOCK_SETTIME 1 ++_ACEOF ++ ++else ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for clock_settime in -lrt" >&5 ++$as_echo_n "checking for clock_settime in -lrt... " >&6; } ++if ${ac_cv_lib_rt_clock_settime+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lrt $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -15575,42 +13403,43 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* 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 clock_settime (); + int +-main (void) ++main () + { + return clock_settime (); + ; + return 0; + } + _ACEOF +-if ac_fn_c_try_link "$LINENO" +-then : ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_rt_clock_settime=yes +-else $as_nop ++else + ac_cv_lib_rt_clock_settime=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_rt_clock_settime" >&5 +-printf "%s\n" "$ac_cv_lib_rt_clock_settime" >&6; } +-if test "x$ac_cv_lib_rt_clock_settime" = xyes +-then : ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_clock_settime" >&5 ++$as_echo "$ac_cv_lib_rt_clock_settime" >&6; } ++if test "x$ac_cv_lib_rt_clock_settime" = xyes; then : + +- printf "%s\n" "#define HAVE_CLOCK_SETTIME 1" >>confdefs.h ++ $as_echo "#define HAVE_CLOCK_SETTIME 1" >>confdefs.h + + + fi + + + fi +- + done + +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for major" >&5 +-printf %s "checking for major... " >&6; } ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for major" >&5 ++$as_echo_n "checking for major... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -15623,7 +13452,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + #endif + + int +-main (void) ++main () + { + + makedev(major(0),minor(0)); +@@ -15632,28 +13461,27 @@ main (void) + return 0; + } + _ACEOF +-if ac_fn_c_try_link "$LINENO" +-then : ++if ac_fn_c_try_link "$LINENO"; then : + + +-printf "%s\n" "#define HAVE_DEVICE_MACROS 1" >>confdefs.h ++$as_echo "#define HAVE_DEVICE_MACROS 1" >>confdefs.h + +- { 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_nop ++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 +-rm -f core conftest.err conftest.$ac_objext conftest.beam \ ++rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + + # On OSF/1 V5.1, getaddrinfo is available, but a define + # for [no]getaddrinfo in netdb.h. +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for getaddrinfo" >&5 +-printf %s "checking for getaddrinfo... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for getaddrinfo" >&5 ++$as_echo_n "checking for getaddrinfo... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -15663,40 +13491,37 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + #include + + int +-main (void) ++main () + { + getaddrinfo(NULL, NULL, NULL, NULL); + ; + return 0; + } + _ACEOF +-if ac_fn_c_try_link "$LINENO" +-then : ++if ac_fn_c_try_link "$LINENO"; then : + have_getaddrinfo=yes +-else $as_nop ++else + have_getaddrinfo=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 +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $have_getaddrinfo" >&5 +-printf "%s\n" "$have_getaddrinfo" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_getaddrinfo" >&5 ++$as_echo "$have_getaddrinfo" >&6; } + if test $have_getaddrinfo = yes + then +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking getaddrinfo bug" >&5 +-printf %s "checking getaddrinfo bug... " >&6; } +- if test ${ac_cv_buggy_getaddrinfo+y} +-then : +- printf %s "(cached) " >&6 +-else $as_nop +- if test "$cross_compiling" = yes +-then : ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking getaddrinfo bug" >&5 ++$as_echo_n "checking getaddrinfo bug... " >&6; } ++ if ${ac_cv_buggy_getaddrinfo+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test "$cross_compiling" = yes; then : + + if test "${enable_ipv6+set}" = set; then + ac_cv_buggy_getaddrinfo="no -- configured with --(en|dis)able-ipv6" + else + ac_cv_buggy_getaddrinfo=yes + fi +-else $as_nop ++else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -15790,10 +13615,9 @@ int main() + } + + _ACEOF +-if ac_fn_c_try_run "$LINENO" +-then : ++if ac_fn_c_try_run "$LINENO"; then : + ac_cv_buggy_getaddrinfo=no +-else $as_nop ++else + ac_cv_buggy_getaddrinfo=yes + fi + rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ +@@ -15804,8 +13628,8 @@ fi + + fi + +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_buggy_getaddrinfo" >&5 +-printf "%s\n" "$ac_cv_buggy_getaddrinfo" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_buggy_getaddrinfo" >&5 ++$as_echo "$ac_cv_buggy_getaddrinfo" >&6; } + + if test $have_getaddrinfo = no || test "$ac_cv_buggy_getaddrinfo" = yes + then +@@ -15817,42 +13641,70 @@ then + fi + else + +-printf "%s\n" "#define HAVE_GETADDRINFO 1" >>confdefs.h ++$as_echo "#define HAVE_GETADDRINFO 1" >>confdefs.h + + fi + +-ac_fn_c_check_func "$LINENO" "getnameinfo" "ac_cv_func_getnameinfo" +-if test "x$ac_cv_func_getnameinfo" = xyes +-then : +- printf "%s\n" "#define HAVE_GETNAMEINFO 1" >>confdefs.h ++for ac_func in getnameinfo ++do : ++ ac_fn_c_check_func "$LINENO" "getnameinfo" "ac_cv_func_getnameinfo" ++if test "x$ac_cv_func_getnameinfo" = xyes; then : ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_GETNAMEINFO 1 ++_ACEOF + + fi ++done + + + # checks for structures ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5 ++$as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; } ++if ${ac_cv_header_time+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#include ++#include ++#include + ++int ++main () ++{ ++if ((struct tm *) 0) ++return 0; ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ ac_cv_header_time=yes ++else ++ ac_cv_header_time=no ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_time" >&5 ++$as_echo "$ac_cv_header_time" >&6; } ++if test $ac_cv_header_time = yes; then + +-# Obsolete code to be removed. +-if test $ac_cv_header_sys_time_h = yes; then +- +-printf "%s\n" "#define TIME_WITH_SYS_TIME 1" >>confdefs.h ++$as_echo "#define TIME_WITH_SYS_TIME 1" >>confdefs.h + + fi +-# End of obsolete code. + +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether struct tm is in sys/time.h or time.h" >&5 +-printf %s "checking whether struct tm is in sys/time.h or time.h... " >&6; } +-if test ${ac_cv_struct_tm+y} +-then : +- printf %s "(cached) " >&6 +-else $as_nop ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether struct tm is in sys/time.h or time.h" >&5 ++$as_echo_n "checking whether struct tm is in sys/time.h or time.h... " >&6; } ++if ${ac_cv_struct_tm+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + #include + + int +-main (void) ++main () + { + struct tm tm; + int *p = &tm.tm_sec; +@@ -15861,19 +13713,18 @@ struct tm tm; + return 0; + } + _ACEOF +-if ac_fn_c_try_compile "$LINENO" +-then : ++if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_struct_tm=time.h +-else $as_nop ++else + ac_cv_struct_tm=sys/time.h + 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: $ac_cv_struct_tm" >&5 +-printf "%s\n" "$ac_cv_struct_tm" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_tm" >&5 ++$as_echo "$ac_cv_struct_tm" >&6; } + if test $ac_cv_struct_tm = sys/time.h; then + +-printf "%s\n" "#define TM_IN_SYS_TIME 1" >>confdefs.h ++$as_echo "#define TM_IN_SYS_TIME 1" >>confdefs.h + + fi + +@@ -15881,35 +13732,37 @@ ac_fn_c_check_member "$LINENO" "struct tm" "tm_zone" "ac_cv_member_struct_tm_tm_ + #include <$ac_cv_struct_tm> + + " +-if test "x$ac_cv_member_struct_tm_tm_zone" = xyes +-then : ++if test "x$ac_cv_member_struct_tm_tm_zone" = xyes; then : + +-printf "%s\n" "#define HAVE_STRUCT_TM_TM_ZONE 1" >>confdefs.h ++cat >>confdefs.h <<_ACEOF ++#define HAVE_STRUCT_TM_TM_ZONE 1 ++_ACEOF + + + fi + + if test "$ac_cv_member_struct_tm_tm_zone" = yes; then + +-printf "%s\n" "#define HAVE_TM_ZONE 1" >>confdefs.h ++$as_echo "#define HAVE_TM_ZONE 1" >>confdefs.h + + else +- ac_fn_check_decl "$LINENO" "tzname" "ac_cv_have_decl_tzname" "#include +-" "$ac_c_undeclared_builtin_options" "CFLAGS" +-if test "x$ac_cv_have_decl_tzname" = xyes +-then : ++ ac_fn_c_check_decl "$LINENO" "tzname" "ac_cv_have_decl_tzname" "#include ++" ++if test "x$ac_cv_have_decl_tzname" = xyes; then : + ac_have_decl=1 +-else $as_nop ++else + ac_have_decl=0 + fi +-printf "%s\n" "#define HAVE_DECL_TZNAME $ac_have_decl" >>confdefs.h + +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for tzname" >&5 +-printf %s "checking for tzname... " >&6; } +-if test ${ac_cv_var_tzname+y} +-then : +- printf %s "(cached) " >&6 +-else $as_nop ++cat >>confdefs.h <<_ACEOF ++#define HAVE_DECL_TZNAME $ac_have_decl ++_ACEOF ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tzname" >&5 ++$as_echo_n "checking for tzname... " >&6; } ++if ${ac_cv_var_tzname+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include +@@ -15918,81 +13771,86 @@ extern char *tzname[]; + #endif + + int +-main (void) ++main () + { + return tzname[0][0]; + ; + return 0; + } + _ACEOF +-if ac_fn_c_try_link "$LINENO" +-then : ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_var_tzname=yes +-else $as_nop ++else + ac_cv_var_tzname=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: $ac_cv_var_tzname" >&5 +-printf "%s\n" "$ac_cv_var_tzname" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_var_tzname" >&5 ++$as_echo "$ac_cv_var_tzname" >&6; } + if test $ac_cv_var_tzname = yes; then + +-printf "%s\n" "#define HAVE_TZNAME 1" >>confdefs.h ++$as_echo "#define HAVE_TZNAME 1" >>confdefs.h + + fi + fi + + ac_fn_c_check_member "$LINENO" "struct stat" "st_rdev" "ac_cv_member_struct_stat_st_rdev" "$ac_includes_default" +-if test "x$ac_cv_member_struct_stat_st_rdev" = xyes +-then : ++if test "x$ac_cv_member_struct_stat_st_rdev" = xyes; then : + +-printf "%s\n" "#define HAVE_STRUCT_STAT_ST_RDEV 1" >>confdefs.h ++cat >>confdefs.h <<_ACEOF ++#define HAVE_STRUCT_STAT_ST_RDEV 1 ++_ACEOF + + + fi + + ac_fn_c_check_member "$LINENO" "struct stat" "st_blksize" "ac_cv_member_struct_stat_st_blksize" "$ac_includes_default" +-if test "x$ac_cv_member_struct_stat_st_blksize" = xyes +-then : ++if test "x$ac_cv_member_struct_stat_st_blksize" = xyes; then : + +-printf "%s\n" "#define HAVE_STRUCT_STAT_ST_BLKSIZE 1" >>confdefs.h ++cat >>confdefs.h <<_ACEOF ++#define HAVE_STRUCT_STAT_ST_BLKSIZE 1 ++_ACEOF + + + fi + + ac_fn_c_check_member "$LINENO" "struct stat" "st_flags" "ac_cv_member_struct_stat_st_flags" "$ac_includes_default" +-if test "x$ac_cv_member_struct_stat_st_flags" = xyes +-then : ++if test "x$ac_cv_member_struct_stat_st_flags" = xyes; then : + +-printf "%s\n" "#define HAVE_STRUCT_STAT_ST_FLAGS 1" >>confdefs.h ++cat >>confdefs.h <<_ACEOF ++#define HAVE_STRUCT_STAT_ST_FLAGS 1 ++_ACEOF + + + fi + + ac_fn_c_check_member "$LINENO" "struct stat" "st_gen" "ac_cv_member_struct_stat_st_gen" "$ac_includes_default" +-if test "x$ac_cv_member_struct_stat_st_gen" = xyes +-then : ++if test "x$ac_cv_member_struct_stat_st_gen" = xyes; then : + +-printf "%s\n" "#define HAVE_STRUCT_STAT_ST_GEN 1" >>confdefs.h ++cat >>confdefs.h <<_ACEOF ++#define HAVE_STRUCT_STAT_ST_GEN 1 ++_ACEOF + + + fi + + ac_fn_c_check_member "$LINENO" "struct stat" "st_birthtime" "ac_cv_member_struct_stat_st_birthtime" "$ac_includes_default" +-if test "x$ac_cv_member_struct_stat_st_birthtime" = xyes +-then : ++if test "x$ac_cv_member_struct_stat_st_birthtime" = xyes; then : + +-printf "%s\n" "#define HAVE_STRUCT_STAT_ST_BIRTHTIME 1" >>confdefs.h ++cat >>confdefs.h <<_ACEOF ++#define HAVE_STRUCT_STAT_ST_BIRTHTIME 1 ++_ACEOF + + + fi + + ac_fn_c_check_member "$LINENO" "struct stat" "st_blocks" "ac_cv_member_struct_stat_st_blocks" "$ac_includes_default" +-if test "x$ac_cv_member_struct_stat_st_blocks" = xyes +-then : ++if test "x$ac_cv_member_struct_stat_st_blocks" = xyes; then : + +-printf "%s\n" "#define HAVE_STRUCT_STAT_ST_BLOCKS 1" >>confdefs.h ++cat >>confdefs.h <<_ACEOF ++#define HAVE_STRUCT_STAT_ST_BLOCKS 1 ++_ACEOF + + + fi +@@ -16002,10 +13860,11 @@ ac_fn_c_check_member "$LINENO" "struct passwd" "pw_gecos" "ac_cv_member_struct_p + #include + + " +-if test "x$ac_cv_member_struct_passwd_pw_gecos" = xyes +-then : ++if test "x$ac_cv_member_struct_passwd_pw_gecos" = xyes; then : + +-printf "%s\n" "#define HAVE_STRUCT_PASSWD_PW_GECOS 1" >>confdefs.h ++cat >>confdefs.h <<_ACEOF ++#define HAVE_STRUCT_PASSWD_PW_GECOS 1 ++_ACEOF + + + fi +@@ -16014,10 +13873,11 @@ ac_fn_c_check_member "$LINENO" "struct passwd" "pw_passwd" "ac_cv_member_struct_ + #include + + " +-if test "x$ac_cv_member_struct_passwd_pw_passwd" = xyes +-then : ++if test "x$ac_cv_member_struct_passwd_pw_passwd" = xyes; then : + +-printf "%s\n" "#define HAVE_STRUCT_PASSWD_PW_PASSWD 1" >>confdefs.h ++cat >>confdefs.h <<_ACEOF ++#define HAVE_STRUCT_PASSWD_PW_PASSWD 1 ++_ACEOF + + + fi +@@ -16025,54 +13885,53 @@ fi + # Issue #21085: In Cygwin, siginfo_t does not have si_band field. + ac_fn_c_check_member "$LINENO" "siginfo_t" "si_band" "ac_cv_member_siginfo_t_si_band" "#include + " +-if test "x$ac_cv_member_siginfo_t_si_band" = xyes +-then : ++if test "x$ac_cv_member_siginfo_t_si_band" = xyes; then : + +-printf "%s\n" "#define HAVE_SIGINFO_T_SI_BAND 1" >>confdefs.h ++cat >>confdefs.h <<_ACEOF ++#define HAVE_SIGINFO_T_SI_BAND 1 ++_ACEOF + + + fi + + +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for time.h that defines altzone" >&5 +-printf %s "checking for time.h that defines altzone... " >&6; } +-if test ${ac_cv_header_time_altzone+y} +-then : +- printf %s "(cached) " >&6 +-else $as_nop ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for time.h that defines altzone" >&5 ++$as_echo_n "checking for time.h that defines altzone... " >&6; } ++if ${ac_cv_header_time_altzone+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + int +-main (void) ++main () + { + return altzone; + ; + return 0; + } + _ACEOF +-if ac_fn_c_try_compile "$LINENO" +-then : ++if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_header_time_altzone=yes +-else $as_nop ++else + ac_cv_header_time_altzone=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: $ac_cv_header_time_altzone" >&5 +-printf "%s\n" "$ac_cv_header_time_altzone" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_time_altzone" >&5 ++$as_echo "$ac_cv_header_time_altzone" >&6; } + if test $ac_cv_header_time_altzone = yes; then + +-printf "%s\n" "#define HAVE_ALTZONE 1" >>confdefs.h ++$as_echo "#define HAVE_ALTZONE 1" >>confdefs.h + + fi + + was_it_defined=no +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether sys/select.h and sys/time.h may both be included" >&5 +-printf %s "checking whether sys/select.h and sys/time.h may both be included... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether sys/select.h and sys/time.h may both be included" >&5 ++$as_echo_n "checking whether sys/select.h and sys/time.h may both be included... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -16081,102 +13940,96 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + #include + + int +-main (void) ++main () + { + ; + ; + return 0; + } + _ACEOF +-if ac_fn_c_try_compile "$LINENO" +-then : ++if ac_fn_c_try_compile "$LINENO"; then : + + +-printf "%s\n" "#define SYS_SELECT_WITH_SYS_TIME 1" >>confdefs.h ++$as_echo "#define SYS_SELECT_WITH_SYS_TIME 1" >>confdefs.h + + was_it_defined=yes + + fi +-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $was_it_defined" >&5 +-printf "%s\n" "$was_it_defined" >&6; } ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $was_it_defined" >&5 ++$as_echo "$was_it_defined" >&6; } + +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for addrinfo" >&5 +-printf %s "checking for addrinfo... " >&6; } +-if test ${ac_cv_struct_addrinfo+y} +-then : +- printf %s "(cached) " >&6 +-else $as_nop ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for addrinfo" >&5 ++$as_echo_n "checking for addrinfo... " >&6; } ++if ${ac_cv_struct_addrinfo+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + int +-main (void) ++main () + { + struct addrinfo a + ; + return 0; + } + _ACEOF +-if ac_fn_c_try_compile "$LINENO" +-then : ++if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_struct_addrinfo=yes +-else $as_nop ++else + ac_cv_struct_addrinfo=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: $ac_cv_struct_addrinfo" >&5 +-printf "%s\n" "$ac_cv_struct_addrinfo" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_addrinfo" >&5 ++$as_echo "$ac_cv_struct_addrinfo" >&6; } + if test $ac_cv_struct_addrinfo = yes; then + +-printf "%s\n" "#define HAVE_ADDRINFO 1" >>confdefs.h ++$as_echo "#define HAVE_ADDRINFO 1" >>confdefs.h + + fi + +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sockaddr_storage" >&5 +-printf %s "checking for sockaddr_storage... " >&6; } +-if test ${ac_cv_struct_sockaddr_storage+y} +-then : +- printf %s "(cached) " >&6 +-else $as_nop ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sockaddr_storage" >&5 ++$as_echo_n "checking for sockaddr_storage... " >&6; } ++if ${ac_cv_struct_sockaddr_storage+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + # include + # include + int +-main (void) ++main () + { + struct sockaddr_storage s + ; + return 0; + } + _ACEOF +-if ac_fn_c_try_compile "$LINENO" +-then : ++if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_struct_sockaddr_storage=yes +-else $as_nop ++else + ac_cv_struct_sockaddr_storage=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: $ac_cv_struct_sockaddr_storage" >&5 +-printf "%s\n" "$ac_cv_struct_sockaddr_storage" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_sockaddr_storage" >&5 ++$as_echo "$ac_cv_struct_sockaddr_storage" >&6; } + if test $ac_cv_struct_sockaddr_storage = yes; then + +-printf "%s\n" "#define HAVE_SOCKADDR_STORAGE 1" >>confdefs.h ++$as_echo "#define HAVE_SOCKADDR_STORAGE 1" >>confdefs.h + + fi + +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sockaddr_alg" >&5 +-printf %s "checking for sockaddr_alg... " >&6; } +-if test ${ac_cv_struct_sockaddr_alg+y} +-then : +- printf %s "(cached) " >&6 +-else $as_nop ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sockaddr_alg" >&5 ++$as_echo_n "checking for sockaddr_alg... " >&6; } ++if ${ac_cv_struct_sockaddr_alg+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -16184,43 +14037,41 @@ else $as_nop + # include + # include + int +-main (void) ++main () + { + struct sockaddr_alg s + ; + return 0; + } + _ACEOF +-if ac_fn_c_try_compile "$LINENO" +-then : ++if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_struct_sockaddr_alg=yes +-else $as_nop ++else + ac_cv_struct_sockaddr_alg=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: $ac_cv_struct_sockaddr_alg" >&5 +-printf "%s\n" "$ac_cv_struct_sockaddr_alg" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_sockaddr_alg" >&5 ++$as_echo "$ac_cv_struct_sockaddr_alg" >&6; } + if test $ac_cv_struct_sockaddr_alg = yes; then + +-printf "%s\n" "#define HAVE_SOCKADDR_ALG 1" >>confdefs.h ++$as_echo "#define HAVE_SOCKADDR_ALG 1" >>confdefs.h + + fi + + # checks for compiler characteristics + +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether char is unsigned" >&5 +-printf %s "checking whether char is unsigned... " >&6; } +-if test ${ac_cv_c_char_unsigned+y} +-then : +- printf %s "(cached) " >&6 +-else $as_nop ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether char is unsigned" >&5 ++$as_echo_n "checking whether char is unsigned... " >&6; } ++if ${ac_cv_c_char_unsigned+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + $ac_includes_default + int +-main (void) ++main () + { + static int test_array [1 - 2 * !(((char) -1) < 0)]; + test_array [0] = 0; +@@ -16230,32 +14081,30 @@ return test_array [0]; + return 0; + } + _ACEOF +-if ac_fn_c_try_compile "$LINENO" +-then : ++if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_c_char_unsigned=no +-else $as_nop ++else + ac_cv_c_char_unsigned=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 +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_char_unsigned" >&5 +-printf "%s\n" "$ac_cv_c_char_unsigned" >&6; } +-if test $ac_cv_c_char_unsigned = yes; then +- printf "%s\n" "#define __CHAR_UNSIGNED__ 1" >>confdefs.h ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_char_unsigned" >&5 ++$as_echo "$ac_cv_c_char_unsigned" >&6; } ++if test $ac_cv_c_char_unsigned = yes && test "$GCC" != yes; then ++ $as_echo "#define __CHAR_UNSIGNED__ 1" >>confdefs.h + + fi + +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5 +-printf %s "checking for an ANSI C-conforming const... " >&6; } +-if test ${ac_cv_c_const+y} +-then : +- printf %s "(cached) " >&6 +-else $as_nop ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5 ++$as_echo_n "checking for an ANSI C-conforming const... " >&6; } ++if ${ac_cv_c_const+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +-main (void) ++main () + { + + #ifndef __cplusplus +@@ -16268,7 +14117,7 @@ main (void) + /* NEC SVR4.0.2 mips cc rejects this. */ + struct point {int x, y;}; + static struct point const zero = {0,0}; +- /* IBM XL C 1.02.0.0 rejects this. ++ /* AIX XL C 1.02.0.0 rejects this. + It does not let you subtract one const X* pointer from another in + an arm of an if-expression whose if-part is not a constant + expression */ +@@ -16296,7 +14145,7 @@ main (void) + iptr p = 0; + ++p; + } +- { /* IBM XL C 1.02.0.0 rejects this sort of thing, saying ++ { /* AIX XL C 1.02.0.0 rejects this sort of thing, saying + "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ + struct s { int j; const int *ap[3]; } bx; + struct s *b = &bx; b->j = 5; +@@ -16312,78 +14161,75 @@ main (void) + return 0; + } + _ACEOF +-if ac_fn_c_try_compile "$LINENO" +-then : ++if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_c_const=yes +-else $as_nop ++else + ac_cv_c_const=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: $ac_cv_c_const" >&5 +-printf "%s\n" "$ac_cv_c_const" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5 ++$as_echo "$ac_cv_c_const" >&6; } + if test $ac_cv_c_const = no; then + +-printf "%s\n" "#define const /**/" >>confdefs.h ++$as_echo "#define const /**/" >>confdefs.h + + fi + + + works=no +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working signed char" >&5 +-printf %s "checking for working signed char... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working signed char" >&5 ++$as_echo_n "checking for working signed char... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +-main (void) ++main () + { + signed char c; + ; + return 0; + } + _ACEOF +-if ac_fn_c_try_compile "$LINENO" +-then : ++if ac_fn_c_try_compile "$LINENO"; then : + works=yes +-else $as_nop ++else + +-printf "%s\n" "#define signed /**/" >>confdefs.h ++$as_echo "#define signed /**/" >>confdefs.h + + + fi +-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $works" >&5 +-printf "%s\n" "$works" >&6; } ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $works" >&5 ++$as_echo "$works" >&6; } + + have_prototypes=no +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for prototypes" >&5 +-printf %s "checking for prototypes... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for prototypes" >&5 ++$as_echo_n "checking for prototypes... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + int foo(int x) { return 0; } + int +-main (void) ++main () + { + return foo(10); + ; + return 0; + } + _ACEOF +-if ac_fn_c_try_compile "$LINENO" +-then : ++if ac_fn_c_try_compile "$LINENO"; then : + +-printf "%s\n" "#define HAVE_PROTOTYPES 1" >>confdefs.h ++$as_echo "#define HAVE_PROTOTYPES 1" >>confdefs.h + + have_prototypes=yes + fi +-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $have_prototypes" >&5 +-printf "%s\n" "$have_prototypes" >&6; } ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_prototypes" >&5 ++$as_echo "$have_prototypes" >&6; } + + works=no +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for variable length prototypes and stdarg.h" >&5 +-printf %s "checking for variable length prototypes and stdarg.h... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for variable length prototypes and stdarg.h" >&5 ++$as_echo_n "checking for variable length prototypes and stdarg.h... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -16398,29 +14244,28 @@ int foo(int x, ...) { + } + + int +-main (void) ++main () + { + return foo(10, "", 3.14); + ; + return 0; + } + _ACEOF +-if ac_fn_c_try_compile "$LINENO" +-then : ++if ac_fn_c_try_compile "$LINENO"; then : + + +-printf "%s\n" "#define HAVE_STDARG_PROTOTYPES 1" >>confdefs.h ++$as_echo "#define HAVE_STDARG_PROTOTYPES 1" >>confdefs.h + + works=yes + + fi +-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $works" >&5 +-printf "%s\n" "$works" >&6; } ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $works" >&5 ++$as_echo "$works" >&6; } + + # check for socketpair +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for socketpair" >&5 +-printf %s "checking for socketpair... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for socketpair" >&5 ++$as_echo_n "checking for socketpair... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -16428,36 +14273,35 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + #include + + int +-main (void) ++main () + { + void *x=socketpair + ; + return 0; + } + _ACEOF +-if ac_fn_c_try_compile "$LINENO" +-then : ++if ac_fn_c_try_compile "$LINENO"; then : + +-printf "%s\n" "#define HAVE_SOCKETPAIR 1" >>confdefs.h ++$as_echo "#define HAVE_SOCKETPAIR 1" >>confdefs.h + +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-printf "%s\n" "yes" >&6; } +-else $as_nop +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-printf "%s\n" "no" >&6; } ++ { $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 +-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + # check if sockaddr has sa_len member +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if sockaddr has sa_len member" >&5 +-printf %s "checking if sockaddr has sa_len member... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if sockaddr has sa_len member" >&5 ++$as_echo_n "checking if sockaddr has sa_len member... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + #include + int +-main (void) ++main () + { + struct sockaddr x; + x.sa_len = 0; +@@ -16465,31 +14309,29 @@ x.sa_len = 0; + return 0; + } + _ACEOF +-if ac_fn_c_try_compile "$LINENO" +-then : +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-printf "%s\n" "yes" >&6; } ++if ac_fn_c_try_compile "$LINENO"; then : ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; } + +-printf "%s\n" "#define HAVE_SOCKADDR_SA_LEN 1" >>confdefs.h ++$as_echo "#define HAVE_SOCKADDR_SA_LEN 1" >>confdefs.h + +-else $as_nop +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-printf "%s\n" "no" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } + + 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 + + # sigh -- gethostbyname_r is a mess; it can have 3, 5 or 6 arguments :-( + + + ac_fn_c_check_func "$LINENO" "gethostbyname_r" "ac_cv_func_gethostbyname_r" +-if test "x$ac_cv_func_gethostbyname_r" = xyes +-then : ++if test "x$ac_cv_func_gethostbyname_r" = xyes; then : + +- printf "%s\n" "#define HAVE_GETHOSTBYNAME_R 1" >>confdefs.h ++ $as_echo "#define HAVE_GETHOSTBYNAME_R 1" >>confdefs.h + +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking gethostbyname_r with 6 args" >&5 +-printf %s "checking gethostbyname_r with 6 args... " >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking gethostbyname_r with 6 args" >&5 ++$as_echo_n "checking gethostbyname_r with 6 args... " >&6; } + OLD_CFLAGS=$CFLAGS + CFLAGS="$CFLAGS $MY_CPPFLAGS $MY_THREAD_CPPFLAGS $MY_CFLAGS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -16498,7 +14340,7 @@ printf %s "checking gethostbyname_r with 6 args... " >&6; } + # include + + int +-main (void) ++main () + { + + char *name; +@@ -16513,30 +14355,29 @@ main (void) + return 0; + } + _ACEOF +-if ac_fn_c_try_compile "$LINENO" +-then : ++if ac_fn_c_try_compile "$LINENO"; then : + +- printf "%s\n" "#define HAVE_GETHOSTBYNAME_R 1" >>confdefs.h ++ $as_echo "#define HAVE_GETHOSTBYNAME_R 1" >>confdefs.h + + +-printf "%s\n" "#define HAVE_GETHOSTBYNAME_R_6_ARG 1" >>confdefs.h ++$as_echo "#define HAVE_GETHOSTBYNAME_R_6_ARG 1" >>confdefs.h + +- { 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_nop ++else + +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-printf "%s\n" "no" >&6; } +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking gethostbyname_r with 5 args" >&5 +-printf %s "checking gethostbyname_r with 5 args... " >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking gethostbyname_r with 5 args" >&5 ++$as_echo_n "checking gethostbyname_r with 5 args... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + # include + + int +-main (void) ++main () + { + + char *name; +@@ -16551,30 +14392,29 @@ main (void) + return 0; + } + _ACEOF +-if ac_fn_c_try_compile "$LINENO" +-then : ++if ac_fn_c_try_compile "$LINENO"; then : + +- printf "%s\n" "#define HAVE_GETHOSTBYNAME_R 1" >>confdefs.h ++ $as_echo "#define HAVE_GETHOSTBYNAME_R 1" >>confdefs.h + + +-printf "%s\n" "#define HAVE_GETHOSTBYNAME_R_5_ARG 1" >>confdefs.h ++$as_echo "#define HAVE_GETHOSTBYNAME_R_5_ARG 1" >>confdefs.h + +- { 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_nop ++else + +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-printf "%s\n" "no" >&6; } +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking gethostbyname_r with 3 args" >&5 +-printf %s "checking gethostbyname_r with 3 args... " >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking gethostbyname_r with 3 args" >&5 ++$as_echo_n "checking gethostbyname_r with 3 args... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + # include + + int +-main (void) ++main () + { + + char *name; +@@ -16587,40 +14427,43 @@ main (void) + return 0; + } + _ACEOF +-if ac_fn_c_try_compile "$LINENO" +-then : ++if ac_fn_c_try_compile "$LINENO"; then : + +- printf "%s\n" "#define HAVE_GETHOSTBYNAME_R 1" >>confdefs.h ++ $as_echo "#define HAVE_GETHOSTBYNAME_R 1" >>confdefs.h + + +-printf "%s\n" "#define HAVE_GETHOSTBYNAME_R_3_ARG 1" >>confdefs.h ++$as_echo "#define HAVE_GETHOSTBYNAME_R_3_ARG 1" >>confdefs.h + +- { 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_nop ++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 +-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 + CFLAGS=$OLD_CFLAGS + +-else $as_nop ++else + ++ for ac_func in gethostbyname ++do : + ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname" +-if test "x$ac_cv_func_gethostbyname" = xyes +-then : +- printf "%s\n" "#define HAVE_GETHOSTBYNAME 1" >>confdefs.h ++if test "x$ac_cv_func_gethostbyname" = xyes; then : ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_GETHOSTBYNAME 1 ++_ACEOF + + fi ++done + + + fi +@@ -16636,16 +14479,14 @@ fi + + # Linux requires this for correct f.p. operations + ac_fn_c_check_func "$LINENO" "__fpu_control" "ac_cv_func___fpu_control" +-if test "x$ac_cv_func___fpu_control" = xyes +-then : +- +-else $as_nop +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __fpu_control in -lieee" >&5 +-printf %s "checking for __fpu_control in -lieee... " >&6; } +-if test ${ac_cv_lib_ieee___fpu_control+y} +-then : +- printf %s "(cached) " >&6 +-else $as_nop ++if test "x$ac_cv_func___fpu_control" = xyes; then : ++ ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __fpu_control in -lieee" >&5 ++$as_echo_n "checking for __fpu_control in -lieee... " >&6; } ++if ${ac_cv_lib_ieee___fpu_control+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lieee $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -16654,30 +14495,33 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* 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 __fpu_control (); + int +-main (void) ++main () + { + return __fpu_control (); + ; + return 0; + } + _ACEOF +-if ac_fn_c_try_link "$LINENO" +-then : ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_ieee___fpu_control=yes +-else $as_nop ++else + ac_cv_lib_ieee___fpu_control=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_ieee___fpu_control" >&5 +-printf "%s\n" "$ac_cv_lib_ieee___fpu_control" >&6; } +-if test "x$ac_cv_lib_ieee___fpu_control" = xyes +-then : +- printf "%s\n" "#define HAVE_LIBIEEE 1" >>confdefs.h ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ieee___fpu_control" >&5 ++$as_echo "$ac_cv_lib_ieee___fpu_control" >&6; } ++if test "x$ac_cv_lib_ieee___fpu_control" = xyes; then : ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_LIBIEEE 1 ++_ACEOF + + LIBS="-lieee $LIBS" + +@@ -16693,51 +14537,49 @@ case $ac_sys_system in + Darwin) ;; + *) LIBM=-lm + esac +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for --with-libm=STRING" >&5 +-printf %s "checking for --with-libm=STRING... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-libm=STRING" >&5 ++$as_echo_n "checking for --with-libm=STRING... " >&6; } + + # Check whether --with-libm was given. +-if test ${with_libm+y} +-then : ++if test "${with_libm+set}" = set; then : + withval=$with_libm; + if test "$withval" = no + then LIBM= +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: force LIBM empty" >&5 +-printf "%s\n" "force LIBM empty" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: force LIBM empty" >&5 ++$as_echo "force LIBM empty" >&6; } + elif test "$withval" != yes + then LIBM=$withval +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: set LIBM=\"$withval\"" >&5 +-printf "%s\n" "set LIBM=\"$withval\"" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: set LIBM=\"$withval\"" >&5 ++$as_echo "set LIBM=\"$withval\"" >&6; } + else as_fn_error $? "proper usage is --with-libm=STRING" "$LINENO" 5 + fi +-else $as_nop +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: default LIBM=\"$LIBM\"" >&5 +-printf "%s\n" "default LIBM=\"$LIBM\"" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: default LIBM=\"$LIBM\"" >&5 ++$as_echo "default LIBM=\"$LIBM\"" >&6; } + fi + + + # check for --with-libc=... + +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for --with-libc=STRING" >&5 +-printf %s "checking for --with-libc=STRING... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-libc=STRING" >&5 ++$as_echo_n "checking for --with-libc=STRING... " >&6; } + + # Check whether --with-libc was given. +-if test ${with_libc+y} +-then : ++if test "${with_libc+set}" = set; then : + withval=$with_libc; + if test "$withval" = no + then LIBC= +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: force LIBC empty" >&5 +-printf "%s\n" "force LIBC empty" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: force LIBC empty" >&5 ++$as_echo "force LIBC empty" >&6; } + elif test "$withval" != yes + then LIBC=$withval +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: set LIBC=\"$withval\"" >&5 +-printf "%s\n" "set LIBC=\"$withval\"" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: set LIBC=\"$withval\"" >&5 ++$as_echo "set LIBC=\"$withval\"" >&6; } + else as_fn_error $? "proper usage is --with-libc=STRING" "$LINENO" 5 + fi +-else $as_nop +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: default LIBC=\"$LIBC\"" >&5 +-printf "%s\n" "default LIBC=\"$LIBC\"" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: default LIBC=\"$LIBC\"" >&5 ++$as_echo "default LIBC=\"$LIBC\"" >&6; } + fi + + +@@ -16745,13 +14587,13 @@ fi + # * Check for gcc x64 inline assembler * + # ************************************** + +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for x64 gcc inline assembler" >&5 +-printf %s "checking for x64 gcc inline assembler... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for x64 gcc inline assembler" >&5 ++$as_echo_n "checking for x64 gcc inline assembler... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +-main (void) ++main () + { + + __asm__ __volatile__ ("movq %rcx, %rax"); +@@ -16760,20 +14602,19 @@ main (void) + return 0; + } + _ACEOF +-if ac_fn_c_try_link "$LINENO" +-then : ++if ac_fn_c_try_link "$LINENO"; then : + have_gcc_asm_for_x64=yes +-else $as_nop ++else + have_gcc_asm_for_x64=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 +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $have_gcc_asm_for_x64" >&5 +-printf "%s\n" "$have_gcc_asm_for_x64" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_gcc_asm_for_x64" >&5 ++$as_echo "$have_gcc_asm_for_x64" >&6; } + if test "$have_gcc_asm_for_x64" = yes + then + +-printf "%s\n" "#define HAVE_GCC_ASM_FOR_X64 1" >>confdefs.h ++$as_echo "#define HAVE_GCC_ASM_FOR_X64 1" >>confdefs.h + + fi + +@@ -16781,12 +14622,11 @@ fi + # * Check for various properties of floating point * + # ************************************************** + +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether float word ordering is bigendian" >&5 +-printf %s "checking whether float word ordering is bigendian... " >&6; } +-if test ${ax_cv_c_float_words_bigendian+y} +-then : +- printf %s "(cached) " >&6 +-else $as_nop ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether float word ordering is bigendian" >&5 ++$as_echo_n "checking whether float word ordering is bigendian... " >&6; } ++if ${ax_cv_c_float_words_bigendian+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else + + + ax_cv_c_float_words_bigendian=unknown +@@ -16798,8 +14638,7 @@ double d = 909042349670368103374704789055050114762116927356156320147971208440534 + + + _ACEOF +-if ac_fn_c_try_compile "$LINENO" +-then : ++if ac_fn_c_try_compile "$LINENO"; then : + + + if grep noonsees conftest.$ac_objext >/dev/null ; then +@@ -16815,15 +14654,15 @@ fi + + + 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: $ax_cv_c_float_words_bigendian" >&5 +-printf "%s\n" "$ax_cv_c_float_words_bigendian" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_c_float_words_bigendian" >&5 ++$as_echo "$ax_cv_c_float_words_bigendian" >&6; } + + case $ax_cv_c_float_words_bigendian in + yes) + +-printf "%s\n" "#define FLOAT_WORDS_BIGENDIAN 1" >>confdefs.h ++$as_echo "#define FLOAT_WORDS_BIGENDIAN 1" >>confdefs.h + ;; + no) + ;; +@@ -16840,12 +14679,12 @@ esac + if test "$ax_cv_c_float_words_bigendian" = "yes" + then + +-printf "%s\n" "#define DOUBLE_IS_BIG_ENDIAN_IEEE754 1" >>confdefs.h ++$as_echo "#define DOUBLE_IS_BIG_ENDIAN_IEEE754 1" >>confdefs.h + + elif test "$ax_cv_c_float_words_bigendian" = "no" + then + +-printf "%s\n" "#define DOUBLE_IS_LITTLE_ENDIAN_IEEE754 1" >>confdefs.h ++$as_echo "#define DOUBLE_IS_LITTLE_ENDIAN_IEEE754 1" >>confdefs.h + + else + # Some ARM platforms use a mixed-endian representation for doubles. +@@ -16855,7 +14694,7 @@ else + # FLOAT_WORDS_BIGENDIAN doesnt actually detect this case, but if it's not big + # or little, then it must be this? + +-printf "%s\n" "#define DOUBLE_IS_ARM_MIXED_ENDIAN_IEEE754 1" >>confdefs.h ++$as_echo "#define DOUBLE_IS_ARM_MIXED_ENDIAN_IEEE754 1" >>confdefs.h + + fi + +@@ -16869,13 +14708,13 @@ fi + # This inline assembler syntax may also work for suncc and icc, + # so we try it on all platforms. + +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we can use gcc inline assembler to get and set x87 control word" >&5 +-printf %s "checking whether we can use gcc inline assembler to get and set x87 control word... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we can use gcc inline assembler to get and set x87 control word" >&5 ++$as_echo_n "checking whether we can use gcc inline assembler to get and set x87 control word... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +-main (void) ++main () + { + + unsigned short cw; +@@ -16886,30 +14725,29 @@ main (void) + return 0; + } + _ACEOF +-if ac_fn_c_try_link "$LINENO" +-then : ++if ac_fn_c_try_link "$LINENO"; then : + have_gcc_asm_for_x87=yes +-else $as_nop ++else + have_gcc_asm_for_x87=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 +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $have_gcc_asm_for_x87" >&5 +-printf "%s\n" "$have_gcc_asm_for_x87" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_gcc_asm_for_x87" >&5 ++$as_echo "$have_gcc_asm_for_x87" >&6; } + if test "$have_gcc_asm_for_x87" = yes + then + +-printf "%s\n" "#define HAVE_GCC_ASM_FOR_X87 1" >>confdefs.h ++$as_echo "#define HAVE_GCC_ASM_FOR_X87 1" >>confdefs.h + + fi + +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we can use gcc inline assembler to get and set mc68881 fpcr" >&5 +-printf %s "checking whether we can use gcc inline assembler to get and set mc68881 fpcr... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we can use gcc inline assembler to get and set mc68881 fpcr" >&5 ++$as_echo_n "checking whether we can use gcc inline assembler to get and set mc68881 fpcr... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +-main (void) ++main () + { + + unsigned int fpcr; +@@ -16920,20 +14758,19 @@ main (void) + return 0; + } + _ACEOF +-if ac_fn_c_try_link "$LINENO" +-then : ++if ac_fn_c_try_link "$LINENO"; then : + have_gcc_asm_for_mc68881=yes +-else $as_nop ++else + have_gcc_asm_for_mc68881=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 +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $have_gcc_asm_for_mc68881" >&5 +-printf "%s\n" "$have_gcc_asm_for_mc68881" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_gcc_asm_for_mc68881" >&5 ++$as_echo "$have_gcc_asm_for_mc68881" >&6; } + if test "$have_gcc_asm_for_mc68881" = yes + then + +-printf "%s\n" "#define HAVE_GCC_ASM_FOR_MC68881 1" >>confdefs.h ++$as_echo "#define HAVE_GCC_ASM_FOR_MC68881 1" >>confdefs.h + + fi + +@@ -16942,15 +14779,14 @@ fi + # IEEE 754 platforms. On IEEE 754, test should return 1 if rounding + # mode is round-to-nearest and double rounding issues are present, and + # 0 otherwise. See http://bugs.python.org/issue2937 for more info. +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for x87-style double rounding" >&5 +-printf %s "checking for x87-style double rounding... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for x87-style double rounding" >&5 ++$as_echo_n "checking for x87-style double rounding... " >&6; } + # $BASECFLAGS may affect the result + ac_save_cc="$CC" + CC="$CC $BASECFLAGS" +-if test "$cross_compiling" = yes +-then : ++if test "$cross_compiling" = yes; then : + ac_cv_x87_double_rounding=no +-else $as_nop ++else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -16974,10 +14810,9 @@ int main() { + } + + _ACEOF +-if ac_fn_c_try_run "$LINENO" +-then : ++if ac_fn_c_try_run "$LINENO"; then : + ac_cv_x87_double_rounding=no +-else $as_nop ++else + ac_cv_x87_double_rounding=yes + fi + rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ +@@ -16985,12 +14820,12 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + fi + + CC="$ac_save_cc" +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_x87_double_rounding" >&5 +-printf "%s\n" "$ac_cv_x87_double_rounding" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_x87_double_rounding" >&5 ++$as_echo "$ac_cv_x87_double_rounding" >&6; } + if test "$ac_cv_x87_double_rounding" = yes + then + +-printf "%s\n" "#define X87_DOUBLE_ROUNDING 1" >>confdefs.h ++$as_echo "#define X87_DOUBLE_ROUNDING 1" >>confdefs.h + + fi + +@@ -17001,125 +14836,63 @@ fi + LIBS_SAVE=$LIBS + LIBS="$LIBS $LIBM" + +-ac_fn_c_check_func "$LINENO" "acosh" "ac_cv_func_acosh" +-if test "x$ac_cv_func_acosh" = xyes +-then : +- printf "%s\n" "#define HAVE_ACOSH 1" >>confdefs.h +- +-fi +-ac_fn_c_check_func "$LINENO" "asinh" "ac_cv_func_asinh" +-if test "x$ac_cv_func_asinh" = xyes +-then : +- printf "%s\n" "#define HAVE_ASINH 1" >>confdefs.h +- +-fi +-ac_fn_c_check_func "$LINENO" "atanh" "ac_cv_func_atanh" +-if test "x$ac_cv_func_atanh" = xyes +-then : +- printf "%s\n" "#define HAVE_ATANH 1" >>confdefs.h +- +-fi +-ac_fn_c_check_func "$LINENO" "copysign" "ac_cv_func_copysign" +-if test "x$ac_cv_func_copysign" = xyes +-then : +- printf "%s\n" "#define HAVE_COPYSIGN 1" >>confdefs.h +- +-fi +-ac_fn_c_check_func "$LINENO" "erf" "ac_cv_func_erf" +-if test "x$ac_cv_func_erf" = xyes +-then : +- printf "%s\n" "#define HAVE_ERF 1" >>confdefs.h +- +-fi +-ac_fn_c_check_func "$LINENO" "erfc" "ac_cv_func_erfc" +-if test "x$ac_cv_func_erfc" = xyes +-then : +- printf "%s\n" "#define HAVE_ERFC 1" >>confdefs.h +- +-fi +-ac_fn_c_check_func "$LINENO" "expm1" "ac_cv_func_expm1" +-if test "x$ac_cv_func_expm1" = xyes +-then : +- printf "%s\n" "#define HAVE_EXPM1 1" >>confdefs.h +- +-fi +-ac_fn_c_check_func "$LINENO" "finite" "ac_cv_func_finite" +-if test "x$ac_cv_func_finite" = xyes +-then : +- printf "%s\n" "#define HAVE_FINITE 1" >>confdefs.h +- +-fi +-ac_fn_c_check_func "$LINENO" "gamma" "ac_cv_func_gamma" +-if test "x$ac_cv_func_gamma" = xyes +-then : +- printf "%s\n" "#define HAVE_GAMMA 1" >>confdefs.h +- +-fi +- +-ac_fn_c_check_func "$LINENO" "hypot" "ac_cv_func_hypot" +-if test "x$ac_cv_func_hypot" = xyes +-then : +- printf "%s\n" "#define HAVE_HYPOT 1" >>confdefs.h +- +-fi +-ac_fn_c_check_func "$LINENO" "lgamma" "ac_cv_func_lgamma" +-if test "x$ac_cv_func_lgamma" = xyes +-then : +- printf "%s\n" "#define HAVE_LGAMMA 1" >>confdefs.h +- +-fi +-ac_fn_c_check_func "$LINENO" "log1p" "ac_cv_func_log1p" +-if test "x$ac_cv_func_log1p" = xyes +-then : +- printf "%s\n" "#define HAVE_LOG1P 1" >>confdefs.h +- +-fi +-ac_fn_c_check_func "$LINENO" "log2" "ac_cv_func_log2" +-if test "x$ac_cv_func_log2" = xyes +-then : +- printf "%s\n" "#define HAVE_LOG2 1" >>confdefs.h ++for ac_func in acosh asinh atanh copysign erf erfc expm1 finite gamma ++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 +-ac_fn_c_check_func "$LINENO" "round" "ac_cv_func_round" +-if test "x$ac_cv_func_round" = xyes +-then : +- printf "%s\n" "#define HAVE_ROUND 1" >>confdefs.h ++done + +-fi +-ac_fn_c_check_func "$LINENO" "tgamma" "ac_cv_func_tgamma" +-if test "x$ac_cv_func_tgamma" = xyes +-then : +- printf "%s\n" "#define HAVE_TGAMMA 1" >>confdefs.h ++for ac_func in hypot lgamma log1p log2 round tgamma ++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_check_decl "$LINENO" "isinf" "ac_cv_have_decl_isinf" "#include +-" "$ac_c_undeclared_builtin_options" "CFLAGS" +-if test "x$ac_cv_have_decl_isinf" = xyes +-then : ++ac_fn_c_check_decl "$LINENO" "isinf" "ac_cv_have_decl_isinf" "#include ++" ++if test "x$ac_cv_have_decl_isinf" = xyes; then : + ac_have_decl=1 +-else $as_nop ++else + ac_have_decl=0 + fi +-printf "%s\n" "#define HAVE_DECL_ISINF $ac_have_decl" >>confdefs.h +-ac_fn_check_decl "$LINENO" "isnan" "ac_cv_have_decl_isnan" "#include +-" "$ac_c_undeclared_builtin_options" "CFLAGS" +-if test "x$ac_cv_have_decl_isnan" = xyes +-then : ++ ++cat >>confdefs.h <<_ACEOF ++#define HAVE_DECL_ISINF $ac_have_decl ++_ACEOF ++ac_fn_c_check_decl "$LINENO" "isnan" "ac_cv_have_decl_isnan" "#include ++" ++if test "x$ac_cv_have_decl_isnan" = xyes; then : + ac_have_decl=1 +-else $as_nop ++else + ac_have_decl=0 + fi +-printf "%s\n" "#define HAVE_DECL_ISNAN $ac_have_decl" >>confdefs.h +-ac_fn_check_decl "$LINENO" "isfinite" "ac_cv_have_decl_isfinite" "#include +-" "$ac_c_undeclared_builtin_options" "CFLAGS" +-if test "x$ac_cv_have_decl_isfinite" = xyes +-then : ++ ++cat >>confdefs.h <<_ACEOF ++#define HAVE_DECL_ISNAN $ac_have_decl ++_ACEOF ++ac_fn_c_check_decl "$LINENO" "isfinite" "ac_cv_have_decl_isfinite" "#include ++" ++if test "x$ac_cv_have_decl_isfinite" = xyes; then : + ac_have_decl=1 +-else $as_nop ++else + ac_have_decl=0 + fi +-printf "%s\n" "#define HAVE_DECL_ISFINITE $ac_have_decl" >>confdefs.h ++ ++cat >>confdefs.h <<_ACEOF ++#define HAVE_DECL_ISFINITE $ac_have_decl ++_ACEOF + + + # For multiprocessing module, check that sem_open +@@ -17127,16 +14900,14 @@ printf "%s\n" "#define HAVE_DECL_ISFINITE $ac_have_decl" >>confdefs.h + # the kernel module that provides POSIX semaphores + # isn't loaded by default, so an attempt to call + # sem_open results in a 'Signal 12' error. +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether POSIX semaphores are enabled" >&5 +-printf %s "checking whether POSIX semaphores are enabled... " >&6; } +-if test ${ac_cv_posix_semaphores_enabled+y} +-then : +- printf %s "(cached) " >&6 +-else $as_nop +- if test "$cross_compiling" = yes +-then : ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether POSIX semaphores are enabled" >&5 ++$as_echo_n "checking whether POSIX semaphores are enabled... " >&6; } ++if ${ac_cv_posix_semaphores_enabled+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test "$cross_compiling" = yes; then : + ac_cv_posix_semaphores_enabled=yes +-else $as_nop ++else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -17158,10 +14929,9 @@ int main(void) { + } + + _ACEOF +-if ac_fn_c_try_run "$LINENO" +-then : ++if ac_fn_c_try_run "$LINENO"; then : + ac_cv_posix_semaphores_enabled=yes +-else $as_nop ++else + ac_cv_posix_semaphores_enabled=no + fi + rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ +@@ -17171,26 +14941,24 @@ fi + + fi + +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_posix_semaphores_enabled" >&5 +-printf "%s\n" "$ac_cv_posix_semaphores_enabled" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_posix_semaphores_enabled" >&5 ++$as_echo "$ac_cv_posix_semaphores_enabled" >&6; } + if test $ac_cv_posix_semaphores_enabled = no + then + +-printf "%s\n" "#define POSIX_SEMAPHORES_NOT_ENABLED 1" >>confdefs.h ++$as_echo "#define POSIX_SEMAPHORES_NOT_ENABLED 1" >>confdefs.h + + fi + + # Multiprocessing check for broken sem_getvalue +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for broken sem_getvalue" >&5 +-printf %s "checking for broken sem_getvalue... " >&6; } +-if test ${ac_cv_broken_sem_getvalue+y} +-then : +- printf %s "(cached) " >&6 +-else $as_nop +- if test "$cross_compiling" = yes +-then : ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken sem_getvalue" >&5 ++$as_echo_n "checking for broken sem_getvalue... " >&6; } ++if ${ac_cv_broken_sem_getvalue+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test "$cross_compiling" = yes; then : + ac_cv_broken_sem_getvalue=yes +-else $as_nop ++else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -17216,10 +14984,9 @@ int main(void){ + } + + _ACEOF +-if ac_fn_c_try_run "$LINENO" +-then : ++if ac_fn_c_try_run "$LINENO"; then : + ac_cv_broken_sem_getvalue=no +-else $as_nop ++else + ac_cv_broken_sem_getvalue=yes + fi + rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ +@@ -17229,95 +14996,110 @@ fi + + fi + +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_broken_sem_getvalue" >&5 +-printf "%s\n" "$ac_cv_broken_sem_getvalue" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_broken_sem_getvalue" >&5 ++$as_echo "$ac_cv_broken_sem_getvalue" >&6; } + if test $ac_cv_broken_sem_getvalue = yes + then + +-printf "%s\n" "#define HAVE_BROKEN_SEM_GETVALUE 1" >>confdefs.h ++$as_echo "#define HAVE_BROKEN_SEM_GETVALUE 1" >>confdefs.h + + fi + +-ac_fn_check_decl "$LINENO" "RTLD_LAZY" "ac_cv_have_decl_RTLD_LAZY" "#include +-" "$ac_c_undeclared_builtin_options" "CFLAGS" +-if test "x$ac_cv_have_decl_RTLD_LAZY" = xyes +-then : ++ac_fn_c_check_decl "$LINENO" "RTLD_LAZY" "ac_cv_have_decl_RTLD_LAZY" "#include ++" ++if test "x$ac_cv_have_decl_RTLD_LAZY" = xyes; then : + ac_have_decl=1 +-else $as_nop ++else + ac_have_decl=0 + fi +-printf "%s\n" "#define HAVE_DECL_RTLD_LAZY $ac_have_decl" >>confdefs.h +-ac_fn_check_decl "$LINENO" "RTLD_NOW" "ac_cv_have_decl_RTLD_NOW" "#include +-" "$ac_c_undeclared_builtin_options" "CFLAGS" +-if test "x$ac_cv_have_decl_RTLD_NOW" = xyes +-then : ++ ++cat >>confdefs.h <<_ACEOF ++#define HAVE_DECL_RTLD_LAZY $ac_have_decl ++_ACEOF ++ac_fn_c_check_decl "$LINENO" "RTLD_NOW" "ac_cv_have_decl_RTLD_NOW" "#include ++" ++if test "x$ac_cv_have_decl_RTLD_NOW" = xyes; then : + ac_have_decl=1 +-else $as_nop ++else + ac_have_decl=0 + fi +-printf "%s\n" "#define HAVE_DECL_RTLD_NOW $ac_have_decl" >>confdefs.h +-ac_fn_check_decl "$LINENO" "RTLD_GLOBAL" "ac_cv_have_decl_RTLD_GLOBAL" "#include +-" "$ac_c_undeclared_builtin_options" "CFLAGS" +-if test "x$ac_cv_have_decl_RTLD_GLOBAL" = xyes +-then : ++ ++cat >>confdefs.h <<_ACEOF ++#define HAVE_DECL_RTLD_NOW $ac_have_decl ++_ACEOF ++ac_fn_c_check_decl "$LINENO" "RTLD_GLOBAL" "ac_cv_have_decl_RTLD_GLOBAL" "#include ++" ++if test "x$ac_cv_have_decl_RTLD_GLOBAL" = xyes; then : + ac_have_decl=1 +-else $as_nop ++else + ac_have_decl=0 + fi +-printf "%s\n" "#define HAVE_DECL_RTLD_GLOBAL $ac_have_decl" >>confdefs.h +-ac_fn_check_decl "$LINENO" "RTLD_LOCAL" "ac_cv_have_decl_RTLD_LOCAL" "#include +-" "$ac_c_undeclared_builtin_options" "CFLAGS" +-if test "x$ac_cv_have_decl_RTLD_LOCAL" = xyes +-then : ++ ++cat >>confdefs.h <<_ACEOF ++#define HAVE_DECL_RTLD_GLOBAL $ac_have_decl ++_ACEOF ++ac_fn_c_check_decl "$LINENO" "RTLD_LOCAL" "ac_cv_have_decl_RTLD_LOCAL" "#include ++" ++if test "x$ac_cv_have_decl_RTLD_LOCAL" = xyes; then : + ac_have_decl=1 +-else $as_nop ++else + ac_have_decl=0 + fi +-printf "%s\n" "#define HAVE_DECL_RTLD_LOCAL $ac_have_decl" >>confdefs.h +-ac_fn_check_decl "$LINENO" "RTLD_NODELETE" "ac_cv_have_decl_RTLD_NODELETE" "#include +-" "$ac_c_undeclared_builtin_options" "CFLAGS" +-if test "x$ac_cv_have_decl_RTLD_NODELETE" = xyes +-then : ++ ++cat >>confdefs.h <<_ACEOF ++#define HAVE_DECL_RTLD_LOCAL $ac_have_decl ++_ACEOF ++ac_fn_c_check_decl "$LINENO" "RTLD_NODELETE" "ac_cv_have_decl_RTLD_NODELETE" "#include ++" ++if test "x$ac_cv_have_decl_RTLD_NODELETE" = xyes; then : + ac_have_decl=1 +-else $as_nop ++else + ac_have_decl=0 + fi +-printf "%s\n" "#define HAVE_DECL_RTLD_NODELETE $ac_have_decl" >>confdefs.h +-ac_fn_check_decl "$LINENO" "RTLD_NOLOAD" "ac_cv_have_decl_RTLD_NOLOAD" "#include +-" "$ac_c_undeclared_builtin_options" "CFLAGS" +-if test "x$ac_cv_have_decl_RTLD_NOLOAD" = xyes +-then : ++ ++cat >>confdefs.h <<_ACEOF ++#define HAVE_DECL_RTLD_NODELETE $ac_have_decl ++_ACEOF ++ac_fn_c_check_decl "$LINENO" "RTLD_NOLOAD" "ac_cv_have_decl_RTLD_NOLOAD" "#include ++" ++if test "x$ac_cv_have_decl_RTLD_NOLOAD" = xyes; then : + ac_have_decl=1 +-else $as_nop ++else + ac_have_decl=0 + fi +-printf "%s\n" "#define HAVE_DECL_RTLD_NOLOAD $ac_have_decl" >>confdefs.h +-ac_fn_check_decl "$LINENO" "RTLD_DEEPBIND" "ac_cv_have_decl_RTLD_DEEPBIND" "#include +-" "$ac_c_undeclared_builtin_options" "CFLAGS" +-if test "x$ac_cv_have_decl_RTLD_DEEPBIND" = xyes +-then : ++ ++cat >>confdefs.h <<_ACEOF ++#define HAVE_DECL_RTLD_NOLOAD $ac_have_decl ++_ACEOF ++ac_fn_c_check_decl "$LINENO" "RTLD_DEEPBIND" "ac_cv_have_decl_RTLD_DEEPBIND" "#include ++" ++if test "x$ac_cv_have_decl_RTLD_DEEPBIND" = xyes; then : + ac_have_decl=1 +-else $as_nop ++else + ac_have_decl=0 + fi +-printf "%s\n" "#define HAVE_DECL_RTLD_DEEPBIND $ac_have_decl" >>confdefs.h +-ac_fn_check_decl "$LINENO" "RTLD_MEMBER" "ac_cv_have_decl_RTLD_MEMBER" "#include +-" "$ac_c_undeclared_builtin_options" "CFLAGS" +-if test "x$ac_cv_have_decl_RTLD_MEMBER" = xyes +-then : ++ ++cat >>confdefs.h <<_ACEOF ++#define HAVE_DECL_RTLD_DEEPBIND $ac_have_decl ++_ACEOF ++ac_fn_c_check_decl "$LINENO" "RTLD_MEMBER" "ac_cv_have_decl_RTLD_MEMBER" "#include ++" ++if test "x$ac_cv_have_decl_RTLD_MEMBER" = xyes; then : + ac_have_decl=1 +-else $as_nop ++else + ac_have_decl=0 + fi +-printf "%s\n" "#define HAVE_DECL_RTLD_MEMBER $ac_have_decl" >>confdefs.h ++ ++cat >>confdefs.h <<_ACEOF ++#define HAVE_DECL_RTLD_MEMBER $ac_have_decl ++_ACEOF + + + # determine what size digit to use for Python's longs +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking digit size for Python's longs" >&5 +-printf %s "checking digit size for Python's longs... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking digit size for Python's longs" >&5 ++$as_echo_n "checking digit size for Python's longs... " >&6; } + # Check whether --enable-big-digits was given. +-if test ${enable_big_digits+y} +-then : ++if test "${enable_big_digits+set}" = set; then : + enableval=$enable_big_digits; case $enable_big_digits in + yes) + enable_big_digits=30 ;; +@@ -17328,34 +15110,36 @@ no) + *) + as_fn_error $? "bad value $enable_big_digits for --enable-big-digits; value should be 15 or 30" "$LINENO" 5 ;; + esac +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_big_digits" >&5 +-printf "%s\n" "$enable_big_digits" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_big_digits" >&5 ++$as_echo "$enable_big_digits" >&6; } + +-printf "%s\n" "#define PYLONG_BITS_IN_DIGIT $enable_big_digits" >>confdefs.h ++cat >>confdefs.h <<_ACEOF ++#define PYLONG_BITS_IN_DIGIT $enable_big_digits ++_ACEOF + + +-else $as_nop +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no value specified" >&5 +-printf "%s\n" "no value specified" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no value specified" >&5 ++$as_echo "no value specified" >&6; } + fi + + + # check for wchar.h +-ac_fn_c_check_header_compile "$LINENO" "wchar.h" "ac_cv_header_wchar_h" "$ac_includes_default" +-if test "x$ac_cv_header_wchar_h" = xyes +-then : ++ac_fn_c_check_header_mongrel "$LINENO" "wchar.h" "ac_cv_header_wchar_h" "$ac_includes_default" ++if test "x$ac_cv_header_wchar_h" = xyes; then : + + +-printf "%s\n" "#define HAVE_WCHAR_H 1" >>confdefs.h ++$as_echo "#define HAVE_WCHAR_H 1" >>confdefs.h + + wchar_h="yes" + +-else $as_nop ++else + wchar_h="no" + + fi + + ++ + # determine wchar_t size + if test "$wchar_h" = yes + then +@@ -17363,20 +15147,18 @@ then + # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects + # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. + # This bug is HP SR number 8606223364. +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of wchar_t" >&5 +-printf %s "checking size of wchar_t... " >&6; } +-if test ${ac_cv_sizeof_wchar_t+y} +-then : +- printf %s "(cached) " >&6 +-else $as_nop ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of wchar_t" >&5 ++$as_echo_n "checking size of wchar_t... " >&6; } ++if ${ac_cv_sizeof_wchar_t+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (wchar_t))" "ac_cv_sizeof_wchar_t" "#include +-" +-then : ++"; then : + +-else $as_nop ++else + if test "$ac_cv_type_wchar_t" = 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;} ++ { { $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 "cannot compute sizeof (wchar_t) + See \`config.log' for more details" "$LINENO" 5; } + else +@@ -17385,18 +15167,20 @@ See \`config.log' for more details" "$LINENO" 5; } + fi + + fi +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_wchar_t" >&5 +-printf "%s\n" "$ac_cv_sizeof_wchar_t" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_wchar_t" >&5 ++$as_echo "$ac_cv_sizeof_wchar_t" >&6; } + + + +-printf "%s\n" "#define SIZEOF_WCHAR_T $ac_cv_sizeof_wchar_t" >>confdefs.h ++cat >>confdefs.h <<_ACEOF ++#define SIZEOF_WCHAR_T $ac_cv_sizeof_wchar_t ++_ACEOF + + + fi + +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for UCS-4 tcl" >&5 +-printf %s "checking for UCS-4 tcl... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for UCS-4 tcl" >&5 ++$as_echo_n "checking for UCS-4 tcl... " >&6; } + have_ucs4_tcl=no + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +@@ -17406,41 +15190,38 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + # error "NOT UCS4_TCL" + #endif + int +-main (void) ++main () + { + + ; + return 0; + } + _ACEOF +-if ac_fn_c_try_compile "$LINENO" +-then : ++if ac_fn_c_try_compile "$LINENO"; then : + + +-printf "%s\n" "#define HAVE_UCS4_TCL 1" >>confdefs.h ++$as_echo "#define HAVE_UCS4_TCL 1" >>confdefs.h + + have_ucs4_tcl=yes + + fi +-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $have_ucs4_tcl" >&5 +-printf "%s\n" "$have_ucs4_tcl" >&6; } ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_ucs4_tcl" >&5 ++$as_echo "$have_ucs4_tcl" >&6; } + + # check whether wchar_t is signed or not + if test "$wchar_h" = yes + then + # check whether wchar_t is signed or not +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether wchar_t is signed" >&5 +-printf %s "checking whether wchar_t is signed... " >&6; } +- if test ${ac_cv_wchar_t_signed+y} +-then : +- printf %s "(cached) " >&6 +-else $as_nop +- +- if test "$cross_compiling" = yes +-then : ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether wchar_t is signed" >&5 ++$as_echo_n "checking whether wchar_t is signed... " >&6; } ++ if ${ac_cv_wchar_t_signed+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ if test "$cross_compiling" = yes; then : + ac_cv_wchar_t_signed=yes +-else $as_nop ++else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -17452,10 +15233,9 @@ else $as_nop + } + + _ACEOF +-if ac_fn_c_try_run "$LINENO" +-then : ++if ac_fn_c_try_run "$LINENO"; then : + ac_cv_wchar_t_signed=yes +-else $as_nop ++else + ac_cv_wchar_t_signed=no + fi + rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ +@@ -17464,33 +15244,32 @@ fi + + fi + +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_wchar_t_signed" >&5 +-printf "%s\n" "$ac_cv_wchar_t_signed" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_wchar_t_signed" >&5 ++$as_echo "$ac_cv_wchar_t_signed" >&6; } + fi + +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether wchar_t is usable" >&5 +-printf %s "checking whether wchar_t is usable... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether wchar_t is usable" >&5 ++$as_echo_n "checking whether wchar_t is usable... " >&6; } + # wchar_t is only usable if it maps to an unsigned type + if test "$ac_cv_sizeof_wchar_t" -ge 2 \ + -a "$ac_cv_wchar_t_signed" = "no" + then + +-printf "%s\n" "#define HAVE_USABLE_WCHAR_T 1" >>confdefs.h ++$as_echo "#define HAVE_USABLE_WCHAR_T 1" >>confdefs.h + +- { 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; } + fi + + # check for endianness +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5 +-printf %s "checking whether byte ordering is bigendian... " >&6; } +-if test ${ac_cv_c_bigendian+y} +-then : +- printf %s "(cached) " >&6 +-else $as_nop ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5 ++$as_echo_n "checking whether byte ordering is bigendian... " >&6; } ++if ${ac_cv_c_bigendian+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else + ac_cv_c_bigendian=unknown + # See if we're dealing with a universal compiler. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -17501,8 +15280,7 @@ else $as_nop + typedef int dummy; + + _ACEOF +-if ac_fn_c_try_compile "$LINENO" +-then : ++if ac_fn_c_try_compile "$LINENO"; then : + + # Check for potential -arch flags. It is not universal unless + # there are at least two -arch flags with different values. +@@ -17526,7 +15304,7 @@ then : + fi + done + 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 + if test $ac_cv_c_bigendian = unknown; then + # See if sys/param.h defines the BYTE_ORDER macro. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -17535,7 +15313,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + #include + + int +-main (void) ++main () + { + #if ! (defined BYTE_ORDER && defined BIG_ENDIAN \ + && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \ +@@ -17547,8 +15325,7 @@ main (void) + return 0; + } + _ACEOF +-if ac_fn_c_try_compile "$LINENO" +-then : ++if ac_fn_c_try_compile "$LINENO"; then : + # It does; now see whether it defined to BIG_ENDIAN or not. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +@@ -17556,7 +15333,7 @@ then : + #include + + int +-main (void) ++main () + { + #if BYTE_ORDER != BIG_ENDIAN + not big endian +@@ -17566,15 +15343,14 @@ main (void) + return 0; + } + _ACEOF +-if ac_fn_c_try_compile "$LINENO" +-then : ++if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_c_bigendian=yes +-else $as_nop ++else + ac_cv_c_bigendian=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 + if test $ac_cv_c_bigendian = unknown; then + # See if defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris). +@@ -17583,7 +15359,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + #include + + int +-main (void) ++main () + { + #if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN) + bogus endian macros +@@ -17593,15 +15369,14 @@ main (void) + return 0; + } + _ACEOF +-if ac_fn_c_try_compile "$LINENO" +-then : ++if ac_fn_c_try_compile "$LINENO"; then : + # It does; now see whether it defined to _BIG_ENDIAN or not. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + + int +-main (void) ++main () + { + #ifndef _BIG_ENDIAN + not big endian +@@ -17611,33 +15386,31 @@ main (void) + return 0; + } + _ACEOF +-if ac_fn_c_try_compile "$LINENO" +-then : ++if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_c_bigendian=yes +-else $as_nop ++else + ac_cv_c_bigendian=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 + if test $ac_cv_c_bigendian = unknown; then + # Compile a test program. +- if test "$cross_compiling" = yes +-then : ++ if test "$cross_compiling" = yes; then : + # Try to guess by grepping values from an object file. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +-unsigned short int ascii_mm[] = ++short int ascii_mm[] = + { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 }; +- unsigned short int ascii_ii[] = ++ short int ascii_ii[] = + { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 }; + int use_ascii (int i) { + return ascii_mm[i] + ascii_ii[i]; + } +- unsigned short int ebcdic_ii[] = ++ short int ebcdic_ii[] = + { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 }; +- unsigned short int ebcdic_mm[] = ++ short int ebcdic_mm[] = + { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 }; + int use_ebcdic (int i) { + return ebcdic_mm[i] + ebcdic_ii[i]; +@@ -17645,15 +15418,14 @@ unsigned short int ascii_mm[] = + extern int foo; + + int +-main (void) ++main () + { + return use_ascii (foo) == use_ebcdic (foo); + ; + return 0; + } + _ACEOF +-if ac_fn_c_try_compile "$LINENO" +-then : ++if ac_fn_c_try_compile "$LINENO"; then : + if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then + ac_cv_c_bigendian=yes + fi +@@ -17666,13 +15438,13 @@ then : + fi + fi + fi +-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +-else $as_nop ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + $ac_includes_default + int +-main (void) ++main () + { + + /* Are we little or big endian? From Harbison&Steele. */ +@@ -17688,10 +15460,9 @@ main (void) + return 0; + } + _ACEOF +-if ac_fn_c_try_run "$LINENO" +-then : ++if ac_fn_c_try_run "$LINENO"; then : + ac_cv_c_bigendian=no +-else $as_nop ++else + ac_cv_c_bigendian=yes + fi + rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ +@@ -17700,17 +15471,17 @@ fi + + fi + fi +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5 +-printf "%s\n" "$ac_cv_c_bigendian" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5 ++$as_echo "$ac_cv_c_bigendian" >&6; } + case $ac_cv_c_bigendian in #( + yes) +- printf "%s\n" "#define WORDS_BIGENDIAN 1" >>confdefs.h ++ $as_echo "#define WORDS_BIGENDIAN 1" >>confdefs.h + ;; #( + no) + ;; #( + universal) + +-printf "%s\n" "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h ++$as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h + + ;; #( + *) +@@ -17735,15 +15506,15 @@ printf "%s\n" "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h + # In Python 3.2 and older, --with-wide-unicode added a 'u' flag. + # In Python 3.7 and older, --with-pymalloc added a 'm' flag. + +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking ABIFLAGS" >&5 +-printf %s "checking ABIFLAGS... " >&6; } +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ABIFLAGS" >&5 +-printf "%s\n" "$ABIFLAGS" >&6; } +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking SOABI" >&5 +-printf %s "checking SOABI... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking ABIFLAGS" >&5 ++$as_echo_n "checking ABIFLAGS... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ABIFLAGS" >&5 ++$as_echo "$ABIFLAGS" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking SOABI" >&5 ++$as_echo_n "checking SOABI... " >&6; } + SOABI='cpython-'`echo $VERSION | tr -d .`${ABIFLAGS}${PLATFORM_TRIPLET:+-$PLATFORM_TRIPLET} +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $SOABI" >&5 +-printf "%s\n" "$SOABI" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $SOABI" >&5 ++$as_echo "$SOABI" >&6; } + + # Release and debug (Py_DEBUG) ABI are compatible, but not Py_TRACE_REFS ABI + if test "$Py_DEBUG" = 'true' -a "$with_trace_refs" != "yes"; then +@@ -17751,18 +15522,20 @@ if test "$Py_DEBUG" = 'true' -a "$with_trace_refs" != "yes"; then + + ALT_SOABI='cpython-'`echo $VERSION | tr -d .``echo $ABIFLAGS | tr -d d`${PLATFORM_TRIPLET:+-$PLATFORM_TRIPLET} + +-printf "%s\n" "#define ALT_SOABI \"${ALT_SOABI}\"" >>confdefs.h ++cat >>confdefs.h <<_ACEOF ++#define ALT_SOABI "${ALT_SOABI}" ++_ACEOF + + fi + + + EXT_SUFFIX=.${SOABI}${SHLIB_SUFFIX} + +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking LDVERSION" >&5 +-printf %s "checking LDVERSION... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking LDVERSION" >&5 ++$as_echo_n "checking LDVERSION... " >&6; } + LDVERSION='$(VERSION)$(ABIFLAGS)' +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LDVERSION" >&5 +-printf "%s\n" "$LDVERSION" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $LDVERSION" >&5 ++$as_echo "$LDVERSION" >&6; } + + # On Android and Cygwin the shared libraries must be linked with libpython. + +@@ -17781,12 +15554,11 @@ BINLIBDEST='$(LIBDIR)/python$(VERSION)' + # /usr/$LIDIRNAME/python$VERSION + + PLATLIBDIR="lib" +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for --with-platlibdir" >&5 +-printf %s "checking for --with-platlibdir... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-platlibdir" >&5 ++$as_echo_n "checking for --with-platlibdir... " >&6; } + + # Check whether --with-platlibdir was given. +-if test ${with_platlibdir+y} +-then : ++if test "${with_platlibdir+set}" = set; then : + withval=$with_platlibdir; + # ignore 3 options: + # --with-platlibdir +@@ -17794,17 +15566,17 @@ then : + # --without-platlibdir + if test -n "$withval" -a "$withval" != yes -a "$withval" != no + 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; } + PLATLIBDIR="$withval" + BINLIBDEST='${exec_prefix}/${PLATLIBDIR}/python$(VERSION)' + 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 +-else $as_nop +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-printf "%s\n" "no" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } + fi + + +@@ -17820,40 +15592,37 @@ fi + # Check for --with-wheel-pkg-dir=PATH + + WHEEL_PKG_DIR="" +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for --with-wheel-pkg-dir" >&5 +-printf %s "checking for --with-wheel-pkg-dir... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-wheel-pkg-dir" >&5 ++$as_echo_n "checking for --with-wheel-pkg-dir... " >&6; } + + # Check whether --with-wheel-pkg-dir was given. +-if test ${with_wheel_pkg_dir+y} +-then : ++if test "${with_wheel_pkg_dir+set}" = set; then : + withval=$with_wheel_pkg_dir; + if test -n "$withval"; 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; } + WHEEL_PKG_DIR="$withval" + 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 +-else $as_nop +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-printf "%s\n" "no" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } + fi + + + # Check whether right shifting a negative integer extends the sign bit + # or fills with zeros (like the Cray J90, according to Tim Peters). +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether right shift extends the sign bit" >&5 +-printf %s "checking whether right shift extends the sign bit... " >&6; } +-if test ${ac_cv_rshift_extends_sign+y} +-then : +- printf %s "(cached) " >&6 +-else $as_nop +- +-if test "$cross_compiling" = yes +-then : ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether right shift extends the sign bit" >&5 ++$as_echo_n "checking whether right shift extends the sign bit... " >&6; } ++if ${ac_cv_rshift_extends_sign+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++if test "$cross_compiling" = yes; then : + ac_cv_rshift_extends_sign=yes +-else $as_nop ++else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -17863,10 +15632,9 @@ int main() + } + + _ACEOF +-if ac_fn_c_try_run "$LINENO" +-then : ++if ac_fn_c_try_run "$LINENO"; then : + ac_cv_rshift_extends_sign=yes +-else $as_nop ++else + ac_cv_rshift_extends_sign=no + fi + rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ +@@ -17875,28 +15643,27 @@ fi + + fi + +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_rshift_extends_sign" >&5 +-printf "%s\n" "$ac_cv_rshift_extends_sign" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_rshift_extends_sign" >&5 ++$as_echo "$ac_cv_rshift_extends_sign" >&6; } + if test "$ac_cv_rshift_extends_sign" = no + then + +-printf "%s\n" "#define SIGNED_RIGHT_SHIFT_ZERO_FILLS 1" >>confdefs.h ++$as_echo "#define SIGNED_RIGHT_SHIFT_ZERO_FILLS 1" >>confdefs.h + + fi + + # check for getc_unlocked and related locking functions +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for getc_unlocked() and friends" >&5 +-printf %s "checking for getc_unlocked() and friends... " >&6; } +-if test ${ac_cv_have_getc_unlocked+y} +-then : +- printf %s "(cached) " >&6 +-else $as_nop ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for getc_unlocked() and friends" >&5 ++$as_echo_n "checking for getc_unlocked() and friends... " >&6; } ++if ${ac_cv_have_getc_unlocked+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + int +-main (void) ++main () + { + + FILE *f = fopen("/dev/null", "r"); +@@ -17908,31 +15675,29 @@ main (void) + return 0; + } + _ACEOF +-if ac_fn_c_try_link "$LINENO" +-then : ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_have_getc_unlocked=yes +-else $as_nop ++else + ac_cv_have_getc_unlocked=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: $ac_cv_have_getc_unlocked" >&5 +-printf "%s\n" "$ac_cv_have_getc_unlocked" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_getc_unlocked" >&5 ++$as_echo "$ac_cv_have_getc_unlocked" >&6; } + if test "$ac_cv_have_getc_unlocked" = yes + then + +-printf "%s\n" "#define HAVE_GETC_UNLOCKED 1" >>confdefs.h ++$as_echo "#define HAVE_GETC_UNLOCKED 1" >>confdefs.h + + fi + + + # Check whether --with-readline was given. +-if test ${with_readline+y} +-then : ++if test "${with_readline+set}" = set; then : + withval=$with_readline; +-else $as_nop ++else + with_readline=yes + fi + +@@ -17947,7 +15712,7 @@ if test "$with_readline" != no; then + editline|edit) + LIBREADLINE=edit + +-printf "%s\n" "#define WITH_EDITLINE 1" >>confdefs.h ++$as_echo "#define WITH_EDITLINE 1" >>confdefs.h + + ;; + yes|readline) +@@ -17961,8 +15726,8 @@ printf "%s\n" "#define WITH_EDITLINE 1" >>confdefs.h + # On some systems we need to link readline to a termcap compatible + # library. NOTE: Keep the precedence of listed libraries synchronised + # with setup.py. +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to link readline libs" >&5 +-printf %s "checking how to link readline libs... " >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link readline libs" >&5 ++$as_echo_n "checking how to link readline libs... " >&6; } + for py_libtermcap in "" tinfo ncursesw ncurses curses termcap; do + if test -z "$py_libtermcap"; then + READLINE_LIBS="-l$LIBREADLINE" +@@ -17976,20 +15741,22 @@ printf %s "checking how to link readline libs... " >&6; } + /* 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 readline (); + int +-main (void) ++main () + { + return readline (); + ; + return 0; + } + _ACEOF +-if ac_fn_c_try_link "$LINENO" +-then : ++if ac_fn_c_try_link "$LINENO"; then : + py_cv_lib_readline=yes + 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 $py_cv_lib_readline = yes; then + break +@@ -17999,20 +15766,20 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \ + # Uncomment this line if you want to use READLINE_LIBS in Makefile or scripts + #AC_SUBST([READLINE_LIBS]) + if test $py_cv_lib_readline = no; then +- { 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; } + else +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $READLINE_LIBS" >&5 +-printf "%s\n" "$READLINE_LIBS" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $READLINE_LIBS" >&5 ++$as_echo "$READLINE_LIBS" >&6; } + +-printf "%s\n" "#define HAVE_LIBREADLINE 1" >>confdefs.h ++$as_echo "#define HAVE_LIBREADLINE 1" >>confdefs.h + + fi + fi + + if test "$py_cv_lib_readline" = yes; then + # check for readline 2.2 +- ac_fn_check_decl "$LINENO" "rl_completion_append_character" "ac_cv_have_decl_rl_completion_append_character" " ++ ac_fn_c_check_decl "$LINENO" "rl_completion_append_character" "ac_cv_have_decl_rl_completion_append_character" " + #include /* Must be first for Gnu Readline */ + #ifdef WITH_EDITLINE + # include +@@ -18020,14 +15787,14 @@ if test "$py_cv_lib_readline" = yes; then + # include + #endif + +-" "$ac_c_undeclared_builtin_options" "CFLAGS" +-if test "x$ac_cv_have_decl_rl_completion_append_character" = xyes +-then : ++" ++if test "x$ac_cv_have_decl_rl_completion_append_character" = xyes; then : + +-printf "%s\n" "#define HAVE_RL_COMPLETION_APPEND_CHARACTER 1" >>confdefs.h ++$as_echo "#define HAVE_RL_COMPLETION_APPEND_CHARACTER 1" >>confdefs.h + + fi +- ac_fn_check_decl "$LINENO" "rl_completion_suppress_append" "ac_cv_have_decl_rl_completion_suppress_append" " ++ ++ ac_fn_c_check_decl "$LINENO" "rl_completion_suppress_append" "ac_cv_have_decl_rl_completion_suppress_append" " + #include /* Must be first for Gnu Readline */ + #ifdef WITH_EDITLINE + # include +@@ -18035,22 +15802,21 @@ fi + # include + #endif + +-" "$ac_c_undeclared_builtin_options" "CFLAGS" +-if test "x$ac_cv_have_decl_rl_completion_suppress_append" = xyes +-then : ++" ++if test "x$ac_cv_have_decl_rl_completion_suppress_append" = xyes; then : + +-printf "%s\n" "#define HAVE_RL_COMPLETION_SUPPRESS_APPEND 1" >>confdefs.h ++$as_echo "#define HAVE_RL_COMPLETION_SUPPRESS_APPEND 1" >>confdefs.h + + fi + ++ + # check for readline 4.0 +- as_ac_Lib=`printf "%s\n" "ac_cv_lib_$LIBREADLINE""_rl_pre_input_hook" | $as_tr_sh` +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for rl_pre_input_hook in -l$LIBREADLINE" >&5 +-printf %s "checking for rl_pre_input_hook in -l$LIBREADLINE... " >&6; } +-if eval test \${$as_ac_Lib+y} +-then : +- printf %s "(cached) " >&6 +-else $as_nop ++ as_ac_Lib=`$as_echo "ac_cv_lib_$LIBREADLINE''_rl_pre_input_hook" | $as_tr_sh` ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for rl_pre_input_hook in -l$LIBREADLINE" >&5 ++$as_echo_n "checking for rl_pre_input_hook in -l$LIBREADLINE... " >&6; } ++if eval \${$as_ac_Lib+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else + ac_check_lib_save_LIBS=$LIBS + LIBS="-l$LIBREADLINE $READLINE_LIBS $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -18059,44 +15825,44 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* 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 rl_pre_input_hook (); + int +-main (void) ++main () + { + return rl_pre_input_hook (); + ; + return 0; + } + _ACEOF +-if ac_fn_c_try_link "$LINENO" +-then : ++if ac_fn_c_try_link "$LINENO"; then : + eval "$as_ac_Lib=yes" +-else $as_nop ++else + eval "$as_ac_Lib=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 + eval ac_res=\$$as_ac_Lib +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +-printf "%s\n" "$ac_res" >&6; } +-if eval test \"x\$"$as_ac_Lib"\" = x"yes" +-then : ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 ++$as_echo "$ac_res" >&6; } ++if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + +-printf "%s\n" "#define HAVE_RL_PRE_INPUT_HOOK 1" >>confdefs.h ++$as_echo "#define HAVE_RL_PRE_INPUT_HOOK 1" >>confdefs.h + + fi + + + # also in 4.0 +- as_ac_Lib=`printf "%s\n" "ac_cv_lib_$LIBREADLINE""_rl_completion_display_matches_hook" | $as_tr_sh` +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for rl_completion_display_matches_hook in -l$LIBREADLINE" >&5 +-printf %s "checking for rl_completion_display_matches_hook in -l$LIBREADLINE... " >&6; } +-if eval test \${$as_ac_Lib+y} +-then : +- printf %s "(cached) " >&6 +-else $as_nop ++ as_ac_Lib=`$as_echo "ac_cv_lib_$LIBREADLINE''_rl_completion_display_matches_hook" | $as_tr_sh` ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for rl_completion_display_matches_hook in -l$LIBREADLINE" >&5 ++$as_echo_n "checking for rl_completion_display_matches_hook in -l$LIBREADLINE... " >&6; } ++if eval \${$as_ac_Lib+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else + ac_check_lib_save_LIBS=$LIBS + LIBS="-l$LIBREADLINE $READLINE_LIBS $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -18105,44 +15871,44 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* 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 rl_completion_display_matches_hook (); + int +-main (void) ++main () + { + return rl_completion_display_matches_hook (); + ; + return 0; + } + _ACEOF +-if ac_fn_c_try_link "$LINENO" +-then : ++if ac_fn_c_try_link "$LINENO"; then : + eval "$as_ac_Lib=yes" +-else $as_nop ++else + eval "$as_ac_Lib=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 + eval ac_res=\$$as_ac_Lib +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +-printf "%s\n" "$ac_res" >&6; } +-if eval test \"x\$"$as_ac_Lib"\" = x"yes" +-then : ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 ++$as_echo "$ac_res" >&6; } ++if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + +-printf "%s\n" "#define HAVE_RL_COMPLETION_DISPLAY_MATCHES_HOOK 1" >>confdefs.h ++$as_echo "#define HAVE_RL_COMPLETION_DISPLAY_MATCHES_HOOK 1" >>confdefs.h + + fi + + + # also in 4.0, but not in editline +- as_ac_Lib=`printf "%s\n" "ac_cv_lib_$LIBREADLINE""_rl_resize_terminal" | $as_tr_sh` +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for rl_resize_terminal in -l$LIBREADLINE" >&5 +-printf %s "checking for rl_resize_terminal in -l$LIBREADLINE... " >&6; } +-if eval test \${$as_ac_Lib+y} +-then : +- printf %s "(cached) " >&6 +-else $as_nop ++ as_ac_Lib=`$as_echo "ac_cv_lib_$LIBREADLINE''_rl_resize_terminal" | $as_tr_sh` ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for rl_resize_terminal in -l$LIBREADLINE" >&5 ++$as_echo_n "checking for rl_resize_terminal in -l$LIBREADLINE... " >&6; } ++if eval \${$as_ac_Lib+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else + ac_check_lib_save_LIBS=$LIBS + LIBS="-l$LIBREADLINE $READLINE_LIBS $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -18151,44 +15917,44 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* 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 rl_resize_terminal (); + int +-main (void) ++main () + { + return rl_resize_terminal (); + ; + return 0; + } + _ACEOF +-if ac_fn_c_try_link "$LINENO" +-then : ++if ac_fn_c_try_link "$LINENO"; then : + eval "$as_ac_Lib=yes" +-else $as_nop ++else + eval "$as_ac_Lib=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 + eval ac_res=\$$as_ac_Lib +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +-printf "%s\n" "$ac_res" >&6; } +-if eval test \"x\$"$as_ac_Lib"\" = x"yes" +-then : ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 ++$as_echo "$ac_res" >&6; } ++if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + +-printf "%s\n" "#define HAVE_RL_RESIZE_TERMINAL 1" >>confdefs.h ++$as_echo "#define HAVE_RL_RESIZE_TERMINAL 1" >>confdefs.h + + fi + + + # check for readline 4.2 +- as_ac_Lib=`printf "%s\n" "ac_cv_lib_$LIBREADLINE""_rl_completion_matches" | $as_tr_sh` +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for rl_completion_matches in -l$LIBREADLINE" >&5 +-printf %s "checking for rl_completion_matches in -l$LIBREADLINE... " >&6; } +-if eval test \${$as_ac_Lib+y} +-then : +- printf %s "(cached) " >&6 +-else $as_nop ++ as_ac_Lib=`$as_echo "ac_cv_lib_$LIBREADLINE''_rl_completion_matches" | $as_tr_sh` ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for rl_completion_matches in -l$LIBREADLINE" >&5 ++$as_echo_n "checking for rl_completion_matches in -l$LIBREADLINE... " >&6; } ++if eval \${$as_ac_Lib+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else + ac_check_lib_save_LIBS=$LIBS + LIBS="-l$LIBREADLINE $READLINE_LIBS $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -18197,38 +15963,39 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* 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 rl_completion_matches (); + int +-main (void) ++main () + { + return rl_completion_matches (); + ; + return 0; + } + _ACEOF +-if ac_fn_c_try_link "$LINENO" +-then : ++if ac_fn_c_try_link "$LINENO"; then : + eval "$as_ac_Lib=yes" +-else $as_nop ++else + eval "$as_ac_Lib=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 + eval ac_res=\$$as_ac_Lib +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +-printf "%s\n" "$ac_res" >&6; } +-if eval test \"x\$"$as_ac_Lib"\" = x"yes" +-then : ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 ++$as_echo "$ac_res" >&6; } ++if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + +-printf "%s\n" "#define HAVE_RL_COMPLETION_MATCHES 1" >>confdefs.h ++$as_echo "#define HAVE_RL_COMPLETION_MATCHES 1" >>confdefs.h + + fi + + + # also in readline 4.2 +- ac_fn_check_decl "$LINENO" "rl_catch_signals" "ac_cv_have_decl_rl_catch_signals" " ++ ac_fn_c_check_decl "$LINENO" "rl_catch_signals" "ac_cv_have_decl_rl_catch_signals" " + #include /* Must be first for Gnu Readline */ + #ifdef WITH_EDITLINE + # include +@@ -18236,21 +16003,20 @@ fi + # include + #endif + +-" "$ac_c_undeclared_builtin_options" "CFLAGS" +-if test "x$ac_cv_have_decl_rl_catch_signals" = xyes +-then : ++" ++if test "x$ac_cv_have_decl_rl_catch_signals" = xyes; then : + +-printf "%s\n" "#define HAVE_RL_CATCH_SIGNAL 1" >>confdefs.h ++$as_echo "#define HAVE_RL_CATCH_SIGNAL 1" >>confdefs.h + + fi + +- as_ac_Lib=`printf "%s\n" "ac_cv_lib_$LIBREADLINE""_append_history" | $as_tr_sh` +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for append_history in -l$LIBREADLINE" >&5 +-printf %s "checking for append_history in -l$LIBREADLINE... " >&6; } +-if eval test \${$as_ac_Lib+y} +-then : +- printf %s "(cached) " >&6 +-else $as_nop ++ ++ as_ac_Lib=`$as_echo "ac_cv_lib_$LIBREADLINE''_append_history" | $as_tr_sh` ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for append_history in -l$LIBREADLINE" >&5 ++$as_echo_n "checking for append_history in -l$LIBREADLINE... " >&6; } ++if eval \${$as_ac_Lib+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else + ac_check_lib_save_LIBS=$LIBS + LIBS="-l$LIBREADLINE $READLINE_LIBS $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -18259,32 +16025,33 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* 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 append_history (); + int +-main (void) ++main () + { + return append_history (); + ; + return 0; + } + _ACEOF +-if ac_fn_c_try_link "$LINENO" +-then : ++if ac_fn_c_try_link "$LINENO"; then : + eval "$as_ac_Lib=yes" +-else $as_nop ++else + eval "$as_ac_Lib=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 + eval ac_res=\$$as_ac_Lib +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +-printf "%s\n" "$ac_res" >&6; } +-if eval test \"x\$"$as_ac_Lib"\" = x"yes" +-then : ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 ++$as_echo "$ac_res" >&6; } ++if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + +-printf "%s\n" "#define HAVE_RL_APPEND_HISTORY 1" >>confdefs.h ++$as_echo "#define HAVE_RL_APPEND_HISTORY 1" >>confdefs.h + + fi + +@@ -18293,17 +16060,15 @@ fi + # End of readline checks: restore LIBS + LIBS=$LIBS_no_readline + +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for broken nice()" >&5 +-printf %s "checking for broken nice()... " >&6; } +-if test ${ac_cv_broken_nice+y} +-then : +- printf %s "(cached) " >&6 +-else $as_nop ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken nice()" >&5 ++$as_echo_n "checking for broken nice()... " >&6; } ++if ${ac_cv_broken_nice+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else + +-if test "$cross_compiling" = yes +-then : ++if test "$cross_compiling" = yes; then : + ac_cv_broken_nice=no +-else $as_nop ++else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -18318,10 +16083,9 @@ int main() + } + + _ACEOF +-if ac_fn_c_try_run "$LINENO" +-then : ++if ac_fn_c_try_run "$LINENO"; then : + ac_cv_broken_nice=yes +-else $as_nop ++else + ac_cv_broken_nice=no + fi + rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ +@@ -18330,25 +16094,23 @@ fi + + fi + +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_broken_nice" >&5 +-printf "%s\n" "$ac_cv_broken_nice" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_broken_nice" >&5 ++$as_echo "$ac_cv_broken_nice" >&6; } + if test "$ac_cv_broken_nice" = yes + then + +-printf "%s\n" "#define HAVE_BROKEN_NICE 1" >>confdefs.h ++$as_echo "#define HAVE_BROKEN_NICE 1" >>confdefs.h + + fi + +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for broken poll()" >&5 +-printf %s "checking for broken poll()... " >&6; } +-if test ${ac_cv_broken_poll+y} +-then : +- printf %s "(cached) " >&6 +-else $as_nop +- if test "$cross_compiling" = yes +-then : ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken poll()" >&5 ++$as_echo_n "checking for broken poll()... " >&6; } ++if ${ac_cv_broken_poll+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test "$cross_compiling" = yes; then : + ac_cv_broken_poll=no +-else $as_nop ++else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -18372,10 +16134,9 @@ int main() + } + + _ACEOF +-if ac_fn_c_try_run "$LINENO" +-then : ++if ac_fn_c_try_run "$LINENO"; then : + ac_cv_broken_poll=yes +-else $as_nop ++else + ac_cv_broken_poll=no + fi + rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ +@@ -18384,27 +16145,25 @@ fi + + fi + +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_broken_poll" >&5 +-printf "%s\n" "$ac_cv_broken_poll" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_broken_poll" >&5 ++$as_echo "$ac_cv_broken_poll" >&6; } + if test "$ac_cv_broken_poll" = yes + then + +-printf "%s\n" "#define HAVE_BROKEN_POLL 1" >>confdefs.h ++$as_echo "#define HAVE_BROKEN_POLL 1" >>confdefs.h + + fi + + # check tzset(3) exists and works like we expect it to +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working tzset()" >&5 +-printf %s "checking for working tzset()... " >&6; } +-if test ${ac_cv_working_tzset+y} +-then : +- printf %s "(cached) " >&6 +-else $as_nop +- +-if test "$cross_compiling" = yes +-then : ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working tzset()" >&5 ++$as_echo_n "checking for working tzset()... " >&6; } ++if ${ac_cv_working_tzset+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++if test "$cross_compiling" = yes; then : + ac_cv_working_tzset=no +-else $as_nop ++else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -18472,10 +16231,9 @@ int main() + } + + _ACEOF +-if ac_fn_c_try_run "$LINENO" +-then : ++if ac_fn_c_try_run "$LINENO"; then : + ac_cv_working_tzset=yes +-else $as_nop ++else + ac_cv_working_tzset=no + fi + rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ +@@ -18484,27 +16242,26 @@ fi + + fi + +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_working_tzset" >&5 +-printf "%s\n" "$ac_cv_working_tzset" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_working_tzset" >&5 ++$as_echo "$ac_cv_working_tzset" >&6; } + if test "$ac_cv_working_tzset" = yes + then + +-printf "%s\n" "#define HAVE_WORKING_TZSET 1" >>confdefs.h ++$as_echo "#define HAVE_WORKING_TZSET 1" >>confdefs.h + + fi + + # Look for subsecond timestamps in struct stat +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for tv_nsec in struct stat" >&5 +-printf %s "checking for tv_nsec in struct stat... " >&6; } +-if test ${ac_cv_stat_tv_nsec+y} +-then : +- printf %s "(cached) " >&6 +-else $as_nop ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for tv_nsec in struct stat" >&5 ++$as_echo_n "checking for tv_nsec in struct stat... " >&6; } ++if ${ac_cv_stat_tv_nsec+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + int +-main (void) ++main () + { + + struct stat st; +@@ -18514,36 +16271,34 @@ st.st_mtim.tv_nsec = 1; + return 0; + } + _ACEOF +-if ac_fn_c_try_compile "$LINENO" +-then : ++if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_stat_tv_nsec=yes +-else $as_nop ++else + ac_cv_stat_tv_nsec=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: $ac_cv_stat_tv_nsec" >&5 +-printf "%s\n" "$ac_cv_stat_tv_nsec" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_stat_tv_nsec" >&5 ++$as_echo "$ac_cv_stat_tv_nsec" >&6; } + if test "$ac_cv_stat_tv_nsec" = yes + then + +-printf "%s\n" "#define HAVE_STAT_TV_NSEC 1" >>confdefs.h ++$as_echo "#define HAVE_STAT_TV_NSEC 1" >>confdefs.h + + fi + + # Look for BSD style subsecond timestamps in struct stat +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for tv_nsec2 in struct stat" >&5 +-printf %s "checking for tv_nsec2 in struct stat... " >&6; } +-if test ${ac_cv_stat_tv_nsec2+y} +-then : +- printf %s "(cached) " >&6 +-else $as_nop ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for tv_nsec2 in struct stat" >&5 ++$as_echo_n "checking for tv_nsec2 in struct stat... " >&6; } ++if ${ac_cv_stat_tv_nsec2+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + int +-main (void) ++main () + { + + struct stat st; +@@ -18553,21 +16308,20 @@ st.st_mtimespec.tv_nsec = 1; + return 0; + } + _ACEOF +-if ac_fn_c_try_compile "$LINENO" +-then : ++if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_stat_tv_nsec2=yes +-else $as_nop ++else + ac_cv_stat_tv_nsec2=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: $ac_cv_stat_tv_nsec2" >&5 +-printf "%s\n" "$ac_cv_stat_tv_nsec2" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_stat_tv_nsec2" >&5 ++$as_echo "$ac_cv_stat_tv_nsec2" >&6; } + if test "$ac_cv_stat_tv_nsec2" = yes + then + +-printf "%s\n" "#define HAVE_STAT_TV_NSEC2 1" >>confdefs.h ++$as_echo "#define HAVE_STAT_TV_NSEC2 1" >>confdefs.h + + fi + +@@ -18577,46 +16331,50 @@ if test "$cross_compiling" = no; then + CPPFLAGS="$CPPFLAGS -I/usr/include/ncursesw" + fi + +-ac_fn_c_check_header_compile "$LINENO" "curses.h" "ac_cv_header_curses_h" "$ac_includes_default" +-if test "x$ac_cv_header_curses_h" = xyes +-then : +- printf "%s\n" "#define HAVE_CURSES_H 1" >>confdefs.h ++for ac_header in curses.h ncurses.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" "ncurses.h" "ac_cv_header_ncurses_h" "$ac_includes_default" +-if test "x$ac_cv_header_ncurses_h" = xyes +-then : +- printf "%s\n" "#define HAVE_NCURSES_H 1" >>confdefs.h + +-fi ++done + + + # On Solaris, term.h requires curses.h +-ac_fn_c_check_header_compile "$LINENO" "term.h" "ac_cv_header_term_h" " ++for ac_header in term.h ++do : ++ ac_fn_c_check_header_compile "$LINENO" "term.h" "ac_cv_header_term_h" " + #ifdef HAVE_CURSES_H + #include + #endif + + " +-if test "x$ac_cv_header_term_h" = xyes +-then : +- printf "%s\n" "#define HAVE_TERM_H 1" >>confdefs.h ++if test "x$ac_cv_header_term_h" = xyes; then : ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_TERM_H 1 ++_ACEOF + + fi + ++done ++ + + # On HP/UX 11.0, mvwdelch is a block with a return statement +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether mvwdelch is an expression" >&5 +-printf %s "checking whether mvwdelch is an expression... " >&6; } +-if test ${ac_cv_mvwdelch_is_expression+y} +-then : +- printf %s "(cached) " >&6 +-else $as_nop ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mvwdelch is an expression" >&5 ++$as_echo_n "checking whether mvwdelch is an expression... " >&6; } ++if ${ac_cv_mvwdelch_is_expression+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + int +-main (void) ++main () + { + + int rtn; +@@ -18626,22 +16384,21 @@ main (void) + return 0; + } + _ACEOF +-if ac_fn_c_try_compile "$LINENO" +-then : ++if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_mvwdelch_is_expression=yes +-else $as_nop ++else + ac_cv_mvwdelch_is_expression=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: $ac_cv_mvwdelch_is_expression" >&5 +-printf "%s\n" "$ac_cv_mvwdelch_is_expression" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_mvwdelch_is_expression" >&5 ++$as_echo "$ac_cv_mvwdelch_is_expression" >&6; } + + if test "$ac_cv_mvwdelch_is_expression" = yes + then + +-printf "%s\n" "#define MVWDELCH_IS_EXPRESSION 1" >>confdefs.h ++$as_echo "#define MVWDELCH_IS_EXPRESSION 1" >>confdefs.h + + fi + +@@ -18649,12 +16406,11 @@ fi + # structs since version 5.7. If the macro is defined as zero before including + # [n]curses.h, ncurses will expose fields of the structs regardless of the + # configuration. +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether WINDOW has _flags" >&5 +-printf %s "checking whether WINDOW has _flags... " >&6; } +-if test ${ac_cv_window_has_flags+y} +-then : +- printf %s "(cached) " >&6 +-else $as_nop ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether WINDOW has _flags" >&5 ++$as_echo_n "checking whether WINDOW has _flags... " >&6; } ++if ${ac_cv_window_has_flags+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -18662,7 +16418,7 @@ else $as_nop + #include + + int +-main (void) ++main () + { + + WINDOW *w; +@@ -18672,33 +16428,32 @@ main (void) + return 0; + } + _ACEOF +-if ac_fn_c_try_compile "$LINENO" +-then : ++if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_window_has_flags=yes +-else $as_nop ++else + ac_cv_window_has_flags=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: $ac_cv_window_has_flags" >&5 +-printf "%s\n" "$ac_cv_window_has_flags" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_window_has_flags" >&5 ++$as_echo "$ac_cv_window_has_flags" >&6; } + + + if test "$ac_cv_window_has_flags" = yes + then + +-printf "%s\n" "#define WINDOW_HAS_FLAGS 1" >>confdefs.h ++$as_echo "#define WINDOW_HAS_FLAGS 1" >>confdefs.h + + fi + +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for is_pad" >&5 +-printf %s "checking for is_pad... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for is_pad" >&5 ++$as_echo_n "checking for is_pad... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + int +-main (void) ++main () + { + + #ifndef is_pad +@@ -18709,108 +16464,104 @@ void *x=is_pad + return 0; + } + _ACEOF +-if ac_fn_c_try_compile "$LINENO" +-then : ++if ac_fn_c_try_compile "$LINENO"; then : + +-printf "%s\n" "#define HAVE_CURSES_IS_PAD 1" >>confdefs.h ++$as_echo "#define HAVE_CURSES_IS_PAD 1" >>confdefs.h + +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-printf "%s\n" "yes" >&6; } +-else $as_nop +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-printf "%s\n" "no" >&6; } ++ { $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 +-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for is_term_resized" >&5 +-printf %s "checking for is_term_resized... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for is_term_resized" >&5 ++$as_echo_n "checking for is_term_resized... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + int +-main (void) ++main () + { + void *x=is_term_resized + ; + return 0; + } + _ACEOF +-if ac_fn_c_try_compile "$LINENO" +-then : ++if ac_fn_c_try_compile "$LINENO"; then : + +-printf "%s\n" "#define HAVE_CURSES_IS_TERM_RESIZED 1" >>confdefs.h ++$as_echo "#define HAVE_CURSES_IS_TERM_RESIZED 1" >>confdefs.h + +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-printf "%s\n" "yes" >&6; } +-else $as_nop +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-printf "%s\n" "no" >&6; } ++ { $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 +-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for resize_term" >&5 +-printf %s "checking for resize_term... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for resize_term" >&5 ++$as_echo_n "checking for resize_term... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + int +-main (void) ++main () + { + void *x=resize_term + ; + return 0; + } + _ACEOF +-if ac_fn_c_try_compile "$LINENO" +-then : ++if ac_fn_c_try_compile "$LINENO"; then : + +-printf "%s\n" "#define HAVE_CURSES_RESIZE_TERM 1" >>confdefs.h ++$as_echo "#define HAVE_CURSES_RESIZE_TERM 1" >>confdefs.h + +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-printf "%s\n" "yes" >&6; } +-else $as_nop +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-printf "%s\n" "no" >&6; } ++ { $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 +-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for resizeterm" >&5 +-printf %s "checking for resizeterm... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for resizeterm" >&5 ++$as_echo_n "checking for resizeterm... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + int +-main (void) ++main () + { + void *x=resizeterm + ; + return 0; + } + _ACEOF +-if ac_fn_c_try_compile "$LINENO" +-then : ++if ac_fn_c_try_compile "$LINENO"; then : + +-printf "%s\n" "#define HAVE_CURSES_RESIZETERM 1" >>confdefs.h ++$as_echo "#define HAVE_CURSES_RESIZETERM 1" >>confdefs.h + +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-printf "%s\n" "yes" >&6; } +-else $as_nop +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-printf "%s\n" "no" >&6; } ++ { $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 +-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for immedok" >&5 +-printf %s "checking for immedok... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for immedok" >&5 ++$as_echo_n "checking for immedok... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + int +-main (void) ++main () + { + + #ifndef immedok +@@ -18821,27 +16572,26 @@ void *x=immedok + return 0; + } + _ACEOF +-if ac_fn_c_try_compile "$LINENO" +-then : ++if ac_fn_c_try_compile "$LINENO"; then : + +-printf "%s\n" "#define HAVE_CURSES_IMMEDOK 1" >>confdefs.h ++$as_echo "#define HAVE_CURSES_IMMEDOK 1" >>confdefs.h + +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-printf "%s\n" "yes" >&6; } +-else $as_nop +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-printf "%s\n" "no" >&6; } ++ { $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 +-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for syncok" >&5 +-printf %s "checking for syncok... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for syncok" >&5 ++$as_echo_n "checking for syncok... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + int +-main (void) ++main () + { + + #ifndef syncok +@@ -18852,27 +16602,26 @@ void *x=syncok + return 0; + } + _ACEOF +-if ac_fn_c_try_compile "$LINENO" +-then : ++if ac_fn_c_try_compile "$LINENO"; then : + +-printf "%s\n" "#define HAVE_CURSES_SYNCOK 1" >>confdefs.h ++$as_echo "#define HAVE_CURSES_SYNCOK 1" >>confdefs.h + +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-printf "%s\n" "yes" >&6; } +-else $as_nop +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-printf "%s\n" "no" >&6; } ++ { $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 +-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for wchgat" >&5 +-printf %s "checking for wchgat... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for wchgat" >&5 ++$as_echo_n "checking for wchgat... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + int +-main (void) ++main () + { + + #ifndef wchgat +@@ -18883,27 +16632,26 @@ void *x=wchgat + return 0; + } + _ACEOF +-if ac_fn_c_try_compile "$LINENO" +-then : ++if ac_fn_c_try_compile "$LINENO"; then : + +-printf "%s\n" "#define HAVE_CURSES_WCHGAT 1" >>confdefs.h ++$as_echo "#define HAVE_CURSES_WCHGAT 1" >>confdefs.h + +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-printf "%s\n" "yes" >&6; } +-else $as_nop +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-printf "%s\n" "no" >&6; } ++ { $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 +-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for filter" >&5 +-printf %s "checking for filter... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for filter" >&5 ++$as_echo_n "checking for filter... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + int +-main (void) ++main () + { + + #ifndef filter +@@ -18914,27 +16662,26 @@ void *x=filter + return 0; + } + _ACEOF +-if ac_fn_c_try_compile "$LINENO" +-then : ++if ac_fn_c_try_compile "$LINENO"; then : + +-printf "%s\n" "#define HAVE_CURSES_FILTER 1" >>confdefs.h ++$as_echo "#define HAVE_CURSES_FILTER 1" >>confdefs.h + +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-printf "%s\n" "yes" >&6; } +-else $as_nop +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-printf "%s\n" "no" >&6; } ++ { $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 +-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for has_key" >&5 +-printf %s "checking for has_key... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for has_key" >&5 ++$as_echo_n "checking for has_key... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + int +-main (void) ++main () + { + + #ifndef has_key +@@ -18945,27 +16692,26 @@ void *x=has_key + return 0; + } + _ACEOF +-if ac_fn_c_try_compile "$LINENO" +-then : ++if ac_fn_c_try_compile "$LINENO"; then : + +-printf "%s\n" "#define HAVE_CURSES_HAS_KEY 1" >>confdefs.h ++$as_echo "#define HAVE_CURSES_HAS_KEY 1" >>confdefs.h + +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-printf "%s\n" "yes" >&6; } +-else $as_nop +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-printf "%s\n" "no" >&6; } ++ { $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 +-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for typeahead" >&5 +-printf %s "checking for typeahead... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for typeahead" >&5 ++$as_echo_n "checking for typeahead... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + int +-main (void) ++main () + { + + #ifndef typeahead +@@ -18976,27 +16722,26 @@ void *x=typeahead + return 0; + } + _ACEOF +-if ac_fn_c_try_compile "$LINENO" +-then : ++if ac_fn_c_try_compile "$LINENO"; then : + +-printf "%s\n" "#define HAVE_CURSES_TYPEAHEAD 1" >>confdefs.h ++$as_echo "#define HAVE_CURSES_TYPEAHEAD 1" >>confdefs.h + +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-printf "%s\n" "yes" >&6; } +-else $as_nop +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-printf "%s\n" "no" >&6; } ++ { $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 +-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for use_env" >&5 +-printf %s "checking for use_env... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for use_env" >&5 ++$as_echo_n "checking for use_env... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + int +-main (void) ++main () + { + + #ifndef use_env +@@ -19007,48 +16752,46 @@ void *x=use_env + return 0; + } + _ACEOF +-if ac_fn_c_try_compile "$LINENO" +-then : ++if ac_fn_c_try_compile "$LINENO"; then : + +-printf "%s\n" "#define HAVE_CURSES_USE_ENV 1" >>confdefs.h ++$as_echo "#define HAVE_CURSES_USE_ENV 1" >>confdefs.h + +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-printf "%s\n" "yes" >&6; } +-else $as_nop +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-printf "%s\n" "no" >&6; } ++ { $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 +-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + # last curses configure check + CPPFLAGS=$ac_save_cppflags + +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for device files" >&5 +-printf "%s\n" "$as_me: checking for device files" >&6;} ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for device files" >&5 ++$as_echo "$as_me: checking for device files" >&6;} + + if test "x$cross_compiling" = xyes; then + if test "${ac_cv_file__dev_ptmx+set}" != set; then +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for /dev/ptmx" >&5 +-printf %s "checking for /dev/ptmx... " >&6; } +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not set" >&5 +-printf "%s\n" "not set" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /dev/ptmx" >&5 ++$as_echo_n "checking for /dev/ptmx... " >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: not set" >&5 ++$as_echo "not set" >&6; } + as_fn_error $? "set ac_cv_file__dev_ptmx to yes/no in your CONFIG_SITE file when cross compiling" "$LINENO" 5 + fi + if test "${ac_cv_file__dev_ptc+set}" != set; then +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for /dev/ptc" >&5 +-printf %s "checking for /dev/ptc... " >&6; } +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not set" >&5 +-printf "%s\n" "not set" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /dev/ptc" >&5 ++$as_echo_n "checking for /dev/ptc... " >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: not set" >&5 ++$as_echo "not set" >&6; } + as_fn_error $? "set ac_cv_file__dev_ptc to yes/no in your CONFIG_SITE file when cross compiling" "$LINENO" 5 + fi + fi + +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for /dev/ptmx" >&5 +-printf %s "checking for /dev/ptmx... " >&6; } +-if test ${ac_cv_file__dev_ptmx+y} +-then : +- printf %s "(cached) " >&6 +-else $as_nop ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for /dev/ptmx" >&5 ++$as_echo_n "checking for /dev/ptmx... " >&6; } ++if ${ac_cv_file__dev_ptmx+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else + test "$cross_compiling" = yes && + as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5 + if test -r "/dev/ptmx"; then +@@ -19057,24 +16800,22 @@ else + ac_cv_file__dev_ptmx=no + fi + fi +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__dev_ptmx" >&5 +-printf "%s\n" "$ac_cv_file__dev_ptmx" >&6; } +-if test "x$ac_cv_file__dev_ptmx" = xyes +-then : ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__dev_ptmx" >&5 ++$as_echo "$ac_cv_file__dev_ptmx" >&6; } ++if test "x$ac_cv_file__dev_ptmx" = xyes; then : + + fi + + if test "x$ac_cv_file__dev_ptmx" = xyes; then + +-printf "%s\n" "#define HAVE_DEV_PTMX 1" >>confdefs.h ++$as_echo "#define HAVE_DEV_PTMX 1" >>confdefs.h + + fi +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for /dev/ptc" >&5 +-printf %s "checking for /dev/ptc... " >&6; } +-if test ${ac_cv_file__dev_ptc+y} +-then : +- printf %s "(cached) " >&6 +-else $as_nop ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for /dev/ptc" >&5 ++$as_echo_n "checking for /dev/ptc... " >&6; } ++if ${ac_cv_file__dev_ptc+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else + test "$cross_compiling" = yes && + as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5 + if test -r "/dev/ptc"; then +@@ -19083,16 +16824,15 @@ else + ac_cv_file__dev_ptc=no + fi + fi +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__dev_ptc" >&5 +-printf "%s\n" "$ac_cv_file__dev_ptc" >&6; } +-if test "x$ac_cv_file__dev_ptc" = xyes +-then : ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__dev_ptc" >&5 ++$as_echo "$ac_cv_file__dev_ptc" >&6; } ++if test "x$ac_cv_file__dev_ptc" = xyes; then : + + fi + + if test "x$ac_cv_file__dev_ptc" = xyes; then + +-printf "%s\n" "#define HAVE_DEV_PTC 1" >>confdefs.h ++$as_echo "#define HAVE_DEV_PTC 1" >>confdefs.h + + fi + +@@ -19101,17 +16841,15 @@ then + LIBS="$LIBS -framework CoreFoundation" + fi + +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for %zd printf() format support" >&5 +-printf %s "checking for %zd printf() format support... " >&6; } +-if test ${ac_cv_have_size_t_format+y} +-then : +- printf %s "(cached) " >&6 +-else $as_nop +- if test "$cross_compiling" = yes +-then : ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for %zd printf() format support" >&5 ++$as_echo_n "checking for %zd printf() format support... " >&6; } ++if ${ac_cv_have_size_t_format+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test "$cross_compiling" = yes; then : + ac_cv_have_size_t_format="cross -- assuming yes" + +-else $as_nop ++else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -19151,10 +16889,9 @@ int main() + } + + _ACEOF +-if ac_fn_c_try_run "$LINENO" +-then : ++if ac_fn_c_try_run "$LINENO"; then : + ac_cv_have_size_t_format=yes +-else $as_nop ++else + ac_cv_have_size_t_format=no + fi + rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ +@@ -19162,11 +16899,11 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + fi + + fi +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_size_t_format" >&5 +-printf "%s\n" "$ac_cv_have_size_t_format" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_size_t_format" >&5 ++$as_echo "$ac_cv_have_size_t_format" >&6; } + if test "$ac_cv_have_size_t_format" != no ; then + +-printf "%s\n" "#define PY_FORMAT_SIZE_T \"z\"" >>confdefs.h ++$as_echo "#define PY_FORMAT_SIZE_T \"z\"" >>confdefs.h + + fi + +@@ -19179,26 +16916,23 @@ ac_fn_c_check_type "$LINENO" "socklen_t" "ac_cv_type_socklen_t" " + #endif + + " +-if test "x$ac_cv_type_socklen_t" = xyes +-then : ++if test "x$ac_cv_type_socklen_t" = xyes; then : + +-else $as_nop ++else + +-printf "%s\n" "#define socklen_t int" >>confdefs.h ++$as_echo "#define socklen_t int" >>confdefs.h + + fi + + +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for broken mbstowcs" >&5 +-printf %s "checking for broken mbstowcs... " >&6; } +-if test ${ac_cv_broken_mbstowcs+y} +-then : +- printf %s "(cached) " >&6 +-else $as_nop +- if test "$cross_compiling" = yes +-then : ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken mbstowcs" >&5 ++$as_echo_n "checking for broken mbstowcs... " >&6; } ++if ${ac_cv_broken_mbstowcs+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test "$cross_compiling" = yes; then : + ac_cv_broken_mbstowcs=no +-else $as_nop ++else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -19212,10 +16946,9 @@ int main() { + } + + _ACEOF +-if ac_fn_c_try_run "$LINENO" +-then : ++if ac_fn_c_try_run "$LINENO"; then : + ac_cv_broken_mbstowcs=no +-else $as_nop ++else + ac_cv_broken_mbstowcs=yes + fi + rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ +@@ -19224,60 +16957,57 @@ fi + + fi + +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_broken_mbstowcs" >&5 +-printf "%s\n" "$ac_cv_broken_mbstowcs" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_broken_mbstowcs" >&5 ++$as_echo "$ac_cv_broken_mbstowcs" >&6; } + if test "$ac_cv_broken_mbstowcs" = yes + then + +-printf "%s\n" "#define HAVE_BROKEN_MBSTOWCS 1" >>confdefs.h ++$as_echo "#define HAVE_BROKEN_MBSTOWCS 1" >>confdefs.h + + fi + + # Check for --with-computed-gotos +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for --with-computed-gotos" >&5 +-printf %s "checking for --with-computed-gotos... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-computed-gotos" >&5 ++$as_echo_n "checking for --with-computed-gotos... " >&6; } + + # Check whether --with-computed-gotos was given. +-if test ${with_computed_gotos+y} +-then : ++if test "${with_computed_gotos+set}" = set; then : + withval=$with_computed_gotos; + if test "$withval" = yes + then + +-printf "%s\n" "#define USE_COMPUTED_GOTOS 1" >>confdefs.h ++$as_echo "#define USE_COMPUTED_GOTOS 1" >>confdefs.h + +- { 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 + if test "$withval" = no + then + +-printf "%s\n" "#define USE_COMPUTED_GOTOS 0" >>confdefs.h ++$as_echo "#define USE_COMPUTED_GOTOS 0" >>confdefs.h + +- { 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 + +-else $as_nop +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no value specified" >&5 +-printf "%s\n" "no value specified" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no value specified" >&5 ++$as_echo "no value specified" >&6; } + fi + + +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC supports computed gotos" >&5 +-printf %s "checking whether $CC supports computed gotos... " >&6; } +-if test ${ac_cv_computed_gotos+y} +-then : +- printf %s "(cached) " >&6 +-else $as_nop +- if test "$cross_compiling" = yes +-then : ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports computed gotos" >&5 ++$as_echo_n "checking whether $CC supports computed gotos... " >&6; } ++if ${ac_cv_computed_gotos+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test "$cross_compiling" = yes; then : + if test "${with_computed_gotos+set}" = set; then + ac_cv_computed_gotos="$with_computed_gotos -- configured --with(out)-computed-gotos" + else + ac_cv_computed_gotos=no + fi +-else $as_nop ++else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -19293,10 +17023,9 @@ LABEL2: + } + + _ACEOF +-if ac_fn_c_try_run "$LINENO" +-then : ++if ac_fn_c_try_run "$LINENO"; then : + ac_cv_computed_gotos=yes +-else $as_nop ++else + ac_cv_computed_gotos=no + fi + rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ +@@ -19305,18 +17034,18 @@ fi + + fi + +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_computed_gotos" >&5 +-printf "%s\n" "$ac_cv_computed_gotos" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_computed_gotos" >&5 ++$as_echo "$ac_cv_computed_gotos" >&6; } + case "$ac_cv_computed_gotos" in yes*) + +-printf "%s\n" "#define HAVE_COMPUTED_GOTOS 1" >>confdefs.h ++$as_echo "#define HAVE_COMPUTED_GOTOS 1" >>confdefs.h + + esac + + case $ac_sys_system in + AIX*) + +-printf "%s\n" "#define HAVE_BROKEN_PIPE_BUF 1" >>confdefs.h ++$as_echo "#define HAVE_BROKEN_PIPE_BUF 1" >>confdefs.h + ;; + esac + +@@ -19330,26 +17059,26 @@ done + + + SRCDIRS="Parser Objects Python Modules Modules/_io Programs" +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for build directories" >&5 +-printf %s "checking for build directories... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for build directories" >&5 ++$as_echo_n "checking for build directories... " >&6; } + for dir in $SRCDIRS; do + if test ! -d $dir; then + mkdir $dir + fi + done +-{ 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; } + + # Availability of -O2: +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -O2" >&5 +-printf %s "checking for -O2... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -O2" >&5 ++$as_echo_n "checking for -O2... " >&6; } + saved_cflags="$CFLAGS" + CFLAGS="-O2" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + int +-main (void) ++main () + { + + +@@ -19357,30 +17086,28 @@ main (void) + return 0; + } + _ACEOF +-if ac_fn_c_try_compile "$LINENO" +-then : ++if ac_fn_c_try_compile "$LINENO"; then : + have_O2=yes +-else $as_nop ++else + have_O2=no + fi +-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $have_O2" >&5 +-printf "%s\n" "$have_O2" >&6; } ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_O2" >&5 ++$as_echo "$have_O2" >&6; } + CFLAGS="$saved_cflags" + + # _FORTIFY_SOURCE wrappers for memmove and bcopy are incorrect: + # http://sourceware.org/ml/libc-alpha/2010-12/msg00009.html +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for glibc _FORTIFY_SOURCE/memmove bug" >&5 +-printf %s "checking for glibc _FORTIFY_SOURCE/memmove bug... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for glibc _FORTIFY_SOURCE/memmove bug" >&5 ++$as_echo_n "checking for glibc _FORTIFY_SOURCE/memmove bug... " >&6; } + saved_cflags="$CFLAGS" + CFLAGS="-O2 -D_FORTIFY_SOURCE=2" + if test "$have_O2" = no; then + CFLAGS="" + fi +-if test "$cross_compiling" = yes +-then : ++if test "$cross_compiling" = yes; then : + have_glibc_memmove_bug=undefined +-else $as_nop ++else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -19400,10 +17127,9 @@ int main() { + } + + _ACEOF +-if ac_fn_c_try_run "$LINENO" +-then : ++if ac_fn_c_try_run "$LINENO"; then : + have_glibc_memmove_bug=no +-else $as_nop ++else + have_glibc_memmove_bug=yes + fi + rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ +@@ -19411,11 +17137,11 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + fi + + CFLAGS="$saved_cflags" +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $have_glibc_memmove_bug" >&5 +-printf "%s\n" "$have_glibc_memmove_bug" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_glibc_memmove_bug" >&5 ++$as_echo "$have_glibc_memmove_bug" >&6; } + if test "$have_glibc_memmove_bug" = yes; then + +-printf "%s\n" "#define HAVE_GLIBC_MEMMOVE_BUG 1" >>confdefs.h ++$as_echo "#define HAVE_GLIBC_MEMMOVE_BUG 1" >>confdefs.h + + fi + +@@ -19425,14 +17151,13 @@ if test "$have_gcc_asm_for_x87" = yes; then + # http://gcc.gnu.org/ml/gcc/2010-11/msg00366.html + case $CC in + *gcc*) +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gcc ipa-pure-const bug" >&5 +-printf %s "checking for gcc ipa-pure-const bug... " >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gcc ipa-pure-const bug" >&5 ++$as_echo_n "checking for gcc ipa-pure-const bug... " >&6; } + saved_cflags="$CFLAGS" + CFLAGS="-O2" +- if test "$cross_compiling" = yes +-then : ++ if test "$cross_compiling" = yes; then : + have_ipa_pure_const_bug=undefined +-else $as_nop ++else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -19453,10 +17178,9 @@ else $as_nop + } + + _ACEOF +-if ac_fn_c_try_run "$LINENO" +-then : ++if ac_fn_c_try_run "$LINENO"; then : + have_ipa_pure_const_bug=no +-else $as_nop ++else + have_ipa_pure_const_bug=yes + fi + rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ +@@ -19464,11 +17188,11 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + fi + + CFLAGS="$saved_cflags" +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $have_ipa_pure_const_bug" >&5 +-printf "%s\n" "$have_ipa_pure_const_bug" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_ipa_pure_const_bug" >&5 ++$as_echo "$have_ipa_pure_const_bug" >&6; } + if test "$have_ipa_pure_const_bug" = yes; then + +-printf "%s\n" "#define HAVE_IPA_PURE_CONST_BUG 1" >>confdefs.h ++$as_echo "#define HAVE_IPA_PURE_CONST_BUG 1" >>confdefs.h + + fi + ;; +@@ -19476,8 +17200,8 @@ printf "%s\n" "#define HAVE_IPA_PURE_CONST_BUG 1" >>confdefs.h + fi + + # Check for stdatomic.h +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for stdatomic.h" >&5 +-printf %s "checking for stdatomic.h... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdatomic.h" >&5 ++$as_echo_n "checking for stdatomic.h... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -19494,27 +17218,26 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + + + _ACEOF +-if ac_fn_c_try_link "$LINENO" +-then : ++if ac_fn_c_try_link "$LINENO"; then : + have_stdatomic_h=yes +-else $as_nop ++else + have_stdatomic_h=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 + +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $have_stdatomic_h" >&5 +-printf "%s\n" "$have_stdatomic_h" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_stdatomic_h" >&5 ++$as_echo "$have_stdatomic_h" >&6; } + + if test "$have_stdatomic_h" = yes; then + +-printf "%s\n" "#define HAVE_STD_ATOMIC 1" >>confdefs.h ++$as_echo "#define HAVE_STD_ATOMIC 1" >>confdefs.h + + fi + + # Check for GCC >= 4.7 and clang __atomic builtin functions +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for builtin __atomic_load_n and __atomic_store_n functions" >&5 +-printf %s "checking for builtin __atomic_load_n and __atomic_store_n functions... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for builtin __atomic_load_n and __atomic_store_n functions" >&5 ++$as_echo_n "checking for builtin __atomic_load_n and __atomic_store_n functions... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -19528,33 +17251,31 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + + + _ACEOF +-if ac_fn_c_try_link "$LINENO" +-then : ++if ac_fn_c_try_link "$LINENO"; then : + have_builtin_atomic=yes +-else $as_nop ++else + have_builtin_atomic=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 + +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $have_builtin_atomic" >&5 +-printf "%s\n" "$have_builtin_atomic" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_builtin_atomic" >&5 ++$as_echo "$have_builtin_atomic" >&6; } + + if test "$have_builtin_atomic" = yes; then + +-printf "%s\n" "#define HAVE_BUILTIN_ATOMIC 1" >>confdefs.h ++$as_echo "#define HAVE_BUILTIN_ATOMIC 1" >>confdefs.h + + fi + + # ensurepip option +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ensurepip" >&5 +-printf %s "checking for ensurepip... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ensurepip" >&5 ++$as_echo_n "checking for ensurepip... " >&6; } + + # Check whether --with-ensurepip was given. +-if test ${with_ensurepip+y} +-then : ++if test "${with_ensurepip+set}" = set; then : + withval=$with_ensurepip; +-else $as_nop ++else + with_ensurepip=upgrade + fi + +@@ -19568,13 +17289,13 @@ case $with_ensurepip in #( + *) : + as_fn_error $? "--with-ensurepip=upgrade|install|no" "$LINENO" 5 ;; + esac +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ENSUREPIP" >&5 +-printf "%s\n" "$ENSUREPIP" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ENSUREPIP" >&5 ++$as_echo "$ENSUREPIP" >&6; } + + + # check if the dirent structure of a d_type field and DT_UNKNOWN is defined +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if the dirent structure of a d_type field" >&5 +-printf %s "checking if the dirent structure of a d_type field... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the dirent structure of a d_type field" >&5 ++$as_echo_n "checking if the dirent structure of a d_type field... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -19588,26 +17309,25 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + + + _ACEOF +-if ac_fn_c_try_link "$LINENO" +-then : ++if ac_fn_c_try_link "$LINENO"; then : + have_dirent_d_type=yes +-else $as_nop ++else + have_dirent_d_type=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 +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $have_dirent_d_type" >&5 +-printf "%s\n" "$have_dirent_d_type" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_dirent_d_type" >&5 ++$as_echo "$have_dirent_d_type" >&6; } + + if test "$have_dirent_d_type" = yes; then + +-printf "%s\n" "#define HAVE_DIRENT_D_TYPE 1" >>confdefs.h ++$as_echo "#define HAVE_DIRENT_D_TYPE 1" >>confdefs.h + + fi + + # check if the Linux getrandom() syscall is available +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for the Linux getrandom() syscall" >&5 +-printf %s "checking for the Linux getrandom() syscall... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the Linux getrandom() syscall" >&5 ++$as_echo_n "checking for the Linux getrandom() syscall... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -19627,27 +17347,26 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + + + _ACEOF +-if ac_fn_c_try_link "$LINENO" +-then : ++if ac_fn_c_try_link "$LINENO"; then : + have_getrandom_syscall=yes +-else $as_nop ++else + have_getrandom_syscall=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 +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $have_getrandom_syscall" >&5 +-printf "%s\n" "$have_getrandom_syscall" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_getrandom_syscall" >&5 ++$as_echo "$have_getrandom_syscall" >&6; } + + if test "$have_getrandom_syscall" = yes; then + +-printf "%s\n" "#define HAVE_GETRANDOM_SYSCALL 1" >>confdefs.h ++$as_echo "#define HAVE_GETRANDOM_SYSCALL 1" >>confdefs.h + + fi + + # check if the getrandom() function is available + # the test was written for the Solaris function of +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for the getrandom() function" >&5 +-printf %s "checking for the getrandom() function... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the getrandom() function" >&5 ++$as_echo_n "checking for the getrandom() function... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -19665,20 +17384,19 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + + + _ACEOF +-if ac_fn_c_try_link "$LINENO" +-then : ++if ac_fn_c_try_link "$LINENO"; then : + have_getrandom=yes +-else $as_nop ++else + have_getrandom=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 +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $have_getrandom" >&5 +-printf "%s\n" "$have_getrandom" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_getrandom" >&5 ++$as_echo "$have_getrandom" >&6; } + + if test "$have_getrandom" = yes; then + +-printf "%s\n" "#define HAVE_GETRANDOM 1" >>confdefs.h ++$as_echo "#define HAVE_GETRANDOM 1" >>confdefs.h + + fi + +@@ -19686,12 +17404,11 @@ fi + # shm_* may only be available if linking against librt + save_LIBS="$LIBS" + save_includes_default="$ac_includes_default" +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing shm_open" >&5 +-printf %s "checking for library containing shm_open... " >&6; } +-if test ${ac_cv_search_shm_open+y} +-then : +- printf %s "(cached) " >&6 +-else $as_nop ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing shm_open" >&5 ++$as_echo_n "checking for library containing shm_open... " >&6; } ++if ${ac_cv_search_shm_open+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else + ac_func_search_save_LIBS=$LIBS + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +@@ -19699,64 +17416,67 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* 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 shm_open (); + int +-main (void) ++main () + { + return shm_open (); + ; + return 0; + } + _ACEOF +-for ac_lib in '' rt +-do ++for ac_lib in '' rt; 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_shm_open=$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_shm_open+y} +-then : ++ if ${ac_cv_search_shm_open+:} false; then : + break + fi + done +-if test ${ac_cv_search_shm_open+y} +-then : ++if ${ac_cv_search_shm_open+:} false; then : + +-else $as_nop ++else + ac_cv_search_shm_open=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_shm_open" >&5 +-printf "%s\n" "$ac_cv_search_shm_open" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_shm_open" >&5 ++$as_echo "$ac_cv_search_shm_open" >&6; } + ac_res=$ac_cv_search_shm_open +-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_shm_open" = "-lrt"; then + +-printf "%s\n" "#define SHM_NEEDS_LIBRT 1" >>confdefs.h ++$as_echo "#define SHM_NEEDS_LIBRT 1" >>confdefs.h + + fi +-ac_fn_c_check_header_compile "$LINENO" "sys/mman.h" "ac_cv_header_sys_mman_h" "$ac_includes_default" +-if test "x$ac_cv_header_sys_mman_h" = xyes +-then : +- printf "%s\n" "#define HAVE_SYS_MMAN_H 1" >>confdefs.h ++for ac_header in sys/mman.h ++do : ++ ac_fn_c_check_header_mongrel "$LINENO" "sys/mman.h" "ac_cv_header_sys_mman_h" "$ac_includes_default" ++if test "x$ac_cv_header_sys_mman_h" = xyes; then : ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_SYS_MMAN_H 1 ++_ACEOF + + fi + ++done ++ + # temporarily override ac_includes_default for AC_CHECK_FUNCS below + ac_includes_default="\ + ${ac_includes_default} +@@ -19766,18 +17486,17 @@ ${ac_includes_default} + # endif + #endif + " +-ac_fn_c_check_func "$LINENO" "shm_open" "ac_cv_func_shm_open" +-if test "x$ac_cv_func_shm_open" = xyes +-then : +- printf "%s\n" "#define HAVE_SHM_OPEN 1" >>confdefs.h +- +-fi +-ac_fn_c_check_func "$LINENO" "shm_unlink" "ac_cv_func_shm_unlink" +-if test "x$ac_cv_func_shm_unlink" = xyes +-then : +- printf "%s\n" "#define HAVE_SHM_UNLINK 1" >>confdefs.h ++for ac_func in shm_open shm_unlink ++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 + + # we don't want to link with librt always, restore LIBS + LIBS="$save_LIBS" +@@ -19788,8 +17507,7 @@ ac_includes_default="$save_includes_default" + found=false + + # Check whether --with-openssl was given. +-if test ${with_openssl+y} +-then : ++if test "${with_openssl+set}" = set; then : + withval=$with_openssl; + case "$withval" in + "" | y | ye | yes | n | no) +@@ -19799,19 +17517,18 @@ then : + ;; + esac + +-else $as_nop ++else + + # if pkg-config is installed and openssl has installed a .pc file, + # then use that information and don't search ssldirs + 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_prog_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_prog_PKG_CONFIG+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else + if test -n "$PKG_CONFIG"; then + ac_cv_prog_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test. + else +@@ -19819,15 +17536,11 @@ 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 ++ 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_PKG_CONFIG="${ac_tool_prefix}pkg-config" +- 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 +@@ -19838,11 +17551,11 @@ fi + fi + PKG_CONFIG=$ac_cv_prog_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 + + +@@ -19851,12 +17564,11 @@ if test -z "$ac_cv_prog_PKG_CONFIG"; then + ac_ct_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_prog_ac_ct_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_prog_ac_ct_PKG_CONFIG+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else + if test -n "$ac_ct_PKG_CONFIG"; then + ac_cv_prog_ac_ct_PKG_CONFIG="$ac_ct_PKG_CONFIG" # Let the user override the test. + else +@@ -19864,15 +17576,11 @@ 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 ++ 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_PKG_CONFIG="pkg-config" +- 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 +@@ -19883,11 +17591,11 @@ fi + fi + ac_ct_PKG_CONFIG=$ac_cv_prog_ac_ct_PKG_CONFIG + if test -n "$ac_ct_PKG_CONFIG"; then +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_PKG_CONFIG" >&5 +-printf "%s\n" "$ac_ct_PKG_CONFIG" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_PKG_CONFIG" >&5 ++$as_echo "$ac_ct_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_ct_PKG_CONFIG" = x; then +@@ -19895,8 +17603,8 @@ fi + 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_ct_PKG_CONFIG +@@ -19930,19 +17638,19 @@ fi + if ! $found; then + OPENSSL_INCLUDES= + for ssldir in $ssldirs; do +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for openssl/ssl.h in $ssldir" >&5 +-printf %s "checking for openssl/ssl.h in $ssldir... " >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for openssl/ssl.h in $ssldir" >&5 ++$as_echo_n "checking for openssl/ssl.h in $ssldir... " >&6; } + if test -f "$ssldir/include/openssl/ssl.h"; then + OPENSSL_INCLUDES="-I$ssldir/include" + OPENSSL_LDFLAGS="-L$ssldir/lib" + OPENSSL_LIBS="-lssl -lcrypto" + found=true +- { 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; } + break + 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 + done + +@@ -19953,8 +17661,8 @@ printf "%s\n" "no" >&6; } + # try the preprocessor and linker with our new flags, + # being careful not to pollute the global LIBS, LDFLAGS, and CPPFLAGS + +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether compiling and linking against OpenSSL works" >&5 +-printf %s "checking whether compiling and linking against OpenSSL works... " >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether compiling and linking against OpenSSL works" >&5 ++$as_echo_n "checking whether compiling and linking against OpenSSL works... " >&6; } + echo "Trying link with OPENSSL_LDFLAGS=$OPENSSL_LDFLAGS;" \ + "OPENSSL_LIBS=$OPENSSL_LIBS; OPENSSL_INCLUDES=$OPENSSL_INCLUDES" >&5 + +@@ -19968,28 +17676,27 @@ printf %s "checking whether compiling and linking against OpenSSL works... " >&6 + /* end confdefs.h. */ + #include + int +-main (void) ++main () + { + SSL_new(NULL) + ; + return 0; + } + _ACEOF +-if ac_fn_c_try_link "$LINENO" +-then : ++if ac_fn_c_try_link "$LINENO"; 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; } + have_openssl=yes + +-else $as_nop ++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; } + have_openssl=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 + CPPFLAGS="$save_CPPFLAGS" + LDFLAGS="$save_LDFLAGS" +@@ -20000,70 +17707,14 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \ + + + +-if test "$have_openssl" = yes; then +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for X509_VERIFY_PARAM_set1_host in libssl" >&5 +-printf %s "checking for X509_VERIFY_PARAM_set1_host in libssl... " >&6; } +- +- save_LIBS="$LIBS" +- save_LDFLAGS="$LDFLAGS" +- save_CPPFLAGS="$CPPFLAGS" +- LDFLAGS="$LDFLAGS $OPENSSL_LDFLAGS" +- LIBS="$OPENSSL_LIBS $LIBS" +- CPPFLAGS="$OPENSSL_INCLUDES $CPPFLAGS" +- +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +- #include +- +-int +-main (void) +-{ +- +- X509_VERIFY_PARAM *p = X509_VERIFY_PARAM_new(); +- X509_VERIFY_PARAM_set1_host(p, "localhost", 0); +- X509_VERIFY_PARAM_set1_ip_asc(p, "127.0.0.1"); +- X509_VERIFY_PARAM_set_hostflags(p, 0); +- +- ; +- return 0; +-} +- +-_ACEOF +-if ac_fn_c_try_link "$LINENO" +-then : +- +- ac_cv_has_x509_verify_param_set1_host=yes +- +-else $as_nop +- +- ac_cv_has_x509_verify_param_set1_host=no +- +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.beam \ +- conftest$ac_exeext conftest.$ac_ext +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_has_x509_verify_param_set1_host" >&5 +-printf "%s\n" "$ac_cv_has_x509_verify_param_set1_host" >&6; } +- if test "$ac_cv_has_x509_verify_param_set1_host" = "yes"; then +- +-printf "%s\n" "#define HAVE_X509_VERIFY_PARAM_SET1_HOST 1" >>confdefs.h +- +- fi +- +- CPPFLAGS="$save_CPPFLAGS" +- LDFLAGS="$save_LDFLAGS" +- LIBS="$save_LIBS" +-fi +- + # rpath to libssl and libcrypto +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for --with-openssl-rpath" >&5 +-printf %s "checking for --with-openssl-rpath... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-openssl-rpath" >&5 ++$as_echo_n "checking for --with-openssl-rpath... " >&6; } + + # Check whether --with-openssl-rpath was given. +-if test ${with_openssl_rpath+y} +-then : ++if test "${with_openssl_rpath+set}" = set; then : + withval=$with_openssl_rpath; +-else $as_nop ++else + with_openssl_rpath=no + + fi +@@ -20074,54 +17725,54 @@ case $with_openssl_rpath in #( + no) : + OPENSSL_RPATH= ;; #( + *) : +- if test -d "$with_openssl_rpath" +-then : ++ if test -d "$with_openssl_rpath"; then : + OPENSSL_RPATH="$with_openssl_rpath" +-else $as_nop ++else + as_fn_error $? "--with-openssl-rpath \"$with_openssl_rpath\" is not a directory" "$LINENO" 5 + fi + + ;; + esac +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OPENSSL_RPATH" >&5 +-printf "%s\n" "$OPENSSL_RPATH" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $OPENSSL_RPATH" >&5 ++$as_echo "$OPENSSL_RPATH" >&6; } + + + # ssl module default cipher suite string + + + +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for --with-ssl-default-suites" >&5 +-printf %s "checking for --with-ssl-default-suites... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-ssl-default-suites" >&5 ++$as_echo_n "checking for --with-ssl-default-suites... " >&6; } + + # Check whether --with-ssl-default-suites was given. +-if test ${with_ssl_default_suites+y} +-then : ++if test "${with_ssl_default_suites+set}" = set; then : + withval=$with_ssl_default_suites; +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $withval" >&5 +-printf "%s\n" "$withval" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $withval" >&5 ++$as_echo "$withval" >&6; } + case "$withval" in + python) +- printf "%s\n" "#define PY_SSL_DEFAULT_CIPHERS 1" >>confdefs.h ++ $as_echo "#define PY_SSL_DEFAULT_CIPHERS 1" >>confdefs.h + + ;; + openssl) +- printf "%s\n" "#define PY_SSL_DEFAULT_CIPHERS 2" >>confdefs.h ++ $as_echo "#define PY_SSL_DEFAULT_CIPHERS 2" >>confdefs.h + + ;; + *) +- printf "%s\n" "#define PY_SSL_DEFAULT_CIPHERS 0" >>confdefs.h ++ $as_echo "#define PY_SSL_DEFAULT_CIPHERS 0" >>confdefs.h + +- printf "%s\n" "#define PY_SSL_DEFAULT_CIPHER_STRING \"$withval\"" >>confdefs.h ++ cat >>confdefs.h <<_ACEOF ++#define PY_SSL_DEFAULT_CIPHER_STRING "$withval" ++_ACEOF + + ;; + esac + +-else $as_nop ++else + +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: python" >&5 +-printf "%s\n" "python" >&6; } +-printf "%s\n" "#define PY_SSL_DEFAULT_CIPHERS 1" >>confdefs.h ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: python" >&5 ++$as_echo "python" >&6; } ++$as_echo "#define PY_SSL_DEFAULT_CIPHERS 1" >>confdefs.h + + + fi +@@ -20130,14 +17781,13 @@ fi + # builtin hash modules + default_hashlib_hashes="md5,sha1,sha256,sha512,sha3,blake2" + +-printf "%s\n" "#define PY_BUILTIN_HASHLIB_HASHES /**/" >>confdefs.h ++$as_echo "#define PY_BUILTIN_HASHLIB_HASHES /**/" >>confdefs.h + +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for --with-builtin-hashlib-hashes" >&5 +-printf %s "checking for --with-builtin-hashlib-hashes... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-builtin-hashlib-hashes" >&5 ++$as_echo_n "checking for --with-builtin-hashlib-hashes... " >&6; } + + # Check whether --with-builtin-hashlib-hashes was given. +-if test ${with_builtin_hashlib_hashes+y} +-then : ++if test "${with_builtin_hashlib_hashes+set}" = set; then : + withval=$with_builtin_hashlib_hashes; + case "$withval" in + yes) +@@ -20147,16 +17797,20 @@ case "$withval" in + withval="" + ;; + esac +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $withval" >&5 +-printf "%s\n" "$withval" >&6; } +-printf "%s\n" "#define PY_BUILTIN_HASHLIB_HASHES \"$withval\"" >>confdefs.h ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $withval" >&5 ++$as_echo "$withval" >&6; } ++cat >>confdefs.h <<_ACEOF ++#define PY_BUILTIN_HASHLIB_HASHES "$withval" ++_ACEOF + + +-else $as_nop ++else + +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $default_hashlib_hashes" >&5 +-printf "%s\n" "$default_hashlib_hashes" >&6; }; +-printf "%s\n" "#define PY_BUILTIN_HASHLIB_HASHES \"$default_hashlib_hashes\"" >>confdefs.h ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $default_hashlib_hashes" >&5 ++$as_echo "$default_hashlib_hashes" >&6; }; ++cat >>confdefs.h <<_ACEOF ++#define PY_BUILTIN_HASHLIB_HASHES "$default_hashlib_hashes" ++_ACEOF + + + fi +@@ -20164,50 +17818,48 @@ fi + + # --with-experimental-isolated-subinterpreters + +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for --with-experimental-isolated-subinterpreters" >&5 +-printf %s "checking for --with-experimental-isolated-subinterpreters... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-experimental-isolated-subinterpreters" >&5 ++$as_echo_n "checking for --with-experimental-isolated-subinterpreters... " >&6; } + + # Check whether --with-experimental-isolated-subinterpreters was given. +-if test ${with_experimental_isolated_subinterpreters+y} +-then : ++if test "${with_experimental_isolated_subinterpreters+set}" = set; then : + withval=$with_experimental_isolated_subinterpreters; + if test "$withval" != no + then +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-printf "%s\n" "yes" >&6; }; +- printf "%s\n" "#define EXPERIMENTAL_ISOLATED_SUBINTERPRETERS 1" >>confdefs.h ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; }; ++ $as_echo "#define EXPERIMENTAL_ISOLATED_SUBINTERPRETERS 1" >>confdefs.h + + 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 +-else $as_nop +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-printf "%s\n" "no" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } + fi + + + # --with-static-libpython + STATIC_LIBPYTHON=1 +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for --with-static-libpython" >&5 +-printf %s "checking for --with-static-libpython... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-static-libpython" >&5 ++$as_echo_n "checking for --with-static-libpython... " >&6; } + + # Check whether --with-static-libpython was given. +-if test ${with_static_libpython+y} +-then : ++if test "${with_static_libpython+set}" = set; then : + withval=$with_static_libpython; + if test "$withval" = no + 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; }; + STATIC_LIBPYTHON=0 + else +- { 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 +-else $as_nop +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-printf "%s\n" "yes" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; } + fi + + LIBRARY_DEPS='$(PY3LIBRARY) $(EXPORTSYMS)' +@@ -20224,22 +17876,21 @@ fi + + # Check whether to disable test modules. Once set, setup.py will not build + # test extension modules and "make install" will not install test suites. +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for --disable-test-modules" >&5 +-printf %s "checking for --disable-test-modules... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --disable-test-modules" >&5 ++$as_echo_n "checking for --disable-test-modules... " >&6; } + # Check whether --enable-test-modules was given. +-if test ${enable_test_modules+y} +-then : ++if test "${enable_test_modules+set}" = set; then : + enableval=$enable_test_modules; + fi + + if test "$enable_test_modules" = no; then + TEST_MODULES=no +- { 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 + TEST_MODULES=yes +- { 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 + + +@@ -20276,8 +17927,8 @@ _ACEOF + 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) ;; #( +@@ -20307,15 +17958,15 @@ printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} + /^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 +@@ -20329,8 +17980,8 @@ printf "%s\n" "$as_me: updating cache $cache_file" >&6;} + 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 +@@ -20347,7 +17998,7 @@ U= + 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" +@@ -20364,8 +18015,8 @@ LTLIBOBJS=$ac_ltlibobjs + 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 +@@ -20388,16 +18039,14 @@ cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1 + + # 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 ;; #( +@@ -20407,46 +18056,46 @@ esac + 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&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 || +@@ -20455,6 +18104,13 @@ if ${PATH_SEPARATOR+false} :; then + 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 #(( +@@ -20463,12 +18119,8 @@ case $0 in #(( + 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 + +@@ -20480,10 +18132,30 @@ if test "x$as_myself" = x; then + 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] +@@ -20496,14 +18168,13 @@ as_fn_error () + 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. +@@ -20530,20 +18201,18 @@ as_fn_unset () + { 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 +@@ -20555,13 +18224,12 @@ fi # as_fn_append + # 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` +@@ -20592,7 +18260,7 @@ as_me=`$as_basename -- "$0" || + $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 +@@ -20614,10 +18282,6 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS + 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*) +@@ -20631,12 +18295,6 @@ case `echo -n x` in #((((( + 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 +@@ -20678,7 +18336,7 @@ as_fn_mkdir_p () + 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" +@@ -20687,7 +18345,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + 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 +@@ -20750,7 +18408,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 + # values after options handling. + ac_log=" + This file was extended by python $as_me 3.10, which was +-generated by GNU Autoconf 2.71. Invocation command line was ++generated by GNU Autoconf 2.69. Invocation command line was + + CONFIG_FILES = $CONFIG_FILES + CONFIG_HEADERS = $CONFIG_HEADERS +@@ -20808,16 +18466,14 @@ $config_headers + Report bugs to ." + + _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="\\ + python config.status 3.10 +-configured by $0, generated by GNU Autoconf 2.71, ++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." + +@@ -20856,15 +18512,15 @@ do + -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'" +@@ -20872,7 +18528,7 @@ do + --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;; +@@ -20881,7 +18537,7 @@ do + 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=: ;; +@@ -20909,7 +18565,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + 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 "\$@" +@@ -20923,7 +18579,7 @@ exec 5>>config.log + 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 +@@ -20957,8 +18613,8 @@ done + # 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_FILES+set}" = set || CONFIG_FILES=$config_files ++ test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers + fi + + # Have a temporary directory for convenience. Make it in the build tree +@@ -21294,7 +18950,7 @@ do + 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 + +@@ -21302,17 +18958,17 @@ do + # 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 +@@ -21329,7 +18985,7 @@ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + 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 +@@ -21353,9 +19009,9 @@ printf "%s\n" X"$ac_file" | + 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/ ;; +@@ -21417,8 +19073,8 @@ ac_sed_dataroot=' + 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=' +@@ -21462,9 +19118,9 @@ test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && + { 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" +@@ -21480,20 +19136,20 @@ which seems to be undefined. Please make sure it is defined" >&2;} + # + 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 +@@ -21539,8 +19195,8 @@ if test "$no_create" != yes; then + $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 + + +@@ -21564,4 +19220,3 @@ if test "$Py_OPT" = 'false' -a "$Py_DEBUG" != 'true'; then + echo "" >&6 + echo "" >&6 + fi +- +diff --git a/configure.ac b/configure.ac +index 8b3ab1e16f6af6..3df9bd0acec628 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -5781,42 +5781,6 @@ ac_includes_default="$save_includes_default" + # Check for usable OpenSSL + AX_CHECK_OPENSSL([have_openssl=yes],[have_openssl=no]) + +-if test "$have_openssl" = yes; then +- AC_MSG_CHECKING([for X509_VERIFY_PARAM_set1_host in libssl]) +- +- save_LIBS="$LIBS" +- save_LDFLAGS="$LDFLAGS" +- save_CPPFLAGS="$CPPFLAGS" +- LDFLAGS="$LDFLAGS $OPENSSL_LDFLAGS" +- LIBS="$OPENSSL_LIBS $LIBS" +- CPPFLAGS="$OPENSSL_INCLUDES $CPPFLAGS" +- +- AC_LINK_IFELSE([AC_LANG_PROGRAM([ +- [#include ] +- ], [ +- [X509_VERIFY_PARAM *p = X509_VERIFY_PARAM_new();] +- [X509_VERIFY_PARAM_set1_host(p, "localhost", 0);] +- [X509_VERIFY_PARAM_set1_ip_asc(p, "127.0.0.1");] +- [X509_VERIFY_PARAM_set_hostflags(p, 0);] +- ]) +- ], +- [ +- ac_cv_has_x509_verify_param_set1_host=yes +- ], +- [ +- ac_cv_has_x509_verify_param_set1_host=no +- ]) +- AC_MSG_RESULT($ac_cv_has_x509_verify_param_set1_host) +- if test "$ac_cv_has_x509_verify_param_set1_host" = "yes"; then +- AC_DEFINE(HAVE_X509_VERIFY_PARAM_SET1_HOST, 1, +- [Define if libssl has X509_VERIFY_PARAM_set1_host and related function]) +- fi +- +- CPPFLAGS="$save_CPPFLAGS" +- LDFLAGS="$save_LDFLAGS" +- LIBS="$save_LIBS" +-fi +- + # rpath to libssl and libcrypto + AC_MSG_CHECKING(for --with-openssl-rpath) + AC_ARG_WITH(openssl-rpath, +diff --git a/pyconfig.h.in b/pyconfig.h.in +index 9b713ac93e75ea..6e54d553b7750f 100644 +--- a/pyconfig.h.in ++++ b/pyconfig.h.in +@@ -1356,9 +1356,6 @@ + /* Define to 1 if you have the `writev' function. */ + #undef HAVE_WRITEV + +-/* Define if libssl has X509_VERIFY_PARAM_set1_host and related function */ +-#undef HAVE_X509_VERIFY_PARAM_SET1_HOST +- + /* Define if the zlib library has inflateCopy */ + #undef HAVE_ZLIB_COPY + +diff --git a/setup.py b/setup.py +index f8b7a17e772b11..605f7d628e7338 100644 +--- a/setup.py ++++ b/setup.py +@@ -551,10 +551,7 @@ def print_three_column(lst): + for l in (self.missing, self.failed, self.failed_on_import)): + print() + print("Could not build the ssl module!") +- print("Python requires an OpenSSL 1.0.2 or 1.1 compatible " +- "libssl with X509_VERIFY_PARAM_set1_host().") +- print("LibreSSL 2.6.4 and earlier do not provide the necessary " +- "APIs, https://github.com/libressl-portable/portable/issues/381") ++ print("Python requires a OpenSSL 1.1.1 or newer") + if sysconfig.get_config_var("OPENSSL_LDFLAGS"): + print("Custom linker flags may require --with-openssl-rpath=auto") + print() +@@ -2431,13 +2428,13 @@ def split_var(name, sep): + self.missing.extend(['_ssl', '_hashlib']) + return None, None + +- # OpenSSL 1.0.2 uses Kerberos for KRB5 ciphers +- krb5_h = find_file( +- 'krb5.h', self.inc_dirs, +- ['/usr/kerberos/include'] ++ self.add(Extension( ++ '_ssl', ['_ssl.c'], ++ include_dirs=openssl_includes, ++ library_dirs=openssl_libdirs, ++ libraries=openssl_libs, ++ depends=['socketmodule.h', '_ssl/debughelpers.c']) + ) +- if krb5_h: +- ssl_incs.extend(krb5_h) + + if openssl_rpath == 'auto': + runtime_library_dirs = openssl_libdirs[:] +@@ -2468,24 +2465,14 @@ def split_var(name, sep): + # don't link OpenSSL shared libraries. + openssl_extension_kwargs["libraries"] = [] + +- if config_vars.get("HAVE_X509_VERIFY_PARAM_SET1_HOST"): +- self.add( +- Extension( +- '_ssl', +- ['_ssl.c'], +- depends=[ +- 'socketmodule.h', +- '_ssl/debughelpers.c', +- '_ssl_data.h', +- '_ssl_data_111.h', +- '_ssl_data_300.h', +- ], +- **openssl_extension_kwargs +- ) ++ self.add( ++ Extension( ++ '_ssl', ++ ['_ssl.c'], ++ depends=['socketmodule.h', '_ssl/debughelpers.c'], ++ **openssl_extension_kwargs + ) +- else: +- self.missing.append('_ssl') +- ++ ) + self.add( + Extension( + '_hashlib', diff --git a/CVE-2024-6923-email-hdr-inject.patch b/CVE-2024-6923-email-hdr-inject.patch new file mode 100644 index 0000000..b580c78 --- /dev/null +++ b/CVE-2024-6923-email-hdr-inject.patch @@ -0,0 +1,339 @@ +From f9ddc53ea850fb02d640a9b3263756d43fb6d868 Mon Sep 17 00:00:00 2001 +From: Petr Viktorin +Date: Wed, 31 Jul 2024 00:19:48 +0200 +Subject: [PATCH] [3.9] gh-121650: Encode newlines in headers, and verify + headers are sound (GH-122233) + +GH-GH- Encode header parts that contain newlines + +Per RFC 2047: + +> [...] these encoding schemes allow the +> encoding of arbitrary octet values, mail readers that implement this +> decoding should also ensure that display of the decoded data on the +> recipient's terminal will not cause unwanted side-effects + +It seems that the "quoted-word" scheme is a valid way to include +a newline character in a header value, just like we already allow +undecodable bytes or control characters. +They do need to be properly quoted when serialized to text, though. + +GH-GH- Verify that email headers are well-formed + +This should fail for custom fold() implementations that aren't careful +about newlines. + +(cherry picked from commit 097633981879b3c9de9a1dd120d3aa585ecc2384) + +Co-authored-by: Petr Viktorin +Co-authored-by: Bas Bloemsaat +Co-authored-by: Serhiy Storchaka +--- + Doc/library/email.errors.rst | 6 + Doc/library/email.policy.rst | 18 ++ + Doc/whatsnew/3.9.rst | 12 + + Lib/email/_header_value_parser.py | 12 + + Lib/email/_policybase.py | 8 + + Lib/email/errors.py | 4 + Lib/email/generator.py | 13 +- + Lib/test/test_email/test_generator.py | 62 ++++++++++ + Lib/test/test_email/test_policy.py | 26 ++++ + Misc/NEWS.d/next/Library/2024-07-27-16-10-41.gh-issue-121650.nf6oc9.rst | 5 + 10 files changed, 162 insertions(+), 4 deletions(-) + create mode 100644 Misc/NEWS.d/next/Library/2024-07-27-16-10-41.gh-issue-121650.nf6oc9.rst + +--- a/Doc/library/email.errors.rst ++++ b/Doc/library/email.errors.rst +@@ -59,6 +59,12 @@ The following exception classes are defi + :class:`~email.mime.image.MIMEImage`). + + ++.. exception:: HeaderWriteError() ++ ++ Raised when an error occurs when the :mod:`~email.generator` outputs ++ headers. ++ ++ + Here is the list of the defects that the :class:`~email.parser.FeedParser` + can find while parsing messages. Note that the defects are added to the message + where the problem was found, so for example, if a message nested inside a +--- a/Doc/library/email.policy.rst ++++ b/Doc/library/email.policy.rst +@@ -229,6 +229,24 @@ added matters. To illustrate:: + + .. versionadded:: 3.6 + ++ ++ .. attribute:: verify_generated_headers ++ ++ If ``True`` (the default), the generator will raise ++ :exc:`~email.errors.HeaderWriteError` instead of writing a header ++ that is improperly folded or delimited, such that it would ++ be parsed as multiple headers or joined with adjacent data. ++ Such headers can be generated by custom header classes or bugs ++ in the ``email`` module. ++ ++ As it's a security feature, this defaults to ``True`` even in the ++ :class:`~email.policy.Compat32` policy. ++ For backwards compatible, but unsafe, behavior, it must be set to ++ ``False`` explicitly. ++ ++ .. versionadded:: 3.11.10 ++ ++ + The following :class:`Policy` method is intended to be called by code using + the email library to create policy instances with custom settings: + +--- a/Doc/whatsnew/3.9.rst ++++ b/Doc/whatsnew/3.9.rst +@@ -1625,3 +1625,15 @@ ipaddress + + * Fixed ``is_global`` and ``is_private`` behavior in ``IPv4Address``, + ``IPv6Address``, ``IPv4Network`` and ``IPv6Network``. ++ ++email ++----- ++ ++* Headers with embedded newlines are now quoted on output. ++ ++ The :mod:`~email.generator` will now refuse to serialize (write) headers ++ that are improperly folded or delimited, such that they would be parsed as ++ multiple headers or joined with adjacent data. ++ If you need to turn this safety feature off, ++ set :attr:`~email.policy.Policy.verify_generated_headers`. ++ (Contributed by Bas Bloemsaat and Petr Viktorin in :gh:`121650`.) +--- a/Lib/email/_header_value_parser.py ++++ b/Lib/email/_header_value_parser.py +@@ -92,6 +92,8 @@ TOKEN_ENDS = TSPECIALS | WSP + ASPECIALS = TSPECIALS | set("*'%") + ATTRIBUTE_ENDS = ASPECIALS | WSP + EXTENDED_ATTRIBUTE_ENDS = ATTRIBUTE_ENDS - set('%') ++NLSET = {'\n', '\r'} ++SPECIALSNL = SPECIALS | NLSET + + def quote_string(value): + return '"'+str(value).replace('\\', '\\\\').replace('"', r'\"')+'"' +@@ -2778,9 +2780,13 @@ def _refold_parse_tree(parse_tree, *, po + wrap_as_ew_blocked -= 1 + continue + tstr = str(part) +- if part.token_type == 'ptext' and set(tstr) & SPECIALS: +- # Encode if tstr contains special characters. +- want_encoding = True ++ if not want_encoding: ++ if part.token_type == 'ptext': ++ # Encode if tstr contains special characters. ++ want_encoding = not SPECIALSNL.isdisjoint(tstr) ++ else: ++ # Encode if tstr contains newlines. ++ want_encoding = not NLSET.isdisjoint(tstr) + try: + tstr.encode(encoding) + charset = encoding +--- a/Lib/email/_policybase.py ++++ b/Lib/email/_policybase.py +@@ -157,6 +157,13 @@ class Policy(_PolicyBase, metaclass=abc. + message_factory -- the class to use to create new message objects. + If the value is None, the default is Message. + ++ verify_generated_headers ++ -- if true, the generator verifies that each header ++ they are properly folded, so that a parser won't ++ treat it as multiple headers, start-of-body, or ++ part of another header. ++ This is a check against custom Header & fold() ++ implementations. + """ + + raise_on_defect = False +@@ -165,6 +172,7 @@ class Policy(_PolicyBase, metaclass=abc. + max_line_length = 78 + mangle_from_ = False + message_factory = None ++ verify_generated_headers = True + + def handle_defect(self, obj, defect): + """Based on policy, either raise defect or call register_defect. +--- a/Lib/email/errors.py ++++ b/Lib/email/errors.py +@@ -29,6 +29,10 @@ class CharsetError(MessageError): + """An illegal charset was given.""" + + ++class HeaderWriteError(MessageError): ++ """Error while writing headers.""" ++ ++ + # These are parsing defects which the parser was able to work around. + class MessageDefect(ValueError): + """Base class for a message defect.""" +--- a/Lib/email/generator.py ++++ b/Lib/email/generator.py +@@ -14,12 +14,14 @@ import random + from copy import deepcopy + from io import StringIO, BytesIO + from email.utils import _has_surrogates ++from email.errors import HeaderWriteError + + UNDERSCORE = '_' + NL = '\n' # XXX: no longer used by the code below. + + NLCRE = re.compile(r'\r\n|\r|\n') + fcre = re.compile(r'^From ', re.MULTILINE) ++NEWLINE_WITHOUT_FWSP = re.compile(r'\r\n[^ \t]|\r[^ \n\t]|\n[^ \t]') + + + +@@ -223,7 +225,16 @@ class Generator: + + def _write_headers(self, msg): + for h, v in msg.raw_items(): +- self.write(self.policy.fold(h, v)) ++ folded = self.policy.fold(h, v) ++ if self.policy.verify_generated_headers: ++ linesep = self.policy.linesep ++ if not folded.endswith(self.policy.linesep): ++ raise HeaderWriteError( ++ f'folded header does not end with {linesep!r}: {folded!r}') ++ if NEWLINE_WITHOUT_FWSP.search(folded.removesuffix(linesep)): ++ raise HeaderWriteError( ++ f'folded header contains newline: {folded!r}') ++ self.write(folded) + # A blank line always separates headers from body + self.write(self._NL) + +--- a/Lib/test/test_email/test_generator.py ++++ b/Lib/test/test_email/test_generator.py +@@ -6,6 +6,7 @@ from email.message import EmailMessage + from email.generator import Generator, BytesGenerator + from email.headerregistry import Address + from email import policy ++import email.errors + from test.test_email import TestEmailBase, parameterize + + +@@ -216,6 +217,44 @@ class TestGeneratorBase: + g.flatten(msg) + self.assertEqual(s.getvalue(), self.typ(expected)) + ++ def test_keep_encoded_newlines(self): ++ msg = self.msgmaker(self.typ(textwrap.dedent("""\ ++ To: nobody ++ Subject: Bad subject=?UTF-8?Q?=0A?=Bcc: injection@example.com ++ ++ None ++ """))) ++ expected = textwrap.dedent("""\ ++ To: nobody ++ Subject: Bad subject=?UTF-8?Q?=0A?=Bcc: injection@example.com ++ ++ None ++ """) ++ s = self.ioclass() ++ g = self.genclass(s, policy=self.policy.clone(max_line_length=80)) ++ g.flatten(msg) ++ self.assertEqual(s.getvalue(), self.typ(expected)) ++ ++ def test_keep_long_encoded_newlines(self): ++ msg = self.msgmaker(self.typ(textwrap.dedent("""\ ++ To: nobody ++ Subject: Bad subject=?UTF-8?Q?=0A?=Bcc: injection@example.com ++ ++ None ++ """))) ++ expected = textwrap.dedent("""\ ++ To: nobody ++ Subject: Bad subject ++ =?utf-8?q?=0A?=Bcc: ++ injection@example.com ++ ++ None ++ """) ++ s = self.ioclass() ++ g = self.genclass(s, policy=self.policy.clone(max_line_length=30)) ++ g.flatten(msg) ++ self.assertEqual(s.getvalue(), self.typ(expected)) ++ + + class TestGenerator(TestGeneratorBase, TestEmailBase): + +@@ -224,6 +263,29 @@ class TestGenerator(TestGeneratorBase, T + ioclass = io.StringIO + typ = str + ++ def test_verify_generated_headers(self): ++ """gh-121650: by default the generator prevents header injection""" ++ class LiteralHeader(str): ++ name = 'Header' ++ def fold(self, **kwargs): ++ return self ++ ++ for text in ( ++ 'Value\r\nBad Injection\r\n', ++ 'NoNewLine' ++ ): ++ with self.subTest(text=text): ++ message = message_from_string( ++ "Header: Value\r\n\r\nBody", ++ policy=self.policy, ++ ) ++ ++ del message['Header'] ++ message['Header'] = LiteralHeader(text) ++ ++ with self.assertRaises(email.errors.HeaderWriteError): ++ message.as_string() ++ + + class TestBytesGenerator(TestGeneratorBase, TestEmailBase): + +--- a/Lib/test/test_email/test_policy.py ++++ b/Lib/test/test_email/test_policy.py +@@ -26,6 +26,7 @@ class PolicyAPITests(unittest.TestCase): + 'raise_on_defect': False, + 'mangle_from_': True, + 'message_factory': None, ++ 'verify_generated_headers': True, + } + # These default values are the ones set on email.policy.default. + # If any of these defaults change, the docs must be updated. +@@ -277,6 +278,31 @@ class PolicyAPITests(unittest.TestCase): + with self.assertRaises(email.errors.HeaderParseError): + policy.fold("Subject", subject) + ++ def test_verify_generated_headers(self): ++ """Turning protection off allows header injection""" ++ policy = email.policy.default.clone(verify_generated_headers=False) ++ for text in ( ++ 'Header: Value\r\nBad: Injection\r\n', ++ 'Header: NoNewLine' ++ ): ++ with self.subTest(text=text): ++ message = email.message_from_string( ++ "Header: Value\r\n\r\nBody", ++ policy=policy, ++ ) ++ class LiteralHeader(str): ++ name = 'Header' ++ def fold(self, **kwargs): ++ return self ++ ++ del message['Header'] ++ message['Header'] = LiteralHeader(text) ++ ++ self.assertEqual( ++ message.as_string(), ++ f"{text}\nBody", ++ ) ++ + # XXX: Need subclassing tests. + # For adding subclassed objects, make sure the usual rules apply (subclass + # wins), but that the order still works (right overrides left). +--- /dev/null ++++ b/Misc/NEWS.d/next/Library/2024-07-27-16-10-41.gh-issue-121650.nf6oc9.rst +@@ -0,0 +1,5 @@ ++:mod:`email` headers with embedded newlines are now quoted on output. The ++:mod:`~email.generator` will now refuse to serialize (write) headers that ++are unsafely folded or delimited; see ++:attr:`~email.policy.Policy.verify_generated_headers`. (Contributed by Bas ++Bloemsaat and Petr Viktorin in :gh:`121650`.) diff --git a/bso1227999-reproducible-builds.patch b/bso1227999-reproducible-builds.patch new file mode 100644 index 0000000..6f1930b --- /dev/null +++ b/bso1227999-reproducible-builds.patch @@ -0,0 +1,37 @@ +From ac2b8869724d7a57d9b5efbdce2f20423214e8bb Mon Sep 17 00:00:00 2001 +From: "Bernhard M. Wiedemann" +Date: Tue, 16 Jul 2024 21:39:33 +0200 +Subject: [PATCH] Allow to override build date with SOURCE_DATE_EPOCH + +to make builds reproducible. +See https://reproducible-builds.org/ for why this is good +and https://reproducible-builds.org/specs/source-date-epoch/ +for the definition of this variable. +--- + Doc/conf.py | 3 ++- + Doc/library/functions.rst | 2 +- + 2 files changed, 3 insertions(+), 2 deletions(-) + +--- a/Doc/conf.py ++++ b/Doc/conf.py +@@ -80,7 +80,8 @@ html_short_title = '%s Documentation' % + + # If not '', a 'Last updated on:' timestamp is inserted at every page bottom, + # using the given strftime format. +-html_last_updated_fmt = '%b %d, %Y' ++html_time = int(os.environ.get('SOURCE_DATE_EPOCH', time.time())) ++html_last_updated_fmt = time.strftime('%b %d, %Y (%H:%M UTC)', time.gmtime(html_time)) + + # Path to find HTML templates. + templates_path = ['tools/templates'] +--- a/Doc/library/functions.rst ++++ b/Doc/library/functions.rst +@@ -1254,7 +1254,7 @@ are always available. They are listed h + (where :func:`open` is declared), :mod:`os`, :mod:`os.path`, :mod:`tempfile`, + and :mod:`shutil`. + +- .. audit-event:: open file,mode,flags open ++ .. audit-event:: open path,mode,flags open + + The ``mode`` and ``flags`` arguments may have been modified or inferred from + the original call. diff --git a/python39.changes b/python39.changes index e5d58e1..af26b44 100644 --- a/python39.changes +++ b/python39.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Wed Aug 7 12:12:42 UTC 2024 - Matej Cepl + +- Add CVE-2024-6923-email-hdr-inject.patch to prevent email + header injection due to unquoted newlines (bsc#1228780, + CVE-2024-6923). +- Adding bso1227999-reproducible-builds.patch fixing bsc#1227999 + adding reproducibility patches from gh#python/cpython!121872 + and gh#python/cpython!121883. +- Add CVE-2024-5642-OpenSSL-API-buf-overread-NPN.patch removing + support for anything but OpenSSL 1.1.1 or newer (bsc#1227233, + CVE-2024-5642). +- %{profileopt} variable is set according to the variable + %{do_profiling} (bsc#1227999) + ------------------------------------------------------------------- Mon Jul 22 21:20:54 UTC 2024 - Matej Cepl diff --git a/python39.spec b/python39.spec index 7291550..876b50c 100644 --- a/python39.spec +++ b/python39.spec @@ -36,6 +36,12 @@ %bcond_without general %endif +%if 0%{?do_profiling} +%bcond_without profileopt +%else +%bcond_with profileopt +%endif + %define python_pkg_name python39 %if "%{python_pkg_name}" == "%{primary_python}" %define primary_interpreter 1 @@ -187,6 +193,15 @@ Patch44: CVE-2024-0397-memrace_ssl.SSLContext_cert_store.patch # PATCH-FIX-UPSTREAM CVE-2024-4032-private-IP-addrs.patch bsc#1226448 mcepl@suse.com # rearrange definition of private v global IP addresses Patch45: CVE-2024-4032-private-IP-addrs.patch +# PATCH-FIX-UPSTREAM bso1227999-reproducible-builds.patch bsc#1227999 mcepl@suse.com +# reproducibility patches +Patch46: bso1227999-reproducible-builds.patch +# PATCH-FIX-UPSTREAM CVE-2024-6923-email-hdr-inject.patch bsc#1228780 mcepl@suse.com +# prevent email header injection, patch from gh#python/cpython!122608 +Patch47: CVE-2024-6923-email-hdr-inject.patch +# PATCH-FIX-UPSTREAM CVE-2024-5642-OpenSSL-API-buf-overread-NPN.patch bsc#1227233 mcepl@suse.com +# Remove for support for anything but OpenSSL 1.1.1 or newer +Patch48: CVE-2024-5642-OpenSSL-API-buf-overread-NPN.patch BuildRequires: autoconf-archive BuildRequires: automake BuildRequires: fdupes @@ -447,12 +462,15 @@ other applications. %patch -P 39 -p1 %patch -P 40 -p1 %if 0%{?sle_version} && 0%{?sle_version} <= 150500 -%patch -P 41 -p1 +%patch -p1 -P 41 %endif -%patch -P 42 -p1 -%patch -P 43 -p1 -%patch -P 44 -p1 -%patch -P 45 -p1 +%patch -p1 -P 42 +%patch -p1 -P 43 +%patch -p1 -P 44 +%patch -p1 -P 45 +%patch -p1 -P 46 +%patch -p1 -P 47 +%patch -p1 -P 48 # drop Autoconf version requirement sed -i 's/^AC_PREREQ/dnl AC_PREREQ/' configure.ac